You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by na...@apache.org on 2010/01/22 12:16:01 UTC

svn commit: r902059 [1/2] - in /tuscany/sandbox/travelsample: ./ distribution/ distribution/src/main/components/ domainconfig/ domainconfig/fullapp/ domainconfig/fullapp/src/ domainconfig/fullapp/src/main/ domainconfig/fullapp/src/main/resources/ domai...

Author: nash
Date: Fri Jan 22 11:15:58 2010
New Revision: 902059

URL: http://svn.apache.org/viewvc?rev=902059&view=rev
Log:
Make domain launchers run from the distribution (TUSCANY-3423)

Added:
    tuscany/sandbox/travelsample/domainconfig/
    tuscany/sandbox/travelsample/domainconfig/build.xml
    tuscany/sandbox/travelsample/domainconfig/fullapp/   (with props)
    tuscany/sandbox/travelsample/domainconfig/fullapp/build.xml
    tuscany/sandbox/travelsample/domainconfig/fullapp/pom.xml
    tuscany/sandbox/travelsample/domainconfig/fullapp/src/
    tuscany/sandbox/travelsample/domainconfig/fullapp/src/main/
    tuscany/sandbox/travelsample/domainconfig/fullapp/src/main/resources/
    tuscany/sandbox/travelsample/domainconfig/fullapp/src/main/resources/cloud/
    tuscany/sandbox/travelsample/domainconfig/fullapp/src/main/resources/cloud.composite
    tuscany/sandbox/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-bespoketrip.composite
    tuscany/sandbox/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-coordination.composite
    tuscany/sandbox/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-creditcard.composite
    tuscany/sandbox/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-currency.composite
    tuscany/sandbox/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-packagedtrip.composite
    tuscany/sandbox/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-payment.composite
    tuscany/sandbox/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-shoppingcart.composite
    tuscany/sandbox/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-ui.composite
    tuscany/sandbox/travelsample/domainconfig/fullapp/src/main/resources/domain.composite
    tuscany/sandbox/travelsample/domainconfig/fullapp/src/main/resources/workspace-distribution.xml
    tuscany/sandbox/travelsample/domainconfig/fullapp/src/main/resources/workspace.xml
    tuscany/sandbox/travelsample/domainconfig/introducing/   (with props)
    tuscany/sandbox/travelsample/domainconfig/introducing/build.xml
    tuscany/sandbox/travelsample/domainconfig/introducing/pom.xml
    tuscany/sandbox/travelsample/domainconfig/introducing/src/
    tuscany/sandbox/travelsample/domainconfig/introducing/src/main/
    tuscany/sandbox/travelsample/domainconfig/introducing/src/main/resources/
    tuscany/sandbox/travelsample/domainconfig/introducing/src/main/resources/cloud/
    tuscany/sandbox/travelsample/domainconfig/introducing/src/main/resources/cloud.composite
    tuscany/sandbox/travelsample/domainconfig/introducing/src/main/resources/cloud/ClientNode.composite
    tuscany/sandbox/travelsample/domainconfig/introducing/src/main/resources/cloud/ToursNode.composite
    tuscany/sandbox/travelsample/domainconfig/introducing/src/main/resources/cloud/TripsNode.composite
    tuscany/sandbox/travelsample/domainconfig/introducing/src/main/resources/domain.composite
    tuscany/sandbox/travelsample/domainconfig/introducing/src/main/resources/workspace-distribution.xml
    tuscany/sandbox/travelsample/domainconfig/introducing/src/main/resources/workspace.xml
    tuscany/sandbox/travelsample/domainconfig/pom.xml
    tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/java/scatours/FullAppDomainAPILauncher.java
    tuscany/sandbox/travelsample/launchers/introducing-domain/src/main/java/
    tuscany/sandbox/travelsample/launchers/introducing-domain/src/main/java/scatours/
    tuscany/sandbox/travelsample/launchers/introducing-domain/src/main/java/scatours/IntroducingDomainAPILauncher.java
    tuscany/sandbox/travelsample/launchers/introducing-domain/src/main/java/scatours/IntroducingDomainLauncher.java
    tuscany/sandbox/travelsample/launchers/introducing-tours/pom.xml
    tuscany/sandbox/travelsample/launchers/introducing-tours/src/
    tuscany/sandbox/travelsample/launchers/introducing-tours/src/main/
    tuscany/sandbox/travelsample/launchers/introducing-tours/src/main/java/
    tuscany/sandbox/travelsample/launchers/introducing-tours/src/main/java/scatours/
    tuscany/sandbox/travelsample/launchers/introducing-tours/src/main/java/scatours/IntroducingToursLauncher.java
    tuscany/sandbox/travelsample/launchers/introducing-trips/pom.xml
    tuscany/sandbox/travelsample/launchers/introducing-trips/src/
    tuscany/sandbox/travelsample/launchers/introducing-trips/src/main/
    tuscany/sandbox/travelsample/launchers/introducing-trips/src/main/java/
    tuscany/sandbox/travelsample/launchers/introducing-trips/src/main/java/scatours/
    tuscany/sandbox/travelsample/launchers/introducing-trips/src/main/java/scatours/IntroducingTripsLauncher.java
Modified:
    tuscany/sandbox/travelsample/build.xml
    tuscany/sandbox/travelsample/distribution/pom.xml
    tuscany/sandbox/travelsample/distribution/src/main/components/bin-modules.xml
    tuscany/sandbox/travelsample/launchers/build.xml
    tuscany/sandbox/travelsample/launchers/fullapp-domain/build.xml
    tuscany/sandbox/travelsample/launchers/fullapp-domain/pom.xml
    tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/java/scatours/FullAppDomainLauncher.java
    tuscany/sandbox/travelsample/launchers/introducing-client/pom.xml
    tuscany/sandbox/travelsample/launchers/introducing-domain/build.xml
    tuscany/sandbox/travelsample/launchers/introducing-domain/pom.xml
    tuscany/sandbox/travelsample/launchers/introducing-tours/   (props changed)
    tuscany/sandbox/travelsample/launchers/introducing-tours/build.xml
    tuscany/sandbox/travelsample/launchers/introducing-trips/   (props changed)
    tuscany/sandbox/travelsample/launchers/introducing-trips/build.xml
    tuscany/sandbox/travelsample/launchers/pom.xml
    tuscany/sandbox/travelsample/pom.xml

