You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ni...@apache.org on 2007/11/21 02:20:29 UTC
svn commit: r596897 - in /incubator/cxf/branches/2.0.x-fixes: ./
distribution/src/main/release/samples/integration/jca/inbound/
distribution/src/main/release/samples/integration/jca/outbound/
distribution/src/main/release/samples/mtosi_1.1/wsdl/binding...
Author: ningjiang
Date: Tue Nov 20 17:20:28 2007
New Revision: 596897
URL: http://svn.apache.org/viewvc?rev=596897&view=rev
Log:
Merged revisions 596520-596551 via svnmerge from
https://svn.apache.org/repos/asf/incubator/cxf/trunk
........
r596520 | bimargulies | 2007-11-20 10:59:13 +0800 (Tue, 20 Nov 2007) | 1 line
spelling correction
........
r596547 | ningjiang | 2007-11-20 14:14:01 +0800 (Tue, 20 Nov 2007) | 1 line
CXF-1221 applied the patch for the sample of integration JCA, thank Jeff
........
r596551 | ema | 2007-11-20 14:40:08 +0800 (Tue, 20 Nov 2007) | 1 line
Fixed mtosi_1.1/alarm_retrieval sample
........
Modified:
incubator/cxf/branches/2.0.x-fixes/ (props changed)
incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound/README.txt
incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound/build.xml
incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/outbound/README.txt
incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/outbound/build.xml
incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/mtosi_1.1/wsdl/binding/soap_http/FaultServiceSOAP.wsdl
incubator/cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
Propchange: incubator/cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound/README.txt
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound/README.txt?rev=596897&r1=596896&r2=596897&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound/README.txt (original)
+++ incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound/README.txt Tue Nov 20 17:20:28 2007
@@ -3,7 +3,7 @@
This demo shows how to expose an Enterprise Java Bean over
-SOAP/HTTP using CXF.
+SOAP/HTTP using CXF. This demo is based on JBoss4.0.5GA.
Running the Demo
Modified: incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound/build.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound/build.xml?rev=596897&r1=596896&r2=596897&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound/build.xml (original)
+++ incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound/build.xml Tue Nov 20 17:20:28 2007
@@ -73,7 +73,7 @@
<include name="*activation*" />
<include name="jaxb*" />
<include name="stax*" />
- <include name="jsr181*" />
+ <include name="geronimo-stax-api*" />
<include name="saaj*" />
</fileset>
</copy>
Modified: incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/outbound/README.txt
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/outbound/README.txt?rev=596897&r1=596896&r2=596897&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/outbound/README.txt (original)
+++ incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/outbound/README.txt Tue Nov 20 17:20:28 2007
@@ -3,7 +3,7 @@
This demo shows how to connect with an Apache CXF Web service using a
-Servlet deployed in an application server.
+Servlet deployed in an application server. This demo is based on JBoss4.0.5GA.
Running the Demo
@@ -127,7 +127,7 @@
(Windows) > ant server
-See hello_world/README.txt file for full details.
+See wsdl_first/README.txt file for full details.
Deploying the demo WAR archive
@@ -137,6 +137,8 @@
application server. Please consult your vendor documentation
on application deployment. Here are basic instructions to deploy
the demo application for JBoss application servers.
+
+Run the command in outbound directory.
(Unix) % ant deploy.war
(Windows) > ant deploy.war
Modified: incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/outbound/build.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/outbound/build.xml?rev=596897&r1=596896&r2=596897&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/outbound/build.xml (original)
+++ incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/outbound/build.xml Tue Nov 20 17:20:28 2007
@@ -81,7 +81,7 @@
<include name="*ws-metadata*" />
<include name="jaxb*" />
<include name="stax*" />
- <include name="jsr181*" />
+ <include name="geronimo-stax-api*" />
<include name="saaj*" />
<include name="wsdl4j*" />
</fileset>
Modified: incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/mtosi_1.1/wsdl/binding/soap_http/FaultServiceSOAP.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/mtosi_1.1/wsdl/binding/soap_http/FaultServiceSOAP.wsdl?rev=596897&r1=596896&r2=596897&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/mtosi_1.1/wsdl/binding/soap_http/FaultServiceSOAP.wsdl (original)
+++ incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/mtosi_1.1/wsdl/binding/soap_http/FaultServiceSOAP.wsdl Tue Nov 20 17:20:28 2007
@@ -11,7 +11,7 @@
<soap:body parts="mtosiBody" use="literal" />
</wsdl:input>
<wsdl:output>
- <soap:header message="tmf854WS:tmf854XSD:getActiveAlarmsCountResponse" part="mtosiHeader" use="literal" />
+ <soap:header message="tmf854WS:getActiveAlarmsCountResponse" part="mtosiHeader" use="literal" />
<soap:body parts="mtosiBody" use="literal" />
</wsdl:output>
<wsdl:fault name="ProcessingFailureException">
Modified: incubator/cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java?rev=596897&r1=596896&r2=596897&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java (original)
+++ incubator/cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java Tue Nov 20 17:20:28 2007
@@ -183,7 +183,7 @@
//if we shutdown the port, on SOME OS's/JVM's, if a client
//in the same jvm had been talking to it at some point and keep alives
//are on, then the port is held open for about 60 seconds
- //afterword and if we restart, connections will then
+ //afterwards and if we restart, connections will then
//get sent into the old stuff where there are
//no longer any servant registered. They pretty much just hang.