diff options
| author | ramkumar <ramkumar@13f79535-47bb-0310-9956-ffa450edef68> | 2009-07-16 08:56:12 +0000 |
|---|---|---|
| committer | ramkumar <ramkumar@13f79535-47bb-0310-9956-ffa450edef68> | 2009-07-16 08:56:12 +0000 |
| commit | 3ce45cf08490efd5a3ab8bab1f8eae9dbd375851 (patch) | |
| tree | 5fb1dd2bc29960013ae3fa335dded5602579e5b3 | |
| parent | 58bd56d4726df4f33c9db9b7bc8e5e7a64064b6c (diff) | |
Fixes for TUSCANY-3156
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@794598 13f79535-47bb-0310-9956-ffa450edef68
6 files changed, 206 insertions, 0 deletions
diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/location/folder/SpringFolderNoManifest.composite b/branches/sca-java-1.x/itest/spring/src/main/resources/location/folder/SpringFolderNoManifest.composite new file mode 100644 index 0000000000..dafa671288 --- /dev/null +++ b/branches/sca-java-1.x/itest/spring/src/main/resources/location/folder/SpringFolderNoManifest.composite @@ -0,0 +1,39 @@ +<?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 for the SpringSCAPropertyTestCase
+ * This composite has the HelloWorldComponent implemented with a Spring implementation where
+ * the Spring application context uses an explicit SCA property. The value of the property
+ * is set in this composite and is used to compute the response to a service invocation from
+ * the ClientComponent.
+ -->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+ name="SpringFolderLocation">
+
+ <component name="ClientComponent">
+ <implementation.java class="helloworld.HelloWorldProxy"/>
+ <reference name="delegate" target="HelloWorldComponent"/>
+ </component>
+
+ <component name="HelloWorldComponent">
+ <implementation.spring location="springappnomanifest"/>
+ <property name="TestProperty">Hello</property>
+ </component>
+
+</composite>
diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/location/folder/springappnomanifest/META-INF/spring/application-context.xml b/branches/sca-java-1.x/itest/spring/src/main/resources/location/folder/springappnomanifest/META-INF/spring/application-context.xml new file mode 100644 index 0000000000..d2f406294d --- /dev/null +++ b/branches/sca-java-1.x/itest/spring/src/main/resources/location/folder/springappnomanifest/META-INF/spring/application-context.xml @@ -0,0 +1,38 @@ +<?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. +--> +<!-- Application context for the SpringHelloWorld testcase --> +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:sca="http://www.springframework.org/schema/sca" + xsi:schemaLocation=" +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd +http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd"> + + <bean id="testBean1" class="mock.TestSCAPropertyBean" lazy-init="true"> + <property name="hello" ref="TestProperty"/> + </bean> + + <bean id="testBean2" class="mock.TestSCAPropertyBean" lazy-init="true"> + <property name="hello"><ref bean="TestProperty"/></property> + </bean> + + <sca:property id="foo" name="TestProperty" type="java.lang.String"/> + +</beans>
\ No newline at end of file diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/location/jar/SpringJarNoManifest.composite b/branches/sca-java-1.x/itest/spring/src/main/resources/location/jar/SpringJarNoManifest.composite new file mode 100644 index 0000000000..addb4655fc --- /dev/null +++ b/branches/sca-java-1.x/itest/spring/src/main/resources/location/jar/SpringJarNoManifest.composite @@ -0,0 +1,39 @@ +<?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 for the SpringSCAPropertyTestCase
+ * This composite has the HelloWorldComponent implemented with a Spring implementation where
+ * the Spring application context uses an explicit SCA property. The value of the property
+ * is set in this composite and is used to compute the response to a service invocation from
+ * the ClientComponent.
+ -->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+ name="SpringJarLocation">
+
+ <component name="ClientComponent">
+ <implementation.java class="helloworld.HelloWorldProxy"/>
+ <reference name="delegate" target="HelloWorldComponent"/>
+ </component>
+
+ <component name="HelloWorldComponent">
+ <implementation.spring location="spring-context-nomanifest.jar"/>
+ <property name="TestProperty">Hello</property>
+ </component>
+
+</composite>
diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/location/jar/spring-context-nomanifest.jar b/branches/sca-java-1.x/itest/spring/src/main/resources/location/jar/spring-context-nomanifest.jar Binary files differnew file mode 100644 index 0000000000..26062e1e53 --- /dev/null +++ b/branches/sca-java-1.x/itest/spring/src/main/resources/location/jar/spring-context-nomanifest.jar diff --git a/branches/sca-java-1.x/itest/spring/src/test/java/location/folder/SpringFolderNoManifestTestCase.java b/branches/sca-java-1.x/itest/spring/src/test/java/location/folder/SpringFolderNoManifestTestCase.java new file mode 100644 index 0000000000..c9876fd947 --- /dev/null +++ b/branches/sca-java-1.x/itest/spring/src/test/java/location/folder/SpringFolderNoManifestTestCase.java @@ -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 location.folder;
+
+import org.apache.tuscany.sca.itest.spring.AbstractHelloWorldTestCase;
+
+/**
+ * A test case designed to test the implementation of Properties from a Spring application
+ * context, where the properties are explicit, through the presence of an sca:property
+ * element within the Spring application context
+ *
+ * The artifacts involved in this test are:
+ *
+ * 1) A composite containing a component with a Spring implementation
+ * 2) The <implementation.spring.../> element references an application context that
+ * uses an explicit sca:property element which is used to compute the response to an invocation
+ * of the service of the implementation
+ *
+ * @version $Rev$ $Date$
+ */
+public class SpringFolderNoManifestTestCase extends AbstractHelloWorldTestCase {
+ // super class does it all getting composite based on this class name
+
+ public SpringFolderNoManifestTestCase() {
+ super("SpringFolderNoManifest.composite", "location/folder");
+ }
+}
+
diff --git a/branches/sca-java-1.x/itest/spring/src/test/java/location/jar/SpringJarNoManifestTestCase.java b/branches/sca-java-1.x/itest/spring/src/test/java/location/jar/SpringJarNoManifestTestCase.java new file mode 100644 index 0000000000..e32227cbe9 --- /dev/null +++ b/branches/sca-java-1.x/itest/spring/src/test/java/location/jar/SpringJarNoManifestTestCase.java @@ -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 location.jar;
+
+import org.apache.tuscany.sca.itest.spring.AbstractHelloWorldTestCase;
+
+/**
+ * A test case designed to test the implementation of Properties from a Spring application
+ * context, where the properties are explicit, through the presence of an sca:property
+ * element within the Spring application context
+ *
+ * The artifacts involved in this test are:
+ *
+ * 1) A composite containing a component with a Spring implementation
+ * 2) The <implementation.spring.../> element references an application context that
+ * uses an explicit sca:property element which is used to compute the response to an invocation
+ * of the service of the implementation
+ *
+ * @version $Rev$ $Date$
+ */
+public class SpringJarNoManifestTestCase extends AbstractHelloWorldTestCase {
+ // super class does it all getting composite based on this class name
+
+ public SpringJarNoManifestTestCase() {
+ super("SpringJarNoManifest.composite", "location/jar");
+ }
+}
+
|