activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r1045350 - in /activemq/activemq-apollo/trunk: apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/ apollo-broker/src/test/resources/org/apache/activemq/apollo/broker/ apollo-broker/src/test/scala/org/apache/activemq/apollo/broke...
Date Mon, 13 Dec 2010 20:02:36 GMT
Author: chirino
Date: Mon Dec 13 20:02:35 2010
New Revision: 1045350

URL: http://svn.apache.org/viewvc?rev=1045350&view=rev
Log:
renaming some of the dto fields to get more consistent naming.

Modified:
    activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Binding.scala
    activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Router.scala
    activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/VirtualHost.scala
    activemq/activemq-apollo/trunk/apollo-broker/src/test/resources/org/apache/activemq/apollo/broker/destination-config.xml
    activemq/activemq-apollo/trunk/apollo-broker/src/test/scala/org/apache/activemq/apollo/broker/DestinationConfigurationTest.scala
    activemq/activemq-apollo/trunk/apollo-cli/src/main/resources/org/apache/activemq/apollo/cli/commands/etc/apollo-ssl.xml
    activemq/activemq-apollo/trunk/apollo-cli/src/main/resources/org/apache/activemq/apollo/cli/commands/etc/apollo.xml
    activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/DestinationDTO.java
    activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/QueueBindingDTO.java
    activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/QueueDTO.java
    activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/SubscriptionBindingDTO.java
    activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocolHandler.scala
    activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-secure.xml
    activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/QueueStatusDTO.jade

