Moving 1.x trunk

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

10 files changed, 0 insertions, 447 deletions

diff --git a/branches/sca-java-1.x/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java b/branches/sca-java-1.x/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
deleted file mode 100644
index d4cd5df431..0000000000
--- a/branches/sca-java-1.x/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
+++ /dev/null
@@ -1,28 +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;

-

-

-/**

- * The client interface

- */

-public interface JMSClient {

-

-    void aClientMethod();

-}

diff --git a/branches/sca-java-1.x/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java b/branches/sca-java-1.x/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java
deleted file mode 100644
index 9d75685a8a..0000000000
--- a/branches/sca-java-1.x/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java
+++ /dev/null
@@ -1,50 +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;

-

-/**

- * Remote Web service client with callback interface

- */

-@Service(JMSClient.class)

-public class JMSClientImpl implements JMSClient, JMSServiceCallback {

-

-    @Reference protected JMSService myService;

-

-    public static String result;

-    public static Object lock = new Object();

-	

-    public void aClientMethod() {

-        System.out.println("aClientMethod " + this + " on thread " + Thread.currentThread());

-        myService.someMethod(" -> someMethod ");  // calls the server

-        System.out.println("aClientMethod return from someMethod on thread " + Thread.currentThread());

-    }

-

-    public void receiveResult(String result) {

-        System.out.println("receiveResult " + this + " '" + result + "' on thread " + Thread.currentThread());

-        JMSClientImpl.result = result;

-        

-        // wakeup the waiting testcase

-        synchronized (lock) {

-            lock.notifyAll();

-	}

-    }

-}

diff --git a/branches/sca-java-1.x/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.java b/branches/sca-java-1.x/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.java
deleted file mode 100644
index 9c2c657b55..0000000000
--- a/branches/sca-java-1.x/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.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;

-

-import org.osoa.sca.annotations.Callback;

-import org.osoa.sca.annotations.OneWay;

-import org.osoa.sca.annotations.Remotable;

-

-/**

- * The remote service that will be invoked by the client

- */

-@Remotable

-@Callback(JMSServiceCallback.class)

-public interface JMSService {

-

-    @OneWay

-    void someMethod(String arg);

-}

diff --git a/branches/sca-java-1.x/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.java b/branches/sca-java-1.x/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.java
deleted file mode 100644
index 5697d819c7..0000000000
--- a/branches/sca-java-1.x/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.java
+++ /dev/null
@@ -1,32 +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;

-

-/**

- * The callback interface for {@link JMSService}.

- */

-@Remotable

-public interface JMSServiceCallback {

-

-    @OneWay

-    void receiveResult(String result);

-}

diff --git a/branches/sca-java-1.x/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java b/branches/sca-java-1.x/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java
deleted file mode 100644
index b15b40c8a6..0000000000
--- a/branches/sca-java-1.x/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java
+++ /dev/null
@@ -1,47 +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.Callback;

-import org.osoa.sca.annotations.Service;

-

-/**

- * This class implements MyService and uses a callback.

- */

-@Service(JMSService.class)

-public class JMSServiceImpl implements JMSService {

-

-    private JMSServiceCallback myServiceCallback;

-    

-    @Callback

-    public void setMyServiceCallback(JMSServiceCallback myServiceCallback) {

-        System.out.println("setMyServiceCallback on thread " + Thread.currentThread() + " cb: " + myServiceCallback);

-        this.myServiceCallback = myServiceCallback;

-    }

-    

-    public void someMethod(String arg) {

-        System.out.println("someMethod '" + arg + "' on thread " + Thread.currentThread());

-        try {

-            myServiceCallback.receiveResult(arg + " -> receiveResult ");

-        } catch(Exception e) {

-            System.out.println("RuntimeException invoking receiveResult: " + e.toString());

-            e.printStackTrace();

-        }

-    }

-}

diff --git a/branches/sca-java-1.x/itest/jms-callbacks/src/main/resources/jndi.properties b/branches/sca-java-1.x/itest/jms-callbacks/src/main/resources/jndi.properties
deleted file mode 100644
index 608fe747f5..0000000000
--- a/branches/sca-java-1.x/itest/jms-callbacks/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&broker.useJmx=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.ServiceQueue = ServiceQueue

-queue.CallbackQueue = CallbackQueue

-

-# register some topics in JNDI using the form

-# topic.[jndiName] = [physicalName]

-#topic.MyTopic = example.MyTopic

-

-# END SNIPPET: jndi

diff --git a/branches/sca-java-1.x/itest/jms-callbacks/src/main/resources/simple/client.composite b/branches/sca-java-1.x/itest/jms-callbacks/src/main/resources/simple/client.composite
deleted file mode 100644
index 93d8acb65b..0000000000
--- a/branches/sca-java-1.x/itest/jms-callbacks/src/main/resources/simple/client.composite
+++ /dev/null
@@ -1,44 +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://www.osoa.org/xmlns/sca/1.0"

-           targetNamespace="http://jms"

-           name="CallbackClientComposite">

-

-    <component name="ClientComponent">

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

-        <reference name="myService">

-            <binding.jms uri="jms:ServiceQueue"/>

-            <callback>

-                <binding.jms uri="jms:CallbackQueue"/>

-            </callback>

-        </reference>

-    </component>

-

-    <component name="ServiceComponent">

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

-        <service name="JMSService">

-            <binding.jms uri="jms:ServiceQueue"/>

-            <callback>

-                <binding.jms uri="jms:CallbackQueue"/>

-            </callback>

-        </service>

-    </component>

-

-</composite>

diff --git a/branches/sca-java-1.x/itest/jms-callbacks/src/main/resources/simple/tempq.composite b/branches/sca-java-1.x/itest/jms-callbacks/src/main/resources/simple/tempq.composite
deleted file mode 100644
index 636e951d03..0000000000
--- a/branches/sca-java-1.x/itest/jms-callbacks/src/main/resources/simple/tempq.composite
+++ /dev/null
@@ -1,50 +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://www.osoa.org/xmlns/sca/1.0"

-           targetNamespace="http://jms"

-           name="CallbackClientComposite">

-

-<!-- 

-

-The client component does not define the callback destination so a temporary queue should be used

-

--->

-

-    <component name="ClientComponent">

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

-        <reference name="myService">

-            <binding.jms uri="jms:ServiceQueue"/>

-            <callback>

-                <binding.jms />

-            </callback>

-        </reference>

-    </component>

-

-    <component name="ServiceComponent">

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

-        <service name="JMSService">

-            <binding.jms uri="jms:ServiceQueue"/>

-            <callback>

-                <binding.jms />

-            </callback>

-        </service>

-    </component>

-

-</composite>

diff --git a/branches/sca-java-1.x/itest/jms-callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/CallbackTestCase.java b/branches/sca-java-1.x/itest/jms-callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/CallbackTestCase.java
deleted file mode 100644
index cb9acb1bc1..0000000000
--- a/branches/sca-java-1.x/itest/jms-callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/CallbackTestCase.java
+++ /dev/null
@@ -1,60 +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;

-

-/**

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

- */

-public class CallbackTestCase {

-

-    private static SCADomain scaDomain;

-

-    @Before

-    public void init() {

-        scaDomain = SCADomain.newInstance("http://localhost", "/", "simple/client.composite");

-    }

-

-    @Test

-    public void testHelloWorldCreate() throws Exception {

-        JMSClient client = scaDomain.getService(JMSClient.class, "ClientComponent");

-

-        client.aClientMethod();

-

-        // wait for up to 5 seconds but should wake up as soon as done

-        synchronized(JMSClientImpl.lock) {

-        	JMSClientImpl.lock.wait(5000);

-        }

-

-        assertEquals(" -> someMethod  -> receiveResult ", JMSClientImpl.result);

-    }

-

-    @After

-    public void end() {

-        if (scaDomain != null) {

-            scaDomain.close();

-        }

-    }

-}

diff --git a/branches/sca-java-1.x/itest/jms-callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/TempCallbackQTestCase.java b/branches/sca-java-1.x/itest/jms-callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/TempCallbackQTestCase.java
deleted file mode 100644
index 9f450574df..0000000000
--- a/branches/sca-java-1.x/itest/jms-callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/TempCallbackQTestCase.java
+++ /dev/null
@@ -1,63 +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.net.MalformedURLException;

-

-import org.apache.tuscany.sca.host.embedded.SCADomain;

-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 TempCallbackQTestCase {

-

-    private SCADomain scaDomain;

-

-    @Before

-    public void init() throws MalformedURLException {

-        scaDomain = SCADomain.newInstance("http://localhost", "/", "simple/tempq.composite");

-    }

-

-    @Test

-    public void testHelloWorldCreate() throws Exception {

-        JMSClient client = scaDomain.getService(JMSClient.class, "ClientComponent");

-

-        client.aClientMethod();

-

-        // wait for up to 5 seconds but should wake up as soon as done

-        synchronized (JMSClientImpl.lock) {

-            JMSClientImpl.lock.wait(5000);

-        }

-

-        assertEquals(" -> someMethod  -> receiveResult ", JMSClientImpl.result);

-    }

-

-    @After

-    public void end() {

-        if (scaDomain != null) {

-            scaDomain.close();

-        }

-    }

-

-}