re-org the modules

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

4 files changed, 0 insertions, 347 deletions

diff --git a/sandbox/travelsample/trip-contribution/META-INF/sca-contribution.xml b/sandbox/travelsample/trip-contribution/META-INF/sca-contribution.xml
deleted file mode 100644
index 8a4f6abf02..0000000000
--- a/sandbox/travelsample/trip-contribution/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,23 +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"/>
-   <export.java package="scatours.trip"/>
-</contribution>
\ No newline at end of file
diff --git a/sandbox/travelsample/trip-contribution/pom.xml b/sandbox/travelsample/trip-contribution/pom.xml
deleted file mode 100644
index e858b5cf1e..0000000000
--- a/sandbox/travelsample/trip-contribution/pom.xml
+++ /dev/null
@@ -1,76 +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.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
-        <version>1.5-SNAPSHOT</version>
-        <!--relativePath>../../pom.xml</relativePath-->
-    </parent>
-    <artifactId>scatours-trip-contribution</artifactId>
-    <name>Apache Tuscany SCA Tours Prepackaged Trip Contribution</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-api</artifactId>
-            <version>1.5-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-data-api</artifactId>
-            <version>1.5-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>scatours-common-contribution</artifactId>
-            <version>1.5-SNAPSHOT</version>
-        </dependency> 
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-       <finalName>${artifactId}</finalName>
-       <sourceDirectory>${basedir}/src</sourceDirectory>
-       <resources>
-          <resource>
-              <directory>${basedir}</directory>
-              <excludes>
-                  <exclude>**/*.java</exclude>
-                  <exclude>**/.*/**</exclude>
-                  <exclude>pom.xml</exclude>
-                  <exclude>build.xml</exclude>
-                  <exclude>target/**</exclude>
-                  <exclude>src/**</exclude>
-              </excludes>
-          </resource>
-       </resources>
-    </build>
-</project>
diff --git a/sandbox/travelsample/trip-contribution/src/scatours/trip/TripImpl.java b/sandbox/travelsample/trip-contribution/src/scatours/trip/TripImpl.java
deleted file mode 100644
index 9d51c8078b..0000000000
--- a/sandbox/travelsample/trip-contribution/src/scatours/trip/TripImpl.java
+++ /dev/null
@@ -1,106 +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.trip;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-import scatours.common.Book;
-import scatours.common.Search;
-import scatours.common.SearchCallback;
-import scatours.common.TripItem;
-import scatours.common.TripLeg;
-
-/**
- * An implementation of the Hotel service
- */
-@Scope("STATELESS")
-@Service(interfaces={Search.class, Book.class})
-public class TripImpl implements Search, Book {
-    
-    private List<TripInfo> trips = new ArrayList<TripInfo>();
-    
-    @Callback
-    protected SearchCallback searchCallback; 
-
-    @Init
-    public void init() {
-        trips.add(new TripInfo("FS1DEC06", 
-                               "Florence and Siena pre-packaged tour",
-                               "LGW",
-                               "FLR",
-                               "06/12/09",
-                               "13/12/09",
-                               "27",
-                               450,
-                               "EUR",
-                               "http://localhost:8085/tbd" ));
-        trips.add(new TripInfo("FS1DEC13", 
-                               "Florence and Siena pre-packaged tour 2",
-                               "LGW",
-                               "FLR",
-                               "13/12/09",
-                               "20/12/09",
-                               "27",
-                               550,
-                               "EUR",
-                               "http://localhost:8085/tbd" ));
-    }
-    
-    public TripItem[] searchSynch(TripLeg tripLeg) {
-        List<TripItem> items = new ArrayList<TripItem>();
-        
-        // find the pre-package trip
-        for(TripInfo trip : trips){
-            if ((trip.getFromLocation().equals(tripLeg.getFromLocation())) &&
-                (trip.getToLocation().equals(tripLeg.getToLocation())) &&
-                (trip.getFromDate().equals(tripLeg.getFromDate()))){
-                TripItem item = new TripItem("",
-                                             "",
-                                             TripItem.TRIP,
-                                             trip.getName(), 
-                                             trip.getDescription(), 
-                                             trip.getFromLocation() + " - " + trip.getToLocation(),
-                                             trip.getFromDate(),
-                                             trip.getToDate(),
-                                             trip.getPricePerPerson(),
-                                             trip.getCurrency(),
-                                             trip.getLink());
-                items.add(item);
-            }
-        }      
-        
-        return items.toArray(new TripItem[items.size()]);
-    }
-    
-    public void searchAsynch(TripLeg tripLeg) {
-        
-        // return available hotels
-        searchCallback.searchResults(searchSynch(tripLeg));  
-    }
-    
-    public String book(TripItem tripItem) {
-        return "trip1";
-    }      
-}
diff --git a/sandbox/travelsample/trip-contribution/src/scatours/trip/TripInfo.java b/sandbox/travelsample/trip-contribution/src/scatours/trip/TripInfo.java
deleted file mode 100644
index 343a3d2cef..0000000000
--- a/sandbox/travelsample/trip-contribution/src/scatours/trip/TripInfo.java
+++ /dev/null
@@ -1,142 +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.trip;
-
-
-public class TripInfo {
-    
-    private String name;
-    private String description;
-    private String fromLocation;
-    private String toLocation;
-    private String fromDate;
-    private String toDate;
-    private String spaces;
-    private double pricePerPerson;
-    private String currency;
-    private String link;
-    
-    public TripInfo() {
-    }  
-    
-    public TripInfo(String name, 
-                    String description, 
-                    String fromLocation,
-                    String toLocation,
-                    String fromDate,
-                    String toDate,
-                    String spaces,
-                    double pricePerPerson,
-                    String currency,
-                    String link) {
-
-        
-        this.name = name;
-        this.description = description;
-        this.fromLocation = fromLocation;
-        this.toLocation = toLocation;
-        this.fromDate = fromDate;
-        this.toDate = toDate;
-        this.spaces = spaces;
-        this.pricePerPerson = pricePerPerson;
-        this.currency = currency;
-        this.link = link;
-    }  
-    
-    public String getName() {
-        return name;
-    }
-    
-    public void setName(String name) {
-        this.name = name;
-    }    
-    
-    public String getDescription() {
-        return description;
-    }
-    
-    public void setDescription(String description) {
-        this.description = description; 
-    }   
-    
-    public String getFromLocation() {
-        return fromLocation;
-    }
-    
-    public void setFromLocation(String fromLocation) {
-        this.fromLocation = fromLocation;
-    }
-    
-    public String getToLocation() {
-        return toLocation;
-    }    
-    
-    public void setToLocation(String toLocation) {
-        this.toLocation = toLocation;
-    }
-    
-    public String getFromDate() {
-        return fromDate;
-    }
-    
-    public void setFromDate(String fromDate) {
-        this.fromDate = fromDate;
-    }
-    
-    public String getToDate() {
-        return toDate;
-    }
-    
-    public void setToDate(String toDate) {
-        this.toDate = toDate;
-    }
-    
-    public String getSpaces() {
-        return spaces;
-    }
-    
-    public void setSpaces(String spaces) {
-        this.spaces = spaces;
-    }
-    
-    public double getPricePerPerson() {
-        return pricePerPerson;
-    }
-    
-    public void setPricePerPerson(double pricePerPerson) {
-        this.pricePerPerson = pricePerPerson;
-    }
-    
-    public String getCurrency() {
-        return currency;
-    }
-    
-    public void setCurrency(String currency) {
-        this.currency = currency;
-    }
-    
-    public String getLink() {
-        return link;
-    }
-    
-    public void setLink(String link) {
-        this.link = link;
-    }
-}
\ No newline at end of file