Moving 1.x branches

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

9 files changed, 0 insertions, 294 deletions

diff --git a/branches/sca-java-1.5.2/itest/domainmgr/basic/tours/pom.xml b/branches/sca-java-1.5.2/itest/domainmgr/basic/tours/pom.xml
deleted file mode 100644
index 45eec90493..0000000000
--- a/branches/sca-java-1.5.2/itest/domainmgr/basic/tours/pom.xml
+++ /dev/null
@@ -1,42 +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>itest-domainmgr-basic</artifactId>
-        <version>1.5.2-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-domainmgr-basic-tours</artifactId>
-    <name>Apache Tuscany SCA iTest Domain Manager Basic Tours Contribution</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-api</artifactId>
-            <version>1.5.2-SNAPSHOT</version>
-        </dependency>        
-    </dependencies>
-
-    <build>
-        <finalName>${artifactId}</finalName>
-    </build>
-</project>
diff --git a/branches/sca-java-1.5.2/itest/domainmgr/basic/tours/src/main/java/com/goodvaluetrips/Trips.java b/branches/sca-java-1.5.2/itest/domainmgr/basic/tours/src/main/java/com/goodvaluetrips/Trips.java
deleted file mode 100644
index 365a210368..0000000000
--- a/branches/sca-java-1.5.2/itest/domainmgr/basic/tours/src/main/java/com/goodvaluetrips/Trips.java
+++ /dev/null
@@ -1,26 +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 com.goodvaluetrips;

-

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

-

-@Remotable

-public interface Trips {

-    String checkAvailability(String trip, int people);

-}

diff --git a/branches/sca-java-1.5.2/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/Bookings.java b/branches/sca-java-1.5.2/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/Bookings.java
deleted file mode 100644
index 9d54d46bb6..0000000000
--- a/branches/sca-java-1.5.2/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/Bookings.java
+++ /dev/null
@@ -1,26 +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 com.tuscanyscatours;

-

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

-

-@Remotable

-public interface Bookings {

-    String newBooking(String trip, int people);

-}

diff --git a/branches/sca-java-1.5.2/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/Checkout.java b/branches/sca-java-1.5.2/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/Checkout.java
deleted file mode 100644
index 29c84d2bc0..0000000000
--- a/branches/sca-java-1.5.2/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/Checkout.java
+++ /dev/null
@@ -1,28 +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 com.tuscanyscatours;

-

-import java.math.BigDecimal;

-

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

-

-@Remotable

-public interface Checkout {

-    void makePayment(BigDecimal amount, String cardInfo);

-}

diff --git a/branches/sca-java-1.5.2/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/ShoppingCart.java b/branches/sca-java-1.5.2/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/ShoppingCart.java
deleted file mode 100644
index db551501e1..0000000000
--- a/branches/sca-java-1.5.2/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/ShoppingCart.java
+++ /dev/null
@@ -1,40 +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 com.tuscanyscatours;

-

-import java.math.BigDecimal;

-import java.util.ArrayList;

-import java.util.List;

-

-public class ShoppingCart implements Checkout, Updates {

-	private static List<String> bookedTrips = new ArrayList<String>();

-	

-    public void makePayment(BigDecimal amount, String cardInfo) {

-    	System.out.print("Charged $" + amount + " to card " + cardInfo + " for " +

-                         (bookedTrips.size() > 1 ? "trips" : "trip"));

-    	for (String trip : bookedTrips){

-    		System.out.print(" " + trip);

-    	}

-    	System.out.println();

-    	bookedTrips.clear();

-    }

-    public void addTrip(String resCode) {

-        bookedTrips.add(resCode);

-    }

-}

diff --git a/branches/sca-java-1.5.2/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/TripBooking.java b/branches/sca-java-1.5.2/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/TripBooking.java
deleted file mode 100644
index e64d60545e..0000000000
--- a/branches/sca-java-1.5.2/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/TripBooking.java
+++ /dev/null
@@ -1,35 +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 com.tuscanyscatours;

-

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

-

-public class TripBooking implements Bookings {

-    @Reference

-    protected com.goodvaluetrips.Trips mytrips;

-

-    @Reference

-    protected Updates cart;

- 

-    public String newBooking(String trip, int people) {

-        String resCode = mytrips.checkAvailability(trip, people);

-        cart.addTrip(resCode);

-        return "GV" + resCode;

-    }

-}

diff --git a/branches/sca-java-1.5.2/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/Updates.java b/branches/sca-java-1.5.2/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/Updates.java
deleted file mode 100644
index e33b0399cb..0000000000
--- a/branches/sca-java-1.5.2/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/Updates.java
+++ /dev/null
@@ -1,26 +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 com.tuscanyscatours;

-

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

-

-@Remotable

-public interface Updates {

-    void addTrip(String resCode);

-}

diff --git a/branches/sca-java-1.5.2/itest/domainmgr/basic/tours/src/main/resources/META-INF/sca-contribution.xml b/branches/sca-java-1.5.2/itest/domainmgr/basic/tours/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index b6ef1acafa..0000000000
--- a/branches/sca-java-1.5.2/itest/domainmgr/basic/tours/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"

-              xmlns:tst="http://tuscanyscatours.com/">

-    <!--export namespace="http://tuscanyscatours.com/" /-->

-    <export.java package="com.tuscanyscatours" />

-    <deployable composite="tst:Tours" />

-</contribution>

diff --git a/branches/sca-java-1.5.2/itest/domainmgr/basic/tours/src/main/resources/tours.composite b/branches/sca-java-1.5.2/itest/domainmgr/basic/tours/src/main/resources/tours.composite
deleted file mode 100644
index f166a1635d..0000000000
--- a/branches/sca-java-1.5.2/itest/domainmgr/basic/tours/src/main/resources/tours.composite
+++ /dev/null
@@ -1,46 +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://tuscanyscatours.com/"

-    name="Tours">

-

-    <component name="TripBooking">

-        <implementation.java class="com.tuscanyscatours.TripBooking" />

-        <service name="Bookings">

-            <interface.java interface="com.tuscanyscatours.Bookings" />

-        </service>

-        <reference name="mytrips" target="TripProvider/Trips">

-            <interface.java interface="com.goodvaluetrips.Trips" />

-        </reference>

-        <reference name="cart" target="ShoppingCart/Updates">

-            <interface.java interface="com.tuscanyscatours.Updates" />

-        </reference>

-    </component>

-

-    <component name="ShoppingCart">

-        <implementation.java class="com.tuscanyscatours.ShoppingCart"/>

-        <service name="Checkout">

-            <interface.java interface="com.tuscanyscatours.Checkout" />

-        </service>

-        <service name="Updates">

-            <interface.java interface="com.tuscanyscatours.Updates" />

-        </service>

-    </component>

-</composite>