From 3d3b8834b93b98cc7d7534e693e937179067eb58 Mon Sep 17 00:00:00 2001 From: antelder Date: Sat, 16 May 2009 08:44:44 +0000 Subject: Delete previous 1.5 branch thats now old and unused and will be replaced with the current 1.x trunk git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@775435 13f79535-47bb-0310-9956-ffa450edef68 --- branches/sca-java-1.5/itest/jms-selectors/pom.xml | 99 ---------------------- .../apache/tuscany/sca/binding/jms/ClientImpl.java | 41 --------- .../tuscany/sca/binding/jms/SelectorService.java | 29 ------- .../sca/binding/jms/SelectorServiceImpl1.java | 40 --------- .../sca/binding/jms/SelectorServiceImpl2.java | 38 --------- .../sca/binding/jms/SelectorServiceImpl3.java | 38 --------- .../src/main/resources/jndi.properties | 38 --------- .../main/resources/selectors/selectors.composite | 68 --------------- .../tuscany/sca/binding/jms/SelectorsTestCase.java | 75 ---------------- 9 files changed, 466 deletions(-) delete mode 100644 branches/sca-java-1.5/itest/jms-selectors/pom.xml delete mode 100644 branches/sca-java-1.5/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java delete mode 100644 branches/sca-java-1.5/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java delete mode 100644 branches/sca-java-1.5/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl1.java delete mode 100644 branches/sca-java-1.5/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl2.java delete mode 100644 branches/sca-java-1.5/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl3.java delete mode 100644 branches/sca-java-1.5/itest/jms-selectors/src/main/resources/jndi.properties delete mode 100644 branches/sca-java-1.5/itest/jms-selectors/src/main/resources/selectors/selectors.composite delete mode 100644 branches/sca-java-1.5/itest/jms-selectors/src/test/java/org/apache/tuscany/sca/binding/jms/SelectorsTestCase.java (limited to 'branches/sca-java-1.5/itest/jms-selectors') diff --git a/branches/sca-java-1.5/itest/jms-selectors/pom.xml b/branches/sca-java-1.5/itest/jms-selectors/pom.xml deleted file mode 100644 index bdc52f4bc5..0000000000 --- a/branches/sca-java-1.5/itest/jms-selectors/pom.xml +++ /dev/null @@ -1,99 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.5-SNAPSHOT - ../../pom.xml - - itest-jms-selectors - Apache Tuscany SCA iTest JMS Tests For Selectors - - - - apache.incubator - http://people.apache.org/repo/m2-incubating-repository - - - - - - - org.apache.tuscany.sca - tuscany-sca-api - 1.5-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.5-SNAPSHOT - runtime - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.5-SNAPSHOT - runtime - - - - org.apache.tuscany.sca - tuscany-binding-jms-runtime - 1.5-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-host-jms-asf - 1.5-SNAPSHOT - - - - junit - junit - 4.5 - test - - - - org.apache.tuscany.sca - tuscany-node-impl - 1.5-SNAPSHOT - test - - - - - org.apache.activemq - activemq-core - 5.1.0 - - - - - - ${artifactId} - - diff --git a/branches/sca-java-1.5/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java b/branches/sca-java-1.5/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java deleted file mode 100644 index 0ad6440593..0000000000 --- a/branches/sca-java-1.5/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * 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. - */ -@Service(SelectorService.class) -public class ClientImpl implements SelectorService { - - private SelectorService serviceA; - - @Reference - public void setServiceA(SelectorService service) { - this.serviceA = service; - } - - public void sayHello(String name) { - serviceA.sayHello(name); - } - -} diff --git a/branches/sca-java-1.5/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java b/branches/sca-java-1.5/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java deleted file mode 100644 index f26a3ce68b..0000000000 --- a/branches/sca-java-1.5/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * 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; - -@Remotable -public interface SelectorService { - - @OneWay - void sayHello(String name); -} diff --git a/branches/sca-java-1.5/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl1.java b/branches/sca-java-1.5/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl1.java deleted file mode 100644 index fb53c877e6..0000000000 --- a/branches/sca-java-1.5/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl1.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * 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 java.util.ArrayList; -import java.util.List; - -public class SelectorServiceImpl1 implements SelectorService { - - public static Object lock = new Object(); - public static List names = new ArrayList(); - - public void sayHello(String name) { - System.out.println("SelectorServiceImpl1 " + name); - SelectorServiceImpl1.names.add(name); - if (names.size() == 2) { - synchronized (SelectorServiceImpl1.lock) { - SelectorServiceImpl1.lock.notify(); - } - } - } - -} diff --git a/branches/sca-java-1.5/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl2.java b/branches/sca-java-1.5/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl2.java deleted file mode 100644 index 1bbaf5d6f4..0000000000 --- a/branches/sca-java-1.5/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl2.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * 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 SelectorServiceImpl2 implements SelectorService { - - public static Object lock = new Object(); - public static String name; - - public void sayHello(String name) { - if (SelectorServiceImpl2.name != null) { - throw new IllegalStateException("name already set"); - } - System.out.println("SelectorServiceImpl2 " + name); - SelectorServiceImpl2.name = name; - synchronized (SelectorServiceImpl2.lock) { - SelectorServiceImpl2.lock.notify(); - } - } - -} diff --git a/branches/sca-java-1.5/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl3.java b/branches/sca-java-1.5/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl3.java deleted file mode 100644 index 4bdc4edcb5..0000000000 --- a/branches/sca-java-1.5/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl3.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * 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 SelectorServiceImpl3 implements SelectorService { - - public static Object lock = new Object(); - public static String name; - - public void sayHello(String name) { - if (SelectorServiceImpl3.name != null) { - throw new IllegalStateException("name already set"); - } - System.out.println("SelectorServiceImpl3 " + name); - SelectorServiceImpl3.name = name; - synchronized (SelectorServiceImpl3.lock) { - SelectorServiceImpl3.lock.notify(); - } - } - -} diff --git a/branches/sca-java-1.5/itest/jms-selectors/src/main/resources/jndi.properties b/branches/sca-java-1.5/itest/jms-selectors/src/main/resources/jndi.properties deleted file mode 100644 index bb431a592b..0000000000 --- a/branches/sca-java-1.5/itest/jms-selectors/src/main/resources/jndi.properties +++ /dev/null @@ -1,38 +0,0 @@ -## --------------------------------------------------------------------------- -## 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 diff --git a/branches/sca-java-1.5/itest/jms-selectors/src/main/resources/selectors/selectors.composite b/branches/sca-java-1.5/itest/jms-selectors/src/main/resources/selectors/selectors.composite deleted file mode 100644 index 83fb50531b..0000000000 --- a/branches/sca-java-1.5/itest/jms-selectors/src/main/resources/selectors/selectors.composite +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.5/itest/jms-selectors/src/test/java/org/apache/tuscany/sca/binding/jms/SelectorsTestCase.java b/branches/sca-java-1.5/itest/jms-selectors/src/test/java/org/apache/tuscany/sca/binding/jms/SelectorsTestCase.java deleted file mode 100644 index ea548c22e6..0000000000 --- a/branches/sca-java-1.5/itest/jms-selectors/src/test/java/org/apache/tuscany/sca/binding/jms/SelectorsTestCase.java +++ /dev/null @@ -1,75 +0,0 @@ -/* - * 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 SelectorsTestCase { - - private static SCADomain scaDomain; - - @Before - public void init() { - scaDomain = SCADomain.newInstance("http://localhost", "/", "selectors/selectors.composite"); - } - - @Test - public void testSayHello() throws Exception { - SelectorService client1 = scaDomain.getService(SelectorService.class, "Client1"); - SelectorService client2 = scaDomain.getService(SelectorService.class, "Client2"); - - client1.sayHello("petra"); - client2.sayHello("beate"); - - // wait for up to 5 seconds but should wake up as soon as done - synchronized(SelectorServiceImpl2.lock) { - if (SelectorServiceImpl2.name == null) { - SelectorServiceImpl2.lock.wait(5000); - } - } - synchronized(SelectorServiceImpl3.lock) { - if (SelectorServiceImpl3.name == null) { - SelectorServiceImpl3.lock.wait(5000); - } - } - synchronized(SelectorServiceImpl1.lock) { - if (SelectorServiceImpl1.names.size() != 2) { - SelectorServiceImpl1.lock.wait(5000); - } - } - - assertEquals("petra", SelectorServiceImpl2.name); - assertEquals("beate", SelectorServiceImpl3.name); - assertEquals(2, SelectorServiceImpl1.names.size()); - } - - @After - public void end() { - if (scaDomain != null) { - scaDomain.close(); - } - } -} -- cgit v1.2.3