activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r1034511 - in /activemq/activemq-apollo/trunk: apollo-dto/src/main/java/org/apache/activemq/apollo/dto/ apollo-dto/src/main/resources/org/apache/activemq/apollo/dto/ apollo-hawtdb/ apollo-hawtdb/src/main/resources/META-INF/services/org.apac...
Date Fri, 12 Nov 2010 18:54:41 GMT
Author: chirino
Date: Fri Nov 12 18:54:40 2010
New Revision: 1034511

URL: http://svn.apache.org/viewvc?rev=1034511&view=rev
Log:
Moved all the hawtdb dto and web templates into the hawtdb module.

Added:
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/resources/META-INF/services/org.apache.activemq.apollo/xml-packages.index
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/resources/org/
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/resources/org/apache/
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/resources/org/apache/activemq/
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/resources/org/apache/activemq/apollo/
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/resources/org/apache/activemq/apollo/store/
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/resources/org/apache/activemq/apollo/store/hawtdb/
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/resources/org/apache/activemq/apollo/store/hawtdb/dto/
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/resources/org/apache/activemq/apollo/store/hawtdb/dto/jaxb.index
      - copied, changed from r1034470, activemq/activemq-apollo/trunk/apollo-dto/src/main/resources/org/apache/activemq/apollo/dto/jaxb.index
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/dto/
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/dto/HawtDBStoreDTO.java
      - copied, changed from r1034470, activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/HawtDBStoreDTO.java
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/dto/HawtDBStoreStatusDTO.java
      - copied, changed from r1034470, activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/HawtDBStoreStatusDTO.java
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/dto/package-info.java
      - copied, changed from r1034470, activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/HawtDBStoreStatusDTO.java
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/webapp/
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/webapp/WEB-INF/
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/webapp/WEB-INF/org/
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/webapp/WEB-INF/org/apache/
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/webapp/WEB-INF/org/apache/activemq/
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/webapp/WEB-INF/org/apache/activemq/apollo/
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/webapp/WEB-INF/org/apache/activemq/apollo/store/
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/webapp/WEB-INF/org/apache/activemq/apollo/store/hawtdb/
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/webapp/WEB-INF/org/apache/activemq/apollo/store/hawtdb/dto/
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/webapp/WEB-INF/org/apache/activemq/apollo/store/hawtdb/dto/HawtDBStoreStatusDTO.jade
      - copied, changed from r1034470, activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/HawtDBStoreStatusDTO.jade
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/test/resources/org/
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/test/resources/org/apache/
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/test/resources/org/apache/activemq/
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/test/resources/org/apache/activemq/apollo/
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/test/resources/org/apache/activemq/apollo/store/
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/test/resources/org/apache/activemq/apollo/store/hawtdb/
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/test/resources/org/apache/activemq/apollo/store/hawtdb/dto/
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/test/resources/org/apache/activemq/apollo/store/hawtdb/dto/simple.xml
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/test/scala/org/apache/activemq/apollo/store/hawtdb/dto/
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/test/scala/org/apache/activemq/apollo/store/hawtdb/dto/XmlCodecTest.java
      - copied, changed from r1034470, activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/HawtDBStoreStatusDTO.java
Removed:
    activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/HawtDBStoreDTO.java
    activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/HawtDBStoreStatusDTO.java
    activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/HawtDBStoreStatusDTO.jade
Modified:
    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/resources/org/apache/activemq/apollo/dto/jaxb.index
    activemq/activemq-apollo/trunk/apollo-hawtdb/pom.xml
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBClient.scala
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBStore.scala
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBStoreFactory.scala
    activemq/activemq-apollo/trunk/apollo-stomp/src/test/scala/org/apache/activemq/apollo/stomp/perf/StompBrokerPerfTest.scala

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=1034511&r1=1034510&r2=1034511&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
Fri Nov 12 18:54:40 2010
@@ -16,19 +16,17 @@
  */
 package org.apache.activemq.apollo.dto;
 
-import org.codehaus.jackson.annotate.JsonProperty;
 import org.codehaus.jackson.annotate.JsonTypeInfo;
 
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlSeeAlso;
 import javax.xml.bind.annotation.XmlType;
-import java.io.File;
 
 /**
  * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
  */
 @XmlType(name = "store-type")
-@XmlSeeAlso({CassandraStoreDTO.class, HawtDBStoreDTO.class})
+// @XmlSeeAlso({CassandraStoreDTO.class, HawtDBStoreDTO.class})
 @JsonTypeInfo(use=JsonTypeInfo.Id.CLASS, include=JsonTypeInfo.As.PROPERTY, property="@class")
 public abstract class StoreDTO {
 

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=1034511&r1=1034510&r2=1034511&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
Fri Nov 12 18:54:40 2010
@@ -16,7 +16,6 @@
  */
 package org.apache.activemq.apollo.dto;
 
-import org.codehaus.jackson.annotate.JsonProperty;
 import org.codehaus.jackson.annotate.JsonTypeInfo;
 
 import javax.xml.bind.annotation.XmlAttribute;
@@ -28,7 +27,7 @@ import javax.xml.bind.annotation.XmlType
  * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
  */
 @XmlType(name = "store-status-type")
-@XmlSeeAlso({HawtDBStoreStatusDTO.class})
+// @XmlSeeAlso({HawtDBStoreStatusDTO.class})
 @JsonTypeInfo(use=JsonTypeInfo.Id.CLASS, include=JsonTypeInfo.As.PROPERTY, property="@class")
 public class StoreStatusDTO {
 

Modified: activemq/activemq-apollo/trunk/apollo-dto/src/main/resources/org/apache/activemq/apollo/dto/jaxb.index
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-dto/src/main/resources/org/apache/activemq/apollo/dto/jaxb.index?rev=1034511&r1=1034510&r2=1034511&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-dto/src/main/resources/org/apache/activemq/apollo/dto/jaxb.index
(original)
+++ activemq/activemq-apollo/trunk/apollo-dto/src/main/resources/org/apache/activemq/apollo/dto/jaxb.index
Fri Nov 12 18:54:40 2010
@@ -23,8 +23,6 @@ ConnectorDTO
 ConnectorStatusDTO
 DestinationStatusDTO
 EntryStatusDTO
-HawtDBStoreDTO
-HawtDBStoreStatusDTO
 IntMetricDTO
 LongIdDTO
 LongIdLabeledDTO

Modified: activemq/activemq-apollo/trunk/apollo-hawtdb/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-hawtdb/pom.xml?rev=1034511&r1=1034510&r2=1034511&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-hawtdb/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-hawtdb/pom.xml Fri Nov 12 18:54:40 2010
@@ -52,6 +52,22 @@
       <version>${hawtbuf-version}</version>
     </dependency>
 
+    <!-- Since we implement a jade template to display the BDB status -->
+    <dependency>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>apollo-web</artifactId>
+      <version>1.0-SNAPSHOT</version>
+      <type>jar</type>
+      <classifier>slim</classifier>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>${servlet-api-version}</version>
+      <scope>provided</scope>
+    </dependency>
+
     <!-- Scala Support -->
     <dependency>
       <groupId>org.scala-lang</groupId>
@@ -123,6 +139,19 @@
         </executions>
       </plugin>
 
+      <plugin>
+        <groupId>org.fusesource.scalate</groupId>
+        <artifactId>maven-scalate-plugin</artifactId>
+        <version>${scalate-version}</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>precompile</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
     </plugins>
   </build>
 

Added: activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/resources/META-INF/services/org.apache.activemq.apollo/xml-packages.index
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/resources/META-INF/services/org.apache.activemq.apollo/xml-packages.index?rev=1034511&view=auto
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/resources/META-INF/services/org.apache.activemq.apollo/xml-packages.index
(added)
+++ activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/resources/META-INF/services/org.apache.activemq.apollo/xml-packages.index
Fri Nov 12 18:54:40 2010
@@ -0,0 +1,17 @@
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements.  See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License.  You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
+org.apache.activemq.apollo.store.hawtdb.dto
\ No newline at end of file

Copied: activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/resources/org/apache/activemq/apollo/store/hawtdb/dto/jaxb.index
(from r1034470, activemq/activemq-apollo/trunk/apollo-dto/src/main/resources/org/apache/activemq/apollo/dto/jaxb.index)
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/resources/org/apache/activemq/apollo/store/hawtdb/dto/jaxb.index?p2=activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/resources/org/apache/activemq/apollo/store/hawtdb/dto/jaxb.index&p1=activemq/activemq-apollo/trunk/apollo-dto/src/main/resources/org/apache/activemq/apollo/dto/jaxb.index&r1=1034470&r2=1034511&rev=1034511&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-dto/src/main/resources/org/apache/activemq/apollo/dto/jaxb.index
(original)
+++ activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/resources/org/apache/activemq/apollo/store/hawtdb/dto/jaxb.index
Fri Nov 12 18:54:40 2010
@@ -14,31 +14,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ------------------------------------------------------------------------
-BrokerDTO
-BrokerStatusDTO
-BrokerSummaryDTO
-CassandraStoreDTO
-ConnectionStatusDTO
-ConnectorDTO
-ConnectorStatusDTO
-DestinationStatusDTO
-EntryStatusDTO
 HawtDBStoreDTO
 HawtDBStoreStatusDTO
-IntMetricDTO
-LongIdDTO
-LongIdLabeledDTO
-LongIdListDTO
-QueueStatusDTO
-ServiceDTO
-ServiceStatusDTO
-StoreDTO
-StoreStatusDTO
-StringIdDTO
-StringIdLabeledDTO
-StringIdListDTO
-TimeMetricDTO
-VirtualHostDTO
-VirtualHostStatusDTO
-StompConnectionStatusDTO
-KeyStorageDTO
\ No newline at end of file

Modified: activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBClient.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBClient.scala?rev=1034511&r1=1034510&r2=1034511&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBClient.scala
(original)
+++ activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBClient.scala
Fri Nov 12 18:54:40 2010
@@ -16,11 +16,10 @@
  */
 package org.apache.activemq.apollo.store.hawtdb
 
+import dto.HawtDBStoreDTO
 import java.{lang=>jl}
 import java.{util=>ju}
 
-import model.{AddQueue, AddQueueEntry, AddMessage}
-import org.apache.activemq.apollo.dto.HawtDBStoreDTO
 import java.io.File
 import java.io.IOException
 import java.util.concurrent.atomic.{AtomicInteger, AtomicLong}
@@ -29,7 +28,7 @@ import org.apache.activemq.apollo.store.
 import org.apache.activemq.apollo.store.hawtdb.model._
 import org.fusesource.hawtbuf._
 import org.fusesource.hawtdispatch._
-import collection.mutable.{LinkedHashMap, HashMap, ListBuffer}
+import collection.mutable.{LinkedHashMap, ListBuffer}
 import collection.JavaConversions
 import ju.{TreeSet, HashSet}
 

Modified: activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBStore.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBStore.scala?rev=1034511&r1=1034510&r2=1034511&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBStore.scala
(original)
+++ activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBStore.scala
Fri Nov 12 18:54:40 2010
@@ -17,6 +17,7 @@
 package org.apache.activemq.apollo.store.hawtdb
 
 import collection.mutable.ListBuffer
+import dto.{HawtDBStoreStatusDTO, HawtDBStoreDTO}
 import java.util.HashMap
 import collection.{Seq}
 import org.fusesource.hawtdispatch._

Modified: activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBStoreFactory.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBStoreFactory.scala?rev=1034511&r1=1034510&r2=1034511&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBStoreFactory.scala
(original)
+++ activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBStoreFactory.scala
Fri Nov 12 18:54:40 2010
@@ -16,8 +16,9 @@
  */
 package org.apache.activemq.apollo.store.hawtdb
 
+import dto.HawtDBStoreDTO
 import org.apache.activemq.apollo.store.StoreFactory
-import org.apache.activemq.apollo.dto.{HawtDBStoreDTO, StoreDTO}
+import org.apache.activemq.apollo.dto.StoreDTO
 import org.apache.activemq.apollo.util._
 import ReporterLevel._
 

Copied: activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/dto/HawtDBStoreDTO.java
(from r1034470, activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/HawtDBStoreDTO.java)
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/dto/HawtDBStoreDTO.java?p2=activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/dto/HawtDBStoreDTO.java&p1=activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/HawtDBStoreDTO.java&r1=1034470&r2=1034511&rev=1034511&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/HawtDBStoreDTO.java
(original)
+++ activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/dto/HawtDBStoreDTO.java
Fri Nov 12 18:54:40 2010
@@ -14,8 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.apollo.dto;
+package org.apache.activemq.apollo.store.hawtdb.dto;
 
+import org.apache.activemq.apollo.dto.StoreDTO;
 import org.codehaus.jackson.annotate.JsonProperty;
 
 import javax.xml.bind.annotation.XmlAccessType;

Copied: activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/dto/HawtDBStoreStatusDTO.java
(from r1034470, activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/HawtDBStoreStatusDTO.java)
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/dto/HawtDBStoreStatusDTO.java?p2=activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/dto/HawtDBStoreStatusDTO.java&p1=activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/HawtDBStoreStatusDTO.java&r1=1034470&r2=1034511&rev=1034511&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/HawtDBStoreStatusDTO.java
(original)
+++ activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/dto/HawtDBStoreStatusDTO.java
Fri Nov 12 18:54:40 2010
@@ -14,7 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.apollo.dto;
+package org.apache.activemq.apollo.store.hawtdb.dto;
+
+import org.apache.activemq.apollo.dto.IntMetricDTO;
+import org.apache.activemq.apollo.dto.StoreStatusDTO;
+import org.apache.activemq.apollo.dto.TimeMetricDTO;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

Copied: activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/dto/package-info.java
(from r1034470, activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/HawtDBStoreStatusDTO.java)
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/dto/package-info.java?p2=activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/dto/package-info.java&p1=activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/HawtDBStoreStatusDTO.java&r1=1034470&r2=1034511&rev=1034511&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/HawtDBStoreStatusDTO.java
(original)
+++ activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/dto/package-info.java
Fri Nov 12 18:54:40 2010
@@ -14,27 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.apollo.dto;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
 
 /**
- * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
+ * The JAXB POJOs for the
+ * The JAXB POJOs for the
+ * <a href="http://activemq.apache.org/schema/activemq/apollo/xml-configuration.html">XML
Configuration</a>
+ * of the ActiveMQ Broker.
  */
-@XmlRootElement(name="hawtdb-store-status")
-@XmlAccessorType(XmlAccessType.FIELD)
-public class HawtDBStoreStatusDTO extends StoreStatusDTO {
-
-    @XmlElement(name="journal-append-latency")
-    public TimeMetricDTO journal_append_latency;
-
-    @XmlElement(name="index-update-latency")
-    public TimeMetricDTO index_update_latency;
-
-    @XmlElement(name="message-load-batch-size")
-    public IntMetricDTO message_load_batch_size;
+@javax.xml.bind.annotation.XmlSchema(
+        namespace = "http://activemq.apache.org/schema/activemq/apollo",
+        elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+package org.apache.activemq.apollo.store.hawtdb.dto;
 
-}
\ No newline at end of file

Copied: activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/webapp/WEB-INF/org/apache/activemq/apollo/store/hawtdb/dto/HawtDBStoreStatusDTO.jade
(from r1034470, activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/HawtDBStoreStatusDTO.jade)
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/webapp/WEB-INF/org/apache/activemq/apollo/store/hawtdb/dto/HawtDBStoreStatusDTO.jade?p2=activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/webapp/WEB-INF/org/apache/activemq/apollo/store/hawtdb/dto/HawtDBStoreStatusDTO.jade&p1=activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/HawtDBStoreStatusDTO.jade&r1=1034470&r2=1034511&rev=1034511&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/HawtDBStoreStatusDTO.jade
(original)
+++ activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/webapp/WEB-INF/org/apache/activemq/apollo/store/hawtdb/dto/HawtDBStoreStatusDTO.jade
Fri Nov 12 18:54:40 2010
@@ -13,6 +13,7 @@
 -# See the License for the specific language governing permissions and
 -# limitations under the License.
 
+- import org.apache.activemq.apollo.dto._
 - import it._
 - val helper = new org.apache.activemq.apollo.web.resources.ViewHelper
 - import helper._

Added: activemq/activemq-apollo/trunk/apollo-hawtdb/src/test/resources/org/apache/activemq/apollo/store/hawtdb/dto/simple.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-hawtdb/src/test/resources/org/apache/activemq/apollo/store/hawtdb/dto/simple.xml?rev=1034511&view=auto
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-hawtdb/src/test/resources/org/apache/activemq/apollo/store/hawtdb/dto/simple.xml
(added)
+++ activemq/activemq-apollo/trunk/apollo-hawtdb/src/test/resources/org/apache/activemq/apollo/store/hawtdb/dto/simple.xml
Fri Nov 12 18:54:40 2010
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    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>
+</broker>

Copied: activemq/activemq-apollo/trunk/apollo-hawtdb/src/test/scala/org/apache/activemq/apollo/store/hawtdb/dto/XmlCodecTest.java
(from r1034470, activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/HawtDBStoreStatusDTO.java)
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-hawtdb/src/test/scala/org/apache/activemq/apollo/store/hawtdb/dto/XmlCodecTest.java?p2=activemq/activemq-apollo/trunk/apollo-hawtdb/src/test/scala/org/apache/activemq/apollo/store/hawtdb/dto/XmlCodecTest.java&p1=activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/HawtDBStoreStatusDTO.java&r1=1034470&r2=1034511&rev=1034511&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/HawtDBStoreStatusDTO.java
(original)
+++ activemq/activemq-apollo/trunk/apollo-hawtdb/src/test/scala/org/apache/activemq/apollo/store/hawtdb/dto/XmlCodecTest.java
Fri Nov 12 18:54:40 2010
@@ -14,27 +14,39 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.apollo.dto;
+package org.apache.activemq.apollo.store.hawtdb.dto;
+
+import org.apache.activemq.apollo.dto.BrokerDTO;
+import org.apache.activemq.apollo.dto.VirtualHostDTO;
+import org.apache.activemq.apollo.dto.XmlCodec;
+import org.junit.Test;
+
+import java.io.InputStream;
+
+import static junit.framework.Assert.*;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
 
 /**
  * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
  */
-@XmlRootElement(name="hawtdb-store-status")
-@XmlAccessorType(XmlAccessType.FIELD)
-public class HawtDBStoreStatusDTO extends StoreStatusDTO {
 
-    @XmlElement(name="journal-append-latency")
-    public TimeMetricDTO journal_append_latency;
+public class XmlCodecTest {
 
-    @XmlElement(name="index-update-latency")
-    public TimeMetricDTO index_update_latency;
+    private InputStream resource(String path) {
+        return getClass().getResourceAsStream(path);
+    }
+
+    @Test
+    public void unmarshalling() throws Exception {
+        BrokerDTO dto = XmlCodec.unmarshalBrokerDTO(resource("simple.xml"));
+        assertNotNull(dto);
+        VirtualHostDTO host = dto.virtual_hosts.get(0);
+        assertEquals("vh-local", host.id);
+        assertEquals("localhost", host.host_names.get(0));
+
+        assertNotNull( host.store );
+        assertTrue( host.store instanceof HawtDBStoreDTO);
+    }
 
-    @XmlElement(name="message-load-batch-size")
-    public IntMetricDTO message_load_batch_size;
 
-}
\ No newline at end of file
+}

Modified: activemq/activemq-apollo/trunk/apollo-stomp/src/test/scala/org/apache/activemq/apollo/stomp/perf/StompBrokerPerfTest.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-stomp/src/test/scala/org/apache/activemq/apollo/stomp/perf/StompBrokerPerfTest.scala?rev=1034511&r1=1034510&r2=1034511&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-stomp/src/test/scala/org/apache/activemq/apollo/stomp/perf/StompBrokerPerfTest.scala
(original)
+++ activemq/activemq-apollo/trunk/apollo-stomp/src/test/scala/org/apache/activemq/apollo/stomp/perf/StompBrokerPerfTest.scala
Fri Nov 12 18:54:40 2010
@@ -18,9 +18,9 @@ package org.apache.activemq.apollo.stomp
 
 import _root_.org.apache.activemq.apollo.broker.perf._
 import java.io.File
-import org.apache.activemq.apollo.dto.{BrokerDTO, HawtDBStoreDTO}
+import org.apache.activemq.apollo.dto.BrokerDTO
 import org.apache.activemq.apollo.store.bdb.dto.BDBStoreDTO
-
+import org.apache.activemq.apollo.store.hawtdb.dto.HawtDBStoreDTO
 
 class BasicNonPersistentTest extends BasicScenarios with StompScenario {
   override def description = "Using the STOMP protocol over TCP"



Mime
View raw message