Modified: tuscany/sandbox/travelsample/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/build.xml?rev=902059&r1=902058&r2=902059&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/build.xml (original)
+++ tuscany/sandbox/travelsample/build.xml Fri Jan 22 11:15:58 2010
@@ -40,6 +40,7 @@
     <target name="allsubdirs">
         <ant dir="util" target="${target}"/> <!--needed by launchers-->
         <ant dir="contributions" target="${target}"/> <!--needed by launchers-->
+        <ant dir="domainconfig" target="${target}"/> <!--needed by launchers-->
         <ant dir="services" target="${target}"/> <!--needed by launchers-->
         <ant dir="launchers" target="${target}"/> <!--needed by clients-->
         <ant dir="clients" target="${target}"/>

Modified: tuscany/sandbox/travelsample/distribution/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/distribution/pom.xml?rev=902059&r1=902058&r2=902059&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/distribution/pom.xml (original)
+++ tuscany/sandbox/travelsample/distribution/pom.xml Fri Jan 22 11:15:58 2010
@@ -398,6 +398,16 @@
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>scatours-launcher-introducing-tours</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>scatours-launcher-introducing-trips</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>scatours-launcher-jumpstart</artifactId>
             <version>${pom.version}</version>
         </dependency>
@@ -466,7 +476,16 @@
             <artifactId>scatours-util-launcher-common</artifactId>
             <version>${pom.version}</version>
         </dependency>
-
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>scatours-domainconfig-fullapp</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>scatours-domainconfig-introducing</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
         <dependency>
            <groupId>org.apache.geronimo.specs</groupId>
            <artifactId>geronimo-jms_1.1_spec</artifactId>
@@ -513,6 +532,23 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <configuration>
+                            <tasks>
+                                <delete dir="target/apache-tuscany-scatours-${version}/tuscany-scatours-${version}/domainconfig/META-INF"
+                                        includeemptydirs="true"/>
+                            </tasks>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 </project>

Modified: tuscany/sandbox/travelsample/distribution/src/main/components/bin-modules.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/distribution/src/main/components/bin-modules.xml?rev=902059&r1=902058&r2=902059&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/distribution/src/main/components/bin-modules.xml (original)
+++ tuscany/sandbox/travelsample/distribution/src/main/components/bin-modules.xml Fri Jan 22 11:15:58 2010
@@ -89,6 +89,14 @@
             </includes>
             <scope>runtime</scope>
         </dependencySet>
+        <dependencySet>
+            <outputDirectory>domainconfig</outputDirectory>
+            <unpack>true</unpack>
+            <includes>
+                <include>org.apache.tuscany.sca:scatours-domainconfig-*</include>
+            </includes>
+            <scope>runtime</scope>
+        </dependencySet>
 
     </dependencySets>
 

Added: tuscany/sandbox/travelsample/domainconfig/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/domainconfig/build.xml?rev=902059&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/domainconfig/build.xml (added)
+++ tuscany/sandbox/travelsample/domainconfig/build.xml Fri Jan 22 11:15:58 2010
@@ -0,0 +1,45 @@
+<!--
+ * 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-domainconfig" default="compile">
+
+    <target name="compile">
+        <antcall target="allsubdirs">
+            <param name="target" value="compile"/>
+        </antcall>
+    </target>
+
+    <target name="test">
+        <antcall target="allsubdirs">
+            <param name="target" value="test"/>
+        </antcall>
+    </target>
+
+    <target name="clean">
+        <antcall target="allsubdirs">
+            <param name="target" value="clean"/>
+        </antcall>
+    </target>
+
+    <target name="allsubdirs">
+        <ant dir="fullapp" target="${target}"/>
+        <ant dir="introducing" target="${target}"/>
+    </target>
+
+</project>

Propchange: tuscany/sandbox/travelsample/domainconfig/fullapp/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Jan 22 11:15:58 2010
@@ -0,0 +1,15 @@
+target
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+maven.log
+velocity.log*
+junit*.properties
+surefire*.properties
+.settings
+.deployables
+.wtpmodules
+.externalToolBuilders
+maven-eclipse.xml

Added: tuscany/sandbox/travelsample/domainconfig/fullapp/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/domainconfig/fullapp/build.xml?rev=902059&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/domainconfig/fullapp/build.xml (added)
+++ tuscany/sandbox/travelsample/domainconfig/fullapp/build.xml Fri Jan 22 11:15:58 2010
@@ -0,0 +1,22 @@
+<!--
+ * 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-domainconfig-fullapp" default="compile">
+    <import file="../../antdefs.xml"/>
+</project>

Added: tuscany/sandbox/travelsample/domainconfig/fullapp/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/domainconfig/fullapp/pom.xml?rev=902059&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/domainconfig/fullapp/pom.xml (added)
+++ tuscany/sandbox/travelsample/domainconfig/fullapp/pom.xml Fri Jan 22 11:15:58 2010
@@ -0,0 +1,79 @@
+<?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>scatours</artifactId>
+        <version>1.0-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent><version>1.0-SNAPSHOT</version>
+    <artifactId>scatours-domainconfig-fullapp</artifactId>
+    <name>Apache Tuscany SCA Tours Full App Domain Configuration</name>
+
+    <build>
+        <finalName>${artifactId}</finalName>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <excludes>
+                    <exclude>workspace-distribution.xml</exclude>
+                </excludes>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>process-resources</phase>
+                        <configuration>
+                            <tasks>
+                                <mkdir dir="target/jar-classes/fullapp"/>
+                                <copy todir="target/jar-classes/fullapp">
+                                    <fileset dir="src/main/resources">
+                                        <exclude name="workspace*.xml"/>
+                                    </fileset>
+                                </copy>
+                                <copy todir="target/jar-classes/fullapp">
+                                    <fileset dir="src/main/resources">
+                                        <include name="workspace-distribution.xml"/>
+                                    </fileset>
+                                    <globmapper from="workspace-distribution.xml" to="workspace.xml"/>
+                                </copy>
+                            </tasks>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <classesDirectory>target/jar-classes</classesDirectory>
+                </configuration>
+            </plugin>
+        </plugins>                      
+    </build>
+
+</project>

