Changed maven bundle plugin to generate classpath off the list of JARs in the third-party bundle's lib directory. It now generates a correct .classpath that makes the PDE happy.

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

20 files changed, 80 insertions, 28 deletions

diff --git a/branches/sca-equinox/distribution/features/all/pom.xml b/branches/sca-equinox/distribution/features/all/pom.xml
index 86eb319ad8..f6a328d6e3 100644
--- a/branches/sca-equinox/distribution/features/all/pom.xml
+++ b/branches/sca-equinox/distribution/features/all/pom.xml
@@ -205,7 +205,6 @@
                 <module>../../../modules/host-corba</module>
                 <module>../../../modules/host-corba-jee</module>
                 <module>../../../modules/host-corba-jse</module>
-                <module>../../../modules/host-embedded</module>
                 <module>../../../modules/host-http</module>
                 <module>../../../modules/host-jetty</module>
                 <module>../../../modules/host-rmi</module>
diff --git a/branches/sca-equinox/distribution/features/all/src/main/components/src-modules.xml b/branches/sca-equinox/distribution/features/all/src/main/components/src-modules.xml
index 6f8750d19d..f3320c3456 100644
--- a/branches/sca-equinox/distribution/features/all/src/main/components/src-modules.xml
+++ b/branches/sca-equinox/distribution/features/all/src/main/components/src-modules.xml
@@ -90,7 +90,6 @@
                 <include>host-corba/**/*</include>
                 <include>host-corba-jee/**/*</include>
                 <include>host-corba-jse/**/*</include>
-                <include>host-embedded/**/*</include>
                 <include>host-http/**/*</include>
                 <include>host-jetty/**/*</include>
                 <include>host-rmi/**/*</include>
diff --git a/branches/sca-equinox/distribution/features/core/pom.xml b/branches/sca-equinox/distribution/features/core/pom.xml
index 64a0f8f4aa..073565b61e 100644
--- a/branches/sca-equinox/distribution/features/core/pom.xml
+++ b/branches/sca-equinox/distribution/features/core/pom.xml
@@ -330,6 +330,9 @@
                 <module>../../../modules/policy-security-jsr250</module>
                 <module>../../../modules/policy-xml</module>
                 <module>../../../modules/sca-api</module>
+                <module>../../../modules/workspace</module>
+                <module>../../../modules/workspace-impl</module>
+                <module>../../../modules/workspace-xml</module>
                 <module>../../../modules/xsd</module>
                 <module>../../../modules/xsd-xml</module>
             </modules>
diff --git a/branches/sca-equinox/distribution/features/core/src/main/components/bin-filtered-dependencies.xml b/branches/sca-equinox/distribution/features/core/src/main/components/bin-filtered-dependencies.xml
index ee10890d84..39d74059ef 100644
--- a/branches/sca-equinox/distribution/features/core/src/main/components/bin-filtered-dependencies.xml
+++ b/branches/sca-equinox/distribution/features/core/src/main/components/bin-filtered-dependencies.xml
@@ -75,6 +75,9 @@
                 <exclude>org.apache.tuscany.sca:tuscany-policy-security-jsr250</exclude>
                 <exclude>org.apache.tuscany.sca:tuscany-policy-xml</exclude>
                 <exclude>org.apache.tuscany.sca:tuscany-sca-api</exclude>
+                <exclude>org.apache.tuscany.sca:tuscany-workspace</exclude>
+                <exclude>org.apache.tuscany.sca:tuscany-workspace-impl</exclude>
+                <exclude>org.apache.tuscany.sca:tuscany-workspace-xml</exclude>
                 <exclude>org.apache.tuscany.sca:tuscany-xsd</exclude>
                 <exclude>org.apache.tuscany.sca:tuscany-xsd-xml</exclude>
             </excludes>
diff --git a/branches/sca-equinox/distribution/features/core/src/main/components/src-modules.xml b/branches/sca-equinox/distribution/features/core/src/main/components/src-modules.xml
index 91573a79a7..3a091b567b 100644
--- a/branches/sca-equinox/distribution/features/core/src/main/components/src-modules.xml
+++ b/branches/sca-equinox/distribution/features/core/src/main/components/src-modules.xml
@@ -72,6 +72,9 @@
                 <include>policy-security-jsr250/**/*</include>
                 <include>policy-xml/**/*</include>
                 <include>sca-api/**/*</include>
