servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r707358 - in /servicemix/smx4/kernel/trunk: ./ assembly/ assembly/src/main/descriptors/ assembly/src/main/distribution/text/etc/ assembly/src/main/filtered-resources/etc/ gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/g...
Date Thu, 23 Oct 2008 12:11:47 GMT
Author: gnodet
Date: Thu Oct 23 05:11:46 2008
New Revision: 707358

URL: http://svn.apache.org/viewvc?rev=707358&view=rev
Log:
SMX4KNL-123: XML parsing does not work on non Sun JVMs and Sun's SAAJ bundle requires Sun's
JAXP implementation

Modified:
    servicemix/smx4/kernel/trunk/assembly/pom.xml
    servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml
    servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml
    servicemix/smx4/kernel/trunk/assembly/src/main/distribution/text/etc/config.properties
    servicemix/smx4/kernel/trunk/assembly/src/main/filtered-resources/etc/startup.properties
    servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/etc/config.properties
    servicemix/smx4/kernel/trunk/pom.xml
    servicemix/smx4/kernel/trunk/testing/itests/pom.xml
    servicemix/smx4/kernel/trunk/testing/itests/src/test/java/org/apache/servicemix/kernel/testing/itests/SimpleTest.java
    servicemix/smx4/kernel/trunk/testing/support/src/main/java/org/apache/servicemix/kernel/testing/support/AbstractIntegrationTest.java
    servicemix/smx4/kernel/trunk/testing/support/src/main/resources/org/apache/servicemix/kernel/testing/support/felix.config.properties

Modified: servicemix/smx4/kernel/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/assembly/pom.xml?rev=707358&r1=707357&r2=707358&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/assembly/pom.xml Thu Oct 23 05:11:46 2008
@@ -127,6 +127,18 @@
             <artifactId>org.apache.felix.bundlerepository</artifactId>
         </dependency>
         <dependency>
+            <groupId>org.apache.servicemix.specs</groupId>
+            <artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix.specs</groupId>
+            <artifactId>org.apache.servicemix.specs.jaxp-api-1.3</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.jaxp-ri</artifactId>
+        </dependency>
+        <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.mina</artifactId>
         </dependency>

Modified: servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml?rev=707358&r1=707357&r2=707358&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml (original)
+++ servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml Thu Oct 23 05:11:46
2008
@@ -171,6 +171,16 @@
                 <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.aopalliance</include>
                 <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.cglib</include>
                 <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.mina</include>
+                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxp-ri</include>
+            </includes>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>/system</outputDirectory>
+            <unpack>false</unpack>
+            <outputFileNameMapping>org/apache/servicemix/specs/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+            <includes>
+                <include>org.apache.servicemix.specs:org.apache.servicemix.specs.jaxp-api-1.3</include>
+                <include>org.apache.servicemix.specs:org.apache.servicemix.specs.stax-api-1.0</include>
             </includes>
         </dependencySet>
         <dependencySet>

Modified: servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml?rev=707358&r1=707357&r2=707358&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml (original)
+++ servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml Thu Oct 23
05:11:46 2008
@@ -163,6 +163,16 @@
                 <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.aopalliance</include>
                 <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.cglib</include>
                 <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.mina</include>
+                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxp-ri</include>
+            </includes>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>/system</outputDirectory>
+            <unpack>false</unpack>
+            <outputFileNameMapping>org/apache/servicemix/specs/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+            <includes>
+                <include>org.apache.servicemix.specs:org.apache.servicemix.specs.jaxp-api-1.3</include>
+                <include>org.apache.servicemix.specs:org.apache.servicemix.specs.stax-api-1.0</include>
             </includes>
         </dependencySet>
         <dependencySet>

Modified: servicemix/smx4/kernel/trunk/assembly/src/main/distribution/text/etc/config.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/assembly/src/main/distribution/text/etc/config.properties?rev=707358&r1=707357&r2=707358&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/assembly/src/main/distribution/text/etc/config.properties
(original)
+++ servicemix/smx4/kernel/trunk/assembly/src/main/distribution/text/etc/config.properties
Thu Oct 23 05:11:46 2008
@@ -26,11 +26,6 @@
  org.osgi.service.url; version=1.0.0, \
  org.apache.servicemix.kernel.main.spi; version=1.0.0, \
  org.apache.servicemix.kernel.jaas.boot, \
