Author: sergeyb
Date: Thu Dec 11 06:27:45 2008
New Revision: 725697
URL: http://svn.apache.org/viewvc?rev=725697&view=rev
Log:
Merged revisions 725671 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r725671 | seanoc | 2008-12-11 12:18:54 +0000 (Thu, 11 Dec 2008) | 1 line
Keep demos consistent using .xml suffixes.
........
Added:
cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jax_rs/basic/src/demo/jaxrs/client/add_customer.xml
- copied unchanged from r725671,
cxf/trunk/distribution/src/main/release/samples/jax_rs/basic/src/demo/jaxrs/client/add_customer.xml
cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jax_rs/basic/src/demo/jaxrs/client/update_customer.xml
- copied unchanged from r725671,
cxf/trunk/distribution/src/main/release/samples/jax_rs/basic/src/demo/jaxrs/client/update_customer.xml
Removed:
cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jax_rs/basic/src/demo/jaxrs/client/add_customer.txt
cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jax_rs/basic/src/demo/jaxrs/client/update_customer.txt
Modified:
cxf/branches/2.1.x-fixes/ (props changed)
cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jax_rs/basic/pom.xml
cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jax_rs/basic/src/demo/jaxrs/client/Client.java
cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jax_rs/basic_https/build.xml
cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/hello_world_async_noservice.wsdl
(props changed)
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 11 06:27:45 2008
@@ -1 +1 @@
-/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708410,708417,708550,708554,709353-709354,709425,710076,710150,71015
4,711193,711388,711410,711490,711635,711949,711975,712194,712198,712238,712272,712299,712312,712670,712893,713082,713095-713096,713099,713584,713597,713737,713804,713899,714167-714168,714245,714255,717937-717961,718281-718448,718565,718620,718640,718665,718970,719017,719210,719215-719218,719222-719273,719305,719327-719680,720053,720119-720218,720238,720293-720316,720497,721221,721241,721501,722117,722129,722412,722988,723024,723338,723378,723716-723791,724333-724372,724433-724438,724449,724481,724485,724668,724780,724782,724785,724793,724795,724940,725071,725316,725332,725335,725364,725418,725425-725426,725651
+/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708410,708417,708550,708554,709353-709354,709425,710076,710150,71015
4,711193,711388,711410,711490,711635,711949,711975,712194,712198,712238,712272,712299,712312,712670,712893,713082,713095-713096,713099,713584,713597,713737,713804,713899,714167-714168,714245,714255,717937-717961,718281-718448,718565,718620,718640,718665,718970,719017,719210,719215-719218,719222-719273,719305,719327-719680,720053,720119-720218,720238,720293-720316,720497,721221,721241,721501,722117,722129,722412,722988,723024,723338,723378,723716-723791,724333-724372,724433-724438,724449,724481,724485,724668,724780,724782,724785,724793,724795,724940,725071,725316,725332,725335,725364,725418,725425-725426,725651,725671
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jax_rs/basic/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jax_rs/basic/pom.xml?rev=725697&r1=725696&r2=725697&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jax_rs/basic/pom.xml
(original)
+++
cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jax_rs/basic/pom.xml
Thu Dec 11 06:27:45 2008
@@ -3,11 +3,11 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cxf.samples</groupId>
<artifactId>jax_rs_basic</artifactId>
- <version>0.8</version>
+ <version>1.0</version>
<properties>
<cxf.version>[2,)</cxf.version>
<httpclient.version>3.1</httpclient.version>
- <jsr311.version>1.0</jsr311.version>
+ <jsr311.version>0.8</jsr311.version>
</properties>
<build>
<sourceDirectory>src</sourceDirectory>
@@ -30,8 +30,8 @@
</goals>
<configuration>
<tasks>
- <copy
file="${basedir}/src/demo/jaxrs/client/add_customer.txt"
todir="${basedir}/target/classes/demo/jaxrs/client"/>
- <copy
file="${basedir}/src/demo/jaxrs/client/update_customer.txt"
todir="${basedir}/target/classes/demo/jaxrs/client"/>
+ <copy
file="${basedir}/src/demo/jaxrs/client/add_customer.xml"
todir="${basedir}/target/classes/demo/jaxrs/client"/>
+ <copy
file="${basedir}/src/demo/jaxrs/client/update_customer.xml"
todir="${basedir}/target/classes/demo/jaxrs/client"/>
</tasks>
</configuration>
</execution>
@@ -156,4 +156,3 @@
</dependency>
</dependencies>
</project>
->>>>>>> .merge-right.r725651
Modified:
cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jax_rs/basic/src/demo/jaxrs/client/Client.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jax_rs/basic/src/demo/jaxrs/client/Client.java?rev=725697&r1=725696&r2=725697&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jax_rs/basic/src/demo/jaxrs/client/Client.java
(original)
+++
cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jax_rs/basic/src/demo/jaxrs/client/Client.java
Thu Dec 11 06:27:45 2008
@@ -63,7 +63,7 @@
System.out.println("\n");
System.out.println("Sent HTTP PUT request to update customer info");
Client client = new Client();
- String inputFile =
client.getClass().getResource("update_customer.txt").getFile();
+ String inputFile =
client.getClass().getResource("update_customer.xml").getFile();
File input = new File(inputFile);
PutMethod put = new
PutMethod("http://localhost:9000/customerservice/customers";);
RequestEntity entity = new FileRequestEntity(input, "text/xml;
charset=ISO-8859-1");
@@ -84,7 +84,7 @@
// Sent HTTP POST request to add customer
System.out.println("\n");
System.out.println("Sent HTTP POST request to add customer");
- inputFile =
client.getClass().getResource("add_customer.txt").getFile();
+ inputFile =
client.getClass().getResource("add_customer.xml").getFile();
input = new File(inputFile);
PostMethod post = new
PostMethod("http://localhost:9000/customerservice/customers";);
post.addRequestHeader("Accept" , "text/xml");
Modified:
cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jax_rs/basic_https/build.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jax_rs/basic_https/build.xml?rev=725697&r1=725696&r2=725697&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jax_rs/basic_https/build.xml
(original)
+++
cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jax_rs/basic_https/build.xml
Thu Dec 11 06:27:45 2008
@@ -47,8 +47,8 @@
</javac>
<copy todir="${build.classes.dir}">
- <fileset dir="${basedir}/src" includes="**/*.xml, **/*.txt" />
- <fileset dir="${build.src.dir}" includes="**/*.xml, **/*.txt" />
+ <fileset dir="${basedir}/src" includes="**/*.xml />
+ <fileset dir="${build.src.dir}" includes="**/*.xml />
</copy>
</target>
</project>
Propchange:
cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/hello_world_async_noservice.wsdl
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 11 06:27:45 2008
@@ -1 +1 @@
-/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/hello_world_async_noservice.wsdl:722412,722988,723378,724485,724668,724780,724782,724785,724793,724795,724940,725071,725316,725332,725335,725364,725418,725425-725426,725651
+/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/hello_world_async_noservice.wsdl:722412,722988,723378,724485,724668,724780,724782,724785,724793,724795,724940,725071,725316,725332,725335,725364,725418,725425-725426,725651,725671
