Author: ningjiang
Date: Wed Nov 16 12:58:05 2011
New Revision: 1202685
URL: http://svn.apache.org/viewvc?rev=1202685&view=rev
Log:
Install the xml-specs-api feature by default to fix the OSGi test failures
Modified:
camel/trunk/tests/camel-itest-karaf/pom.xml
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
camel/trunk/tests/camel-itest-karaf/src/test/resources/org/apache/camel/itest/karaf/jre.properties
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/karaf/jre.properties
Modified: camel/trunk/tests/camel-itest-karaf/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/pom.xml?rev=1202685&r1=1202684&r2=1202685&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-karaf/pom.xml (original)
+++ camel/trunk/tests/camel-itest-karaf/pom.xml Wed Nov 16 12:58:05 2011
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>camel-parent</artifactId>
- <version>2.9.0-SNAPSHOT</version>
+ <version>2.9-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
Modified:
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java?rev=1202685&r1=1202684&r2=1202685&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
(original)
+++
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
Wed Nov 16 12:58:05 2011
@@ -131,7 +131,7 @@ public abstract class AbstractFeatureTes
return sb.toString();
}
- private static URL getResource(String location) {
+ private static URL getResource(String location) {
URL url = null;
if (Thread.currentThread().getContextClassLoader() != null) {
url =
Thread.currentThread().getContextClassLoader().getResource(location);
@@ -175,7 +175,7 @@ public abstract class AbstractFeatureTes
// using the features to install the camel components
scanFeatures(getCamelKarafFeatureUrl(),
- "camel-core", "camel-spring", "camel-" + feature),
+ "xml-specs-api", "camel-core", "camel-spring", "camel-" +
feature),
workingDirectory("target/paxrunner/"));
Modified:
camel/trunk/tests/camel-itest-karaf/src/test/resources/org/apache/camel/itest/karaf/jre.properties
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/src/test/resources/org/apache/camel/itest/karaf/jre.properties?rev=1202685&r1=1202684&r2=1202685&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-karaf/src/test/resources/org/apache/camel/itest/karaf/jre.properties
(original)
+++
camel/trunk/tests/camel-itest-karaf/src/test/resources/org/apache/camel/itest/karaf/jre.properties
Wed Nov 16 12:58:05 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, \
Modified:
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java?rev=1202685&r1=1202684&r2=1202685&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
(original)
+++
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
Wed Nov 16 12:58:05 2011
@@ -131,7 +131,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/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/karaf/jre.properties
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/karaf/jre.properties?rev=1202685&r1=1202684&r2=1202685&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/karaf/jre.properties
(original)
+++
camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/karaf/jre.properties
Wed Nov 16 12:58:05 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, \
