servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ge...@apache.org
Subject git commit: SM-2267: Provide working configuration for activemq-web-console Thanks to Wim Verreydt for the pull request!
Date Wed, 14 May 2014 09:22:28 GMT
Repository: servicemix
Updated Branches:
  refs/heads/servicemix-5.0.x ac02c39b8 -> 7c5207d25


SM-2267: Provide working configuration for activemq-web-console
Thanks to Wim Verreydt for the pull request!


Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/7c5207d2
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/7c5207d2
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/7c5207d2

Branch: refs/heads/servicemix-5.0.x
Commit: 7c5207d25c275b7f0fb262842f948539f8e7e5d9
Parents: ac02c39
Author: Wim Verreydt <wim@studentenleuven.be>
Authored: Mon May 5 10:00:20 2014 +0200
Committer: Gert Vanthienen <gertv@apache.org>
Committed: Wed May 14 11:04:25 2014 +0200

----------------------------------------------------------------------
 .../etc/org.apache.activemq.webconsole.cfg      | 23 ++++++++++++++++++++
 .../src/main/resources/etc/system.properties    |  9 --------
 .../src/main/resources/etc/users.properties     |  4 ++++
 3 files changed, 27 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/servicemix/blob/7c5207d2/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/7c5207d2/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 d0f5e07..101a824 100644
--- a/assembly/src/main/resources/etc/system.properties
+++ b/assembly/src/main/resources/etc/system.properties
@@ -111,15 +111,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
-#
-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
-
 
 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/7c5207d2/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


Mime
View raw message