Author: antelder
Date: Tue Feb 19 01:04:55 2008
New Revision: 629037
URL: http://svn.apache.org/viewvc?rev=629037&view=rev
Log:
Update jms samples for jms changes
Modified:
incubator/tuscany/java/sca/samples/helloworld-reference-jms/pom.xml
incubator/tuscany/java/sca/samples/helloworld-reference-jms/src/test/java/helloworld/HelloWorldJmsClientTestCase.java
incubator/tuscany/java/sca/samples/helloworld-service-jms/pom.xml
incubator/tuscany/java/sca/samples/helloworld-ws-reference-jms/pom.xml
incubator/tuscany/java/sca/samples/helloworld-ws-reference-jms/src/test/java/helloworld/HelloWorldJmsClientTestCase.java
incubator/tuscany/java/sca/samples/helloworld-ws-service-jms/pom.xml
incubator/tuscany/java/sca/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldServer.java
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
Modified: incubator/tuscany/java/sca/samples/helloworld-reference-jms/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/helloworld-reference-jms/pom.xml?rev=629037&r1=629036&r2=629037&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/helloworld-reference-jms/pom.xml
(original)
+++ incubator/tuscany/java/sca/samples/helloworld-reference-jms/pom.xml Tue Feb
19 01:04:55 2008
@@ -83,13 +83,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-jms-activemq</artifactId>
- <version>1.2-incubating-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
-
</dependencies>
<build>
Modified:
incubator/tuscany/java/sca/samples/helloworld-reference-jms/src/test/java/helloworld/HelloWorldJmsClientTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/helloworld-reference-jms/src/test/java/helloworld/HelloWorldJmsClientTestCase.java?rev=629037&r1=629036&r2=629037&view=diff
==============================================================================
---
incubator/tuscany/java/sca/samples/helloworld-reference-jms/src/test/java/helloworld/HelloWorldJmsClientTestCase.java
(original)
+++
incubator/tuscany/java/sca/samples/helloworld-reference-jms/src/test/java/helloworld/HelloWorldJmsClientTestCase.java
Tue Feb 19 01:04:55 2008
@@ -41,7 +41,6 @@
@Before
public void startClient() throws Exception {
try {
- // ActiveMQModuleActivator.startBroker();
scaServiceDomain =
SCADomain.newInstance("helloworldjmsservice.composite");
scaClientDomain =
SCADomain.newInstance("helloworldjmsreference.composite");
helloWorldService =
scaClientDomain.getService(HelloWorldService.class,
"HelloWorldServiceComponent");
Modified: incubator/tuscany/java/sca/samples/helloworld-service-jms/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/helloworld-service-jms/pom.xml?rev=629037&r1=629036&r2=629037&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/helloworld-service-jms/pom.xml (original)
+++ incubator/tuscany/java/sca/samples/helloworld-service-jms/pom.xml Tue Feb
19 01:04:55 2008
@@ -45,13 +45,6 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-jms-activemq</artifactId>
- <version>1.2-incubating-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-host-embedded</artifactId>
<version>1.2-incubating-SNAPSHOT</version>
<scope>compile</scope>
Modified: incubator/tuscany/java/sca/samples/helloworld-ws-reference-jms/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/helloworld-ws-reference-jms/pom.xml?rev=629037&r1=629036&r2=629037&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/helloworld-ws-reference-jms/pom.xml
(original)
+++ incubator/tuscany/java/sca/samples/helloworld-ws-reference-jms/pom.xml Tue
Feb 19 01:04:55 2008
@@ -77,13 +77,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-jms-activemq</artifactId>
- <version>1.2-incubating-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
-
</dependencies>
<build>
Modified:
incubator/tuscany/java/sca/samples/helloworld-ws-reference-jms/src/test/java/helloworld/HelloWorldJmsClientTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/helloworld-ws-reference-jms/src/test/java/helloworld/HelloWorldJmsClientTestCase.java?rev=629037&r1=629036&r2=629037&view=diff
==============================================================================
---
incubator/tuscany/java/sca/samples/helloworld-ws-reference-jms/src/test/java/helloworld/HelloWorldJmsClientTestCase.java
(original)
+++
incubator/tuscany/java/sca/samples/helloworld-ws-reference-jms/src/test/java/helloworld/HelloWorldJmsClientTestCase.java
Tue Feb 19 01:04:55 2008
@@ -21,9 +21,8 @@
import junit.framework.Assert;
+import org.apache.activemq.broker.BrokerService;
import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.host.embedded.SCATestCaseRunner;
-import org.apache.tuscany.sca.host.jms.activemq.ActiveMQModuleActivator;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -38,14 +37,15 @@
private HelloWorldService helloTuscanyService;
private SCADomain scaClientDomain;
private SCADomain scaServiceDomain;
+ private BrokerService jmsBroker;
@Before
public void startClient() throws Exception {
try {
- ActiveMQModuleActivator.startBroker();
- scaServiceDomain =
SCADomain.newInstance("helloworldwsjms.composite");
- scaClientDomain =
SCADomain.newInstance("helloworldwsjmsclient.composite");
+ startBroker();
+ scaServiceDomain =
SCADomain.newInstance("helloworldwsjms.composite");
+ scaClientDomain =
SCADomain.newInstance("helloworldwsjmsclient.composite");
helloWorldService =
scaClientDomain.getService(HelloWorldService.class,
"HelloWorldServiceComponent");
helloTuscanyService =
scaClientDomain.getService(HelloWorldService.class,
"HelloTuscanyServiceComponent");
@@ -69,6 +69,16 @@
public void stopClient() throws Exception {
scaServiceDomain.close();
scaClientDomain.close();
+ if (jmsBroker != null) {
+ jmsBroker.stop();
+ }
}
+ protected void startBroker() throws Exception {
+ jmsBroker = new BrokerService();
+ jmsBroker.setPersistent(false);
+ jmsBroker.setUseJmx(false);
+ jmsBroker.addConnector("tcp://localhost:61619");
+ jmsBroker.start();
+ }
}
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=629037&r1=629036&r2=629037&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 Tue
Feb 19 01:04:55 2008
@@ -45,13 +45,6 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-jms-activemq</artifactId>
- <version>1.2-incubating-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-host-embedded</artifactId>
<version>1.2-incubating-SNAPSHOT</version>
<scope>compile</scope>
@@ -78,6 +71,13 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-core</artifactId>
+ <version>4.1.1</version>
+ <scope>runtime</scope>
+ </dependency>
+
</dependencies>
<build>
Modified:
incubator/tuscany/java/sca/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldServer.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldServer.java?rev=629037&r1=629036&r2=629037&view=diff
==============================================================================
---
incubator/tuscany/java/sca/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldServer.java
(original)
+++
incubator/tuscany/java/sca/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldServer.java
Tue Feb 19 01:04:55 2008
@@ -21,7 +21,6 @@
import java.io.IOException;
import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.host.jms.activemq.ActiveMQModuleActivator;
/**
* This server program shows how to create an SCA runtime, and start it which
@@ -31,7 +30,6 @@
public static void main(String[] args) {
- ActiveMQModuleActivator.startBroker();
SCADomain scaDomain =
SCADomain.newInstance("helloworldwsjms.composite");
try {
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=629037&r1=629036&r2=629037&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
Tue Feb 19 01:04:55 2008
@@ -23,8 +23,8 @@
import java.io.IOException;
+import org.apache.activemq.broker.BrokerService;
import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.host.jms.activemq.ActiveMQModuleActivator;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -35,14 +35,22 @@
public class HelloWorldJmsPolicyServerTestCase{
private SCADomain scaDomain;
+ private BrokerService jmsBroker;
@Before
public void startServer() throws Exception {
- ActiveMQModuleActivator.startBroker();
+ startBroker();
scaDomain = SCADomain.newInstance("helloworldwsjmspolicy.composite");
}
-
+ protected void startBroker() throws Exception {
+ jmsBroker = new BrokerService();
+ jmsBroker.setPersistent(false);
+ jmsBroker.setUseJmx(false);
+ jmsBroker.addConnector("tcp://localhost:61619");
+ jmsBroker.start();
+ }
+
@Test
public void testServiceCall() throws IOException {
HelloWorldService helloWorldService =
scaDomain.getService(HelloWorldService.class,
"HelloWorldServiceComponent/HelloWorldService");
@@ -53,5 +61,8 @@
@After
public void stopServer() throws Exception {
scaDomain.close();
+ if (jmsBroker != null) {
+ jmsBroker.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=629037&r1=629036&r2=629037&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
Tue Feb 19 01:04:55 2008
@@ -23,8 +23,8 @@
import java.io.IOException;
+import org.apache.activemq.broker.BrokerService;
import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.host.jms.activemq.ActiveMQModuleActivator;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -35,13 +35,21 @@
public class HelloWorldJmsServerTestCase{
private SCADomain scaDomain;
+ private BrokerService jmsBroker;
@Before
public void startServer() throws Exception {
- ActiveMQModuleActivator.startBroker();
- scaDomain = SCADomain.newInstance("helloworldwsjms.composite");
+ startBroker();
+ scaDomain = SCADomain.newInstance("helloworldwsjms.composite");
}
+ protected void startBroker() throws Exception {
+ jmsBroker = new BrokerService();
+ jmsBroker.setPersistent(false);
+ jmsBroker.setUseJmx(false);
+ jmsBroker.addConnector("tcp://localhost:61619");
+ jmsBroker.start();
+ }
@Test
public void testServiceCall() throws IOException {
@@ -55,6 +63,9 @@
public void stopServer() throws Exception {
if (scaDomain != null) {
scaDomain.close();
+ }
+ if (jmsBroker != null) {
+ jmsBroker.stop();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
