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/10/16 07:00:46 UTC
svn commit: r464377 - in /incubator/tuscany/branches/sca-java-M2/samples:
applications/ applications/bigbank/ applications/bigbank/account/pom.xml
applications/bigbank/pom.xml applications/bigbank/webclient/pom.xml pom.xml
Author: jboynes
Date: Sun Oct 15 22:00:45 2006
New Revision: 464377
URL: http://svn.apache.org/viewvc?view=rev&rev=464377
Log:
copy BigBank sample to branch and clean up POMs
Added:
incubator/tuscany/branches/sca-java-M2/samples/applications/
incubator/tuscany/branches/sca-java-M2/samples/applications/bigbank/
- copied from r464374, incubator/tuscany/java/sampleapps/bigbank/
Modified:
incubator/tuscany/branches/sca-java-M2/samples/applications/bigbank/account/pom.xml
incubator/tuscany/branches/sca-java-M2/samples/applications/bigbank/pom.xml
incubator/tuscany/branches/sca-java-M2/samples/applications/bigbank/webclient/pom.xml
incubator/tuscany/branches/sca-java-M2/samples/pom.xml
Modified: incubator/tuscany/branches/sca-java-M2/samples/applications/bigbank/account/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-M2/samples/applications/bigbank/account/pom.xml?view=diff&rev=464377&r1=464374&r2=464377
==============================================================================
--- incubator/tuscany/branches/sca-java-M2/samples/applications/bigbank/account/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-M2/samples/applications/bigbank/account/pom.xml Sun Oct 15 22:00:45 2006
@@ -19,7 +19,7 @@
-->
<project>
<parent>
- <groupId>org.apache.tuscany.samples.bigbank</groupId>
+ <groupId>org.apache.tuscany.sca.samples.bigbank</groupId>
<artifactId>bigbank-scenario</artifactId>
<version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
@@ -28,13 +28,19 @@
<packaging>war</packaging>
<name>Tuscany BigBank Account Module</name>
<description>BigBank Scenario - Account Management Module</description>
- <dependencies>
-
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sca.kernel</groupId>
+ <artifactId>tuscany-api</artifactId>
+ <version>${scaVersion}</version>
+ <scope>compile</scope>
+ </dependency>
<dependency>
<groupId>org.apache.tuscany.sca.runtime</groupId>
<artifactId>webapp</artifactId>
- <version>${tuscanyVersion}</version>
+ <version>${scaVersion}</version>
+ <scope>runtime</scope>
</dependency>
<!-- java.xml.stream API -->
@@ -57,7 +63,7 @@
<dependency>
<groupId>org.apache.tuscany.sdo</groupId>
<artifactId>tuscany-sdo-impl</artifactId>
- <version>${sca.version}</version>
+ <version>${sdoVersion}</version>
<scope>compile</scope>
</dependency>
@@ -65,7 +71,7 @@
<dependency>
<groupId>org.apache.tuscany.das</groupId>
<artifactId>tuscany-das-rdb</artifactId>
- <version>${pom.version}</version>
+ <version>${dasVersion}</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -86,40 +92,6 @@
<version>3.8.1</version>
<scope>test</scope>
</dependency>
-
-
-
- <!--TUSCANY-765 include here
- <dependency>
- <groupId>org.apache.tuscany.sca.services.idl</groupId>
- <artifactId>wsdl</artifactId>
- <version>${sca.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca.services.databinding</groupId>
- <artifactId>databinding-sdo</artifactId>
- <version>${sca.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca.services.databinding</groupId>
- <artifactId>databinding-axiom</artifactId>
- <version>${sca.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca.services.bindings</groupId>
- <artifactId>axis2</artifactId>
- <version>${sca.version}</version>
- <scope>compile</scope>
- </dependency>
-
-
-
-
- TUSCANY-765 include here -->
-
</dependencies>
<build>
<resources>
@@ -141,7 +113,7 @@
<plugin>
<groupId>org.apache.tuscany.sdo</groupId>
<artifactId>tuscany-sdo-plugin</artifactId>
- <version>${sdo.version}</version>
+ <version>${sdoVersion}</version>
<executions>
<execution>
<configuration>
@@ -201,24 +173,12 @@
<dependency>
<groupId>org.apache.tuscany.sca.services.databinding</groupId>
<artifactId>databinding-sdo</artifactId>
- <version>${sca.version}</version>
- </dependency>
- <!--
- <dependency>
- <groupId>org.apache.tuscany.sca.services.idl</groupId>
- <artifactId>wsdl</artifactId>
- <version>${sca.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca.services.databinding</groupId>
- <artifactId>databinding-axiom</artifactId>
- <version>${sca.version}</version>
+ <version>${scaVersion}</version>
</dependency>
- -->
<dependency>
<groupId>org.apache.tuscany.sca.services.bindings</groupId>
<artifactId>axis2</artifactId>
- <version>${sca.version}</version>
+ <version>${scaVersion}</version>
</dependency>
</extensions>
Modified: incubator/tuscany/branches/sca-java-M2/samples/applications/bigbank/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-M2/samples/applications/bigbank/pom.xml?view=diff&rev=464377&r1=464374&r2=464377
==============================================================================
--- incubator/tuscany/branches/sca-java-M2/samples/applications/bigbank/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-M2/samples/applications/bigbank/pom.xml Sun Oct 15 22:00:45 2006
@@ -19,12 +19,12 @@
-->
<project>
<parent>
- <groupId>org.apache.tuscany.sampleapps</groupId>
- <artifactId>tuscany-sampleapps</artifactId>
+ <groupId>org.apache.tuscany.sca.samples</groupId>
+ <artifactId>parent</artifactId>
<version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.tuscany.samples.bigbank</groupId>
+ <groupId>org.apache.tuscany.sca.samples.bigbank</groupId>
<artifactId>bigbank-scenario</artifactId>
<packaging>pom</packaging>
<name>Tuscany BigBank Scenario Sample</name>
Modified: incubator/tuscany/branches/sca-java-M2/samples/applications/bigbank/webclient/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-M2/samples/applications/bigbank/webclient/pom.xml?view=diff&rev=464377&r1=464374&r2=464377
==============================================================================
--- incubator/tuscany/branches/sca-java-M2/samples/applications/bigbank/webclient/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-M2/samples/applications/bigbank/webclient/pom.xml Sun Oct 15 22:00:45 2006
@@ -19,7 +19,7 @@
-->
<project>
<parent>
- <groupId>org.apache.tuscany.samples.bigbank</groupId>
+ <groupId>org.apache.tuscany.sca.samples.bigbank</groupId>
<artifactId>bigbank-scenario</artifactId>
<version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
@@ -33,14 +33,14 @@
<dependency>
<groupId>org.apache.tuscany.sca.kernel</groupId>
<artifactId>tuscany-api</artifactId>
- <version>${pom.version}</version>
- <scope>compile</scope><!-- runtime is need for webapp integration to include jar -->
+ <version>${scaVersion}</version>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>commonj</groupId>
<artifactId>sdo-api-r2.0.1</artifactId>
- <version>${tuscanyVersion}</version>
+ <version>${sdoVersion}</version>
<scope>compile</scope>
</dependency>
<!-- SDO's XMLStreamHelper requires StAX API and impl (it's not pulled by
@@ -60,28 +60,28 @@
<dependency>
<groupId>org.apache.tuscany.sdo</groupId>
<artifactId>tuscany-sdo-impl</artifactId>
- <version>${sca.version}</version>
+ <version>${sdoVersion}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca.runtime</groupId>
<artifactId>webapp</artifactId>
- <version>${tuscanyVersion}</version>
+ <version>${scaVersion}</version>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>tomcat</groupId>
+ <groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>5.0.18</version>
+ <version>2.4</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>tomcat</groupId>
+ <groupId>javax.servlet</groupId>
<artifactId>jsp-api</artifactId>
- <version>5.0.18</version>
+ <version>2.0</version>
<scope>provided</scope>
</dependency>
@@ -91,51 +91,6 @@
<version>3.8.1</version>
<scope>test</scope>
</dependency>
- <!--
- <dependency>
- <groupId>org.apache.tuscany.sca.kernel</groupId>
- <artifactId>tuscany-api</artifactId>
- <version>${sca.version}</version>
- <scope>provided</scope>
- </dependency>
- -->
-
-
- <!--TUSCANY-765 include here -->
- <!--
- <dependency>
- <groupId>org.apache.tuscany.sca.services.idl</groupId>
- <artifactId>wsdl</artifactId>
- <version>${sca.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca.services.databinding</groupId>
- <artifactId>databinding-sdo</artifactId>
- <version>${sca.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca.services.databinding</groupId>
- <artifactId>databinding-axiom</artifactId>
- <version>${sca.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca.services.bindings</groupId>
- <artifactId>axis2</artifactId>
- <version>${sca.version}</version>
- <scope>compile</scope>
- </dependency>
- -->
- <!-- move it to web-inf/lib -->
-
-
- <!--TUSCANY-765 include here -->
-
-
-
-
</dependencies>
<build>
@@ -159,7 +114,7 @@
<plugin>
<groupId>org.apache.tuscany.sdo</groupId>
<artifactId>tuscany-sdo-plugin</artifactId>
- <version>${sdo.version}</version>
+ <version>${sdoVersion}</version>
<executions>
<execution>
<configuration>
@@ -204,35 +159,19 @@
<!-- Set to false to leave external jars for extensions to be resolved from maven repository -->
<loadExtensionDependencies>false</loadExtensionDependencies>
- <!--TUSCANY-765 -->
<extensions>
<dependency>
<groupId>org.apache.tuscany.sca.services.databinding</groupId>
<artifactId>databinding-sdo</artifactId>
- <version>${sca.version}</version>
- </dependency>
- <!-- HACK: comment out databinding-axiom extension to work around the inter-extension
- dependency issue -->
- <!--
- <dependency>
- <groupId>org.apache.tuscany.sca.services.idl</groupId>
- <artifactId>wsdl</artifactId>
- <version>${sca.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca.services.databinding</groupId>
- <artifactId>databinding-axiom</artifactId>
- <version>${sca.version}</version>
+ <version>${scaVersion}</version>
</dependency>
- -->
<dependency>
<groupId>org.apache.tuscany.sca.services.bindings</groupId>
<artifactId>axis2</artifactId>
- <version>${sca.version}</version>
+ <version>${scaVersion}</version>
</dependency>
</extensions>
- <!-- TUSCANY-765 -->
</configuration>
</plugin>
</plugins>
Modified: incubator/tuscany/branches/sca-java-M2/samples/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-M2/samples/pom.xml?view=diff&rev=464377&r1=464376&r2=464377
==============================================================================
--- incubator/tuscany/branches/sca-java-M2/samples/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-M2/samples/pom.xml Sun Oct 15 22:00:45 2006
@@ -33,6 +33,8 @@
<properties>
<scaVersion>1.0-incubator-M2-SNAPSHOT</scaVersion>
+ <sdoVersion>1.0-incubator-M2</sdoVersion>
+ <dasVersion>1.0-incubator-M2-SNAPSHOT</dasVersion>
<specVersion>0.95</specVersion>
</properties>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org