Author: dims
Date: Fri Apr 4 06:33:09 2008
New Revision: 644708
URL: http://svn.apache.org/viewvc?rev=644708&view=rev
Log:
use fixed manifest's and remove maven-bundle-plugin
Added:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/resources/
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/resources/META-INF/
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/resources/META-INF/MANIFEST.MF
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/resources/META-INF/
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/resources/META-INF/MANIFEST.MF
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/resources/
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/resources/META-INF/
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/resources/META-INF/MANIFEST.MF
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-api/pom.xml
webservices/commons/trunk/modules/axiom/modules/axiom-dom/pom.xml
webservices/commons/trunk/modules/axiom/modules/axiom-impl/pom.xml
webservices/commons/trunk/modules/axiom/pom.xml
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-api/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/pom.xml?rev=644708&r1=644707&r2=644708&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-api/pom.xml (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-api/pom.xml Fri Apr
4 06:33:09 2008
@@ -60,34 +60,20 @@
</dependency>
</dependencies>
<build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ </resources>
<plugins>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
-
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+
<manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
</archive>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>${bundle.plugin.version}</version>
- <configuration>
- <instructions>
- <Bundle-Version>${axiom.osgi.version}</Bundle-Version>
- </instructions>
- </configuration>
- <executions>
- <execution>
- <id>bundle-manifest</id>
- <phase>process-classes</phase>
- <goals>
- <goal>manifest</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
Added:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/resources/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/resources/META-INF/MANIFEST.MF?rev=644708&view=auto
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/resources/META-INF/MANIFEST.MF
(added)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/resources/META-INF/MANIFEST.MF
Fri Apr 4 06:33:09 2008
@@ -0,0 +1,40 @@
+Manifest-Version: 1.0
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Import-Package:
+ javax.activation,
+ javax.mail,
+ javax.mail.internet,
+ javax.xml.namespace,
+ javax.xml.stream,
+ 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
+Export-Package:
+ org.apache.axiom.attachments.impl,
+ org.apache.axiom.attachments.lifecycle.impl,
+ org.apache.axiom.attachments.lifecycle,
+ org.apache.axiom.attachments.utils,
+ org.apache.axiom.attachments,
+ org.apache.axiom.om.ds.custombuilder,
+ org.apache.axiom.om.ds,
+ 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.impl,
+ org.apache.axiom.om.util,
+ org.apache.axiom.om.xpath,
+ org.apache.axiom.om,
+ org.apache.axiom.soap.impl.builder,
+ org.apache.axiom.soap
+Bundle-Version: 1.2.6
+Bundle-Name: Axiom API
+Bundle-DocURL: http://www.apache.org/
+Bundle-ManifestVersion: 2
+Bundle-Vendor: Apache Software Foundation
+Bundle-SymbolicName: org.apache.ws.commons.axiom.axiom-api
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-dom/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/pom.xml?rev=644708&r1=644707&r2=644708&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-dom/pom.xml (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-dom/pom.xml Fri Apr
4 06:33:09 2008
@@ -57,34 +57,20 @@
</dependency>
</dependencies>
<build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ </resources>
<plugins>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
-
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+
<manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
</archive>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>${bundle.plugin.version}</version>
- <configuration>
- <instructions>
- <Bundle-Version>${axiom.osgi.version}</Bundle-Version>
- </instructions>
- </configuration>
- <executions>
- <execution>
- <id>bundle-manifest</id>
- <phase>process-classes</phase>
- <goals>
- <goal>manifest</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
Added:
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/resources/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/resources/META-INF/MANIFEST.MF?rev=644708&view=auto
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/resources/META-INF/MANIFEST.MF
(added)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/resources/META-INF/MANIFEST.MF
Fri Apr 4 06:33:09 2008
@@ -0,0 +1,42 @@
+Manifest-Version: 1.0
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Import-Package:
+ javax.activation,
+ javax.xml.namespace,
+ javax.xml.parsers,
+ javax.xml.stream,
+ javax.xml.validation,org.apache.axiom.attachments.utils,
+ org.apache.axiom.om,
+ org.apache.axiom.om.impl,
+ org.apache.axiom.om.impl.builder,
+ org.apache.axiom.om.impl.dom,
+ org.apache.axiom.om.impl.dom.factory,
+ org.apache.axiom.om.impl.dom.jaxp,
+ 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.soap,
+ org.apache.axiom.soap.impl.builder,
+ org.apache.axiom.soap.impl.dom,
+ org.apache.axiom.soap.impl.dom.factory,
+ org.apache.axiom.soap.impl.dom.soap11,
+ org.apache.axiom.soap.impl.dom.soap12,
+ org.w3c.dom,
+ org.xml.sax
+Export-Package:
+ org.apache.axiom.om.impl.dom.factory,
+ org.apache.axiom.om.impl.dom.jaxp,
+ org.apache.axiom.om.impl.dom,
+ org.apache.axiom.soap.impl.dom.factory,
+ org.apache.axiom.soap.impl.dom.soap11,
+ org.apache.axiom.soap.impl.dom.soap12,
+ org.apache.axiom.soap.impl.dom
+Bundle-Version: 1.2.6
+Bundle-Name: Axiom DOM
+Bundle-DocURL: http://www.apache.org/
+Bundle-ManifestVersion: 2
+Bundle-Vendor: Apache Software Foundation
+Bundle-SymbolicName: org.apache.ws.commons.axiom.axiom-dom
+
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/pom.xml?rev=644708&r1=644707&r2=644708&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/pom.xml
(original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/pom.xml Fri Apr
4 06:33:09 2008
@@ -57,34 +57,20 @@
</dependency>
</dependencies>
<build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ </resources>
<plugins>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
-
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+
<manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
</archive>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>${bundle.plugin.version}</version>
- <configuration>
- <instructions>
- <Bundle-Version>${axiom.osgi.version}</Bundle-Version>
- </instructions>
- </configuration>
- <executions>
- <execution>
- <id>bundle-manifest</id>
- <phase>process-classes</phase>
- <goals>
- <goal>manifest</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</project>
Added:
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/resources/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/resources/META-INF/MANIFEST.MF?rev=644708&view=auto
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/resources/META-INF/MANIFEST.MF
(added)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/resources/META-INF/MANIFEST.MF
Fri Apr 4 06:33:09 2008
@@ -0,0 +1,37 @@
+Manifest-Version: 1.0
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Import-Package:
+ javax.activation,
+ javax.xml.namespace,
+ javax.xml.stream,
+ org.apache.axiom.attachments.utils,
+ org.apache.axiom.om,
+ org.apache.axiom.om.impl,
+ org.apache.axiom.om.impl.builder,
+ org.apache.axiom.om.impl.exception,
+ org.apache.axiom.om.impl.llom,
+ org.apache.axiom.om.impl.llom.factory,
+ org.apache.axiom.om.impl.llom.util,
+ 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.soap,
+ org.apache.axiom.soap.impl.builder,
+ org.apache.axiom.soap.impl.llom,
+ org.apache.axiom.soap.impl.llom.soap11,
+ org.apache.axiom.soap.impl.llom.soap12,
+ org.apache.commons.logging
+Export-Package:
+ org.apache.axiom.om.impl.llom.factory,
+ org.apache.axiom.om.impl.llom.util,
+ org.apache.axiom.om.impl.llom,
+ org.apache.axiom.soap.impl.llom.soap11,
+ org.apache.axiom.soap.impl.llom.soap12,
+ org.apache.axiom.soap.impl.llom
+Bundle-Version: 1.2.6
+Bundle-Name: Axiom API
+Bundle-DocURL: http://www.apache.org/
+Bundle-ManifestVersion: 2
+Bundle-Vendor: Apache Software Foundation
+Bundle-SymbolicName: org.apache.ws.commons.axiom.axiom-impl
\ No newline at end of file
Modified: webservices/commons/trunk/modules/axiom/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/pom.xml?rev=644708&r1=644707&r2=644708&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/pom.xml (original)
+++ webservices/commons/trunk/modules/axiom/pom.xml Fri Apr 4 06:33:09 2008
@@ -507,6 +507,7 @@
<stax.impl.artifact>wstx-asl</stax.impl.artifact>
<stax.impl.version>3.2.4</stax.impl.version>
<bundle.plugin.version>1.4.0</bundle.plugin.version>
+ <failIfNoTests>false</failIfNoTests>
<!--
<stax.impl.groupid>com.sun.xml.stream</stax.impl.groupid>
<stax.impl.artifact>sjsxp</stax.impl.artifact>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
