You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2013/08/15 21:08:53 UTC
svn commit: r1514442 - in /cxf/trunk: core/ maven-plugins/codegen-plugin/
maven-plugins/corba/ maven-plugins/java2ws-plugin/
maven-plugins/wadl2java-plugin/ maven-plugins/wsdl-validator-plugin/
parent/ rt/bindings/coloc/ rt/bindings/corba/ rt/bindings/...
Author: dkulp
Date: Thu Aug 15 19:08:52 2013
New Revision: 1514442
URL: http://svn.apache.org/r1514442
Log:
Change to <packaging>bundle</packaging> for everything that should be a bundle
Modified:
cxf/trunk/core/pom.xml
cxf/trunk/maven-plugins/codegen-plugin/pom.xml
cxf/trunk/maven-plugins/corba/pom.xml
cxf/trunk/maven-plugins/java2ws-plugin/pom.xml
cxf/trunk/maven-plugins/wadl2java-plugin/pom.xml
cxf/trunk/maven-plugins/wsdl-validator-plugin/pom.xml
cxf/trunk/parent/pom.xml
cxf/trunk/rt/bindings/coloc/pom.xml
cxf/trunk/rt/bindings/corba/pom.xml
cxf/trunk/rt/bindings/object/pom.xml
cxf/trunk/rt/bindings/soap/pom.xml
cxf/trunk/rt/bindings/xml/pom.xml
cxf/trunk/rt/databinding/aegis/pom.xml
cxf/trunk/rt/databinding/jaxb/pom.xml
cxf/trunk/rt/databinding/jibx/pom.xml
cxf/trunk/rt/databinding/sdo/pom.xml
cxf/trunk/rt/databinding/xmlbeans/pom.xml
cxf/trunk/rt/features/clustering/pom.xml
cxf/trunk/rt/frontend/jaxrs/pom.xml
cxf/trunk/rt/frontend/jaxws/pom.xml
cxf/trunk/rt/frontend/js/pom.xml
cxf/trunk/rt/frontend/simple/pom.xml
cxf/trunk/rt/javascript/javascript-rt/pom.xml
cxf/trunk/rt/javascript/javascript-tests/pom.xml
cxf/trunk/rt/management-web/pom.xml
cxf/trunk/rt/management/pom.xml
cxf/trunk/rt/rs/client/pom.xml
cxf/trunk/rt/rs/description/pom.xml
cxf/trunk/rt/rs/extensions/providers/pom.xml
cxf/trunk/rt/rs/extensions/search/pom.xml
cxf/trunk/rt/rs/security/cors/pom.xml
cxf/trunk/rt/rs/security/oauth-parent/oauth/pom.xml
cxf/trunk/rt/rs/security/oauth-parent/oauth2-saml/pom.xml
cxf/trunk/rt/rs/security/oauth-parent/oauth2/pom.xml
cxf/trunk/rt/rs/security/sso/saml/pom.xml
cxf/trunk/rt/rs/security/xml/pom.xml
cxf/trunk/rt/security/pom.xml
cxf/trunk/rt/transports/http-hc/pom.xml
cxf/trunk/rt/transports/http-jetty/pom.xml
cxf/trunk/rt/transports/http-netty/netty-client/pom.xml
cxf/trunk/rt/transports/http-netty/netty-server/pom.xml
cxf/trunk/rt/transports/http/pom.xml
cxf/trunk/rt/transports/jms/pom.xml
cxf/trunk/rt/transports/local/pom.xml
cxf/trunk/rt/transports/udp/pom.xml
cxf/trunk/rt/ws/addr/pom.xml
cxf/trunk/rt/ws/eventing/pom.xml
cxf/trunk/rt/ws/mex/pom.xml
cxf/trunk/rt/ws/policy/pom.xml
cxf/trunk/rt/ws/rm/pom.xml
cxf/trunk/rt/ws/security/pom.xml
cxf/trunk/rt/wsdl/pom.xml
cxf/trunk/services/wsn/wsn-osgi/pom.xml
cxf/trunk/services/xkms/xkms-client/pom.xml
cxf/trunk/services/xkms/xkms-common/pom.xml
cxf/trunk/services/xkms/xkms-osgi/pom.xml
cxf/trunk/services/xkms/xkms-service/pom.xml
cxf/trunk/services/xkms/xkms-x509-handlers/pom.xml
Modified: cxf/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/core/pom.xml?rev=1514442&r1=1514441&r2=1514442&view=diff
==============================================================================
--- cxf/trunk/core/pom.xml (original)
+++ cxf/trunk/core/pom.xml Thu Aug 15 19:08:52 2013
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-core</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>Apache CXF Core</name>
<description>Apache CXF Core</description>
<version>3.0.0-SNAPSHOT</version>
@@ -328,6 +328,35 @@
<footer>Apache CXF API</footer>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>${cxf.osgi.symbolic.name}</Bundle-SymbolicName>
+ <Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor>
+ <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
+ <Implementation-Version>${cxf.osgi.version.clean}</Implementation-Version>
+ <Specification-Vendor>The Apache Software Foundation</Specification-Vendor>
+ <Specification-Version>${cxf.osgi.version.clean}</Specification-Version>
+ <Bundle-DocURL>http://cxf.apache.org</Bundle-DocURL>
+ <Fragment-Host>${cxf.fragment.host}</Fragment-Host>
+ <_failok>true</_failok>
+ <_nouses>true</_nouses>
+ <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
+ <Export-Package>${cxf.osgi.export}</Export-Package>
+ <Import-Package>
+ ${cxf.osgi.import},
+ *
+ </Import-Package>
+ <DynamicImport-Package>
+ ${cxf.osgi.dynamic.import}
+ </DynamicImport-Package>
+ <Bundle-Activator>${cxf.bundle.activator}</Bundle-Activator>
+ </instructions>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
</build>
Modified: cxf/trunk/maven-plugins/codegen-plugin/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/maven-plugins/codegen-plugin/pom.xml?rev=1514442&r1=1514441&r2=1514442&view=diff
==============================================================================
--- cxf/trunk/maven-plugins/codegen-plugin/pom.xml (original)
+++ cxf/trunk/maven-plugins/codegen-plugin/pom.xml Thu Aug 15 19:08:52 2013
@@ -33,10 +33,6 @@
<version>3.0.0-SNAPSHOT</version>
</parent>
- <properties>
- <cxf.manifest.location />
- </properties>
-
<dependencies>
<dependency>
<groupId>junit</groupId>
Modified: cxf/trunk/maven-plugins/corba/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/maven-plugins/corba/pom.xml?rev=1514442&r1=1514441&r2=1514442&view=diff
==============================================================================
--- cxf/trunk/maven-plugins/corba/pom.xml (original)
+++ cxf/trunk/maven-plugins/corba/pom.xml Thu Aug 15 19:08:52 2013
@@ -32,9 +32,6 @@
<artifactId>cxf-maven-plugins</artifactId>
<version>3.0.0-SNAPSHOT</version>
</parent>
- <properties>
- <cxf.manifest.location />
- </properties>
<dependencies>
<dependency>
Modified: cxf/trunk/maven-plugins/java2ws-plugin/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/maven-plugins/java2ws-plugin/pom.xml?rev=1514442&r1=1514441&r2=1514442&view=diff
==============================================================================
--- cxf/trunk/maven-plugins/java2ws-plugin/pom.xml (original)
+++ cxf/trunk/maven-plugins/java2ws-plugin/pom.xml Thu Aug 15 19:08:52 2013
@@ -33,9 +33,6 @@
<artifactId>cxf-maven-plugins</artifactId>
<version>3.0.0-SNAPSHOT</version>
</parent>
- <properties>
- <cxf.manifest.location />
- </properties>
<dependencies>
<dependency>
Modified: cxf/trunk/maven-plugins/wadl2java-plugin/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/maven-plugins/wadl2java-plugin/pom.xml?rev=1514442&r1=1514441&r2=1514442&view=diff
==============================================================================
--- cxf/trunk/maven-plugins/wadl2java-plugin/pom.xml (original)
+++ cxf/trunk/maven-plugins/wadl2java-plugin/pom.xml Thu Aug 15 19:08:52 2013
@@ -33,9 +33,6 @@
<artifactId>cxf-maven-plugins</artifactId>
<version>3.0.0-SNAPSHOT</version>
</parent>
- <properties>
- <cxf.manifest.location />
- </properties>
<dependencies>
<dependency>
Modified: cxf/trunk/maven-plugins/wsdl-validator-plugin/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/maven-plugins/wsdl-validator-plugin/pom.xml?rev=1514442&r1=1514441&r2=1514442&view=diff
==============================================================================
--- cxf/trunk/maven-plugins/wsdl-validator-plugin/pom.xml (original)
+++ cxf/trunk/maven-plugins/wsdl-validator-plugin/pom.xml Thu Aug 15 19:08:52 2013
@@ -32,9 +32,6 @@
<artifactId>cxf-maven-plugins</artifactId>
<version>3.0.0-SNAPSHOT</version>
</parent>
- <properties>
- <cxf.manifest.location />
- </properties>
<dependencies>
<dependency>
Modified: cxf/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=1514442&r1=1514441&r2=1514442&view=diff
==============================================================================
--- cxf/trunk/parent/pom.xml (original)
+++ cxf/trunk/parent/pom.xml Thu Aug 15 19:08:52 2013
@@ -44,7 +44,6 @@
<cxf.compile.flags>-Xlint:unchecked,deprecation,fallthrough,finally</cxf.compile.flags>
<cxf.compile.show.deprecation>true</cxf.compile.show.deprecation>
<cxf.codegenplugin.forkmode>once</cxf.codegenplugin.forkmode>
- <cxf.manifest.location>${project.build.outputDirectory}/META-INF/MANIFEST.MF</cxf.manifest.location>
<cxf.eclipse.outputDirectory>${basedir}/target/classes</cxf.eclipse.outputDirectory>
<cxf.saaj.impl.groupId>com.sun.xml.messaging.saaj</cxf.saaj.impl.groupId>
<cxf.saaj.impl.artifactId>saaj-impl</cxf.saaj.impl.artifactId>
@@ -67,9 +66,6 @@
<cxf.bundle.activator />
<cxf.osgi.import />
<cxf.osgi.symbolic.name>${project.groupId}.${project.artifactId}</cxf.osgi.symbolic.name>
- <cxf.osgi.export>
- org.apache.cxf.*;-split-package:=first,
- </cxf.osgi.export>
<cxf.osgi.dynamic.import />
<cxf.osgi.spring.version>[3.1,4)</cxf.osgi.spring.version>
<cxf.osgi.commons.lang.version>[2.4,3)</cxf.osgi.commons.lang.version>
@@ -421,7 +417,6 @@
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
- <manifestFile>${cxf.manifest.location}</manifestFile>
<manifestEntries>
<Specification-Title>${project.name}</Specification-Title>
<Specification-Vendor>The Apache Software Foundation</Specification-Vendor>
@@ -489,6 +484,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
<executions>
<execution>
<id>versions</id>
@@ -502,38 +498,30 @@
</versions>
</configuration>
</execution>
- <execution>
- <id>bundle-manifest</id>
- <phase>process-classes</phase>
- <goals>
- <goal>manifest</goal>
- </goals>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>${cxf.osgi.symbolic.name}</Bundle-SymbolicName>
- <Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor>
- <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
- <Implementation-Version>${cxf.osgi.version.clean}</Implementation-Version>
- <Specification-Vendor>The Apache Software Foundation</Specification-Vendor>
- <Specification-Version>${cxf.osgi.version.clean}</Specification-Version>
- <Bundle-DocURL>http://cxf.apache.org</Bundle-DocURL>
- <Fragment-Host>${cxf.fragment.host}</Fragment-Host>
- <_failok>true</_failok>
- <_nouses>true</_nouses>
- <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
- <Export-Package>${cxf.osgi.export}</Export-Package>
- <Import-Package>
- ${cxf.osgi.import},
- *
- </Import-Package>
- <DynamicImport-Package>
- ${cxf.osgi.dynamic.import}
- </DynamicImport-Package>
- <Bundle-Activator>${cxf.bundle.activator}</Bundle-Activator>
- </instructions>
- </configuration>
- </execution>
</executions>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>${cxf.osgi.symbolic.name}</Bundle-SymbolicName>
+ <Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor>
+ <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
+ <Implementation-Version>${cxf.osgi.version.clean}</Implementation-Version>
+ <Specification-Vendor>The Apache Software Foundation</Specification-Vendor>
+ <Specification-Version>${cxf.osgi.version.clean}</Specification-Version>
+ <Bundle-DocURL>http://cxf.apache.org</Bundle-DocURL>
+ <Fragment-Host>${cxf.fragment.host}</Fragment-Host>
+ <_failok>true</_failok>
+ <_nouses>true</_nouses>
+ <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
+ <Import-Package>
+ ${cxf.osgi.import},
+ *
+ </Import-Package>
+ <DynamicImport-Package>
+ ${cxf.osgi.dynamic.import}
+ </DynamicImport-Package>
+ <Bundle-Activator>${cxf.bundle.activator}</Bundle-Activator>
+ </instructions>
+ </configuration>
</plugin>
</plugins>
Modified: cxf/trunk/rt/bindings/coloc/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/coloc/pom.xml?rev=1514442&r1=1514441&r2=1514442&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/coloc/pom.xml (original)
+++ cxf/trunk/rt/bindings/coloc/pom.xml Thu Aug 15 19:08:52 2013
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-coloc</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>Apache CXF Runtime Colocated Binding</name>
<description>Apache CXF Runtime Colocated Binding</description>
<url>http://cxf.apache.org</url>
Modified: cxf/trunk/rt/bindings/corba/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/corba/pom.xml?rev=1514442&r1=1514441&r2=1514442&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/corba/pom.xml (original)
+++ cxf/trunk/rt/bindings/corba/pom.xml Thu Aug 15 19:08:52 2013
@@ -20,7 +20,7 @@
<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>
<artifactId>cxf-rt-bindings-corba</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>Apache CXF Runtime CORBA Binding</name>
<description>Apache CXF Runtime CORBA Binding</description>
<url>http://cxf.apache.org</url>
Modified: cxf/trunk/rt/bindings/object/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/object/pom.xml?rev=1514442&r1=1514441&r2=1514442&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/object/pom.xml (original)
+++ cxf/trunk/rt/bindings/object/pom.xml Thu Aug 15 19:08:52 2013
@@ -19,7 +19,7 @@
<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>
<artifactId>cxf-rt-bindings-object</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>Apache CXF Runtime Object Binding</name>
<description>Apache CXF Runtime Object Binding</description>
<url>http://cxf.apache.org</url>
Modified: cxf/trunk/rt/bindings/soap/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/pom.xml?rev=1514442&r1=1514441&r2=1514442&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/soap/pom.xml (original)
+++ cxf/trunk/rt/bindings/soap/pom.xml Thu Aug 15 19:08:52 2013
@@ -19,7 +19,7 @@
<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>
<artifactId>cxf-rt-bindings-soap</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>Apache CXF Runtime SOAP Binding</name>
<description>Apache CXF Runtime SOAP Binding</description>
<url>http://cxf.apache.org</url>
Modified: cxf/trunk/rt/bindings/xml/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/xml/pom.xml?rev=1514442&r1=1514441&r2=1514442&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/xml/pom.xml (original)
+++ cxf/trunk/rt/bindings/xml/pom.xml Thu Aug 15 19:08:52 2013
@@ -19,7 +19,7 @@
<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>
<artifactId>cxf-rt-bindings-xml</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>Apache CXF Runtime XML Binding</name>
<description>Apache CXF Runtime XML Binding</description>
<url>http://cxf.apache.org</url>
Modified: cxf/trunk/rt/databinding/aegis/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/pom.xml?rev=1514442&r1=1514441&r2=1514442&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/pom.xml (original)
+++ cxf/trunk/rt/databinding/aegis/pom.xml Thu Aug 15 19:08:52 2013
@@ -20,7 +20,7 @@
<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>
<artifactId>cxf-rt-databinding-aegis</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>Apache CXF Runtime Aegis Databinding</name>
<description>Apache CXF Runtime Aegis Databinding</description>
<url>http://cxf.apache.org/</url>
Modified: cxf/trunk/rt/databinding/jaxb/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/pom.xml?rev=1514442&r1=1514441&r2=1514442&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jaxb/pom.xml (original)
+++ cxf/trunk/rt/databinding/jaxb/pom.xml Thu Aug 15 19:08:52 2013
@@ -19,7 +19,7 @@
<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>
<artifactId>cxf-rt-databinding-jaxb</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>Apache CXF Runtime JAXB DataBinding</name>
<description>Apache CXF Runtime JAXB DataBinding</description>
<url>http://cxf.apache.org</url>
Modified: cxf/trunk/rt/databinding/jibx/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jibx/pom.xml?rev=1514442&r1=1514441&r2=1514442&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jibx/pom.xml (original)
+++ cxf/trunk/rt/databinding/jibx/pom.xml Thu Aug 15 19:08:52 2013
@@ -19,7 +19,7 @@
<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>
<artifactId>cxf-rt-databinding-jibx</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>Apache CXF Runtime JiBX DataBinding</name>
<description>Apache CXF Runtime JiBX DataBinding</description>
<url>http://cxf.apache.org</url>
Modified: cxf/trunk/rt/databinding/sdo/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/sdo/pom.xml?rev=1514442&r1=1514441&r2=1514442&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/sdo/pom.xml (original)
+++ cxf/trunk/rt/databinding/sdo/pom.xml Thu Aug 15 19:08:52 2013
@@ -19,7 +19,7 @@
<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>
<artifactId>cxf-rt-databinding-sdo</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>Apache CXF Runtime SDO DataBinding</name>
<description>Apache CXF Runtime SDO DataBinding</description>
<url>http://cxf.apache.org</url>
Modified: cxf/trunk/rt/databinding/xmlbeans/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/xmlbeans/pom.xml?rev=1514442&r1=1514441&r2=1514442&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/xmlbeans/pom.xml (original)
+++ cxf/trunk/rt/databinding/xmlbeans/pom.xml Thu Aug 15 19:08:52 2013
@@ -19,7 +19,7 @@
<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>
<artifactId>cxf-rt-databinding-xmlbeans</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>Apache CXF Runtime XmlBeans DataBinding</name>
<description>Apache CXF Runtime XmlBeans DataBinding</description>
<url>http://cxf.apache.org</url>
Modified: cxf/trunk/rt/features/clustering/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/features/clustering/pom.xml?rev=1514442&r1=1514441&r2=1514442&view=diff
==============================================================================
--- cxf/trunk/rt/features/clustering/pom.xml (original)
+++ cxf/trunk/rt/features/clustering/pom.xml Thu Aug 15 19:08:52 2013
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-features-clustering</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<version>3.0.0-SNAPSHOT</version>
<name>Apache CXF Runtime Clustering</name>
<description>Failover and loadbalancing support</description>
Modified: cxf/trunk/rt/frontend/jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/pom.xml?rev=1514442&r1=1514441&r2=1514442&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/pom.xml (original)
+++ cxf/trunk/rt/frontend/jaxrs/pom.xml Thu Aug 15 19:08:52 2013
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<version>3.0.0-SNAPSHOT</version>
<name>Apache CXF Runtime JAX-RS Frontend</name>
<description>Apache CXF Runtime JAX-RS Frontend</description>
@@ -41,6 +41,9 @@
javax.ws.rs.client;version="[2.0,3)",
javax.ws.rs*;version="[1.0,3)",
</cxf.osgi.import>
+ <cxf.osgi.export>
+ org.apache.cxf.jaxrs*
+ </cxf.osgi.export>
</properties>
<dependencies>
@@ -154,4 +157,42 @@
</exclusions>
</dependency>
</dependencies>
+
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>${cxf.osgi.symbolic.name}</Bundle-SymbolicName>
+ <Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor>
+ <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
+ <Implementation-Version>${cxf.osgi.version.clean}</Implementation-Version>
+ <Specification-Vendor>The Apache Software Foundation</Specification-Vendor>
+ <Specification-Version>${cxf.osgi.version.clean}</Specification-Version>
+ <Bundle-DocURL>http://cxf.apache.org</Bundle-DocURL>
+ <Fragment-Host>${cxf.fragment.host}</Fragment-Host>
+ <_failok>true</_failok>
+ <_nouses>true</_nouses>
+ <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
+ <Export-Package>${cxf.osgi.export}</Export-Package>
+ <Import-Package>
+ ${cxf.osgi.import},
+ *
+ </Import-Package>
+ <DynamicImport-Package>
+ ${cxf.osgi.dynamic.import}
+ </DynamicImport-Package>
+ <Bundle-Activator>${cxf.bundle.activator}</Bundle-Activator>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
</project>
Modified: cxf/trunk/rt/frontend/jaxws/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/pom.xml?rev=1514442&r1=1514441&r2=1514442&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/pom.xml (original)
+++ cxf/trunk/rt/frontend/jaxws/pom.xml Thu Aug 15 19:08:52 2013
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<version>3.0.0-SNAPSHOT</version>
<name>Apache CXF Runtime JAX-WS Frontend</name>
<description>Apache CXF Runtime JAX-WS Frontend</description>
Modified: cxf/trunk/rt/frontend/js/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/js/pom.xml?rev=1514442&r1=1514441&r2=1514442&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/js/pom.xml (original)
+++ cxf/trunk/rt/frontend/js/pom.xml Thu Aug 15 19:08:52 2013
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-js</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<version>3.0.0-SNAPSHOT</version>
<name>Apache CXF Runtime JavaScript Frontend</name>
<description>Apache CXF Runtime JavaScript Frontend</description>
Modified: cxf/trunk/rt/frontend/simple/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/pom.xml?rev=1514442&r1=1514441&r2=1514442&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/simple/pom.xml (original)
+++ cxf/trunk/rt/frontend/simple/pom.xml Thu Aug 15 19:08:52 2013
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-simple</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<version>3.0.0-SNAPSHOT</version>
<name>Apache CXF Runtime Simple Frontend</name>
<description>Apache CXF Runtime Simple Frontend</description>
Modified: cxf/trunk/rt/javascript/javascript-rt/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/javascript/javascript-rt/pom.xml?rev=1514442&r1=1514441&r2=1514442&view=diff
==============================================================================
--- cxf/trunk/rt/javascript/javascript-rt/pom.xml (original)
+++ cxf/trunk/rt/javascript/javascript-rt/pom.xml Thu Aug 15 19:08:52 2013
@@ -19,7 +19,7 @@
<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>
<artifactId>cxf-rt-javascript</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>Apache CXF Runtime JavaScript Client Generator</name>
<description>Apache CXF Runtime JavaScript Client Generator</description>
<url>http://cxf.apache.org/</url>
Modified: cxf/trunk/rt/javascript/javascript-tests/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/javascript/javascript-tests/pom.xml?rev=1514442&r1=1514441&r2=1514442&view=diff
==============================================================================
--- cxf/trunk/rt/javascript/javascript-tests/pom.xml (original)
+++ cxf/trunk/rt/javascript/javascript-tests/pom.xml Thu Aug 15 19:08:52 2013
@@ -19,7 +19,7 @@
<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>
<artifactId>cxf-rt-javascript-tests</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>Apache CXF Runtime JavaScript Client Generator Tests</name>
<description>Apache CXF Runtime JavaScript Client Generator Tests</description>
<url>http://cxf.apache.org/</url>
Modified: cxf/trunk/rt/management-web/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/management-web/pom.xml?rev=1514442&r1=1514441&r2=1514442&view=diff
==============================================================================
--- cxf/trunk/rt/management-web/pom.xml (original)
+++ cxf/trunk/rt/management-web/pom.xml Thu Aug 15 19:08:52 2013
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-management-web</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<version>3.0.0-SNAPSHOT</version>
<name>Apache CXF Runtime Web Management</name>
<description>Apache CXF Runtime Web Management</description>
Modified: cxf/trunk/rt/management/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/management/pom.xml?rev=1514442&r1=1514441&r2=1514442&view=diff
==============================================================================
--- cxf/trunk/rt/management/pom.xml (original)
+++ cxf/trunk/rt/management/pom.xml Thu Aug 15 19:08:52 2013
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-management</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<version>3.0.0-SNAPSHOT</version>
<name>Apache CXF Runtime Management</name>
<description>Apache CXF Runtime Management</description>
Modified: cxf/trunk/rt/rs/client/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/client/pom.xml?rev=1514442&r1=1514441&r2=1514442&view=diff
==============================================================================
--- cxf/trunk/rt/rs/client/pom.xml (original)
+++ cxf/trunk/rt/rs/client/pom.xml Thu Aug 15 19:08:52 2013
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-client</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<version>3.0.0-SNAPSHOT</version>
<name>Apache CXF JAX-RS Client</name>
<description>Apache CXF JAX-RS Client</description>
Modified: cxf/trunk/rt/rs/description/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/description/pom.xml?rev=1514442&r1=1514441&r2=1514442&view=diff
==============================================================================
--- cxf/trunk/rt/rs/description/pom.xml (original)
+++ cxf/trunk/rt/rs/description/pom.xml Thu Aug 15 19:08:52 2013
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-service-description</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<version>3.0.0-SNAPSHOT</version>
<name>Apache CXF JAX-RS Service Description</name>
<description>Apache CXF JAX-RS Service Description</description>
Modified: cxf/trunk/rt/rs/extensions/providers/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/extensions/providers/pom.xml?rev=1514442&r1=1514441&r2=1514442&view=diff
==============================================================================
--- cxf/trunk/rt/rs/extensions/providers/pom.xml (original)
+++ cxf/trunk/rt/rs/extensions/providers/pom.xml Thu Aug 15 19:08:52 2013
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-extension-providers</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<version>3.0.0-SNAPSHOT</version>
<name>Apache CXF JAX-RS Extensions: Providers</name>
<description>Apache CXF JAX-RS Extensions: Providers</description>
Modified: cxf/trunk/rt/rs/extensions/search/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/extensions/search/pom.xml?rev=1514442&r1=1514441&r2=1514442&view=diff
==============================================================================
--- cxf/trunk/rt/rs/extensions/search/pom.xml (original)
+++ cxf/trunk/rt/rs/extensions/search/pom.xml Thu Aug 15 19:08:52 2013
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-extension-search</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<version>3.0.0-SNAPSHOT</version>
<name>Apache CXF JAX-RS Extensions: Search</name>
<description>Apache CXF JAX-RS Extensions: Search</description>
@@ -37,9 +37,6 @@
<hibernate.em.version>4.1.0.Final</hibernate.em.version>
<hsqldb.version>1.8.0.10</hsqldb.version>
<cxf.lucene.version>4.0.0-BETA</cxf.lucene.version>
- <cxf.osgi.import>
- org.apache.cxf.jaxrs.impl.tl
- </cxf.osgi.import>
</properties>
<dependencies>
Modified: cxf/trunk/rt/rs/security/cors/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/security/cors/pom.xml?rev=1514442&r1=1514441&r2=1514442&view=diff
==============================================================================
--- cxf/trunk/rt/rs/security/cors/pom.xml (original)
+++ cxf/trunk/rt/rs/security/cors/pom.xml Thu Aug 15 19:08:52 2013
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-security-cors</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<version>3.0.0-SNAPSHOT</version>
<name>Apache CXF RS Cross-Origin Resource Sharing</name>
<description>Apache CXF RS XML Security</description>
Modified: cxf/trunk/rt/rs/security/oauth-parent/oauth/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/security/oauth-parent/oauth/pom.xml?rev=1514442&r1=1514441&r2=1514442&view=diff
==============================================================================
--- cxf/trunk/rt/rs/security/oauth-parent/oauth/pom.xml (original)
+++ cxf/trunk/rt/rs/security/oauth-parent/oauth/pom.xml Thu Aug 15 19:08:52 2013
@@ -23,7 +23,7 @@
<artifactId>cxf-rt-rs-security-oauth</artifactId>
<version>3.0.0-SNAPSHOT</version>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>Apache CXF Runtime OAuth 1.0a</name>
<description>Apache CXF Runtime OAuth 1.0a</description>
<url>http://cxf.apache.org</url>
Modified: cxf/trunk/rt/rs/security/oauth-parent/oauth2-saml/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/security/oauth-parent/oauth2-saml/pom.xml?rev=1514442&r1=1514441&r2=1514442&view=diff
==============================================================================
--- cxf/trunk/rt/rs/security/oauth-parent/oauth2-saml/pom.xml (original)
+++ cxf/trunk/rt/rs/security/oauth-parent/oauth2-saml/pom.xml Thu Aug 15 19:08:52 2013
@@ -23,7 +23,7 @@
<artifactId>cxf-rt-rs-security-oauth2-saml</artifactId>
<version>3.0.0-SNAPSHOT</version>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>Apache CXF Runtime OAuth 2.0 SAML</name>
<description>Apache CXF Runtime OAuth 2.0 SAML</description>
<url>http://cxf.apache.org</url>
Modified: cxf/trunk/rt/rs/security/oauth-parent/oauth2/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/security/oauth-parent/oauth2/pom.xml?rev=1514442&r1=1514441&r2=1514442&view=diff
==============================================================================
--- cxf/trunk/rt/rs/security/oauth-parent/oauth2/pom.xml (original)
+++ cxf/trunk/rt/rs/security/oauth-parent/oauth2/pom.xml Thu Aug 15 19:08:52 2013
@@ -23,7 +23,7 @@
<artifactId>cxf-rt-rs-security-oauth2</artifactId>
<version>3.0.0-SNAPSHOT</version>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>Apache CXF Runtime OAuth 2.0</name>
<description>Apache CXF Runtime OAuth 2.0</description>
<url>http://cxf.apache.org</url>
Modified: cxf/trunk/rt/rs/security/sso/saml/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/security/sso/saml/pom.xml?rev=1514442&r1=1514441&r2=1514442&view=diff
==============================================================================
--- cxf/trunk/rt/rs/security/sso/saml/pom.xml (original)
+++ cxf/trunk/rt/rs/security/sso/saml/pom.xml Thu Aug 15 19:08:52 2013
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-security-sso-saml</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<version>3.0.0-SNAPSHOT</version>
<name>Apache CXF RS SSO SAML</name>
<description>Apache CXF RS SSO SAML</description>
Modified: cxf/trunk/rt/rs/security/xml/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/security/xml/pom.xml?rev=1514442&r1=1514441&r2=1514442&view=diff
==============================================================================
--- cxf/trunk/rt/rs/security/xml/pom.xml (original)
+++ cxf/trunk/rt/rs/security/xml/pom.xml Thu Aug 15 19:08:52 2013
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-security-xml</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<version>3.0.0-SNAPSHOT</version>
<name>Apache CXF RS XML Security</name>
<description>Apache CXF RS XML Security</description>
Modified: cxf/trunk/rt/security/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/security/pom.xml?rev=1514442&r1=1514441&r2=1514442&view=diff
==============================================================================
--- cxf/trunk/rt/security/pom.xml (original)
+++ cxf/trunk/rt/security/pom.xml Thu Aug 15 19:08:52 2013
@@ -20,7 +20,7 @@
<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>
<artifactId>cxf-rt-security</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>Apache CXF Runtime Security functionality</name>
<description>Apache CXF Runtime Security functionality</description>
<url>http://cxf.apache.org</url>
Modified: cxf/trunk/rt/transports/http-hc/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-hc/pom.xml?rev=1514442&r1=1514441&r2=1514442&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-hc/pom.xml (original)
+++ cxf/trunk/rt/transports/http-hc/pom.xml Thu Aug 15 19:08:52 2013
@@ -42,9 +42,6 @@
org.apache.http.*;version="${cxf.httpcomponents.core.version.range}",
javax.annotation;version="${cxf.osgi.javax.annotation.version}",
</cxf.osgi.import>
- <cxf.osgi.export>
- org.apache.cxf.*,
- </cxf.osgi.export>
</properties>
<dependencies>
Modified: cxf/trunk/rt/transports/http-jetty/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-jetty/pom.xml?rev=1514442&r1=1514441&r2=1514442&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-jetty/pom.xml (original)
+++ cxf/trunk/rt/transports/http-jetty/pom.xml Thu Aug 15 19:08:52 2013
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http-jetty</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<version>3.0.0-SNAPSHOT</version>
<name>Apache CXF Runtime HTTP Jetty Transport</name>
<description>Apache CXF Runtime HTTP Jetty Transport</description>
Modified: cxf/trunk/rt/transports/http-netty/netty-client/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-netty/netty-client/pom.xml?rev=1514442&r1=1514441&r2=1514442&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-netty/netty-client/pom.xml (original)
+++ cxf/trunk/rt/transports/http-netty/netty-client/pom.xml Thu Aug 15 19:08:52 2013
@@ -21,7 +21,7 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http-netty-client</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<version>3.0.0-SNAPSHOT</version>
<name>Apache CXF Runtime HTTP Netty Client Transport</name>
<description>Apache CXF Runtime HTTP Netty Client Transport</description>
@@ -39,9 +39,6 @@
io.netty.*;version="${cxf.netty.version.range}",
javax.annotation;version="${cxf.osgi.javax.annotation.version}",
</cxf.osgi.import>
- <cxf.osgi.export>
- org.apache.cxf.*,
- </cxf.osgi.export>
</properties>
<dependencies>
Modified: cxf/trunk/rt/transports/http-netty/netty-server/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-netty/netty-server/pom.xml?rev=1514442&r1=1514441&r2=1514442&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-netty/netty-server/pom.xml (original)
+++ cxf/trunk/rt/transports/http-netty/netty-server/pom.xml Thu Aug 15 19:08:52 2013
@@ -21,7 +21,7 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http-netty-server</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<version>3.0.0-SNAPSHOT</version>
<name>Apache CXF Runtime HTTP Netty Server Transport</name>
<description>Apache CXF Runtime HTTP Netty Server Transport</description>
Modified: cxf/trunk/rt/transports/http/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/pom.xml?rev=1514442&r1=1514441&r2=1514442&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http/pom.xml (original)
+++ cxf/trunk/rt/transports/http/pom.xml Thu Aug 15 19:08:52 2013
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<version>3.0.0-SNAPSHOT</version>
<name>Apache CXF Runtime HTTP Transport</name>
<description>Apache CXF Runtime HTTP Transport</description>
@@ -39,10 +39,6 @@
org.apache.aries*;version="${cxf.aries.version.range}",
org.springframework*;resolution:="optional";version="${cxf.osgi.spring.version}"
</cxf.osgi.import>
- <cxf.osgi.export>
- '=META-INF.cxf.osgi',
- org.apache.cxf.*,
- </cxf.osgi.export>
</properties>
<dependencies>
Modified: cxf/trunk/rt/transports/jms/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/jms/pom.xml?rev=1514442&r1=1514441&r2=1514442&view=diff
==============================================================================
--- cxf/trunk/rt/transports/jms/pom.xml (original)
+++ cxf/trunk/rt/transports/jms/pom.xml Thu Aug 15 19:08:52 2013
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-jms</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<version>3.0.0-SNAPSHOT</version>
<name>Apache CXF Runtime JMS Transport</name>
<description>Apache CXF Runtime JMS Transport</description>
Modified: cxf/trunk/rt/transports/local/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/local/pom.xml?rev=1514442&r1=1514441&r2=1514442&view=diff
==============================================================================
--- cxf/trunk/rt/transports/local/pom.xml (original)
+++ cxf/trunk/rt/transports/local/pom.xml Thu Aug 15 19:08:52 2013
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-local</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<version>3.0.0-SNAPSHOT</version>
<name>Apache CXF Runtime Local Transport</name>
<description>Apache CXF Runtime Local Transport</description>
Modified: cxf/trunk/rt/transports/udp/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/udp/pom.xml?rev=1514442&r1=1514441&r2=1514442&view=diff
==============================================================================
--- cxf/trunk/rt/transports/udp/pom.xml (original)
+++ cxf/trunk/rt/transports/udp/pom.xml Thu Aug 15 19:08:52 2013
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-udp</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<version>3.0.0-SNAPSHOT</version>
<name>Apache CXF Runtime UDP Transport</name>
<description>Apache CXF Runtime UDP Transport</description>
Modified: cxf/trunk/rt/ws/addr/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/addr/pom.xml?rev=1514442&r1=1514441&r2=1514442&view=diff
==============================================================================
--- cxf/trunk/rt/ws/addr/pom.xml (original)
+++ cxf/trunk/rt/ws/addr/pom.xml Thu Aug 15 19:08:52 2013
@@ -19,7 +19,7 @@
<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>
<artifactId>cxf-rt-ws-addr</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>Apache CXF Runtime WS Addressing</name>
<description>Apache CXF Runtime WS Addressing</description>
<url>http://cxf.apache.org</url>
Modified: cxf/trunk/rt/ws/eventing/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/eventing/pom.xml?rev=1514442&r1=1514441&r2=1514442&view=diff
==============================================================================
--- cxf/trunk/rt/ws/eventing/pom.xml (original)
+++ cxf/trunk/rt/ws/eventing/pom.xml Thu Aug 15 19:08:52 2013
@@ -3,7 +3,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>cxf-rt-ws-eventing</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>Apache CXF Runtime WS Eventing</name>
<description>Apache CXF Runtime WS Eventing</description>
<url>http://cxf.apache.org</url>
Modified: cxf/trunk/rt/ws/mex/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/mex/pom.xml?rev=1514442&r1=1514441&r2=1514442&view=diff
==============================================================================
--- cxf/trunk/rt/ws/mex/pom.xml (original)
+++ cxf/trunk/rt/ws/mex/pom.xml Thu Aug 15 19:08:52 2013
@@ -20,7 +20,7 @@
<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>
<artifactId>cxf-rt-ws-mex</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>Apache CXF Runtime WS MetadataExchange</name>
<description>Apache CXF Runtime WS MetadataExchange</description>
<url>http://cxf.apache.org</url>
Modified: cxf/trunk/rt/ws/policy/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/pom.xml?rev=1514442&r1=1514441&r2=1514442&view=diff
==============================================================================
--- cxf/trunk/rt/ws/policy/pom.xml (original)
+++ cxf/trunk/rt/ws/policy/pom.xml Thu Aug 15 19:08:52 2013
@@ -19,7 +19,7 @@
<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>
<artifactId>cxf-rt-ws-policy</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>Apache CXF Runtime WS Policy</name>
<description>Apache CXF Runtime WS Policy</description>
<url>http://cxf.apache.org</url>
Modified: cxf/trunk/rt/ws/rm/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/pom.xml?rev=1514442&r1=1514441&r2=1514442&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/pom.xml (original)
+++ cxf/trunk/rt/ws/rm/pom.xml Thu Aug 15 19:08:52 2013
@@ -19,7 +19,7 @@
<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>
<artifactId>cxf-rt-ws-rm</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>Apache CXF Runtime WS Reliable Messaging</name>
<description>Apache CXF Runtime WS Reliable Messaging</description>
<url>http://cxf.apache.org</url>
Modified: cxf/trunk/rt/ws/security/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/pom.xml?rev=1514442&r1=1514441&r2=1514442&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/pom.xml (original)
+++ cxf/trunk/rt/ws/security/pom.xml Thu Aug 15 19:08:52 2013
@@ -20,7 +20,7 @@
<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>
<artifactId>cxf-rt-ws-security</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>Apache CXF Runtime WS Security</name>
<description>Apache CXF Runtime WS Security</description>
<url>http://cxf.apache.org</url>
Modified: cxf/trunk/rt/wsdl/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/pom.xml?rev=1514442&r1=1514441&r2=1514442&view=diff
==============================================================================
--- cxf/trunk/rt/wsdl/pom.xml (original)
+++ cxf/trunk/rt/wsdl/pom.xml Thu Aug 15 19:08:52 2013
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-wsdl</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<version>3.0.0-SNAPSHOT</version>
<name>Apache CXF Runtime Core for WSDL</name>
<description>Apache CXF Runtime Core for WSDL Based Technologies</description>
Modified: cxf/trunk/services/wsn/wsn-osgi/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/wsn/wsn-osgi/pom.xml?rev=1514442&r1=1514441&r2=1514442&view=diff
==============================================================================
--- cxf/trunk/services/wsn/wsn-osgi/pom.xml (original)
+++ cxf/trunk/services/wsn/wsn-osgi/pom.xml Thu Aug 15 19:08:52 2013
@@ -46,7 +46,7 @@
</exclusions>
</dependency>
</dependencies>
-
+
<build>
<plugins>
<plugin>
Modified: cxf/trunk/services/xkms/xkms-client/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/xkms/xkms-client/pom.xml?rev=1514442&r1=1514441&r2=1514442&view=diff
==============================================================================
--- cxf/trunk/services/xkms/xkms-client/pom.xml (original)
+++ cxf/trunk/services/xkms/xkms-client/pom.xml Thu Aug 15 19:08:52 2013
@@ -75,18 +75,4 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
Modified: cxf/trunk/services/xkms/xkms-common/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/xkms/xkms-common/pom.xml?rev=1514442&r1=1514441&r2=1514442&view=diff
==============================================================================
--- cxf/trunk/services/xkms/xkms-common/pom.xml (original)
+++ cxf/trunk/services/xkms/xkms-common/pom.xml Thu Aug 15 19:08:52 2013
@@ -67,16 +67,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
- </instructions>
- </configuration>
- </plugin>
</plugins>
</build>
</project>
Modified: cxf/trunk/services/xkms/xkms-osgi/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/xkms/xkms-osgi/pom.xml?rev=1514442&r1=1514441&r2=1514442&view=diff
==============================================================================
--- cxf/trunk/services/xkms/xkms-osgi/pom.xml (original)
+++ cxf/trunk/services/xkms/xkms-osgi/pom.xml Thu Aug 15 19:08:52 2013
@@ -50,19 +50,4 @@
<version>${project.version}</version>
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
Modified: cxf/trunk/services/xkms/xkms-service/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/xkms/xkms-service/pom.xml?rev=1514442&r1=1514441&r2=1514442&view=diff
==============================================================================
--- cxf/trunk/services/xkms/xkms-service/pom.xml (original)
+++ cxf/trunk/services/xkms/xkms-service/pom.xml Thu Aug 15 19:08:52 2013
@@ -50,19 +50,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
Modified: cxf/trunk/services/xkms/xkms-x509-handlers/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/xkms/xkms-x509-handlers/pom.xml?rev=1514442&r1=1514441&r2=1514442&view=diff
==============================================================================
--- cxf/trunk/services/xkms/xkms-x509-handlers/pom.xml (original)
+++ cxf/trunk/services/xkms/xkms-x509-handlers/pom.xml Thu Aug 15 19:08:52 2013
@@ -63,16 +63,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-packaging-plugin</artifactId>
<executions>