Author: ningjiang
Date: Wed May 9 15:49:47 2012
New Revision: 1336248
URL: http://svn.apache.org/viewvc?rev=1336248&view=rev
Log:
Merged revisions 1336004 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1336004 | ningjiang | 2012-05-09 16:49:50 +0800 (Wed, 09 May 2012) | 1 line
CAMEL-5257 fix camel-jpa feature install issue
........
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/platforms/karaf/features/src/main/resources/features.xml
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1336004
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.9.x/platforms/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/platforms/karaf/features/src/main/resources/features.xml?rev=1336248&r1=1336247&r2=1336248&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/platforms/karaf/features/src/main/resources/features.xml
(original)
+++
camel/branches/camel-2.9.x/platforms/karaf/features/src/main/resources/features.xml
Wed May 9 15:49:47 2012
@@ -414,6 +414,9 @@
<feature name='camel-jpa' version='${project.version}' resolver='(obr)'
start-level='50'>
<bundle
dependency='true'>mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/${gernimo-annotation-spec-version}</bundle>
<bundle
dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jpa_2.0_spec/${geronimo-jpa2-spec-version}</bundle>
+ <!-- the jetty feature provides the geronimo-servlet_2.5_spec -->
+ <!-- TODO replace the jetty feature by a Karaf spec feature -->
+ <feature>jetty</feature>
<feature version='[3,4)'>spring-tx</feature>
<bundle
dependency='true'>mvn:org.apache.geronimo.specs/geronimo-el_1.0_spec/${geronimo-el-version}</bundle>
<bundle
dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle>
