This is an automated email from the ASF dual-hosted git repository.

jbonofre pushed a commit to branch activemq-6.1.x
in repository https://gitbox.apache.org/repos/asf/activemq.git


The following commit(s) were added to refs/heads/activemq-6.1.x by this push:
     new ef1f7f5406 [AMQ-9537] Update user-guide.html (#1266)
ef1f7f5406 is described below

commit ef1f7f540609170a8d05a8a93de04e4ba3649bca
Author: DressedUpZebra <[email protected]>
AuthorDate: Tue Jan 7 17:56:58 2025 +0100

    [AMQ-9537] Update user-guide.html (#1266)
    
    Update user-guide.html in the distribution
    
    (cherry picked from commit be37c9b72b692423cb3c756a0c97ca475e0edb8f)
---
 assembly/src/release/docs/WebConsole-README.txt    |   6 +-
 assembly/src/release/docs/user-guide.html          |  74 +-------
 assembly/src/release/examples/conf/jetty-demo.xml  | 185 ++++--------------
 .../examples/conf/jetty-realm-5.x.properties       |  33 ----
 .../src/release/examples/conf/jetty-realm-5.x.xml  | 206 ---------------------
 5 files changed, 40 insertions(+), 464 deletions(-)

diff --git a/assembly/src/release/docs/WebConsole-README.txt 
b/assembly/src/release/docs/WebConsole-README.txt
index e6ed5eb9dc..6e4234ad34 100644
--- a/assembly/src/release/docs/WebConsole-README.txt
+++ b/assembly/src/release/docs/WebConsole-README.txt
@@ -1,9 +1,7 @@
 Deploying the ActiveMQ-WebConsole
 =================================
 
-From ActiveMQ 5.9 onwards ActiveMQ ships with a web console which
-is accessible at its usual location at:
-  http://localhost:8161/admin/
+ActiveMQ Classic ships with a web console which is accessible at: 
http://localhost:8161/admin/
 
 In the default configuration ActiveMQ automatically starts the web console in 
the
 same VM as the broker. The console is accessibly under 
http://localhost:8161/admin/.
@@ -12,7 +10,7 @@ The broker may ask for credentials to login the web console 
the first time.
 The default username and password is admin/admin. 
 
 In the web console you can configure the default users, in the
-conf/jetty-real.properties file. And in the conf/jetty.xml file you can 
configure
+conf/users.properties file. And in the conf/jetty.xml file you can configure
 to disable login for the web consoles.
 
 However it's also possible to start the web console in a separate VM and 
connect it
diff --git a/assembly/src/release/docs/user-guide.html 
b/assembly/src/release/docs/user-guide.html
index 2529d43ff7..1f4feca430 100755
--- a/assembly/src/release/docs/user-guide.html
+++ b/assembly/src/release/docs/user-guide.html
@@ -25,7 +25,7 @@
 </h1>
 
 <p>
-Welcome to Apache ActiveMQ. This document gives you a quick overview of how to 
get started trying out Apache ActiveMQ.
+Welcome to Apache ActiveMQ Classic. This document gives you a quick overview 
of how to get started trying out Apache ActiveMQ Classic.
 </p>
 
 <h2>Running the broker</h2>
@@ -89,7 +89,7 @@ On Unix-like systems, type
 In a web browser you can access the url <a 
href="http://0.0.0.0:8161/admin";>http://0.0.0.0:8161/admin</a> to access the 
ActiveMQ web console.
 <br/>
 The broker may ask for credentials to login the web console the first time.
-The default username and password is admin/admin. You can configure this in 
the conf/jetty-real.properties file.
+The default username and password is admin/admin. You can configure this in 
the conf/user.properties file.
 
 <h2>Access the web demos</h2>
 
@@ -98,7 +98,7 @@ If you're using Windows, just type
 </p>
 <pre>
     cd bin
-    activemq.bat console xbean:examples/conf/activemq-demo.xml
+    activemq.bat start xbean:../examples/conf/activemq-demo.xml
 </pre>
 <p>
 On Unix-like systems, type
@@ -110,73 +110,13 @@ On Unix-like systems, type
 In a web browser you can access the url <a 
href="http://0.0.0.0:8161/demo";>http://0.0.0.0:8161/demo</a> to access the 
ActiveMQ web demos.
 <br/>
 The broker may ask for credentials to login the web console the first time.
-The default username and password is admin/admin. You can configure this in 
the conf/jetty-real.properties file.
+The default username and password is admin/admin. You can configure this in 
the conf/user.properties file.
 
 
-<h2>Running the example programs</h2>
-
-<p>
-To run the demo producer/consumer tools, you need Java and Ant installed.
-</p>
-
-<h3>Installing Ant</h3>
-
-
-<p>
-The example programs depend on <a href="http://ant.apache.org/";>Ant</a> being 
installed. There are more detailed
-instructions on the Ant website - but essentially you need to follow these 
steps.
-</p>
-<ul>
-<li>
-JAVA_HOME must point to your JDK installation, such that $JAVA_HOME/bin 
contains the java executable and $JAVA_HOME/lib contains some jar files.
-</li>
-<li>
-ANT_HOME must point to where you installed Apache Ant (http://ant.apache.org)
-</li>
-<li>
-then you need to add $JAVA_HOME/bin and $ANT_HOME/bin to your PATH variable.
-</li>
-</ul>
-
-<p>
-To test this is all working, try typing
-</p>
-
-<pre>
-    java -version
-    cd examples/openwire/swissarmy
-    ant -version
-</pre>
-
-<h3>Running the example producer and consumer</h3>
-
-<p>
-Once you've got Java and Ant installed correctly you should be able to run
-</p>
-
-<pre>
-    cd examples/openwire/swissarmy
-    ant consumer
-</pre>
-
-<p>
-and in another shell
-</p>
-
-<pre>
-    cd examples/openwire/swissarmy
-    ant producer
-</pre>
-
-<p>
-you can specify exact URLs to connect to via command like arguments. e.g.
-</p>
-
-<pre>
-    ant producer -Durl=tcp://somehost:port
-</pre>
-
+<h2>Example programs</h2>
 
+<p>Several runnable examples are in the examples directory, each with its own 
readme.md file containing instructions on how to run the example.</p>
+<p>Configuration examples are located in example/conf directory.</p>
 
 <h2>Further Readings</h2>
 
diff --git a/assembly/src/release/examples/conf/jetty-demo.xml 
b/assembly/src/release/examples/conf/jetty-demo.xml
index 00878e2cbd..3e2d791abe 100644
--- a/assembly/src/release/examples/conf/jetty-demo.xml
+++ b/assembly/src/release/examples/conf/jetty-demo.xml
@@ -13,169 +13,46 @@
         limitations under the License.
     -->
     <!--
-        An embedded servlet engine for serving up the Admin consoles, REST and 
Ajax APIs and
-        some demos Include this file in your configuration to enable ActiveMQ 
web components
-        e.g. <import resource="jetty.xml"/>
+        An embedded servlet engine used for serving broker with demo 
applications.
     -->
 <beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
     xsi:schemaLocation="http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans.xsd";>
 
-    <bean id="securityLoginService" 
class="org.eclipse.jetty.security.HashLoginService">
-        <property name="name" value="ActiveMQRealm" />
-        <property name="config" 
value="${activemq.conf}/jetty-realm-5.x.properties" />
-    </bean>
-
-    <bean id="securityConstraint" 
class="org.eclipse.jetty.util.security.Constraint">
-        <property name="name" value="BASIC" />
-        <property name="roles" value="user,admin" />
-        <!-- set authenticate=false to disable login -->
-        <property name="authenticate" value="true" />
-    </bean>
-    <bean id="adminSecurityConstraint" 
class="org.eclipse.jetty.util.security.Constraint">
-        <property name="name" value="BASIC" />
-        <property name="roles" value="admin" />
-         <!-- set authenticate=false to disable login -->
-        <property name="authenticate" value="true" />
-    </bean>
-    <bean id="securityConstraintMapping" 
class="org.eclipse.jetty.security.ConstraintMapping">
-        <property name="constraint" ref="securityConstraint" />
-        <property name="pathSpec" value="/admin,/api/*" />
-    </bean>
-    <bean id="adminSecurityConstraintMapping" 
class="org.eclipse.jetty.security.ConstraintMapping">
-        <property name="constraint" ref="adminSecurityConstraint" />
-        <property name="pathSpec" value="*.action" />
-    </bean>
+    <import resource="classpath:jetty.xml" />
 
-    <bean id="rewriteHandler" 
class="org.eclipse.jetty.rewrite.handler.RewriteHandler">
-        <property name="rules">
+    <bean id="secHandlerCollection" 
class="org.eclipse.jetty.server.handler.HandlerCollection">
+        <property name="handlers">
             <list>
-                <bean id="header" 
class="org.eclipse.jetty.rewrite.handler.HeaderPatternRule">
-                  <property name="pattern" value="*"/>
-                  <property name="name" value="X-FRAME-OPTIONS"/>
-                  <property name="value" value="SAMEORIGIN"/>
-                </bean>
-            </list>
-        </property>
-    </bean>
-    
-       <bean id="secHandlerCollection" 
class="org.eclipse.jetty.server.handler.HandlerCollection">
-               <property name="handlers">
-                       <list>
                 <ref bean="rewriteHandler"/>
-                               <bean 
class="org.eclipse.jetty.webapp.WebAppContext">
-                                       <property name="contextPath" 
value="/admin" />
-                                       <property name="resourceBase" 
value="${activemq.home}/webapps/admin" />
-                                       <property name="logUrlOnStart" 
value="true" />
-                               </bean>
-                               <bean 
class="org.eclipse.jetty.webapp.WebAppContext">
-                                       <property name="contextPath" 
value="/demo" />
-                                       <property name="resourceBase" 
value="${activemq.home}/webapps-demo/demo" />
-                                       <property name="logUrlOnStart" 
value="true" />
-                               </bean>
-                               <bean 
class="org.eclipse.jetty.webapp.WebAppContext">
-                                       <property name="contextPath" 
value="/api" />
-                                       <property name="resourceBase" 
value="${activemq.home}/webapps/api" />
-                                       <property name="logUrlOnStart" 
value="true" />
-                               </bean>
-                               <bean 
class="org.eclipse.jetty.server.handler.ResourceHandler">
-                                       <property name="directoriesListed" 
value="false" />
-                                       <property name="welcomeFiles">
-                                               <list>
-                                                       
<value>index.html</value>
-                                               </list>
-                                       </property>
-                                       <property name="resourceBase" 
value="${activemq.home}/webapps/" />
-                               </bean>
-                               <bean id="defaultHandler" 
class="org.eclipse.jetty.server.handler.DefaultHandler">
-                                       <property name="serveIcon" 
value="false" />
-                               </bean>
-                       </list>
-               </property>
-       </bean>    
-       
-    <bean id="securityHandler" 
class="org.eclipse.jetty.security.ConstraintSecurityHandler">
-        <property name="loginService" ref="securityLoginService" />
-        <property name="authenticator">
-            <bean 
class="org.eclipse.jetty.security.authentication.BasicAuthenticator" />
-        </property>
-        <property name="constraintMappings">
-            <list>
-                <ref bean="adminSecurityConstraintMapping" />
-                <ref bean="securityConstraintMapping" />
-            </list>
-        </property>
-        <property name="handler" ref="secHandlerCollection" />
-    </bean>
-
-
-    <bean id="contexts" 
class="org.eclipse.jetty.server.handler.ContextHandlerCollection">
-    </bean>
-
-    <bean id="jettyPort" class="org.apache.activemq.web.WebConsolePort" 
init-method="start">
-             <!-- the default port number for the web console -->
-        <property name="port" value="8161"/>
-    </bean>
-    
-        <bean id="Server" depends-on="jettyPort" 
class="org.eclipse.jetty.server.Server"
-        destroy-method="stop">
-
-        <property name="handler">
-            <bean id="handlers" 
class="org.eclipse.jetty.server.handler.HandlerCollection">
-                <property name="handlers">
-                    <list>
-                        <ref bean="contexts" />
-                        <ref bean="securityHandler" />
-                    </list>
-                </property>
-            </bean>
-        </property>
-
-    </bean>
-
-    <bean id="invokeConnectors" 
class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
-       <property name="targetObject" ref="Server" />
-       <property name="targetMethod" value="setConnectors" />
-       <property name="arguments">
-       <list>
-               <bean id="Connector" 
class="org.eclipse.jetty.server.ServerConnector">
-                       <constructor-arg ref="Server" />
-                     <!-- see the jettyPort bean -->
-                    <property name="port" 
value="#{systemProperties['jetty.port']}" />
+                <bean class="org.eclipse.jetty.webapp.WebAppContext">
+                    <property name="contextPath" value="/admin" />
+                    <property name="resourceBase" 
value="${activemq.home}/webapps/admin" />
+                    <property name="logUrlOnStart" value="true" />
+                </bean>
+                <bean class="org.eclipse.jetty.webapp.WebAppContext">
+                    <property name="contextPath" value="/api" />
+                    <property name="resourceBase" 
value="${activemq.home}/webapps/api" />
+                    <property name="logUrlOnStart" value="true" />
+                </bean>
+                <bean class="org.eclipse.jetty.webapp.WebAppContext">
+                    <property name="contextPath" value="/demo" />
+                    <property name="resourceBase" 
value="${activemq.home}/webapps-demo/demo" />
+                    <property name="logUrlOnStart" value="true" />
+                </bean>
+                <bean class="org.eclipse.jetty.server.handler.ResourceHandler">
+                    <property name="directoriesListed" value="false" />
+                    <property name="welcomeFiles">
+                        <list>
+                            <value>index.html</value>
+                        </list>
+                    </property>
+                    <property name="resourceBase" 
value="${activemq.home}/webapps/" />
+                </bean>
+                <bean id="defaultHandler" 
class="org.eclipse.jetty.server.handler.DefaultHandler">
+                    <property name="serveIcon" value="false" />
                 </bean>
-                <!--
-                    Enable this connector to use https with web console
-                -->
-                <bean id="SecureConnector" 
class="org.eclipse.jetty.server.ServerConnector">
-                                       <constructor-arg ref="Server" />
-                                       <constructor-arg>
-                                               <bean id="handlers" 
class="org.eclipse.jetty.util.ssl.SslContextFactory$Server">
-                                                       <property 
name="keyStorePath" value="${activemq.conf}/broker.ks" />
-                                                       <property 
name="keyStorePassword" value="password" />
-                                               </bean>
-                                       </constructor-arg>
-                                       <property name="port" value="8162" />
-                               </bean>
             </list>
-       </property>
-    </bean>
-    
-    
-    <bean id="configureJetty" 
class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
-               <property name="staticMethod" 
value="org.apache.activemq.web.config.JspConfigurer.configureJetty" />
-               <property name="arguments">
-                       <list>
-                               <ref bean="Server" />
-                               <ref bean="secHandlerCollection" />
-                       </list>
-               </property>
-       </bean>
-    
-    <bean id="invokeStart" 
class="org.springframework.beans.factory.config.MethodInvokingFactoryBean" 
-       depends-on="configureJetty, invokeConnectors">
-       <property name="targetObject" ref="Server" />
-       <property name="targetMethod" value="start" />          
+        </property>
     </bean>
-    
 
 </beans>
-
diff --git a/assembly/src/release/examples/conf/jetty-realm-5.x.properties 
b/assembly/src/release/examples/conf/jetty-realm-5.x.properties
deleted file mode 100644
index 4643126028..0000000000
--- a/assembly/src/release/examples/conf/jetty-realm-5.x.properties
+++ /dev/null
@@ -1,33 +0,0 @@
-## ---------------------------------------------------------------------------
-## 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.
-## ---------------------------------------------------------------------------
-
-## ---------------------------------------------------------------------------
-## [AMQ-8391] ActiveMQ 6.x converted jetty to use a common JAAS for users and 
groups. 
-## This version of conf/jetty.xml demonstrates how to use a dedicated JAAS 
realm
-## for authentication and authorization of web-based services such as the web 
console
-## and rest apis. This is the config approach that was used in ActiveMQ 5.x.
-##
-## Rename this file to conf/jetty-realm.properties to setup user and group
-## authorization following the ActiveMQ 5.x approach
-##
-## Note: conf/jetty-realm.properties is used to store user, password and group 
data
-## ---------------------------------------------------------------------------
-
-# Defines users that can access the web (console, demo, etc.)
-# username: password [,rolename ...]
-admin: admin, admin
-user: user, user
diff --git a/assembly/src/release/examples/conf/jetty-realm-5.x.xml 
b/assembly/src/release/examples/conf/jetty-realm-5.x.xml
deleted file mode 100644
index f9c6575efb..0000000000
--- a/assembly/src/release/examples/conf/jetty-realm-5.x.xml
+++ /dev/null
@@ -1,206 +0,0 @@
-
-    <!--
-        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.
-    -->
-    <!--
-        An embedded servlet engine for serving up the Admin consoles, REST and 
Ajax APIs and
-        some demos Include this file in your configuration to enable ActiveMQ 
web components
-        e.g. <import resource="jetty.xml"/>
-    -->
-    <!--
-        [AMQ-8391] ActiveMQ 6.x converted jetty to use a common JAAS for users 
and groups. 
-        This version of conf/jetty.xml demonstrates how to use a dedicated 
JAAS realm
-        for authentication and authorization of web-based services such as the 
web console
-        and rest apis. This is the config approach that was used in ActiveMQ 
5.x.
-
-        Note: conf/jetty-realm.properties is used to store user, password and 
group data
-    -->
-<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-    xsi:schemaLocation="http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans.xsd";>
-
-    <bean id="httpConfig" class="org.eclipse.jetty.server.HttpConfiguration">
-        <property name="sendServerVersion" value="false"/>
-    </bean>
-
-    <bean id="securityLoginService" 
class="org.eclipse.jetty.security.HashLoginService">
-        <property name="name" value="ActiveMQRealm" />
-        <property name="config" 
value="${activemq.conf}/jetty-realm.properties" />
-    </bean>
-
-    <bean id="securityConstraint" 
class="org.eclipse.jetty.util.security.Constraint">
-        <property name="name" value="BASIC" />
-        <property name="roles" value="user,admin" />
-        <!-- set authenticate=false to disable login -->
-        <property name="authenticate" value="true" />
-    </bean>
-    <bean id="adminSecurityConstraint" 
class="org.eclipse.jetty.util.security.Constraint">
-        <property name="name" value="BASIC" />
-        <property name="roles" value="admin" />
-         <!-- set authenticate=false to disable login -->
-        <property name="authenticate" value="true" />
-    </bean>
-    <bean id="securityConstraintMapping" 
class="org.eclipse.jetty.security.ConstraintMapping">
-        <property name="constraint" ref="securityConstraint" />
-        <!-- AMQ-9239 TODO: review jetty.xml pathSpec change
-        <property name="pathSpec" 
value="/,/api/*,*.jsp,*.html,*.js,*.css,*.png,*.gif,*.ico" />
-        -->
-        <property name="pathSpec" value="/,/api/*" />
-    </bean>
-    <bean id="adminSecurityConstraintMapping" 
class="org.eclipse.jetty.security.ConstraintMapping">
-        <property name="constraint" ref="adminSecurityConstraint" />
-        <property name="pathSpec" value="*.action" />
-    </bean>
-    
-    <bean id="rewriteHandler" 
class="org.eclipse.jetty.rewrite.handler.RewriteHandler">
-        <property name="rules">
-            <list>
-                <bean id="header" 
class="org.eclipse.jetty.rewrite.handler.HeaderPatternRule">
-                  <property name="pattern" value="*"/>
-                  <property name="name" value="X-FRAME-OPTIONS"/>
-                  <property name="value" value="SAMEORIGIN"/>
-                </bean>
-                <bean id="header" 
class="org.eclipse.jetty.rewrite.handler.HeaderPatternRule">
-                  <property name="pattern" value="*"/>
-                  <property name="name" value="X-XSS-Protection"/>
-                  <property name="value" value="1; mode=block"/>
-                </bean>
-                <bean id="header" 
class="org.eclipse.jetty.rewrite.handler.HeaderPatternRule">
-                  <property name="pattern" value="*"/>
-                  <property name="name" value="X-Content-Type-Options"/>
-                  <property name="value" value="nosniff"/>
-                </bean>
-            </list>
-        </property>
-    </bean>
-    
-       <bean id="secHandlerCollection" 
class="org.eclipse.jetty.server.handler.HandlerCollection">
-               <property name="handlers">
-                       <list>
-                   <ref bean="rewriteHandler"/>
-                               <bean 
class="org.eclipse.jetty.webapp.WebAppContext">
-                                       <property name="contextPath" 
value="/admin" />
-                                       <property name="resourceBase" 
value="${activemq.home}/webapps/admin" />
-                                       <property name="logUrlOnStart" 
value="true" />
-                               </bean>
-                               <bean 
class="org.eclipse.jetty.webapp.WebAppContext">
-                                       <property name="contextPath" 
value="/api" />
-                                       <property name="resourceBase" 
value="${activemq.home}/webapps/api" />
-                                       <property name="logUrlOnStart" 
value="true" />
-                               </bean>
-                               <bean 
class="org.eclipse.jetty.server.handler.ResourceHandler">
-                                       <property name="directoriesListed" 
value="false" />
-                                       <property name="welcomeFiles">
-                                               <list>
-                                                       
<value>index.html</value>
-                                               </list>
-                                       </property>
-                                       <property name="resourceBase" 
value="${activemq.home}/webapps/" />
-                               </bean>
-                               <bean id="defaultHandler" 
class="org.eclipse.jetty.server.handler.DefaultHandler">
-                                       <property name="serveIcon" 
value="false" />
-                               </bean>
-                       </list>
-               </property>
-       </bean>    
-    <bean id="securityHandler" 
class="org.eclipse.jetty.security.ConstraintSecurityHandler">
-        <property name="loginService" ref="securityLoginService" />
-        <property name="authenticator">
-            <bean 
class="org.eclipse.jetty.security.authentication.BasicAuthenticator" />
-        </property>
-        <property name="constraintMappings">
-            <list>
-                <ref bean="adminSecurityConstraintMapping" />
-                <ref bean="securityConstraintMapping" />
-            </list>
-        </property>
-        <property name="handler" ref="secHandlerCollection" />
-    </bean>
-
-    <bean id="contexts" 
class="org.eclipse.jetty.server.handler.ContextHandlerCollection">
-    </bean>
-
-    <bean id="jettyPort" class="org.apache.activemq.web.WebConsolePort" 
init-method="start">
-             <!-- the default port number for the web console -->
-        <property name="host" value="127.0.0.1"/>
-        <property name="port" value="8161"/>
-    </bean>
-
-    <bean id="Server" depends-on="jettyPort" 
class="org.eclipse.jetty.server.Server"
-        destroy-method="stop">
-
-        <property name="handler">
-            <bean id="handlers" 
class="org.eclipse.jetty.server.handler.HandlerCollection">
-                <property name="handlers">
-                    <list>
-                        <ref bean="contexts" />
-                        <ref bean="securityHandler" />
-                    </list>
-                </property>
-            </bean>
-        </property>
-
-    </bean>
-
-    <bean id="invokeConnectors" 
class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
-       <property name="targetObject" ref="Server" />
-       <property name="targetMethod" value="setConnectors" />
-       <property name="arguments">
-       <list>
-               <bean id="Connector" 
class="org.eclipse.jetty.server.ServerConnector">
-                   <constructor-arg ref="Server"/>
-                   <constructor-arg>
-                       <list>
-                           <bean id="httpConnectionFactory" 
class="org.eclipse.jetty.server.HttpConnectionFactory">
-                               <constructor-arg ref="httpConfig"/>
-                           </bean>
-                       </list>
-                   </constructor-arg>
-                   <!-- see the jettyPort bean -->
-                   <property name="host" 
value="#{systemProperties['jetty.host']}" />
-                   <property name="port" 
value="#{systemProperties['jetty.port']}" />
-               </bean>
-                <!--
-                    Enable this connector if you wish to use https with web 
console
-                -->
-                <!-- bean id="SecureConnector" 
class="org.eclipse.jetty.server.ServerConnector">
-                                       <constructor-arg ref="Server" />
-                                       <constructor-arg>
-                                               <bean id="handlers" 
class="org.eclipse.jetty.util.ssl.SslContextFactory$Server">
-                                                       <property 
name="keyStorePath" value="${activemq.conf}/broker.ks" />
-                                                       <property 
name="keyStorePassword" value="password" />
-                                               </bean>
-                                       </constructor-arg>
-                                       <property name="port" value="8162" />
-                               </bean -->
-            </list>
-       </property>
-    </bean>
-
-       <bean id="configureJetty" 
class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
-               <property name="staticMethod" 
value="org.apache.activemq.web.config.JspConfigurer.configureJetty" />
-               <property name="arguments">
-                       <list>
-                               <ref bean="Server" />
-                               <ref bean="secHandlerCollection" />
-                       </list>
-               </property>
-       </bean>
-    
-    <bean id="invokeStart" 
class="org.springframework.beans.factory.config.MethodInvokingFactoryBean" 
-       depends-on="configureJetty, invokeConnectors">
-       <property name="targetObject" ref="Server" />
-       <property name="targetMethod" value="start" />          
-    </bean>
-    
-    
-</beans>


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information, visit: https://activemq.apache.org/contact


Reply via email to