Author: ffang
Date: Thu Apr 7 10:25:56 2011
New Revision: 1089810
URL: http://svn.apache.org/viewvc?rev=1089810&view=rev
Log:
[SMX4-799]use the latest xerces to replace the jaxp-ri-1.4.4 to resolve
cocurrent issue
Modified:
servicemix/smx4/features/trunk/assembly/pom.xml
servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml
servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml
servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/system.properties
servicemix/smx4/features/trunk/pom.xml
Modified: servicemix/smx4/features/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/pom.xml?rev=1089810&r1=1089809&r2=1089810&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/features/trunk/assembly/pom.xml Thu Apr 7 10:25:56 2011
@@ -100,6 +100,16 @@
<groupId>com.sun.xml.parsers</groupId>
<artifactId>jaxp-ri</artifactId>
</dependency>
+ <!--Xerces jar to be included in lib/endorsed -->
+ <dependency>
+ <groupId>org.apache.xerces</groupId>
+ <artifactId>xml-apis</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </dependency>
+
</dependencies>
<build>
Modified:
servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml?rev=1089810&r1=1089809&r2=1089810&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml
(original)
+++ servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml
Thu Apr 7 10:25:56 2011
@@ -336,7 +336,8 @@
<dependencySet>
<outputDirectory>/lib/endorsed</outputDirectory>
<includes>
- <include>com.sun.xml.parsers:jaxp-ri</include>
+ <include>org.apache.xerces:xercesImpl</include>
+ <include>org.apache.xerces:xml-apis</include>
</includes>
</dependencySet>
<dependencySet>
Modified:
servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml?rev=1089810&r1=1089809&r2=1089810&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml
(original)
+++
servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml
Thu Apr 7 10:25:56 2011
@@ -320,7 +320,8 @@
<dependencySet>
<outputDirectory>/lib/endorsed</outputDirectory>
<includes>
- <include>com.sun.xml.parsers:jaxp-ri</include>
+ <include>org.apache.xerces:xercesImpl</include>
+ <include>org.apache.xerces:xml-apis</include>
</includes>
</dependencySet>
<dependencySet>
Modified:
servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/system.properties
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/system.properties?rev=1089810&r1=1089809&r2=1089810&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/system.properties
(original)
+++
servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/system.properties
Thu Apr 7 10:25:56 2011
@@ -69,3 +69,7 @@ org.osgi.service.http.port=8181
# Allow usage of ${servicemix.home} as an alias for ${karaf.home}
#
servicemix.home=${karaf.home}
+
+
+
+javax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl
Modified: servicemix/smx4/features/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=1089810&r1=1089809&r2=1089810&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/pom.xml (original)
+++ servicemix/smx4/features/trunk/pom.xml Thu Apr 7 10:25:56 2011
@@ -204,6 +204,7 @@
<drools.version>5.1.1</drools.version>
<javax.mail.version>1.4.3</javax.mail.version>
<jaxp-ri.version>1.4.4</jaxp-ri.version>
+ <xerces.version>2.11.0</xerces.version>
<jaxws-api.version>2.2</jaxws-api.version>
<jetty.version>7.3.1.v20110307</jetty.version>
<jettison.version>1.2</jettison.version>
@@ -558,6 +559,16 @@
<version>${jaxp-ri.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>${xerces.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xerces</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>${xerces.version}</version>
+ </dependency>
+ <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>${commons-logging.version}</version>
