Author: chirino
Date: Thu Mar 10 20:20:29 2011
New Revision: 1080334
URL: http://svn.apache.org/viewvc?rev=1080334&view=rev
Log:
cleaning up default config files and messages from router factory.
Modified:
activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Router.scala
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
Modified: activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Router.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Router.scala?rev=1080334&r1=1080333&r2=1080334&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Router.scala
(original)
+++ activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Router.scala
Thu Mar 10 20:20:29 2011
@@ -71,7 +71,7 @@ object RouterFactory {
return rc
}
}
- throw new IllegalArgumentException("Uknonwn store type: "+config.getClass)
+ throw new IllegalArgumentException("Uknonwn router type: "+config.getClass)
}
@@ -86,7 +86,7 @@ object RouterFactory {
}
}
}
- reporter.report(ERROR, "Uknonwn store type: "+config.getClass)
+ reporter.report(ERROR, "Uknonwn router type: "+config.getClass)
ERROR
}
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=1080334&r1=1080333&r2=1080334&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
Thu Mar 10 20:20:29 2011
@@ -26,14 +26,14 @@
The default configuration with tls/ssl enabled.
</notes>
+ <log_category console="console" security="security" connection="connection" audit="audit"/>
+
<!-- used to secure the web admin interface -->
<authentication domain="apollo"/>
<acl>
<admin allow="admins"/>
</acl>
- <web_admin host="127.0.0.1" port="61680"/>
-
<virtual_host id="${host}">
<!--
You should add all the host names that this virtual host is known as
@@ -55,9 +55,11 @@
</virtual_host>
- <key_storage file="${apollo.base}/etc/keystore" password="password" key_password="password"/>
+ <web_admin host="127.0.0.1" port="61680"/>
<connector id="tcp" bind="tcp://0.0.0.0:61613" connection_limit="2000"/>
<connector id="tls" bind="tls://0.0.0.0:61614" connection_limit="2000"/>
+ <key_storage file="${apollo.base}/etc/keystore" password="password" key_password="password"/>
+
</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=1080334&r1=1080333&r2=1080334&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
Thu Mar 10 20:20:29 2011
@@ -26,17 +26,14 @@
The default configuration.
</notes>
+ <log_category console="console" security="security" connection="connection" audit="audit"/>
+
<!-- used to secure the web admin interface -->
<authentication domain="apollo"/>
<acl>
<admin allow="admins"/>
</acl>
- <log_category console="console" security="security" connection="connection" audit="audit"/>
-
-
- <web_admin host="127.0.0.1" port="61680"/>
-
<virtual_host id="${host}">
<!--
You should add all the host names that this virtual host is known as
@@ -58,6 +55,7 @@
</virtual_host>
+ <web_admin host="127.0.0.1" port="61680"/>
<connector id="tcp" bind="tcp://0.0.0.0:61613" connection_limit="2000"/>
</broker>
|