activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r1052062 [1/2] - in /activemq/activemq-apollo/trunk: apollo-bdb/src/main/scala/org/apache/activemq/apollo/broker/store/bdb/dto/ apollo-bdb/src/test/resources/org/apache/activemq/apollo/broker/store/bdb/dto/ apollo-broker/src/main/resources/...
Date Wed, 22 Dec 2010 20:46:07 GMT
Author: chirino
Date: Wed Dec 22 20:46:05 2010
New Revision: 1052062

URL: http://svn.apache.org/viewvc?rev=1052062&view=rev
Log:
made the xml elements use underscores too so that everything is more consistent.  Will make documentation easier as users can refer to javadoc and json marshaling will also match.

Added:
    activemq/activemq-apollo/trunk/apollo-cli/src/main/filtered-resources/org/apache/activemq/apollo/cli/commands/
    activemq/activemq-apollo/trunk/apollo-cli/src/main/filtered-resources/org/apache/activemq/apollo/cli/commands/version.txt
Modified:
    activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/broker/store/bdb/dto/BDBStoreDTO.java
    activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/broker/store/bdb/dto/BDBStoreStatusDTO.java
    activemq/activemq-apollo/trunk/apollo-bdb/src/test/resources/org/apache/activemq/apollo/broker/store/bdb/dto/simple.xml
    activemq/activemq-apollo/trunk/apollo-broker/src/main/resources/non-persistent-activemq.xml
    activemq/activemq-apollo/trunk/apollo-broker/src/main/resources/persistent-activemq.xml
    activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/transport/VMTransport.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/jaxb/testSimpleConfig.xml
    activemq/activemq-apollo/trunk/apollo-cassandra/src/main/scala/org/apache/activemq/apollo/broker/store/cassandra/dto/CassandraStoreDTO.java
    activemq/activemq-apollo/trunk/apollo-cassandra/src/test/resources/org/apache/activemq/apollo/broker/store/cassandra/dto/simple.xml
    activemq/activemq-apollo/trunk/apollo-cassandra/src/test/resources/org/apache/activemq/apollo/broker/store/cassandra/storage-conf.xml
    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-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Create.scala
    activemq/activemq-apollo/trunk/apollo-cli/src/test/resources/example-broker/etc/apollo.xml
    activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/AuthenticationDTO.java
    activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/BrokerDTO.java
    activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/BrokerStatusDTO.java
    activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/BrokerSummaryDTO.java
    activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/ConnectionStatusDTO.java
    activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/ConnectorDTO.java
    activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/ConnectorStatusDTO.java
    activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/DestinationAclDTO.java
    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/DestinationStatusDTO.java
    activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/EntryStatusDTO.java
    activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/IntMetricDTO.java
    activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/KeyStorageDTO.java
    activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/LongIdDTO.java
    activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/LongIdListDTO.java
    activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/NullStoreDTO.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/QueueConsumerStatusDTO.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/QueueStatusDTO.java
    activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/ServiceDTO.java
    activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/ServiceStatusDTO.java
    activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/SimpleStoreStatusDTO.java
    activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/StompConnectionStatusDTO.java
    activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/StompDTO.java
    activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/StoreDTO.java
    activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/StoreStatusDTO.java
    activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/SubscriptionBindingDTO.java
    activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/TempBindingDTO.java
    activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/TimeMetricDTO.java
    activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/VirtualHostDTO.java
    activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/VirtualHostStatusDTO.java
    activemq/activemq-apollo/trunk/apollo-dto/src/test/resources/org/apache/activemq/apollo/dto/XmlCodecTest.xml
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/broker/store/hawtdb/dto/HawtDBStoreDTO.java
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/broker/store/hawtdb/dto/HawtDBStoreStatusDTO.java
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/test/resources/org/apache/activemq/apollo/broker/store/hawtdb/dto/simple.xml
    activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-secure.xml
    activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-ssl-secure.xml
    activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-ssl.xml
    activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp.xml
    activemq/activemq-apollo/trunk/apollo-util/src/main/scala/org/apache/activemq/apollo/util/FileSupport.scala
    activemq/activemq-apollo/trunk/apollo-website/src/documentation/getting-started.md
    activemq/activemq-apollo/trunk/apollo-website/src/documentation/user-manual.md

Modified: activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/broker/store/bdb/dto/BDBStoreDTO.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/broker/store/bdb/dto/BDBStoreDTO.java?rev=1052062&r1=1052061&r2=1052062&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/broker/store/bdb/dto/BDBStoreDTO.java (original)
+++ activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/broker/store/bdb/dto/BDBStoreDTO.java Wed Dec 22 20:46:05 2010
@@ -27,14 +27,14 @@ import java.io.File;
 /**
  * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
  */
-@XmlRootElement(name="bdb-store")
+@XmlRootElement(name="bdb_store")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class BDBStoreDTO extends StoreDTO {
 
     @XmlAttribute
     public File directory;
 
-    @XmlAttribute(name = "read-threads")
+    @XmlAttribute(name="read_threads")
     public Integer read_threads;
 
 }

Modified: activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/broker/store/bdb/dto/BDBStoreStatusDTO.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/broker/store/bdb/dto/BDBStoreStatusDTO.java?rev=1052062&r1=1052061&r2=1052062&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/broker/store/bdb/dto/BDBStoreStatusDTO.java (original)
+++ activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/broker/store/bdb/dto/BDBStoreStatusDTO.java Wed Dec 22 20:46:05 2010
@@ -28,17 +28,17 @@ import javax.xml.bind.annotation.XmlRoot
 /**
  * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
  */
-@XmlRootElement(name="bdb-store-status")
+@XmlRootElement(name="bdb_store_status")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class BDBStoreStatusDTO extends StoreStatusDTO {
 
-    @XmlElement(name="journal-append-latency")
+    @XmlElement(name="journal_append_latency")
     public TimeMetricDTO journal_append_latency;
 
-    @XmlElement(name="index-update-latency")
+    @XmlElement(name="index_update_latency")
     public TimeMetricDTO index_update_latency;
 
-    @XmlElement(name="message-load-batch-size")
+    @XmlElement(name="message_load_batch_size")
     public IntMetricDTO message_load_batch_size;
 
 }

Modified: activemq/activemq-apollo/trunk/apollo-bdb/src/test/resources/org/apache/activemq/apollo/broker/store/bdb/dto/simple.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-bdb/src/test/resources/org/apache/activemq/apollo/broker/store/bdb/dto/simple.xml?rev=1052062&r1=1052061&r2=1052062&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-bdb/src/test/resources/org/apache/activemq/apollo/broker/store/bdb/dto/simple.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-bdb/src/test/resources/org/apache/activemq/apollo/broker/store/bdb/dto/simple.xml Wed Dec 22 20:46:05 2010
@@ -16,8 +16,8 @@
     limitations under the License.
 -->
 <broker basedir="./activemq-data/default" id="default" xmlns="http://activemq.apache.org/schema/activemq/apollo">
-    <virtual-host enabled="true" id="vh-local">
-        <host-name>localhost</host-name>
-        <bdb-store directory="activemq-data"/>
-    </virtual-host>
+    <virtual_host enabled="true" id="vh-local">
+        <host_name>localhost</host_name>
+        <bdb_store directory="activemq-data"/>
+    </virtual_host>
 </broker>

Modified: activemq/activemq-apollo/trunk/apollo-broker/src/main/resources/non-persistent-activemq.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/main/resources/non-persistent-activemq.xml?rev=1052062&r1=1052061&r2=1052062&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/src/main/resources/non-persistent-activemq.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-broker/src/main/resources/non-persistent-activemq.xml Wed Dec 22 20:46:05 2010
@@ -16,7 +16,7 @@
     limitations under the License.
 -->
 <broker xmlns="http://activemq.apache.org/schema/activemq/apollo">
-  <virtual-host>
-    <host-name>default</host-name>
-  </virtual-host>
+  <virtual_host>
+    <host_name>default</host_name>
+  </virtual_host>
 </broker>

