You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sl...@apache.org on 2008/07/28 10:10:59 UTC

svn commit: r680283 [1/2] - in /tuscany/sandbox/travelsample: ./ calendar-contribution/ calendar-contribution/META-INF/ calendar-contribution/src/ calendar-contribution/src/main/ calendar-contribution/src/main/java/ calendar-contribution/src/main/java/...

Author: slaws
Date: Mon Jul 28 01:10:57 2008
New Revision: 680283

URL: http://svn.apache.org/viewvc?rev=680283&view=rev
Log:
More modules for the travel sample

Added:
    tuscany/sandbox/travelsample/calendar-contribution/
    tuscany/sandbox/travelsample/calendar-contribution/META-INF/
    tuscany/sandbox/travelsample/calendar-contribution/META-INF/sca-contribution.xml   (with props)
    tuscany/sandbox/travelsample/calendar-contribution/pom.xml   (with props)
    tuscany/sandbox/travelsample/calendar-contribution/src/
    tuscany/sandbox/travelsample/calendar-contribution/src/main/
    tuscany/sandbox/travelsample/calendar-contribution/src/main/java/
    tuscany/sandbox/travelsample/calendar-contribution/src/main/java/calendar/
    tuscany/sandbox/travelsample/calendar-contribution/src/main/java/calendar/Calendar.java   (with props)
    tuscany/sandbox/travelsample/calendar-contribution/src/main/java/calendar/CalendarImpl.java   (with props)
    tuscany/sandbox/travelsample/calendar-contribution/src/main/resources/
    tuscany/sandbox/travelsample/calendar-contribution/src/main/resources/calendar.composite   (with props)
    tuscany/sandbox/travelsample/calendar-contribution/src/test/
    tuscany/sandbox/travelsample/calendar-contribution/src/test/java/
    tuscany/sandbox/travelsample/calendar-contribution/src/test/java/calendar/
    tuscany/sandbox/travelsample/calendar-contribution/src/test/java/calendar/CalendarTestCase.java   (with props)
    tuscany/sandbox/travelsample/calendar-contribution/src/test/resources/
    tuscany/sandbox/travelsample/calendar-contribution/src/test/resources/calendar.composite   (with props)
    tuscany/sandbox/travelsample/common-contribution/
    tuscany/sandbox/travelsample/common-contribution/META-INF/
    tuscany/sandbox/travelsample/common-contribution/META-INF/sca-contribution.xml   (with props)
    tuscany/sandbox/travelsample/common-contribution/build.xml   (with props)
    tuscany/sandbox/travelsample/common-contribution/pom.xml   (with props)
    tuscany/sandbox/travelsample/common-contribution/src/
    tuscany/sandbox/travelsample/common-contribution/src/scatours/
    tuscany/sandbox/travelsample/common-contribution/src/scatours/common/
    tuscany/sandbox/travelsample/common-contribution/src/scatours/common/Search.java   (with props)
    tuscany/sandbox/travelsample/common-contribution/src/scatours/common/SearchCallback.java   (with props)
    tuscany/sandbox/travelsample/common-contribution/src/scatours/common/TripItem.java   (with props)
    tuscany/sandbox/travelsample/common-contribution/src/scatours/common/TripLeg.java   (with props)
    tuscany/sandbox/travelsample/hotel-contribution/
    tuscany/sandbox/travelsample/hotel-contribution/META-INF/
    tuscany/sandbox/travelsample/hotel-contribution/META-INF/sca-contribution.xml   (with props)
    tuscany/sandbox/travelsample/hotel-contribution/pom.xml   (with props)
    tuscany/sandbox/travelsample/hotel-contribution/src/
    tuscany/sandbox/travelsample/hotel-contribution/src/scatours/
    tuscany/sandbox/travelsample/hotel-contribution/src/scatours/hotel/
    tuscany/sandbox/travelsample/hotel-contribution/src/scatours/hotel/HotelImpl.java   (with props)
    tuscany/sandbox/travelsample/hotel-contribution/src/scatours/hotel/HotelInfo.java   (with props)
    tuscany/sandbox/travelsample/node/
    tuscany/sandbox/travelsample/node/build.xml   (with props)
    tuscany/sandbox/travelsample/node/pom.xml   (with props)
    tuscany/sandbox/travelsample/node/src/
    tuscany/sandbox/travelsample/node/src/scatours/
    tuscany/sandbox/travelsample/node/src/scatours/LaunchNode.java   (with props)
    tuscany/sandbox/travelsample/trip-contribution/
    tuscany/sandbox/travelsample/trip-contribution/META-INF/
    tuscany/sandbox/travelsample/trip-contribution/META-INF/sca-contribution.xml   (with props)
    tuscany/sandbox/travelsample/trip-contribution/build.xml   (with props)
    tuscany/sandbox/travelsample/trip-contribution/pom.xml   (with props)
    tuscany/sandbox/travelsample/trip-contribution/src/
    tuscany/sandbox/travelsample/trip-contribution/src/scatours/
    tuscany/sandbox/travelsample/trip-contribution/src/scatours/trip/
    tuscany/sandbox/travelsample/trip-contribution/src/scatours/trip/Trip.java   (with props)
    tuscany/sandbox/travelsample/trip-contribution/src/scatours/trip/TripImpl.java   (with props)
    tuscany/sandbox/travelsample/ui-contribution/
    tuscany/sandbox/travelsample/ui-contribution/META-INF/
    tuscany/sandbox/travelsample/ui-contribution/META-INF/sca-contribution.xml   (with props)
    tuscany/sandbox/travelsample/ui-contribution/build.xml   (with props)
    tuscany/sandbox/travelsample/ui-contribution/pom.xml   (with props)
    tuscany/sandbox/travelsample/ui-contribution/scatours.composite   (with props)
    tuscany/sandbox/travelsample/ui-contribution/scatours.html   (with props)
    tuscany/sandbox/travelsample/ui-contribution/scatours.odg   (with props)
    tuscany/sandbox/travelsample/ui-contribution/scatours.png   (with props)
    tuscany/sandbox/travelsample/ui-contribution/style.css   (with props)
