diff options
author | ramkumar <ramkumar@13f79535-47bb-0310-9956-ffa450edef68> | 2009-09-04 07:03:52 +0000 |
---|---|---|
committer | ramkumar <ramkumar@13f79535-47bb-0310-9956-ffa450edef68> | 2009-09-04 07:03:52 +0000 |
commit | 0ca2cf1d5a9f074218f3730e017e1bce33086c68 (patch) | |
tree | fb718fabeee64d53302ca1e78df7e9d83b190754 /branches/sca-java-1.x/itest/spring/src/main/resources | |
parent | 891c195256186adb8717a521bd2af7cbf9d3c851 (diff) |
Fixes for TUSCANY-3250: Testcases for multiple application context using MANIFEST.MF
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@811233 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
-rw-r--r-- | branches/sca-java-1.x/itest/spring/src/main/resources/context/multiple/META-INF/spring/beanRefContext.xml | 35 | ||||
-rw-r--r-- | branches/sca-java-1.x/itest/spring/src/main/resources/context/multiple/StockQuote.composite | 3 | ||||
-rw-r--r-- | branches/sca-java-1.x/itest/spring/src/main/resources/context/multiple/springapps/META-INF/MANIFEST.MF | 3 | ||||
-rw-r--r-- | branches/sca-java-1.x/itest/spring/src/main/resources/context/multiple/springapps/META-INF/spring/SpringHelloWorld-context.xml (renamed from branches/sca-java-1.x/itest/spring/src/main/resources/context/multiple/META-INF/spring/SpringHelloWorld-context.xml) | 60 | ||||
-rw-r--r-- | branches/sca-java-1.x/itest/spring/src/main/resources/context/multiple/springapps/META-INF/spring/StockQuoteService-context.xml (renamed from branches/sca-java-1.x/itest/spring/src/main/resources/context/multiple/META-INF/spring/StockQuoteService-context.xml) | 64 |
5 files changed, 66 insertions, 99 deletions
diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/context/multiple/META-INF/spring/beanRefContext.xml b/branches/sca-java-1.x/itest/spring/src/main/resources/context/multiple/META-INF/spring/beanRefContext.xml deleted file mode 100644 index f547b179ef..0000000000 --- a/branches/sca-java-1.x/itest/spring/src/main/resources/context/multiple/META-INF/spring/beanRefContext.xml +++ /dev/null @@ -1,35 +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.
--->
-<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="beanRefFactory" class="org.springframework.context.support.ClassPathXmlApplicationContext">
- <constructor-arg>
- <list>
- <value>META-INF/spring/SpringHelloWorld-context.xml</value>
- <value>META-INF/spring/StockQuoteService-context.xml</value>
- </list>
- </constructor-arg>
- </bean>
-</beans>
\ No newline at end of file diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/context/multiple/StockQuote.composite b/branches/sca-java-1.x/itest/spring/src/main/resources/context/multiple/StockQuote.composite index eb40f30b3c..051529d7de 100644 --- a/branches/sca-java-1.x/itest/spring/src/main/resources/context/multiple/StockQuote.composite +++ b/branches/sca-java-1.x/itest/spring/src/main/resources/context/multiple/StockQuote.composite @@ -29,7 +29,6 @@ </service>
<component name="StockQuoteServiceComponent">
- <implementation.spring location="META-INF/spring/beanRefContext.xml"/>
+ <implementation.spring location="springapps"/>
</component>
-
</composite>
diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/context/multiple/springapps/META-INF/MANIFEST.MF b/branches/sca-java-1.x/itest/spring/src/main/resources/context/multiple/springapps/META-INF/MANIFEST.MF new file mode 100644 index 0000000000..72370a0683 --- /dev/null +++ b/branches/sca-java-1.x/itest/spring/src/main/resources/context/multiple/springapps/META-INF/MANIFEST.MF @@ -0,0 +1,3 @@ +Manifest-Version: 1.0
+Spring-Context: META-INF/spring/SpringHelloWorld-context.xml;META-INF/spring/StockQuoteService-context.xml
+
diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/context/multiple/META-INF/spring/SpringHelloWorld-context.xml b/branches/sca-java-1.x/itest/spring/src/main/resources/context/multiple/springapps/META-INF/spring/SpringHelloWorld-context.xml index c20679241f..62e4e077b6 100644 --- a/branches/sca-java-1.x/itest/spring/src/main/resources/context/multiple/META-INF/spring/SpringHelloWorld-context.xml +++ b/branches/sca-java-1.x/itest/spring/src/main/resources/context/multiple/springapps/META-INF/spring/SpringHelloWorld-context.xml @@ -1,31 +1,31 @@ -<?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="testBean" class="org.apache.tuscany.sca.itest.spring.TestHelloWorldBean" lazy-init="true">
- </bean>
-
+<?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="testBean" class="org.apache.tuscany.sca.itest.spring.TestHelloWorldBean" lazy-init="true"> + </bean> + </beans>
\ No newline at end of file diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/context/multiple/META-INF/spring/StockQuoteService-context.xml b/branches/sca-java-1.x/itest/spring/src/main/resources/context/multiple/springapps/META-INF/spring/StockQuoteService-context.xml index 0b8ee44e85..5738d0f890 100644 --- a/branches/sca-java-1.x/itest/spring/src/main/resources/context/multiple/META-INF/spring/StockQuoteService-context.xml +++ b/branches/sca-java-1.x/itest/spring/src/main/resources/context/multiple/springapps/META-INF/spring/StockQuoteService-context.xml @@ -1,33 +1,33 @@ -<?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.
--->
-<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">
-
- <sca:service name="StockQuoteService"
- type="bigbank.stockquote.StockQuoteService" target="StockQuoteServiceBean"/>
-
- <bean id="StockQuoteServiceBean" class="bigbank.stockquote.StockQuoteImpl">
- </bean>
-
+<?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. +--> +<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"> + + <sca:service name="StockQuoteService" + type="bigbank.stockquote.StockQuoteService" target="StockQuoteServiceBean"/> + + <bean id="StockQuoteServiceBean" class="bigbank.stockquote.StockQuoteImpl"> + </bean> + </beans>
\ No newline at end of file |