cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gma...@apache.org
Subject svn commit: r1414800 - in /cxf/branches/2.6.x-fixes: ./ distribution/src/main/release/samples/mtom/ distribution/src/main/release/samples/mtom/src/main/java/demo/mtom/client/ distribution/src/main/release/samples/mtom/src/main/resources/ distribution/s...
Date Wed, 28 Nov 2012 16:36:08 GMT
Author: gmazza
Date: Wed Nov 28 16:36:07 2012
New Revision: 1414800

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

........
  r1414792 | gmazza | 2012-11-28 11:29:22 -0500 (Wed, 28 Nov 2012) | 1 line
  
  Better Mavenized mtom sample
........

Added:
    cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/mtom/src/main/resources/
      - copied from r1414792, cxf/trunk/distribution/src/main/release/samples/mtom/src/main/resources/
    cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/mtom/src/main/resources/me.bmp
      - copied unchanged from r1414792, cxf/trunk/distribution/src/main/release/samples/mtom/src/main/resources/me.bmp
    cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/mtom/src/main/resources/mtom_xop.wsdl
      - copied unchanged from r1414792, cxf/trunk/distribution/src/main/release/samples/mtom/src/main/resources/mtom_xop.wsdl
Removed:
    cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/mtom/src/main/java/demo/mtom/client/me.bmp
    cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/mtom/wsdl/
Modified:
    cxf/branches/2.6.x-fixes/   (props changed)
    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

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/mtom/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/mtom/pom.xml?rev=1414800&r1=1414799&r2=1414800&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 Wed Nov 28
16:36:07 2012
@@ -32,18 +32,10 @@
 
     <properties>
         <cxf.version>${project.version}</cxf.version>
+        <wsdl.location>${basedir}/src/main/resources/mtom_xop.wsdl</wsdl.location>
     </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>
@@ -63,7 +55,7 @@
                         <configuration>
                             <wsdlOptions>
                                 <wsdlOption>
-                                    <wsdl>${basedir}/wsdl/mtom_xop.wsdl</wsdl>
+                                    <wsdl>${wsdl.location}</wsdl>
                                     <frontEnd>jaxws21</frontEnd>
                                     <faultSerialVersionUID>1</faultSerialVersionUID>
                                 </wsdlOption>
@@ -95,7 +87,7 @@
                                 <configuration>
                                     <mainClass>demo.mtom.server.Server</mainClass>
                                     <arguments>
-                                        <argument>${basedir}/wsdl/mtom_xop.wsdl</argument>
+                                        <argument>${wsdl.location}</argument>
                                     </arguments>
                                 </configuration>
                             </execution>
@@ -121,7 +113,7 @@
                                 <configuration>
                                     <mainClass>demo.mtom.client.Client</mainClass>
                                     <arguments>
-                                        <argument>${basedir}/wsdl/mtom_xop.wsdl</argument>
+                                        <argument>${wsdl.location}</argument>
                                     </arguments>
                                 </configuration>
                             </execution>

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=1414800&r1=1414799&r2=1414800&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
Wed Nov 28 16:36:07 2012
@@ -69,7 +69,7 @@ public final class Client {
         Binding binding = ((BindingProvider)port).getBinding();
         ((SOAPBinding)binding).setMTOMEnabled(true);
 
-        URL fileURL = Client.class.getResource("me.bmp");
+        URL fileURL = Client.class.getResource("/me.bmp");
         File aFile = new File(new URI(fileURL.toString()));
         long fileSize = aFile.length();
         System.out.println("Filesize of me.bmp image is: " + fileSize);



Mime
View raw message