Author: [email protected]
Date: Fri Aug 5 09:30:48 2011
New Revision: 1254
Log:
[AMDATUAUTH-77] refactoring package names, artifact ids - part 6
Removed:
trunk/amdatu-auth/oauth-stores/nonce-store-mem/src/test/java/org/amdatu/auth/test/
Modified:
trunk/amdatu-auth/login-gadget/src/main/java/org/amdatu/auth/login/gadget/osgi/Activator.java
trunk/amdatu-auth/login-service/src/main/java/org/amdatu/auth/login/service/service/LoginServiceImpl.java
trunk/amdatu-auth/oauth-consumerregistry/src/main/java/org/amdatu/auth/oauth/consumerregistry/service/OAuthServiceConsumerRegistryRESTImpl.java
trunk/amdatu-auth/oauth-example/src/main/java/org/amdatu/auth/example/oauth/service/OAuthProtectedResource.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/OAuthTokenProviderImpl.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/src/main/java/org/amdatu/auth/oauth/consumerregistry/fs/internal/FSConsumerEntity.java
trunk/amdatu-auth/oauth-stores/consumer-store-fs/src/main/java/org/amdatu/auth/oauth/consumerregistry/fs/internal/FSConsumerStorage.java
trunk/amdatu-auth/oauth-stores/consumer-store-fs/src/main/java/org/amdatu/auth/oauth/consumerregistry/fs/internal/FSConsumerStore.java
trunk/amdatu-auth/oauth-stores/consumer-store-fs/src/main/java/org/amdatu/auth/oauth/consumerregistry/fs/osgi/Activator.java
trunk/amdatu-auth/oauth-stores/consumer-store-fs/src/main/java/org/amdatu/auth/oauth/consumerregistry/fs/service/FSConsumerRegistryImpl.java
trunk/amdatu-auth/oauth-stores/consumer-store-fs/src/test/java/org/amdatu/auth/oauth/consumerregistry/fs/service/FSConsumerRegistryImplTest.java
trunk/amdatu-auth/pom.xml
trunk/amdatu-auth/test-integration/base/src/main/java/org/amdatu/auth/test/integration/base/AuthFixture.java
trunk/amdatu-auth/test-integration/tests/src/test/java/org/amdatu/auth/test/integration/tests/util/AuthUtils.java
trunk/amdatu-auth/test-integration/tests/src/test/java/org/amdatu/auth/test/integration/tests/util/OAuthProtectedTestServlet.java
trunk/amdatu-auth/useradmin-gadget/src/main/java/org/amdatu/auth/useradmin/gadget/osgi/Activator.java
trunk/amdatu-auth/useradmin-gadget/src/main/java/org/amdatu/auth/useradmin/gadget/service/UserAdminGadgetImpl.java
trunk/amdatu-auth/useradmin-rest/src/test/java/org/amdatu/auth/test/unit/useradmin/rest/UserAdminSearchResultsTest.java
Modified:
trunk/amdatu-auth/login-gadget/src/main/java/org/amdatu/auth/login/gadget/osgi/Activator.java
==============================================================================
---
trunk/amdatu-auth/login-gadget/src/main/java/org/amdatu/auth/login/gadget/osgi/Activator.java
(original)
+++
trunk/amdatu-auth/login-gadget/src/main/java/org/amdatu/auth/login/gadget/osgi/Activator.java
Fri Aug 5 09:30:48 2011
@@ -18,8 +18,8 @@
import java.util.Dictionary;
import java.util.Hashtable;
-import org.amdatu.authorization.login.gadget.service.LoginGadgetImpl;
-import org.amdatu.authorization.login.service.LoginService;
+import org.amdatu.auth.login.gadget.service.LoginGadgetImpl;
+import org.amdatu.auth.login.service.LoginService;
import org.amdatu.opensocial.gadgetmanagement.GadgetManagement;
import org.amdatu.web.dispatcher.DispatcherService;
import org.amdatu.web.httpcontext.ResourceProvider;
Modified:
trunk/amdatu-auth/login-service/src/main/java/org/amdatu/auth/login/service/service/LoginServiceImpl.java
==============================================================================
---
trunk/amdatu-auth/login-service/src/main/java/org/amdatu/auth/login/service/service/LoginServiceImpl.java
(original)
+++
trunk/amdatu-auth/login-service/src/main/java/org/amdatu/auth/login/service/service/LoginServiceImpl.java
Fri Aug 5 09:30:48 2011
@@ -36,9 +36,9 @@
import javax.ws.rs.core.Response.ResponseBuilder;
import org.amdatu.auth.login.service.LoginService;
-import org.amdatu.authentication.tokenprovider.InvalidTokenException;
-import org.amdatu.authentication.tokenprovider.TokenProvider;
-import org.amdatu.authentication.tokenprovider.TokenProviderException;
+import org.amdatu.auth.tokenprovider.InvalidTokenException;
+import org.amdatu.auth.tokenprovider.TokenProvider;
+import org.amdatu.auth.tokenprovider.TokenProviderException;
import org.amdatu.core.tenant.Tenant;
import org.amdatu.core.tenant.TenantException;
import org.amdatu.core.tenant.TenantManagementService;
Modified:
trunk/amdatu-auth/oauth-consumerregistry/src/main/java/org/amdatu/auth/oauth/consumerregistry/service/OAuthServiceConsumerRegistryRESTImpl.java
==============================================================================
---
trunk/amdatu-auth/oauth-consumerregistry/src/main/java/org/amdatu/auth/oauth/consumerregistry/service/OAuthServiceConsumerRegistryRESTImpl.java
(original)
+++
trunk/amdatu-auth/oauth-consumerregistry/src/main/java/org/amdatu/auth/oauth/consumerregistry/service/OAuthServiceConsumerRegistryRESTImpl.java
Fri Aug 5 09:30:48 2011
@@ -47,9 +47,9 @@
import org.amdatu.auth.oauth.consumerregistry.bean.ConsumerBean;
import org.amdatu.auth.oauth.consumerregistry.bean.ConsumersBean;
import org.amdatu.auth.oauth.consumerregistry.bean.ResultBean;
-import org.amdatu.authentication.tokenprovider.InvalidTokenException;
-import org.amdatu.authentication.tokenprovider.TokenProvider;
-import org.amdatu.authentication.tokenprovider.TokenProviderException;
+import org.amdatu.auth.tokenprovider.InvalidTokenException;
+import org.amdatu.auth.tokenprovider.TokenProvider;
+import org.amdatu.auth.tokenprovider.TokenProviderException;
import org.amdatu.core.tenant.Tenant;
import org.apache.felix.dm.Component;
import org.apache.felix.dm.DependencyManager;
Modified:
trunk/amdatu-auth/oauth-example/src/main/java/org/amdatu/auth/example/oauth/service/OAuthProtectedResource.java
==============================================================================
---
trunk/amdatu-auth/oauth-example/src/main/java/org/amdatu/auth/example/oauth/service/OAuthProtectedResource.java
(original)
+++
trunk/amdatu-auth/oauth-example/src/main/java/org/amdatu/auth/example/oauth/service/OAuthProtectedResource.java
Fri Aug 5 09:30:48 2011
@@ -33,7 +33,7 @@
import net.oauth.server.OAuthServlet;
import org.amdatu.auth.oauth.server.OAuthTokenProvider;
-import org.amdatu.authentication.tokenprovider.Token;
+import org.amdatu.auth.tokenprovider.Token;
/**
* Full path to this resource becomes: /rest/resource
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/auth/oauth/server/OAuthServerConfig.java
(original)
+++
trunk/amdatu-auth/oauth-server/src/main/java/org/amdatu/auth/oauth/server/OAuthServerConfig.java
Fri Aug 5 09:30:48 2011
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2010, 2011 The Amdatu Foundation
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@@ -17,14 +17,14 @@
/**
* Holds the PID and property names of the configuration properties stored in
Config Admin.
- *
+ *
* @author ivol
*/
public final class OAuthServerConfig {
/**
* The PID of the configuration of this service.
*/
- public static final String PID = "org.amdatu.authentication.oauth.server";
+ public static final String PID = "org.amdatu.auth.oauth.server";
/**
* The hostname property name of the configuration properties.
@@ -44,12 +44,12 @@
* an Amdatu account and the request token must be submitted to the
authorize token servlet.
*/
public static final String AUTHORIZE_URL = "authorizeurl";
-
+
/**
* The lifetime of an OAuth request is limited to request.timestamp.maxage.
* This defines the maximum amount of time between the signing of an OAuth
* request (at which point the oauth_timestamp is added to it) and the
- * receipt of the request.
+ * receipt of the request.
* Defaults to 300000 (5 minutes).
*/
public static final String REQUEST_TIMESTAMP_AGE =
"request.timestamp.maxage";
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/auth/oauth/server/OAuthTokenProvider.java
(original)
+++
trunk/amdatu-auth/oauth-server/src/main/java/org/amdatu/auth/oauth/server/OAuthTokenProvider.java
Fri Aug 5 09:30:48 2011
@@ -20,7 +20,7 @@
import net.oauth.OAuthMessage;
import net.oauth.OAuthProblemException;
-import org.amdatu.authentication.tokenprovider.Token;
+import org.amdatu.auth.tokenprovider.Token;
/**
* Interface of an oAuth token provider. A oAuth token provider provides
request and access tokens and facilitates
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/auth/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 09:30:48 2011
@@ -36,7 +36,7 @@
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.auth.tokenprovider.TokenStorageProvider;
import org.amdatu.core.tenant.Tenant;
import org.amdatu.libraries.utilities.osgi.ServiceDependentActivator;
import org.amdatu.web.dispatcher.DispatcherService;
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/auth/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 09:30:48 2011
@@ -33,8 +33,8 @@
import org.amdatu.auth.oauth.consumerregistry.OAuthServiceConsumerRegistry;
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.auth.tokenprovider.Token;
+import org.amdatu.auth.tokenprovider.TokenStorageProvider;
import org.amdatu.core.tenant.Tenant;
import org.apache.felix.dm.Component;
import org.osgi.service.log.LogService;
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/auth/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 09:30:48 2011
@@ -30,7 +30,7 @@
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.auth.tokenprovider.Token;
import org.amdatu.core.tenant.Tenant;
import org.apache.felix.dm.Component;
import org.osgi.service.log.LogService;
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/auth/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 09:30:48 2011
@@ -34,10 +34,10 @@
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;
-import org.amdatu.authentication.tokenprovider.TokenProviderException;
+import org.amdatu.auth.tokenprovider.InvalidTokenException;
+import org.amdatu.auth.tokenprovider.Token;
+import org.amdatu.auth.tokenprovider.TokenProvider;
+import org.amdatu.auth.tokenprovider.TokenProviderException;
import org.amdatu.core.tenant.Tenant;
import org.apache.felix.dm.Component;
import org.apache.felix.dm.DependencyManager;
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/auth/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 09:30:48 2011
@@ -30,7 +30,7 @@
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.auth.tokenprovider.Token;
import org.amdatu.core.tenant.Tenant;
import org.apache.felix.dm.Component;
import org.osgi.service.log.LogService;
Modified:
trunk/amdatu-auth/oauth-stores/consumer-store-fs/src/main/java/org/amdatu/auth/oauth/consumerregistry/fs/internal/FSConsumerEntity.java
==============================================================================
---
trunk/amdatu-auth/oauth-stores/consumer-store-fs/src/main/java/org/amdatu/auth/oauth/consumerregistry/fs/internal/FSConsumerEntity.java
(original)
+++
trunk/amdatu-auth/oauth-stores/consumer-store-fs/src/main/java/org/amdatu/auth/oauth/consumerregistry/fs/internal/FSConsumerEntity.java
Fri Aug 5 09:30:48 2011
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.amdatu.authentication.oauth.consumerregistry.fs.internal;
+package org.amdatu.auth.oauth.consumerregistry.fs.internal;
import java.util.ArrayList;
import java.util.List;
Modified:
trunk/amdatu-auth/oauth-stores/consumer-store-fs/src/main/java/org/amdatu/auth/oauth/consumerregistry/fs/internal/FSConsumerStorage.java
==============================================================================
---
trunk/amdatu-auth/oauth-stores/consumer-store-fs/src/main/java/org/amdatu/auth/oauth/consumerregistry/fs/internal/FSConsumerStorage.java
(original)
+++
trunk/amdatu-auth/oauth-stores/consumer-store-fs/src/main/java/org/amdatu/auth/oauth/consumerregistry/fs/internal/FSConsumerStorage.java
Fri Aug 5 09:30:48 2011
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.amdatu.authentication.oauth.consumerregistry.fs.internal;
+package org.amdatu.auth.oauth.consumerregistry.fs.internal;
-import java.io.File;
-import java.io.IOException;
-
-import org.amdatu.libraries.fsstorage.FSStorageBase;
+import java.io.File;
+import java.io.IOException;
+
+import org.amdatu.libraries.fsstorage.FSStorageBase;
public class FSConsumerStorage extends FSStorageBase<FSConsumerStore,
FSConsumerEntity> {
Modified:
trunk/amdatu-auth/oauth-stores/consumer-store-fs/src/main/java/org/amdatu/auth/oauth/consumerregistry/fs/internal/FSConsumerStore.java
==============================================================================
---
trunk/amdatu-auth/oauth-stores/consumer-store-fs/src/main/java/org/amdatu/auth/oauth/consumerregistry/fs/internal/FSConsumerStore.java
(original)
+++
trunk/amdatu-auth/oauth-stores/consumer-store-fs/src/main/java/org/amdatu/auth/oauth/consumerregistry/fs/internal/FSConsumerStore.java
Fri Aug 5 09:30:48 2011
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.amdatu.authentication.oauth.consumerregistry.fs.internal;
+package org.amdatu.auth.oauth.consumerregistry.fs.internal;
import java.io.File;
import java.io.IOException;
Modified:
trunk/amdatu-auth/oauth-stores/consumer-store-fs/src/main/java/org/amdatu/auth/oauth/consumerregistry/fs/osgi/Activator.java
==============================================================================
---
trunk/amdatu-auth/oauth-stores/consumer-store-fs/src/main/java/org/amdatu/auth/oauth/consumerregistry/fs/osgi/Activator.java
(original)
+++
trunk/amdatu-auth/oauth-stores/consumer-store-fs/src/main/java/org/amdatu/auth/oauth/consumerregistry/fs/osgi/Activator.java
Fri Aug 5 09:30:48 2011
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.amdatu.authentication.oauth.consumerregistry.fs.osgi;
+package org.amdatu.auth.oauth.consumerregistry.fs.osgi;
import org.amdatu.auth.oauth.consumerregistry.OAuthServiceConsumerRegistry;
-import
org.amdatu.authentication.oauth.consumerregistry.fs.service.FSConsumerRegistryImpl;
+import
org.amdatu.auth.oauth.consumerregistry.fs.service.FSConsumerRegistryImpl;
import org.amdatu.core.tenant.Tenant;
import org.apache.felix.dm.DependencyActivatorBase;
import org.apache.felix.dm.DependencyManager;
Modified:
trunk/amdatu-auth/oauth-stores/consumer-store-fs/src/main/java/org/amdatu/auth/oauth/consumerregistry/fs/service/FSConsumerRegistryImpl.java
==============================================================================
---
trunk/amdatu-auth/oauth-stores/consumer-store-fs/src/main/java/org/amdatu/auth/oauth/consumerregistry/fs/service/FSConsumerRegistryImpl.java
(original)
+++
trunk/amdatu-auth/oauth-stores/consumer-store-fs/src/main/java/org/amdatu/auth/oauth/consumerregistry/fs/service/FSConsumerRegistryImpl.java
Fri Aug 5 09:30:48 2011
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2010, 2011 The Amdatu Foundation
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.amdatu.authentication.oauth.consumerregistry.fs.service;
+package org.amdatu.auth.oauth.consumerregistry.fs.service;
import java.io.File;
import java.io.IOException;
@@ -29,8 +29,8 @@
import org.amdatu.auth.oauth.api.ConsumerRegistryStorageException;
import org.amdatu.auth.oauth.api.OAuthServiceConsumer;
import org.amdatu.auth.oauth.consumerregistry.OAuthServiceConsumerRegistry;
-import
org.amdatu.authentication.oauth.consumerregistry.fs.internal.FSConsumerEntity;
-import
org.amdatu.authentication.oauth.consumerregistry.fs.internal.FSConsumerStorage;
+import org.amdatu.auth.oauth.consumerregistry.fs.internal.FSConsumerEntity;
+import org.amdatu.auth.oauth.consumerregistry.fs.internal.FSConsumerStorage;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Filter;
import org.osgi.framework.InvalidSyntaxException;
@@ -42,7 +42,7 @@
/**
* Configuration PID.
*/
- public static final String CONFIGURATION_PID =
"org.amdatu.authentication.oauth.consumerregistry.fs";
+ public static final String CONFIGURATION_PID =
"org.amdatu.auth.oauth.consumerregistry.fs";
/**
* Configuration property name holding the data directory.
@@ -53,14 +53,14 @@
private volatile LogService m_logService;
private volatile BundleContext m_context;
private FSConsumerStorage m_storage;
-
+
public void start() {
m_logService.log(LogService.LOG_DEBUG, "FSConsumerRegistryImpl service
started");
}
/**
* Invoked since this is a managed service.
- *
+ *
* @param dictionary
* Dictionary holding the configuration properties
* @throws ConfigurationException
Modified:
trunk/amdatu-auth/oauth-stores/consumer-store-fs/src/test/java/org/amdatu/auth/oauth/consumerregistry/fs/service/FSConsumerRegistryImplTest.java
==============================================================================
---
trunk/amdatu-auth/oauth-stores/consumer-store-fs/src/test/java/org/amdatu/auth/oauth/consumerregistry/fs/service/FSConsumerRegistryImplTest.java
(original)
+++
trunk/amdatu-auth/oauth-stores/consumer-store-fs/src/test/java/org/amdatu/auth/oauth/consumerregistry/fs/service/FSConsumerRegistryImplTest.java
Fri Aug 5 09:30:48 2011
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2010, 2011 The Amdatu Foundation
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.amdatu.authentication.oauth.consumerregistry.fs.service;
+package org.amdatu.auth.oauth.consumerregistry.fs.service;
import java.io.File;
import java.util.HashMap;
@@ -25,7 +25,7 @@
import org.amdatu.auth.oauth.api.ConsumerNotFoundException;
import org.amdatu.auth.oauth.api.ConsumerRegistryStorageException;
import org.amdatu.auth.oauth.api.OAuthServiceConsumer;
-import
org.amdatu.authentication.oauth.consumerregistry.fs.internal.FSConsumerEntity;
+import org.amdatu.auth.oauth.consumerregistry.fs.internal.FSConsumerEntity;
import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
Modified: trunk/amdatu-auth/pom.xml
==============================================================================
--- trunk/amdatu-auth/pom.xml (original)
+++ trunk/amdatu-auth/pom.xml Fri Aug 5 09:30:48 2011
@@ -269,6 +269,7 @@
<module>oauth-api</module>
<module>oauth-client</module>
<module>oauth-consumerregistry</module>
+ <module>oauth-example</module>
<module>oauth-server</module>
<module>oauth-stores</module>
<module>release</module>
@@ -327,7 +328,7 @@
<configuration>
<show>public</show>
<detectOfflineLinks>false</detectOfflineLinks>
-
<excludePackageNames>org.amdatu.authorization.login.gadget.*:org.amdatu.authorization.login.service.*:org.amdatu.authentication.oauth.api.*:org.amdatu.authentication.oauth.client.*:org.amdatu.authentication.oauth.consumerregistry.fs.*:org.amdatu.authentication.oauth.server.*:org.amdatu.authentication.tokenprovider.*:org.amdatu.authentication.tokenstore.mem.*:org.amdatu.authorization.useradmin.gadget.*:org.amdatu.authorization.useradmin.rest.*</excludePackageNames>
+
<excludePackageNames>org.amdatu.auth.login.gadget.*:org.amdatu.auth.login.service.*:org.amdatu.auth.oauth.api.*:org.amdatu.auth.oauth.client.*:org.amdatu.auth.oauth.consumerregistry.fs.*:org.amdatu.auth.oauth.server.*:org.amdatu.auth.tokenprovider.*:org.amdatu.auth.tokenstore.mem.*:org.amdatu.auth.useradmin.gadget.*:org.amdatu.auth.useradmin.rest.*</excludePackageNames>
</configuration>
<executions>
<execution>
Modified:
trunk/amdatu-auth/test-integration/base/src/main/java/org/amdatu/auth/test/integration/base/AuthFixture.java
==============================================================================
---
trunk/amdatu-auth/test-integration/base/src/main/java/org/amdatu/auth/test/integration/base/AuthFixture.java
(original)
+++
trunk/amdatu-auth/test-integration/base/src/main/java/org/amdatu/auth/test/integration/base/AuthFixture.java
Fri Aug 5 09:30:48 2011
@@ -28,7 +28,7 @@
public static final String HOSTNAME = "localhost";
public final static String IP = "127.0.0.1";
public static final String PORTNR = "8080";
-
+
public Option provision() {
return org.ops4j.pax.exam.CoreOptions.provision(
// Wrap libraries we depend on as OSGi bundles and provision those
@@ -36,11 +36,11 @@
wrappedBundle(mavenBundle().groupId("commons-codec").artifactId("commons-codec").versionAsInProject()),
wrappedBundle(mavenBundle().groupId("commons-logging").artifactId("commons-logging").versionAsInProject()),
wrappedBundle(mavenBundle().groupId("org.json").artifactId("json").versionAsInProject()),
-
+
// The following 2 artifacts are necessary for default tenant
resolving
mavenBundle().groupId("org.amdatu.web").artifactId("org.amdatu.web.tenantresolver.hostname").versionAsInProject(),
mavenBundle().groupId("org.amdatu.web").artifactId("org.amdatu.web.tenantresolver.parameter").versionAsInProject(),
-
+
// Provision Amdatu Auth bundles
mavenBundle().groupId("org.amdatu.auth").artifactId("org.amdatu.auth.test.integration.base").versionAsInProject(),
mavenBundle().groupId("org.amdatu.auth").artifactId("org.amdatu.auth.tokenprovider").versionAsInProject(),
@@ -55,10 +55,10 @@
mavenBundle().groupId("org.amdatu.auth").artifactId("org.amdatu.auth.useradmin.rest").versionAsInProject()
);
}
-
+
/**
* Example configure method for Amdatu Auth feature. To be extended..
- *
+ *
* @param testContext
* @throws Exception
*/
@@ -67,11 +67,11 @@
configureFSConsumerRegistry(testContext);
configureHttpService(testContext);
}
-
+
public void configureOAuthServer(TestContext testContext) throws Exception
{
testContext.updateConfig(OAuthServerConfig.PID, getOAuthServerCfg());
}
-
+
private Properties getOAuthServerCfg() {
Properties properties = new Properties();
properties.put("hostname", HOSTNAME); // fixme private/missing
constants
@@ -81,33 +81,33 @@
properties.put("request.token.maxage", "300000");
properties.put("access.token.maxage", "-1");
properties.put("access.token.timeout", "1800000");
-
+
return properties;
}
-
+
public void configureFSConsumerRegistry(TestContext testContext) throws
Exception {
-
testContext.updateConfig("org.amdatu.authentication.oauth.consumerregistry.fs",
getFSConsumerRegistryCfg());
+ testContext.updateConfig("org.amdatu.auth.oauth.consumerregistry.fs",
getFSConsumerRegistryCfg());
}
-
+
private Properties getFSConsumerRegistryCfg() {
Properties properties = new Properties();
properties.put("datadir", "work/consumerregistrystore"); // fixme
private/missing constants
return properties;
}
-
+
public void configureHttpService(TestContext testContext) throws Exception
{
testContext.updateConfig("org.apache.felix.http", getHttpServiceCfg());
}
-
+
private Properties getHttpServiceCfg() {
Properties properties = new Properties();
- properties.put("org.osgi.service.http.hostname", "localhost"); //
fixme private/missing constants
+ properties.put("org.osgi.service.http.hostname", "localhost"); //
fixme private/missing constants
properties.put("org.osgi.service.http.port", "8080");
properties.put("org.osgi.service.http.port.secure", "8090");
properties.put("org.apache.felix.http.debug", "true");
properties.put("org.apache.felix.log.storeDebug", "true");
return properties;
}
-
-
+
+
}
Modified:
trunk/amdatu-auth/test-integration/tests/src/test/java/org/amdatu/auth/test/integration/tests/util/AuthUtils.java
==============================================================================
---
trunk/amdatu-auth/test-integration/tests/src/test/java/org/amdatu/auth/test/integration/tests/util/AuthUtils.java
(original)
+++
trunk/amdatu-auth/test-integration/tests/src/test/java/org/amdatu/auth/test/integration/tests/util/AuthUtils.java
Fri Aug 5 09:30:48 2011
@@ -25,7 +25,7 @@
import org.amdatu.auth.login.service.LoginService;
import org.amdatu.auth.test.integration.base.AuthFixture;
import org.amdatu.auth.test.integration.tests.AuthTest;
-import org.amdatu.authentication.tokenprovider.TokenProvider;
+import org.amdatu.auth.tokenprovider.TokenProvider;
import org.apache.commons.httpclient.Header;
import org.apache.commons.httpclient.HeaderElement;
import org.apache.commons.httpclient.HttpClient;
Modified:
trunk/amdatu-auth/test-integration/tests/src/test/java/org/amdatu/auth/test/integration/tests/util/OAuthProtectedTestServlet.java
==============================================================================
---
trunk/amdatu-auth/test-integration/tests/src/test/java/org/amdatu/auth/test/integration/tests/util/OAuthProtectedTestServlet.java
(original)
+++
trunk/amdatu-auth/test-integration/tests/src/test/java/org/amdatu/auth/test/integration/tests/util/OAuthProtectedTestServlet.java
Fri Aug 5 09:30:48 2011
@@ -39,7 +39,7 @@
import org.amdatu.auth.oauth.consumerregistry.OAuthServiceConsumerRegistry;
import org.amdatu.auth.oauth.server.OAuthTokenProvider;
-import org.amdatu.authentication.tokenprovider.Token;
+import org.amdatu.auth.tokenprovider.Token;
import org.osgi.service.log.LogService;
public class OAuthProtectedTestServlet extends HttpServlet implements Servlet {
Modified:
trunk/amdatu-auth/useradmin-gadget/src/main/java/org/amdatu/auth/useradmin/gadget/osgi/Activator.java
==============================================================================
---
trunk/amdatu-auth/useradmin-gadget/src/main/java/org/amdatu/auth/useradmin/gadget/osgi/Activator.java
(original)
+++
trunk/amdatu-auth/useradmin-gadget/src/main/java/org/amdatu/auth/useradmin/gadget/osgi/Activator.java
Fri Aug 5 09:30:48 2011
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2010, 2011 The Amdatu Foundation
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.amdatu.authorization.useradmin.gadget.osgi;
+package org.amdatu.auth.useradmin.gadget.osgi;
import java.util.Dictionary;
import java.util.Hashtable;
-import org.amdatu.authorization.useradmin.gadget.service.UserAdminGadgetImpl;
+import org.amdatu.auth.useradmin.gadget.service.UserAdminGadgetImpl;
import org.amdatu.opensocial.gadgetmanagement.GadgetManagement;
import org.amdatu.web.dispatcher.DispatcherService;
import org.amdatu.web.httpcontext.ResourceProvider;
@@ -31,7 +31,7 @@
/**
* This is the OSGi activator for this gadget bundle.
- *
+ *
* @author ivol
*/
public class Activator extends DependencyActivatorBase {
Modified:
trunk/amdatu-auth/useradmin-gadget/src/main/java/org/amdatu/auth/useradmin/gadget/service/UserAdminGadgetImpl.java
==============================================================================
---
trunk/amdatu-auth/useradmin-gadget/src/main/java/org/amdatu/auth/useradmin/gadget/service/UserAdminGadgetImpl.java
(original)
+++
trunk/amdatu-auth/useradmin-gadget/src/main/java/org/amdatu/auth/useradmin/gadget/service/UserAdminGadgetImpl.java
Fri Aug 5 09:30:48 2011
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2010, 2011 The Amdatu Foundation
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.amdatu.authorization.useradmin.gadget.service;
+package org.amdatu.auth.useradmin.gadget.service;
import java.net.URL;
-import org.amdatu.authorization.useradmin.gadget.osgi.Activator;
+import org.amdatu.auth.useradmin.gadget.osgi.Activator;
import org.amdatu.opensocial.gadgetmanagement.GadgetCategory;
import org.amdatu.opensocial.gadgetmanagement.GadgetDefinition;
import org.amdatu.opensocial.gadgetmanagement.GadgetManagement;
@@ -27,7 +27,7 @@
/**
* This service provides the UserAdmin gadget.
- *
+ *
* @author ivol
*/
public class UserAdminGadgetImpl implements ResourceProvider {
Modified:
trunk/amdatu-auth/useradmin-rest/src/test/java/org/amdatu/auth/test/unit/useradmin/rest/UserAdminSearchResultsTest.java
==============================================================================
---
trunk/amdatu-auth/useradmin-rest/src/test/java/org/amdatu/auth/test/unit/useradmin/rest/UserAdminSearchResultsTest.java
(original)
+++
trunk/amdatu-auth/useradmin-rest/src/test/java/org/amdatu/auth/test/unit/useradmin/rest/UserAdminSearchResultsTest.java
Fri Aug 5 09:30:48 2011
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.amdatu.auth.useradmin.rest;
+package org.amdatu.auth.test.unit.useradmin.rest;
import java.net.URISyntaxException;
import java.util.Dictionary;
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
