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

4 files changed, 0 insertions, 256 deletions

diff --git a/sandbox/travelsample/contributions/shoppingcart-contribution/src/main/java/scatours/shoppingcart/CartStore.java b/sandbox/travelsample/contributions/shoppingcart-contribution/src/main/java/scatours/shoppingcart/CartStore.java
deleted file mode 100644
index 949a602686..0000000000
--- a/sandbox/travelsample/contributions/shoppingcart-contribution/src/main/java/scatours/shoppingcart/CartStore.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * 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.    
- */
-package scatours.shoppingcart;
-
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.EndsConversation;
-import org.osoa.sca.annotations.Remotable;
-
-import scatours.common.TripItem;
-
-/**
- * The CartStore service interface
- */
-@Remotable
-@Conversational
-public interface CartStore{
-    void addTrip(TripItem trip);
-    
-    void removeTrip(TripItem trip);
-    
-    TripItem[] getTrips();
-    
-    @EndsConversation
-    void reset();  
-}
diff --git a/sandbox/travelsample/contributions/shoppingcart-contribution/src/main/java/scatours/shoppingcart/CartStoreImpl.java b/sandbox/travelsample/contributions/shoppingcart-contribution/src/main/java/scatours/shoppingcart/CartStoreImpl.java
deleted file mode 100644
index 934bc04f75..0000000000
--- a/sandbox/travelsample/contributions/shoppingcart-contribution/src/main/java/scatours/shoppingcart/CartStoreImpl.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * 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.    
- */
-package scatours.shoppingcart;
-
-import java.util.ArrayList;
-import java.util.List;
-
-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;
-
-/**
- * An implementation of the Trip service
- */
-@Scope("CONVERSATION")
-@Service(interfaces={CartStore.class})
-public class CartStoreImpl implements CartStore{
-
-    @ConversationID
-    protected String cartId;
-    
-    private List<TripItem> trips = new ArrayList<TripItem>();
-        
-    @Init
-    public void initCart() {
-        System.out.println("CartStore init for id: " + cartId);
-    }
-    
-    @Destroy
-    public void destroyCart() {
-        System.out.println("CartStore destroy for id: " + cartId);
-    }
-    
-    public void addTrip(TripItem trip) {
-        trips.add(trip);
-    }
-    
-    public void removeTrip(TripItem trip) {
-        trips.remove(trip);
-    }
-    
-    public TripItem[] getTrips(){
-        return trips.toArray(new TripItem[trips.size()]);
-    }
-    
-    public void reset(){ 
-        trips.clear();
-    }   
-}
diff --git a/sandbox/travelsample/contributions/shoppingcart-contribution/src/main/java/scatours/shoppingcart/ShoppingCart.java b/sandbox/travelsample/contributions/shoppingcart-contribution/src/main/java/scatours/shoppingcart/ShoppingCart.java
deleted file mode 100644
index e2773f6754..0000000000
--- a/sandbox/travelsample/contributions/shoppingcart-contribution/src/main/java/scatours/shoppingcart/ShoppingCart.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*

- * 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.    

- */

-package scatours.shoppingcart;

-

-import org.osoa.sca.annotations.Conversational;

-import org.osoa.sca.annotations.EndsConversation;

-import org.osoa.sca.annotations.Remotable;

-

-import scatours.common.TripItem;

-

-/**

- * The ShoppingCart service interface

- */

-@Remotable

-public interface ShoppingCart{

-	String newCart();

-    void addTrip(String cartId,TripItem trip);

-    void removeTrip(String cartId,TripItem trip);

-    TripItem[] getTrips(String cartId);

-    void checkout(String cartId,String name);  

-}

diff --git a/sandbox/travelsample/contributions/shoppingcart-contribution/src/main/java/scatours/shoppingcart/ShoppingCartImpl.java b/sandbox/travelsample/contributions/shoppingcart-contribution/src/main/java/scatours/shoppingcart/ShoppingCartImpl.java
deleted file mode 100644
index fa4ef02e55..0000000000
--- a/sandbox/travelsample/contributions/shoppingcart-contribution/src/main/java/scatours/shoppingcart/ShoppingCartImpl.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*

- * 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.    

- */

-package scatours.shoppingcart;

-

-import java.util.ArrayList;

-import java.util.HashMap;

-import java.util.List;

-import java.util.Map;

-import java.util.UUID;

-

-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 payment.Payment;

-import scatours.common.TripItem;

-

-/**

- * An implementation of the Trip service

- */

-@Service(interfaces={ShoppingCart.class})

-public class ShoppingCartImpl implements ShoppingCart{

-    

-    @Reference

-    protected Payment payment; 

-    

-    @Reference 

-    protected CartStore cartStore;

-    

-    @Context

-    protected ComponentContext componentContext;  

-    

-    private static Map<String, CartStore> cartStores = new HashMap<String, CartStore>();

-    

-    public String newCart(){

-        String cartId = UUID.randomUUID().toString();

-        ServiceReference<CartStore> cartStore = componentContext.getServiceReference(CartStore.class, 

-                                                                                           "cartStore");

-        cartStore.setConversationID(cartId);

-        cartStores.put(cartId, cartStore.getService());

-        

-        return cartId;

-    }  

-    

-    public void addTrip(String cartId, TripItem trip) {

-    	cartStores.get(cartId).addTrip(trip);

-    }

-    

-    public void removeTrip(String cartId, TripItem trip) {

-    	cartStores.get(cartId).addTrip(trip);

-    }

-    

-    public TripItem[] getTrips(String cartId){

-        return cartStores.get(cartId).getTrips();

-    }

-    

-    public void checkout(String cartId, String customerName){ 

-        // get users credentials. Hard coded for now but should

-        // come from the security context

-        String customerId = customerName;

-       

-        // get the total for all the trips

-        float amount = (float)0.0;

-        

-        TripItem[] trips = getTrips(cartId);

-        

-        for (TripItem trip : trips){

-            if (trip.getType().equals(TripItem.TRIP)){

-                amount += trip.getPrice();

-            } else {

-                for (TripItem tripItem : trip.getTripItems()){

-                    amount += tripItem.getPrice();

-                }

-            }

-        }

-        

-        // Take the payment from the customer

-        payment.makePaymentMember(customerId, amount);

-        

-        // reset the cart store

-        cartStores.get(cartId).reset();

-        cartStores.remove(cartId);

-    }  

-    

-}