cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gma...@apache.org
Subject svn commit: r1411250 - in /cxf/branches/2.6.x-fixes: ./ distribution/src/main/release/samples/jaxws_handlers/ distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/common/ distribution/src/main/release/samples/jaxws_handlers/...
Date Mon, 19 Nov 2012 15:34:47 GMT
Author: gmazza
Date: Mon Nov 19 15:34:46 2012
New Revision: 1411250

URL: http://svn.apache.org/viewvc?rev=1411250&view=rev
Log:
Merged revisions 1411248 via  svn merge from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1411248 | gmazza | 2012-11-19 10:29:14 -0500 (Mon, 19 Nov 2012) | 1 line
  
  Updated jaxws_handlers sample to remove Maven antrun plugin.
........

Added:
    cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jaxws_handlers/src/main/resources/
      - copied from r1411248, cxf/trunk/distribution/src/main/release/samples/jaxws_handlers/src/main/resources/
    cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jaxws_handlers/src/main/resources/addNumbers.wsdl
      - copied unchanged from r1411248, cxf/trunk/distribution/src/main/release/samples/jaxws_handlers/src/main/resources/addNumbers.wsdl
    cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jaxws_handlers/src/main/resources/demo_handlers.xml
      - copied unchanged from r1411248, cxf/trunk/distribution/src/main/release/samples/jaxws_handlers/src/main/resources/demo_handlers.xml
Removed:
    cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/common/demo_handlers.xml
    cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jaxws_handlers/wsdl/
Modified:
    cxf/branches/2.6.x-fixes/   (props changed)
    cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jaxws_handlers/pom.xml
    cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/server/AddNumbersImpl.java

Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jaxws_handlers/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jaxws_handlers/pom.xml?rev=1411250&r1=1411249&r2=1411250&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jaxws_handlers/pom.xml
(original)
+++ cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jaxws_handlers/pom.xml
Mon Nov 19 15:34:46 2012
@@ -31,6 +31,7 @@
 
     <properties>
         <cxf.version>${project.version}</cxf.version>
+        <wsdl.file>${basedir}/src/main/resources/addNumbers.wsdl</wsdl.file>
     </properties>
 
     <build>
@@ -53,7 +54,7 @@
                         <configuration>
                             <wsdlOptions>
                                 <wsdlOption>
-                                    <wsdl>${basedir}/wsdl/addNumbers.wsdl</wsdl>
+                                    <wsdl>${wsdl.file}</wsdl>
                                 </wsdlOption>
                             </wsdlOptions>
                         </configuration>
@@ -63,23 +64,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/handlers/common/demo_handlers.xml"
todir="${basedir}/target/classes/demo/handlers/common" />
-                            </tasks>
-                        </configuration>
-                    </execution>
-	        </executions>
-            </plugin>
         </plugins>
     </build>   
     <profiles>
@@ -100,7 +84,7 @@
                                 <configuration>
                                     <mainClass>demo.handlers.server.Server</mainClass>
                                     <arguments>
-				        <argument>${basedir}/wsdl/addNumbers.wsdl</argument>
+                                        <argument>${wsdl.file}</argument>
                                     </arguments>
                                 </configuration>
                             </execution>
@@ -126,7 +110,7 @@
                                 <configuration>
                                     <mainClass>demo.handlers.client.Client</mainClass>
                                     <arguments>
-                                        <argument>${basedir}/wsdl/addNumbers.wsdl</argument>
+                                        <argument>${wsdl.file}</argument>
                                     </arguments>
                                 </configuration>
                             </execution>

Modified: cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/server/AddNumbersImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/server/AddNumbersImpl.java?rev=1411250&r1=1411249&r2=1411250&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/server/AddNumbersImpl.java
(original)
+++ cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/server/AddNumbersImpl.java
Mon Nov 19 15:34:46 2012
@@ -31,7 +31,7 @@ import org.apache.handlers.types.FaultDe
             portName = "AddNumbersPort",
             endpointInterface = "org.apache.handlers.AddNumbers",
             serviceName = "AddNumbersService")
-@HandlerChain(file = "../common/demo_handlers.xml")
+@HandlerChain(file = "/demo_handlers.xml")
 public class AddNumbersImpl implements AddNumbers {
 
 



Mime
View raw message