diff options
| author | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2011-07-18 12:56:45 +0000 |
|---|---|---|
| committer | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2011-07-18 12:56:45 +0000 |
| commit | 63b05d0d32716968bb442de6ab2959694185e327 (patch) | |
| tree | a525b30a1c450b94c437c94e7572437e12e0811e /sca-java-2.x/branches/2.0-Beta3 | |
| parent | 1ced0ad3ca56a0a9584e5844c0fb2db73fd50aa3 (diff) | |
Merge the tuscany plugin changes from trunk to beta3
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1147841 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x/branches/2.0-Beta3')
2 files changed, 12 insertions, 5 deletions
diff --git a/sca-java-2.x/branches/2.0-Beta3/maven/tuscany-maven-plugin/pom.xml b/sca-java-2.x/branches/2.0-Beta3/maven/tuscany-maven-plugin/pom.xml index 09746fef6a..a9b079aa97 100644 --- a/sca-java-2.x/branches/2.0-Beta3/maven/tuscany-maven-plugin/pom.xml +++ b/sca-java-2.x/branches/2.0-Beta3/maven/tuscany-maven-plugin/pom.xml @@ -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>
diff --git a/sca-java-2.x/branches/2.0-Beta3/maven/tuscany-maven-plugin/src/main/java/org/apache/tuscany/maven/plugin/TuscanyShellMojo.java b/sca-java-2.x/branches/2.0-Beta3/maven/tuscany-maven-plugin/src/main/java/org/apache/tuscany/maven/plugin/TuscanyShellMojo.java index 671100fd13..6d7c4f656a 100644 --- a/sca-java-2.x/branches/2.0-Beta3/maven/tuscany-maven-plugin/src/main/java/org/apache/tuscany/maven/plugin/TuscanyShellMojo.java +++ b/sca-java-2.x/branches/2.0-Beta3/maven/tuscany-maven-plugin/src/main/java/org/apache/tuscany/maven/plugin/TuscanyShellMojo.java @@ -62,11 +62,7 @@ public class TuscanyShellMojo extends AbstractMojo { 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 {
|