You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sl...@apache.org on 2010/10/12 14:18:26 UTC
svn commit: r1021754 - in /tuscany/otest/newlayout:
tuscany-java-caa-test-runner/pom.xml tuscany-test-runner/pom.xml
Author: slaws
Date: Tue Oct 12 12:18:25 2010
New Revision: 1021754
URL: http://svn.apache.org/viewvc?rev=1021754&view=rev
Log:
switch to new distro structure
Modified:
tuscany/otest/newlayout/tuscany-java-caa-test-runner/pom.xml
tuscany/otest/newlayout/tuscany-test-runner/pom.xml
Modified: tuscany/otest/newlayout/tuscany-java-caa-test-runner/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/otest/newlayout/tuscany-java-caa-test-runner/pom.xml?rev=1021754&r1=1021753&r2=1021754&view=diff
==============================================================================
--- tuscany/otest/newlayout/tuscany-java-caa-test-runner/pom.xml (original)
+++ tuscany/otest/newlayout/tuscany-java-caa-test-runner/pom.xml Tue Oct 12 12:18:25 2010
@@ -29,35 +29,19 @@
<name>Apache Tuscany SCA Specification Tests for SCA-J CAA</name>
<dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-client-impl</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl</artifactId>
+ <artifactId>tuscany-base-runtime</artifactId>
<version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-launcher-equinox</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
+ <type>pom</type>
+ </dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-deployment</artifactId>
+ <artifactId>tuscany-osgi-runtime</artifactId>
<version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
+ <type>pom</type>
+ </dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
@@ -159,6 +143,7 @@
<property name="to.file" value="src/main/resources/TestClient.wsdl"/>
<target name="copyFile"/>
</ant>
+<!--
<ant antfile="../build.xml">
<property name="zip.file" value="../sca-java-caa/JCA_GENERAL_POJO/target/JCA_GENERAL_POJO.zip"/>
<property name="target.file" value="sca_variables.dtd"/>
@@ -166,6 +151,7 @@
<property name="target.token" value="default"/>
<target name="updateTestArtifact"/>
</ant>
+-->
</tasks>
</configuration>
</execution>
@@ -189,8 +175,35 @@
</sources>
</configuration>
</execution>
+ <execution>
+ <id>add-test-resource</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-test-resource</goal>
+ </goals>
+ <configuration>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
</executions>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+ <classesDirectory>${project.build.directory}/test-classes</classesDirectory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </configuration>
+ </plugin>
+
</plugins>
</build>
</project>
Modified: tuscany/otest/newlayout/tuscany-test-runner/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/otest/newlayout/tuscany-test-runner/pom.xml?rev=1021754&r1=1021753&r2=1021754&view=diff
==============================================================================
--- tuscany/otest/newlayout/tuscany-test-runner/pom.xml (original)
+++ tuscany/otest/newlayout/tuscany-test-runner/pom.xml Tue Oct 12 12:18:25 2010
@@ -31,72 +31,36 @@
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl</artifactId>
+ <artifactId>tuscany-base-runtime</artifactId>
<version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-deployment</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl-osgi</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-launcher</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
+ <type>pom</type>
+ </dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-launcher-equinox</artifactId>
+ <artifactId>tuscany-osgi-runtime</artifactId>
<version>2.0-SNAPSHOT</version>
+ <type>pom</type>
</dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
-
- <dependency>
+
+ <dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-host-jetty</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
-<!-- This dependency causes a problem on systems that haven't compiled the
- OASIS contributions independently and hence haven't dded them to their
- Local repo.
- <dependency>
- <groupId>org.oasis-open.sca.assembly</groupId>
- <artifactId>General_Java</artifactId>
- <version>1.0</version>
- </dependency>
--->
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- </dependency>
-
+ <!-- Not sure why this is required for ASM. But ASM_6039 & ASM_6036 fail without it -->
<dependency>
<groupId>com.sun.xml.ws</groupId>
<artifactId>jaxws-rt</artifactId>
<version>2.1.7</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>junit</groupId>