delete the beta2 branch as i'd not seen raymonds mail when i made it and we might as well wait till he's got his changes in before creating the beta2 branch

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1040700 13f79535-47bb-0310-9956-ffa450edef68

8 files changed, 0 insertions, 386 deletions

diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java
deleted file mode 100644
index 9083ba1d9c..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.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.oasisopen.sca.annotation.OneWay;

-import org.oasisopen.sca.annotation.Remotable;

-

-@Remotable

-public interface OneWayObjectService {

-

-    @OneWay

-    void sayHello(Object name);

-}

diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java
deleted file mode 100644
index 3149f99a25..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java
+++ /dev/null
@@ -1,34 +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 OneWayObjectServiceImpl implements OneWayObjectService {

-

-    public static Object mutex = new Object();

-    public static Object name;

-

-    public void sayHello(Object name) {

-        OneWayObjectServiceImpl.name = name;

-        synchronized (OneWayObjectServiceImpl.mutex) {

-            OneWayObjectServiceImpl.mutex.notify();

-        }

-    }

-

-}

diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
deleted file mode 100644
index 9cec2d9b3e..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.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.oasisopen.sca.annotation.OneWay;

-import org.oasisopen.sca.annotation.Remotable;

-

-@Remotable

-public interface OneWayService {

-    

-    @OneWay

-    void sayHello(String name);

-}

diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
deleted file mode 100644
index 0036391696..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
+++ /dev/null
@@ -1,34 +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 OneWayServiceImpl implements OneWayService {

-

-    public static Object mutex = new Object();

-    public static String name;

-    

-    public void sayHello(String name) {

-        OneWayServiceImpl.name = name;

-        synchronized (OneWayServiceImpl.mutex) {

-            OneWayServiceImpl.mutex.notify();

-        }

-    }

-

-}

diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/jms/non-sca-client/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/branches/2.0-Beta2/testing/itest/jms/non-sca-client/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index decff8708f..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/jms/non-sca-client/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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/200912"

-              xmlns:itest="http://itest">

-   <deployable composite="itest:ServiceComposite"/>

-</contribution>
\ No newline at end of file
diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/jms/non-sca-client/src/main/resources/jndi.properties b/sca-java-2.x/branches/2.0-Beta2/testing/itest/jms/non-sca-client/src/main/resources/jndi.properties
deleted file mode 100644
index 03690b1169..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/jms/non-sca-client/src/main/resources/jndi.properties
+++ /dev/null
@@ -1,39 +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

-

-# use the following property to specify the JNDI name the connection factory

-# should appear as. 

-#connectionFactoryNames = connectionFactory, queueConnectionFactory, topicConnectionFactry

-connectionFactoryNames = ConnectionFactory

-

-# register some queues in JNDI using the form

-# queue.[jndiName] = [physicalName]

-queue.TextDest = TextDest

-queue.ObjectDest = ObjectDest

-

-# register some topics in JNDI using the form

-# topic.[jndiName] = [physicalName]

-#topic.MyTopic = example.MyTopic

-

-# END SNIPPET: jndi

diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/jms/non-sca-client/src/main/resources/nonSCAclient/service.composite b/sca-java-2.x/branches/2.0-Beta2/testing/itest/jms/non-sca-client/src/main/resources/nonSCAclient/service.composite
deleted file mode 100644
index 67d5038a51..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/jms/non-sca-client/src/main/resources/nonSCAclient/service.composite
+++ /dev/null
@@ -1,54 +0,0 @@
-<?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://docs.oasis-open.org/ns/opencsa/sca/200912"

-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"

-           targetNamespace="http://itest"

-           name="ServiceComposite">

-

-    <component name="DefaultService">

-        <implementation.java class="org.apache.tuscany.sca.binding.jms.OneWayServiceImpl"/>

-        <service name="OneWayService">

-            <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" jndiURL="tcp://localhost:61623">

-                <tuscany:wireFormat.jmsTextXML/>

-            </binding.jms>

-        </service>

-    </component>

-

-    <component name="TextService">

-        <implementation.java class="org.apache.tuscany.sca.binding.jms.OneWayServiceImpl"/>

-        <service name="OneWayService">

-            <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" jndiURL="tcp://localhost:61623"

-                         uri="jms:jndi:TextDest">

-                <tuscany:wireFormat.jmsText/>

-            </binding.jms>

-        </service>

-    </component>

-

-    <component name="ObjectService">

-        <implementation.java class="org.apache.tuscany.sca.binding.jms.OneWayObjectServiceImpl"/>

-        <service name="OneWayObjectService">

-            <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" jndiURL="tcp://localhost:61623"

-                         uri="jms:jndi:ObjectDest">

-                <tuscany:wireFormat.jmsObject /> <!-- test that wrapSingle default works -->

-            </binding.jms>

-        </service>

-    </component>

-

-</composite>

diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/jms/non-sca-client/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/jms/non-sca-client/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java
deleted file mode 100644
index 54cfdeb273..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/jms/non-sca-client/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java
+++ /dev/null
@@ -1,144 +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 java.io.Serializable;

-import java.util.HashSet;

-import java.util.Set;

-

-import javax.jms.JMSException;

-import javax.jms.MessageProducer;

-import javax.jms.Session;

-import javax.naming.NamingException;

-

-import org.apache.activemq.broker.BrokerService;

-import org.apache.tuscany.sca.binding.jms.provider.JMSResourceFactory;

-import org.apache.tuscany.sca.binding.jms.provider.JMSResourceFactoryImpl;

-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;

-

-/**

- * This shows how to test the JMS binding using a simple HelloWorld application.

- */

-public class NonSCAClientTestCase {

-

-    private static Node node;

-

-    @Before

-    public void init() throws Exception {

-        startBroker();

-        node = NodeFactory.newInstance().createNode().start();

-    }

-

-    @After

-    public void end() throws Exception {

-        if (node != null) {

-            node.stop();

-        }

-        stopBroker();

-    }

-

-

-    @Test

-    public void testXMLText() throws Exception {

-

-        synchronized (OneWayServiceImpl.mutex) {

-

-            sendTextMessage("dynamicQueues/OneWayService", "<ns2:sayHello xmlns:ns2=\"http://jms.binding.sca.tuscany.apache.org/\"><arg0>Petra</arg0></ns2:sayHello>");

-

-            // wait up to 10 seconds but it will likely be a lot less

-            // as the service invocation will wake this up earlier

-            if (OneWayServiceImpl.name == null) {

-                OneWayServiceImpl.mutex.wait(10000);

-            }

-        }

-        assertEquals("Petra", OneWayServiceImpl.name);

-    }

-

-    @Test

-    public void testText() throws Exception {

-

-        synchronized (OneWayServiceImpl.mutex) {

-

-            sendTextMessage("dynamicQueues/TextDest", "Petra");

-

-            // wait up to 10 seconds but it will likely be a lot less

-            // as the service invocation will wake this up earlier

-            OneWayServiceImpl.mutex.wait(10000);

-        }

-        assertEquals("Petra", OneWayServiceImpl.name);

-    }

-

-    @Test

-    public void testObject() throws Exception {

-

-        Set<Integer> arg = new HashSet<Integer>();

-        arg.add(new Integer(3));

-

-        synchronized (OneWayObjectServiceImpl.mutex) {

-

-            sendObjectMessage("dynamicQueues/ObjectDest", arg);

-

-            // wait up to 10 seconds but it will likely be a lot less

-            // as the service invocation will wake this up earlier

-            OneWayObjectServiceImpl.mutex.wait(10000);

-        }

-        assertEquals(arg, OneWayObjectServiceImpl.name);

-    }

-

-    private static BrokerService broker;

-    protected static void startBroker() throws Exception {

-        broker = new BrokerService();

-        broker.setPersistent(false);

-        broker.setUseJmx(false);

-        broker.addConnector("tcp://localhost:61623");

-        broker.start();

-    }

-

-    protected static void stopBroker() throws Exception {

-        if (broker != null) {

-            broker.stop();

-        }

-    }

-

-    protected static void sendTextMessage(String destName, String payload) throws JMSException, NamingException {

-        JMSResourceFactory rf = new JMSResourceFactoryImpl(null, null, null, "tcp://localhost:61623");

-        Session session = rf.getConnection().createSession(false, Session.AUTO_ACKNOWLEDGE);

-        MessageProducer p = session.createProducer(rf.lookupDestination(destName));

-        rf.getConnection().start();

-        session.run();

-        p.send(session.createTextMessage(payload));

-        rf.closeConnection();

-    }

-

-    protected static void sendObjectMessage(String destName, Object payload) throws JMSException, NamingException {

-        JMSResourceFactory rf = new JMSResourceFactoryImpl(null, null, null, "tcp://localhost:61623");

-        Session session = rf.getConnection().createSession(false, Session.AUTO_ACKNOWLEDGE);

-        MessageProducer p = session.createProducer(rf.lookupDestination(destName));

-        rf.getConnection().start();

-        session.run();

-        p.send(session.createObjectMessage((Serializable)payload));

-        rf.closeConnection();

-    }

-}