Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

resolve some failures and ref to old config namespace 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@814757 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Gary Tully 2009-09-14 18:05:43 +00:00
parent bdd989a975
commit 72b941603a
4 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java
View File

@ -415,6 +415,8 @@ public class BrokerService implements Service {
public void start(boolean force) throws Exception { public void start(boolean force) throws Exception {
forceStart = force; forceStart = force;
stopped.set(false);
started.set(false);
start(); start();
} }

12
activemq-core/src/test/java/org/apache/activemq/xbean/ConnectorXBeanConfigTest.java
View File

@ -61,16 +61,12 @@ public class ConnectorXBeanConfigTest extends TestCase {
} }
public void testBrokerRestartFails() throws Exception { public void testBrokerRestartIsAllowed() throws Exception {
brokerService.stop(); brokerService.stop();
brokerService.waitUntilStopped(); brokerService.waitUntilStopped();
try { // redundant start is now ignored
brokerService.start(); brokerService.start();
} catch (Exception e) {
return;
}
fail("Error broker should have prevented us from starting it again");
} }
public void testForceBrokerRestart() throws Exception { public void testForceBrokerRestart() throws Exception {

4
activemq-core/src/test/resources/org/apache/activemq/transport/stomp/niostomp-auth-broker.xml
View File

@ -25,7 +25,7 @@
<property name="annotatedClass"><value>org.apache.activemq.transport.stomp.SamplePojo</value></property> <property name="annotatedClass"><value>org.apache.activemq.transport.stomp.SamplePojo</value></property>
</bean> </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> <transportConnectors>
<transportConnector name="stomp+nio" uri="stomp+nio://localhost:61612"/> <transportConnector name="stomp+nio" uri="stomp+nio://localhost:61612"/>
@ -64,4 +64,4 @@
</plugins> </plugins>
</broker> </broker>
</beans> </beans>

4
activemq-core/src/test/resources/org/apache/activemq/transport/stomp/sslstomp-auth-broker.xml
View File

@ -25,7 +25,7 @@
<property name="annotatedClass"><value>org.apache.activemq.transport.stomp.SamplePojo</value></property> <property name="annotatedClass"><value>org.apache.activemq.transport.stomp.SamplePojo</value></property>
</bean> </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> <transportConnectors>
<transportConnector name="stomp+ssl" uri="stomp+ssl://localhost:61612"/> <transportConnector name="stomp+ssl" uri="stomp+ssl://localhost:61612"/>
@ -64,4 +64,4 @@
</plugins> </plugins>
</broker> </broker>
</beans> </beans>