Author: slaws
Date: Fri Jul 25 02:01:03 2008
New Revision: 679715
URL: http://svn.apache.org/viewvc?rev=679715&view=rev
Log:
TUSCANY-2420 commit changes from 1.3 branch
Modified:
tuscany/java/sca/samples/helloworld-reference-jms/src/main/resources/helloworldjmsservice.composite
tuscany/java/sca/samples/helloworld-service-jms/pom.xml
tuscany/java/sca/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldServer.java
tuscany/java/sca/samples/helloworld-service-jms/src/main/resources/helloworldjmsservice.composite
Modified:
tuscany/java/sca/samples/helloworld-reference-jms/src/main/resources/helloworldjmsservice.composite
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/samples/helloworld-reference-jms/src/main/resources/helloworldjmsservice.composite?rev=679715&r1=679714&r2=679715&view=diff
==============================================================================
---
tuscany/java/sca/samples/helloworld-reference-jms/src/main/resources/helloworldjmsservice.composite
(original)
+++
tuscany/java/sca/samples/helloworld-reference-jms/src/main/resources/helloworldjmsservice.composite
Fri Jul 25 02:01:03 2008
@@ -20,7 +20,7 @@
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0";
targetNamespace="http://helloworld";
xmlns:hw="http://helloworld";
- name="helloworldws">
+ name="helloworld">
<component name="HelloWorldServiceComponent">
<implementation.java class="helloworld.HelloWorldImpl" />
Modified: tuscany/java/sca/samples/helloworld-service-jms/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/samples/helloworld-service-jms/pom.xml?rev=679715&r1=679714&r2=679715&view=diff
==============================================================================
--- tuscany/java/sca/samples/helloworld-service-jms/pom.xml (original)
+++ tuscany/java/sca/samples/helloworld-service-jms/pom.xml Fri Jul 25 02:01:03
2008
@@ -35,14 +35,7 @@
</repository>
</repositories>
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-jetty</artifactId>
- <version>1.4-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
-
+ <dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-host-embedded</artifactId>
@@ -75,7 +68,6 @@
<groupId>org.apache.activemq</groupId>
<artifactId>apache-activemq</artifactId>
<version>4.1.1</version>
- <scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.apache.activemq</groupId>
Modified:
tuscany/java/sca/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldServer.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldServer.java?rev=679715&r1=679714&r2=679715&view=diff
==============================================================================
---
tuscany/java/sca/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldServer.java
(original)
+++
tuscany/java/sca/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldServer.java
Fri Jul 25 02:01:03 2008
@@ -20,6 +20,7 @@
import java.io.IOException;
+import org.apache.activemq.broker.BrokerService;
import org.apache.tuscany.sca.host.embedded.SCADomain;
/**
@@ -29,19 +30,29 @@
public class HelloWorldServer {
public static void main(String[] args) {
-
- // ActiveMQModuleActivator.startBroker();
- SCADomain scaDomain =
SCADomain.newInstance("helloworldjmsservice.composite");
-
try {
+ BrokerService jmsBroker;
+ jmsBroker = new BrokerService();
+ jmsBroker.setPersistent(false);
+ jmsBroker.setUseJmx(false);
+ jmsBroker.addConnector("tcp://localhost:61619");
+ jmsBroker.start();
+
+ SCADomain scaDomain =
SCADomain.newInstance("helloworldjmsservice.composite");
+
System.out.println("HelloWorld server started (press enter to
shutdown)");
System.in.read();
+
+ scaDomain.close();
+
+ jmsBroker.stop();
+ System.out.println("HelloWorld server stopped");
+
} catch (IOException e) {
e.printStackTrace();
+ } catch (Exception e) {
+ e.printStackTrace();
}
-
- scaDomain.close();
- System.out.println("HelloWorld server stopped");
}
}
Modified:
tuscany/java/sca/samples/helloworld-service-jms/src/main/resources/helloworldjmsservice.composite
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/samples/helloworld-service-jms/src/main/resources/helloworldjmsservice.composite?rev=679715&r1=679714&r2=679715&view=diff
==============================================================================
---
tuscany/java/sca/samples/helloworld-service-jms/src/main/resources/helloworldjmsservice.composite
(original)
+++
tuscany/java/sca/samples/helloworld-service-jms/src/main/resources/helloworldjmsservice.composite
Fri Jul 25 02:01:03 2008
@@ -21,7 +21,7 @@
xmlns:sca="http://www.osoa.org/xmlns/sca/1.0";
targetNamespace="http://helloworld";
xmlns:hw="http://helloworld";
- name="helloworldws">
+ name="helloworld">
<component name="HelloWorldServiceComponent">
<implementation.java class="helloworld.HelloWorldImpl" />
