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

6 files changed, 0 insertions, 449 deletions

diff --git a/sandbox/travelsample/contributions/common-contribution/src/main/java/scatours/common/Book.java b/sandbox/travelsample/contributions/common-contribution/src/main/java/scatours/common/Book.java
deleted file mode 100644
index 0c8033d137..0000000000
--- a/sandbox/travelsample/contributions/common-contribution/src/main/java/scatours/common/Book.java
+++ /dev/null
@@ -1,27 +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.common;

-

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

-

-@Remotable

-public interface Book {

-    String book(TripItem tripItem);

-}

diff --git a/sandbox/travelsample/contributions/common-contribution/src/main/java/scatours/common/Search.java b/sandbox/travelsample/contributions/common-contribution/src/main/java/scatours/common/Search.java
deleted file mode 100644
index 097ae69e38..0000000000
--- a/sandbox/travelsample/contributions/common-contribution/src/main/java/scatours/common/Search.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.common;

-

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

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

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

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

-

-@Remotable

-@Conversational

-@Callback(SearchCallback.class)

-public interface Search {

-    TripItem[] searchSynch(TripLeg tripLeg);

-    

-    @OneWay

-    void searchAsynch(TripLeg tripLeg);

-    

-    int getPercentComplete();

-}

diff --git a/sandbox/travelsample/contributions/common-contribution/src/main/java/scatours/common/SearchCallback.java b/sandbox/travelsample/contributions/common-contribution/src/main/java/scatours/common/SearchCallback.java
deleted file mode 100644
index 252fb955a2..0000000000
--- a/sandbox/travelsample/contributions/common-contribution/src/main/java/scatours/common/SearchCallback.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.common;

-

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

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

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

-

-@Remotable

-@Conversational

-public interface SearchCallback {

-    @EndsConversation

-    void searchResults(TripItem[] items);

-    void setPercentComplete(String searchComponent, int percentComplete);

-}

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

-

-

-

-public class TripItem {

-    

-    public static String FLIGHT = "Flight";

-    public static String HOTEL = "Hotel";

-    public static String CAR = "Car";

-    public static String TRIP = "Trip";

-    

-    private String id; 

-    private String tripId;

-    private String type;

-    private String name;

-    private String description;

-    private String location;

-    private String fromDate;

-    private String toDate;

-    private double price;

-    private String currency;

-    private String link;

-    private TripItem[] tripItems; // used for a trip made up of trip items

-    private String customerDetails;

-    private String agentDetails;

-    private String bookingCode;

-    

-    public TripItem() {

-    }  

-    

-    public TripItem(TripItem item) {

-        this.id = item.getId();

-        this.tripId = item.getTripId();

-        this.type = item.getType();

-        this.name = item.getName();

-        this.description = item.getDescription();

-        this.location = item.getLocation();

-        this.fromDate = item.getFromDate();

-        this.toDate = item.getToDate();

-        this.price = item.getPrice();

-        this.currency = item.getCurrency();

-        this.link = item.getLink();

-    } 

-    

-    public TripItem(String id, 

-                    String tripId,

-                    String type, 

-                    String name, 

-                    String description, 

-                    String location, 

-                    String fromDate, 

-                    String toDate, 

-                    double price, 

-                    String currency, 

-                    String link) {

-        this.id = id;

-        this.tripId = tripId;

-        this.type = type;

-        this.name = name;

-        this.description = description;

-        this.location = location;

-        this.fromDate = fromDate;

-        this.toDate = toDate;

-        this.price = price;

-        this.currency = currency;

-        this.link = link;

-    }  

-    

-    public String getId() {

-        return id;

-    }

-    

-    public void setId(String id) {

-        this.id = id;

-    }

-    

-    public String getTripId() {

-        return tripId;

-    }

-    

-    public void setTripId(String tripId) {

-        this.tripId = tripId;

-    }

-    

-    public String getType() {

-        return type;

-    }

-    

-    public void setType(String type) {

-        this.type = type;

-    }

-    

-    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 getLocation() {

-        return location;

-    } 

-    

-    public void setLocation(String location) {

-        this.location = location;

-    }

-    

-    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 double getPrice() {

-        return price;

-    }

-    

-    public void setPrice(double price) {

-        this.price = price;

-    }

-    

-    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;

-    }

-    

-    public TripItem[] getTripItems() {

-        return tripItems;

-    }

-    

-    public void setTripItems(TripItem[] tripItems) {

-        this.tripItems = tripItems;

-    }

-    

-    public String getCustomerDetails() {

-        return customerDetails;

-    }

-    

-    public void setCustomerDetails(String customerDetails) {

-        this.customerDetails = customerDetails;

-    }

-    

-    public String getAgentDetails() {

-        return agentDetails;

-    }

-    

-    public void setAgentDetails(String agentDetails) {

-        this.agentDetails = agentDetails;

-    }

-    

-    public String getBookingCode() {

-        return bookingCode;

-    }

-    

-    public void setBookingCode(String bookingCode) {

-        this.bookingCode = bookingCode;

-    }

-    

-    @Override

-    public String toString(){

-        String tripString = "Trip: id " + this.tripId +

-                            " type " + this.type +

-                            " name " + this.name +

-                            " description " + this.description +

-                            " location " + this.location +

-                            " fromDate " + this.fromDate +

-                            " toDate " + this.toDate +

-                            " price " + this.price +

-                            " currency " + this.currency +

-                            " link " + this.link;

-        return tripString;

-    }

-    

-    @Override

-    public boolean equals(Object obj) {

-        

-        if (obj instanceof TripItem){

-            if (((TripItem)obj).getId().equals(getId())){

-                return true;

-            }

-        }

-

-        return super.equals(obj);

-    }

-}

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

-

-

-public class TripLeg {

-    

-    private String id;

-    private String fromLocation;

-    private String toLocation;

-    private String fromDate;

-    private String toDate;

-    private String noOfPeople;

-

-    

-    public TripLeg() {

-    }

-    

-    public TripLeg(String id, 

-                       String fromLocation, 

-                       String toLocation, 

-                       String fromDate, 

-                       String toDate, 

-                       String noOfPeople) {

-    }    

-    

-    public String getId() {

-        return id;

-    }

-    

-    public void setId(String id) {

-        this.id = id;

-    }    

-    

-    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 getNoOfPeople() {

-        return noOfPeople;

-    }

-    

-    public void setNoOfPeople(String noOfPeople) {

-        this.noOfPeople = noOfPeople;

-    }

-    

-    

-    

-

-    

-  

-}

diff --git a/sandbox/travelsample/contributions/common-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/common-contribution/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 51540f80a2..0000000000
--- a/sandbox/travelsample/contributions/common-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,22 +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">

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

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