You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ff...@apache.org on 2010/08/19 08:43:03 UTC
svn commit: r987037 - in /servicemix/smx4/nmr/trunk/testing/support: pom.xml
src/main/java/org/apache/servicemix/platform/testing/support/AbstractIntegrationTest.java
src/main/resources/org/apache/servicemix/platform/testing/support/config.properties
Author: ffang
Date: Thu Aug 19 06:43:02 2010
New Revision: 987037
URL: http://svn.apache.org/viewvc?rev=987037&view=rev
Log:
[SMX4NMR-220]platform/testing/support should use jaxp related api from system bundle, keep it same as we do currently in kit
Modified:
servicemix/smx4/nmr/trunk/testing/support/pom.xml
servicemix/smx4/nmr/trunk/testing/support/src/main/java/org/apache/servicemix/platform/testing/support/AbstractIntegrationTest.java
servicemix/smx4/nmr/trunk/testing/support/src/main/resources/org/apache/servicemix/platform/testing/support/config.properties
Modified: servicemix/smx4/nmr/trunk/testing/support/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/testing/support/pom.xml?rev=987037&r1=987036&r2=987037&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/testing/support/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/testing/support/pom.xml Thu Aug 19 06:43:02 2010
@@ -106,10 +106,6 @@
<artifactId>geronimo-servlet_2.5_spec</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.jaxp-api-1.4</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.aopalliance</artifactId>
</dependency>
@@ -126,10 +122,6 @@
<artifactId>woodstox-core-asl</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.jaxp-ri</artifactId>
- </dependency>
- <dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-mvn</artifactId>
</dependency>
Modified: servicemix/smx4/nmr/trunk/testing/support/src/main/java/org/apache/servicemix/platform/testing/support/AbstractIntegrationTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/testing/support/src/main/java/org/apache/servicemix/platform/testing/support/AbstractIntegrationTest.java?rev=987037&r1=987036&r2=987037&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/testing/support/src/main/java/org/apache/servicemix/platform/testing/support/AbstractIntegrationTest.java (original)
+++ servicemix/smx4/nmr/trunk/testing/support/src/main/java/org/apache/servicemix/platform/testing/support/AbstractIntegrationTest.java Thu Aug 19 06:43:02 2010
@@ -92,8 +92,6 @@ public class AbstractIntegrationTest ext
protected String[] getTestFrameworkBundlesNames() {
return new String[] {
getBundle("org.apache.geronimo.specs", "geronimo-servlet_2.5_spec"),
- getBundle("org.apache.servicemix.specs", "org.apache.servicemix.specs.jaxp-api-1.4"),
- getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.jaxp-ri"),
getBundle("org.osgi", "org.osgi.core"),
getBundle("org.osgi", "org.osgi.compendium"),
getBundle("org.apache.felix", "org.apache.felix.configadmin"),
Modified: servicemix/smx4/nmr/trunk/testing/support/src/main/resources/org/apache/servicemix/platform/testing/support/config.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/testing/support/src/main/resources/org/apache/servicemix/platform/testing/support/config.properties?rev=987037&r1=987036&r2=987037&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/testing/support/src/main/resources/org/apache/servicemix/platform/testing/support/config.properties (original)
+++ servicemix/smx4/nmr/trunk/testing/support/src/main/resources/org/apache/servicemix/platform/testing/support/config.properties Thu Aug 19 06:43:02 2010
@@ -29,7 +29,6 @@ org.osgi.framework.system.packages=org.o
org.osgi.util.tracker; version=1.3.3, \
${jre-${java.specification.version}}
org.osgi.framework.bootdelegation=sun.*,com.sun.management*
-
# To enable the use of the startup.properties file to control the start level:
felix.auto.start=startup.properties
#felix.auto.start=all
@@ -58,11 +57,17 @@ org.apache.servicemix.filemonitor.monito
org.apache.servicemix.filemonitor.generatedJarDir = ${servicemix.base}/data/generated-bundles
org.apache.servicemix.filemonitor.scanInterval = 500
-
#
# Java platform package export properties.
#
jre-1.5= \
+ 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; \
+ com.sun.org.apache.xerces.internal.jaxp.validation.xs; \
+ com.sun.jndi.ldap; \
javax.accessibility; \
javax.activity; \
javax.crypto; \
@@ -131,6 +136,17 @@ jre-1.5= \
javax.swing.text.rtf; \
javax.swing.tree; \
javax.swing.undo; \
+ javax.transaction; javax.transaction.xa; \
+ 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; \
@@ -161,16 +177,30 @@ jre-1.5= \
org.omg.SendingContext; \
org.omg.stub.java.rmi; \
org.omg.stub.javax.management.remote.rmi; \
- sun.misc; \
- sun.reflect; \
+ 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; \
version="1.5.0"
jre-1.6= \
+ 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.xni; \
+ com.sun.org.apache.xerces.internal.jaxp.validation; \
+ com.sun.jndi.ldap; \
javax.accessibility; \
- javax.activation; \
javax.activity; \
- javax.annotation; \
- javax.annotation.processing; \
javax.crypto; \
javax.crypto.interfaces; \
javax.crypto.spec; \
@@ -181,9 +211,6 @@ jre-1.6= \
javax.imageio.plugins.jpeg; \
javax.imageio.spi; \
javax.imageio.stream; \
- javax.jws; \
- javax.jws.soap; \
- javax.lang; \
javax.lang.model; \
javax.lang.model.element; \
javax.lang.model.type; \
@@ -246,6 +273,24 @@ jre-1.6= \
javax.swing.tree; \
javax.swing.undo; \
javax.tools; \
+ javax.transaction; javax.transaction.xa; \
+ javax.xml; \
+ 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.transform; \
+ javax.xml.transform.dom; \
+ javax.xml.transform.sax; \
+ javax.xml.transform.stax; \
+ javax.xml.transform.stream; \
+ javax.xml.validation; \
+ javax.xml.xpath; \
org.ietf.jgss; \
org.omg.CORBA; \
org.omg.CORBA_2_3; \
@@ -276,7 +321,19 @@ jre-1.6= \
org.omg.SendingContext; \
org.omg.stub.java.rmi; \
org.omg.stub.javax.management.remote.rmi; \
- sun.misc; \
- sun.reflect; \
+ 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; \
version="1.6.0"