Repository: servicemix
Updated Branches:
refs/heads/master 9297055f3 -> c9dd91785
SM-2267: Provide working configuration for activemq-web-console (part 2)
Thanks to Wim Verreydt for the pull request!
(cherry picked from commit 7c5207d25c275b7f0fb262842f948539f8e7e5d9)
Conflicts:
assembly/src/main/resources/etc/system.properties
(cherry picked from commit 214ceabbeb72ed72e0a2e248675acacf9081751e)
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/c9dd9178
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/c9dd9178
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/c9dd9178
Branch: refs/heads/master
Commit: c9dd91785f4149e6127a83bb1aafae10f635bda2
Parents: 9297055
Author: Wim Verreydt <[email protected]>
Authored: Mon May 5 10:00:20 2014 +0200
Committer: Gert Vanthienen <[email protected]>
Committed: Wed May 14 11:44:55 2014 +0200
----------------------------------------------------------------------
assembly/src/main/resources/etc/system.properties | 5 -----
assembly/src/main/resources/etc/users.properties | 4 ++++
2 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c9dd9178/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 afb6d9d..8ff4edf 100644
--- a/assembly/src/main/resources/etc/system.properties
+++ b/assembly/src/main/resources/etc/system.properties
@@ -123,11 +123,6 @@
activemq.jmx.url=service:jmx:rmi:///jndi/rmi://localhost:1099/karaf-${karaf.name
activemq.jmx.user=smx
activemq.jmx.password=smx
-#
-# Activemq Webconsole configuration
-#
-# This configuration moved to org.apache.activemq.webconsole.cfg
-
javax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl
javax.xml.transform.TransformerFactory=org.apache.xalan.processor.TransformerFactoryImpl
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c9dd9178/assembly/src/main/resources/etc/users.properties
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/etc/users.properties
b/assembly/src/main/resources/etc/users.properties
index 0348fae..5087da1 100644
--- a/assembly/src/main/resources/etc/users.properties
+++ b/assembly/src/main/resources/etc/users.properties
@@ -19,3 +19,7 @@
#
smx=smx,admin
+
+# Workaround for SM-2267: sometimes, the webconsole configuration first hands
out a ConnectionFactory
+# that uses karaf/karaf as the credentials before picking up the settings in
system.properties
+karaf=karaf,admin
