Author: [email protected]
Date: Wed Apr 4 11:49:43 2012
New Revision: 2180
Log:
[AMDATUAUTH-138] Moved login and useradmin gadgets
Modified:
trunk/amdatu-auth/login-gadget/
trunk/amdatu-auth/pom.xml
trunk/amdatu-auth/release-demo/pom.xml
trunk/amdatu-auth/release/pom.xml
trunk/amdatu-auth/useradmin-gadget/
trunk/amdatu-auth/useradmin-rest/src/main/java/org/amdatu/auth/useradmin/rest/util/
Modified: trunk/amdatu-auth/pom.xml
==============================================================================
--- trunk/amdatu-auth/pom.xml (original)
+++ trunk/amdatu-auth/pom.xml Wed Apr 4 11:49:43 2012
@@ -84,13 +84,6 @@
<!-- Internal project dependencies -->
<dependency>
<groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.login.gadget</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.auth</groupId>
<artifactId>org.amdatu.auth.login.service</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
@@ -161,13 +154,6 @@
</dependency>
<dependency>
<groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.useradmin.gadget</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.auth</groupId>
<artifactId>org.amdatu.auth.useradmin.rest</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
@@ -283,7 +269,6 @@
<modules>
<module>auth-stores</module>
<module>config</module>
- <module>login-gadget</module>
<module>login-service</module>
<module>oauth-api</module>
<module>oauth-client</module>
@@ -296,7 +281,6 @@
<module>test-performance</module>
<module>tokenprovider</module>
<module>tools</module>
- <module>useradmin-gadget</module>
<module>useradmin-rest</module>
</modules>
@@ -348,7 +332,7 @@
<configuration>
<show>public</show>
<detectOfflineLinks>false</detectOfflineLinks>
-
<excludePackageNames>org.amdatu.auth.login.gadget.*:org.amdatu.auth.login.service.*:org.amdatu.auth.oauth.api.*:org.amdatu.auth.oauth.client.*:org.amdatu.auth.oauth.consumerregistry.fs.*:org.amdatu.auth.oauth.server.*:org.amdatu.auth.tokenprovider.*:org.amdatu.auth.tokenstore.mem.*:org.amdatu.auth.useradmin.gadget.*:org.amdatu.auth.useradmin.rest.*</excludePackageNames>
+
<excludePackageNames>org.amdatu.auth.login.service.*:org.amdatu.auth.oauth.api.*:org.amdatu.auth.oauth.client.*:org.amdatu.auth.oauth.consumerregistry.fs.*:org.amdatu.auth.oauth.server.*:org.amdatu.auth.tokenprovider.*:org.amdatu.auth.tokenstore.mem.*:org.amdatu.auth.useradmin.rest.*</excludePackageNames>
</configuration>
<executions>
<execution>
Modified: trunk/amdatu-auth/release-demo/pom.xml
==============================================================================
--- trunk/amdatu-auth/release-demo/pom.xml (original)
+++ trunk/amdatu-auth/release-demo/pom.xml Wed Apr 4 11:49:43 2012
@@ -355,12 +355,6 @@
<!-- Add the Auth dependencies -->
<dependency>
<groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.login.gadget</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.amdatu.auth</groupId>
<artifactId>org.amdatu.auth.login.service</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
@@ -397,12 +391,6 @@
</dependency>
<dependency>
<groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.useradmin.gadget</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.amdatu.auth</groupId>
<artifactId>org.amdatu.auth.useradmin.rest</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
@@ -463,6 +451,20 @@
<version>${org.amdatu.opensocial.version}</version>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>org.amdatu.opensocial</groupId>
+ <artifactId>org.amdatu.opensocial.gadgets.login</artifactId>
+ <version>${org.amdatu.opensocial.version}</version>
+ <type>bundle</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.opensocial</groupId>
+ <artifactId>org.amdatu.opensocial.gadgets.useradmin</artifactId>
+ <version>${org.amdatu.opensocial.version}</version>
+ <type>bundle</type>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
<build>
<defaultGoal>package</defaultGoal>
Modified: trunk/amdatu-auth/release/pom.xml
==============================================================================
--- trunk/amdatu-auth/release/pom.xml (original)
+++ trunk/amdatu-auth/release/pom.xml Wed Apr 4 11:49:43 2012
@@ -36,12 +36,6 @@
<dependencies>
<dependency>
<groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.login.gadget</artifactId>
- <scope>runtime</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.auth</groupId>
<artifactId>org.amdatu.auth.login.service</artifactId>
<scope>runtime</scope>
<type>bundle</type>
@@ -108,12 +102,6 @@
</dependency>
<dependency>
<groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.useradmin.gadget</artifactId>
- <scope>runtime</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.auth</groupId>
<artifactId>org.amdatu.auth.useradmin.rest</artifactId>
<scope>runtime</scope>
<type>bundle</type>
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