Modified:
    tuscany/sandbox/travelsample/gettingstarted/pom.xml
    tuscany/sandbox/travelsample/pom.xml

Added: tuscany/sandbox/travelsample/calendar-contribution/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/calendar-contribution/META-INF/sca-contribution.xml?rev=680283&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/calendar-contribution/META-INF/sca-contribution.xml (added)
+++ tuscany/sandbox/travelsample/calendar-contribution/META-INF/sca-contribution.xml Mon Jul 28 01:10:57 2008
@@ -0,0 +1,22 @@
+<?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.calendar"/>
+</contribution>
\ No newline at end of file

Propchange: tuscany/sandbox/travelsample/calendar-contribution/META-INF/sca-contribution.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sandbox/travelsample/calendar-contribution/META-INF/sca-contribution.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: tuscany/sandbox/travelsample/calendar-contribution/META-INF/sca-contribution.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: tuscany/sandbox/travelsample/calendar-contribution/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/calendar-contribution/pom.xml?rev=680283&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/calendar-contribution/pom.xml (added)
+++ tuscany/sandbox/travelsample/calendar-contribution/pom.xml Mon Jul 28 01:10:57 2008
@@ -0,0 +1,57 @@
+<?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.4-SNAPSHOT</version>
+        <!--relativePath>../../pom.xml</relativePath-->
+    </parent>
+    <artifactId>scatours-calendar-contribution</artifactId>
+    <name>Apache Tuscany SCA Tours Calendar Contribution</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.4-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.4-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.2</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+    </build>
+</project>

Propchange: tuscany/sandbox/travelsample/calendar-contribution/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sandbox/travelsample/calendar-contribution/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: tuscany/sandbox/travelsample/calendar-contribution/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: tuscany/sandbox/travelsample/calendar-contribution/src/main/java/calendar/Calendar.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/calendar-contribution/src/main/java/calendar/Calendar.java?rev=680283&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/calendar-contribution/src/main/java/calendar/Calendar.java (added)
+++ tuscany/sandbox/travelsample/calendar-contribution/src/main/java/calendar/Calendar.java Mon Jul 28 01:10:57 2008
@@ -0,0 +1,28 @@
+/*
+ * 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 calendar;
+
+/**
+ * The Add service interface
+ */
+public interface Calendar {
+
+    String getEndDate(String startDate, int duration);
+
+}

Propchange: tuscany/sandbox/travelsample/calendar-contribution/src/main/java/calendar/Calendar.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sandbox/travelsample/calendar-contribution/src/main/java/calendar/Calendar.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: tuscany/sandbox/travelsample/calendar-contribution/src/main/java/calendar/CalendarImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/calendar-contribution/src/main/java/calendar/CalendarImpl.java?rev=680283&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/calendar-contribution/src/main/java/calendar/CalendarImpl.java (added)
+++ tuscany/sandbox/travelsample/calendar-contribution/src/main/java/calendar/CalendarImpl.java Mon Jul 28 01:10:57 2008
@@ -0,0 +1,48 @@
+/*
+ * 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 calendar;
+
+import java.text.DateFormat;
+import java.util.Date;
+import java.util.TimeZone;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * An implementation of the Add service
+ */
+public class CalendarImpl implements Calendar {
+
+    public String getEndDate(String startDate, int duration){
+        String returnDate = "Invalid Date";
+        
+        try {
+            Date date = DateFormat.getInstance().parse(startDate);
+            java.util.Calendar calendar = java.util.Calendar.getInstance();
+            calendar.setTime(date);
+            calendar.add(java.util.Calendar.DATE, duration);
+            returnDate = DateFormat.getInstance().format(calendar.getTime());
+        } catch (Exception ex){
+            // do nothing  
+            System.out.println(ex.toString());
+        }
+        
+        return returnDate;
+    }
+}

Propchange: tuscany/sandbox/travelsample/calendar-contribution/src/main/java/calendar/CalendarImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sandbox/travelsample/calendar-contribution/src/main/java/calendar/CalendarImpl.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: tuscany/sandbox/travelsample/calendar-contribution/src/main/resources/calendar.composite
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/calendar-contribution/src/main/resources/calendar.composite?rev=680283&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/calendar-contribution/src/main/resources/calendar.composite (added)
+++ tuscany/sandbox/travelsample/calendar-contribution/src/main/resources/calendar.composite Mon Jul 28 01:10:57 2008
@@ -0,0 +1,29 @@
+<?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://travel"
+           xmlns:sample="http://travel"
+           name="calendar">
+
+    <component name="CalendarComponent">
+		<implementation.java class="calendar.CalendarImpl"/>
+    </component>
+
+</composite>

