mirror of https://github.com/apache/activemq.git
The ItStillMarshallsTheSameTest looks like it's passing
Also did some work to get the http://jira.activemq.org/jira/browse/AMQ-522 to pass. git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@415356 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
140daf436c
commit
65e40d03da
|
@ -221,9 +221,6 @@
|
|||
<!-- These are performance tests so take too long to run -->
|
||||
<exclude>**/perf/*</exclude>
|
||||
|
||||
<!-- This test currently fails -->
|
||||
<exclude>**/ItStillMarshallsTheSameTest.*</exclude>
|
||||
|
||||
<!-- http://jira.activemq.org/jira/browse/AMQ-522 -->
|
||||
<exclude>**/ProxyConnectorTest.*</exclude>
|
||||
|
||||
|
|
|
@ -152,7 +152,11 @@ public class ProxyConnector implements Service {
|
|||
|
||||
public String getName() {
|
||||
if( name == null ) {
|
||||
if( server!=null ) {
|
||||
name = server.getConnectURI().toString();
|
||||
} else {
|
||||
name = "proxy";
|
||||
}
|
||||
}
|
||||
return name;
|
||||
}
|
||||
|
|
|
@ -50,6 +50,7 @@ public class ProxyTestSupport extends BrokerTestSupport {
|
|||
|
||||
connector = service.addConnector(getLocalURI());
|
||||
proxyConnector=new ProxyConnector();
|
||||
proxyConnector.setName("proxy");
|
||||
proxyConnector.setBind(new URI(getLocalProxyURI()));
|
||||
proxyConnector.setRemote(new URI("fanout:static://"+getRemoteURI()));
|
||||
service.addProxyConnector(proxyConnector);
|
||||
|
@ -64,6 +65,7 @@ public class ProxyTestSupport extends BrokerTestSupport {
|
|||
|
||||
remoteConnector = service.addConnector(getRemoteURI());
|
||||
remoteProxyConnector = new ProxyConnector();
|
||||
remoteProxyConnector.setName("remoteProxy");
|
||||
remoteProxyConnector.setBind(new URI(getRemoteProxyURI()));
|
||||
remoteProxyConnector.setRemote(new URI("fanout:static://"+getLocalURI()));
|
||||
service.addProxyConnector(remoteProxyConnector);
|
||||
|
|
Loading…
Reference in New Issue