Fixes for TUSCANY-2730

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@724617 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 96 insertions, 94 deletions

diff --git a/branches/sca-java-1.4/samples/binding-notification-broker/README b/branches/sca-java-1.4/samples/binding-notification-broker/README
index ebd8bbec30..c21b8a5a1c 100644
--- a/branches/sca-java-1.4/samples/binding-notification-broker/README
+++ b/branches/sca-java-1.4/samples/binding-notification-broker/README
@@ -26,34 +26,6 @@ This sample also illustrates the use of a wsdl interface in the notification
 component's <implementation.notification/>. This allows messages sent and received

 via <binding.notification/> to be transported as literal xml over http.

 

-Building And Running The Sample Using Ant

------------------------------------------

-With the binary distribution the sample can be built and run using Ant as 

-follows

-

-cd binding-notification-broker

-ant compile

-ant run

-

-You should see the following output from the run target.

-

-run:

-     [java] Sep 14, 2007 11:14:24 AM org.apache.tuscany.sca.http.jetty.JettyServer addServletMapping

-     [java] INFO: Added Servlet mapping: http://localhost:8083/ntm/trafficAdvisory

-     [java] Sep 14, 2007 11:14:24 AM org.apache.tuscany.sca.http.jetty.JettyServer addServletMapping

-     [java] INFO: Added Servlet mapping: http://localhost:8083/consumer/trafficAdvisory

-     [java] Sep 14, 2007 11:14:24 AM org.apache.tuscany.sca.http.jetty.JettyServer addServletMapping

-     [java] INFO: Added Servlet mapping: http://localhost:8083/producer/trafficAdvisory

-     

-Building And Running The Sample Using Maven 

--------------------------------------------

-

-With either the binary or source distributions the sample can be built and run 

-using Maven as follows. 

-

-cd binding-notification-broker

-mvn

-

 Sample Usage

 ------------

 

@@ -109,4 +81,32 @@ binding-notification-broker/
                                                      notification components, and composite service and reference

   binding-notification-broker.png                  - a pictorial representation of the sample .composite file

   build.xml                       		   - the Ant build file

-  pom.xml                                          - the Maven build file        

+  pom.xml                                          - the Maven build file 

+

+Building And Running The Sample Using Ant

+-----------------------------------------

+With the binary distribution the sample can be built and run using Ant as 

+follows

+

+cd binding-notification-broker

+ant compile

+ant run

+

+You should see the following output from the run target.

+

+run:

+     [java] Sep 14, 2007 11:14:24 AM org.apache.tuscany.sca.http.jetty.JettyServer addServletMapping

+     [java] INFO: Added Servlet mapping: http://localhost:8083/ntm/trafficAdvisory

+     [java] Sep 14, 2007 11:14:24 AM org.apache.tuscany.sca.http.jetty.JettyServer addServletMapping

+     [java] INFO: Added Servlet mapping: http://localhost:8083/consumer/trafficAdvisory

+     [java] Sep 14, 2007 11:14:24 AM org.apache.tuscany.sca.http.jetty.JettyServer addServletMapping

+     [java] INFO: Added Servlet mapping: http://localhost:8083/producer/trafficAdvisory

+     

+Building And Running The Sample Using Maven 

+-------------------------------------------

+

+With either the binary or source distributions the sample can be built and run 

+using Maven as follows. 

+

+cd binding-notification-broker

+mvn

diff --git a/branches/sca-java-1.4/samples/binding-notification-consumer/README b/branches/sca-java-1.4/samples/binding-notification-consumer/README
index b54b445670..62ef1d0126 100644
--- a/branches/sca-java-1.4/samples/binding-notification-consumer/README
+++ b/branches/sca-java-1.4/samples/binding-notification-consumer/README
@@ -26,31 +26,6 @@ This sample also illustrates the use of a wsdl interface in the notification
 component's <implementation.notification/>. This allows messages sent and received

 via <binding.notification/> to be transported as literal xml over http.

 

-Building And Running The Sample Using Ant

------------------------------------------

-With the binary distribution the sample can be built and run using Ant as 

-follows

-

-cd binding-notification-consumer

-ant compile

-ant run

-

-You should see the following output from the run target.

-

-run:

-     [java] Sep 14, 2007 10:56:29 AM org.apache.tuscany.sca.http.jetty.JettyServer addServletMapping

-     [java] INFO: Added Servlet mapping: http://localhost:8083/ntm/trafficAdvisory

-     [java] Sep 14, 2007 10:56:29 AM org.apache.tuscany.sca.http.jetty.JettyServer addServletMapping

-     [java] INFO: Added Servlet mapping: http://localhost:8083/consumer/trafficAdvisory

-     

-Building And Running The Sample Using Maven 