+                <include>workspace/**/*</include>
+                <include>workspace-impl/**/*</include>
+                <include>workspace-xml/**/*</include>
                 <include>xsd/**/*</include>
                 <include>xsd-xml/**/*</include>
             </includes>
diff --git a/branches/sca-equinox/distribution/features/ejava/pom.xml b/branches/sca-equinox/distribution/features/ejava/pom.xml
index 4e4ba94cd3..bdf69ad6b4 100644
--- a/branches/sca-equinox/distribution/features/ejava/pom.xml
+++ b/branches/sca-equinox/distribution/features/ejava/pom.xml
@@ -175,7 +175,6 @@
                 <module>../../../modules/host-corba</module>
                 <module>../../../modules/host-corba-jee</module>
                 <module>../../../modules/host-corba-jse</module>
-                <module>../../../modules/host-embedded</module>
                 <module>../../../modules/host-http</module>
                 <module>../../../modules/host-rmi</module>
                 <module>../../../modules/implementation-ejb</module>
@@ -204,6 +203,9 @@
                 <module>../../../modules/policy-transaction</module>
                 <module>../../../modules/policy-xml</module>
                 <module>../../../modules/sca-api</module>
+                <module>../../../modules/workspace</module>
+                <module>../../../modules/workspace-impl</module>
+                <module>../../../modules/workspace-xml</module>
                 <module>../../../modules/xsd</module>
                 <module>../../../modules/xsd-xml</module>
             </modules>
diff --git a/branches/sca-equinox/distribution/features/ejava/src/main/components/src-modules.xml b/branches/sca-equinox/distribution/features/ejava/src/main/components/src-modules.xml
index 9bd1e51781..89a432e2cc 100644
--- a/branches/sca-equinox/distribution/features/ejava/src/main/components/src-modules.xml
+++ b/branches/sca-equinox/distribution/features/ejava/src/main/components/src-modules.xml
@@ -60,7 +60,6 @@
                 <include>host-corba/**/*</include>
                 <include>host-corba-jee/**/*</include>
                 <include>host-corba-jse/**/*</include>
-                <include>host-embedded/**/*</include>
                 <include>host-http/**/*</include>
                 <include>host-rmi/**/*</include>
                 <include>implementation-ejb/**/*</include>
@@ -89,6 +88,9 @@
                 <include>policy-transaction/**/*</include>
                 <include>policy-xml/**/*</include>
                 <include>sca-api/**/*</include>
+                <include>workspace/**/*</include>
+                <include>workspace-impl/**/*</include>
+                <include>workspace-xml/**/*</include>
                 <include>xsd/**/*</include>
                 <include>xsd-xml/**/*</include>
             </includes>
diff --git a/branches/sca-equinox/distribution/features/manager/pom.xml b/branches/sca-equinox/distribution/features/manager/pom.xml
index efe7b2d2b5..68c5bc277a 100644
--- a/branches/sca-equinox/distribution/features/manager/pom.xml
+++ b/branches/sca-equinox/distribution/features/manager/pom.xml
@@ -221,7 +221,6 @@
                 <module>../../../modules/extensibility-equinox</module>
                 <module>../../../modules/host-corba</module>
                 <module>../../../modules/host-corba-jse</module>
-                <module>../../../modules/host-embedded</module>
                 <module>../../../modules/host-http</module>
                 <module>../../../modules/host-jetty</module>
                 <module>../../../modules/implementation-bpel</module>
diff --git a/branches/sca-equinox/distribution/features/manager/src/main/components/src-modules.xml b/branches/sca-equinox/distribution/features/manager/src/main/components/src-modules.xml
index 4fb71652f5..3437db9cc5 100644
--- a/branches/sca-equinox/distribution/features/manager/src/main/components/src-modules.xml
+++ b/branches/sca-equinox/distribution/features/manager/src/main/components/src-modules.xml
@@ -63,7 +63,6 @@
                 <include>extensibility-equinox/**/*</include>
                 <include>host-corba/**/*</include>
                 <include>host-corba-jse/**/*</include>
-                <include>host-embedded/**/*</include>
                 <include>host-http/**/*</include>
                 <include>host-jetty/**/*</include>
                 <include>implementation-bpel/**/*</include>
diff --git a/branches/sca-equinox/distribution/features/process/pom.xml b/branches/sca-equinox/distribution/features/process/pom.xml
index df28d4a66d..6b623d49c9 100644
--- a/branches/sca-equinox/distribution/features/process/pom.xml
+++ b/branches/sca-equinox/distribution/features/process/pom.xml
@@ -119,7 +119,6 @@
                 <module>../../../modules/extensibility-equinox</module>
                 <module>../../../modules/host-corba</module>
                 <module>../../../modules/host-corba-jse</module>
