You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by di...@apache.org on 2008/04/05 07:24:17 UTC
svn commit: r645030 - in /webservices/axis2/trunk/java/modules/osgi: pom.xml
resources/META-INF/ resources/META-INF/MANIFEST.MF
Author: dims
Date: Fri Apr 4 22:24:01 2008
New Revision: 645030
URL: http://svn.apache.org/viewvc?rev=645030&view=rev
Log:
getting rid of maven-bundle-plugin
Added:
webservices/axis2/trunk/java/modules/osgi/resources/META-INF/
webservices/axis2/trunk/java/modules/osgi/resources/META-INF/MANIFEST.MF
Modified:
webservices/axis2/trunk/java/modules/osgi/pom.xml
Modified: webservices/axis2/trunk/java/modules/osgi/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/osgi/pom.xml?rev=645030&r1=645029&r2=645030&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/osgi/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/osgi/pom.xml Fri Apr 4 22:24:01 2008
@@ -22,7 +22,6 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <packaging>bundle</packaging>
<parent>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-parent</artifactId>
@@ -42,6 +41,14 @@
</resources>
<plugins>
<plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>resources/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
@@ -53,32 +60,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>1.2.0</version>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-Version>1.4</Bundle-Version>
- <Bundle-Name>org.apache.axis2</Bundle-Name>
- <Bundle-Vendor>Apache Software Foundation</Bundle-Vendor>
- <Bundle-Author>Davanum Srinivas <dims@apache.org></Bundle-Author>
- <Bundle-Description>OSGi Bundle for Axis2</Bundle-Description>
- <Bundle-SymbolicName>org.apache.axis2.osgi</Bundle-SymbolicName>
- <Bundle-Activator>org.apache.axis2.extensions.osgi.Activator</Bundle-Activator>
- <Export-Package>
- ${bundle.namespace}.*;version="1.4",javax.jws.*;version="0.0.0",com.sun.tools.ws.spi.*;version="0.0.0"
- </Export-Package>
- <Import-Package>*;resolution:=optional</Import-Package>
- <Private-Package>org.apache.axis2.extensions.osgi.*</Private-Package>
- <Embed-Dependency>*;scope=compile|runtime;inline=false</Embed-Dependency>
- <Embed-Directory>target/dependency</Embed-Directory>
- <Embed-Transitive>true</Embed-Transitive>
- <Embed-StripGroup>true</Embed-StripGroup>
- </instructions>
- </configuration>
- </plugin>
</plugins>
</build>
<dependencies>
@@ -108,10 +89,6 @@
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
</dependency>
- <!--<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-xjc</artifactId>
- </dependency>-->
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-jaxws</artifactId>
Added: webservices/axis2/trunk/java/modules/osgi/resources/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/osgi/resources/META-INF/MANIFEST.MF?rev=645030&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/osgi/resources/META-INF/MANIFEST.MF (added)
+++ webservices/axis2/trunk/java/modules/osgi/resources/META-INF/MANIFEST.MF Fri Apr 4 22:24:01 2008
@@ -0,0 +1,28 @@
+Manifest-Version: 1.0
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-Activator: org.apache.axis2.extensions.osgi.Activator
+Import-Package:
+ javax.servlet.http,
+ javax.servlet,
+ org.apache.axis2,
+ org.apache.axis2.deployment,
+ org.apache.axis2.deployment.util,
+ org.apache.axis2.description,
+ org.apache.axis2.engine,
+ org.apache.axis2.jaxws.framework,
+ org.apache.axis2.transport.http,
+ org.osgi.framework,
+ org.osgi.service.http,
+ org.osgi.service.log
+Export-Package:
+ org.apache.axis2.extensions.osgi.core.web,
+ org.apache.axis2.extensions.osgi.core,
+ org.apache.axis2.extensions.osgi.util,
+ org.apache.axis2.extensions.osgi
+Bundle-Version: 1.4
+Bundle-Name: Axis2 OSGi Bundle
+Bundle-DocURL: http://www.apache.org/
+Bundle-ManifestVersion: 2
+Bundle-Vendor: Apache Software Foundation
+Bundle-SymbolicName: org.apache.axis2.osgi
+
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org