Merge r1000266 Fix notification sample build.xml and README files to provide clear instructions that work

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

6 files changed, 102 insertions, 40 deletions

diff --git a/sca-java-1.x/trunk/samples/binding-notification-broker/README b/sca-java-1.x/trunk/samples/binding-notification-broker/README
index c21b8a5a1c..d73d296bee 100644
--- a/sca-java-1.x/trunk/samples/binding-notification-broker/README
+++ b/sca-java-1.x/trunk/samples/binding-notification-broker/README
@@ -29,19 +29,37 @@ via <binding.notification/> to be transported as literal xml over http.
 Sample Usage

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

 

-This sample is run using the tuscany binary distribution. To run it, navigate to this sample's directory and 

+These instructions assume that you will start the notification samples in the

+following order:

+ binding-notification-consumer

+ binding-notification-broker

+ binding-notification-producer

+

+For a clean shutdown without exceptions, you should end the notification samples

+in the following order:

+ binding-notification-producer

+ binding-notification-broker

+ binding-notification-consumer

+

+This sample is run using the tuscany binary distribution. To see what it does,

+first start the consumer sample. When this is running, open a command prompt,

+navigate to this sample's directory and do 

 

-on Wondows, use following command:

+ant run

+

+OR if you don't have ant,

 

-java -Dnotification.httpPort=8080 -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-binding-notification-broker.jar  notification.broker.TrafficAdvisoryServer

+on Windows, use the following command:

 

-on *nix, use following command:

+java -Dnotification.httpPort=8082 -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-binding-notification-broker.jar  notification.broker.TrafficAdvisoryServer

 

-java -Dnotification.httpPort=8080 -cp ../../lib/tuscany-sca-manifest.jar:target/sample-binding-notification-broker.jar notification.broker.TrafficAdvisoryServer

+on *nix, use the following command:

+

+java -Dnotification.httpPort=8082 -cp ../../lib/tuscany-sca-manifest.jar:target/sample-binding-notification-broker.jar notification.broker.TrafficAdvisoryServer

 

 this should bring up the following prompt:

 

-Send a report value, ^C or <end> to end

+Send a report value, ^C or 'end' to end

 

 at this point you should be able to type a message to send, for instance:

 

@@ -51,7 +69,7 @@ Notice that before you try to receive any message, you should bring up the
 consumer sample or another broker sample. When you have finished using this

 sample, type 'end' or ^C to end.

 

-Also notice that '-Dnotification.httpPort=8080' is used in the java command.

+Also notice that '-Dnotification.httpPort=8082' is used in the java command.

 This indicates the port the sample should use. This also says that this server

 is not going to play the role of ntm, given our previous assumption. It is important

 that the first one of the producer, consumer or broker sample that is run be the

@@ -80,7 +98,7 @@ binding-notification-broker/
         TrafficAdvisoryNotification.composite      - the main composite including producer, consumer and

                                                      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

+  build.xml                       		           - the Ant build file

   pom.xml                                          - the Maven build file 

 

 Building And Running The Sample Using Ant

@@ -96,11 +114,9 @@ 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] INFO: Added Servlet mapping: http://localhost:8082/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

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

      

 Building And Running The Sample Using Maven 

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

diff --git a/sca-java-1.x/trunk/samples/binding-notification-broker/build.xml b/sca-java-1.x/trunk/samples/binding-notification-broker/build.xml
index a042b9036a..dd3ed8eaea 100644
--- a/sca-java-1.x/trunk/samples/binding-notification-broker/build.xml
+++ b/sca-java-1.x/trunk/samples/binding-notification-broker/build.xml
@@ -51,7 +51,7 @@
                 <pathelement path="target/classes"/>

             	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>

             </classpath>

-        	<sysproperty key="notification.httpPort" value="8083"/>

+        	<sysproperty key="notification.httpPort" value="8082"/>

         	<arg value="end"/>

         </java>

     </target>

@@ -63,7 +63,7 @@
                 <pathelement path="target/${test.jar}"/>

             	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>

             </classpath>

-        	<sysproperty key="notification.httpPort" value="8083"/>

+        	<sysproperty key="notification.httpPort" value="8082"/>

         </java>    	

     </target>

 	

