Fix for TUSCANY-2875

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@749548 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 10 insertions, 13 deletions

diff --git a/branches/sca-java-1.x/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountServiceImpl.java b/branches/sca-java-1.x/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountServiceImpl.java
index ce41006fa6..964d0f9989 100644
--- a/branches/sca-java-1.x/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountServiceImpl.java
+++ b/branches/sca-java-1.x/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountServiceImpl.java
@@ -21,8 +21,6 @@ package bigbank.account;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.osoa.sca.annotations.Service;
-
 import bigbank.account.checking.CheckingAccountDetails;
 import bigbank.account.checking.CheckingAccountService;
 import bigbank.account.savings.SavingsAccountDetails;
@@ -35,20 +33,19 @@ import bigbank.calculator.CalculatorService;
 /**
  * Account service implementation
  */
-@Service(AccountService.class)
 public class AccountServiceImpl implements AccountService {
 
-    private SavingsAccountService savingsAccountService;
+	protected SavingsAccountService savingsAccountService;
     
-    private CheckingAccountService checkingAccountService;
+	protected CheckingAccountService checkingAccountService;
     
-    private StockAccountService stockAccountService;
+	protected StockAccountService stockAccountService;
     
-    private CalculatorService calculatorService;
+	protected CalculatorService calculatorService;
     
-    private StockQuoteService stockQuoteService;
+	protected StockQuoteService stockQuoteService;
     
-    private String currency;
+	protected String currency;
 
     public AccountReport getAccountReport(String customerID) {
 
diff --git a/branches/sca-java-1.x/samples/simple-bigbank-spring/src/main/resources/spring-context/Account-spring-context.xml b/branches/sca-java-1.x/samples/simple-bigbank-spring/src/main/resources/spring-context/Account-spring-context.xml
index 899d8d7d62..4a1727b08c 100644
--- a/branches/sca-java-1.x/samples/simple-bigbank-spring/src/main/resources/spring-context/Account-spring-context.xml
+++ b/branches/sca-java-1.x/samples/simple-bigbank-spring/src/main/resources/spring-context/Account-spring-context.xml
@@ -24,8 +24,8 @@
        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="AccountService"
-        type="bigbank.account.AccountService" target="AccountServiceBean"/> -->
+    <sca:service name="AccountService"
+        type="bigbank.account.AccountService" target="AccountServiceBean"/>
     
     <bean id="AccountServiceBean" class="bigbank.account.AccountServiceImpl">     
         <property name="calculatorService" ref="calculatorService"/>
@@ -46,8 +46,8 @@
     
     <sca:reference name="stockQuoteService" type="bigbank.stockquote.StockQuoteService"/>
     
-    <!-- <sca:reference name="savingsAccountServiceRef" type="bigbank.account.savings.SavingsAccountService"/>-->
+    <!-- <sca:reference name="savingsAccountService" type="bigbank.account.savings.SavingsAccountService"/>-->
     
-    <!-- <sca:reference name="stockAccountServiceRef" type="bigbank.account.stock.StockAccountService"/>-->
+    <!-- <sca:reference name="stockAccountService" type="bigbank.account.stock.StockAccountService"/>-->
 
 </beans>