Author: [email protected]
Date: Mon Apr 18 16:58:30 2011
New Revision: 990
Log:
[AMDATU-352] Moved authorization bundles to amdatu-auth module
Added:
trunk/amdatu-auth/login-gadget/
- copied from r985, /trunk/amdatu-authorization/login-gadget/
trunk/amdatu-auth/login-service/
- copied from r985, /trunk/amdatu-authorization/login-service/
trunk/amdatu-auth/useradmin-gadget/
- copied from r985, /trunk/amdatu-authorization/useradmin-gadget/
trunk/amdatu-auth/useradmin-rest/
- copied from r985, /trunk/amdatu-authorization/useradmin-rest/
Removed:
trunk/amdatu-authorization/login-gadget/
trunk/amdatu-authorization/login-service/
trunk/amdatu-authorization/useradmin-gadget/
trunk/amdatu-authorization/useradmin-rest/
Modified:
trunk/amdatu-auth/login-gadget/pom.xml
trunk/amdatu-auth/login-service/pom.xml
trunk/amdatu-auth/pom.xml
trunk/amdatu-auth/useradmin-gadget/pom.xml
trunk/amdatu-auth/useradmin-rest/pom.xml
trunk/amdatu-authorization/pom.xml
trunk/amdatu-example/course-service/pom.xml
trunk/amdatu-example/pom.xml
trunk/amdatu-release/pom.xml
trunk/amdatu-release/src/main/assembly/bin-component.xml
trunk/amdatu-release/src/main/assembly/war-component.xml
trunk/integration-tests/test-platform/pom.xml
trunk/pom.xml
trunk/src/main/resources/conf/felix-config.properties
Modified: trunk/amdatu-auth/login-gadget/pom.xml
==============================================================================
--- /trunk/amdatu-authorization/login-gadget/pom.xml (original)
+++ trunk/amdatu-auth/login-gadget/pom.xml Mon Apr 18 16:58:30 2011
@@ -3,58 +3,56 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.amdatu</groupId>
- <artifactId>org.amdatu.authorization</artifactId>
+ <artifactId>org.amdatu.auth</artifactId>
<version>0.2.0-SNAPSHOT</version>
</parent>
- <groupId>org.amdatu.authorization.login</groupId>
+ <groupId>org.amdatu.auth.login</groupId>
<artifactId>gadget</artifactId>
<packaging>bundle</packaging>
- <name>Amdatu Authorization - Login gadget</name>
+ <name>Amdatu Auth - Login gadget</name>
<description>Provides a login gadget</description>
+ <properties>
+ <amdatu.opensocial.version>0.2.0-SNAPSHOT</amdatu.opensocial.version>
+ </properties>
+
<dependencies>
<dependency>
+ <groupId>org.amdatu.auth.login</groupId>
+ <artifactId>service</artifactId>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
<groupId>org.amdatu.web</groupId>
<artifactId>dispatcher</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.web</groupId>
<artifactId>httpcontext</artifactId>
- <scope>provided</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.web</groupId>
<artifactId>jsp</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.web</groupId>
<artifactId>resource</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.authorization.login</groupId>
- <artifactId>service</artifactId>
- <scope>provided</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.opensocial</groupId>
<artifactId>shindig</artifactId>
+ <version>${amdatu.opensocial.version}</version>
<scope>provided</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.opensocial</groupId>
<artifactId>gadgetmanagement</artifactId>
+ <version>${amdatu.opensocial.version}</version>
<scope>provided</scope>
<type>bundle</type>
</dependency>
@@ -74,7 +72,7 @@
<configuration>
<instructions>
<Bundle-Activator>org.amdatu.authorization.login.gadget.osgi.Activator</Bundle-Activator>
-
<Bundle-SymbolicName>org.amdatu.authorization.login.gadget</Bundle-SymbolicName>
+
<Bundle-SymbolicName>org.amdatu.auth.login.gadget</Bundle-SymbolicName>
<Embed-Dependency>*;scope=compile</Embed-Dependency>
<Embed-Transitive>true</Embed-Transitive>
</instructions>
Modified: trunk/amdatu-auth/login-service/pom.xml
==============================================================================
--- /trunk/amdatu-authorization/login-service/pom.xml (original)
+++ trunk/amdatu-auth/login-service/pom.xml Mon Apr 18 16:58:30 2011
@@ -3,62 +3,50 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.amdatu</groupId>
- <artifactId>org.amdatu.authorization</artifactId>
+ <artifactId>org.amdatu.auth</artifactId>
<version>0.2.0-SNAPSHOT</version>
</parent>
- <groupId>org.amdatu.authorization.login</groupId>
+ <groupId>org.amdatu.auth.login</groupId>
<artifactId>service</artifactId>
<packaging>bundle</packaging>
- <name>Amdatu Authorization - Login service</name>
+ <name>Amdatu Auth - Login service</name>
<description>Provides a service for login and logout
functionality</description>
<dependencies>
<dependency>
+ <groupId>org.amdatu.auth</groupId>
+ <artifactId>tokenprovider</artifactId>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.core</groupId>
+ <artifactId>tenant</artifactId>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
<groupId>org.amdatu.web</groupId>
<artifactId>dispatcher</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.web</groupId>
<artifactId>httpcontext</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.web.rest</groupId>
<artifactId>jaxrs</artifactId>
- <version>${project.version}</version>
- <type>bundle</type>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.json</groupId>
- <artifactId>json</artifactId>
- <version>20090211</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.amdatu.auth</groupId>
- <artifactId>tokenprovider</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.libraries</groupId>
<artifactId>utilities</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.amdatu.core</groupId>
- <artifactId>tenant</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- <type>bundle</type>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ <version>20090211</version>
+ <scope>compile</scope>
</dependency>
</dependencies>
@@ -70,7 +58,7 @@
<configuration>
<instructions>
<Bundle-Activator>org.amdatu.authorization.login.service.osgi.Activator</Bundle-Activator>
-
<Bundle-SymbolicName>org.amdatu.authorization.login.service</Bundle-SymbolicName>
+
<Bundle-SymbolicName>org.amdatu.auth.login.service</Bundle-SymbolicName>
<Export-Package>org.amdatu.authorization.login.service</Export-Package>
<Embed-Dependency>*;scope=compile</Embed-Dependency>
<Embed-Transitive>true</Embed-Transitive>
Modified: trunk/amdatu-auth/pom.xml
==============================================================================
--- trunk/amdatu-auth/pom.xml (original)
+++ trunk/amdatu-auth/pom.xml Mon Apr 18 16:58:30 2011
@@ -17,8 +17,8 @@
<!-- 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.auth.version>0.2.0-SNAPSHOT</amdatu.auth.version>
<amdatu.libraries.version>0.2.0-SNAPSHOT</amdatu.libraries.version>
+ <org.apache.wink.version>1.1.1-incubating</org.apache.wink.version>
</properties>
<repositories>
@@ -54,6 +54,20 @@
<scope>provided</scope>
<type>bundle</type>
</dependency>
+ <dependency>
+ <groupId>org.amdatu.auth.login</groupId>
+ <artifactId>service</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.web</groupId>
+ <artifactId>resource</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ <type>bundle</type>
+ </dependency>
<!-- Dependency setup for amdatu-core project -->
<dependency>
@@ -93,13 +107,6 @@
<scope>provided</scope>
<type>bundle</type>
</dependency>
- <dependency>
- <groupId>org.amdatu.web</groupId>
- <artifactId>httpcontext</artifactId>
- <version>${amdatu.web.version}</version>
- <scope>provided</scope>
- <type>bundle</type>
- </dependency>
<!-- Dependency setup for amdatu-libraries project -->
<dependency>
@@ -127,12 +134,16 @@
</dependencies>
<modules>
+ <module>login-gadget</module>
+ <module>login-service</module>
<module>oauth-api</module>
<module>oauth-client</module>
<module>oauth-server</module>
<module>oauth-consumerregistry-fs</module>
<module>tokenprovider</module>
<module>tokenstore-mem</module>
+ <module>useradmin-gadget</module>
+ <module>useradmin-rest</module>
</modules>
<build>
Modified: trunk/amdatu-auth/useradmin-gadget/pom.xml
==============================================================================
--- /trunk/amdatu-authorization/useradmin-gadget/pom.xml (original)
+++ trunk/amdatu-auth/useradmin-gadget/pom.xml Mon Apr 18 16:58:30 2011
@@ -3,52 +3,51 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.amdatu</groupId>
- <artifactId>org.amdatu.authorization</artifactId>
+ <artifactId>org.amdatu.auth</artifactId>
<version>0.2.0-SNAPSHOT</version>
</parent>
- <groupId>org.amdatu.authorization.useradmin</groupId>
+ <groupId>org.amdatu.auth.useradmin</groupId>
<artifactId>gadget</artifactId>
<packaging>bundle</packaging>
- <name>Amdatu Authorization - User Admin Gadget</name>
+ <name>Amdatu Auth - User Admin Gadget</name>
<description>Provides a UserAdmin gadget to manage users and
groups</description>
-
- <dependencies>
+
+ <properties>
+ <amdatu.opensocial.version>0.2.0-SNAPSHOT</amdatu.opensocial.version>
+ </properties>
+
+ <dependencies>
<dependency>
<groupId>org.amdatu.web</groupId>
<artifactId>dispatcher</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.web</groupId>
<artifactId>httpcontext</artifactId>
- <scope>provided</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.web</groupId>
<artifactId>jsp</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.web</groupId>
<artifactId>resource</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.opensocial</groupId>
<artifactId>shindig</artifactId>
+ <version>${amdatu.opensocial.version}</version>
<scope>provided</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.opensocial</groupId>
<artifactId>gadgetmanagement</artifactId>
+ <version>${amdatu.opensocial.version}</version>
<scope>provided</scope>
<type>bundle</type>
</dependency>
@@ -57,9 +56,9 @@
<artifactId>json</artifactId>
<version>20090211</version>
<scope>compile</scope>
- </dependency>
+ </dependency>
</dependencies>
-
+
<build>
<plugins>
<plugin>
@@ -68,11 +67,11 @@
<configuration>
<instructions>
<Bundle-Activator>org.amdatu.authorization.useradmin.gadget.osgi.Activator</Bundle-Activator>
- <Bundle-SymbolicName>
org.amdatu.authorization.useradmin.gadget</Bundle-SymbolicName>
+ <Bundle-SymbolicName>
org.amdatu.auth.useradmin.gadget</Bundle-SymbolicName>
<Embed-Dependency>*;scope=compile</Embed-Dependency>
</instructions>
</configuration>
- </plugin>
- </plugins>
- </build>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: trunk/amdatu-auth/useradmin-rest/pom.xml
==============================================================================
--- /trunk/amdatu-authorization/useradmin-rest/pom.xml (original)
+++ trunk/amdatu-auth/useradmin-rest/pom.xml Mon Apr 18 16:58:30 2011
@@ -3,39 +3,45 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.amdatu</groupId>
- <artifactId>org.amdatu.authorization</artifactId>
+ <artifactId>org.amdatu.auth</artifactId>
<version>0.2.0-SNAPSHOT</version>
</parent>
- <groupId>org.amdatu.authorization.useradmin</groupId>
+ <groupId>org.amdatu.auth.useradmin</groupId>
<artifactId>rest</artifactId>
<packaging>bundle</packaging>
- <name>Amdatu Authorization - User Admin REST API</name>
+ <name>Amdatu Auth - User Admin REST API</name>
<description>Provides a REST API on UserAdmin</description>
<dependencies>
<dependency>
+ <groupId>org.amdatu.auth</groupId>
+ <artifactId>tokenprovider</artifactId>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.core</groupId>
+ <artifactId>tenant</artifactId>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
<groupId>org.amdatu.web</groupId>
<artifactId>httpcontext</artifactId>
- <scope>provided</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.web.rest</groupId>
<artifactId>jaxrs</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.json</groupId>
- <artifactId>json</artifactId>
- <version>20090211</version>
+ <groupId>org.amdatu.libraries</groupId>
+ <artifactId>utilities</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.amdatu.libraries</groupId>
- <artifactId>utilities</artifactId>
- <version>${project.version}</version>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ <version>20090211</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -45,20 +51,6 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.amdatu.auth</groupId>
- <artifactId>tokenprovider</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.core</groupId>
- <artifactId>tenant</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.5.6</version>
@@ -80,11 +72,11 @@
<configuration>
<instructions>
<Bundle-Activator>org.amdatu.authorization.useradmin.rest.osgi.Activator</Bundle-Activator>
-
<Bundle-SymbolicName>org.amdatu.authorization.useradmin.rest</Bundle-SymbolicName>
+
<Bundle-SymbolicName>org.amdatu.auth.useradmin.rest</Bundle-SymbolicName>
<Private-Package>org.amdatu.authorization.useradmin.rest.*,org.apache.wink.common.internal.uri</Private-Package>
<Embed-Dependency>json,utilities;scope=compile</Embed-Dependency>
- <Export-Package>!*</Export-Package>
- <Import-Package>!org.apache.wink.common.internal.*,*</Import-Package>
+ <Export-Package>!*</Export-Package>
+
<Import-Package>!org.apache.wink.common.internal.*,*</Import-Package>
</instructions>
</configuration>
</plugin>
Modified: trunk/amdatu-authorization/pom.xml
==============================================================================
--- trunk/amdatu-authorization/pom.xml (original)
+++ trunk/amdatu-authorization/pom.xml Mon Apr 18 16:58:30 2011
@@ -11,44 +11,4 @@
<description>This module consists of all Authorization related
bundles</description>
<packaging>pom</packaging>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.amdatu.authorization.login</groupId>
- <artifactId>service</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.web</groupId>
- <artifactId>httpcontext</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.opensocial</groupId>
- <artifactId>gadgetmanagement</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.opensocial</groupId>
- <artifactId>shindig</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- <type>bundle</type>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <modules>
- <module>login-gadget</module>
- <module>login-service</module>
- <module>useradmin-gadget</module>
- <module>useradmin-rest</module>
- </modules>
-
</project>
\ No newline at end of file
Modified: trunk/amdatu-example/course-service/pom.xml
==============================================================================
--- trunk/amdatu-example/course-service/pom.xml (original)
+++ trunk/amdatu-example/course-service/pom.xml Mon Apr 18 16:58:30 2011
@@ -77,7 +77,7 @@
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.authorization.login</groupId>
+ <groupId>org.amdatu.auth.login</groupId>
<artifactId>service</artifactId>
<scope>provided</scope>
<type>bundle</type>
Modified: trunk/amdatu-example/pom.xml
==============================================================================
--- trunk/amdatu-example/pom.xml (original)
+++ trunk/amdatu-example/pom.xml Mon Apr 18 16:58:30 2011
@@ -63,7 +63,7 @@
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.authorization.login</groupId>
+ <groupId>org.amdatu.auth.login</groupId>
<artifactId>service</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
Modified: trunk/amdatu-release/pom.xml
==============================================================================
--- trunk/amdatu-release/pom.xml (original)
+++ trunk/amdatu-release/pom.xml Mon Apr 18 16:58:30 2011
@@ -13,6 +13,7 @@
<properties>
<cassandra.project.version>0.2.0-SNAPSHOT</cassandra.project.version>
<opensocial.project.version>0.2.0-SNAPSHOT</opensocial.project.version>
+ <auth.project.version>0.2.0-SNAPSHOT</auth.project.version>
</properties>
<dependencies>
@@ -20,72 +21,72 @@
<dependency>
<groupId>org.amdatu.auth.oauth</groupId>
<artifactId>api</artifactId>
- <version>${project.version}</version>
+ <version>${auth.project.version}</version>
<scope>compile</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.auth.oauth</groupId>
<artifactId>server</artifactId>
- <version>${project.version}</version>
+ <version>${auth.project.version}</version>
<scope>compile</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.auth.oauth</groupId>
<artifactId>client</artifactId>
- <version>${project.version}</version>
+ <version>${auth.project.version}</version>
<scope>compile</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.auth.oauth</groupId>
<artifactId>consumerregistry-fs</artifactId>
- <version>${project.version}</version>
+ <version>${auth.project.version}</version>
<scope>compile</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.auth</groupId>
<artifactId>tokenprovider</artifactId>
- <version>${project.version}</version>
+ <version>${auth.project.version}</version>
<scope>compile</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.auth.tokenstore</groupId>
<artifactId>mem</artifactId>
- <version>${project.version}</version>
+ <version>${auth.project.version}</version>
<scope>compile</scope>
<type>bundle</type>
</dependency>
<!-- Authorization bundles -->
<dependency>
- <groupId>org.amdatu.authorization.login</groupId>
+ <groupId>org.amdatu.auth.login</groupId>
<artifactId>gadget</artifactId>
- <version>${project.version}</version>
+ <version>${auth.project.version}</version>
<scope>compile</scope>
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.authorization.login</groupId>
+ <groupId>org.amdatu.auth.login</groupId>
<artifactId>service</artifactId>
- <version>${project.version}</version>
+ <version>${auth.project.version}</version>
<scope>compile</scope>
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.authorization.useradmin</groupId>
+ <groupId>org.amdatu.auth.useradmin</groupId>
<artifactId>gadget</artifactId>
- <version>${project.version}</version>
+ <version>${auth.project.version}</version>
<scope>compile</scope>
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.authorization.useradmin</groupId>
+ <groupId>org.amdatu.auth.useradmin</groupId>
<artifactId>rest</artifactId>
- <version>${project.version}</version>
+ <version>${auth.project.version}</version>
<scope>compile</scope>
<type>bundle</type>
</dependency>
Modified: trunk/amdatu-release/src/main/assembly/bin-component.xml
==============================================================================
--- trunk/amdatu-release/src/main/assembly/bin-component.xml (original)
+++ trunk/amdatu-release/src/main/assembly/bin-component.xml Mon Apr 18
16:58:30 2011
@@ -15,8 +15,8 @@
<includes>
<include>org.amdatu.auth:*</include>
<include>org.amdatu.auth.*:*</include>
- <include>org.amdatu.authorization:*</include>
- <include>org.amdatu.authorization.*:*</include>
+ <include>org.amdatu.auth:*</include>
+ <include>org.amdatu.auth.*:*</include>
<include>org.amdatu.cassandra:*</include>
<include>org.amdatu.cassandra.*:*</include>
<include>org.amdatu.opensocial:*</include>
Modified: trunk/amdatu-release/src/main/assembly/war-component.xml
==============================================================================
--- trunk/amdatu-release/src/main/assembly/war-component.xml (original)
+++ trunk/amdatu-release/src/main/assembly/war-component.xml Mon Apr 18
16:58:30 2011
@@ -15,8 +15,8 @@
<includes>
<include>org.amdatu.auth:*</include>
<include>org.amdatu.auth.*:*</include>
- <include>org.amdatu.authorization:*</include>
- <include>org.amdatu.authorization.*:*</include>
+ <include>org.amdatu.auth:*</include>
+ <include>org.amdatu.auth.*:*</include>
<include>org.amdatu.cassandra:*</include>
<include>org.amdatu.cassandra.*:*</include>
<include>org.amdatu.opensocial:*</include>
Modified: trunk/integration-tests/test-platform/pom.xml
==============================================================================
--- trunk/integration-tests/test-platform/pom.xml (original)
+++ trunk/integration-tests/test-platform/pom.xml Mon Apr 18 16:58:30 2011
@@ -202,14 +202,14 @@
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.authorization.login</groupId>
+ <groupId>org.amdatu.auth.login</groupId>
<artifactId>service</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.authorization.useradmin</groupId>
+ <groupId>org.amdatu.auth.useradmin</groupId>
<artifactId>rest</artifactId>
<version>${project.version}</version>
<scope>test</scope>
Modified: trunk/pom.xml
==============================================================================
--- trunk/pom.xml (original)
+++ trunk/pom.xml Mon Apr 18 16:58:30 2011
@@ -436,7 +436,6 @@
<modules>
<module>amdatu-auth</module>
- <module>amdatu-authorization</module>
<module>amdatu-cassandra</module>
<module>amdatu-core</module>
<module>amdatu-example</module>
Modified: trunk/src/main/resources/conf/felix-config.properties
==============================================================================
--- trunk/src/main/resources/conf/felix-config.properties (original)
+++ trunk/src/main/resources/conf/felix-config.properties Mon Apr 18
16:58:30 2011
@@ -108,10 +108,10 @@
reference:file:amdatu-core/org.amdatu.core.config.templates-${project.version}.jar
\
reference:file:amdatu-application/org.amdatu.web.rest.jaxrs-${project.version}.jar
\
reference:file:amdatu-application/org.amdatu.web.rest.wink-${project.version}.jar
\
-
reference:file:amdatu-application/org.amdatu.authorization.login.gadget-${project.version}.jar
\
-
reference:file:amdatu-application/org.amdatu.authorization.login.service-${project.version}.jar
\
-
reference:file:amdatu-application/org.amdatu.authorization.useradmin.gadget-${project.version}.jar
\
-
reference:file:amdatu-application/org.amdatu.authorization.useradmin.rest-${project.version}.jar
\
+
reference:file:amdatu-application/org.amdatu.auth.login.gadget-${project.version}.jar
\
+
reference:file:amdatu-application/org.amdatu.auth.login.service-${project.version}.jar
\
+
reference:file:amdatu-application/org.amdatu.auth.useradmin.gadget-${project.version}.jar
\
+
reference:file:amdatu-application/org.amdatu.auth.useradmin.rest-${project.version}.jar
\
reference:file:amdatu-application/org.amdatu.auth.oauth.api-${project.version}.jar
\
reference:file:amdatu-application/org.amdatu.auth.oauth.client-${project.version}.jar
\
reference:file:amdatu-application/org.amdatu.auth.oauth.server-${project.version}.jar
\
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
