You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2010/11/16 16:01:18 UTC
svn commit: r1035650 - in /activemq/activemq-apollo/trunk:
apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/
apollo-cli/src/main/resources/org/apache/activemq/apollo/cli/commands/etc/
apollo-cli/src/test/resources/example-broker/etc/ apol...
Author: chirino
Date: Tue Nov 16 15:01:17 2010
New Revision: 1035650
URL: http://svn.apache.org/viewvc?rev=1035650&view=rev
Log:
the basedir xml attribute was unused.
Modified:
activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Broker.scala
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/test/resources/example-broker/etc/apollo.xml
activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/BrokerDTO.java
activemq/activemq-apollo/trunk/apollo-dto/src/test/java/org/apache/activemq/apollo/dto/XmlCodecTest.java
Modified: activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Broker.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Broker.scala?rev=1035650&r1=1035649&r2=1035650&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Broker.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Broker.scala Tue Nov 16 15:01:17 2010
@@ -125,7 +125,6 @@ object Broker extends Log {
rc.notes = "A default configuration"
rc.virtual_hosts.add(VirtualHost.defaultConfig)
rc.connectors.add(Connector.defaultConfig)
- rc.basedir = "./activemq-data/default"
rc
}
@@ -140,9 +139,6 @@ object Broker extends Log {
if( config.virtual_hosts.isEmpty ) {
error("Broker must define at least one virtual host.")
}
- if( empty(config.basedir) ) {
- error("Broker basedir must be defined.")
- }
for (host <- config.virtual_hosts ) {
result |= VirtualHost.validate(host, reporter)
@@ -170,7 +166,6 @@ class Broker() extends BaseService with
var config: BrokerDTO = defaultConfig
- var data_directory: File = null
var default_virtual_host: VirtualHost = null
val virtual_hosts = LinkedHashMap[AsciiBuffer, VirtualHost]()
val virtual_hosts_by_hostname = new LinkedHashMap[AsciiBuffer, VirtualHost]()
@@ -213,8 +208,6 @@ class Broker() extends BaseService with
// create the runtime objects from the config
{
- data_directory = new File(config.basedir)
-
if( config.key_storage!=null ) {
key_storage = new KeyStorage
key_storage.config = config.key_storage
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=1035650&r1=1035649&r2=1035650&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 Tue Nov 16 15:01:17 2010
@@ -13,7 +13,7 @@
License for the specific language governing permissions and
limitations under the License.
-->
-<broker basedir="./activemq-data/default" rev="1" enabled="true" id="default" xmlns="http://activemq.apache.org/schema/activemq/apollo">
+<broker id="default" rev="1" xmlns="http://activemq.apache.org/schema/activemq/apollo">
<notes>
The default configuration.
</notes>
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=1035650&r1=1035649&r2=1035650&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 Tue Nov 16 15:01:17 2010
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<broker basedir="./activemq-data/default" rev="4" enabled="true" id="default" xmlns="http://activemq.apache.org/schema/activemq/apollo">
+<broker id="default" rev="1" xmlns="http://activemq.apache.org/schema/activemq/apollo">
<notes>
A default configuration
</notes>
- <virtual-host purge-on-startup="false" auto-create-queues="true" enabled="true" id="default">
+ <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 advertise="tcp://localhost:61613" protocol="multi" bind="tcp://0.0.0.0:61613" enabled="true" id="default"/>
+ <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/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=1035650&r1=1035649&r2=1035650&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 Tue Nov 16 15:01:17 2010
@@ -64,14 +64,6 @@ public class BrokerDTO extends ServiceDT
@XmlElement(name="connector")
public List<ConnectorDTO> connectors = new ArrayList<ConnectorDTO>();
- /**
- * The base data directory of the broker. It will store
- * persistent data under it.
- */
- @JsonProperty
- @XmlAttribute
- public String basedir;
-
/**
* The base data directory of the broker. It will store
Modified: activemq/activemq-apollo/trunk/apollo-dto/src/test/java/org/apache/activemq/apollo/dto/XmlCodecTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-dto/src/test/java/org/apache/activemq/apollo/dto/XmlCodecTest.java?rev=1035650&r1=1035649&r2=1035650&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-dto/src/test/java/org/apache/activemq/apollo/dto/XmlCodecTest.java (original)
+++ activemq/activemq-apollo/trunk/apollo-dto/src/test/java/org/apache/activemq/apollo/dto/XmlCodecTest.java Tue Nov 16 15:01:17 2010
@@ -59,7 +59,6 @@ public class XmlCodecTest {
connector.id = "port-61616";
connector.bind = "tcp://0.0.0.0:61616";
broker.connectors.add(connector);
- broker.basedir = "./activemq-data/default";
XmlCodec.marshalBrokerDTO(broker, System.out, true);