Apply the new naming conventions to the fullapp contributions and launchers

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

7 files changed, 25 insertions, 20 deletions

diff --git a/sandbox/travelsample/contributions/payment-java-contribution/src/main/java/scatours/customer/Customer.java b/sandbox/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/customer/Customer.java
index daf56353a3..c97ba8fb9f 100644
--- a/sandbox/travelsample/contributions/payment-java-contribution/src/main/java/scatours/customer/Customer.java
+++ b/sandbox/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/customer/Customer.java
@@ -17,9 +17,9 @@
  * under the License.    

  */

 

-package scatours.customer;

+package com.tuscanyscatours.customer;

 

-import payment.creditcard.CreditCardDetailsType;

+import com.tuscanyscatours.payment.creditcard.CreditCardDetailsType;

 

 /**

  * Customer data

diff --git a/sandbox/travelsample/contributions/payment-java-contribution/src/main/java/scatours/customer/CustomerNotFoundException.java b/sandbox/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/customer/CustomerNotFoundException.java
index 89f56ce6ec..58772c747c 100644
--- a/sandbox/travelsample/contributions/payment-java-contribution/src/main/java/scatours/customer/CustomerNotFoundException.java
+++ b/sandbox/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/customer/CustomerNotFoundException.java
@@ -17,7 +17,7 @@
  * under the License.    

  */

 

-package scatours.customer;

+package com.tuscanyscatours.customer;

 

 

 public class CustomerNotFoundException extends Exception {

diff --git a/sandbox/travelsample/contributions/payment-java-contribution/src/main/java/scatours/customer/CustomerRegistry.java b/sandbox/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/customer/CustomerRegistry.java
index cfd79a7f95..38a2759660 100644
--- a/sandbox/travelsample/contributions/payment-java-contribution/src/main/java/scatours/customer/CustomerRegistry.java
+++ b/sandbox/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/customer/CustomerRegistry.java
@@ -17,11 +17,11 @@
  * under the License.    

  */

 

-package scatours.customer;

+package com.tuscanyscatours.customer;

 

 import java.util.Collection;

 

-import payment.creditcard.CreditCardDetailsType;

+import com.tuscanyscatours.payment.creditcard.CreditCardDetailsType;

 

 /**

  * Customer registry interface

diff --git a/sandbox/travelsample/contributions/payment-java-contribution/src/main/java/scatours/customer/CustomerRegistryImpl.java b/sandbox/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/customer/impl/CustomerRegistryImpl.java
index e6328f062c..ac7b71c17f 100644
--- a/sandbox/travelsample/contributions/payment-java-contribution/src/main/java/scatours/customer/CustomerRegistryImpl.java
+++ b/sandbox/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/customer/impl/CustomerRegistryImpl.java
@@ -17,7 +17,7 @@
  * under the License.    

  */

 

-package scatours.customer;

+package com.tuscanyscatours.customer.impl;

 

 import java.util.Collection;

 import java.util.HashMap;

@@ -30,10 +30,13 @@ import org.osoa.sca.annotations.Requires;
 import org.osoa.sca.annotations.Scope;

 import org.osoa.sca.annotations.Service;

 

-import payment.creditcard.CreditCardDetailsType;

-import payment.creditcard.CreditCardTypeType;

-import payment.creditcard.ObjectFactory;

-import payment.creditcard.PayerType;

+import com.tuscanyscatours.customer.Customer;

+import com.tuscanyscatours.customer.CustomerNotFoundException;

+import com.tuscanyscatours.customer.CustomerRegistry;

+import com.tuscanyscatours.payment.creditcard.CreditCardDetailsType;

+import com.tuscanyscatours.payment.creditcard.CreditCardTypeType;

+import com.tuscanyscatours.payment.creditcard.ObjectFactory;

+import com.tuscanyscatours.payment.creditcard.PayerType;

 

 /**

  * An in-memory customer registry implementation

diff --git a/sandbox/travelsample/contributions/payment-java-contribution/src/main/java/scatours/emailgateway/EmailGateway.java b/sandbox/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/emailgateway/EmailGateway.java
index d360381327..8c6ca806d2 100644
--- a/sandbox/travelsample/contributions/payment-java-contribution/src/main/java/scatours/emailgateway/EmailGateway.java
+++ b/sandbox/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/emailgateway/EmailGateway.java
@@ -17,7 +17,7 @@
  * under the License.    

  */

 

-package scatours.emailgateway;

+package com.tuscanyscatours.emailgateway;

 

 import org.osoa.sca.annotations.Remotable;

 

diff --git a/sandbox/travelsample/contributions/payment-java-contribution/src/main/java/scatours/emailgateway/EmailGatewayImpl.java b/sandbox/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/emailgateway/impl/EmailGatewayImpl.java
index 060c3dabda..b942eebddf 100644
--- a/sandbox/travelsample/contributions/payment-java-contribution/src/main/java/scatours/emailgateway/EmailGatewayImpl.java
+++ b/sandbox/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/emailgateway/impl/EmailGatewayImpl.java
@@ -17,9 +17,10 @@
  * under the License.    

  */

 

-package scatours.emailgateway;

+package com.tuscanyscatours.emailgateway.impl;

 

 import org.osoa.sca.annotations.Service;

+import com.tuscanyscatours.emailgateway.EmailGateway;

 

 @Service(EmailGateway.class)

 public class EmailGatewayImpl implements EmailGateway {

diff --git a/sandbox/travelsample/contributions/payment-java-contribution/src/main/java/payment/PaymentImpl.java b/sandbox/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/payment/impl/PaymentImpl.java
index 53e896a580..8fb56c67e7 100644
--- a/sandbox/travelsample/contributions/payment-java-contribution/src/main/java/payment/PaymentImpl.java
+++ b/sandbox/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/payment/impl/PaymentImpl.java
@@ -17,7 +17,7 @@
  * under the License.

  */

 

-package payment;

+package com.tuscanyscatours.payment.impl;

 

 import javax.annotation.security.RolesAllowed;

 import javax.annotation.security.RunAs;

@@ -27,13 +27,14 @@ import org.osoa.sca.annotations.Property;
 import org.osoa.sca.annotations.Reference;

 import org.osoa.sca.annotations.Service;

 

-import payment.creditcard.AuthorizeFault_Exception;

-import payment.creditcard.CreditCardDetailsType;

-import payment.creditcard.CreditCardPayment;

-import scatours.customer.Customer;

-import scatours.customer.CustomerNotFoundException;

-import scatours.customer.CustomerRegistry;

-import scatours.emailgateway.EmailGateway;

+import com.tuscanyscatours.customer.Customer;

+import com.tuscanyscatours.customer.CustomerNotFoundException;

+import com.tuscanyscatours.customer.CustomerRegistry;

+import com.tuscanyscatours.emailgateway.EmailGateway;

+import com.tuscanyscatours.payment.Payment;

+import com.tuscanyscatours.payment.creditcard.AuthorizeFault_Exception;

+import com.tuscanyscatours.payment.creditcard.CreditCardDetailsType;

+import com.tuscanyscatours.payment.creditcard.CreditCardPayment;

 

 /**

  * The payment implementation