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 2009/09/29 18:01:46 UTC
svn commit: r820004 - in /cxf/branches/2.2.x-fixes: ./
distribution/bundle/all/pom.xml distribution/bundle/jaxrs/pom.xml
distribution/bundle/minimal/pom.xml distribution/pom.xml
Author: dkulp
Date: Tue Sep 29 16:01:46 2009
New Revision: 820004
URL: http://svn.apache.org/viewvc?rev=820004&view=rev
Log:
Merged revisions 819989 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r819989 | dkulp | 2009-09-29 11:41:38 -0400 (Tue, 29 Sep 2009) | 1 line
Add http-osgi stuff to bundles
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/distribution/bundle/all/pom.xml
cxf/branches/2.2.x-fixes/distribution/bundle/jaxrs/pom.xml
cxf/branches/2.2.x-fixes/distribution/bundle/minimal/pom.xml
cxf/branches/2.2.x-fixes/distribution/pom.xml
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.2.x-fixes/distribution/bundle/all/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/distribution/bundle/all/pom.xml?rev=820004&r1=820003&r2=820004&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/distribution/bundle/all/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/distribution/bundle/all/pom.xml Tue Sep 29 16:01:46 2009
@@ -144,6 +144,11 @@
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
+ <artifactId>cxf-rt-transports-http-osgi</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-transports-http-jetty</artifactId>
<version>${pom.version}</version>
</dependency>
@@ -303,6 +308,7 @@
</Import-Package>
<Export-Package>
org.apache.cxf.*;version=${pom.version};-split-package:=merge-first,
+ '=META-INF.cxf.osgi',
'=META-INF.cxf'
</Export-Package>
<_failok>true</_failok>
Modified: cxf/branches/2.2.x-fixes/distribution/bundle/jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/distribution/bundle/jaxrs/pom.xml?rev=820004&r1=820003&r2=820004&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/distribution/bundle/jaxrs/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/distribution/bundle/jaxrs/pom.xml Tue Sep 29 16:01:46 2009
@@ -57,6 +57,11 @@
<artifactId>cxf-rt-transports-http</artifactId>
<version>${pom.version}</version>
</dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>cxf-rt-transports-http-osgi</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
@@ -146,6 +151,7 @@
</Import-Package>
<Export-Package>
org.apache.cxf.*;version=${pom.version};-split-package:=merge-first,
+ '=META-INF.cxf.osgi',
'=META-INF.cxf'
</Export-Package>
<_failok>true</_failok>
Modified: cxf/branches/2.2.x-fixes/distribution/bundle/minimal/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/distribution/bundle/minimal/pom.xml?rev=820004&r1=820003&r2=820004&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/distribution/bundle/minimal/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/distribution/bundle/minimal/pom.xml Tue Sep 29 16:01:46 2009
@@ -66,6 +66,11 @@
<artifactId>cxf-rt-transports-http-jetty</artifactId>
<version>${pom.version}</version>
</dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>cxf-rt-transports-http-osgi</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
@@ -193,6 +198,7 @@
<Export-Package>
org.apache.cxf.*;version=${pom.version};-split-package:=merge-first,
'=META-INF.cxf',
+ '=META-INF.cxf.osgi',
'=schemas',
'=schemas.configuration',
'=schemas.wsdl'
Modified: cxf/branches/2.2.x-fixes/distribution/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/distribution/pom.xml?rev=820004&r1=820003&r2=820004&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/distribution/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/distribution/pom.xml Tue Sep 29 16:01:46 2009
@@ -149,6 +149,11 @@
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
+ <artifactId>cxf-rt-transports-http-osgi</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-transports-http-jetty</artifactId>
<version>${pom.version}</version>
</dependency>