Propchange: tuscany/sandbox/travelsample/calendar-contribution/src/main/resources/calendar.composite
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sandbox/travelsample/calendar-contribution/src/main/resources/calendar.composite
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: tuscany/sandbox/travelsample/calendar-contribution/src/main/resources/calendar.composite
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: tuscany/sandbox/travelsample/calendar-contribution/src/test/java/calendar/CalendarTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/calendar-contribution/src/test/java/calendar/CalendarTestCase.java?rev=680283&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/calendar-contribution/src/test/java/calendar/CalendarTestCase.java (added)
+++ tuscany/sandbox/travelsample/calendar-contribution/src/test/java/calendar/CalendarTestCase.java Mon Jul 28 01:10:57 2008
@@ -0,0 +1,47 @@
+/*
+ * 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 calendar;
+
+import junit.framework.TestCase;
+
+import org.apache.tuscany.sca.host.embedded.SCADomain;
+
+/**
+ * This shows how to test the Calculator service component.
+ */
+public class CalendarTestCase extends TestCase {
+
+    private Calendar calendar;
+    private SCADomain scaDomain;
+
+    @Override
+    protected void setUp() throws Exception {
+        scaDomain = SCADomain.newInstance("calendar.composite");
+        calendar = scaDomain.getService(Calendar.class, "CalendarComponent");
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        scaDomain.close();
+    }
+
+    public void testCalculator() throws Exception {
+        System.out.println(calendar.getEndDate("07/10/96 04:05", 3));
+    }
+}

Propchange: tuscany/sandbox/travelsample/calendar-contribution/src/test/java/calendar/CalendarTestCase.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sandbox/travelsample/calendar-contribution/src/test/java/calendar/CalendarTestCase.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: tuscany/sandbox/travelsample/calendar-contribution/src/test/resources/calendar.composite
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/calendar-contribution/src/test/resources/calendar.composite?rev=680283&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/calendar-contribution/src/test/resources/calendar.composite (added)
+++ tuscany/sandbox/travelsample/calendar-contribution/src/test/resources/calendar.composite Mon Jul 28 01:10:57 2008
@@ -0,0 +1,29 @@
+<?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://travel"
+           xmlns:sample="http://travel"
+           name="calendar">
+
+    <component name="CalendarComponent">
+		<implementation.java class="calendar.CalendarImpl"/>
+    </component>
+
+</composite>

Propchange: tuscany/sandbox/travelsample/calendar-contribution/src/test/resources/calendar.composite
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sandbox/travelsample/calendar-contribution/src/test/resources/calendar.composite
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: tuscany/sandbox/travelsample/calendar-contribution/src/test/resources/calendar.composite
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: tuscany/sandbox/travelsample/common-contribution/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/common-contribution/META-INF/sca-contribution.xml?rev=680283&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/common-contribution/META-INF/sca-contribution.xml (added)
+++ tuscany/sandbox/travelsample/common-contribution/META-INF/sca-contribution.xml Mon Jul 28 01:10:57 2008
@@ -0,0 +1,22 @@
+<?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

Propchange: tuscany/sandbox/travelsample/common-contribution/META-INF/sca-contribution.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sandbox/travelsample/common-contribution/META-INF/sca-contribution.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: tuscany/sandbox/travelsample/common-contribution/META-INF/sca-contribution.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: tuscany/sandbox/travelsample/common-contribution/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/common-contribution/build.xml?rev=680283&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/common-contribution/build.xml (added)
+++ tuscany/sandbox/travelsample/common-contribution/build.xml Mon Jul 28 01:10:57 2008
@@ -0,0 +1,61 @@
+<!--
+ * 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 name="gettingstarted" default="compile">
+	<property environment="env"/> 
+	
+    <target name="compile">
+    	<mkdir dir="target/classes"/>
+        <javac srcdir="src" destdir="target/classes" 
+        	           debug="on" source="1.5" target="1.5">
+            <classpath>
+            	<pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
+            </classpath>
+        </javac>   	
+    </target>
+	
+    <target name="run">
+        <java classname="client.CurrencyConverterClient" fork="true">
+            <classpath>
+            	<pathelement path="src"/>
+                <pathelement path="target/classes"/>
+                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
+            </classpath>
+        </java>     
+    </target> 	
+	
+    <target name="runtrip">
+        <java classname="client.TripClient" fork="true">
+            <classpath>
+            	<pathelement path="src"/>
+                <pathelement path="target/classes"/>
+            	<pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
+            </classpath>
+        </java>    	
+    </target>	
+	
+    <target name="runtripws">
+        <java classname="client.TripWsClient" fork="true">
+            <classpath>
+            	<pathelement path="src"/>
+                <pathelement path="target/classes"/>
+                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
+            </classpath>
+        </java>     
+    </target>   	
+</project>

Propchange: tuscany/sandbox/travelsample/common-contribution/build.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sandbox/travelsample/common-contribution/build.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: tuscany/sandbox/travelsample/common-contribution/build.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: tuscany/sandbox/travelsample/common-contribution/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/common-contribution/pom.xml?rev=680283&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/common-contribution/pom.xml (added)
+++ tuscany/sandbox/travelsample/common-contribution/pom.xml Mon Jul 28 01:10:57 2008
@@ -0,0 +1,57 @@
+<?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.4-SNAPSHOT</version>
+        <!--relativePath>../../pom.xml</relativePath-->
+    </parent>
+    <artifactId>scatours-common-contribution</artifactId>
+    <name>Apache Tuscany SCA Tours Common Artefacts Contribution</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-sca-api</artifactId>
+            <version>1.4-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-data-api</artifactId>
+            <version>1.4-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.2</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+       <sourceDirectory>${basedir}/src</sourceDirectory>
+    </build>
+</project>

