Repository: servicemix Updated Branches: refs/heads/master 18664fe85 -> 9297055f3
SM-2267: Provide working configuration for activemq-web-console (cherry picked from commit 3618da3fb96ee5c3c1586eb6cc8422147646a353) Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/9297055f Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/9297055f Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/9297055f Branch: refs/heads/master Commit: 9297055f3bcd841aba5060cc833693657a7c9f52 Parents: 18664fe Author: Wim Verreydt <[email protected]> Authored: Mon May 5 10:00:20 2014 +0200 Committer: Gert Vanthienen <[email protected]> Committed: Wed May 14 11:15:52 2014 +0200 ---------------------------------------------------------------------- .../etc/org.apache.activemq.webconsole.cfg | 23 ++++++++++++++++++++ .../src/main/resources/etc/system.properties | 6 +---- 2 files changed, 24 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/servicemix/blob/9297055f/assembly/src/main/resources/etc/org.apache.activemq.webconsole.cfg ---------------------------------------------------------------------- diff --git a/assembly/src/main/resources/etc/org.apache.activemq.webconsole.cfg b/assembly/src/main/resources/etc/org.apache.activemq.webconsole.cfg new file mode 100644 index 0000000..16e4adc --- /dev/null +++ b/assembly/src/main/resources/etc/org.apache.activemq.webconsole.cfg @@ -0,0 +1,23 @@ +## --------------------------------------------------------------------------- +## 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. +## --------------------------------------------------------------------------- + +webconsole.jms.url=${activemq.url} +webconsole.jmx.url=service:jmx:rmi:///jndi/rmi://localhost:1099/karaf-${karaf.name} +webconsole.jmx.user=smx +webconsole.jmx.password=smx +webconsole.jms.user=smx +webconsole.jms.password=smx \ No newline at end of file http://git-wip-us.apache.org/repos/asf/servicemix/blob/9297055f/assembly/src/main/resources/etc/system.properties ---------------------------------------------------------------------- diff --git a/assembly/src/main/resources/etc/system.properties b/assembly/src/main/resources/etc/system.properties index 1aac6bd..afb6d9d 100644 --- a/assembly/src/main/resources/etc/system.properties +++ b/assembly/src/main/resources/etc/system.properties @@ -126,11 +126,7 @@ activemq.jmx.password=smx # # Activemq Webconsole configuration # -webconsole.type=properties -webconsole.jms.url=${activemq.url} -webconsole.jmx.url=service:jmx:rmi:///jndi/rmi://localhost:1099/karaf-${karaf.name} -webconsole.jmx.user=smx -webconsole.jmx.password=smx +# This configuration moved to org.apache.activemq.webconsole.cfg javax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl
