You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2007/02/19 23:47:09 UTC
svn commit: r509362 - in /incubator/tuscany/branches/sca-java-integration:
sca/extensions/axis2/samples/ testing/sca/ testing/sca/itest/
testing/sca/itest/bindingsTest/bindingsclient/
testing/sca/itest/bindingsTest/bindingscomposite/ testing/sca/itest/...
Author: jsdelfino
Date: Mon Feb 19 14:47:08 2007
New Revision: 509362
URL: http://svn.apache.org/viewvc?view=rev&rev=509362
Log:
Simplifying pom.xml files for integration tests and samples
Modified:
incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/pom.xml
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingsclient/pom.xml
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingscomposite/pom.xml
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingsutility/pom.xml
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingTest/pom.xml
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/pom.xml
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/wsdl/pom.xml
incubator/tuscany/branches/sca-java-integration/testing/sca/pom.xml
Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/pom.xml?view=diff&rev=509362&r1=509361&r2=509362
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/pom.xml Mon Feb 19 14:47:08 2007
@@ -86,18 +86,18 @@
<groupId>org.apache.tuscany.sca.kernel</groupId>
<artifactId>tuscany-core</artifactId>
<version>0.1-integration-incubating-SNAPSHOT</version>
- <scope>provided</scope>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca.extensions.axis2</groupId>
<artifactId>tuscany-axis2</artifactId>
- <scope>provided</scope>
+ <scope>runtime</scope>
<version>0.1-integration-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca.services</groupId>
<artifactId>tuscany-http-jetty</artifactId>
- <scope>provided</scope>
+ <scope>runtime</scope>
<version>0.1-integration-incubating-SNAPSHOT</version>
</dependency>
<dependency>
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingsclient/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingsclient/pom.xml?view=diff&rev=509362&r1=509361&r2=509362
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingsclient/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingsclient/pom.xml Mon Feb 19 14:47:08 2007
@@ -31,7 +31,6 @@
<groupId>org.apache.tuscany.testing.bindingstest</groupId>
<artifactId>iTest-Bindings-bindingsclient</artifactId>
<packaging>jar</packaging>
- <version>SNAPSHOT</version>
<name>SCA FVT Bindings Test Tool JSP Client</name>
<properties>
@@ -41,29 +40,12 @@
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.osoa</groupId>
- <artifactId>sca-api-r${scaSpecVersion}</artifactId>
- <version>0.1-integration-incubating-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>commonj</groupId>
<artifactId>sdo-api-r2.1</artifactId>
<version>1.0-incubator-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sca.extensions.axis2</groupId>
- <artifactId>tuscany-axis2</artifactId>
- <version>0.1-integration-incubating-SNAPSHOT</version>
- </dependency>
- <dependency>
<groupId>org.apache.tuscany.testing.bindingstest</groupId>
<artifactId>iTest-Bindings-bindingscomposite</artifactId>
<version>SNAPSHOT</version>
@@ -77,148 +59,6 @@
<type>war</type>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-test</artifactId>
- <version>0.1-integration-incubating-SNAPSHOT</version>
- </dependency>
</dependencies>
-
- <build>
- <defaultGoal>install</defaultGoal>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- <showDeprecation>true</showDeprecation>
- <compilerArgument>-Xlint:unchecked,deprecation,fallthrough,finally</compilerArgument>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.cargo</groupId>
- <artifactId>cargo-maven2-plugin</artifactId>
- <executions>
- <execution>
- <id>start-container</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>start</goal>
- </goals>
- </execution>
- <execution>
- <id>stop-container</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>stop</goal>
- </goals>
- </execution>
- </executions>
-
- <configuration>
- <wait>false</wait>
-
- <!-- Container configuration -->
- <container>
- <containerId>tomcat5x</containerId>
- <home>${tomcat.dir}</home>
- <!--
- <zipUrlInstaller>
- <url>http://www.orionserver.com/distributions/orion2.0.5.zip</url>
- <installDir>${java.io.tmpdir}/cargoinstalls</installDir>
- </zipUrlInstaller>
- -->
-
- </container>
-
- <!-- Configuration to use with the container -->
- <configuration>
- <home>${project.build.directory}/tomcat5x</home>
- <deployables>
- <deployable>
- <groupId>org.apache.tuscany.testing.bindingstest</groupId>
- <artifactId>iTest-Bindings-bindingscomposite</artifactId>
- <type>war</type>
- <properties>
- <context>/testtool</context>
- </properties>
- <pingURL>http://localhost:8080/testtool/services</pingURL>
- </deployable>
- <deployable>
- <groupId>org.apache.tuscany.testing.bindingstest</groupId>
- <artifactId>iTest-Bindings-bindingsutility</artifactId>
- <type>war</type>
- <properties>
- <context>/testutil</context>
- </properties>
- <pingURL>http://localhost:8080/testutil/services</pingURL>
- </deployable>
- </deployables>
- </configuration>
-
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.tuscany.sca.plugins</groupId>
- <artifactId>tuscany-itest-plugin</artifactId>
- <executions>
- <execution>
- <id>start</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>start</goal>
- </goals>
- <configuration>
- <applicationScdl>
- file:///C:/Tuscany/java/testing/sca/itest/bindingsTest/bindingsclient/src/main/resources/META-INF/sca/default.scdl
- </applicationScdl>
- <extensions>
- <dependency>
- <groupId>org.apache.tuscany.sca.services.databinding</groupId>
- <artifactId>databinding-sdo</artifactId>
- <version>0.1-integration-incubating-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca.extensions.axis2</groupId>
- <artifactId>tuscany-axis2</artifactId>
- <version>0.1-integration-incubating-SNAPSHOT</version>
- </dependency>
- </extensions>
- </configuration>
- </execution>
- <execution>
- <id>test</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <includes>
- <include>**/*ITest.java</include>
- </includes>
- </configuration>
- </execution>
- <execution>
- <id>stop</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>stop</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/*ITest.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingscomposite/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingscomposite/pom.xml?view=diff&rev=509362&r1=509361&r2=509362
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingscomposite/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingscomposite/pom.xml Mon Feb 19 14:47:08 2007
@@ -28,23 +28,11 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.tuscany.testing.bindingstest</groupId>
<artifactId>iTest-Bindings-bindingscomposite</artifactId>
- <packaging>war</packaging>
- <version>SNAPSHOT</version>
+ <packaging>jar</packaging>
<name>SCA FVT Bindings Test Tool Service Composite</name>
<dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.osoa</groupId>
- <artifactId>sca-api-r${scaSpecVersion}</artifactId>
- <version>0.1-integration-incubating-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
+
<dependency>
<groupId>commonj</groupId>
<artifactId>sdo-api-r2.1</artifactId>
@@ -59,75 +47,7 @@
<version>1.0-incubator-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
- <dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- <version>1.0.1</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
- <version>3.2.0</version>
- <scope>runtime</scope>
- </dependency>
- <!-- runtime is need for webapp integration to include jar -->
- <dependency>
- <groupId>org.apache.tuscany.sca.runtime.webapp</groupId>
- <artifactId>webapp-api</artifactId>
- <version>0.1-integration-incubating-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
</dependencies>
-
- <build>
- <finalName>testtool</finalName>
- <defaultGoal>install</defaultGoal>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.tuscany.sca.runtime.webapp</groupId>
- <artifactId>tuscany-war-plugin</artifactId>
- <version>0.1-integration-incubating-SNAPSHOT</version>
- <executions>
- <execution>
- <id>tuscany-war</id>
- <goals>
- <goal>tuscany-war</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <!-- Set to true to embed external jars for extensions in the WAR -->
- <!-- Set to false to leave external jars for extensions to be resolved from maven repository -->
- <loadExtensionDependencies>false</loadExtensionDependencies>
-
- <extensions>
- <dependency>
- <groupId>org.apache.tuscany.sca.services.databinding</groupId>
- <artifactId>databinding-sdo</artifactId>
- <version>0.1-integration-incubating-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca.extensions.axis2</groupId>
- <artifactId>tuscany-axis2</artifactId>
- <version>0.1-integration-incubating-SNAPSHOT</version>
- </dependency>
- </extensions>
-
- </configuration>
- </plugin>
-
- </plugins>
-
- </build>
</project>
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingsutility/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingsutility/pom.xml?view=diff&rev=509362&r1=509361&r2=509362
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingsutility/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingsutility/pom.xml Mon Feb 19 14:47:08 2007
@@ -29,25 +29,11 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.tuscany.testing.bindingstest</groupId>
<artifactId>iTest-Bindings-bindingsutility</artifactId>
- <packaging>war</packaging>
- <version>SNAPSHOT</version>
+ <packaging>jar</packaging>
<name>SCA FVT Bindings Test Tool Utility Composite</name>
-
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.osoa</groupId>
- <artifactId>sca-api-r${scaSpecVersion}</artifactId>
- <version>0.1-integration-incubating-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
<groupId>commonj</groupId>
<artifactId>sdo-api-r2.1</artifactId>
<version>1.0-incubator-SNAPSHOT</version>
@@ -61,76 +47,7 @@
<version>1.0-incubator-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
- <dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- <version>1.0.1</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
- <version>3.2.0</version>
- <scope>runtime</scope>
- </dependency>
- <!-- runtime is need for webapp integration to include jar -->
- <dependency>
- <groupId>org.apache.tuscany.sca.runtime.webapp</groupId>
- <artifactId>webapp-api</artifactId>
- <version>0.1-integration-incubating-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
</dependencies>
-
- <build>
- <finalName>testutil</finalName>
- <defaultGoal>install</defaultGoal>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.tuscany.sca.runtime.webapp</groupId>
- <artifactId>tuscany-war-plugin</artifactId>
- <version>0.1-integration-incubating-SNAPSHOT</version>
- <executions>
- <execution>
- <id>tuscany-war</id>
- <goals>
- <goal>tuscany-war</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <!-- Set to true to embed external jars for extensions in the WAR -->
- <!-- Set to false to leave external jars for extensions to be resolved from maven repository -->
- <loadExtensionDependencies>false</loadExtensionDependencies>
-
- <extensions>
- <dependency>
- <groupId>org.apache.tuscany.sca.services.databinding</groupId>
- <artifactId>databinding-sdo</artifactId>
- <version>0.1-integration-incubating-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca.extensions.axis2</groupId>
- <artifactId>tuscany-axis2</artifactId>
- <version>0.1-integration-incubating-SNAPSHOT</version>
- </dependency>
- </extensions>
-
- </configuration>
- </plugin>
- </plugins>
-
- </build>
-
-
</project>
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingTest/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingTest/pom.xml?view=diff&rev=509362&r1=509361&r2=509362
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingTest/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingTest/pom.xml Mon Feb 19 14:47:08 2007
@@ -37,10 +37,6 @@
</repository>
</repositories>
<dependencies>
- <dependency>
- <groupId>org.osoa</groupId>
- <artifactId>sca-api-r${scaSpecVersion}</artifactId>
- </dependency>
<!-- Required extensions -->
<dependency>
<groupId>org.apache.tuscany.sca.services.databinding</groupId>
@@ -92,11 +88,6 @@
<version>2.1</version>
</dependency>
<!-- ENDOF sun's jax-ws -->
- <!-- junit -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
</dependencies>
<build>
<plugins>
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/pom.xml?view=diff&rev=509362&r1=509361&r2=509362
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/pom.xml Mon Feb 19 14:47:08 2007
@@ -93,37 +93,40 @@
</profiles>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.osoa</groupId>
- <artifactId>sca-api-r${scaSpecVersion}</artifactId>
- <version>0.1-integration-incubating-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-test</artifactId>
- <version>0.1-integration-incubating-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<dependencies>
<dependency>
+ <groupId>org.apache.tuscany.sca.kernel</groupId>
+ <artifactId>tuscany-api</artifactId>
+ <version>0.1-integration-incubating-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca.kernel</groupId>
+ <artifactId>tuscany-core</artifactId>
+ <version>0.1-integration-incubating-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca.extensions.axis2</groupId>
+ <artifactId>tuscany-axis2</artifactId>
+ <scope>runtime</scope>
+ <version>0.1-integration-incubating-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca.services</groupId>
+ <artifactId>tuscany-http-jetty</artifactId>
+ <scope>runtime</scope>
+ <version>0.1-integration-incubating-SNAPSHOT</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-test</artifactId>
+ <version>0.1-integration-incubating-SNAPSHOT</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <version>3.8.1</version>
</dependency>
</dependencies>
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/wsdl/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/wsdl/pom.xml?view=diff&rev=509362&r1=509361&r2=509362
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/wsdl/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/wsdl/pom.xml Mon Feb 19 14:47:08 2007
@@ -37,7 +37,7 @@
<groupId>org.apache.tuscany.sca.services.idl</groupId>
<artifactId>tuscany-wsdl</artifactId>
<version>${sca.version}</version>
- <scope>compile</scope>
+ <scope>runtime</scope>
</dependency>
</dependencies>
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/pom.xml?view=diff&rev=509362&r1=509361&r2=509362
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/pom.xml Mon Feb 19 14:47:08 2007
@@ -152,21 +152,6 @@
</plugin>
<plugin>
- <groupId>org.apache.felix.plugins</groupId>
- <artifactId>maven-osgi-plugin</artifactId>
- <version>0.8.0-SNAPSHOT</version>
- <extensions>true</extensions>
- <configuration>
- <osgiManifest>
- <bundleName>${pom.name}</bundleName>
- <bundleDescription>${pom.description}</bundleDescription>
- <bundleVendor>${pom.organization.name}</bundleVendor>
- <bundleLocalization>plugin</bundleLocalization>
- </osgiManifest>
- </configuration>
- </plugin>
-
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clover-plugin</artifactId>
<configuration>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org