Author: antelder
Date: Wed Sep 10 07:44:38 2008
New Revision: 693860
URL: http://svn.apache.org/viewvc?rev=693860&view=rev
Log:
Add a new JMS test for using multiple args
Added:
tuscany/java/sca/itest/jms-args/ (with props)
tuscany/java/sca/itest/jms-args/pom.xml
tuscany/java/sca/itest/jms-args/src/
tuscany/java/sca/itest/jms-args/src/main/
tuscany/java/sca/itest/jms-args/src/main/java/
tuscany/java/sca/itest/jms-args/src/main/java/org/
tuscany/java/sca/itest/jms-args/src/main/java/org/apache/
tuscany/java/sca/itest/jms-args/src/main/java/org/apache/tuscany/
tuscany/java/sca/itest/jms-args/src/main/java/org/apache/tuscany/sca/
tuscany/java/sca/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/
tuscany/java/sca/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/
tuscany/java/sca/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
tuscany/java/sca/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java
tuscany/java/sca/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java
tuscany/java/sca/itest/jms-args/src/main/resources/
tuscany/java/sca/itest/jms-args/src/main/resources/jndi.properties
tuscany/java/sca/itest/jms-args/src/main/resources/selectors/
tuscany/java/sca/itest/jms-args/src/main/resources/selectors/selectors.composite
tuscany/java/sca/itest/jms-args/src/test/
tuscany/java/sca/itest/jms-args/src/test/java/
tuscany/java/sca/itest/jms-args/src/test/java/org/
tuscany/java/sca/itest/jms-args/src/test/java/org/apache/
tuscany/java/sca/itest/jms-args/src/test/java/org/apache/tuscany/
tuscany/java/sca/itest/jms-args/src/test/java/org/apache/tuscany/sca/
tuscany/java/sca/itest/jms-args/src/test/java/org/apache/tuscany/sca/binding/
tuscany/java/sca/itest/jms-args/src/test/java/org/apache/tuscany/sca/binding/jms/
tuscany/java/sca/itest/jms-args/src/test/java/org/apache/tuscany/sca/binding/jms/ArgsTestCase.java
Propchange: tuscany/java/sca/itest/jms-args/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Sep 10 07:44:38 2008
@@ -0,0 +1,20 @@
+target
+work
+dojo
+*.iws
+*.ipr
+*.iml
+derby.log
+maven.log
+maven-eclipse.xml
+build.xml
+build-dependency.xml
+velocity.log*
+junit*.properties
+surefire*.properties
+.project
+.classpath
+.settings
+.deployables
+.wtpmodules
+.externalToolBuilders
Added: tuscany/java/sca/itest/jms-args/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms-args/pom.xml?rev=693860&view=auto
==============================================================================
--- tuscany/java/sca/itest/jms-args/pom.xml (added)
+++ tuscany/java/sca/itest/jms-args/pom.xml Wed Sep 10 07:44:38 2008
@@ -0,0 +1,92 @@
+<?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.
+-->
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-itest</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+ <artifactId>itest-jms-args</artifactId>
+
+ <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.4-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-host-embedded</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-implementation-java-runtime</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-binding-jms-runtime</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.2</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-node-impl</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- uses ActiveMQ 5.1 as 4.1 Session.createQueue does not work using
+ a temporary queue name -->
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-core</artifactId>
+ <version>5.1.0</version>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <finalName>${artifactId}</finalName>
+ </build>
+</project>
Added:
tuscany/java/sca/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java?rev=693860&view=auto
==============================================================================
---
tuscany/java/sca/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
(added)
+++
tuscany/java/sca/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
Wed Sep 10 07:44:38 2008
@@ -0,0 +1,41 @@
+/*
+ * 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.
+ */
+package org.apache.tuscany.sca.binding.jms;
+
+import org.osoa.sca.annotations.Reference;
+import org.osoa.sca.annotations.Service;
+
+/**
+ * This class implements the OneWay service.
+ */
[EMAIL PROTECTED](MyService.class)
+public class ClientImpl implements MyService {
+
+ private MyService serviceA;
+
+ @Reference
+ public void setServiceA(MyService service) {
+ this.serviceA = service;
+ }
+
+ public void sayHello(String name, String n2) {
+ serviceA.sayHello(name, n2);
+ }
+
+}
Added:
tuscany/java/sca/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java?rev=693860&view=auto
==============================================================================
---
tuscany/java/sca/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java
(added)
+++
tuscany/java/sca/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java
Wed Sep 10 07:44:38 2008
@@ -0,0 +1,29 @@
+/*
+ * 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.
+ */
+package org.apache.tuscany.sca.binding.jms;
+
+import org.osoa.sca.annotations.OneWay;
+import org.osoa.sca.annotations.Remotable;
+
[EMAIL PROTECTED]
+public interface MyService {
+
+ @OneWay
+ void sayHello(String name, String n2);
+}
Added:
tuscany/java/sca/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java?rev=693860&view=auto
==============================================================================
---
tuscany/java/sca/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java
(added)
+++
tuscany/java/sca/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java
Wed Sep 10 07:44:38 2008
@@ -0,0 +1,38 @@
+/*
+ * 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.
+ */
+
+package org.apache.tuscany.sca.binding.jms;
+
+
+public class ServiceImpl implements MyService {
+
+ public static Object lock = new Object();
+ public static String name;
+ public static String n2;
+
+ public void sayHello(String name, String n2) {
+ System.out.println("SelectorServiceImpl1 " + name + n2);
+ ServiceImpl.name = name;
+ ServiceImpl.n2 = n2;
+ synchronized (ServiceImpl.lock) {
+ ServiceImpl.lock.notify();
+ }
+ }
+
+}
Added: tuscany/java/sca/itest/jms-args/src/main/resources/jndi.properties
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms-args/src/main/resources/jndi.properties?rev=693860&view=auto
==============================================================================
--- tuscany/java/sca/itest/jms-args/src/main/resources/jndi.properties (added)
+++ tuscany/java/sca/itest/jms-args/src/main/resources/jndi.properties Wed Sep
10 07:44:38 2008
@@ -0,0 +1,38 @@
+## ---------------------------------------------------------------------------
+## 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.
+## ---------------------------------------------------------------------------
+
+# START SNIPPET: jndi
+
+java.naming.factory.initial =
org.apache.activemq.jndi.ActiveMQInitialContextFactory
+
+# use the following property to configure the default connector
+java.naming.provider.url =
vm://localhost?broker.persistent=false&broker.useJmx=false
+
+# use the following property to specify the JNDI name the connection factory
+# should appear as.
+#connectionFactoryNames = connectionFactory, queueConnectionFactory,
topicConnectionFactry
+connectionFactoryNames = ConnectionFactory, ConnectionFactory2
+
+# register some queues in JNDI using the form
+# queue.[jndiName] = [physicalName]
+
+# register some topics in JNDI using the form
+# topic.[jndiName] = [physicalName]
+#topic.MyTopic = example.MyTopic
+topic.ServiceTopic = ServiceTopic
+
+# END SNIPPET: jndi
Added:
tuscany/java/sca/itest/jms-args/src/main/resources/selectors/selectors.composite
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms-args/src/main/resources/selectors/selectors.composite?rev=693860&view=auto
==============================================================================
---
tuscany/java/sca/itest/jms-args/src/main/resources/selectors/selectors.composite
(added)
+++
tuscany/java/sca/itest/jms-args/src/main/resources/selectors/selectors.composite
Wed Sep 10 07:44:38 2008
@@ -0,0 +1,39 @@
+<?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.
+ -->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0";
+ targetNamespace="http://jms";
+ xmlns:itest="http://jms";
+ name="DefinitionsTests">
+
+ <component name="Client1">
+ <implementation.java
class="org.apache.tuscany.sca.binding.jms.ClientImpl"/>
+ <reference name="serviceA">
+ <binding.jms uri="jms:MyService" />
+ </reference>
+ </component>
+
+ <component name="Service1">
+ <implementation.java
class="org.apache.tuscany.sca.binding.jms.ServiceImpl"/>
+ <service name="MyService">
+ <binding.jms />
+ </service>
+ </component>
+
+</composite>
Added:
tuscany/java/sca/itest/jms-args/src/test/java/org/apache/tuscany/sca/binding/jms/ArgsTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms-args/src/test/java/org/apache/tuscany/sca/binding/jms/ArgsTestCase.java?rev=693860&view=auto
==============================================================================
---
tuscany/java/sca/itest/jms-args/src/test/java/org/apache/tuscany/sca/binding/jms/ArgsTestCase.java
(added)
+++
tuscany/java/sca/itest/jms-args/src/test/java/org/apache/tuscany/sca/binding/jms/ArgsTestCase.java
Wed Sep 10 07:44:38 2008
@@ -0,0 +1,61 @@
+/*
+ * 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.
+ */
+package org.apache.tuscany.sca.binding.jms;
+
+import static org.junit.Assert.assertEquals;
+
+import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ */
+public class ArgsTestCase {
+
+ private static SCADomain scaDomain;
+
+ @Before
+ public void init() {
+ scaDomain = SCADomain.newInstance("http://localhost";, "/",
"selectors/selectors.composite");
+ }
+
+ @Test
+ public void testSayHello() throws Exception {
+ MyService client1 = scaDomain.getService(MyService.class, "Client1");
+
+ client1.sayHello("petra", "beate");
+
+ synchronized(ServiceImpl.lock) {
+ if (ServiceImpl.name == null) {
+ ServiceImpl.lock.wait(5000);
+ }
+ }
+
+ assertEquals("petra", ServiceImpl.name);
+ assertEquals("beate", ServiceImpl.n2);
+ }
+
+ @After
+ public void end() {
+ if (scaDomain != null) {
+ scaDomain.close();
+ }
+ }
+}
