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/19 18:57:24 UTC
svn commit: r1411333 - in /cxf/branches/2.6.x-fixes: ./
distribution/src/main/release/samples/callback/
distribution/src/main/release/samples/callback/src/main/java/demo/callback/client/
distribution/src/main/release/samples/callback/src/main/resources...
Author: gmazza
Date: Mon Nov 19 17:57:23 2012
New Revision: 1411333
URL: http://svn.apache.org/viewvc?rev=1411333&view=rev
Log:
Merged revisions 1411331 via svn merge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1411331 | gmazza | 2012-11-19 12:55:59 -0500 (Mon, 19 Nov 2012) | 1 line
Updated sample to remove antrun plugin.
........
Added:
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/callback/src/main/resources/
- copied from r1411331, cxf/trunk/distribution/src/main/release/samples/callback/src/main/resources/
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/callback/src/main/resources/basic_callback.wsdl
- copied unchanged from r1411331, cxf/trunk/distribution/src/main/release/samples/callback/src/main/resources/basic_callback.wsdl
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/callback/src/main/resources/callback_infoset.xml
- copied unchanged from r1411331, cxf/trunk/distribution/src/main/release/samples/callback/src/main/resources/callback_infoset.xml
Removed:
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/callback/src/main/java/demo/callback/client/callback_infoset.xml
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/callback/wsdl/
Modified:
cxf/branches/2.6.x-fixes/ (props changed)
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/callback/pom.xml
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/callback/src/main/java/demo/callback/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/callback/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/callback/pom.xml?rev=1411333&r1=1411332&r2=1411333&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/callback/pom.xml (original)
+++ cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/callback/pom.xml Mon Nov 19 17:57:23 2012
@@ -20,8 +20,8 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cxf.samples</groupId>
<artifactId>callback</artifactId>
- <name>CXF sample using a callbak object</name>
- <description>CXF sample using a callbak object</description>
+ <name>CXF sample using a callback object</name>
+ <description>CXF sample using a callback object</description>
<version>2.6.4-SNAPSHOT</version>
<parent>
@@ -31,6 +31,7 @@
</parent>
<properties>
<cxf.version>${project.version}</cxf.version>
+ <wsdl.file>${basedir}/src/main/resources/basic_callback.wsdl</wsdl.file>
</properties>
<build>
<plugins>
@@ -52,7 +53,7 @@
<configuration>
<wsdlOptions>
<wsdlOption>
- <wsdl>${basedir}/wsdl/basic_callback.wsdl</wsdl>
+ <wsdl>${wsdl.file}</wsdl>
<extraargs>
<extraarg>-sn</extraarg>
<extraarg>CallbackService</extraarg>
@@ -70,7 +71,7 @@
<configuration>
<wsdlOptions>
<wsdlOption>
- <wsdl>${basedir}/wsdl/basic_callback.wsdl</wsdl>
+ <wsdl>${wsdl.file}</wsdl>
<extraargs>
<extraarg>-sn</extraarg>
<extraarg>SOAPService</extraarg>
@@ -84,23 +85,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>prepare-transform</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <copy file="${basedir}/src/main/java/demo/callback/client/callback_infoset.xml" todir="${basedir}/target/classes/demo/callback/client" />
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
@@ -123,7 +107,7 @@
<configuration>
<mainClass>demo.callback.server.Server</mainClass>
<arguments>
- <argument>${basedir}/wsdl/basic_callback.wsdl</argument>
+ <argument>${wsdl.file}</argument>
</arguments>
</configuration>
</execution>
@@ -152,7 +136,7 @@
<argument>-classpath</argument>
<classpath />
<argument>demo.callback.client.Client</argument>
- <argument>${basedir}/wsdl/basic_callback.wsdl</argument>
+ <argument>${wsdl.file}</argument>
</arguments>
</configuration>
</execution>
Modified: cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/callback/src/main/java/demo/callback/client/Client.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/callback/src/main/java/demo/callback/client/Client.java?rev=1411333&r1=1411332&r2=1411333&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/callback/src/main/java/demo/callback/client/Client.java (original)
+++ cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/callback/src/main/java/demo/callback/client/Client.java Mon Nov 19 17:57:23 2012
@@ -71,7 +71,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]);
}
@@ -79,7 +79,7 @@ public final class Client {
SOAPService ss = new SOAPService(wsdlURL, SERVICE_NAME);
ServerPortType port = ss.getSOAPPort();
- InputStream is = demo.callback.client.Client.class.getResourceAsStream("callback_infoset.xml");
+ InputStream is = demo.callback.client.Client.class.getResourceAsStream("/callback_infoset.xml");
Document doc = XMLUtils.parse(is);
Element referenceParameters = XMLUtils.fetchElementByNameAttribute(doc.getDocumentElement(),
"wsa:ReferenceParameters",