Author: ningjiang Date: Thu Sep 25 20:20:31 2008 New Revision: 699161 URL: http://svn.apache.org/viewvc?rev=699161&view=rev Log: Merged revisions 699158 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.1.x-fixes
................ r699158 | ningjiang | 2008-09-26 11:13:09 +0800 (Fri, 26 Sep 2008) | 9 lines Merged revisions 699155 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r699155 | ningjiang | 2008-09-26 10:53:39 +0800 (Fri, 26 Sep 2008) | 1 line CXF-1823 applied patch with thanks to William ........ ................ Modified: cxf/branches/2.0.x-fixes/ (props changed) cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch-wsdl/README.txt cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch/README.txt cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb/README.txt Propchange: cxf/branches/2.0.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch-wsdl/README.txt URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch-wsdl/README.txt?rev=699161&r1=699160&r2=699161&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch-wsdl/README.txt (original) +++ cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch-wsdl/README.txt Thu Sep 25 20:20:31 2008 @@ -57,9 +57,9 @@ 3. On the Resource adapters page, click the "Install RAR" button. 4. On the Install RAR File page, select the "Local path" radio button if this - sample is on the same machine as the WebSphere server. Otherwise, select - the "Server path" radio button. Specify or browse to the path - build/lib/cxf.rar file in this sample. Then, click the "Next" button. + sample is located in the same machine that you are running the web browser. + Otherwise, select the "Server path" radio button. Specify or browse to the + path build/lib/cxf.rar file in this sample. Then, click the "Next" button. 5. On the next page, click the "OK" button to install the Resource Adapter. @@ -110,10 +110,10 @@ 2. Navigate to tree menu: Applications -> Install new Applications 3. On the "Preparing for the application installation" page, select the "Local - path" radio button if this sample is on the same machine as the WebSphere - server. Otherwise, select the "Server path" radio button. Specify or - browse to the path j2ee-archives/greeterwithwsdlejb.jar file in this - sample. Then, click the "Next" button. + path" radio button if this sample is located in the same machine that you + are running the web browse. Otherwise, select the "Server path" radio + button. Specify or browse to the path j2ee-archives/greeterwithwsdlejb.jar + file in this sample. Then, click the "Next" button. 4. Click the "Next" button on the "Step 1: Select installation options" page. @@ -190,3 +190,4 @@ SOAP messages exchanged between the server and client. + Modified: cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch/README.txt URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch/README.txt?rev=699161&r1=699160&r2=699161&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch/README.txt (original) +++ cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch/README.txt Thu Sep 25 20:20:31 2008 @@ -87,9 +87,9 @@ 3. On the Resource adapters page, click the "Install RAR" button. 4. On the Install RAR File page, select the "Local path" radio button if this - sample is on the same machine as the WebSphere server. Otherwise, select - the "Server path" radio button. Specify or browse to the path - build/lib/cxf.rar file in this sample. Then, click the "Next" button. + sample is located in the same machine that you are running the web browser. + Otherwise, select the "Server path" radio button. Specify or browse to the + path build/lib/cxf.rar file in this sample. Then, click the "Next" button. 5. On the next page, click the "OK" button to install the Resource Adapter. @@ -140,10 +140,11 @@ 2. Navigate to tree menu: Applications -> Install new Applications 3. On the "Preparing for the application installation" page, the select "Local - path" radio button if this sample is on the same machine as the WebSphere - server. Otherwise, select the "Server path" radio button. Specify or - browse to the path j2ee-archives/dispatchedgreeterejb.jar file in this - sample. Then, click the "Next" button. + path" radio button if this sample is located in the same machine that you + are running the web browswer. Otherwise, select the "Server path" radio + button. Specify or browse to the path + j2ee-archives/dispatchedgreeterejb.jar file in this sample. Then, click + the "Next" button. 4. Click the "Next" button on the "Step 1: Select installation options" page. Modified: cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb/README.txt URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb/README.txt?rev=699161&r1=699160&r2=699161&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb/README.txt (original) +++ cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb/README.txt Thu Sep 25 20:20:31 2008 @@ -157,9 +157,10 @@ 3. On the Resource adapters page, click the "Install RAR" button. 4. On the Install RAR File page, select the "Local path" radio button if this - sample is located in the same machine as the WebSphere server. Otherwise, - select the "Server path" radio button. Specify or browse to the path - build/lib/cxf.rar file of this sample. Then, click the "Next" button. + sample is located in the same machine that you are running the web browser. + Otherwise, select the "Server path" radio button. Specify or browse to + the path build/lib/cxf.rar file of this sample. Then, click the "Next" + button. 5. On the next page, click the "OK" button to install the Resource Adapter. @@ -209,11 +210,11 @@ 2. Navigate to tree menu: Applications -> Install new Applications -3. On the "Preparing for the application installation" page, select the "Local - path" radio button if this sample is located in the same machine as the - WebSphere server. Otherwise, select the "Server path" radio button. - Specify or browse to the path j2ee-archives/greeterejb.jar file in this - sample. Then, click the "Next" button. +3. On the "Preparing for the application installation" page, select the + "Local path" radio button if this sample is located in the same machine + that you are running the web browser. Otherwise, select the "Server path" + radio button. Specify or browse to the path j2ee-archives/greeterejb.jar + file in this sample. Then, click the "Next" button. 4. Click the "Next" button on the "Step 1: Select installation options" page.
