TUSCANY-2657: Apply patch from Dhaval Chauhan for Updates for the binding-notification-* samples"

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

6 files changed, 32 insertions, 18 deletions

diff --git a/java/sca/samples/binding-notification-broker/README b/java/sca/samples/binding-notification-broker/README
index e47f12cb20..ebd8bbec30 100644
--- a/java/sca/samples/binding-notification-broker/README
+++ b/java/sca/samples/binding-notification-broker/README
@@ -57,15 +57,15 @@ mvn
 Sample Usage

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

 

-This sample is run using the tuscany binary distribution. To run it, first set the

-following environment variables:

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

 

-set TUSCANY_BIN_DISTRO=<Directory where the distro was extracted, e.g. \Devt\tuscany-sca-distr\tuscany-sca>

-set TUSCANY_SCA_MANIFEST_JAR=%TUSCANY_BIN_DISTRO%\lib\tuscany-sca-manifest.jar

+on Wondows, use following command:

 

-Then navigate to this sample directory and do:

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

 

-java -Dnotification.httpPort=8080 -cp "target\sample-binding-notification-broker.jar;%TUSCANY_SCA_MANIFEST_JAR%" notification.broker.TrafficAdvisoryServer

+on *nix, use following command:

+

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

 

 this should bring up the following prompt:

 

@@ -107,4 +107,6 @@ binding-notification-broker/
                                                      <implementation.notification/>

         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

   pom.xml                                          - the Maven build file        

diff --git a/java/sca/samples/binding-notification-broker/pom.xml b/java/sca/samples/binding-notification-broker/pom.xml
index f591bc9d07..f925f0f752 100644
--- a/java/sca/samples/binding-notification-broker/pom.xml
+++ b/java/sca/samples/binding-notification-broker/pom.xml
@@ -82,6 +82,7 @@
     </dependencies>

 

     <build>

+	<finalName>${artifactId}</finalName>

         <plugins>

             <plugin>

                 <groupId>org.apache.maven.plugins</groupId>

diff --git a/java/sca/samples/binding-notification-consumer/README b/java/sca/samples/binding-notification-consumer/README
index 0fdfa8461a..b54b445670 100644
--- a/java/sca/samples/binding-notification-consumer/README
+++ b/java/sca/samples/binding-notification-consumer/README
@@ -54,15 +54,15 @@ mvn
 Sample Usage

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

 

-This sample is run using the tuscany binary distribution. To run it, first set the

-following environment variables:

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

 

-set TUSCANY_BIN_DISTRO=<Directory where the distro was extracted, e.g. \Devt\tuscany-sca-distr\tuscany-sca>

-set TUSCANY_SCA_MANIFEST_JAR=%TUSCANY_BIN_DISTRO%\lib\tuscany-sca-manifest.jar

+on Wondows, use following command:

 

-Then navigate to this sample directory and do:

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

 

-java -Dnotification.httpPort=8082 -cp "target\sample-binding-notification-consumer.jar;%TUSCANY_SCA_MANIFEST_JAR%" notification.consumer.TrafficAdvisoryServer

+on *nix, use following command:

+

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

 

 this should bring up the following prompt:

 

@@ -99,4 +99,11 @@ binding-notification-consumer/
                                                      <implementation.notification/>

         TrafficAdvisoryNotification.composite      - the main composite including producer and

                                                      notification components, and composite reference

+  test/

+      java/

+        notification.producer/

+          TrafficAdvisoryTestCase.java             - JUnit test case

+  resources/

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

+  build.xml                       		   - the Ant build file

   pom.xml                                          - the Maven build file        

diff --git a/java/sca/samples/binding-notification-consumer/pom.xml b/java/sca/samples/binding-notification-consumer/pom.xml
index 7feffecfb8..b293b07373 100644
--- a/java/sca/samples/binding-notification-consumer/pom.xml
+++ b/java/sca/samples/binding-notification-consumer/pom.xml
@@ -88,6 +88,7 @@
     </dependencies>

     

     <build>

+	<finalName>${artifactId}</finalName>

         <plugins>

             <plugin>

                 <groupId>org.apache.maven.plugins</groupId>

diff --git a/java/sca/samples/binding-notification-producer/README b/java/sca/samples/binding-notification-producer/README
index 58611f64bd..c5f284d4c5 100644
--- a/java/sca/samples/binding-notification-producer/README
+++ b/java/sca/samples/binding-notification-producer/README
@@ -69,15 +69,15 @@ This shows that the Junit test cases have run successfully.
 Sample Usage

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

 

-This sample is run using the tuscany binary distribution. To run it, first set the

-following environment variables:

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

 

-set TUSCANY_BIN_DISTRO=<Directory where the distro was extracted, e.g. \Devt\tuscany-sca-distr\tuscany-sca>

-set TUSCANY_SCA_MANIFEST_JAR=%TUSCANY_BIN_DISTRO%\lib\tuscany-sca-manifest.jar

+on Wondows, use following command:

 

-Then navigate to this sample directory and do:

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

 

-java -Dnotification.httpPort=8083 -cp "target\sample-binding-notification-producer.jar;%TUSCANY_SCA_MANIFEST_JAR%" notification.producer.TrafficAdvisoryServer

+on *nix, use following command:

+

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

 

 this should bring up the following prompt:

 

@@ -128,4 +128,6 @@ binding-notification-producer/
                                                      <implementation.notification/>

         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

   pom.xml                                          - the Maven build file        

diff --git a/java/sca/samples/binding-notification-producer/pom.xml b/java/sca/samples/binding-notification-producer/pom.xml
index 81b163fba8..262cb0b8b0 100644
--- a/java/sca/samples/binding-notification-producer/pom.xml
+++ b/java/sca/samples/binding-notification-producer/pom.xml
@@ -88,6 +88,7 @@
     </dependencies>

     

     <build>

+	<finalName>${artifactId}</finalName>

         <plugins>

             <plugin>

                 <groupId>org.apache.maven.plugins</groupId>