Return-Path: 
 <commits-return-16574-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 74ADC7B6A
	for <apmail-cxf-commits-archive@www.apache.org>;
 Mon, 24 Oct 2011 19:06:37 +0000 (UTC)
Received: (qmail 71780 invoked by uid 500); 24 Oct 2011 19:06:37 -0000
Delivered-To: apmail-cxf-commits-archive@cxf.apache.org
Received: (qmail 71732 invoked by uid 500); 24 Oct 2011 19:06:37 -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 71725 invoked by uid 99); 24 Oct 2011 19:06:37 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 24 Oct 2011 19:06:37 +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; Mon, 24 Oct 2011 19:06:36 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 594DD238897D
	for <commits@cxf.apache.org>; Mon, 24 Oct 2011 19:06:15 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1188294 - in /cxf/branches/2.4.x-fixes: ./
 osgi/karaf/features/src/main/resources/features.xml
Date: Mon, 24 Oct 2011 19:06:15 -0000
To: commits@cxf.apache.org
From: dkulp@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20111024190615.594DD238897D@eris.apache.org>

Author: dkulp
Date: Mon Oct 24 19:06:14 2011
New Revision: 1188294

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

........
  r1188251 | dkulp | 2011-10-24 13:32:41 -0400 (Mon, 24 Oct 2011) | 1 line
  
  Workaround "war" issue on java5.
........

Modified:
    cxf/branches/2.4.x-fixes/   (props changed)
    cxf/branches/2.4.x-fixes/osgi/karaf/features/src/main/resources/features.xml

Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.4.x-fixes/osgi/karaf/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/osgi/karaf/features/src/main/resources/features.xml?rev=1188294&r1=1188293&r2=1188294&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/osgi/karaf/features/src/main/resources/features.xml (original)
+++ cxf/branches/2.4.x-fixes/osgi/karaf/features/src/main/resources/features.xml Mon Oct 24 19:06:14 2011
@@ -67,6 +67,18 @@
         <feature version="${project.version}">cxf-specs</feature>
         <bundle start-level='25'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saaj-impl/${cxf.saaj-impl.bundle.version}</bundle>
     </feature>
+    <feature name="cxf-war-java5" version="${project.version}" resolver="(obr)">
+        <!-- This is to work around an issue in Karaf 2.2.4 where the "war" feature cannot be installed on Java 5 -->
+        <!-- This gives us what we need and doesn't pull in the stuff that doesn't work (the jsp bundle) -->
+        <config name="org.ops4j.pax.url.war">
+            org.ops4j.pax.url.war.importPaxLoggingPackages=true
+        </config>
+        <feature>http</feature>
+        <bundle>mvn:org.ops4j.pax.web/pax-web-extender-war/1.0.7</bundle>
+        <bundle>mvn:org.ops4j.pax.web/pax-web-extender-whiteboard/1.0.7</bundle>
+        <bundle>mvn:org.ops4j.pax.web/pax-web-deployer/1.0.7</bundle>
+        <bundle>mvn:org.ops4j.pax.url/pax-url-war/1.2.8</bundle>
+    </feature>
 
     <feature name="cxf" version="${project.version}" resolver='(obr)'>
         <feature version="${project.version}">cxf-specs</feature>
@@ -79,7 +91,7 @@
 
         <feature version='${project.version}'>cxf-jaxb</feature>
         <feature version="[2,3)">http</feature>
-        <feature version="[2,3)">war</feature>
+        <feature version="[2,3)">cxf-war-java5</feature>
         <feature version="[3,4)">spring</feature>
         <feature version="[1.2,2)">spring-dm</feature>
         <feature version="[3,4)">spring-jms</feature>