Author: muthulee
Date: Wed Jul 11 02:35:59 2007
New Revision: 555226
URL: http://svn.apache.org/viewvc?view=rev&rev=555226
Log:
Fixing Rampart-57
Now we can put nightly builds!
Modified:
webservices/rampart/trunk/java/modules/rampart-integration/pom.xml
Modified: webservices/rampart/trunk/java/modules/rampart-integration/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-integration/pom.xml?view=diff&rev=555226&r1=555225&r2=555226
==============================================================================
--- webservices/rampart/trunk/java/modules/rampart-integration/pom.xml
(original)
+++ webservices/rampart/trunk/java/modules/rampart-integration/pom.xml Wed Jul
11 02:35:59 2007
@@ -84,24 +84,6 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>add-source</id>
- <phase>process-resources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>generated-code/src</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.1</version>
@@ -114,32 +96,37 @@
</goals>
<configuration>
<tasks>
- <mkdir dir="generated-code"/>
- <java
classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
- <arg line="-uri
src/main/resources/ping/ping.wsdl -ss -o ./generated-code -p
org.apache.axis2.oasis.ping -d xmlbeans -g"/>
+ <java
classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
+ <arg line="-uri
src/main/resources/ping/ping.wsdl -ss -o target/generated-code -p
org.apache.axis2.oasis.ping -d xmlbeans -g"/>
<classpath
refid="maven.dependency.classpath"/>
<classpath
refid="maven.compile.classpath"/>
<classpath
refid="maven.runtime.classpath"/>
</java>
<!-- copy the service impl -->
<copy
file="src/main/resources/ping/src/org/apache/axis2/oasis/ping/PingPortSkeleton.java"
-
tofile="generated-code/src/org/apache/axis2/oasis/ping/PingPortSkeleton.java"
+
tofile="target/generated-code/src/org/apache/axis2/oasis/ping/PingPortSkeleton.java"
overwrite="yes"/>
<!-- Password callback class for the interop
service -->
<copy
file="src/main/resources/ping/src/org/apache/axis2/security/PWCallback.java"
-
tofile="generated-code/src/org/apache/axis2/security/PWCallback.java"
+
tofile="target/generated-code/src/org/apache/axis2/security/PWCallback.java"
overwrite="yes"/>
<!-- Interop client -->
<copy
file="src/main/resources/ping/src/org/apache/axis2/security/InteropScenarioClient.java"
-
tofile="generated-code/src/org/apache/axis2/security/InteropScenarioClient.java"
+
tofile="target/generated-code/src/org/apache/axis2/security/InteropScenarioClient.java"
overwrite="yes"/>
- <copy overwrite="yes"
todir="src/test/resources">
- <fileset dir="generated-code/resources">
+ <copy todir="target/test-classes">
+ <fileset
dir="target/generated-code/resources">
<include name="**/*"/>
</fileset>
</copy>
- </tasks>
+
+ <javac srcdir="target/generated-code"
destdir="target/classes" fork="true">
+ <classpath
refid="maven.dependency.classpath"/>
+ <classpath
refid="maven.compile.classpath"/>
+ <classpath
refid="maven.runtime.classpath"/>
+ </javac>
+ </tasks>
</configuration>
</execution>
<execution>
@@ -620,35 +607,24 @@
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <configuration>
- <filesets>
- <fileset>
- <directory>./</directory>
- <includes>
- <include>generated-code</include>
- </includes>
- <followSymlinks>false</followSymlinks>
- </fileset>
- <fileset>
- <directory>./src/test/resources</directory>
- <includes>
- <include>schemaorg_apache_xmlbeans</include>
- </includes>
- <excludes>
- <exclude>*.properties</exclude>
- <exclude>*.jks</exclude>
- <exclude>*.xml</exclude>
- <exclude>*.MSFT</exclude>
- <exclude>policy/**/*</exclude>
- <exclude>sc/**/*</exclude>
- </excludes>
- <followSymlinks>false</followSymlinks>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
+ <!--plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>add-test-source</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>add-test-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>target/generated-code/resources</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin-->
</plugins>
</build>
@@ -668,6 +644,13 @@
<artifactId>rampart-core</artifactId>
<version>${pom.version}</version>
</dependency>
+ <dependency>
+ <groupId>sun.jdk</groupId>
+ <artifactId>tools</artifactId>
+ <version>1.4.2</version>
+ <scope>system</scope>
+ <systemPath>${java.home}/../lib/tools.jar</systemPath>
+ </dependency>
</dependencies>
<reporting>