Added: tuscany/sandbox/travelsample/domainconfig/fullapp/src/main/resources/cloud.composite
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/domainconfig/fullapp/src/main/resources/cloud.composite?rev=902059&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/domainconfig/fullapp/src/main/resources/cloud.composite (added)
+++ tuscany/sandbox/travelsample/domainconfig/fullapp/src/main/resources/cloud.composite Fri Jan 22 11:15:58 2010
@@ -0,0 +1,35 @@
+<?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 name="cloud.composite"
+           targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0"
+           xmlns="http://www.osoa.org/xmlns/sca/1.0" 
+           xmlns:ns1="http://www.osoa.org/xmlns/sca/1.0"
+           xmlns:ns2="http://tuscany.apache.org/cloud">
+      
+  <include name="ns2:ui" uri="http://tuscany.apache.org/cloud" />
+  <include name="ns2:coordination" uri="http://tuscany.apache.org/cloud" />
+  <include name="ns2:packagedtrip" uri="http://tuscany.apache.org/cloud" />
+  <include name="ns2:bespoketrip" uri="http://tuscany.apache.org/cloud" />
+  <include name="ns2:currency" uri="http://tuscany.apache.org/cloud" />
+  <include name="ns2:shoppingcart" uri="http://tuscany.apache.org/cloud" />
+  <include name="ns2:payment" uri="http://tuscany.apache.org/cloud" />
+  <include name="ns2:creditcard" uri="http://tuscany.apache.org/cloud" />
+  
+</composite>

Added: tuscany/sandbox/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-bespoketrip.composite
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-bespoketrip.composite?rev=902059&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-bespoketrip.composite (added)
+++ tuscany/sandbox/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-bespoketrip.composite Fri Jan 22 11:15:58 2010
@@ -0,0 +1,36 @@
+<?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"
+		xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
+        targetNamespace="http://tuscany.apache.org/cloud"
+        xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+        xmlns:s="http://tuscanyscatours.com/"
+		name="bespoketrip">
+
+    <component name="bespoketrip">
+        <t:implementation.node uri="fullapp-bespoketrip" composite="s:fullapp-bespoketrip"/>
+        <service name="Node">
+            <binding.sca uri="http://localhost:8086"/>
+            <binding.ws uri="http://localhost:8086"/>
+            <tuscany:binding.jsonrpc uri="http://localhost:8086"/>
+        </service>
+    </component>
+     
+</composite>

Added: tuscany/sandbox/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-coordination.composite
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-coordination.composite?rev=902059&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-coordination.composite (added)
+++ tuscany/sandbox/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-coordination.composite Fri Jan 22 11:15:58 2010
@@ -0,0 +1,36 @@
+<?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"
+		xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
+        targetNamespace="http://tuscany.apache.org/cloud"
+        xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+        xmlns:s="http://tuscanyscatours.com/"
+		name="coordination">
+
+    <component name="coordination">
+        <t:implementation.node uri="fullapp-coordination" composite="s:fullapp-coordination"/>
+        <service name="Node">
+            <binding.sca uri="http://localhost:8084"/>
+            <binding.ws uri="http://localhost:8084"/>
+            <tuscany:binding.jsonrpc uri="http://localhost:8084"/>
+        </service>
+    </component>
+     
+</composite>

Added: tuscany/sandbox/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-creditcard.composite
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-creditcard.composite?rev=902059&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-creditcard.composite (added)
+++ tuscany/sandbox/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-creditcard.composite Fri Jan 22 11:15:58 2010
@@ -0,0 +1,36 @@
+<?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"
+		xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
+        targetNamespace="http://tuscany.apache.org/cloud"
+        xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+        xmlns:s="http://tuscanyscatours.com/"
+		name="creditcard">
+
+    <component name="creditcard">
+        <t:implementation.node uri="fullapp-creditcard" composite="s:creditcard"/>
+        <service name="Node">
+            <binding.sca uri="http://localhost:8082"/>
+            <binding.ws uri="http://localhost:8082"/>
+            <tuscany:binding.jsonrpc uri="http://localhost:8082"/>
+        </service>
+    </component>
+     
+</composite>

Added: tuscany/sandbox/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-currency.composite
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-currency.composite?rev=902059&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-currency.composite (added)
+++ tuscany/sandbox/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-currency.composite Fri Jan 22 11:15:58 2010
@@ -0,0 +1,36 @@
+<?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"
+		xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
+        targetNamespace="http://tuscany.apache.org/cloud"
+        xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+        xmlns:s="http://tuscanyscatours.com/"
+		name="currency">
+
+    <component name="currency">
+        <t:implementation.node uri="fullapp-currency" composite="s:fullapp-currency"/>
+        <service name="Node">
+            <binding.sca uri="http://localhost:8083"/>
+            <binding.ws uri="http://localhost:8083"/>
+            <tuscany:binding.jsonrpc uri="http://localhost:8083"/>
+        </service>
+    </component>
+     
+</composite>

Added: tuscany/sandbox/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-packagedtrip.composite
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-packagedtrip.composite?rev=902059&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-packagedtrip.composite (added)
+++ tuscany/sandbox/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-packagedtrip.composite Fri Jan 22 11:15:58 2010
@@ -0,0 +1,35 @@
+<?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"
+		xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
+        targetNamespace="http://tuscany.apache.org/cloud"
+        xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+        xmlns:s="http://tuscanyscatours.com/"
+		name="packagedtrip">
+
+    <component name="packagedtrip">
+        <t:implementation.node uri="fullapp-packagedtrip" composite="s:fullapp-packagedtrip"/>
+        <service name="Node">
+            <binding.sca uri="http://localhost:8085"/>
+            <tuscany:binding.jsonrpc uri="http://localhost:8085"/>
+        </service>
+    </component>
+     
+</composite>

