summaryrefslogtreecommitdiffstats
path: root/java/sca/itest/implementation-spring/src/main
diff options
context:
space:
mode:
authorramkumar <ramkumar@13f79535-47bb-0310-9956-ffa450edef68>2009-09-30 10:46:20 +0000
committerramkumar <ramkumar@13f79535-47bb-0310-9956-ffa450edef68>2009-09-30 10:46:20 +0000
commit5d29d53c4ad74b2ec834aad00cc5273bebe6e3f4 (patch)
tree29bfbacde5a496dd5bd0bcada9ba2d2237fefe16 /java/sca/itest/implementation-spring/src/main
parent1de0dd6c7217ee5ef89b8f357bf18d13494cbac5 (diff)
Fixes for TUSCANY-3287: Complaince with OASIS specs
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@820238 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
-rw-r--r--java/sca/itest/implementation-spring/src/main/resources/context/multiple/MultipleContext.composite9
-rw-r--r--java/sca/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/MANIFEST.MF3
-rw-r--r--java/sca/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/SpringHelloWorld-context.xml (renamed from java/sca/itest/implementation-spring/src/main/resources/context/multiple/META-INF/spring/SpringHelloWorld-context.xml)0
-rw-r--r--java/sca/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/StockQuoteService-context.xml (renamed from java/sca/itest/implementation-spring/src/main/resources/context/multiple/META-INF/spring/StockQuoteService-context.xml)0
-rw-r--r--java/sca/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/beanRefContext.xml (renamed from java/sca/itest/implementation-spring/src/main/resources/context/multiple/META-INF/spring/beanRefContext.xml)3
5 files changed, 6 insertions, 9 deletions
diff --git a/java/sca/itest/implementation-spring/src/main/resources/context/multiple/MultipleContext.composite b/java/sca/itest/implementation-spring/src/main/resources/context/multiple/MultipleContext.composite
index 5acdc77d1a..1c4b81db33 100644
--- a/java/sca/itest/implementation-spring/src/main/resources/context/multiple/MultipleContext.composite
+++ b/java/sca/itest/implementation-spring/src/main/resources/context/multiple/MultipleContext.composite
@@ -21,15 +21,10 @@
xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
targetNamespace="http://stockquote"
xmlns:hw="http://stockquote"
- name="MultipleContext">
-
- <service name="StockQuoteService" promote="StockQuoteServiceComponent">
- <interface.java interface="bigbank.stockquote.StockQuoteService"/>
- <binding.ws uri="http://localhost:8081/services/StockQuoteWebService"/>
- </service>
+ name="MultipleContext">
<component name="StockQuoteServiceComponent">
- <implementation.spring location="META-INF/spring/beanRefContext.xml"/>
+ <implementation.spring location="springapp"/>
</component>
</composite>
diff --git a/java/sca/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/MANIFEST.MF b/java/sca/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..9267f28e83
--- /dev/null
+++ b/java/sca/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/MANIFEST.MF
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Spring-Context: META-INF/spring/beanRefContext.xml; META-INF/spring/StockQuoteService-context.xml
+
diff --git a/java/sca/itest/implementation-spring/src/main/resources/context/multiple/META-INF/spring/SpringHelloWorld-context.xml b/java/sca/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/SpringHelloWorld-context.xml
index 62e4e077b6..62e4e077b6 100644
--- a/java/sca/itest/implementation-spring/src/main/resources/context/multiple/META-INF/spring/SpringHelloWorld-context.xml
+++ b/java/sca/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/SpringHelloWorld-context.xml
diff --git a/java/sca/itest/implementation-spring/src/main/resources/context/multiple/META-INF/spring/StockQuoteService-context.xml b/java/sca/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/StockQuoteService-context.xml
index 5b1885d6b3..5b1885d6b3 100644
--- a/java/sca/itest/implementation-spring/src/main/resources/context/multiple/META-INF/spring/StockQuoteService-context.xml
+++ b/java/sca/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/StockQuoteService-context.xml
diff --git a/java/sca/itest/implementation-spring/src/main/resources/context/multiple/META-INF/spring/beanRefContext.xml b/java/sca/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/beanRefContext.xml
index 1bb3b2c146..5ccc8892b6 100644
--- a/java/sca/itest/implementation-spring/src/main/resources/context/multiple/META-INF/spring/beanRefContext.xml
+++ b/java/sca/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/beanRefContext.xml
@@ -27,8 +27,7 @@
<bean id="beanRefFactory" class="org.springframework.context.support.ClassPathXmlApplicationContext">
<constructor-arg>
<list>
- <value>META-INF/spring/StockQuoteService-context.xml</value>
- <value>META-INF/spring/SpringHelloWorld-context.xml</value>
+ <value>context/multiple/META-INF/spring/SpringHelloWorld-context.xml</value>
</list>
</constructor-arg>
</bean>