You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2007/10/23 22:51:58 UTC
svn commit: r587651 - in /incubator/tuscany/branches/sca-java-1.0.1: ./
demos/mortgage-creditcheck/
demos/mortgage-creditcheck/src/main/webapp/META-INF/ distribution/
distribution/bundle/ distribution/manifest/ itest/databindings/
modules/contribution-...
Author: rfeng
Date: Tue Oct 23 13:51:54 2007
New Revision: 587651
URL: http://svn.apache.org/viewvc?rev=587651&view=rev
Log:
Merge the changes up to r577910 (We had some extra changes in trunk when the 1.0 branch was serving the 1.0 release)
Added:
incubator/tuscany/branches/sca-java-1.0.1/modules/node-impl/src/main/resources/META-INF/
- copied from r577910, incubator/tuscany/java/sca/modules/node-impl/src/main/resources/META-INF/
incubator/tuscany/branches/sca-java-1.0.1/modules/node-impl/src/main/resources/META-INF/sca-contribution.xml
- copied unchanged from r577910, incubator/tuscany/java/sca/modules/node-impl/src/main/resources/META-INF/sca-contribution.xml
incubator/tuscany/branches/sca-java-1.0.1/modules/node-impl/src/main/resources/node.composite
- copied unchanged from r577910, incubator/tuscany/java/sca/modules/node-impl/src/main/resources/node.composite
incubator/tuscany/branches/sca-java-1.0.1/modules/node-impl/src/main/resources/webroot/
- copied from r577910, incubator/tuscany/java/sca/modules/node-impl/src/main/resources/webroot/
incubator/tuscany/branches/sca-java-1.0.1/modules/node-impl/src/main/resources/webroot/index.html
- copied unchanged from r577910, incubator/tuscany/java/sca/modules/node-impl/src/main/resources/webroot/index.html
incubator/tuscany/branches/sca-java-1.0.1/modules/node-impl/src/main/resources/webroot/node.png
- copied unchanged from r577910, incubator/tuscany/java/sca/modules/node-impl/src/main/resources/webroot/node.png
incubator/tuscany/branches/sca-java-1.0.1/modules/node-impl/src/main/resources/webroot/style.css
- copied unchanged from r577910, incubator/tuscany/java/sca/modules/node-impl/src/main/resources/webroot/style.css
incubator/tuscany/branches/sca-java-1.0.1/samples/binding-notification-broker/build.xml
- copied unchanged from r577910, incubator/tuscany/java/sca/samples/binding-notification-broker/build.xml
incubator/tuscany/branches/sca-java-1.0.1/samples/binding-notification-consumer/build.xml
- copied unchanged from r577910, incubator/tuscany/java/sca/samples/binding-notification-consumer/build.xml
incubator/tuscany/branches/sca-java-1.0.1/samples/binding-notification-producer/build.xml
- copied unchanged from r577910, incubator/tuscany/java/sca/samples/binding-notification-producer/build.xml
incubator/tuscany/branches/sca-java-1.0.1/samples/calculator-webapp/src/main/resources/wsdl/
- copied from r577910, incubator/tuscany/java/sca/samples/calculator-webapp/src/main/resources/wsdl/
incubator/tuscany/branches/sca-java-1.0.1/samples/calculator-webapp/src/main/resources/wsdl/add.wsdl
- copied unchanged from r577910, incubator/tuscany/java/sca/samples/calculator-webapp/src/main/resources/wsdl/add.wsdl
incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-bpel/build.xml
- copied unchanged from r577910, incubator/tuscany/java/sca/samples/helloworld-bpel/build.xml
incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-bpel/helloworld-bpel.png
- copied unchanged from r577910, incubator/tuscany/java/sca/samples/helloworld-bpel/helloworld-bpel.png
incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-bpel/helloworld-bpel.svg
- copied unchanged from r577910, incubator/tuscany/java/sca/samples/helloworld-bpel/helloworld-bpel.svg
incubator/tuscany/branches/sca-java-1.0.1/samples/implementation-notification/build.xml
- copied unchanged from r577910, incubator/tuscany/java/sca/samples/implementation-notification/build.xml
incubator/tuscany/branches/sca-java-1.0.1/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryClient.java
- copied unchanged from r577910, incubator/tuscany/java/sca/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryClient.java
incubator/tuscany/branches/sca-java-1.0.1/samples/implementation-notification/src/main/resources/
- copied from r577910, incubator/tuscany/java/sca/samples/implementation-notification/src/main/resources/
incubator/tuscany/branches/sca-java-1.0.1/samples/implementation-notification/src/main/resources/TrafficAdvisoryNotification.componentType
- copied unchanged from r577910, incubator/tuscany/java/sca/samples/implementation-notification/src/main/resources/TrafficAdvisoryNotification.componentType
incubator/tuscany/branches/sca-java-1.0.1/samples/implementation-notification/src/main/resources/TrafficAdvisoryNotification.composite
- copied unchanged from r577910, incubator/tuscany/java/sca/samples/implementation-notification/src/main/resources/TrafficAdvisoryNotification.composite
incubator/tuscany/branches/sca-java-1.0.1/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.componentType
- copied unchanged from r577910, incubator/tuscany/java/sca/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.componentType
incubator/tuscany/branches/sca-java-1.0.1/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.composite
- copied unchanged from r577910, incubator/tuscany/java/sca/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.composite
Removed:
incubator/tuscany/branches/sca-java-1.0.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/
Modified:
incubator/tuscany/branches/sca-java-1.0.1/ (props changed)
incubator/tuscany/branches/sca-java-1.0.1/demos/mortgage-creditcheck/pom.xml
incubator/tuscany/branches/sca-java-1.0.1/demos/mortgage-creditcheck/src/main/webapp/META-INF/sca-contribution.xml
incubator/tuscany/branches/sca-java-1.0.1/distribution/bundle/pom.xml
incubator/tuscany/branches/sca-java-1.0.1/distribution/manifest/pom.xml
incubator/tuscany/branches/sca-java-1.0.1/distribution/pom.xml
incubator/tuscany/branches/sca-java-1.0.1/itest/databindings/pom.xml
incubator/tuscany/branches/sca-java-1.0.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiClassReferenceModelResolver.java
incubator/tuscany/branches/sca-java-1.0.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementation.java
incubator/tuscany/branches/sca-java-1.0.1/pom.xml
incubator/tuscany/branches/sca-java-1.0.1/samples/binding-notification-broker/README
incubator/tuscany/branches/sca-java-1.0.1/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryServer.java
incubator/tuscany/branches/sca-java-1.0.1/samples/binding-notification-consumer/README
incubator/tuscany/branches/sca-java-1.0.1/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryServer.java
incubator/tuscany/branches/sca-java-1.0.1/samples/binding-notification-producer/README
incubator/tuscany/branches/sca-java-1.0.1/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryServer.java
incubator/tuscany/branches/sca-java-1.0.1/samples/implementation-composite/pom.xml
incubator/tuscany/branches/sca-java-1.0.1/samples/implementation-notification/README
incubator/tuscany/branches/sca-java-1.0.1/tools/registry-inspector/ (props changed)
Propchange: incubator/tuscany/branches/sca-java-1.0.1/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Oct 23 13:51:54 2007
@@ -11,4 +11,7 @@
.settings
.deployables
.wtpmodules
+.externalToolBuilders
+maven-eclipse.xml
+Maven_Ant_Builder.launch
Modified: incubator/tuscany/branches/sca-java-1.0.1/demos/mortgage-creditcheck/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/demos/mortgage-creditcheck/pom.xml?rev=587651&r1=587650&r2=587651&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/demos/mortgage-creditcheck/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/demos/mortgage-creditcheck/pom.xml Tue Oct 23 13:51:54 2007
@@ -54,7 +54,7 @@
<!--
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-webapp</artifactId>
<version>1.0.1-incubating-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
Modified: incubator/tuscany/branches/sca-java-1.0.1/demos/mortgage-creditcheck/src/main/webapp/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/demos/mortgage-creditcheck/src/main/webapp/META-INF/sca-contribution.xml?rev=587651&r1=587650&r2=587651&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/demos/mortgage-creditcheck/src/main/webapp/META-INF/sca-contribution.xml (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/demos/mortgage-creditcheck/src/main/webapp/META-INF/sca-contribution.xml Tue Oct 23 13:51:54 2007
@@ -21,4 +21,4 @@
targetNamespace="http://credit"
xmlns:credit="http://credit">
<deployable composite="credit:CreditComposite"/>
-</contribution>
\ No newline at end of file
+</contribution>
Modified: incubator/tuscany/branches/sca-java-1.0.1/distribution/bundle/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/distribution/bundle/pom.xml?rev=587651&r1=587650&r2=587651&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/distribution/bundle/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/distribution/bundle/pom.xml Tue Oct 23 13:51:54 2007
@@ -374,6 +374,13 @@
<artifactId>wstx-asl</artifactId>
</exclusion>
</exclusions>
+ <exclusions>
+ <exclusion>
+ <!-- sdo 1.0 uses 3.2.0 but sca uses 3.2.1 -->
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sdo</groupId>
Modified: incubator/tuscany/branches/sca-java-1.0.1/distribution/manifest/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/distribution/manifest/pom.xml?rev=587651&r1=587650&r2=587651&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/distribution/manifest/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/distribution/manifest/pom.xml Tue Oct 23 13:51:54 2007
@@ -367,6 +367,13 @@
<artifactId>wstx-asl</artifactId>
</exclusion>
</exclusions>
+ <exclusions>
+ <exclusion>
+ <!-- sdo 1.0 uses 3.2.0 but sca uses 3.2.1 -->
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sdo</groupId>
Modified: incubator/tuscany/branches/sca-java-1.0.1/distribution/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/distribution/pom.xml?rev=587651&r1=587650&r2=587651&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/distribution/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/distribution/pom.xml Tue Oct 23 13:51:54 2007
@@ -101,6 +101,18 @@
<artifactId>stax-api</artifactId>
</exclusion>
</exclusions>
+ <exclusions>
+ <exclusion>
+ <!-- sdo 1.0 uses 3.2.0 but sca uses 3.2.1 -->
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ </exclusion>
+ <exclusion>
+ <!-- exclude stax 1.0.1 as we're also pulling in javax\xml\stream\stax-api\1.0-2 -->
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
Modified: incubator/tuscany/branches/sca-java-1.0.1/itest/databindings/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/itest/databindings/pom.xml?rev=587651&r1=587650&r2=587651&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/itest/databindings/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/itest/databindings/pom.xml Tue Oct 23 13:51:54 2007
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-itest</artifactId>
- <version>1.0-incubating-SNAPSHOT</version>
+ <version>1.1-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -29,7 +29,7 @@
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>itest-databindings</artifactId>
<name>Apache Tuscany SCA Databindings Integration Tests</name>
- <version>1.0-incubating-SNAPSHOT</version>
+ <version>1.1-incubating-SNAPSHOT</version>
<packaging>pom</packaging>
Modified: incubator/tuscany/branches/sca-java-1.0.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiClassReferenceModelResolver.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiClassReferenceModelResolver.java?rev=587651&r1=587650&r2=587651&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiClassReferenceModelResolver.java (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiClassReferenceModelResolver.java Tue Oct 23 13:51:54 2007
@@ -40,8 +40,7 @@
private Map<String, ClassReference> map = new HashMap<String, ClassReference>();
private Bundle bundle;
private boolean initialized;
-
-
+
public OSGiClassReferenceModelResolver(Contribution contribution, ModelFactoryExtensionPoint modelFactories) {
this.contribution = contribution;
}
@@ -50,11 +49,11 @@
ClassReference clazz = (ClassReference)resolved;
map.put(clazz.getClassName(), clazz);
}
-
+
public Object removeModel(Object resolved) {
return map.remove(((ClassReference)resolved).getClassName());
}
-
+
/**
* Handle artifact resolution when the specific class reference is imported from another contribution
* @param unresolved
@@ -63,66 +62,63 @@
private ClassReference resolveImportedModel(ClassReference unresolved) {
ClassReference resolved = unresolved;
- if( this.contribution != null) {
+ if (this.contribution != null) {
for (Import import_ : this.contribution.getImports()) {
-
+
if (resolved == unresolved && bundle != null) {
resolved = import_.getModelResolver().resolveModel(ClassReference.class, unresolved);
if (resolved != unresolved)
- break;
+ break;
}
}
-
+
}
return resolved;
}
-
-
+
public <T> T resolveModel(Class<T> modelClass, T unresolved) {
Object resolved = map.get(unresolved);
-
- if (resolved != null ){
+
+ if (resolved != null) {
return modelClass.cast(resolved);
- }
+ }
initialize();
//Load a class on demand
Class clazz = null;
if (bundle != null) {
- try {
- clazz = bundle.loadClass(((ClassReference)unresolved).getClassName());
- } catch (Exception e) {
- // we will later try to delegate to imported model resolvers
- }
+ try {
+ clazz = bundle.loadClass(((ClassReference)unresolved).getClassName());
+ } catch (Exception e) {
+ // we will later try to delegate to imported model resolvers
+ }
}
-
-
+
if (clazz != null) {
//if we load the class
// Store a new ClassReference wrappering the loaded class
ClassReference classReference = new ClassReference(clazz);
map.put(getPackageName(classReference), classReference);
-
+
// Return the resolved ClassReference
- return modelClass.cast(classReference);
+ return modelClass.cast(classReference);
} else {
//delegate resolution of the class
resolved = this.resolveImportedModel((ClassReference)unresolved);
return modelClass.cast(resolved);
}
-
}
-
+
/***************
* Helper methods
***************/
-
+
private String getPackageName(ClassReference clazz) {
int pos = clazz.getClassName().lastIndexOf(".");
- return clazz.getClassName().substring(0, pos - 1 );
+ return clazz.getClassName().substring(0, pos - 1);
}
-
+
private void initialize() {
if (initialized)
return;
Modified: incubator/tuscany/branches/sca-java-1.0.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementation.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementation.java?rev=587651&r1=587650&r2=587651&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementation.java (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementation.java Tue Oct 23 13:51:54 2007
@@ -51,4 +51,4 @@
* @param processDefinition
*/
void setProcessDefinition(BPELProcessDefinition processDefinition);
-}
\ No newline at end of file
+}
Modified: incubator/tuscany/branches/sca-java-1.0.1/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/pom.xml?rev=587651&r1=587650&r2=587651&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/pom.xml Tue Oct 23 13:51:54 2007
@@ -127,7 +127,8 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3</version>
+ <!-- http://jira.codehaus.org/browse/SUREFIRE-322 -->
+ <version>2.3.1-SNAPSHOT</version>
<configuration>
<includes>
<include>**/*TestCase.java</include>
Modified: incubator/tuscany/branches/sca-java-1.0.1/samples/binding-notification-broker/README
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/samples/binding-notification-broker/README?rev=587651&r1=587650&r2=587651&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/samples/binding-notification-broker/README (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/samples/binding-notification-broker/README Tue Oct 23 13:51:54 2007
@@ -26,6 +26,25 @@
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
-------------------------------------------
Modified: incubator/tuscany/branches/sca-java-1.0.1/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryServer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryServer.java?rev=587651&r1=587650&r2=587651&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryServer.java (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryServer.java Tue Oct 23 13:51:54 2007
@@ -41,16 +41,19 @@
TestCaseProducer testCaseProducer = domain.getService(TestCaseProducer.class, "TrafficAdvisoryProducer");
BufferedReader reader = new BufferedReader(new InputStreamReader(System.in));
- String value = null;
+ String value = "";
+ if (args.length == 1) {
+ value = args[0];
+ }
do {
+ if(value == null || value.equals("end")) {
+ break;
+ }
try {
System.out.println("Send a report value, ^C or <end> to end");
value = reader.readLine();
} catch (IOException e) {
e.printStackTrace();
- }
- if(value == null || value.equals("end")) {
- break;
}
if (value.equals("rb")) {
NotificationBindingProviderFactory.removeBroker(notificationType);
Modified: incubator/tuscany/branches/sca-java-1.0.1/samples/binding-notification-consumer/README
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/samples/binding-notification-consumer/README?rev=587651&r1=587650&r2=587651&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/samples/binding-notification-consumer/README (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/samples/binding-notification-consumer/README Tue Oct 23 13:51:54 2007
@@ -26,6 +26,23 @@
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
Modified: incubator/tuscany/branches/sca-java-1.0.1/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryServer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryServer.java?rev=587651&r1=587650&r2=587651&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryServer.java (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryServer.java Tue Oct 23 13:51:54 2007
@@ -32,8 +32,10 @@
SCADomain domain = SCADomain.newInstance("TrafficAdvisoryNotification.composite");
try {
- System.out.println("TrafficAdvisoryServer, hit return to end");
- System.in.read();
+ if (args.length != 1 || !args[0].equals("end")) {
+ System.out.println("TrafficAdvisoryServer, hit return to end");
+ System.in.read();
+ }
} catch (IOException e) {
e.printStackTrace();
}
Modified: incubator/tuscany/branches/sca-java-1.0.1/samples/binding-notification-producer/README
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/samples/binding-notification-producer/README?rev=587651&r1=587650&r2=587651&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/samples/binding-notification-producer/README (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/samples/binding-notification-producer/README Tue Oct 23 13:51:54 2007
@@ -26,6 +26,23 @@
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
Modified: incubator/tuscany/branches/sca-java-1.0.1/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryServer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryServer.java?rev=587651&r1=587650&r2=587651&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryServer.java (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryServer.java Tue Oct 23 13:51:54 2007
@@ -31,16 +31,19 @@
SCADomain domain = SCADomain.newInstance("TrafficAdvisoryNotification.composite");
TestCaseProducer testCaseProducer = domain.getService(TestCaseProducer.class, "TrafficAdvisoryProducer");
BufferedReader reader = new BufferedReader(new InputStreamReader(System.in));
- String value = null;
+ String value = "";
+ if (args.length == 1) {
+ value = args[0];
+ }
do {
+ if(value == null || value.equals("end")) {
+ break;
+ }
try {
System.out.println("Send a report value, ^C or <end> to end");
value = reader.readLine();
} catch (IOException e) {
e.printStackTrace();
- }
- if(value == null || value.equals("end")) {
- break;
}
testCaseProducer.produceTrafficNotification("Report value [" + value + "]");
}
Modified: incubator/tuscany/branches/sca-java-1.0.1/samples/implementation-composite/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/samples/implementation-composite/pom.xml?rev=587651&r1=587650&r2=587651&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/samples/implementation-composite/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/samples/implementation-composite/pom.xml Tue Oct 23 13:51:54 2007
@@ -57,6 +57,12 @@
</dependency>
<dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-host-embedded</artifactId>
+ <version>1.1-incubating-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.2</version>
Modified: incubator/tuscany/branches/sca-java-1.0.1/samples/implementation-notification/README
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/samples/implementation-notification/README?rev=587651&r1=587650&r2=587651&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/samples/implementation-notification/README (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/samples/implementation-notification/README Tue Oct 23 13:51:54 2007
@@ -10,6 +10,14 @@
If you just want to run it to see what happens open a command prompt, navigate
to this sample directory and do:
+ant run
+
+OR if you don't have ant, on Windows do
+
+java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-implementation-notification.jar notification.TrafficAdvisoryClient
+
+OR you can also use Maven to test:
+
mvn test
Sample Overview
@@ -45,6 +53,21 @@
notification component, and consumers
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 implementation-notification
+ant compile
+ant run
+
+You should see the following output from the run target.
+
+run:
+ [java] Consumer [Consumer1] received report: Nothing to report today
+ [java] Consumer [Consumer2] received report: Nothing to report today
+
Building And Running The Sample Using Maven
-------------------------------------------
With either the binary or source distributions the sample can be built and run
Propchange: incubator/tuscany/branches/sca-java-1.0.1/tools/registry-inspector/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Oct 23 13:51:54 2007
@@ -0,0 +1,5 @@
+*.classpath
+.externalToolBuilders
+.project
+.settings
+target
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org