-                <module>../../../modules/host-embedded</module>
                 <module>../../../modules/host-http</module>
                 <module>../../../modules/implementation-bpel</module>
                 <module>../../../modules/implementation-bpel-ode</module>
@@ -146,6 +145,9 @@
                 <module>../../../modules/policy-security-jsr250</module>
                 <module>../../../modules/policy-xml</module>
                 <module>../../../modules/sca-api</module>
+                <module>../../../modules/workspace</module>
+                <module>../../../modules/workspace-impl</module>
+                <module>../../../modules/workspace-xml</module>
                 <module>../../../modules/xsd</module>
                 <module>../../../modules/xsd-xml</module>
             </modules>
diff --git a/branches/sca-equinox/distribution/features/process/src/main/components/src-modules.xml b/branches/sca-equinox/distribution/features/process/src/main/components/src-modules.xml
index dacda26919..68b2c39644 100644
--- a/branches/sca-equinox/distribution/features/process/src/main/components/src-modules.xml
+++ b/branches/sca-equinox/distribution/features/process/src/main/components/src-modules.xml
@@ -52,7 +52,6 @@
                 <include>extensibility-equinox/**/*</include>
                 <include>host-corba/**/*</include>
                 <include>host-corba-jse/**/*</include>
-                <include>host-embedded/**/*</include>
                 <include>host-http/**/*</include>
                 <include>implementation-bpel/**/*</include>
                 <include>implementation-bpel-ode/**/*</include>
@@ -79,6 +78,9 @@
                 <include>policy-security-jsr250/**/*</include>
                 <include>policy-xml/**/*</include>
                 <include>sca-api/**/*</include>
+                <include>workspace/**/*</include>
+                <include>workspace-impl/**/*</include>
+                <include>workspace-xml/**/*</include>
                 <include>xsd/**/*</include>
                 <include>xsd-xml/**/*</include>
             </includes>
diff --git a/branches/sca-equinox/distribution/features/repository/pom.xml b/branches/sca-equinox/distribution/features/repository/pom.xml
index c235d2bc33..0e5feb0579 100644
--- a/branches/sca-equinox/distribution/features/repository/pom.xml
+++ b/branches/sca-equinox/distribution/features/repository/pom.xml
@@ -174,7 +174,6 @@
                 <module>../../../modules/host-corba</module>
                 <module>../../../modules/host-corba-jee</module>
                 <module>../../../modules/host-corba-jse</module>
-                <module>../../../modules/host-embedded</module>
                 <module>../../../modules/host-http</module>
                 <module>../../../modules/host-jetty</module>
                 <module>../../../modules/host-rmi</module>
diff --git a/branches/sca-equinox/distribution/features/repository/src/main/components/src-modules.xml b/branches/sca-equinox/distribution/features/repository/src/main/components/src-modules.xml
index 02f37b4b70..0736faf913 100644
--- a/branches/sca-equinox/distribution/features/repository/src/main/components/src-modules.xml
+++ b/branches/sca-equinox/distribution/features/repository/src/main/components/src-modules.xml
@@ -79,11 +79,23 @@
                 <include>definitions-xml/**/*</include>
                 <include>distribution-all/**/*</include>
                 <include>distribution-core/**/*</include>
+                <include>distribution-core/**/*</include>
+                <include>distribution-core:zip/**/*</include>
+                <include>distribution-ejava/**/*</include>
                 <include>distribution-ejava/**/*</include>
+                <include>distribution-ejava:zip/**/*</include>
+                <include>distribution-manager/**/*</include>
                 <include>distribution-manager/**/*</include>
+                <include>distribution-manager:zip/**/*</include>
                 <include>distribution-process/**/*</include>
+                <include>distribution-process/**/*</include>
+                <include>distribution-process:zip/**/*</include>
+                <include>distribution-web20/**/*</include>
                 <include>distribution-web20/**/*</include>
+                <include>distribution-web20:zip/**/*</include>
+                <include>distribution-webservice/**/*</include>
                 <include>distribution-webservice/**/*</include>
+                <include>distribution-webservice:zip/**/*</include>
                 <include>domain-manager/**/*</include>
                 <include>endpoint/**/*</include>
                 <include>extensibility/**/*</include>
