diff options
author | ramkumar <ramkumar@13f79535-47bb-0310-9956-ffa450edef68> | 2009-06-30 11:13:48 +0000 |
---|---|---|
committer | ramkumar <ramkumar@13f79535-47bb-0310-9956-ffa450edef68> | 2009-06-30 11:13:48 +0000 |
commit | e48a541b03281411d1780cd860043ca0499fe198 (patch) | |
tree | 1a4f670f3246adcb2d88851a722083ccff56e450 /branches/sca-java-1.x/itest/spring/src/main/resources/location | |
parent | 4b8f6c020fd9ad60d55a9644b568a7bd8fa89bfd (diff) |
Fixes in 1.x for TUSCANY-3069
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@789681 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'branches/sca-java-1.x/itest/spring/src/main/resources/location')
5 files changed, 43 insertions, 2 deletions
diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/location/folder/SpringFolderLocation.composite b/branches/sca-java-1.x/itest/spring/src/main/resources/location/folder/SpringFolderLocation.composite index 7f6268f6b5..50d6456737 100644 --- a/branches/sca-java-1.x/itest/spring/src/main/resources/location/folder/SpringFolderLocation.composite +++ b/branches/sca-java-1.x/itest/spring/src/main/resources/location/folder/SpringFolderLocation.composite @@ -32,7 +32,7 @@ </component>
<component name="HelloWorldComponent">
- <implementation.spring location="META-INF/sca/location-folder"/>
+ <implementation.spring location="springapp"/>
<property name="TestProperty">Hello</property>
</component>
diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/location/folder/springapp/META-INF/MANIFEST.MF b/branches/sca-java-1.x/itest/spring/src/main/resources/location/folder/springapp/META-INF/MANIFEST.MF new file mode 100644 index 0000000000..950dbeba4c --- /dev/null +++ b/branches/sca-java-1.x/itest/spring/src/main/resources/location/folder/springapp/META-INF/MANIFEST.MF @@ -0,0 +1,3 @@ +Manifest-Version: 1.0
+Spring-Context: META-INF/spring/SpringSCAProperty-context.xml
+
diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/location/folder/springapp/META-INF/spring/SpringSCAProperty-context.xml b/branches/sca-java-1.x/itest/spring/src/main/resources/location/folder/springapp/META-INF/spring/SpringSCAProperty-context.xml new file mode 100644 index 0000000000..d2f406294d --- /dev/null +++ b/branches/sca-java-1.x/itest/spring/src/main/resources/location/folder/springapp/META-INF/spring/SpringSCAProperty-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/SpringJarLocation.composite b/branches/sca-java-1.x/itest/spring/src/main/resources/location/jar/SpringJarLocation.composite index 1f8792e4d8..b0b191801d 100644 --- a/branches/sca-java-1.x/itest/spring/src/main/resources/location/jar/SpringJarLocation.composite +++ b/branches/sca-java-1.x/itest/spring/src/main/resources/location/jar/SpringJarLocation.composite @@ -32,7 +32,7 @@ </component>
<component name="HelloWorldComponent">
- <implementation.spring location="META-INF/sca/location-jar/spring-context.jar"/>
+ <implementation.spring location="spring-context.jar"/>
<property name="TestProperty">Hello</property>
</component>
diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/location/jar/spring-context.jar b/branches/sca-java-1.x/itest/spring/src/main/resources/location/jar/spring-context.jar Binary files differnew file mode 100644 index 0000000000..d8ee59a610 --- /dev/null +++ b/branches/sca-java-1.x/itest/spring/src/main/resources/location/jar/spring-context.jar |