Author: chirino
Date: Thu Nov 11 13:31:02 2010
New Revision: 1033934
URL: http://svn.apache.org/viewvc?rev=1033934&view=rev
Log:
Allows configuring a key/storage element per broker.
Added:
activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/KeyStorageDTO.java
- copied, changed from r1033933,
activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/BrokerDTO.java
Modified:
activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/BrokerDTO.java
activemq/activemq-apollo/trunk/apollo-dto/src/main/resources/org/apache/activemq/apollo/dto/jaxb.index
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=1033934&r1=1033933&r2=1033934&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
Thu Nov 11 13:31:02 2010
@@ -21,11 +21,7 @@ import org.codehaus.jackson.annotate.Jso
import java.util.ArrayList;
import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.*;
/**
* @author <a href="http://hiramchirino.com";>Hiram Chirino</a>
@@ -76,5 +72,11 @@ public class BrokerDTO extends ServiceDT
public String basedir;
+ /**
+ * The base data directory of the broker. It will store
+ * persistent data under it.
+ */
+ @XmlElementRef
+ public KeyStorageDTO key_storage;
}
Copied:
activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/KeyStorageDTO.java
(from r1033933,
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/KeyStorageDTO.java?p2=activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/KeyStorageDTO.java&p1=activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/BrokerDTO.java&r1=1033933&r2=1033934&rev=1033934&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/KeyStorageDTO.java
Thu Nov 11 13:31:02 2010
@@ -16,65 +16,56 @@
*/
package org.apache.activemq.apollo.dto;
-import org.codehaus.jackson.annotate.JsonProperty;
-
-import java.util.ArrayList;
-import java.util.List;
-
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
+import java.io.File;
/**
+ *
+ *
* @author <a href="http://hiramchirino.com";>Hiram Chirino</a>
*/
-...@xmlrootelement(name="broker")
+...@xmlrootelement(name="key-storage")
@XmlAccessorType(XmlAccessType.FIELD)
-public class BrokerDTO extends ServiceDTO<String> {
+public class KeyStorageDTO {
/**
- * Used to track config revisions.
+ * Path to where the key store is located.
*/
- @JsonProperty
@XmlAttribute
- public int rev;
+ public File file;
/**
- * Used to track who last modified the configuration.
+ * The key store password
*/
- @XmlAttribute(name="modified-by")
- public String modified_by;
+ @XmlAttribute
+ public String password;
/**
- * Used to store any configuration notes.
+ * The password to the keys in the key store.
*/
- @JsonProperty
- @XmlElement
- public String notes;
+ @XmlAttribute(name="key-password")
+ public String key_password;
/**
- * A broker can service many virtual hosts.
+ * The type of key store. If not set, defaults to JKS
*/
- @XmlElement(name="virtual-host")
- public List<VirtualHostDTO> virtual_hosts = new
ArrayList<VirtualHostDTO>();
+ @XmlAttribute(name="store-type")
+ public String store_type;
/**
- * A broker accepts connections via it's configured connectors.
+ * The trust management algorithm. If not set, defaults to SunX509
*/
- @JsonProperty
- @XmlElement
- public List<ConnectorDTO> connectors = new ArrayList<ConnectorDTO>();
+ @XmlAttribute(name="trust-algorithm")
+ public String trust_algorithm;
/**
- * The base data directory of the broker. It will store
- * persistent data under it.
+ * The key management algorithm. If not set, defaults to SunX509
*/
- @JsonProperty
- @XmlAttribute
- public String basedir;
+ @XmlAttribute(name="key-algorithm")
+ public String key_algorithm;
-
}
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=1033934&r1=1033933&r2=1033934&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
Thu Nov 11 13:31:02 2010
@@ -40,4 +40,5 @@ StringIdListDTO
TimeMetricDTO
VirtualHostDTO
VirtualHostStatusDTO
-StompConnectionStatusDTO
\ No newline at end of file
+StompConnectionStatusDTO
+KeyStorageDTO
\ No newline at end of file
