[jboss-svn-commits] JBL Code SVN: r17954 - in labs/jbosslabs/labs-3.0-build: configuration/resources/to-copy/server/default/deploy/jboss-web.deployer and 3 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Fri Jan 18 10:49:28 EST 2008


Author: szimano
Date: 2008-01-18 10:49:28 -0500 (Fri, 18 Jan 2008)
New Revision: 17954

Added:
   labs/jbosslabs/labs-3.0-build/configuration/resources/to-copy/server/default/deploy/jmx-console.war/login-redirect.jsp
Removed:
   labs/jbosslabs/labs-3.0-build/services/authorization/resources/jboss-web.deployer/wsdl4j-1.5.1.jar
Modified:
   labs/jbosslabs/labs-3.0-build/configuration/resources/to-copy/server/default/conf/josso-agent-config.xml
   labs/jbosslabs/labs-3.0-build/configuration/resources/to-copy/server/default/conf/josso-gateway-config.xml
   labs/jbosslabs/labs-3.0-build/configuration/resources/to-copy/server/default/deploy/jboss-web.deployer/server.xml
   labs/jbosslabs/labs-3.0-build/configuration/resources/to-copy/server/default/deploy/jmx-console.war/WEB-INF/jboss-web.xml
   labs/jbosslabs/labs-3.0-build/configuration/resources/to-copy/server/default/deploy/jmx-console.war/WEB-INF/web.xml
Log:
jmx console pluged into JOSSO, removed conflicting library

Modified: labs/jbosslabs/labs-3.0-build/configuration/resources/to-copy/server/default/conf/josso-agent-config.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/configuration/resources/to-copy/server/default/conf/josso-agent-config.xml	2008-01-18 14:13:30 UTC (rev 17953)
+++ labs/jbosslabs/labs-3.0-build/configuration/resources/to-copy/server/default/conf/josso-agent-config.xml	2008-01-18 15:49:28 UTC (rev 17954)
@@ -94,6 +94,10 @@
         <partner-app>
             <context>/foo-view</context>
         </partner-app>
+        
+        <partner-app>
+            <context>/jmx-console</context>
+        </partner-app>
         
 
         <!-- Root context protection

Modified: labs/jbosslabs/labs-3.0-build/configuration/resources/to-copy/server/default/conf/josso-gateway-config.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/configuration/resources/to-copy/server/default/conf/josso-gateway-config.xml	2008-01-18 14:13:30 UTC (rev 17953)
+++ labs/jbosslabs/labs-3.0-build/configuration/resources/to-copy/server/default/conf/josso-gateway-config.xml	2008-01-18 15:49:28 UTC (rev 17954)
@@ -246,7 +246,7 @@
             </userPropertiesQueryString>
 
             <rolesQueryString>
-                SELECT "admin" AS 'josso_role.name' UNION SELECT "user" AS 'josso_role.name' UNION SELECT ? UNION SELECT "role1";
+                SELECT "admin" AS 'josso_role.name' UNION SELECT "user" AS 'josso_role.name' UNION SELECT ? UNION SELECT "role1" UNION SELECT "JBossAdmin";
             </rolesQueryString>
 
             <dsJndiName>java:JBossDS</dsJndiName>

Modified: labs/jbosslabs/labs-3.0-build/configuration/resources/to-copy/server/default/deploy/jboss-web.deployer/server.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/configuration/resources/to-copy/server/default/deploy/jboss-web.deployer/server.xml	2008-01-18 14:13:30 UTC (rev 17953)
+++ labs/jbosslabs/labs-3.0-build/configuration/resources/to-copy/server/default/deploy/jboss-web.deployer/server.xml	2008-01-18 15:49:28 UTC (rev 17954)
@@ -42,13 +42,7 @@
 
       <Engine name="jboss.web" defaultHost="localhost">
       
-      	 <!-- JOSS Realm -->
-
-		<Realm className="org.josso.jb42.agent.JBossCatalinaRealm"
-                 appName="josso"
-                 userClassNames="org.josso.gateway.identity.service.BaseUserImpl"
-                 roleClassNames="org.josso.gateway.identity.service.BaseRoleImpl"
-                 debug="1" />
+      	
                  
          <!-- The JAAS based authentication and authorization realm implementation
          that is compatible with the jboss 3.2.x realm implementation.
@@ -65,10 +59,10 @@
          -->
          
          
-         <!-- <Realm className="org.jboss.web.tomcat.security.JBossSecurityMgrRealm"
+         <!--  <Realm className="org.jboss.web.tomcat.security.JBossSecurityMgrRealm"
             certificatePrincipal="org.jboss.security.auth.certs.SubjectDNMapping"
             allRolesMode="authOnly"
