Author: [email protected] Date: Fri Apr 29 10:19:23 2011 New Revision: 1066 Log: [AMDATUAUTH-23] Refactored artifactIds, groupIds and dependencies
Modified: trunk/amdatu-auth/login-gadget/pom.xml 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-fs/pom.xml trunk/amdatu-auth/oauth-server/pom.xml trunk/amdatu-auth/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 trunk/amdatu-example/course-gadget/pom.xml trunk/amdatu-example/course-service/pom.xml trunk/amdatu-example/oauth/pom.xml trunk/amdatu-example/pom.xml trunk/amdatu-opensocial/opensocial-shindig/pom.xml trunk/amdatu-opensocial/pom.xml trunk/integration-tests/test-platform/pom.xml Modified: trunk/amdatu-auth/login-gadget/pom.xml ============================================================================== --- trunk/amdatu-auth/login-gadget/pom.xml (original) +++ trunk/amdatu-auth/login-gadget/pom.xml Fri Apr 29 10:19:23 2011 @@ -2,12 +2,11 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.amdatu</groupId> + <groupId>org.amdatu.auth</groupId> <artifactId>org.amdatu.auth</artifactId> <version>0.2.0-SNAPSHOT</version> </parent> - <groupId>org.amdatu.auth.login</groupId> - <artifactId>gadget</artifactId> + <artifactId>org.amdatu.auth.login.gadget</artifactId> <packaging>bundle</packaging> <name>Amdatu Auth - Login gadget</name> <description>Provides a login gadget</description> @@ -18,28 +17,28 @@ <dependencies> <dependency> - <groupId>org.amdatu.auth.login</groupId> - <artifactId>service</artifactId> + <groupId>org.amdatu.auth</groupId> + <artifactId>org.amdatu.auth.login.service</artifactId> <type>bundle</type> </dependency> <dependency> <groupId>org.amdatu.web</groupId> - <artifactId>dispatcher</artifactId> + <artifactId>org.amdatu.web.dispatcher</artifactId> <type>bundle</type> </dependency> <dependency> <groupId>org.amdatu.web</groupId> - <artifactId>httpcontext</artifactId> + <artifactId>org.amdatu.web.httpcontext</artifactId> <type>bundle</type> </dependency> <dependency> <groupId>org.amdatu.web</groupId> - <artifactId>jsp</artifactId> + <artifactId>org.amdatu.web.jsp</artifactId> <type>bundle</type> </dependency> <dependency> <groupId>org.amdatu.web</groupId> - <artifactId>resource</artifactId> + <artifactId>org.amdatu.web.resource</artifactId> <type>bundle</type> </dependency> <dependency> Modified: trunk/amdatu-auth/login-service/pom.xml ============================================================================== --- trunk/amdatu-auth/login-service/pom.xml (original) +++ trunk/amdatu-auth/login-service/pom.xml Fri Apr 29 10:19:23 2011 @@ -2,12 +2,11 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.amdatu</groupId> + <groupId>org.amdatu.auth</groupId> <artifactId>org.amdatu.auth</artifactId> <version>0.2.0-SNAPSHOT</version> </parent> - <groupId>org.amdatu.auth.login</groupId> - <artifactId>service</artifactId> + <artifactId>org.amdatu.auth.login.service</artifactId> <packaging>bundle</packaging> <name>Amdatu Auth - Login service</name> <description>Provides a service for login and logout functionality</description> @@ -15,32 +14,32 @@ <dependencies> <dependency> <groupId>org.amdatu.auth</groupId> - <artifactId>tokenprovider</artifactId> + <artifactId>org.amdatu.auth.tokenprovider</artifactId> <type>bundle</type> </dependency> <dependency> <groupId>org.amdatu.core</groupId> - <artifactId>tenant</artifactId> + <artifactId>org.amdatu.core.tenant</artifactId> <type>bundle</type> </dependency> <dependency> <groupId>org.amdatu.web</groupId> - <artifactId>dispatcher</artifactId> + <artifactId>org.amdatu.web.dispatcher</artifactId> <type>bundle</type> </dependency> <dependency> <groupId>org.amdatu.web</groupId> - <artifactId>httpcontext</artifactId> + <artifactId>org.amdatu.web.httpcontext</artifactId> <type>bundle</type> </dependency> <dependency> - <groupId>org.amdatu.web.rest</groupId> - <artifactId>jaxrs</artifactId> + <groupId>org.amdatu.web</groupId> + <artifactId>org.amdatu.web.jaxrs</artifactId> <type>bundle</type> </dependency> <dependency> <groupId>org.amdatu.libraries</groupId> - <artifactId>utilities</artifactId> + <artifactId>org.amdatu.libraries.utilities</artifactId> </dependency> <dependency> <groupId>org.json</groupId> Modified: trunk/amdatu-auth/oauth-api/pom.xml ============================================================================== --- trunk/amdatu-auth/oauth-api/pom.xml (original) +++ trunk/amdatu-auth/oauth-api/pom.xml Fri Apr 29 10:19:23 2011 @@ -2,12 +2,11 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.amdatu</groupId> + <groupId>org.amdatu.auth</groupId> <artifactId>org.amdatu.auth</artifactId> <version>0.2.0-SNAPSHOT</version> </parent> - <groupId>org.amdatu.auth.oauth</groupId> - <artifactId>api</artifactId> + <artifactId>org.amdatu.auth.oauth.api</artifactId> <packaging>bundle</packaging> <name>Amdatu Auth - oAuth API (net.oauth)</name> <description>This bundle includes the net.oauth API</description> Modified: trunk/amdatu-auth/oauth-client/pom.xml ============================================================================== --- trunk/amdatu-auth/oauth-client/pom.xml (original) +++ trunk/amdatu-auth/oauth-client/pom.xml Fri Apr 29 10:19:23 2011 @@ -2,25 +2,24 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.amdatu</groupId> + <groupId>org.amdatu.auth</groupId> <artifactId>org.amdatu.auth</artifactId> <version>0.2.0-SNAPSHOT</version> </parent> - <groupId>org.amdatu.auth.oauth</groupId> - <artifactId>client</artifactId> + <artifactId>org.amdatu.auth.oauth.client</artifactId> <packaging>bundle</packaging> <name>Amdatu Auth - oAuth client</name> <description>This bundle includes an API for oAuth service consumers</description> <dependencies> <dependency> - <groupId>org.amdatu.auth.oauth</groupId> - <artifactId>api</artifactId> + <groupId>org.amdatu.auth</groupId> + <artifactId>org.amdatu.auth.oauth.api</artifactId> <type>bundle</type> </dependency> <dependency> <groupId>org.amdatu.web</groupId> - <artifactId>httpcontext</artifactId> + <artifactId>org.amdatu.web.httpcontext</artifactId> <type>bundle</type> </dependency> <dependency> Modified: trunk/amdatu-auth/oauth-consumerregistry-fs/pom.xml ============================================================================== --- trunk/amdatu-auth/oauth-consumerregistry-fs/pom.xml (original) +++ trunk/amdatu-auth/oauth-consumerregistry-fs/pom.xml Fri Apr 29 10:19:23 2011 @@ -2,25 +2,24 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.amdatu</groupId> + <groupId>org.amdatu.auth</groupId> <artifactId>org.amdatu.auth</artifactId> <version>0.2.0-SNAPSHOT</version> </parent> - <groupId>org.amdatu.auth.oauth</groupId> - <artifactId>consumerregistry-fs</artifactId> + <artifactId>org.amdatu.auth.oauth.consumerregistry-fs</artifactId> <packaging>bundle</packaging> <name>Amdatu Auth - oAuth File-based consumer registry store</name> <description>This bundle implements a persistent storage for oAuth service consumers</description> <dependencies> <dependency> - <groupId>org.amdatu.auth.oauth</groupId> - <artifactId>api</artifactId> + <groupId>org.amdatu.auth</groupId> + <artifactId>org.amdatu.auth.oauth.api</artifactId> <type>bundle</type> </dependency> <dependency> <groupId>org.amdatu.libraries</groupId> - <artifactId>fsstorage</artifactId> + <artifactId>org.amdatu.libraries.fsstorage</artifactId> </dependency> </dependencies> Modified: trunk/amdatu-auth/oauth-server/pom.xml ============================================================================== --- trunk/amdatu-auth/oauth-server/pom.xml (original) +++ trunk/amdatu-auth/oauth-server/pom.xml Fri Apr 29 10:19:23 2011 @@ -2,63 +2,62 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.amdatu</groupId> + <groupId>org.amdatu.auth</groupId> <artifactId>org.amdatu.auth</artifactId> <version>0.2.0-SNAPSHOT</version> </parent> - <groupId>org.amdatu.auth.oauth</groupId> - <artifactId>server</artifactId> + <artifactId>org.amdatu.auth.oauth.server</artifactId> <packaging>bundle</packaging> <name>Amdatu Auth - oAuth server</name> <description>This bundle includes an API for oAuth service providers</description> <dependencies> <dependency> - <groupId>org.amdatu.auth.oauth</groupId> - <artifactId>api</artifactId> + <groupId>org.amdatu.auth</groupId> + <artifactId>org.amdatu.auth.oauth.api</artifactId> <type>bundle</type> </dependency> <dependency> <groupId>org.amdatu.auth</groupId> - <artifactId>tokenprovider</artifactId> + <artifactId>org.amdatu.auth.tokenprovider</artifactId> <type>bundle</type> </dependency> <dependency> <groupId>org.amdatu.core</groupId> - <artifactId>tenant</artifactId> + <artifactId>org.amdatu.core.tenant</artifactId> <type>bundle</type> </dependency> <dependency> <groupId>org.amdatu.web</groupId> - <artifactId>dispatcher</artifactId> + <artifactId>org.amdatu.web.dispatcher</artifactId> <type>bundle</type> </dependency> <dependency> <groupId>org.amdatu.web</groupId> - <artifactId>httpcontext</artifactId> + <artifactId>org.amdatu.web.httpcontext</artifactId> <type>bundle</type> </dependency> <dependency> <groupId>org.amdatu.web</groupId> - <artifactId>jsp</artifactId> + <artifactId>org.amdatu.web.jsp</artifactId> <type>bundle</type> </dependency> <dependency> - <groupId>org.amdatu.web.rest</groupId> - <artifactId>jaxrs</artifactId> + <groupId>org.amdatu.web</groupId> + <artifactId>org.amdatu.web.jaxrs</artifactId> <type>bundle</type> </dependency> <dependency> <groupId>org.amdatu.web</groupId> - <artifactId>httpcontext</artifactId> + <artifactId>org.amdatu.web.httpcontext</artifactId> <type>bundle</type> </dependency> <dependency> <groupId>org.amdatu.libraries</groupId> - <artifactId>utilities</artifactId> + <artifactId>org.amdatu.libraries.utilities</artifactId> </dependency> <dependency> Modified: trunk/amdatu-auth/pom.xml ============================================================================== --- trunk/amdatu-auth/pom.xml (original) +++ trunk/amdatu-auth/pom.xml Fri Apr 29 10:19:23 2011 @@ -5,19 +5,20 @@ <parent> <groupId>org.amdatu</groupId> <artifactId>amdatu</artifactId> - <version>2-SNAPSHOT</version> + <version>3-SNAPSHOT</version> <relativePath>../amdatu-parent/pom.xml</relativePath> </parent> + <groupId>org.amdatu.auth</groupId> <artifactId>org.amdatu.auth</artifactId> <version>0.2.0-SNAPSHOT</version> - <name>Amdatu Auth</name> - <description>This module consists of all Authorization and Authentication related bundles</description> <packaging>pom</packaging> + <name>Amdatu Auth</name> + <description>This project brings Authentication and Authorization to the Amdatu platform</description> <properties> <!-- Version of dependend components --> - <amdatu.core.version>0.2.0-SNAPSHOT</amdatu.core.version> - <amdatu.web.version>0.2.0-SNAPSHOT</amdatu.web.version> + <amdatu.core.version>0.2.1-SNAPSHOT</amdatu.core.version> + <amdatu.web.version>0.2.1-SNAPSHOT</amdatu.web.version> <amdatu.libraries.version>0.2.0-SNAPSHOT</amdatu.libraries.version> <org.apache.wink.version>1.1.1-incubating</org.apache.wink.version> </properties> @@ -58,35 +59,26 @@ </repository> </repositories> - <dependencyManagement> <dependencies> - <!-- Internal project dependencies --> <dependency> - <groupId>org.amdatu.auth.oauth</groupId> - <artifactId>api</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - <type>bundle</type> - </dependency> - <dependency> <groupId>org.amdatu.auth</groupId> - <artifactId>tokenprovider</artifactId> + <artifactId>org.amdatu.auth.oauth.api</artifactId> <version>${project.version}</version> <scope>provided</scope> <type>bundle</type> </dependency> <dependency> - <groupId>org.amdatu.auth.login</groupId> - <artifactId>service</artifactId> + <groupId>org.amdatu.auth</groupId> + <artifactId>org.amdatu.auth.tokenprovider</artifactId> <version>${project.version}</version> <scope>provided</scope> <type>bundle</type> </dependency> <dependency> - <groupId>org.amdatu.web</groupId> - <artifactId>resource</artifactId> + <groupId>org.amdatu.auth</groupId> + <artifactId>org.amdatu.auth.login.service</artifactId> <version>${project.version}</version> <scope>provided</scope> <type>bundle</type> @@ -95,7 +87,7 @@ <!-- Dependency setup for amdatu-core project --> <dependency> <groupId>org.amdatu.core</groupId> - <artifactId>tenant</artifactId> + <artifactId>org.amdatu.core.tenant</artifactId> <version>${amdatu.core.version}</version> <scope>provided</scope> <type>bundle</type> @@ -104,28 +96,35 @@ <!-- Dependency setup for amdatu-web project --> <dependency> <groupId>org.amdatu.web</groupId> - <artifactId>httpcontext</artifactId> + <artifactId>org.amdatu.web.httpcontext</artifactId> + <version>${amdatu.web.version}</version> + <scope>provided</scope> + <type>bundle</type> + </dependency> + <dependency> + <groupId>org.amdatu.web</groupId> + <artifactId>org.amdatu.web.dispatcher</artifactId> <version>${amdatu.web.version}</version> <scope>provided</scope> <type>bundle</type> </dependency> <dependency> <groupId>org.amdatu.web</groupId> - <artifactId>dispatcher</artifactId> + <artifactId>org.amdatu.web.jsp</artifactId> <version>${amdatu.web.version}</version> <scope>provided</scope> <type>bundle</type> </dependency> <dependency> <groupId>org.amdatu.web</groupId> - <artifactId>jsp</artifactId> + <artifactId>org.amdatu.web.jaxrs</artifactId> <version>${amdatu.web.version}</version> <scope>provided</scope> <type>bundle</type> </dependency> <dependency> - <groupId>org.amdatu.web.rest</groupId> - <artifactId>jaxrs</artifactId> + <groupId>org.amdatu.web</groupId> + <artifactId>org.amdatu.web.resource</artifactId> <version>${amdatu.web.version}</version> <scope>provided</scope> <type>bundle</type> @@ -134,17 +133,16 @@ <!-- Dependency setup for amdatu-libraries project --> <dependency> <groupId>org.amdatu.libraries</groupId> - <artifactId>utilities</artifactId> + <artifactId>org.amdatu.libraries.utilities</artifactId> <version>${amdatu.libraries.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.amdatu.libraries</groupId> - <artifactId>fsstorage</artifactId> + <artifactId>org.amdatu.libraries.fsstorage</artifactId> <version>${amdatu.libraries.version}</version> <scope>compile</scope> </dependency> - </dependencies> </dependencyManagement> @@ -169,7 +167,4 @@ <module>useradmin-rest</module> </modules> - <build> - <finalName>${project.groupId}.${project.artifactId}-${project.version}</finalName> - </build> </project> \ No newline at end of file Modified: trunk/amdatu-auth/tokenprovider/pom.xml ============================================================================== --- trunk/amdatu-auth/tokenprovider/pom.xml (original) +++ trunk/amdatu-auth/tokenprovider/pom.xml Fri Apr 29 10:19:23 2011 @@ -2,12 +2,11 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.amdatu</groupId> + <groupId>org.amdatu.auth</groupId> <artifactId>org.amdatu.auth</artifactId> <version>0.2.0-SNAPSHOT</version> </parent> - <groupId>org.amdatu.auth</groupId> - <artifactId>tokenprovider</artifactId> + <artifactId>org.amdatu.auth.tokenprovider</artifactId> <packaging>bundle</packaging> <name>Amdatu Auth - Token provider</name> <description>This bundle includes a token provider for token distribution</description> @@ -15,17 +14,17 @@ <dependencies> <dependency> <groupId>org.amdatu.core</groupId> - <artifactId>tenant</artifactId> + <artifactId>org.amdatu.core.tenant</artifactId> <type>bundle</type> </dependency> <dependency> - <groupId>org.amdatu.web.rest</groupId> - <artifactId>jaxrs</artifactId> + <groupId>org.amdatu.web</groupId> + <artifactId>org.amdatu.web.jaxrs</artifactId> <type>bundle</type> </dependency> <dependency> <groupId>org.amdatu.libraries</groupId> - <artifactId>utilities</artifactId> + <artifactId>org.amdatu.libraries.utilities</artifactId> </dependency> <dependency> <groupId>commons-codec</groupId> Modified: trunk/amdatu-auth/tokenstore-mem/pom.xml ============================================================================== --- trunk/amdatu-auth/tokenstore-mem/pom.xml (original) +++ trunk/amdatu-auth/tokenstore-mem/pom.xml Fri Apr 29 10:19:23 2011 @@ -2,12 +2,11 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.amdatu</groupId> + <groupId>org.amdatu.auth</groupId> <artifactId>org.amdatu.auth</artifactId> <version>0.2.0-SNAPSHOT</version> </parent> - <groupId>org.amdatu.auth.tokenstore</groupId> - <artifactId>mem</artifactId> + <artifactId>org.amdatu.auth.tokenstore.mem</artifactId> <packaging>bundle</packaging> <name>Amdatu Auth - In-memory token store</name> <description>This bundle implements an in-memory token store</description> @@ -15,7 +14,7 @@ <dependencies> <dependency> <groupId>org.amdatu.auth</groupId> - <artifactId>tokenprovider</artifactId> + <artifactId>org.amdatu.auth.tokenprovider</artifactId> <type>bundle</type> </dependency> </dependencies> Modified: trunk/amdatu-auth/useradmin-gadget/pom.xml ============================================================================== --- trunk/amdatu-auth/useradmin-gadget/pom.xml (original) +++ trunk/amdatu-auth/useradmin-gadget/pom.xml Fri Apr 29 10:19:23 2011 @@ -2,12 +2,11 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.amdatu</groupId> + <groupId>org.amdatu.auth</groupId> <artifactId>org.amdatu.auth</artifactId> <version>0.2.0-SNAPSHOT</version> </parent> - <groupId>org.amdatu.auth.useradmin</groupId> - <artifactId>gadget</artifactId> + <artifactId>org.amdatu.auth.useradmin.gadget</artifactId> <packaging>bundle</packaging> <name>Amdatu Auth - User Admin Gadget</name> <description>Provides a UserAdmin gadget to manage users and groups</description> @@ -19,22 +18,22 @@ <dependencies> <dependency> <groupId>org.amdatu.web</groupId> - <artifactId>dispatcher</artifactId> + <artifactId>org.amdatu.web.dispatcher</artifactId> <type>bundle</type> </dependency> <dependency> <groupId>org.amdatu.web</groupId> - <artifactId>httpcontext</artifactId> + <artifactId>org.amdatu.web.httpcontext</artifactId> <type>bundle</type> </dependency> <dependency> <groupId>org.amdatu.web</groupId> - <artifactId>jsp</artifactId> + <artifactId>org.amdatu.web.jsp</artifactId> <type>bundle</type> </dependency> <dependency> <groupId>org.amdatu.web</groupId> - <artifactId>resource</artifactId> + <artifactId>org.amdatu.web.resource</artifactId> <type>bundle</type> </dependency> <dependency> Modified: trunk/amdatu-auth/useradmin-rest/pom.xml ============================================================================== --- trunk/amdatu-auth/useradmin-rest/pom.xml (original) +++ trunk/amdatu-auth/useradmin-rest/pom.xml Fri Apr 29 10:19:23 2011 @@ -2,12 +2,11 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.amdatu</groupId> + <groupId>org.amdatu.auth</groupId> <artifactId>org.amdatu.auth</artifactId> <version>0.2.0-SNAPSHOT</version> </parent> - <groupId>org.amdatu.auth.useradmin</groupId> - <artifactId>rest</artifactId> + <artifactId>org.amdatu.auth.useradmin.rest</artifactId> <packaging>bundle</packaging> <name>Amdatu Auth - User Admin REST API</name> <description>Provides a REST API on UserAdmin</description> @@ -15,27 +14,27 @@ <dependencies> <dependency> <groupId>org.amdatu.auth</groupId> - <artifactId>tokenprovider</artifactId> + <artifactId>org.amdatu.auth.tokenprovider</artifactId> <type>bundle</type> </dependency> <dependency> <groupId>org.amdatu.core</groupId> - <artifactId>tenant</artifactId> + <artifactId>org.amdatu.core.tenant</artifactId> <type>bundle</type> </dependency> <dependency> <groupId>org.amdatu.web</groupId> - <artifactId>httpcontext</artifactId> + <artifactId>org.amdatu.web.httpcontext</artifactId> <type>bundle</type> </dependency> <dependency> - <groupId>org.amdatu.web.rest</groupId> - <artifactId>jaxrs</artifactId> + <groupId>org.amdatu.web</groupId> + <artifactId>org.amdatu.web.jaxrs</artifactId> <type>bundle</type> </dependency> <dependency> <groupId>org.amdatu.libraries</groupId> - <artifactId>utilities</artifactId> + <artifactId>org.amdatu.libraries.utilities</artifactId> <scope>compile</scope> </dependency> <dependency> Modified: trunk/amdatu-example/course-gadget/pom.xml ============================================================================== --- trunk/amdatu-example/course-gadget/pom.xml (original) +++ trunk/amdatu-example/course-gadget/pom.xml Fri Apr 29 10:19:23 2011 @@ -46,8 +46,8 @@ <type>bundle</type> </dependency> <dependency> - <groupId>org.amdatu.auth.oauth</groupId> - <artifactId>api</artifactId> + <groupId>org.amdatu.auth</groupId> + <artifactId>org.amdatu.auth.oauth.api</artifactId> <version>${project.version}</version> <scope>provided</scope> <type>bundle</type> Modified: trunk/amdatu-example/course-service/pom.xml ============================================================================== --- trunk/amdatu-example/course-service/pom.xml (original) +++ trunk/amdatu-example/course-service/pom.xml Fri Apr 29 10:19:23 2011 @@ -90,8 +90,8 @@ <type>bundle</type> </dependency> <dependency> - <groupId>org.amdatu.auth.login</groupId> - <artifactId>service</artifactId> + <groupId>org.amdatu.auth</groupId> + <artifactId>org.amdatu.auth.login.service</artifactId> <scope>provided</scope> <type>bundle</type> </dependency> Modified: trunk/amdatu-example/oauth/pom.xml ============================================================================== --- trunk/amdatu-example/oauth/pom.xml (original) +++ trunk/amdatu-example/oauth/pom.xml Fri Apr 29 10:19:23 2011 @@ -54,15 +54,15 @@ <type>bundle</type> </dependency> <dependency> - <groupId>org.amdatu.auth.oauth</groupId> - <artifactId>api</artifactId> + <groupId>org.amdatu.auth</groupId> + <artifactId>org.amdatu.auth.oauth.api</artifactId> <version>${project.version}</version> <scope>provided</scope> <type>bundle</type> </dependency> <dependency> - <groupId>org.amdatu.auth.oauth</groupId> - <artifactId>server</artifactId> + <groupId>org.amdatu.auth</groupId> + <artifactId>org.amdatu.auth.oauth.server</artifactId> <version>${project.version}</version> <scope>provided</scope> <type>bundle</type> Modified: trunk/amdatu-example/pom.xml ============================================================================== --- trunk/amdatu-example/pom.xml (original) +++ trunk/amdatu-example/pom.xml Fri Apr 29 10:19:23 2011 @@ -102,8 +102,8 @@ <type>bundle</type> </dependency> <dependency> - <groupId>org.amdatu.auth.login</groupId> - <artifactId>service</artifactId> + <groupId>org.amdatu.auth</groupId> + <artifactId>org.amdatu.auth.login.service</artifactId> <version>${project.version}</version> <scope>provided</scope> <type>bundle</type> Modified: trunk/amdatu-opensocial/opensocial-shindig/pom.xml ============================================================================== --- trunk/amdatu-opensocial/opensocial-shindig/pom.xml (original) +++ trunk/amdatu-opensocial/opensocial-shindig/pom.xml Fri Apr 29 10:19:23 2011 @@ -60,14 +60,14 @@ <!-- Auth --> <dependency> <groupId>org.amdatu.auth</groupId> - <artifactId>tokenprovider</artifactId> + <artifactId>org.amdatu.auth.tokenprovider</artifactId> <type>bundle</type> </dependency> <!-- Libraries --> <dependency> <groupId>org.amdatu.libraries</groupId> - <artifactId>utilities</artifactId> + <artifactId>org.amdatu.libraries.utilities</artifactId> <scope>compile</scope> </dependency> Modified: trunk/amdatu-opensocial/pom.xml ============================================================================== --- trunk/amdatu-opensocial/pom.xml (original) +++ trunk/amdatu-opensocial/pom.xml Fri Apr 29 10:19:23 2011 @@ -183,7 +183,7 @@ <!-- Dependency setup for amdatu-auth project --> <dependency> <groupId>org.amdatu.auth</groupId> - <artifactId>tokenprovider</artifactId> + <artifactId>org.amdatu.auth.tokenprovider</artifactId> <version>${amdatu.auth.version}</version> <scope>provided</scope> <type>bundle</type> Modified: trunk/integration-tests/test-platform/pom.xml ============================================================================== --- trunk/integration-tests/test-platform/pom.xml (original) +++ trunk/integration-tests/test-platform/pom.xml Fri Apr 29 10:19:23 2011 @@ -210,57 +210,57 @@ <type>bundle</type> </dependency> <dependency> - <groupId>org.amdatu.auth.login</groupId> - <artifactId>service</artifactId> + <groupId>org.amdatu.auth</groupId> + <artifactId>org.amdatu.auth.login.service</artifactId> <version>${project.version}</version> <scope>test</scope> <type>bundle</type> </dependency> <dependency> - <groupId>org.amdatu.auth.useradmin</groupId> - <artifactId>rest</artifactId> + <groupId>org.amdatu.auth</groupId> + <artifactId>org.amdatu.auth.useradmin.rest</artifactId> <version>${project.version}</version> <scope>test</scope> <type>bundle</type> </dependency> <dependency> - <groupId>org.amdatu.auth.oauth</groupId> - <artifactId>api</artifactId> + <groupId>org.amdatu.auth</groupId> + <artifactId>org.amdatu.auth.oauth.api</artifactId> <version>${project.version}</version> <scope>test</scope> <type>bundle</type> </dependency> <dependency> - <groupId>org.amdatu.auth.oauth</groupId> - <artifactId>server</artifactId> + <groupId>org.amdatu.auth</groupId> + <artifactId>org.amdatu.auth.oauth.server</artifactId> <version>${project.version}</version> <scope>test</scope> <type>bundle</type> </dependency> <dependency> - <groupId>org.amdatu.auth.oauth</groupId> - <artifactId>client</artifactId> + <groupId>org.amdatu.auth</groupId> + <artifactId>org.amdatu.auth.oauth.client</artifactId> <version>${project.version}</version> <scope>test</scope> <type>bundle</type> </dependency> <dependency> - <groupId>org.amdatu.auth.oauth</groupId> - <artifactId>consumerregistry-fs</artifactId> + <groupId>org.amdatu.auth</groupId> + <artifactId>org.amdatu.auth.oauth.consumerregistry-fs</artifactId> <version>${project.version}</version> <scope>test</scope> <type>bundle</type> </dependency> <dependency> <groupId>org.amdatu.auth</groupId> - <artifactId>tokenprovider</artifactId> + <artifactId>org.amdatu.auth.tokenprovider</artifactId> <version>${project.version}</version> <scope>test</scope> <type>bundle</type> </dependency> <dependency> - <groupId>org.amdatu.auth.tokenstore</groupId> - <artifactId>mem</artifactId> + <groupId>org.amdatu.auth</groupId> + <artifactId>org.amdatu.auth.tokenstore.mem</artifactId> <version>${project.version}</version> <scope>test</scope> <type>bundle</type> _______________________________________________ Amdatu-commits mailing list [email protected] http://lists.amdatu.org/mailman/listinfo/amdatu-commits
