From 6a3ca6736c808c1647854e405ef379b609f276db Mon Sep 17 00:00:00 2001 From: lresende Date: Wed, 11 Nov 2009 23:07:45 +0000 Subject: Moving 1.x branches git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835126 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/test/java/greetings/GreetingsService.java | 31 -------- .../test/java/greetings/GreetingsServiceImpl.java | 33 -------- .../src/test/java/greetings/GreetingsTestCase.java | 63 ---------------- .../test/java/greetings/GreetingsTestServer.java | 55 -------------- .../test/java/helloworld/HelloWorldService.java | 29 -------- .../java/helloworld/HelloWorldServiceImpl.java | 47 ------------ .../test/java/helloworld/HelloWorldTestCase.java | 63 ---------------- .../test/resources/greetings/greetings.composite | 33 -------- .../src/test/resources/greetings/greetings.wsdl | 87 ---------------------- .../src/test/resources/helloworld/deploy.xml | 34 --------- .../src/test/resources/helloworld/helloworld.bpel | 84 --------------------- .../resources/helloworld/helloworld.componentType | 36 --------- .../test/resources/helloworld/helloworld.composite | 50 ------------- .../src/test/resources/helloworld/helloworld.wsdl | 82 -------------------- .../src/test/resources/log4j.properties | 35 --------- 15 files changed, 762 deletions(-) delete mode 100644 branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsService.java delete mode 100644 branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsServiceImpl.java delete mode 100644 branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsTestCase.java delete mode 100644 branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsTestServer.java delete mode 100644 branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldService.java delete mode 100644 branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldServiceImpl.java delete mode 100644 branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldTestCase.java delete mode 100644 branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.composite delete mode 100644 branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.wsdl delete mode 100644 branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/resources/helloworld/deploy.xml delete mode 100644 branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.bpel delete mode 100644 branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.componentType delete mode 100644 branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.composite delete mode 100644 branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.wsdl delete mode 100644 branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/resources/log4j.properties (limited to 'branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test') diff --git a/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsService.java b/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsService.java deleted file mode 100644 index 532b84bd22..0000000000 --- a/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsService.java +++ /dev/null @@ -1,31 +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 greetings; - -import org.osoa.sca.annotations.Remotable; - -/** - * This is the business interface of the HelloWorld greetings service. - */ -@Remotable -public interface GreetingsService { - - public String getGreetings(String name); -} - diff --git a/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsServiceImpl.java b/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsServiceImpl.java deleted file mode 100644 index 86d7f245e8..0000000000 --- a/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsServiceImpl.java +++ /dev/null @@ -1,33 +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 greetings; - -import org.osoa.sca.annotations.Service; - -/** - * This class implements the HelloWorld service. - */ -@Service(GreetingsService.class) -public class GreetingsServiceImpl implements GreetingsService { - - public String getGreetings(String name) { - return "Hello " + name; - } - -} diff --git a/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsTestCase.java b/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsTestCase.java deleted file mode 100644 index 182d7c2c55..0000000000 --- a/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsTestCase.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 greetings; - -import java.io.IOException; -import java.net.Socket; - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.host.embedded.SCADomain; - -/** - * Tests the Greetings service - * - * @version $Rev$ $Date$ - */ -public class GreetingsTestCase extends TestCase { - - private SCADomain scaDomain; - GreetingsService greetingsService = null; - - /** - * @throws java.lang.Exception - */ - @Override - protected void setUp() throws Exception { - scaDomain = SCADomain.newInstance("greetings/greetings.composite"); - greetingsService = scaDomain.getService(GreetingsService.class, "GreetingsServiceComponent"); - } - - /** - * @throws java.lang.Exception - */ - @Override - protected void tearDown() throws Exception { - scaDomain.close(); - } - - public void testPing() throws IOException { - new Socket("127.0.0.1", 8085); - } - public void testInvoke() { - String response = greetingsService.getGreetings("Luciano"); - assertEquals("Hello Luciano", response); - } -} diff --git a/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsTestServer.java b/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsTestServer.java deleted file mode 100644 index 86e97361df..0000000000 --- a/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsTestServer.java +++ /dev/null @@ -1,55 +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 greetings; - -import java.io.IOException; -import java.net.Socket; - -import org.apache.tuscany.sca.host.embedded.SCADomain; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -/** - * Starts up the SCA runtime which starts listening for service requests - */ -public class GreetingsTestServer { - - private SCADomain scaDomain; - - @Before - public void startServer() throws Exception { - try { - scaDomain = SCADomain.newInstance("greetings/greetings.composite"); - } catch (Exception e) { - e.printStackTrace(); - } - } - - @Test - public void testPing() throws IOException { - new Socket("127.0.0.1", 8085); - } - - @After - public void stopServer() throws Exception { - scaDomain.close(); - } - -} diff --git a/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldService.java b/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldService.java deleted file mode 100644 index 672dbdc0b5..0000000000 --- a/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldService.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 helloworld; - -import org.osoa.sca.annotations.Remotable; - -/** - * The interface for the helloworld service - */ -@Remotable -public interface HelloWorldService { - public String hello(String name); -} diff --git a/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldServiceImpl.java b/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldServiceImpl.java deleted file mode 100644 index d7ebd5cbb8..0000000000 --- a/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldServiceImpl.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 helloworld; - -import greetings.GreetingsService; - -import org.osoa.sca.annotations.Reference; - -/** - * The HelloWorld service implementation - */ -public class HelloWorldServiceImpl implements HelloWorldService { - - protected GreetingsService greetingsService; - - public GreetingsService getGreetingsService() { - System.out.println("Got Injected greetingsService"); - return greetingsService; - } - - @Reference - public void setGreetingsService(GreetingsService greetingsService) { - System.out.println("Injected greetingsService"); - this.greetingsService = greetingsService; - } - - public String hello(String name) { - System.out.println("Calling greeting services getGreetings"); - return greetingsService.getGreetings(name); - } -} \ No newline at end of file diff --git a/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldTestCase.java b/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldTestCase.java deleted file mode 100644 index 900f59ca9c..0000000000 --- a/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldTestCase.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 helloworld; - -import greetings.GreetingsTestServer; -import junit.framework.TestCase; - -import org.apache.tuscany.sca.host.embedded.SCADomain; -import org.apache.tuscany.sca.host.embedded.SCATestCaseRunner; - -/** - * Tests the BPEL Helloworld Service - * - * @version $Rev$ $Date$ - */ -public class HelloWorldTestCase extends TestCase { - private SCADomain scaDomain; - - //private SCATestCaseRunner server; - - /** - * @throws java.lang.Exception - */ - @Override - protected void setUp() throws Exception { - scaDomain = SCADomain.newInstance("helloworld/helloworld.composite"); - - //server = new SCATestCaseRunner(GreetingsTestServer.class); - //server.before(); - } - - /** - * @throws java.lang.Exception - */ - @Override - protected void tearDown() throws Exception { - //server.after(); - scaDomain.close(); - } - - public void testServiceInvocation() { - HelloWorldService bpelService = scaDomain.getService(HelloWorldService.class, "HelloWorldService"); - String response = bpelService.hello("Luciano"); - assertEquals("Hello Luciano", response); - } -} diff --git a/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.composite b/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.composite deleted file mode 100644 index fde89667cd..0000000000 --- a/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.composite +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - diff --git a/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.wsdl b/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.wsdl deleted file mode 100644 index e768707ccd..0000000000 --- a/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.wsdl +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/resources/helloworld/deploy.xml b/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/resources/helloworld/deploy.xml deleted file mode 100644 index f6f9bbfc2e..0000000000 --- a/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/resources/helloworld/deploy.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - true - - - - - - - - diff --git a/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.bpel b/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.bpel deleted file mode 100644 index d9b91ed8ba..0000000000 --- a/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.bpel +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - $helloMessage.TestPart - $greetingsRequest.parameters - - - - - - - - $greetingsResponse.parameters - $helloResponse.TestPart - - - - - - diff --git a/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.componentType b/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.componentType deleted file mode 100644 index de765c986f..0000000000 --- a/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.componentType +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.composite b/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.composite deleted file mode 100644 index 7207398eba..0000000000 --- a/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.composite +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.wsdl b/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.wsdl deleted file mode 100644 index 0f51b96b27..0000000000 --- a/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.wsdl +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/resources/log4j.properties b/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/resources/log4j.properties deleted file mode 100644 index 6c7c7e7ab1..0000000000 --- a/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/resources/log4j.properties +++ /dev/null @@ -1,35 +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. -# - -# Set root logger level to WARN and its only appender to CONSOLE -log4j.rootLogger=OFF, CONSOLE - -# log4j properties to work with commandline tools. -log4j.category.org.mortbay=OFF -log4j.category.org.hibernate.type=OFF -log4j.category.org.objectweb=OFF -log4j.category.org.apache.ode.axis2=OFF -log4j.category.org.apache.ode.bpel.engine=OFF -log4j.category.org.apache.ode.daohib.bpel.CorrelatorDaoImpl=OFF -log4j.category.org.apache.ode.bpel.epr=OFF -log4j.category.org.apache.tuscany.sca.implementation.bpel=DEBUG -log4j.category.org.apache.tuscany.sca.implementation.bpel.ode=DEBUG - -# Console appender -log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender -log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout -log4j.appender.CONSOLE.layout.ConversionPattern=%p - %C{1}.%M(%L) | %m%n -- cgit v1.2.3