Propchange: tuscany/sandbox/travelsample/common-contribution/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sandbox/travelsample/common-contribution/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: tuscany/sandbox/travelsample/common-contribution/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: tuscany/sandbox/travelsample/common-contribution/src/scatours/common/Search.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/common-contribution/src/scatours/common/Search.java?rev=680283&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/common-contribution/src/scatours/common/Search.java (added)
+++ tuscany/sandbox/travelsample/common-contribution/src/scatours/common/Search.java Mon Jul 28 01:10:57 2008
@@ -0,0 +1,35 @@
+/*
+ * 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 java.util.List;
+
+import org.osoa.sca.annotations.Callback;
+import org.osoa.sca.annotations.OneWay;
+import org.osoa.sca.annotations.Remotable;
+
+@Remotable
+@Callback(SearchCallback.class)
+public interface Search {
+    TripItem[] searchSynch(TripLeg tripLeg);
+    
+    // TODO - Use to run searches in parallel @OneWay
+    void searchAsynch(TripLeg tripLeg);
+}

Propchange: tuscany/sandbox/travelsample/common-contribution/src/scatours/common/Search.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sandbox/travelsample/common-contribution/src/scatours/common/Search.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: tuscany/sandbox/travelsample/common-contribution/src/scatours/common/SearchCallback.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/common-contribution/src/scatours/common/SearchCallback.java?rev=680283&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/common-contribution/src/scatours/common/SearchCallback.java (added)
+++ tuscany/sandbox/travelsample/common-contribution/src/scatours/common/SearchCallback.java Mon Jul 28 01:10:57 2008
@@ -0,0 +1,30 @@
+/*
+ * 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 java.util.List;
+
+import org.apache.tuscany.sca.data.collection.Item;
+import org.osoa.sca.annotations.Remotable;
+
+@Remotable
+public interface SearchCallback {
+    void searchResults(TripItem[] items);
+}

Propchange: tuscany/sandbox/travelsample/common-contribution/src/scatours/common/SearchCallback.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sandbox/travelsample/common-contribution/src/scatours/common/SearchCallback.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: tuscany/sandbox/travelsample/common-contribution/src/scatours/common/TripItem.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/common-contribution/src/scatours/common/TripItem.java?rev=680283&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/common-contribution/src/scatours/common/TripItem.java (added)
+++ tuscany/sandbox/travelsample/common-contribution/src/scatours/common/TripItem.java Mon Jul 28 01:10:57 2008
@@ -0,0 +1,96 @@
+/*
+ * 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 {
+    
+    private String id;    
+    private String type;
+    private String name;
+    private String description;
+    private String location;
+    private String link;
+    
+    public TripItem() {
+    }  
+    
+    public TripItem(String id, 
+                        String type, 
+                        String name, 
+                        String description, 
+                        String location, 
+                        String link) {
+        this.id = id;
+        this.type = type;
+        this.name = name;
+        this.description = description;
+        this.location = location;
+        this.link = link;
+    }  
+    
+    public String getId() {
+        return id;
+    }
+    
+    public void setId(String id) {
+        this.id = id;
+    }
+    
+    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 getLink() {
+        return link;
+    }
+    
+    public void setLink(String link) {
+        this.link = link;
+    }
+}

Propchange: tuscany/sandbox/travelsample/common-contribution/src/scatours/common/TripItem.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sandbox/travelsample/common-contribution/src/scatours/common/TripItem.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: tuscany/sandbox/travelsample/common-contribution/src/scatours/common/TripLeg.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/common-contribution/src/scatours/common/TripLeg.java?rev=680283&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/common-contribution/src/scatours/common/TripLeg.java (added)
+++ tuscany/sandbox/travelsample/common-contribution/src/scatours/common/TripLeg.java Mon Jul 28 01:10:57 2008
@@ -0,0 +1,97 @@
+/*
+ * 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;
+    }
+    
+    
+    
+
+    
+  
+}

Propchange: tuscany/sandbox/travelsample/common-contribution/src/scatours/common/TripLeg.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sandbox/travelsample/common-contribution/src/scatours/common/TripLeg.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: tuscany/sandbox/travelsample/gettingstarted/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/gettingstarted/pom.xml?rev=680283&r1=680282&r2=680283&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/gettingstarted/pom.xml (original)
+++ tuscany/sandbox/travelsample/gettingstarted/pom.xml Mon Jul 28 01:10:57 2008
@@ -22,8 +22,8 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>2.0-incubating-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
+        <version>1.4-SNAPSHOT</version>
+        <!--relativePath>../../pom.xml</relativePath-->
     </parent>
     <artifactId>scatours-gettingstarted</artifactId>
     <name>Apache Tuscany SCA Tours Getting Started</name>
@@ -32,27 +32,27 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>  
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
             <scope>test</scope>
         </dependency> 
 

Added: tuscany/sandbox/travelsample/hotel-contribution/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/hotel-contribution/META-INF/sca-contribution.xml?rev=680283&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/hotel-contribution/META-INF/sca-contribution.xml (added)
+++ tuscany/sandbox/travelsample/hotel-contribution/META-INF/sca-contribution.xml Mon Jul 28 01:10:57 2008
@@ -0,0 +1,23 @@
+<?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.hotel"/>
+</contribution>
\ No newline at end of file

Propchange: tuscany/sandbox/travelsample/hotel-contribution/META-INF/sca-contribution.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sandbox/travelsample/hotel-contribution/META-INF/sca-contribution.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: tuscany/sandbox/travelsample/hotel-contribution/META-INF/sca-contribution.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: tuscany/sandbox/travelsample/hotel-contribution/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/hotel-contribution/pom.xml?rev=680283&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/hotel-contribution/pom.xml (added)
+++ tuscany/sandbox/travelsample/hotel-contribution/pom.xml Mon Jul 28 01:10:57 2008
@@ -0,0 +1,76 @@
+<?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.4-SNAPSHOT</version>
+        <!--relativePath>../../pom.xml</relativePath-->
+    </parent>
+    <artifactId>scatours-hotel-contribution</artifactId>
+    <name>Apache Tuscany SCA Tours Hotel Contribution</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-sca-api</artifactId>
+            <version>1.4-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-data-api</artifactId>
+            <version>1.4-SNAPSHOT</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>scatours-common-contribution</artifactId>
+            <version>1.4-SNAPSHOT</version>
+        </dependency> 
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.2</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>

Propchange: tuscany/sandbox/travelsample/hotel-contribution/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sandbox/travelsample/hotel-contribution/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: tuscany/sandbox/travelsample/hotel-contribution/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: tuscany/sandbox/travelsample/hotel-contribution/src/scatours/hotel/HotelImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/hotel-contribution/src/scatours/hotel/HotelImpl.java?rev=680283&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/hotel-contribution/src/scatours/hotel/HotelImpl.java (added)
+++ tuscany/sandbox/travelsample/hotel-contribution/src/scatours/hotel/HotelImpl.java Mon Jul 28 01:10:57 2008
@@ -0,0 +1,90 @@
+/*
+ * 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.hotel;
+
+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.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})
+public class HotelImpl implements Search {
+    
+    private List<HotelInfo> hotels = new ArrayList<HotelInfo>();
+    
+    @Callback
+    protected SearchCallback searchCallback; 
+
+    @Init
+    public void init() {
+        hotels.add(new HotelInfo("Deep Bay Hotel", 
+                             "Wonderful sea views and a relaxed atmosphere", 
+                             "ANU", 
+                             "http://localhost:8085/tbd" ));
+        hotels.add(new HotelInfo("Long Bay Hotel", 
+                             "Friendly staff and an ocean breeze", 
+                             "ANU", 
+                             "http://localhost:8085/tbd" ));
+        hotels.add(new HotelInfo("City Hotel", 
+                             "Smart rooms and early breakfasts", 
+                             "NY", 
+                             "http://localhost:8085/tbd" ));
+        hotels.add(new HotelInfo("County Hotel", 
+                             "The smell of the open country", 
+                             "SOU", 
+                             "http://localhost:8085/tbd" ));
+    }
+    
+    public TripItem[] searchSynch(TripLeg tripLeg) {
+        List<TripItem> items = new ArrayList<TripItem>();
+        
+        // find available hotels
+        for(HotelInfo hotel : hotels){
+            if (hotel.getLocation().equals(tripLeg.getToLocation())){
+                TripItem item = new TripItem("1", 
+                                             "Hotel",
+                                             hotel.getName(), 
+                                             hotel.getDescription(), 
+                                             hotel.getLocation(), 
+                                             hotel.getLink());
+                items.add(item);
+            }
+        }
+        
+        return items.toArray(new TripItem[items.size()]);
+    }
+    
+    public void searchAsynch(TripLeg tripLeg) {
+        
+        // return available hotels
+        searchCallback.searchResults(searchSynch(tripLeg));  
+    }
+}

Propchange: tuscany/sandbox/travelsample/hotel-contribution/src/scatours/hotel/HotelImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sandbox/travelsample/hotel-contribution/src/scatours/hotel/HotelImpl.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: tuscany/sandbox/travelsample/hotel-contribution/src/scatours/hotel/HotelInfo.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/hotel-contribution/src/scatours/hotel/HotelInfo.java?rev=680283&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/hotel-contribution/src/scatours/hotel/HotelInfo.java (added)
+++ tuscany/sandbox/travelsample/hotel-contribution/src/scatours/hotel/HotelInfo.java Mon Jul 28 01:10:57 2008
@@ -0,0 +1,76 @@
+/*
+ * 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.hotel;
+
+
+public class HotelInfo {
+    
+    private String name;
+    private String description;
+    private String location;
+    private String link;
+    
+    public HotelInfo() {
+    }  
+    
+    public HotelInfo(String name, 
+                 String description, 
+                 String location,
+                 String link) {
+
+        this.name = name;
+        this.description = description;
+        this.location = location;
+        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 getLocation() {
+        return location;
+    }
+    
+    public void setLocation(String location) {
+        this.location = location;
+    }
+    
+    public String getLink() {
+        return link;
+    }
+    
+    public void setLink(String link) {
+        this.link = link;
+    }
+}

Propchange: tuscany/sandbox/travelsample/hotel-contribution/src/scatours/hotel/HotelInfo.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sandbox/travelsample/hotel-contribution/src/scatours/hotel/HotelInfo.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: tuscany/sandbox/travelsample/node/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/node/build.xml?rev=680283&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/node/build.xml (added)
+++ tuscany/sandbox/travelsample/node/build.xml Mon Jul 28 01:10:57 2008
@@ -0,0 +1,206 @@
+<!--
+ * 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 name="scatours-node" default="compile">
+
+    <target name="compile">
+        <mkdir dir="target/classes"/>
+        <javac destdir="target/classes" debug="on" source="1.5" target="1.5">
+            <src path="src"/>
+            <classpath>
+                <fileset refid="tuscany.jars"/>
+                <fileset refid="3rdparty.jars"/>
+            </classpath>
+        </javac>
+        <copy todir="target/classes">
+            <fileset dir="." excludes="**/*.java, pom.xml, build.xml, target"/>
+        </copy>
+        <jar destfile="target/scatours-node.jar" basedir="target/classes">
+            <manifest>
+                <attribute name="Main-Class" value="launch.LaunchTutorialAdmin"/>
+            </manifest>
+        </jar>
+    </target>
+
+    <target name="package" depends="compile"/>
+
+    <target name="run">
+        <java classname="launch.LaunchTutorialAdmin" fork="true">
+            <classpath>
+                <pathelement location="target/scatours-node.jar"/>
+                <fileset refid="tuscany.jars"/>
+                <fileset refid="3rdparty.jars"/>
+            </classpath>
+        </java>
+    </target>
+
+    <target name="clean">
+        <delete includeemptydirs="true">
+            <fileset dir="target"/>
+        </delete>
+    </target>
+
+    <fileset id="tuscany.jars" dir="../../modules">
+        <include name="tuscany-assembly-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-assembly-xml-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-assembly-xsd-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-atom-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-atom-abdera-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-ejb-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-ejb-runtime-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-http-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-http-runtime-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-jsonrpc-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-jsonrpc-runtime-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-sca-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-sca-axis2-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-sca-xml-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-ws-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-ws-axis2-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-ws-wsdlgen-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-ws-xml-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-impl-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-java-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-namespace-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-resource-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-xml-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-core-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-core-databinding-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-core-spi-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-data-api-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-databinding-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-databinding-axiom-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-databinding-jaxb-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-databinding-jaxb-axiom-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-databinding-json-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-definitions-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-definitions-xml-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-domain-manager-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-endpoint-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-extensibility-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-host-embedded-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-host-http-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-host-jetty-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-ejb-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-java-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-java-runtime-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-java-xml-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-node-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-node-runtime-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-resource-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-resource-runtime-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-widget-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-widget-runtime-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-interface-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-interface-java-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-interface-java-jaxws-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-interface-java-xml-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-interface-wsdl-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-interface-wsdl-xml-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-monitor-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-monitor-logging-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-node-manager-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-node2-api-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-node2-impl-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-node2-launcher-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-policy-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-policy-security-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-policy-security-ws-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-policy-xml-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-policy-xml-ws-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-sca-api-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-workspace-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-workspace-impl-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-workspace-xml-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-xsd-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-xsd-xml-1.4-SNAPSHOT.jar"/>
+    </fileset>
+    <fileset id="3rdparty.jars" dir="../../lib">
+        <include name="XmlSchema-1.3.2.jar"/>
+        <include name="abdera-core-0.3.0-incubating.jar"/>
+        <include name="abdera-i18n-0.3.0-incubating.jar"/>
+        <include name="abdera-parser-0.3.0-incubating.jar"/>
+        <include name="activation-1.1.jar"/>
+        <include name="annogen-0.1.0.jar"/>
+        <include name="asm-all-3.1.jar"/>
+        <include name="axiom-api-1.2.5.jar"/>
+        <include name="axiom-dom-1.2.5.jar"/>
+        <include name="axiom-impl-1.2.5.jar"/>
+        <include name="axis2-adb-1.3.jar"/>
+        <include name="axis2-adb-codegen-1.3.jar"/>
+        <include name="axis2-codegen-1.3.jar"/>
+        <include name="axis2-java2wsdl-1.3.jar"/>
+        <include name="axis2-kernel-1.3.jar"/>
+        <include name="axis2-mtompolicy-1.3.jar"/>
+        <include name="backport-util-concurrent-3.0.jar"/>
+        <include name="bcprov-jdk15-132.jar"/>
+        <include name="cglib-nodep-2.1_3.jar"/>
+        <include name="commons-codec-1.3.jar"/>
+        <include name="commons-collections-3.1.jar"/>
+        <include name="commons-discovery-0.2.jar"/>
+        <include name="commons-fileupload-1.1.1.jar"/>
+        <include name="commons-httpclient-3.0.1.jar"/>
+        <include name="commons-io-1.1.jar"/>
+        <include name="commons-logging-1.1.jar"/>
+        <include name="derby-10.3.1.4.jar"/>
+        <include name="dom4j-1.6.1.jar"/>
+        <include name="geronimo-activation_1.0.2_spec-1.1.jar"/>
+        <include name="geronimo-activation_1.1_spec-1.0-M1.jar"/>
+        <include name="geronimo-commonj_1.1_spec-1.0.jar"/>
+        <include name="geronimo-ejb_3.0_spec-1.0.jar"/>
+        <include name="geronimo-javamail_1.4_spec-1.0-M1.jar"/>
+        <include name="geronimo-jms_1.1_spec-1.1.jar"/>
+        <include name="httpcore-4.0-alpha5.jar"/>
+        <include name="httpcore-nio-4.0-alpha5.jar"/>
+        <include name="httpcore-niossl-4.0-alpha5.jar"/>
+        <include name="jaxb-api-2.1.jar"/>
+        <include name="jaxb-impl-2.1.7.jar"/>
+        <include name="jaxen-1.1.1.jar"/>
+        <include name="jaxws-api-2.1.jar"/>
+        <include name="jdom-1.0.jar"/>
+        <include name="jettison-1.0.jar"/>
+        <include name="jetty-6.1.7.jar"/>
+        <include name="jetty-util-6.1.7.jar"/>
+        <include name="json-rpc-1.0.jar"/>
+        <include name="jsr181-api-1.0-MR1.jar"/>
+        <include name="jsr250-api-1.0.jar"/>
+        <include name="junit-3.8.1.jar"/>
+        <include name="log4j-1.2.12.jar"/>
+        <include name="logkit-1.0.1.jar"/>
+        <include name="mail-1.4.jar"/>
+        <include name="neethi-2.0.2.jar"/>
+        <include name="opensaml-1.1.jar"/>
+        <include name="rampart-core-1.3.jar"/>
+        <include name="rampart-policy-1.3.jar"/>
+        <include name="rampart-trust-1.3.jar"/>
+        <include name="servlet-api-2.5.jar"/>
+        <include name="stax-api-1.0-2.jar"/>
+        <include name="stax-api-1.0.1.jar"/>
+        <include name="woden-1.0-incubating-M7b.jar"/>
+        <include name="wsdl4j-1.6.2.jar"/>
+        <include name="wss4j-1.5.3.jar"/>
+        <include name="wstx-asl-3.2.1.jar"/>
+        <include name="xalan-2.7.0.jar"/>
+        <include name="xercesImpl-2.8.1.jar"/>
+        <include name="xml-apis-1.3.03.jar"/>
+        <include name="xmlsec-1.4.0.jar"/>
+    </fileset>
+
+</project>

