You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jb...@apache.org on 2006/01/14 17:48:48 UTC

svn commit: r369044 - in /incubator/tuscany/java: ./ das/ das/rdb/ das/rdb/META-INF/ das/rdb/src/main/resources/META-INF/ samples/ samples/bigbank/ samples/bigbank/account/ samples/bigbank/account/src/main/webapp/ samples/bigbank/customers/ samples/big...

Author: jboynes
Date: Sat Jan 14 08:48:35 2006
New Revision: 369044

URL: http://svn.apache.org/viewcvs?rev=369044&view=rev
Log:
integrate das and bigbank sample with main tree and build

Added:
    incubator/tuscany/java/das/pom.xml
      - copied, changed from r368870, incubator/tuscany/contrib/java/trunk/das/pom.xml
    incubator/tuscany/java/das/rdb/
      - copied from r368857, incubator/tuscany/contrib/java/trunk/das/rdb/
    incubator/tuscany/java/das/rdb/pom.xml
      - copied, changed from r368870, incubator/tuscany/contrib/java/trunk/das/rdb/pom.xml
    incubator/tuscany/java/das/rdb/src/main/resources/META-INF/
      - copied from r368857, incubator/tuscany/contrib/java/trunk/das/rdb/META-INF/
    incubator/tuscany/java/samples/bigbank/account/
      - copied from r368857, incubator/tuscany/contrib/java/trunk/samples/bigbank.account/
    incubator/tuscany/java/samples/bigbank/account/pom.xml
      - copied, changed from r368870, incubator/tuscany/contrib/java/trunk/samples/bigbank.account/pom.xml
    incubator/tuscany/java/samples/bigbank/account/src/main/webapp/
      - copied from r368870, incubator/tuscany/contrib/java/trunk/samples/bigbank.account/src/main/webapp/
    incubator/tuscany/java/samples/bigbank/customers/
      - copied from r368857, incubator/tuscany/contrib/java/trunk/samples/customers/
    incubator/tuscany/java/samples/bigbank/customers/pom.xml
      - copied, changed from r368870, incubator/tuscany/contrib/java/trunk/samples/customers/pom.xml
    incubator/tuscany/java/samples/bigbank/customers/src/main/webapp/
      - copied from r368870, incubator/tuscany/contrib/java/trunk/samples/customers/src/main/webapp/
    incubator/tuscany/java/samples/bigbank/pom.xml   (with props)
    incubator/tuscany/java/samples/bigbank/webclient/
      - copied from r368857, incubator/tuscany/contrib/java/trunk/samples/bigbank.webclient/
    incubator/tuscany/java/samples/bigbank/webclient/pom.xml
      - copied, changed from r368870, incubator/tuscany/contrib/java/trunk/samples/bigbank.webclient/pom.xml
    incubator/tuscany/java/samples/bigbank/webclient/src/main/webapp/
      - copied from r368870, incubator/tuscany/contrib/java/trunk/samples/bigbank.webclient/src/main/webapp/
Removed:
    incubator/tuscany/java/das/rdb/.classpath
    incubator/tuscany/java/das/rdb/.project
    incubator/tuscany/java/das/rdb/META-INF/
    incubator/tuscany/java/das/rdb/build.properties
    incubator/tuscany/java/das/rdb/project.xml
    incubator/tuscany/java/das/rdb/rdb.iml
    incubator/tuscany/java/samples/bigbank/account/.classpath
    incubator/tuscany/java/samples/bigbank/account/.project
    incubator/tuscany/java/samples/bigbank/account/bigbank.account.iml
    incubator/tuscany/java/samples/bigbank/account/project.properties
    incubator/tuscany/java/samples/bigbank/account/project.xml
    incubator/tuscany/java/samples/bigbank/customers/build.properties
    incubator/tuscany/java/samples/bigbank/customers/customers.iml
    incubator/tuscany/java/samples/bigbank/customers/project.properties
    incubator/tuscany/java/samples/bigbank/customers/project.xml
    incubator/tuscany/java/samples/bigbank/webclient/.classpath
    incubator/tuscany/java/samples/bigbank/webclient/.project
    incubator/tuscany/java/samples/bigbank/webclient/.runtime
    incubator/tuscany/java/samples/bigbank/webclient/.wtpmodules
    incubator/tuscany/java/samples/bigbank/webclient/bigbank.webclient.iml
    incubator/tuscany/java/samples/bigbank/webclient/project.properties
    incubator/tuscany/java/samples/bigbank/webclient/project.xml
