svn commit: r415356 - in /incubator/activemq/trunk/activemq-core: pom.xml src/main/java/org/apache/activemq/proxy/ProxyConnector.java src/test/java/org/apache/activemq/proxy/ProxyTestSupport.java

[chirino]

Author: chirino
Date: Mon Jun 19 09:03:50 2006
New Revision: 415356

URL: http://svn.apache.org/viewvc?rev=415356&view=rev
Log:
The ItStillMarshallsTheSameTest looks like it's passing
Also did some work to get the http://jira.activemq.org/jira/browse/AMQ-522 to 
pass.


Modified:
    incubator/activemq/trunk/activemq-core/pom.xml
    
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/proxy/ProxyConnector.java
    
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/proxy/ProxyTestSupport.java

Modified: incubator/activemq/trunk/activemq-core/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/pom.xml?rev=415356&r1=415355&r2=415356&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/pom.xml (original)
+++ incubator/activemq/trunk/activemq-core/pom.xml Mon Jun 19 09:03:50 2006
@@ -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>
                 

Modified: 
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/proxy/ProxyConnector.java
URL: 
http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/proxy/ProxyConnector.java?rev=415356&r1=415355&r2=415356&view=diff
==============================================================================
--- 
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/proxy/ProxyConnector.java
 (original)
+++ 
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/proxy/ProxyConnector.java
 Mon Jun 19 09:03:50 2006
@@ -152,7 +152,11 @@
 
     public String getName() {
         if( name == null ) {
-            name = server.getConnectURI().toString();
+            if( server!=null ) {
+                name = server.getConnectURI().toString();
+            } else {
+                name = "proxy";
+            }
         }
         return name;
     }

Modified: 
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/proxy/ProxyTestSupport.java
URL: 
http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/proxy/ProxyTestSupport.java?rev=415356&r1=415355&r2=415356&view=diff
==============================================================================
--- 
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/proxy/ProxyTestSupport.java
 (original)
+++ 
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/proxy/ProxyTestSupport.java
 Mon Jun 19 09:03:50 2006
@@ -50,6 +50,7 @@
 
         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 @@
 
         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);