Author: gnodet
Date: Sat Dec 9 08:38:41 2006
New Revision: 485005
URL: http://svn.apache.org/viewvc?view=rev&rev=485005
Log:
Fix main configuration file
Modified:
incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/conf/activemq.xml
incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/conf/component.properties
incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/conf/groups.properties
incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/conf/jmx.xml
incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/conf/jndi.xml
incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/conf/servicemix.xml
Modified:
incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/conf/activemq.xml
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/conf/activemq.xml?view=diff&rev=485005&r1=485004&r2=485005
==============================================================================
---
incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/conf/activemq.xml
(original)
+++
incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/conf/activemq.xml
Sat Dec 9 08:38:41 2006
@@ -17,17 +17,20 @@
limitations under the License.
-->
-<!-- START SNIPPET: xbean -->
<beans xmlns:amq="http://activemq.org/config/1.0";>
+ <!-- ActiveMQ JMS Broker configuration -->
<amq:broker depends-on="jmxServer">
+ <!-- Disable creation of the jmx connector
+ which is created in the jmx.xml configuration file -->
<amq:managementContext>
<bean class="org.apache.activemq.broker.jmx.ManagementContext">
<property name="createConnector" value="false" />
</bean>
</amq:managementContext>
+ <!-- Use journaled JDBC persistence -->
<amq:persistenceAdapter>
<amq:journaledJDBC journalLogFiles="5" dataDirectory="./data/amq"/>
<!-- To use a different datasource, use th following syntax : -->
@@ -37,6 +40,11 @@
</amq:persistenceAdapter>
<amq:transportConnectors>
+ <!-- Activate a TCP connector with multicast discovery.
+ Note that multicast may be disabled if your computer
+ is not on a network, which may prevent the broker to start.
+ In such a case, just remove the discoveryUri attribute.
+ -->
<amq:transportConnector uri="tcp://localhost:61616"
discoveryUri="multicast://default"/>
</amq:transportConnectors>
@@ -99,4 +107,3 @@
-->
</beans>
-<!-- END SNIPPET: xbean -->
Modified:
incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/conf/component.properties
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/conf/component.properties?view=diff&rev=485005&r1=485004&r2=485005
==============================================================================
---
incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/conf/component.properties
(original)
+++
incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/conf/component.properties
Sat Dec 9 08:38:41 2006
@@ -14,6 +14,21 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
+################################################################################
+#
+# This configuration file may be used by servicemix components to load default
+# values when installed. Note that the values configured here are only
+# used at component installation time. If you want to change these values
+# once the component is installed, you need to use a JMX console and connect
+# to the configuration for the component.
+#
+# The syntax is:
+# [component-name].[property] = [value]
+# where:
+# [component-name] is the name of the component (defined in the component
jbi descriptor)
+# [property] is the name of the property
+# [value] is the value given to the property
+#
servicemix-http.authenticationServiceName=java\:comp/env/smx/AuthenticationService
servicemix-http.jettyManagement=false
servicemix-http.streamingEnabled=false
Modified:
incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/conf/groups.properties
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/conf/groups.properties?view=diff&rev=485005&r1=485004&r2=485005
==============================================================================
---
incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/conf/groups.properties
(original)
+++
incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/conf/groups.properties
Sat Dec 9 08:38:41 2006
@@ -14,4 +14,18 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
+################################################################################
+#
+# This configuration file is used by the login modules configured
+# in the JAAS configuration file: login.properties.
+#
+# The syntax used is:
+# [role]=[users]
+# where:
+# [role] is the role to define
+# [users] is a comma separated list of users granted this role
+#
+# Note that the jmx connector delegates security to JAAS, and uses the
+# admin role which is configured by default.
+#
admin=smx
Modified:
incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/conf/jmx.xml
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/conf/jmx.xml?view=diff&rev=485005&r1=485004&r2=485005
==============================================================================
---
incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/conf/jmx.xml
(original)
+++
incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/conf/jmx.xml
Sat Dec 9 08:38:41 2006
@@ -17,7 +17,6 @@
limitations under the License.
-->
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN"
"http://www.springframework.org/dtd/spring-beans.dtd";>
<beans xmlns:sm="http://servicemix.apache.org/config/1.0";
xmlns:util="http://www.springframework.org/schema/util";>
Modified:
incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/conf/jndi.xml
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/conf/jndi.xml?view=diff&rev=485005&r1=485004&r2=485005
==============================================================================
---
incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/conf/jndi.xml
(original)
+++
incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/conf/jndi.xml
Sat Dec 9 08:38:41 2006
@@ -25,9 +25,9 @@
xmlns:util="http://www.springframework.org/schema/util";>
<bean id="jndi"
- class="org.apache.xbean.spring.jndi.SpringInitialContextFactory"
- factory-method="makeInitialContext"
- singleton="true">
+ class="org.apache.xbean.spring.jndi.SpringInitialContextFactory"
+ factory-method="makeInitialContext"
+ singleton="true">
<property name="entries" ref="jndiEntries" />
</bean>
Modified:
incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/conf/servicemix.xml
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/conf/servicemix.xml?view=diff&rev=485005&r1=485004&r2=485005
==============================================================================
---
incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/conf/servicemix.xml
(original)
+++
incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/conf/servicemix.xml
Sat Dec 9 08:38:41 2006
@@ -46,8 +46,6 @@
installationDirPath="./install"
deploymentDirPath="./deploy"
monitorInterval="1"
- dumpStats="true"
- statsInterval="10"
transactionManager="#transactionManager"
createJmxConnector="false"
depends-on="jndi">
@@ -62,6 +60,10 @@
</sm:flows>
</sm:securedBroker>
</sm:broker>
+
+ <sm:services>
+ <sm:statistics statsInterval="10" dumpStats="true" />
+ </sm:services>
<sm:activationSpecs>
