Author: edwardsmj
Date: Mon Jan 19 04:01:23 2009
New Revision: 735670
URL: http://svn.apache.org/viewvc?rev=735670&view=rev
Log:
Added Test_ASM_0024 Test_ASM_0025
Added:
tuscany/java/sca/stest/sampleTest/src/main/java/test/service1Impl5.java
tuscany/java/sca/stest/sampleTest/src/main/resources/TestComposite12.composite
tuscany/java/sca/stest/sampleTest/src/main/resources/Test_ASM_0024.composite
tuscany/java/sca/stest/sampleTest/src/main/resources/Test_ASM_0025.composite
tuscany/java/sca/stest/sampleTest/src/main/resources/Test_Types.xsd
tuscany/java/sca/stest/sampleTest/src/test/java/client/ASM_0024_TestCase.java
tuscany/java/sca/stest/sampleTest/src/test/java/client/ASM_0025_TestCase.java
Modified:
tuscany/java/sca/stest/sampleTest/src/main/java/test/Service1.java
tuscany/java/sca/stest/sampleTest/src/main/resources/TestComposite1.composite
Modified: tuscany/java/sca/stest/sampleTest/src/main/java/test/Service1.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/stest/sampleTest/src/main/java/test/Service1.java?rev=735670&r1=735669&r2=735670&view=diff
==============================================================================
--- tuscany/java/sca/stest/sampleTest/src/main/java/test/Service1.java
(original)
+++ tuscany/java/sca/stest/sampleTest/src/main/java/test/Service1.java Mon Jan
19 04:01:23 2009
@@ -18,11 +18,15 @@
*/
package test;
+// TODO: Need to change *ALL* annotations to org.oasisopen.xxxx
+import org.osoa.sca.annotations.Remotable;
+
/**
* A test service interface
* @author MikeEdwards
*
*/
+...@remotable
public interface Service1 {
/**
Added: tuscany/java/sca/stest/sampleTest/src/main/java/test/service1Impl5.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/stest/sampleTest/src/main/java/test/service1Impl5.java?rev=735670&view=auto
==============================================================================
--- tuscany/java/sca/stest/sampleTest/src/main/java/test/service1Impl5.java
(added)
+++ tuscany/java/sca/stest/sampleTest/src/main/java/test/service1Impl5.java Mon
Jan 19 04:01:23 2009
@@ -0,0 +1,44 @@
+/*
+ * 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.*;
+
+/**
+ * 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;
+ }
+
+}
Modified:
tuscany/java/sca/stest/sampleTest/src/main/resources/TestComposite1.composite
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/stest/sampleTest/src/main/resources/TestComposite1.composite?rev=735670&r1=735669&r2=735670&view=diff
==============================================================================
---
tuscany/java/sca/stest/sampleTest/src/main/resources/TestComposite1.composite
(original)
+++
tuscany/java/sca/stest/sampleTest/src/main/resources/TestComposite1.composite
Mon Jan 19 04:01:23 2009
@@ -17,6 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
+<!-- A simple composite which provides a single service and no references -->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0";
targetNamespace="http://oasis/tests";
xmlns:sample="http://oasis/tests";
Added:
tuscany/java/sca/stest/sampleTest/src/main/resources/TestComposite12.composite
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/stest/sampleTest/src/main/resources/TestComposite12.composite?rev=735670&view=auto
==============================================================================
---
tuscany/java/sca/stest/sampleTest/src/main/resources/TestComposite12.composite
(added)
+++
tuscany/java/sca/stest/sampleTest/src/main/resources/TestComposite12.composite
Mon Jan 19 04:01:23 2009
@@ -0,0 +1,45 @@
+<?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 -->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0";
+ targetNamespace="http://oasis/tests";
+ xmlns:test="http://oasis/tests";
+ name="TestComposite12">
+
+ <service name="Service1" promote="TestComponent1/Service1">
+ <interface.java interface="test.Service1"></interface.java>
+ </service>
+
+ <property name="serviceName" type="string"/>
+
+ <property name="complexType" type="test:ComplexType1"/>
+
+ <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>
Added:
tuscany/java/sca/stest/sampleTest/src/main/resources/Test_ASM_0024.composite
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/stest/sampleTest/src/main/resources/Test_ASM_0024.composite?rev=735670&view=auto
==============================================================================
---
tuscany/java/sca/stest/sampleTest/src/main/resources/Test_ASM_0024.composite
(added)
+++
tuscany/java/sca/stest/sampleTest/src/main/resources/Test_ASM_0024.composite
Mon Jan 19 04:01:23 2009
@@ -0,0 +1,60 @@
+<?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" target="TestComponent2/Service1">
+ <interface.java interface="test.Service1"/>
+ <!-- A binding which contradicts the @target attribute -->
+ <binding.ws/>
+ </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>
Added:
tuscany/java/sca/stest/sampleTest/src/main/resources/Test_ASM_0025.composite
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/stest/sampleTest/src/main/resources/Test_ASM_0025.composite?rev=735670&view=auto
==============================================================================
---
tuscany/java/sca/stest/sampleTest/src/main/resources/Test_ASM_0025.composite
(added)
+++
tuscany/java/sca/stest/sampleTest/src/main/resources/Test_ASM_0025.composite
Mon Jan 19 04:01:23 2009
@@ -0,0 +1,54 @@
+<?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 name="serviceName">service1</property>
+ <!-- Property with complex type with a value declared using a <value/>
subelement -->
+ <property name="complexType" type="test:ComplexType1">
+ <value>
+ <firstData>complex1</firstData>
+ <secondData>complex2</secondData>
+ </value>
+ </property>
+ </component>
+
+</composite>
Added: tuscany/java/sca/stest/sampleTest/src/main/resources/Test_Types.xsd
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/stest/sampleTest/src/main/resources/Test_Types.xsd?rev=735670&view=auto
==============================================================================
--- tuscany/java/sca/stest/sampleTest/src/main/resources/Test_Types.xsd (added)
+++ tuscany/java/sca/stest/sampleTest/src/main/resources/Test_Types.xsd Mon Jan
19 04:01:23 2009
@@ -0,0 +1,32 @@
+<?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">
+
+ <complexType name="ComplexType1">
+ <element name="firstData" type="string" />
+ <element name="secondData" type="string" />
+ </complexType>
+
+</schema>
\ No newline at end of file
Added:
tuscany/java/sca/stest/sampleTest/src/test/java/client/ASM_0024_TestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/stest/sampleTest/src/test/java/client/ASM_0024_TestCase.java?rev=735670&view=auto
==============================================================================
---
tuscany/java/sca/stest/sampleTest/src/test/java/client/ASM_0024_TestCase.java
(added)
+++
tuscany/java/sca/stest/sampleTest/src/test/java/client/ASM_0024_TestCase.java
Mon Jan 19 04:01:23 2009
@@ -0,0 +1,45 @@
+/*
+ * 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 client;
+
+
+import test.ASM_0002_Client;
+import testClient.TestInvocation;
+
+/**
+ * Client for ASM_0024_TestCase, which tests that where a <component/>
+ * <reference/> has @target set to some service, that the reference
+ * can have no child <binding/> elements
+ */
+public class ASM_0024_TestCase extends BaseJAXWSTestCase {
+
+
+ protected TestConfiguration getTestConfiguration() {
+ TestConfiguration config = new TestConfiguration();
+ config.testName = "ASM_0024";
+ config.input = "request";
+ config.output = "exception";
+ config.composite = "Test_ASM_0024.composite";
+ config.testServiceName = "TestClient";
+ config.testClass = ASM_0002_Client.class;
+ config.serviceInterface = TestInvocation.class;
+ return config;
+ }
+
+} // end class Test_ASM_0003
Added:
tuscany/java/sca/stest/sampleTest/src/test/java/client/ASM_0025_TestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/stest/sampleTest/src/test/java/client/ASM_0025_TestCase.java?rev=735670&view=auto
==============================================================================
---
tuscany/java/sca/stest/sampleTest/src/test/java/client/ASM_0025_TestCase.java
(added)
+++
tuscany/java/sca/stest/sampleTest/src/test/java/client/ASM_0025_TestCase.java
Mon Jan 19 04:01:23 2009
@@ -0,0 +1,46 @@
+/*
+ * 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 client;
+
+
+import test.ASM_0002_Client;
+import testClient.TestInvocation;
+
+/**
+ * Client for ASM_0025_TestCase, which 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
+ */
+public class ASM_0025_TestCase extends BaseJAXWSTestCase {
+
+
+ protected TestConfiguration getTestConfiguration() {
+ TestConfiguration config = new TestConfiguration();
+ config.testName = "ASM_0025";
+ config.input = "request";
+ config.output = "ASM_0025 request service1 operation1
invokedcomplex1complex2";
+ config.composite = "Test_ASM_0025.composite";
+ config.testServiceName = "TestClient";
+ config.testClass = ASM_0002_Client.class;
+ config.serviceInterface = TestInvocation.class;
+ return config;
+ }
+
+} // end class Test_ASM_0003
