You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by ch...@apache.org on 2013/06/20 21:38:10 UTC
svn commit: r1495145 - in /uima/sandbox/uima-ducc/trunk/src/main:
admin/ducc.py assembly/bin.xml config/activemq-nojournal5.xml
Author: challngr
Date: Thu Jun 20 19:38:10 2013
New Revision: 1495145
URL: http://svn.apache.org/r1495145
Log:
UIMA-3016 Set broker jmx port from startup scripting for automanaged brokers.
Modified:
uima/sandbox/uima-ducc/trunk/src/main/admin/ducc.py
uima/sandbox/uima-ducc/trunk/src/main/assembly/bin.xml
uima/sandbox/uima-ducc/trunk/src/main/config/activemq-nojournal5.xml
Modified: uima/sandbox/uima-ducc/trunk/src/main/admin/ducc.py
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/src/main/admin/ducc.py?rev=1495145&r1=1495144&r2=1495145&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/src/main/admin/ducc.py (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/admin/ducc.py Thu Jun 20 19:38:10 2013
@@ -33,6 +33,7 @@ class Ducc(DuccUtil):
def run_broker(self, component):
broker_port = self.ducc_properties.get('ducc.broker.port')
+ broker_jmx_port = self.ducc_properties.get('ducc.broker.jmx.port')
broker_url_decoration = self.ducc_properties.get('ducc.broker.server.url.decoration')
broker_memory_opts = self.ducc_properties.get('ducc.broker.memory.options')
broker_config = self.ducc_properties.get('ducc.broker.configuration')
@@ -41,7 +42,7 @@ class Ducc(DuccUtil):
if ( broker_config[0] != '/' ): # relative to broker_home if not absolute
broker_config = broker_home + '/' + broker_config
- os.environ['ACTIVEMQ_OPTS'] = '-DDUCC_AMQ_PORT=' + broker_port + ' -DDUCC_AMQ_DECORATION=' + broker_url_decoration
+ os.environ['ACTIVEMQ_OPTS'] = '-DDUCC_AMQ_PORT=' + broker_port + ' -DDUCC_AMQ_JMX_PORT=' + broker_jmx_port + ' -DDUCC_AMQ_DECORATION=' + broker_url_decoration
os.environ['ACTIVEMQ_OPTS_MEMORY'] = broker_memory_opts
os.environ['ACTIVEMQ_HOME'] = broker_home
Modified: uima/sandbox/uima-ducc/trunk/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/src/main/assembly/bin.xml?rev=1495145&r1=1495144&r2=1495145&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/src/main/assembly/bin.xml (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/assembly/bin.xml Thu Jun 20 19:38:10 2013
@@ -109,7 +109,7 @@ under the License.
<includes>
<include>org.apache.uima:uimaj-core</include>
</includes>
- <outputFileNameMapping>uima-${org.apache.uima.version}.jar</outputFileNameMapping>
+ <outputFileNameMapping>uima-core-${org.apache.uima.version}.jar</outputFileNameMapping>
<outputDirectory>ducc_runtime/lib/uima</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
<fileMode>644</fileMode>
Modified: uima/sandbox/uima-ducc/trunk/src/main/config/activemq-nojournal5.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/src/main/config/activemq-nojournal5.xml?rev=1495145&r1=1495144&r2=1495145&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/src/main/config/activemq-nojournal5.xml (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/config/activemq-nojournal5.xml Thu Jun 20 19:38:10 2013
@@ -28,7 +28,7 @@
</destinationPolicy>
<managementContext>
- <managementContext createConnector="true" connectorPort="1099"/>
+ <managementContext createConnector="true" connectorPort="${DUCC_AMQ_JMX_PORT}"/>
</managementContext>
<systemUsage>