Add in a customized version on the axiom api manifest. Add message to equinox hos to remind me where it actually picks up customized manifests from.

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

4 files changed, 101 insertions, 2 deletions

diff --git a/sca-java-2.x/trunk/distribution/all/manifests/axiom-api-1.2.8.MF b/sca-java-2.x/trunk/distribution/all/manifests/axiom-api-1.2.8.MF
new file mode 100644
index 0000000000..c5b975bf88
--- /dev/null
+++ b/sca-java-2.x/trunk/distribution/all/manifests/axiom-api-1.2.8.MF
@@ -0,0 +1,48 @@
+Manifest-Version: 1.0

+Bundle-ManifestVersion: 2

+Bundle-Name: Axiom API

+Bundle-SymbolicName: org.apache.ws.commons.axiom.axiom-api

+Bundle-Version: 1.2.8

+Bundle-Vendor: Apache Software Foundation

+Bundle-DocURL: http://www.apache.org/

+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

+Bundle-ClassPath: axiom-api-1.2.8.jar

+Export-Package: org.apache.axiom.attachments,

+ org.apache.axiom.attachments.impl,

+ org.apache.axiom.attachments.lifecycle,

+ org.apache.axiom.attachments.lifecycle.impl,

+ org.apache.axiom.attachments.utils,

+ org.apache.axiom.om,

+ org.apache.axiom.om.ds,

+ org.apache.axiom.om.ds.custombuilder,

+ org.apache.axiom.om.impl,

+ org.apache.axiom.om.impl.builder,

+ org.apache.axiom.om.impl.exception,

+ org.apache.axiom.om.impl.serialize,

+ org.apache.axiom.om.impl.traverse,

+ org.apache.axiom.om.impl.util,

+ org.apache.axiom.om.util,

+ org.apache.axiom.om.xpath,

+ org.apache.axiom.soap,

+ org.apache.axiom.soap.impl.builder

+Archiver-Version: Plexus Archiver

+Build-Jdk: 1.5.0_15

+Created-By: Apache Maven

+Built-By: dims

+Import-Package: javax.activation,

+ javax.mail,

+ javax.mail.internet,

+ javax.xml.namespace,

+ javax.xml.stream,

+ org.apache.axiom.om.impl.dom.factory;resolution:=optional,

+ org.apache.axiom.om.impl.llom.factory;resolution:=optional,

+ org.apache.axiom.soap.impl.dom.factory;resolution:=optional,

+ org.apache.axiom.soap.impl.llom.soap11;resolution:=optional,

+ org.apache.axiom.soap.impl.llom.soap12;resolution:=optional,

+ org.apache.commons.logging,

+ org.jaxen;resolution:=optional,

+ org.jaxen.saxpath;resolution:=optional,

+ org.jaxen.util;resolution:=optional,

+ org.w3c.dom,

+ org.xml.sax,

+ org.xml.sax.helpers

diff --git a/sca-java-2.x/trunk/distribution/all/pom.xml b/sca-java-2.x/trunk/distribution/all/pom.xml
index 4696def259..42679555da 100644
--- a/sca-java-2.x/trunk/distribution/all/pom.xml
+++ b/sca-java-2.x/trunk/distribution/all/pom.xml
@@ -150,12 +150,12 @@
                              <useDistributionName>false</useDistributionName>
                              <generateManifestJar>true</generateManifestJar>
                              <artifactManifests>
-                                 <!--artifactManifest>
+                                 <artifactManifest>
                                      <groupId>org.apache.ws.commons.axiom</groupId>
                                      <artifactId>axiom-api</artifactId>
                                      <version>1.2.8</version>
                                      <manifestFile>${basedir}/manifests/axiom-api-1.2.8.MF</manifestFile>
-                                 </artifactManifest-->
+                                 </artifactManifest>
                                  <artifactManifest>
                                      <groupId>org.apache.woden</groupId>
                                      <artifactId>woden-impl-dom</artifactId>
diff --git a/sca-java-2.x/trunk/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java b/sca-java-2.x/trunk/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java
index fd4d0ee5bf..2014e15939 100644
--- a/sca-java-2.x/trunk/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java
+++ b/sca-java-2.x/trunk/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java
@@ -256,6 +256,9 @@ public class EquinoxHost {
             if (logger.isLoggable(Level.FINE)) {
                 logger.fine("Generating third-party library bundle.");
             }
+            
+            logger.info("Checking for manfiests customized by Tuscany in node-launcher-equinox/resources");
+            
             long libraryStart = currentTimeMillis();
             
             Set<String> serviceProviders = new HashSet<String>();
diff --git a/sca-java-2.x/trunk/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/axiom-api-1.2.8.MF b/sca-java-2.x/trunk/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/axiom-api-1.2.8.MF
new file mode 100644
index 0000000000..c5b975bf88
--- /dev/null
+++ b/sca-java-2.x/trunk/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/axiom-api-1.2.8.MF
@@ -0,0 +1,48 @@
+Manifest-Version: 1.0

+Bundle-ManifestVersion: 2

+Bundle-Name: Axiom API

+Bundle-SymbolicName: org.apache.ws.commons.axiom.axiom-api

+Bundle-Version: 1.2.8

+Bundle-Vendor: Apache Software Foundation

+Bundle-DocURL: http://www.apache.org/

+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

+Bundle-ClassPath: axiom-api-1.2.8.jar

+Export-Package: org.apache.axiom.attachments,

+ org.apache.axiom.attachments.impl,

+ org.apache.axiom.attachments.lifecycle,

+ org.apache.axiom.attachments.lifecycle.impl,

+ org.apache.axiom.attachments.utils,

+ org.apache.axiom.om,

+ org.apache.axiom.om.ds,

+ org.apache.axiom.om.ds.custombuilder,

+ org.apache.axiom.om.impl,

+ org.apache.axiom.om.impl.builder,

+ org.apache.axiom.om.impl.exception,

+ org.apache.axiom.om.impl.serialize,

+ org.apache.axiom.om.impl.traverse,

+ org.apache.axiom.om.impl.util,

+ org.apache.axiom.om.util,

+ org.apache.axiom.om.xpath,

+ org.apache.axiom.soap,

+ org.apache.axiom.soap.impl.builder

+Archiver-Version: Plexus Archiver

+Build-Jdk: 1.5.0_15

+Created-By: Apache Maven

+Built-By: dims

+Import-Package: javax.activation,

+ javax.mail,

+ javax.mail.internet,

+ javax.xml.namespace,

+ javax.xml.stream,

+ org.apache.axiom.om.impl.dom.factory;resolution:=optional,

+ org.apache.axiom.om.impl.llom.factory;resolution:=optional,

+ org.apache.axiom.soap.impl.dom.factory;resolution:=optional,

+ org.apache.axiom.soap.impl.llom.soap11;resolution:=optional,

+ org.apache.axiom.soap.impl.llom.soap12;resolution:=optional,

+ org.apache.commons.logging,

+ org.jaxen;resolution:=optional,

+ org.jaxen.saxpath;resolution:=optional,

+ org.jaxen.util;resolution:=optional,

+ org.w3c.dom,

+ org.xml.sax,

+ org.xml.sax.helpers