Author: [email protected]
Date: Mon Apr 18 15:57:21 2011
New Revision: 984
Log:
[AMDATU-352] Refactored amdatu-authentication to get parent pom as its new
parent
Modified:
trunk/amdatu-authentication/oauth-api/pom.xml
trunk/amdatu-authentication/oauth-client/pom.xml
trunk/amdatu-authentication/oauth-consumerregistry-fs/pom.xml
trunk/amdatu-authentication/oauth-consumerregistry-fs/src/main/resources/OSGI-INF/metatype/metatype.xml
trunk/amdatu-authentication/oauth-server/pom.xml
trunk/amdatu-authentication/oauth-server/src/main/resources/OSGI-INF/metatype/metatype.xml
trunk/amdatu-authentication/pom.xml
trunk/amdatu-authentication/tokenprovider/pom.xml
trunk/amdatu-authentication/tokenstore-mem/pom.xml
trunk/amdatu-authorization/login-service/pom.xml
trunk/amdatu-authorization/useradmin-rest/pom.xml
trunk/amdatu-example/course-gadget/pom.xml
trunk/amdatu-example/oauth/pom.xml
trunk/amdatu-opensocial/dashboard/src/main/resources/static/img/lake.png
trunk/amdatu-opensocial/pom.xml
trunk/amdatu-opensocial/shindig/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/src/main/resources/conf/felix-config.properties
Modified: trunk/amdatu-authentication/oauth-api/pom.xml
==============================================================================
--- trunk/amdatu-authentication/oauth-api/pom.xml (original)
+++ trunk/amdatu-authentication/oauth-api/pom.xml Mon Apr 18 15:57:21 2011
@@ -3,38 +3,38 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.amdatu</groupId>
- <artifactId>org.amdatu.authentication</artifactId>
+ <artifactId>org.amdatu.auth</artifactId>
<version>0.2.0-SNAPSHOT</version>
</parent>
- <groupId>org.amdatu.authentication.oauth</groupId>
+ <groupId>org.amdatu.auth.oauth</groupId>
<artifactId>api</artifactId>
<packaging>bundle</packaging>
- <name>Amdatu Authentication - oAuth API (net.oauth)</name>
+ <name>Amdatu Auth - oAuth API (net.oauth)</name>
<description>This bundle includes the net.oauth API</description>
-
+
<dependencies>
<dependency>
<groupId>net.oauth.core</groupId>
<artifactId>oauth</artifactId>
- <version>20100527</version>
+ <version>20100527</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>net.oauth.core</groupId>
<artifactId>oauth-provider</artifactId>
- <version>20100527</version>
+ <version>20100527</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>net.oauth.core</groupId>
<artifactId>oauth-consumer</artifactId>
- <version>20100527</version>
+ <version>20100527</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>net.oauth.core</groupId>
<artifactId>oauth-httpclient4</artifactId>
- <version>20090913</version>
+ <version>20090913</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -54,9 +54,9 @@
<artifactId>log4j</artifactId>
<version>1.2.16</version>
<scope>compile</scope>
- </dependency>
+ </dependency>
</dependencies>
-
+
<build>
<plugins>
<plugin>
@@ -64,10 +64,10 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
-
<Bundle-SymbolicName>org.amdatu.authentication.oauth.api</Bundle-SymbolicName>
+
<Bundle-SymbolicName>org.amdatu.auth.oauth.api</Bundle-SymbolicName>
<Embed-Transitive>true</Embed-Transitive>
<Embed-Dependency>*;scope=compile</Embed-Dependency>
- <Import-Package>*;resolution:=optional</Import-Package>
+ <Import-Package>*;resolution:=optional</Import-Package>
<Export-Package>org.amdatu.authentication.oauth.api</Export-Package>
<_exportcontents>
net.oauth.*
@@ -76,5 +76,5 @@
</configuration>
</plugin>
</plugins>
- </build>
+ </build>
</project>
Modified: trunk/amdatu-authentication/oauth-client/pom.xml
==============================================================================
--- trunk/amdatu-authentication/oauth-client/pom.xml (original)
+++ trunk/amdatu-authentication/oauth-client/pom.xml Mon Apr 18 15:57:21 2011
@@ -3,30 +3,26 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.amdatu</groupId>
- <artifactId>org.amdatu.authentication</artifactId>
+ <artifactId>org.amdatu.auth</artifactId>
<version>0.2.0-SNAPSHOT</version>
</parent>
- <groupId>org.amdatu.authentication.oauth</groupId>
+ <groupId>org.amdatu.auth.oauth</groupId>
<artifactId>client</artifactId>
<packaging>bundle</packaging>
- <name>Amdatu Authentication - oAuth client</name>
+ <name>Amdatu Auth - oAuth client</name>
<description>This bundle includes an API for oAuth service
consumers</description>
-
+
<dependencies>
<dependency>
- <groupId>org.amdatu.web</groupId>
- <artifactId>httpcontext</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
+ <groupId>org.amdatu.auth.oauth</groupId>
+ <artifactId>api</artifactId>
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.authentication.oauth</groupId>
- <artifactId>api</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
+ <groupId>org.amdatu.web</groupId>
+ <artifactId>httpcontext</artifactId>
<type>bundle</type>
- </dependency>
+ </dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
@@ -50,9 +46,9 @@
<artifactId>log4j</artifactId>
<version>1.2.16</version>
<scope>compile</scope>
- </dependency>
+ </dependency>
</dependencies>
-
+
<build>
<plugins>
<plugin>
@@ -61,13 +57,13 @@
<configuration>
<instructions>
<Bundle-Activator>org.amdatu.authentication.oauth.client.osgi.Activator</Bundle-Activator>
-
<Bundle-SymbolicName>org.amdatu.authentication.oauth.client</Bundle-SymbolicName>
+
<Bundle-SymbolicName>org.amdatu.auth.oauth.client</Bundle-SymbolicName>
<Export-Package>org.amdatu.authentication.oauth.client</Export-Package>
- <Embed-Dependency>*;scope=compile</Embed-Dependency>
- <Import-Package>*;resolution:=optional</Import-Package>
+ <Embed-Dependency>*;scope=compile</Embed-Dependency>
+ <Import-Package>*;resolution:=optional</Import-Package>
</instructions>
</configuration>
</plugin>
</plugins>
- </build>
+ </build>
</project>
Modified: trunk/amdatu-authentication/oauth-consumerregistry-fs/pom.xml
==============================================================================
--- trunk/amdatu-authentication/oauth-consumerregistry-fs/pom.xml
(original)
+++ trunk/amdatu-authentication/oauth-consumerregistry-fs/pom.xml Mon Apr
18 15:57:21 2011
@@ -3,31 +3,27 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.amdatu</groupId>
- <artifactId>org.amdatu.authentication</artifactId>
+ <artifactId>org.amdatu.auth</artifactId>
<version>0.2.0-SNAPSHOT</version>
</parent>
- <groupId>org.amdatu.authentication.oauth</groupId>
+ <groupId>org.amdatu.auth.oauth</groupId>
<artifactId>consumerregistry-fs</artifactId>
<packaging>bundle</packaging>
- <name>Amdatu Authentication - oAuth File-based consumer registry store</name>
+ <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.authentication.oauth</groupId>
+ <groupId>org.amdatu.auth.oauth</groupId>
<artifactId>api</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
<type>bundle</type>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.amdatu.libraries</groupId>
<artifactId>fsstorage</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- </dependency>
+ </dependency>
</dependencies>
-
+
<build>
<plugins>
<plugin>
@@ -36,11 +32,11 @@
<configuration>
<instructions>
<Bundle-Activator>org.amdatu.authentication.oauth.consumerregistry.fs.osgi.Activator</Bundle-Activator>
-
<Bundle-SymbolicName>org.amdatu.authentication.oauth.consumerregistry.fs</Bundle-SymbolicName>
+
<Bundle-SymbolicName>org.amdatu.auth.oauth.consumerregistry.fs</Bundle-SymbolicName>
<Embed-Dependency>*;scope=compile</Embed-Dependency>
</instructions>
</configuration>
</plugin>
</plugins>
- </build>
+ </build>
</project>
Modified:
trunk/amdatu-authentication/oauth-consumerregistry-fs/src/main/resources/OSGI-INF/metatype/metatype.xml
==============================================================================
---
trunk/amdatu-authentication/oauth-consumerregistry-fs/src/main/resources/OSGI-INF/metatype/metatype.xml
(original)
+++
trunk/amdatu-authentication/oauth-consumerregistry-fs/src/main/resources/OSGI-INF/metatype/metatype.xml
Mon Apr 18 15:57:21 2011
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<metatype:MetaData xmlns:metatype="http://www.osgi.org/xmlns/metatype/v1.0.0";>
- <OCD id="org.amdatu.authentication.oauth.consumerregistry.fs" name="Amdatu
OAuth consumer registry file storage">
+ <OCD id="org.amdatu.auth.oauth.consumerregistry.fs" name="Amdatu OAuth
consumer registry file storage">
<AD id="datadir" name="datadir" type="String"/>
</OCD>
- <Designate pid="org.amdatu.authentication.oauth.consumerregistry.fs">
- <Object ocdref="org.amdatu.authentication.oauth.consumerregistry.fs"/>
+ <Designate pid="org.amdatu.auth.oauth.consumerregistry.fs">
+ <Object ocdref="org.amdatu.auth.oauth.consumerregistry.fs"/>
</Designate>
</metatype:MetaData>
\ No newline at end of file
Modified: trunk/amdatu-authentication/oauth-server/pom.xml
==============================================================================
--- trunk/amdatu-authentication/oauth-server/pom.xml (original)
+++ trunk/amdatu-authentication/oauth-server/pom.xml Mon Apr 18 15:57:21 2011
@@ -3,58 +3,64 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.amdatu</groupId>
- <artifactId>org.amdatu.authentication</artifactId>
+ <artifactId>org.amdatu.auth</artifactId>
<version>0.2.0-SNAPSHOT</version>
</parent>
- <groupId>org.amdatu.authentication.oauth</groupId>
+ <groupId>org.amdatu.auth.oauth</groupId>
<artifactId>server</artifactId>
<packaging>bundle</packaging>
- <name>Amdatu Authentication - oAuth server</name>
+ <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>
+ <type>bundle</type>
+ </dependency>
+ <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</groupId>
<artifactId>jsp</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>
- <scope>provided</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.authentication.oauth</groupId>
- <artifactId>api</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.libraries</groupId>
+ <artifactId>utilities</artifactId>
+ </dependency>
+
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
@@ -79,26 +85,7 @@
<version>1.1.1</version>
<scope>compile</scope>
</dependency>
- <dependency>
- <groupId>org.amdatu.libraries</groupId>
- <artifactId>utilities</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.amdatu.authentication</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>
+
</dependencies>
<build>
@@ -109,7 +96,7 @@
<configuration>
<instructions>
<Bundle-Activator>org.amdatu.authentication.oauth.server.osgi.Activator</Bundle-Activator>
-
<Bundle-SymbolicName>org.amdatu.authentication.oauth.server</Bundle-SymbolicName>
+
<Bundle-SymbolicName>org.amdatu.auth.oauth.server</Bundle-SymbolicName>
<Export-Package>org.amdatu.authentication.oauth.server</Export-Package>
<Embed-Dependency>*;scope=compile</Embed-Dependency>
<DynamicImport-Package>
Modified:
trunk/amdatu-authentication/oauth-server/src/main/resources/OSGI-INF/metatype/metatype.xml
==============================================================================
---
trunk/amdatu-authentication/oauth-server/src/main/resources/OSGI-INF/metatype/metatype.xml
(original)
+++
trunk/amdatu-authentication/oauth-server/src/main/resources/OSGI-INF/metatype/metatype.xml
Mon Apr 18 15:57:21 2011
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<metatype:MetaData xmlns:metatype="http://www.osgi.org/xmlns/metatype/v1.0.0";>
- <OCD id="org.amdatu.authentication.oauth.server" name="Amdatu OAuth
server">
+ <OCD id="org.amdatu.auth.oauth.server" name="Amdatu OAuth server">
<AD id="hostname" name="hostname" type="String"/>
<AD id="portnr" name="portnr" type="String"/>
<AD id="authorizeurl" name="authorizeurl" type="String"/>
</OCD>
- <Designate pid="org.amdatu.authentication.oauth.server">
- <Object ocdref="org.amdatu.authentication.oauth.server"/>
+ <Designate pid="org.amdatu.auth.oauth.server">
+ <Object ocdref="org.amdatu.auth.oauth.server"/>
</Designate>
-</metatype:MetaData>
\ No newline at end of file
+</metatype:MetaData>
\ No newline at end of file
Modified: trunk/amdatu-authentication/pom.xml
==============================================================================
--- trunk/amdatu-authentication/pom.xml (original)
+++ trunk/amdatu-authentication/pom.xml Mon Apr 18 15:57:21 2011
@@ -5,12 +5,119 @@
<groupId>org.amdatu</groupId>
<artifactId>amdatu</artifactId>
<version>0.2.0-SNAPSHOT</version>
+ <relativePath>../amdatu-parent/pom.xml</relativePath>
</parent>
- <artifactId>org.amdatu.authentication</artifactId>
- <name>Amdatu Authentication</name>
- <description>This module consists of all Authentication related
bundles</description>
+ <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>
+ <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.auth.version>0.2.0-SNAPSHOT</amdatu.auth.version>
+ <amdatu.libraries.version>0.2.0-SNAPSHOT</amdatu.libraries.version>
+ </properties>
+
+ <repositories>
+ <repository>
+ <id>oauth.googlecode.com</id>
+ <name>OAuth Google Code</name>
+ <url>http://oauth.googlecode.com/svn/code/maven</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </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>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ <type>bundle</type>
+ </dependency>
+
+ <!-- Dependency setup for amdatu-core project -->
+ <dependency>
+ <groupId>org.amdatu.core</groupId>
+ <artifactId>tenant</artifactId>
+ <version>${amdatu.core.version}</version>
+ <scope>provided</scope>
+ <type>bundle</type>
+ </dependency>
+
+ <!-- Dependency setup for amdatu-web project -->
+ <dependency>
+ <groupId>org.amdatu.web</groupId>
+ <artifactId>httpcontext</artifactId>
+ <version>${amdatu.web.version}</version>
+ <scope>provided</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.web</groupId>
+ <artifactId>dispatcher</artifactId>
+ <version>${amdatu.web.version}</version>
+ <scope>provided</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.web</groupId>
+ <artifactId>jsp</artifactId>
+ <version>${amdatu.web.version}</version>
+ <scope>provided</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.web.rest</groupId>
+ <artifactId>jaxrs</artifactId>
+ <version>${amdatu.web.version}</version>
+ <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>
+ <groupId>org.amdatu.libraries</groupId>
+ <artifactId>utilities</artifactId>
+ <version>${amdatu.libraries.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.libraries</groupId>
+ <artifactId>fsstorage</artifactId>
+ <version>${amdatu.libraries.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ </dependencies>
+ </dependencyManagement>
+
<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
@@ -28,4 +135,7 @@
<module>tokenstore-mem</module>
</modules>
+ <build>
+
<finalName>${project.groupId}.${project.artifactId}-${project.version}</finalName>
+ </build>
</project>
\ No newline at end of file
Modified: trunk/amdatu-authentication/tokenprovider/pom.xml
==============================================================================
--- trunk/amdatu-authentication/tokenprovider/pom.xml (original)
+++ trunk/amdatu-authentication/tokenprovider/pom.xml Mon Apr 18 15:57:21 2011
@@ -3,41 +3,35 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.amdatu</groupId>
- <artifactId>org.amdatu.authentication</artifactId>
+ <artifactId>org.amdatu.auth</artifactId>
<version>0.2.0-SNAPSHOT</version>
</parent>
- <groupId>org.amdatu.authentication</groupId>
+ <groupId>org.amdatu.auth</groupId>
<artifactId>tokenprovider</artifactId>
<packaging>bundle</packaging>
- <name>Amdatu Authentication - Token provider</name>
+ <name>Amdatu Auth - Token provider</name>
<description>This bundle includes a token provider for token
distribution</description>
<dependencies>
<dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.4</version>
- <scope>compile</scope>
+ <groupId>org.amdatu.core</groupId>
+ <artifactId>tenant</artifactId>
+ <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.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>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.4</version>
+ <scope>compile</scope>
</dependency>
</dependencies>
@@ -49,7 +43,7 @@
<configuration>
<instructions>
<Bundle-Activator>org.amdatu.authentication.tokenprovider.osgi.Activator</Bundle-Activator>
-
<Bundle-SymbolicName>org.amdatu.authentication.tokenprovider</Bundle-SymbolicName>
+
<Bundle-SymbolicName>org.amdatu.auth.tokenprovider</Bundle-SymbolicName>
<Export-Package>org.amdatu.authentication.tokenprovider</Export-Package>
<Embed-Dependency>*;scope=compile</Embed-Dependency>
<DynamicImport-Package>
Modified: trunk/amdatu-authentication/tokenstore-mem/pom.xml
==============================================================================
--- trunk/amdatu-authentication/tokenstore-mem/pom.xml (original)
+++ trunk/amdatu-authentication/tokenstore-mem/pom.xml Mon Apr 18 15:57:21 2011
@@ -3,25 +3,23 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.amdatu</groupId>
- <artifactId>org.amdatu.authentication</artifactId>
+ <artifactId>org.amdatu.auth</artifactId>
<version>0.2.0-SNAPSHOT</version>
</parent>
- <groupId>org.amdatu.authentication.tokenstore</groupId>
+ <groupId>org.amdatu.auth.tokenstore</groupId>
<artifactId>mem</artifactId>
<packaging>bundle</packaging>
- <name>Amdatu Authentication - In-memory token store</name>
+ <name>Amdatu Auth - In-memory token store</name>
<description>This bundle implements an in-memory token store</description>
-
+
<dependencies>
<dependency>
- <groupId>org.amdatu.authentication</groupId>
+ <groupId>org.amdatu.auth</groupId>
<artifactId>tokenprovider</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
<type>bundle</type>
</dependency>
</dependencies>
-
+
<build>
<plugins>
<plugin>
@@ -30,11 +28,11 @@
<configuration>
<instructions>
<Bundle-Activator>org.amdatu.authentication.tokenstore.mem.osgi.Activator</Bundle-Activator>
-
<Bundle-SymbolicName>org.amdatu.authentication.tokenstore.mem</Bundle-SymbolicName>
+
<Bundle-SymbolicName>org.amdatu.auth.tokenstore.mem</Bundle-SymbolicName>
<Export-Package>org.amdatu.authentication.tokenstore.mem</Export-Package>
</instructions>
</configuration>
</plugin>
</plugins>
- </build>
+ </build>
</project>
Modified: trunk/amdatu-authorization/login-service/pom.xml
==============================================================================
--- trunk/amdatu-authorization/login-service/pom.xml (original)
+++ trunk/amdatu-authorization/login-service/pom.xml Mon Apr 18 15:57:21 2011
@@ -41,7 +41,7 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.amdatu.authentication</groupId>
+ <groupId>org.amdatu.auth</groupId>
<artifactId>tokenprovider</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
Modified: trunk/amdatu-authorization/useradmin-rest/pom.xml
==============================================================================
--- trunk/amdatu-authorization/useradmin-rest/pom.xml (original)
+++ trunk/amdatu-authorization/useradmin-rest/pom.xml Mon Apr 18 15:57:21 2011
@@ -45,7 +45,7 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.amdatu.authentication</groupId>
+ <groupId>org.amdatu.auth</groupId>
<artifactId>tokenprovider</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
Modified: trunk/amdatu-example/course-gadget/pom.xml
==============================================================================
--- trunk/amdatu-example/course-gadget/pom.xml (original)
+++ trunk/amdatu-example/course-gadget/pom.xml Mon Apr 18 15:57:21 2011
@@ -46,7 +46,7 @@
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.authentication.oauth</groupId>
+ <groupId>org.amdatu.auth.oauth</groupId>
<artifactId>api</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
Modified: trunk/amdatu-example/oauth/pom.xml
==============================================================================
--- trunk/amdatu-example/oauth/pom.xml (original)
+++ trunk/amdatu-example/oauth/pom.xml Mon Apr 18 15:57:21 2011
@@ -54,14 +54,14 @@
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.authentication.oauth</groupId>
+ <groupId>org.amdatu.auth.oauth</groupId>
<artifactId>api</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.authentication.oauth</groupId>
+ <groupId>org.amdatu.auth.oauth</groupId>
<artifactId>server</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
Modified:
trunk/amdatu-opensocial/dashboard/src/main/resources/static/img/lake.png
==============================================================================
Binary files. No diff available.
Modified: trunk/amdatu-opensocial/pom.xml
==============================================================================
--- trunk/amdatu-opensocial/pom.xml (original)
+++ trunk/amdatu-opensocial/pom.xml Mon Apr 18 15:57:21 2011
@@ -126,7 +126,7 @@
<!-- Dependency setup for amdatu-auth project -->
<dependency>
- <groupId>org.amdatu.authentication</groupId>
+ <groupId>org.amdatu.auth</groupId>
<artifactId>tokenprovider</artifactId>
<version>${amdatu.auth.version}</version>
<scope>provided</scope>
Modified: trunk/amdatu-opensocial/shindig/pom.xml
==============================================================================
--- trunk/amdatu-opensocial/shindig/pom.xml (original)
+++ trunk/amdatu-opensocial/shindig/pom.xml Mon Apr 18 15:57:21 2011
@@ -60,7 +60,7 @@
<!-- Auth -->
<dependency>
- <groupId>org.amdatu.authentication</groupId>
+ <groupId>org.amdatu.auth</groupId>
<artifactId>tokenprovider</artifactId>
<type>bundle</type>
</dependency>
Modified: trunk/amdatu-release/pom.xml
==============================================================================
--- trunk/amdatu-release/pom.xml (original)
+++ trunk/amdatu-release/pom.xml Mon Apr 18 15:57:21 2011
@@ -18,42 +18,42 @@
<dependencies>
<!-- Authentication bundles -->
<dependency>
- <groupId>org.amdatu.authentication.oauth</groupId>
+ <groupId>org.amdatu.auth.oauth</groupId>
<artifactId>api</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.authentication.oauth</groupId>
+ <groupId>org.amdatu.auth.oauth</groupId>
<artifactId>server</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.authentication.oauth</groupId>
+ <groupId>org.amdatu.auth.oauth</groupId>
<artifactId>client</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.authentication.oauth</groupId>
+ <groupId>org.amdatu.auth.oauth</groupId>
<artifactId>consumerregistry-fs</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.authentication</groupId>
+ <groupId>org.amdatu.auth</groupId>
<artifactId>tokenprovider</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.authentication.tokenstore</groupId>
+ <groupId>org.amdatu.auth.tokenstore</groupId>
<artifactId>mem</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
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
15:57:21 2011
@@ -13,8 +13,8 @@
<outputFileNameMapping>${artifact.groupId}.${artifact.artifactId}-${artifact.version}.${artifact.extension}
</outputFileNameMapping>
<includes>
- <include>org.amdatu.authentication:*</include>
- <include>org.amdatu.authentication.*:*</include>
+ <include>org.amdatu.auth:*</include>
+ <include>org.amdatu.auth.*:*</include>
<include>org.amdatu.authorization:*</include>
<include>org.amdatu.authorization.*:*</include>
<include>org.amdatu.cassandra:*</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
15:57:21 2011
@@ -13,8 +13,8 @@
<outputFileNameMapping>${artifact.groupId}.${artifact.artifactId}-${artifact.version}.${artifact.extension}
</outputFileNameMapping>
<includes>
- <include>org.amdatu.authentication:*</include>
- <include>org.amdatu.authentication.*:*</include>
+ <include>org.amdatu.auth:*</include>
+ <include>org.amdatu.auth.*:*</include>
<include>org.amdatu.authorization:*</include>
<include>org.amdatu.authorization.*:*</include>
<include>org.amdatu.cassandra:*</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 15:57:21 2011
@@ -216,42 +216,42 @@
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.authentication.oauth</groupId>
+ <groupId>org.amdatu.auth.oauth</groupId>
<artifactId>api</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.authentication.oauth</groupId>
+ <groupId>org.amdatu.auth.oauth</groupId>
<artifactId>server</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.authentication.oauth</groupId>
+ <groupId>org.amdatu.auth.oauth</groupId>
<artifactId>client</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.authentication.oauth</groupId>
+ <groupId>org.amdatu.auth.oauth</groupId>
<artifactId>consumerregistry-fs</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.authentication</groupId>
+ <groupId>org.amdatu.auth</groupId>
<artifactId>tokenprovider</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.authentication.tokenstore</groupId>
+ <groupId>org.amdatu.auth.tokenstore</groupId>
<artifactId>mem</artifactId>
<version>${project.version}</version>
<scope>test</scope>
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
15:57:21 2011
@@ -112,12 +112,12 @@
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.authentication.oauth.api-${project.version}.jar
\
-
reference:file:amdatu-application/org.amdatu.authentication.oauth.client-${project.version}.jar
\
-
reference:file:amdatu-application/org.amdatu.authentication.oauth.server-${project.version}.jar
\
-
reference:file:amdatu-application/org.amdatu.authentication.oauth.consumerregistry-fs-${project.version}.jar
\
-
reference:file:amdatu-application/org.amdatu.authentication.tokenprovider-${project.version}.jar
\
-
reference:file:amdatu-application/org.amdatu.authentication.tokenstore.mem-${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
\
+
reference:file:amdatu-application/org.amdatu.auth.oauth.consumerregistry-fs-${project.version}.jar
\
+
reference:file:amdatu-application/org.amdatu.auth.tokenprovider-${project.version}.jar
\
+
reference:file:amdatu-application/org.amdatu.auth.tokenstore.mem-${project.version}.jar
\
reference:file:amdatu-application/org.amdatu.web.httpcontext-${project.version}.jar
\
reference:file:amdatu-application/org.amdatu.web.dispatcher-${project.version}.jar
\
reference:file:amdatu-application/org.amdatu.web.tenantresolver-hostname-${project.version}.jar
\
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
