Return-Path: 
 <commits-return-20790-apmail-cxf-commits-archive=cxf.apache.org@cxf.apache.org>
X-Original-To: apmail-cxf-commits-archive@www.apache.org
Delivered-To: apmail-cxf-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id BA1F2D172
	for <apmail-cxf-commits-archive@www.apache.org>;
 Sun,  1 Jul 2012 22:57:46 +0000 (UTC)
Received: (qmail 73748 invoked by uid 500); 1 Jul 2012 22:57:46 -0000
Delivered-To: apmail-cxf-commits-archive@cxf.apache.org
Received: (qmail 73705 invoked by uid 500); 1 Jul 2012 22:57:46 -0000
Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cxf.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cxf.apache.org>
List-Post: <mailto:commits@cxf.apache.org>
List-Id: <commits.cxf.apache.org>
Reply-To: dev@cxf.apache.org
Delivered-To: mailing list commits@cxf.apache.org
Received: (qmail 73697 invoked by uid 99); 1 Jul 2012 22:57:46 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 Jul 2012 22:57:46 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 Jul 2012 22:57:44 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 74A5D2388865;
	Sun,  1 Jul 2012 22:57:23 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1356043 -
 /cxf/trunk/osgi/karaf/features/src/main/resources/features.xml
Date: Sun, 01 Jul 2012 22:57:23 -0000
To: commits@cxf.apache.org
From: ffang@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120701225723.74A5D2388865@eris.apache.org>

Author: ffang
Date: Sun Jul  1 22:57:22 2012
New Revision: 1356043

URL: http://svn.apache.org/viewvc?rev=1356043&view=rev
Log:
[CXF-4402]remove http-whiteboard feature from cxf features.xml

Modified:
    cxf/trunk/osgi/karaf/features/src/main/resources/features.xml

Modified: cxf/trunk/osgi/karaf/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/osgi/karaf/features/src/main/resources/features.xml?rev=1356043&r1=1356042&r2=1356043&view=diff
==============================================================================
--- cxf/trunk/osgi/karaf/features/src/main/resources/features.xml (original)
+++ cxf/trunk/osgi/karaf/features/src/main/resources/features.xml Sun Jul  1 22:57:22 2012
@@ -116,13 +116,9 @@
         <bundle start-level='40' dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ehcache/${cxf.ehcache.bundle.version}</bundle>
         <bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-ws-security/${project.version}</bundle>
     </feature>
-    <feature name="http-whiteboard" version="2.2.5" resolver='(obr)'>
-        <feature>http</feature>
-        <bundle start-level="30">mvn:org.ops4j.pax.web/pax-web-extender-whiteboard/1.0.8</bundle>
-    </feature>
     <feature name="cxf-http" version="${project.version}" resolver='(obr)'>
         <feature version="${project.version}">cxf-core</feature>
-        <feature version="[2,4)">http-whiteboard</feature>
+        <feature version="[2,4)">http</feature>
         <bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-transports-http/${project.version}</bundle>
     </feature>
     <feature name="cxf-http-jetty" version="${project.version}" resolver='(obr)'>