summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2009-09-14 13:23:46 +0000
committerantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2009-09-14 13:23:46 +0000
commitc3d47005c56765f21c425ed1260e98f38fe4684a (patch)
treedb3ed1773fd64ca53b24b772febd61256206dd61
parent447fa59f39c04a95c8d42435dd3113284db2e1d0 (diff)
Start to bring up the jms exceptions test, all but one test still fail
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@814632 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--java/sca/itest/jms/exceptions/pom.xml33
-rw-r--r--java/sca/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java2
-rw-r--r--java/sca/itest/jms/exceptions/src/main/resources/META-INF/sca-contribution.xml23
-rw-r--r--java/sca/itest/jms/exceptions/src/main/resources/exceptions/service.composite9
-rw-r--r--java/sca/itest/jms/exceptions/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java11
5 files changed, 44 insertions, 34 deletions
diff --git a/java/sca/itest/jms/exceptions/pom.xml b/java/sca/itest/jms/exceptions/pom.xml
index 0caaf0d6e9..970bcabbbe 100644
--- a/java/sca/itest/jms/exceptions/pom.xml
+++ b/java/sca/itest/jms/exceptions/pom.xml
@@ -22,57 +22,42 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-itest</artifactId>
- <version>1.6-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <version>2.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>itest-jms-nonscaclient-exceptions</artifactId>
<name>Apache Tuscany SCA iTest JMS NonSCA Client Exceptions</name>
- <repositories>
- <repository>
- <id>apache.incubator</id>
- <url>http://people.apache.org/repo/m2-incubating-repository</url>
- </repository>
- </repositories>
-
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca-api</artifactId>
- <version>1.6-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
- <version>1.6-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
+ <artifactId>tuscany-node-impl</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>1.6-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-jms-policy</artifactId>
- <version>1.6-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-jms-runtime</artifactId>
- <version>1.6-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-host-jms-asf</artifactId>
- <version>1.6-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
diff --git a/java/sca/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java b/java/sca/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
index cc21afaa60..9e4c4c46d4 100644
--- a/java/sca/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
+++ b/java/sca/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
@@ -19,7 +19,7 @@
package org.apache.tuscany.sca.binding.jms;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface ExceptionService {
diff --git a/java/sca/itest/jms/exceptions/src/main/resources/META-INF/sca-contribution.xml b/java/sca/itest/jms/exceptions/src/main/resources/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..c9945cc57d
--- /dev/null
+++ b/java/sca/itest/jms/exceptions/src/main/resources/META-INF/sca-contribution.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+ xmlns:itest="http://itest">
+ <deployable composite="itest:ExceptionServiceComposite"/>
+</contribution> \ No newline at end of file
diff --git a/java/sca/itest/jms/exceptions/src/main/resources/exceptions/service.composite b/java/sca/itest/jms/exceptions/src/main/resources/exceptions/service.composite
index 0dcbb0687a..9eb8f2b27d 100644
--- a/java/sca/itest/jms/exceptions/src/main/resources/exceptions/service.composite
+++ b/java/sca/itest/jms/exceptions/src/main/resources/exceptions/service.composite
@@ -17,15 +17,16 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+ targetNamespace="http://itest"
+ xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
name="ExceptionServiceComposite">
<component name="TextExceptionService">
<implementation.java class="org.apache.tuscany.sca.binding.jms.ExceptionServiceImpl"/>
<service name="ExceptionService">
<binding.jms>
- <destination name="TextExceptionService"/>
+ <destination jndiName="TextExceptionService"/>
</binding.jms>
</service>
</component>
@@ -34,7 +35,7 @@
<implementation.java class="org.apache.tuscany.sca.binding.jms.ExceptionServiceImpl"/>
<service name="ExceptionService">
<binding.jms>
- <destination name="ObjectExceptionService"/>
+ <destination jndiName="ObjectExceptionService"/>
<tuscany:wireFormat.jmsObject/>
</binding.jms>
</service>
diff --git a/java/sca/itest/jms/exceptions/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java b/java/sca/itest/jms/exceptions/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
index 1dec4a6f92..1e1a0987ad 100644
--- a/java/sca/itest/jms/exceptions/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
+++ b/java/sca/itest/jms/exceptions/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
@@ -38,7 +38,8 @@ import javax.jms.TextMessage;
import javax.naming.InitialContext;
import javax.naming.NamingException;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -49,7 +50,7 @@ import org.xml.sax.SAXException;
*/
public class ExceptionsTestCase {
- private static SCADomain scaDomain;
+ private Node node;
private Session session;
private InitialContext context;
private Connection connection;
@@ -64,7 +65,7 @@ public class ExceptionsTestCase {
@Before
public void init() {
- scaDomain = SCADomain.newInstance("http://localhost", "/", "exceptions/service.composite");
+ node = NodeFactory.newInstance().createNode().start();
}
@Test
@@ -155,8 +156,8 @@ public class ExceptionsTestCase {
@After
public void end() throws JMSException {
- if (scaDomain != null) {
- scaDomain.close();
+ if (node != null) {
+ node.stop();
}
if (connection != null) {
connection.close();