You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2007/12/03 14:52:04 UTC

svn commit: r600536 - in /incubator/tuscany/java/sca/samples/helloworld-ws-service-jms: ./ src/main/java/helloworld/ src/test/java/helloworld/

Author: antelder
Date: Mon Dec  3 05:52:03 2007
New Revision: 600536

URL: http://svn.apache.org/viewvc?rev=600536&view=rev
Log:
Change helloworld sample to work with embedded jms host

Removed:
    incubator/tuscany/java/sca/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldJmsServer.java
Modified:
    incubator/tuscany/java/sca/samples/helloworld-ws-service-jms/   (props changed)
    incubator/tuscany/java/sca/samples/helloworld-ws-service-jms/pom.xml
    incubator/tuscany/java/sca/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsPolicyServerTestCase.java
    incubator/tuscany/java/sca/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCase.java

Propchange: incubator/tuscany/java/sca/samples/helloworld-ws-service-jms/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Dec  3 05:52:03 2007
@@ -0,0 +1,18 @@
+target
+work
+dojo
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+derby.log
+maven.log
+velocity.log*
+junit*.properties
+surefire*.properties
+.settings
+.deployables
+.wtpmodules
+.externalToolBuilders
+activemq-data

Modified: incubator/tuscany/java/sca/samples/helloworld-ws-service-jms/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/helloworld-ws-service-jms/pom.xml?rev=600536&r1=600535&r2=600536&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/helloworld-ws-service-jms/pom.xml (original)
+++ incubator/tuscany/java/sca/samples/helloworld-ws-service-jms/pom.xml Mon Dec  3 05:52:03 2007
@@ -37,12 +37,12 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>apache-activemq</artifactId>
-            <version>4.1.1</version>
-            <scope>provided</scope>
-        </dependency> 
-            
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-jms-activemq</artifactId>
+            <version>1.1-incubating-SNAPSHOT</version>
+            <scope>compile</scope>            
+        </dependency>
+
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>

Modified: incubator/tuscany/java/sca/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsPolicyServerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsPolicyServerTestCase.java?rev=600536&r1=600535&r2=600536&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsPolicyServerTestCase.java (original)
+++ incubator/tuscany/java/sca/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsPolicyServerTestCase.java Mon Dec  3 05:52:03 2007
@@ -22,13 +22,11 @@
 import static junit.framework.Assert.assertNotNull;
 
 import java.io.IOException;
-import java.net.Socket;
 
 import org.apache.tuscany.sca.host.embedded.SCADomain;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.apache.activemq.broker.BrokerService;
 
 /**
  * Tests that the helloworld server is available
@@ -36,12 +34,9 @@
 public class HelloWorldJmsPolicyServerTestCase{
 
     private SCADomain scaDomain;
-    private BrokerService broker = new BrokerService();
 
     @Before
     public void startServer() throws Exception {
-        broker.addConnector("tcp://localhost:61616");
-        broker.start();            
         scaDomain = SCADomain.newInstance("helloworldwsjmspolicy.composite");
     }
 
@@ -56,6 +51,5 @@
     @After
     public void stopServer() throws Exception {
         scaDomain.close();
-        broker.stop();
     }
 }

Modified: incubator/tuscany/java/sca/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCase.java?rev=600536&r1=600535&r2=600536&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCase.java (original)
+++ incubator/tuscany/java/sca/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCase.java Mon Dec  3 05:52:03 2007
@@ -22,13 +22,11 @@
 import static junit.framework.Assert.assertNotNull;
 
 import java.io.IOException;
-import java.net.Socket;
 
 import org.apache.tuscany.sca.host.embedded.SCADomain;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.apache.activemq.broker.BrokerService;
 
 /**
  * Tests that the helloworld server is available
@@ -36,12 +34,9 @@
 public class HelloWorldJmsServerTestCase{
 
     private SCADomain scaDomain;
-    private BrokerService broker = new BrokerService();
 
         @Before
 	public void startServer() throws Exception {
-           	broker.addConnector("tcp://localhost:61616");
-            broker.start();            
 		scaDomain = SCADomain.newInstance("helloworldwsjms.composite");
 	}
 
@@ -56,8 +51,9 @@
 
 	@After
 	public void stopServer() throws Exception {
-            scaDomain.close();
-		broker.stop();
+            if (scaDomain != null) {
+                scaDomain.close();
+            }
 	}
 
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org