Author: dkulp
Date: Tue Mar 4 11:07:43 2008
New Revision: 633588
URL: http://svn.apache.org/viewvc?rev=633588&view=rev
Log:
Use felix to add osgi stuff to manifest - work in progress.
Modified:
incubator/cxf/trunk/distribution/bundle/pom.xml
Modified: incubator/cxf/trunk/distribution/bundle/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/bundle/pom.xml?rev=633588&r1=633587&r2=633588&view=diff
==============================================================================
--- incubator/cxf/trunk/distribution/bundle/pom.xml (original)
+++ incubator/cxf/trunk/distribution/bundle/pom.xml Tue Mar 4 11:07:43 2008
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-bundle</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>Apache CXF Bundle Jar</name>
<version>2.1-incubator-SNAPSHOT</version>
<url>http://cwiki.apache.org/CXF</url>
@@ -45,43 +45,36 @@
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-common-utilities</artifactId>
<version>${pom.version}</version>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-common-schemas</artifactId>
<version>${pom.version}</version>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-tools-common</artifactId>
<version>${pom.version}</version>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-tools-validator</artifactId>
<version>${pom.version}</version>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-tools-wsdlto-core</artifactId>
<version>${pom.version}</version>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-tools-misctools</artifactId>
<version>${pom.version}</version>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-tools-wsdlto-databinding-jaxb</artifactId>
<version>${pom.version}</version>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
@@ -92,7 +85,6 @@
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-tools-wsdlto-frontend-jaxws</artifactId>
<version>${pom.version}</version>
- <optional>true</optional>
</dependency>
<dependency>
@@ -105,162 +97,137 @@
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-tools-java2ws</artifactId>
<version>${pom.version}</version>
- <optional>true</optional>
- </dependency>
-
+ </dependency>
+
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-xjc-ts</artifactId>
<version>${pom.version}</version>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-xjc-dv</artifactId>
<version>${pom.version}</version>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-api</artifactId>
<version>${pom.version}</version>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-core</artifactId>
<version>${pom.version}</version>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-management</artifactId>
<version>${pom.version}</version>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-transports-local</artifactId>
<version>${pom.version}</version>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
<version>${pom.version}</version>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-transports-http-jetty</artifactId>
<version>${pom.version}</version>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-transports-jms</artifactId>
<version>${pom.version}</version>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-bindings-soap</artifactId>
<version>${pom.version}</version>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-bindings-coloc</artifactId>
<version>${pom.version}</version>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-bindings-object</artifactId>
<version>${pom.version}</version>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-bindings-xml</artifactId>
<version>${pom.version}</version>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-bindings-http</artifactId>
<version>${pom.version}</version>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-databinding-aegis</artifactId>
<version>${pom.version}</version>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
<version>${pom.version}</version>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-frontend-js</artifactId>
<version>${pom.version}</version>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-frontend-simple</artifactId>
<version>${pom.version}</version>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
<version>${pom.version}</version>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-ws-security</artifactId>
<version>${pom.version}</version>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-ws-policy</artifactId>
<version>${pom.version}</version>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-ws-addr</artifactId>
<version>${pom.version}</version>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-ws-rm</artifactId>
<version>${pom.version}</version>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-javascript</artifactId>
<version>${pom.version}</version>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -279,7 +246,16 @@
</resource>
</resources>
<plugins>
-
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+
<Export-Package>org.apache.cxf.*,org.codehaus.xfire.aegis.type.java5.*,org.xmlsoap.schemas.wsdl.http.*,org.w3._2006._05.addressing.wsdl.*</Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
@@ -296,6 +272,14 @@
<createSourcesJar>${createSourcesJar}</createSourcesJar>
<promoteTransitiveDependencies>true</promoteTransitiveDependencies>
<createDependencyReducedPom>true</createDependencyReducedPom>
+ <filters>
+ <filter>
+
<artifact>${project.groupId}:${project.artifactId}</artifact>
+ <excludes>
+ <exclude>org/**</exclude>
+ </excludes>
+ </filter>
+ </filters>
<transformers>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer">
@@ -338,53 +322,53 @@
</build>
<profiles>
- <profile>
- <id>deploy</id>
- <properties>
- <createSourcesJar>true</createSourcesJar>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>unpack-sources</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>unpack-dependencies</goal>
- </goals>
- <configuration>
-
<includeGroupIds>org.apache.cxf</includeGroupIds>
- <classifier>sources</classifier>
-
<outputDirectory>${project.build.directory}/sources</outputDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <executions>
- <execution>
- <id>package</id>
- <phase>package</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <header>Apache CXF API</header>
- <footer>Apache CXF API</footer>
-
<sourcepath>${project.build.directory}/sources</sourcepath>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
+ <profile>
+ <id>deploy</id>
+ <properties>
+ <createSourcesJar>true</createSourcesJar>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack-sources</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <configuration>
+
<includeGroupIds>org.apache.cxf</includeGroupIds>
+ <classifier>sources</classifier>
+
<outputDirectory>${project.build.directory}/sources</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>package</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <header>Apache CXF API</header>
+ <footer>Apache CXF API</footer>
+
<sourcepath>${project.build.directory}/sources</sourcepath>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