Modified:
    incubator/tuscany/java/pom.xml
    incubator/tuscany/java/samples/pom.xml

Copied: incubator/tuscany/java/das/pom.xml (from r368870, incubator/tuscany/contrib/java/trunk/das/pom.xml)
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/das/pom.xml?p2=incubator/tuscany/java/das/pom.xml&p1=incubator/tuscany/contrib/java/trunk/das/pom.xml&r1=368870&r2=369044&rev=369044&view=diff
==============================================================================
--- incubator/tuscany/contrib/java/trunk/das/pom.xml (original)
+++ incubator/tuscany/java/das/pom.xml Sat Jan 14 08:48:35 2006
@@ -16,13 +16,13 @@
  -->
 <project>
     <parent>
-        <groupId>org.osoa</groupId>
-        <artifactId>tuscany</artifactId>
+        <groupId>org.apache.tuscany</groupId>
+        <artifactId>tuscany-project</artifactId>
         <version>SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.osoa</groupId>
-    <artifactId>das</artifactId>
+    <groupId>org.apache.tuscany.das</groupId>
+    <artifactId>tuscany-das</artifactId>
     <packaging>pom</packaging>
     <name>Tuscany DAS</name>
     <version>SNAPSHOT</version>
@@ -31,17 +31,4 @@
         <module>rdb</module>
     </modules>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <includes>
-                        <include>**/*AllTestsDerby.java</include>
-                    </includes>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>

Copied: incubator/tuscany/java/das/rdb/pom.xml (from r368870, incubator/tuscany/contrib/java/trunk/das/rdb/pom.xml)
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/das/rdb/pom.xml?p2=incubator/tuscany/java/das/rdb/pom.xml&p1=incubator/tuscany/contrib/java/trunk/das/rdb/pom.xml&r1=368870&r2=369044&rev=369044&view=diff
==============================================================================
--- incubator/tuscany/contrib/java/trunk/das/rdb/pom.xml (original)
+++ incubator/tuscany/java/das/rdb/pom.xml Sat Jan 14 08:48:35 2006
@@ -16,14 +16,13 @@
  -->
 <project>
     <parent>
-        <groupId>org.osoa</groupId>
-        <artifactId>das</artifactId>
+        <groupId>org.apache.tuscany.das</groupId>
+        <artifactId>tuscany-das</artifactId>
         <version>SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.osoa</groupId>
-    <artifactId>tuscany-das-jdbc</artifactId>
-    <name>Tuscany DAS for JDBC Databases</name>
+    <artifactId>tuscany-das-rdb</artifactId>
+    <name>Tuscany DAS for Relational Databases</name>
     <version>SNAPSHOT</version>
 
     <dependencies>
@@ -31,31 +30,37 @@
             <groupId>org.eclipse.emf</groupId>
             <artifactId>commonj-sdo</artifactId>
             <version>2.1.0</version>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse.emf</groupId>
             <artifactId>common</artifactId>
             <version>2.1.0</version>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse.emf</groupId>
             <artifactId>ecore</artifactId>
             <version>2.1.0</version>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse.emf</groupId>
             <artifactId>ecore-change</artifactId>
             <version>2.1.0</version>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse.emf</groupId>
             <artifactId>ecore-sdo</artifactId>
             <version>2.1.1</version>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse.emf</groupId>
             <artifactId>ecore-xmi</artifactId>
             <version>2.1.0</version>
+            <scope>compile</scope>
         </dependency>
 
         <dependency>
@@ -68,6 +73,30 @@
             <groupId>org.apache.derby</groupId>
             <artifactId>derby</artifactId>
             <version>10.1.1.0</version>
+            <scope>test</scope>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <includes>
+                        <include>**/*AllTestsDerby.java</include>
+                    </includes>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