--------------------------------------------

-With either the binary or source distributions the sample can be built and run 

-using Maven as follows. 

-

-cd binding-notification-consumer

-mvn

-

 Sample Usage

 ------------

 

@@ -107,3 +82,29 @@ binding-notification-consumer/
   binding-notification-consumer.png                - a pictorial representation of the sample .composite file

   build.xml                       		   - the Ant build file

   pom.xml                                          - the Maven build file        

+

+Building And Running The Sample Using Ant

+-----------------------------------------

+With the binary distribution the sample can be built and run using Ant as 

+follows

+

+cd binding-notification-consumer

+ant compile

+ant run

+

+You should see the following output from the run target.

+

+run:

+     [java] Sep 14, 2007 10:56:29 AM org.apache.tuscany.sca.http.jetty.JettyServer addServletMapping

+     [java] INFO: Added Servlet mapping: http://localhost:8083/ntm/trafficAdvisory

+     [java] Sep 14, 2007 10:56:29 AM org.apache.tuscany.sca.http.jetty.JettyServer addServletMapping

+     [java] INFO: Added Servlet mapping: http://localhost:8083/consumer/trafficAdvisory

+     

+Building And Running The Sample Using Maven 

+-------------------------------------------

+With either the binary or source distributions the sample can be built and run 

+using Maven as follows. 

+

+cd binding-notification-consumer

+mvn

+

diff --git a/branches/sca-java-1.4/samples/binding-notification-producer/README b/branches/sca-java-1.4/samples/binding-notification-producer/README
index c5f284d4c5..3d927a0a50 100644
--- a/branches/sca-java-1.4/samples/binding-notification-producer/README
+++ b/branches/sca-java-1.4/samples/binding-notification-producer/README
@@ -26,46 +26,6 @@ This sample also illustrates the use of a wsdl interface in the notification
 component's <implementation.notification/>. This allows messages sent and received

 via <binding.notification/> to be transported as literal xml over http.

 

-Building And Running The Sample Using Ant

------------------------------------------

-With the binary distribution the sample can be built and run using Ant as 

-follows

-

-cd binding-notification-producer

-ant compile

-ant run

-

-You should see the following output from the run target.

-

-run:

-     [java] Sep 14, 2007 10:31:45 AM org.apache.tuscany.sca.http.jetty.JettyServer addServletMapping

-     [java] INFO: Added Servlet mapping: http://localhost:8083/ntm/trafficAdvisory

-     [java] Sep 14, 2007 10:31:45 AM org.apache.tuscany.sca.http.jetty.JettyServer addServletMapping

-     [java] INFO: Added Servlet mapping: http://localhost:8083/producer/trafficAdvisory

-     

-Building And Running The Sample Using Maven 

--------------------------------------------

-With either the binary or source distributions the sample can be built and run 

-using Maven as follows. 

-

-cd binding-notification-producer

-mvn

-

-You should see the following output from the test phase.

-

--------------------------------------------------------

- T E S T S

--------------------------------------------------------

-Running notification.producer.TrafficAdvisoryTestCase

-Only instantiating and closing domain ...

-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.252 sec

-

-Results :

-

-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0

-

-This shows that the Junit test cases have run successfully. 

-

 Sample Usage

 ------------

 

@@ -131,3 +91,44 @@ binding-notification-producer/
   binding-notification-producer.png                - a pictorial representation of the sample .composite file

   build.xml                       		   - the Ant build file

   pom.xml                                          - the Maven build file        

+

+Building And Running The Sample Using Ant

+-----------------------------------------

+With the binary distribution the sample can be built and run using Ant as 

+follows

+

+cd binding-notification-producer

+ant compile

+ant run

+

+You should see the following output from the run target.

+

+run:

+     [java] Sep 14, 2007 10:31:45 AM org.apache.tuscany.sca.http.jetty.JettyServer addServletMapping

+     [java] INFO: Added Servlet mapping: http://localhost:8083/ntm/trafficAdvisory

+     [java] Sep 14, 2007 10:31:45 AM org.apache.tuscany.sca.http.jetty.JettyServer addServletMapping

+     [java] INFO: Added Servlet mapping: http://localhost:8083/producer/trafficAdvisory

+     

+Building And Running The Sample Using Maven 

+-------------------------------------------

+With either the binary or source distributions the sample can be built and run 

+using Maven as follows. 

+

+cd binding-notification-producer

+mvn

+

+You should see the following output from the test phase.

+

+-------------------------------------------------------

+ T E S T S

+-------------------------------------------------------

+Running notification.producer.TrafficAdvisoryTestCase

+Only instantiating and closing domain ...

+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.252 sec

+

+Results :

+

+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0

+

+This shows that the Junit test cases have run successfully. 

+