Author: rfeng
Date: Fri Feb 27 21:22:24 2009
New Revision: 748706
URL: http://svn.apache.org/viewvc?rev=748706&view=rev
Log:
Organize imports
Modified:
tuscany/sandbox/travelsample/chapter-01/src/main/java/client/TripClient.java
tuscany/sandbox/travelsample/chapter-05/node/src/main/java/scatours/LaunchNode.java
tuscany/sandbox/travelsample/chapter-06/payment-javascript-contribution/src/test/java/payment/creditcard/CreditCardPaymentImpl.java
tuscany/sandbox/travelsample/chapter-09/node/src/main/java/scatours/LaunchNode.java
tuscany/sandbox/travelsample/chapter-09/payment-contribution/src/test/java/payment/PaymentTestCase.java
tuscany/sandbox/travelsample/chapter-09/payment-contribution/src/test/java/payment/creditcard/CreditCardPaymentImpl.java
tuscany/sandbox/travelsample/shared-contributions/calendar-contribution/src/main/java/calendar/CalendarImpl.java
tuscany/sandbox/travelsample/shared-contributions/common-contribution/src/main/java/scatours/common/Book.java
tuscany/sandbox/travelsample/shared-contributions/common-contribution/src/main/java/scatours/common/Search.java
tuscany/sandbox/travelsample/shared-contributions/common-contribution/src/main/java/scatours/common/SearchCallback.java
tuscany/sandbox/travelsample/shared-contributions/common-contribution/src/main/java/scatours/common/TripItem.java
tuscany/sandbox/travelsample/shared-contributions/creditcard-payment-jaxb-contribution/src/main/java/payment/creditcard/CreditCardPaymentImpl.java
tuscany/sandbox/travelsample/shared-contributions/emailgateway-contribution/src/test/java/scatours/emailgateway/EmailGatewayTestCase.java
tuscany/sandbox/travelsample/shared-contributions/payment-java-contribution/src/test/java/payment/creditcard/CreditCardPaymentImpl.java
tuscany/sandbox/travelsample/shared-contributions/scatours-contribution/src/main/java/scatours/SCAToursCart.java
tuscany/sandbox/travelsample/shared-contributions/scatours-contribution/src/main/java/scatours/SCAToursImpl.java
tuscany/sandbox/travelsample/shared-contributions/shoppingcart-contribution/src/main/java/scatours/shoppingcart/ShoppingCartImpl.java
tuscany/sandbox/travelsample/shared-contributions/travelcatalog-contribution/src/main/java/scatours/travelcatalog/TravelCatalogImpl.java
tuscany/sandbox/travelsample/shared-contributions/tripbooking-contribution/src/main/java/scatours/tripbooking/TripBooking.java
tuscany/sandbox/travelsample/shared-contributions/tripbooking-contribution/src/main/java/scatours/tripbooking/TripBookingImpl.java
Modified:
tuscany/sandbox/travelsample/chapter-01/src/main/java/client/TripClient.java
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/chapter-01/src/main/java/client/TripClient.java?rev=748706&r1=748705&r2=748706&view=diff
==============================================================================
---
tuscany/sandbox/travelsample/chapter-01/src/main/java/client/TripClient.java
(original)
+++
tuscany/sandbox/travelsample/chapter-01/src/main/java/client/TripClient.java
Fri Feb 27 21:22:24 2009
@@ -22,7 +22,6 @@
import org.apache.tuscany.sca.node.SCANode;
import org.apache.tuscany.sca.node.SCANodeFactory;
-
import trip.Trip;
/**
Modified:
tuscany/sandbox/travelsample/chapter-05/node/src/main/java/scatours/LaunchNode.java
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/chapter-05/node/src/main/java/scatours/LaunchNode.java?rev=748706&r1=748705&r2=748706&view=diff
==============================================================================
---
tuscany/sandbox/travelsample/chapter-05/node/src/main/java/scatours/LaunchNode.java
(original)
+++
tuscany/sandbox/travelsample/chapter-05/node/src/main/java/scatours/LaunchNode.java
Fri Feb 27 21:22:24 2009
@@ -24,7 +24,6 @@
import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode;
import org.apache.tuscany.sca.node.SCANodeFactory;
-import org.apache.tuscany.sca.node.launcher.NodeLauncher;
public class LaunchNode {
public static void main(String[] args) throws Exception {
Modified:
tuscany/sandbox/travelsample/chapter-06/payment-javascript-contribution/src/test/java/payment/creditcard/CreditCardPaymentImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/chapter-06/payment-javascript-contribution/src/test/java/payment/creditcard/CreditCardPaymentImpl.java?rev=748706&r1=748705&r2=748706&view=diff
==============================================================================
---
tuscany/sandbox/travelsample/chapter-06/payment-javascript-contribution/src/test/java/payment/creditcard/CreditCardPaymentImpl.java
(original)
+++
tuscany/sandbox/travelsample/chapter-06/payment-javascript-contribution/src/test/java/payment/creditcard/CreditCardPaymentImpl.java
Fri Feb 27 21:22:24 2009
@@ -21,9 +21,6 @@
import org.osoa.sca.annotations.Service;
-import payment.creditcard.CreditCardDetailsType;
-import payment.creditcard.CreditCardPayment;
-
@Service(CreditCardPayment.class)
public class CreditCardPaymentImpl implements CreditCardPayment {
Modified:
tuscany/sandbox/travelsample/chapter-09/node/src/main/java/scatours/LaunchNode.java
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/chapter-09/node/src/main/java/scatours/LaunchNode.java?rev=748706&r1=748705&r2=748706&view=diff
==============================================================================
---
tuscany/sandbox/travelsample/chapter-09/node/src/main/java/scatours/LaunchNode.java
(original)
+++
tuscany/sandbox/travelsample/chapter-09/node/src/main/java/scatours/LaunchNode.java
Fri Feb 27 21:22:24 2009
@@ -24,7 +24,6 @@
import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode;
import org.apache.tuscany.sca.node.SCANodeFactory;
-import org.apache.tuscany.sca.node.launcher.NodeLauncher;
public class LaunchNode {
public static void main(String[] args) throws Exception {
Modified:
tuscany/sandbox/travelsample/chapter-09/payment-contribution/src/test/java/payment/PaymentTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/chapter-09/payment-contribution/src/test/java/payment/PaymentTestCase.java?rev=748706&r1=748705&r2=748706&view=diff
==============================================================================
---
tuscany/sandbox/travelsample/chapter-09/payment-contribution/src/test/java/payment/PaymentTestCase.java
(original)
+++
tuscany/sandbox/travelsample/chapter-09/payment-contribution/src/test/java/payment/PaymentTestCase.java
Fri Feb 27 21:22:24 2009
@@ -24,14 +24,8 @@
import org.apache.tuscany.sca.node.SCANodeFactory;
import org.junit.AfterClass;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import org.junit.Test;
-import payment.creditcard.CreditCardDetailsType;
-import payment.creditcard.CreditCardTypeType;
-import payment.creditcard.ObjectFactory;
-import payment.creditcard.PayerType;
-
/**
*
*/
Modified:
tuscany/sandbox/travelsample/chapter-09/payment-contribution/src/test/java/payment/creditcard/CreditCardPaymentImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/chapter-09/payment-contribution/src/test/java/payment/creditcard/CreditCardPaymentImpl.java?rev=748706&r1=748705&r2=748706&view=diff
==============================================================================
---
tuscany/sandbox/travelsample/chapter-09/payment-contribution/src/test/java/payment/creditcard/CreditCardPaymentImpl.java
(original)
+++
tuscany/sandbox/travelsample/chapter-09/payment-contribution/src/test/java/payment/creditcard/CreditCardPaymentImpl.java
Fri Feb 27 21:22:24 2009
@@ -21,9 +21,6 @@
import org.osoa.sca.annotations.Service;
-import payment.creditcard.CreditCardDetailsType;
-import payment.creditcard.CreditCardPayment;
-
/**
*
*/
Modified:
tuscany/sandbox/travelsample/shared-contributions/calendar-contribution/src/main/java/calendar/CalendarImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/shared-contributions/calendar-contribution/src/main/java/calendar/CalendarImpl.java?rev=748706&r1=748705&r2=748706&view=diff
==============================================================================
---
tuscany/sandbox/travelsample/shared-contributions/calendar-contribution/src/main/java/calendar/CalendarImpl.java
(original)
+++
tuscany/sandbox/travelsample/shared-contributions/calendar-contribution/src/main/java/calendar/CalendarImpl.java
Fri Feb 27 21:22:24 2009
@@ -20,9 +20,6 @@
import java.text.DateFormat;
import java.util.Date;
-import java.util.TimeZone;
-import java.util.logging.Level;
-import java.util.logging.Logger;
/**
* An implementation of the Add service
Modified:
tuscany/sandbox/travelsample/shared-contributions/common-contribution/src/main/java/scatours/common/Book.java
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/shared-contributions/common-contribution/src/main/java/scatours/common/Book.java?rev=748706&r1=748705&r2=748706&view=diff
==============================================================================
---
tuscany/sandbox/travelsample/shared-contributions/common-contribution/src/main/java/scatours/common/Book.java
(original)
+++
tuscany/sandbox/travelsample/shared-contributions/common-contribution/src/main/java/scatours/common/Book.java
Fri Feb 27 21:22:24 2009
@@ -19,10 +19,6 @@
package scatours.common;
-import java.util.List;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.OneWay;
import org.osoa.sca.annotations.Remotable;
@Remotable
Modified:
tuscany/sandbox/travelsample/shared-contributions/common-contribution/src/main/java/scatours/common/Search.java
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/shared-contributions/common-contribution/src/main/java/scatours/common/Search.java?rev=748706&r1=748705&r2=748706&view=diff
==============================================================================
---
tuscany/sandbox/travelsample/shared-contributions/common-contribution/src/main/java/scatours/common/Search.java
(original)
+++
tuscany/sandbox/travelsample/shared-contributions/common-contribution/src/main/java/scatours/common/Search.java
Fri Feb 27 21:22:24 2009
@@ -19,8 +19,6 @@
package scatours.common;
-import java.util.List;
-
import org.osoa.sca.annotations.Callback;
import org.osoa.sca.annotations.OneWay;
import org.osoa.sca.annotations.Remotable;
Modified:
tuscany/sandbox/travelsample/shared-contributions/common-contribution/src/main/java/scatours/common/SearchCallback.java
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/shared-contributions/common-contribution/src/main/java/scatours/common/SearchCallback.java?rev=748706&r1=748705&r2=748706&view=diff
==============================================================================
---
tuscany/sandbox/travelsample/shared-contributions/common-contribution/src/main/java/scatours/common/SearchCallback.java
(original)
+++
tuscany/sandbox/travelsample/shared-contributions/common-contribution/src/main/java/scatours/common/SearchCallback.java
Fri Feb 27 21:22:24 2009
@@ -19,9 +19,6 @@
package scatours.common;
-import java.util.List;
-
-import org.apache.tuscany.sca.data.collection.Item;
import org.osoa.sca.annotations.Remotable;
@Remotable
Modified:
tuscany/sandbox/travelsample/shared-contributions/common-contribution/src/main/java/scatours/common/TripItem.java
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/shared-contributions/common-contribution/src/main/java/scatours/common/TripItem.java?rev=748706&r1=748705&r2=748706&view=diff
==============================================================================
---
tuscany/sandbox/travelsample/shared-contributions/common-contribution/src/main/java/scatours/common/TripItem.java
(original)
+++
tuscany/sandbox/travelsample/shared-contributions/common-contribution/src/main/java/scatours/common/TripItem.java
Fri Feb 27 21:22:24 2009
@@ -19,7 +19,6 @@
package scatours.common;
-import java.util.List;
public class TripItem {
Modified:
tuscany/sandbox/travelsample/shared-contributions/creditcard-payment-jaxb-contribution/src/main/java/payment/creditcard/CreditCardPaymentImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/shared-contributions/creditcard-payment-jaxb-contribution/src/main/java/payment/creditcard/CreditCardPaymentImpl.java?rev=748706&r1=748705&r2=748706&view=diff
==============================================================================
---
tuscany/sandbox/travelsample/shared-contributions/creditcard-payment-jaxb-contribution/src/main/java/payment/creditcard/CreditCardPaymentImpl.java
(original)
+++
tuscany/sandbox/travelsample/shared-contributions/creditcard-payment-jaxb-contribution/src/main/java/payment/creditcard/CreditCardPaymentImpl.java
Fri Feb 27 21:22:24 2009
@@ -21,9 +21,6 @@
import org.osoa.sca.annotations.Service;
-import payment.creditcard.CreditCardDetailsType;
-import payment.creditcard.CreditCardPayment;
-
/**
*
*/
Modified:
tuscany/sandbox/travelsample/shared-contributions/emailgateway-contribution/src/test/java/scatours/emailgateway/EmailGatewayTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/shared-contributions/emailgateway-contribution/src/test/java/scatours/emailgateway/EmailGatewayTestCase.java?rev=748706&r1=748705&r2=748706&view=diff
==============================================================================
---
tuscany/sandbox/travelsample/shared-contributions/emailgateway-contribution/src/test/java/scatours/emailgateway/EmailGatewayTestCase.java
(original)
+++
tuscany/sandbox/travelsample/shared-contributions/emailgateway-contribution/src/test/java/scatours/emailgateway/EmailGatewayTestCase.java
Fri Feb 27 21:22:24 2009
@@ -24,7 +24,6 @@
import org.apache.tuscany.sca.node.SCANodeFactory;
import org.junit.AfterClass;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import org.junit.Test;
/**
Modified:
tuscany/sandbox/travelsample/shared-contributions/payment-java-contribution/src/test/java/payment/creditcard/CreditCardPaymentImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/shared-contributions/payment-java-contribution/src/test/java/payment/creditcard/CreditCardPaymentImpl.java?rev=748706&r1=748705&r2=748706&view=diff
==============================================================================
---
tuscany/sandbox/travelsample/shared-contributions/payment-java-contribution/src/test/java/payment/creditcard/CreditCardPaymentImpl.java
(original)
+++
tuscany/sandbox/travelsample/shared-contributions/payment-java-contribution/src/test/java/payment/creditcard/CreditCardPaymentImpl.java
Fri Feb 27 21:22:24 2009
@@ -21,9 +21,6 @@
import org.osoa.sca.annotations.Service;
-import payment.creditcard.CreditCardDetailsType;
-import payment.creditcard.CreditCardPayment;
-
@Service(CreditCardPayment.class)
public class CreditCardPaymentImpl implements CreditCardPayment {
Modified:
tuscany/sandbox/travelsample/shared-contributions/scatours-contribution/src/main/java/scatours/SCAToursCart.java
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/shared-contributions/scatours-contribution/src/main/java/scatours/SCAToursCart.java?rev=748706&r1=748705&r2=748706&view=diff
==============================================================================
---
tuscany/sandbox/travelsample/shared-contributions/scatours-contribution/src/main/java/scatours/SCAToursCart.java
(original)
+++
tuscany/sandbox/travelsample/shared-contributions/scatours-contribution/src/main/java/scatours/SCAToursCart.java
Fri Feb 27 21:22:24 2009
@@ -18,7 +18,6 @@
*/
package scatours;
-import org.osoa.sca.annotations.Conversational;
import org.osoa.sca.annotations.Remotable;
import scatours.common.TripItem;
Modified:
tuscany/sandbox/travelsample/shared-contributions/scatours-contribution/src/main/java/scatours/SCAToursImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/shared-contributions/scatours-contribution/src/main/java/scatours/SCAToursImpl.java?rev=748706&r1=748705&r2=748706&view=diff
==============================================================================
---
tuscany/sandbox/travelsample/shared-contributions/scatours-contribution/src/main/java/scatours/SCAToursImpl.java
(original)
+++
tuscany/sandbox/travelsample/shared-contributions/scatours-contribution/src/main/java/scatours/SCAToursImpl.java
Fri Feb 27 21:22:24 2009
@@ -18,10 +18,7 @@
*/
package scatours;
-import java.util.ArrayList;
-import java.util.Arrays;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
import java.util.UUID;
@@ -34,7 +31,6 @@
import scatours.common.TripItem;
import scatours.common.TripLeg;
-//import scatours.paymentprocess.PaymentProcess;
import scatours.shoppingcart.ShoppingCart;
import scatours.travelcatalog.TravelCatalogSearch;
import scatours.tripbooking.TripBooking;
Modified:
tuscany/sandbox/travelsample/shared-contributions/shoppingcart-contribution/src/main/java/scatours/shoppingcart/ShoppingCartImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/shared-contributions/shoppingcart-contribution/src/main/java/scatours/shoppingcart/ShoppingCartImpl.java?rev=748706&r1=748705&r2=748706&view=diff
==============================================================================
---
tuscany/sandbox/travelsample/shared-contributions/shoppingcart-contribution/src/main/java/scatours/shoppingcart/ShoppingCartImpl.java
(original)
+++
tuscany/sandbox/travelsample/shared-contributions/shoppingcart-contribution/src/main/java/scatours/shoppingcart/ShoppingCartImpl.java
Fri Feb 27 21:22:24 2009
@@ -19,22 +19,16 @@
package scatours.shoppingcart;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
-
import org.osoa.sca.annotations.ConversationID;
import org.osoa.sca.annotations.Destroy;
import org.osoa.sca.annotations.Init;
import org.osoa.sca.annotations.Reference;
-
import org.osoa.sca.annotations.Scope;
import org.osoa.sca.annotations.Service;
import payment.Payment;
-
-
import scatours.common.TripItem;
/**
Modified:
tuscany/sandbox/travelsample/shared-contributions/travelcatalog-contribution/src/main/java/scatours/travelcatalog/TravelCatalogImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/shared-contributions/travelcatalog-contribution/src/main/java/scatours/travelcatalog/TravelCatalogImpl.java?rev=748706&r1=748705&r2=748706&view=diff
==============================================================================
---
tuscany/sandbox/travelsample/shared-contributions/travelcatalog-contribution/src/main/java/scatours/travelcatalog/TravelCatalogImpl.java
(original)
+++
tuscany/sandbox/travelsample/shared-contributions/travelcatalog-contribution/src/main/java/scatours/travelcatalog/TravelCatalogImpl.java
Fri Feb 27 21:22:24 2009
@@ -19,14 +19,9 @@
package scatours.travelcatalog;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
import java.util.UUID;
-import org.apache.tuscany.sca.data.collection.Entry;
-import org.apache.tuscany.sca.data.collection.NotFoundException;
-import org.osoa.sca.CallableReference;
import org.osoa.sca.ComponentContext;
import org.osoa.sca.RequestContext;
import org.osoa.sca.ServiceReference;
Modified:
tuscany/sandbox/travelsample/shared-contributions/tripbooking-contribution/src/main/java/scatours/tripbooking/TripBooking.java
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/shared-contributions/tripbooking-contribution/src/main/java/scatours/tripbooking/TripBooking.java?rev=748706&r1=748705&r2=748706&view=diff
==============================================================================
---
tuscany/sandbox/travelsample/shared-contributions/tripbooking-contribution/src/main/java/scatours/tripbooking/TripBooking.java
(original)
+++
tuscany/sandbox/travelsample/shared-contributions/tripbooking-contribution/src/main/java/scatours/tripbooking/TripBooking.java
Fri Feb 27 21:22:24 2009
@@ -18,10 +18,6 @@
*/
package scatours.tripbooking;
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.EndsConversation;
-import org.osoa.sca.annotations.Init;
import org.osoa.sca.annotations.Remotable;
import scatours.common.TripItem;
Modified:
tuscany/sandbox/travelsample/shared-contributions/tripbooking-contribution/src/main/java/scatours/tripbooking/TripBookingImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/shared-contributions/tripbooking-contribution/src/main/java/scatours/tripbooking/TripBookingImpl.java?rev=748706&r1=748705&r2=748706&view=diff
==============================================================================
---
tuscany/sandbox/travelsample/shared-contributions/tripbooking-contribution/src/main/java/scatours/tripbooking/TripBookingImpl.java
(original)
+++
tuscany/sandbox/travelsample/shared-contributions/tripbooking-contribution/src/main/java/scatours/tripbooking/TripBookingImpl.java
Fri Feb 27 21:22:24 2009
@@ -18,24 +18,12 @@
*/
package scatours.tripbooking;
-import java.util.HashMap;
-import java.util.Map;
-
-
import org.osoa.sca.ComponentContext;
-import org.osoa.sca.ServiceReference;
import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Init;
import org.osoa.sca.annotations.Reference;
-
-import org.osoa.sca.annotations.Scope;
import org.osoa.sca.annotations.Service;
-
import scatours.common.Book;
-import scatours.common.Search;
import scatours.common.TripItem;
import scatours.shoppingcart.ShoppingCart;
