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

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:
Hiram R. Chirino 2006-06-19 16:03:50 +00:00
parent 140daf436c
commit 65e40d03da
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
activemq-core/pom.xml
View File

@ -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>

6
activemq-core/src/main/java/org/apache/activemq/proxy/ProxyConnector.java
View File

@ -152,7 +152,11 @@ public class ProxyConnector implements Service {
public String getName() {
if( name == null ) {
name = server.getConnectURI().toString();
if( server!=null ) {
name = server.getConnectURI().toString();
} else {
name = "proxy";
}
}
return name;
}

2
activemq-core/src/test/java/org/apache/activemq/proxy/ProxyTestSupport.java
View File

@ -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);