From 618380f66eb98814864c9367243a010d6d44be13 Mon Sep 17 00:00:00 2001 From: "Hiram R. Chirino" Date: Fri, 18 Apr 2008 16:31:27 +0000 Subject: [PATCH] Updating the xsd location.. git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@649594 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/activemq/soaktest/LoadTest-context.xml | 2 +- .../soaktest/localBroker/LocalBrokerLoadTest-context.xml | 2 +- .../LocalBrokerParallelProducerLoadTest-context.xml | 2 +- activemq-core/src/main/resources/META-INF/spring.schemas | 4 +--- .../test/resources/org/apache/activemq/memory/activemq.xml | 2 +- .../src/test/resources/spring-embedded-xbean-noversion.xml | 2 +- activemq-core/src/test/resources/spring-embedded-xbean.xml | 2 +- assembly/src/release/conf/activemq.xml | 2 +- assembly/src/release/example/conf/activemq.xml | 2 +- 9 files changed, 9 insertions(+), 11 deletions(-) diff --git a/activemq-camel-loadtest/src/test/resources/org/apache/activemq/soaktest/LoadTest-context.xml b/activemq-camel-loadtest/src/test/resources/org/apache/activemq/soaktest/LoadTest-context.xml index ca28e2ceec..fc0825f8eb 100644 --- a/activemq-camel-loadtest/src/test/resources/org/apache/activemq/soaktest/LoadTest-context.xml +++ b/activemq-camel-loadtest/src/test/resources/org/apache/activemq/soaktest/LoadTest-context.xml @@ -21,7 +21,7 @@ xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd - http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core-5.0.0.xsd + http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd "> diff --git a/activemq-camel-loadtest/src/test/resources/org/apache/activemq/soaktest/localBroker/LocalBrokerLoadTest-context.xml b/activemq-camel-loadtest/src/test/resources/org/apache/activemq/soaktest/localBroker/LocalBrokerLoadTest-context.xml index 9a5948caee..d51f6149a5 100644 --- a/activemq-camel-loadtest/src/test/resources/org/apache/activemq/soaktest/localBroker/LocalBrokerLoadTest-context.xml +++ b/activemq-camel-loadtest/src/test/resources/org/apache/activemq/soaktest/localBroker/LocalBrokerLoadTest-context.xml @@ -21,7 +21,7 @@ xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd - http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core-5.0.0.xsd + http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd "> diff --git a/activemq-camel-loadtest/src/test/resources/org/apache/activemq/soaktest/localBroker/LocalBrokerParallelProducerLoadTest-context.xml b/activemq-camel-loadtest/src/test/resources/org/apache/activemq/soaktest/localBroker/LocalBrokerParallelProducerLoadTest-context.xml index 299617d59c..3b9176e50b 100644 --- a/activemq-camel-loadtest/src/test/resources/org/apache/activemq/soaktest/localBroker/LocalBrokerParallelProducerLoadTest-context.xml +++ b/activemq-camel-loadtest/src/test/resources/org/apache/activemq/soaktest/localBroker/LocalBrokerParallelProducerLoadTest-context.xml @@ -21,7 +21,7 @@ xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd - http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core-5.0.0.xsd + http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd "> diff --git a/activemq-core/src/main/resources/META-INF/spring.schemas b/activemq-core/src/main/resources/META-INF/spring.schemas index bb8e6aed93..0fd7b385c2 100644 --- a/activemq-core/src/main/resources/META-INF/spring.schemas +++ b/activemq-core/src/main/resources/META-INF/spring.schemas @@ -14,9 +14,7 @@ ## See the License for the specific language governing permissions and ## limitations under the License. ## --------------------------------------------------------------------------- - -# attempt to resolve the namespace URI to a schema if no XSD is mentioned in the doc -# TODO this is EXPERIMENTAL - it might not actually be used! http\://activemq.org/config/1.0=activemq.xsd http\://activemq.org/config/1.0/1.0.xsd=activemq.xsd http\://activemq.apache.org/schema/core=activemq.xsd +http\://activemq.apache.org/schema/core/activemq-core.xsd=activemq.xsd diff --git a/activemq-core/src/test/resources/org/apache/activemq/memory/activemq.xml b/activemq-core/src/test/resources/org/apache/activemq/memory/activemq.xml index f8eac26625..ccd66f96b9 100644 --- a/activemq-core/src/test/resources/org/apache/activemq/memory/activemq.xml +++ b/activemq-core/src/test/resources/org/apache/activemq/memory/activemq.xml @@ -20,7 +20,7 @@ xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd - http://activemq.apache.org/schema/core http://activemq.apache.org/schema/activemq-core.xsd + http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd"> diff --git a/activemq-core/src/test/resources/spring-embedded-xbean-noversion.xml b/activemq-core/src/test/resources/spring-embedded-xbean-noversion.xml index 1e47b0565f..e21073c3a3 100755 --- a/activemq-core/src/test/resources/spring-embedded-xbean-noversion.xml +++ b/activemq-core/src/test/resources/spring-embedded-xbean-noversion.xml @@ -22,7 +22,7 @@ xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd - http://activemq.apache.org/schema/core http://activemq.apache.org/schema/activemq-core.xsd"> + http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd"> diff --git a/activemq-core/src/test/resources/spring-embedded-xbean.xml b/activemq-core/src/test/resources/spring-embedded-xbean.xml index 457fe704b2..e21073c3a3 100755 --- a/activemq-core/src/test/resources/spring-embedded-xbean.xml +++ b/activemq-core/src/test/resources/spring-embedded-xbean.xml @@ -22,7 +22,7 @@ xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd - http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core-5.0.0.xsd"> + http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd"> diff --git a/assembly/src/release/conf/activemq.xml b/assembly/src/release/conf/activemq.xml index dc12d0007c..dff26fc70a 100755 --- a/assembly/src/release/conf/activemq.xml +++ b/assembly/src/release/conf/activemq.xml @@ -20,7 +20,7 @@ xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd - http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core-VERSION.xsd + http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd"> diff --git a/assembly/src/release/example/conf/activemq.xml b/assembly/src/release/example/conf/activemq.xml index b3d0570018..ddca8aace4 100644 --- a/assembly/src/release/example/conf/activemq.xml +++ b/assembly/src/release/example/conf/activemq.xml @@ -20,7 +20,7 @@ xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd - http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core-VERSION.xsd + http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd">