Skip to content

Commit

Permalink
Partial migration of package names.
Browse files Browse the repository at this point in the history
  • Loading branch information
@jjg-123
jjg-123 committed Sep 11, 2024
1 parent 4b55158 commit 80906ef
Show file tree
Hide file tree
Showing 2,498 changed files with 16,687 additions and 15,623 deletions.
2,677 changes: 2,545 additions & 132 deletions .idea/workspace.xml
View file

Large diffs are not rendered by default.

8 changes: 0 additions & 8 deletions client-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,6 @@
<artifactId>oauth2</artifactId>
<version>5.3-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>edu.uiuc.ncsa.security</groupId>
<artifactId>core</artifactId>
<version>5.3-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>edu.uiuc.ncsa.security</groupId>
<artifactId>servlet</artifactId>
Expand Down
24 changes: 12 additions & 12 deletions ...xy/oa4mp/client/AbstractOA4MPService.java → ...a4mp/client/api/AbstractOA4MPService.java
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package edu.uiuc.ncsa.myproxy.oa4mp.client;

import edu.uiuc.ncsa.myproxy.oa4mp.client.storage.AssetProvider;
import edu.uiuc.ncsa.myproxy.oa4mp.client.storage.AssetStore;
import edu.uiuc.ncsa.myproxy.oa4mp.client.storage.MemoryAssetStore;
import edu.uiuc.ncsa.oa4mp.delegation.client.request.DelegatedAssetRequest;
import edu.uiuc.ncsa.oa4mp.delegation.client.request.DelegatedAssetResponse;
import edu.uiuc.ncsa.oa4mp.delegation.client.request.DelegationRequest;
import edu.uiuc.ncsa.oa4mp.delegation.client.request.DelegationResponse;
import edu.uiuc.ncsa.oa4mp.delegation.common.token.AuthorizationGrant;
import edu.uiuc.ncsa.oa4mp.delegation.common.token.MyX509Certificates;
import edu.uiuc.ncsa.oa4mp.delegation.common.token.Verifier;
package org.oa4mp.client.api;

import org.oa4mp.client.api.storage.AssetProvider;
import org.oa4mp.client.api.storage.AssetStore;
import org.oa4mp.client.api.storage.MemoryAssetStore;
import org.oa4mp.delegation.request.DelegatedAssetRequest;
import org.oa4mp.delegation.request.DelegatedAssetResponse;
import org.oa4mp.delegation.request.DelegationRequest;
import org.oa4mp.delegation.request.DelegationResponse;
import org.oa4mp.delegation.common.token.AuthorizationGrant;
import org.oa4mp.delegation.common.token.MyX509Certificates;
import org.oa4mp.delegation.common.token.Verifier;
import edu.uiuc.ncsa.security.core.Identifier;
import edu.uiuc.ncsa.security.core.exceptions.GeneralException;
import edu.uiuc.ncsa.security.core.util.BasicIdentifier;
Expand Down
5 changes: 3 additions & 2 deletions ...uiuc/ncsa/myproxy/oa4mp/client/Asset.java → ...main/java/org/oa4mp/client/api/Asset.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package edu.uiuc.ncsa.myproxy.oa4mp.client;
package org.oa4mp.client.api;

import edu.uiuc.ncsa.security.core.Identifier;
import edu.uiuc.ncsa.security.core.util.BasicIdentifier;
Expand All @@ -9,6 +9,7 @@
import edu.uiuc.ncsa.security.util.crypto.KeyUtil;
import edu.uiuc.ncsa.security.util.crypto.MyPKCS10CertRequest;
import net.sf.json.JSONObject;
import org.oa4mp.client.api.storage.AssetStore;

import java.net.URI;
import java.security.PrivateKey;
Expand All @@ -26,7 +27,7 @@
* <li>the username used for the MyProxy call</li>
* <li>the creation time of this entry (useful for removing expired/old assets)</li>
* </ul>
* read more on the use of this in the {@link edu.uiuc.ncsa.myproxy.oa4mp.client.storage.AssetStore}
* read more on the use of this in the {@link AssetStore}
* javadoc.
* <p>Created by Jeff Gaynor<br>
* on 1/29/13 at 10:51 AM
Expand Down
4 changes: 2 additions & 2 deletions ...a/myproxy/oa4mp/client/AssetResponse.java → ...a/org/oa4mp/client/api/AssetResponse.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package edu.uiuc.ncsa.myproxy.oa4mp.client;
package org.oa4mp.client.api;

