diff options
Diffstat (limited to '')
79 files changed, 0 insertions, 4227 deletions
diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/java/test/ASM_0001_Client.java b/branches/sca-java-1.5/stest/sampleTest/src/main/java/test/ASM_0001_Client.java deleted file mode 100644 index 0e4583ffc2..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/java/test/ASM_0001_Client.java +++ /dev/null @@ -1,69 +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 test; - -import org.osoa.sca.annotations.Service; - -import test.TestInvocation; - -/** - * Basic test initiation class - * @author MikeEdwards - * - */ -@Service(TestInvocation.class) -public class ASM_0001_Client implements TestInvocation { - - private String testName = "ASM_0001"; - - /** - * This method is offered as a service and is - * invoked by the test client to run the test - */ - public String invokeTest( String input ) throws TestException { - String response = null; - - response = runTest( input ); - - return response; - } // end method invokeTest - - /** - * This method actually runs the test - and is subclassed by classes that run other tests. - * @param input - an input string - * @return - a response string = "ASM_0001 inputString invoked ok"; - * - */ - public String runTest( String input ){ - String response = null; - - response = testName + " " + input + " invoked ok"; - - return response; - } // end method runTest - - /** - * Sets the name of the test - * @param name - the test name - */ - protected void setTestName( String name ) { - testName = name; - } - -} // diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/java/test/ASM_0002_Client.java b/branches/sca-java-1.5/stest/sampleTest/src/main/java/test/ASM_0002_Client.java deleted file mode 100644 index 8a4a0c3fdc..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/java/test/ASM_0002_Client.java +++ /dev/null @@ -1,80 +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 test; - -import org.osoa.sca.annotations.Service; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Property; - -import test.TestInvocation; - -/** - * Test initiation class with a single reference of multiplicity 1..1 - * @author MikeEdwards - * - */ -@Service(TestInvocation.class) -public class ASM_0002_Client implements TestInvocation { - - @Property - public String testName = "ASM_xxxx"; - - @Reference - public Service1 reference1; - - /** - * This method is offered as a service and is - * invoked by the test client to run the test - */ - public String invokeTest( String input ) throws TestException { - String response = null; - - try { - response = runTest( input ); - } catch( Exception e ) { - throw new TestException("Test service got an exception during execution: " + e.getClass().getName()+ " " + e.getMessage() ); - } // end try - return response; - } // end method invokeTest - - /** - * This method actually runs the test - and is subclassed by classes that run other tests. - * @param input - an input string - * @return - a response string = "ASM_0001 inputString invoked ok"; - * - */ - public String runTest( String input ){ - String response = null; - - String response1 = reference1.operation1(input); - - response = testName + " " + input + " " + response1; - - return response; - } // end method runTest - - /** - * Sets the name of the test - * @param name - the test name - */ - protected void setTestName( String name ) { - testName = name; - } - -} // diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/java/test/ASM_0003_Client.java b/branches/sca-java-1.5/stest/sampleTest/src/main/java/test/ASM_0003_Client.java deleted file mode 100644 index d4f3f7e5af..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/java/test/ASM_0003_Client.java +++ /dev/null @@ -1,81 +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 test; - -import org.osoa.sca.annotations.Service; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Property; - -import test.TestInvocation; - -import java.util.List; - -/** - * Basic test initiation class - * @author MikeEdwards - * - */ -@Service(TestInvocation.class) -public class ASM_0003_Client implements TestInvocation { - - @Property - public String testName = "ASM_xxxx"; - - @Reference - public List<Service1> reference1; - - /** - * This method is offered as a service and is - * invoked by the test client to run the test - */ - public String invokeTest( String input ) throws TestException { - String response = null; - - response = runTest( input ); - - return response; - } // end method invokeTest - - /** - * This method actually runs the test - and is subclassed by classes that run other tests. - * @param input - an input string - * @return - a response string = "ASM_0001 inputString invoked ok"; - * - */ - public String runTest( String input ){ - String response = ""; - - for( Service1 reference : reference1 ) { - response += reference.operation1(input); - } // end for - - response = testName + " " + input + " " + response; - - return response; - } // end method runTest - - /** - * Sets the name of the test - * @param name - the test name - */ - protected void setTestName( String name ) { - testName = name; - } - -} // diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/java/test/Service1.java b/branches/sca-java-1.5/stest/sampleTest/src/main/java/test/Service1.java deleted file mode 100644 index eeb3b31999..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/java/test/Service1.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 test; - -/** - * A test service interface - * @author MikeEdwards - * - */ -public interface Service1 { - - /** - * Method for invoking testcase service - * @param input - input parameter(s) as a String - * @return - output data as a String - */ - public String operation1( String input ); - -} diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/java/test/Service1Superset.java b/branches/sca-java-1.5/stest/sampleTest/src/main/java/test/Service1Superset.java deleted file mode 100644 index 487d748513..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/java/test/Service1Superset.java +++ /dev/null @@ -1,42 +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 test; - -/** - * A superset of the basic test service interface - * @author MikeEdwards - * - */ -public interface Service1Superset { - - /** - * Method for invoking testcase service - * @param input - input parameter(s) as a String - * @return - output data as a String - */ - public String operation1( String input ); - - /** - * A second method for invoking a testcase service - * @param input - input parameter(s) as a String - * @return - output data as a String - */ - public String operation2( String input ); - -} diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/java/test/Service2.java b/branches/sca-java-1.5/stest/sampleTest/src/main/java/test/Service2.java deleted file mode 100644 index 3006a885b2..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/java/test/Service2.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 test; - -/** - * A test service interface, designed to be incompatible with the Service1 interface - * @author MikeEdwards - * - */ -public interface Service2 { - - /** - * Method for invoking testcase service - * @param input - input parameter(s) as a String - * @return - output data as a String - */ - public int operation2( int input ); - -} diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/java/test/TestException.java b/branches/sca-java-1.5/stest/sampleTest/src/main/java/test/TestException.java deleted file mode 100644 index d66a9c73bc..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/java/test/TestException.java +++ /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. - */ -package test; - -/* - * Exception thrown by SCA Test services - */ -public class TestException extends Exception { - - /** - * Required serialVersionUID field - */ - private static final long serialVersionUID = -6978058912756564824L; - - public TestException() { super(); }; - - public TestException( String msg ) { super( msg ); }; - - public TestException( String msg, Throwable cause ) { super( msg, cause); }; - - public TestException( Throwable cause ) { super( cause ); }; - -} diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/java/test/TestInvocation.java b/branches/sca-java-1.5/stest/sampleTest/src/main/java/test/TestInvocation.java deleted file mode 100644 index 94bbe87ed0..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/java/test/TestInvocation.java +++ /dev/null @@ -1,42 +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 test; - -import javax.jws.WebService; -import javax.jws.WebMethod; -import org.osoa.sca.annotations.Remotable; - -/** - * Basic interface to invoke testcases - * @author MikeEdwards - * - */ -@Remotable -public interface TestInvocation { - - /** - * Method for invoking testcase - * @param input - input parameter(s) as a String - * @return - output data as a String - * @throws - a TestException is thrown in cases where the test service fails internally - */ - @WebMethod - public String invokeTest( String input ) throws TestException ; - -} diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/java/test/service1Impl.java b/branches/sca-java-1.5/stest/sampleTest/src/main/java/test/service1Impl.java deleted file mode 100644 index b61fde92c9..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/java/test/service1Impl.java +++ /dev/null @@ -1,38 +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 test; - -import org.osoa.sca.annotations.*; - -/** - * Simple Java component implementation for business interface Service1 - * @author MikeEdwards - * - */ -@Service(Service1.class) -public class service1Impl implements Service1 { - - @Property - public String serviceName = "service1"; - - public String operation1(String input) { - return serviceName + " operation1 invoked"; - } - -} diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/java/test/service1Impl2.java b/branches/sca-java-1.5/stest/sampleTest/src/main/java/test/service1Impl2.java deleted file mode 100644 index abff52b606..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/java/test/service1Impl2.java +++ /dev/null @@ -1,44 +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 test; - -import org.osoa.sca.annotations.*; - -/** - * Enhanced Java component implementation for business interface Service1, - * where the implementation also has a single reference using the Service1 - * interface and which gets called when operation1 is invoked - * @author MikeEdwards - * - */ -@Service(Service1.class) -public class service1Impl2 implements Service1 { - - @Property - public String serviceName = "service1"; - // Reference with an implied multiplicity of (1..1) since required=true is the default - @Reference - public Service1 reference1 = null; - - public String operation1(String input) { - String result = reference1.operation1(input); - return serviceName + " operation1 invoked" + " " + result; - } - -} diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/java/test/service1Impl3.java b/branches/sca-java-1.5/stest/sampleTest/src/main/java/test/service1Impl3.java deleted file mode 100644 index b9f7d34638..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/java/test/service1Impl3.java +++ /dev/null @@ -1,49 +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 test; - -import org.osoa.sca.annotations.*; - -/** - * Enhanced Java component implementation for business interface Service1, - * where the implementation also has a single reference using the Service1 - * interface with mutiplicity 1..n all of which and which get called when - * operation1 is invoked - * @author MikeEdwards - * - */ -@Service(Service1.class) -public class service1Impl3 implements Service1 { - - @Property - public String serviceName = "service1"; - // Required = true + an array -> multiplicity 1..n - @Reference(required=true) - public Service1[] reference1 = null; - - public String operation1(String input) { - String result = ""; - // Call each of the references in the array, concatenating the results - for( int i=0 ; i < reference1.length; i++ ) { - result = result.concat( reference1[i].operation1(input) ); - } // end for - return serviceName + " operation1 invoked" + " " + result; - } - -} diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/java/test/service1Impl4.java b/branches/sca-java-1.5/stest/sampleTest/src/main/java/test/service1Impl4.java deleted file mode 100644 index 0c41f7e405..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/java/test/service1Impl4.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 test; - -import org.osoa.sca.annotations.*; - -/** - * Enhanced Java component implementation for business interface Service1, - * where the implementation also has a single reference using the Service1 - * interface with multiplicity 0..n all of which and which get called when - * operation1 is invoked - * @author MikeEdwards - * - */ -@Service(Service1.class) -public class service1Impl4 implements Service1 { - - @Property - public String serviceName = "service1"; - // Required = false + an array -> multiplicity 0..n - @Reference(required=false) - public Service1[] reference1 = null; - - public String operation1(String input) { - String result = serviceName + " operation1 invoked"; - // Call each of the references in the array, concatenating the results - for( int i=0 ; i < reference1.length; i++ ) { - result = result.concat(" "); - result = result.concat( reference1[i].operation1(input) ); - } // end for - return result; - } - -} diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/java/test/service1Impl5.java b/branches/sca-java-1.5/stest/sampleTest/src/main/java/test/service1Impl5.java deleted file mode 100644 index 1719ba9405..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/java/test/service1Impl5.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 test; - -//import org.oasisopen.sca.annotation.*; -import org.osoa.sca.annotations.*; - -/** - * Java component implementation for business interface Service1 - * - no references - * - 3 properties - * @author MikeEdwards - * - */ -@Service(Service1.class) -public class service1Impl5 implements Service1 { - - @Property - public String serviceName = "service1"; - @Property - public String serviceData1; - @Property - public String serviceData2; - - public String operation1(String input) { - return serviceName + " operation1 invoked" + serviceData1 + serviceData2; - } - -} diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/java/test/service1SupersetImpl.java b/branches/sca-java-1.5/stest/sampleTest/src/main/java/test/service1SupersetImpl.java deleted file mode 100644 index c75078f961..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/java/test/service1SupersetImpl.java +++ /dev/null @@ -1,42 +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 test; - -import org.osoa.sca.annotations.*; - -/** - * Simple Java component implementation for business interface Service1Superset - * @author MikeEdwards - * - */ -@Service(Service1Superset.class) -public class service1SupersetImpl implements Service1Superset { - - @Property - public String serviceName = "service1"; - - public String operation1(String input) { - return serviceName + " operation1 invoked"; - } - - public String operation2(String input) { - return serviceName + " operation2 invoked"; - } - -} diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/java/test/service2Impl.java b/branches/sca-java-1.5/stest/sampleTest/src/main/java/test/service2Impl.java deleted file mode 100644 index 44a2789125..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/java/test/service2Impl.java +++ /dev/null @@ -1,38 +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 test; - -import org.osoa.sca.annotations.*; - -/** - * Simple Java component implementation for business interface Service2 - * @author MikeEdwards - * - */ -@Service(Service2.class) -public class service2Impl implements Service2 { - - @Property - public String serviceName = "service1"; - - public int operation2(int input) { - return input+1; - } - -} diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/TestClient.wsdl b/branches/sca-java-1.5/stest/sampleTest/src/main/resources/TestClient.wsdl deleted file mode 100644 index 2a8b112cca..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/TestClient.wsdl +++ /dev/null @@ -1,102 +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. ---> -<!-- Produced from the TestInvocation,java interface by running a service - based on that interface in an SCA runtime using a Web services binding - - Mike Edwards, 6th January 2008 ---> -<wsdl:definitions name="TestInvocationService" - targetNamespace="http://test/" - xmlns:tns="http://test/" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" - xmlns:xs="http://www.w3.org/2001/XMLSchema" - xmlns:SOAP="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:SOAP11="http://schemas.xmlsoap.org/wsdl/soap/"> - <wsdl:types> - <xs:schema targetNamespace="http://test/" version="1.0" xmlns:tns="http://test/" xmlns:xs="http://www.w3.org/2001/XMLSchema"> - <xs:element name="TestException" type="tns:TestException"/> - <xs:complexType name="TestException"> - <xs:sequence> - <xs:element minOccurs="0" name="message" type="xs:string"/> - </xs:sequence> - </xs:complexType> - </xs:schema> - <xs:schema attributeFormDefault="qualified" elementFormDefault="unqualified" - targetNamespace="http://test/" - xmlns:xs="http://www.w3.org/2001/XMLSchema"> - <xs:element name="invokeTest"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="arg0" nillable="true" type="xs:string"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="invokeTestResponse"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="xs:string"/> - </xs:sequence> - </xs:complexType> - </xs:element> - </xs:schema> - </wsdl:types> - <wsdl:message name="invokeTest"> - <wsdl:part name="invokeTest" element="tns:invokeTest"> - </wsdl:part> - </wsdl:message> - <wsdl:message name="invokeTestResponse"> - <wsdl:part name="invokeTestResponse" element="tns:invokeTestResponse"> - </wsdl:part> - </wsdl:message> - <wsdl:message name="TestException"> - <wsdl:part name="TestException" element="tns:TestException"> - </wsdl:part> - </wsdl:message> - <wsdl:portType name="TestInvocation"> - <wsdl:operation name="invokeTest"> - <wsdl:input message="tns:invokeTest"> - </wsdl:input> - <wsdl:output message="tns:invokeTestResponse"> - </wsdl:output> - <wsdl:fault name="TestException" message="tns:TestException"> - </wsdl:fault> - </wsdl:operation> - </wsdl:portType> - <wsdl:binding name="TestInvocationBinding" type="tns:TestInvocation"> - <SOAP:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="invokeTest"> - <SOAP:operation soapAction=""/> - <wsdl:input> - <SOAP:body use="literal"/> - </wsdl:input> - <wsdl:output> - <SOAP:body use="literal"/> - </wsdl:output> - <wsdl:fault name="TestException"> - <SOAP:fault name="TestException" use="literal"/> - </wsdl:fault> - </wsdl:operation> - </wsdl:binding> - <wsdl:service name="TestInvocationService"> - <wsdl:port name="TestInvocationPort" binding="tns:TestInvocationBinding"> - <SOAP:address location="http://localhost:8080/TestClient"/> - </wsdl:port> - </wsdl:service> -</wsdl:definitions> diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/TestClient_0002.composite b/branches/sca-java-1.5/stest/sampleTest/src/main/resources/TestClient_0002.composite deleted file mode 100644 index 299a7d665f..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/TestClient_0002.composite +++ /dev/null @@ -1,47 +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://oasis/tests" - xmlns:tns="http://oasis/tests" - xmlns:sample="http://oasis/tests" - name="TestClient_0002"> - - <service name="TestInvocation" promote="TestClient/TestInvocation"> - <interface.java interface="test.TestInvocation"/> - </service> - - <property name="testName" type="string"/> - - <component name="TestClient"> - <implementation.java class="test.ASM_0002_Client"/> - <service name="TestInvocation"> - <interface.java interface="test.TestInvocation"/> - </service> - <reference name="reference1"> - <interface.java interface="test.Service1"/> - </reference> - <property name="testName" source="$testName"/> - </component> - - <reference name="reference1" promote="TestClient/reference1"> - <interface.java interface="test.Service1"/> - </reference> - -</composite> diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/TestClient_0003.composite b/branches/sca-java-1.5/stest/sampleTest/src/main/resources/TestClient_0003.composite deleted file mode 100644 index 0079b802b7..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/TestClient_0003.composite +++ /dev/null @@ -1,47 +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://oasis/tests" - xmlns:tns="http://oasis/tests" - xmlns:sample="http://oasis/tests" - name="TestClient_0003"> - - <service name="TestInvocation" promote="TestClient/TestInvocation"> - <interface.java interface="test.TestInvocation"/> - </service> - - <property name="testName" type="string"/> - - <component name="TestClient"> - <implementation.java class="test.ASM_0003_Client"/> - <service name="TestInvocation"> - <interface.java interface="test.TestInvocation"/> - </service> - <reference name="reference1"> - <interface.java interface="test.Service1"/> - </reference> - <property name="testName" source="$testName"/> - </component> - - <reference name="reference1" promote="TestClient/reference1" multiplicity="1..n"> - <interface.java interface="test.Service1"/> - </reference> - -</composite> diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/TestComposite1.composite b/branches/sca-java-1.5/stest/sampleTest/src/main/resources/TestComposite1.composite deleted file mode 100644 index 4d65e37e16..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/TestComposite1.composite +++ /dev/null @@ -1,39 +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://oasis/tests" - xmlns:sample="http://oasis/tests" - name="TestComposite1"> - - <service name="Service1" promote="TestComponent1/Service1"> - <interface.java interface="test.Service1"></interface.java> - </service> - - <property name="serviceName" type="string"/> - - <component name="TestComponent1"> - <implementation.java class="test.service1Impl"/> - <service name="Service1"> - <interface.java interface="test.Service1"></interface.java> - </service> - <property name="serviceName" source="$serviceName"/> - </component> - -</composite> diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/TestComposite10.composite b/branches/sca-java-1.5/stest/sampleTest/src/main/resources/TestComposite10.composite deleted file mode 100644 index 0a743d7767..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/TestComposite10.composite +++ /dev/null @@ -1,47 +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. ---> -<!-- An example of a composite which has a single service and - a single reference, but where the reference has a binding - applied to it, with a target service identified --> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" - targetNamespace="http://oasis/tests" - xmlns:sample="http://oasis/tests" - name="TestComposite10"> - - <service name="Service1" promote="Composite10Component1/Service1"> - <interface.java interface="test.Service1"/> - </service> - - <property name="serviceName" type="string"/> - - <component name="Composite10Component1"> - <implementation.java class="test.service1Impl2"/> - <service name="Service1"> - <interface.java interface="test.Service1"/> - </service> - <property name="serviceName" source="$serviceName"/> - </component> - - <reference name="Reference1" promote="Composite10Component1/reference1"> - <interface.java interface="test.Service1"/> - <binding.sca uri="TestComponent2/Service1"/> - </reference> - -</composite> diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/TestComposite11.composite b/branches/sca-java-1.5/stest/sampleTest/src/main/resources/TestComposite11.composite deleted file mode 100644 index 98775aa6e5..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/TestComposite11.composite +++ /dev/null @@ -1,59 +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. ---> -<!-- An example of a composite which has one component with a reference - that is multiplicity 1..1 and which is both wired to a service of a - second component in the same composite and is also promoted by a - composite reference --> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" - targetNamespace="http://oasis/tests" - xmlns:sample="http://oasis/tests" - name="TestComposite11"> - - <service name="Service1" promote="Composite11Component1/Service1"> - <interface.java interface="test.Service1"/> - </service> - - <property name="serviceName" type="string"/> - - <component name="Composite11Component1"> - <implementation.java class="test.service1Impl2"/> - <service name="Service1"> - <interface.java interface="test.Service1"/> - </service> - <property name="serviceName" source="$serviceName"/> - <!-- reference is multiplicity 1..1 --> - <reference name="reference1" target="Composite11Component2/Service1"> - <interface.java interface="test.Service1"/> - </reference> - </component> - - <component name="Composite11Component2"> - <implementation.java class="test.service1Impl"/> - <service name="Service1"> - <interface.java interface="test.Service1"/> - </service> - <property name="serviceName">Composite11-C2</property> - </component> - - <reference name="Reference1" promote="Composite11Component1/reference1"> - <interface.java interface="test.Service1"/> - </reference> - -</composite> diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/TestComposite12.composite b/branches/sca-java-1.5/stest/sampleTest/src/main/resources/TestComposite12.composite deleted file mode 100644 index 8619ae175a..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/TestComposite12.composite +++ /dev/null @@ -1,39 +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://oasis/tests" - xmlns:sample="http://oasis/tests" - name="TestComposite12"> - - <service name="Service1" promote="TestComponent1/Service1"> - <interface.java interface="test.Service1"></interface.java> - </service> - - <property name="serviceName" type="string" mustSupply="true"/> - - <component name="TestComponent1"> - <implementation.java class="test.service1Impl"/> - <service name="Service1"> - <interface.java interface="test.Service1"></interface.java> - </service> - <property name="serviceName" source="$serviceName"/> - </component> - -</composite> diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/TestComposite13.composite b/branches/sca-java-1.5/stest/sampleTest/src/main/resources/TestComposite13.composite deleted file mode 100644 index 37247e24fe..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/TestComposite13.composite +++ /dev/null @@ -1,46 +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.
--->
-<!-- A simple composite which provides a single service and no references
- plus a property with a complex type with a type which is an XSD global
- element -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://oasis/tests"
- xmlns:test="http://oasis/tests"
- name="TestComposite13">
-
- <service name="Service1" promote="TestComponent1/Service1">
- <interface.java interface="test.Service1"></interface.java>
- </service>
-
- <property name="serviceName" type="string"/>
-
- <property name="complexType" element="test:globalElement1"/>
-
- <component name="TestComponent1">
- <implementation.java class="test.service1Impl5"/>
- <service name="Service1">
- <interface.java interface="test.Service1"/>
- </service>
- <property name="serviceName" source="$serviceName"/>
- <property name="serviceData1" source="$complexType/firstData"/>
- <property name="serviceData2" source="$complexType/secondData"/>
- </component>
-
-</composite>
diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/TestComposite14.composite b/branches/sca-java-1.5/stest/sampleTest/src/main/resources/TestComposite14.composite deleted file mode 100644 index e62c7f6eaa..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/TestComposite14.composite +++ /dev/null @@ -1,45 +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.
--->
-<!-- A simple composite which provides a single service and no references
- plus a property with a simple type -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://oasis/tests"
- xmlns:test="http://oasis/tests"
- name="TestComposite14">
-
- <service name="Service1" promote="TestComponent1/Service1">
- <interface.java interface="test.Service1"></interface.java>
- </service>
-
- <property name="serviceName" type="string"/>
-
- <property name="simpleType" type="string"/>
-
- <component name="TestComponent1">
- <implementation.java class="test.service1Impl5"/>
- <service name="Service1">
- <interface.java interface="test.Service1"/>
- </service>
- <property name="serviceName" source="$serviceName"/>
- <property name="serviceData1" source="$simpleType"/>
- <property name="serviceData2" source="$simpleType"/>
- </component>
-
-</composite>
diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/TestComposite15.composite b/branches/sca-java-1.5/stest/sampleTest/src/main/resources/TestComposite15.composite deleted file mode 100644 index e85a4ee831..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/TestComposite15.composite +++ /dev/null @@ -1,43 +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.
--->
-<!-- A simple composite which provides a single service and no references,
- where the service is configured with multiple explicit bindings -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://oasis/tests"
- xmlns:sample="http://oasis/tests"
- name="TestComposite15">
-
- <service name="Service1" promote="TestComponent1/Service1">
- <interface.java interface="test.Service1"></interface.java>
- <binding.sca/>
- <binding.ws/>
- </service>
-
- <property name="serviceName" type="string"/>
-
- <component name="TestComponent1">
- <implementation.java class="test.service1Impl"/>
- <service name="Service1">
- <interface.java interface="test.Service1"></interface.java>
- </service>
- <property name="serviceName" source="$serviceName"/>
- </component>
-
-</composite>
diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/TestComposite16.composite b/branches/sca-java-1.5/stest/sampleTest/src/main/resources/TestComposite16.composite deleted file mode 100644 index 25284836f8..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/TestComposite16.composite +++ /dev/null @@ -1,48 +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.
--->
-<!-- A composite which multiple <service/> subelements with the same name and no references -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://oasis/tests"
- xmlns:sample="http://oasis/tests"
- name="TestComposite16">
-
- <service name="Service1" promote="TestComponent1/Service1">
- <interface.java interface="test.Service1"></interface.java>
- </service>
-
- <service name="Service1" promote="TestComponent1/Service1">
- <interface.java interface="test.Service1"></interface.java>
- </service>
-
- <service name="Service2" promote="TestComponent1/Service1">
- <interface.java interface="test.Service1"></interface.java>
- </service>
-
- <property name="serviceName" type="string"/>
-
- <component name="TestComponent1">
- <implementation.java class="test.service1Impl"/>
- <service name="Service1">
- <interface.java interface="test.Service1"></interface.java>
- </service>
- <property name="serviceName" source="$serviceName"/>
- </component>
-
-</composite>
diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/TestComposite17.composite b/branches/sca-java-1.5/stest/sampleTest/src/main/resources/TestComposite17.composite deleted file mode 100644 index 7a562ae237..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/TestComposite17.composite +++ /dev/null @@ -1,46 +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.
--->
-<!-- A composite which has a single service with a @promote attribute
- that does not reference the <service/> of a <component/> within the
- <composite/> and no references -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://oasis/tests"
- xmlns:sample="http://oasis/tests"
- name="TestComposite17">
-
- <service name="Service1" promote="TestComponent1/Service1">
- <interface.java interface="test.Service1"></interface.java>
- </service>
-
- <service name="Service2" promote="SpuriousComponent/SpuriousService">
- <interface.java interface="test.Service1"></interface.java>
- </service>
-
- <property name="serviceName" type="string"/>
-
- <component name="TestComponent1">
- <implementation.java class="test.service1Impl"/>
- <service name="Service1">
- <interface.java interface="test.Service1"></interface.java>
- </service>
- <property name="serviceName" source="$serviceName"/>
- </component>
-
-</composite>
diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/TestComposite18.composite b/branches/sca-java-1.5/stest/sampleTest/src/main/resources/TestComposite18.composite deleted file mode 100644 index 9ffea418db..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/TestComposite18.composite +++ /dev/null @@ -1,42 +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.
--->
-<!-- A composite which has a single service with a declared <interface/>
- that is a compatible subset of the interface of the component service
- declared in the @promote attribute -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://oasis/tests"
- xmlns:sample="http://oasis/tests"
- name="TestComposite18">
-
- <service name="Service1" promote="TestComponent1/Service1Superset">
- <interface.java interface="test.Service1"></interface.java>
- </service>
-
- <property name="serviceName" type="string"/>
-
- <component name="TestComponent1">
- <implementation.java class="test.service1SupersetImpl"/>
- <service name="Service1Superset">
- <interface.java interface="test.Service1Superset"></interface.java>
- </service>
- <property name="serviceName" source="$serviceName"/>
- </component>
-
-</composite>
diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/TestComposite2.composite b/branches/sca-java-1.5/stest/sampleTest/src/main/resources/TestComposite2.composite deleted file mode 100644 index 9b89563a42..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/TestComposite2.composite +++ /dev/null @@ -1,43 +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://oasis/tests" - xmlns:sample="http://oasis/tests" - name="TestComposite2"> - - <service name="Service1" promote="TestComponent1/Service1"> - <interface.java interface="test.Service1"></interface.java> - </service> - - <service name="Service1" promote="TestComponent1/Service1"> - <interface.java interface="test.Service1"></interface.java> - </service> - - <property name="serviceName" type="string"/> - - <component name="TestComponent1"> - <implementation.java class="test.service1Impl"/> - <service name="Service1"> - <interface.java interface="test.Service1"></interface.java> - </service> - <property name="serviceName" source="$serviceName"/> - </component> - -</composite> diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/TestComposite23.composite b/branches/sca-java-1.5/stest/sampleTest/src/main/resources/TestComposite23.composite deleted file mode 100644 index 35bd141aef..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/TestComposite23.composite +++ /dev/null @@ -1,48 +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.
--->
-<!-- An example of a composite which has a single service and
- a single reference with multiplicity 0..1 -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://oasis/tests"
- xmlns:sample="http://oasis/tests"
- name="TestComposite23">
-
- <service name="Service1" promote="TestComponent1/Service1">
- <interface.java interface="test.Service1"/>
- </service>
-
- <property name="serviceName" type="string"/>
-
- <component name="TestComponent1">
- <implementation.java class="test.service1Impl2"/>
- <service name="Service1">
- <interface.java interface="test.Service1"/>
- </service>
- <property name="serviceName" source="$serviceName"/>
- <reference name="reference1" multiplicity="1..1">
- <interface.java interface="test.Service1"/>
- </reference>
- </component>
-
- <reference name="Reference1" promote="TestComponent1/reference1" multiplicity="0..1">
- <interface.java interface="test.Service1"/>
- </reference>
-
-</composite>
diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/TestComposite3.composite b/branches/sca-java-1.5/stest/sampleTest/src/main/resources/TestComposite3.composite deleted file mode 100644 index 506557606f..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/TestComposite3.composite +++ /dev/null @@ -1,49 +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. ---> -<!-- An example of a composite which is invalid because it has two - composite level references with the same @name attribute --> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" - targetNamespace="http://oasis/tests" - xmlns:sample="http://oasis/tests" - name="TestComposite3"> - - <service name="Service1" promote="TestComponent1/Service1"> - <interface.java interface="test.Service1"/> - </service> - - <property name="serviceName" type="string"/> - - <component name="TestComponent1"> - <implementation.java class="test.service1Impl2"/> - <service name="Service1"> - <interface.java interface="test.Service1"/> - </service> - <property name="serviceName" source="$serviceName"/> - </component> - - <reference name="Reference1" promote="TestComponent1/Reference"> - <interface.java interface="test.Service1"/> - </reference> - - <reference name="Reference1" promote="TestComponent1/Reference"> - <interface.java interface="test.Service1"/> - </reference> - -</composite> diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/TestComposite4.composite b/branches/sca-java-1.5/stest/sampleTest/src/main/resources/TestComposite4.composite deleted file mode 100644 index c8f1a4c005..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/TestComposite4.composite +++ /dev/null @@ -1,45 +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. ---> -<!-- An example of a composite which has a single service and - a single reference --> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" - targetNamespace="http://oasis/tests" - xmlns:sample="http://oasis/tests" - name="TestComposite4"> - - <service name="Service1" promote="Composite4Component1/Service1"> - <interface.java interface="test.Service1"/> - </service> - - <property name="serviceName" type="string"/> - - <component name="Composite4Component1"> - <implementation.java class="test.service1Impl2"/> - <service name="Service1"> - <interface.java interface="test.Service1"/> - </service> - <property name="serviceName" source="$serviceName"/> - </component> - - <reference name="Reference1" promote="Composite4Component1/reference1"> - <interface.java interface="test.Service1"/> - </reference> - -</composite> diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/TestComposite5.composite b/branches/sca-java-1.5/stest/sampleTest/src/main/resources/TestComposite5.composite deleted file mode 100644 index b804c58a68..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/TestComposite5.composite +++ /dev/null @@ -1,41 +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 offering a single service, with a modified interface - type --> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" - targetNamespace="http://oasis/tests" - xmlns:sample="http://oasis/tests" - name="TestComposite5"> - - <service name="Service1" promote="TestComponent1/Service1"> - <interface.java interface="test.Service2"></interface.java> - </service> - - <property name="serviceName" type="string"/> - - <component name="TestComponent1"> - <implementation.java class="test.service2Impl"/> - <service name="Service1"> - <interface.java interface="test.Service2"></interface.java> - </service> - <property name="serviceName" source="$serviceName"/> - </component> - -</composite> diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/TestComposite6.composite b/branches/sca-java-1.5/stest/sampleTest/src/main/resources/TestComposite6.composite deleted file mode 100644 index 5c9b9ed0e0..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/TestComposite6.composite +++ /dev/null @@ -1,48 +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. ---> -<!-- An example of a composite which has a single service and - a single reference with multiplicity 1..n --> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" - targetNamespace="http://oasis/tests" - xmlns:sample="http://oasis/tests" - name="TestComposite6"> - - <service name="Service1" promote="TestComponent1/Service1"> - <interface.java interface="test.Service1"/> - </service> - - <property name="serviceName" type="string"/> - - <component name="TestComponent1"> - <implementation.java class="test.service1Impl3"/> - <service name="Service1"> - <interface.java interface="test.Service1"/> - </service> - <property name="serviceName" source="$serviceName"/> - <reference name="reference1" multiplicity="1..n"> - <interface.java interface="test.Service1"/> - </reference> - </component> - - <reference name="Reference1" promote="TestComponent1/reference1" multiplicity="1..n"> - <interface.java interface="test.Service1"/> - </reference> - -</composite> diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/TestComposite7.composite b/branches/sca-java-1.5/stest/sampleTest/src/main/resources/TestComposite7.composite deleted file mode 100644 index e498e15510..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/TestComposite7.composite +++ /dev/null @@ -1,48 +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. ---> -<!-- An example of a composite which has a single service and - a single reference with multiplicity 0..n --> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" - targetNamespace="http://oasis/tests" - xmlns:sample="http://oasis/tests" - name="TestComposite7"> - - <service name="Service1" promote="TestComponent1/Service1"> - <interface.java interface="test.Service1"/> - </service> - - <property name="serviceName" type="string"/> - - <component name="TestComponent1"> - <implementation.java class="test.service1Impl4"/> - <service name="Service1"> - <interface.java interface="test.Service1"/> - </service> - <property name="serviceName" source="$serviceName"/> - <reference name="reference1" multiplicity="0..n"> - <interface.java interface="test.Service1"/> - </reference> - </component> - - <reference name="Reference1" promote="TestComponent1/reference1" multiplicity="0..n"> - <interface.java interface="test.Service1"/> - </reference> - -</composite> diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/TestComposite8.composite b/branches/sca-java-1.5/stest/sampleTest/src/main/resources/TestComposite8.composite deleted file mode 100644 index d5cccf8ee9..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/TestComposite8.composite +++ /dev/null @@ -1,48 +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. ---> -<!-- An example of a composite which has a single service and - a single reference with multiplicity 0..1 --> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" - targetNamespace="http://oasis/tests" - xmlns:sample="http://oasis/tests" - name="TestComposite8"> - - <service name="Service1" promote="TestComponent1/Service1"> - <interface.java interface="test.Service1"/> - </service> - - <property name="serviceName" type="string"/> - - <component name="TestComponent1"> - <implementation.java class="test.service1Impl4"/> - <service name="Service1"> - <interface.java interface="test.Service1"/> - </service> - <property name="serviceName" source="$serviceName"/> - <reference name="reference1" multiplicity="0..n"> - <interface.java interface="test.Service1"/> - </reference> - </component> - - <reference name="Reference1" promote="TestComponent1/reference1" multiplicity="0..1"> - <interface.java interface="test.Service1"/> - </reference> - -</composite> diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/TestComposite9.composite b/branches/sca-java-1.5/stest/sampleTest/src/main/resources/TestComposite9.composite deleted file mode 100644 index 931565aae0..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/TestComposite9.composite +++ /dev/null @@ -1,41 +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 that provides a single service with the extended - Service1Superset interface --> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" - targetNamespace="http://oasis/tests" - xmlns:sample="http://oasis/tests" - name="TestComposite9"> - - <service name="Service1" promote="Composite9Component1/Service1Superset"> - <interface.java interface="test.Service1Superset"></interface.java> - </service> - - <property name="serviceName" type="string"/> - - <component name="Composite9Component1"> - <implementation.java class="test.service1SupersetImpl"/> - <service name="Service1Superset"> - <interface.java interface="test.Service1Superset"></interface.java> - </service> - <property name="serviceName" source="$serviceName"/> - </component> - -</composite> diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/TestDuplicate1.composite b/branches/sca-java-1.5/stest/sampleTest/src/main/resources/TestDuplicate1.composite deleted file mode 100644 index d34ee0300a..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/TestDuplicate1.composite +++ /dev/null @@ -1,41 +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.
--->
-<!-- 1st of a pair of composite files where the composites have duplicated
- names and targetNamespaces -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://oasis/tests"
- xmlns:sample="http://oasis/tests"
- name="DuplicateComposite">
-
- <service name="Service1" promote="TestComponent1/Service1">
- <interface.java interface="test.Service1"></interface.java>
- </service>
-
- <property name="serviceName" type="string"/>
-
- <component name="TestComponent1">
- <implementation.java class="test.service1Impl"/>
- <service name="Service1">
- <interface.java interface="test.Service1"></interface.java>
- </service>
- <property name="serviceName">duplicate1</property>
- </component>
-
-</composite>
diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/TestDuplicate2.composite b/branches/sca-java-1.5/stest/sampleTest/src/main/resources/TestDuplicate2.composite deleted file mode 100644 index d8d4a3ab45..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/TestDuplicate2.composite +++ /dev/null @@ -1,41 +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.
--->
-<!-- 2nd of a pair of composite files where the composites have duplicated
- names and targetNamespaces -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://oasis/tests"
- xmlns:sample="http://oasis/tests"
- name="DuplicateComposite">
-
- <service name="Service1" promote="TestComponent1/Service1">
- <interface.java interface="test.Service1"></interface.java>
- </service>
-
- <property name="serviceName" type="string"/>
-
- <component name="TestComponent1">
- <implementation.java class="test.service1Impl"/>
- <service name="Service1">
- <interface.java interface="test.Service1"></interface.java>
- </service>
- <property name="serviceName">duplicate2</property>
- </component>
-
-</composite>
diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0001.composite b/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0001.composite deleted file mode 100644 index a8864587f3..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0001.composite +++ /dev/null @@ -1,33 +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://oasis/tests" - xmlns:sample="http://oasis/tests" - name="TEST_ASM_0001"> - - <component name="TestClient"> - <implementation.java class="test.ASM_0001_Client"/> - <service name="TestInvocation"> - <interface.java interface="test.TestInvocation"/> - <binding.sca/> - </service> - </component> - -</composite> diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0002.composite b/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0002.composite deleted file mode 100644 index 058bdff522..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0002.composite +++ /dev/null @@ -1,48 +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.
--->
-<!--
- ASM_0002_TestCase tests that component with a single reference can be wired to a single
- component service in the same composite.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://oasis/tests"
- xmlns:tns="http://oasis/tests"
- xmlns:sample="http://oasis/tests"
- name="TEST_ASM_0002">
-
- <component name="TestClient">
- <implementation.composite name="tns:TestClient_0002"/>
- <service name="TestInvocation">
- <interface.java interface="test.TestInvocation"/>
- <binding.ws/>
- </service>
- <reference name="reference1" target="TestComponent1/Service1" />
- <property name="testName">ASM_0002</property>
- </component>
-
- <component name="TestComponent1">
- <implementation.composite name="tns:TestComposite1"/>
- <service name="Service1">
- <interface.java interface="test.Service1"></interface.java>
- </service>
- <property name="serviceName">service1</property>
- </component>
-
-</composite>
diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0003.composite b/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0003.composite deleted file mode 100644 index d3b4e51ef7..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0003.composite +++ /dev/null @@ -1,64 +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.
--->
-<!-- Test case that verifies that an implementation with a reference with multiplicity 1..n can
- be validly wired to 3 target services and invoke them all correctly.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://oasis/tests"
- xmlns:tns="http://oasis/tests"
- xmlns:sample="http://oasis/tests"
- name="TEST_ASM_0003">
-
- <component name="TestClient">
- <implementation.composite name="tns:TestClient_0003"/>
- <service name="TestInvocation">
- <interface.java interface="test.TestInvocation"/>
- <binding.ws/>
- </service>
- <reference name="reference1" target="TestComponent1/Service1 TestComponent2/Service1 TestComponent3/Service1" />
- <property name="testName">ASM_0003</property>
- </component>
-
-
- <component name="TestComponent1">
- <implementation.composite name="tns:TestComposite1"/>
- <service name="Service1">
- <interface.java interface="test.Service1"></interface.java>
- </service>
- <property name="serviceName">service1</property>
- </component>
-
- <component name="TestComponent2">
- <implementation.composite name="tns:TestComposite1"/>
- <service name="Service1">
- <interface.java interface="test.Service1"></interface.java>
- </service>
- <property name="serviceName">service2</property>
- </component>
-
- <component name="TestComponent3">
- <implementation.composite name="tns:TestComposite1"/>
- <service name="Service1">
- <interface.java interface="test.Service1"></interface.java>
- </service>
- <property name="serviceName">service3</property>
- </component>
-
-</composite>
diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0004.composite b/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0004.composite deleted file mode 100644 index 9f586ddbcf..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0004.composite +++ /dev/null @@ -1,62 +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. ---> -<!-- Test that verifies that a reference with multiplicity 1..1 which is provided - with multiple wire targets in the component configuration is marked as an error --> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" - targetNamespace="http://oasis/tests" - xmlns:tns="http://oasis/tests" - xmlns:sample="http://oasis/tests" - name="TEST_ASM_0004"> - - <component name="TestClient"> - <implementation.composite name="tns:TestClient_0002"/> - <service name="TestInvocation"> - <interface.java interface="test.TestInvocation"/> - <binding.ws/> - </service> - <reference name="reference1" target="TestComponent1/Service1 TestComponent2/Service1 TestComponent3/Service1" /> - <property name="testName">ASM_0004</property> - </component> - - <component name="TestComponent1"> - <implementation.composite name="tns:TestComposite1"/> - <service name="Service1"> - <interface.java interface="test.Service1"></interface.java> - </service> - <property name="serviceName">service1</property> - </component> - - <component name="TestComponent2"> - <implementation.composite name="tns:TestComposite1"/> - <service name="Service1"> - <interface.java interface="test.Service1"></interface.java> - </service> - <property name="serviceName">service2</property> - </component> - - <component name="TestComponent3"> - <implementation.composite name="tns:TestComposite1"/> - <service name="Service1"> - <interface.java interface="test.Service1"></interface.java> - </service> - <property name="serviceName">service3</property> - </component> - -</composite> diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0005.composite b/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0005.composite deleted file mode 100644 index 1bc61089a7..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0005.composite +++ /dev/null @@ -1,49 +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. ---> -<!-- Test that a component with multiple <service/> elements must have unique @name attributes for each - service - negative test that has a component with 2 services with the same name --> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" - targetNamespace="http://oasis/tests" - xmlns:tns="http://oasis/tests" - xmlns:sample="http://oasis/tests" - name="TEST_ASM_0005"> - - <component name="TestClient"> - <implementation.composite name="tns:TestClient_0002"/> - <service name="TestInvocation"> - <interface.java interface="test.TestInvocation"/> - <binding.ws/> - </service> - <reference name="reference1" target="TestComponent1/Service1" /> - <property name="testName">ASM_0005</property> - </component> - - <component name="TestComponent1"> - <implementation.composite name="tns:TestComposite2"/> - <service name="Service1"> - <interface.java interface="test.Service1"></interface.java> - </service> - <service name="Service1"> - <interface.java interface="test.Service1"></interface.java> - </service> - <property name="serviceName">service1</property> - </component> - -</composite> diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0006.composite b/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0006.composite deleted file mode 100644 index 2705d967a2..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0006.composite +++ /dev/null @@ -1,47 +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. ---> -<!-- Test checks that the @name attribute of a <service/> - element of a <component/> matches the @name attribute of a <service/> element of the - componentType of the <implementation/> used by the <component/> --> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" - targetNamespace="http://oasis/tests" - xmlns:tns="http://oasis/tests" - xmlns:sample="http://oasis/tests" - name="TEST_ASM_0006"> - - <component name="TestClient"> - <implementation.composite name="tns:TestClient_0002"/> - <service name="TestInvocation"> - <interface.java interface="test.TestInvocation"/> - <binding.ws/> - </service> - <reference name="reference1" target="TestComponent1/InvalidName" /> - <property name="testName">ASM_0005</property> - </component> - - <component name="TestComponent1"> - <implementation.composite name="tns:TestComposite1"/> - <service name="InvalidName"> - <interface.java interface="test.Service1"></interface.java> - </service> - <property name="serviceName">service1</property> - </component> - -</composite> diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0007.composite b/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0007.composite deleted file mode 100644 index 521d28b27d..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0007.composite +++ /dev/null @@ -1,60 +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. ---> -<!-- Test that the @name attribute of a <reference/> element of a - component is not equal to the @name attribute of any other - <reference/> element of the same component --> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" - targetNamespace="http://oasis/tests" - xmlns:tns="http://oasis/tests" - xmlns:sample="http://oasis/tests" - name="TEST_ASM_0007"> - - <component name="TestClient"> - <implementation.composite name="tns:TestClient_0002"/> - <service name="TestInvocation"> - <interface.java interface="test.TestInvocation"/> - <binding.ws/> - </service> - <reference name="reference1" target="TestComponent1/Service1" /> - <property name="testName">ASM_0005</property> - </component> - - <component name="TestComponent1"> - <implementation.composite name="tns:TestComposite3"/> - <service name="Service1"> - <interface.java interface="test.Service1"/> - </service> - <property name="serviceName">service1</property> - <!-- Two references with the same name - the implementation also has - two references of the same name so that the component type - matches the configuration of the component --> - <reference name="Reference1" target="TestComponent2/Service1"/> - <reference name="Reference1" target="TestComponent2/Service1"/> - </component> - - <component name="TestComponent2"> - <implementation.composite name="tns:TestComposite1"/> - <service name="Service1"> - <interface.java interface="test.Service1"/> - </service> - <property name="serviceName">service2</property> - </component> - -</composite> diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0008.composite b/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0008.composite deleted file mode 100644 index 618d090bcb..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0008.composite +++ /dev/null @@ -1,61 +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. ---> -<!-- Tests that the @name attribute of a <reference/> element of a - component is equal to the @name attribute of a <reference/> - element of the <componentType/> of the <implementation/> of - the <component/> - negative test in that here there is a - reference @name which does NOT match a reference name in the - component type --> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" - targetNamespace="http://oasis/tests" - xmlns:tns="http://oasis/tests" - xmlns:sample="http://oasis/tests" - name="TEST_ASM_0008"> - - <component name="TestClient"> - <implementation.composite name="tns:TestClient_0002"/> - <service name="TestInvocation"> - <interface.java interface="test.TestInvocation"/> - <binding.ws/> - </service> - <reference name="reference1" target="TestComponent1/Service1" /> - <property name="testName">ASM_0005</property> - </component> - - <component name="TestComponent1"> - <implementation.composite name="tns:TestComposite4"/> - <service name="Service1"> - <interface.java interface="test.Service1"/> - </service> - <property name="serviceName">service1</property> - <!-- This reference has a name that does not match the name of a - Reference in the implementation --> - <reference name="InvalidName" target="TestComponent2/Service1"/> - </component> - - <component name="TestComponent2"> - <implementation.composite name="tns:TestComposite1"/> - <service name="Service1"> - <interface.java interface="test.Service1"/> - </service> - <property name="serviceName">service2</property> - </component> - -</composite> diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0009.composite b/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0009.composite deleted file mode 100644 index a161bdc36f..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0009.composite +++ /dev/null @@ -1,63 +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. ---> -<!-- Tests that the @name attribute of a <component/> element - in a <composite/> is not the same as the @name - attribute of a second component in the same <composite/> --> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" - targetNamespace="http://oasis/tests" - xmlns:tns="http://oasis/tests" - xmlns:sample="http://oasis/tests" - name="TEST_ASM_0009"> - - <component name="TestClient"> - <implementation.composite name="tns:TestClient_0002"/> - <service name="TestInvocation"> - <interface.java interface="test.TestInvocation"/> - <binding.ws/> - </service> - <reference name="reference1" target="TestComponent1/Service1" /> - <property name="testName">ASM_0009</property> - </component> - - <component name="TestComponent1"> - <implementation.composite name="tns:TestComposite1"/> - <service name="Service1"> - <interface.java interface="test.Service1"/> - </service> - <property name="serviceName">service1</property> - </component> - - <component name="TestComponent1"> - <implementation.composite name="tns:TestComposite1"/> - <service name="Service1"> - <interface.java interface="test.Service1"/> - </service> - <property name="serviceName">service2</property> - </component> - - <component name="TestComponent1"> - <implementation.composite name="tns:TestComposite1"/> - <service name="Service1"> - <interface.java interface="test.Service1"/> - </service> - <property name="serviceName">service2</property> - </component> - -</composite> diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0010.composite b/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0010.composite deleted file mode 100644 index d753742383..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0010.composite +++ /dev/null @@ -1,51 +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. ---> -<!-- Tests interface specified by the <interface/> child element of a - <service/> element is a compatible subset of the interface declared - for the <service/> element with the same @name attribute in the - <componentType/> of the <implementation/> of the <component/> - parent of the <service/> --> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" - targetNamespace="http://oasis/tests" - xmlns:tns="http://oasis/tests" - xmlns:sample="http://oasis/tests" - name="TEST_ASM_0010"> - - <component name="TestClient"> - <implementation.composite name="tns:TestClient_0002"/> - <service name="TestInvocation"> - <interface.java interface="test.TestInvocation"/> - <binding.ws/> - </service> - <reference name="reference1" target="TestComponent1/Service1" /> - <property name="testName">ASM_0010</property> - </component> - - <component name="TestComponent1"> - <implementation.composite name="tns:TestComposite5"/> - <!-- This service declares interface Service1 while the implementation offers - Service2, which is not compatible with Service1 --> - <service name="Service1"> - <interface.java interface="test.Service1"/> - </service> - <property name="serviceName">service1</property> - </component> - -</composite> diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0011.composite b/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0011.composite deleted file mode 100644 index 50c5bcc7b7..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0011.composite +++ /dev/null @@ -1,61 +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. ---> -<!-- Tests the multiplicity of a <reference/> element of a <component/> - can be 1..1 where the multiplicity of the equivalent <reference/> - element in the <componentType/> of the <implementation/> of the - <component/> is 1..n --> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" - targetNamespace="http://oasis/tests" - xmlns:tns="http://oasis/tests" - xmlns:sample="http://oasis/tests" - name="TEST_ASM_0011"> - - <component name="TestClient"> - <implementation.composite name="tns:TestClient_0002"/> - <service name="TestInvocation"> - <interface.java interface="test.TestInvocation"/> - <binding.ws/> - </service> - <reference name="reference1" target="TestComponent1/Service1" /> - <property name="testName">ASM_0011</property> - </component> - - <component name="TestComponent1"> - <implementation.composite name="tns:TestComposite6"/> - <service name="Service1"> - <interface.java interface="test.Service1"/> - </service> - <property name="serviceName">service1</property> - <!-- The multiplicity declared for this reference is 1..1 while the multiplicity of - the corresponding reference on the componentType of the implementation is 1..n --> - <reference name="Reference1" target="TestComponent2/Service1" multiplicity="1..1"> - <interface.java interface="test.Service1"/> - </reference> - </component> - - <component name="TestComponent2"> - <implementation.composite name="tns:TestComposite1"/> - <service name="Service1"> - <interface.java interface="test.Service1"></interface.java> - </service> - <property name="serviceName">service2</property> - </component> - -</composite> diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0012.composite b/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0012.composite deleted file mode 100644 index 586aec454f..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0012.composite +++ /dev/null @@ -1,101 +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. ---> -<!-- Tests that the the multiplicity - of a <reference/> element of a <component/> can be any one of 0..1, - 1..1, 0..n, 1..n where the multiplicity of the equivalent <reference/> - element in the <componentType/> of the <implementation/> of the - <component/> is 0..n --> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" - targetNamespace="http://oasis/tests" - xmlns:tns="http://oasis/tests" - xmlns:sample="http://oasis/tests" - name="TEST_ASM_0012"> - - <component name="TestClient"> - <implementation.composite name="tns:TestClient_0002"/> - <service name="TestInvocation"> - <interface.java interface="test.TestInvocation"/> - <binding.ws/> - </service> - <reference name="reference1" target="TestComponent1/Service1" /> - <property name="testName">ASM_0012</property> - </component> - - <component name="TestComponent1"> - <implementation.composite name="tns:TestComposite7"/> - <service name="Service1"> - <interface.java interface="test.Service1"/> - </service> - <property name="serviceName">service1</property> - <!-- The multiplicity declared for this reference is 0..1 while the multiplicity of - the corresponding reference on the componentType of the implementation is 0..n --> - <reference name="Reference1" target="TestComponent2/Service1" multiplicity="0..1"> - <interface.java interface="test.Service1"/> - </reference> - </component> - - <component name="TestComponent2"> - <implementation.composite name="tns:TestComposite7"/> - <service name="Service1"> - <interface.java interface="test.Service1"/> - </service> - <property name="serviceName">service2</property> - <!-- The multiplicity declared for this reference is 1..1 while the multiplicity of - the corresponding reference on the componentType of the implementation is 0..n --> - <reference name="Reference1" target="TestComponent3/Service1" multiplicity="1..1"> - <interface.java interface="test.Service1"/> - </reference> - </component> - - <component name="TestComponent3"> - <implementation.composite name="tns:TestComposite7"/> - <service name="Service1"> - <interface.java interface="test.Service1"/> - </service> - <property name="serviceName">service3</property> - <!-- The multiplicity declared for this reference is 0..n while the multiplicity of - the corresponding reference on the componentType of the implementation is 0..n --> - <reference name="Reference1" target="TestComponent4/Service1" multiplicity="0..n"> - <interface.java interface="test.Service1"/> - </reference> - </component> - - <component name="TestComponent4"> - <implementation.composite name="tns:TestComposite7"/> - <service name="Service1"> - <interface.java interface="test.Service1"/> - </service> - <property name="serviceName">service4</property> - <!-- The multiplicity declared for this reference is 1..n while the multiplicity of - the corresponding reference on the componentType of the implementation is 0..n --> - <reference name="Reference1" target="TestComponent5/Service1" multiplicity="1..n"> - <interface.java interface="test.Service1"/> - </reference> - </component> - - <component name="TestComponent5"> - <implementation.composite name="tns:TestComposite1"/> - <service name="Service1"> - <interface.java interface="test.Service1"></interface.java> - </service> - <property name="serviceName">service5</property> - </component> - -</composite> diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0013.composite b/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0013.composite deleted file mode 100644 index 2fb5f3a969..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0013.composite +++ /dev/null @@ -1,62 +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. ---> -<!-- Tests that the the multiplicity - of a <reference/> element of a <component/> is - 1..1 where the multiplicity of the equivalent <reference/> - element in the <componentType/> of the <implementation/> of the - <component/> is 1..1 --> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" - targetNamespace="http://oasis/tests" - xmlns:tns="http://oasis/tests" - xmlns:sample="http://oasis/tests" - name="TEST_ASM_0013"> - - <component name="TestClient"> - <implementation.composite name="tns:TestClient_0002"/> - <service name="TestInvocation"> - <interface.java interface="test.TestInvocation"/> - <binding.ws/> - </service> - <reference name="reference1" target="TestComponent1/Service1" /> - <property name="testName">ASM_0013</property> - </component> - - <component name="TestComponent1"> - <implementation.composite name="tns:TestComposite4"/> - <service name="Service1"> - <interface.java interface="test.Service1"/> - </service> - <property name="serviceName">service1</property> - <!-- The multiplicity declared for this reference is 1..1 while the multiplicity of - the corresponding reference on the componentType of the implementation is 1..1 --> - <reference name="Reference1" target="TestComponent2/Service1" multiplicity="1..1"> - <interface.java interface="test.Service1"/> - </reference> - </component> - - <component name="TestComponent2"> - <implementation.composite name="tns:TestComposite1"/> - <service name="Service1"> - <interface.java interface="test.Service1"></interface.java> - </service> - <property name="serviceName">service2</property> - </component> - -</composite> diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0014.composite b/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0014.composite deleted file mode 100644 index 09082d724b..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0014.composite +++ /dev/null @@ -1,61 +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. ---> -<!-- Tests that the multiplicity of a <reference/> element of a - <component/> is 0..n where the multiplicity of the equivalent - <reference/> element in the <componentType/> of the - <implementation/> of the <component/> is 1..1 --> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" - targetNamespace="http://oasis/tests" - xmlns:tns="http://oasis/tests" - xmlns:sample="http://oasis/tests" - name="TEST_ASM_0014"> - - <component name="TestClient"> - <implementation.composite name="tns:TestClient_0002"/> - <service name="TestInvocation"> - <interface.java interface="test.TestInvocation"/> - <binding.ws/> - </service> - <reference name="reference1" target="TestComponent1/Service1" /> - <property name="testName">ASM_0014</property> - </component> - - <component name="TestComponent1"> - <implementation.composite name="tns:TestComposite4"/> - <service name="Service1"> - <interface.java interface="test.Service1"/> - </service> - <property name="serviceName">service1</property> - <!-- The multiplicity declared for this reference is 0..n while the multiplicity of - the corresponding reference on the componentType of the implementation is 1..1 --> - <reference name="Reference1" target="TestComponent2/Service1" multiplicity="0..n"> - <interface.java interface="test.Service1"/> - </reference> - </component> - - <component name="TestComponent2"> - <implementation.composite name="tns:TestComposite1"/> - <service name="Service1"> - <interface.java interface="test.Service1"></interface.java> - </service> - <property name="serviceName">service2</property> - </component> - -</composite> diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0015.composite b/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0015.composite deleted file mode 100644 index 53c14c2248..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0015.composite +++ /dev/null @@ -1,62 +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. ---> -<!-- Tests that the the multiplicity - of a <reference/> element of a <component/> is - 1..1 where the multiplicity of the equivalent <reference/> - element in the <componentType/> of the <implementation/> of the - <component/> is 0..1 --> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" - targetNamespace="http://oasis/tests" - xmlns:tns="http://oasis/tests" - xmlns:sample="http://oasis/tests" - name="TEST_ASM_0015"> - - <component name="TestClient"> - <implementation.composite name="tns:TestClient_0002"/> - <service name="TestInvocation"> - <interface.java interface="test.TestInvocation"/> - <binding.ws/> - </service> - <reference name="reference1" target="TestComponent1/Service1" /> - <property name="testName">ASM_0015</property> - </component> - - <component name="TestComponent1"> - <implementation.composite name="tns:TestComposite8"/> - <service name="Service1"> - <interface.java interface="test.Service1"/> - </service> - <property name="serviceName">service1</property> - <!-- The multiplicity declared for this reference is 1..1 while the multiplicity of - the corresponding reference on the componentType of the implementation is 0..1 --> - <reference name="Reference1" target="TestComponent2/Service1" multiplicity="1..1"> - <interface.java interface="test.Service1"/> - </reference> - </component> - - <component name="TestComponent2"> - <implementation.composite name="tns:TestComposite1"/> - <service name="Service1"> - <interface.java interface="test.Service1"></interface.java> - </service> - <property name="serviceName">service2</property> - </component> - -</composite> diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0016.composite b/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0016.composite deleted file mode 100644 index 28503194b6..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0016.composite +++ /dev/null @@ -1,61 +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. ---> -<!-- Tests that the interface declared by the <interface/> child element - of a <reference/> of a <component/> is a compatible superset of the - interface declared on the corresponding <reference/> of the - componentType of the <implementation/> of the <component/> --> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" - targetNamespace="http://oasis/tests" - xmlns:tns="http://oasis/tests" - xmlns:sample="http://oasis/tests" - name="TEST_ASM_0016"> - - <component name="TestClient"> - <implementation.composite name="tns:TestClient_0002"/> - <service name="TestInvocation"> - <interface.java interface="test.TestInvocation"/> - <binding.ws/> - </service> - <reference name="reference1" target="TestComponent1/Service1" /> - <property name="testName">ASM_0016</property> - </component> - - <component name="TestComponent1"> - <implementation.composite name="tns:TestComposite4"/> - <service name="Service1"> - <interface.java interface="test.Service1"/> - </service> - <property name="serviceName">service1</property> - <reference name="Reference1" target="TestComponent2/Service1"> - <!-- Component type has the interface = test.Service1 - here - we use an interface that is a superset --> - <interface.java interface="test.Service1Superset"/> - </reference> - </component> - - <component name="TestComponent2"> - <implementation.composite name="tns:TestComposite9"/> - <service name="Service1"> - <interface.java interface="test.Service1Superset"></interface.java> - </service> - <property name="serviceName">service2</property> - </component> - -</composite> diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0017.composite b/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0017.composite deleted file mode 100644 index 7f7fdf8f25..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0017.composite +++ /dev/null @@ -1,61 +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. ---> -<!-- Tests that where a <reference/> of a <component/> has no <binding/> - child element, but the corresponding <reference/> element in the - componentType does have a binding child element, the <binding/> - from the componentType is used for the reference --> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" - targetNamespace="http://oasis/tests" - xmlns:tns="http://oasis/tests" - xmlns:sample="http://oasis/tests" - name="TEST_ASM_0017"> - - <component name="TestClient"> - <implementation.composite name="tns:TestClient_0002"/> - <service name="TestInvocation"> - <interface.java interface="test.TestInvocation"/> - <binding.ws/> - </service> - <reference name="reference1" target="TestComponent1/Service1" /> - <property name="testName">ASM_0017</property> - </component> - - <component name="TestComponent1"> - <implementation.composite name="tns:TestComposite10"/> - <service name="Service1"> - <interface.java interface="test.Service1"/> - </service> - <property name="serviceName">service1</property> - <!-- ComponentType has a binding for this reference that - identifies the target for this reference --> - <reference name="Reference1"> - <interface.java interface="test.Service1"/> - </reference> - </component> - - <component name="TestComponent2"> - <implementation.composite name="tns:TestComposite1"/> - <service name="Service1"> - <interface.java interface="test.Service1"></interface.java> - </service> - <property name="serviceName">service2</property> - </component> - -</composite> diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0018.composite b/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0018.composite deleted file mode 100644 index af18c09162..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0018.composite +++ /dev/null @@ -1,72 +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. ---> -<!-- Tests that where a <reference/> of a <component/> has a <binding/> - child element and the corresponding <reference/> element in the - componentType has a binding child element, the <binding/> - from the <reference/> is used for the reference --> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" - targetNamespace="http://oasis/tests" - xmlns:tns="http://oasis/tests" - xmlns:sample="http://oasis/tests" - name="TEST_ASM_0018"> - - <component name="TestClient"> - <implementation.composite name="tns:TestClient_0002"/> - <service name="TestInvocation"> - <interface.java interface="test.TestInvocation"/> - <binding.ws/> - </service> - <reference name="reference1" target="TestComponent1/Service1" /> - <property name="testName">ASM_0018</property> - </component> - - <component name="TestComponent1"> - <implementation.composite name="tns:TestComposite10"/> - <service name="Service1"> - <interface.java interface="test.Service1"/> - </service> - <property name="serviceName">service1</property> - <!-- ComponentType has a binding for this reference that - identifies a target for this reference --> - <reference name="Reference1"> - <interface.java interface="test.Service1"/> - <binding.sca uri="TestComponent3/Service1"/> - </reference> - </component> - - <!-- This component is the target identified by the Component Type --> - <component name="TestComponent2"> - <implementation.composite name="tns:TestComposite1"/> - <service name="Service1"> - <interface.java interface="test.Service1"></interface.java> - </service> - <property name="serviceName">service2</property> - </component> - - <!-- This component is the target identified by the reference --> - <component name="TestComponent3"> - <implementation.composite name="tns:TestComposite1"/> - <service name="Service1"> - <interface.java interface="test.Service1"></interface.java> - </service> - <property name="serviceName">service3</property> - </component> - -</composite> diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0019.composite b/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0019.composite deleted file mode 100644 index f5cfc652f7..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0019.composite +++ /dev/null @@ -1,69 +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. ---> -<!-- Tests that where a <reference/> of a <component/> has autowire=true - and also has target identifying a single target service that the - reference is wired only to the single service identified by the - target attribute --> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" - targetNamespace="http://oasis/tests" - xmlns:tns="http://oasis/tests" - xmlns:sample="http://oasis/tests" - name="TEST_ASM_0019"> - - <component name="TestClient"> - <implementation.composite name="tns:TestClient_0002"/> - <service name="TestInvocation"> - <interface.java interface="test.TestInvocation"/> - <binding.ws/> - </service> - <reference name="reference1" target="TestComponent1/Service1" /> - <property name="testName">ASM_0019</property> - </component> - - <component name="TestComponent1"> - <implementation.composite name="tns:TestComposite7"/> - <service name="Service1"> - <interface.java interface="test.Service1"/> - </service> - <property name="serviceName">service1</property> - <reference name="Reference1" autowire="true" target="TestComponent3/Service1"> - <interface.java interface="test.Service1"/> - </reference> - </component> - - <!-- This component is the target identified by the Component Type --> - <component name="TestComponent2"> - <implementation.composite name="tns:TestComposite1"/> - <service name="Service1"> - <interface.java interface="test.Service1"></interface.java> - </service> - <property name="serviceName">service2</property> - </component> - - <!-- This component is the target identified by the reference --> - <component name="TestComponent3"> - <implementation.composite name="tns:TestComposite1"/> - <service name="Service1"> - <interface.java interface="test.Service1"></interface.java> - </service> - <property name="serviceName">service3</property> - </component> - -</composite> diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0020.composite b/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0020.composite deleted file mode 100644 index e1ab046081..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0020.composite +++ /dev/null @@ -1,71 +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. ---> -<!-- Tests that where a <reference/> of a <component/> has - @autowire=true and where there is also a single <wire/> element - which as that <reference/> as its source that the reference is - wired only to the single service identified by the <wire/> element --> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" - targetNamespace="http://oasis/tests" - xmlns:tns="http://oasis/tests" - xmlns:sample="http://oasis/tests" - name="TEST_ASM_0020"> - - <component name="TestClient"> - <implementation.composite name="tns:TestClient_0002"/> - <service name="TestInvocation"> - <interface.java interface="test.TestInvocation"/> - <binding.ws/> - </service> - <reference name="reference1" target="TestComponent1/Service1" /> - <property name="testName">ASM_0020</property> - </component> - - <component name="TestComponent1"> - <implementation.composite name="tns:TestComposite7"/> - <service name="Service1"> - <interface.java interface="test.Service1"/> - </service> - <property name="serviceName">service1</property> - <reference name="Reference1" autowire="true"> - <interface.java interface="test.Service1"/> - </reference> - </component> - - <wire source="TestComponent1/Reference1" target="TestComponent3/Service1"/> - - <!-- This component is the target identified by the Component Type --> - <component name="TestComponent2"> - <implementation.composite name="tns:TestComposite1"/> - <service name="Service1"> - <interface.java interface="test.Service1"></interface.java> - </service> - <property name="serviceName">service2</property> - </component> - - <!-- This component is the target identified by the reference --> - <component name="TestComponent3"> - <implementation.composite name="tns:TestComposite1"/> - <service name="Service1"> - <interface.java interface="test.Service1"></interface.java> - </service> - <property name="serviceName">service3</property> - </component> - -</composite> diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0021.composite b/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0021.composite deleted file mode 100644 index 1234571493..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0021.composite +++ /dev/null @@ -1,70 +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. ---> -<!-- Tests that where a <reference/> of a <component/> has @autowire=true - and where the <reference/> has a <binding/> child element which - declares a single target service, the reference is wired only to - the single service identified by the <wire/> element --> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" - targetNamespace="http://oasis/tests" - xmlns:tns="http://oasis/tests" - xmlns:sample="http://oasis/tests" - name="TEST_ASM_0021"> - - <component name="TestClient"> - <implementation.composite name="tns:TestClient_0002"/> - <service name="TestInvocation"> - <interface.java interface="test.TestInvocation"/> - <binding.ws/> - </service> - <reference name="reference1" target="TestComponent1/Service1" /> - <property name="testName">ASM_0021</property> - </component> - - <component name="TestComponent1"> - <implementation.composite name="tns:TestComposite7"/> - <service name="Service1"> - <interface.java interface="test.Service1"/> - </service> - <property name="serviceName">service1</property> - <reference name="Reference1" autowire="true"> - <interface.java interface="test.Service1"/> - <binding.sca uri="TestComponent3/Service1"/> - </reference> - </component> - - <!-- This component is the target identified by the Component Type --> - <component name="TestComponent2"> - <implementation.composite name="tns:TestComposite1"/> - <service name="Service1"> - <interface.java interface="test.Service1"></interface.java> - </service> - <property name="serviceName">service2</property> - </component> - - <!-- This component is the target identified by the reference --> - <component name="TestComponent3"> - <implementation.composite name="tns:TestComposite1"/> - <service name="Service1"> - <interface.java interface="test.Service1"></interface.java> - </service> - <property name="serviceName">service3</property> - </component> - -</composite> diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0022.composite b/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0022.composite deleted file mode 100644 index b32ecf1dba..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0022.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. ---> -<!-- Tests that where a <component/> <reference/> with multiplicity=0..1 - is unwired (by any means) that the component executes correctly --> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" - targetNamespace="http://oasis/tests" - xmlns:tns="http://oasis/tests" - xmlns:sample="http://oasis/tests" - name="TEST_ASM_0022"> - - <component name="TestClient"> - <implementation.composite name="tns:TestClient_0002"/> - <service name="TestInvocation"> - <interface.java interface="test.TestInvocation"/> - <binding.ws/> - </service> - <reference name="reference1" target="TestComponent1/Service1" /> - <property name="testName">ASM_0022</property> - </component> - - <component name="TestComponent1"> - <implementation.composite name="tns:TestComposite8"/> - <service name="Service1"> - <interface.java interface="test.Service1"/> - </service> - <property name="serviceName">service1</property> - <!-- Reference is 0..1 and is deliberately left unwired --> - <reference name="Reference1"> - <interface.java interface="test.Service1"/> - </reference> - </component> - -</composite> diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0023.composite b/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0023.composite deleted file mode 100644 index df781e4408..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0023.composite +++ /dev/null @@ -1,60 +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. ---> -<!-- Tests that where a <component/> <reference/> with multiplicity=1..1 - is wired to a component service in the same composite and is also - promoted by a <composite/> <reference/> which is wired to a target - service by a component using the <composite/> as its implementation, - that this is an error --> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" - targetNamespace="http://oasis/tests" - xmlns:tns="http://oasis/tests" - xmlns:sample="http://oasis/tests" - name="TEST_ASM_0023"> - - <component name="TestClient"> - <implementation.composite name="tns:TestClient_0002"/> - <service name="TestInvocation"> - <interface.java interface="test.TestInvocation"/> - <binding.ws/> - </service> - <reference name="reference1" target="TestComponent1/Service1" /> - <property name="testName">ASM_0023</property> - </component> - - <component name="TestComponent1"> - <implementation.composite name="tns:TestComposite11"/> - <service name="Service1"> - <interface.java interface="test.Service1"/> - </service> - <property name="serviceName">service1</property> - <reference name="Reference1" target="TestComponent2/Service1"> - <interface.java interface="test.Service1"/> - </reference> - </component> - - <component name="TestComponent2"> - <implementation.composite name="tns:TestComposite1"/> - <service name="Service1"> - <interface.java interface="test.Service1"></interface.java> - </service> - <property name="serviceName">service2</property> - </component> - -</composite> diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0024.composite b/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0024.composite deleted file mode 100644 index 6859c22502..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0024.composite +++ /dev/null @@ -1,60 +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.
--->
-<!-- Tests that where a <component/> <reference/> has @target set to
- some service, that the reference can have no child <binding/> elements -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://oasis/tests"
- xmlns:tns="http://oasis/tests"
- xmlns:sample="http://oasis/tests"
- name="TEST_ASM_0024">
-
- <component name="TestClient">
- <implementation.composite name="tns:TestClient_0002"/>
- <service name="TestInvocation">
- <interface.java interface="test.TestInvocation"/>
- <binding.ws/>
- </service>
- <reference name="reference1" target="TestComponent1/Service1" />
- <property name="testName">ASM_0024</property>
- </component>
-
- <component name="TestComponent1">
- <implementation.composite name="tns:TestComposite4"/>
- <service name="Service1">
- <interface.java interface="test.Service1"/>
- </service>
- <property name="serviceName">service1</property>
- <reference name="Reference1" >
- <interface.java interface="test.Service1" target="TestComponent2/Service1"/>
- <!--A binding which contradicts the @target attribute -->
- <binding.ws uri="http://localhost:8080/TestComponent2"/>
- </reference>
- </component>
-
- <component name="TestComponent2">
- <implementation.composite name="tns:TestComposite1"/>
- <service name="Service1">
- <interface.java interface="test.Service1"/>
- <binding.ws/>
- </service>
- <property name="serviceName">service2</property>
- </component>
-
-</composite>
diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0025.composite b/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0025.composite deleted file mode 100644 index 92c5e3189f..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0025.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.
--->
-<!-- Tests that where a <component/> <property/> has its value set by means
- of a child <value/> element, that the type of the <value/> element matches
- the type declared for the <property/> element -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://oasis/tests"
- xmlns:tns="http://oasis/tests"
- xmlns:test="http://oasis/tests"
- name="TEST_ASM_0025">
-
- <component name="TestClient">
- <implementation.composite name="tns:TestClient_0002"/>
- <service name="TestInvocation">
- <interface.java interface="test.TestInvocation"/>
- <binding.ws/>
- </service>
- <reference name="reference1" target="TestComponent1/Service1" />
- <property name="testName">ASM_0025</property>
- </component>
-
- <component name="TestComponent1">
- <implementation.composite name="tns:TestComposite12"/>
- <service name="Service1">
- <interface.java interface="test.Service1"/>
- </service>
- <!-- Property with complex type with a value declared using a <value/> subelement -->
- <property name="complexType" type="test:ComplexType1">
- <ComplexType1Value type="test:ComplexType1">
- <test:firstData>complex1</test:firstData>
- <test:secondData>complex2</test:secondData>
- </ComplexType1Value>
- </property>
- <property name="serviceName">service1</property>
- </component>
-
-</composite>
diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0026.composite b/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0026.composite deleted file mode 100644 index 3c5a441899..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0026.composite +++ /dev/null @@ -1,57 +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.
--->
-<!-- Tests that where a <component/> <property/> has its value set by means
- of a child element that is NOT a <value/> element, that a) the type of
- the <property/> element is declared as an XML Schema global element by
- its @element attribute and that the child element is an instance of that
- global element -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://oasis/tests"
- xmlns:tns="http://oasis/tests"
- xmlns:test="http://oasis/tests"
- name="TEST_ASM_0026">
-
- <component name="TestClient">
- <implementation.composite name="tns:TestClient_0002"/>
- <service name="TestInvocation">
- <interface.java interface="test.TestInvocation"/>
- <binding.ws/>
- </service>
- <reference name="reference1" target="TestComponent1/Service1" />
- <property name="testName">ASM_0026</property>
- </component>
-
- <component name="TestComponent1">
- <implementation.composite name="tns:TestComposite13"/>
- <service name="Service1">
- <interface.java interface="test.Service1"/>
- </service>
- <property name="serviceName">service1</property>
- <!-- Property with complex type with a value declared using a subelement
- with the correct XSD global element type -->
- <property name="complexType" element="test:globalElement1">
- <test:globalElement1>
- <firstData>complex1</firstData>
- <secondData>complex2</secondData>
- </test:globalElement1>
- </property>
- </component>
-
-</composite>
diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0027.composite b/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0027.composite deleted file mode 100644 index c2ed53146f..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0027.composite +++ /dev/null @@ -1,49 +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.
--->
-<!-- Tests that where a <component/> has 2 or more <property/> child elements
- that each <property/> element has a unique @name attribute value -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://oasis/tests"
- xmlns:tns="http://oasis/tests"
- xmlns:test="http://oasis/tests"
- name="TEST_ASM_0027">
-
- <component name="TestClient">
- <implementation.composite name="tns:TestClient_0002"/>
- <service name="TestInvocation">
- <interface.java interface="test.TestInvocation"/>
- <binding.ws/>
- </service>
- <reference name="reference1" target="TestComponent1/Service1" />
- <property name="testName">ASM_0027</property>
- </component>
-
- <component name="TestComponent1">
- <implementation.composite name="tns:TestComposite1"/>
- <service name="Service1">
- <interface.java interface="test.Service1"/>
- </service>
- <property name="serviceName">service1</property>
- <!-- Multiple properties with the same @name attribute value - an error -->
- <property name="serviceName">service2</property>
- <property name="serviceName">service3</property>
- </component>
-
-</composite>
diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0028.composite b/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0028.composite deleted file mode 100644 index b79eefbce9..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0028.composite +++ /dev/null @@ -1,55 +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.
--->
-<!-- Tests that a <component/> <property/> @name attribute matches the
- @name attribute of one of the <property/> elements of the
- <componentType/> of the <implementation/> of the <component/> -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://oasis/tests"
- xmlns:tns="http://oasis/tests"
- xmlns:test="http://oasis/tests"
- name="TEST_ASM_0028">
-
- <component name="TestClient">
- <implementation.composite name="tns:TestClient_0002"/>
- <service name="TestInvocation">
- <interface.java interface="test.TestInvocation"/>
- <binding.ws/>
- </service>
- <reference name="reference1" target="TestComponent1/Service1" />
- <property name="testName">ASM_0028</property>
- </component>
-
- <component name="TestComponent1">
- <implementation.composite name="tns:TestComposite1"/>
- <service name="Service1">
- <interface.java interface="test.Service1"/>
- </service>
-
- <!--
- <property name="serviceName">service1</property>
- -->
-
- <!-- Property with @name attribute that does not match the @name
- attribute of any of the <property/> elements in the
- <componentType/> of the <implementation/> -->
- <property name="randomName">randomValue</property>
- </component>
-
-</composite>
diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0029.composite b/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0029.composite deleted file mode 100644 index c1aaba1775..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0029.composite +++ /dev/null @@ -1,58 +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.
--->
-<!-- Tests that that where a <component/> <property/> has @many=false that
- there is only one <value/> child element of the <property/> -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://oasis/tests"
- xmlns:tns="http://oasis/tests"
- xmlns:test="http://oasis/tests"
- name="TEST_ASM_0029">
-
- <component name="TestClient">
- <implementation.composite name="tns:TestClient_0002"/>
- <service name="TestInvocation">
- <interface.java interface="test.TestInvocation"/>
- <binding.ws/>
- </service>
- <reference name="reference1" target="TestComponent1/Service1" />
- <property name="testName">ASM_0029</property>
- </component>
-
- <component name="TestComponent1">
- <implementation.composite name="tns:TestComposite12"/>
- <service name="Service1">
- <interface.java interface="test.Service1"/>
- </service>
- <property name="serviceName">service1</property>
- <!-- Property with complex type with many=false but 2 <value/>
- subelements - which is an error -->
- <property name="complexType" type="test:ComplexType1" many="false">
- <value>
- <test:firstData>SomeData</test:firstData>
- <test:secondData>MoreData</test:secondData>
- </value>
- <value>
- <test:firstData>SomeData2</test:firstData>
- <test:secondData>MoreData2</test:secondData>
- </value>
- </property>
- </component>
-
-</composite>
diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0030.composite b/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0030.composite deleted file mode 100644 index 0ce29cdab2..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0030.composite +++ /dev/null @@ -1,51 +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.
--->
-<!-- Tests that a <component/> <property/> with a @value attribute set
-does not have any <value/> child elements -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://oasis/tests"
- xmlns:tns="http://oasis/tests"
- xmlns:test="http://oasis/tests"
- name="TEST_ASM_0030">
-
- <component name="TestClient">
- <implementation.composite name="tns:TestClient_0002"/>
- <service name="TestInvocation">
- <interface.java interface="test.TestInvocation"/>
- <binding.ws/>
- </service>
- <reference name="reference1" target="TestComponent1/Service1" />
- <property name="testName">ASM_0030</property>
- </component>
-
- <component name="TestComponent1">
- <implementation.composite name="tns:TestComposite14"/>
- <service name="Service1">
- <interface.java interface="test.Service1"/>
- </service>
- <property name="serviceName">service1</property>
- <!-- Property with value set via a @value attribute and also having
- <value/> child elements, which is an error -->
- <property name="simpleType" value="someValue">
- <value>someOtherValue</value>
- </property>
- </component>
-
-</composite>
diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0031.composite b/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0031.composite deleted file mode 100644 index 50cd134a6e..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0031.composite +++ /dev/null @@ -1,68 +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.
--->
-<!-- Tests that where a <component/> <reference/> has its @target attribute set
- to a valid service and the <composite/> also contains a <wire/> element with
- @source set to the <component/> <reference/> and @target set to a second valid
- service and has @replace=true, the <reference/> is wired to the second service
- only -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://oasis/tests"
- xmlns:tns="http://oasis/tests"
- xmlns:test="http://oasis/tests"
- name="TEST_ASM_0031">
-
- <component name="TestClient">
- <implementation.composite name="tns:TestClient_0002"/>
- <service name="TestInvocation">
- <interface.java interface="test.TestInvocation"/>
- <binding.ws/>
- </service>
- <reference name="reference1" target="TestComponent1/Service1" />
- <property name="testName">ASM_0031</property>
- </component>
-
- <component name="TestComponent1">
- <implementation.composite name="tns:TestComposite4"/>
- <service name="Service1">
- <interface.java interface="test.Service1"/>
- </service>
- <property name="serviceName">service1</property>
- <reference name="Reference1" target="TestComponent2/Service1"/>
- </component>
-
- <!-- Here is a wire that overrides the reference target of TestComponent1/Reference1 -->
- <wire source="TestComponent1/Reference1" target="TestComponent3/Service1" replace="true"/>
-
- <component name="TestComponent2">
- <implementation.composite name="tns:TestComposite1"/>
- <service name="Service1">
- <interface.java interface="test.Service1"/>
- </service>
- <property name="serviceName">service2</property>
- </component>
-
- <component name="TestComponent3">
- <implementation.composite name="tns:TestComposite1"/>
- <service name="Service1">
- <interface.java interface="test.Service1"/>
- </service>
- <property name="serviceName">service3</property>
- </component>
-</composite>
diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0039.composite b/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0039.composite deleted file mode 100644 index bf69bef4fe..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0039.composite +++ /dev/null @@ -1,70 +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://oasis/tests"
- xmlns:tns="http://oasis/tests"
- xmlns:test="http://oasis/tests"
- name="TEST_ASM_0039">
-
- <component name="TestClient">
- <implementation.composite name="tns:TestClient_0002"/>
- <service name="TestInvocation">
- <interface.java interface="test.TestInvocation"/>
- <binding.ws/>
- </service>
- <reference name="reference1" target="TestComponent1/Service1" />
- <property name="testName">ASM_0039</property>
- </component>
-
- <!-- Implementation with a single reference with multiplicity 1..n which
- has multiple concrete bindings applied to it -->
- <component name="TestComponent1">
- <implementation.composite name="tns:TestComposite8"/>
- <service name="Service1">
- <interface.java interface="test.Service1"/>
- </service>
- <property name="serviceName">service1</property>
- <!-- multiplicity is restricted to 1, but 2 tagets is specified, this should be detected in deployment time -->
- <!--In the test, it reported "WARNING: Too many targets on reference: Reference1"-->
- <!--if the multiplicity is specified to "1..1", it reported "Component reference multiplicity incompatible with reference multiplicity: Component = TestComponent1 Reference = Reference1"-->
- <reference name="Reference1" target="TestComponent2/Service1 TestComponent3/Service1" multiplicity="0..1">
- <interface.java interface="test.Service1"/>
- </reference>
- </component>
-
-
- <component name="TestComponent2">
- <implementation.composite name="tns:TestComposite1"/>
- <service name="Service1">
- <interface.java interface="test.Service1"/>
- </service>
- <property name="serviceName">service2</property>
- </component>
-
- <component name="TestComponent3">
- <implementation.composite name="tns:TestComposite1"/>
- <service name="Service1">
- <interface.java interface="test.Service1"/>
- </service>
- <property name="serviceName">service3</property>
- </component>
-
-</composite>
diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0040.composite b/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0040.composite deleted file mode 100644 index 1b01ddc9d3..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0040.composite +++ /dev/null @@ -1,53 +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.
--->
-<!-- Tests that if the runtime is using an untargeted reference,
-it should throw an exception.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://oasis/tests"
- xmlns:tns="http://oasis/tests"
- xmlns:test="http://oasis/tests"
- name="TEST_ASM_0040">
-
- <component name="TestClient">
- <implementation.composite name="tns:TestClient_0002"/>
- <service name="TestInvocation">
- <interface.java interface="test.TestInvocation"/>
- <binding.ws/>
- </service>
- <reference name="reference1" target="TestComponent1/Service1" />
- <property name="testName">ASM_0040</property>
- </component>
-
-
- <component name="TestComponent1">
- <implementation.composite name="tns:TestComposite23"/>
- <service name="Service1">
- <interface.java interface="test.Service1"/>
- </service>
- <property name="serviceName">service1</property>
- <!--Reference1 has no target service, the SCA runtime will throw the ServiceRunTimeExceptions.-->
- <reference name="Reference1" multiplicity="0..1">
- <interface.java interface="test.Service1"/>
- </reference>
- </component>
-
-
-</composite>
diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0041.composite b/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0041.composite deleted file mode 100644 index b56100c8e9..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0041.composite +++ /dev/null @@ -1,63 +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.
--->
-<!--
-test if @wiredByImpl="true", <reference/> element has no <binding/> child elements.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://oasis/tests"
- xmlns:tns="http://oasis/tests"
- xmlns:test="http://oasis/tests"
- name="TEST_ASM_0041">
-
- <component name="TestClient">
- <implementation.composite name="tns:TestClient_0002"/>
- <service name="TestInvocation">
- <interface.java interface="test.TestInvocation"/>
- <binding.ws/>
- </service>
- <reference name="reference1" target="TestComponent1/Service1" />
- <property name="testName">ASM_0041</property>
- </component>
-
-
- <component name="TestComponent1">
- <implementation.composite name="tns:TestComposite23"/>
- <service name="Service1">
- <interface.java interface="test.Service1"/>
- </service>
- <property name="serviceName">service1</property>
-
- <reference name="Reference1" wiredByImpl="true">
- <interface.java interface="test.Service1"/>
- <binding.sca uri="TestComponent2/Service1"/>
- </reference>
- </component>
-
- <component name="TestComponent2">
- <implementation.composite name="tns:TestComposite1"/>
- <service name="Service1">
- <interface.java interface="test.Service1"/>
- </service>
- <property name="serviceName">service1</property>
-
- </component>
-
-
-</composite>
diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0042.composite b/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0042.composite deleted file mode 100644 index 9904308676..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0042.composite +++ /dev/null @@ -1,65 +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.
--->
-<!-- test if @wiredByImpl="true",
-No <wire/> elements have the <reference/> element declared as the @source for the wire.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://oasis/tests"
- xmlns:tns="http://oasis/tests"
- xmlns:test="http://oasis/tests"
- name="TEST_ASM_0042">
-
-
- <component name="TestClient">
- <implementation.composite name="tns:TestClient_0002"/>
- <service name="TestInvocation">
- <interface.java interface="test.TestInvocation"/>
- <binding.ws/>
- </service>
- <reference name="reference1" target="TestComponent1/Service1" />
- <property name="testName">ASM_0041</property>
- </component>
-
-
- <component name="TestComponent1">
- <implementation.composite name="tns:TestComposite23"/>
- <service name="Service1">
- <interface.java interface="test.Service1"/>
- </service>
- <property name="serviceName">service1</property>
-
- <reference name="Reference1" wiredByImpl="true">
- <interface.java interface="test.Service1"/>
-
- </reference>
- </component>
-
- <component name="TestComponent2">
- <implementation.composite name="tns:TestComposite1"/>
- <service name="Service1">
- <interface.java interface="test.Service1"/>
- </service>
- <property name="serviceName">service1</property>
-
- </component>
-
- <wire source="TestComponent1/Reference1" target="TestComponent2/Service1"/>
-
-</composite>
diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0043.composite b/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0043.composite deleted file mode 100644 index b71c81a749..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0043.composite +++ /dev/null @@ -1,89 +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.
--->
-<!-- test if @wiredByImpl="true",
-No <wire/> elements have the <reference/> element declared as the @source for the wire.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://oasis/tests"
- xmlns:tns="http://oasis/tests"
- xmlns:test="http://oasis/tests"
- name="TEST_ASM_0043">
-
-
- <component name="TestClient">
- <implementation.composite name="tns:TestClient_0002"/>
- <service name="TestInvocation">
- <interface.java interface="test.TestInvocation"/>
- <binding.ws/>
- </service>
- <reference name="reference1" target="TestComponent1/Service1" />
- <property name="testName">ASM_0043</property>
- </component>
-
- <!--JMS client-->
- <component name="TestComponent1">
- <implementation.composite name="tns:TestComposite23"/>
- <service name="Service1">
- <interface.java interface="test.Service1"/>
- </service>
- <property name="serviceName">service1</property>
-
- <reference name="Reference1" target="TestComponent2/Service1">
- <interface.java interface="test.Service1"/>
- <binding.jms uri="jms:DestQueueA">
- <destination name="DestQueueA"/>
- </binding.jms>
-
- </reference>
- </component>
-
- <!--JMS service-->
- <component name="TestComponent2">
-
- <implementation.java class="test.service1Impl"/>
-
- <service name="Service1">
- <interface.java interface="test.Service1"/>
- <binding.jms>
- <destination name="DestQueueA" create="always"/>
- </binding.jms>
-
- </service>
- <property name="serviceName">service1</property>
-
- </component>
-
- <!--WebService service-->
- <component name="TestComponent3">
-
- <implementation.java class="test.service1Impl"/>
-
- <service name="Service1">
- <interface.java interface="test.Service1"/>
- <binding.ws uri="http://localhost:8080/Service1"/>
-
- </service>
- <property name="serviceName">service1</property>
-
- </component>
-
-
-
-</composite>
diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0101.composite b/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0101.composite deleted file mode 100644 index d2bfe29775..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_0101.composite +++ /dev/null @@ -1,42 +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://oasis/tests" - xmlns:sample="http://oasis/tests" - name="TEST_ASM_0101"> - - <component name="TestClient"> - <implementation.java class="test.ASM_0001_Client"/> - <service name="TestInvocation"> - <interface.java interface="test.TestInvocation"/> - <binding.sca/> - <binding.ws/> - </service> - <!-- reference name="testRef1" target="TestComponent1/service1" / --> - </component> - -<!-- - <component name="TestComponent1"> - <implementation.java class="test.ASM_0001_Impl1"/> - <service name="service1"/> - </component> ---> - -</composite> diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_6030.composite b/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_6030.composite deleted file mode 100644 index 1d34ffc721..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_ASM_6030.composite +++ /dev/null @@ -1,46 +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. ---> -<!-- - For a composite used as a component implementation, all properties of - components within the composite, where the underlying component - implementation specifies "mustSupply=true" for the property, MUST - either specify a value for the property or source the value from a - composite property. ---> - -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" - targetNamespace="http://oasis/tests" xmlns:tns="http://oasis/tests" - xmlns:sample="http://oasis/tests" name="TEST_ASM_6030"> - - <component name="TestClient"> - <implementation.composite name="tns:TestClient_0002" /> - <service name="TestInvocation"> - <interface.java interface="test.TestInvocation" /> - <binding.ws /> - </service> - <reference name="reference1" target="TestComponent1/Service1" /> - <property name="testName">ASM_6030</property> - </component> - - <component name="TestComponent1"> - <implementation.composite name="tns:TestComposite12"/> - <service name="Service1"> - <interface.java interface="test.Service1"></interface.java> - </service> - <property name="serviceName">service1</property> - </component> - - </composite> diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_Types.xsd b/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_Types.xsd deleted file mode 100644 index c0f488ab12..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/Test_Types.xsd +++ /dev/null @@ -1,37 +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. ---> -<!-- Schema for Schema types used by the SCA TestCases --> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://oasis/tests" - xmlns:test="http://oasis/tests" - xmlns:sca="http://www.osoa.org/xmlns/sca/1.0" - elementFormDefault="qualified"> - - - <!-- A complex type --> - <complexType name="ComplexType1"> - <element name="firstData" type="string" /> - <element name="secondData" type="string" /> - </complexType> - - <!-- A global element with a complex type --> - <element name="globalElement1" type="test:ComplexType1"/> - -</schema> diff --git a/branches/sca-java-1.5/stest/sampleTest/src/main/resources/jndi.properties b/branches/sca-java-1.5/stest/sampleTest/src/main/resources/jndi.properties deleted file mode 100644 index 9abdff215d..0000000000 --- a/branches/sca-java-1.5/stest/sampleTest/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.RequestQueue = RequestQueue -queue.ResponseQueue = ResponseQueue - -# register some topics in JNDI using the form -# topic.[jndiName] = [physicalName] -#topic.MyTopic = example.MyTopic - -# END SNIPPET: jndi |