Author: [email protected]
Date: Fri Aug 5 09:09:00 2011
New Revision: 1251
Log:
[AMDATUAUTH-77] refactoring package names, artifact ids - part 3
Added:
trunk/amdatu-auth/oauth-example/src/main/java/org/amdatu/auth/example/
- copied from r1248,
/trunk/amdatu-auth/oauth-example/src/main/java/org/amdatu/example/
trunk/amdatu-auth/oauth-stores/consumer-store-fs/src/test/java/org/amdatu/auth/
- copied from r1248,
/trunk/amdatu-auth/oauth-stores/consumer-store-fs/src/test/java/org/amdatu/authentication/
trunk/amdatu-auth/oauth-stores/nonce-store-mem/src/main/java/org/amdatu/auth/oauth/
- copied from r1248,
/trunk/amdatu-auth/oauth-stores/nonce-store-mem/src/main/java/org/amdatu/oauth/
trunk/amdatu-auth/tokenprovider/src/test/java/org/amdatu/auth/
- copied from r1248,
/trunk/amdatu-auth/tokenprovider/src/test/java/org/amdatu/authentication/
trunk/amdatu-auth/useradmin-rest/src/test/java/org/amdatu/auth/
- copied from r1248,
/trunk/amdatu-auth/useradmin-rest/src/test/java/org/amdatu/authorization/
Removed:
trunk/amdatu-auth/oauth-example/src/main/java/org/amdatu/example/
trunk/amdatu-auth/oauth-stores/consumer-store-fs/src/test/java/org/amdatu/authentication/
trunk/amdatu-auth/oauth-stores/nonce-store-mem/src/main/java/org/amdatu/oauth/
trunk/amdatu-auth/tokenprovider/src/test/java/org/amdatu/authentication/
trunk/amdatu-auth/useradmin-rest/src/test/java/org/amdatu/authorization/
Modified:
trunk/amdatu-auth/oauth-example/src/main/java/org/amdatu/auth/example/oauth/osgi/Activator.java
trunk/amdatu-auth/oauth-example/src/main/java/org/amdatu/auth/example/oauth/service/DummyInterface.java
trunk/amdatu-auth/oauth-example/src/main/java/org/amdatu/auth/example/oauth/service/OAuthGadgetsRegistrationServiceImpl.java
trunk/amdatu-auth/oauth-example/src/main/java/org/amdatu/auth/example/oauth/service/OAuthProtectedResource.java
trunk/amdatu-auth/oauth-stores/nonce-store-mem/src/main/java/org/amdatu/auth/oauth/store/nonce/mem/osgi/Activator.java
trunk/amdatu-auth/oauth-stores/nonce-store-mem/src/main/java/org/amdatu/auth/oauth/store/nonce/mem/service/InMemNonceStorageProviderImpl.java
trunk/amdatu-auth/oauth-stores/nonce-store-mem/src/test/java/org/amdatu/auth/oauth/test/unit/NonceStoreTest.java
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/AuthTest.java
trunk/amdatu-auth/test-integration/tests/src/test/java/org/amdatu/auth/test/integration/tests/util/OAuthProtectedTestServlet.java
trunk/amdatu-auth/tokenprovider/src/main/java/org/amdatu/auth/tokenprovider/InvalidTokenException.java
trunk/amdatu-auth/tokenprovider/src/main/java/org/amdatu/auth/tokenprovider/Token.java
trunk/amdatu-auth/tokenprovider/src/main/java/org/amdatu/auth/tokenprovider/TokenProvider.java
trunk/amdatu-auth/tokenprovider/src/main/java/org/amdatu/auth/tokenprovider/TokenProviderException.java
trunk/amdatu-auth/tokenprovider/src/main/java/org/amdatu/auth/tokenprovider/TokenRESTResource.java
trunk/amdatu-auth/tokenprovider/src/main/java/org/amdatu/auth/tokenprovider/TokenStorageProvider.java
trunk/amdatu-auth/tokenprovider/src/main/java/org/amdatu/auth/tokenprovider/osgi/Activator.java
trunk/amdatu-auth/tokenprovider/src/main/java/org/amdatu/auth/tokenprovider/service/TokenProviderImpl.java
trunk/amdatu-auth/tokenprovider/src/main/java/org/amdatu/auth/tokenprovider/service/TokenRESTResourceImpl.java
trunk/amdatu-auth/tokenprovider/src/test/java/org/amdatu/auth/tokenprovider/service/TokenProviderImplTest.java
trunk/amdatu-auth/tokenstore-mem/src/main/java/org/amdatu/auth/tokenstore/mem/osgi/Activator.java
trunk/amdatu-auth/tokenstore-mem/src/main/java/org/amdatu/auth/tokenstore/mem/service/InMemTokenStorageProviderImpl.java
trunk/amdatu-auth/useradmin-rest/src/main/java/org/amdatu/auth/useradmin/rest/bean/RoleBean.java
trunk/amdatu-auth/useradmin-rest/src/main/java/org/amdatu/auth/useradmin/rest/bean/SearchResultBean.java
trunk/amdatu-auth/useradmin-rest/src/main/java/org/amdatu/auth/useradmin/rest/osgi/Activator.java
trunk/amdatu-auth/useradmin-rest/src/main/java/org/amdatu/auth/useradmin/rest/service/GroupsResource.java
trunk/amdatu-auth/useradmin-rest/src/main/java/org/amdatu/auth/useradmin/rest/service/ResourceBase.java
trunk/amdatu-auth/useradmin-rest/src/main/java/org/amdatu/auth/useradmin/rest/service/RolesResource.java
trunk/amdatu-auth/useradmin-rest/src/main/java/org/amdatu/auth/useradmin/rest/service/UsersResource.java
trunk/amdatu-auth/useradmin-rest/src/test/java/org/amdatu/auth/useradmin/rest/UserAdminSearchResultsTest.java
Modified:
trunk/amdatu-auth/oauth-example/src/main/java/org/amdatu/auth/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/auth/example/oauth/osgi/Activator.java
Fri Aug 5 09:09:00 2011
@@ -13,16 +13,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.amdatu.example.oauth.osgi;
+package org.amdatu.auth.example.oauth.osgi;
import java.util.Dictionary;
import java.util.Hashtable;
+import org.amdatu.auth.example.oauth.service.DummyInterface;
+import
org.amdatu.auth.example.oauth.service.OAuthGadgetsRegistrationServiceImpl;
+import org.amdatu.auth.example.oauth.service.OAuthProtectedResource;
import org.amdatu.auth.oauth.consumerregistry.OAuthServiceConsumerRegistry;
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;
import org.amdatu.libraries.utilities.osgi.ServiceDependentActivator;
import org.amdatu.opensocial.gadgetmanagement.GadgetManagement;
import org.amdatu.web.dispatcher.DispatcherService;
Modified:
trunk/amdatu-auth/oauth-example/src/main/java/org/amdatu/auth/example/oauth/service/DummyInterface.java
==============================================================================
---
/trunk/amdatu-auth/oauth-example/src/main/java/org/amdatu/example/oauth/service/DummyInterface.java
(original)
+++
trunk/amdatu-auth/oauth-example/src/main/java/org/amdatu/auth/example/oauth/service/DummyInterface.java
Fri Aug 5 09:09:00 2011
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.amdatu.example.oauth.service;
+package org.amdatu.auth.example.oauth.service;
/**
* This dummy interface is necessary in the current Amdatu version since a
REST service MUST implement an interface
Modified:
trunk/amdatu-auth/oauth-example/src/main/java/org/amdatu/auth/example/oauth/service/OAuthGadgetsRegistrationServiceImpl.java
==============================================================================
---
/trunk/amdatu-auth/oauth-example/src/main/java/org/amdatu/example/oauth/service/OAuthGadgetsRegistrationServiceImpl.java
(original)
+++
trunk/amdatu-auth/oauth-example/src/main/java/org/amdatu/auth/example/oauth/service/OAuthGadgetsRegistrationServiceImpl.java
Fri Aug 5 09:09:00 2011
@@ -13,17 +13,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.amdatu.example.oauth.service;
+package org.amdatu.auth.example.oauth.service;
import java.net.URL;
import java.util.Map;
+import org.amdatu.auth.example.oauth.osgi.Activator;
import org.amdatu.auth.oauth.api.ConsumerAlreadyExistsException;
import org.amdatu.auth.oauth.api.ConsumerNotFoundException;
import org.amdatu.auth.oauth.api.ConsumerRegistryStorageException;
import org.amdatu.auth.oauth.api.OAuthServiceConsumer;
import org.amdatu.auth.oauth.consumerregistry.OAuthServiceConsumerRegistry;
-import org.amdatu.example.oauth.osgi.Activator;
import org.amdatu.opensocial.gadgetmanagement.GadgetCategory;
import org.amdatu.opensocial.gadgetmanagement.GadgetDefinition;
import org.amdatu.opensocial.gadgetmanagement.GadgetManagement;
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/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:09:00 2011
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.amdatu.example.oauth.service;
+package org.amdatu.auth.example.oauth.service;
import java.io.IOException;
Modified:
trunk/amdatu-auth/oauth-stores/nonce-store-mem/src/main/java/org/amdatu/auth/oauth/store/nonce/mem/osgi/Activator.java
==============================================================================
---
/trunk/amdatu-auth/oauth-stores/nonce-store-mem/src/main/java/org/amdatu/oauth/store/nonce/mem/osgi/Activator.java
(original)
+++
trunk/amdatu-auth/oauth-stores/nonce-store-mem/src/main/java/org/amdatu/auth/oauth/store/nonce/mem/osgi/Activator.java
Fri Aug 5 09:09:00 2011
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.amdatu.oauth.store.nonce.mem.osgi;
+package org.amdatu.auth.oauth.store.nonce.mem.osgi;
-import org.amdatu.authentication.oauth.server.OAuthNonceStorageProvider;
-import org.amdatu.oauth.store.nonce.mem.service.InMemNonceStorageProviderImpl;
+import org.amdatu.auth.oauth.server.OAuthNonceStorageProvider;
+import
org.amdatu.auth.oauth.store.nonce.mem.service.InMemNonceStorageProviderImpl;
import org.apache.felix.dm.DependencyActivatorBase;
import org.apache.felix.dm.DependencyManager;
import org.osgi.framework.BundleContext;
Modified:
trunk/amdatu-auth/oauth-stores/nonce-store-mem/src/main/java/org/amdatu/auth/oauth/store/nonce/mem/service/InMemNonceStorageProviderImpl.java
==============================================================================
---
/trunk/amdatu-auth/oauth-stores/nonce-store-mem/src/main/java/org/amdatu/oauth/store/nonce/mem/service/InMemNonceStorageProviderImpl.java
(original)
+++
trunk/amdatu-auth/oauth-stores/nonce-store-mem/src/main/java/org/amdatu/auth/oauth/store/nonce/mem/service/InMemNonceStorageProviderImpl.java
Fri Aug 5 09:09:00 2011
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.amdatu.oauth.store.nonce.mem.service;
+package org.amdatu.auth.oauth.store.nonce.mem.service;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
@@ -21,7 +21,7 @@
import java.util.Set;
import java.util.TreeSet;
-import org.amdatu.authentication.oauth.server.OAuthNonceStorageProvider;
+import org.amdatu.auth.oauth.server.OAuthNonceStorageProvider;
public class InMemNonceStorageProviderImpl implements
OAuthNonceStorageProvider {
private final Set<UsedNonce> usedNonces = new TreeSet<UsedNonce>();
Modified:
trunk/amdatu-auth/oauth-stores/nonce-store-mem/src/test/java/org/amdatu/auth/oauth/test/unit/NonceStoreTest.java
==============================================================================
---
trunk/amdatu-auth/oauth-stores/nonce-store-mem/src/test/java/org/amdatu/auth/oauth/test/unit/NonceStoreTest.java
(original)
+++
trunk/amdatu-auth/oauth-stores/nonce-store-mem/src/test/java/org/amdatu/auth/oauth/test/unit/NonceStoreTest.java
Fri Aug 5 09:09:00 2011
@@ -16,7 +16,7 @@
*/
package org.amdatu.auth.oauth.test.unit;
-import org.amdatu.oauth.store.nonce.mem.service.InMemNonceStorageProviderImpl;
+import
org.amdatu.auth.oauth.store.nonce.mem.service.InMemNonceStorageProviderImpl;
import org.junit.Assert;
import org.junit.Test;
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:09:00 2011
@@ -20,7 +20,7 @@
import java.util.Properties;
-import org.amdatu.authentication.oauth.server.OAuthServerConfig;
+import org.amdatu.auth.oauth.server.OAuthServerConfig;
import org.amdatu.core.itest.base.TestContext;
import org.ops4j.pax.exam.Option;
Modified:
trunk/amdatu-auth/test-integration/tests/src/test/java/org/amdatu/auth/test/integration/tests/AuthTest.java
==============================================================================
---
trunk/amdatu-auth/test-integration/tests/src/test/java/org/amdatu/auth/test/integration/tests/AuthTest.java
(original)
+++
trunk/amdatu-auth/test-integration/tests/src/test/java/org/amdatu/auth/test/integration/tests/AuthTest.java
Fri Aug 5 09:09:00 2011
@@ -32,14 +32,14 @@
import org.amdatu.auth.oauth.api.OAuthServiceProvider;
import org.amdatu.auth.oauth.consumerregistry.OAuthServiceConsumerRegistry;
+import org.amdatu.auth.oauth.server.OAuthAccessTokenServlet;
+import org.amdatu.auth.oauth.server.OAuthAuthorizeTokenServlet;
+import org.amdatu.auth.oauth.server.OAuthRequestTokenServlet;
+import org.amdatu.auth.oauth.server.OAuthTokenProvider;
import org.amdatu.auth.test.integration.base.AuthFixture;
import org.amdatu.auth.test.integration.tests.util.AuthTestBase;
import org.amdatu.auth.test.integration.tests.util.AuthUtils;
import org.amdatu.auth.test.integration.tests.util.OAuthProtectedTestServlet;
-import org.amdatu.authentication.oauth.server.OAuthAccessTokenServlet;
-import org.amdatu.authentication.oauth.server.OAuthAuthorizeTokenServlet;
-import org.amdatu.authentication.oauth.server.OAuthRequestTokenServlet;
-import org.amdatu.authentication.oauth.server.OAuthTokenProvider;
import org.amdatu.core.itest.base.CoreFixture;
import org.amdatu.core.itest.base.TestContext;
import org.amdatu.core.tenant.TenantManagementService;
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:09:00 2011
@@ -38,7 +38,7 @@
import net.oauth.server.OAuthServlet;
import org.amdatu.auth.oauth.consumerregistry.OAuthServiceConsumerRegistry;
-import org.amdatu.authentication.oauth.server.OAuthTokenProvider;
+import org.amdatu.auth.oauth.server.OAuthTokenProvider;
import org.amdatu.authentication.tokenprovider.Token;
import org.osgi.service.log.LogService;
Modified:
trunk/amdatu-auth/tokenprovider/src/main/java/org/amdatu/auth/tokenprovider/InvalidTokenException.java
==============================================================================
---
trunk/amdatu-auth/tokenprovider/src/main/java/org/amdatu/auth/tokenprovider/InvalidTokenException.java
(original)
+++
trunk/amdatu-auth/tokenprovider/src/main/java/org/amdatu/auth/tokenprovider/InvalidTokenException.java
Fri Aug 5 09:09:00 2011
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.amdatu.authentication.tokenprovider;
+package org.amdatu.auth.tokenprovider;
/**
* This exception is thrown when a token provided is invalid.
Modified:
trunk/amdatu-auth/tokenprovider/src/main/java/org/amdatu/auth/tokenprovider/Token.java
==============================================================================
---
trunk/amdatu-auth/tokenprovider/src/main/java/org/amdatu/auth/tokenprovider/Token.java
(original)
+++
trunk/amdatu-auth/tokenprovider/src/main/java/org/amdatu/auth/tokenprovider/Token.java
Fri Aug 5 09:09:00 2011
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.amdatu.authentication.tokenprovider;
+package org.amdatu.auth.tokenprovider;
import java.util.HashMap;
import java.util.Map;
Modified:
trunk/amdatu-auth/tokenprovider/src/main/java/org/amdatu/auth/tokenprovider/TokenProvider.java
==============================================================================
---
trunk/amdatu-auth/tokenprovider/src/main/java/org/amdatu/auth/tokenprovider/TokenProvider.java
(original)
+++
trunk/amdatu-auth/tokenprovider/src/main/java/org/amdatu/auth/tokenprovider/TokenProvider.java
Fri Aug 5 09:09:00 2011
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.amdatu.authentication.tokenprovider;
+package org.amdatu.auth.tokenprovider;
import java.util.SortedMap;
Modified:
trunk/amdatu-auth/tokenprovider/src/main/java/org/amdatu/auth/tokenprovider/TokenProviderException.java
==============================================================================
---
trunk/amdatu-auth/tokenprovider/src/main/java/org/amdatu/auth/tokenprovider/TokenProviderException.java
(original)
+++
trunk/amdatu-auth/tokenprovider/src/main/java/org/amdatu/auth/tokenprovider/TokenProviderException.java
Fri Aug 5 09:09:00 2011
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.amdatu.authentication.tokenprovider;
+package org.amdatu.auth.tokenprovider;
/**
* Exception indicating an internal error that occurred during generating or
verifying tokens.
Modified:
trunk/amdatu-auth/tokenprovider/src/main/java/org/amdatu/auth/tokenprovider/TokenRESTResource.java
==============================================================================
---
trunk/amdatu-auth/tokenprovider/src/main/java/org/amdatu/auth/tokenprovider/TokenRESTResource.java
(original)
+++
trunk/amdatu-auth/tokenprovider/src/main/java/org/amdatu/auth/tokenprovider/TokenRESTResource.java
Fri Aug 5 09:09:00 2011
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.amdatu.authentication.tokenprovider;
+package org.amdatu.auth.tokenprovider;
/**
* REST interface for token management (generating and verifying tokens).
Modified:
trunk/amdatu-auth/tokenprovider/src/main/java/org/amdatu/auth/tokenprovider/TokenStorageProvider.java
==============================================================================
---
trunk/amdatu-auth/tokenprovider/src/main/java/org/amdatu/auth/tokenprovider/TokenStorageProvider.java
(original)
+++
trunk/amdatu-auth/tokenprovider/src/main/java/org/amdatu/auth/tokenprovider/TokenStorageProvider.java
Fri Aug 5 09:09:00 2011
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.amdatu.authentication.tokenprovider;
+package org.amdatu.auth.tokenprovider;
/**
* Interface of a token storage provider. The only responsibility of a token
storage provider is
Modified:
trunk/amdatu-auth/tokenprovider/src/main/java/org/amdatu/auth/tokenprovider/osgi/Activator.java
==============================================================================
---
trunk/amdatu-auth/tokenprovider/src/main/java/org/amdatu/auth/tokenprovider/osgi/Activator.java
(original)
+++
trunk/amdatu-auth/tokenprovider/src/main/java/org/amdatu/auth/tokenprovider/osgi/Activator.java
Fri Aug 5 09:09:00 2011
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.amdatu.authentication.tokenprovider.osgi;
+package org.amdatu.auth.tokenprovider.osgi;
-import org.amdatu.authentication.tokenprovider.TokenProvider;
-import org.amdatu.authentication.tokenprovider.TokenStorageProvider;
-import org.amdatu.authentication.tokenprovider.service.TokenProviderImpl;
+import org.amdatu.auth.tokenprovider.TokenProvider;
+import org.amdatu.auth.tokenprovider.TokenStorageProvider;
+import org.amdatu.auth.tokenprovider.service.TokenProviderImpl;
import org.amdatu.core.tenant.Tenant;
import org.amdatu.libraries.utilities.osgi.ServiceDependentActivator;
import org.amdatu.web.rest.jaxrs.JaxRsSpi;
Modified:
trunk/amdatu-auth/tokenprovider/src/main/java/org/amdatu/auth/tokenprovider/service/TokenProviderImpl.java
==============================================================================
---
trunk/amdatu-auth/tokenprovider/src/main/java/org/amdatu/auth/tokenprovider/service/TokenProviderImpl.java
(original)
+++
trunk/amdatu-auth/tokenprovider/src/main/java/org/amdatu/auth/tokenprovider/service/TokenProviderImpl.java
Fri Aug 5 09:09:00 2011
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.amdatu.authentication.tokenprovider.service;
+package org.amdatu.auth.tokenprovider.service;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
@@ -32,11 +32,11 @@
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
-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.authentication.tokenprovider.TokenStorageProvider;
+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.auth.tokenprovider.TokenStorageProvider;
import org.amdatu.core.tenant.Tenant;
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.codec.binary.StringUtils;
Modified:
trunk/amdatu-auth/tokenprovider/src/main/java/org/amdatu/auth/tokenprovider/service/TokenRESTResourceImpl.java
==============================================================================
---
trunk/amdatu-auth/tokenprovider/src/main/java/org/amdatu/auth/tokenprovider/service/TokenRESTResourceImpl.java
(original)
+++
trunk/amdatu-auth/tokenprovider/src/main/java/org/amdatu/auth/tokenprovider/service/TokenRESTResourceImpl.java
Fri Aug 5 09:09:00 2011
@@ -13,30 +13,30 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.amdatu.authentication.tokenprovider.service;
+package org.amdatu.auth.tokenprovider.service;
-import java.util.Enumeration;
-import java.util.SortedMap;
-import java.util.TreeMap;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.CacheControl;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-import org.amdatu.authentication.tokenprovider.InvalidTokenException;
-import org.amdatu.authentication.tokenprovider.TokenProvider;
-import org.amdatu.authentication.tokenprovider.TokenProviderException;
-import org.amdatu.authentication.tokenprovider.TokenRESTResource;
+import java.util.Enumeration;
+import java.util.SortedMap;
+import java.util.TreeMap;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.CacheControl;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+import org.amdatu.auth.tokenprovider.InvalidTokenException;
+import org.amdatu.auth.tokenprovider.TokenProvider;
+import org.amdatu.auth.tokenprovider.TokenProviderException;
+import org.amdatu.auth.tokenprovider.TokenRESTResource;
/**
* TODO: This REST interface is not yet activated in the OSGi activator as an
important security issue first needs
Modified:
trunk/amdatu-auth/tokenprovider/src/test/java/org/amdatu/auth/tokenprovider/service/TokenProviderImplTest.java
==============================================================================
---
/trunk/amdatu-auth/tokenprovider/src/test/java/org/amdatu/authentication/tokenprovider/service/TokenProviderImplTest.java
(original)
+++
trunk/amdatu-auth/tokenprovider/src/test/java/org/amdatu/auth/tokenprovider/service/TokenProviderImplTest.java
Fri Aug 5 09:09:00 2011
@@ -13,11 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.amdatu.authentication.tokenprovider.service;
+package org.amdatu.auth.tokenprovider.service;
import java.net.URLEncoder;
import java.util.SortedMap;
+import org.amdatu.auth.tokenprovider.service.TokenProviderImpl;
import org.junit.Assert;
import org.junit.Test;
Modified:
trunk/amdatu-auth/tokenstore-mem/src/main/java/org/amdatu/auth/tokenstore/mem/osgi/Activator.java
==============================================================================
---
trunk/amdatu-auth/tokenstore-mem/src/main/java/org/amdatu/auth/tokenstore/mem/osgi/Activator.java
(original)
+++
trunk/amdatu-auth/tokenstore-mem/src/main/java/org/amdatu/auth/tokenstore/mem/osgi/Activator.java
Fri Aug 5 09:09:00 2011
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.amdatu.authentication.tokenstore.mem.osgi;
+package org.amdatu.auth.tokenstore.mem.osgi;
-import org.amdatu.authentication.tokenprovider.TokenStorageProvider;
-import
org.amdatu.authentication.tokenstore.mem.service.InMemTokenStorageProviderImpl;
+import org.amdatu.auth.tokenprovider.TokenStorageProvider;
+import org.amdatu.auth.tokenstore.mem.service.InMemTokenStorageProviderImpl;
import org.apache.felix.dm.DependencyActivatorBase;
import org.apache.felix.dm.DependencyManager;
import org.osgi.framework.BundleContext;
Modified:
trunk/amdatu-auth/tokenstore-mem/src/main/java/org/amdatu/auth/tokenstore/mem/service/InMemTokenStorageProviderImpl.java
==============================================================================
---
trunk/amdatu-auth/tokenstore-mem/src/main/java/org/amdatu/auth/tokenstore/mem/service/InMemTokenStorageProviderImpl.java
(original)
+++
trunk/amdatu-auth/tokenstore-mem/src/main/java/org/amdatu/auth/tokenstore/mem/service/InMemTokenStorageProviderImpl.java
Fri Aug 5 09:09:00 2011
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.amdatu.authentication.tokenstore.mem.service;
+package org.amdatu.auth.tokenstore.mem.service;
import java.util.HashMap;
import java.util.Map;
-import org.amdatu.authentication.tokenprovider.Token;
-import org.amdatu.authentication.tokenprovider.TokenStorageProvider;
+import org.amdatu.auth.tokenprovider.Token;
+import org.amdatu.auth.tokenprovider.TokenStorageProvider;
/**
* This class implements a very simple in-memory token store.
Modified:
trunk/amdatu-auth/useradmin-rest/src/main/java/org/amdatu/auth/useradmin/rest/bean/RoleBean.java
==============================================================================
---
trunk/amdatu-auth/useradmin-rest/src/main/java/org/amdatu/auth/useradmin/rest/bean/RoleBean.java
(original)
+++
trunk/amdatu-auth/useradmin-rest/src/main/java/org/amdatu/auth/useradmin/rest/bean/RoleBean.java
Fri Aug 5 09:09:00 2011
@@ -13,31 +13,31 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.amdatu.authorization.useradmin.rest.bean;
+package org.amdatu.auth.useradmin.rest.bean;
-import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.Dictionary;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.ws.rs.core.UriBuilder;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-import org.amdatu.libraries.utilities.rest.AtomSyndicationLink;
-import org.amdatu.libraries.utilities.xml.StringMapAdapter;
-import org.apache.wink.common.internal.uri.UriEncoder;
-import org.osgi.service.useradmin.Group;
-import org.osgi.service.useradmin.Role;
-import org.osgi.service.useradmin.User;
-import org.osgi.service.useradmin.UserAdmin;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.Dictionary;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.ws.rs.core.UriBuilder;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+import org.amdatu.libraries.utilities.rest.AtomSyndicationLink;
+import org.amdatu.libraries.utilities.xml.StringMapAdapter;
+import org.apache.wink.common.internal.uri.UriEncoder;
+import org.osgi.service.useradmin.Group;
+import org.osgi.service.useradmin.Role;
+import org.osgi.service.useradmin.User;
+import org.osgi.service.useradmin.UserAdmin;
@XmlRootElement(name = "roles")
@XmlAccessorType(XmlAccessType.NONE)
Modified:
trunk/amdatu-auth/useradmin-rest/src/main/java/org/amdatu/auth/useradmin/rest/bean/SearchResultBean.java
==============================================================================
---
trunk/amdatu-auth/useradmin-rest/src/main/java/org/amdatu/auth/useradmin/rest/bean/SearchResultBean.java
(original)
+++
trunk/amdatu-auth/useradmin-rest/src/main/java/org/amdatu/auth/useradmin/rest/bean/SearchResultBean.java
Fri Aug 5 09:09:00 2011
@@ -13,19 +13,19 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.amdatu.authorization.useradmin.rest.bean;
+package org.amdatu.auth.useradmin.rest.bean;
-import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import org.amdatu.libraries.utilities.rest.AtomSyndicationLink;
-import org.osgi.service.useradmin.Role;
-import org.osgi.service.useradmin.UserAdmin;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.amdatu.libraries.utilities.rest.AtomSyndicationLink;
+import org.osgi.service.useradmin.Role;
+import org.osgi.service.useradmin.UserAdmin;
@XmlRootElement(name = "searchresult")
@XmlAccessorType(XmlAccessType.PUBLIC_MEMBER)
Modified:
trunk/amdatu-auth/useradmin-rest/src/main/java/org/amdatu/auth/useradmin/rest/osgi/Activator.java
==============================================================================
---
trunk/amdatu-auth/useradmin-rest/src/main/java/org/amdatu/auth/useradmin/rest/osgi/Activator.java
(original)
+++
trunk/amdatu-auth/useradmin-rest/src/main/java/org/amdatu/auth/useradmin/rest/osgi/Activator.java
Fri Aug 5 09:09:00 2011
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.amdatu.authorization.useradmin.rest.osgi;
+package org.amdatu.auth.useradmin.rest.osgi;
-import org.amdatu.authorization.useradmin.rest.service.GroupsResource;
-import org.amdatu.authorization.useradmin.rest.service.RolesResource;
-import org.amdatu.authorization.useradmin.rest.service.UsersResource;
+import org.amdatu.auth.useradmin.rest.service.GroupsResource;
+import org.amdatu.auth.useradmin.rest.service.RolesResource;
+import org.amdatu.auth.useradmin.rest.service.UsersResource;
import org.amdatu.core.tenant.Tenant;
import org.amdatu.core.tenant.TenantManagementService;
import org.amdatu.libraries.utilities.osgi.ServiceDependentActivator;
Modified:
trunk/amdatu-auth/useradmin-rest/src/main/java/org/amdatu/auth/useradmin/rest/service/GroupsResource.java
==============================================================================
---
trunk/amdatu-auth/useradmin-rest/src/main/java/org/amdatu/auth/useradmin/rest/service/GroupsResource.java
(original)
+++
trunk/amdatu-auth/useradmin-rest/src/main/java/org/amdatu/auth/useradmin/rest/service/GroupsResource.java
Fri Aug 5 09:09:00 2011
@@ -13,23 +13,23 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.amdatu.authorization.useradmin.rest.service;
+package org.amdatu.auth.useradmin.rest.service;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.GET;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-import org.osgi.service.useradmin.Group;
-import org.osgi.service.useradmin.Role;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.DefaultValue;
+import javax.ws.rs.GET;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+import org.osgi.service.useradmin.Group;
+import org.osgi.service.useradmin.Role;
/**
* REST service for managing Groups based on the UserAdmin OSGi specification
(see chapter 107 of the Enterprise OSGi
Modified:
trunk/amdatu-auth/useradmin-rest/src/main/java/org/amdatu/auth/useradmin/rest/service/ResourceBase.java
==============================================================================
---
trunk/amdatu-auth/useradmin-rest/src/main/java/org/amdatu/auth/useradmin/rest/service/ResourceBase.java
(original)
+++
trunk/amdatu-auth/useradmin-rest/src/main/java/org/amdatu/auth/useradmin/rest/service/ResourceBase.java
Fri Aug 5 09:09:00 2011
@@ -13,41 +13,41 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.amdatu.authorization.useradmin.rest.service;
+package org.amdatu.auth.useradmin.rest.service;
-import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.CacheControl;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-import org.amdatu.authentication.tokenprovider.InvalidTokenException;
-import org.amdatu.authentication.tokenprovider.TokenProvider;
-import org.amdatu.authentication.tokenprovider.TokenProviderException;
-import org.amdatu.authorization.useradmin.rest.bean.RoleBean;
-import org.amdatu.authorization.useradmin.rest.bean.SearchResultBean;
-import org.amdatu.core.tenant.Tenant;
-import org.amdatu.core.tenant.TenantException;
-import org.amdatu.core.tenant.TenantManagementService;
-import org.amdatu.libraries.utilities.rest.AtomSyndicationLink;
-import org.amdatu.web.rest.jaxrs.RESTService;
-import org.apache.felix.dm.Component;
-import org.apache.felix.dm.DependencyManager;
-import org.json.JSONObject;
-import org.osgi.framework.Constants;
-import org.osgi.framework.InvalidSyntaxException;
-import org.osgi.service.log.LogService;
-import org.osgi.service.useradmin.Group;
-import org.osgi.service.useradmin.Role;
-import org.osgi.service.useradmin.User;
-import org.osgi.service.useradmin.UserAdmin;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.CacheControl;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+import org.amdatu.auth.tokenprovider.InvalidTokenException;
+import org.amdatu.auth.tokenprovider.TokenProvider;
+import org.amdatu.auth.tokenprovider.TokenProviderException;
+import org.amdatu.auth.useradmin.rest.bean.RoleBean;
+import org.amdatu.auth.useradmin.rest.bean.SearchResultBean;
+import org.amdatu.core.tenant.Tenant;
+import org.amdatu.core.tenant.TenantException;
+import org.amdatu.core.tenant.TenantManagementService;
+import org.amdatu.libraries.utilities.rest.AtomSyndicationLink;
+import org.amdatu.web.rest.jaxrs.RESTService;
+import org.apache.felix.dm.Component;
+import org.apache.felix.dm.DependencyManager;
+import org.json.JSONObject;
+import org.osgi.framework.Constants;
+import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.service.log.LogService;
+import org.osgi.service.useradmin.Group;
+import org.osgi.service.useradmin.Role;
+import org.osgi.service.useradmin.User;
+import org.osgi.service.useradmin.UserAdmin;
abstract class ResourceBase implements RESTService {
// FIXME: Temporary fix for AMDATU-81
Modified:
trunk/amdatu-auth/useradmin-rest/src/main/java/org/amdatu/auth/useradmin/rest/service/RolesResource.java
==============================================================================
---
trunk/amdatu-auth/useradmin-rest/src/main/java/org/amdatu/auth/useradmin/rest/service/RolesResource.java
(original)
+++
trunk/amdatu-auth/useradmin-rest/src/main/java/org/amdatu/auth/useradmin/rest/service/RolesResource.java
Fri Aug 5 09:09:00 2011
@@ -13,19 +13,19 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.amdatu.authorization.useradmin.rest.service;
+package org.amdatu.auth.useradmin.rest.service;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-import org.osgi.service.useradmin.Role;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.DefaultValue;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+import org.osgi.service.useradmin.Role;
@Path("roles")
public class RolesResource extends ResourceBase {
Modified:
trunk/amdatu-auth/useradmin-rest/src/main/java/org/amdatu/auth/useradmin/rest/service/UsersResource.java
==============================================================================
---
trunk/amdatu-auth/useradmin-rest/src/main/java/org/amdatu/auth/useradmin/rest/service/UsersResource.java
(original)
+++
trunk/amdatu-auth/useradmin-rest/src/main/java/org/amdatu/auth/useradmin/rest/service/UsersResource.java
Fri Aug 5 09:09:00 2011
@@ -13,26 +13,26 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.amdatu.authorization.useradmin.rest.service;
+package org.amdatu.auth.useradmin.rest.service;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-import org.amdatu.core.tenant.Tenant;
-import org.apache.felix.dm.Component;
-import org.osgi.service.useradmin.Role;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.DefaultValue;
+import javax.ws.rs.FormParam;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+import org.amdatu.core.tenant.Tenant;
+import org.apache.felix.dm.Component;
+import org.osgi.service.useradmin.Role;
/**
* REST service for managing Users based on the UserAdmin OSGi specification
(see chapter 107 of the Enterprise OSGi
Modified:
trunk/amdatu-auth/useradmin-rest/src/test/java/org/amdatu/auth/useradmin/rest/UserAdminSearchResultsTest.java
==============================================================================
---
/trunk/amdatu-auth/useradmin-rest/src/test/java/org/amdatu/authorization/useradmin/rest/UserAdminSearchResultsTest.java
(original)
+++
trunk/amdatu-auth/useradmin-rest/src/test/java/org/amdatu/auth/useradmin/rest/UserAdminSearchResultsTest.java
Fri Aug 5 09:09:00 2011
@@ -13,20 +13,20 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.amdatu.authorization.useradmin.rest;
+package org.amdatu.auth.useradmin.rest;
-import java.net.URISyntaxException;
-import java.util.Dictionary;
-import java.util.List;
-
-import junit.framework.Assert;
-
-import org.amdatu.authorization.useradmin.rest.bean.RoleBean;
-import org.amdatu.authorization.useradmin.rest.bean.SearchResultBean;
-import org.amdatu.authorization.useradmin.rest.service.UsersResource;
-import org.amdatu.libraries.utilities.rest.AtomSyndicationLink;
-import org.junit.Test;
-import org.osgi.service.useradmin.Role;
+import java.net.URISyntaxException;
+import java.util.Dictionary;
+import java.util.List;
+
+import junit.framework.Assert;
+
+import org.amdatu.auth.useradmin.rest.bean.RoleBean;
+import org.amdatu.auth.useradmin.rest.bean.SearchResultBean;
+import org.amdatu.auth.useradmin.rest.service.UsersResource;
+import org.amdatu.libraries.utilities.rest.AtomSyndicationLink;
+import org.junit.Test;
+import org.osgi.service.useradmin.Role;
public class UserAdminSearchResultsTest {
/**
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