Added: tuscany/sandbox/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-payment.composite
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-payment.composite?rev=902059&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-payment.composite (added)
+++ tuscany/sandbox/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-payment.composite Fri Jan 22 11:15:58 2010
@@ -0,0 +1,36 @@
+<?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"
+		xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
+        targetNamespace="http://tuscany.apache.org/cloud"
+        xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+        xmlns:s="http://tuscanyscatours.com/"
+		name="payment">
+
+    <component name="payment">
+        <t:implementation.node uri="fullapp-payment" composite="s:payment"/>
+        <service name="Node">
+            <binding.sca uri="http://localhost:8081"/>
+            <binding.ws uri="http://localhost:8081"/>
+            <tuscany:binding.jsonrpc uri="http://localhost:8081"/>
+        </service>
+    </component>
+     
+</composite>

Added: tuscany/sandbox/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-shoppingcart.composite
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-shoppingcart.composite?rev=902059&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-shoppingcart.composite (added)
+++ tuscany/sandbox/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-shoppingcart.composite Fri Jan 22 11:15:58 2010
@@ -0,0 +1,36 @@
+<?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"
+		xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
+        targetNamespace="http://tuscany.apache.org/cloud"
+        xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+        xmlns:s="http://tuscanyscatours.com/"
+		name="shoppingcart">
+
+    <component name="shoppingcart">
+        <t:implementation.node uri="fullapp-shoppingcart" composite="s:fullapp-shoppingcart"/>
+        <service name="Node">
+            <binding.sca uri="http://localhost:8087"/>
+            <binding.ws uri="http://localhost:8087"/>
+            <tuscany:binding.jsonrpc uri="http://localhost:8087"/>
+        </service>
+    </component>
+     
+</composite>

Added: tuscany/sandbox/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-ui.composite
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-ui.composite?rev=902059&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-ui.composite (added)
+++ tuscany/sandbox/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-ui.composite Fri Jan 22 11:15:58 2010
@@ -0,0 +1,33 @@
+<?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"
+		xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
+		targetNamespace="http://tuscany.apache.org/cloud"
+		xmlns:s="http://tuscanyscatours.com/"
+		name="ui">
+
+    <component name="ui">
+        <t:implementation.node uri="fullapp-ui" composite="s:fullapp-ui"/>
+        <service name="Node">
+            <binding.sca uri="http://localhost:8080"/>
+        </service>
+    </component>
+     
+</composite>

Added: tuscany/sandbox/travelsample/domainconfig/fullapp/src/main/resources/domain.composite
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/domainconfig/fullapp/src/main/resources/domain.composite?rev=902059&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/domainconfig/fullapp/src/main/resources/domain.composite (added)
+++ tuscany/sandbox/travelsample/domainconfig/fullapp/src/main/resources/domain.composite Fri Jan 22 11:15:58 2010
@@ -0,0 +1,35 @@
+<?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 name="domain.composite"
+           targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0"
+           xmlns="http://www.osoa.org/xmlns/sca/1.0" 
+           xmlns:ns1="http://www.osoa.org/xmlns/sca/1.0"
+           xmlns:ns2="http://tuscanyscatours.com/">
+       
+  <include name="ns2:creditcard" uri="fullapp-creditcard" />         
+  <include name="ns2:payment" uri="fullapp-payment" />    
+  <include name="ns2:fullapp-shoppingcart" uri="fullapp-shoppingcart" />
+  <include name="ns2:fullapp-currency" uri="fullapp-currency" />
+  <include name="ns2:fullapp-packagedtrip" uri="fullapp-packagedtrip" /> 
+  <include name="ns2:fullapp-bespoketrip" uri="fullapp-bespoketrip" />
+  <include name="ns2:fullapp-coordination" uri="fullapp-coordination" />         
+  <include name="ns2:fullapp-ui" uri="fullapp-ui" /> 
+
+</composite>

Added: tuscany/sandbox/travelsample/domainconfig/fullapp/src/main/resources/workspace-distribution.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/domainconfig/fullapp/src/main/resources/workspace-distribution.xml?rev=902059&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/domainconfig/fullapp/src/main/resources/workspace-distribution.xml (added)
+++ tuscany/sandbox/travelsample/domainconfig/fullapp/src/main/resources/workspace-distribution.xml Fri Jan 22 11:15:58 2010
@@ -0,0 +1,41 @@
+<?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.    
+-->
+<workspace xmlns="http://tuscany.apache.org/xmlns/sca/1.0" 
+           xmlns:ns1="http://tuscany.apache.org/xmlns/sca/1.0">
+  <contribution location="file:../contributions/scatours-contribution-common.jar"  uri="common"/>
+  <contribution location="file:../contributions/scatours-contribution-currency.jar"  uri="currency"/>
+  <contribution location="file:../contributions/scatours-contribution-hotel.jar"  uri="hotel"/>
+  <contribution location="file:../contributions/scatours-contribution-flight.jar"  uri="flight"/>
+  <contribution location="file:../contributions/scatours-contribution-car.jar"  uri="car"/>
+  <contribution location="file:../contributions/scatours-contribution-trip.jar"  uri="trip"/>
+  <contribution location="file:../contributions/scatours-contribution-tripbooking.jar"  uri="tripbooking"/>
+  <contribution location="file:../contributions/scatours-contribution-travelcatalog.jar"  uri="travelcatalog"/>
+  <contribution location="file:../contributions/scatours-contribution-payment-java.jar"  uri="fullapp-payment"/>
+  <contribution location="file:../contributions/scatours-contribution-creditcard-payment-jaxb.jar"  uri="fullapp-creditcard"/>
+  <contribution location="file:../contributions/scatours-contribution-shoppingcart.jar"  uri="shoppingcart"/>
+  <contribution location="file:../contributions/scatours-contribution-scatours.jar"  uri="scatours"/>
+  <contribution location="file:../contributions/scatours-contribution-fullapp-ui.jar"  uri="fullapp-ui"/>
+  <contribution location="file:../contributions/scatours-contribution-fullapp-coordination.jar"  uri="fullapp-coordination"/>
+  <contribution location="file:../contributions/scatours-contribution-fullapp-currency.jar"  uri="fullapp-currency"/>
+  <contribution location="file:../contributions/scatours-contribution-fullapp-packagedtrip.jar"  uri="fullapp-packagedtrip"/>
+  <contribution location="file:../contributions/scatours-contribution-fullapp-bespoketrip.jar"  uri="fullapp-bespoketrip"/>
+  <contribution location="file:../contributions/scatours-contribution-fullapp-shoppingcart.jar"  uri="fullapp-shoppingcart"/>
+  <contribution location="file:../domainconfig/fullapp/cloud" uri="http://tuscany.apache.org/cloud"/>  
+</workspace>
\ No newline at end of file