Propchange: tuscany/sandbox/travelsample/node/build.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sandbox/travelsample/node/build.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: tuscany/sandbox/travelsample/node/build.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: tuscany/sandbox/travelsample/node/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/node/pom.xml?rev=680283&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/node/pom.xml (added)
+++ tuscany/sandbox/travelsample/node/pom.xml Mon Jul 28 01:10:57 2008
@@ -0,0 +1,171 @@
+<?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.4-SNAPSHOT</version>
+        <!--relativePath>../../pom.xml</relativePath-->
+    </parent>
+    <artifactId>scatours-node</artifactId>
+    <name>Apache Tuscany SCA Tours Node</name>
+
+    <dependencies>
+            <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node2-api</artifactId>
+            <version>1.4-SNAPSHOT</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node2-launcher</artifactId>
+            <version>1.4-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-domain-manager</artifactId>
+            <version>1.4-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-node-runtime</artifactId>
+            <version>1.4-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.4-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-widget-runtime</artifactId>
+            <version>1.4-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-resource-runtime</artifactId>
+            <version>1.4-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-atom-abdera</artifactId>
+            <version>1.4-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
+            <version>1.4-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-http-runtime</artifactId>
+            <version>1.4-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws-axis2</artifactId>
+            <version>1.4-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-sca-axis2</artifactId>
+            <version>1.4-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ejb-runtime</artifactId>
+            <version>1.4-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-ejb</artifactId>
+            <version>1.4-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derby</artifactId>
+            <version>10.3.1.4</version>
+            <scope>runtime</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>
+       <plugins>
+            <plugin>
+                <groupId>org.apache.tuscany.sca</groupId>
+                <artifactId>tuscany-maven-ant-generator</artifactId>
+                <version>1.4-SNAPSHOT</version>
+                <executions>
+                    <execution>
+                        <configuration>
+                            <mainClass>launch.LaunchTutorialAdmin</mainClass>
+                        </configuration>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+       </plugins>
+    </build>
+</project>

