cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1406352 - in /cxf/trunk/distribution/src/main/release/samples: java_first_jaxws/ java_first_jms/ java_first_spring_support/ mtom/ mtom/src/main/java/demo/mtom/client/ soap_header/ soap_header/src/main/java/demo/soap_header/client/
Date Tue, 06 Nov 2012 21:36:48 GMT
Author: dkulp
Date: Tue Nov  6 21:36:48 2012
New Revision: 1406352

URL: http://svn.apache.org/viewvc?rev=1406352&view=rev
Log:
More m2e updates

Modified:
    cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/pom.xml
    cxf/trunk/distribution/src/main/release/samples/java_first_jms/pom.xml
    cxf/trunk/distribution/src/main/release/samples/java_first_spring_support/pom.xml
    cxf/trunk/distribution/src/main/release/samples/mtom/pom.xml
    cxf/trunk/distribution/src/main/release/samples/mtom/src/main/java/demo/mtom/client/Client.java
    cxf/trunk/distribution/src/main/release/samples/soap_header/pom.xml
    cxf/trunk/distribution/src/main/release/samples/soap_header/src/main/java/demo/soap_header/client/Client.java

Modified: cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/pom.xml?rev=1406352&r1=1406351&r2=1406352&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/pom.xml Tue Nov  6 21:36:48
2012
@@ -135,7 +135,6 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
-            <version>3.0.6.RELEASE</version>
         </dependency> 
         <dependency>
             <groupId>junit</groupId>

Modified: cxf/trunk/distribution/src/main/release/samples/java_first_jms/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/java_first_jms/pom.xml?rev=1406352&r1=1406351&r2=1406352&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/java_first_jms/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/java_first_jms/pom.xml Tue Nov  6 21:36:48
2012
@@ -35,7 +35,6 @@
 
     <properties>
         <cxf.version>${project.version}</cxf.version>
-        <cxf.amq.version>5.3.0</cxf.amq.version>
         <useJaxws>-jaxws</useJaxws>
     </properties>
 
@@ -115,7 +114,6 @@
         <dependency>
             <groupId>org.apache.activemq</groupId>
             <artifactId>activemq-core</artifactId>
-            <version>${cxf.amq.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>

Modified: cxf/trunk/distribution/src/main/release/samples/java_first_spring_support/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/java_first_spring_support/pom.xml?rev=1406352&r1=1406351&r2=1406352&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/java_first_spring_support/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/java_first_spring_support/pom.xml Tue
Nov  6 21:36:48 2012
@@ -113,12 +113,10 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
-            <version>3.0.6.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
-            <version>3.0.6.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>

Modified: cxf/trunk/distribution/src/main/release/samples/mtom/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/mtom/pom.xml?rev=1406352&r1=1406351&r2=1406352&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/mtom/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/mtom/pom.xml Tue Nov  6 21:36:48 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/trunk/distribution/src/main/release/samples/mtom/src/main/java/demo/mtom/client/Client.java
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/mtom/src/main/java/demo/mtom/client/Client.java?rev=1406352&r1=1406351&r2=1406352&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/mtom/src/main/java/demo/mtom/client/Client.java
(original)
+++ cxf/trunk/distribution/src/main/release/samples/mtom/src/main/java/demo/mtom/client/Client.java
Tue Nov  6 21:36:48 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]);
         }

Modified: cxf/trunk/distribution/src/main/release/samples/soap_header/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/soap_header/pom.xml?rev=1406352&r1=1406351&r2=1406352&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/soap_header/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/soap_header/pom.xml Tue Nov  6 21:36:48
2012
@@ -53,6 +53,8 @@
                         <configuration>
                             <wsdlOptions>
                                 <wsdlOption>
+                                    <frontEnd>jaxws21</frontEnd>
+                                    <faultSerialVersionUID>1</faultSerialVersionUID>
                                     <wsdl>${basedir}/wsdl/soap_header.wsdl</wsdl>
                                 </wsdlOption>
                             </wsdlOptions>

Modified: cxf/trunk/distribution/src/main/release/samples/soap_header/src/main/java/demo/soap_header/client/Client.java
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/soap_header/src/main/java/demo/soap_header/client/Client.java?rev=1406352&r1=1406351&r2=1406352&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/soap_header/src/main/java/demo/soap_header/client/Client.java
(original)
+++ cxf/trunk/distribution/src/main/release/samples/soap_header/src/main/java/demo/soap_header/client/Client.java
Tue Nov  6 21:36:48 2012
@@ -54,7 +54,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]);
         }



Mime
View raw message