Author: antelder
Date: Mon Jul 18 12:56:45 2011
New Revision: 1147841
URL: http://svn.apache.org/viewvc?rev=1147841&view=rev
Log:
Merge the tuscany plugin changes from trunk to beta3
Modified:
tuscany/sca-java-2.x/branches/2.0-Beta3/maven/tuscany-maven-plugin/
(props changed)
tuscany/sca-java-2.x/branches/2.0-Beta3/maven/tuscany-maven-plugin/pom.xml
tuscany/sca-java-2.x/branches/2.0-Beta3/maven/tuscany-maven-plugin/src/main/java/org/apache/tuscany/maven/plugin/TuscanyShellMojo.java
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta3/maven/tuscany-maven-plugin/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Jul 18 12:56:45 2011
@@ -0,0 +1,2 @@
+/tuscany/branches/sca-java-1.3/maven/tuscany-maven-plugin:671193
+/tuscany/sca-java-2.x/trunk/maven/tuscany-maven-plugin:1147834-1147835
Modified:
tuscany/sca-java-2.x/branches/2.0-Beta3/maven/tuscany-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0-Beta3/maven/tuscany-maven-plugin/pom.xml?rev=1147841&r1=1147840&r2=1147841&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/2.0-Beta3/maven/tuscany-maven-plugin/pom.xml
(original)
+++ tuscany/sca-java-2.x/branches/2.0-Beta3/maven/tuscany-maven-plugin/pom.xml
Mon Jul 18 12:56:45 2011
@@ -66,6 +66,17 @@
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
<version>6.1.19</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-servlet-api</artifactId>
+ <version>7.0.8</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
Modified:
tuscany/sca-java-2.x/branches/2.0-Beta3/maven/tuscany-maven-plugin/src/main/java/org/apache/tuscany/maven/plugin/TuscanyShellMojo.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0-Beta3/maven/tuscany-maven-plugin/src/main/java/org/apache/tuscany/maven/plugin/TuscanyShellMojo.java?rev=1147841&r1=1147840&r2=1147841&view=diff
==============================================================================
---
tuscany/sca-java-2.x/branches/2.0-Beta3/maven/tuscany-maven-plugin/src/main/java/org/apache/tuscany/maven/plugin/TuscanyShellMojo.java
(original)
+++
tuscany/sca-java-2.x/branches/2.0-Beta3/maven/tuscany-maven-plugin/src/main/java/org/apache/tuscany/maven/plugin/TuscanyShellMojo.java
Mon Jul 18 12:56:45 2011
@@ -62,11 +62,7 @@ public class TuscanyShellMojo extends Ab
cs.add(0, domainURI);
args = cs.toArray(new String[cs.size()]);
} else {
- if ("default".equals(domainURI)) {
- args = new String[]{};
- } else {
- args = new String[]{domainURI};
- }
+ args = new String[]{domainURI};
}
try {