Propchange: tuscany/sandbox/travelsample/node/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sandbox/travelsample/node/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: tuscany/sandbox/travelsample/node/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: tuscany/sandbox/travelsample/node/src/scatours/LaunchNode.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/node/src/scatours/LaunchNode.java?rev=680283&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/node/src/scatours/LaunchNode.java (added)
+++ tuscany/sandbox/travelsample/node/src/scatours/LaunchNode.java Mon Jul 28 01:10:57 2008
@@ -0,0 +1,109 @@
+/*
+ * 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;
+
+import java.io.IOException;
+
+import org.apache.tuscany.sca.node.SCAContribution;
+import org.apache.tuscany.sca.node.SCANode2;
+import org.apache.tuscany.sca.node.SCANode2Factory;
+import org.apache.tuscany.sca.node.launcher.NodeLauncher;
+
+public class LaunchNode {
+    public static void main(String[] args) throws Exception {
+        LaunchNode.launchFromFileSystemDir();
+    }
+
+    // OK for development but you must launch the node from this module 
+    public static void launchFromFileSystemJar(){
+        SCANode2 node = null; 
+        
+        try {
+            node = SCANode2Factory.newInstance().createSCANode("scatours.composite", 
+                                                               new SCAContribution("common", "../common-contribution/target/scatours-common-contribution.jar"),
+                                                               new SCAContribution("currency", "../currency-contribution/target/scatours-currency-contribution.jar"),
+                                                               new SCAContribution("hotel", "../hotel-contribution/target/scatours-hotel-contribution.jar"),
+                                                               new SCAContribution("trip", "../trip-contribution/target/scatours-trip-contribution.jar"),
+                                                               new SCAContribution("ui", "../ui-contribution/target/scatours-ui-contribution.jar"));
+
+            node.start();
+            
+            System.out.println("Node started - Press enter to shutdown.");
+            try {
+                System.in.read();
+            } catch (IOException e) {}
+            
+            node.stop();
+            
+        } catch (Exception ex) {
+            System.out.println(ex.toString());
+        }
+    }
+    
+    // OK for development but you must launch the node from this module 
+    public static void launchFromFileSystemDir(){
+        SCANode2 node = null; 
+        
+        try {
+            node = SCANode2Factory.newInstance().createSCANode("scatours.composite", 
+                                                               new SCAContribution("common", "../common-contribution/target/classes"),
+                                                               new SCAContribution("currency", "../currency-contribution/target/classes"),
+                                                               new SCAContribution("hotel", "../hotel-contribution/target/classes"),
+                                                               new SCAContribution("trip", "../trip-contribution/target/classes"),
+                                                               new SCAContribution("ui", "../ui-contribution/target/classes"));
+            node.start();
+            
+            System.out.println("Node started - Press enter to shutdown.");
+            try {
+                System.in.read();
+            } catch (IOException e) {}
+            
+            node.stop();
+            
+        } catch (Exception ex) {
+            System.out.println(ex.toString());
+        }
+    }    
+    
+    // OK for samples but you can only load one contribution 
+    public static void launchFromClasspath(){
+        SCANode2 node = null; 
+        
+        try {
+            node = SCANode2Factory.newInstance().createSCANodeFromClassLoader("scatours.composite", null);
+            node.start();
+            
+            System.out.println("Node started - Press enter to shutdown.");
+            try {
+                System.in.read();
+            } catch (IOException e) {}
+            
+            node.stop();
+            
+        } catch (Exception ex) {
+            System.out.println(ex.toString());
+        }
+    }    
+    
+    // have to be running the domain in this case
+    public static void launchFromDomain()throws Exception {  
+        NodeLauncher.main(new String[] {"http://localhost:9990/node-config/SCAToursNode"});
+    }
+}

Propchange: tuscany/sandbox/travelsample/node/src/scatours/LaunchNode.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sandbox/travelsample/node/src/scatours/LaunchNode.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: tuscany/sandbox/travelsample/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/pom.xml?rev=680283&r1=680282&r2=680283&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/pom.xml (original)
+++ tuscany/sandbox/travelsample/pom.xml Mon Jul 28 01:10:57 2008
@@ -22,8 +22,8 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>2.0-incubating-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <version>1.4-SNAPSHOT</version>
+        <!--relativePath>../pom.xml</relativePath-->
     </parent>
     <artifactId>tuscany-scatours</artifactId>
     <packaging>pom</packaging>
@@ -36,8 +36,17 @@
                 <activeByDefault>true</activeByDefault>
             </activation>
             <modules>
-                <module>calendar</module>
-                <module>currencyconverter</module>
+                <module>calendar-contribution</module>
+                <module>common-contribution</module>
+                <module>currency-contribution</module>
+                <module>hotel-contribution</module>
+                <module>payment-contribution</module>
+                <module>trip-contribution</module>
+                <module>ui-contribution</module>
+
+                <module>domain</module>
+                <module>node</module>
+
                 <module>gettingstarted</module>
             </modules>
         </profile>

Added: tuscany/sandbox/travelsample/trip-contribution/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/trip-contribution/META-INF/sca-contribution.xml?rev=680283&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/trip-contribution/META-INF/sca-contribution.xml (added)
+++ tuscany/sandbox/travelsample/trip-contribution/META-INF/sca-contribution.xml Mon Jul 28 01:10:57 2008
@@ -0,0 +1,24 @@
+<?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"/>
+   <export.java package="scatours.trip"/>
+</contribution>
\ No newline at end of file

Propchange: tuscany/sandbox/travelsample/trip-contribution/META-INF/sca-contribution.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sandbox/travelsample/trip-contribution/META-INF/sca-contribution.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: tuscany/sandbox/travelsample/trip-contribution/META-INF/sca-contribution.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: tuscany/sandbox/travelsample/trip-contribution/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/trip-contribution/build.xml?rev=680283&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/trip-contribution/build.xml (added)
+++ tuscany/sandbox/travelsample/trip-contribution/build.xml Mon Jul 28 01:10:57 2008
@@ -0,0 +1,61 @@
+<!--
+ * 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 name="gettingstarted" default="compile">
+	<property environment="env"/> 
+	
+    <target name="compile">
+    	<mkdir dir="target/classes"/>
+        <javac srcdir="src" destdir="target/classes" 
+        	           debug="on" source="1.5" target="1.5">
+            <classpath>
+            	<pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
+            </classpath>
+        </javac>   	
+    </target>
+	
+    <target name="run">
+        <java classname="client.CurrencyConverterClient" fork="true">
+            <classpath>
+            	<pathelement path="src"/>
+                <pathelement path="target/classes"/>
+                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
+            </classpath>
+        </java>     
+    </target> 	
+	
+    <target name="runtrip">
+        <java classname="client.TripClient" fork="true">
+            <classpath>
+            	<pathelement path="src"/>
+                <pathelement path="target/classes"/>
+            	<pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
+            </classpath>
+        </java>    	
+    </target>	
+	
+    <target name="runtripws">
+        <java classname="client.TripWsClient" fork="true">
+            <classpath>
+            	<pathelement path="src"/>
+                <pathelement path="target/classes"/>
+                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
+            </classpath>
+        </java>     
+    </target>   	
+</project>

Propchange: tuscany/sandbox/travelsample/trip-contribution/build.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sandbox/travelsample/trip-contribution/build.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: tuscany/sandbox/travelsample/trip-contribution/build.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml