Author: ningjiang
Date: Wed May 29 09:39:20 2013
New Revision: 1487425
URL: http://svn.apache.org/r1487425
Log:
CXF-5041 cxf-rt-transports-http-netty-server and
cxf-rt-transports-http-netty-client are OSGi bundle now
Modified:
cxf/trunk/parent/pom.xml
cxf/trunk/rt/transports/http-netty/netty-client/pom.xml
cxf/trunk/rt/transports/http-netty/netty-server/pom.xml
Modified: cxf/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=1487425&r1=1487424&r2=1487425&view=diff
==============================================================================
--- cxf/trunk/parent/pom.xml (original)
+++ cxf/trunk/parent/pom.xml Wed May 29 09:39:20 2013
@@ -133,6 +133,7 @@
<cxf.msv.version>2011.1</cxf.msv.version>
<cxf.neethi.version>3.0.2</cxf.neethi.version>
<cxf.netty.version>3.6.5.Final</cxf.netty.version>
+ <cxf.netty.version.range>[3,4)</cxf.netty.version.range>
<cxf.oauth.bundle.version>20100527_1</cxf.oauth.bundle.version>
<cxf.opensaml.version>2.5.3</cxf.opensaml.version>
<cxf.opensaml.osgi.version>2.5.3_1</cxf.opensaml.osgi.version>
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=1487425&r1=1487424&r2=1487425&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-netty/netty-client/pom.xml (original)
+++ cxf/trunk/rt/transports/http-netty/netty-client/pom.xml Wed May 29 09:39:20
2013
@@ -33,6 +33,16 @@
<version>3.0.0-SNAPSHOT</version>
<relativePath>../../../../parent/pom.xml</relativePath>
</parent>
+
+ <properties>
+ <cxf.osgi.import>
+ org.jboss.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>
<dependency>
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=1487425&r1=1487424&r2=1487425&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-netty/netty-server/pom.xml (original)
+++ cxf/trunk/rt/transports/http-netty/netty-server/pom.xml Wed May 29 09:39:20
2013
@@ -33,6 +33,16 @@
<version>3.0.0-SNAPSHOT</version>
<relativePath>../../../../parent/pom.xml</relativePath>
</parent>
+
+ <properties>
+ <cxf.osgi.import>
+ org.jboss.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>
<dependency>