diff --git a/sca-java-1.x/trunk/samples/binding-notification-consumer/README b/sca-java-1.x/trunk/samples/binding-notification-consumer/README
index 62ef1d0126..4993c5ce79 100644
--- a/sca-java-1.x/trunk/samples/binding-notification-consumer/README
+++ b/sca-java-1.x/trunk/samples/binding-notification-consumer/README
@@ -1,5 +1,5 @@
 Notification Consumer Binding Sample

-===============================

+====================================

 

 This sample illustrates the use of <binding.notification/> with a

 remote consumer.

@@ -29,15 +29,32 @@ via <binding.notification/> to be transported as literal xml over http.
 Sample Usage

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

 

-This sample is run using the tuscany binary distribution. To run it, navigate to this sample's directory and 

+These instructions assume that you will start the notification samples in the

+following order:

+ binding-notification-consumer

+ binding-notification-broker

+ binding-notification-producer

 

-on Wondows, use following command:

+For a clean shutdown without exceptions, you should end the notification samples

+in the following order:

+ binding-notification-producer

+ binding-notification-broker

+ binding-notification-consumer

 

-java -Dnotification.httpPort=8082 -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-binding-notification-consumer.jar notification.consumer.TrafficAdvisoryServer

+This sample is run using the tuscany binary distribution. To see what it does,

+open a command prompt, navigate to this sample's directory and do 

 

-on *nix, use following command:

+ant run

+

+OR if you don't have ant,

+

+on Windows, use the following command:

+

+java -Dnotification.httpPort=8083 -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-binding-notification-consumer.jar notification.consumer.TrafficAdvisoryServer

+

+on *nix, use the following command:

 

-java -Dnotification.httpPort=8082 -cp ../../lib/tuscany-sca-manifest.jar:target/sample-binding-notification-consumer.jar notification.consumer.TrafficAdvisoryServer

+java -Dnotification.httpPort=8083 -cp ../../lib/tuscany-sca-manifest.jar:target/sample-binding-notification-consumer.jar notification.consumer.TrafficAdvisoryServer

 

 this should bring up the following prompt:

 

@@ -49,9 +66,9 @@ Notice that before you try to receive any message, you should bring up the
 producer sample or the broker sample. When you have finished using this

 sample, hit return to end.

 

-Also notice that '-Dnotification.httpPort=8082' is used in the java command.

+Also notice that '-Dnotification.httpPort=8083' is used in the java command.

 This indicates the port the sample should use. This also says that this server

-is not going to play the role of ntm, given our previous assumption. It is important

+is going to play the role of ntm, given our previous assumption. It is important

 that the first one of the producer, consumer or broker sample that is run be the

 one that uses '-Dnotification.httpPort=8083', otherwise there is no ntm to talk

 to and an exception will be thrown.

@@ -80,7 +97,7 @@ binding-notification-consumer/
           TrafficAdvisoryTestCase.java             - JUnit test case

   resources/

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

-  build.xml                       		   - the Ant build file

+  build.xml                       		           - the Ant build file

   pom.xml                                          - the Maven build file        

 

 Building And Running The Sample Using Ant

@@ -108,3 +125,17 @@ using Maven as follows.
 cd binding-notification-consumer

 mvn

 

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

+

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

+ T E S T S

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

+Running notification.consumer.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. 

diff --git a/sca-java-1.x/trunk/samples/binding-notification-consumer/build.xml b/sca-java-1.x/trunk/samples/binding-notification-consumer/build.xml
index f57fe1bb26..b4ddaa3aec 100644
--- a/sca-java-1.x/trunk/samples/binding-notification-consumer/build.xml
+++ b/sca-java-1.x/trunk/samples/binding-notification-consumer/build.xml
@@ -63,7 +63,7 @@
                 <pathelement path="target/${test.jar}"/>

             	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>

             </classpath>

-        	<sysproperty key="notification.httpPort" value="8081"/>

+        	<sysproperty key="notification.httpPort" value="8083"/>

         </java>    	

     </target>

 	

diff --git a/sca-java-1.x/trunk/samples/binding-notification-producer/README b/sca-java-1.x/trunk/samples/binding-notification-producer/README
index 3d927a0a50..b585c8c3e0 100644
--- a/sca-java-1.x/trunk/samples/binding-notification-producer/README
+++ b/sca-java-1.x/trunk/samples/binding-notification-producer/README
@@ -1,5 +1,5 @@
 Notification Producer Binding Sample

