From 5963a2d3d6860fe57afc138f095bf2d2eb5a7b80 Mon Sep 17 00:00:00 2001 From: lresende Date: Mon, 7 Oct 2013 22:23:21 +0000 Subject: Official Tuscany 2.0.1 Release git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1530096 13f79535-47bb-0310-9956-ffa450edef68 --- .../sca/policy/matching/helloworld/HelloWorld.java | 29 ----- .../matching/helloworld/HelloWorldClient.java | 35 ------ .../matching/helloworld/HelloWorldService.java | 30 ----- .../main/resources/META-INF/sca-contribution.xml | 23 ---- ....apache.tuscany.sca.definitions.xml.Definitions | 17 --- .../sca/policy/matching/helloworld/definitions.xml | 67 ----------- .../matching/helloworld/helloworld.composite | 86 -------------- .../sca/policy/matching/helloworld/helloworld.wsdl | 90 -------------- .../sca/policy/matching/MatchingTestCase.java | 130 --------------------- 9 files changed, 507 deletions(-) delete mode 100644 sca-java-2.x/tags/2.0.1-RC1/testing/itest/policy/matching/src/main/java/org/apache/tuscany/sca/policy/matching/helloworld/HelloWorld.java delete mode 100644 sca-java-2.x/tags/2.0.1-RC1/testing/itest/policy/matching/src/main/java/org/apache/tuscany/sca/policy/matching/helloworld/HelloWorldClient.java delete mode 100644 sca-java-2.x/tags/2.0.1-RC1/testing/itest/policy/matching/src/main/java/org/apache/tuscany/sca/policy/matching/helloworld/HelloWorldService.java delete mode 100644 sca-java-2.x/tags/2.0.1-RC1/testing/itest/policy/matching/src/main/resources/META-INF/sca-contribution.xml delete mode 100644 sca-java-2.x/tags/2.0.1-RC1/testing/itest/policy/matching/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions delete mode 100644 sca-java-2.x/tags/2.0.1-RC1/testing/itest/policy/matching/src/main/resources/org/apache/tuscany/sca/policy/matching/helloworld/definitions.xml delete mode 100644 sca-java-2.x/tags/2.0.1-RC1/testing/itest/policy/matching/src/main/resources/org/apache/tuscany/sca/policy/matching/helloworld/helloworld.composite delete mode 100644 sca-java-2.x/tags/2.0.1-RC1/testing/itest/policy/matching/src/main/resources/org/apache/tuscany/sca/policy/matching/helloworld/helloworld.wsdl delete mode 100644 sca-java-2.x/tags/2.0.1-RC1/testing/itest/policy/matching/src/test/java/org/apache/tuscany/sca/policy/matching/MatchingTestCase.java (limited to 'sca-java-2.x/tags/2.0.1-RC1/testing/itest/policy/matching/src') diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/policy/matching/src/main/java/org/apache/tuscany/sca/policy/matching/helloworld/HelloWorld.java b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/policy/matching/src/main/java/org/apache/tuscany/sca/policy/matching/helloworld/HelloWorld.java deleted file mode 100644 index 16db3fd9fc..0000000000 --- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/policy/matching/src/main/java/org/apache/tuscany/sca/policy/matching/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.policy.matching.helloworld; - -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -public interface HelloWorld { - - String getGreetings(String s); - -} diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/policy/matching/src/main/java/org/apache/tuscany/sca/policy/matching/helloworld/HelloWorldClient.java b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/policy/matching/src/main/java/org/apache/tuscany/sca/policy/matching/helloworld/HelloWorldClient.java deleted file mode 100644 index d34591713b..0000000000 --- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/policy/matching/src/main/java/org/apache/tuscany/sca/policy/matching/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.policy.matching.helloworld; - -import org.oasisopen.sca.annotation.Reference; - -public class HelloWorldClient implements HelloWorld { - - @Reference - public HelloWorld helloWorld; - - public String getGreetings(String s) { - String response = helloWorld.getGreetings(s); - System.out.println("At client: " + response); - return response; - } - -} diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/policy/matching/src/main/java/org/apache/tuscany/sca/policy/matching/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/policy/matching/src/main/java/org/apache/tuscany/sca/policy/matching/helloworld/HelloWorldService.java deleted file mode 100644 index 31a2d2cb89..0000000000 --- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/policy/matching/src/main/java/org/apache/tuscany/sca/policy/matching/helloworld/HelloWorldService.java +++ /dev/null @@ -1,30 +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.policy.matching.helloworld; - -public class HelloWorldService implements HelloWorld { - - public String getGreetings(String s) { - String response = "Hello " + s; - System.out.println("At service: " + response); - return response; - } - -} diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/policy/matching/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/policy/matching/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 6ae1c88c42..0000000000 --- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/policy/matching/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/tags/2.0.1-RC1/testing/itest/policy/matching/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/policy/matching/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions deleted file mode 100644 index 45b6be47b7..0000000000 --- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/policy/matching/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/policy/matching/helloworld/definitions.xml \ No newline at end of file diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/policy/matching/src/main/resources/org/apache/tuscany/sca/policy/matching/helloworld/definitions.xml b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/policy/matching/src/main/resources/org/apache/tuscany/sca/policy/matching/helloworld/definitions.xml deleted file mode 100644 index c70aae996b..0000000000 --- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/policy/matching/src/main/resources/org/apache/tuscany/sca/policy/matching/helloworld/definitions.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - FINE - LoggingMessages.properties - - - - - - - - - FINE - LoggingMessages.properties - - - - - - - \ No newline at end of file diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/policy/matching/src/main/resources/org/apache/tuscany/sca/policy/matching/helloworld/helloworld.composite b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/policy/matching/src/main/resources/org/apache/tuscany/sca/policy/matching/helloworld/helloworld.composite deleted file mode 100644 index 7dfe083bae..0000000000 --- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/policy/matching/src/main/resources/org/apache/tuscany/sca/policy/matching/helloworld/helloworld.composite +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/policy/matching/src/main/resources/org/apache/tuscany/sca/policy/matching/helloworld/helloworld.wsdl b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/policy/matching/src/main/resources/org/apache/tuscany/sca/policy/matching/helloworld/helloworld.wsdl deleted file mode 100644 index a352696b8e..0000000000 --- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/policy/matching/src/main/resources/org/apache/tuscany/sca/policy/matching/helloworld/helloworld.wsdl +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/policy/matching/src/test/java/org/apache/tuscany/sca/policy/matching/MatchingTestCase.java b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/policy/matching/src/test/java/org/apache/tuscany/sca/policy/matching/MatchingTestCase.java deleted file mode 100644 index 5b1f971a3a..0000000000 --- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/policy/matching/src/test/java/org/apache/tuscany/sca/policy/matching/MatchingTestCase.java +++ /dev/null @@ -1,130 +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.policy.matching; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.apache.tuscany.sca.policy.matching.helloworld.HelloWorld; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -/* - * Test the various conditions in the matching algorithm - * 1 - FAIL if there are intents that are mutually exclusive between reference and service - * 2 - PASS if there are no intents or policies present at reference and service - * 3 - FAIL if there are unresolved intents (intents with no policy set) at the reference (service should have been checked previously) - * 4 - PASS if there are no policies at reference and service (now we know all intents are resolved) - * 5 - FAIL if there are some policies on one side but not on the other - * 6 - PASS if the QName of the policy sets on each side match - * 7 - FAIL if the policy languages on both sides are different - * 8 - Perform policy specific match - */ -public class MatchingTestCase { - - private static Node node; - - - @BeforeClass - public static void setUp() throws Exception { - try { - node = NodeFactory.newInstance().createNode(new Contribution("test", "target/classes")); - node.start(); - } catch (Exception ex) { - ex.printStackTrace(); - } - } - - @Test - public void testMutuallyExclusiveIntents() throws Exception { - HelloWorld helloWorld = node.getService(HelloWorld.class, "HelloWorldClientMutuallyExclusiveIntents"); - try { - helloWorld.getGreetings("petra"); - fail("Exception expected"); - } catch (Exception ex) { - assertTrue(ex.getMessage().indexOf("No match because the following intents are mutually exclusive {http://tuscany.apache.org/xmlns/sca/1.1}testIntent3 {http://tuscany.apache.org/xmlns/sca/1.1}testIntent1") > -1); - } - } - - @Test - public void testNoIntentsOrPolicies() throws Exception { - HelloWorld helloWorld = node.getService(HelloWorld.class, "HelloWorldClientNoIntentsOrPolicies"); - assertEquals("Hello petra", helloWorld.getGreetings("petra")); - } - - @Test - public void testUnresolvedIntentsOnReference() throws Exception { - HelloWorld helloWorld = node.getService(HelloWorld.class, "HelloUnresolvedIntentsOnReference"); - try { - helloWorld.getGreetings("petra"); - fail("Exception expected"); - } catch (Exception ex) { - assertTrue(ex.getMessage().indexOf("No match because there are unresolved intents [{http://tuscany.apache.org/xmlns/sca/1.1}testIntent2]") > -1); - } - } - - @Test - public void testIntentsButNoPolicies() throws Exception { - HelloWorld helloWorld = node.getService(HelloWorld.class, "HelloWorldClientIntentsButNoPolicies1"); - assertEquals("Hello petra", helloWorld.getGreetings("petra")); - - helloWorld = node.getService(HelloWorld.class, "HelloWorldClientIntentsButNoPolicies2"); - assertEquals("Hello petra", helloWorld.getGreetings("petra")); - } - - @Test - public void testSomePoliciesOnOneSideButNoneOnTheOther() throws Exception { - HelloWorld helloWorld = node.getService(HelloWorld.class, "HelloWorldClientSomePoliciesOnOneSideButNoneOnTheOther"); - assertEquals("Hello petra",helloWorld.getGreetings("petra")); - } - - @Test - public void testPolicySetQNameMatch() throws Exception { - HelloWorld helloWorld = node.getService(HelloWorld.class, "HelloWorldClientPolicySetQNameMatch"); - assertEquals("Hello petra", helloWorld.getGreetings("petra")); - } - - @Test - public void testDifferentPolicyLanguage() throws Exception { - try { - HelloWorld helloWorld = node.getService(HelloWorld.class, "HelloWorldClientDifferentPolicyLanguage"); - helloWorld.getGreetings("petra"); - fail("Exception expected"); - } catch (Exception ex) { - assertTrue(ex.getMessage().indexOf("No match because the policy sets on either side have policies in differnt languages {http://schemas.xmlsoap.org/ws/2004/09/policy}Policy and {http://tuscany.apache.org/xmlns/sca/1.1}jdkLogger") > -1); - } - } - - @Test - public void testPolicySpecificMatch() throws Exception { - // TODO - } - - @AfterClass - public static void tearDown() throws Exception { - node.stop(); - } - -} -- cgit v1.2.3