Modified: incubator/tuscany/java/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/pom.xml?rev=369044&r1=369043&r2=369044&view=diff
==============================================================================
--- incubator/tuscany/java/pom.xml (original)
+++ incubator/tuscany/java/pom.xml Sat Jan 14 08:48:35 2006
@@ -58,10 +58,10 @@
 
     <modules>
         <module>spec</module>
+        <module>das</module>
         <module>sca</module>
         <module>samples</module>
         <!--
-            <module>das</module>
             <module>tools</module>
             <module>acceptance</module>
         -->

Copied: incubator/tuscany/java/samples/bigbank/account/pom.xml (from r368870, incubator/tuscany/contrib/java/trunk/samples/bigbank.account/pom.xml)
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/samples/bigbank/account/pom.xml?p2=incubator/tuscany/java/samples/bigbank/account/pom.xml&p1=incubator/tuscany/contrib/java/trunk/samples/bigbank.account/pom.xml&r1=368870&r2=369044&rev=369044&view=diff
==============================================================================
--- incubator/tuscany/contrib/java/trunk/samples/bigbank.account/pom.xml (original)
+++ incubator/tuscany/java/samples/bigbank/account/pom.xml Sat Jan 14 08:48:35 2006
@@ -16,13 +16,12 @@
  -->
 <project>
     <parent>
-        <groupId>org.osoa</groupId>
-        <artifactId>samples</artifactId>
+        <groupId>org.apache.tuscany.samples.bigbank</groupId>
+        <artifactId>bigbank-samples</artifactId>
         <version>SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.osoa</groupId>
-    <artifactId>tuscany-samples-bigbank-account</artifactId>
+    <artifactId>account</artifactId>
     <packaging>war</packaging>
     <name>Tuscany sample BigBank account</name>
     <description>BigBank sample - account module</description>
@@ -30,87 +29,10 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.osoa</groupId>
-            <artifactId>sca-api</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.osoa</groupId>
-            <artifactId>tuscany-common</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.osoa</groupId>
+            <groupId>org.apache.tuscany</groupId>
             <artifactId>tuscany-core</artifactId>
             <version>${pom.version}</version>
             <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.osoa</groupId>
-            <artifactId>tuscany-model</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.osoa</groupId>
-            <artifactId>tuscany-binding-axis</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.osoa</groupId>
-            <artifactId>tuscany-container-java</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.eclipse.emf</groupId>
-            <artifactId>commonj-sdo</artifactId>
-            <version>2.1.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.emf</groupId>
-            <artifactId>common</artifactId>
-            <version>2.1.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.emf</groupId>
-            <artifactId>ecore</artifactId>
-            <version>2.1.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.emf</groupId>
-            <artifactId>ecore-change</artifactId>
-            <version>2.1.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.emf</groupId>
-            <artifactId>ecore-sdo</artifactId>
-            <version>2.1.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.emf</groupId>
-            <artifactId>ecore-xmi</artifactId>
-            <version>2.1.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.xsd</groupId>
-            <artifactId>xsd</artifactId>
-            <version>2.1.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.wtp</groupId>
-            <artifactId>wsdl</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-
-        <dependency>
-            <groupId>axis</groupId>
-            <artifactId>axis-wsdl4j</artifactId>
-            <version>1.5.1</version>
         </dependency>
     </dependencies>
 </project>

Copied: incubator/tuscany/java/samples/bigbank/customers/pom.xml (from r368870, incubator/tuscany/contrib/java/trunk/samples/customers/pom.xml)
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/samples/bigbank/customers/pom.xml?p2=incubator/tuscany/java/samples/bigbank/customers/pom.xml&p1=incubator/tuscany/contrib/java/trunk/samples/customers/pom.xml&r1=368870&r2=369044&rev=369044&view=diff
==============================================================================
--- incubator/tuscany/contrib/java/trunk/samples/customers/pom.xml (original)
+++ incubator/tuscany/java/samples/bigbank/customers/pom.xml Sat Jan 14 08:48:35 2006
@@ -16,120 +16,29 @@
  -->
 <project>
     <parent>
-        <groupId>org.osoa</groupId>
-        <artifactId>samples</artifactId>
+        <groupId>org.apache.tuscany.samples.bigbank</groupId>
+        <artifactId>bigbank-samples</artifactId>
         <version>SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.osoa</groupId>
-    <artifactId>tuscany-samples-customerWEB</artifactId>
+    <artifactId>customers</artifactId>
     <packaging>war</packaging>
-    <name>Tuscany sample customer WEB</name>
+    <name>Tuscany sample BigBank customer</name>
     <description>DAS example with JSP</description>
     <version>SNAPSHOT</version>
 
     <dependencies>
         <dependency>
-            <groupId>org.osoa</groupId>
-            <artifactId>sca-api</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.osoa</groupId>
-            <artifactId>tuscany-common</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.osoa</groupId>
-            <artifactId>tuscany-core</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.osoa</groupId>
-            <artifactId>tuscany-model</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.osoa</groupId>
-            <artifactId>tuscany-binding-axis</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.osoa</groupId>
-            <artifactId>tuscany-container-java</artifactId>
+            <groupId>org.apache.tuscany.das</groupId>
+            <artifactId>tuscany-das-rdb</artifactId>
             <version>${pom.version}</version>
-            <scope>compile</scope>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.osoa</groupId>
-            <artifactId>tuscany-das-jdbc</artifactId>
+            <artifactId>sca-api</artifactId>
             <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.eclipse.emf</groupId>