-===============================

+====================================

 

 This sample illustrates the use of <binding.notification/> with a

 remote producer.

@@ -29,19 +29,37 @@ via <binding.notification/> to be transported as literal xml over http.
 Sample Usage

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

 

-This sample is run using the tuscany binary distribution. To run it, navigate to this sample's directory and 

+These instructions assume that you will start the notification samples in the

+following order:

+ binding-notification-consumer

+ binding-notification-broker

+ binding-notification-producer

 

-on Wondows, use following command:

+For a clean shutdown without exceptions, you should end the notification samples

+in the following order:

+ binding-notification-producer

+ binding-notification-broker

+ binding-notification-consumer

 

-java -Dnotification.httpPort=8083 -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-binding-notification-producer.jar notification.producer.TrafficAdvisoryServer

+This sample is run using the tuscany binary distribution. To see what it does,

+first start the consumer and broker samples. When these are running, open a

+command prompt, navigate to this sample's directory and do 

 

-on *nix, use following command:

+ant run

+

+OR if you don't have ant,

+

+on Windows, use the following command:

+

+java -Dnotification.httpPort=8081 -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-binding-notification-producer.jar notification.producer.TrafficAdvisoryServer

 

-java -Dnotification.httpPort=8083 -cp ../../lib/tuscany-sca-manifest.jar:target/sample-binding-notification-producer.jar notification.producer.TrafficAdvisoryServer

+on *nix, use the following command:

+

+java -Dnotification.httpPort=8081 -cp ../../lib/tuscany-sca-manifest.jar:target/sample-binding-notification-producer.jar notification.producer.TrafficAdvisoryServer

 

 this should bring up the following prompt:

 

-Send a report value, ^C or <end> to end

+Send a report value, ^C or 'end' to end

 

 at this point you should be able to type a message to send, for instance:

 

@@ -51,9 +69,9 @@ Notice that before you try to send any message, you should bring up the
 consumer sample or the broker sample. When you have finished using this

 sample, type 'end' or ^C to end.

 

-Also notice that '-Dnotification.httpPort=8083' is used in the java command.

+Also notice that '-Dnotification.httpPort=8081' is used in the java command.

 This indicates the port the sample should use. This also says that this server

-is going to play the role of ntm, given our previous assumption. It is important

+is not going to play the role of ntm, given our previous assumption. It is important

 that the first one of the producer, consumer or broker sample that is run be the

 one that uses '-Dnotification.httpPort=8083', otherwise there is no ntm to talk

 to and an exception will be thrown.

@@ -89,7 +107,7 @@ binding-notification-producer/
         TrafficAdvisoryNotification.composite      - the main composite including producer and

                                                      notification components, and composite reference

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

-  build.xml                       		   - the Ant build file

+  build.xml                       		           - the Ant build file

   pom.xml                                          - the Maven build file        

 

 Building And Running The Sample Using Ant

@@ -105,9 +123,7 @@ 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

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

      

 Building And Running The Sample Using Maven 

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

@@ -131,4 +147,3 @@ Results :
 Tests run: 1, Failures: 0, Errors: 0, Skipped: 0

 

 This shows that the Junit test cases have run successfully. 

-

diff --git a/sca-java-1.x/trunk/samples/binding-notification-producer/build.xml b/sca-java-1.x/trunk/samples/binding-notification-producer/build.xml
index d13e4c8a6c..6908a306b8 100644
--- a/sca-java-1.x/trunk/samples/binding-notification-producer/build.xml
+++ b/sca-java-1.x/trunk/samples/binding-notification-producer/build.xml
@@ -51,7 +51,7 @@
                 <pathelement path="target/classes"/>

             	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>

             </classpath>

-        	<sysproperty key="notification.httpPort" value="8083"/>

+        	<sysproperty key="notification.httpPort" value="8081"/>

         	<arg value="end"/>

         </java>

     </target>

@@ -63,7 +63,7 @@
                 <pathelement path="target/${test.jar}"/>

             	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>

             </classpath>

-        	<sysproperty key="notification.httpPort" value="8082"/>

+        	<sysproperty key="notification.httpPort" value="8081"/>

         </java>    	

     </target>