Author: ffang
Date: Thu Sep 3 03:30:24 2009
New Revision: 810769
URL: http://svn.apache.org/viewvc?rev=810769&view=rev
Log:
[SMX4-348]use XmlSchema 1.4.5 directly as it's already a bundle
Modified:
servicemix/smx4/features/trunk/assembly/pom.xml
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
servicemix/smx4/features/trunk/camel/camel-features/src/main/resources/bundles.properties
servicemix/smx4/features/trunk/examples/itests/tests/pom.xml
servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java
servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
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=810769&r1=810768&r2=810769&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/features/trunk/assembly/pom.xml Thu Sep 3 03:30:24 2009
@@ -150,8 +150,8 @@
<version>${saaj.impl.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.xmlsec</artifactId>
+ <groupId>org.apache.ws.commons.schema</groupId>
+ <artifactId>XmlSchema</artifactId>
<version>${xmlsec.version}</version>
</dependency>
<dependency>
@@ -335,8 +335,8 @@
<version>${neethi.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.xmlschema</artifactId>
+ <groupId>org.apache.ws.commons.schema</groupId>
+ <artifactId>XmlSchema</artifactId>
<version>${xmlschema.version}</version>
</dependency>
<dependency>
Modified:
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml?rev=810769&r1=810768&r2=810769&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
(original)
+++
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
Thu Sep 3 03:30:24 2009
@@ -63,7 +63,7 @@
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saaj-impl/${saaj.impl.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.woodstox/${woodstox.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.wsdl4j/${wsdl4j.version}</bundle>
-
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlschema/${xmlschema.version}</bundle>
+
<bundle>mvn:org.apache.ws.commons.schema/XmlSchema/${xmlschema.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${xmlresolver.version}</bundle>
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr311-api-${jaxrs.api.version}/${servicemix.specs.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlsec/${xmlsec.version}</bundle>
@@ -198,7 +198,7 @@
<feature
version="${servicemix-shared-version}">servicemix-shared</feature>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-codec/${commons-codec.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons.httpclient.version}</bundle>
-
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlschema/${xmlschema.version}</bundle>
+
<bundle>mvn:org.apache.ws.commons.schema/XmlSchema/${xmlschema.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlsec/${xmlsec.version}</bundle>
<bundle>mvn:org.apache.ws.security/wss4j/${wss4j.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty-bundle/${jetty.bundle.version}</bundle>
@@ -208,7 +208,7 @@
</feature>
<feature name="servicemix-jms" version="${servicemix-jms-version}">
<feature
version="${servicemix-shared-version}">servicemix-shared</feature>
-
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlschema/${xmlschema.version}</bundle>
+
<bundle>mvn:org.apache.ws.commons.schema/XmlSchema/${xmlschema.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlsec/${xmlsec.version}</bundle>
<bundle>mvn:org.apache.ws.security/wss4j/${wss4j.version}</bundle>
<bundle>mvn:org.apache.servicemix/servicemix-soap/${servicemix-shared-version}</bundle>
Modified:
servicemix/smx4/features/trunk/camel/camel-features/src/main/resources/bundles.properties
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/camel-features/src/main/resources/bundles.properties?rev=810769&r1=810768&r2=810769&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/camel/camel-features/src/main/resources/bundles.properties
(original)
+++
servicemix/smx4/features/trunk/camel/camel-features/src/main/resources/bundles.properties
Thu Sep 3 03:30:24 2009
@@ -84,7 +84,6 @@
org.apache.servicemix.bundles/org.apache.servicemix.bundles.wsdl4j/${wsdl4j.version}/jar
org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlbeans/${xmlbeans.version}/jar
org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${xmlresolver.version}/jar
-org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlschema/${xmlschema.version}/jar
org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/${xpp3.version}/jar
org.apache.servicemix.bundles/org.apache.servicemix.bundles.xstream/${xstream.bundle.version}/jar
@@ -92,6 +91,7 @@
org.apache.cxf/cxf-bundle/${cxf.version}/jar
#Other bundles
+org.apache.ws.commons.schema/XmlSchema/${xmlschema.version}/jar
commons-collections/commons-collections/3.2.1/jar
commons-lang/commons-lang/2.4/jar
commons-pool/commons-pool/1.4/jar
Modified: servicemix/smx4/features/trunk/examples/itests/tests/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/tests/pom.xml?rev=810769&r1=810768&r2=810769&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/tests/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/itests/tests/pom.xml Thu Sep 3
03:30:24 2009
@@ -115,8 +115,8 @@
<version>${wsdl4j.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.xmlschema</artifactId>
+ <groupId>org.apache.ws.commons.schema</groupId>
+ <artifactId>XmlSchema</artifactId>
<version>${xmlschema.version}</version>
</dependency>
<dependency>
Modified:
servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java?rev=810769&r1=810768&r2=810769&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java
(original)
+++
servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java
Thu Sep 3 03:30:24 2009
@@ -94,7 +94,7 @@
getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.saaj-impl"),
getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.woodstox"),
getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.wsdl4j"),
- getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.xmlschema"),
+ getBundle("org.apache.ws.commons.schema", "XmlSchema"),
getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.xmlsec"),
getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.xmlresolver"),
getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.jetty-bundle"),
Modified:
servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java?rev=810769&r1=810768&r2=810769&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
(original)
+++
servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
Thu Sep 3 03:30:24 2009
@@ -108,7 +108,7 @@
getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.saaj-impl"),
getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.woodstox"),
getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.wsdl4j"),
- getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.xmlschema"),
+ getBundle("org.apache.ws.commons.schema", "XmlSchema"),
getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.xmlsec"),
getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.xmlresolver"),
getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.jetty-bundle"),
Modified: servicemix/smx4/features/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=810769&r1=810768&r2=810769&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/pom.xml (original)
+++ servicemix/smx4/features/trunk/pom.xml Thu Sep 3 03:30:24 2009
@@ -218,7 +218,7 @@
<xstream.bundle.version>1.3_1</xstream.bundle.version>
<xbean.version>3.5</xbean.version>
<xmlbeans.version>2.4.0_2</xmlbeans.version>
- <xmlschema.version>1.4.3_1</xmlschema.version>
+ <xmlschema.version>1.4.5</xmlschema.version>
<xmlsec.version>1.4.3_1-SNAPSHOT</xmlsec.version>
<opensaml.version>1.1_1</opensaml.version>
<xmlresolver.version>1.2_1</xmlresolver.version>
