Author: gtully
Date: Mon Sep 14 18:05:43 2009
New Revision: 814757
URL: http://svn.apache.org/viewvc?rev=814757&view=rev
Log:
resolve some failures and ref to old config namespace
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/xbean/ConnectorXBeanConfigTest.java
activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/transport/stomp/niostomp-auth-broker.xml
activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/transport/stomp/sslstomp-auth-broker.xml
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java?rev=814757&r1=814756&r2=814757&view=diff
==============================================================================
---
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java
(original)
+++
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java
Mon Sep 14 18:05:43 2009
@@ -415,6 +415,8 @@
public void start(boolean force) throws Exception {
forceStart = force;
+ stopped.set(false);
+ started.set(false);
start();
}
Modified:
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/xbean/ConnectorXBeanConfigTest.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/xbean/ConnectorXBeanConfigTest.java?rev=814757&r1=814756&r2=814757&view=diff
==============================================================================
---
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/xbean/ConnectorXBeanConfigTest.java
(original)
+++
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/xbean/ConnectorXBeanConfigTest.java
Mon Sep 14 18:05:43 2009
@@ -61,16 +61,12 @@
}
- public void testBrokerRestartFails() throws Exception {
+ public void testBrokerRestartIsAllowed() throws Exception {
brokerService.stop();
brokerService.waitUntilStopped();
-
- try {
- brokerService.start();
- } catch (Exception e) {
- return;
- }
- fail("Error broker should have prevented us from starting it again");
+
+ // redundant start is now ignored
+ brokerService.start();
}
public void testForceBrokerRestart() throws Exception {
Modified:
activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/transport/stomp/niostomp-auth-broker.xml
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/transport/stomp/niostomp-auth-broker.xml?rev=814757&r1=814756&r2=814757&view=diff
==============================================================================
---
activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/transport/stomp/niostomp-auth-broker.xml
(original)
+++
activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/transport/stomp/niostomp-auth-broker.xml
Mon Sep 14 18:05:43 2009
@@ -25,7 +25,7 @@
<property
name="annotatedClass"><value>org.apache.activemq.transport.stomp.SamplePojo</value></property>
</bean>
- <broker useJmx="true" persistent="false"
xmlns="http://activemq.org/config/1.0"; populateJMSXUserID="true">
+ <broker useJmx="true" persistent="false"
xmlns="http://activemq.apache.org/schema/core"; populateJMSXUserID="true">
<transportConnectors>
<transportConnector name="stomp+nio"
uri="stomp+nio://localhost:61612"/>
@@ -64,4 +64,4 @@
</plugins>
</broker>
-</beans>
\ No newline at end of file
+</beans>
Modified:
activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/transport/stomp/sslstomp-auth-broker.xml
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/transport/stomp/sslstomp-auth-broker.xml?rev=814757&r1=814756&r2=814757&view=diff
==============================================================================
---
activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/transport/stomp/sslstomp-auth-broker.xml
(original)
+++
activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/transport/stomp/sslstomp-auth-broker.xml
Mon Sep 14 18:05:43 2009
@@ -25,7 +25,7 @@
<property
name="annotatedClass"><value>org.apache.activemq.transport.stomp.SamplePojo</value></property>
</bean>
- <broker useJmx="true" persistent="false"
xmlns="http://activemq.org/config/1.0"; populateJMSXUserID="true">
+ <broker useJmx="true" persistent="false"
xmlns="http://activemq.apache.org/schema/core"; populateJMSXUserID="true">
<transportConnectors>
<transportConnector name="stomp+ssl"
uri="stomp+ssl://localhost:61612"/>
@@ -64,4 +64,4 @@
</plugins>
</broker>
-</beans>
\ No newline at end of file
+</beans>
