Author: [email protected]
Date: Wed May 4 15:50:40 2011
New Revision: 1092
Log:
[AMDATUAUTH-23] Replaced SNAPSHOT dependencies with release dependencies, added
NOTICE file, disabled modules depending on opensocial (as there will not be an
official release of opensocial before auth 0.2.0 is released) and added ant
tasks to enable easy deployment of Amdatu Auth artifacts into an Amdatu
instance (enable by defining the property amdatu.deploy.directory in your
settings.xml)
Added:
trunk/amdatu-auth/release/src/main/resources/NOTICE.txt
Modified:
trunk/amdatu-auth/pom.xml
trunk/amdatu-auth/useradmin-rest/pom.xml
Modified: trunk/amdatu-auth/pom.xml
==============================================================================
--- trunk/amdatu-auth/pom.xml (original)
+++ trunk/amdatu-auth/pom.xml Wed May 4 15:50:40 2011
@@ -17,10 +17,9 @@
<properties>
<!-- Version of dependend components -->
- <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>
+ <amdatu.core.version>0.2.0</amdatu.core.version>
+ <amdatu.web.version>0.2.0</amdatu.web.version>
+ <amdatu.libraries.version>0.2.0</amdatu.libraries.version>
</properties>
<repositories>
@@ -219,16 +218,23 @@
</distributionManagement>
<modules>
- <module>login-gadget</module>
+ <!--
+ For now these modules are disabled, as it depends on amdatu-opensocial
for which
+ there is no official release yet. So we will first provide an official
0.2.0
+ releases of Amdatu OpenSocial, then we can release Amdatu Auth 0.2.1
including
+ these artifacts.
+ <module>login-gadget</module>
+ <module>oauth-example</module>
+ <module>useradmin-gadget</module>
+ -->
+
<module>login-service</module>
<module>oauth-api</module>
<module>oauth-client</module>
- <module>oauth-example</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>
@@ -253,6 +259,66 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.6</version>
+ <dependencies>
+ <dependency>
+ <groupId>ant-contrib</groupId>
+ <artifactId>ant-contrib</artifactId>
+ <version>1.0b3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-nodeps</artifactId>
+ <version>1.8.1</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <phase>install</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+
+ <taskdef resource="net/sf/antcontrib/antcontrib.properties"
classpathref="maven.compile.classpath"/>
+ <available
file="${project.build.directory}/${project.build.finalName}.jar"
property="fileExists" value="true"/>
+
+ <if>
+ <isset property="fileExists" />
+ <then>
+ <if>
+ <equals arg1="${amdatu.deploy.directory}" arg2="" />
+ <then>
+ <echo message="Property amdatu.deploy.directory not
defined, skipping copy to deploy dir task"/>
+ </then>
+ <else>
+ <copy
+
file="${project.build.directory}/${project.build.finalName}.jar"
+
tofile="${amdatu.deploy.directory}/${project.artifactId}-${project.version}.jar"
+ overwrite="true" />
+
+ <copy todir="${amdatu.deploy.directory}"
overwrite="false">
+ <fileset dir="../config-fileinstall"/>
+ </copy>
+ </else>
+ </if>
+ </then>
+ </if>
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
<pluginManagement>
<plugins>
Added: trunk/amdatu-auth/release/src/main/resources/NOTICE.txt
==============================================================================
--- (empty file)
+++ trunk/amdatu-auth/release/src/main/resources/NOTICE.txt Wed May 4
15:50:40 2011
@@ -0,0 +1,55 @@
+This product includes Amdatu Auth, developed by The Amdatu Foundation
(http://www.amdatu.org/).
+Copyright 2011 The Amdatu Foundation.
+For more information, see
http://www.amdatu.org/confluence/display/Amdatu/Amdatu+Cassandra.
+License: Apache Software License 2.0 (see LICENSE-ASL2.txt).
+-
+This product includes JSON in JAVA, developed by JSON.org
(http://www.json.org).
+Copyright 2002 JSON.org
+For more information, see http://www.json.org/.
+License: JSON (see LICENSE-JSON.txt)
+-
+This product includes the net.oauth Java library, developed by Netflix Inc.
(http://developer.netflix.com/docs)
+Copyright 2007 Netflix, Inc.
+For more information, see http://code.google.com/p/oauth/.
+License: Apache Software License 2.0 (see LICENSE-ASL2.txt).
+-
+This product includes Apache HttpComponents, developed by The Apache Software
Foundation (http://www.apache.org/).
+Copyright 1999-2011 The Apache Software Foundation.
+For more information, see http://hc.apache.org/index.html.
+License: Apache Software License 2.0 (see LICENSE-ASL2.txt).
+-
+This product includes Apache log4j, developed by The Apache Software
Foundation (http://www.apache.org/).
+Copyright 2007 The Apache Software Foundation.
+For more information, see http://logging.apache.org/log4j/.
+License: Apache Software License 2.0 (see LICENSE-ASL2.txt).
+-
+This product includes commons codec, developed by The Apache Software
Foundation (http://www.apache.org/).
+Copyright 2002-2011 The Apache Software Foundation.
+For more information, see http://commons.apache.org/codec/.
+License: Apache Software License 2.0 (see LICENSE-ASL2.txt).
+-
+This product includes commons logging, developed by The Apache Software
Foundation (http://www.apache.org/).
+Copyright 2003-2007 The Apache Software Foundation.
+For more information, see http://commons.apache.org/logging/.
+License: Apache Software License 2.0 (see LICENSE-ASL2.txt).
+-
+This product includes commons beanutils, developed by The Apache Software
Foundation (http://www.apache.org/).
+Copyright 2000-2010 The Apache Software Foundation.
+For more information, see http://commons.apache.org/beanutils/.
+License: Apache Software License 2.0 (see LICENSE-ASL2.txt).
+-
+This product includes commons collections, developed by The Apache Software
Foundation (http://www.apache.org/).
+Copyright 2001-2008 The Apache Software Foundation.
+For more information, see http://commons.apache.org/collections/.
+License: Apache Software License 2.0 (see LICENSE-ASL2.txt).
+-
+This product includes the Apache Wink library, developed by The Apache
Software Foundation (http://www.apache.org/).
+Copyright 2009-2010 The Apache Software Foundation
+For more information, see http://incubator.apache.org/wink/.
+License: Apache Software License 2.0 (see LICENSE-ASL2.txt).
+-
+This product includes Apache SLF4J, developed by Ceki G�lc�.
+Copyright 2004-2005 SLF4J.ORG.
+For more information, see http://www.slf4j.org/.
+License: MIT License (see LICENSE-MIT.txt).
+-
\ No newline at end of file
Modified: trunk/amdatu-auth/useradmin-rest/pom.xml
==============================================================================
--- trunk/amdatu-auth/useradmin-rest/pom.xml (original)
+++ trunk/amdatu-auth/useradmin-rest/pom.xml Wed May 4 15:50:40 2011
@@ -46,7 +46,7 @@
<dependency>
<groupId>org.apache.wink</groupId>
<artifactId>wink-assembly-aggregatejar-osgi</artifactId>
- <version>${org.apache.wink.version}</version>
+ <version>1.1.1-incubating</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -73,7 +73,7 @@
<Bundle-Activator>org.amdatu.authorization.useradmin.rest.osgi.Activator</Bundle-Activator>
<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>
+
<Embed-Dependency>json,org.amdatu.libraries.utilities;scope=compile</Embed-Dependency>
<Export-Package>!*</Export-Package>
<Import-Package>!org.apache.wink.common.internal.*,*</Import-Package>
</instructions>
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
