mirror of https://github.com/apache/activemq.git
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:
parent
bdd989a975
commit
72b941603a
|
@ -415,6 +415,8 @@ public class BrokerService implements Service {
|
|||
|
||||
public void start(boolean force) throws Exception {
|
||||
forceStart = force;
|
||||
stopped.set(false);
|
||||
started.set(false);
|
||||
start();
|
||||
}
|
||||
|
||||
|
|
|
@ -61,16 +61,12 @@ public class ConnectorXBeanConfigTest extends TestCase {
|
|||
|
||||
}
|
||||
|
||||
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 {
|
||||
|
|
|
@ -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>
|
||||
</beans>
|
||||
|
|
|
@ -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>
|
||||
</beans>
|
||||
|
|
Loading…
Reference in New Issue