Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@activemq.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r947019 - in /activemq/trunk/assembly/src/release/conf:
 jetty-realm.properties jetty.xml
Date: Fri, 21 May 2010 14:21:28 -0000
To: commits@activemq.apache.org
From: dejanb@apache.org
Message-Id: <20100521142128.A0317238896F@eris.apache.org>

Author: dejanb
Date: Fri May 21 14:21:28 2010
New Revision: 947019

URL: http://svn.apache.org/viewvc?rev=947019&view=rev
Log:
https://issues.apache.org/activemq/browse/AMQ-2744 - web server authentication configuration

Added:
    activemq/trunk/assembly/src/release/conf/jetty-realm.properties
Modified:
    activemq/trunk/assembly/src/release/conf/jetty.xml

Added: activemq/trunk/assembly/src/release/conf/jetty-realm.properties
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/conf/jetty-realm.properties?rev=947019&view=auto
==============================================================================
--- activemq/trunk/assembly/src/release/conf/jetty-realm.properties (added)
+++ activemq/trunk/assembly/src/release/conf/jetty-realm.properties Fri May 21 14:21:28 2010
@@ -0,0 +1,20 @@
+## ---------------------------------------------------------------------------
+## 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.
+## ---------------------------------------------------------------------------
+
+# Defines users that can access the web (console, demo, etc.)
+# username: password [,rolename ...]
+admin: admin, admin
\ No newline at end of file

Modified: activemq/trunk/assembly/src/release/conf/jetty.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/conf/jetty.xml?rev=947019&r1=947018&r2=947019&view=diff
==============================================================================
--- activemq/trunk/assembly/src/release/conf/jetty.xml (original)
+++ activemq/trunk/assembly/src/release/conf/jetty.xml Fri May 21 14:21:28 2010
@@ -1,85 +1,117 @@
- <!--
-    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"/>
--->
-<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="contexts" class="org.eclipse.jetty.server.handler.ContextHandlerCollection"/>
- 
-  <bean id="Server" class="org.eclipse.jetty.server.Server" init-method="start" destroy-method="stop">
- 
-    <property name="connectors">
-      <list>
-        <bean id="Connector" class="org.eclipse.jetty.server.nio.SelectChannelConnector">
-          <property name="port" value="8161"/>
-        </bean>
-      </list>
-    </property>
- 
-    <property name="handler">
-      <bean id="handlers" class="org.eclipse.jetty.server.handler.HandlerCollection">
-        <property name="handlers">
-          <list>
-            <ref bean="contexts"/>
-            <bean class="org.eclipse.jetty.webapp.WebAppContext">
-              <property name="contextPath" value="/admin"/>
-              <property name="resourceBase" value="${activemq.base}/webapps/admin"/>
-              <property name="logUrlOnStart" value="true"/>
-            </bean>
-            <bean class="org.eclipse.jetty.webapp.WebAppContext">
-              <property name="contextPath" value="/camel"/>
-              <property name="resourceBase" value="${activemq.base}/webapps/camel"/>
-              <property name="logUrlOnStart" value="true"/>
-            </bean>
-            <bean class="org.eclipse.jetty.webapp.WebAppContext">
-              <property name="contextPath" value="/demo"/>
-              <property name="resourceBase" value="${activemq.base}/webapps/demo"/>
-              <property name="logUrlOnStart" value="true"/>
-            </bean>
-            <bean class="org.eclipse.jetty.webapp.WebAppContext">
-              <property name="contextPath" value="/fileserver"/>
-              <property name="resourceBase" value="${activemq.base}/webapps/fileserver"/>
-              <property name="logUrlOnStart" value="true"/>
-              <property name="parentLoaderPriority" value="true"/>
+
+    <!--
+        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"/>
+    -->
+<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="conf/jetty-realm.properties" />
+    </bean>
+
+    <bean id="securityConstraint" class="org.eclipse.jetty.http.security.Constraint">
+        <property name="name" value="BASIC" />
+        <property name="roles" value="admin" />
+        <property name="authenticate" value="true" />
+    </bean>
+    <bean id="securityConstraintMapping" class="org.eclipse.jetty.security.ConstraintMapping">
+        <property name="constraint" ref="securityConstraint" />
+        <property name="pathSpec" value="/*" />
+    </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="securityConstraintMapping" />
+            </list>
+        </property>
+        <property name="handler">
+            <bean id="sec" class="org.eclipse.jetty.server.handler.HandlerCollection">
+                <property name="handlers">
+                    <list>
+                        <bean class="org.eclipse.jetty.webapp.WebAppContext">
+                            <property name="contextPath" value="/admin" />
+                            <property name="resourceBase" value="${activemq.base}/webapps/admin" />
+                            <property name="logUrlOnStart" value="true" />
+                        </bean>
+                        <bean class="org.eclipse.jetty.webapp.WebAppContext">
+                            <property name="contextPath" value="/camel" />
+                            <property name="resourceBase" value="${activemq.base}/webapps/camel" />
+                            <property name="logUrlOnStart" value="true" />
+                        </bean>
+                        <bean class="org.eclipse.jetty.webapp.WebAppContext">
+                            <property name="contextPath" value="/demo" />
+                            <property name="resourceBase" value="${activemq.base}/webapps/demo" />
+                            <property name="logUrlOnStart" value="true" />
+                        </bean>
+                        <bean class="org.eclipse.jetty.webapp.WebAppContext">
+                            <property name="contextPath" value="/fileserver" />
+                            <property name="resourceBase" value="${activemq.base}/webapps/fileserver" />
+                            <property name="logUrlOnStart" value="true" />
+                            <property name="parentLoaderPriority" 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.base}/webapps/" />
+                        </bean>
+                        <bean id="defaultHandler" class="org.eclipse.jetty.server.handler.DefaultHandler">
+                            <property name="serveIcon" value="false" />
+                        </bean>
+                    </list>
+                </property>
             </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.base}/webapps/"/>
-            </bean> 
-            <bean id="defaultHandler" class="org.eclipse.jetty.server.handler.DefaultHandler">
-                <property name="serveIcon" value="false"/>
+        </property>
+    </bean>
+
+    <bean id="contexts" class="org.eclipse.jetty.server.handler.ContextHandlerCollection">
+    </bean>
+
+    <bean id="Server" class="org.eclipse.jetty.server.Server" init-method="start"
+        destroy-method="stop">
+
+        <property name="connectors">
+            <list>
+                <bean id="Connector" class="org.eclipse.jetty.server.nio.SelectChannelConnector">
+                    <property name="port" value="8161" />
+                </bean>
+            </list>
+        </property>
+
+        <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>
-          </list>
         </property>
-      </bean>
-    </property>
- 
-  </bean>
- 
-</beans>
+
+    </bean>
+
+</beans>
\ No newline at end of file