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

3 files changed, 0 insertions, 148 deletions

diff --git a/sandbox/travelsample/contributions/tripbooking-contribution/src/main/java/scatours/tripbooking/TripBooking.java b/sandbox/travelsample/contributions/tripbooking-contribution/src/main/java/scatours/tripbooking/TripBooking.java
deleted file mode 100644
index 8959bc29f3..0000000000
--- a/sandbox/travelsample/contributions/tripbooking-contribution/src/main/java/scatours/tripbooking/TripBooking.java
+++ /dev/null
@@ -1,32 +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.tripbooking;

-

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

-

-import scatours.common.TripItem;

-

-/**

- * The Trip service interface

- */

-@Remotable

-public interface TripBooking {

-       

-    TripItem bookTrip(String cartId, TripItem trip);

-}

diff --git a/sandbox/travelsample/contributions/tripbooking-contribution/src/main/java/scatours/tripbooking/TripBookingImpl.java b/sandbox/travelsample/contributions/tripbooking-contribution/src/main/java/scatours/tripbooking/TripBookingImpl.java
deleted file mode 100644
index debbafda64..0000000000
--- a/sandbox/travelsample/contributions/tripbooking-contribution/src/main/java/scatours/tripbooking/TripBookingImpl.java
+++ /dev/null
@@ -1,91 +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.tripbooking;

-

-import org.osoa.sca.ComponentContext;

-import org.osoa.sca.ServiceReference;

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

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

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

-

-import scatours.common.Book;

-import scatours.common.TripItem;

-import scatours.shoppingcart.ShoppingCart;

-

-/**

- * An implementation of the Trip service

- */

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

-public class TripBookingImpl implements TripBooking{

-

-    @Reference 

-    protected Book hotelBook;

-    

-    @Reference 

-    protected Book flightBook;

-    

-    @Reference 

-    protected Book carBook;

-    

-    @Reference 

-    protected Book tripBook;   

-    

-    @Reference 

-    protected ShoppingCart shoppingCart;

-    

-    @Context

-    protected ComponentContext componentContext;     

-    

-    public TripItem bookTrip(String cartId, TripItem trip) {

-        

-        String bookingCode = "";

-        

-        // book any nested items

-        TripItem[] nestedItems = trip.getTripItems();

-        if (nestedItems != null){

-            for(int i = 0; i < nestedItems.length; i++ ){

-                TripItem tripItem = nestedItems[i];

-                if (tripItem.getType().equals(TripItem.CAR)){

-                    tripItem.setBookingCode(carBook.book(tripItem));

-                } else if (tripItem.getType().equals(TripItem.FLIGHT)){

-                    tripItem.setBookingCode(flightBook.book(tripItem));

-                } else if (tripItem.getType().equals(TripItem.HOTEL)){

-                    tripItem.setBookingCode(hotelBook.book(tripItem));

-                } else {

-                    tripItem.setBookingCode(tripItem.getType() + " is invalid");

-                }

-            }

-        }

-        

-        // book the top level item if it's a packaged trip

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

-            bookingCode = tripBook.book(trip);

-            trip.setBookingCode(bookingCode);

-        }

-        

-        // add trip to the shopping cart

-        ServiceReference<ShoppingCart> cart = componentContext.getServiceReference(ShoppingCart.class, 

-                                                                                   "shoppingCart");

-        cart.setConversationID(cartId);

-        cart.getService().addTrip(cartId, trip);

-        

-        return trip;

-    }

- 

-}

diff --git a/sandbox/travelsample/contributions/tripbooking-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/tripbooking-contribution/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index b8f57ddbd0..0000000000
--- a/sandbox/travelsample/contributions/tripbooking-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

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

--->

-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">

-   <import.java package="scatours.common"/>

-   <import.java package="scatours.currencyconverter"/>

-   <import.java package="scatours.shoppingcart"/>

-   <export.java package="scatours.tripbooking"/>

-</contribution>
\ No newline at end of file