You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2010/01/19 18:02:55 UTC
svn commit: r900847 - in /cxf/branches/2.2.x-fixes: ./
distribution/bundle/jaxrs/Readme.txt distribution/bundle/jaxrs/pom.xml
distribution/bundle/minimal/Readme.txt distribution/bundle/minimal/pom.xml
Author: sergeyb
Date: Tue Jan 19 17:02:54 2010
New Revision: 900847
URL: http://svn.apache.org/viewvc?rev=900847&view=rev
Log:
Merged revisions 900840 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r900840 | sergeyb | 2010-01-19 16:52:16 +0000 (Tue, 19 Jan 2010) | 1 line
Removing cxf-rt-transports-http-osgi module from jaxrs and minimal bundles
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/distribution/bundle/jaxrs/Readme.txt
cxf/branches/2.2.x-fixes/distribution/bundle/jaxrs/pom.xml
cxf/branches/2.2.x-fixes/distribution/bundle/minimal/Readme.txt
cxf/branches/2.2.x-fixes/distribution/bundle/minimal/pom.xml
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 17:02:54 2010
@@ -1 +1 @@
-/cxf/trunk:900181,900243,900738
+/cxf/trunk:900181,900243,900738,900840
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.2.x-fixes/distribution/bundle/jaxrs/Readme.txt
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/distribution/bundle/jaxrs/Readme.txt?rev=900847&r1=900846&r2=900847&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/distribution/bundle/jaxrs/Readme.txt (original)
+++ cxf/branches/2.2.x-fixes/distribution/bundle/jaxrs/Readme.txt Tue Jan 19 17:02:54 2010
@@ -49,6 +49,7 @@
cxf-rt-frontend-jaxws
cxf-rt-frontend-js
cxf-rt-frontend-simple
+cxf-rt-transports-http-osgi
If your code depends on any of the above modules then
please use either an all-inclusive cxf-bundle bundle or
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=900847&r1=900846&r2=900847&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 Jan 19 17:02:54 2010
@@ -57,12 +57,7 @@
<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>
<artifactId>cxf-rt-transports-http-jetty</artifactId>
Modified: cxf/branches/2.2.x-fixes/distribution/bundle/minimal/Readme.txt
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/distribution/bundle/minimal/Readme.txt?rev=900847&r1=900846&r2=900847&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/distribution/bundle/minimal/Readme.txt (original)
+++ cxf/branches/2.2.x-fixes/distribution/bundle/minimal/Readme.txt Tue Jan 19 17:02:54 2010
@@ -42,8 +42,8 @@
cxf-rt-bindings-xml
cxf-rt-bindings-http
cxf-rt-frontend-js
-cxf-rt-frontend-jaxrs
cxf-rt-javascript
+cxf-rt-transports-http-osgi
If your code depends on any of the above modules then please use
an all-inclusive cxf-bundle bundle or cxf-bundle-jaxrs bundle instead,
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=900847&r1=900846&r2=900847&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 Jan 19 17:02:54 2010
@@ -66,11 +66,7 @@
<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>