You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dv...@apache.org on 2010/03/25 03:26:23 UTC

svn commit: r927255 - in /cxf/branches/2.2.x-fixes: ./ distribution/bundle/all/pom.xml distribution/bundle/jaxrs/pom.xml distribution/bundle/minimal/pom.xml

Author: dvaleri
Date: Thu Mar 25 02:26:22 2010
New Revision: 927255

URL: http://svn.apache.org/viewvc?rev=927255&view=rev
Log:
Merged revisions 927169 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r927169 | dvaleri | 2010-03-24 15:52:45 -0400 (Wed, 24 Mar 2010) | 1 line
  
  [CXF-2729] Fixes issues with enabling of Jetty JMX extensions in OSGi.
........

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

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 25 02:26:22 2010
@@ -1 +1 @@
-/cxf/trunk:925337,925378,925995
+/cxf/trunk:925337,925378,925995,927169

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=927255&r1=927254&r2=927255&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 Thu Mar 25 02:26:22 2010
@@ -261,7 +261,8 @@
                             com.ctc.wstx.*,
                             org.apache.commons.logging.*,
                             org.slf4j.*,
-                            org.slf4j.impl.*
+                            org.slf4j.impl.*,
+                            org.mortbay.management
                         </DynamicImport-Package>
                         <Import-Package>
                             !org.apache.cxf.*,

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=927255&r1=927254&r2=927255&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 Thu Mar 25 02:26:22 2010
@@ -117,7 +117,8 @@
                             com.ctc.wstx.*,
                             org.apache.commons.logging.*,
                             org.slf4j.*,
-                            org.slf4j.impl.*
+                            org.slf4j.impl.*,
+                            org.mortbay.management
                         </DynamicImport-Package>
                         <Import-Package>
                             !org.apache.cxf.*,

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=927255&r1=927254&r2=927255&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 Thu Mar 25 02:26:22 2010
@@ -161,7 +161,8 @@
                             com.sun.xml.internal.bind.api.*,
                             org.apache.commons.logging.*,
                             org.slf4j.*,
-                            org.slf4j.impl.*
+                            org.slf4j.impl.*,
+                            org.mortbay.management
                         </DynamicImport-Package>
                         <Import-Package>
                             !org.apache.cxf.*,