Author: [email protected]
Date: Mon Aug 8 11:08:35 2011
New Revision: 1278
Log:
[AMDATUCASSANDRA-75] Fixed creation of bogus ${amdatu.deploy.directoy} files.
Also fixed that only artifacts will be deployed that are relevant for the
Amdatu runtime (i.e. no integration test bundles)
Modified:
trunk/amdatu-cassandra/cassandra-application/pom.xml
trunk/amdatu-cassandra/cassandra-gadgetstore/pom.xml
trunk/amdatu-cassandra/cassandra-listener/pom.xml
trunk/amdatu-cassandra/cassandra-persistencemanager/pom.xml
trunk/amdatu-cassandra/cassandra-store-consumer/pom.xml
trunk/amdatu-cassandra/cassandra-store-tenant/pom.xml
trunk/amdatu-cassandra/cassandra-store-token/pom.xml
trunk/amdatu-cassandra/cassandra-store-useradmin/pom.xml
trunk/amdatu-cassandra/pom.xml
trunk/amdatu-cassandra/test-integration/tests/pom.xml
Modified: trunk/amdatu-cassandra/cassandra-application/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/cassandra-application/pom.xml (original)
+++ trunk/amdatu-cassandra/cassandra-application/pom.xml Mon Aug 8
11:08:35 2011
@@ -151,8 +151,26 @@
</instructions>
</configuration>
</plugin>
-
</plugins>
-
</build>
+
+ <profiles>
+ <profile>
+ <!-- Profile that will copy the jar to the configured
amdatu.deploy.directory when
+ the deploy profile is activated -->
+ <id>deploy</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <defaultGoal>install</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: trunk/amdatu-cassandra/cassandra-gadgetstore/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/cassandra-gadgetstore/pom.xml (original)
+++ trunk/amdatu-cassandra/cassandra-gadgetstore/pom.xml Mon Aug 8
11:08:35 2011
@@ -69,4 +69,24 @@
</plugin>
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <!-- Profile that will copy the jar to the configured
amdatu.deploy.directory when
+ the deploy profile is activated -->
+ <id>deploy</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <defaultGoal>install</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: trunk/amdatu-cassandra/cassandra-listener/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/cassandra-listener/pom.xml (original)
+++ trunk/amdatu-cassandra/cassandra-listener/pom.xml Mon Aug 8 11:08:35 2011
@@ -66,8 +66,26 @@
</instructions>
</configuration>
</plugin>
-
</plugins>
-
</build>
+
+ <profiles>
+ <profile>
+ <!-- Profile that will copy the jar to the configured
amdatu.deploy.directory when
+ the deploy profile is activated -->
+ <id>deploy</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <defaultGoal>install</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: trunk/amdatu-cassandra/cassandra-persistencemanager/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/cassandra-persistencemanager/pom.xml (original)
+++ trunk/amdatu-cassandra/cassandra-persistencemanager/pom.xml Mon Aug 8
11:08:35 2011
@@ -118,7 +118,26 @@
</instructions>
</configuration>
</plugin>
-
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <!-- Profile that will copy the jar to the configured
amdatu.deploy.directory when
+ the deploy profile is activated -->
+ <id>deploy</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <defaultGoal>install</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: trunk/amdatu-cassandra/cassandra-store-consumer/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/cassandra-store-consumer/pom.xml (original)
+++ trunk/amdatu-cassandra/cassandra-store-consumer/pom.xml Mon Aug 8
11:08:35 2011
@@ -118,4 +118,24 @@
</plugin>
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <!-- Profile that will copy the jar to the configured
amdatu.deploy.directory when
+ the deploy profile is activated -->
+ <id>deploy</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <defaultGoal>install</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: trunk/amdatu-cassandra/cassandra-store-tenant/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/cassandra-store-tenant/pom.xml (original)
+++ trunk/amdatu-cassandra/cassandra-store-tenant/pom.xml Mon Aug 8
11:08:35 2011
@@ -72,7 +72,26 @@
</instructions>
</configuration>
</plugin>
-
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <!-- Profile that will copy the jar to the configured
amdatu.deploy.directory when
+ the deploy profile is activated -->
+ <id>deploy</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <defaultGoal>install</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: trunk/amdatu-cassandra/cassandra-store-token/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/cassandra-store-token/pom.xml (original)
+++ trunk/amdatu-cassandra/cassandra-store-token/pom.xml Mon Aug 8
11:08:35 2011
@@ -99,4 +99,24 @@
</plugin>
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <!-- Profile that will copy the jar to the configured
amdatu.deploy.directory when
+ the deploy profile is activated -->
+ <id>deploy</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <defaultGoal>install</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: trunk/amdatu-cassandra/cassandra-store-useradmin/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/cassandra-store-useradmin/pom.xml (original)
+++ trunk/amdatu-cassandra/cassandra-store-useradmin/pom.xml Mon Aug 8
11:08:35 2011
@@ -112,4 +112,24 @@
</plugin>
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <!-- Profile that will copy the jar to the configured
amdatu.deploy.directory when
+ the deploy profile is activated -->
+ <id>deploy</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <defaultGoal>install</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: trunk/amdatu-cassandra/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/pom.xml (original)
+++ trunk/amdatu-cassandra/pom.xml Mon Aug 8 11:08:35 2011
@@ -270,14 +270,7 @@
<modules>
<module>config</module>
<module>cassandra-application</module>
-
- <!--
- For now this module is disabled, as it depends on amdatu-opensocial for
which
- there is no official release yet. So we will first provide official 0.2.0
- releases for Amdatu Cassandra, Amdatu OpenSocial and Amdatu Auth, then
we can
- release Amdatu Cassandra 0.2.1 including this artifact.
- <module>cassandra-gadgetstore</module>
- -->
+ <module>cassandra-gadgetstore</module>
<module>cassandra-listener</module>
<module>cassandra-persistencemanager</module>
<module>cassandra-store-consumer</module>
@@ -366,6 +359,7 @@
</execution>
</executions>
</plugin>
+
<!--
Apache Cassandra requires Java 1.6
-->
@@ -378,6 +372,64 @@
<target>1.6</target>
</configuration>
</plugin>
+
+ <!-- Plugin configuration for -Pdeploy -->
+ <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>
+ <isset property="amdatu.deploy.directory"/>
+ <then>
+ <copy
+
file="${project.build.directory}/${project.build.finalName}.jar"
+
tofile="${amdatu.deploy.directory}/${project.artifactId}-${project.version}.jar"
+ overwrite="true" />
+ </then>
+ <else>
+ <echo message="Property amdatu.deploy.directory not
defined, skipping copy to deploy dir task"/>
+ </else>
+ </if>
+ </then>
+ </if>
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</pluginManagement>
<!-- This can be removed when using the parent pom version 3 -->
@@ -415,83 +467,5 @@
</plugins>
</reporting>
- <profiles>
- <profile>
- <id>deploy</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <build>
- <defaultGoal>install</defaultGoal>
- <plugins>
- <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"/>
- <available file="../config-fileinstall"
property="configFileDirExists" 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" />
-
- <if>
- <isset property="configFileDirExists" />
- <then>
- <copy todir="${amdatu.deploy.directory}"
overwrite="false">
- <fileset dir="../config-fileinstall"/>
- </copy>
- </then>
- </if>
- </else>
- </if>
- </then>
- </if>
- </target>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+
</project>
\ No newline at end of file
Modified: trunk/amdatu-cassandra/test-integration/tests/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/test-integration/tests/pom.xml (original)
+++ trunk/amdatu-cassandra/test-integration/tests/pom.xml Mon Aug 8
11:08:35 2011
@@ -138,43 +138,6 @@
</build>
<profiles>
<!--
- Outside the itest profile show some help.
- -->
- <profile>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <build>
- <defaultGoal>initialize</defaultGoal>
- <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>show-help</id>
- <phase>initialize</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <echo>
- <![CDATA[
-================================================
-Please activate the "itest" profile if you whish
-to run the Amdatu Cassandra integration tests
-================================================
- ]]>
- </echo>
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <!--
In the itest profile launch surefire in the
integration-test phase.
-->
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
