You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2012/11/06 22:07:38 UTC

svn commit: r1406327 - in /cxf/trunk/distribution/src/main/release/samples/configuration_interceptor: ./ src/main/java/demo/stream/client/ src/main/java/demo/stream/server/ src/main/resources/ src/main/resources/wsdl/ wsdl/

Author: dkulp
Date: Tue Nov  6 21:07:37 2012
New Revision: 1406327

URL: http://svn.apache.org/viewvc?rev=1406327&view=rev
Log:
Update configuration_interceptor sample to work better in m2eclipse

Added:
    cxf/trunk/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/client/client.xml
      - copied, changed from r1406106, cxf/trunk/distribution/src/main/release/samples/configuration_interceptor/client.xml
    cxf/trunk/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/server/server.xml
      - copied, changed from r1406106, cxf/trunk/distribution/src/main/release/samples/configuration_interceptor/server.xml
    cxf/trunk/distribution/src/main/release/samples/configuration_interceptor/src/main/resources/
    cxf/trunk/distribution/src/main/release/samples/configuration_interceptor/src/main/resources/wsdl/
    cxf/trunk/distribution/src/main/release/samples/configuration_interceptor/src/main/resources/wsdl/hello_world.wsdl
      - copied, changed from r1406106, cxf/trunk/distribution/src/main/release/samples/configuration_interceptor/wsdl/hello_world.wsdl
Removed:
    cxf/trunk/distribution/src/main/release/samples/configuration_interceptor/client.xml
    cxf/trunk/distribution/src/main/release/samples/configuration_interceptor/server.xml
    cxf/trunk/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/client/AntClient.java
    cxf/trunk/distribution/src/main/release/samples/configuration_interceptor/wsdl/hello_world.wsdl
Modified:
    cxf/trunk/distribution/src/main/release/samples/configuration_interceptor/pom.xml
    cxf/trunk/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/client/Client.java

Modified: cxf/trunk/distribution/src/main/release/samples/configuration_interceptor/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/configuration_interceptor/pom.xml?rev=1406327&r1=1406326&r2=1406327&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/configuration_interceptor/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/configuration_interceptor/pom.xml Tue Nov  6 21:07:37 2012
@@ -52,7 +52,9 @@
                         <configuration>
                             <wsdlOptions>
                                 <wsdlOption>
-                                    <wsdl>${basedir}/wsdl/hello_world.wsdl</wsdl>
+                                    <wsdl>${basedir}/src/main/resources/wsdl/hello_world.wsdl</wsdl>
+                                    <frontEnd>jaxws21</frontEnd>
+                                    <faultSerialVersionUID>1</faultSerialVersionUID>
                                 </wsdlOption>
                             </wsdlOptions>
                         </configuration>
@@ -62,25 +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}/client.xml" todir="${basedir}/target/classes/demo/stream/client" />
-                                <copy file="${basedir}/server.xml" todir="${basedir}/target/classes/demo/stream/server" />
-                                <copy file="${basedir}/wsdl/hello_world.wsdl" todir="${basedir}/target/classes/demo/stream/client" />
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
     <profiles>

Modified: cxf/trunk/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/client/Client.java
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/client/Client.java?rev=1406327&r1=1406326&r2=1406327&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/client/Client.java (original)
+++ cxf/trunk/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/client/Client.java Tue Nov  6 21:07:37 2012
@@ -36,7 +36,7 @@ public final class Client {
 
     public static void main(String args[]) throws Exception {
 
-        URL wsdlURL = Client.class.getResource("hello_world.wsdl");
+        URL wsdlURL = Client.class.getResource("/wsdl/hello_world.wsdl");
         SOAPService ss = new SOAPService(wsdlURL, SERVICE_NAME);
         Greeter port = ss.getSoapPort();
         String resp; 

Copied: cxf/trunk/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/client/client.xml (from r1406106, cxf/trunk/distribution/src/main/release/samples/configuration_interceptor/client.xml)
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/client/client.xml?p2=cxf/trunk/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/client/client.xml&p1=cxf/trunk/distribution/src/main/release/samples/configuration_interceptor/client.xml&r1=1406106&r2=1406327&rev=1406327&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/server/server.xml (from r1406106, cxf/trunk/distribution/src/main/release/samples/configuration_interceptor/server.xml)
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/server/server.xml?p2=cxf/trunk/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/server/server.xml&p1=cxf/trunk/distribution/src/main/release/samples/configuration_interceptor/server.xml&r1=1406106&r2=1406327&rev=1406327&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/distribution/src/main/release/samples/configuration_interceptor/src/main/resources/wsdl/hello_world.wsdl (from r1406106, cxf/trunk/distribution/src/main/release/samples/configuration_interceptor/wsdl/hello_world.wsdl)
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/configuration_interceptor/src/main/resources/wsdl/hello_world.wsdl?p2=cxf/trunk/distribution/src/main/release/samples/configuration_interceptor/src/main/resources/wsdl/hello_world.wsdl&p1=cxf/trunk/distribution/src/main/release/samples/configuration_interceptor/wsdl/hello_world.wsdl&r1=1406106&r2=1406327&rev=1406327&view=diff
==============================================================================
    (empty)