- com.sun.org.apache.xalan.internal.xsltc.trax, \
- com.sun.org.apache.xerces.internal.dom, \
- com.sun.org.apache.xerces.internal.jaxp, \
- com.sun.org.apache.xerces.internal.jaxp.datatype, \
- com.sun.org.apache.xerces.internal.xni, \
  ${jre-${java.specification.version}}
 org.osgi.framework.bootdelegation=sun.*,com.sun.management*,
 
@@ -129,16 +124,6 @@
  javax.swing.text.rtf; \
  javax.swing.tree; \
  javax.swing.undo; \
- javax.xml; \
- javax.xml.datatype; \
- javax.xml.namespace; \
- javax.xml.parsers; \
- javax.xml.transform; \
- javax.xml.transform.dom; \
- javax.xml.transform.sax; \
- javax.xml.transform.stream; \
- javax.xml.validation; \
- javax.xml.xpath; \
  org.ietf.jgss; \
  org.omg.CORBA; \
  org.omg.CORBA_2_3; \
@@ -169,19 +154,6 @@
  org.omg.SendingContext; \
  org.omg.stub.java.rmi; \
  org.omg.stub.javax.management.remote.rmi; \
- org.w3c.dom; \
- org.w3c.dom.bootstrap; \
- org.w3c.dom.css; \
- org.w3c.dom.events; \
- org.w3c.dom.html; \
- org.w3c.dom.ls; \
- org.w3c.dom.ranges; \
- org.w3c.dom.stylesheets; \
- org.w3c.dom.traversal; \
- org.w3c.dom.views; \
- org.xml.sax; \
- org.xml.sax.ext; \
- org.xml.sax.helpers; \
  sun.misc; \
  sun.reflect; \
  version="1.5.0"
@@ -267,39 +239,6 @@
  javax.swing.tree; \
  javax.swing.undo; \
  javax.tools; \
- 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.crypto; \
- javax.xml.crypto.dom; \
- javax.xml.crypto.dsig; \
- javax.xml.crypto.dsig.dom; \
- javax.xml.crypto.dsig.keyinfo; \
- javax.xml.crypto.dsig.spec; \
- javax.xml.datatype; \
- javax.xml.namespace; \
- javax.xml.parsers; \
- javax.xml.soap; \
- javax.xml.stream; \
- javax.xml.stream.events; \
- javax.xml.stream.util; \
- javax.xml.transform; \
- javax.xml.transform.dom; \
- javax.xml.transform.sax; \
- javax.xml.transform.stax; \
- javax.xml.transform.stream; \
- javax.xml.validation; \
- javax.xml.ws; \
- javax.xml.ws.handler; \
- javax.xml.ws.handler.soap; \
- javax.xml.ws.http; \
- javax.xml.ws.soap; \
- javax.xml.ws.spi; \
- javax.xml.xpath; \
  org.ietf.jgss; \
  org.omg.CORBA; \
  org.omg.CORBA_2_3; \
@@ -330,20 +269,6 @@
  org.omg.SendingContext; \
  org.omg.stub.java.rmi; \
  org.omg.stub.javax.management.remote.rmi; \
- org.w3c.dom; \
- org.w3c.dom.bootstrap; \
- org.w3c.dom.css; \
- org.w3c.dom.events; \
- org.w3c.dom.html; \
- org.w3c.dom.ls; \
- org.w3c.dom.ranges; \
- org.w3c.dom.stylesheets; \
- org.w3c.dom.traversal; \
- org.w3c.dom.views; \
- org.w3c.dom.xpath; \
- org.xml.sax; \
- org.xml.sax.ext; \
- org.xml.sax.helpers; \
  sun.misc; \
  sun.reflect; \
  version="1.6.0"

Modified: servicemix/smx4/kernel/trunk/assembly/src/main/filtered-resources/etc/startup.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/assembly/src/main/filtered-resources/etc/startup.properties?rev=707358&r1=707357&r2=707358&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/assembly/src/main/filtered-resources/etc/startup.properties
(original)
+++ servicemix/smx4/kernel/trunk/assembly/src/main/filtered-resources/etc/startup.properties
Thu Oct 23 05:11:46 2008
@@ -25,6 +25,9 @@
 #
 org/ops4j/pax/url/pax-url-mvn/${pax.url.version}/pax-url-mvn-${pax.url.version}.jar=5
 org/apache/geronimo/specs/geronimo-servlet_2.5_spec/${geronimo.servlet.version}/geronimo-servlet_2.5_spec-${geronimo.servlet.version}.jar=10
