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:09:18 UTC
svn commit: r369040 - in /incubator/tuscany/java: ./ samples/
samples/bigbank/ samples/helloworld/ samples/helloworld/helloworld/
samples/helloworld/helloworldaxis/ samples/helloworld/helloworldaxissvc/
samples/helloworld/helloworldaxissvc/src/main/web...
Author: jboynes
Date: Sat Jan 14 08:09:05 2006
New Revision: 369040
URL: http://svn.apache.org/viewcvs?rev=369040&view=rev
Log:
integrate helloworld samples into main tree and build
Added:
incubator/tuscany/java/samples/bigbank/
incubator/tuscany/java/samples/helloworld/
incubator/tuscany/java/samples/helloworld/helloworld/
- copied from r368857, incubator/tuscany/contrib/java/trunk/samples/helloworld/
incubator/tuscany/java/samples/helloworld/helloworld/pom.xml
- copied, changed from r368870, incubator/tuscany/contrib/java/trunk/samples/helloworld/pom.xml
incubator/tuscany/java/samples/helloworld/helloworldaxis/
- copied from r368857, incubator/tuscany/contrib/java/trunk/samples/helloworldaxis/
incubator/tuscany/java/samples/helloworld/helloworldaxis/pom.xml
- copied, changed from r368870, incubator/tuscany/contrib/java/trunk/samples/helloworldaxis/pom.xml
incubator/tuscany/java/samples/helloworld/helloworldaxissvc/
- copied from r368857, incubator/tuscany/contrib/java/trunk/samples/helloworldaxissvc/
incubator/tuscany/java/samples/helloworld/helloworldaxissvc/pom.xml
- copied, changed from r368870, incubator/tuscany/contrib/java/trunk/samples/helloworldaxissvc/pom.xml
incubator/tuscany/java/samples/helloworld/helloworldaxissvc/src/main/webapp/
- copied from r368870, incubator/tuscany/contrib/java/trunk/samples/helloworldaxissvc/src/main/webapp/
incubator/tuscany/java/samples/helloworld/helloworldmc/
- copied from r368857, incubator/tuscany/contrib/java/trunk/samples/helloworldmc/
incubator/tuscany/java/samples/helloworld/helloworldmc/pom.xml
- copied, changed from r368870, incubator/tuscany/contrib/java/trunk/samples/helloworldmc/pom.xml
incubator/tuscany/java/samples/helloworld/helloworldweb/
- copied from r368857, incubator/tuscany/contrib/java/trunk/samples/helloworldweb/
incubator/tuscany/java/samples/helloworld/helloworldweb/pom.xml
- copied, changed from r368870, incubator/tuscany/contrib/java/trunk/samples/helloworldweb/pom.xml
incubator/tuscany/java/samples/helloworld/helloworldweb/src/main/webapp/
- copied from r368870, incubator/tuscany/contrib/java/trunk/samples/helloworldweb/src/main/webapp/
incubator/tuscany/java/samples/helloworld/helloworldws/
- copied from r368857, incubator/tuscany/contrib/java/trunk/samples/helloworldws/
incubator/tuscany/java/samples/helloworld/helloworldws/pom.xml
- copied, changed from r368870, incubator/tuscany/contrib/java/trunk/samples/helloworldws/pom.xml
incubator/tuscany/java/samples/helloworld/helloworldws/src/main/webapp/
- copied from r368870, incubator/tuscany/contrib/java/trunk/samples/helloworldws/src/main/webapp/
incubator/tuscany/java/samples/helloworld/helloworldwsclient/
- copied from r368857, incubator/tuscany/contrib/java/trunk/samples/helloworldwsclient/
incubator/tuscany/java/samples/helloworld/helloworldwsclient/pom.xml
- copied, changed from r368870, incubator/tuscany/contrib/java/trunk/samples/helloworldwsclient/pom.xml
incubator/tuscany/java/samples/helloworld/pom.xml
- copied, changed from r368870, incubator/tuscany/contrib/java/trunk/samples/pom.xml
incubator/tuscany/java/samples/pom.xml
- copied, changed from r368870, incubator/tuscany/contrib/java/trunk/samples/pom.xml
Removed:
incubator/tuscany/java/samples/helloworld/helloworld/.classpath
incubator/tuscany/java/samples/helloworld/helloworld/.project
incubator/tuscany/java/samples/helloworld/helloworld/helloworld.iml
incubator/tuscany/java/samples/helloworld/helloworld/project.xml
incubator/tuscany/java/samples/helloworld/helloworldaxis/.classpath
incubator/tuscany/java/samples/helloworld/helloworldaxis/.project
incubator/tuscany/java/samples/helloworld/helloworldaxis/helloworldaxis.iml
incubator/tuscany/java/samples/helloworld/helloworldaxis/project.xml
incubator/tuscany/java/samples/helloworld/helloworldaxissvc/.classpath
incubator/tuscany/java/samples/helloworld/helloworldaxissvc/.project
incubator/tuscany/java/samples/helloworld/helloworldaxissvc/project.properties
incubator/tuscany/java/samples/helloworld/helloworldaxissvc/project.xml
incubator/tuscany/java/samples/helloworld/helloworldmc/.classpath
incubator/tuscany/java/samples/helloworld/helloworldmc/.project
incubator/tuscany/java/samples/helloworld/helloworldmc/helloworldmc.iml
incubator/tuscany/java/samples/helloworld/helloworldmc/project.xml
incubator/tuscany/java/samples/helloworld/helloworldweb/.classpath
incubator/tuscany/java/samples/helloworld/helloworldweb/.project
incubator/tuscany/java/samples/helloworld/helloworldweb/helloworldweb.iml
incubator/tuscany/java/samples/helloworld/helloworldweb/project.properties
incubator/tuscany/java/samples/helloworld/helloworldweb/project.xml
incubator/tuscany/java/samples/helloworld/helloworldws/.classpath
incubator/tuscany/java/samples/helloworld/helloworldws/.project
incubator/tuscany/java/samples/helloworld/helloworldws/helloworldws.iml
incubator/tuscany/java/samples/helloworld/helloworldws/project.properties
incubator/tuscany/java/samples/helloworld/helloworldws/project.xml
incubator/tuscany/java/samples/helloworld/helloworldwsclient/.classpath
incubator/tuscany/java/samples/helloworld/helloworldwsclient/.project
incubator/tuscany/java/samples/helloworld/helloworldwsclient/helloworldwsclient.iml
incubator/tuscany/java/samples/helloworld/helloworldwsclient/project.xml
Modified:
incubator/tuscany/java/pom.xml
Modified: incubator/tuscany/java/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/pom.xml?rev=369040&r1=369039&r2=369040&view=diff
==============================================================================
--- incubator/tuscany/java/pom.xml (original)
+++ incubator/tuscany/java/pom.xml Sat Jan 14 08:09:05 2006
@@ -59,10 +59,10 @@
<modules>
<module>spec</module>
<module>sca</module>
+ <module>samples</module>
<!--
<module>das</module>
<module>tools</module>
- <module>samples</module>
<module>acceptance</module>
-->
</modules>
@@ -75,17 +75,33 @@
<configuration>
<source>1.5</source>
<target>1.5</target>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <includes>
- <include>**/*</include>
- </includes>
- </resource>
- </resources>
</configuration>
</plugin>
</plugins>
+
+ <resources>
+ <resource>
+ <directory>src/main/java</directory>
+ <includes>
+ <include>**/*.componentType</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ </resources>
+
+ <testResources>
+ <testResource>
+ <directory>src/test/java</directory>
+ <includes>
+ <include>**/*.componentType</include>
+ </includes>
+ </testResource>
+ <testResource>
+ <directory>src/test/resources</directory>
+ </testResource>
+ </testResources>
<defaultGoal>install</defaultGoal>
</build>
Copied: incubator/tuscany/java/samples/helloworld/helloworld/pom.xml (from r368870, incubator/tuscany/contrib/java/trunk/samples/helloworld/pom.xml)
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/samples/helloworld/helloworld/pom.xml?p2=incubator/tuscany/java/samples/helloworld/helloworld/pom.xml&p1=incubator/tuscany/contrib/java/trunk/samples/helloworld/pom.xml&r1=368870&r2=369040&rev=369040&view=diff
==============================================================================
--- incubator/tuscany/contrib/java/trunk/samples/helloworld/pom.xml (original)
+++ incubator/tuscany/java/samples/helloworld/helloworld/pom.xml Sat Jan 14 08:09:05 2006
@@ -16,13 +16,12 @@
-->
<project>
<parent>
- <groupId>org.osoa</groupId>
- <artifactId>samples</artifactId>
+ <groupId>org.apache.tuscany.samples.helloworld</groupId>
+ <artifactId>helloworld-samples</artifactId>
<version>SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.osoa</groupId>
- <artifactId>tuscany-samples-helloworld</artifactId>
+ <artifactId>helloworld</artifactId>
<packaging>jar</packaging>
<name>Tuscany sample HelloWorld</name>
<description>Sample classic helloworld</description>
@@ -30,123 +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>
+ <groupId>org.apache.tuscany</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>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- <resources>
- <resource>
- <directory>src/test/java</directory>
- <includes>
- <include>**/*</include>
- </includes>
- </resource>
- </resources>
- </configuration>
- </plugin>
- </plugins>
- <resources>
- <resource>
- <directory>src/main/java</directory>
- <includes>
- <include>**/*</include>
- </includes>
- <filtering>false</filtering>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- <includes>
- <include>**/*</include>
- </includes>
- </resource>
- </resources>
- </build>
</project>
Copied: incubator/tuscany/java/samples/helloworld/helloworldaxis/pom.xml (from r368870, incubator/tuscany/contrib/java/trunk/samples/helloworldaxis/pom.xml)
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/samples/helloworld/helloworldaxis/pom.xml?p2=incubator/tuscany/java/samples/helloworld/helloworldaxis/pom.xml&p1=incubator/tuscany/contrib/java/trunk/samples/helloworldaxis/pom.xml&r1=368870&r2=369040&rev=369040&view=diff
==============================================================================
--- incubator/tuscany/contrib/java/trunk/samples/helloworldaxis/pom.xml (original)
+++ incubator/tuscany/java/samples/helloworld/helloworldaxis/pom.xml Sat Jan 14 08:09:05 2006
@@ -16,13 +16,12 @@
-->
<project>
<parent>
- <groupId>org.osoa</groupId>
- <artifactId>samples</artifactId>
+ <groupId>org.apache.tuscany.samples.helloworld</groupId>
+ <artifactId>helloworld-samples</artifactId>
<version>SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.osoa</groupId>
- <artifactId>tuscany-samples-helloworldaxis</artifactId>
+ <artifactId>helloworldaxis</artifactId>
<packaging>jar</packaging>
<name>Tuscany sample HelloWorld Axis</name>
<description>Sample classic helloworld Axis to test with Tuscany SCA</description>
@@ -30,53 +29,22 @@
<dependencies>
<dependency>
- <groupId>axis</groupId>
- <artifactId>axis</artifactId>
- <version>1.2.1</version>
- </dependency>
- <dependency>
- <groupId>axis</groupId>
- <artifactId>axis-wsdl4j</artifactId>
- <version>1.5.1</version>
- </dependency>
- <dependency>
- <groupId>axis</groupId>
- <artifactId>axis-jaxrpc</artifactId>
- <version>1.2.1</version>
- </dependency>
- <dependency>
- <groupId>axis</groupId>
- <artifactId>axis-saaj</artifactId>
- <version>1.2.1</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
- </dependency>
- <dependency>
- <groupId>commons-discovery</groupId>
- <artifactId>commons-discovery</artifactId>
- <version>0.2</version>
- </dependency>
-
- <dependency>
- <groupId>tomcat</groupId>
- <artifactId>servlet-api</artifactId>
- <version>5.0.18</version>
+ <groupId>org.apache.tuscany</groupId>
+ <artifactId>tuscany-core</artifactId>
+ <version>${pom.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany</groupId>
+ <artifactId>tuscany-container-java</artifactId>
+ <version>${pom.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany</groupId>
+ <artifactId>tuscany-binding-axis</artifactId>
+ <version>${pom.version}</version>
+ <scope>compile</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>
Copied: incubator/tuscany/java/samples/helloworld/helloworldaxissvc/pom.xml (from r368870, incubator/tuscany/contrib/java/trunk/samples/helloworldaxissvc/pom.xml)
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/samples/helloworld/helloworldaxissvc/pom.xml?p2=incubator/tuscany/java/samples/helloworld/helloworldaxissvc/pom.xml&p1=incubator/tuscany/contrib/java/trunk/samples/helloworldaxissvc/pom.xml&r1=368870&r2=369040&rev=369040&view=diff
==============================================================================
--- incubator/tuscany/contrib/java/trunk/samples/helloworldaxissvc/pom.xml (original)
+++ incubator/tuscany/java/samples/helloworld/helloworldaxissvc/pom.xml Sat Jan 14 08:09:05 2006
@@ -16,13 +16,12 @@
-->
<project>
<parent>
- <groupId>org.osoa</groupId>
- <artifactId>samples</artifactId>
+ <groupId>org.apache.tuscany.samples.helloworld</groupId>
+ <artifactId>helloworld-samples</artifactId>
<version>SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.osoa</groupId>
- <artifactId>tuscany-samples-helloworldaxissvc</artifactId>
+ <artifactId>helloworldaxissvc</artifactId>
<packaging>war</packaging>
<name>Tuscany sample HelloWorld Axis Service</name>
<description>Sample classic helloworld Axis to test with Tuscany SCA</description>
@@ -30,65 +29,10 @@
<dependencies>
<dependency>
- <groupId>org.osoa</groupId>
- <artifactId>tuscany-samples-helloworldaxis</artifactId>
+ <groupId>org.apache.tuscany.samples.helloworld</groupId>
+ <artifactId>helloworldaxis</artifactId>
<version>${pom.version}</version>
<scope>compile</scope>
-<!--
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
--->
- </dependency>
-
- <dependency>
- <groupId>axis</groupId>
- <artifactId>axis</artifactId>
- <version>1.2.1</version>
- </dependency>
- <dependency>
- <groupId>axis</groupId>
- <artifactId>axis-wsdl4j</artifactId>
- <version>1.5.1</version>
- </dependency>
- <dependency>
- <groupId>axis</groupId>
- <artifactId>axis-jaxrpc</artifactId>
- <version>1.2.1</version>
- </dependency>
- <dependency>
- <groupId>axis</groupId>
- <artifactId>axis-saaj</artifactId>
- <version>1.2.1</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
- </dependency>
- <dependency>
- <groupId>commons-discovery</groupId>
- <artifactId>commons-discovery</artifactId>
- <version>0.2</version>
- </dependency>
-
- <dependency>
- <groupId>tomcat</groupId>
- <artifactId>servlet-api</artifactId>
- <version>5.0.18</version>
</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>
Copied: incubator/tuscany/java/samples/helloworld/helloworldmc/pom.xml (from r368870, incubator/tuscany/contrib/java/trunk/samples/helloworldmc/pom.xml)
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/samples/helloworld/helloworldmc/pom.xml?p2=incubator/tuscany/java/samples/helloworld/helloworldmc/pom.xml&p1=incubator/tuscany/contrib/java/trunk/samples/helloworldmc/pom.xml&r1=368870&r2=369040&rev=369040&view=diff
==============================================================================
--- incubator/tuscany/contrib/java/trunk/samples/helloworldmc/pom.xml (original)
+++ incubator/tuscany/java/samples/helloworld/helloworldmc/pom.xml Sat Jan 14 08:09:05 2006
@@ -16,13 +16,12 @@
-->
<project>
<parent>
- <groupId>org.osoa</groupId>
- <artifactId>samples</artifactId>
+ <groupId>org.apache.tuscany.samples.helloworld</groupId>
+ <artifactId>helloworld-samples</artifactId>
<version>SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.osoa</groupId>
- <artifactId>tuscany-samples-helloworldmc</artifactId>
+ <artifactId>helloworldmc</artifactId>
<packaging>jar</packaging>
<name>Tuscany sample multi-component HelloWorld</name>
<description>Sample helloworld with multiple components</description>
@@ -30,100 +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>
+ <groupId>org.apache.tuscany</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>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
</dependency>
</dependencies>
-
- <build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <includes>
- <include>**/*.componentType</include>
- <include>sca.module</include>
- </includes>
- <filtering>false</filtering>
- </resource>
- </resources>
- </build>
</project>
Copied: incubator/tuscany/java/samples/helloworld/helloworldweb/pom.xml (from r368870, incubator/tuscany/contrib/java/trunk/samples/helloworldweb/pom.xml)
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/samples/helloworld/helloworldweb/pom.xml?p2=incubator/tuscany/java/samples/helloworld/helloworldweb/pom.xml&p1=incubator/tuscany/contrib/java/trunk/samples/helloworldweb/pom.xml&r1=368870&r2=369040&rev=369040&view=diff
==============================================================================
--- incubator/tuscany/contrib/java/trunk/samples/helloworldweb/pom.xml (original)
+++ incubator/tuscany/java/samples/helloworld/helloworldweb/pom.xml Sat Jan 14 08:09:05 2006
@@ -16,13 +16,12 @@
-->
<project>
<parent>
- <groupId>org.osoa</groupId>
- <artifactId>samples</artifactId>
+ <groupId>org.apache.tuscany.samples.helloworld</groupId>
+ <artifactId>helloworld-samples</artifactId>
<version>SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.osoa</groupId>
- <artifactId>tuscany-samples-helloworldWEB</artifactId>
+ <artifactId>helloworldWeb</artifactId>
<packaging>war</packaging>
<name>Tuscany sample HelloWorld WEB</name>
<description>Sample classic helloworld with JSP</description>
@@ -30,87 +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>
+ <groupId>org.apache.tuscany</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>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
</dependency>
</dependencies>
</project>
Copied: incubator/tuscany/java/samples/helloworld/helloworldws/pom.xml (from r368870, incubator/tuscany/contrib/java/trunk/samples/helloworldws/pom.xml)
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/samples/helloworld/helloworldws/pom.xml?p2=incubator/tuscany/java/samples/helloworld/helloworldws/pom.xml&p1=incubator/tuscany/contrib/java/trunk/samples/helloworldws/pom.xml&r1=368870&r2=369040&rev=369040&view=diff
==============================================================================
--- incubator/tuscany/contrib/java/trunk/samples/helloworldws/pom.xml (original)
+++ incubator/tuscany/java/samples/helloworld/helloworldws/pom.xml Sat Jan 14 08:09:05 2006
@@ -16,13 +16,12 @@
-->
<project>
<parent>
- <groupId>org.osoa</groupId>
- <artifactId>samples</artifactId>
+ <groupId>org.apache.tuscany.samples.helloworld</groupId>
+ <artifactId>helloworld-samples</artifactId>
<version>SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.osoa</groupId>
- <artifactId>tuscany-samples-helloworldws-service</artifactId>
+ <artifactId>helloworldws</artifactId>
<packaging>war</packaging>
<name>Tuscany sample HelloWorld WS Service</name>
<description>Sample classic helloworld SCA Service</description>
@@ -30,100 +29,22 @@
<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>
+ <groupId>org.apache.tuscany</groupId>
+ <artifactId>tuscany-container-java</artifactId>
<version>${pom.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.osoa</groupId>
+ <groupId>org.apache.tuscany</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>
-
- <build>
- <resources>
- <resource>
- <directory>src/main/java</directory>
- <includes>
- <include>**/*.componentType</include>
- <include>sca.module</include>
- </includes>
- <filtering>false</filtering>
- </resource>
- </resources>
- </build>
</project>
Copied: incubator/tuscany/java/samples/helloworld/helloworldwsclient/pom.xml (from r368870, incubator/tuscany/contrib/java/trunk/samples/helloworldwsclient/pom.xml)
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/samples/helloworld/helloworldwsclient/pom.xml?p2=incubator/tuscany/java/samples/helloworld/helloworldwsclient/pom.xml&p1=incubator/tuscany/contrib/java/trunk/samples/helloworldwsclient/pom.xml&r1=368870&r2=369040&rev=369040&view=diff
==============================================================================
--- incubator/tuscany/contrib/java/trunk/samples/helloworldwsclient/pom.xml (original)
+++ incubator/tuscany/java/samples/helloworld/helloworldwsclient/pom.xml Sat Jan 14 08:09:05 2006
@@ -16,13 +16,12 @@
-->
<project>
<parent>
- <groupId>org.osoa</groupId>
- <artifactId>samples</artifactId>
+ <groupId>org.apache.tuscany.samples.helloworld</groupId>
+ <artifactId>helloworld-samples</artifactId>
<version>SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.osoa</groupId>
- <artifactId>tuscany-samples-helloworldwsclient</artifactId>
+ <artifactId>helloworldwsclient</artifactId>
<packaging>jar</packaging>
<name>Tuscany sample HelloWorld Webservice SCA Client</name>
<description>Sample classic helloworldws client</description>
@@ -30,135 +29,22 @@
<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>
+ <groupId>org.apache.tuscany</groupId>
+ <artifactId>tuscany-container-java</artifactId>
<version>${pom.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.osoa</groupId>
+ <groupId>org.apache.tuscany</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>
- <dependency>
- <groupId>axis</groupId>
- <artifactId>axis</artifactId>
- <version>1.2.1</version>
- </dependency>
- <dependency>
- <groupId>axis</groupId>
- <artifactId>axis-jaxrpc</artifactId>
- <version>1.2.1</version>
- </dependency>
- <dependency>
- <groupId>axis</groupId>
- <artifactId>axis-saaj</artifactId>
- <version>1.2.1</version>
- </dependency>
-
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
- </dependency>
- <dependency>
- <groupId>commons-discovery</groupId>
- <artifactId>commons-discovery</artifactId>
- <version>0.2</version>
- </dependency>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.12</version>
- </dependency>
</dependencies>
-
- <build>
- <resources>
- <resource>
- <directory>src/main/java</directory>
- <includes>
- <include>**/*.componentType</include>
- <include>sca.module</include>
- </includes>
- <filtering>false</filtering>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- </resources>
- </build>
</project>
Copied: incubator/tuscany/java/samples/helloworld/pom.xml (from r368870, incubator/tuscany/contrib/java/trunk/samples/pom.xml)
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/samples/helloworld/pom.xml?p2=incubator/tuscany/java/samples/helloworld/pom.xml&p1=incubator/tuscany/contrib/java/trunk/samples/pom.xml&r1=368870&r2=369040&rev=369040&view=diff
==============================================================================
--- incubator/tuscany/contrib/java/trunk/samples/pom.xml (original)
+++ incubator/tuscany/java/samples/helloworld/pom.xml Sat Jan 14 08:09:05 2006
@@ -16,21 +16,18 @@
-->
<project>
<parent>
- <groupId>org.osoa</groupId>
- <artifactId>tuscany</artifactId>
+ <groupId>org.apache.tuscany.samples</groupId>
+ <artifactId>tuscany-samples</artifactId>
<version>SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.osoa</groupId>
- <artifactId>samples</artifactId>
+ <groupId>org.apache.tuscany.samples.helloworld</groupId>
+ <artifactId>helloworld-samples</artifactId>
<packaging>pom</packaging>
- <name>Tuscany Samples</name>
+ <name>Tuscany HelloWorld Samples</name>
<version>SNAPSHOT</version>
<modules>
- <module>bigbank.account</module>
- <module>bigbank.webclient</module>
- <module>customers</module>
<module>helloworld</module>
<module>helloworldaxis</module>
<module>helloworldaxissvc</module>
@@ -39,21 +36,4 @@
<module>helloworldws</module>
<module>helloworldwsclient</module>
</modules>
-
- <build>
- <testResources>
- <testResource>
- <directory>src/test/java</directory>
- <includes>
- <include>**/*.componentType</include>
- </includes>
- </testResource>
- <testResource>
- <directory>src/test/resources</directory>
- <includes>
- <include>**/*</include>
- </includes>
- </testResource>
- </testResources>
- </build>
</project>
Copied: incubator/tuscany/java/samples/pom.xml (from r368870, incubator/tuscany/contrib/java/trunk/samples/pom.xml)
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/samples/pom.xml?p2=incubator/tuscany/java/samples/pom.xml&p1=incubator/tuscany/contrib/java/trunk/samples/pom.xml&r1=368870&r2=369040&rev=369040&view=diff
==============================================================================
--- incubator/tuscany/contrib/java/trunk/samples/pom.xml (original)
+++ incubator/tuscany/java/samples/pom.xml Sat Jan 14 08:09:05 2006
@@ -16,44 +16,19 @@
-->
<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>samples</artifactId>
+ <groupId>org.apache.tuscany.samples</groupId>
+ <artifactId>tuscany-samples</artifactId>
<packaging>pom</packaging>
<name>Tuscany Samples</name>
<version>SNAPSHOT</version>
<modules>
- <module>bigbank.account</module>
- <module>bigbank.webclient</module>
- <module>customers</module>
+ <!--<module>bigbank</module>-->
<module>helloworld</module>
- <module>helloworldaxis</module>
- <module>helloworldaxissvc</module>
- <module>helloworldmc</module>
- <module>helloworldweb</module>
- <module>helloworldws</module>
- <module>helloworldwsclient</module>
</modules>
-
- <build>
- <testResources>
- <testResource>
- <directory>src/test/java</directory>
- <includes>
- <include>**/*.componentType</include>
- </includes>
- </testResource>
- <testResource>
- <directory>src/test/resources</directory>
- <includes>
- <include>**/*</include>
- </includes>
- </testResource>
- </testResources>
- </build>
</project>