Author: lresende
Date: Mon Nov 3 22:52:10 2008
New Revision: 711190
URL: http://svn.apache.org/viewvc?rev=711190&view=rev
Log:
Merging changes from TUSCANY-2657 and TUSCANY-2659 from trunk.
Modified:
tuscany/branches/sca-java-1.3.3/ (props changed)
tuscany/branches/sca-java-1.3.3/samples/binding-notification-broker/README
tuscany/branches/sca-java-1.3.3/samples/binding-notification-broker/pom.xml
tuscany/branches/sca-java-1.3.3/samples/binding-notification-consumer/README
tuscany/branches/sca-java-1.3.3/samples/binding-notification-consumer/pom.xml
tuscany/branches/sca-java-1.3.3/samples/binding-notification-producer/README
tuscany/branches/sca-java-1.3.3/samples/binding-notification-producer/pom.xml
tuscany/branches/sca-java-1.3.3/samples/implementation-notification/README
tuscany/branches/sca-java-1.3.3/samples/implementation-notification/pom.xml
Propchange: tuscany/branches/sca-java-1.3.3/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 3 22:52:10 2008
@@ -1 +1 @@
-/tuscany/java/sca:673298,695536
+/tuscany/java/sca:673298,695536,710039-710042
Modified:
tuscany/branches/sca-java-1.3.3/samples/binding-notification-broker/README
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3.3/samples/binding-notification-broker/README?rev=711190&r1=711189&r2=711190&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3.3/samples/binding-notification-broker/README
(original)
+++ tuscany/branches/sca-java-1.3.3/samples/binding-notification-broker/README
Mon Nov 3 22:52:10 2008
@@ -57,15 +57,15 @@
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 @@
<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
Modified:
tuscany/branches/sca-java-1.3.3/samples/binding-notification-broker/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3.3/samples/binding-notification-broker/pom.xml?rev=711190&r1=711189&r2=711190&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3.3/samples/binding-notification-broker/pom.xml
(original)
+++ tuscany/branches/sca-java-1.3.3/samples/binding-notification-broker/pom.xml
Mon Nov 3 22:52:10 2008
@@ -82,6 +82,7 @@
</dependencies>
<build>
+ <finalName>${artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified:
tuscany/branches/sca-java-1.3.3/samples/binding-notification-consumer/README
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3.3/samples/binding-notification-consumer/README?rev=711190&r1=711189&r2=711190&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.3.3/samples/binding-notification-consumer/README
(original)
+++
tuscany/branches/sca-java-1.3.3/samples/binding-notification-consumer/README
Mon Nov 3 22:52:10 2008
@@ -54,15 +54,15 @@
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 @@
<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
Modified:
tuscany/branches/sca-java-1.3.3/samples/binding-notification-consumer/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3.3/samples/binding-notification-consumer/pom.xml?rev=711190&r1=711189&r2=711190&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.3.3/samples/binding-notification-consumer/pom.xml
(original)
+++
tuscany/branches/sca-java-1.3.3/samples/binding-notification-consumer/pom.xml
Mon Nov 3 22:52:10 2008
@@ -88,6 +88,7 @@
</dependencies>
<build>
+ <finalName>${artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified:
tuscany/branches/sca-java-1.3.3/samples/binding-notification-producer/README
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3.3/samples/binding-notification-producer/README?rev=711190&r1=711189&r2=711190&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.3.3/samples/binding-notification-producer/README
(original)
+++
tuscany/branches/sca-java-1.3.3/samples/binding-notification-producer/README
Mon Nov 3 22:52:10 2008
@@ -69,15 +69,15 @@
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 @@
<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
Modified:
tuscany/branches/sca-java-1.3.3/samples/binding-notification-producer/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3.3/samples/binding-notification-producer/pom.xml?rev=711190&r1=711189&r2=711190&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.3.3/samples/binding-notification-producer/pom.xml
(original)
+++
tuscany/branches/sca-java-1.3.3/samples/binding-notification-producer/pom.xml
Mon Nov 3 22:52:10 2008
@@ -88,6 +88,7 @@
</dependencies>
<build>
+ <finalName>${artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified:
tuscany/branches/sca-java-1.3.3/samples/implementation-notification/README
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3.3/samples/implementation-notification/README?rev=711190&r1=711189&r2=711190&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3.3/samples/implementation-notification/README
(original)
+++ tuscany/branches/sca-java-1.3.3/samples/implementation-notification/README
Mon Nov 3 22:52:10 2008
@@ -12,10 +12,14 @@
ant run
-OR if you don't have ant, on Windows do
+OR if you don't have ant, on Windows, use following command:
java -cp
..\..\lib\tuscany-sca-manifest.jar;target\sample-implementation-notification.jar
notification.TrafficAdvisoryClient
+on *nix, use following command:
+
+java -cp
../../lib/tuscany-sca-manifest.jar:target/sample-implementation-notification.jar
notification.TrafficAdvisoryClient
+
OR you can also use Maven to test:
mvn test
Modified:
tuscany/branches/sca-java-1.3.3/samples/implementation-notification/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3.3/samples/implementation-notification/pom.xml?rev=711190&r1=711189&r2=711190&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3.3/samples/implementation-notification/pom.xml
(original)
+++ tuscany/branches/sca-java-1.3.3/samples/implementation-notification/pom.xml
Mon Nov 3 22:52:10 2008
@@ -60,6 +60,7 @@
</dependencies>
<build>
+ <finalName>${artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
