Update Tuscany run plugin for latest runtime and change to not include all extension by default but require that they're added separately where the plugin is used. Also update to use the exploded folder in the target directory as the contribution instead of the packaged artifacts as the bpel extension only seems to work with folder contributions

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@925592 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 3 insertions, 62 deletions

diff --git a/maven-plugins/trunk/maven-tuscany-plugin/pom.xml b/maven-plugins/trunk/maven-tuscany-plugin/pom.xml
index 516a544889..b0dcf24ba8 100644
--- a/maven-plugins/trunk/maven-tuscany-plugin/pom.xml
+++ b/maven-plugins/trunk/maven-tuscany-plugin/pom.xml
@@ -180,67 +180,8 @@
        </dependency>
 
        <dependency>
-          <groupId>org.apache.tuscany.sca</groupId>
-          <artifactId>tuscany-domain-node</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>
-
-       <dependency>
-          <groupId>org.apache.tuscany.sca</groupId>
-          <artifactId>tuscany-implementation-bpel-runtime</artifactId>
-          <version>2.0-SNAPSHOT</version>
-       </dependency>
-
-       <dependency>
-          <groupId>org.apache.tuscany.sca</groupId>
-          <artifactId>tuscany-implementation-spring</artifactId>
-          <version>2.0-SNAPSHOT</version>
-       </dependency>
-       <dependency>
-          <groupId>org.apache.tuscany.sca</groupId>
-          <artifactId>tuscany-implementation-spring-sca</artifactId>
-          <version>2.0-SNAPSHOT</version>
-       </dependency>
-
-       <dependency>
-          <groupId>org.apache.tuscany.sca</groupId>
-          <artifactId>tuscany-binding-jsonp-runtime</artifactId>
-          <version>2.0-SNAPSHOT</version>
-       </dependency>
-
-       <dependency>
-          <groupId>org.apache.tuscany.sca</groupId>
-          <artifactId>tuscany-binding-rmi-runtime</artifactId>
-          <version>2.0-SNAPSHOT</version>
-       </dependency>
-
-       <dependency>
-          <groupId>org.apache.tuscany.sca</groupId>
-          <artifactId>tuscany-binding-ws-axis2</artifactId>
-          <version>2.0-SNAPSHOT</version>
-       </dependency>
-
-       <dependency>
-          <groupId>org.apache.tuscany.sca</groupId>
-          <artifactId>tuscany-binding-sca-axis2-runtime</artifactId>
-          <version>2.0-SNAPSHOT</version>
-       </dependency>
-
-       <dependency>
-          <groupId>org.apache.tuscany.sca</groupId>
-          <artifactId>tuscany-host-jetty</artifactId>
-          <version>2.0-SNAPSHOT</version>
-       </dependency>
-
-       <dependency>
-          <groupId>org.apache.tuscany.sca</groupId>
-          <artifactId>tuscany-endpoint-tribes</artifactId>
+          <groupId>org.apache.tuscany.sca.shades</groupId>
+          <artifactId>tuscany-base</artifactId>
           <version>2.0-SNAPSHOT</version>
        </dependency>
 
diff --git a/maven-plugins/trunk/maven-tuscany-plugin/src/main/java/org/apache/tuscany/maven/plugin/TuscanyRunMojo.java b/maven-plugins/trunk/maven-tuscany-plugin/src/main/java/org/apache/tuscany/maven/plugin/TuscanyRunMojo.java
index e796cc2386..44f1067c14 100644
--- a/maven-plugins/trunk/maven-tuscany-plugin/src/main/java/org/apache/tuscany/maven/plugin/TuscanyRunMojo.java
+++ b/maven-plugins/trunk/maven-tuscany-plugin/src/main/java/org/apache/tuscany/maven/plugin/TuscanyRunMojo.java
@@ -105,7 +105,7 @@ public class TuscanyRunMojo extends AbstractMojo {
     protected void addProjectContribution(List<String> cs) throws MojoExecutionException {
         try {
 
-            String contribution = new File(buildDirectory.getParent(), finalName.getName() + packaging).toURI().toURL().toString();
+            String contribution = new File(buildDirectory.getParent(), finalName.getName()).toURI().toURL().toString();
             getLog().info("Project contribution: " + contribution);
             cs.add(contribution);