Update interaction-* and calendar contributions and launcher to new naming convention

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

8 files changed, 0 insertions, 530 deletions

diff --git a/sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/InteractionConversationClient.java b/sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/InteractionConversationClient.java
deleted file mode 100644
index c013cd63fb..0000000000
--- a/sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/InteractionConversationClient.java
+++ /dev/null
@@ -1,78 +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.client;
-
-import java.util.concurrent.CountDownLatch;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-import scatours.common.Search;
-import scatours.common.SearchCallback;
-import scatours.common.TripItem;
-import scatours.common.TripLeg;
-import scatours.shoppingcart.CartStore;
-
-@Scope("COMPOSITE")
-@Service(Runnable.class)
-public class InteractionConversationClient implements Runnable{
-	
-    @Reference
-    protected CartStore cartStoreConversation;
-       
-    public void run() {
-    	System.out.println("\nCalling cart store using the conversational interaction pattern");
-
-    	// add some trip items to the cart store
-    	TripItem tripItem = getTestTripItem();
-    	cartStoreConversation.addTrip(tripItem);
-    	
-    	tripItem.setDescription("2nd trip item");
-    	cartStoreConversation.addTrip(tripItem);
-    	
-        tripItem.setDescription("3rd trip item");
-        cartStoreConversation.addTrip(tripItem);
-
-        System.out.println("Trip items now in cart");
-	    TripItem[] tripItems = cartStoreConversation.getTrips();
-        for (TripItem item : tripItems){
-            System.out.println("Item - " + item.getDescription());
-        }
-	    
-        System.out.println("Reset the cart");
-        cartStoreConversation.reset();
-        
-        System.out.println("Trip items now in cart");
-        tripItems = cartStoreConversation.getTrips();
-        for (TripItem item : tripItems){
-            System.out.println("Item - " + item.getDescription());
-        }
-    }     
-    
-    private TripItem getTestTripItem(){
-        TripItem tripItem = new TripItem();
-        tripItem.setLocation("FLR");
-        tripItem.setFromDate("06/12/09 00:00");
-        tripItem.setToDate("13/12/09 00:00");
-        tripItem.setDescription("1st trip item");
-    	return tripItem;
-    }    
-}
diff --git a/sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/InteractionLocalClient.java b/sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/InteractionLocalClient.java
deleted file mode 100644
index 4ada5ab47f..0000000000
--- a/sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/InteractionLocalClient.java
+++ /dev/null
@@ -1,53 +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.client;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-import calendar.Calendar;
-
-import scatours.common.TripLeg;
-
-@Service(Runnable.class)
-public class InteractionLocalClient implements Runnable {
-	
-    @Reference
-    protected Calendar calendarLocal;
-
-    public void run() {   	
-    	System.out.println("\nCalling calendar component over a local binding");
-    	TripLeg tripLeg = getTestTripLeg();
-    	String toDate = calendarLocal.getEndDate(tripLeg.getFromDate(), 10);
-    	tripLeg.setToDate(toDate);
-    	System.out.println("Calculated trip end date - " + toDate);;
-    }
-    
-    private TripLeg getTestTripLeg(){
-    	TripLeg tripLeg = new TripLeg();
-    	tripLeg.setFromLocation("LGW");
-    	tripLeg.setToLocation("FLR");
-    	tripLeg.setFromDate("06/12/09 00:00");
-    	tripLeg.setToDate("13/12/09 00:00");
-    	tripLeg.setNoOfPeople("1");
-    	tripLeg.setId("TRIP27");
-    	return tripLeg;
-    }
-}
diff --git a/sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/InteractionOneWayCallbackClient.java b/sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/InteractionOneWayCallbackClient.java
deleted file mode 100644
index 94ef5ef284..0000000000
--- a/sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/InteractionOneWayCallbackClient.java
+++ /dev/null
@@ -1,78 +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.client;
-
-import java.util.concurrent.CountDownLatch;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-import scatours.common.Search;
-import scatours.common.SearchCallback;
-import scatours.common.TripItem;
-import scatours.common.TripLeg;
-
-@Scope("COMPOSITE")
-@Service(Runnable.class)
-public class InteractionOneWayCallbackClient implements Runnable, SearchCallback{
-	
-    @Reference
-    protected Search hotelSearchOneWayCallback;
-    
-    CountDownLatch resultsReceivedCountdown;
-    
-    public void run() {
-    	System.out.println("\nCalling hotel component using both one way and callback interation patterns");
-    	resultsReceivedCountdown = new CountDownLatch(1);
-    	TripLeg tripLeg = getTestTripLeg();
-    	hotelSearchOneWayCallback.searchAsynch(tripLeg);
-    	
-    	// start other searched here while the hotel search progresses
-    	
-    	// wait for responses to come back
-        try {
-            resultsReceivedCountdown.await();
-        } catch (InterruptedException ex){
-        }
-    }
-    
-    public void searchResults(TripItem[] items){
-        for (TripItem tripItem : items){
-            System.out.println("Found hotel - " + tripItem.getName());
-        }
-        resultsReceivedCountdown.countDown();
-    }  
-    
-    public void setPercentComplete(String searchComponent, int percentComplete){
-        // Not used in this sample
-    }    
-    
-    private TripLeg getTestTripLeg(){
-    	TripLeg tripLeg = new TripLeg();
-    	tripLeg.setFromLocation("LGW");
-    	tripLeg.setToLocation("FLR");
-    	tripLeg.setFromDate("06/12/09 00:00");
-    	tripLeg.setToDate("13/12/09 00:00");
-    	tripLeg.setNoOfPeople("1");
-    	tripLeg.setId("TRIP27");
-    	return tripLeg;
-    }    
-}
diff --git a/sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/InteractionRemoteClient.java b/sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/InteractionRemoteClient.java
deleted file mode 100644
index 278c7bb08f..0000000000
--- a/sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/InteractionRemoteClient.java
+++ /dev/null
@@ -1,64 +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.client;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-import scatours.common.Search;
-import scatours.common.SearchCallback;
-import scatours.common.TripItem;
-import scatours.common.TripLeg;
-
-@Service(Runnable.class)
-public class InteractionRemoteClient implements Runnable, SearchCallback{
-	
-    @Reference
-    protected Search hotelSearchRemote;
-    
-    public void run() {
-    	System.out.println("\nCalling hotel component over a remote binding");
-    	TripLeg tripLeg = getTestTripLeg();
-    	TripItem[] tripItems = hotelSearchRemote.searchSynch(tripLeg);
-    	for (TripItem tripItem : tripItems){
-    		System.out.println("Found hotel - " + tripItem.getName());
-    	}
-    }
-    
-    public void searchResults(TripItem[] items){
-        // we are calling the hotel component synchronously here
-    	// so the callback interface is not used
-    }      
-    
-    public void setPercentComplete(String searchComponent, int percentComplete){
-        // Not used in this sample
-    }    
-    
-    private TripLeg getTestTripLeg(){
-    	TripLeg tripLeg = new TripLeg();
-    	tripLeg.setFromLocation("LGW");
-    	tripLeg.setToLocation("FLR");
-    	tripLeg.setFromDate("06/12/09 00:00");
-    	tripLeg.setToDate("13/12/09 00:00");
-    	tripLeg.setNoOfPeople("1");
-    	tripLeg.setId("TRIP27");
-    	return tripLeg;
-    }    
-}
diff --git a/sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/InteractionRequestResponseClient.java b/sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/InteractionRequestResponseClient.java
deleted file mode 100644
index b418cf361b..0000000000
--- a/sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/InteractionRequestResponseClient.java
+++ /dev/null
@@ -1,42 +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.client;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-import calendar.Calendar;
-
-import scatours.common.TripLeg;
-import scatours.currencyconverter.CurrencyConverter;
-
-@Service(Runnable.class)
-public class InteractionRequestResponseClient implements Runnable {
-	
-    @Reference
-    protected CurrencyConverter currencyConverterRequestResponse;
-
-    public void run() {   	
-    	System.out.println("\nCalling currency converter component using request response interation pattern");
-    	double exchangeRate = currencyConverterRequestResponse.getExchangeRate("GBP", "USD");
-    	System.out.println("GBP to USD exchange rate is " + exchangeRate);
-    }
-    
-}
diff --git a/sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/InteractionStatefulCallbackClient.java b/sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/InteractionStatefulCallbackClient.java
deleted file mode 100644
index 690c99373e..0000000000
--- a/sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/InteractionStatefulCallbackClient.java
+++ /dev/null
@@ -1,98 +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.client;
-
-import java.util.concurrent.CountDownLatch;
-
-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.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-import scatours.common.Search;
-import scatours.common.SearchCallback;
-import scatours.common.TripItem;
-import scatours.common.TripLeg;
-
-@Scope("CONVERSATION")
-@Service(Runnable.class)
-public class InteractionStatefulCallbackClient implements Runnable, SearchCallback{
-	
-    @Reference
-    protected Search flightSearchStatefulCallback;
-    
-    @Context
-    protected ComponentContext componentContext;
-    
-    CountDownLatch resultsReceivedCountdown;
-    
-    public void run() {
-    	System.out.println("\nCalling flight component using stateful callback interation pattern");
-    	resultsReceivedCountdown = new CountDownLatch(1);
-    	TripLeg tripLeg = getTestTripLeg();
-    	
-        ServiceReference<Search> dynamicFlightSearchStatefulCallback = 
-            componentContext.getServiceReference(Search.class, "flightSearchStatefulCallback");
-        dynamicFlightSearchStatefulCallback.setConversationID("SomeUniqeID"); 
-        Search flightSearch = dynamicFlightSearchStatefulCallback.getService();
-       
-        flightSearch.searchAsynch(tripLeg);
-    	       
-        // wait for a while and see how the flight search is getting one
-        try {
-            Thread.sleep(1200);
-        } catch(Exception ex){
-            // do nothing
-        }
-        System.out.println("Flight search is " + flightSearch.getPercentComplete() + "% complete");
-        	
-    	// wait for responses to come back
-        try {
-            resultsReceivedCountdown.await();
-        } catch (InterruptedException ex){
-        }
-    }
-    
-    public void searchResults(TripItem[] items){
-        System.out.println("Received results in conversation - " + componentContext.getRequestContext().getServiceReference().getConversation().getConversationID());
-        for (TripItem tripItem : items){
-            System.out.println("Found flight - " + tripItem.getName());
-        }
-        resultsReceivedCountdown.countDown();
-    }      
-    
-    public void setPercentComplete(String searchComponent, int percentComplete){
-        System.out.println(searchComponent + " search is " + percentComplete + "% complete");
-    }    
-    
-    private TripLeg getTestTripLeg(){
-    	TripLeg tripLeg = new TripLeg();
-    	tripLeg.setFromLocation("LGW");
-    	tripLeg.setToLocation("FLR");
-    	tripLeg.setFromDate("06/12/09");
-    	tripLeg.setToDate("13/12/09");
-    	tripLeg.setNoOfPeople("1");
-    	tripLeg.setId("TRIP27");
-    	return tripLeg;
-    }    
-}
diff --git a/sandbox/travelsample/contributions/interaction-client-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/interaction-client-contribution/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index bc47b4de2e..0000000000
--- a/sandbox/travelsample/contributions/interaction-client-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,27 +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"
-              xmlns:client="http://client.scatours/">
-    <import.java package="calendar"/>
-    <import.java package="scatours.common"/>
-    <import.java package="scatours.currencyconverter"/>
-    <import.java package="scatours.shoppingcart"/>
-    <deployable composite="client:Client" />
-</contribution>
diff --git a/sandbox/travelsample/contributions/interaction-client-contribution/src/main/resources/client.composite b/sandbox/travelsample/contributions/interaction-client-contribution/src/main/resources/client.composite
deleted file mode 100644
index 2900b764f6..0000000000
--- a/sandbox/travelsample/contributions/interaction-client-contribution/src/main/resources/client.composite
+++ /dev/null
@@ -1,90 +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.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-    targetNamespace="http://client.scatours/"
-    name="Client">
-
-    <!-- Local interaction -->
-    <component name="InteractionLocalClient">
-        <implementation.java class="scatours.client.InteractionLocalClient" />
-        <reference name="calendarLocal" 
-                   target="Calendar"/>
-     </component>
-     
-    <component name="Calendar">
-		<implementation.java class="calendar.CalendarImpl"/>
-    </component> 
-    
-    <!-- Remote interaction -->
-    <component name="InteractionRemoteClient">
-        <implementation.java class="scatours.client.InteractionRemoteClient" />
-        <reference name="hotelSearchRemote">
-            <binding.ws uri="http://localhost:8081/Hotel/Search"/>
-        </reference>
-    </component>
-     
-    <!-- Request response interaction -->
-    <component name="InteractionRequestResponseClient">
-        <implementation.java class="scatours.client.InteractionRequestResponseClient" />
-        <reference name="currencyConverterRequestResponse" target="CurrencyConverter"/>
-    </component>
-     
-    <component name="CurrencyConverter">
-        <implementation.java class="scatours.currencyconverter.CurrencyConverterImpl"/>
-    </component> 
-    
-    <!-- One way and callback interaction -->
-    <component name="InteractionOneWayCallbackClient">
-        <implementation.java class="scatours.client.InteractionOneWayCallbackClient" />
-        <reference name="hotelSearchOneWayCallback">
-            <interface.java interface="scatours.common.Search" 
-                    callbackInterface="scatours.common.SearchCallback"/>
-            <binding.ws uri="http://localhost:8081/Hotel/Search"/>
-            <callback>
-                <binding.ws uri="http://localhost:8080/Client/SearchCallback"/>
-            </callback>
-        </reference>
-     </component>
-     
-     <!-- Conversational interaction -->
-     <component name="InteractionConversationClient">
-        <implementation.java class="scatours.client.InteractionConversationClient" />
-        <reference name="cartStoreConversation" target="CartStore"/>
-     </component>
-              
-    <component name="CartStore">
-        <implementation.java class="scatours.shoppingcart.CartStoreImpl"/>
-        <service name="CartStore"/>
-    </component> 
-    
-    <!-- Stateful callback interaction -->
-    <component name="InteractionStatefulCallbackClient">
-        <implementation.java class="scatours.client.InteractionStatefulCallbackClient" />
-        <reference name="flightSearchStatefulCallback">
-            <interface.java interface="scatours.common.Search" 
-                    callbackInterface="scatours.common.SearchCallback"/>
-            <binding.ws uri="http://localhost:8081/Hotel/SearchConversational"/>
-            <callback>
-                <binding.ws uri="http://localhost:8080/Client/SearchCallbackConversational"/>
-            </callback>
-        </reference>
-     </component>    
-
-</composite>