You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2008/10/13 00:52:24 UTC
svn commit: r703895 - in /tuscany/branches/sca-equinox:
distribution/features/all/ distribution/features/all/src/main/components/
distribution/features/core/ distribution/features/core/src/main/components/
distribution/features/ejava/ distribution/feat...
Author: jsdelfino
Date: Sun Oct 12 15:52:23 2008
New Revision: 703895
URL: http://svn.apache.org/viewvc?rev=703895&view=rev
Log:
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.
Added:
tuscany/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/tools/bundle/plugin/ThirdPartyBundleClasspathGeneratorMojo.java
- copied, changed from r703894, tuscany/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/tools/bundle/plugin/ThirdPartyBundleFixupClasspathMojo.java
Removed:
tuscany/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/tools/bundle/plugin/ThirdPartyBundleFixupClasspathMojo.java
Modified:
tuscany/branches/sca-equinox/distribution/features/all/pom.xml
tuscany/branches/sca-equinox/distribution/features/all/src/main/components/src-modules.xml
tuscany/branches/sca-equinox/distribution/features/core/pom.xml
tuscany/branches/sca-equinox/distribution/features/core/src/main/components/bin-filtered-dependencies.xml
tuscany/branches/sca-equinox/distribution/features/core/src/main/components/src-modules.xml
tuscany/branches/sca-equinox/distribution/features/ejava/pom.xml
tuscany/branches/sca-equinox/distribution/features/ejava/src/main/components/src-modules.xml
tuscany/branches/sca-equinox/distribution/features/manager/pom.xml
tuscany/branches/sca-equinox/distribution/features/manager/src/main/components/src-modules.xml
tuscany/branches/sca-equinox/distribution/features/process/pom.xml
tuscany/branches/sca-equinox/distribution/features/process/src/main/components/src-modules.xml
tuscany/branches/sca-equinox/distribution/features/repository/pom.xml
tuscany/branches/sca-equinox/distribution/features/repository/src/main/components/src-modules.xml
tuscany/branches/sca-equinox/distribution/features/web20/pom.xml
tuscany/branches/sca-equinox/distribution/features/web20/src/main/components/src-modules.xml
tuscany/branches/sca-equinox/distribution/features/webservice/pom.xml
tuscany/branches/sca-equinox/distribution/features/webservice/src/main/components/src-modules.xml
tuscany/branches/sca-equinox/modules/node-impl/pom.xml
tuscany/branches/sca-equinox/modules/thirdparty-library/pom.xml
Modified: tuscany/branches/sca-equinox/distribution/features/all/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/distribution/features/all/pom.xml?rev=703895&r1=703894&r2=703895&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/distribution/features/all/pom.xml (original)
+++ tuscany/branches/sca-equinox/distribution/features/all/pom.xml Sun Oct 12 15:52:23 2008
@@ -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>
Modified: tuscany/branches/sca-equinox/distribution/features/all/src/main/components/src-modules.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/distribution/features/all/src/main/components/src-modules.xml?rev=703895&r1=703894&r2=703895&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/distribution/features/all/src/main/components/src-modules.xml (original)
+++ tuscany/branches/sca-equinox/distribution/features/all/src/main/components/src-modules.xml Sun Oct 12 15:52:23 2008
@@ -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>
Modified: tuscany/branches/sca-equinox/distribution/features/core/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/distribution/features/core/pom.xml?rev=703895&r1=703894&r2=703895&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/distribution/features/core/pom.xml (original)
+++ tuscany/branches/sca-equinox/distribution/features/core/pom.xml Sun Oct 12 15:52:23 2008
@@ -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>
Modified: tuscany/branches/sca-equinox/distribution/features/core/src/main/components/bin-filtered-dependencies.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/distribution/features/core/src/main/components/bin-filtered-dependencies.xml?rev=703895&r1=703894&r2=703895&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/distribution/features/core/src/main/components/bin-filtered-dependencies.xml (original)
+++ tuscany/branches/sca-equinox/distribution/features/core/src/main/components/bin-filtered-dependencies.xml Sun Oct 12 15:52:23 2008
@@ -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>
Modified: tuscany/branches/sca-equinox/distribution/features/core/src/main/components/src-modules.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/distribution/features/core/src/main/components/src-modules.xml?rev=703895&r1=703894&r2=703895&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/distribution/features/core/src/main/components/src-modules.xml (original)
+++ tuscany/branches/sca-equinox/distribution/features/core/src/main/components/src-modules.xml Sun Oct 12 15:52:23 2008
@@ -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>
Modified: tuscany/branches/sca-equinox/distribution/features/ejava/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/distribution/features/ejava/pom.xml?rev=703895&r1=703894&r2=703895&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/distribution/features/ejava/pom.xml (original)
+++ tuscany/branches/sca-equinox/distribution/features/ejava/pom.xml Sun Oct 12 15:52:23 2008
@@ -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>
Modified: tuscany/branches/sca-equinox/distribution/features/ejava/src/main/components/src-modules.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/distribution/features/ejava/src/main/components/src-modules.xml?rev=703895&r1=703894&r2=703895&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/distribution/features/ejava/src/main/components/src-modules.xml (original)
+++ tuscany/branches/sca-equinox/distribution/features/ejava/src/main/components/src-modules.xml Sun Oct 12 15:52:23 2008
@@ -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>
Modified: tuscany/branches/sca-equinox/distribution/features/manager/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/distribution/features/manager/pom.xml?rev=703895&r1=703894&r2=703895&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/distribution/features/manager/pom.xml (original)
+++ tuscany/branches/sca-equinox/distribution/features/manager/pom.xml Sun Oct 12 15:52:23 2008
@@ -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>
Modified: tuscany/branches/sca-equinox/distribution/features/manager/src/main/components/src-modules.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/distribution/features/manager/src/main/components/src-modules.xml?rev=703895&r1=703894&r2=703895&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/distribution/features/manager/src/main/components/src-modules.xml (original)
+++ tuscany/branches/sca-equinox/distribution/features/manager/src/main/components/src-modules.xml Sun Oct 12 15:52:23 2008
@@ -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>
Modified: tuscany/branches/sca-equinox/distribution/features/process/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/distribution/features/process/pom.xml?rev=703895&r1=703894&r2=703895&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/distribution/features/process/pom.xml (original)
+++ tuscany/branches/sca-equinox/distribution/features/process/pom.xml Sun Oct 12 15:52:23 2008
@@ -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>
Modified: tuscany/branches/sca-equinox/distribution/features/process/src/main/components/src-modules.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/distribution/features/process/src/main/components/src-modules.xml?rev=703895&r1=703894&r2=703895&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/distribution/features/process/src/main/components/src-modules.xml (original)
+++ tuscany/branches/sca-equinox/distribution/features/process/src/main/components/src-modules.xml Sun Oct 12 15:52:23 2008
@@ -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>
Modified: tuscany/branches/sca-equinox/distribution/features/repository/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/distribution/features/repository/pom.xml?rev=703895&r1=703894&r2=703895&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/distribution/features/repository/pom.xml (original)
+++ tuscany/branches/sca-equinox/distribution/features/repository/pom.xml Sun Oct 12 15:52:23 2008
@@ -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>
Modified: tuscany/branches/sca-equinox/distribution/features/repository/src/main/components/src-modules.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/distribution/features/repository/src/main/components/src-modules.xml?rev=703895&r1=703894&r2=703895&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/distribution/features/repository/src/main/components/src-modules.xml (original)
+++ tuscany/branches/sca-equinox/distribution/features/repository/src/main/components/src-modules.xml Sun Oct 12 15:52:23 2008
@@ -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>
Modified: tuscany/branches/sca-equinox/distribution/features/web20/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/distribution/features/web20/pom.xml?rev=703895&r1=703894&r2=703895&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/distribution/features/web20/pom.xml (original)
+++ tuscany/branches/sca-equinox/distribution/features/web20/pom.xml Sun Oct 12 15:52:23 2008
@@ -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>
Modified: tuscany/branches/sca-equinox/distribution/features/web20/src/main/components/src-modules.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/distribution/features/web20/src/main/components/src-modules.xml?rev=703895&r1=703894&r2=703895&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/distribution/features/web20/src/main/components/src-modules.xml (original)
+++ tuscany/branches/sca-equinox/distribution/features/web20/src/main/components/src-modules.xml Sun Oct 12 15:52:23 2008
@@ -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>
Modified: tuscany/branches/sca-equinox/distribution/features/webservice/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/distribution/features/webservice/pom.xml?rev=703895&r1=703894&r2=703895&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/distribution/features/webservice/pom.xml (original)
+++ tuscany/branches/sca-equinox/distribution/features/webservice/pom.xml Sun Oct 12 15:52:23 2008
@@ -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>
Modified: tuscany/branches/sca-equinox/distribution/features/webservice/src/main/components/src-modules.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/distribution/features/webservice/src/main/components/src-modules.xml?rev=703895&r1=703894&r2=703895&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/distribution/features/webservice/src/main/components/src-modules.xml (original)
+++ tuscany/branches/sca-equinox/distribution/features/webservice/src/main/components/src-modules.xml Sun Oct 12 15:52:23 2008
@@ -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>
Modified: tuscany/branches/sca-equinox/modules/node-impl/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/node-impl/pom.xml?rev=703895&r1=703894&r2=703895&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/node-impl/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/node-impl/pom.xml Sun Oct 12 15:52:23 2008
@@ -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>
Modified: tuscany/branches/sca-equinox/modules/thirdparty-library/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/thirdparty-library/pom.xml?rev=703895&r1=703894&r2=703895&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/thirdparty-library/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/thirdparty-library/pom.xml Sun Oct 12 15:52:23 2008
@@ -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>
Copied: tuscany/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/tools/bundle/plugin/ThirdPartyBundleClasspathGeneratorMojo.java (from r703894, tuscany/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/tools/bundle/plugin/ThirdPartyBundleFixupClasspathMojo.java)
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/tools/bundle/plugin/ThirdPartyBundleClasspathGeneratorMojo.java?p2=tuscany/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/tools/bundle/plugin/ThirdPartyBundleClasspathGeneratorMojo.java&p1=tuscany/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/tools/bundle/plugin/ThirdPartyBundleFixupClasspathMojo.java&r1=703894&r2=703895&rev=703895&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/tools/bundle/plugin/ThirdPartyBundleFixupClasspathMojo.java (original)
+++ tuscany/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/tools/bundle/plugin/ThirdPartyBundleClasspathGeneratorMojo.java Sun Oct 12 15:52:23 2008
@@ -47,12 +47,12 @@
/**
* @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 @@
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 @@
}
+ 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() + "\"/>");
+ }
+ }
+
}