Author: gnodet
Date: Sat Nov 1 07:39:27 2008
New Revision: 709702
URL: http://svn.apache.org/viewvc?rev=709702&view=rev
Log:
SMX4KNL-131: Include JAXP 1.4 API
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/filtered-resources/etc/startup.properties
servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/filtered-resources/org/apache/servicemix/kernel/gshell/admin/etc/startup.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/pom.xml
servicemix/smx4/kernel/trunk/testing/support/src/main/java/org/apache/servicemix/kernel/testing/support/AbstractIntegrationTest.java
Modified: servicemix/smx4/kernel/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/assembly/pom.xml?rev=709702&r1=709701&r2=709702&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/assembly/pom.xml Sat Nov 1 07:39:27 2008
@@ -128,11 +128,7 @@
</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>
+ <artifactId>org.apache.servicemix.specs.jaxp-api-1.4</artifactId>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
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=709702&r1=709701&r2=709702&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 Sat
Nov 1 07:39:27 2008
@@ -184,8 +184,7 @@
<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>
+
<include>org.apache.servicemix.specs:org.apache.servicemix.specs.jaxp-api-1.4</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=709702&r1=709701&r2=709702&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
Sat Nov 1 07:39:27 2008
@@ -176,8 +176,7 @@
<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>
+
<include>org.apache.servicemix.specs:org.apache.servicemix.specs.jaxp-api-1.4</include>
</includes>
</dependencySet>
<dependencySet>
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=709702&r1=709701&r2=709702&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
Sat Nov 1 07:39:27 2008
@@ -25,8 +25,7 @@
#
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/specs/org.apache.servicemix.specs.jaxp-api-1.4/${servicemix.specs.version}/org.apache.servicemix.specs.jaxp-api-1.4-${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
Modified:
servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/filtered-resources/org/apache/servicemix/kernel/gshell/admin/etc/startup.properties
URL:
http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/filtered-resources/org/apache/servicemix/kernel/gshell/admin/etc/startup.properties?rev=709702&r1=709701&r2=709702&view=diff
==============================================================================
---
servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/filtered-resources/org/apache/servicemix/kernel/gshell/admin/etc/startup.properties
(original)
+++
servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/filtered-resources/org/apache/servicemix/kernel/gshell/admin/etc/startup.properties
Sat Nov 1 07:39:27 2008
@@ -25,8 +25,7 @@
#
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/specs/org.apache.servicemix.specs.jaxp-api-1.4/${servicemix.specs.version}/org.apache.servicemix.specs.jaxp-api-1.4-${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
Modified: servicemix/smx4/kernel/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/pom.xml?rev=709702&r1=709701&r2=709702&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/pom.xml Sat Nov 1 07:39:27 2008
@@ -645,12 +645,7 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.specs</groupId>
-
<artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId>
- <version>${servicemix.specs.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.specs</groupId>
-
<artifactId>org.apache.servicemix.specs.jaxp-api-1.3</artifactId>
+
<artifactId>org.apache.servicemix.specs.jaxp-api-1.4</artifactId>
<version>${servicemix.specs.version}</version>
</dependency>
<dependency>
Modified: servicemix/smx4/kernel/trunk/testing/itests/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/testing/itests/pom.xml?rev=709702&r1=709701&r2=709702&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/testing/itests/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/testing/itests/pom.xml Sat Nov 1 07:39:27 2008
@@ -41,12 +41,7 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.jaxp-api-1.3</artifactId>
+ <artifactId>org.apache.servicemix.specs.jaxp-api-1.4</artifactId>
<scope>test</scope>
</dependency>
<dependency>
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=709702&r1=709701&r2=709702&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
Sat Nov 1 07:39:27 2008
@@ -69,8 +69,7 @@
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.3"),
- 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.4"),
getBundle("org.apache.felix", "org.osgi.compendium"),
getBundle("org.apache.felix", "org.apache.felix.configadmin"),
getBundle("org.ops4j.pax.logging", "pax-logging-api"),
Modified: servicemix/smx4/kernel/trunk/testing/support/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/testing/support/pom.xml?rev=709702&r1=709701&r2=709702&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/testing/support/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/testing/support/pom.xml Sat Nov 1 07:39:27
2008
@@ -72,11 +72,7 @@
</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>
+ <artifactId>org.apache.servicemix.specs.jaxp-api-1.4</artifactId>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
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=709702&r1=709701&r2=709702&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
Sat Nov 1 07:39:27 2008
@@ -89,8 +89,7 @@
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.3"),
- 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.4"),
getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.jaxp-ri"),
getBundle("org.apache.felix", "org.osgi.compendium"),
getBundle("org.apache.felix", "org.apache.felix.configadmin"),