@@ -91,7 +103,6 @@
                 <include>host-corba/**/*</include>
                 <include>host-corba-jee/**/*</include>
                 <include>host-corba-jse/**/*</include>
-                <include>host-embedded/**/*</include>
                 <include>host-http/**/*</include>
                 <include>host-jetty/**/*</include>
                 <include>host-rmi/**/*</include>
@@ -117,6 +128,12 @@
                 <include>interface-java-xml/**/*</include>
                 <include>interface-wsdl/**/*</include>
                 <include>interface-wsdl-xml/**/*</include>
+                <include>java2wsdl/**/*</include>
+                <include>maven-ant-generator/**/*</include>
+                <include>maven-bundle-plugin/**/*</include>
+                <include>maven-incremental-build/**/*</include>
+                <include>maven-java2wsdl/**/*</include>
+                <include>maven-wsdl2java/**/*</include>
                 <include>monitor/**/*</include>
                 <include>node-api/**/*</include>
                 <include>node-impl/**/*</include>
@@ -136,6 +153,7 @@
                 <include>workspace/**/*</include>
                 <include>workspace-impl/**/*</include>
                 <include>workspace-xml/**/*</include>
+                <include>wsdl2java/**/*</include>
                 <include>xsd/**/*</include>
                 <include>xsd-xml/**/*</include>
             </includes>
diff --git a/branches/sca-equinox/distribution/features/web20/pom.xml b/branches/sca-equinox/distribution/features/web20/pom.xml
index ead4bafae1..bd4edf4a34 100644
--- a/branches/sca-equinox/distribution/features/web20/pom.xml
+++ b/branches/sca-equinox/distribution/features/web20/pom.xml
@@ -205,6 +205,9 @@
                 <module>../../../modules/policy-security-jsr250</module>
                 <module>../../../modules/policy-xml</module>
                 <module>../../../modules/sca-api</module>
+                <module>../../../modules/workspace</module>
+                <module>../../../modules/workspace-impl</module>
+                <module>../../../modules/workspace-xml</module>
                 <module>../../../modules/xsd</module>
                 <module>../../../modules/xsd-xml</module>
             </modules>
diff --git a/branches/sca-equinox/distribution/features/web20/src/main/components/src-modules.xml b/branches/sca-equinox/distribution/features/web20/src/main/components/src-modules.xml
index e8e6919b9e..68aae46796 100644
--- a/branches/sca-equinox/distribution/features/web20/src/main/components/src-modules.xml
+++ b/branches/sca-equinox/distribution/features/web20/src/main/components/src-modules.xml
@@ -90,6 +90,9 @@
                 <include>policy-security-jsr250/**/*</include>
                 <include>policy-xml/**/*</include>
                 <include>sca-api/**/*</include>
+                <include>workspace/**/*</include>
+                <include>workspace-impl/**/*</include>
+                <include>workspace-xml/**/*</include>
                 <include>xsd/**/*</include>
                 <include>xsd-xml/**/*</include>
             </includes>
diff --git a/branches/sca-equinox/distribution/features/webservice/pom.xml b/branches/sca-equinox/distribution/features/webservice/pom.xml
index abb0e6e51e..33c340cc91 100644
--- a/branches/sca-equinox/distribution/features/webservice/pom.xml
+++ b/branches/sca-equinox/distribution/features/webservice/pom.xml
@@ -215,6 +215,9 @@
                 <module>../../../modules/policy-xml</module>
                 <module>../../../modules/policy-xml-ws</module>
                 <module>../../../modules/sca-api</module>
+                <module>../../../modules/workspace</module>
+                <module>../../../modules/workspace-impl</module>
+                <module>../../../modules/workspace-xml</module>
                 <module>../../../modules/xsd</module>
                 <module>../../../modules/xsd-xml</module>
             </modules>
diff --git a/branches/sca-equinox/distribution/features/webservice/src/main/components/src-modules.xml b/branches/sca-equinox/distribution/features/webservice/src/main/components/src-modules.xml
index 0b27ebd5af..d4c14d2d90 100644
--- a/branches/sca-equinox/distribution/features/webservice/src/main/components/src-modules.xml
+++ b/branches/sca-equinox/distribution/features/webservice/src/main/components/src-modules.xml
@@ -86,6 +86,9 @@
                 <include>policy-xml/**/*</include>
                 <include>policy-xml-ws/**/*</include>
                 <include>sca-api/**/*</include>