+org/apache/servicemix/specs/org.apache.servicemix.specs.jaxp-api-1.3/${servicemix.specs.version}/org.apache.servicemix.specs.jaxp-api-1.3-${servicemix.specs.version}.jar=10
+org/apache/servicemix/specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix.specs.version}/org.apache.servicemix.specs.stax-api-1.0-${servicemix.specs.version}.jar=10
+org/apache/servicemix/bundles/org.apache.servicemix.bundles.jaxp-ri/${jaxp.ri.version}/org.apache.servicemix.bundles.jaxp-ri-${jaxp.ri.version}.jar=10
 org/apache/felix/org.osgi.compendium/${felix.compendium.version}/org.osgi.compendium-${felix.compendium.version}.jar=10
 org/apache/felix/org.apache.felix.configadmin/${felix.configadmin.version}/org.apache.felix.configadmin-${felix.configadmin.version}.jar=10
 org/apache/servicemix/kernel/org.apache.servicemix.kernel.filemonitor/${pom.version}/org.apache.servicemix.kernel.filemonitor-${pom.version}.jar=15

Modified: servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/etc/config.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/etc/config.properties?rev=707358&r1=707357&r2=707358&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/etc/config.properties
(original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/etc/config.properties
Thu Oct 23 05:11:46 2008
@@ -26,11 +26,6 @@
  org.osgi.service.url; version=1.0.0, \
  org.apache.servicemix.kernel.main.spi; version=1.0.0, \
  org.apache.servicemix.kernel.jaas.boot, \
- com.sun.org.apache.xalan.internal.xsltc.trax, \
- com.sun.org.apache.xerces.internal.dom, \
- com.sun.org.apache.xerces.internal.jaxp, \
- com.sun.org.apache.xerces.internal.jaxp.datatype, \
- com.sun.org.apache.xerces.internal.xni, \
  ${jre-${java.specification.version}}
 org.osgi.framework.bootdelegation=sun.*,com.sun.management*,
 
@@ -129,16 +124,6 @@
  javax.swing.text.rtf; \
  javax.swing.tree; \
  javax.swing.undo; \
- javax.xml; \
- javax.xml.datatype; \
- javax.xml.namespace; \
- javax.xml.parsers; \
- javax.xml.transform; \
- javax.xml.transform.dom; \
- javax.xml.transform.sax; \
- javax.xml.transform.stream; \
- javax.xml.validation; \
- javax.xml.xpath; \
  org.ietf.jgss; \
  org.omg.CORBA; \
  org.omg.CORBA_2_3; \
@@ -169,19 +154,6 @@
  org.omg.SendingContext; \
  org.omg.stub.java.rmi; \
  org.omg.stub.javax.management.remote.rmi; \
- org.w3c.dom; \
- org.w3c.dom.bootstrap; \
- org.w3c.dom.css; \
- org.w3c.dom.events; \
- org.w3c.dom.html; \
- org.w3c.dom.ls; \
- org.w3c.dom.ranges; \
- org.w3c.dom.stylesheets; \
- org.w3c.dom.traversal; \
- org.w3c.dom.views; \
- org.xml.sax; \
- org.xml.sax.ext; \
- org.xml.sax.helpers; \
  sun.misc; \
  sun.reflect; \
  version="1.5.0"
@@ -267,39 +239,6 @@
  javax.swing.tree; \
  javax.swing.undo; \
  javax.tools; \
- 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.crypto; \
- javax.xml.crypto.dom; \
- javax.xml.crypto.dsig; \
- javax.xml.crypto.dsig.dom; \
- javax.xml.crypto.dsig.keyinfo; \
- javax.xml.crypto.dsig.spec; \
- javax.xml.datatype; \
- javax.xml.namespace; \
- javax.xml.parsers; \
- javax.xml.soap; \
- javax.xml.stream; \
- javax.xml.stream.events; \
- javax.xml.stream.util; \
- javax.xml.transform; \
- javax.xml.transform.dom; \
- javax.xml.transform.sax; \
- javax.xml.transform.stax; \
- javax.xml.transform.stream; \
- javax.xml.validation; \
- javax.xml.ws; \
- javax.xml.ws.handler; \
- javax.xml.ws.handler.soap; \
- javax.xml.ws.http; \
- javax.xml.ws.soap; \
- javax.xml.ws.spi; \
- javax.xml.xpath; \
  org.ietf.jgss; \
  org.omg.CORBA; \
  org.omg.CORBA_2_3; \
@@ -330,20 +269,6 @@
  org.omg.SendingContext; \
  org.omg.stub.java.rmi; \
  org.omg.stub.javax.management.remote.rmi; \
- org.w3c.dom; \
- org.w3c.dom.bootstrap; \
- org.w3c.dom.css; \
- org.w3c.dom.events; \
- org.w3c.dom.html; \
- org.w3c.dom.ls; \
- org.w3c.dom.ranges; \
- org.w3c.dom.stylesheets; \
- org.w3c.dom.traversal; \
- org.w3c.dom.views; \
- org.w3c.dom.xpath; \
- org.xml.sax; \
- org.xml.sax.ext; \
- org.xml.sax.helpers; \
  sun.misc; \
  sun.reflect; \
  version="1.6.0"

Modified: servicemix/smx4/kernel/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/pom.xml?rev=707358&r1=707357&r2=707358&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/pom.xml Thu Oct 23 05:11:46 2008
@@ -78,6 +78,7 @@
         <felix.prefs.version>1.0.2</felix.prefs.version>
         <geronimo.servlet.version>1.1.2</geronimo.servlet.version>
         <gshell.version>1.0-alpha-2-r654638</gshell.version>
+        <jaxp.ri.version>1.4.2_1-SNAPSHOT</jaxp.ri.version>
         <junit.version>4.4_1</junit.version>
         <jline.version>0.9.94</jline.version>
         <log4j.version>1.2.14</log4j.version>
@@ -85,7 +86,7 @@
         <pax.logging.version>1.1.1</pax.logging.version>
         <pax.url.version>0.3.2</pax.url.version>
         <servicemix.legal.version>1.0</servicemix.legal.version>
-        <servicemix.specs.version>1.1.0</servicemix.specs.version>
+        <servicemix.specs.version>1.2-SNAPSHOT</servicemix.specs.version>
         <spring.osgi.version>1.1.0</spring.osgi.version>
         <spring.version>2.5.5</spring.version>
         <woodstox.version>3.2.7_1</woodstox.version>
@@ -581,6 +582,16 @@
                 <version>${servicemix.specs.version}</version>
             </dependency>
             <dependency>
+                <groupId>org.apache.servicemix.specs</groupId>
+                <artifactId>org.apache.servicemix.specs.jaxp-api-1.3</artifactId>
+                <version>${servicemix.specs.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.servicemix.bundles</groupId>
+                <artifactId>org.apache.servicemix.bundles.jaxp-ri</artifactId>
+                <version>${jaxp.ri.version}</version>
+            </dependency>
+            <dependency>
                 <groupId>org.apache.servicemix.bundles</groupId>
                 <artifactId>org.apache.servicemix.bundles.woodstox</artifactId>
                 <version>${woodstox.version}</version>

Modified: servicemix/smx4/kernel/trunk/testing/itests/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/testing/itests/pom.xml?rev=707358&r1=707357&r2=707358&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/testing/itests/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/testing/itests/pom.xml Thu Oct 23 05:11:46 2008
@@ -45,10 +45,20 @@
             <scope>test</scope>
         </dependency>
         <dependency>
+            <groupId>org.apache.servicemix.specs</groupId>
+            <artifactId>org.apache.servicemix.specs.jaxp-api-1.3</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.woodstox</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.jaxp-ri</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

Modified: servicemix/smx4/kernel/trunk/testing/itests/src/test/java/org/apache/servicemix/kernel/testing/itests/SimpleTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/testing/itests/src/test/java/org/apache/servicemix/kernel/testing/itests/SimpleTest.java?rev=707358&r1=707357&r2=707358&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/testing/itests/src/test/java/org/apache/servicemix/kernel/testing/itests/SimpleTest.java
(original)
+++ servicemix/smx4/kernel/trunk/testing/itests/src/test/java/org/apache/servicemix/kernel/testing/itests/SimpleTest.java
Thu Oct 23 05:11:46 2008
@@ -17,11 +17,20 @@
 package org.apache.servicemix.kernel.testing.itests;
 
 import javax.xml.stream.XMLInputFactory;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.validation.SchemaFactory;
 
 import org.apache.servicemix.kernel.testing.support.AbstractIntegrationTest;
+import org.osgi.framework.Bundle;
 
 public class SimpleTest extends AbstractIntegrationTest {
 
+    static {
+        System.setProperty("jaxp.debug", "true");
+        System.setProperty("org.apache.servicemix.specs.debug", "true");
+    }
+
     /**
 	 * The manifest to use for the "virtual bundle" created
 	 * out of the test classes and resources in this project
@@ -51,38 +60,55 @@
 	protected String[] getTestBundlesNames() {
         return new String[] {
             getBundle("org.apache.servicemix.specs", "org.apache.servicemix.specs.stax-api-1.0"),
+            getBundle("org.apache.servicemix.specs", "org.apache.servicemix.specs.jaxp-api-1.3"),
 		};
 	}
 
     public void testDocumentBuilderFactory() throws Exception {
-		assertNotNull(javax.xml.parsers.DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument());
+        try {
+            DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
+            fail("Implementation should not have been found");
+        } catch (Throwable t) {
+        }
+        Bundle b = installBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.jaxp-ri",
null, "jar");
+        Thread.sleep(100);
+		assertNotNull(DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument());
+        b.uninstall();
     }
 
     public void testTransformerFactory() throws Exception {
-        assertNotNull(javax.xml.transform.TransformerFactory.newInstance().newTransformer());
+        try {
+            TransformerFactory.newInstance().newTransformer();
+            fail("Implementation should not have been found");
+        } catch (Throwable t) {
+        }
+        Bundle b = installBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.jaxp-ri",
null, "jar");
+        Thread.sleep(100);
+        assertNotNull(TransformerFactory.newInstance().newTransformer());
+        b.uninstall();
     }
 
     public void testSchemaFactory() throws Exception {
-        assertNotNull(javax.xml.validation.SchemaFactory.newInstance("http://www.w3.org/2001/XMLSchema").newSchema());
+        try {
+            SchemaFactory.newInstance("http://www.w3.org/2001/XMLSchema").newSchema();
+            fail("Implementation should not have been found");
+        } catch (Throwable t) {
+        }
+        Bundle b = installBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.jaxp-ri",
null, "jar");
+        Thread.sleep(100);
+        assertNotNull(SchemaFactory.newInstance("http://www.w3.org/2001/XMLSchema").newSchema());
+        b.uninstall();
     }
 
     public void testWoodstox() throws Exception {
-        //JDK 1.6 and above ship with a StaX implementation 
-        if (System.getProperty("java.version").startsWith("1.5")) {
-            Thread.currentThread().setContextClassLoader(XMLInputFactory.class.getClassLoader());
-            System.err.println(XMLInputFactory.class.getClassLoader());
-            System.err.println(getClass().getClassLoader());
-            XMLInputFactory factory = null;
-            try {
-                factory = XMLInputFactory.newInstance();
-                fail("Factory should not have been found");
-            } catch (Throwable t) {
-                System.err.println(t.getMessage());
-            }
-            assertNull(factory);
-            installBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.woodstox",
null, "jar");
-            assertNotNull(XMLInputFactory.newInstance());
+        try {
+            XMLInputFactory.newInstance();
+            fail("Implementation should not have been found");
+        } catch (Throwable t) {
         }
+        Bundle b = installBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.jaxp-ri",
null, "jar");
+        assertNotNull(XMLInputFactory.newInstance());
+        b.uninstall();
     }
 
 }

Modified: servicemix/smx4/kernel/trunk/testing/support/src/main/java/org/apache/servicemix/kernel/testing/support/AbstractIntegrationTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/testing/support/src/main/java/org/apache/servicemix/kernel/testing/support/AbstractIntegrationTest.java?rev=707358&r1=707357&r2=707358&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/testing/support/src/main/java/org/apache/servicemix/kernel/testing/support/AbstractIntegrationTest.java
(original)
+++ servicemix/smx4/kernel/trunk/testing/support/src/main/java/org/apache/servicemix/kernel/testing/support/AbstractIntegrationTest.java
Thu Oct 23 05:11:46 2008
@@ -110,11 +110,12 @@
 		};
     }
 
-    protected void installBundle(String groupId, String artifactId, String classifier, String
type) throws Exception {
+    protected Bundle installBundle(String groupId, String artifactId, String classifier,
String type) throws Exception {
         String version = getBundleVersion(groupId, artifactId);
         File loc = localMavenBundle(groupId, artifactId, version, classifier, type);
         Bundle bundle = bundleContext.installBundle(loc.toURI().toString());
         bundle.start();
+        return bundle;
     }
 
     protected Resource locateBundle(String bundleId) {

Modified: servicemix/smx4/kernel/trunk/testing/support/src/main/resources/org/apache/servicemix/kernel/testing/support/felix.config.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/testing/support/src/main/resources/org/apache/servicemix/kernel/testing/support/felix.config.properties?rev=707358&r1=707357&r2=707358&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/testing/support/src/main/resources/org/apache/servicemix/kernel/testing/support/felix.config.properties
(original)
+++ servicemix/smx4/kernel/trunk/testing/support/src/main/resources/org/apache/servicemix/kernel/testing/support/felix.config.properties
Thu Oct 23 05:11:46 2008
@@ -26,12 +26,6 @@
  org.osgi.service.url; version=1.0.0, \
  org.apache.servicemix.kernel.main.spi; version=1.0.0, \
  org.apache.servicemix.kernel.jaas.boot, \
- com.sun.org.apache.xalan.internal.xsltc.trax, \
- com.sun.org.apache.xerces.internal.dom, \
- com.sun.org.apache.xerces.internal.jaxp, \
- com.sun.org.apache.xerces.internal.jaxp.datatype, \
- com.sun.org.apache.xerces.internal.jaxp.validation.xs, \
- com.sun.org.apache.xerces.internal.xni, \
  ${jre-${java.specification.version}}
 org.osgi.framework.bootdelegation=sun.*,com.sun.management*,
 
@@ -130,16 +124,6 @@
  javax.swing.text.rtf; \
  javax.swing.tree; \
  javax.swing.undo; \
- javax.xml; \
- javax.xml.datatype; \
- javax.xml.namespace; \
- javax.xml.parsers; \
- javax.xml.transform; \
- javax.xml.transform.dom; \
- javax.xml.transform.sax; \
- javax.xml.transform.stream; \
- javax.xml.validation; \
- javax.xml.xpath; \
  org.ietf.jgss; \
  org.omg.CORBA; \
  org.omg.CORBA_2_3; \
@@ -170,19 +154,6 @@
  org.omg.SendingContext; \
  org.omg.stub.java.rmi; \
  org.omg.stub.javax.management.remote.rmi; \
- org.w3c.dom; \
- org.w3c.dom.bootstrap; \
- org.w3c.dom.css; \
- org.w3c.dom.events; \
- org.w3c.dom.html; \
- org.w3c.dom.ls; \
- org.w3c.dom.ranges; \
- org.w3c.dom.stylesheets; \
- org.w3c.dom.traversal; \
- org.w3c.dom.views; \
- org.xml.sax; \
- org.xml.sax.ext; \
- org.xml.sax.helpers; \
  sun.misc; \
  sun.reflect; \
  version="1.5.0"
@@ -268,39 +239,6 @@
  javax.swing.tree; \
  javax.swing.undo; \
  javax.tools; \
- 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.crypto; \
- javax.xml.crypto.dom; \
- javax.xml.crypto.dsig; \
- javax.xml.crypto.dsig.dom; \
- javax.xml.crypto.dsig.keyinfo; \
- javax.xml.crypto.dsig.spec; \
- javax.xml.datatype; \
- javax.xml.namespace; \
- javax.xml.parsers; \
- javax.xml.soap; \
- javax.xml.stream; \
- javax.xml.stream.events; \
- javax.xml.stream.util; \
- javax.xml.transform; \
- javax.xml.transform.dom; \
- javax.xml.transform.sax; \
- javax.xml.transform.stax; \
- javax.xml.transform.stream; \
- javax.xml.validation; \
- javax.xml.ws; \
- javax.xml.ws.handler; \
- javax.xml.ws.handler.soap; \
- javax.xml.ws.http; \
- javax.xml.ws.soap; \
- javax.xml.ws.spi; \
- javax.xml.xpath; \
  org.ietf.jgss; \
  org.omg.CORBA; \
  org.omg.CORBA_2_3; \
@@ -331,20 +269,6 @@
  org.omg.SendingContext; \
  org.omg.stub.java.rmi; \
  org.omg.stub.javax.management.remote.rmi; \
- org.w3c.dom; \
- org.w3c.dom.bootstrap; \
- org.w3c.dom.css; \
- org.w3c.dom.events; \
- org.w3c.dom.html; \
- org.w3c.dom.ls; \
- org.w3c.dom.ranges; \
- org.w3c.dom.stylesheets; \
- org.w3c.dom.traversal; \
- org.w3c.dom.views; \
- org.w3c.dom.xpath; \
- org.xml.sax; \
- org.xml.sax.ext; \
- org.xml.sax.helpers; \
  sun.misc; \
  sun.reflect; \
  version="1.6.0"



Mime
View raw message