Author: [email protected]
Date: Fri Aug 5 08:58:55 2011
New Revision: 1248
Log:
[AMDATUAUTH-77] refactoring package names, artifact ids - part 2
Added:
trunk/amdatu-auth/oauth-server/src/main/java/org/amdatu/auth/
- copied from r1247,
/trunk/amdatu-auth/oauth-server/src/main/java/org/amdatu/authentication/
trunk/amdatu-auth/oauth-stores/consumer-store-fs/src/main/java/org/amdatu/auth/
- copied from r1247,
/trunk/amdatu-auth/oauth-stores/consumer-store-fs/src/main/java/org/amdatu/authentication/
trunk/amdatu-auth/tokenprovider/src/main/java/org/amdatu/auth/
- copied from r1247,
/trunk/amdatu-auth/tokenprovider/src/main/java/org/amdatu/authentication/
trunk/amdatu-auth/tokenstore-mem/src/main/java/org/amdatu/auth/
- copied from r1247,
/trunk/amdatu-auth/tokenstore-mem/src/main/java/org/amdatu/authentication/
trunk/amdatu-auth/useradmin-gadget/src/main/java/org/amdatu/auth/
- copied from r1247,
/trunk/amdatu-auth/useradmin-gadget/src/main/java/org/amdatu/authorization/
trunk/amdatu-auth/useradmin-rest/src/main/java/org/amdatu/auth/
- copied from r1247,
/trunk/amdatu-auth/useradmin-rest/src/main/java/org/amdatu/authorization/
Removed:
trunk/amdatu-auth/oauth-server/src/main/java/org/amdatu/authentication/
trunk/amdatu-auth/oauth-stores/consumer-store-fs/src/main/java/org/amdatu/authentication/
trunk/amdatu-auth/tokenprovider/src/main/java/org/amdatu/authentication/
trunk/amdatu-auth/tokenstore-mem/src/main/java/org/amdatu/authentication/
trunk/amdatu-auth/useradmin-gadget/src/main/java/org/amdatu/authorization/
trunk/amdatu-auth/useradmin-rest/src/main/java/org/amdatu/authorization/
Modified:
trunk/amdatu-auth/login-service/pom.xml
trunk/amdatu-auth/oauth-api/pom.xml
trunk/amdatu-auth/oauth-client/pom.xml
trunk/amdatu-auth/oauth-consumerregistry/pom.xml
trunk/amdatu-auth/oauth-example/pom.xml
trunk/amdatu-auth/oauth-example/src/main/java/org/amdatu/example/oauth/osgi/Activator.java
trunk/amdatu-auth/oauth-example/src/main/java/org/amdatu/example/oauth/service/OAuthProtectedResource.java
trunk/amdatu-auth/oauth-server/pom.xml
trunk/amdatu-auth/oauth-server/src/main/java/org/amdatu/auth/oauth/server/OAuthAccessTokenServlet.java
trunk/amdatu-auth/oauth-server/src/main/java/org/amdatu/auth/oauth/server/OAuthAuthorizeTokenServlet.java
trunk/amdatu-auth/oauth-server/src/main/java/org/amdatu/auth/oauth/server/OAuthNonceStorageProvider.java
trunk/amdatu-auth/oauth-server/src/main/java/org/amdatu/auth/oauth/server/OAuthRequestTokenServlet.java
trunk/amdatu-auth/oauth-server/src/main/java/org/amdatu/auth/oauth/server/OAuthServerConfig.java
trunk/amdatu-auth/oauth-server/src/main/java/org/amdatu/auth/oauth/server/OAuthTokenProvider.java
trunk/amdatu-auth/oauth-server/src/main/java/org/amdatu/auth/oauth/server/osgi/Activator.java
trunk/amdatu-auth/oauth-server/src/main/java/org/amdatu/auth/oauth/server/service/OAuthResourceProviderImpl.java
trunk/amdatu-auth/oauth-server/src/main/java/org/amdatu/auth/oauth/server/service/OAuthServerConfiguration.java
trunk/amdatu-auth/oauth-server/src/main/java/org/amdatu/auth/oauth/server/service/OAuthServerConfigurationImpl.java
trunk/amdatu-auth/oauth-server/src/main/java/org/amdatu/auth/oauth/server/service/OAuthServerUtil.java
trunk/amdatu-auth/oauth-server/src/main/java/org/amdatu/auth/oauth/server/service/OAuthServiceProviderImpl.java
trunk/amdatu-auth/oauth-server/src/main/java/org/amdatu/auth/oauth/server/service/OAuthTokenProviderImpl.java
trunk/amdatu-auth/oauth-server/src/main/java/org/amdatu/auth/oauth/server/service/PluggableOAuthValidator.java
trunk/amdatu-auth/oauth-server/src/main/java/org/amdatu/auth/oauth/server/servlet/OAuthAccessTokenServletImpl.java
trunk/amdatu-auth/oauth-server/src/main/java/org/amdatu/auth/oauth/server/servlet/OAuthAuthorizeTokenServletImpl.java
trunk/amdatu-auth/oauth-server/src/main/java/org/amdatu/auth/oauth/server/servlet/OAuthRequestTokenServletImpl.java
trunk/amdatu-auth/oauth-stores/consumer-store-fs/pom.xml
trunk/amdatu-auth/oauth-stores/nonce-store-mem/pom.xml
trunk/amdatu-auth/tokenprovider/pom.xml
trunk/amdatu-auth/tokenstore-mem/pom.xml
trunk/amdatu-auth/useradmin-gadget/pom.xml
trunk/amdatu-auth/useradmin-rest/pom.xml
Modified: trunk/amdatu-auth/login-service/pom.xml
==============================================================================
--- trunk/amdatu-auth/login-service/pom.xml (original)
+++ trunk/amdatu-auth/login-service/pom.xml Fri Aug 5 08:58:55 2011
@@ -72,9 +72,9 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
-
<Bundle-Activator>org.amdatu.authorization.login.service.osgi.Activator</Bundle-Activator>
+
<Bundle-Activator>org.amdatu.auth.login.service.osgi.Activator</Bundle-Activator>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-
<Export-Package>org.amdatu.authorization.login.service;version="1.0.0"</Export-Package>
+
<Export-Package>org.amdatu.auth.login.service;version="1.0.0"</Export-Package>
<Embed-Dependency>*;scope=compile</Embed-Dependency>
<Embed-Transitive>true</Embed-Transitive>
</instructions>
Modified: trunk/amdatu-auth/oauth-api/pom.xml
==============================================================================
--- trunk/amdatu-auth/oauth-api/pom.xml (original)
+++ trunk/amdatu-auth/oauth-api/pom.xml Fri Aug 5 08:58:55 2011
@@ -99,7 +99,7 @@
*
</Import-Package>
<Export-Package>
- org.amdatu.authentication.oauth.api;version="1.0.0"
+ org.amdatu.auth.oauth.api;version="1.0.0"
</Export-Package>
<_exportcontents>
net.oauth.*;version="1.0.0"
Modified: trunk/amdatu-auth/oauth-client/pom.xml
==============================================================================
--- trunk/amdatu-auth/oauth-client/pom.xml (original)
+++ trunk/amdatu-auth/oauth-client/pom.xml Fri Aug 5 08:58:55 2011
@@ -83,13 +83,13 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
-
<Bundle-Activator>org.amdatu.authentication.oauth.client.osgi.Activator</Bundle-Activator>
+
<Bundle-Activator>org.amdatu.auth.oauth.client.osgi.Activator</Bundle-Activator>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-
<Export-Package>org.amdatu.authentication.oauth.client</Export-Package>
+ <Export-Package>org.amdatu.auth.oauth.client</Export-Package>
<Embed-Dependency>*;scope=compile</Embed-Dependency>
<Import-Package>
net.oauth.*;version="[1.0,2.0)",
- org.amdatu.authentication.oauth.api;version="[1.0,2.0)",
+ org.amdatu.auth.oauth.api;version="[1.0,2.0)",
!com.ibm.uvm.tools,
!com.sun.jdmk.comm,
!javax.jmdns,
@@ -101,7 +101,7 @@
*
</Import-Package>
<Export-Package>
- org.amdatu.authentication.oauth.client;version="1.0.0"
+ org.amdatu.auth.oauth.client;version="1.0.0"
</Export-Package>
</instructions>
</configuration>
Modified: trunk/amdatu-auth/oauth-consumerregistry/pom.xml
==============================================================================
--- trunk/amdatu-auth/oauth-consumerregistry/pom.xml (original)
+++ trunk/amdatu-auth/oauth-consumerregistry/pom.xml Fri Aug 5 08:58:55 2011
@@ -104,18 +104,18 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
-
<Bundle-Activator>org.amdatu.authentication.oauth.consumerregistry.osgi.Activator</Bundle-Activator>
+
<Bundle-Activator>org.amdatu.auth.oauth.consumerregistry.osgi.Activator</Bundle-Activator>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Embed-Dependency>*;scope=compile</Embed-Dependency>
<Import-Package>
!org.apache.avalon.*,
!org.apache.log,
!org.apache.log4j,
- org.amdatu.authentication.oauth.api;version="[1.0,1.1)",
+ org.amdatu.auth.oauth.api;version="[1.0,1.1)",
*
</Import-Package>
<Export-Package>
- org.amdatu.authentication.oauth.consumerregistry
+ org.amdatu.auth.oauth.consumerregistry
</Export-Package>
</instructions>
</configuration>
Modified: trunk/amdatu-auth/oauth-example/pom.xml
==============================================================================
--- trunk/amdatu-auth/oauth-example/pom.xml (original)
+++ trunk/amdatu-auth/oauth-example/pom.xml Fri Aug 5 08:58:55 2011
@@ -105,14 +105,14 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
-
<Bundle-Activator>org.amdatu.example.oauth.osgi.Activator</Bundle-Activator>
+
<Bundle-Activator>org.amdatu.auth.example.oauth.osgi.Activator</Bundle-Activator>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Embed-Dependency>*;scope=compile</Embed-Dependency>
<Export-Package></Export-Package>
<Import-Package>
net.oauth.*;version="[1.0,2.0)",
- org.amdatu.authentication.oauth.api;version="[1.0,1.1)",
- org.amdatu.authentication.oauth.server;version="[1.0,2.0)",
+ org.amdatu.auth.oauth.api;version="[1.0,1.1)",
+ org.amdatu.auth.oauth.server;version="[1.0,2.0)",
org.amdatu.opensocial.gadgetmanagement,
*
</Import-Package>
Modified:
trunk/amdatu-auth/oauth-example/src/main/java/org/amdatu/example/oauth/osgi/Activator.java
==============================================================================
---
trunk/amdatu-auth/oauth-example/src/main/java/org/amdatu/example/oauth/osgi/Activator.java
(original)
+++
trunk/amdatu-auth/oauth-example/src/main/java/org/amdatu/example/oauth/osgi/Activator.java
Fri Aug 5 08:58:55 2011
@@ -19,7 +19,7 @@
import java.util.Hashtable;
import org.amdatu.auth.oauth.consumerregistry.OAuthServiceConsumerRegistry;
-import org.amdatu.authentication.oauth.server.OAuthTokenProvider;
+import org.amdatu.auth.oauth.server.OAuthTokenProvider;
import org.amdatu.example.oauth.service.DummyInterface;
import org.amdatu.example.oauth.service.OAuthGadgetsRegistrationServiceImpl;
import org.amdatu.example.oauth.service.OAuthProtectedResource;
Modified:
trunk/amdatu-auth/oauth-example/src/main/java/org/amdatu/example/oauth/service/OAuthProtectedResource.java
==============================================================================
---
trunk/amdatu-auth/oauth-example/src/main/java/org/amdatu/example/oauth/service/OAuthProtectedResource.java
(original)
+++
trunk/amdatu-auth/oauth-example/src/main/java/org/amdatu/example/oauth/service/OAuthProtectedResource.java
Fri Aug 5 08:58:55 2011
@@ -32,7 +32,7 @@
import net.oauth.OAuthMessage;
import net.oauth.server.OAuthServlet;
-import org.amdatu.authentication.oauth.server.OAuthTokenProvider;
+import org.amdatu.auth.oauth.server.OAuthTokenProvider;
import org.amdatu.authentication.tokenprovider.Token;
/**
Modified: trunk/amdatu-auth/oauth-server/pom.xml
==============================================================================
--- trunk/amdatu-auth/oauth-server/pom.xml (original)
+++ trunk/amdatu-auth/oauth-server/pom.xml Fri Aug 5 08:58:55 2011
@@ -110,16 +110,16 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
-
<Bundle-Activator>org.amdatu.authentication.oauth.server.osgi.Activator</Bundle-Activator>
+
<Bundle-Activator>org.amdatu.auth.oauth.server.osgi.Activator</Bundle-Activator>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Import-Package>
net.oauth.*;version="[1.0,2.0)",
- org.amdatu.authentication.oauth.api;version="[1.0,1.1)",
- org.amdatu.authentication.tokenprovider;version="[1.0,1.1)",
+ org.amdatu.auth.oauth.api;version="[1.0,1.1)",
+ org.amdatu.auth.tokenprovider;version="[1.0,1.1)",
*
</Import-Package>
<Export-Package>
- org.amdatu.authentication.oauth.server;version="1.0.0"
+ org.amdatu.auth.oauth.server;version="1.0.0"
</Export-Package>
<Embed-Dependency>*;scope=compile</Embed-Dependency>
<DynamicImport-Package>
Modified:
trunk/amdatu-auth/oauth-server/src/main/java/org/amdatu/auth/oauth/server/OAuthAccessTokenServlet.java
==============================================================================
---
/trunk/amdatu-auth/oauth-server/src/main/java/org/amdatu/authentication/oauth/server/OAuthAccessTokenServlet.java
(original)
+++
trunk/amdatu-auth/oauth-server/src/main/java/org/amdatu/auth/oauth/server/OAuthAccessTokenServlet.java
Fri Aug 5 08:58:55 2011
@@ -13,9 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.amdatu.authentication.oauth.server;
+package org.amdatu.auth.oauth.server;
+
+import org.amdatu.auth.oauth.server.osgi.Activator;
-import org.amdatu.authentication.oauth.server.osgi.Activator;
/**
* Represents the servlet that is responsible for generating OAuth access
tokens.
Modified:
trunk/amdatu-auth/oauth-server/src/main/java/org/amdatu/auth/oauth/server/OAuthAuthorizeTokenServlet.java
==============================================================================
---
/trunk/amdatu-auth/oauth-server/src/main/java/org/amdatu/authentication/oauth/server/OAuthAuthorizeTokenServlet.java
(original)
+++
trunk/amdatu-auth/oauth-server/src/main/java/org/amdatu/auth/oauth/server/OAuthAuthorizeTokenServlet.java
Fri Aug 5 08:58:55 2011
@@ -13,9 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.amdatu.authentication.oauth.server;
+package org.amdatu.auth.oauth.server;
+
+import org.amdatu.auth.oauth.server.osgi.Activator;
-import org.amdatu.authentication.oauth.server.osgi.Activator;
/**
* Represents the servlet that is responsible for authorizing OAuth request
tokens.
Modified:
trunk/amdatu-auth/oauth-server/src/main/java/org/amdatu/auth/oauth/server/OAuthNonceStorageProvider.java
==============================================================================
---
/trunk/amdatu-auth/oauth-server/src/main/java/org/amdatu/authentication/oauth/server/OAuthNonceStorageProvider.java
(original)
+++
trunk/amdatu-auth/oauth-server/src/main/java/org/amdatu/auth/oauth/server/OAuthNonceStorageProvider.java
Fri Aug 5 08:58:55 2011
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.amdatu.authentication.oauth.server;
+package org.amdatu.auth.oauth.server;
/**
* Pluggable nonce store.
Modified:
trunk/amdatu-auth/oauth-server/src/main/java/org/amdatu/auth/oauth/server/OAuthRequestTokenServlet.java
==============================================================================
---
/trunk/amdatu-auth/oauth-server/src/main/java/org/amdatu/authentication/oauth/server/OAuthRequestTokenServlet.java
(original)
+++
trunk/amdatu-auth/oauth-server/src/main/java/org/amdatu/auth/oauth/server/OAuthRequestTokenServlet.java
Fri Aug 5 08:58:55 2011
@@ -13,9 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.amdatu.authentication.oauth.server;
+package org.amdatu.auth.oauth.server;
+
+import org.amdatu.auth.oauth.server.osgi.Activator;
-import org.amdatu.authentication.oauth.server.osgi.Activator;
/**
* Represents the servlet that is responsible for generating OAuth request
tokens.
Modified:
trunk/amdatu-auth/oauth-server/src/main/java/org/amdatu/auth/oauth/server/OAuthServerConfig.java
==============================================================================
---
/trunk/amdatu-auth/oauth-server/src/main/java/org/amdatu/authentication/oauth/server/OAuthServerConfig.java
(original)
+++
trunk/amdatu-auth/oauth-server/src/main/java/org/amdatu/auth/oauth/server/OAuthServerConfig.java
Fri Aug 5 08:58:55 2011
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.amdatu.authentication.oauth.server;
+package org.amdatu.auth.oauth.server;
/**
* Holds the PID and property names of the configuration properties stored in
Config Admin.
Modified:
trunk/amdatu-auth/oauth-server/src/main/java/org/amdatu/auth/oauth/server/OAuthTokenProvider.java
==============================================================================
---
/trunk/amdatu-auth/oauth-server/src/main/java/org/amdatu/authentication/oauth/server/OAuthTokenProvider.java
(original)
+++
trunk/amdatu-auth/oauth-server/src/main/java/org/amdatu/auth/oauth/server/OAuthTokenProvider.java
Fri Aug 5 08:58:55 2011
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.amdatu.authentication.oauth.server;
+package org.amdatu.auth.oauth.server;
import net.oauth.OAuthConsumer;
import net.oauth.OAuthException;
Modified:
trunk/amdatu-auth/oauth-server/src/main/java/org/amdatu/auth/oauth/server/osgi/Activator.java
==============================================================================
---
/trunk/amdatu-auth/oauth-server/src/main/java/org/amdatu/authentication/oauth/server/osgi/Activator.java
(original)
+++
trunk/amdatu-auth/oauth-server/src/main/java/org/amdatu/auth/oauth/server/osgi/Activator.java
Fri Aug 5 08:58:55 2011
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.amdatu.authentication.oauth.server.osgi;
+package org.amdatu.auth.oauth.server.osgi;
import java.util.Dictionary;
import java.util.Hashtable;
@@ -22,20 +22,20 @@
import org.amdatu.auth.oauth.api.OAuthServiceProvider;
import org.amdatu.auth.oauth.consumerregistry.OAuthServiceConsumerRegistry;
-import org.amdatu.authentication.oauth.server.OAuthAccessTokenServlet;
-import org.amdatu.authentication.oauth.server.OAuthAuthorizeTokenServlet;
-import org.amdatu.authentication.oauth.server.OAuthNonceStorageProvider;
-import org.amdatu.authentication.oauth.server.OAuthRequestTokenServlet;
-import org.amdatu.authentication.oauth.server.OAuthServerConfig;
-import org.amdatu.authentication.oauth.server.OAuthTokenProvider;
-import
org.amdatu.authentication.oauth.server.service.OAuthResourceProviderImpl;
-import org.amdatu.authentication.oauth.server.service.OAuthServerConfiguration;
-import
org.amdatu.authentication.oauth.server.service.OAuthServerConfigurationImpl;
-import org.amdatu.authentication.oauth.server.service.OAuthServiceProviderImpl;
-import org.amdatu.authentication.oauth.server.service.OAuthTokenProviderImpl;
-import
org.amdatu.authentication.oauth.server.servlet.OAuthAccessTokenServletImpl;
-import
org.amdatu.authentication.oauth.server.servlet.OAuthAuthorizeTokenServletImpl;
-import
org.amdatu.authentication.oauth.server.servlet.OAuthRequestTokenServletImpl;
+import org.amdatu.auth.oauth.server.OAuthAccessTokenServlet;
+import org.amdatu.auth.oauth.server.OAuthAuthorizeTokenServlet;
+import org.amdatu.auth.oauth.server.OAuthNonceStorageProvider;
+import org.amdatu.auth.oauth.server.OAuthRequestTokenServlet;
+import org.amdatu.auth.oauth.server.OAuthServerConfig;
+import org.amdatu.auth.oauth.server.OAuthTokenProvider;
+import org.amdatu.auth.oauth.server.service.OAuthResourceProviderImpl;
+import org.amdatu.auth.oauth.server.service.OAuthServerConfiguration;
+import org.amdatu.auth.oauth.server.service.OAuthServerConfigurationImpl;
+import org.amdatu.auth.oauth.server.service.OAuthServiceProviderImpl;
+import org.amdatu.auth.oauth.server.service.OAuthTokenProviderImpl;
+import org.amdatu.auth.oauth.server.servlet.OAuthAccessTokenServletImpl;
+import org.amdatu.auth.oauth.server.servlet.OAuthAuthorizeTokenServletImpl;
+import org.amdatu.auth.oauth.server.servlet.OAuthRequestTokenServletImpl;
import org.amdatu.authentication.tokenprovider.TokenStorageProvider;
import org.amdatu.core.tenant.Tenant;
import org.amdatu.libraries.utilities.osgi.ServiceDependentActivator;
Modified:
trunk/amdatu-auth/oauth-server/src/main/java/org/amdatu/auth/oauth/server/service/OAuthResourceProviderImpl.java
==============================================================================
---
/trunk/amdatu-auth/oauth-server/src/main/java/org/amdatu/authentication/oauth/server/service/OAuthResourceProviderImpl.java
(original)
+++
trunk/amdatu-auth/oauth-server/src/main/java/org/amdatu/auth/oauth/server/service/OAuthResourceProviderImpl.java
Fri Aug 5 08:58:55 2011
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.amdatu.authentication.oauth.server.service;
+package org.amdatu.auth.oauth.server.service;
-import java.net.URL;
-
-import org.amdatu.authentication.oauth.server.osgi.Activator;
-import org.amdatu.web.httpcontext.ResourceProvider;
-import org.osgi.framework.BundleContext;
+import java.net.URL;
+
+import org.amdatu.auth.oauth.server.osgi.Activator;
+import org.amdatu.web.httpcontext.ResourceProvider;
+import org.osgi.framework.BundleContext;
public class OAuthResourceProviderImpl implements ResourceProvider {
Modified:
trunk/amdatu-auth/oauth-server/src/main/java/org/amdatu/auth/oauth/server/service/OAuthServerConfiguration.java
==============================================================================
---
/trunk/amdatu-auth/oauth-server/src/main/java/org/amdatu/authentication/oauth/server/service/OAuthServerConfiguration.java
(original)
+++
trunk/amdatu-auth/oauth-server/src/main/java/org/amdatu/auth/oauth/server/service/OAuthServerConfiguration.java
Fri Aug 5 08:58:55 2011
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.amdatu.authentication.oauth.server.service;
+package org.amdatu.auth.oauth.server.service;
/**
* Provides the OAuth server configuration. This interface is not published as
it should
Modified:
trunk/amdatu-auth/oauth-server/src/main/java/org/amdatu/auth/oauth/server/service/OAuthServerConfigurationImpl.java
==============================================================================
---
/trunk/amdatu-auth/oauth-server/src/main/java/org/amdatu/authentication/oauth/server/service/OAuthServerConfigurationImpl.java
(original)
+++
trunk/amdatu-auth/oauth-server/src/main/java/org/amdatu/auth/oauth/server/service/OAuthServerConfigurationImpl.java
Fri Aug 5 08:58:55 2011
@@ -13,15 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.amdatu.authentication.oauth.server.service;
+package org.amdatu.auth.oauth.server.service;
-import static
org.amdatu.authentication.oauth.server.OAuthServerConfig.ACCESS_TOKEN_MAXAGE;
-import static
org.amdatu.authentication.oauth.server.OAuthServerConfig.ACCESS_TOKEN_TIMEOUT;
-import static
org.amdatu.authentication.oauth.server.OAuthServerConfig.AUTHORIZE_URL;
-import static
org.amdatu.authentication.oauth.server.OAuthServerConfig.HOSTNAME;
-import static org.amdatu.authentication.oauth.server.OAuthServerConfig.PORTNR;
-import static
org.amdatu.authentication.oauth.server.OAuthServerConfig.REQUEST_TIMESTAMP_AGE;
-import static
org.amdatu.authentication.oauth.server.OAuthServerConfig.REQUEST_TOKEN_MAXAGE;
+import static
org.amdatu.auth.oauth.server.OAuthServerConfig.ACCESS_TOKEN_MAXAGE;
+import static
org.amdatu.auth.oauth.server.OAuthServerConfig.ACCESS_TOKEN_TIMEOUT;
+import static org.amdatu.auth.oauth.server.OAuthServerConfig.AUTHORIZE_URL;
+import static org.amdatu.auth.oauth.server.OAuthServerConfig.HOSTNAME;
+import static org.amdatu.auth.oauth.server.OAuthServerConfig.PORTNR;
+import static
org.amdatu.auth.oauth.server.OAuthServerConfig.REQUEST_TIMESTAMP_AGE;
+import static
org.amdatu.auth.oauth.server.OAuthServerConfig.REQUEST_TOKEN_MAXAGE;
import java.util.Dictionary;
Modified:
trunk/amdatu-auth/oauth-server/src/main/java/org/amdatu/auth/oauth/server/service/OAuthServerUtil.java
==============================================================================
---
/trunk/amdatu-auth/oauth-server/src/main/java/org/amdatu/authentication/oauth/server/service/OAuthServerUtil.java
(original)
+++
trunk/amdatu-auth/oauth-server/src/main/java/org/amdatu/auth/oauth/server/service/OAuthServerUtil.java
Fri Aug 5 08:58:55 2011
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.amdatu.authentication.oauth.server.service;
+package org.amdatu.auth.oauth.server.service;
import java.io.IOException;
Modified:
trunk/amdatu-auth/oauth-server/src/main/java/org/amdatu/auth/oauth/server/service/OAuthServiceProviderImpl.java
==============================================================================
---
/trunk/amdatu-auth/oauth-server/src/main/java/org/amdatu/authentication/oauth/server/service/OAuthServiceProviderImpl.java
(original)
+++
trunk/amdatu-auth/oauth-server/src/main/java/org/amdatu/auth/oauth/server/service/OAuthServiceProviderImpl.java
Fri Aug 5 08:58:55 2011
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.amdatu.authentication.oauth.server.service;
+package org.amdatu.auth.oauth.server.service;
import org.amdatu.auth.oauth.api.OAuthServiceProvider;
-import org.amdatu.authentication.oauth.server.OAuthAccessTokenServlet;
-import org.amdatu.authentication.oauth.server.OAuthAuthorizeTokenServlet;
-import org.amdatu.authentication.oauth.server.OAuthRequestTokenServlet;
+import org.amdatu.auth.oauth.server.OAuthAccessTokenServlet;
+import org.amdatu.auth.oauth.server.OAuthAuthorizeTokenServlet;
+import org.amdatu.auth.oauth.server.OAuthRequestTokenServlet;
import org.osgi.service.log.LogService;
public class OAuthServiceProviderImpl implements OAuthServiceProvider {
Modified:
trunk/amdatu-auth/oauth-server/src/main/java/org/amdatu/auth/oauth/server/service/OAuthTokenProviderImpl.java
==============================================================================
---
/trunk/amdatu-auth/oauth-server/src/main/java/org/amdatu/authentication/oauth/server/service/OAuthTokenProviderImpl.java
(original)
+++
trunk/amdatu-auth/oauth-server/src/main/java/org/amdatu/auth/oauth/server/service/OAuthTokenProviderImpl.java
Fri Aug 5 08:58:55 2011
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.amdatu.authentication.oauth.server.service;
+package org.amdatu.auth.oauth.server.service;
import java.io.IOException;
import java.math.BigInteger;
@@ -31,8 +31,8 @@
import org.amdatu.auth.oauth.api.OAuthServiceConsumer;
import org.amdatu.auth.oauth.api.OAuthServiceProvider;
import org.amdatu.auth.oauth.consumerregistry.OAuthServiceConsumerRegistry;
-import org.amdatu.authentication.oauth.server.OAuthNonceStorageProvider;
-import org.amdatu.authentication.oauth.server.OAuthTokenProvider;
+import org.amdatu.auth.oauth.server.OAuthNonceStorageProvider;
+import org.amdatu.auth.oauth.server.OAuthTokenProvider;
import org.amdatu.authentication.tokenprovider.Token;
import org.amdatu.authentication.tokenprovider.TokenStorageProvider;
import org.amdatu.core.tenant.Tenant;
Modified:
trunk/amdatu-auth/oauth-server/src/main/java/org/amdatu/auth/oauth/server/service/PluggableOAuthValidator.java
==============================================================================
---
/trunk/amdatu-auth/oauth-server/src/main/java/org/amdatu/authentication/oauth/server/service/PluggableOAuthValidator.java
(original)
+++
trunk/amdatu-auth/oauth-server/src/main/java/org/amdatu/auth/oauth/server/service/PluggableOAuthValidator.java
Fri Aug 5 08:58:55 2011
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.amdatu.authentication.oauth.server.service;
+package org.amdatu.auth.oauth.server.service;
import java.io.IOException;
import java.net.URISyntaxException;
@@ -33,7 +33,7 @@
import net.oauth.OAuthValidator;
import net.oauth.signature.OAuthSignatureMethod;
-import org.amdatu.authentication.oauth.server.OAuthNonceStorageProvider;
+import org.amdatu.auth.oauth.server.OAuthNonceStorageProvider;
public class PluggableOAuthValidator implements OAuthValidator {
Modified:
trunk/amdatu-auth/oauth-server/src/main/java/org/amdatu/auth/oauth/server/servlet/OAuthAccessTokenServletImpl.java
==============================================================================
---
/trunk/amdatu-auth/oauth-server/src/main/java/org/amdatu/authentication/oauth/server/servlet/OAuthAccessTokenServletImpl.java
(original)
+++
trunk/amdatu-auth/oauth-server/src/main/java/org/amdatu/auth/oauth/server/servlet/OAuthAccessTokenServletImpl.java
Fri Aug 5 08:58:55 2011
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.amdatu.authentication.oauth.server.servlet;
+package org.amdatu.auth.oauth.server.servlet;
import java.io.IOException;
import java.io.OutputStream;
@@ -27,9 +27,9 @@
import net.oauth.OAuthMessage;
import net.oauth.server.OAuthServlet;
-import org.amdatu.authentication.oauth.server.OAuthAccessTokenServlet;
-import org.amdatu.authentication.oauth.server.OAuthTokenProvider;
-import org.amdatu.authentication.oauth.server.service.OAuthServerUtil;
+import org.amdatu.auth.oauth.server.OAuthAccessTokenServlet;
+import org.amdatu.auth.oauth.server.OAuthTokenProvider;
+import org.amdatu.auth.oauth.server.service.OAuthServerUtil;
import org.amdatu.authentication.tokenprovider.Token;
import org.amdatu.core.tenant.Tenant;
import org.apache.felix.dm.Component;
Modified:
trunk/amdatu-auth/oauth-server/src/main/java/org/amdatu/auth/oauth/server/servlet/OAuthAuthorizeTokenServletImpl.java
==============================================================================
---
/trunk/amdatu-auth/oauth-server/src/main/java/org/amdatu/authentication/oauth/server/servlet/OAuthAuthorizeTokenServletImpl.java
(original)
+++
trunk/amdatu-auth/oauth-server/src/main/java/org/amdatu/auth/oauth/server/servlet/OAuthAuthorizeTokenServletImpl.java
Fri Aug 5 08:58:55 2011
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.amdatu.authentication.oauth.server.servlet;
+package org.amdatu.auth.oauth.server.servlet;
import java.io.IOException;
import java.util.Map;
@@ -30,10 +30,10 @@
import net.oauth.server.OAuthServlet;
import org.amdatu.auth.oauth.api.OAuthServiceProvider;
-import org.amdatu.authentication.oauth.server.OAuthAuthorizeTokenServlet;
-import org.amdatu.authentication.oauth.server.OAuthTokenProvider;
-import org.amdatu.authentication.oauth.server.service.OAuthServerUtil;
-import org.amdatu.authentication.oauth.server.service.OAuthServiceProviderImpl;
+import org.amdatu.auth.oauth.server.OAuthAuthorizeTokenServlet;
+import org.amdatu.auth.oauth.server.OAuthTokenProvider;
+import org.amdatu.auth.oauth.server.service.OAuthServerUtil;
+import org.amdatu.auth.oauth.server.service.OAuthServiceProviderImpl;
import org.amdatu.authentication.tokenprovider.InvalidTokenException;
import org.amdatu.authentication.tokenprovider.Token;
import org.amdatu.authentication.tokenprovider.TokenProvider;
Modified:
trunk/amdatu-auth/oauth-server/src/main/java/org/amdatu/auth/oauth/server/servlet/OAuthRequestTokenServletImpl.java
==============================================================================
---
/trunk/amdatu-auth/oauth-server/src/main/java/org/amdatu/authentication/oauth/server/servlet/OAuthRequestTokenServletImpl.java
(original)
+++
trunk/amdatu-auth/oauth-server/src/main/java/org/amdatu/auth/oauth/server/servlet/OAuthRequestTokenServletImpl.java
Fri Aug 5 08:58:55 2011
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.amdatu.authentication.oauth.server.servlet;
+package org.amdatu.auth.oauth.server.servlet;
import java.io.IOException;
import java.io.OutputStream;
@@ -27,9 +27,9 @@
import net.oauth.OAuthConsumer;
import net.oauth.OAuthMessage;
-import org.amdatu.authentication.oauth.server.OAuthRequestTokenServlet;
-import org.amdatu.authentication.oauth.server.OAuthTokenProvider;
-import org.amdatu.authentication.oauth.server.service.OAuthServerUtil;
+import org.amdatu.auth.oauth.server.OAuthRequestTokenServlet;
+import org.amdatu.auth.oauth.server.OAuthTokenProvider;
+import org.amdatu.auth.oauth.server.service.OAuthServerUtil;
import org.amdatu.authentication.tokenprovider.Token;
import org.amdatu.core.tenant.Tenant;
import org.apache.felix.dm.Component;
Modified: trunk/amdatu-auth/oauth-stores/consumer-store-fs/pom.xml
==============================================================================
--- trunk/amdatu-auth/oauth-stores/consumer-store-fs/pom.xml (original)
+++ trunk/amdatu-auth/oauth-stores/consumer-store-fs/pom.xml Fri Aug 5
08:58:55 2011
@@ -62,11 +62,11 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
-
<Bundle-Activator>org.amdatu.authentication.oauth.consumerregistry.fs.osgi.Activator</Bundle-Activator>
+
<Bundle-Activator>org.amdatu.auth.oauth.consumerregistry.fs.osgi.Activator</Bundle-Activator>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Embed-Dependency>*;scope=compile</Embed-Dependency>
<Import-Package>
- org.amdatu.authentication.oauth.api;version="[1.0,1.1)",
+ org.amdatu.auth.oauth.api;version="[1.0,1.1)",
*
</Import-Package>
<Export-Package></Export-Package>
Modified: trunk/amdatu-auth/oauth-stores/nonce-store-mem/pom.xml
==============================================================================
--- trunk/amdatu-auth/oauth-stores/nonce-store-mem/pom.xml (original)
+++ trunk/amdatu-auth/oauth-stores/nonce-store-mem/pom.xml Fri Aug 5
08:58:55 2011
@@ -46,11 +46,11 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
-
<Bundle-Activator>org.amdatu.oauth.store.nonce.mem.osgi.Activator</Bundle-Activator>
+
<Bundle-Activator>org.amdatu.auth.oauth.store.nonce.mem.osgi.Activator</Bundle-Activator>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Embed-Dependency>*;scope=compile</Embed-Dependency>
<Import-Package>
- org.amdatu.authentication.oauth.server,
+ org.amdatu.auth.oauth.server,
*
</Import-Package>
<Export-Package></Export-Package>
Modified: trunk/amdatu-auth/tokenprovider/pom.xml
==============================================================================
--- trunk/amdatu-auth/tokenprovider/pom.xml (original)
+++ trunk/amdatu-auth/tokenprovider/pom.xml Fri Aug 5 08:58:55 2011
@@ -57,10 +57,10 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
-
<Bundle-Activator>org.amdatu.authentication.tokenprovider.osgi.Activator</Bundle-Activator>
+
<Bundle-Activator>org.amdatu.auth.tokenprovider.osgi.Activator</Bundle-Activator>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Export-Package>
- org.amdatu.authentication.tokenprovider;version="1.0.0"
+ org.amdatu.auth.tokenprovider;version="1.0.0"
</Export-Package>
<Embed-Dependency>*;scope=compile</Embed-Dependency>
<DynamicImport-Package>
Modified: trunk/amdatu-auth/tokenstore-mem/pom.xml
==============================================================================
--- trunk/amdatu-auth/tokenstore-mem/pom.xml (original)
+++ trunk/amdatu-auth/tokenstore-mem/pom.xml Fri Aug 5 08:58:55 2011
@@ -42,10 +42,10 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
-
<Bundle-Activator>org.amdatu.authentication.tokenstore.mem.osgi.Activator</Bundle-Activator>
+
<Bundle-Activator>org.amdatu.auth.tokenstore.mem.osgi.Activator</Bundle-Activator>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Import-Package>
- org.amdatu.authentication.tokenprovider;version="[1.0,1.1)",
+ org.amdatu.auth.tokenprovider;version="[1.0,1.1)",
*
</Import-Package>
<Export-Package></Export-Package>
Modified: trunk/amdatu-auth/useradmin-gadget/pom.xml
==============================================================================
--- trunk/amdatu-auth/useradmin-gadget/pom.xml (original)
+++ trunk/amdatu-auth/useradmin-gadget/pom.xml Fri Aug 5 08:58:55 2011
@@ -81,7 +81,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
-
<Bundle-Activator>org.amdatu.authorization.useradmin.gadget.osgi.Activator</Bundle-Activator>
+
<Bundle-Activator>org.amdatu.auth.useradmin.gadget.osgi.Activator</Bundle-Activator>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Embed-Dependency>*;scope=compile</Embed-Dependency>
<Import-Package>
Modified: trunk/amdatu-auth/useradmin-rest/pom.xml
==============================================================================
--- trunk/amdatu-auth/useradmin-rest/pom.xml (original)
+++ trunk/amdatu-auth/useradmin-rest/pom.xml Fri Aug 5 08:58:55 2011
@@ -86,15 +86,15 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
-
<Bundle-Activator>org.amdatu.authorization.useradmin.rest.osgi.Activator</Bundle-Activator>
+
<Bundle-Activator>org.amdatu.auth.useradmin.rest.osgi.Activator</Bundle-Activator>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-
<Private-Package>org.amdatu.authorization.useradmin.rest.*,org.apache.wink.common.internal.uri</Private-Package>
+
<Private-Package>org.amdatu.auth.useradmin.rest.*,org.apache.wink.common.internal.uri</Private-Package>
<Embed-Dependency>json,org.amdatu.libraries.utilities;scope=compile</Embed-Dependency>
<Export-Package>
!*
</Export-Package>
<Import-Package>
- org.amdatu.authentication.tokenprovider;version="[1.0,2.0)",
+ org.amdatu.auth.tokenprovider;version="[1.0,2.0)",
!org.apache.wink.common.internal.*,
*
</Import-Package>
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
