activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gtu...@apache.org
Subject svn commit: r1208660 - in /activemq/trunk/activemq-core: ./ src/main/java/org/apache/activemq/transport/discovery/rendezvous/ src/main/java/org/apache/activemq/transport/discovery/zeroconf/ src/main/resources/META-INF/services/org/apache/activemq/trans...
Date Wed, 30 Nov 2011 18:31:24 GMT
Author: gtully
Date: Wed Nov 30 18:31:22 2011
New Revision: 1208660

URL: http://svn.apache.org/viewvc?rev=1208660&view=rev
Log:
https://issues.apache.org/jira/browse/AMQ-3613 - rename rendezvous discovery to zeroconf

Added:
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/zeroconf/
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/zeroconf/JmDNSFactory.java
  (contents, props changed)
      - copied, changed from r1208377, activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/rendezvous/JmDNSFactory.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/zeroconf/ZeroconfDiscoveryAgent.java
  (contents, props changed)
      - copied, changed from r1208377, activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/rendezvous/RendezvousDiscoveryAgent.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/zeroconf/ZeroconfDiscoveryAgentFactory.java
  (contents, props changed)
      - copied, changed from r1208377, activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/rendezvous/RendezvousDiscoveryAgentFactory.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/zeroconf/package.html
  (contents, props changed)
      - copied, changed from r1208377, activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/rendezvous/package.html
    activemq/trunk/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/zeroconf
      - copied, changed from r1208377, activemq/trunk/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/rendezvous
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/discovery/ZeroconfDiscoverTransportTest.java
  (contents, props changed)
      - copied, changed from r1208377, activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/discovery/RendezvousDiscoverTransportTest.java
Removed:
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/rendezvous/JmDNSFactory.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/rendezvous/RendezvousDiscoveryAgent.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/rendezvous/RendezvousDiscoveryAgentFactory.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/rendezvous/package.html
    activemq/trunk/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/rendezvous
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/discovery/RendezvousDiscoverTransportTest.java
Modified:
    activemq/trunk/activemq-core/pom.xml

Modified: activemq/trunk/activemq-core/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/pom.xml?rev=1208660&r1=1208659&r2=1208660&view=diff
==============================================================================
--- activemq/trunk/activemq-core/pom.xml (original)
+++ activemq/trunk/activemq-core/pom.xml Wed Nov 30 18:31:22 2011
@@ -456,7 +456,7 @@
             <!-- this one is a little flaky and can fail on some platforms randomly -->
             <exclude>**/QuickJournalRecoveryBrokerTest.*</exclude>
             <exclude>**/QuickJournalXARecoveryBrokerTest.*</exclude>
-            <exclude>**/RendezvousDiscoverTransportTest.*</exclude>
+            <exclude>**/ZeroconfDiscoverTransportTest.*</exclude>
 
             <!-- m2 tests failing since move from assembly  -->
             <exclude>**/QueueConsumerCloseAndReconnectTest.*</exclude>