Modified: activemq/activemq-apollo/trunk/apollo-broker/src/main/resources/persistent-activemq.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/main/resources/persistent-activemq.xml?rev=1052062&r1=1052061&r2=1052062&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/src/main/resources/persistent-activemq.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-broker/src/main/resources/persistent-activemq.xml Wed Dec 22 20:46:05 2010
@@ -16,8 +16,8 @@
     limitations under the License.
 -->
 <broker xmlns="http://activemq.apache.org/schema/activemq/apollo">
-  <virtual-host>
-    <host-name>default</host-name>
-    <kahadb-store purge-on-startup="true" directory="${basedir}/target/test-data/kahadb"/>
-  </virtual-host>
+  <virtual_host>
+    <host_name>default</host_name>
+    <kahadb_store purge_on_startup="true" directory="${basedir}/target/test-data/kahadb"/>
+  </virtual_host>
 </broker>

Modified: activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/transport/VMTransport.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/transport/VMTransport.scala?rev=1052062&r1=1052061&r2=1052062&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/transport/VMTransport.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/transport/VMTransport.scala Wed Dec 22 20:46:05 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.apollobroker.transport
+package org.apache.activemq.apollo.broker.transport
 
 import _root_.java.io.IOException
 import _root_.java.net.URI

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=1052062&r1=1052061&r2=1052062&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 Wed Dec 22 20:46:05 2010
@@ -17,16 +17,16 @@
 -->
 <broker xmlns="http://activemq.apache.org/schema/activemq/apollo" id="default">
 
-  <virtual-host id="default">
-    <host-name>test</host-name>
+  <virtual_host id="default">
+    <host_name>test</host_name>
 
     <destination name="unified.*" unified="true"/>
     <destination name="notunified.*" unified="false"/>
 
-    <queue name="unified.a" kind="ptp" queue-buffer="333"/>
-    <queue name="unified.*" kind="ds" queue-buffer="444"/>
-    <queue queue-buffer="111"/>
+    <queue name="unified.a" kind="ptp" queue_buffer="333"/>
+    <queue name="unified.*" kind="ds" queue_buffer="444"/>
+    <queue queue_buffer="111"/>
 
-  </virtual-host>
+  </virtual_host>
   
 </broker>

Modified: activemq/activemq-apollo/trunk/apollo-broker/src/test/scala/org/apache/activemq/apollo/broker/jaxb/testSimpleConfig.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/test/scala/org/apache/activemq/apollo/broker/jaxb/testSimpleConfig.xml?rev=1052062&r1=1052061&r2=1052062&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/src/test/scala/org/apache/activemq/apollo/broker/jaxb/testSimpleConfig.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-broker/src/test/scala/org/apache/activemq/apollo/broker/jaxb/testSimpleConfig.xml Wed Dec 22 20:46:05 2010
@@ -19,10 +19,10 @@
 
   <connector>pipe://test1</connector>
 
-  <virtual-host>
-    <host-name>localhost</host-name>
-    <host-name>test.localhost</host-name>
-    <memory-store/>
-  </virtual-host>
+  <virtual_host>
+    <host_name>localhost</host_name>
+    <host_name>test.localhost</host_name>
+    <memory_store/>
+  </virtual_host>
   
 </broker>

Modified: activemq/activemq-apollo/trunk/apollo-cassandra/src/main/scala/org/apache/activemq/apollo/broker/store/cassandra/dto/CassandraStoreDTO.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-cassandra/src/main/scala/org/apache/activemq/apollo/broker/store/cassandra/dto/CassandraStoreDTO.java?rev=1052062&r1=1052061&r2=1052062&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-cassandra/src/main/scala/org/apache/activemq/apollo/broker/store/cassandra/dto/CassandraStoreDTO.java (original)
+++ activemq/activemq-apollo/trunk/apollo-cassandra/src/main/scala/org/apache/activemq/apollo/broker/store/cassandra/dto/CassandraStoreDTO.java Wed Dec 22 20:46:05 2010
@@ -17,7 +17,6 @@
 package org.apache.activemq.apollo.broker.store.cassandra.dto;
 
 import org.apache.activemq.apollo.dto.StoreDTO;
-import org.codehaus.jackson.annotate.JsonProperty;
 
 import javax.xml.bind.annotation.*;
 import java.util.ArrayList;
@@ -25,15 +24,13 @@ import java.util.ArrayList;
 /**
  * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
  */
-@XmlRootElement(name="cassandra-store")
+@XmlRootElement(name="cassandra_store")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class CassandraStoreDTO extends StoreDTO {
 
-    @JsonProperty
     @XmlAttribute
     public String keyspace;
 
-    @JsonProperty
     @XmlElement(required=true)
     public ArrayList<String> hosts = new ArrayList<String>();    
 

Modified: activemq/activemq-apollo/trunk/apollo-cassandra/src/test/resources/org/apache/activemq/apollo/broker/store/cassandra/dto/simple.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-cassandra/src/test/resources/org/apache/activemq/apollo/broker/store/cassandra/dto/simple.xml?rev=1052062&r1=1052061&r2=1052062&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-cassandra/src/test/resources/org/apache/activemq/apollo/broker/store/cassandra/dto/simple.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-cassandra/src/test/resources/org/apache/activemq/apollo/broker/store/cassandra/dto/simple.xml Wed Dec 22 20:46:05 2010
@@ -16,8 +16,8 @@
     limitations under the License.
 -->
 <broker basedir="./activemq-data/default" id="default" xmlns="http://activemq.apache.org/schema/activemq/apollo">
-    <virtual-host enabled="true" id="vh-local">
-        <host-name>localhost</host-name>
-        <cassandra-store keyspace="vh-local"/>
-    </virtual-host>
+    <virtual_host enabled="true" id="vh-local">
+        <host_name>localhost</host_name>
+        <cassandra_store keyspace="vh-local"/>
+    </virtual_host>
 </broker>

Modified: activemq/activemq-apollo/trunk/apollo-cassandra/src/test/resources/org/apache/activemq/apollo/broker/store/cassandra/storage-conf.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-cassandra/src/test/resources/org/apache/activemq/apollo/broker/store/cassandra/storage-conf.xml?rev=1052062&r1=1052061&r2=1052062&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-cassandra/src/test/resources/org/apache/activemq/apollo/broker/store/cassandra/storage-conf.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-cassandra/src/test/resources/org/apache/activemq/apollo/broker/store/cassandra/storage-conf.xml Wed Dec 22 20:46:05 2010
@@ -39,10 +39,10 @@
   <Authenticator>org.apache.cassandra.auth.AllowAllAuthenticator</Authenticator>
   <Partitioner>org.apache.cassandra.dht.OrderPreservingPartitioner</Partitioner>
   <InitialToken></InitialToken>
-  <CommitLogDirectory>%temp-dir%commitlog</CommitLogDirectory>
+  <CommitLogDirectory>%temp_dir%commitlog</CommitLogDirectory>
 
   <DataFileDirectories>
-    <DataFileDirectory>%temp-dir%data</DataFileDirectory>
+    <DataFileDirectory>%temp_dir%data</DataFileDirectory>
   </DataFileDirectories>
 
   <Seeds>

Added: activemq/activemq-apollo/trunk/apollo-cli/src/main/filtered-resources/org/apache/activemq/apollo/cli/commands/version.txt
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-cli/src/main/filtered-resources/org/apache/activemq/apollo/cli/commands/version.txt?rev=1052062&view=auto
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-cli/src/main/filtered-resources/org/apache/activemq/apollo/cli/commands/version.txt (added)
+++ activemq/activemq-apollo/trunk/apollo-cli/src/main/filtered-resources/org/apache/activemq/apollo/cli/commands/version.txt Wed Dec 22 20:46:05 2010
@@ -0,0 +1 @@
+${project.version}
\ No newline at end of file

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=1052062&r1=1052061&r2=1052062&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 Wed Dec 22 20:46:05 2010
@@ -13,7 +13,14 @@
   License for the specific language governing permissions and
   limitations under the License.
 -->
-<broker id="default" rev="1" xmlns="http://activemq.apache.org/schema/activemq/apollo">
+
+<!--
+  For more information on how configure this file please
+  reference:
+
+  http://activemq.apache.org/apollo/versions/${version}/website/documentation/user-manual.html
+  -->
+<broker id="default" xmlns="http://activemq.apache.org/schema/activemq/apollo">
 
   <notes>
     The default configuration with tls/ssl enabled.
@@ -25,75 +32,33 @@
     <admin allow="admins"/>
   </acl>
 
-  <web-admin host="127.0.0.1" port="8080"/>
+  <web_admin host="127.0.0.1" port="8080"/>
 
-  <virtual-host id="default" auto-create-queues="true" >
+  <virtual_host id="default" auto_create_queues="true" >
     <!--
       You should add all the host names that this virtual host is known as
       to properly support the STOMP 1.1 virtual host feature.
       -->
-    <host-name>localhost</host-name>
+    <host_name>${host}</host_name>
+    <host_name>localhost</host_name>
+    <host_name>127.0.0.1</host_name>
 
     <!-- Uncomment to disable security for the virtual host
     <authentication enabled="false"/>
     -->
 
-    <!--
-      You can add an 'acl' element to the virtual host,
-      destination, or queue elements to restrict the operations
-      that a user can take.  If the acl element is not set on
-      an object, then access is not restricted at all.
-      -->
     <acl>
       <connect allow="admins"/>
     </acl>
-    <destination name="secure.**">
-      <acl>
-        <create  allow="admins"/>
-        <destroy allow="admins"/>
-        <send    allow="admins"/>
-        <receive allow="admins"/>
-      </acl>
-    </destination>
-    <queue name="secure.**">
-      <acl>
-        <create  allow="admins"/>
-        <destroy allow="admins"/>
-        <send    allow="admins"/>
-        <receive allow="admins"/> <!-- queue browsers -->
-        <consume allow="admins"/> <!-- regular consumers -->
-      </acl>
-    </queue>
-
-    <!--
-      Examples of how to configure destinations and queues. Note
-      they you can use wildcard patterns when specifying destinations,
-      only the first element that matches will be used to configure the
-      destination or queue.
-      -->
-
-    <!-- Use this if you expect to have slow consumers on a topic
-         allows slow consumers to swap messages to a disk 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 name="unified.**" unified="true"/>
-
-    <!-- disable message swapping for some queues -->
-    <queue name="noswap.**" kind="ptp" swap="false"/>
-
-    <!-- disable message swapping for durable subscriptions -->
-    <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"/>
+    <hawtdb_store directory="${apollo.base}/data"/>
 
-  </virtual-host>
+  </virtual_host>
 
-  <key-storage file="${apollo.base}/etc/keystore" password="password" key-password="password"/>
+  <key_storage file="${apollo.base}/etc/keystore" password="password" key_password="password"/>
 
-  <connector id="tcp" bind="tcp://0.0.0.0:61613" connection-limit="2000" protocol="multi"/>
-  <connector id="tls" bind="tls://0.0.0.0:61614" connection-limit="2000" protocol="multi"/>
+  <connector id="tcp" bind="tcp://0.0.0.0:61613" connection_limit="2000" protocol="multi"/>
+  <connector id="tls" bind="tls://0.0.0.0:61614" connection_limit="2000" protocol="multi"/>
 
 </broker>

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=1052062&r1=1052061&r2=1052062&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 Wed Dec 22 20:46:05 2010
@@ -13,8 +13,14 @@
   License for the specific language governing permissions and
   limitations under the License.
 -->
-<broker id="default" rev="1"
-  xmlns="http://activemq.apache.org/schema/activemq/apollo">
+
+<!--
+  For more information on how configure this file please
+  reference:
+
+  http://activemq.apache.org/apollo/versions/${version}/website/documentation/user-manual.html
+  -->
+<broker id="default" xmlns="http://activemq.apache.org/schema/activemq/apollo">
 
   <notes>
     The default configuration.
@@ -26,73 +32,30 @@
     <admin allow="admins"/>
   </acl>
 
-  <web-admin host="127.0.0.1" port="8080"/>
-
-  <virtual-host id="default" auto-create-queues="true" >
+  <web_admin host="127.0.0.1" port="8080"/>
 
+  <virtual_host id="default" auto_create_queues="true" >
     <!--
       You should add all the host names that this virtual host is known as
       to properly support the STOMP 1.1 virtual host feature.
       -->
-    <host-name>localhost</host-name>
+    <host_name>${host}</host_name>
+    <host_name>localhost</host_name>
+    <host_name>127.0.0.1</host_name>
 
     <!-- Uncomment to disable security for the virtual host
     <authentication enabled="false"/>
     -->
 
-    <!--
-      You can add an 'acl' element to the virtual host,
-      destination, or queue elements to restrict the operations
-      that a user can take.  If the acl element is not set on
-      an object, then access is not restricted at all.
-      -->
     <acl>
       <connect allow="admins"/>
     </acl>
-    <destination name="secure.**">
-      <acl>
-        <create  allow="admins"/>
-        <destroy allow="admins"/>
-        <send    allow="admins"/>
-        <receive allow="admins"/>
-      </acl>
-    </destination>
-    <queue name="secure.**">
-      <acl>
-        <create  allow="admins"/>
-        <destroy allow="admins"/>
-        <send    allow="admins"/>
-        <receive allow="admins"/> <!-- queue browsers -->
-        <consume allow="admins"/> <!-- regular consumers -->
-      </acl>
-    </queue>
-
-
-    <!--
-      Examples of how to configure destinations and queues. Note
-      they you can use wildcard patterns when specifying destinations,
-      only the first element that matches will be used to configure the
-      destination or queue.
-      -->
-
-    <!-- Use this if you expect to have slow consumers on a topic -->
-    <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 name="unified.**" unified="true"/>
-
-    <!-- disable message swapping for some queues -->
-    <queue name="noswap.**" kind="ptp" swap="false"/>
-
-    <!-- disable message swapping for durable subscriptions -->
-    <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"/>
+    <hawtdb_store directory="${apollo.base}/data"/>
 
-  </virtual-host>
+  </virtual_host>
 
-  <connector id="tcp" bind="tcp://0.0.0.0:61613" connection-limit="2000" protocol="multi"/>
+  <connector id="tcp" bind="tcp://0.0.0.0:61613" connection_limit="2000" protocol="multi"/>
 
 </broker>

Modified: activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Create.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Create.scala?rev=1052062&r1=1052061&r2=1052062&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Create.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Create.scala Wed Dec 22 20:46:05 2010
@@ -25,6 +25,7 @@ import Helper._
 import java.io._
 import org.apache.activemq.apollo.util.FileSupport._
 import java.util.regex.Matcher
+import java.nio.charset.Charset
 
 object Create {
   val IS_WINDOWS = System.getProperty("os.name").toLowerCase().trim().startsWith("win");
@@ -47,8 +48,14 @@ class Create extends Action {
   @option(name = "--force", description = "Overwrite configuration at destination directory")
   var force = false
 
+  var version:String = "${version}"
+
   def execute(session: CommandSession) = {
 
+    val version = using(getClass().getResourceAsStream("version.txt")) { source=>
+      read_text(source)
+    }
+
     def println(value:Any) = session.getConsole.println(value)
     try {
       println("Creating apollo instance at: %s".format(directory))
@@ -87,10 +94,10 @@ class Create extends Action {
 
       target = etc / "apollo.xml"
       if( ssl ) {
-        write("etc/apollo-ssl.xml", target)
+        write("etc/apollo-ssl.xml", target, true)
       } else {
         println("WARNNIG: Could not generate the keystore, make sure the keytool command is in your PATH")
-        write("etc/apollo.xml", target)
+        write("etc/apollo.xml", target, true)
       }
 
 
@@ -121,20 +128,33 @@ class Create extends Action {
     null
   }
 
-  def write(source:String, target:File, filter:Boolean=false) = {
+  def write(source:String, target:File, filter:Boolean=false, target_encoding:String=null) = {
     if( target.exists && !force ) {
       error("The file '%s' already exists.  Use --force to overwrite.".format(target))
     }
-    if( filter ) {
+    if( filter || target_encoding!=null ) {
+
+      val encoding = if( target_encoding!=null ) {
+        target_encoding
+      } else {
+        "UTF-8"
+      }
 
       val out = new ByteArrayOutputStream()
       using(getClass.getResourceAsStream(source)) { in=>
         copy(in, out)
       }
 
+      // Yes this is reading in UTF-8 from the jar file..
       var content = new String(out.toByteArray, "UTF-8")
-      content = content.replaceAll("${host}", Matcher.quoteReplacement(host))
-      val in = new ByteArrayInputStream(content.getBytes("UTF-8"))
+
+      if( filter ) {
+        content = content.replaceAll("${host}", Matcher.quoteReplacement(host))
+        content = content.replaceAll("${version}", Matcher.quoteReplacement(version))
+      }
+
+      // and then writing out in the new target encoding.
+      val in = new ByteArrayInputStream(content.getBytes(encoding))
 
       using(new FileOutputStream(target)) { out=>
         copy(in, out)

Modified: activemq/activemq-apollo/trunk/apollo-cli/src/test/resources/example-broker/etc/apollo.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-cli/src/test/resources/example-broker/etc/apollo.xml?rev=1052062&r1=1052061&r2=1052062&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-cli/src/test/resources/example-broker/etc/apollo.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-cli/src/test/resources/example-broker/etc/apollo.xml Wed Dec 22 20:46:05 2010
@@ -3,9 +3,9 @@
     <notes>
       A default configuration
     </notes>
-    <virtual-host id="default"  auto-create-queues="true">
-        <host-name>localhost</host-name>
-        <bdb-store directory="${apollo.base}/data" flush-delay="100"/>
-    </virtual-host>
+    <virtual_host id="default"  auto_create_queues="true">
+        <host_name>localhost</host_name>
+        <bdb_store directory="${apollo.base}/data" flush_delay="100"/>
+    </virtual_host>
     <connector protocol="multi" bind="tcp://0.0.0.0:61613" id="default"/>
 </broker>

Modified: activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/AuthenticationDTO.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/AuthenticationDTO.java?rev=1052062&r1=1052061&r2=1052062&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/AuthenticationDTO.java (original)
+++ activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/AuthenticationDTO.java Wed Dec 22 20:46:05 2010
@@ -42,7 +42,7 @@ public class AuthenticationDTO {
      * The class names for the types of principles that
      * the acl lists check against.
      */
-    @XmlElement(name="acl-principal-kind")
+    @XmlElement(name="acl_principal_kind")
     public List<String> acl_principal_kinds = new ArrayList<String>();
 
     public List<String> acl_principal_kinds() {
@@ -58,7 +58,7 @@ public class AuthenticationDTO {
      * The class names for the types of principles that
      * the user name is extracted from.
      */
-    @XmlElement(name="user-principal-kind")
+    @XmlElement(name="user_principal_kind")
     public List<String> user_principal_kinds = new ArrayList<String>();
 
     public List<String> user_principal_kinds() {

Modified: activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/BrokerDTO.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/BrokerDTO.java?rev=1052062&r1=1052061&r2=1052062&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/BrokerDTO.java (original)
+++ activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/BrokerDTO.java Wed Dec 22 20:46:05 2010
@@ -38,7 +38,7 @@ public class BrokerDTO extends ServiceDT
     /**
      * A broker can service many virtual hosts.
      */
-    @XmlElement(name="virtual-host")
+    @XmlElement(name="virtual_host")
     public List<VirtualHostDTO> virtual_hosts = new ArrayList<VirtualHostDTO>();
 
     /**
@@ -58,7 +58,7 @@ public class BrokerDTO extends ServiceDT
     @XmlElement(name="acl")
     public BrokerAclDTO acl;
 
-    @XmlElement(name="web-admin")
+    @XmlElement(name="web_admin")
     public WebAdminDTO web_admin;
 
     @XmlElement(name="authentication")

Modified: activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/BrokerStatusDTO.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/BrokerStatusDTO.java?rev=1052062&r1=1052061&r2=1052062&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/BrokerStatusDTO.java (original)
+++ activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/BrokerStatusDTO.java Wed Dec 22 20:46:05 2010
@@ -26,20 +26,20 @@ import java.util.List;
  *
  * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
  */
-@XmlRootElement(name="broker-status")
+@XmlRootElement(name="broker_status")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class BrokerStatusDTO extends ServiceStatusDTO {
 
     /**
      * The current time on the broker machine.  In milliseconds since the epoch.
      */
-	@XmlAttribute(name="current-time")
+	@XmlAttribute(name="current_time")
 	public long current_time;
 
     /**
      * Ids of all the virtual hosts running on the broker
      */
-    @XmlElement(name="virtual-host")
+    @XmlElement(name="virtual_host")
     public List<LongIdLabeledDTO> virtual_hosts = new ArrayList<LongIdLabeledDTO>();
 
     /**

Modified: activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/BrokerSummaryDTO.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/BrokerSummaryDTO.java?rev=1052062&r1=1052061&r2=1052062&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/BrokerSummaryDTO.java (original)
+++ activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/BrokerSummaryDTO.java Wed Dec 22 20:46:05 2010
@@ -27,7 +27,7 @@ import javax.xml.bind.annotation.XmlRoot
  *
  * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
  */
-@XmlRootElement(name="broker-summary")
+@XmlRootElement(name="broker_summary")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class BrokerSummaryDTO extends StringIdDTO {
 

Modified: activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/ConnectionStatusDTO.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/ConnectionStatusDTO.java?rev=1052062&r1=1052061&r2=1052062&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/ConnectionStatusDTO.java (original)
+++ activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/ConnectionStatusDTO.java Wed Dec 22 20:46:05 2010
@@ -16,7 +16,7 @@
  */
 package org.apache.activemq.apollo.dto;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -29,20 +29,20 @@ import javax.xml.bind.annotation.XmlRoot
  *
  * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
  */
-@XmlRootElement(name="connection-status")
+@XmlRootElement(name="connection_status")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class ConnectionStatusDTO extends ServiceStatusDTO {
 
     /**
      * The number of bytes that have been read from the connection.
      */
-	@XmlAttribute(name="read-counter")
+	@XmlAttribute(name="read_counter")
 	public long read_counter;
 
     /**
      * The number of bytes that have been written to the connection.
      */
-	@XmlAttribute(name="write-counter")
+	@XmlAttribute(name="write_counter")
 	public long write_counter;
 
     /**
@@ -60,7 +60,7 @@ public class ConnectionStatusDTO extends
     /**
      * The remote address of the connection
      */
-	@XmlAttribute(name="remote-address")
+	@XmlAttribute(name="remote_address")
 	public String remote_address;
 
 }

Modified: activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/ConnectorDTO.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/ConnectorDTO.java?rev=1052062&r1=1052061&r2=1052062&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/ConnectorDTO.java (original)
+++ activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/ConnectorDTO.java Wed Dec 22 20:46:05 2010
@@ -48,7 +48,7 @@ public class ConnectorDTO extends Servic
     @XmlAttribute
     public String advertise;
 
-    @XmlAttribute(name="connection-limit")
+    @XmlAttribute(name="connection_limit")
     public Integer connection_limit;
 
     /**

Modified: activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/ConnectorStatusDTO.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/ConnectorStatusDTO.java?rev=1052062&r1=1052061&r2=1052062&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/ConnectorStatusDTO.java (original)
+++ activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/ConnectorStatusDTO.java Wed Dec 22 20:46:05 2010
@@ -16,7 +16,7 @@
  */
 package org.apache.activemq.apollo.dto;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+
 
 import javax.xml.bind.annotation.*;
 import java.util.ArrayList;
@@ -28,7 +28,7 @@ import java.util.List;
  *
  * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
  */
-@XmlRootElement(name="connector-status")
+@XmlRootElement(name="connector_status")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class ConnectorStatusDTO extends ServiceStatusDTO {
 

Modified: activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/DestinationAclDTO.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/DestinationAclDTO.java?rev=1052062&r1=1052061&r2=1052062&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/DestinationAclDTO.java (original)
+++ activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/DestinationAclDTO.java Wed Dec 22 20:46:05 2010
@@ -16,7 +16,7 @@
  */
 package org.apache.activemq.apollo.dto;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+
 
 import javax.xml.bind.annotation.*;
 import java.util.*;

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=1052062&r1=1052061&r2=1052062&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 Wed Dec 22 20:46:05 2010
@@ -16,7 +16,7 @@
  */
 package org.apache.activemq.apollo.dto;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+
 
 import javax.xml.bind.annotation.*;
 import java.util.ArrayList;
@@ -43,7 +43,7 @@ public class DestinationDTO extends Stri
     @XmlAttribute
     public Boolean unified;
 
-    @XmlElement(name="slow-consumer-policy")
+    @XmlElement(name="slow_consumer_policy")
     public String slow_consumer_policy;
 
     @XmlElement(name="acl")

Modified: activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/DestinationStatusDTO.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/DestinationStatusDTO.java?rev=1052062&r1=1052061&r2=1052062&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/DestinationStatusDTO.java (original)
+++ activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/DestinationStatusDTO.java Wed Dec 22 20:46:05 2010
@@ -26,7 +26,7 @@ import java.util.List;
  *
  * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
  */
-@XmlRootElement(name="destination-status")
+@XmlRootElement(name="destination_status")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class DestinationStatusDTO extends LongIdDTO {
 

Modified: activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/EntryStatusDTO.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/EntryStatusDTO.java?rev=1052062&r1=1052061&r2=1052062&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/EntryStatusDTO.java (original)
+++ activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/EntryStatusDTO.java Wed Dec 22 20:46:05 2010
@@ -16,7 +16,7 @@
  */
 package org.apache.activemq.apollo.dto;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -29,7 +29,7 @@ import javax.xml.bind.annotation.XmlRoot
  *
  * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
  */
-@XmlRootElement(name="entry-status")
+@XmlRootElement(name="entry_status")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class EntryStatusDTO {
 
@@ -48,10 +48,10 @@ public class EntryStatusDTO {
     @XmlAttribute
     public String state;
 
-    @XmlAttribute(name = "consumer-count")
+    @XmlAttribute(name="consumer_count")
     public int consumer_count;
 
-    @XmlAttribute(name = "is-prefetched")
+    @XmlAttribute(name="is_prefetched")
     public boolean is_prefetched;
 
 }
\ No newline at end of file

Modified: activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/IntMetricDTO.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/IntMetricDTO.java?rev=1052062&r1=1052061&r2=1052062&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/IntMetricDTO.java (original)
+++ activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/IntMetricDTO.java Wed Dec 22 20:46:05 2010
@@ -16,7 +16,7 @@
  */
 package org.apache.activemq.apollo.dto;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -30,7 +30,7 @@ import java.util.concurrent.TimeUnit;
  *
  * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
  */
-@XmlRootElement(name = "int-metric")
+@XmlRootElement(name = "int_metric")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class IntMetricDTO {
 

Modified: activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/KeyStorageDTO.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/KeyStorageDTO.java?rev=1052062&r1=1052061&r2=1052062&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/KeyStorageDTO.java (original)
+++ activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/KeyStorageDTO.java Wed Dec 22 20:46:05 2010
@@ -27,7 +27,7 @@ import java.io.File;
  *
  * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
  */
-@XmlRootElement(name="key-storage")
+@XmlRootElement(name="key_storage")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class KeyStorageDTO {
 
@@ -46,25 +46,25 @@ public class KeyStorageDTO {
     /**
      * The password to the keys in the key store.
      */
-    @XmlAttribute(name="key-password")
+    @XmlAttribute(name="key_password")
     public String key_password;
 
     /**
      * The type of key store.  If not set, defaults to JKS
      */
-    @XmlAttribute(name="store-type")
+    @XmlAttribute(name="store_type")
     public String store_type;
 
     /**
      * The trust management algorithm.  If not set, defaults to SunX509
      */
-    @XmlAttribute(name="trust-algorithm")
+    @XmlAttribute(name="trust_algorithm")
     public String trust_algorithm;
 
     /**
      * The key management algorithm.  If not set, defaults to SunX509
      */
-    @XmlAttribute(name="key-algorithm")
+    @XmlAttribute(name="key_algorithm")
     public String key_algorithm;
 
 

Modified: activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/LongIdDTO.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/LongIdDTO.java?rev=1052062&r1=1052061&r2=1052062&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/LongIdDTO.java (original)
+++ activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/LongIdDTO.java Wed Dec 22 20:46:05 2010
@@ -16,7 +16,7 @@
  */
 package org.apache.activemq.apollo.dto;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

Modified: activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/LongIdListDTO.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/LongIdListDTO.java?rev=1052062&r1=1052061&r2=1052062&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/LongIdListDTO.java (original)
+++ activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/LongIdListDTO.java Wed Dec 22 20:46:05 2010
@@ -16,7 +16,7 @@
  */
 package org.apache.activemq.apollo.dto;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

Modified: activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/NullStoreDTO.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/NullStoreDTO.java?rev=1052062&r1=1052061&r2=1052062&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/NullStoreDTO.java (original)
+++ activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/NullStoreDTO.java Wed Dec 22 20:46:05 2010
@@ -27,7 +27,7 @@ import javax.xml.bind.annotation.XmlRoot
  *
  * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
  */
-@XmlRootElement(name="null-store")
+@XmlRootElement(name="null_store")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class NullStoreDTO extends StoreDTO {
 }

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=1052062&r1=1052061&r2=1052062&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 Wed Dec 22 20:46:05 2010
@@ -26,7 +26,7 @@ import javax.xml.bind.annotation.*;
  *
  * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
  */
-@XmlRootElement(name = "queue-binding")
+@XmlRootElement(name = "queue_binding")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class QueueBindingDTO extends BindingDTO {
 

Modified: activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/QueueConsumerStatusDTO.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/QueueConsumerStatusDTO.java?rev=1052062&r1=1052061&r2=1052062&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/QueueConsumerStatusDTO.java (original)
+++ activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/QueueConsumerStatusDTO.java Wed Dec 22 20:46:05 2010
@@ -21,7 +21,7 @@ import javax.xml.bind.annotation.*;
 /**
  * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
  */
-@XmlRootElement(name="queue-consumer-status")
+@XmlRootElement(name="queue_consumer_status")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class QueueConsumerStatusDTO {
 
@@ -44,6 +44,6 @@ public class QueueConsumerStatusDTO {
     /**
      * What the consumer is currently waiting on
      */
-    @XmlAttribute(name="waiting-on")
+    @XmlAttribute(name="waiting_on")
 	public String waiting_on;
 }
\ 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=1052062&r1=1052061&r2=1052062&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 Wed Dec 22 20:46:05 2010
@@ -16,7 +16,7 @@
  */
 package org.apache.activemq.apollo.dto;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+
 
 import javax.xml.bind.annotation.*;
 
@@ -44,33 +44,33 @@ public class QueueDTO {
      * If the kind is "ds" then you can specify which client
      * id this configuration should match.
      */
-    @XmlAttribute(name="client-id")
+    @XmlAttribute(name="client_id")
     public String client_id;
 
     /**
      * If the kind is "ds" then you can specify which subscription
      * id this configuration should match.
      */
-    @XmlAttribute(name="subscription-id")
+    @XmlAttribute(name="subscription_id")
     public String subscription_id;
 
 
     /**
      *  The amount of memory buffer space for receiving messages.
      */
-    @XmlAttribute(name="producer-buffer")
+    @XmlAttribute(name="producer_buffer")
     public Integer producer_buffer;
 
     /**
      *  The amount of memory buffer space for the queue..
      */
-    @XmlAttribute(name="queue-buffer")
+    @XmlAttribute(name="queue_buffer")
     public Integer queue_buffer;
 
     /**
      *  The amount of memory buffer space to use per subscription.
      */
-    @XmlAttribute(name="consumer-buffer")
+    @XmlAttribute(name="consumer_buffer")
     public Integer consumer_buffer;
 
     /**
@@ -92,7 +92,7 @@ public class QueueDTO {
      * reference pointers to the actual messages.  When not loaded,
      * the batch is referenced as sequence range to conserve memory.
      */
-    @XmlAttribute(name="flush-range-size")
+    @XmlAttribute(name="flush_range_size")
     public Integer flush_range_size;
 
     @XmlElement(name="acl")

Modified: activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/QueueStatusDTO.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/QueueStatusDTO.java?rev=1052062&r1=1052061&r2=1052062&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/QueueStatusDTO.java (original)
+++ activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/QueueStatusDTO.java Wed Dec 22 20:46:05 2010
@@ -28,7 +28,7 @@ import java.util.List;
  *
  * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
  */
-@XmlRootElement(name="queue-status")
+@XmlRootElement(name="queue_status")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class QueueStatusDTO extends LongIdDTO {
 
@@ -38,40 +38,40 @@ public class QueueStatusDTO extends Long
     @XmlElement
     public BindingDTO binding;
 
-    @XmlAttribute(name="enqueue-item-counter")
+    @XmlAttribute(name="enqueue_item_counter")
     public long enqueue_item_counter;
 
-    @XmlAttribute(name="dequeue-item-counter")
+    @XmlAttribute(name="dequeue_item_counter")
     public long dequeue_item_counter;
 
-    @XmlAttribute(name="enqueue-size-counter")
+    @XmlAttribute(name="enqueue_size_counter")
     public long enqueue_size_counter;
 
-    @XmlAttribute(name="dequeue-size-counter")
+    @XmlAttribute(name="dequeue_size_counter")
     public long dequeue_size_counter;
 
-    @XmlAttribute(name="nack-item-counter")
+    @XmlAttribute(name="nack_item_counter")
     public long nack_item_counter;
 
-    @XmlAttribute(name="nack-size-counter")
+    @XmlAttribute(name="nack_size_counter")
     public long nack_size_counter;
 
-    @XmlAttribute(name="queue-size")
+    @XmlAttribute(name="queue_size")
     public long queue_size;
 
-    @XmlAttribute(name="queue-items")
+    @XmlAttribute(name="queue_items")
     public long queue_items;
 
-    @XmlAttribute(name="loading-size")
+    @XmlAttribute(name="loading_size")
     public int loading_size;
 
-    @XmlAttribute(name="flushing-size")
+    @XmlAttribute(name="flushing_size")
     public int flushing_size;
 
-    @XmlAttribute(name="flushed-items")
+    @XmlAttribute(name="flushed_items")
     public int flushed_items;
 
-    @XmlAttribute(name="capacity-used")
+    @XmlAttribute(name="capacity_used")
     public int capacity_used;
 
     @XmlAttribute

Modified: activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/ServiceDTO.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/ServiceDTO.java?rev=1052062&r1=1052061&r2=1052062&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/ServiceDTO.java (original)
+++ activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/ServiceDTO.java Wed Dec 22 20:46:05 2010
@@ -16,7 +16,7 @@
  */
 package org.apache.activemq.apollo.dto;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

Modified: activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/ServiceStatusDTO.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/ServiceStatusDTO.java?rev=1052062&r1=1052061&r2=1052062&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/ServiceStatusDTO.java (original)
+++ activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/ServiceStatusDTO.java Wed Dec 22 20:46:05 2010
@@ -24,7 +24,7 @@ import javax.xml.bind.annotation.XmlRoot
 /**
  * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
  */
-@XmlRootElement(name="service-status")
+@XmlRootElement(name="service_status")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class ServiceStatusDTO extends LongIdDTO {
 
@@ -38,7 +38,7 @@ public class ServiceStatusDTO extends Lo
     /**
      * Since when has the broker in in this state?  In milliseconds since the epoch. 
      */
-	@XmlAttribute(name="state-since")
+	@XmlAttribute(name="state_since")
 	public long state_since;
 
 }
\ No newline at end of file

Modified: activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/SimpleStoreStatusDTO.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/SimpleStoreStatusDTO.java?rev=1052062&r1=1052061&r2=1052062&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/SimpleStoreStatusDTO.java (original)
+++ activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/SimpleStoreStatusDTO.java Wed Dec 22 20:46:05 2010
@@ -27,7 +27,7 @@ import javax.xml.bind.annotation.XmlRoot
  *
  * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
  */
-@XmlRootElement(name="simple-store-status")
+@XmlRootElement(name="simple_store_status")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class SimpleStoreStatusDTO extends StoreStatusDTO {
 }

Modified: activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/StompConnectionStatusDTO.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/StompConnectionStatusDTO.java?rev=1052062&r1=1052061&r2=1052062&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/StompConnectionStatusDTO.java (original)
+++ activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/StompConnectionStatusDTO.java Wed Dec 22 20:46:05 2010
@@ -27,14 +27,14 @@ import javax.xml.bind.annotation.XmlRoot
  *
  * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
  */
-@XmlRootElement(name="stomp-connection-status")
+@XmlRootElement(name="stomp_connection_status")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class StompConnectionStatusDTO extends ConnectionStatusDTO {
 
     /**
      * The version of the STOMP protocol being used.
      */
-	@XmlAttribute(name="protocol-version")
+	@XmlAttribute
 	public String protocol_version;
 
     /**
@@ -46,13 +46,13 @@ public class StompConnectionStatusDTO ex
     /**
      * What the connection is currently waiting on
      */
-    @XmlAttribute(name="waiting-on")
+    @XmlAttribute(name="waiting_on")
 	public String waiting_on;
 
     /**
      * Opens subscriptions that the connection has created.
      */
-    @XmlAttribute(name="subscription-count")
+    @XmlAttribute(name="subscription_count")
 	public int subscription_count;
 
 

Modified: activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/StompDTO.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/StompDTO.java?rev=1052062&r1=1052061&r2=1052062&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/StompDTO.java (original)
+++ activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/StompDTO.java Wed Dec 22 20:46:05 2010
@@ -30,7 +30,7 @@ import javax.xml.bind.annotation.XmlRoot
 @XmlAccessorType(XmlAccessType.FIELD)
 public class StompDTO extends ProtocolDTO {
 
-    @XmlAttribute(name = "add-user-header")
+    @XmlAttribute(name="add_user_header")
     public String add_user_header;
 
 }

Modified: activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/StoreDTO.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/StoreDTO.java?rev=1052062&r1=1052061&r2=1052062&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/StoreDTO.java (original)
+++ activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/StoreDTO.java Wed Dec 22 20:46:05 2010
@@ -25,7 +25,7 @@ import javax.xml.bind.annotation.XmlType
 /**
  * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
  */
-@XmlType (name = "store-type")
+@XmlType (name = "store_type")
 @JsonTypeInfo(use=JsonTypeInfo.Id.CLASS, include=JsonTypeInfo.As.PROPERTY, property="@class")
 public abstract class StoreDTO {
 
@@ -35,7 +35,7 @@ public abstract class StoreDTO {
      * be invalidated shortly thereafter by another unit of work which
      * would negate the operation.
      */
-    @XmlAttribute(name="flush-delay", required=false)
+    @XmlAttribute(name="flush_delay", required=false)
     public Long flush_delay;
 
 

Modified: activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/StoreStatusDTO.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/StoreStatusDTO.java?rev=1052062&r1=1052061&r2=1052062&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/StoreStatusDTO.java (original)
+++ activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/StoreStatusDTO.java Wed Dec 22 20:46:05 2010
@@ -26,7 +26,7 @@ import javax.xml.bind.annotation.XmlType
 /**
  * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
  */
-@XmlType(name = "store-status-type")
+@XmlType(name = "store_status_type")
 @JsonTypeInfo(use=JsonTypeInfo.Id.CLASS, include=JsonTypeInfo.As.PROPERTY, property="@class")
 public abstract class StoreStatusDTO {
 
@@ -39,43 +39,43 @@ public abstract class StoreStatusDTO {
     /**
      * Since when has the service been in in this state?  In milliseconds since the epoch. 
      */
-	@XmlAttribute(name="state-since")
+	@XmlAttribute(name="state_since")
 	public long state_since;
 
     /**
      * The number of message stores that were canceled before they were flushed.
      */
-    @XmlAttribute(name="canceled-message-counter")
+    @XmlAttribute(name="canceled_message_counter")
     public long canceled_message_counter;
 
     /**
      * The number of message stores that were flushed.
      */
-    @XmlAttribute(name="flushed-message-counter")
+    @XmlAttribute(name="flushed_message_counter")
     public long flushed_message_counter;
 
     /**
      * The number of enqueues that were canceled before they were flushed.
      */
-    @XmlAttribute(name="canceled-enqueue-counter")
+    @XmlAttribute(name="canceled_enqueue_counter")
     public long canceled_enqueue_counter;
 
     /**
      * The number of enqueues that were flushed.
      */
-    @XmlAttribute(name="flushed-enqueue-counter")
+    @XmlAttribute(name="flushed_enqueue_counter")
     public long flushed_enqueue_counter;
 
     /**
      * The amount of time it takes to load a message from the store.
      */
-    @XmlElement(name="message-load-latency")
+    @XmlElement(name="message_load_latency")
     public TimeMetricDTO message_load_latency;
 
     /**
      * The amount of time it takes to flush a unit of work to the store
      */
-    @XmlElement(name="flush-latency")
+    @XmlElement(name="flush_latency")
     public TimeMetricDTO flush_latency;
 
 }
\ No newline at end of file

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=1052062&r1=1052061&r2=1052062&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 Wed Dec 22 20:46:05 2010
@@ -27,7 +27,7 @@ import javax.xml.bind.annotation.XmlRoot
  *
  * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
  */
-@XmlRootElement(name = "subscription-binding")
+@XmlRootElement(name = "subscription_binding")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class SubscriptionBindingDTO extends BindingDTO {
 
@@ -35,9 +35,9 @@ public class SubscriptionBindingDTO exte
 
     public String filter;
 
-    @XmlAttribute(name="client-id")
+    @XmlAttribute(name="client_id")
     public String client_id;
 
-    @XmlAttribute(name="subscription-id")
+    @XmlAttribute(name="subscription_id")
     public String subscription_id;
 }
\ No newline at end of file

Modified: activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/TempBindingDTO.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/TempBindingDTO.java?rev=1052062&r1=1052061&r2=1052062&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/TempBindingDTO.java (original)
+++ activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/TempBindingDTO.java Wed Dec 22 20:46:05 2010
@@ -27,7 +27,7 @@ import javax.xml.bind.annotation.XmlRoot
  *
  * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
  */
-@XmlRootElement(name = "temp-binding")
+@XmlRootElement(name = "temp_binding")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class TempBindingDTO extends BindingDTO {
 }
\ No newline at end of file

Modified: activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/TimeMetricDTO.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/TimeMetricDTO.java?rev=1052062&r1=1052061&r2=1052062&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/TimeMetricDTO.java (original)
+++ activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/TimeMetricDTO.java Wed Dec 22 20:46:05 2010
@@ -30,7 +30,7 @@ import java.util.concurrent.TimeUnit;
  *
  * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
  */
-@XmlRootElement(name = "time-metric")
+@XmlRootElement(name = "time_metric")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class TimeMetricDTO {
 

Modified: activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/VirtualHostDTO.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/VirtualHostDTO.java?rev=1052062&r1=1052061&r2=1052062&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/VirtualHostDTO.java (original)
+++ activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/VirtualHostDTO.java Wed Dec 22 20:46:05 2010
@@ -25,11 +25,11 @@ import javax.xml.bind.annotation.*;
 /**
  * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
  */
-@XmlRootElement(name = "virtual-host")
+@XmlRootElement(name = "virtual_host")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class VirtualHostDTO extends ServiceDTO<String> {
 
-    @XmlElement(name="host-name", required=true)
+    @XmlElement(name="host_name", required=true)
     public ArrayList<String> host_names = new ArrayList<String>();
 
     @XmlElementRef
@@ -39,13 +39,13 @@ public class VirtualHostDTO extends Serv
      * Should queues be auto created when they are first accessed
      * by clients?
      */
-    @XmlAttribute(name="auto-create-queues")
+    @XmlAttribute(name="auto_create_queues")
     public Boolean auto_create_queues;
 
     /**
      * Should queues be purged on startup?
      */
-    @XmlAttribute(name="purge-on-startup")
+    @XmlAttribute(name="purge_on_startup")
     public Boolean purge_on_startup;
 
     /**
@@ -63,7 +63,7 @@ public class VirtualHostDTO extends Serv
     /**
      * Should connections get regroups so they get serviced by the same thread?
      */
-    @XmlAttribute(name="regroup-connections")
+    @XmlAttribute(name="regroup_connections")
     public Boolean regroup_connections;
 
     @XmlElement(name="acl")

Modified: activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/VirtualHostStatusDTO.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/VirtualHostStatusDTO.java?rev=1052062&r1=1052061&r2=1052062&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/VirtualHostStatusDTO.java (original)
+++ activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/VirtualHostStatusDTO.java Wed Dec 22 20:46:05 2010
@@ -28,7 +28,7 @@ import java.util.List;
  *
  * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
  */
-@XmlRootElement(name="virtual-host-status")
+@XmlRootElement(name="virtual_host_status")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class VirtualHostStatusDTO extends ServiceStatusDTO {
 

Modified: activemq/activemq-apollo/trunk/apollo-dto/src/test/resources/org/apache/activemq/apollo/dto/XmlCodecTest.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-dto/src/test/resources/org/apache/activemq/apollo/dto/XmlCodecTest.xml?rev=1052062&r1=1052061&r2=1052062&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-dto/src/test/resources/org/apache/activemq/apollo/dto/XmlCodecTest.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-dto/src/test/resources/org/apache/activemq/apollo/dto/XmlCodecTest.xml Wed Dec 22 20:46:05 2010
@@ -23,12 +23,12 @@
     <admin allow="admins" kind="org.apache.activemq.jaas.GroupPrincipal"/>
   </acl>
 
-  <virtual-host enabled="true" id="vh-local">
+  <virtual_host enabled="true" id="vh-local">
     <acl/>
-    <host-name>localhost</host-name>
-    <host-name>example.com</host-name>
-  </virtual-host>
+    <host_name>localhost</host_name>
+    <host_name>example.com</host_name>
+  </virtual_host>
   <connector bind="tcp://0.0.0.0:61616" enabled="true" id="port-61616">
-    <stomp add-user-header="JMSXUserID"/>
+    <stomp add_user_header="JMSXUserID"/>
   </connector>
 </broker>

Modified: activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/broker/store/hawtdb/dto/HawtDBStoreDTO.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/broker/store/hawtdb/dto/HawtDBStoreDTO.java?rev=1052062&r1=1052061&r2=1052062&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/broker/store/hawtdb/dto/HawtDBStoreDTO.java (original)
+++ activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/broker/store/hawtdb/dto/HawtDBStoreDTO.java Wed Dec 22 20:46:05 2010
@@ -27,35 +27,35 @@ import java.io.File;
 /**
  * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
  */
-@XmlRootElement(name="hawtdb-store")
+@XmlRootElement(name="hawtdb_store")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class HawtDBStoreDTO extends StoreDTO {
 
     @XmlAttribute
     public File directory;
 
-    @XmlAttribute(name="archive-directory")
+    @XmlAttribute(name="archive_directory")
     public File archive_directory;
 
-	@XmlAttribute(name="index-flush-interval")
+	@XmlAttribute(name="index_flush_interval")
 	public Long index_flush_interval;
 
-	@XmlAttribute(name="cleanup-interval")
+	@XmlAttribute(name="cleanup_interval")
 	public Long cleanup_interval;
 
-	@XmlAttribute(name="journal-log-size")
+	@XmlAttribute(name="journal_log_size")
 	public Integer journal_log_size;
 
-    @XmlAttribute(name="journal-batch-size")
+    @XmlAttribute(name="journal_batch_size")
     public Integer journal_batch_size;
 
-    @XmlAttribute(name="index-cache-size")
+    @XmlAttribute(name="index_cache_size")
     public Integer index_cache_size;
 
-    @XmlAttribute(name="index-page-size")
+    @XmlAttribute(name="index_page_size")
     public Short index_page_size;
 
-    @XmlAttribute(name="fail-if-locked")
+    @XmlAttribute(name="fail_if_locked")
     public Boolean fail_if_locked;
 
 

Modified: activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/broker/store/hawtdb/dto/HawtDBStoreStatusDTO.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/broker/store/hawtdb/dto/HawtDBStoreStatusDTO.java?rev=1052062&r1=1052061&r2=1052062&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/broker/store/hawtdb/dto/HawtDBStoreStatusDTO.java (original)
+++ activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/broker/store/hawtdb/dto/HawtDBStoreStatusDTO.java Wed Dec 22 20:46:05 2010
@@ -28,17 +28,17 @@ import javax.xml.bind.annotation.XmlRoot
 /**
  * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
  */
-@XmlRootElement(name="hawtdb-store-status")
+@XmlRootElement(name="hawtdb_store_status")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class HawtDBStoreStatusDTO extends StoreStatusDTO {
 
-    @XmlElement(name="journal-append-latency")
+    @XmlElement(name="journal_append_latency")
     public TimeMetricDTO journal_append_latency;
 
-    @XmlElement(name="index-update-latency")
+    @XmlElement(name="index_update_latency")
     public TimeMetricDTO index_update_latency;
 
-    @XmlElement(name="message-load-batch-size")
+    @XmlElement(name="message_load_batch_size")
     public IntMetricDTO message_load_batch_size;
 
 }

Modified: activemq/activemq-apollo/trunk/apollo-hawtdb/src/test/resources/org/apache/activemq/apollo/broker/store/hawtdb/dto/simple.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-hawtdb/src/test/resources/org/apache/activemq/apollo/broker/store/hawtdb/dto/simple.xml?rev=1052062&r1=1052061&r2=1052062&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-hawtdb/src/test/resources/org/apache/activemq/apollo/broker/store/hawtdb/dto/simple.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-hawtdb/src/test/resources/org/apache/activemq/apollo/broker/store/hawtdb/dto/simple.xml Wed Dec 22 20:46:05 2010
@@ -16,8 +16,8 @@
     limitations under the License.
 -->
 <broker basedir="./activemq-data/default" id="default" xmlns="http://activemq.apache.org/schema/activemq/apollo">
-    <virtual-host id="vh-local">
-        <host-name>localhost</host-name>
-        <hawtdb-store directory="activemq-data"/>
-    </virtual-host>
+    <virtual_host id="vh-local">
+        <host_name>localhost</host_name>
+        <hawtdb_store directory="activemq-data"/>
+    </virtual_host>
 </broker>

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=1052062&r1=1052061&r2=1052062&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 Wed Dec 22 20:46:05 2010
@@ -19,8 +19,8 @@
 
   <authentication domain="StompSecurityTest"/>
 
-  <virtual-host id="default" purge-on-startup="true">
-    <host-name>localhost</host-name>
+  <virtual_host id="default" purge_on_startup="true">
+    <host_name>localhost</host_name>
 
     <acl>
       <connect allow="connect_group"/>
@@ -55,10 +55,10 @@
         <consume allow="can_consume_ds"/>
       </acl>
     </queue>
-  </virtual-host>
+  </virtual_host>
 
   <connector id="tcp" protocol="stomp" bind="tcp://0.0.0.0:0">
-    <stomp add-user-header="JMSXUserID"/>
+    <stomp add_user_header="JMSXUserID"/>
   </connector>
 
 </broker>
\ No newline at end of file

Modified: activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-ssl-secure.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-ssl-secure.xml?rev=1052062&r1=1052061&r2=1052062&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-ssl-secure.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-ssl-secure.xml Wed Dec 22 20:46:05 2010
@@ -20,11 +20,11 @@
 
   <authentication domain="StompSslSecurityTest"/>
 
-  <virtual-host id="default" purge-on-startup="true">
-    <host-name>localhost</host-name>
-  </virtual-host>
+  <virtual_host id="default" purge_on_startup="true">
+    <host_name>localhost</host_name>
+  </virtual_host>
 
-  <key-storage file="${basedir}/src/test/resources/apollo.ks" password="password" key-password="password"/>
+  <key_storage file="${basedir}/src/test/resources/apollo.ks" password="password" key_password="password"/>
   <connector id="ssl" protocol="stomp" bind="ssl://0.0.0.0:0" />
 
 </broker>
\ No newline at end of file

Modified: activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-ssl.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-ssl.xml?rev=1052062&r1=1052061&r2=1052062&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-ssl.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-ssl.xml Wed Dec 22 20:46:05 2010
@@ -18,11 +18,11 @@
 <broker id="default" rev="1" xmlns="http://activemq.apache.org/schema/activemq/apollo">
 
     <notes>The config for the ssl stomp tests.</notes>
-    <virtual-host id="default" purge-on-startup="true" auto-create-queues="true">
-        <host-name>localhost</host-name>
-    </virtual-host>
+    <virtual_host id="default" purge_on_startup="true" auto_create_queues="true">
+        <host_name>localhost</host_name>
+    </virtual_host>
 
-    <key-storage file="${basedir}/src/test/resources/apollo.ks" password="password" key-password="password"/>
+    <key_storage file="${basedir}/src/test/resources/apollo.ks" password="password" key_password="password"/>
     <connector id="ssl" protocol="stomp" bind="ssl://0.0.0.0:0" />
 
 </broker>
\ No newline at end of file

Modified: activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp.xml?rev=1052062&r1=1052061&r2=1052062&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp.xml Wed Dec 22 20:46:05 2010
@@ -18,9 +18,9 @@
 <broker id="default" rev="1" xmlns="http://activemq.apache.org/schema/activemq/apollo">
     <notes>This broker configuration is what the unit tests in this module load up.</notes>
 
-    <virtual-host id="default" purge-on-startup="true" auto-create-queues="true">
-        <host-name>localhost</host-name>
-    </virtual-host>
+    <virtual_host id="default" purge_on_startup="true" auto_create_queues="true">
+        <host_name>localhost</host_name>
+    </virtual_host>
 
     <connector id="tcp" protocol="stomp" bind="tcp://0.0.0.0:0"/>
 

Modified: activemq/activemq-apollo/trunk/apollo-util/src/main/scala/org/apache/activemq/apollo/util/FileSupport.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-util/src/main/scala/org/apache/activemq/apollo/util/FileSupport.scala?rev=1052062&r1=1052061&r2=1052062&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-util/src/main/scala/org/apache/activemq/apollo/util/FileSupport.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-util/src/main/scala/org/apache/activemq/apollo/util/FileSupport.scala Wed Dec 22 20:46:05 2010
@@ -98,5 +98,10 @@ object FileSupport {
     }
   }
 
+  def read_text(in: InputStream, charset:String="UTF-8"): String = {
+    val out = new ByteArrayOutputStream()
+    copy(in, out)
+    new String(out.toByteArray, charset)
+  }
 
 }
\ No newline at end of file

Modified: activemq/activemq-apollo/trunk/apollo-website/src/documentation/getting-started.md
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-website/src/documentation/getting-started.md?rev=1052062&r1=1052061&r2=1052062&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-website/src/documentation/getting-started.md (original)
+++ activemq/activemq-apollo/trunk/apollo-website/src/documentation/getting-started.md Wed Dec 22 20:46:05 2010
@@ -86,7 +86,7 @@ The default configuration used a hawtdb 
 bugs and not yet stable.  Unless you want to help find and squash those bugs,
 it is recommend you change the configuration to use the BDB store instead.  To do that,
 just update the generated configuration by editing the `etc/apollo.xml` file and then
-replace `hawtdb-store` with `bdb-store`
+replace `hawtdb_store` with `bdb_store`
 
 ## Running a Broker Instance
 



Mime
View raw message