Author: jsdelfino
Date: Sat May 10 12:34:30 2008
New Revision: 655145
URL: http://svn.apache.org/viewvc?rev=655145&view=rev
Log:
Changed some test and runtime dependencies from host-tomcat to host-jetty to be
consistent with the behavior of the tuscany distribution which now excludes
host-tomcat.
Modified:
incubator/tuscany/java/sca/modules/binding-atom-abdera/pom.xml
incubator/tuscany/java/sca/modules/binding-feed/pom.xml
incubator/tuscany/java/sca/modules/binding-rss-rome/pom.xml
incubator/tuscany/java/sca/modules/domain-impl/pom.xml
incubator/tuscany/java/sca/modules/domain-manager/pom.xml
incubator/tuscany/java/sca/modules/implementation-data-xml/pom.xml
incubator/tuscany/java/sca/modules/implementation-node-runtime/pom.xml
incubator/tuscany/java/sca/modules/node-impl/pom.xml
incubator/tuscany/java/sca/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java
Modified: incubator/tuscany/java/sca/modules/binding-atom-abdera/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-atom-abdera/pom.xml?rev=655145&r1=655144&r2=655145&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-atom-abdera/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/binding-atom-abdera/pom.xml Sat May 10
12:34:30 2008
@@ -99,7 +99,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-jetty</artifactId>
<version>2.0-incubating-SNAPSHOT</version>
<scope>test</scope>
</dependency>
Modified: incubator/tuscany/java/sca/modules/binding-feed/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-feed/pom.xml?rev=655145&r1=655144&r2=655145&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-feed/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/binding-feed/pom.xml Sat May 10 12:34:30
2008
@@ -87,7 +87,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-jetty</artifactId>
<version>2.0-incubating-SNAPSHOT</version>
<scope>test</scope>
</dependency>
Modified: incubator/tuscany/java/sca/modules/binding-rss-rome/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-rss-rome/pom.xml?rev=655145&r1=655144&r2=655145&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-rss-rome/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/binding-rss-rome/pom.xml Sat May 10
12:34:30 2008
@@ -93,7 +93,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-jetty</artifactId>
<version>2.0-incubating-SNAPSHOT</version>
<scope>test</scope>
</dependency>
Modified: incubator/tuscany/java/sca/modules/domain-impl/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/domain-impl/pom.xml?rev=655145&r1=655144&r2=655145&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/domain-impl/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/domain-impl/pom.xml Sat May 10 12:34:30
2008
@@ -134,13 +134,12 @@
<scope>runtime</scope>
</dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
- <version>2.0-incubating-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
-
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-host-jetty</artifactId>
+ <version>2.0-incubating-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
Modified: incubator/tuscany/java/sca/modules/domain-manager/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/domain-manager/pom.xml?rev=655145&r1=655144&r2=655145&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/domain-manager/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/domain-manager/pom.xml Sat May 10
12:34:30 2008
@@ -104,7 +104,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-jetty</artifactId>
<version>2.0-incubating-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
Modified: incubator/tuscany/java/sca/modules/implementation-data-xml/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-data-xml/pom.xml?rev=655145&r1=655144&r2=655145&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-data-xml/pom.xml
(original)
+++ incubator/tuscany/java/sca/modules/implementation-data-xml/pom.xml Sat May
10 12:34:30 2008
@@ -106,7 +106,7 @@
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-jetty</artifactId>
<version>2.0-incubating-SNAPSHOT</version>
<scope>test</scope>
</dependency>
Modified: incubator/tuscany/java/sca/modules/implementation-node-runtime/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-node-runtime/pom.xml?rev=655145&r1=655144&r2=655145&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-node-runtime/pom.xml
(original)
+++ incubator/tuscany/java/sca/modules/implementation-node-runtime/pom.xml Sat
May 10 12:34:30 2008
@@ -88,7 +88,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-jetty</artifactId>
<version>2.0-incubating-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
Modified: incubator/tuscany/java/sca/modules/node-impl/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/node-impl/pom.xml?rev=655145&r1=655144&r2=655145&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/node-impl/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/node-impl/pom.xml Sat May 10 12:34:30
2008
@@ -95,7 +95,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-jetty</artifactId>
<version>2.0-incubating-SNAPSHOT</version>
<scope>test</scope>
</dependency>
Modified:
incubator/tuscany/java/sca/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java?rev=655145&r1=655144&r2=655145&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java
(original)
+++
incubator/tuscany/java/sca/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java
Sat May 10 12:34:30 2008
@@ -219,8 +219,8 @@
return false;
}
- // Filter out the Jetty and Webapp hosts
- if (name.startsWith("tuscany-host-jetty") ||
+ // Filter out the Tomcat and Webapp hosts
+ if (name.startsWith("tuscany-host-tomcat") ||
name.startsWith("tuscany-host-webapp")) {
//FIXME This is temporary
return false;
@@ -253,8 +253,8 @@
return false;
}
- // Filter out the Tomcat host
- if (name.startsWith("tuscany-host-tomcat")) {
+ // Exclude the Tomcat and Jetty hosts
+ if (name.startsWith("tuscany-host-tomcat") ||
name.startsWith("tuscany-host-jetty")) {
//FIXME This is temporary
return false;
}
