Author: ningjiang
Date: Wed Nov 16 14:48:17 2011
New Revision: 1202726
URL: http://svn.apache.org/viewvc?rev=1202726&view=rev
Log:
Merged revisions 1202685 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1202685 | ningjiang | 2011-11-16 20:58:05 +0800 (Wed, 16 Nov 2011) | 1 line
Install the xml-specs-api feature by default to fix the OSGi test failures
........
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
camel/branches/camel-2.8.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
camel/branches/camel-2.8.x/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/karaf/jre.properties
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 16 14:48:17 2011
@@ -1 +1 @@
-/camel/trunk:1202148,1202167,1202204-1202206,1202215,1202223,1202659
+/camel/trunk:1202148,1202167,1202204-1202206,1202215,1202223,1202659,1202685
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.8.x/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java?rev=1202726&r1=1202725&r2=1202726&view=diff
==============================================================================
---
camel/branches/camel-2.8.x/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
(original)
+++
camel/branches/camel-2.8.x/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
Wed Nov 16 14:48:17 2011
@@ -163,7 +163,7 @@ public abstract class AbstractFeatureTes
// and the camel feature to be tested
scanFeatures(getCamelKarafFeatureUrl(),
- "camel-spring", "camel-" + feature),
+ "xml-specs-api", "camel-spring", "camel-" + feature),
workingDirectory("target/paxrunner/"),
useFelix ? felix() : null,
Modified:
camel/branches/camel-2.8.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java?rev=1202726&r1=1202725&r2=1202726&view=diff
==============================================================================
---
camel/branches/camel-2.8.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
(original)
+++
camel/branches/camel-2.8.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
Wed Nov 16 14:48:17 2011
@@ -113,7 +113,7 @@ public class OSGiIntegrationTestSupport
// using the features to install the camel components
scanFeatures(getCamelKarafFeatureUrl(),
- "camel-core", "camel-spring", "camel-test"),
+ "xml-specs-api", "camel-core", "camel-spring", "camel-test"),
workingDirectory("target/paxrunner/"));
Modified:
camel/branches/camel-2.8.x/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/karaf/jre.properties
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/karaf/jre.properties?rev=1202726&r1=1202725&r2=1202726&view=diff
==============================================================================
---
camel/branches/camel-2.8.x/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/karaf/jre.properties
(original)
+++
camel/branches/camel-2.8.x/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/karaf/jre.properties
Wed Nov 16 14:48:17 2011
@@ -158,7 +158,7 @@ jre-1.6= \
com.sun.org.apache.xerces.internal.xni, \
com.sun.jndi.ldap, \
javax.accessibility, \
- javax.activation, \
+# javax.activation, \
javax.activity, \
javax.annotation;version="1.1", \
javax.annotation.processing;version="1.1", \
@@ -237,12 +237,12 @@ jre-1.6= \
javax.tools, \
javax.transaction; javax.transaction.xa; partial=true; mandatory:=partial, \
javax.xml, \
- javax.xml.bind, \
- javax.xml.bind.annotation, \
- javax.xml.bind.annotation.adapters, \
- javax.xml.bind.attachment, \
- javax.xml.bind.helpers, \
- javax.xml.bind.util, \
+# javax.xml.bind, \
+# javax.xml.bind.annotation, \
+# javax.xml.bind.annotation.adapters, \
+# javax.xml.bind.attachment, \
+# javax.xml.bind.helpers, \
+# javax.xml.bind.util, \
javax.xml.crypto, \
javax.xml.crypto.dom, \
javax.xml.crypto.dsig, \
@@ -253,9 +253,9 @@ jre-1.6= \
javax.xml.namespace, \
javax.xml.parsers, \
# javax.xml.soap, \
- javax.xml.stream, \
- javax.xml.stream.events, \
- javax.xml.stream.util, \
+# javax.xml.stream, \
+# javax.xml.stream.events, \
+# javax.xml.stream.util, \
javax.xml.transform, \
javax.xml.transform.dom, \
javax.xml.transform.sax, \