-            /> -->
+            />  -->
             
          <!-- A subclass of JBossSecurityMgrRealm that uses the authentication
          behavior of JBossSecurityMgrRealm, but overrides the authorization
@@ -86,7 +80,15 @@
             allRolesMode="authOnly"
             />
          -->
+         
+          <!-- JOSS Realm -->
 
+		<Realm className="org.josso.jb42.agent.JBossCatalinaRealm"
+                 appName="josso"
+                 userClassNames="org.josso.gateway.identity.service.BaseUserImpl"
+                 roleClassNames="org.josso.gateway.identity.service.BaseRoleImpl"
+                 debug="1" />
+
         <Host name="localhost"
            autoDeploy="false" deployOnStartup="false" deployXML="false"
            configClass="org.jboss.web.tomcat.security.config.JBossContextConfig"

Modified: labs/jbosslabs/labs-3.0-build/configuration/resources/to-copy/server/default/deploy/jmx-console.war/WEB-INF/jboss-web.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/configuration/resources/to-copy/server/default/deploy/jmx-console.war/WEB-INF/jboss-web.xml	2008-01-18 14:13:30 UTC (rev 17953)
+++ labs/jbosslabs/labs-3.0-build/configuration/resources/to-copy/server/default/deploy/jmx-console.war/WEB-INF/jboss-web.xml	2008-01-18 15:49:28 UTC (rev 17954)
@@ -1,6 +1,6 @@
 <jboss-web>
    <!-- Uncomment the security-domain to enable security. You will
       need to edit the htmladaptor login configuration to setup the
-      login modules used to authentication users.-->
-      <security-domain>java:/jaas/jmx-console</security-domain>
+      login modules used to authentication users.
+      <security-domain>java:/jaas/jmx-console</security-domain> -->
 </jboss-web>

Modified: labs/jbosslabs/labs-3.0-build/configuration/resources/to-copy/server/default/deploy/jmx-console.war/WEB-INF/web.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/configuration/resources/to-copy/server/default/deploy/jmx-console.war/WEB-INF/web.xml	2008-01-18 14:13:30 UTC (rev 17953)
+++ labs/jbosslabs/labs-3.0-build/configuration/resources/to-copy/server/default/deploy/jmx-console.war/WEB-INF/web.xml	2008-01-18 15:49:28 UTC (rev 17954)
@@ -101,9 +101,12 @@
    </security-constraint>
 
    <login-config>
-      <auth-method>BASIC</auth-method>
-      <realm-name>JBoss JMX Console</realm-name>
-   </login-config>
+		<auth-method>FORM</auth-method>
+		<form-login-config>
+			<form-login-page>/login-redirect.jsp</form-login-page>
+			<form-error-page>/login-redirect.jsp</form-error-page>
+		</form-login-config>
+	</login-config>
 
    <security-role>
       <role-name>JBossAdmin</role-name>

Added: labs/jbosslabs/labs-3.0-build/configuration/resources/to-copy/server/default/deploy/jmx-console.war/login-redirect.jsp
===================================================================
--- labs/jbosslabs/labs-3.0-build/configuration/resources/to-copy/server/default/deploy/jmx-console.war/login-redirect.jsp	                        (rev 0)
+++ labs/jbosslabs/labs-3.0-build/configuration/resources/to-copy/server/default/deploy/jmx-console.war/login-redirect.jsp	2008-01-18 15:49:28 UTC (rev 17954)
@@ -0,0 +1,28 @@
+<%--
+  ~ JOSSO: Java Open Single Sign-On
+  ~
+  ~ Copyright 2004-2007, Atricore, Inc.
+  ~
+  ~ This is free software; you can redistribute it and/or modify it
+  ~ under the terms of the GNU Lesser General Public License as
+  ~ published by the Free Software Foundation; either version 2.1 of
+  ~ the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  ~ Lesser General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU Lesser General Public
+  ~ License along with this software; if not, write to the Free
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  --%>
+
+<%@page contentType="text/html; charset=iso-8859-1" language="java" session="true" %>
+<!--
+Redirects the user to the propper login page.  Configured as the login url the web.xml for this application.
+-->
+<%
+    response.sendRedirect(request.getContextPath() + "/josso_login/");
+%>

Deleted: labs/jbosslabs/labs-3.0-build/services/authorization/resources/jboss-web.deployer/wsdl4j-1.5.1.jar
===================================================================
(Binary files differ)




More information about the jboss-svn-commits mailing list