You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ni...@apache.org on 2012/03/26 17:39:08 UTC
svn commit: r1305404 - in /cxf/branches/2.4.x-fixes: ./
osgi/bundle/all/pom.xml osgi/bundle/jaxrs/pom.xml osgi/bundle/minimal/pom.xml
Author: ningjiang
Date: Mon Mar 26 15:39:07 2012
New Revision: 1305404
URL: http://svn.apache.org/viewvc?rev=1305404&view=rev
Log:
Merged revisions 1305400 via svnmerge from
https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
................
r1305400 | ningjiang | 2012-03-26 23:31:14 +0800 (Mon, 26 Mar 2012) | 9 lines
Merged revisions 1305388 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1305388 | ningjiang | 2012-03-26 23:09:33 +0800 (Mon, 26 Mar 2012) | 1 line
CXF-4203 reapply the patch, we still need it
........
................
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/osgi/bundle/all/pom.xml
cxf/branches/2.4.x-fixes/osgi/bundle/jaxrs/pom.xml
cxf/branches/2.4.x-fixes/osgi/bundle/minimal/pom.xml
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Merged /cxf/branches/2.5.x-fixes:r1305400
Merged /cxf/trunk:r1305388
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.4.x-fixes/osgi/bundle/all/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/osgi/bundle/all/pom.xml?rev=1305404&r1=1305403&r2=1305404&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/osgi/bundle/all/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/osgi/bundle/all/pom.xml Mon Mar 26 15:39:07 2012
@@ -313,6 +313,10 @@
org.apache.commons.logging.*,
org.slf4j.*,
org.slf4j.impl.*,
+ org.eclipse.jetty.plus.jaas,
+ org.eclipse.jetty.plus.jaas.*,
+ org.apache.karaf.jaas.modules,
+ org.apache.karaf.jaas.modules.*,
org.eclipse.jetty.jmx,
org.eclipse.jetty.jmx.*
</DynamicImport-Package>
Modified: cxf/branches/2.4.x-fixes/osgi/bundle/jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/osgi/bundle/jaxrs/pom.xml?rev=1305404&r1=1305403&r2=1305404&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/osgi/bundle/jaxrs/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/osgi/bundle/jaxrs/pom.xml Mon Mar 26 15:39:07 2012
@@ -122,6 +122,10 @@
org.apache.commons.logging.*,
org.slf4j.*,
org.slf4j.impl.*,
+ org.eclipse.jetty.plus.jaas,
+ org.eclipse.jetty.plus.jaas.*,
+ org.apache.karaf.jaas.modules,
+ org.apache.karaf.jaas.modules.*,
org.eclipse.jetty.jmx,
org.eclipse.jetty.jmx.*
</DynamicImport-Package>
Modified: cxf/branches/2.4.x-fixes/osgi/bundle/minimal/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/osgi/bundle/minimal/pom.xml?rev=1305404&r1=1305403&r2=1305404&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/osgi/bundle/minimal/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/osgi/bundle/minimal/pom.xml Mon Mar 26 15:39:07 2012
@@ -167,6 +167,10 @@
org.apache.commons.logging.*,
org.slf4j.*,
org.slf4j.impl.*,
+ org.eclipse.jetty.plus.jaas,
+ org.eclipse.jetty.plus.jaas.*,
+ org.apache.karaf.jaas.modules,
+ org.apache.karaf.jaas.modules.*,
org.eclipse.jetty.jmx,
org.eclipse.jetty.jmx.*
</DynamicImport-Package>