Added: tuscany/sandbox/travelsample/domainconfig/fullapp/src/main/resources/workspace.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/domainconfig/fullapp/src/main/resources/workspace.xml?rev=902059&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/domainconfig/fullapp/src/main/resources/workspace.xml (added)
+++ tuscany/sandbox/travelsample/domainconfig/fullapp/src/main/resources/workspace.xml Fri Jan 22 11:15:58 2010
@@ -0,0 +1,41 @@
+<?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.    
+-->
+<workspace xmlns="http://tuscany.apache.org/xmlns/sca/1.0" 
+           xmlns:ns1="http://tuscany.apache.org/xmlns/sca/1.0">
+  <contribution location="file:../../contributions/common/target/scatours-contribution-common.jar"  uri="common"/>
+  <contribution location="file:../../contributions/currency/target/scatours-contribution-currency.jar"  uri="currency"/>
+  <contribution location="file:../../contributions/hotel/target/scatours-contribution-hotel.jar"  uri="hotel"/>
+  <contribution location="file:../../contributions/flight/target/scatours-contribution-flight.jar"  uri="flight"/>
+  <contribution location="file:../../contributions/car/target/scatours-contribution-car.jar"  uri="car"/>
+  <contribution location="file:../../contributions/trip/target/scatours-contribution-trip.jar"  uri="trip"/>
+  <contribution location="file:../../contributions/tripbooking/target/scatours-contribution-tripbooking.jar"  uri="tripbooking"/>
+  <contribution location="file:../../contributions/travelcatalog/target/scatours-contribution-travelcatalog.jar"  uri="travelcatalog"/>
+  <contribution location="file:../../contributions/payment-java/target/scatours-contribution-payment-java.jar"  uri="fullapp-payment"/>
+  <contribution location="file:../../contributions/creditcard-payment-jaxb/target/scatours-contribution-creditcard-payment-jaxb.jar"  uri="fullapp-creditcard"/>
+  <contribution location="file:../../contributions/shoppingcart/target/scatours-contribution-shoppingcart.jar"  uri="shoppingcart"/>
+  <contribution location="file:../../contributions/scatours/target/scatours-contribution-scatours.jar"  uri="scatours"/>
+  <contribution location="file:../../contributions/fullapp-ui/target/scatours-contribution-fullapp-ui.jar"  uri="fullapp-ui"/>
+  <contribution location="file:../../contributions/fullapp-coordination/target/scatours-contribution-fullapp-coordination.jar"  uri="fullapp-coordination"/>
+  <contribution location="file:../../contributions/fullapp-currency/target/scatours-contribution-fullapp-currency.jar"  uri="fullapp-currency"/>
+  <contribution location="file:../../contributions/fullapp-packagedtrip/target/scatours-contribution-fullapp-packagedtrip.jar"  uri="fullapp-packagedtrip"/>
+  <contribution location="file:../../contributions/fullapp-bespoketrip/target/scatours-contribution-fullapp-bespoketrip.jar"  uri="fullapp-bespoketrip"/>
+  <contribution location="file:../../contributions/fullapp-shoppingcart/target/scatours-contribution-fullapp-shoppingcart.jar"  uri="fullapp-shoppingcart"/>
+  <contribution location="file:../../domainconfig/fullapp/target/classes/cloud" uri="http://tuscany.apache.org/cloud"/>  
+</workspace>
\ No newline at end of file

Propchange: tuscany/sandbox/travelsample/domainconfig/introducing/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Jan 22 11:15:58 2010
@@ -0,0 +1,15 @@
+target
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+maven.log
+velocity.log*
+junit*.properties
+surefire*.properties
+.settings
+.deployables
+.wtpmodules
+.externalToolBuilders
+maven-eclipse.xml

Added: tuscany/sandbox/travelsample/domainconfig/introducing/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/domainconfig/introducing/build.xml?rev=902059&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/domainconfig/introducing/build.xml (added)
+++ tuscany/sandbox/travelsample/domainconfig/introducing/build.xml Fri Jan 22 11:15:58 2010
@@ -0,0 +1,22 @@
+<!--
+ * 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-domainconfig-introducing" default="compile">
+    <import file="../../antdefs.xml"/>
+</project>

Added: tuscany/sandbox/travelsample/domainconfig/introducing/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/domainconfig/introducing/pom.xml?rev=902059&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/domainconfig/introducing/pom.xml (added)
+++ tuscany/sandbox/travelsample/domainconfig/introducing/pom.xml Fri Jan 22 11:15:58 2010
@@ -0,0 +1,79 @@
+<?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>scatours</artifactId>
+        <version>1.0-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent><version>1.0-SNAPSHOT</version>
+    <artifactId>scatours-domainconfig-introducing</artifactId>
+    <name>Apache Tuscany SCA Tours Introducing Domain Configuration</name>
+
+    <build>
+        <finalName>${artifactId}</finalName>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <excludes>
+                    <exclude>workspace-distribution.xml</exclude>
+                </excludes>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>process-resources</phase>
+                        <configuration>
+                            <tasks>
+                                <mkdir dir="target/jar-classes/introducing"/>
+                                <copy todir="target/jar-classes/introducing">
+                                    <fileset dir="src/main/resources">
+                                        <exclude name="workspace*.xml"/>
+                                    </fileset>
+                                </copy>
+                                <copy todir="target/jar-classes/introducing">
+                                    <fileset dir="src/main/resources">
+                                        <include name="workspace-distribution.xml"/>
+                                    </fileset>
+                                    <globmapper from="workspace-distribution.xml" to="workspace.xml"/>
+                                </copy>
+                            </tasks>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <classesDirectory>target/jar-classes</classesDirectory>
+                </configuration>
+            </plugin>
+        </plugins>                      
+    </build>
+
+</project>

