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 2012/01/24 20:19:33 UTC
svn commit: r1235425 - in /cxf/trunk: osgi/bundle/compatible/
osgi/bundle/compatible/pom.xml osgi/bundle/pom.xml rt/core/pom.xml
rt/transports/http/pom.xml
Author: dkulp
Date: Tue Jan 24 19:19:32 2012
New Revision: 1235425
URL: http://svn.apache.org/viewvc?rev=1235425&view=rev
Log:
Add a compatibility bundle that allows applications that use
RequireBundle to still work.
Added:
cxf/trunk/osgi/bundle/compatible/
cxf/trunk/osgi/bundle/compatible/pom.xml (with props)
Modified:
cxf/trunk/osgi/bundle/pom.xml
cxf/trunk/rt/core/pom.xml
cxf/trunk/rt/transports/http/pom.xml
Added: cxf/trunk/osgi/bundle/compatible/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/osgi/bundle/compatible/pom.xml?rev=1235425&view=auto
==============================================================================
--- cxf/trunk/osgi/bundle/compatible/pom.xml (added)
+++ cxf/trunk/osgi/bundle/compatible/pom.xml Tue Jan 24 19:19:32 2012
@@ -0,0 +1,280 @@
+<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<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>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-bundle-compatible</artifactId>
+ <packaging>bundle</packaging>
+ <name>Apache CXF Compatibility Bundle Jar</name>
+ <description>Apache CXF Compatibility Bundle Jar</description>
+ <version>2.6.0-SNAPSHOT</version>
+ <url>http://cxf.apache.org</url>
+
+ <parent>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-bundle-parent</artifactId>
+ <version>2.6.0-SNAPSHOT</version>
+ </parent>
+ <properties>
+ <cxf.osgi.symbolic.name>${project.groupId}.bundle</cxf.osgi.symbolic.name>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>cxf-common-utilities</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>cxf-tools-common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>cxf-tools-validator</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>cxf-tools-wsdlto-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>cxf-tools-misctools</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>cxf-tools-wsdlto-databinding-jaxb</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>cxf-tools-corba</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>cxf-rt-databinding-xmlbeans</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>cxf-rt-databinding-jibx</artifactId>
+ <version>${project.version}</version>
+ <optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jibx</groupId>
+ <artifactId>jibx-bind</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jibx</groupId>
+ <artifactId>jibx-run</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jibx</groupId>
+ <artifactId>jibx-schema</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jibx</groupId>
+ <artifactId>jibx-tools</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>cxf-rt-databinding-sdo</artifactId>
+ <version>${project.version}</version>
+ <optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.tuscany.sdo</groupId>
+ <artifactId>tuscany-sdo-tools</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.tuscany.sdo</groupId>
+ <artifactId>tuscany-sdo-impl</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>cxf-tools-wsdlto-frontend-jaxws</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>cxf-tools-wadlto-jaxrs</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>cxf-tools-wsdlto-frontend-javascript</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>cxf-tools-java2ws</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>cxf-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>cxf-rt-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>cxf-rt-management</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>cxf-rt-transports-local</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>cxf-rt-transports-http</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>cxf-rt-transports-http-jetty</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>cxf-rt-transports-jms</artifactId>
+ <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>${cxf.osgi.symbolic.name}</Bundle-SymbolicName>
+ <Implementation-Title>Apache CXF Compatibility Bundle</Implementation-Title>
+ <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-Title>Apache CXF Compatibility Bundle</Specification-Title>
+ <Specification-Vendor>The Apache Software Foundation</Specification-Vendor>
+ <Specification-Version>${cxf.osgi.version.clean}</Specification-Version>
+ <DynamicImport-Package>*</DynamicImport-Package>
+ <DynamicImport-Package>
+ com.sun.xml.bind,
+ com.sun.xml.bind.*,
+ com.sun.xml.internal.bind,
+ com.sun.xml.internal.bind.*,
+ com.ctc.wstx.*,
+ org.apache.commons.logging.*,
+ org.slf4j.*,
+ org.slf4j.impl.*,
+ org.eclipse.jetty.jmx,
+ org.eclipse.jetty.jmx.*
+ </DynamicImport-Package>
+ <Import-Package>
+ org.apache.cxf.*,
+ META-INF.cxf,
+ META-INF.cxf.osgi,
+ antlr*;resolution:=optional,
+ com.sun*;resolution:=optional,
+ com.ctc.wstx.msv*;resolution:=optional,
+ org.codehaus.stax2*;resolution:=optional,
+ commonj.sdo*;resolution:=optional,
+ javax.ws.rs*;resolution:=optional,
+ javax.resource*;resolution:=optional,
+ javax.xml.soap,
+ junit.framework*;resolution:=optional,
+ net.sf.cglib*;resolution:=optional;version="[2.1.3, 3.0.0)",
+ org.apache.abdera*;resolution:=optional;version="[1.0,2)",
+ org.apache.aries*;resolution:=optional;version="[0.2,2)",
+ org.apache.commons.lang*;resolution:=optional;version="[2.4,3)",
+ org.apache.commons.codec*;resolution:=optional,
+ org.apache.commons.pool*;resolution:=optional,
+ org.apache.log4j*;resolution:=optional,
+ org.apache.mina*;resolution:=optional,
+ org.apache.tuscany.sdo*;resolution:=optional,
+ org.apache.velocity*;resolution:=optional,
+ org.apache.xmlbeans*;resolution:=optional,
+ org.apache.xml.security*;resolution:=optional,
+ org.apache.ws.security*;resolution:=optional,
+ org.codehaus.jra*;resolution:=optional,
+ org.codehaus.jettison*;resolution:=optional,
+ org.eclipse.emf*;resolution:=optional,
+ org.eclipse.jetty*;resolution:=optional;version="[7.2,8)",
+ org.jaxen*;resolution:=optional,
+ org.jdom*;resolution:=optional,
+ org.jibx*;resolution:=optional;version="[1.2.3,2)",
+ org.junit*;resolution:=optional,
+ org.mozilla.javascript*;resolution:=optional,
+ org.objectweb.asm*;version="[2.0,4)";resolution:=optional,
+ org.omg*;resolution:=optional,
+ org.opensaml*;resolution:=optional,
+ org.osgi.service.blueprint*;resolution:=optional,
+ org.slf4j*;resolution:=optional;version="[1.5,2)",
+ org.springframework*;resolution:=optional;version="[2.5,4)",
+ javax.activation;version="[0.0,2)",
+ javax.annotation;version="[0.0,2)",
+ javax.jms;resolution:=optional;version="[0.0,2)",
+ javax.jws*;version="[0.0,3)",
+ javax.mail*;version="[0.0,2)",
+ javax.servlet.*;version="[0.0,4)";resolution:=optional,
+ javax.xml.bind*;version="[0.0,3)",
+ javax.xml.stream*;version="[0.0,2)",
+ javax.xml.ws.spi.http*;version="[0.0,3)";resolution:=optional,
+ javax.xml.ws*;version="[0.0,3)",
+ *
+ </Import-Package>
+ <Require-Bundle>org.apache.cxf.cxf-api;visibility:=reexport,
+ org.apache.cxf.cxf-rt-core;visibility:=reexport,
+ org.apache.cxf.cxf-rt-frontend-jaxws;visibility:=reexport,
+ org.apache.cxf.cxf-rt-transports-http;visibility:=reexport,
+ org.springframework.beans</Require-Bundle>
+ <_failok>true</_failok>
+ <_nouses>true</_nouses>
+ <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: cxf/trunk/osgi/bundle/compatible/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/osgi/bundle/compatible/pom.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: cxf/trunk/osgi/bundle/compatible/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: cxf/trunk/osgi/bundle/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/osgi/bundle/pom.xml?rev=1235425&r1=1235424&r2=1235425&view=diff
==============================================================================
--- cxf/trunk/osgi/bundle/pom.xml (original)
+++ cxf/trunk/osgi/bundle/pom.xml Tue Jan 24 19:19:32 2012
@@ -190,6 +190,7 @@ cxf.schema.version = ${os}
<module>all</module>
<module>minimal</module>
<module>jaxrs</module>
+ <module>compatible</module>
</modules>
</project>
Modified: cxf/trunk/rt/core/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/pom.xml?rev=1235425&r1=1235424&r2=1235425&view=diff
==============================================================================
--- cxf/trunk/rt/core/pom.xml (original)
+++ cxf/trunk/rt/core/pom.xml Tue Jan 24 19:19:32 2012
@@ -35,7 +35,6 @@
<properties>
<cxf.bundle.activator>org.apache.cxf.bus.osgi.CXFActivator</cxf.bundle.activator>
- <cxf.osgi.symbolic.name>${project.groupId}.bundle</cxf.osgi.symbolic.name>
<cxf.osgi.import>
org.springframework*;resolution:=optional;version="${cxf.osgi.spring.version}",
Modified: cxf/trunk/rt/transports/http/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/pom.xml?rev=1235425&r1=1235424&r2=1235425&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http/pom.xml (original)
+++ cxf/trunk/rt/transports/http/pom.xml Tue Jan 24 19:19:32 2012
@@ -36,6 +36,10 @@
<cxf.osgi.import>
javax.servlet*;version="${cxf.osgi.javax.servlet.version}",
</cxf.osgi.import>
+ <cxf.osgi.export>
+ '=META-INF.cxf.osgi',
+ org.apache.cxf.*,
+ </cxf.osgi.export>
</properties>
<dependencies>