activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r961109 - in /activemq/sandbox/activemq-apollo-actor: activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/ activemq-dto/src/main/java/org/apache/activemq/apollo/dto/ activemq-web/src/main/scala/org/apache/activemq/apollo/
Date Wed, 07 Jul 2010 03:58:22 GMT
Author: chirino
Date: Wed Jul  7 03:58:22 2010
New Revision: 961109

URL: http://svn.apache.org/viewvc?rev=961109&view=rev
Log:
have the web module use the default config created by the broker module

Modified:
    activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Broker.scala
    activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/ServiceDTO.java
    activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/scala/org/apache/activemq/apollo/ConfigStore.scala

Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Broker.scala
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Broker.scala?rev=961109&r1=961108&r2=961109&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Broker.scala
(original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Broker.scala
Wed Jul  7 03:58:22 2010
@@ -98,6 +98,7 @@ object Broker extends Log {
     val rc = new BrokerDTO
     rc.id = "default"
     rc.enabled = true
+    rc.notes = "A default configuration"
     rc.virtualHosts.add(VirtualHost.default)
     rc.connectors.add(Connector.default)
     rc.basedir = "./activemq-data/default"

Modified: activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/ServiceDTO.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/ServiceDTO.java?rev=961109&r1=961108&r2=961109&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/ServiceDTO.java
(original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dto/src/main/java/org/apache/activemq/apollo/dto/ServiceDTO.java
Wed Jul  7 03:58:22 2010
@@ -32,7 +32,7 @@ public class ServiceDTO extends IdDTO {
      * Should this service be running?
      */
     @XmlAttribute(name="enabled")
-    public boolean enabled;
+    public boolean enabled = true;
 
 
 }
\ No newline at end of file

Modified: activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/scala/org/apache/activemq/apollo/ConfigStore.scala
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/scala/org/apache/activemq/apollo/ConfigStore.scala?rev=961109&r1=961108&r2=961109&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/scala/org/apache/activemq/apollo/ConfigStore.scala
(original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-web/src/main/scala/org/apache/activemq/apollo/ConfigStore.scala
Wed Jul  7 03:58:22 2010
@@ -206,21 +206,8 @@ class FileConfigStore extends ConfigStor
 
 
   private def defaultConfig(rev:Int) = {
-    val config = new BrokerDTO
-    config.id = "default"
+    val config = Broker.default
     config.rev = rev
-    config.notes = "default configuration"
-
-    var host = new VirtualHostDTO
-    host.hostNames.add("default")
-    config.virtualHosts.add(host)
-
-    var connector = new ConnectorDTO
-    connector.bind = "tcp://0.0.0.0:61613"
-    connector.advertise = "tcp://0.0.0.0:61613"
-    connector.protocol = "multi"
-    config.connectors.add( connector )
-    
     config
   }
 



Mime
View raw message