summaryrefslogtreecommitdiffstats
path: root/java/sca/samples/simple-bigbank-spring/src/main/resources
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--java/sca/samples/simple-bigbank-spring/src/main/resources/BigBank.composite9
-rw-r--r--java/sca/samples/simple-bigbank-spring/src/main/resources/CheckingsAccount.composite33
-rw-r--r--java/sca/samples/simple-bigbank-spring/src/main/resources/StockAccount.composite2
-rw-r--r--java/sca/samples/simple-bigbank-spring/src/main/resources/spring-context/Account-spring-context.xml28
-rw-r--r--java/sca/samples/simple-bigbank-spring/src/main/resources/spring-context/CheckingsAccount/META-INF/spring/CheckingsAccount-context.xml33
-rw-r--r--java/sca/samples/simple-bigbank-spring/src/main/resources/spring-context/StockAccount/META-INF/MANIFEST.MF4
6 files changed, 25 insertions, 84 deletions
diff --git a/java/sca/samples/simple-bigbank-spring/src/main/resources/BigBank.composite b/java/sca/samples/simple-bigbank-spring/src/main/resources/BigBank.composite
index dc05d9fd1d..a7624235d8 100644
--- a/java/sca/samples/simple-bigbank-spring/src/main/resources/BigBank.composite
+++ b/java/sca/samples/simple-bigbank-spring/src/main/resources/BigBank.composite
@@ -30,10 +30,13 @@
<component name="AccountServiceComponent">
<implementation.spring location="spring-context/Account-spring-context.xml"/>
+
+ <service name="AccountService">
+ <interface.java interface="bigbank.account.AccountService"/>
+ </service>
<reference name="savingsAccountService" target="SavingsAccountServiceComponent"/>
- <!--reference name="checkingAccountService" target="CheckingAccountServiceComponent"/-->
<reference name="checkingAccountService">
<interface.java interface="bigbank.account.checking.CheckingAccountService"/>
<binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory"
@@ -60,10 +63,6 @@
<implementation.composite name="bbsv:SavingsAccountDept"/>
</component>
- <!--component name="CheckingAccountServiceComponent">
- <implementation.composite name="bbck:CheckingsAccountDept"/>
- </component-->
-
<component name="StockAccountServiceComponent">
<implementation.composite name="bbst:StockAccountDept"/>
</component>
diff --git a/java/sca/samples/simple-bigbank-spring/src/main/resources/CheckingsAccount.composite b/java/sca/samples/simple-bigbank-spring/src/main/resources/CheckingsAccount.composite
deleted file mode 100644
index e0be7584e3..0000000000
--- a/java/sca/samples/simple-bigbank-spring/src/main/resources/CheckingsAccount.composite
+++ /dev/null
@@ -1,33 +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.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://bigbank/checkings"
- xmlns:bbck="http://bigbank/checkings"
- xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:bba="http://bigbankAccount"
- name="CheckingsAccountDept">
-
- <service name="CheckingAccountService" promote="CheckingAccountServiceComponent"/>
-
- <component name="CheckingAccountServiceComponent">
- <implementation.spring location="spring-context/CheckingsAccount/META-INF/spring/CheckingsAccount-context.xml"/>
- </component>
-
-</composite>
diff --git a/java/sca/samples/simple-bigbank-spring/src/main/resources/StockAccount.composite b/java/sca/samples/simple-bigbank-spring/src/main/resources/StockAccount.composite
index caa849e0fd..97dff499ba 100644
--- a/java/sca/samples/simple-bigbank-spring/src/main/resources/StockAccount.composite
+++ b/java/sca/samples/simple-bigbank-spring/src/main/resources/StockAccount.composite
@@ -26,7 +26,7 @@
<service name="StockAccountService" promote="StockAccountServiceComponent"/>
<component name="StockAccountServiceComponent">
- <implementation.spring location="spring-context/StockAccount/META-INF/spring/StockAccount-context.xml"/>
+ <implementation.spring location="spring-context/StockAccount"/>
</component>
</composite>
diff --git a/java/sca/samples/simple-bigbank-spring/src/main/resources/spring-context/Account-spring-context.xml b/java/sca/samples/simple-bigbank-spring/src/main/resources/spring-context/Account-spring-context.xml
index d59d03f611..071092138d 100644
--- a/java/sca/samples/simple-bigbank-spring/src/main/resources/spring-context/Account-spring-context.xml
+++ b/java/sca/samples/simple-bigbank-spring/src/main/resources/spring-context/Account-spring-context.xml
@@ -24,26 +24,30 @@
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/sca http://www.springframework.org/schema/sca/spring-sca.xsd">
- <sca:service name="AccountService"
- type="bigbank.account.AccountService" target="AccountServiceBean"/>
-
- <bean id="AccountServiceBean" class="bigbank.account.AccountServiceImpl">
- <property name="savingsAccountService" ref="savingsAccountService"/>
- <property name="checkingAccountService" ref="checkingAccountService"/>
- <property name="stockAccountService" ref="stockAccountService"/>
+ <!-- <sca:service name="AccountService"
+ type="bigbank.account.AccountService" target="AccountServiceBean"/> -->
+
+ <bean id="AccountServiceBean" class="bigbank.account.AccountServiceImpl">
<property name="calculatorService" ref="calculatorService"/>
- <property name="stockQuoteService" ref="stockQuoteService"/>
+ <property name="stockQuoteService" ref="stockQuoteService"/>
+ <property name="checkingAccountService" ref="checkingAccountService"/>
+
+ <!-- Here are some implicit references & properties - a property with a ref not satisifed
+ * within the Spring application context.
+ -->
+ <property name="savingsAccountService" ref="savingsAccountService"/>
+ <property name="stockAccountService" ref="stockAccountService"/>
<property name="currency" value="EURO"/>
</bean>
-
- <sca:reference name="savingsAccountService" type="bigbank.account.savings.SavingsAccountService"/>
<sca:reference name="checkingAccountService" type="bigbank.account.checking.CheckingAccountService"/>
- <sca:reference name="stockAccountService" type="bigbank.account.stock.StockAccountService"/>
-
<sca:reference name="calculatorService" type="bigbank.calculator.CalculatorService"/>
<sca:reference name="stockQuoteService" type="bigbank.stockquote.StockQuoteService"/>
+
+ <!-- <sca:reference name="savingsAccountServiceRef" type="bigbank.account.savings.SavingsAccountService"/>-->
+
+ <!-- <sca:reference name="stockAccountServiceRef" type="bigbank.account.stock.StockAccountService"/>-->
</beans>
diff --git a/java/sca/samples/simple-bigbank-spring/src/main/resources/spring-context/CheckingsAccount/META-INF/spring/CheckingsAccount-context.xml b/java/sca/samples/simple-bigbank-spring/src/main/resources/spring-context/CheckingsAccount/META-INF/spring/CheckingsAccount-context.xml
deleted file mode 100644
index 7c1780b448..0000000000
--- a/java/sca/samples/simple-bigbank-spring/src/main/resources/spring-context/CheckingsAccount/META-INF/spring/CheckingsAccount-context.xml
+++ /dev/null
@@ -1,33 +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.springframework.org/schema/sca/spring-sca.xsd">
-
- <sca:service name="CheckingAccountService"
- type="bigbank.account.checking.CheckingAccountService" target="CheckingAccountServiceBean"/>
-
- <bean id="CheckingAccountServiceBean" class="bigbank.account.checking.CheckingAccountServiceImpl">
- </bean>
-
-</beans> \ No newline at end of file
diff --git a/java/sca/samples/simple-bigbank-spring/src/main/resources/spring-context/StockAccount/META-INF/MANIFEST.MF b/java/sca/samples/simple-bigbank-spring/src/main/resources/spring-context/StockAccount/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..32fa070ffb
--- /dev/null
+++ b/java/sca/samples/simple-bigbank-spring/src/main/resources/spring-context/StockAccount/META-INF/MANIFEST.MF
@@ -0,0 +1,4 @@
+Manifest-Version: 1.0
+Spring-Context: META-INF/spring/StockAccount-context.xml
+
+