Author: dkulp
Date: Tue Nov 6 21:23:22 2012
New Revision: 1406341
URL: http://svn.apache.org/viewvc?rev=1406341&view=rev
Log:
More m2e updates
Modified:
cxf/trunk/distribution/src/main/release/samples/ws_addressing/pom.xml
cxf/trunk/distribution/src/main/release/samples/ws_addressing/src/main/java/demo/ws_addressing/client/Client.java
cxf/trunk/distribution/src/main/release/samples/ws_policy/pom.xml
cxf/trunk/distribution/src/main/release/samples/ws_rm/pom.xml
Modified: cxf/trunk/distribution/src/main/release/samples/ws_addressing/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_addressing/pom.xml?rev=1406341&r1=1406340&r2=1406341&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/ws_addressing/pom.xml
(original)
+++ cxf/trunk/distribution/src/main/release/samples/ws_addressing/pom.xml Tue
Nov 6 21:23:22 2012
@@ -34,6 +34,15 @@
<cxf.version>${project.version}</cxf.version>
</properties>
<build>
+ <resources>
+ <resource>
+ <directory>src/main/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ <exclude>**/package.html</exclude>
+ </excludes>
+ </resource>
+ </resources>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
@@ -54,6 +63,8 @@
<wsdlOptions>
<wsdlOption>
<wsdl>${basedir}/wsdl/hello_world_addr.wsdl</wsdl>
+
<frontEnd>jaxws21</frontEnd>
+
<faultSerialVersionUID>1</faultSerialVersionUID>
</wsdlOption>
</wsdlOptions>
</configuration>
@@ -63,24 +74,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>copyxmlfiles</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <copy
file="${basedir}/src/main/java/demo/ws_addressing/client/client.xml"
todir="${basedir}/target/classes/demo/ws_addressing/client" />
- <copy
file="${basedir}/src/main/java/demo/ws_addressing/server/server.xml"
todir="${basedir}/target/classes/demo/ws_addressing/server" />
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
<profiles>
Modified:
cxf/trunk/distribution/src/main/release/samples/ws_addressing/src/main/java/demo/ws_addressing/client/Client.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_addressing/src/main/java/demo/ws_addressing/client/Client.java?rev=1406341&r1=1406340&r2=1406341&view=diff
==============================================================================
---
cxf/trunk/distribution/src/main/release/samples/ws_addressing/src/main/java/demo/ws_addressing/client/Client.java
(original)
+++
cxf/trunk/distribution/src/main/release/samples/ws_addressing/src/main/java/demo/ws_addressing/client/Client.java
Tue Nov 6 21:23:22 2012
@@ -63,7 +63,7 @@ public final class Client {
URL wsdlURL;
File wsdlFile = new File(args[0]);
if (wsdlFile.exists()) {
- wsdlURL = wsdlFile.toURL();
+ wsdlURL = wsdlFile.toURI().toURL();
} else {
wsdlURL = new URL(args[0]);
}
Modified: cxf/trunk/distribution/src/main/release/samples/ws_policy/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_policy/pom.xml?rev=1406341&r1=1406340&r2=1406341&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/ws_policy/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/ws_policy/pom.xml Tue Nov
6 21:23:22 2012
@@ -34,6 +34,18 @@
<cxf.version>${project.version}</cxf.version>
</properties>
<build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>src/main/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ <exclude>**/package.html</exclude>
+ </excludes>
+ </resource>
+ </resources>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
Modified: cxf/trunk/distribution/src/main/release/samples/ws_rm/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_rm/pom.xml?rev=1406341&r1=1406340&r2=1406341&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/ws_rm/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/ws_rm/pom.xml Tue Nov 6
21:23:22 2012
@@ -33,6 +33,15 @@
<cxf.version>${project.version}</cxf.version>
</properties>
<build>
+ <resources>
+ <resource>
+ <directory>src/main/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ <exclude>**/package.html</exclude>
+ </excludes>
+ </resource>
+ </resources>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