Added: tuscany/sandbox/travelsample/domainconfig/introducing/src/main/resources/cloud.composite
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/domainconfig/introducing/src/main/resources/cloud.composite?rev=902059&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/domainconfig/introducing/src/main/resources/cloud.composite (added)
+++ tuscany/sandbox/travelsample/domainconfig/introducing/src/main/resources/cloud.composite Fri Jan 22 11:15:58 2010
@@ -0,0 +1,26 @@
+<?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 local="true" name="cloud"
+  targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0"
+  xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:ns1="http://www.osoa.org/xmlns/sca/1.0">
+  <include name="ns2:ToursNode" uri="http://tuscany.apache.org/cloud" xmlns:ns2="http://tuscany.apache.org/cloud"/>
+  <include name="ns2:TripsNode" uri="http://tuscany.apache.org/cloud" xmlns:ns2="http://tuscany.apache.org/cloud"/>
+  <include name="ns2:ClientNode" uri="http://tuscany.apache.org/cloud" xmlns:ns2="http://tuscany.apache.org/cloud"/>
+</composite>

Added: tuscany/sandbox/travelsample/domainconfig/introducing/src/main/resources/cloud/ClientNode.composite
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/domainconfig/introducing/src/main/resources/cloud/ClientNode.composite?rev=902059&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/domainconfig/introducing/src/main/resources/cloud/ClientNode.composite (added)
+++ tuscany/sandbox/travelsample/domainconfig/introducing/src/main/resources/cloud/ClientNode.composite Fri Jan 22 11:15:58 2010
@@ -0,0 +1,32 @@
+<?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" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" xmlns:c="http://client.scatours/" targetNamespace="http://tuscany.apache.org/cloud" name="ClientNode">
+
+	<component name="ClientNode">
+		<t:implementation.node uri="introducing-client" composite="c:Client" />
+		<service name="Node">
+            <binding.sca uri="http://localhost:8083" />
+			<binding.ws uri="http://localhost:8083" />
+			<t:binding.http uri="http://localhost:8083" />
+			<t:binding.jsonrpc uri="http://localhost:8083" />
+			<t:binding.atom uri="http://localhost:8083" />
+		</service>
+	</component>
+</composite>
\ No newline at end of file

Added: tuscany/sandbox/travelsample/domainconfig/introducing/src/main/resources/cloud/ToursNode.composite
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/domainconfig/introducing/src/main/resources/cloud/ToursNode.composite?rev=902059&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/domainconfig/introducing/src/main/resources/cloud/ToursNode.composite (added)
+++ tuscany/sandbox/travelsample/domainconfig/introducing/src/main/resources/cloud/ToursNode.composite Fri Jan 22 11:15:58 2010
@@ -0,0 +1,32 @@
+<?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" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" xmlns:c="http://tuscanyscatours.com/" targetNamespace="http://tuscany.apache.org/cloud" name="ToursNode">
+
+	<component name="ToursNode">
+		<t:implementation.node uri="introducing-tours" composite="c:Tours" />
+		<service name="Node">
+            <binding.sca uri="http://localhost:8081" />
+			<binding.ws uri="http://localhost:8081" />
+			<t:binding.http uri="http://localhost:8081" />
+			<t:binding.jsonrpc uri="http://localhost:8081" />
+			<t:binding.atom uri="http://localhost:8081" />
+		</service>
+	</component>
+</composite>
\ No newline at end of file

Added: tuscany/sandbox/travelsample/domainconfig/introducing/src/main/resources/cloud/TripsNode.composite
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/domainconfig/introducing/src/main/resources/cloud/TripsNode.composite?rev=902059&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/domainconfig/introducing/src/main/resources/cloud/TripsNode.composite (added)
+++ tuscany/sandbox/travelsample/domainconfig/introducing/src/main/resources/cloud/TripsNode.composite Fri Jan 22 11:15:58 2010
@@ -0,0 +1,32 @@
+<?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" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" xmlns:c="http://goodvaluetrips.com/" targetNamespace="http://tuscany.apache.org/cloud" name="TripsNode">
+
+	<component name="TripsNode">
+		<t:implementation.node uri="introducing-trips" composite="c:Trips" />
+		<service name="Node">
+            <binding.sca uri="http://localhost:8082" />
+			<binding.ws uri="http://localhost:8082" />
+			<t:binding.http uri="http://localhost:8082" />
+			<t:binding.jsonrpc uri="http://localhost:8082" />
+			<t:binding.atom uri="http://localhost:8082" />
+		</service>
+	</component>
+</composite>
\ No newline at end of file

Added: tuscany/sandbox/travelsample/domainconfig/introducing/src/main/resources/domain.composite
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/domainconfig/introducing/src/main/resources/domain.composite?rev=902059&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/domainconfig/introducing/src/main/resources/domain.composite (added)
+++ tuscany/sandbox/travelsample/domainconfig/introducing/src/main/resources/domain.composite Fri Jan 22 11:15:58 2010
@@ -0,0 +1,26 @@
+<?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 local="true" name="domain"
+  targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0"
+  xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:ns1="http://www.osoa.org/xmlns/sca/1.0">
+  <include name="ns2:Tours" uri="introducing-tours" xmlns:ns2="http://tuscanyscatours.com/"/>
+  <include name="ns2:Trips" uri="introducing-trips" xmlns:ns2="http://goodvaluetrips.com/"/>
+  <include name="ns2:Client" uri="introducing-client" xmlns:ns2="http://client.scatours/"/>
+</composite>

Added: tuscany/sandbox/travelsample/domainconfig/introducing/src/main/resources/workspace-distribution.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/domainconfig/introducing/src/main/resources/workspace-distribution.xml?rev=902059&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/domainconfig/introducing/src/main/resources/workspace-distribution.xml (added)
+++ tuscany/sandbox/travelsample/domainconfig/introducing/src/main/resources/workspace-distribution.xml Fri Jan 22 11:15:58 2010
@@ -0,0 +1,30 @@
+<?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.    
+-->
+<workspace xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+           xmlns:ns1="http://tuscany.apache.org/xmlns/sca/1.0">
+    <contribution location="file:../domainconfig/introducing/cloud"
+           uri="http://tuscany.apache.org/cloud"/>
+    <contribution location="file:../contributions/scatours-contribution-introducing-tours.jar"
+           uri="introducing-tours"/>
+    <contribution location="file:../contributions/scatours-contribution-introducing-trips.jar"
+           uri="introducing-trips"/>
+    <contribution location="file:../contributions/scatours-contribution-introducing-client.jar"
+           uri="introducing-client"/>
+</workspace>