+                <include>workspace/**/*</include>
+                <include>workspace-impl/**/*</include>
+                <include>workspace-xml/**/*</include>
                 <include>xsd/**/*</include>
                 <include>xsd-xml/**/*</include>
             </includes>
diff --git a/branches/sca-equinox/modules/node-impl/pom.xml b/branches/sca-equinox/modules/node-impl/pom.xml
index 4239a1ee03..e2b885c24b 100644
--- a/branches/sca-equinox/modules/node-impl/pom.xml
+++ b/branches/sca-equinox/modules/node-impl/pom.xml
@@ -82,6 +82,13 @@
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-workspace-impl</artifactId>
+            <version>1.4-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-definitions-xml</artifactId>
             <version>1.4-SNAPSHOT</version>
             <scope>runtime</scope>
diff --git a/branches/sca-equinox/modules/thirdparty-library/pom.xml b/branches/sca-equinox/modules/thirdparty-library/pom.xml
index 7866acd05e..e99e73c0d5 100644
--- a/branches/sca-equinox/modules/thirdparty-library/pom.xml
+++ b/branches/sca-equinox/modules/thirdparty-library/pom.xml
@@ -72,9 +72,9 @@
                 <artifactId>tuscany-maven-bundle-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>fixup-pde-classpath</id>
+                        <id>generate-pde-classpath</id>
                         <goals>
-                            <goal>fixup-pde-classpath</goal>
+                            <goal>generate-pde-classpath</goal>
                         </goals>
                     </execution>
                 </executions>
diff --git a/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/tools/bundle/plugin/ThirdPartyBundleFixupClasspathMojo.java b/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/tools/bundle/plugin/ThirdPartyBundleClasspathGeneratorMojo.java
index 5f5bd030a4..7f4ba1a284 100644
--- a/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/tools/bundle/plugin/ThirdPartyBundleFixupClasspathMojo.java
+++ b/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/tools/bundle/plugin/ThirdPartyBundleClasspathGeneratorMojo.java
@@ -47,12 +47,12 @@ import org.apache.maven.shared.dependency.tree.DependencyTreeBuilderException;
 
 /**
  * @version $Rev$ $Date$
- * @goal fixup-pde-classpath
+ * @goal generate-pde-classpath
  * @phase process-resources
  * @requiresDependencyResolution test
  * @description Adjust third party bundle classpath
  */
-public class ThirdPartyBundleFixupClasspathMojo extends AbstractMojo {
+public class ThirdPartyBundleClasspathGeneratorMojo extends AbstractMojo {
     /**
      * The project to create a build for.
      *
@@ -82,26 +82,19 @@ public class ThirdPartyBundleFixupClasspathMojo extends AbstractMojo {
             File classpath = new File(basedir, ".classpath");
             BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(classpath)));
             StringWriter buffer = new StringWriter();
-            PrintWriter printer = new PrintWriter(buffer); 
+            PrintWriter printer = new PrintWriter(buffer);
+            boolean generatedLib = false;
             for (;;) {
                 String line = reader.readLine();
                 if (line == null) {
                     break;
                 }
-                int i = line.indexOf("kind=\"var\"");
-                if (i != -1) {
-                    line = line.substring(0, i) + "kind=\"lib\" exported=\"true\"" + line.substring(i+10);
-                    
-                    i = line.indexOf("path=\"");
-                    if (i != -1) {
-                        int e = line.indexOf("\"", i+6);
-                        String path = line.substring(i + 6, e);
-                        int s = path.lastIndexOf("/");
-                        if (s != -1) {
-                            path = "lib" + path.substring(s);
-                            line = line.substring(0, i) + "path=\"" + path + line.substring(e);
-                        }
+                if (line.contains("kind=\"var\"")) {
+                    if (!generatedLib) {
+                        generateLibClasspathEntries(printer);
+                        generatedLib = true;
                     }
+                    continue;
                 }
                 printer.println(line);
             }
@@ -116,4 +109,14 @@ public class ThirdPartyBundleFixupClasspathMojo extends AbstractMojo {
 
     }
 
+    private void generateLibClasspathEntries(PrintWriter printer) {
+        File lib = new File(basedir, "lib");
+        for (File jar: lib.listFiles()) {
+            if (!jar.getPath().endsWith(".jar")) {
+                continue;
+            }
+            printer.println("  <classpathentry exported=\"true\" kind=\"lib\" path=\"lib/" + jar.getName() + "\"/>");
+        }
+    }
+    
 }