Fix the package names

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

3 files changed, 6 insertions, 4 deletions

diff --git a/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/java/scatours/currency/impl/CurrencyConverterImpl.java b/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/java/scatours/currency/impl/CurrencyConverterImpl.java
index 52d7c60c31..2a3ffc1a1e 100644
--- a/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/java/scatours/currency/impl/CurrencyConverterImpl.java
+++ b/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/java/scatours/currency/impl/CurrencyConverterImpl.java
@@ -48,6 +48,8 @@ public class CurrencyConverterImpl implements CurrencyConverter {
     }

 

     public float convert(String fromCurrencyCode, String toCurrencyCode, float amount) {

-        return amount * getExchangeRate(fromCurrencyCode, toCurrencyCode);

+        float converted = amount * getExchangeRate(fromCurrencyCode, toCurrencyCode);

+        System.out.println(fromCurrencyCode + amount + "=" + toCurrencyCode + converted);

+        return converted;

     }

 }

diff --git a/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/java/scatours/payment/creditcard/impl/CreditCardPaymentImpl.java b/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/java/scatours/payment/creditcard/impl/CreditCardPaymentImpl.java
index 657ef71c8b..510dc76b7d 100644
--- a/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/java/scatours/payment/creditcard/impl/CreditCardPaymentImpl.java
+++ b/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/java/scatours/payment/creditcard/impl/CreditCardPaymentImpl.java
@@ -36,7 +36,7 @@ public class CreditCardPaymentImpl implements CreditCardPayment {
 

     public String authorize(CreditCardDetailsType creditCard, float amount) {

         if (creditCard != null) {

-            System.out.println("Checking card: name = " + creditCard.getCardOwner().getName()

+            System.out.println("Credit card: name = " + creditCard.getCardOwner().getName()

                 + " number = "

                 + creditCard.getCreditCardNumber()

                 + " for amount "

diff --git a/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/resources/OSGI-INF/sca/bundle.componentType b/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/resources/OSGI-INF/sca/bundle.componentType
index c14c60c21d..2b006a34b5 100644
--- a/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/resources/OSGI-INF/sca/bundle.componentType
+++ b/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/resources/OSGI-INF/sca/bundle.componentType
@@ -23,7 +23,7 @@
     <!-- The service elment defines an SCA view of the OSGi service -->

     <service name="CreditCardPayment">

         <!-- The interface will be mapped into the OSGi service class -->

-        <interface.java interface="payment.creditcard.CreditCardPayment"/>

+        <interface.java interface="scatours.payment.creditcard.CreditCardPayment"/>

         <!-- The list of OSGi properties -->

         <t:osgi.property name="prop1">1</t:osgi.property>

         <t:osgi.property name="prop2">ABC</t:osgi.property>

@@ -31,7 +31,7 @@
 

     <!-- The reference elment defines an SCA proxy to a remote OSGi service -->

     <reference name="currencyConverter">

-        <interface.java interface="currency.CurrencyConverter"/>

+        <interface.java interface="scatours.currency.CurrencyConverter"/>

     </reference>

 

 </componentType>