Author: gmazza
Date: Mon Nov 19 16:12:51 2012
New Revision: 1411271
URL: http://svn.apache.org/viewvc?rev=1411271&view=rev
Log:
Merged revisions 1411263 via svn merge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1411263 | gmazza | 2012-11-19 10:58:43 -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/js_browser_client_simple/src/main/resources/
- copied from r1411263,
cxf/trunk/distribution/src/main/release/samples/js_browser_client_simple/src/main/resources/
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/js_browser_client_simple/src/main/resources/cxf.xml
- copied unchanged from r1411263,
cxf/trunk/distribution/src/main/release/samples/js_browser_client_simple/src/main/resources/cxf.xml
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/js_browser_client_simple/src/main/resources/hello_world.wsdl
- copied unchanged from r1411263,
cxf/trunk/distribution/src/main/release/samples/js_browser_client_simple/src/main/resources/hello_world.wsdl
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/js_browser_client_simple/src/main/resources/staticContent/
- copied from r1411263,
cxf/trunk/distribution/src/main/release/samples/js_browser_client_simple/src/main/resources/staticContent/
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/js_browser_client_simple/src/main/resources/staticContent/HelloWorld.html
- copied unchanged from r1411263,
cxf/trunk/distribution/src/main/release/samples/js_browser_client_simple/src/main/resources/staticContent/HelloWorld.html
Removed:
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/js_browser_client_simple/cxf.xml
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/js_browser_client_simple/staticContent/
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/js_browser_client_simple/wsdl/
Modified:
cxf/branches/2.6.x-fixes/ (props changed)
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/js_browser_client_simple/pom.xml
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/js_browser_client_simple/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/js_browser_client_simple/pom.xml?rev=1411271&r1=1411270&r2=1411271&view=diff
==============================================================================
---
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/js_browser_client_simple/pom.xml
(original)
+++
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/js_browser_client_simple/pom.xml
Mon Nov 19 16:12:51 2012
@@ -32,6 +32,7 @@
<properties>
<cxf.version>${project.version}</cxf.version>
+ <wsdl.file>${basedir}/src/main/resources/hello_world.wsdl</wsdl.file>
</properties>
<build>
<plugins>
@@ -53,7 +54,7 @@
<configuration>
<wsdlOptions>
<wsdlOption>
-
<wsdl>${basedir}/wsdl/hello_world.wsdl</wsdl>
+ <wsdl>${wsdl.file}</wsdl>
</wsdlOption>
</wsdlOptions>
</configuration>
@@ -63,24 +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}/staticContent/HelloWorld.html"
todir="${basedir}/target/classes/staticContent" />
- <copy file="${basedir}/cxf.xml"
todir="${basedir}/target/classes/" />
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
<profiles>
@@ -124,7 +107,7 @@
<configuration>
<mainClass>demo.hw.client.Client</mainClass>
<arguments>
-
<argument>${basedir}/wsdl/hello_world.wsdl</argument>
+ <argument>${wsdl.file}</argument>
</arguments>
</configuration>
</execution>
