Author: sergeyb
Date: Wed Jan 14 04:52:38 2009
New Revision: 734372
URL: http://svn.apache.org/viewvc?rev=734372&view=rev
Log:
Merged revisions 734367 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r734367 | sergeyb | 2009-01-14 12:35:27 +0000 (Wed, 14 Jan 2009) | 2 lines
Fixing JBI integration demos for 2.2/2.1
........
Modified:
cxf/branches/2.1.x-fixes/ (props changed)
cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/JBI/external_provider_external_consumer/README.txt
cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/JBI/external_provider_internal_consumer/README.txt
cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/JBI/internal_provider_external_consumer/README.txt
cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/JBI/internal_provider_internal_consumer/README.txt
cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/JBI/service-engine/build.xml
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 14 04:52:38 2009
@@ -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,725348,725364,725418,725425-725426,725455,725506,725554,725562,725651,725671,725688,725754,725773,725799,725839,726342,726524,726631,726634,726637,726639,726692,726724,726769,726992,727096,727445,727521,727568,727692,727754,727781,727792,728070,728087,728696,728897,729051,729430,729449,729460,729863,730082,730139,730889,730891,731598,731604,731615,731631,731635,732036,732050,732320,732363,732411,732450,
732710,732827,733512,733582
+/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,725348,725364,725418,725425-725426,725455,725506,725554,725562,725651,725671,725688,725754,725773,725799,725839,726342,726524,726631,726634,726637,726639,726692,726724,726769,726992,727096,727445,727521,727568,727692,727754,727781,727792,728070,728087,728696,728897,729051,729430,729449,729460,729863,730082,730139,730889,730891,731598,731604,731615,731631,731635,732036,732050,732320,732363,732411,732450,
732710,732827,733512,733582,734367
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/integration/JBI/external_provider_external_consumer/README.txt
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/JBI/external_provider_external_consumer/README.txt?rev=734372&r1=734371&r2=734372&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/JBI/external_provider_external_consumer/README.txt
(original)
+++
cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/JBI/external_provider_external_consumer/README.txt
Wed Jan 14 04:52:38 2009
@@ -73,10 +73,9 @@
Start cxf server
For UNIX:
- > ant server
-Dthirdparty.classpath=$SERVICEMIX_HOME/lib/activemq-core-4.1.1.jar:$SERVICEMIX_HOME/lib/backport-util-concurrent-2.2.jar:$SERVICEMIX_HOME/lib/activeio-core-3.0.0-incubator.jar:$SERVICEMIX_HOME/lib/geronimo-j2ee-management_1.0_spec-1.1.jar
+ > ant server
-Dthirdparty.classpath=$SERVICEMIX_HOME/lib/activemq-core-5.0.0.jar:$SERVICEMIX_HOME/lib/backport-util-concurrent-2.2.jar:$SERVICEMIX_HOME/lib/activeio-core-3.0.0-incubator.jar:$SERVICEMIX_HOME/lib/geronimo-j2ee-management_1.0_spec-1.1.jar
For Windows:
- > ant server
-Dthirdparty.classpath="%SERVICEMIX_HOME%"/lib/activemq-core-4.1.1.jar:"%SERVICEMIX_HOME%"/lib/backport-util-concurrent-2.2.jar:"%SERVICEMIX_HOME%"/lib/activeio-core-3.0.0-incubator.jar:"%SERVICEMIX_HOME%"/lib/geronimo-j2ee-management_1.0_spec-1.1.jar
-
+ > ant server
-Dthirdparty.classpath="%SERVICEMIX_HOME%\lib\activemq-core-5.0.0.jar;%SERVICEMIX_HOME%\lib\geronimo-j2ee-management_1.0_spec-1.1.jar"
Deploy and start the CXF demo service assembly
@@ -84,8 +83,8 @@
> ant -f $SERVICEMIX_HOME/ant/servicemix-ant-task.xml
deploy-service-assembly
-Dsm.deploy.file=./service-assembly/build/lib/cxf-service-assembly.zip
-Dsm.username=smx -Dsm.password=smx
> ant -f $SERVICEMIX_HOME/ant/servicemix-ant-task.xml start-service-assembly
-Dsm.service.assembly.name=cxf-demo-service-assembly -Dsm.username=smx
-Dsm.password=smx
For Windows:
- > ant -f "%SERVICEMIX_HOME%"/ant/servicemix-ant-task.xml
deploy-service-assembly
-Dsm.deploy.file=./service-assembly/build/lib/cxf-service-assembly.zip
-Dsm.username=smx -Dsm.password=smx
- > ant -f "%SERVICEMIX_HOME%"/ant/servicemix-ant-task.xml
start-service-assembly -Dsm.service.assembly.name=cxf-demo-service-assembly
-Dsm.username=smx -Dsm.password=smx
+ > ant -f "%SERVICEMIX_HOME%"\ant\servicemix-ant-task.xml
deploy-service-assembly
-Dsm.deploy.file=.\service-assembly\build\lib\cxf-service-assembly.zip
-Dsm.username=smx -Dsm.password=smx
+ > ant -f "%SERVICEMIX_HOME%"\ant\servicemix-ant-task.xml
start-service-assembly -Dsm.service.assembly.name=cxf-demo-service-assembly
-Dsm.username=smx -Dsm.password=smx
Start cxf client
> ant client
Modified:
cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/JBI/external_provider_internal_consumer/README.txt
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/JBI/external_provider_internal_consumer/README.txt?rev=734372&r1=734371&r2=734372&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/JBI/external_provider_internal_consumer/README.txt
(original)
+++
cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/JBI/external_provider_internal_consumer/README.txt
Wed Jan 14 04:52:38 2009
@@ -71,10 +71,9 @@
Start cxf server
For UNIX:
- > ant server
-Dthirdparty.classpath=$SERVICEMIX_HOME/lib/activemq-core-4.1.1.jar:$SERVICEMIX_HOME/lib/backport-util-concurrent-2.2.jar:$SERVICEMIX_HOME/lib/activeio-core-3.0.0-incubator.jar:$SERVICEMIX_HOME/lib/geronimo-j2ee-management_1.0_spec-1.1.jar
+ > ant server
-Dthirdparty.classpath=$SERVICEMIX_HOME/lib/activemq-core-5.0.0.jar:$SERVICEMIX_HOME/lib/backport-util-concurrent-2.2.jar:$SERVICEMIX_HOME/lib/activeio-core-3.0.0-incubator.jar:$SERVICEMIX_HOME/lib/geronimo-j2ee-management_1.0_spec-1.1.jar
For Windows:
- > ant server
-Dthirdparty.classpath="%SERVICEMIX_HOME%"/lib/activemq-core-4.1.1.jar:"%SERVICEMIX_HOME%"/lib/backport-util-concurrent-2.2.jar:"%SERVICEMIX_HOME%"/lib/activeio-core-3.0.0-incubator.jar:"%SERVICEMIX_HOME%"/lib/geronimo-j2ee-management_1.0_spec-1.1.jar
-
+ > ant server
-Dthirdparty.classpath="%SERVICEMIX_HOME%\lib\activemq-core-5.0.0.jar;%SERVICEMIX_HOME%\lib\geronimo-j2ee-management_1.0_spec-1.1.jar"
Install and start the CXF Service Engine:
@@ -82,8 +81,8 @@
> ant -f $SERVICEMIX_HOME/ant/servicemix-ant-task.xml install-component
-Dsm.install.file=../service-engine/build/lib/cxf-service-engine.jar
-Dsm.username=smx -Dsm.password=smx
> ant -f $SERVICEMIX_HOME/ant/servicemix-ant-task.xml start-component
-Dsm.component.name=CXFServiceEngine -Dsm.username=smx -Dsm.password=smx
For Windows:
- > ant -f "%SERVICEMIX_HOME%"/ant/servicemix-ant-task.xml install-component
-Dsm.install.file=../service-engine/build/lib/cxf-service-engine.jar
-Dsm.username=smx -Dsm.password=smx
- > ant -f "%SERVICEMIX_HOME%"/ant/servicemix-ant-task.xml start-component
-Dsm.component.name=CXFServiceEngine -Dsm.username=smx -Dsm.password=smx
+ > ant -f "%SERVICEMIX_HOME%"\ant\servicemix-ant-task.xml install-component
-Dsm.install.file=..\service-engine\build\lib\cxf-service-engine.jar
-Dsm.username=smx -Dsm.password=smx
+ > ant -f "%SERVICEMIX_HOME%"\ant\servicemix-ant-task.xml start-component
-Dsm.component.name=CXFServiceEngine -Dsm.username=smx -Dsm.password=smx
Deploy the and start CXF demo service assembly
@@ -92,8 +91,8 @@
> ant -f $SERVICEMIX_HOME/ant/servicemix-ant-task.xml
deploy-service-assembly
-Dsm.deploy.file=./service-assembly/build/lib/cxf-service-assembly.zip
-Dsm.username=smx -Dsm.password=smx
> ant -f $SERVICEMIX_HOME/ant/servicemix-ant-task.xml start-service-assembly
-Dsm.service.assembly.name=cxf-demo-service-assembly -Dsm.username=smx
-Dsm.password=smx
For Windows:
- > ant -f "%SERVICEMIX_HOME%"/ant/servicemix-ant-task.xml
deploy-service-assembly
-Dsm.deploy.file=./service-assembly/build/lib/cxf-service-assembly.zip
-Dsm.username=smx -Dsm.password=smx
- > ant -f "%SERVICEMIX_HOME%"/ant/servicemix-ant-task.xml
start-service-assembly -Dsm.service.assembly.name=cxf-demo-service-assembly
-Dsm.username=smx -Dsm.password=smx
+ > ant -f "%SERVICEMIX_HOME%"\ant\servicemix-ant-task.xml
deploy-service-assembly
-Dsm.deploy.file=.\service-assembly\build\lib/cxf-service-assembly.zip
-Dsm.username=smx -Dsm.password=smx
+ > ant -f "%SERVICEMIX_HOME%"\ant\servicemix-ant-task.xml
start-service-assembly -Dsm.service.assembly.name=cxf-demo-service-assembly
-Dsm.username=smx -Dsm.password=smx
What happened
Modified:
cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/JBI/internal_provider_external_consumer/README.txt
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/JBI/internal_provider_external_consumer/README.txt?rev=734372&r1=734371&r2=734372&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/JBI/internal_provider_external_consumer/README.txt
(original)
+++
cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/JBI/internal_provider_external_consumer/README.txt
Wed Jan 14 04:52:38 2009
@@ -76,8 +76,8 @@
> ant -f $SERVICEMIX_HOME/ant/servicemix-ant-task.xml install-component
-Dsm.install.file=../service-engine/build/lib/cxf-service-engine.jar
-Dsm.username=smx -Dsm.password=smx
> ant -f $SERVICEMIX_HOME/ant/servicemix-ant-task.xml start-component
-Dsm.component.name=CXFServiceEngine -Dsm.username=smx -Dsm.password=smx
For Windows:
- > ant -f "%SERVICEMIX_HOME%"/ant/servicemix-ant-task.xml install-component
-Dsm.install.file=../service-engine/build/lib/cxf-service-engine.jar
-Dsm.username=smx -Dsm.password=smx
- > ant -f "%SERVICEMIX_HOME%"/ant/servicemix-ant-task.xml start-component
-Dsm.component.name=CXFServiceEngine -Dsm.username=smx -Dsm.password=smx
+ > ant -f "%SERVICEMIX_HOME%"\ant\servicemix-ant-task.xml install-component
-Dsm.install.file=..\service-engine/build/lib/cxf-service-engine.jar
-Dsm.username=smx -Dsm.password=smx
+ > ant -f "%SERVICEMIX_HOME%"\ant\servicemix-ant-task.xml start-component
-Dsm.component.name=CXFServiceEngine -Dsm.username=smx -Dsm.password=smx
Deploy the and start CXF demo service assembly
@@ -86,8 +86,8 @@
> ant -f $SERVICEMIX_HOME/ant/servicemix-ant-task.xml start-service-assembly
-Dsm.service.assembly.name=cxf-demo-service-assembly -Dsm.username=smx
-Dsm.password=smx
For Windows:
- > ant -f "%SERVICEMIX_HOME%"/ant/servicemix-ant-task.xml
deploy-service-assembly
-Dsm.deploy.file=./service-assembly/build/lib/cxf-service-assembly.zip
-Dsm.username=smx -Dsm.password=smx
- > ant -f "%SERVICEMIX_HOME%"/ant/servicemix-ant-task.xml
start-service-assembly -Dsm.service.assembly.name=cxf-demo-service-assembly
-Dsm.username=smx -Dsm.password=smx
+ > ant -f "%SERVICEMIX_HOME%"\ant\servicemix-ant-task.xml
deploy-service-assembly
-Dsm.deploy.file=.\service-assembly\build\lib\cxf-service-assembly.zip
-Dsm.username=smx -Dsm.password=smx
+ > ant -f "%SERVICEMIX_HOME%"\ant\servicemix-ant-task.xml
start-service-assembly -Dsm.service.assembly.name=cxf-demo-service-assembly
-Dsm.username=smx -Dsm.password=smx
Start cxf client
> ant client
Modified:
cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/JBI/internal_provider_internal_consumer/README.txt
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/JBI/internal_provider_internal_consumer/README.txt?rev=734372&r1=734371&r2=734372&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/JBI/internal_provider_internal_consumer/README.txt
(original)
+++
cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/JBI/internal_provider_internal_consumer/README.txt
Wed Jan 14 04:52:38 2009
@@ -72,8 +72,8 @@
> ant -f $SERVICEMIX_HOME/ant/servicemix-ant-task.xml install-component
-Dsm.install.file=../service-engine/build/lib/cxf-service-engine.jar
-Dsm.username=smx -Dsm.password=smx
> ant -f $SERVICEMIX_HOME/ant/servicemix-ant-task.xml start-component
-Dsm.component.name=CXFServiceEngine -Dsm.username=smx -Dsm.password=smx
For Windows:
- > ant -f "%SERVICEMIX_HOME%"/ant/servicemix-ant-task.xml install-component
-Dsm.install.file=../service-engine/build/lib/cxf-service-engine.jar
-Dsm.username=smx -Dsm.password=smx
- > ant -f "%SERVICEMIX_HOME%"/ant/servicemix-ant-task.xml start-component
-Dsm.component.name=CXFServiceEngine -Dsm.username=smx -Dsm.password=smx
+ > ant -f "%SERVICEMIX_HOME%"\ant\servicemix-ant-task.xml install-component
-Dsm.install.file=..\service-engine\build\lib\cxf-service-engine.jar
-Dsm.username=smx -Dsm.password=smx
+ > ant -f "%SERVICEMIX_HOME%"\ant\servicemix-ant-task.xml start-component
-Dsm.component.name=CXFServiceEngine -Dsm.username=smx -Dsm.password=smx
Deploy and start the CXF demo service assembly
@@ -81,15 +81,15 @@
> ant -f $SERVICEMIX_HOME/ant/servicemix-ant-task.xml
deploy-service-assembly
-Dsm.deploy.file=./service-assembly/build/lib/cxf-service-assembly.zip
-Dsm.username=smx -Dsm.password=smx
> ant -f $SERVICEMIX_HOME/ant/servicemix-ant-task.xml start-service-assembly
-Dsm.service.assembly.name=cxf-demo-service-assembly -Dsm.username=smx
-Dsm.password=smx
For Windows:
- > ant -f "%SERVICEMIX_HOME%"/ant/servicemix-ant-task.xml
deploy-service-assembly
-Dsm.deploy.file=./service-assembly/build/lib/cxf-service-assembly.zip
-Dsm.username=smx -Dsm.password=smx
- > ant -f "%SERVICEMIX_HOME%"/ant/servicemix-ant-task.xml
start-service-assembly -Dsm.service.assembly.name=cxf-demo-service-assembly
-Dsm.username=smx -Dsm.password=smx
+ > ant -f "%SERVICEMIX_HOME%"\ant\servicemix-ant-task.xml
deploy-service-assembly
-Dsm.deploy.file=.\service-assembly\build\lib\cxf-service-assembly.zip
-Dsm.username=smx -Dsm.password=smx
+ > ant -f "%SERVICEMIX_HOME%"\ant\servicemix-ant-task.xml
start-service-assembly -Dsm.service.assembly.name=cxf-demo-service-assembly
-Dsm.username=smx -Dsm.password=smx
More lifecycle management task
For UNIX:
> ant -f $SERVICEMIX_HOME/ant/servicemix-ant-task.xml -projecthelp
For Windows:
- > ant -f "%SERVICEMIX_HOME%"/ant/servicemix-ant-task.xml -projecthelp
+ > ant -f "%SERVICEMIX_HOME%"\ant\servicemix-ant-task.xml -projecthelp
What happened
=============
Modified:
cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/JBI/service-engine/build.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/JBI/service-engine/build.xml?rev=734372&r1=734371&r2=734372&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/JBI/service-engine/build.xml
(original)
+++
cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/JBI/service-engine/build.xml
Wed Jan 14 04:52:38 2009
@@ -37,13 +37,14 @@
<fileset dir="${env.CXF_HOME}/lib">
<include name="cxf-manifest.jar"/>
<include name="cxf*.jar"/>
+ <include name="FastInfoset-*.jar"/>
<include name="jaxb*.jar"/>
<include name="neethi-*.jar"/>
- <include name="jaxws-api-*.jar"/>
+ <include name="geronimo-jaxws_2.1_spec-1.0.jar"/>
<include name="geronimo-annotation_1.0_spec-*.jar"/>
+ <include name="geronimo-ws-metadata_2.0_spec-*.jar"/>
<include name="xml-resolver-*.jar"/>
<include name="saaj*.jar"/>
- <include name="geronimo-ws-metadata_2.0_spec-*.jar"/>
<include name="XmlSchema-*.jar"/>
<include name="wstx-asl-*.jar"/>
</fileset>
