Author: davidillsley
Date: Fri Jun 6 08:05:40 2008
New Revision: 663974
URL: http://svn.apache.org/viewvc?rev=663974&view=rev
Log:
update poms to use maven file copy... for continuum
Modified:
webservices/sandesha/trunk/java/modules/client/pom.xml
webservices/sandesha/trunk/java/modules/mar/pom.xml
webservices/sandesha/trunk/java/modules/policy/pom.xml
webservices/sandesha/trunk/java/modules/tests/pom.xml
webservices/sandesha/trunk/java/modules/tests/tests.build.xml
Modified: webservices/sandesha/trunk/java/modules/client/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/client/pom.xml?rev=663974&r1=663973&r2=663974&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/client/pom.xml (original)
+++ webservices/sandesha/trunk/java/modules/client/pom.xml Fri Jun 6 08:05:40
2008
@@ -41,41 +41,33 @@
</resource>
</resources>
<plugins>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.1</version>
- <executions>
- <execution>
- <id>create-test-resources</id>
- <phase>process-test-resources</phase>
- <configuration>
- <tasks>
-
- <!--copy sandesha client classes from core
module-->
- <copy overwrite="yes"
-
file="../core/target/classes/org/apache/sandesha2/client/SandeshaClientConstants.class"
-
tofile="target/classes/org/apache/sandesha2/client/SandeshaClientConstants.class"/>
- <copy overwrite="yes"
-
file="../core/target/classes/org/apache/sandesha2/client/SandeshaListener.class"
-
tofile="target/classes/org/apache/sandesha2/client/SandeshaListener.class"/>
- <copy overwrite="yes"
-
file="../core/target/classes/org/apache/sandesha2/client/SequenceReport.class"
-
tofile="target/classes/org/apache/sandesha2/client/SequenceReport.class"/>
-
-
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
-
- <plugin>
+<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.sandesha2</groupId>
+ <artifactId>sandesha2-core</artifactId>
+ <version>${pom.version}</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+
<outputDirectory>${project.build.directory}/classes/</outputDirectory>
+
<includes>org/apache/sandesha2/client/SandeshaClientConstants.class,org/apache/sandesha2/client/SandeshaListener.class,org/apache/sandesha2/client/SequenceReport.class</includes>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
Modified: webservices/sandesha/trunk/java/modules/mar/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/mar/pom.xml?rev=663974&r1=663973&r2=663974&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/mar/pom.xml (original)
+++ webservices/sandesha/trunk/java/modules/mar/pom.xml Fri Jun 6 08:05:40 2008
@@ -43,27 +43,33 @@
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.1</version>
- <executions>
- <execution>
- <id>create-test-resources</id>
- <phase>process-test-resources</phase>
- <configuration>
- <tasks>
- <!--copy jboss client jars into service
archive-->
- <copydir src="../core/target/classes"
- dest="target/classes"/>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.sandesha2</groupId>
+ <artifactId>sandesha2-core</artifactId>
+ <version>${pom.version}</version>
+ <type>jar</type>
+ <overWrite>false</overWrite>
+
<outputDirectory>${project.build.directory}/classes/</outputDirectory>
+ <includes>**/*.class,**/*.xml</includes>
+ <excludes>**/*test.class</excludes>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
Modified: webservices/sandesha/trunk/java/modules/policy/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/policy/pom.xml?rev=663974&r1=663973&r2=663974&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/policy/pom.xml (original)
+++ webservices/sandesha/trunk/java/modules/policy/pom.xml Fri Jun 6 08:05:40
2008
@@ -42,33 +42,33 @@
</resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.1</version>
- <executions>
- <execution>
- <id>create-test-resources</id>
- <phase>process-test-resources</phase>
- <configuration>
- <tasks>
- <!--copy class files required
for policy jar from core module-->
- <copy
todir="target/classes">
-
<fileset dir="../core/target/classes" includes="**/policy/**/*.class"/>
-
<fileset dir="../core/target/classes" includes="**/*.properties"/>
-
<fileset dir="../core/target/classes" includes="org/apache/sandesha2/i18n/**" />
-
<fileset dir="../core/target/classes" includes="**/*Sandesha2Constants*.class"/>
-
<fileset dir="../core/target/classes" includes="**/*SandeshaException*.class"/>
- </copy>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
+<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.sandesha2</groupId>
+ <artifactId>sandesha2-core</artifactId>
+ <version>${pom.version}</version>
+ <type>jar</type>
+ <overWrite>false</overWrite>
+
<outputDirectory>${project.build.directory}/classes/</outputDirectory>
+
<includes>**/policy/**/*.class,**/*.properties,org/apache/sandesha2/i18n/**,**/*Sandesha2Constants*.class,**/*SandeshaException*.class</includes>
+
<excludes>META-INF/maven/org.apache.sandesha2/sandesha2-core/**</excludes>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
Modified: webservices/sandesha/trunk/java/modules/tests/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/tests/pom.xml?rev=663974&r1=663973&r2=663974&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/tests/pom.xml (original)
+++ webservices/sandesha/trunk/java/modules/tests/pom.xml Fri Jun 6 08:05:40
2008
@@ -53,7 +53,68 @@
<target>1.4</target>
</configuration>
</plugin>
-
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy</id>
+ <phase>process-test-resources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.sandesha2</groupId>
+ <artifactId>sandesha2</artifactId>
+ <version>${pom.version}</version>
+ <type>mar</type>
+ <overWrite>true</overWrite>
+
<outputDirectory>${project.build.directory}/copiedmars</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>addressing</artifactId>
+ <version>${addressing.version}</version>
+ <type>mar</type>
+ <overWrite>true</overWrite>
+
<outputDirectory>${project.build.directory}/copiedmars</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.rampart</groupId>
+ <artifactId>rampart</artifactId>
+ <version>${rampart.version}</version>
+ <type>mar</type>
+ <overWrite>true</overWrite>
+
<outputDirectory>${project.build.directory}/copiedmars</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.rampart</groupId>
+ <artifactId>rampart-core</artifactId>
+ <version>${rampart.version}</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+
<outputDirectory>${project.build.directory}/copiedjars</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.rampart</groupId>
+ <artifactId>rampart-policy</artifactId>
+ <version>${ramprt.version}</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+
<outputDirectory>${project.build.directory}/copiedjars</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+
<outputDirectory>${project.build.directory}/wars</outputDirectory>
+ <overWriteReleases>false</overWriteReleases>
+ <overWriteSnapshots>true</overWriteSnapshots>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
Modified: webservices/sandesha/trunk/java/modules/tests/tests.build.xml
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/tests/tests.build.xml?rev=663974&r1=663973&r2=663974&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/tests/tests.build.xml (original)
+++ webservices/sandesha/trunk/java/modules/tests/tests.build.xml Fri Jun 6
08:05:40 2008
@@ -27,14 +27,14 @@
<property name="build.repo.dir" value="${build.dir}/repos" />
<property name="server.dist.path"
value="${build.repo.dir}/server" />
- <property name="repo.addressing.mar"
value="${local.repo}/org/apache/axis2/addressing/${addressing.version}/addressing-${addressing.version}.mar"
/>
+ <property name="repo.addressing.mar"
value="${build.dir}/copiedmars/addressing-${addressing.version}.mar" />
<mkdir dir="${server.dist.path}" />
<mkdir dir="${server.dist.path}/modules" />
<mkdir dir="${server.dist.path}/services" />
<copy file="${basedir}/test-resources/server_axis2.xml"
todir="${server.dist.path}" />
- <copy
file="${basedir}/../mar/target/sandesha2-${sandesha2.version}.mar"
todir="${server.dist.path}/modules" />
+ <copy
file="${build.dir}/copiedmars/sandesha2-${sandesha2.version}.mar"
todir="${server.dist.path}/modules" />
<copy todir="${server.dist.path}/services" >
<fileset dir="../samples/target/aars">
@@ -51,13 +51,13 @@
<property name="build.repo.dir" value="${build.dir}/repos" />
<property name="client.dist.path"
value="${build.repo.dir}/client" />
- <property name="repo.addressing.mar"
value="${local.repo}/org/apache/axis2/addressing/${addressing.version}/addressing-${addressing.version}.mar"
/>
+ <property name="repo.addressing.mar"
value="${build.dir}/copiedmars/addressing-${addressing.version}.mar" />
<mkdir dir="${client.dist.path}" />
<mkdir dir="${client.dist.path}/modules" />
<copy file="${basedir}/test-resources/client_axis2.xml"
todir="${client.dist.path}" />
- <copy
file="${basedir}/../mar/target/sandesha2-${sandesha2.version}.mar"
todir="${client.dist.path}/modules" />
+ <copy
file="${build.dir}/copiedmars/sandesha2-${sandesha2.version}.mar"
todir="${client.dist.path}/modules" />
<!-- Copying dependent mar files -->
<copy file="${repo.addressing.mar}"
toDir="${client.dist.path}/modules/" />
@@ -85,7 +85,7 @@
</copy>
<!-- Switch on serialization in the module.xml file -->
- <unjar src="../mar/target/sandesha2-${sandesha2.version}.mar"
dest="${serialize.temp.path}"/>
+ <unjar
src="${build.dir}/copiedmars/sandesha2-${sandesha2.version}.mar"
dest="${serialize.temp.path}"/>
<replace file="${serialize.temp.path}/META-INF/module.xml"
token="<!--
<sandesha2:UseMessageSerialization>true</sandesha2:UseMessageSerialization>
-->"
value="<sandesha2:UseMessageSerialization>true</sandesha2:UseMessageSerialization>"/>
@@ -101,10 +101,10 @@
<property name="secure.client.path"
value="${build.dir}/repos/secure-client"/>
<property name="secure.server.path"
value="${build.dir}/repos/secure-server"/>
- <property name="repo.addressing.mar"
value="${local.repo}/org/apache/axis2/addressing/${addressing.version}/addressing-${addressing.version}.mar"
/>
- <property name="repo.rampart.mar"
value="${local.repo}/org/apache/rampart/rampart/${rampart.version}/rampart-${rampart.version}.mar"
/>
- <property name="repo.rampart.core.jar"
value="${local.repo}/org/apache/rampart/rampart-core/${rampart.version}/rampart-core-${rampart.version}.jar"
/>
- <property name="repo.rampart.policy.jar"
value="${local.repo}/org/apache/rampart/rampart-policy/${rampart.version}/rampart-policy-${rampart.version}.jar"
/>
+ <property name="repo.addressing.mar"
value="${build.dir}/copiedmars/addressing-${addressing.version}.mar" />
+ <property name="repo.rampart.mar"
value="${build.dir}/copiedmars/rampart-${rampart.version}.mar" />
+ <property name="repo.rampart.core.jar"
value="${build.dir}/copiedjars/rampart-core-${rampart.version}.jar" />
+ <property name="repo.rampart.policy.jar"
value="${build.dir}/copiedjars/rampart-policy-${rampart.version}.jar" />
<property name="secure.temp.path"
value="${build.dir}/temp/secure" />
<mkdir dir="${secure.temp.path}" />
@@ -122,7 +122,7 @@
</copy>
<!-- Replace the security manager in the module.xml file -->
- <unjar src="../mar/target/sandesha2-${sandesha2.version}.mar"
dest="${secure.temp.path}"/>
+ <unjar
src="${build.dir}/copiedmars/sandesha2-${sandesha2.version}.mar"
dest="${secure.temp.path}"/>
<replace file="${secure.temp.path}/META-INF/module.xml"
token="dummy.DummySecurityManager"
value="UnitTestSecurityManager"/>
<jar
jarfile="${secure.client.path}/modules/sandesha2-UnitTest.mar"
basedir="${secure.temp.path}"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