Modified: activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Binding.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Binding.scala?rev=1045350&r1=1045349&r2=1045350&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Binding.scala
(original)
+++ activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Binding.scala
Mon Dec 13 20:02:35 2010
@@ -97,7 +97,7 @@ trait Binding {
   def matches(config:QueueDTO):Boolean = {
     import DestinationParser.default._
     import OptionSupport._
-    var rc = (o(config.destination).map{ x=> parseFilter(ascii(x)).matches(destination)
}.getOrElse(true))
+    var rc = (o(config.name).map{ x=> parseFilter(ascii(x)).matches(destination) }.getOrElse(true))
     rc = rc && (o(config.kind).map{ x=> x == binding_kind.toString }.getOrElse(true))
     rc
   }
@@ -117,7 +117,7 @@ class QueueBindingFactory extends Bindin
   def create(binding_kind:AsciiBuffer, binding_data:Buffer) = {
     if( binding_kind == POINT_TO_POINT_KIND ) {
       val dto = new QueueBindingDTO
-      dto.destination = binding_data.ascii.toString
+      dto.name = binding_data.ascii.toString
       new QueueBinding(binding_data, dto)
     } else {
       null
@@ -127,7 +127,7 @@ class QueueBindingFactory extends Bindin
   def create(binding_dto:BindingDTO) = {
     if( binding_dto.isInstanceOf[QueueBindingDTO] ) {
       val ptp_dto = binding_dto.asInstanceOf[QueueBindingDTO]
-      val data = new AsciiBuffer(ptp_dto.destination).buffer
+      val data = new AsciiBuffer(ptp_dto.name).buffer
       new QueueBinding(data, ptp_dto)
     } else {
       null
@@ -143,7 +143,7 @@ class QueueBindingFactory extends Bindin
  */
 class QueueBinding(val binding_data:Buffer, val binding_dto:QueueBindingDTO) extends Binding
{
 
-  val destination = DestinationParser.decode_path(binding_dto.destination)
+  val destination = DestinationParser.decode_path(binding_dto.name)
   def binding_kind = POINT_TO_POINT_KIND
 
   def unbind(node: RoutingNode, queue: Queue) = {
@@ -158,7 +158,7 @@ class QueueBinding(val binding_data:Buff
     }
   }
 
-  def label = binding_dto.destination
+  def label = binding_dto.name
 
   override def hashCode = binding_kind.hashCode ^ binding_data.hashCode
 
@@ -202,7 +202,7 @@ class SubscriptionBindingFactory extends
  */
 class SubscriptionBinding(val binding_data:Buffer, val binding_dto:SubscriptionBindingDTO)
extends Binding {
 
-  val destination = DestinationParser.decode_path(binding_dto.destination)
+  val destination = DestinationParser.decode_path(binding_dto.name)
 
   def binding_kind = DURABLE_SUB_KIND
 

Modified: activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Router.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Router.scala?rev=1045350&r1=1045349&r2=1045350&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Router.scala
(original)
+++ activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Router.scala
Mon Dec 13 20:02:35 2010
@@ -349,7 +349,7 @@ class Router(val host:VirtualHost) exten
       } else {
 
         val dto = new QueueBindingDTO
-        dto.destination = DestinationParser.encode_path(destination.name)
+        dto.name = DestinationParser.encode_path(destination.name)
 
         // Can we send to the queue?
         def config = host.queue_config(dto).getOrElse(new QueueDTO)

Modified: activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/VirtualHost.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/VirtualHost.scala?rev=1045350&r1=1045349&r2=1045350&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/VirtualHost.scala
(original)
+++ activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/VirtualHost.scala
Mon Dec 13 20:02:35 2010
@@ -274,7 +274,7 @@ class VirtualHost(val broker: Broker, va
     import collection.JavaConversions._
     import DestinationParser.default._
     import AsciiBuffer._
-    config.destinations.find( x=> parseFilter(ascii(x.path)).matches(name) )
+    config.destinations.find( x=> parseFilter(ascii(x.name)).matches(name) )
   }
 
   def queue_config(binding:Binding):Option[QueueDTO] = {

Modified: activemq/activemq-apollo/trunk/apollo-broker/src/test/resources/org/apache/activemq/apollo/broker/destination-config.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/test/resources/org/apache/activemq/apollo/broker/destination-config.xml?rev=1045350&r1=1045349&r2=1045350&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/src/test/resources/org/apache/activemq/apollo/broker/destination-config.xml
(original)
+++ activemq/activemq-apollo/trunk/apollo-broker/src/test/resources/org/apache/activemq/apollo/broker/destination-config.xml
Mon Dec 13 20:02:35 2010
@@ -20,11 +20,11 @@
   <virtual-host id="default">
     <host-name>test</host-name>
 
-    <destination path="unified.*" unified="true"/>
-    <destination path="notunified.*" unified="false"/>
+    <destination name="unified.*" unified="true"/>
+    <destination name="notunified.*" unified="false"/>
 
-    <queue destination="unified.a" kind="ptp" queue-buffer="333"/>
-    <queue destination="unified.*" kind="ds" queue-buffer="444"/>
+    <queue name="unified.a" kind="ptp" queue-buffer="333"/>
+    <queue name="unified.*" kind="ds" queue-buffer="444"/>
     <queue queue-buffer="111"/>
 
   </virtual-host>

Modified: activemq/activemq-apollo/trunk/apollo-broker/src/test/scala/org/apache/activemq/apollo/broker/DestinationConfigurationTest.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/test/scala/org/apache/activemq/apollo/broker/DestinationConfigurationTest.scala?rev=1045350&r1=1045349&r2=1045350&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/src/test/scala/org/apache/activemq/apollo/broker/DestinationConfigurationTest.scala
(original)
+++ activemq/activemq-apollo/trunk/apollo-broker/src/test/scala/org/apache/activemq/apollo/broker/DestinationConfigurationTest.scala
Mon Dec 13 20:02:35 2010
@@ -62,12 +62,12 @@ class DestinationConfigurationTest exten
 
     check_tune_queue_buffer(333) {
       var p = new QueueBindingDTO()
-      p.destination = "unified.a"
+      p.name = "unified.a"
       p
     }
     check_tune_queue_buffer(444) {
       val p = new SubscriptionBindingDTO()
-      p.destination = "unified.b"
+      p.name = "unified.b"
       p.client_id = "a"
       p.subscription_id = "b"
       p
@@ -75,7 +75,7 @@ class DestinationConfigurationTest exten
 
     check_tune_queue_buffer(111) {
       var p = new QueueBindingDTO()
-      p.destination = "notunified.other"
+      p.name = "notunified.other"
       p
     }
 

Modified: activemq/activemq-apollo/trunk/apollo-cli/src/main/resources/org/apache/activemq/apollo/cli/commands/etc/apollo-ssl.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-cli/src/main/resources/org/apache/activemq/apollo/cli/commands/etc/apollo-ssl.xml?rev=1045350&r1=1045349&r2=1045350&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-cli/src/main/resources/org/apache/activemq/apollo/cli/commands/etc/apollo-ssl.xml
(original)
+++ activemq/activemq-apollo/trunk/apollo-cli/src/main/resources/org/apache/activemq/apollo/cli/commands/etc/apollo-ssl.xml
Mon Dec 13 20:02:35 2010
@@ -47,7 +47,7 @@
     <acl>
       <connect name="admins"/>
     </acl>
-    <destination path="secure.**">
+    <destination name="secure.**">
       <acl>
         <create  name="admins"/>
         <destroy name="admins"/>
@@ -55,7 +55,7 @@
         <receive name="admins"/>
       </acl>
     </destination>
-    <queue path="secure.**">
+    <queue name="secure.**">
       <acl>
         <create  name="admins"/>
         <destroy name="admins"/>
@@ -74,17 +74,17 @@
 
     <!-- Use this if you expect to have slow consumers on a topic
          allows slow consumers to swap messages to a disk queue -->
-    <destination path="slow.**" slow_consumer_policy="queue"/>
+    <destination name="slow.**" slow_consumer_policy="queue"/>
 
     <!-- Use this if you want the queue and topic with of the same name
          to be the same logical entity -->
-    <destination path="unified.**" unified="true"/>
+    <destination name="unified.**" unified="true"/>
 
     <!-- disable message swapping for some queues -->
-    <queue destination="noswap.**" kind="ptp" swap="false"/>
+    <queue name="noswap.**" kind="ptp" swap="false"/>
 
     <!-- disable message swapping for durable subscriptions -->
-    <queue destination="noswap.**" kind="ds" swap="false"/>
+    <queue name="noswap.**" kind="ds" swap="false"/>
 
     <!-- You can delete this element if you want to disable persistent for this virtual
host -->
     <hawtdb-store directory="${apollo.base}/data"/>

Modified: activemq/activemq-apollo/trunk/apollo-cli/src/main/resources/org/apache/activemq/apollo/cli/commands/etc/apollo.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-cli/src/main/resources/org/apache/activemq/apollo/cli/commands/etc/apollo.xml?rev=1045350&r1=1045349&r2=1045350&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-cli/src/main/resources/org/apache/activemq/apollo/cli/commands/etc/apollo.xml
(original)
+++ activemq/activemq-apollo/trunk/apollo-cli/src/main/resources/org/apache/activemq/apollo/cli/commands/etc/apollo.xml
Mon Dec 13 20:02:35 2010
@@ -49,7 +49,7 @@
     <acl>
       <connect name="admins"/>
     </acl>
-    <destination path="secure.**">
+    <destination name="secure.**">
       <acl>
         <create  name="admins"/>
         <destroy name="admins"/>
@@ -57,7 +57,7 @@
         <receive name="admins"/>
       </acl>
     </destination>
-    <queue path="secure.**">
+    <queue name="secure.**">
       <acl>
         <create  name="admins"/>
         <destroy name="admins"/>
@@ -76,17 +76,17 @@
       -->
 
     <!-- Use this if you expect to have slow consumers on a topic -->
-    <destination path="slow.**" slow_consumer_policy="queue"/>
+    <destination name="slow.**" slow_consumer_policy="queue"/>
 
     <!-- Use this if you want the queue and topic with of the same name
          to be the same logical entity -->
-    <destination path="unified.**" unified="true"/>
+    <destination name="unified.**" unified="true"/>
 
     <!-- disable message swapping for some queues -->
-    <queue destination="noswap.**" kind="ptp" swap="false"/>
+    <queue name="noswap.**" kind="ptp" swap="false"/>
 
     <!-- disable message swapping for durable subscriptions -->
-    <queue destination="noswap.**" kind="ds" swap="false"/>
+    <queue name="noswap.**" kind="ds" swap="false"/>
 
     <!-- You can delete this element if you want to disable persistent for this virtual
host -->
     <hawtdb-store directory="${apollo.base}/data"/>

Modified: activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/DestinationDTO.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/DestinationDTO.java?rev=1045350&r1=1045349&r2=1045350&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/DestinationDTO.java
(original)
+++ activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/DestinationDTO.java
Mon Dec 13 20:02:35 2010
@@ -29,10 +29,10 @@ import java.util.ArrayList;
 public class DestinationDTO extends StringIdDTO {
 
     /**
-     * The path to the destination.  You can use wild cards.
+     * The name of the destination.  You can use wild cards.
      */
 	@XmlAttribute
-	public String path;
+	public String name;
 
     /**
      * If set to true, then routing then there is no difference between

Modified: activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/QueueBindingDTO.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/QueueBindingDTO.java?rev=1045350&r1=1045349&r2=1045350&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/QueueBindingDTO.java
(original)
+++ activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/QueueBindingDTO.java
Mon Dec 13 20:02:35 2010
@@ -34,6 +34,6 @@ public class QueueBindingDTO extends Bin
      * A label that describes the binding
      */
     @XmlAttribute
-    public String destination;
+    public String name;
 
 }
\ No newline at end of file

Modified: activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/QueueDTO.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/QueueDTO.java?rev=1045350&r1=1045349&r2=1045350&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/QueueDTO.java
(original)
+++ activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/QueueDTO.java
Mon Dec 13 20:02:35 2010
@@ -28,10 +28,10 @@ import javax.xml.bind.annotation.*;
 public class QueueDTO {
 
     /*
-     * The destination this queue is associated with.  You can use wild cards.
+     * The destination name this queue is associated with.  You can use wild cards.
      */
     @XmlAttribute
-    public String destination;
+    public String name;
 
     /*
      * The kind of queue.  It may be "ptp" for standard

Modified: activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/SubscriptionBindingDTO.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/SubscriptionBindingDTO.java?rev=1045350&r1=1045349&r2=1045350&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/SubscriptionBindingDTO.java
(original)
+++ activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/SubscriptionBindingDTO.java
Mon Dec 13 20:02:35 2010
@@ -31,7 +31,7 @@ import javax.xml.bind.annotation.XmlRoot
 @XmlAccessorType(XmlAccessType.FIELD)
 public class SubscriptionBindingDTO extends BindingDTO {
 
-    public String destination;
+    public String name;
 
     public String filter;
 

Modified: activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocolHandler.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocolHandler.scala?rev=1045350&r1=1045349&r2=1045350&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocolHandler.scala
(original)
+++ activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocolHandler.scala
Mon Dec 13 20:02:35 2010
@@ -732,7 +732,7 @@ class StompProtocolHandler extends Proto
       // way again)
       if (topic) {
         val rc = new SubscriptionBindingDTO
-        rc.destination = DestinationParser.encode_path(destination.name)
+        rc.name = DestinationParser.encode_path(destination.name)
         // TODO:
         // rc.client_id =
         rc.subscription_id = if( persistent ) id.toString else null
@@ -740,7 +740,7 @@ class StompProtocolHandler extends Proto
         rc
       } else {
         val rc = new QueueBindingDTO
-        rc.destination = DestinationParser.encode_path(destination.name)
+        rc.name = DestinationParser.encode_path(destination.name)
         rc
       }
     }

Modified: activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-secure.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-secure.xml?rev=1045350&r1=1045349&r2=1045350&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-secure.xml
(original)
+++ activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-secure.xml
Mon Dec 13 20:02:35 2010
@@ -27,7 +27,7 @@
     </acl>
 
     <!-- queue security -->
-    <queue path="**" kind="ptp">
+    <queue name="**" kind="ptp">
       <acl>
         <create  name="can_send_create_queue"/>
         <send    name="can_send_create_queue"/>
@@ -38,7 +38,7 @@
     </queue>
 
     <!-- topic security -->
-    <destination path="**">
+    <destination name="**">
       <acl>
         <create  name="can_send_create_topic"/>
         <send    name="can_send_create_topic"/>
@@ -48,7 +48,7 @@
     </destination>
 
     <!-- durable sub security -->
-    <queue path="**" kind="ds">
+    <queue name="**" kind="ds">
       <acl>
         <create  name="can_consume_create_ds"/>
         <consume name="can_consume_create_ds"/>

Modified: activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/QueueStatusDTO.jade
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/QueueStatusDTO.jade?rev=1045350&r1=1045349&r2=1045350&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/QueueStatusDTO.jade
(original)
+++ activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/QueueStatusDTO.jade
Mon Dec 13 20:02:35 2010
@@ -22,10 +22,10 @@
 
 - binding match
   - case x:QueueBindingDTO =>
-    h1 Queue #{x.destination}
+    h1 Queue #{x.name}
 
   - case x:SubscriptionBindingDTO =>
-    h1 Durable Subscription on #{x.destination}
+    h1 Durable Subscription on #{x.name}
     p client id: ${x.client_id}
     p subscription id: ${x.subscription_id}
     p filter: ${x.filter}



Mime
View raw message