-            <artifactId>commonj-sdo</artifactId>
-            <version>2.1.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.emf</groupId>
-            <artifactId>common</artifactId>
-            <version>2.1.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.emf</groupId>
-            <artifactId>ecore</artifactId>
-            <version>2.1.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.emf</groupId>
-            <artifactId>ecore-change</artifactId>
-            <version>2.1.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.emf</groupId>
-            <artifactId>ecore-sdo</artifactId>
-            <version>2.1.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.emf</groupId>
-            <artifactId>ecore-xmi</artifactId>
-            <version>2.1.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.xsd</groupId>
-            <artifactId>xsd</artifactId>
-            <version>2.1.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.wtp</groupId>
-            <artifactId>wsdl</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-
-        <dependency>
-            <groupId>axis</groupId>
-            <artifactId>axis-wsdl4j</artifactId>
-            <version>1.5.1</version>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
-
-    <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-                <includes>
-                    <include>**/*.componentType</include>
-                    <include>sca.module</include>
-                </includes>
-                <filtering>false</filtering>
-            </resource>
-        </resources>
-    </build>
 </project>

Added: incubator/tuscany/java/samples/bigbank/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/samples/bigbank/pom.xml?rev=369044&view=auto
==============================================================================
--- incubator/tuscany/java/samples/bigbank/pom.xml (added)
+++ incubator/tuscany/java/samples/bigbank/pom.xml Sat Jan 14 08:48:35 2006
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ *  Copyright (c) 2005-2006 The Apache Software Foundation or its licensors, as applicable.
+ *
+ *  Licensed 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>
+    <parent>
+        <groupId>org.apache.tuscany.samples</groupId>
+        <artifactId>tuscany-samples</artifactId>
+        <version>SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.apache.tuscany.samples.bigbank</groupId>
+    <artifactId>bigbank-samples</artifactId>
+    <packaging>pom</packaging>
+    <name>Tuscany BigBank Samples</name>
+    <version>SNAPSHOT</version>
+
+    <modules>
+        <module>customers</module>
+        <module>account</module>
+        <module>webclient</module>
+    </modules>
+</project>

Propchange: incubator/tuscany/java/samples/bigbank/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/samples/bigbank/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Rev,Date

Copied: incubator/tuscany/java/samples/bigbank/webclient/pom.xml (from r368870, incubator/tuscany/contrib/java/trunk/samples/bigbank.webclient/pom.xml)
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/samples/bigbank/webclient/pom.xml?p2=incubator/tuscany/java/samples/bigbank/webclient/pom.xml&p1=incubator/tuscany/contrib/java/trunk/samples/bigbank.webclient/pom.xml&r1=368870&r2=369044&rev=369044&view=diff
==============================================================================
--- incubator/tuscany/contrib/java/trunk/samples/bigbank.webclient/pom.xml (original)
+++ incubator/tuscany/java/samples/bigbank/webclient/pom.xml Sat Jan 14 08:48:35 2006
@@ -16,13 +16,12 @@
  -->
 <project>
     <parent>
-        <groupId>org.osoa</groupId>
-        <artifactId>samples</artifactId>
+        <groupId>org.apache.tuscany.samples.bigbank</groupId>
+        <artifactId>bigbank-samples</artifactId>
         <version>SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.osoa</groupId>
-    <artifactId>tuscany-samples-bigbank-webclient</artifactId>
+    <artifactId>webclient</artifactId>
     <packaging>war</packaging>
     <name>Tuscany sample BigBank webclient</name>
     <description>BigBank sample - webclient module</description>
@@ -30,98 +29,23 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.osoa</groupId>
-            <artifactId>sca-api</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.osoa</groupId>
-            <artifactId>tuscany-common</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.osoa</groupId>
+            <groupId>org.apache.tuscany</groupId>
             <artifactId>tuscany-core</artifactId>
             <version>${pom.version}</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>org.osoa</groupId>
-            <artifactId>tuscany-model</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.osoa</groupId>
-            <artifactId>tuscany-binding-axis</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.osoa</groupId>
-            <artifactId>tuscany-container-java</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.eclipse.emf</groupId>
-            <artifactId>commonj-sdo</artifactId>
-            <version>2.1.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.emf</groupId>
-            <artifactId>common</artifactId>
-            <version>2.1.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.emf</groupId>
-            <artifactId>ecore</artifactId>
-            <version>2.1.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.emf</groupId>
-            <artifactId>ecore-change</artifactId>
-            <version>2.1.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.emf</groupId>
-            <artifactId>ecore-sdo</artifactId>
-            <version>2.1.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.emf</groupId>
-            <artifactId>ecore-xmi</artifactId>
-            <version>2.1.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.xsd</groupId>
-            <artifactId>xsd</artifactId>
-            <version>2.1.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.wtp</groupId>
-            <artifactId>wsdl</artifactId>
-            <version>1.0.0</version>
-        </dependency>
 
         <dependency>
             <groupId>tomcat</groupId>
             <artifactId>servlet-api</artifactId>
             <version>5.0.18</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>tomcat</groupId>
             <artifactId>jsp-api</artifactId>
             <version>5.0.18</version>
-        </dependency>
-
-        <dependency>
-            <groupId>axis</groupId>
-            <artifactId>axis-wsdl4j</artifactId>
-            <version>1.5.1</version>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 </project>

Modified: incubator/tuscany/java/samples/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/samples/pom.xml?rev=369044&r1=369043&r2=369044&view=diff
==============================================================================
--- incubator/tuscany/java/samples/pom.xml (original)
+++ incubator/tuscany/java/samples/pom.xml Sat Jan 14 08:48:35 2006
@@ -28,7 +28,7 @@
     <version>SNAPSHOT</version>
 
     <modules>
-        <!--<module>bigbank</module>-->
         <module>helloworld</module>
+        <module>bigbank</module>
     </modules>
 </project>