diff options
author | fmoga <fmoga@13f79535-47bb-0310-9956-ffa450edef68> | 2011-02-10 11:51:29 +0000 |
---|---|---|
committer | fmoga <fmoga@13f79535-47bb-0310-9956-ffa450edef68> | 2011-02-10 11:51:29 +0000 |
commit | ba4e7df5e7976e7aac5e704e98d22b335e12cf97 (patch) | |
tree | adc225a0516746c6babe6223e40df65b73c01d94 /sca-java-2.x/branches/2.0-Beta2 | |
parent | 44e19f574ee6e00da795418ec3a9efe934cdf10a (diff) |
Commented out OASIS arifacts from compliance tests pom according to TUSCANY-3748. Added missing parent for the helloworld-contribution sample.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1069342 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
3 files changed, 14 insertions, 7 deletions
diff --git a/sca-java-2.x/branches/2.0-Beta2/samples/getting-started/helloworld-contribution/pom.xml b/sca-java-2.x/branches/2.0-Beta2/samples/getting-started/helloworld-contribution/pom.xml index b20c144477..235d928a50 100644 --- a/sca-java-2.x/branches/2.0-Beta2/samples/getting-started/helloworld-contribution/pom.xml +++ b/sca-java-2.x/branches/2.0-Beta2/samples/getting-started/helloworld-contribution/pom.xml @@ -20,14 +20,19 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.tuscany.sca.samples</groupId>
- <artifactId>helloworld-contribution</artifactId>
+ <parent>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-samples</artifactId>
+ <version>2.0-Beta2-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>sample-helloworld-contribution</artifactId>
<version>2.0-Beta2-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>helloworld-contribution</name>
-
+ <name>Apache Tuscany SCA Sample Helloworld Webapp</name>
+
<properties>
<tuscany.version>2.0-Beta2-SNAPSHOT</tuscany.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/sca-java-2.x/branches/2.0-Beta2/samples/getting-started/helloworld-webapp/pom.xml b/sca-java-2.x/branches/2.0-Beta2/samples/getting-started/helloworld-webapp/pom.xml index 1b27b075c9..bd11add4c8 100644 --- a/sca-java-2.x/branches/2.0-Beta2/samples/getting-started/helloworld-webapp/pom.xml +++ b/sca-java-2.x/branches/2.0-Beta2/samples/getting-started/helloworld-webapp/pom.xml @@ -27,7 +27,7 @@ </parent> <artifactId>sample-helloworld-webapp</artifactId> - <name>Apache Tuscany SCA Sample Helloworld</name> + <name>Apache Tuscany SCA Sample Helloworld Webapp</name> <packaging>war</packaging> <dependencies> diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/compliance-tests/pom.xml b/sca-java-2.x/branches/2.0-Beta2/testing/compliance-tests/pom.xml index 1ff9b641c6..e6639401d6 100644 --- a/sca-java-2.x/branches/2.0-Beta2/testing/compliance-tests/pom.xml +++ b/sca-java-2.x/branches/2.0-Beta2/testing/compliance-tests/pom.xml @@ -45,12 +45,14 @@ <activeByDefault>true</activeByDefault>
</activation>
<modules>
+<!-- TUSCANY-3748 - comment out the tests for the Beta2 Release as OASIS haven't
<module>assembly</module>
<module>java-caa</module>
<module>java-ci</module>
<module>policy</module>
<module>binding-ws</module>
-<!--
+-->
+<!--
<module>binding-jms</module>
-->
</modules>
|