Added: tuscany/sandbox/travelsample/domainconfig/introducing/src/main/resources/workspace.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/domainconfig/introducing/src/main/resources/workspace.xml?rev=902059&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/domainconfig/introducing/src/main/resources/workspace.xml (added)
+++ tuscany/sandbox/travelsample/domainconfig/introducing/src/main/resources/workspace.xml Fri Jan 22 11:15:58 2010
@@ -0,0 +1,30 @@
+<?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.    
+-->
+<workspace xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+           xmlns:ns1="http://tuscany.apache.org/xmlns/sca/1.0">
+    <contribution location="file:../../domainconfig/introducing/target/classes/cloud"
+           uri="http://tuscany.apache.org/cloud"/>
+    <contribution location="file:../../contributions/introducing-tours/target/scatours-contribution-introducing-tours.jar"
+           uri="introducing-tours"/>
+    <contribution location="file:../../contributions/introducing-trips/target/scatours-contribution-introducing-trips.jar"
+           uri="introducing-trips"/>
+    <contribution location="file:../../contributions/introducing-client/target/scatours-contribution-introducing-client.jar"
+           uri="introducing-client"/>
+</workspace>

Added: tuscany/sandbox/travelsample/domainconfig/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/domainconfig/pom.xml?rev=902059&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/domainconfig/pom.xml (added)
+++ tuscany/sandbox/travelsample/domainconfig/pom.xml Fri Jan 22 11:15:58 2010
@@ -0,0 +1,47 @@
+<?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>scatours</artifactId>
+        <version>1.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <version>1.0-SNAPSHOT</version>
+    <artifactId>scatours-domainconfig</artifactId>
+    <packaging>pom</packaging>
+    <name>Apache Tuscany SCA Tours Domain Configurations</name>
+
+    <profiles>
+        <profile>
+            <id>default</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <modules>
+                <module>fullapp</module>
+                <module>introducing</module>
+            </modules>
+        </profile>
+
+    </profiles>
+
+</project>

Modified: tuscany/sandbox/travelsample/launchers/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/build.xml?rev=902059&r1=902058&r2=902059&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/build.xml (original)
+++ tuscany/sandbox/travelsample/launchers/build.xml Fri Jan 22 11:15:58 2010
@@ -55,6 +55,8 @@
         <ant dir="introducing" target="${target}"/>
         <ant dir="introducing-client" target="${target}"/>
         <ant dir="introducing-domain" target="${target}"/>
+        <ant dir="introducing-tours" target="${target}"/>
+        <ant dir="introducing-trips" target="${target}"/>
         <ant dir="jumpstart" target="${target}"/>
         <ant dir="notification-corba" target="${target}"/>
         <ant dir="notification-ejb" target="${target}"/>

Modified: tuscany/sandbox/travelsample/launchers/fullapp-domain/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/fullapp-domain/build.xml?rev=902059&r1=902058&r2=902059&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/fullapp-domain/build.xml (original)
+++ tuscany/sandbox/travelsample/launchers/fullapp-domain/build.xml Fri Jan 22 11:15:58 2010
@@ -26,7 +26,7 @@
        manager API.  Note that the classpath only includes the node launcher
        jar which will bootstrap the rest of the Tuscany runtime. -->
     <target name="run">
-        <java classname="scatours.FullAppDomainLauncher" fork="true">
+        <java classname="scatours.FullAppDomainAPILauncher" fork="true">
             <classpath>
                 <pathelement location="target/${ant.project.name}.jar"/>
                 <fileset dir="${env.TUSCANY_HOME}/modules">
@@ -48,7 +48,7 @@
                     <include name="tuscany-node-launcher-*.jar"/>
                 </fileset>
             </classpath>
-        	<arg value=".\target\classes"/>
+        	<arg value="./target/classes"/>
         </java>
     </target>
 </project>

