From 04dcd09976ecc5aa2948993b9a9a2d90d239ee44 Mon Sep 17 00:00:00 2001 From: antelder Date: Thu, 28 Jul 2011 10:58:07 +0000 Subject: Delete old beta3 branch as its going to be recreated from the current trunk git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1151789 13f79535-47bb-0310-9956-ffa450edef68 --- .../testing/itest/ws/authentication-basic/pom.xml | 63 --------------- .../binding/ws/axis2/helloworld/HelloWorld.java | 29 ------- .../ws/axis2/helloworld/HelloWorldClient.java | 35 --------- .../ws/axis2/helloworld/HelloWorldService.java | 45 ----------- .../main/resources/META-INF/sca-contribution.xml | 23 ------ ....apache.tuscany.sca.definitions.xml.Definitions | 17 ---- .../binding/ws/axis2/helloworld/definitions.xml | 46 ----------- .../ws/axis2/helloworld/helloworld.composite | 45 ----------- .../binding/ws/axis2/helloworld/helloworld.wsdl | 90 ---------------------- .../sca/binding/ws/axis2/HelloworldTestCase.java | 52 ------------- 10 files changed, 445 deletions(-) delete mode 100644 sca-java-2.x/branches/2.0-Beta3/testing/itest/ws/authentication-basic/pom.xml delete mode 100644 sca-java-2.x/branches/2.0-Beta3/testing/itest/ws/authentication-basic/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorld.java delete mode 100644 sca-java-2.x/branches/2.0-Beta3/testing/itest/ws/authentication-basic/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldClient.java delete mode 100644 sca-java-2.x/branches/2.0-Beta3/testing/itest/ws/authentication-basic/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldService.java delete mode 100644 sca-java-2.x/branches/2.0-Beta3/testing/itest/ws/authentication-basic/src/main/resources/META-INF/sca-contribution.xml delete mode 100644 sca-java-2.x/branches/2.0-Beta3/testing/itest/ws/authentication-basic/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions delete mode 100644 sca-java-2.x/branches/2.0-Beta3/testing/itest/ws/authentication-basic/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/definitions.xml delete mode 100644 sca-java-2.x/branches/2.0-Beta3/testing/itest/ws/authentication-basic/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.composite delete mode 100644 sca-java-2.x/branches/2.0-Beta3/testing/itest/ws/authentication-basic/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.wsdl delete mode 100644 sca-java-2.x/branches/2.0-Beta3/testing/itest/ws/authentication-basic/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HelloworldTestCase.java (limited to 'sca-java-2.x/branches/2.0-Beta3/testing/itest/ws/authentication-basic') diff --git a/sca-java-2.x/branches/2.0-Beta3/testing/itest/ws/authentication-basic/pom.xml b/sca-java-2.x/branches/2.0-Beta3/testing/itest/ws/authentication-basic/pom.xml deleted file mode 100644 index d31d445db7..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/testing/itest/ws/authentication-basic/pom.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - itest-ws - 2.0-Beta3-SNAPSHOT - ../pom.xml - - - itest-ws-authentication-basic - Apache Tuscany SCA iTest WS with Authentication Basic - - - - - org.apache.tuscany.sca - tuscany-base-runtime-pom - pom - 2.0-Beta3-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-binding-ws-runtime-axis2 - 2.0-Beta3-SNAPSHOT - - - - org.mortbay.jetty - jetty - 6.1.19 - - - - org.codehaus.woodstox - wstx-asl - 3.2.9 - - - - - ${project.artifactId} - - diff --git a/sca-java-2.x/branches/2.0-Beta3/testing/itest/ws/authentication-basic/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorld.java b/sca-java-2.x/branches/2.0-Beta3/testing/itest/ws/authentication-basic/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorld.java deleted file mode 100644 index 98eb6e361b..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/testing/itest/ws/authentication-basic/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorld.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.ws.axis2.helloworld; - -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -public interface HelloWorld { - - String getGreetings(String s); - -} diff --git a/sca-java-2.x/branches/2.0-Beta3/testing/itest/ws/authentication-basic/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldClient.java b/sca-java-2.x/branches/2.0-Beta3/testing/itest/ws/authentication-basic/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldClient.java deleted file mode 100644 index 2c6c4fc92c..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/testing/itest/ws/authentication-basic/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldClient.java +++ /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. - */ - -package org.apache.tuscany.sca.binding.ws.axis2.helloworld; - -import org.oasisopen.sca.annotation.Reference; - -public class HelloWorldClient implements HelloWorld { - - @Reference - public HelloWorld helloWorldWS; - - public String getGreetings(String s) { - String response = helloWorldWS.getGreetings(s); - System.out.println("At client: " + response); - return response; - } - -} diff --git a/sca-java-2.x/branches/2.0-Beta3/testing/itest/ws/authentication-basic/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldService.java b/sca-java-2.x/branches/2.0-Beta3/testing/itest/ws/authentication-basic/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldService.java deleted file mode 100644 index 885844260a..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/testing/itest/ws/authentication-basic/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldService.java +++ /dev/null @@ -1,45 +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.ws.axis2.helloworld; - -import javax.security.auth.Subject; - -import org.oasisopen.sca.RequestContext; -import org.oasisopen.sca.annotation.Context; - -public class HelloWorldService implements HelloWorld { - - @Context - protected RequestContext requestContext; - - public String getGreetings(String name) { - Subject subject = requestContext.getSecuritySubject(); - String response = "Hello " + name + " "; - - if (subject == null){ - response += "null subject"; - } else { - response += subject.getPrincipals().iterator().next().getName(); - } - - System.out.println("At service: " + response); - return response; - } -} diff --git a/sca-java-2.x/branches/2.0-Beta3/testing/itest/ws/authentication-basic/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/branches/2.0-Beta3/testing/itest/ws/authentication-basic/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 7e71dd465f..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/testing/itest/ws/authentication-basic/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - \ No newline at end of file diff --git a/sca-java-2.x/branches/2.0-Beta3/testing/itest/ws/authentication-basic/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions b/sca-java-2.x/branches/2.0-Beta3/testing/itest/ws/authentication-basic/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions deleted file mode 100644 index 04fe620be4..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/testing/itest/ws/authentication-basic/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions +++ /dev/null @@ -1,17 +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. -org/apache/tuscany/sca/binding/ws/axis2/helloworld/definitions.xml \ No newline at end of file diff --git a/sca-java-2.x/branches/2.0-Beta3/testing/itest/ws/authentication-basic/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/definitions.xml b/sca-java-2.x/branches/2.0-Beta3/testing/itest/ws/authentication-basic/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/definitions.xml deleted file mode 100644 index d4e651b271..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/testing/itest/ws/authentication-basic/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/definitions.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - myname - mypassword - - - - - - - - - - \ No newline at end of file diff --git a/sca-java-2.x/branches/2.0-Beta3/testing/itest/ws/authentication-basic/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.composite b/sca-java-2.x/branches/2.0-Beta3/testing/itest/ws/authentication-basic/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.composite deleted file mode 100644 index 166565baa0..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/testing/itest/ws/authentication-basic/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.composite +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - http://localhost:8085/services/HelloWorldWebService1 - - - - - - diff --git a/sca-java-2.x/branches/2.0-Beta3/testing/itest/ws/authentication-basic/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.wsdl b/sca-java-2.x/branches/2.0-Beta3/testing/itest/ws/authentication-basic/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.wsdl deleted file mode 100644 index a352696b8e..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/testing/itest/ws/authentication-basic/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.wsdl +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sca-java-2.x/branches/2.0-Beta3/testing/itest/ws/authentication-basic/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HelloworldTestCase.java b/sca-java-2.x/branches/2.0-Beta3/testing/itest/ws/authentication-basic/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HelloworldTestCase.java deleted file mode 100644 index 380fc5b0f5..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/testing/itest/ws/authentication-basic/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HelloworldTestCase.java +++ /dev/null @@ -1,52 +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.ws.axis2; - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.binding.ws.axis2.helloworld.HelloWorld; -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.Ignore; - -//@Ignore("TUSCANY-3631") -public class HelloworldTestCase extends TestCase { - - private Node node; - private HelloWorld helloWorld; - - public void testCalculator() throws Exception { - assertEquals("Hello fred myname", helloWorld.getGreetings("fred")); - } - - @Override - protected void setUp() throws Exception { - node = NodeFactory.newInstance().createNode(new Contribution("test", "target/classes")); - node.start(); - helloWorld = node.getService(HelloWorld.class, "HelloWorldClient"); - } - - @Override - protected void tearDown() throws Exception { - node.stop(); - } - -} -- cgit v1.2.3