You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ac...@apache.org on 2007/06/13 08:48:21 UTC
svn commit: r546755 - in /activemq/trunk/activemq-core/src/test:
java/org/apache/activemq/spring/SpringTest.java
resources/spring-embedded-xbean-local.xml resources/spring-embedded-xbean.xml
Author: aco
Date: Tue Jun 12 23:48:20 2007
New Revision: 546755
URL: http://svn.apache.org/viewvc?view=rev&rev=546755
Log:
Added fix for http://issues.apache.org/activemq/browse/AMQ-1014 and http://issues.apache.org/activemq/browse/AMQ-1002
Modified:
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/spring/SpringTest.java
activemq/trunk/activemq-core/src/test/resources/spring-embedded-xbean-local.xml
activemq/trunk/activemq-core/src/test/resources/spring-embedded-xbean.xml
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/spring/SpringTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/spring/SpringTest.java?view=diff&rev=546755&r1=546754&r2=546755
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/spring/SpringTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/spring/SpringTest.java Tue Jun 12 23:48:20 2007
@@ -129,13 +129,10 @@
/**
* Spring configured test case that tests the remotely deployed xsd
* http://people.apache.org/repository/org.apache.activemq/xsds/activemq-core-4.1-SNAPSHOT.xsd
- *
- * Broken: http://issues.apache.org/activemq/browse/AMQ-1002
- * Needs to be fixed.
- *
+ *
* @throws Exception
*/
- public void XtestSenderWithSpringXmlUsingSpring2NamespacesWithEmbeddedBrokerConfiguredViaXml() throws Exception {
+ public void testSenderWithSpringXmlUsingSpring2NamespacesWithEmbeddedBrokerConfiguredViaXml() throws Exception {
String config = "spring-embedded-xbean.xml";
assertSenderConfig(config);
}
Modified: activemq/trunk/activemq-core/src/test/resources/spring-embedded-xbean-local.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/spring-embedded-xbean-local.xml?view=diff&rev=546755&r1=546754&r2=546755
==============================================================================
--- activemq/trunk/activemq-core/src/test/resources/spring-embedded-xbean-local.xml (original)
+++ activemq/trunk/activemq-core/src/test/resources/spring-embedded-xbean-local.xml Tue Jun 12 23:48:20 2007
@@ -21,7 +21,7 @@
xmlns="http://www.springframework.org/schema/beans"
xmlns:amq="http://activemq.org/config/1.0"
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.xsd
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
http://activemq.org/config/1.0 file:./target/xbean/activemq.xsd">
<!-- lets create an embedded ActiveMQ Broker -->
Modified: activemq/trunk/activemq-core/src/test/resources/spring-embedded-xbean.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/spring-embedded-xbean.xml?view=diff&rev=546755&r1=546754&r2=546755
==============================================================================
--- activemq/trunk/activemq-core/src/test/resources/spring-embedded-xbean.xml (original)
+++ activemq/trunk/activemq-core/src/test/resources/spring-embedded-xbean.xml Tue Jun 12 23:48:20 2007
@@ -21,7 +21,7 @@
xmlns="http://www.springframework.org/schema/beans"
xmlns:amq="http://activemq.org/config/1.0"
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.xsd
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
http://activemq.org/config/1.0 http://people.apache.org/repository/org.apache.activemq/xsds/activemq-core-4.1-SNAPSHOT.xsd">
<!-- lets create an embedded ActiveMQ Broker -->