You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2011/10/24 19:32:42 UTC
svn commit: r1188251 -
/cxf/trunk/osgi/karaf/features/src/main/resources/features.xml
Author: dkulp
Date: Mon Oct 24 17:32:41 2011
New Revision: 1188251
URL: http://svn.apache.org/viewvc?rev=1188251&view=rev
Log:
Workaround "war" issue on java5.
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=1188251&r1=1188250&r2=1188251&view=diff
==============================================================================
--- cxf/trunk/osgi/karaf/features/src/main/resources/features.xml (original)
+++ cxf/trunk/osgi/karaf/features/src/main/resources/features.xml Mon Oct 24 17:32:41 2011
@@ -91,6 +91,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>
@@ -103,7 +115,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>