You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by gm...@apache.org on 2012/11/27 14:21:52 UTC

svn commit: r1414175 - in /cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/mtom: pom.xml src/main/java/demo/mtom/client/Client.java

Author: gmazza
Date: Tue Nov 27 13:21:51 2012
New Revision: 1414175

URL: http://svn.apache.org/viewvc?rev=1414175&view=rev
Log:
Removed non-m2e friendly antrun plugin from mtom sample (done earlier in 2.7 branch)

Modified:
    cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/mtom/pom.xml
    cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/mtom/src/main/java/demo/mtom/client/Client.java

Modified: cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/mtom/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/mtom/pom.xml?rev=1414175&r1=1414174&r2=1414175&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/mtom/pom.xml (original)
+++ cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/mtom/pom.xml Tue Nov 27 13:21:51 2012
@@ -35,6 +35,15 @@
     </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>
@@ -55,6 +64,8 @@
                             <wsdlOptions>
                                 <wsdlOption>
                                     <wsdl>${basedir}/wsdl/mtom_xop.wsdl</wsdl>
+                                    <frontEnd>jaxws21</frontEnd>
+                                    <faultSerialVersionUID>1</faultSerialVersionUID>
                                 </wsdlOption>
                             </wsdlOptions>
                         </configuration>
@@ -64,23 +75,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/mtom/client/me.bmp" todir="${basedir}/target/classes/demo/mtom/client" />
-	    	            </tasks>
-	    	        </configuration>
-	    	    </execution>
-	    	</executions>
-            </plugin>
         </plugins>
     </build>   
     <profiles>

Modified: cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/mtom/src/main/java/demo/mtom/client/Client.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/mtom/src/main/java/demo/mtom/client/Client.java?rev=1414175&r1=1414174&r2=1414175&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/mtom/src/main/java/demo/mtom/client/Client.java (original)
+++ cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/mtom/src/main/java/demo/mtom/client/Client.java Tue Nov 27 13:21:51 2012
@@ -57,7 +57,7 @@ public final class Client {
         File wsdlFile = new File(args[0]);
 
         if (wsdlFile.exists()) {
-            wsdlURL = wsdlFile.toURL();
+            wsdlURL = wsdlFile.toURI().toURL();
         } else {
             wsdlURL = new URL(args[0]);
         }