Copied: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/zeroconf/JmDNSFactory.java
(from r1208377, activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/rendezvous/JmDNSFactory.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/zeroconf/JmDNSFactory.java?p2=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/zeroconf/JmDNSFactory.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/rendezvous/JmDNSFactory.java&r1=1208377&r2=1208660&rev=1208660&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/rendezvous/JmDNSFactory.java
(original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/zeroconf/JmDNSFactory.java
Wed Nov 30 18:31:22 2011
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.transport.discovery.rendezvous;
+package org.apache.activemq.transport.discovery.zeroconf;
 
 import java.io.IOException;
 import java.net.InetAddress;

Propchange: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/zeroconf/JmDNSFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/zeroconf/JmDNSFactory.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/zeroconf/ZeroconfDiscoveryAgent.java
(from r1208377, activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/rendezvous/RendezvousDiscoveryAgent.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/zeroconf/ZeroconfDiscoveryAgent.java?p2=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/zeroconf/ZeroconfDiscoveryAgent.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/rendezvous/RendezvousDiscoveryAgent.java&r1=1208377&r2=1208660&rev=1208660&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/rendezvous/RendezvousDiscoveryAgent.java
(original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/zeroconf/ZeroconfDiscoveryAgent.java
Wed Nov 30 18:31:22 2011
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.transport.discovery.rendezvous;
+package org.apache.activemq.transport.discovery.zeroconf;
 
 import java.io.IOException;
 import java.net.InetAddress;
@@ -43,8 +43,8 @@ import org.slf4j.LoggerFactory;
  * 
  * 
  */
-public class RendezvousDiscoveryAgent implements DiscoveryAgent, ServiceListener {
-    private static final Logger LOG = LoggerFactory.getLogger(RendezvousDiscoveryAgent.class);
+public class ZeroconfDiscoveryAgent implements DiscoveryAgent, ServiceListener {
+    private static final Logger LOG = LoggerFactory.getLogger(ZeroconfDiscoveryAgent.class);
 
     private static final String TYPE_SUFFIX = "ActiveMQ-4.";
 

Propchange: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/zeroconf/ZeroconfDiscoveryAgent.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/zeroconf/ZeroconfDiscoveryAgent.java
------------------------------------------------------------------------------
    svn:executable = *

Propchange: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/zeroconf/ZeroconfDiscoveryAgent.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/zeroconf/ZeroconfDiscoveryAgentFactory.java
(from r1208377, activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/rendezvous/RendezvousDiscoveryAgentFactory.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/zeroconf/ZeroconfDiscoveryAgentFactory.java?p2=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/zeroconf/ZeroconfDiscoveryAgentFactory.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/rendezvous/RendezvousDiscoveryAgentFactory.java&r1=1208377&r2=1208660&rev=1208660&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/rendezvous/RendezvousDiscoveryAgentFactory.java
(original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/zeroconf/ZeroconfDiscoveryAgentFactory.java
Wed Nov 30 18:31:22 2011
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.transport.discovery.rendezvous;
+package org.apache.activemq.transport.discovery.zeroconf;
 
 import java.io.IOException;
 import java.net.URI;
@@ -26,12 +26,12 @@ import org.apache.activemq.util.IOExcept
 import org.apache.activemq.util.IntrospectionSupport;
 import org.apache.activemq.util.URISupport;
 
-public class RendezvousDiscoveryAgentFactory extends DiscoveryAgentFactory {
+public class ZeroconfDiscoveryAgentFactory extends DiscoveryAgentFactory {
 
     protected DiscoveryAgent doCreateDiscoveryAgent(URI uri) throws IOException {
         try {
             Map options = URISupport.parseParameters(uri);
-            RendezvousDiscoveryAgent rc = new RendezvousDiscoveryAgent();
+            ZeroconfDiscoveryAgent rc = new ZeroconfDiscoveryAgent();
             rc.setGroup(uri.getHost());
             IntrospectionSupport.setProperties(rc, options);
             return rc;

Propchange: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/zeroconf/ZeroconfDiscoveryAgentFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/zeroconf/ZeroconfDiscoveryAgentFactory.java
------------------------------------------------------------------------------
    svn:executable = *

Propchange: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/zeroconf/ZeroconfDiscoveryAgentFactory.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/zeroconf/package.html
(from r1208377, activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/rendezvous/package.html)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/zeroconf/package.html?p2=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/zeroconf/package.html&p1=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/rendezvous/package.html&r1=1208377&r2=1208660&rev=1208660&view=diff
==============================================================================
    (empty)

Propchange: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/zeroconf/package.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/zeroconf/package.html
------------------------------------------------------------------------------
    svn:executable = *

Propchange: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/zeroconf/package.html
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/zeroconf/package.html
------------------------------------------------------------------------------
    svn:mime-type = text/html

Copied: activemq/trunk/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/zeroconf
(from r1208377, activemq/trunk/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/rendezvous)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/zeroconf?p2=activemq/trunk/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/zeroconf&p1=activemq/trunk/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/rendezvous&r1=1208377&r2=1208660&rev=1208660&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/rendezvous
(original)
+++ activemq/trunk/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/zeroconf
Wed Nov 30 18:31:22 2011
@@ -14,4 +14,4 @@
 ## See the License for the specific language governing permissions and
 ## limitations under the License.
 ## ---------------------------------------------------------------------------
-class=org.apache.activemq.transport.discovery.rendezvous.RendezvousDiscoveryAgentFactory
+class=org.apache.activemq.transport.discovery.zeroconf.ZeroconfDiscoveryAgentFactory

Copied: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/discovery/ZeroconfDiscoverTransportTest.java
(from r1208377, activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/discovery/RendezvousDiscoverTransportTest.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/discovery/ZeroconfDiscoverTransportTest.java?p2=activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/discovery/ZeroconfDiscoverTransportTest.java&p1=activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/discovery/RendezvousDiscoverTransportTest.java&r1=1208377&r2=1208660&rev=1208660&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/discovery/RendezvousDiscoverTransportTest.java
(original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/discovery/ZeroconfDiscoverTransportTest.java
Wed Nov 30 18:31:22 2011
@@ -20,10 +20,10 @@ package org.apache.activemq.transport.di
  *
  * 
  */
-public class RendezvousDiscoverTransportTest extends DiscoveryTransportBrokerTest {
+public class ZeroconfDiscoverTransportTest extends DiscoveryTransportBrokerTest {
 
     protected String getDiscoveryUri() {
-        return "rendezvous://cheese";
+        return "zeroconf://cheese";
     }
 
 }

Propchange: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/discovery/ZeroconfDiscoverTransportTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/discovery/ZeroconfDiscoverTransportTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/discovery/ZeroconfDiscoverTransportTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain



Mime
View raw message