You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2007/01/11 17:05:56 UTC
svn commit: r495271 - in
/incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/conf:
jmx.xml jndi.xml servicemix.properties servicemix.xml
Author: gnodet
Date: Thu Jan 11 08:05:55 2007
New Revision: 495271
URL: http://svn.apache.org/viewvc?view=rev&rev=495271
Log:
SM-815: Externalize values from main configuration file into a single property file
Added:
incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/conf/servicemix.properties (with props)
Modified:
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/jmx.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/conf/jmx.xml?view=diff&rev=495271&r1=495270&r2=495271
==============================================================================
--- 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 Thu Jan 11 08:05:55 2007
@@ -21,7 +21,7 @@
xmlns:util="http://www.springframework.org/schema/util">
<!-- RMI registry -->
- <sm:rmiRegistry id="rmiRegistry" port="1099" />
+ <sm:rmiRegistry id="rmiRegistry" port="${rmi.port}" />
<!-- JMX server -->
<sm:jmxServer id="jmxServer" locateExistingServerIfPossible="true" />
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=495271&r1=495270&r2=495271
==============================================================================
--- 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 Thu Jan 11 08:05:55 2007
@@ -45,7 +45,7 @@
<!-- wsn2005 jms connection factory -->
<entry key="java:comp/env/jms/wsnotificationCF">
- <amq:connectionFactory brokerURL="tcp://localhost:61616" />
+ <amq:connectionFactory brokerURL="${activemq.url}" />
</entry>
<!-- transaction manager -->
Added: incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/conf/servicemix.properties
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/conf/servicemix.properties?view=auto&rev=495271
==============================================================================
--- incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/conf/servicemix.properties (added)
+++ incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/conf/servicemix.properties Thu Jan 11 08:05:55 2007
@@ -0,0 +1,33 @@
+#
+# 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.
+#
+################################################################################
+#
+# This file contains properties used by various parts
+# of ServiceMix configuration. They are externalized
+# to ease configuration.
+#
+
+rmi.port = 1099
+jmx.url = service:jmx:rmi:///jndi/rmi://localhost:${rmi.port}/jmxrmi
+
+activemq.port = 61616
+activemq.host = localhost
+activemq.url = tcp://${activemq.host}:${activemq.port}
+
+servicemix.corePoolSize = 4
+servicemix.maximumPoolSize = 32
+servicemix.queueSize = 256
Propchange: incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/conf/servicemix.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/conf/servicemix.properties
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/conf/servicemix.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
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=495271&r1=495270&r2=495271
==============================================================================
--- 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 Thu Jan 11 08:05:55 2007
@@ -33,6 +33,11 @@
</property>
</sm:systemProperties>
+ <bean id="propertyConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <property name="location" value="classpath:servicemix.properties" />
+ </bean>
+
+ <!-- Include other resources -->
<import resource="classpath:security.xml" />
<import resource="classpath:jmx.xml" />
<import resource="classpath:activemq.xml" />
@@ -49,14 +54,16 @@
transactionManager="#transactionManager"
createJmxConnector="false"
depends-on="jndi">
-
+
+ <!-- Use a secured broker (see security.xml)
+ and define the 3 standard flows -->
<sm:broker>
<sm:securedBroker authorizationMap="#authorizationMap">
<sm:flows>
<sm:sedaFlow />
- <sm:jmsFlow jmsURL="tcp://localhost:61616" />
+ <sm:jmsFlow jmsURL="${activemq.url}" />
<sm:jcaFlow connectionManager="#connectionManager"
- jmsURL="tcp://localhost:61616" />
+ jmsURL="${activemq.url}" />
</sm:flows>
</sm:securedBroker>
</sm:broker>
@@ -64,6 +71,18 @@
<sm:services>
<sm:statistics statsInterval="10" dumpStats="true" />
</sm:services>
+
+ <sm:executorFactory>
+ <bean class="org.apache.servicemix.executors.impl.ExecutorFactoryImpl">
+ <property name="defaultConfig">
+ <bean class="org.apache.servicemix.executors.impl.ExecutorConfig">
+ <property name="corePoolSize" value="${servicemix.corePoolSize}"/>
+ <property name="maximumPoolSize" value="${servicemix.maximumPoolSize}"/>
+ <property name="queueSize" value="${servicemix.queueSize}"/>
+ </bean>
+ </property>
+ </bean>
+ </sm:executorFactory>
<sm:activationSpecs>