Modified: tuscany/sandbox/travelsample/launchers/fullapp-domain/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/fullapp-domain/pom.xml?rev=902059&r1=902058&r2=902059&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/fullapp-domain/pom.xml (original)
+++ tuscany/sandbox/travelsample/launchers/fullapp-domain/pom.xml Fri Jan 22 11:15:58 2010
@@ -31,113 +31,12 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly</artifactId>
-            <version>${tuscany.version}</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core</artifactId>
-            <version>${tuscany.version}</version>
-        </dependency>        
-            
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly-xml</artifactId>
-            <version>${tuscany.version}</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-api</artifactId>
-            <version>${tuscany.version}</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher</artifactId>
             <version>${tuscany.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-domain-manager</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>        
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-widget-runtime-tuscany</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jsonrpc-js</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-sca-axis2</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-            
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>scatours-contribution-fullapp-bespoketrip</artifactId>
             <version>${pom.version}</version>
             <scope>provided</scope>
@@ -202,7 +101,11 @@
                 <version>2.2</version>
                 <configuration>
                     <archive>
-                        <manifestFile>META-INF/MANIFEST.MF</manifestFile>
+                        <manifest>
+                            <addClasspath>true</addClasspath>
+                            <classpathPrefix>../lib/</classpathPrefix>
+                            <mainClass>scatours.FullAppDomainLauncher</mainClass>
+                        </manifest>
                     </archive>
                 </configuration>
             </plugin>

Added: tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/java/scatours/FullAppDomainAPILauncher.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/java/scatours/FullAppDomainAPILauncher.java?rev=902059&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/java/scatours/FullAppDomainAPILauncher.java (added)
+++ tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/java/scatours/FullAppDomainAPILauncher.java Fri Jan 22 11:15:58 2010
@@ -0,0 +1,42 @@
+/*
+ * 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.launcher.DomainManagerLauncher;
+
+public class FullAppDomainAPILauncher {
+
+    public static void main(String[] args) throws Exception {
+    	DomainManagerLauncher dml = DomainManagerLauncher.newInstance();
+    	Object dm = dml.createDomainManager("../../domainconfig/fullapp/target/classes");
+        dm.getClass().getMethod("start").invoke(dm);
+    	
+        System.out.println("Point your browser at - http://localhost:9990/ui/home/ ");
+        System.out.println("Domain started - Press enter to shutdown.");
+
+        try {
+            System.in.read();
+        } catch (IOException e) {
+        }
+
+        dm.getClass().getMethod("stop").invoke(dm);
+    }
+}

Modified: tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/java/scatours/FullAppDomainLauncher.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/java/scatours/FullAppDomainLauncher.java?rev=902059&r1=902058&r2=902059&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/java/scatours/FullAppDomainLauncher.java (original)
+++ tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/java/scatours/FullAppDomainLauncher.java Fri Jan 22 11:15:58 2010
@@ -19,26 +19,12 @@
 
 package scatours;
 
-import java.io.IOException;
-import java.util.logging.Level;
-
 import org.apache.tuscany.sca.node.launcher.DomainManagerLauncher;
 
 public class FullAppDomainLauncher {
 
     public static void main(String[] args) throws Exception {
-    	DomainManagerLauncher dml = DomainManagerLauncher.newInstance();
-    	Object dm = dml.createDomainManager("./target/classes");
-        dm.getClass().getMethod("start").invoke(dm);
-    	
-        System.out.println("Point your browser at - http://localhost:9990/ui/home/ ");
-        System.out.println("Domain started - Press enter to shutdown.");
-
-        try {
-            System.in.read();
-        } catch (IOException e) {
-        }
-
-        dm.getClass().getMethod("stop").invoke(dm);
+        String[] dmArgs = {"../domainconfig/fullapp"};
+        DomainManagerLauncher.main(dmArgs);
     }
 }

Modified: tuscany/sandbox/travelsample/launchers/introducing-client/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/introducing-client/pom.xml?rev=902059&r1=902058&r2=902059&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/introducing-client/pom.xml (original)
+++ tuscany/sandbox/travelsample/launchers/introducing-client/pom.xml Fri Jan 22 11:15:58 2010
@@ -50,6 +50,20 @@
         </dependency>
 
         <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-sca-axis2</artifactId>
+            <version>${tuscany.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-jetty</artifactId>
+            <version>${tuscany.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <version>4.5</version>

Modified: tuscany/sandbox/travelsample/launchers/introducing-domain/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/introducing-domain/build.xml?rev=902059&r1=902058&r2=902059&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/introducing-domain/build.xml (original)
+++ tuscany/sandbox/travelsample/launchers/introducing-domain/build.xml Fri Jan 22 11:15:58 2010
@@ -20,14 +20,35 @@
 <project name="scatours-launcher-introducing-domain" default="run">
     <import file="../../antdefs.xml"/>
 
-    <target name="run" depends="compile">
+    <!-- In Tuscany 1.5.1 the command-line launcher for the domain manager
+       is hard wired to use the current directory for the domain configuration,
+       so we use a custom launcher to override this setting using the domain
+       manager API.  Note that the classpath only includes the node launcher
+       jar which will bootstrap the rest of the Tuscany runtime. -->
+    <target name="run">
+        <java classname="scatours.IntroducingDomainAPILauncher" fork="true">
+            <classpath>
+                <pathelement location="target/${ant.project.name}.jar"/>
+                <fileset dir="${env.TUSCANY_HOME}/modules">
+                    <include name="tuscany-node-launcher-*.jar"/>
+                </fileset>
+            </classpath>
+        </java>
+    </target>
+
+    <!-- The "run-command" target runs the DomainManagerLauncher class
+       directly (as if it had been invoked from a command line) and passes
+       in the domain configuration directory as a command-line argument.
+       This only works for Tuscany versions greater than 1.5.1. -->
+    <target name="run-command">
         <java classname="org.apache.tuscany.sca.node.launcher.DomainManagerLauncher"
-              dir="target/classes" fork="true">
+              dir="." fork="true">
             <classpath>
                 <fileset dir="${env.TUSCANY_HOME}/modules">
                     <include name="tuscany-node-launcher-*.jar"/>
                 </fileset>
             </classpath>
+            <arg value="./target/classes"/>
         </java>
     </target>
 </project>

Modified: tuscany/sandbox/travelsample/launchers/introducing-domain/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/introducing-domain/pom.xml?rev=902059&r1=902058&r2=902059&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/introducing-domain/pom.xml (original)
+++ tuscany/sandbox/travelsample/launchers/introducing-domain/pom.xml Fri Jan 22 11:15:58 2010
@@ -31,6 +31,12 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node-launcher</artifactId>
+            <version>${tuscany.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>scatours-contribution-introducing-tours</artifactId>
             <version>${pom.version}</version>
             <scope>provided</scope>
@@ -60,7 +66,11 @@
                 <version>2.2</version>
                 <configuration>
                     <archive>
-                        <manifestFile>META-INF/MANIFEST.MF</manifestFile>
+                        <manifest>
+                            <addClasspath>true</addClasspath>
+                            <classpathPrefix>../lib/</classpathPrefix>
+                            <mainClass>scatours.IntroducingDomainLauncher</mainClass>
+                        </manifest>
                     </archive>
                 </configuration>
             </plugin>

Added: tuscany/sandbox/travelsample/launchers/introducing-domain/src/main/java/scatours/IntroducingDomainAPILauncher.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/introducing-domain/src/main/java/scatours/IntroducingDomainAPILauncher.java?rev=902059&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/launchers/introducing-domain/src/main/java/scatours/IntroducingDomainAPILauncher.java (added)
+++ tuscany/sandbox/travelsample/launchers/introducing-domain/src/main/java/scatours/IntroducingDomainAPILauncher.java Fri Jan 22 11:15:58 2010
@@ -0,0 +1,42 @@
+/*
+ * 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.launcher.DomainManagerLauncher;
+
+public class IntroducingDomainAPILauncher {
+
+    public static void main(String[] args) throws Exception {
+    	DomainManagerLauncher dml = DomainManagerLauncher.newInstance();
+    	Object dm = dml.createDomainManager("../../domainconfig/introducing/target/classes");
+        dm.getClass().getMethod("start").invoke(dm);
+    	
+        System.out.println("Point your browser at - http://localhost:9990/ui/home/ ");
+        System.out.println("Domain started - Press enter to shutdown.");
+
+        try {
+            System.in.read();
+        } catch (IOException e) {
+        }
+
+        dm.getClass().getMethod("stop").invoke(dm);
+    }
+}