import edu.uiuc.ncsa.oa4mp.delegation.common.services.Response;
import org.oa4mp.delegation.common.services.Response;

import java.security.cert.X509Certificate;

Expand Down
16 changes: 8 additions & 8 deletions ...proxy/oa4mp/client/ClientEnvironment.java → ...g/oa4mp/client/api/ClientEnvironment.java
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package edu.uiuc.ncsa.myproxy.oa4mp.client;

import edu.uiuc.ncsa.myproxy.oa4mp.client.storage.AssetProvider;
import edu.uiuc.ncsa.myproxy.oa4mp.client.storage.AssetStore;
import edu.uiuc.ncsa.oa4mp.delegation.client.AbstractClientEnvironment;
import edu.uiuc.ncsa.oa4mp.delegation.client.DelegationService;
import edu.uiuc.ncsa.oa4mp.delegation.common.storage.clients.Client;
import edu.uiuc.ncsa.oa4mp.delegation.common.token.TokenForge;
package org.oa4mp.client.api;

import org.oa4mp.client.api.storage.AssetProvider;
import org.oa4mp.client.api.storage.AssetStore;
import org.oa4mp.delegation.AbstractClientEnvironment;
import org.oa4mp.delegation.DelegationService;
import org.oa4mp.delegation.common.storage.clients.Client;
import org.oa4mp.delegation.common.token.TokenForge;
import edu.uiuc.ncsa.security.core.exceptions.GeneralException;
import edu.uiuc.ncsa.security.core.util.BasicIdentifier;
import edu.uiuc.ncsa.security.core.util.MyLoggingFacade;
Expand Down
4 changes: 2 additions & 2 deletions ...y/oa4mp/client/ClientLoaderInterface.java → ...4mp/client/api/ClientLoaderInterface.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package edu.uiuc.ncsa.myproxy.oa4mp.client;
package org.oa4mp.client.api;

import edu.uiuc.ncsa.myproxy.oa4mp.client.storage.AssetStore;
import org.oa4mp.client.api.storage.AssetStore;
import edu.uiuc.ncsa.security.core.util.ConfigurationLoader;
import edu.uiuc.ncsa.security.util.jwk.JSONWebKeys;
import edu.uiuc.ncsa.security.util.ssl.SSLConfiguration;
Expand Down
4 changes: 2 additions & 2 deletions ...a/myproxy/oa4mp/client/ClientXMLTags.java → ...a/org/oa4mp/client/api/ClientXMLTags.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package edu.uiuc.ncsa.myproxy.oa4mp.client;
package org.oa4mp.client.api;

import edu.uiuc.ncsa.oa4mp.delegation.oa2.jwt.MyOtherJWTUtil2;
import org.oa4mp.delegation.server.jwt.MyOtherJWTUtil2;
import edu.uiuc.ncsa.security.core.configuration.StorageConfigurationTags;

/**
Expand Down
4 changes: 2 additions & 2 deletions ...a/myproxy/oa4mp/client/OA4MPResponse.java → ...a/org/oa4mp/client/api/OA4MPResponse.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package edu.uiuc.ncsa.myproxy.oa4mp.client;
package org.oa4mp.client.api;


import edu.uiuc.ncsa.oa4mp.delegation.common.services.Response;
import org.oa4mp.delegation.common.services.Response;

import java.net.URI;
import java.security.PrivateKey;
Expand Down
4 changes: 2 additions & 2 deletions ...sa/myproxy/oa4mp/client/OA4MPService.java → ...va/org/oa4mp/client/api/OA4MPService.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package edu.uiuc.ncsa.myproxy.oa4mp.client;
package org.oa4mp.client.api;

import edu.uiuc.ncsa.security.core.exceptions.GeneralException;
import edu.uiuc.ncsa.security.util.crypto.CertUtil;
Expand All @@ -8,7 +8,7 @@
import java.security.KeyPair;
import java.util.Map;

import static edu.uiuc.ncsa.myproxy.oa4mp.client.ClientEnvironment.CALLBACK_URI_KEY;
import static org.oa4mp.client.api.ClientEnvironment.CALLBACK_URI_KEY;

/**
* The OAuth for MyProxy service. Note that the {@link ClientEnvironment} is queried for its properties
Expand Down
2 changes: 1 addition & 1 deletion ...xy/oa4mp/client/OA4MPServiceProvider.java → ...a4mp/client/api/OA4MPServiceProvider.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package edu.uiuc.ncsa.myproxy.oa4mp.client;
package org.oa4mp.client.api;

import javax.inject.Provider;

Expand Down
8 changes: 3 additions & 5 deletions ...nt/loader/AbstractClientBootstrapper.java → ...pi/loader/AbstractClientBootstrapper.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package edu.uiuc.ncsa.myproxy.oa4mp.client.loader;
package org.oa4mp.client.api.loader;

import edu.uiuc.ncsa.myproxy.oa4mp.client.ClientXMLTags;
import org.oa4mp.client.api.ClientXMLTags;
import edu.uiuc.ncsa.security.core.exceptions.MyConfigurationException;
import edu.uiuc.ncsa.security.core.util.ConfigurationLoader;
import edu.uiuc.ncsa.security.core.util.MyLoggingFacade;
Expand Down Expand Up @@ -36,6 +36,7 @@
* @see {@link Bootstrapper} for more details.
* <p>Created by Jeff Gaynor<br>
* on 11/25/13 at 11:24 AM
* ∉
*/
public abstract class AbstractClientBootstrapper extends Bootstrapper {
protected static final String OA4MP_CONFIG_FILE_KEY = "oa4mp:client.config.file";
Expand Down Expand Up @@ -114,7 +115,4 @@ public ConfigurationLoader getConfigurationLoader(ServletContext servletContext)
logger.error(cx);
throw cx;
}



}
20 changes: 10 additions & 10 deletions ...p/client/loader/AbstractClientLoader.java → ...ient/api/loader/AbstractClientLoader.java
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
package edu.uiuc.ncsa.myproxy.oa4mp.client.loader;

import edu.uiuc.ncsa.myproxy.oa4mp.client.ClientEnvironment;
import edu.uiuc.ncsa.myproxy.oa4mp.client.ClientLoaderInterface;
import edu.uiuc.ncsa.myproxy.oa4mp.client.ClientXMLTags;
import edu.uiuc.ncsa.myproxy.oa4mp.client.storage.*;
import edu.uiuc.ncsa.oa4mp.delegation.client.DelegationService;
import edu.uiuc.ncsa.oa4mp.delegation.common.servlet.DBConfigLoader;
import edu.uiuc.ncsa.oa4mp.delegation.oa2.OIDCDiscoveryTags;
package org.oa4mp.client.api.loader;

import org.oa4mp.client.api.ClientEnvironment;
import org.oa4mp.client.api.ClientLoaderInterface;
import org.oa4mp.client.api.ClientXMLTags;
import org.oa4mp.delegation.DelegationService;
import org.oa4mp.delegation.common.servlet.DBConfigLoader;
import org.oa4mp.delegation.server.OIDCDiscoveryTags;
import edu.uiuc.ncsa.security.core.configuration.Configurations;
import edu.uiuc.ncsa.security.core.configuration.provider.CfgEvent;
import edu.uiuc.ncsa.security.core.configuration.provider.TypedProvider;
Expand All @@ -17,13 +16,14 @@
import edu.uiuc.ncsa.security.util.ssl.SSLConfigurationUtil;
import net.sf.json.JSONObject;
import org.apache.commons.configuration.tree.ConfigurationNode;
import org.oa4mp.client.api.storage.*;

import javax.inject.Provider;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.HashMap;

import static edu.uiuc.ncsa.myproxy.oa4mp.client.ClientXMLTags.*;
import static org.oa4mp.client.api.ClientXMLTags.*;

/**
* Top-level class for client loader that creates asset store and controls which classes are instantiated for the client.
Expand Down
11 changes: 6 additions & 5 deletions ...ient/loader/ClientServletInitializer.java → .../api/loader/ClientServletInitializer.java
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package edu.uiuc.ncsa.myproxy.oa4mp.client.loader;
package org.oa4mp.client.api.loader;

import edu.uiuc.ncsa.myproxy.oa4mp.client.Asset;
import edu.uiuc.ncsa.myproxy.oa4mp.client.ClientEnvironment;
import edu.uiuc.ncsa.myproxy.oa4mp.client.servlet.ClientExceptionHandler;
import edu.uiuc.ncsa.myproxy.oa4mp.client.servlet.ClientServlet;
import org.oa4mp.client.api.Asset;
import org.oa4mp.client.api.ClientEnvironment;
import org.oa4mp.client.api.servlet.ClientExceptionHandler;
import org.oa4mp.client.api.servlet.ClientServlet;
import edu.uiuc.ncsa.security.core.Identifier;
import edu.uiuc.ncsa.security.core.cache.Cleanup;
import edu.uiuc.ncsa.security.core.cache.LockingCleanup;
Expand All @@ -21,6 +21,7 @@
/**
* <p>Created by Jeff Gaynor<br>
* on 4/15/14 at 11:21 AM
* ∉
*/
public class ClientServletInitializer implements Initialization {
protected ExceptionHandler exceptionHandler;
Expand Down
2 changes: 1 addition & 1 deletion ...lient/servlet/ClientExceptionHandler.java → ...t/api/servlet/ClientExceptionHandler.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package edu.uiuc.ncsa.myproxy.oa4mp.client.servlet;
package org.oa4mp.client.api.servlet;

import edu.uiuc.ncsa.security.core.util.DebugUtil;
import edu.uiuc.ncsa.security.core.util.MyLoggingFacade;
Expand Down
18 changes: 10 additions & 8 deletions ...y/oa4mp/client/servlet/ClientServlet.java → ...4mp/client/api/servlet/ClientServlet.java
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
package edu.uiuc.ncsa.myproxy.oa4mp.client.servlet;
package org.oa4mp.client.api.servlet;

import edu.uiuc.ncsa.myproxy.oa4mp.client.Asset;
import edu.uiuc.ncsa.myproxy.oa4mp.client.ClientEnvironment;
import edu.uiuc.ncsa.myproxy.oa4mp.client.ClientLoaderInterface;
import edu.uiuc.ncsa.myproxy.oa4mp.client.OA4MPService;
import org.oa4mp.client.api.Asset;
import org.oa4mp.client.api.ClientEnvironment;
import org.oa4mp.client.api.ClientLoaderInterface;
import org.oa4mp.client.api.OA4MPService;
import edu.uiuc.ncsa.security.core.Identifier;
import edu.uiuc.ncsa.security.core.cache.Cleanup;
import edu.uiuc.ncsa.security.servlet.AbstractServlet;
import org.oa4mp.client.api.servlet.sample.SimpleReadyServlet;
import org.oa4mp.client.api.servlet.sample.SimpleStartRequest;

import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
Expand All @@ -16,12 +18,12 @@

/**
* Basic Client servlet. it has the machinery in it for reading in a configuration file,
* setting up the {@link edu.uiuc.ncsa.myproxy.oa4mp.client.ClientEnvironment} and making the {@link OA4MPService}
* setting up the {@link ClientEnvironment} and making the {@link OA4MPService}
* instance. It also includes a utility call for getting a cookie with
* the identifier (stored with the key {@value #OA4MP_CLIENT_REQUEST_ID} in
* the users browser). <br><br>
* Look at the two sample uses of this in {@link edu.uiuc.ncsa.myproxy.oa4mp.client.servlet.sample.SimpleStartRequest}
* and {@link edu.uiuc.ncsa.myproxy.oa4mp.client.servlet.sample.SimpleReadyServlet} to see how to extend and use it.
* Look at the two sample uses of this in {@link SimpleStartRequest}
* and {@link SimpleReadyServlet} to see how to extend and use it.
* <p>Created by Jeff Gaynor<br>
* on 2/10/12 at 12:51 PM
*/
Expand Down
10 changes: 5 additions & 5 deletions ...nt/servlet/sample/SimpleReadyServlet.java → ...pi/servlet/sample/SimpleReadyServlet.java
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package edu.uiuc.ncsa.myproxy.oa4mp.client.servlet.sample;
package org.oa4mp.client.api.servlet.sample;

import edu.uiuc.ncsa.myproxy.oa4mp.client.Asset;
import edu.uiuc.ncsa.myproxy.oa4mp.client.AssetResponse;
import edu.uiuc.ncsa.myproxy.oa4mp.client.ClientEnvironment;
import edu.uiuc.ncsa.myproxy.oa4mp.client.servlet.ClientServlet;
import org.oa4mp.client.api.Asset;
import org.oa4mp.client.api.AssetResponse;
import org.oa4mp.client.api.ClientEnvironment;
import org.oa4mp.client.api.servlet.ClientServlet;
import edu.uiuc.ncsa.security.core.exceptions.GeneralException;
import edu.uiuc.ncsa.security.core.util.BasicIdentifier;
import edu.uiuc.ncsa.security.servlet.JSPUtil;
Expand Down
12 changes: 6 additions & 6 deletions ...nt/servlet/sample/SimpleStartRequest.java → ...pi/servlet/sample/SimpleStartRequest.java
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package edu.uiuc.ncsa.myproxy.oa4mp.client.servlet.sample;
package org.oa4mp.client.api.servlet.sample;

import edu.uiuc.ncsa.myproxy.oa4mp.client.Asset;
import edu.uiuc.ncsa.myproxy.oa4mp.client.OA4MPResponse;
import edu.uiuc.ncsa.myproxy.oa4mp.client.servlet.ClientServlet;
import edu.uiuc.ncsa.myproxy.oa4mp.client.storage.AssetStore;
import edu.uiuc.ncsa.myproxy.oa4mp.client.storage.AssetStoreUtil;
import org.oa4mp.client.api.Asset;
import org.oa4mp.client.api.OA4MPResponse;
import org.oa4mp.client.api.servlet.ClientServlet;
import org.oa4mp.client.api.storage.AssetStore;
import org.oa4mp.client.api.storage.AssetStoreUtil;
import edu.uiuc.ncsa.security.core.Identifier;
import edu.uiuc.ncsa.security.servlet.JSPUtil;
import edu.uiuc.ncsa.security.util.crypto.KeyUtil;
Expand Down
0 .../oa4mp/client/servlet/sample/package.html → ...mp/client/api/servlet/sample/package.html
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions .../oa4mp/client/storage/AssetConverter.java → ...mp/client/api/storage/AssetConverter.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package edu.uiuc.ncsa.myproxy.oa4mp.client.storage;
package org.oa4mp.client.api.storage;

import edu.uiuc.ncsa.myproxy.oa4mp.client.Asset;
import org.oa4mp.client.api.Asset;
import edu.uiuc.ncsa.security.core.IdentifiableProvider;
import edu.uiuc.ncsa.security.core.exceptions.GeneralException;
import edu.uiuc.ncsa.security.storage.data.ConversionMap;
Expand Down
4 changes: 2 additions & 2 deletions ...y/oa4mp/client/storage/AssetProvider.java → ...4mp/client/api/storage/AssetProvider.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package edu.uiuc.ncsa.myproxy.oa4mp.client.storage;
package org.oa4mp.client.api.storage;

import edu.uiuc.ncsa.myproxy.oa4mp.client.Asset;
import org.oa4mp.client.api.Asset;
import edu.uiuc.ncsa.security.core.IdentifiableProvider;
import edu.uiuc.ncsa.security.core.Identifier;
import edu.uiuc.ncsa.security.core.util.BasicIdentifier;
Expand Down
2 changes: 1 addition & 1 deletion ...lient/storage/AssetSerializationKeys.java → ...t/api/storage/AssetSerializationKeys.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package edu.uiuc.ncsa.myproxy.oa4mp.client.storage;
package org.oa4mp.client.api.storage;

import edu.uiuc.ncsa.security.storage.data.SerializationKeys;

Expand Down
9 changes: 5 additions & 4 deletions ...roxy/oa4mp/client/storage/AssetStore.java → .../oa4mp/client/api/storage/AssetStore.java
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
package edu.uiuc.ncsa.myproxy.oa4mp.client.storage;
package org.oa4mp.client.api.storage;

import edu.uiuc.ncsa.myproxy.oa4mp.client.Asset;
import org.oa4mp.client.api.Asset;
import edu.uiuc.ncsa.security.core.Identifier;
import edu.uiuc.ncsa.security.core.Store;
import org.oa4mp.client.api.ClientEnvironment;

/**
* The top-level abstract class for storing {@link Asset}s. This is a map that is keyed off an
Expand All @@ -12,10 +13,10 @@
* A store is specified in the client configuration.
* <h2>Lifecycle</h2>
* Once the asset store is specified in the configuration, the system will instantitate it and manage it.
* It is accessible from the {@link edu.uiuc.ncsa.myproxy.oa4mp.client.ClientEnvironment#getAssetStore()}
* It is accessible from the {@link ClientEnvironment#getAssetStore()}
* Note that if there is no asset store specified, then calls for the store return a null,
* therefore implementors should check if there has been a store with the
* {@link edu.uiuc.ncsa.myproxy.oa4mp.client.ClientEnvironment#hasAssetStore()} method first.
* {@link ClientEnvironment#hasAssetStore()} method first.
* <p>Created by Jeff Gaynor<br>
* on 1/23/13 at 4:42 PM
*/
Expand Down
2 changes: 1 addition & 1 deletion ...oa4mp/client/storage/AssetStoreTable.java → ...p/client/api/storage/AssetStoreTable.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package edu.uiuc.ncsa.myproxy.oa4mp.client.storage;
package org.oa4mp.client.api.storage;

import edu.uiuc.ncsa.security.storage.sql.internals.ColumnDescriptorEntry;
import edu.uiuc.ncsa.security.storage.sql.internals.Table;
Expand Down
4 changes: 2 additions & 2 deletions .../oa4mp/client/storage/AssetStoreUtil.java → ...mp/client/api/storage/AssetStoreUtil.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package edu.uiuc.ncsa.myproxy.oa4mp.client.storage;
package org.oa4mp.client.api.storage;

import edu.uiuc.ncsa.myproxy.oa4mp.client.Asset;
import org.oa4mp.client.api.Asset;
import edu.uiuc.ncsa.security.core.Identifier;
import edu.uiuc.ncsa.security.core.util.BasicIdentifier;
import org.apache.commons.codec.binary.Hex;
Expand Down
4 changes: 2 additions & 2 deletions ...xy/oa4mp/client/storage/FSAssetStore.java → ...a4mp/client/api/storage/FSAssetStore.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package edu.uiuc.ncsa.myproxy.oa4mp.client.storage;
package org.oa4mp.client.api.storage;

import edu.uiuc.ncsa.myproxy.oa4mp.client.Asset;
import org.oa4mp.client.api.Asset;
import edu.uiuc.ncsa.security.core.IdentifiableProvider;
import edu.uiuc.ncsa.security.core.Identifier;
import edu.uiuc.ncsa.security.core.exceptions.GeneralException;
Expand Down
4 changes: 2 additions & 2 deletions .../client/storage/FSAssetStoreProvider.java → ...ent/api/storage/FSAssetStoreProvider.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package edu.uiuc.ncsa.myproxy.oa4mp.client.storage;
package org.oa4mp.client.api.storage;

import edu.uiuc.ncsa.myproxy.oa4mp.client.ClientXMLTags;
import org.oa4mp.client.api.ClientXMLTags;
import edu.uiuc.ncsa.security.core.configuration.provider.CfgEvent;
import edu.uiuc.ncsa.security.storage.FSProvider;
import edu.uiuc.ncsa.security.storage.data.MapConverter;
Expand Down
4 changes: 2 additions & 2 deletions ...a4mp/client/storage/MemoryAssetStore.java → .../client/api/storage/MemoryAssetStore.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package edu.uiuc.ncsa.myproxy.oa4mp.client.storage;
package org.oa4mp.client.api.storage;

import edu.uiuc.ncsa.myproxy.oa4mp.client.Asset;
import org.oa4mp.client.api.Asset;
import edu.uiuc.ncsa.security.core.IdentifiableProvider;
import edu.uiuc.ncsa.security.core.Identifier;
import edu.uiuc.ncsa.security.core.XMLConverter;
Expand Down
2 changes: 1 addition & 1 deletion ...ient/storage/MultiAssetStoreProvider.java → .../api/storage/MultiAssetStoreProvider.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package edu.uiuc.ncsa.myproxy.oa4mp.client.storage;
package org.oa4mp.client.api.storage;

import edu.uiuc.ncsa.security.core.configuration.provider.MultiTypeProvider;
import edu.uiuc.ncsa.security.core.util.MyLoggingFacade;
Expand Down
Loading

0 comments on commit 80906ef

Please sign in to comment.