geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ammul...@apache.org
Subject svn commit: r345728 [2/3] - in /geronimo/trunk: applications/console-core/src/java/org/apache/geronimo/console/core/security/ applications/console-core/src/java/org/apache/geronimo/console/util/ applications/console-ear/src/plan/ applications/console-f...
Date Sun, 20 Nov 2005 08:40:52 GMT
Added: geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/classes/login-modules.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/classes/login-modules.properties?rev=345728&view=auto
==============================================================================
--- geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/classes/login-modules.properties (added)
+++ geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/classes/login-modules.properties Sun Nov 20 00:40:24 2005
@@ -0,0 +1,88 @@
+# SQL realm has special edit logic; don't bother with full list
+module.sql.name=Database (SQL) Realm
+module.sql.class=org.apache.geronimo.security.realm.providers.SQLLoginModule
+# Properties File
+module.props.name=Properties File Realm
+module.props.class=org.apache.geronimo.security.realm.providers.PropertiesFileLoginModule
+module.props.field.usersURI.displayOrder=1
+module.props.field.usersURI.displayName=Users File URI
+module.props.field.usersURI.description=The location of a properties file (relative to the Geronimo home dir) holding user/password information.  The format of each line should be <tt>username=password</tt>.
+module.props.field.usersURI.length=50
+module.props.field.groupsURI.displayOrder=2
+module.props.field.groupsURI.displayName=Groups File URI
+module.props.field.groupsURI.description=The location of a properties file (relative to the Geronimo home dir) holding group information.  The format of each line should be <tt>group=user,user,...</tt>.
+module.props.field.groupsURI.length=50
+# LDAP
+module.ldap.name=LDAP Realm
+module.ldap.class=org.apache.geronimo.security.realm.providers.LDAPLoginModule
+module.ldap.field.initialContextFactory.displayOrder=1
+module.ldap.field.initialContextFactory.displayName=Initial Context Factory
+module.ldap.field.initialContextFactory.description=FIXME: Need description for this option
+module.ldap.field.initialContextFactory.length=60
+module.ldap.field.connectionURL.displayOrder=2
+module.ldap.field.connectionURL.displayName=Connection URL
+module.ldap.field.connectionURL.description=FIXME: Need description for this option
+module.ldap.field.connectionURL.length=50
+module.ldap.field.connectionUsername.displayOrder=3
+module.ldap.field.connectionUsername.displayName=Connect Username
+module.ldap.field.connectionUsername.description=FIXME: Need description for this option
+module.ldap.field.connectionUsername.length=20
+module.ldap.field.connectionPassword.displayOrder=4
+module.ldap.field.connectionPassword.displayName=Connect Password
+module.ldap.field.connectionPassword.password=true
+module.ldap.field.connectionPassword.description=FIXME: Need description for this option
+module.ldap.field.connectionPassword.length=20
+module.ldap.field.connectionProtocol.displayOrder=5
+module.ldap.field.connectionProtocol.displayName=Connect Protocol
+module.ldap.field.connectionProtocol.description=FIXME: Need description for this option
+module.ldap.field.connectionProtocol.length=20
+module.ldap.field.authentication.displayOrder=6
+module.ldap.field.authentication.displayName=Authentication
+module.ldap.field.authentication.description=FIXME: Need description for this option
+module.ldap.field.authentication.length=50
+module.ldap.field.userBase.displayOrder=7
+module.ldap.field.userBase.displayName=User Base
+module.ldap.field.userBase.description=FIXME: Need description for this option
+module.ldap.field.userBase.length=50
+module.ldap.field.userSearchMatching.displayOrder=8
+module.ldap.field.userSearchMatching.displayName=User Search Matching
+module.ldap.field.userSearchMatching.description=FIXME: Need description for this option
+module.ldap.field.userSearchMatching.length=50
+module.ldap.field.userSearchSubtree.displayOrder=9
+module.ldap.field.userSearchSubtree.displayName=User Search Subtree
+module.ldap.field.userSearchSubtree.description=FIXME: Need description for this option
+module.ldap.field.userSearchSubtree.length=50
+module.ldap.field.roleBase.displayOrder=10
+module.ldap.field.roleBase.displayName=Role Base
+module.ldap.field.roleBase.description=FIXME: Need description for this option
+module.ldap.field.roleBase.length=50
+module.ldap.field.roleName.displayOrder=11
+module.ldap.field.roleName.displayName=Role Name
+module.ldap.field.roleName.description=FIXME: Need description for this option
+module.ldap.field.roleName.length=50
+module.ldap.field.roleSearchMatching.displayOrder=12
+module.ldap.field.roleSearchMatching.displayName=Role Search Matching
+module.ldap.field.roleSearchMatching.description=FIXME: Need description for this option
+module.ldap.field.roleSearchMatching.length=50
+module.ldap.field.roleSearchSubtree.displayOrder=13
+module.ldap.field.roleSearchSubtree.displayName=Role Search Subtree
+module.ldap.field.roleSearchSubtree.description=FIXME: Need description for this option
+module.ldap.field.roleSearchSubtree.length=50
+module.ldap.field.userRoleName.displayOrder=14
+module.ldap.field.userRoleName.displayName=User Role Name
+module.ldap.field.userRoleName.description=FIXME: Need description for this option
+module.ldap.field.userRoleName.length=50
+# Certificate Properties File
+module.certprops.name=Certificate Properties File Realm
+module.certprops.class=org.apache.geronimo.security.realm.providers.CertificatePropertiesFileLoginModule
+module.certprops.field.usersURI.displayOrder=1
+module.certprops.field.usersURI.displayName=Users File URI
+module.certprops.field.usersURI.description=The location of a properties file (relative to the Geronimo home dir) holding certificate to user mapping information.  The format of each line should be <tt>username=certificatename</tt> where certificate name is <tt>X509Certificate.getSubjectX500Principal().getName()</tt>
+module.certprops.field.usersURI.length=50
+module.certprops.field.groupsURI.displayOrder=2
+module.certprops.field.groupsURI.displayName=Groups File URI
+module.certprops.field.groupsURI.description=The location of a properties file (relative to the Geronimo home dir) holding group information.  The format of each line should be <tt>group=user,user,...</tt>.
+module.certprops.field.groupsURI.length=50
+# TODO: Sun Kerberos Login Module & Properties
+# Other realm has special edit logic; don't bother with much at all
+module.other.name=Other
\ No newline at end of file

Propchange: geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/classes/login-modules.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/portlet.xml?rev=345728&r1=345727&r2=345728&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/portlet.xml (original)
+++ geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/portlet.xml Sun Nov 20 00:40:24 2005
@@ -506,6 +506,29 @@
     </portlet>
 
     <portlet>
+        <description>Portlet for managing security realms</description>
+        <portlet-name>RealmWizard</portlet-name>
+        <display-name>Security Realm Wizard</display-name>
+
+        <portlet-class>org.apache.geronimo.console.securitymanager.realm.SecurityRealmPortlet</portlet-class>
+
+        <expiration-cache>-1</expiration-cache>
+
+        <supports>
+            <mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+        </supports>
+
+        <supported-locale>en</supported-locale>
+
+        <portlet-info>
+            <title>Security Realms</title>
+            <short-title>Security Realms</short-title>
+            <keywords>Security Realm Wizard</keywords>
+        </portlet-info>
+    </portlet>
+
+    <portlet>
         <description>Portlet for managing JMS connections</description>
         <portlet-name>JMSConnections</portlet-name>
         <display-name>JMS Connection Factory Portlet</display-name>

Modified: geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/list.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/list.jsp?rev=345728&r1=345727&r2=345728&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/list.jsp (original)
+++ geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/list.jsp Sun Nov 20 00:40:24 2005
@@ -2,16 +2,71 @@
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
 <portlet:defineObjects/>
 
-<p>This page lists all the available database pools.</p>
-<ul>
+<p>This page lists all the available database pools.  Server-wide database pools can be edited, while database
+pools deployed as part of a single application cannot (change the deployment plan in the application instead).</p>
+
+<c:choose>
+  <c:when test="${empty(pools)}"><p><i>There are no database pools defined</i></p></c:when>
+  <c:otherwise>
+<table width="100%">
+  <tr>
+    <td class="DarkBackground">Name</td>
+    <td class="DarkBackground" align="center">Deployed As</td>
+    <td class="DarkBackground" align="center">State</td>
+    <td class="DarkBackground" align="center">Actions</td>
+  </tr>
 <c:forEach var="pool" items="${pools}">
-  <li>${pool.name} (<a href="<portlet:actionURL portletMode="view">
-              <portlet:param name="mode" value="editExisting" />
-              <portlet:param name="adapterObjectName" value="${pool.adapterObjectName}" />
-              <portlet:param name="objectName" value="${pool.factoryObjectName}" />
-            </portlet:actionURL>">edit</a>)</li>
+  <tr>
+    <td>${pool.name}</td>
+    <td>
+      <c:choose>
+        <c:when test="${empty pool.parentName}">
+          Server-wide
+        </c:when>
+        <c:otherwise>
+          ${pool.parentName}  <%-- todo: make this a link to an application portlet --%>
+        </c:otherwise>
+      </c:choose>
+    </td>
+    <td>${pool.stateName}</td>
+    <td>
+    <c:if test="${empty pool.parentName}">
+         <%--<c:choose>
+               <c:when test="${info.stateName eq 'running'}">
+               <a href="<portlet:actionURL portletMode="view">
+                 <portlet:param name="mode" value="stop" />
+                 <portlet:param name="name" value="${info.objectName}" />
+                 <portlet:param name="managerObjectName" value="${container.managerObjectName}" />
+                 <portlet:param name="containerObjectName" value="${container.containerObjectName}" />
+               </portlet:actionURL>">stop</a>
+               </c:when>
+               <c:otherwise>
+               <a href="<portlet:actionURL portletMode="view">
+                 <portlet:param name="mode" value="start" />
+                 <portlet:param name="name" value="${info.objectName}" />
+                 <portlet:param name="managerObjectName" value="${container.managerObjectName}" />
+                 <portlet:param name="containerObjectName" value="${container.containerObjectName}" />
+               </portlet:actionURL>">start</a>
+               </c:otherwise>
+             </c:choose>--%>
+      <a href="<portlet:actionURL portletMode="view">
+        <portlet:param name="mode" value="editExisting" />
+        <portlet:param name="adapterObjectName" value="${pool.adapterObjectName}" />
+        <portlet:param name="objectName" value="${pool.factoryObjectName}" />
+      </portlet:actionURL>">edit</a>
+           <%--<a href="<portlet:actionURL portletMode="view">
+                 <portlet:param name="mode" value="delete" />
+                 <portlet:param name="name" value="${info.objectName}" />
+                 <portlet:param name="managerObjectName" value="${container.managerObjectName}" />
+                 <portlet:param name="containerObjectName" value="${container.containerObjectName}" />
+               </portlet:actionURL>">delete</a>--%>
+    </c:if>
+    </td>
+  </tr>
 </c:forEach>
-</ul>
+</table>
+  </c:otherwise>
+</c:choose>
 
 <p><a href="<portlet:actionURL portletMode="view">
               <portlet:param name="mode" value="rdbms" />

Modified: geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/showPlan.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/showPlan.jsp?rev=345728&r1=345727&r2=345728&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/showPlan.jsp (original)
+++ geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/showPlan.jsp Sun Nov 20 00:40:24 2005
@@ -2,7 +2,7 @@
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
 <portlet:defineObjects/>
 
-<p><b>Create Database Pool</b> -- Step 4: Test Connection</p>
+<p><b>Create Database Pool</b> -- Show Deployment Plan</p>
 
 <!--   FORM TO COLLECT DATA FOR THIS PAGE   -->
 <form name="<portlet:namespace/>DatabaseForm" action="<portlet:actionURL/>">

Added: geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/_sql.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/_sql.jsp?rev=345728&view=auto
==============================================================================
--- geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/_sql.jsp (added)
+++ geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/_sql.jsp Sun Nov 20 00:40:24 2005
@@ -0,0 +1,114 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
+
+      <tr>
+        <th><div align="right">User SELECT SQL:</div></th>
+        <td><input name="option-userSelect" type="text"
+                   size="60" value="${realm.options['userSelect']}"></td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>A SQL statement to load user/password information.  It should return 2 columns, the first
+          holding a username and the second holding a password.  The statement may use the PreparedStatement
+          syntax of ? for a parameter, in which case the username will be set for every parameter.  A
+          typical setting would be <tt>SELECT username, password FROM app_users WHERE username=?</tt></td>
+      </tr>
+
+      <tr>
+        <th><div align="right">Group SELECT SQL:</div></th>
+        <td><input name="option-groupSelect" type="text"
+                   size="60" value="${realm.options['groupSelect']}"></td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>A SQL statement to load group information for a user.  It should return 2 columns, the first
+          holding a username and the second holding a group name.  The statement may use the PreparedStatement
+          syntax of ? for a parameter, in which case the username will be set for every parameter.  A
+          typical setting would be <tt>SELECT username, group_name FROM user_groups WHERE username=?</tt> or for
+          a more normalized schema, <tt>SELECT u.username, g.name FROM app_users u, groups g, user_groups ug
+          WHERE ug.user_id=users.id AND ug.group_id=g.id AND u.username=?</tt></td>
+      </tr>
+
+      <tr>
+        <td></td>
+        <td><i>A SQL security realm must either have a database pool or JDBC connectivity settings to
+          connect to the database.  Please select EITHER the database pool, OR the rest of the JDBC
+          settings.</i></td>
+      </tr>
+
+
+      <tr>
+        <th><div align="right">Database Pool</div></th>
+        <td>
+          <select name="option-databasePoolObjectName">
+            <option />
+        <c:forEach var="pool" items="${pools}">
+            <option value="${pool.objectName}"<c:if test="${realm.options['dataSourceName'] eq pool.name && realm.options['dataSourceApplication'] eq pool.applicationName}"> selected</c:if>>${pool.displayName}</option>
+        </c:forEach>
+          </select>
+        </td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>A database pool that the login module will use to connect to the database.  If this is specified, none of
+          the rest of the settings after this are necessary.</td>
+      </tr>
+
+      <tr>
+        <th><div align="right">JDBC Driver Class</div></th>
+        <td><input name="option-jdbcDriver" type="text"
+                   size="60" value="${realm.options['jdbcDriver']}"></td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>The fully-qualified JDBC driver class name.  This driver must be located in the JAR specified in the next
+          field.</td>
+      </tr>
+
+      <tr>
+        <th><div align="right">Driver JAR:</div></th>
+        <td>
+          <select name="jar">
+            <option />
+        <c:forEach var="jar" items="${jars}">
+            <option <c:if test="${jar == realm.jar}">selected</c:if>>${jar}</option>
+        </c:forEach>
+          </select>
+        </td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>The JAR holding the selected JDBC driver.  Should be installed under GERONIMO/repository/ to appear in this list.</td>
+      </tr>
+
+      <tr>
+        <th><div align="right">JDBC URL</div></th>
+        <td><input name="option-jdbcURL" type="text"
+                   size="60" value="${realm.options['jdbcURL']}"></td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>The JDBC URL that specifies the details of the database to connect to.  This has a different form for
+          each JDBC driver.</td>
+      </tr>
+
+      <tr>
+        <th><div align="right">JDBC Username</div></th>
+        <td><input name="option-jdbcUser" type="text"
+                   size="20" value="${realm.options['jdbcUser']}"></td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>The username used to connect to the database</td>
+      </tr>
+
+      <tr>
+        <th><div align="right">JDBC Password</div></th>
+        <td><input name="option-jdbcPassword" type="password"
+                   size="20" value="${realm.options['jdbcPassword']}"></td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>The password used to connect to the database</td>
+      </tr>
+

Propchange: geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/_sql.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/advanced.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/advanced.jsp?rev=345728&view=auto
==============================================================================
--- geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/advanced.jsp (added)
+++ geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/advanced.jsp Sun Nov 20 00:40:24 2005
@@ -0,0 +1,118 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<portlet:defineObjects/>
+
+<p><b>Create Security Realm</b> -- Step 3: Advanced Configuration</p>
+
+<c:if test="${!(empty AdvancedError)}"><p><font color="red"><b>Error: ${AdvancedError}</b></font></p></c:if>
+
+<!--   FORM TO COLLECT DATA FOR THIS PAGE   -->
+<form name="<portlet:namespace/>RealmForm" action="<portlet:actionURL/>">
+    <input type="hidden" name="mode" value="process-advanced" />
+    <input type="hidden" name="test" value="true" />
+    <input type="hidden" name="name" value="${realm.name}" />
+    <input type="hidden" name="realmType" value="${realm.realmType}" />
+    <input type="hidden" name="jar" value="${realm.jar}" />
+  <c:forEach var="option" items="${realm.options}">
+    <input type="hidden" name="option-${option.key}" value="${option.value}" />
+  </c:forEach>
+    <input type="hidden" name="objectName" value="${realm.objectName}" />
+    <input type="hidden" name="module-domain-0" value="${realm.modules[0].loginDomainName}" />
+    <input type="hidden" name="module-class-0" value="${realm.modules[0].className}" />
+    <input type="hidden" name="module-control-0" value="${realm.modules[0].controlFlag}" />
+    <input type="hidden" name="module-server-0" value="${realm.modules[0].serverSide}" />
+    <input type="hidden" name="module-options-0" value="${realm.modules[0].optionString}" />
+    <input type="hidden" name="module-domain-1" value="${realm.modules[1].loginDomainName}" />
+    <input type="hidden" name="module-class-1" value="${realm.modules[1].className}" />
+    <input type="hidden" name="module-control-1" value="${realm.modules[1].controlFlag}" />
+    <input type="hidden" name="module-server-1" value="${realm.modules[1].serverSide}" />
+    <input type="hidden" name="module-options-1" value="${realm.modules[1].optionString}" />
+    <input type="hidden" name="module-domain-2" value="${realm.modules[2].loginDomainName}" />
+    <input type="hidden" name="module-class-2" value="${realm.modules[2].className}" />
+    <input type="hidden" name="module-control-2" value="${realm.modules[2].controlFlag}" />
+    <input type="hidden" name="module-server-2" value="${realm.modules[2].serverSide}" />
+    <input type="hidden" name="module-options-2" value="${realm.modules[2].optionString}" />
+    <input type="hidden" name="module-domain-3" value="${realm.modules[3].loginDomainName}" />
+    <input type="hidden" name="module-class-3" value="${realm.modules[3].className}" />
+    <input type="hidden" name="module-control-3" value="${realm.modules[3].controlFlag}" />
+    <input type="hidden" name="module-server-3" value="${realm.modules[3].serverSide}" />
+    <input type="hidden" name="module-options-3" value="${realm.modules[3].optionString}" />
+    <input type="hidden" name="module-domain-4" value="${realm.modules[4].loginDomainName}" />
+    <input type="hidden" name="module-class-4" value="${realm.modules[4].className}" />
+    <input type="hidden" name="module-control-4" value="${realm.modules[4].controlFlag}" />
+    <input type="hidden" name="module-server-4" value="${realm.modules[4].serverSide}" />
+    <input type="hidden" name="module-options-4" value="${realm.modules[4].optionString}" />
+    <table border="0">
+    <!-- ENTRY FIELD: Audit Log -->
+      <tr>
+        <th valign="top"><div align="right">Enable Auditing:</div></th>
+        <td valign="top">
+          <input type="checkbox" id="<portlet:namespace/>auditCheckbox" name="enableAuditing"<c:if test="${!(empty realm.auditPath)}"> checked="checked"</c:if>
+          onclick="document.getElementById('<portlet:namespace/>auditDiv').style.display=this.checked ? 'block' : 'none';document.getElementById('<portlet:namespace/>auditPath').value='';"/>
+          <div id="<portlet:namespace/>auditDiv" style="display: <c:choose><c:when test="${empty realm.auditPath}">none</c:when><c:otherwise>block</c:otherwise></c:choose>;">
+          Log File: <input type="text" id="<portlet:namespace/>auditPath" name="auditPath" size="30" value="${realm.auditPath}" />
+          </div>
+        </td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>If enabled, every login attempt will be recorded to the specified file.  The path should
+          be relative to the Geronimo home directory (a typical value would be
+          <tt>var/log/login-attempts.log</tt>).</td>
+      </tr>
+    <!-- ENTRY FIELDS: Lockout -->
+      <tr>
+        <th valign="top"><div align="right">Enable Lockout:</div></th>
+        <td valign="top">
+          <input type="checkbox" id="<portlet:namespace/>lockoutCheckbox" name="enableAuditing"<c:if test="${realm.lockoutEnabled}"> checked="checked"</c:if>
+                 onclick="document.getElementById('<portlet:namespace/>lockoutDiv').style.display=this.checked ? 'block' : 'none';document.getElementById('<portlet:namespace/>lockoutCount').value='';document.getElementById('<portlet:namespace/>lockoutWindow').value='';document.getElementById('<portlet:namespace/>lockoutDuration').value='';"/>
+          <div id="<portlet:namespace/>lockoutDiv" style="display: <c:choose><c:when test="${realm.lockoutEnabled}">block</c:when><c:otherwise>none</c:otherwise></c:choose>;">
+          Lock a user after <input type="text" id="<portlet:namespace/>lockoutCount" name="lockoutCount" size="2" maxlength="3" value="${realm.lockoutCount}" />
+          failures within <input type="text" id="<portlet:namespace/>lockoutWindow" name="lockoutWindow" size="4" maxlength="5" value="${realm.lockoutWindow}" /> seconds<br />
+          and keep the account locked for <input type="text" id="<portlet:namespace/>lockoutDuration" name="lockoutDuration" size="5" maxlength="5" value="${realm.lockoutDuration}" /> seconds.
+          </div>
+        </td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>If enabled, a certain number of failed logins in a particular time frame will cause a
+          user's account to be locked for a certain period of time.  This is a defense against
+          brute force account cracking attacks.</td>
+      </tr>
+    <!-- ENTRY FIELD: Store Password -->
+      <tr>
+        <th valign="top"><div align="right">Store Password:</div></th>
+        <td valign="top">
+          <input type="checkbox" name="storePassword"<c:if test="${realm.storePassword}"> checked="checked"</c:if>/>
+        </td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>If enabled, the realm will store each user's password in a private credential in the
+          Subject.  This will allow access to the password later after the login process has
+          completed.  This is not normally required.</td>
+      </tr>
+    <!-- SUBMIT BUTTON -->
+      <tr>
+        <td></td>
+        <td>
+      <c:choose>
+        <c:when test="${realm.testable}">
+          <input type="submit" value="Test a Login" />
+          <input type="button" value="Skip Test and Deploy" onclick="document.<portlet:namespace/>RealmForm.test.value='false';document.<portlet:namespace/>RealmForm.submit();return false;" />
+          <input type="button" value="Skip Test and Show Plan" onclick="document.<portlet:namespace/>RealmForm.mode.value='plan';document.<portlet:namespace/>RealmForm.submit();return false;" />
+        </c:when>
+        <c:otherwise>
+          <input type="button" value="Deploy Realm" onclick="document.<portlet:namespace/>RealmForm.test.value='false';document.<portlet:namespace/>RealmForm.submit();return false;" />
+          <input type="button" value="Show Plan" onclick="document.<portlet:namespace/>RealmForm.mode.value='plan';document.<portlet:namespace/>RealmForm.submit();return false;" />
+        </c:otherwise>
+      </c:choose>
+        </td>
+      </tr>
+    </table>
+</form>
+<!--   END OF FORM TO COLLECT DATA FOR THIS PAGE   -->
+
+<p><a href="<portlet:actionURL portletMode="view">
+              <portlet:param name="mode" value="list" />
+            </portlet:actionURL>">Cancel</a></p>

Propchange: geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/advanced.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/configure.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/configure.jsp?rev=345728&view=auto
==============================================================================
--- geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/configure.jsp (added)
+++ geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/configure.jsp Sun Nov 20 00:40:24 2005
@@ -0,0 +1,81 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<portlet:defineObjects/>
+
+<p><b>Create Security Realm</b> -- Step 2: Configure Login Module</p>
+
+<c:if test="${!(empty LoginModuleError)}"><p><font color="red"><b>Error: ${LoginModuleError}</b></font></p></c:if>
+
+<!--   FORM TO COLLECT DATA FOR THIS PAGE   -->
+<form name="<portlet:namespace/>RealmForm" action="<portlet:actionURL/>">
+    <input type="hidden" name="mode" value="process-configure" />
+    <input type="hidden" name="name" value="${realm.name}" />
+    <input type="hidden" name="realmType" value="${realm.realmType}" />
+  <c:if test="${!fn:contains(realm.realmType, 'SQL')}">
+    <input type="hidden" name="jar" value="${realm.jar}" />
+  </c:if>
+    <input type="hidden" name="auditPath" value="${realm.auditPath}" />
+    <input type="hidden" name="lockoutCount" value="${realm.lockoutCount}" />
+    <input type="hidden" name="lockoutWindow" value="${realm.lockoutWindow}" />
+    <input type="hidden" name="lockoutDuration" value="${realm.lockoutDuration}" />
+    <input type="hidden" name="storePassword" value="${realm.storePassword}" />
+    <input type="hidden" name="objectName" value="${realm.objectName}" />
+    <input type="hidden" name="module-domain-0" value="${realm.modules[0].loginDomainName}" />
+    <input type="hidden" name="module-class-0" value="${realm.modules[0].className}" />
+    <input type="hidden" name="module-control-0" value="${realm.modules[0].controlFlag}" />
+    <input type="hidden" name="module-server-0" value="${realm.modules[0].serverSide}" />
+    <input type="hidden" name="module-options-0" value="${realm.modules[0].optionString}" />
+    <input type="hidden" name="module-domain-1" value="${realm.modules[1].loginDomainName}" />
+    <input type="hidden" name="module-class-1" value="${realm.modules[1].className}" />
+    <input type="hidden" name="module-control-1" value="${realm.modules[1].controlFlag}" />
+    <input type="hidden" name="module-server-1" value="${realm.modules[1].serverSide}" />
+    <input type="hidden" name="module-options-1" value="${realm.modules[1].optionString}" />
+    <input type="hidden" name="module-domain-2" value="${realm.modules[2].loginDomainName}" />
+    <input type="hidden" name="module-class-2" value="${realm.modules[2].className}" />
+    <input type="hidden" name="module-control-2" value="${realm.modules[2].controlFlag}" />
+    <input type="hidden" name="module-server-2" value="${realm.modules[2].serverSide}" />
+    <input type="hidden" name="module-options-2" value="${realm.modules[2].optionString}" />
+    <input type="hidden" name="module-domain-3" value="${realm.modules[3].loginDomainName}" />
+    <input type="hidden" name="module-class-3" value="${realm.modules[3].className}" />
+    <input type="hidden" name="module-control-3" value="${realm.modules[3].controlFlag}" />
+    <input type="hidden" name="module-server-3" value="${realm.modules[3].serverSide}" />
+    <input type="hidden" name="module-options-3" value="${realm.modules[3].optionString}" />
+    <input type="hidden" name="module-domain-4" value="${realm.modules[4].loginDomainName}" />
+    <input type="hidden" name="module-class-4" value="${realm.modules[4].className}" />
+    <input type="hidden" name="module-control-4" value="${realm.modules[4].controlFlag}" />
+    <input type="hidden" name="module-server-4" value="${realm.modules[4].serverSide}" />
+    <input type="hidden" name="module-options-4" value="${realm.modules[4].optionString}" />
+    <table border="0">
+<c:choose>
+  <c:when test="${fn:contains(realm.realmType, 'SQL')}">
+<jsp:include page="_sql.jsp" />
+  </c:when>
+  <c:otherwise>
+    <c:forEach var="option" items="${realm.optionNames}">
+      <tr>
+        <th><div align="right">${optionMap[option].displayName}:</div></th>
+        <td><input name="option-${option}"
+                   type="<c:choose><c:when test="${optionMap[option].password}">password</c:when><c:otherwise>text</c:otherwise></c:choose>"
+                   size="${optionMap[option].length}" value="${realm.options[option]}"></td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>${optionMap[option].description}</td>
+      </tr>
+    </c:forEach>
+  </c:otherwise>
+</c:choose>
+    <!-- SUBMIT BUTTON -->
+      <tr>
+        <td></td>
+        <td><input type="submit" value="Next" /></td>
+      </tr>
+    </table>
+</form>
+<!--   END OF FORM TO COLLECT DATA FOR THIS PAGE   -->
+
+
+<p><a href="<portlet:actionURL portletMode="view">
+              <portlet:param name="mode" value="list" />
+            </portlet:actionURL>">Cancel</a></p>

Propchange: geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/configure.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/edit.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/edit.jsp?rev=345728&view=auto
==============================================================================
--- geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/edit.jsp (added)
+++ geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/edit.jsp Sun Nov 20 00:40:24 2005
@@ -0,0 +1,124 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<portlet:defineObjects/>
+
+<p>This page edits a new or existing security realm.</p>
+
+<!--   FORM TO COLLECT DATA FOR THIS PAGE   -->
+<form name="<portlet:namespace/>RealmForm" action="<portlet:actionURL/>">
+    <input type="hidden" name="mode" value="save" />
+    <input type="hidden" name="jar" value="${realm.jar}" />
+    <input type="hidden" name="name" value="${realm.name}" />
+    <input type="hidden" name="realmType" value="${realm.realmType}" />
+  <c:forEach var="option" items="${realm.options}">
+    <input type="hidden" name="option-${option.key}" value="${option.value}" />
+  </c:forEach>
+    <input type="hidden" name="auditPath" value="${realm.auditPath}" />
+    <input type="hidden" name="lockoutCount" value="${realm.lockoutCount}" />
+    <input type="hidden" name="lockoutWindow" value="${realm.lockoutWindow}" />
+    <input type="hidden" name="lockoutDuration" value="${realm.lockoutDuration}" />
+    <input type="hidden" name="storePassword" value="${realm.storePassword}" />
+    <input type="hidden" name="objectName" value="${realm.objectName}" />
+
+    <table border="0">
+    <!-- ENTRY FIELD: NAME -->
+      <tr>
+        <th><div align="right">Realm Name:</div></th>
+        <td>
+      <c:choose> <%-- Can't change the pool name after deployment because it's wired into all the ObjectNames --%>
+        <c:when test="${empty realm.objectName}">
+          <input name="name" type="text" size="30" value="${realm.name}">
+        </c:when>
+        <c:otherwise>
+          <b><c:out value="${realm.name}" /></b>
+        </c:otherwise>
+      </c:choose>
+        </td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>A name that is different than the name for any other security realms in the server (no spaces in the name please).</td>
+      </tr>
+    <!-- HEADER -->
+    <c:forEach var="module" items="${realm.modules}" varStatus="status" >
+      <tr>
+        <th colspan="2">Login Module ${status.index+1}</th>
+      </tr>
+      <tr>
+        <th><div align="right">Login Domain Name:</div></th>
+        <td><input name="module-domain-${status.index}" type="text" size="20" value="${module.loginDomainName}" /></td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>The login domain for this login module, which must be unique among all modules in the security realm.</td>
+      </tr>
+      <tr>
+        <th><div align="right">Login Module Class:</div></th>
+        <td><input name="module-class-${status.index}" type="text" size="60" value="${module.className}" /></td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>The fully-qualified class name for the login module.</td>
+      </tr>
+      <tr>
+        <th><div align="right">Control Flag:</div></th>
+        <td>
+          <select name="module-control-${status.index}">
+            <option value="OPTIONAL"<c:if test="${module.controlFlag eq 'OPTIONAL'}"> selected</c:if>>Optional</option>
+            <option value="REQUIRED"<c:if test="${module.controlFlag eq 'REQUIRED'}"> selected</c:if>>Required</option>
+            <option value="REQUISITE"<c:if test="${module.controlFlag eq 'REQUISITE'}"> selected</c:if>>Requisite</option>
+            <option value="SUFFICIENT"<c:if test="${module.controlFlag eq 'SUFFICIENT'}"> selected</c:if>>Sufficient</option>
+          </select>
+        </td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>The control flag for the login module, which controls what happens to the overall login processing if this
+          login module succeeds or fails.  For more information see
+          <a href="http://java.sun.com/j2se/1.4.2/docs/api/index.html">javax.security.auth.login.Configuration</a>.</td>
+      </tr>
+      <tr>
+        <th><div align="right">Server-Side:</div></th>
+        <td>
+          <select name="module-server-${status.index}">
+            <option value="true"<c:if test="${module.serverSide}"> selected</c:if>>Server Side</option>
+            <option value="false"<c:if test="${!module.serverSide}"> selected</c:if>>Client Side</option>
+          </select>
+        </td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>Server-side login modules are executed within the application server (this is normally correct).  Client-side
+          login modules are executed in the client's environment, for example, in order to use single sign-on features
+          of the client OS.</td>
+      </tr>
+      <tr>
+        <th><div align="right">Configuration Options:</div></th>
+        <td><textarea name="module-options-${status.index}" rows="5" cols="60">${module.optionString}</textarea></td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>Any configuration options necessary for the login module, in the standard Java properties format (one
+          per line, <tt>name=value</tt>)</td>
+      </tr>
+    </c:forEach>
+
+    <!-- SUBMIT BUTTON -->
+      <tr>
+        <td></td>
+        <td>
+          <input type="button" value="<c:choose><c:when test="${empty realm.objectName}">Deploy</c:when><c:otherwise>Save</c:otherwise></c:choose>"
+                 onclick="document.<portlet:namespace/>RealmForm.mode.value='save';document.<portlet:namespace/>RealmForm.submit();return false;" />
+          <input type="button" value="Show Plan" onclick="document.<portlet:namespace/>RealmForm.mode.value='plan';document.<portlet:namespace/>RealmForm.submit();return false;" />
+        </td>
+      </tr>
+    </table>
+</form>
+<!--   END OF FORM TO COLLECT DATA FOR THIS PAGE   -->
+
+
+
+<p><a href="<portlet:actionURL portletMode="view">
+              <portlet:param name="mode" value="list" />
+            </portlet:actionURL>">Cancel</a></p>

Propchange: geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/edit.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/list.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/list.jsp?rev=345728&view=auto
==============================================================================
--- geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/list.jsp (added)
+++ geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/list.jsp Sun Nov 20 00:40:24 2005
@@ -0,0 +1,72 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<portlet:defineObjects/>
+
+<p>This page lists all the available security realms.  Server-wide security realms can be edited, while security
+realms deployed as part of a single application cannot (change the deployment plan in the application instead).</p>
+
+<c:choose>
+  <c:when test="${empty(realms)}"><p><i>There are no security realms defined</i></p></c:when>
+  <c:otherwise>
+<table width="100%">
+  <tr>
+    <td class="DarkBackground">Name</td>
+    <td class="DarkBackground" align="center">Deployed As</td>
+    <td class="DarkBackground" align="center">State</td>
+    <td class="DarkBackground" align="center">Actions</td>
+  </tr>
+<c:forEach var="realm" items="${realms}">
+  <tr>
+    <td>${realm.name}</td>
+    <td>
+      <c:choose>
+        <c:when test="${empty realm.parentName}">
+          Server-wide
+        </c:when>
+        <c:otherwise>
+          ${realm.parentName}  <%-- todo: make this a link to an application portlet --%>
+        </c:otherwise>
+      </c:choose>
+    </td>
+    <td>${realm.stateName}</td>
+    <td>
+    <c:if test="${empty realm.parentName}">
+         <%--<c:choose>
+               <c:when test="${info.stateName eq 'running'}">
+               <a href="<portlet:actionURL portletMode="view">
+                 <portlet:param name="mode" value="stop" />
+                 <portlet:param name="name" value="${info.objectName}" />
+                 <portlet:param name="managerObjectName" value="${container.managerObjectName}" />
+                 <portlet:param name="containerObjectName" value="${container.containerObjectName}" />
+               </portlet:actionURL>">stop</a>
+               </c:when>
+               <c:otherwise>
+               <a href="<portlet:actionURL portletMode="view">
+                 <portlet:param name="mode" value="start" />
+                 <portlet:param name="name" value="${info.objectName}" />
+                 <portlet:param name="managerObjectName" value="${container.managerObjectName}" />
+                 <portlet:param name="containerObjectName" value="${container.containerObjectName}" />
+               </portlet:actionURL>">start</a>
+               </c:otherwise>
+             </c:choose>--%>
+      <a href="<portlet:actionURL portletMode="view">
+        <portlet:param name="mode" value="editExisting" />
+        <portlet:param name="objectName" value="${realm.objectName}" />
+      </portlet:actionURL>">edit</a>
+           <%--<a href="<portlet:actionURL portletMode="view">
+                 <portlet:param name="mode" value="delete" />
+                 <portlet:param name="name" value="${info.objectName}" />
+                 <portlet:param name="managerObjectName" value="${container.managerObjectName}" />
+                 <portlet:param name="containerObjectName" value="${container.containerObjectName}" />
+               </portlet:actionURL>">delete</a>--%>
+    </c:if>
+    </td>
+  </tr>
+</c:forEach>
+</table>
+  </c:otherwise>
+</c:choose>
+
+<p><a href="<portlet:actionURL portletMode="view">
+              <portlet:param name="mode" value="type" />
+            </portlet:actionURL>">Add new security realm</a></p>

Propchange: geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/list.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/selectType.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/selectType.jsp?rev=345728&view=auto
==============================================================================
--- geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/selectType.jsp (added)
+++ geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/selectType.jsp Sun Nov 20 00:40:24 2005
@@ -0,0 +1,82 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<portlet:defineObjects/>
+
+<p><b>Create Security Realm</b> -- Step 1: Select Name and Type</p>
+
+<!--   FORM TO COLLECT DATA FOR THIS PAGE   -->
+<form name="<portlet:namespace/>RealmForm" action="<portlet:actionURL/>">
+    <input type="hidden" name="mode" value="process-type" />
+    <input type="hidden" name="jar" value="${realm.jar}" />
+  <c:forEach var="option" items="${realm.options}">
+    <input type="hidden" name="option-${option.key}" value="${option.value}" />
+  </c:forEach>
+    <input type="hidden" name="auditPath" value="${realm.auditPath}" />
+    <input type="hidden" name="lockoutCount" value="${realm.lockoutCount}" />
+    <input type="hidden" name="lockoutWindow" value="${realm.lockoutWindow}" />
+    <input type="hidden" name="lockoutDuration" value="${realm.lockoutDuration}" />
+    <input type="hidden" name="storePassword" value="${realm.storePassword}" />
+    <input type="hidden" name="objectName" value="${realm.objectName}" />
+    <input type="hidden" name="module-domain-0" value="${realm.modules[0].loginDomainName}" />
+    <input type="hidden" name="module-class-0" value="${realm.modules[0].className}" />
+    <input type="hidden" name="module-control-0" value="${realm.modules[0].controlFlag}" />
+    <input type="hidden" name="module-server-0" value="${realm.modules[0].serverSide}" />
+    <input type="hidden" name="module-options-0" value="${realm.modules[0].optionString}" />
+    <input type="hidden" name="module-domain-1" value="${realm.modules[1].loginDomainName}" />
+    <input type="hidden" name="module-class-1" value="${realm.modules[1].className}" />
+    <input type="hidden" name="module-control-1" value="${realm.modules[1].controlFlag}" />
+    <input type="hidden" name="module-server-1" value="${realm.modules[1].serverSide}" />
+    <input type="hidden" name="module-options-1" value="${realm.modules[1].optionString}" />
+    <input type="hidden" name="module-domain-2" value="${realm.modules[2].loginDomainName}" />
+    <input type="hidden" name="module-class-2" value="${realm.modules[2].className}" />
+    <input type="hidden" name="module-control-2" value="${realm.modules[2].controlFlag}" />
+    <input type="hidden" name="module-server-2" value="${realm.modules[2].serverSide}" />
+    <input type="hidden" name="module-options-2" value="${realm.modules[2].optionString}" />
+    <input type="hidden" name="module-domain-3" value="${realm.modules[3].loginDomainName}" />
+    <input type="hidden" name="module-class-3" value="${realm.modules[3].className}" />
+    <input type="hidden" name="module-control-3" value="${realm.modules[3].controlFlag}" />
+    <input type="hidden" name="module-server-3" value="${realm.modules[3].serverSide}" />
+    <input type="hidden" name="module-options-3" value="${realm.modules[3].optionString}" />
+    <input type="hidden" name="module-domain-4" value="${realm.modules[4].loginDomainName}" />
+    <input type="hidden" name="module-class-4" value="${realm.modules[4].className}" />
+    <input type="hidden" name="module-control-4" value="${realm.modules[4].controlFlag}" />
+    <input type="hidden" name="module-server-4" value="${realm.modules[4].serverSide}" />
+    <input type="hidden" name="module-options-4" value="${realm.modules[4].optionString}" />
+    <table border="0">
+    <!-- ENTRY FIELD: NAME -->
+      <tr>
+        <th><div align="right">Name of Security Realm:</div></th>
+        <td><input name="name" type="text" size="30" value="${realm.name}" /></td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>A name that is different than the name for any other security realms in the server (no spaces in the name please).</td>
+      </tr>
+    <!-- ENTRY FIELD: REALM TYPE -->
+      <tr>
+        <th><div align="right">Realm Type:</div></th>
+        <td>
+          <select name="realmType">
+        <c:forEach var="module" items="${moduleTypes}">
+            <option <c:if test="${module.name == realm.realmType}">selected</c:if>>${module.name}</option>
+        </c:forEach>
+          </select>
+        </td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>The type of login module used as the master for this security realm.  Select "Other" for manual
+          configuration options including custom login modules and realms that use multiple login modules
+          to populate user principals.</td>
+      </tr>
+      <tr>
+        <td></td>
+        <td><input type="submit" value="Next" /></td>
+      </tr>
+    </table>
+</form>
+<!--   END OF FORM TO COLLECT DATA FOR THIS PAGE   -->
+
+<p><a href="<portlet:actionURL portletMode="view">
+              <portlet:param name="mode" value="list" />
+            </portlet:actionURL>">Cancel</a></p>

Propchange: geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/selectType.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/showPlan.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/showPlan.jsp?rev=345728&view=auto
==============================================================================
--- geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/showPlan.jsp (added)
+++ geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/showPlan.jsp Sun Nov 20 00:40:24 2005
@@ -0,0 +1,100 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<portlet:defineObjects/>
+
+<p><b>Create Security Realm</b> -- Show Deployment Plan</p>
+
+<!--   FORM TO COLLECT DATA FOR THIS PAGE   -->
+<form name="<portlet:namespace/>RealmForm" action="<portlet:actionURL/>">
+    <input type="hidden" name="mode" value="save" />
+    <input type="hidden" name="jar" value="${realm.jar}" />
+    <input type="hidden" name="name" value="${realm.name}" />
+    <input type="hidden" name="realmType" value="${realm.realmType}" />
+  <c:forEach var="option" items="${realm.options}">
+    <input type="hidden" name="option-${option.key}" value="${option.value}" />
+  </c:forEach>
+    <input type="hidden" name="auditPath" value="${realm.auditPath}" />
+    <input type="hidden" name="lockoutCount" value="${realm.lockoutCount}" />
+    <input type="hidden" name="lockoutWindow" value="${realm.lockoutWindow}" />
+    <input type="hidden" name="lockoutDuration" value="${realm.lockoutDuration}" />
+    <input type="hidden" name="storePassword" value="${realm.storePassword}" />
+    <input type="hidden" name="objectName" value="${realm.objectName}" />
+    <input type="hidden" name="module-domain-0" value="${realm.modules[0].loginDomainName}" />
+    <input type="hidden" name="module-class-0" value="${realm.modules[0].className}" />
+    <input type="hidden" name="module-control-0" value="${realm.modules[0].controlFlag}" />
+    <input type="hidden" name="module-server-0" value="${realm.modules[0].serverSide}" />
+    <input type="hidden" name="module-options-0" value="${realm.modules[0].optionString}" />
+    <input type="hidden" name="module-domain-1" value="${realm.modules[1].loginDomainName}" />
+    <input type="hidden" name="module-class-1" value="${realm.modules[1].className}" />
+    <input type="hidden" name="module-control-1" value="${realm.modules[1].controlFlag}" />
+    <input type="hidden" name="module-server-1" value="${realm.modules[1].serverSide}" />
+    <input type="hidden" name="module-options-1" value="${realm.modules[1].optionString}" />
+    <input type="hidden" name="module-domain-2" value="${realm.modules[2].loginDomainName}" />
+    <input type="hidden" name="module-class-2" value="${realm.modules[2].className}" />
+    <input type="hidden" name="module-control-2" value="${realm.modules[2].controlFlag}" />
+    <input type="hidden" name="module-server-2" value="${realm.modules[2].serverSide}" />
+    <input type="hidden" name="module-options-2" value="${realm.modules[2].optionString}" />
+    <input type="hidden" name="module-domain-3" value="${realm.modules[3].loginDomainName}" />
+    <input type="hidden" name="module-class-3" value="${realm.modules[3].className}" />
+    <input type="hidden" name="module-control-3" value="${realm.modules[3].controlFlag}" />
+    <input type="hidden" name="module-server-3" value="${realm.modules[3].serverSide}" />
+    <input type="hidden" name="module-options-3" value="${realm.modules[3].optionString}" />
+    <input type="hidden" name="module-domain-4" value="${realm.modules[4].loginDomainName}" />
+    <input type="hidden" name="module-class-4" value="${realm.modules[4].className}" />
+    <input type="hidden" name="module-control-4" value="${realm.modules[4].controlFlag}" />
+    <input type="hidden" name="module-server-4" value="${realm.modules[4].serverSide}" />
+    <input type="hidden" name="module-options-4" value="${realm.modules[4].optionString}" />
+    <table border="0">
+    <!-- STATUS FIELD: Deployment Plan -->
+      <tr>
+        <th valign="top"><div align="right">Deployment Plan:</div></th>
+        <td><textarea rows="30" cols="60" readonly>${deploymentPlan}</textarea></td>
+      </tr>
+    <!-- SUBMIT BUTTON -->
+      <tr>
+        <td></td>
+        <td>
+<input type="submit" value="<c:choose><c:when test="${empty realm.objectName}">Deploy Realm</c:when><c:otherwise>Save</c:otherwise></c:choose>" />
+<input type="button" value="Edit Settings" onclick="document.<portlet:namespace/>RealmForm.mode.value='edit';document.<portlet:namespace/>RealmForm.submit();return false;" />
+        </td>
+      </tr>
+    <!-- STATUS FIELD: Command-line guidance -->
+      <tr>
+        <th valign="top"><div align="right">Deploy Command:</div></th>
+        <td>To deploy a security realm from the command line using this plan,
+          copy and paste it to a file (say, <tt>security-realm.xml</tt>) and save
+          it.  Then run a command like:<br />
+<pre>
+cd GERONIMO_HOME
+java -jar bin/deployer.jar deploy security-realm.xml
+</pre></td>
+      </tr>
+    <!-- STATUS FIELD: Embed in EAR guidance -->
+      <tr>
+        <th valign="top"><div align="right">Add to EAR:</div></th>
+        <td>Instead of deploying as a top-level security realm, you
+          can deploy this realm as part of an EAR.  To add a security
+          realm to an EAR using this plan, create a
+          <tt>META-INF/geronimo-application.xml</tt> file in your EAR
+          that has the <tt>dependency</tt> elements (if any) and
+          <tt>gbean</tt> elements from the plan above.  It should look
+          something like this:
+<pre>
+&lt;application
+   xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.0"
+   configId="MyApplication"&gt;
+
+  &lt;gbean name="${realm.name}"
+    class="org.apache.geronimo.security.realm.GenericSecurityRealm"&gt;
+        ...
+  &lt;/gbean&gt;
+&lt;/application&gt;
+</pre></td>
+      </tr>
+    </table>
+</form>
+<!--   END OF FORM TO COLLECT DATA FOR THIS PAGE   -->
+
+<p><a href="<portlet:actionURL portletMode="view">
+              <portlet:param name="mode" value="list" />
+            </portlet:actionURL>">Cancel</a></p>

Propchange: geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/showPlan.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/testLogin.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/testLogin.jsp?rev=345728&view=auto
==============================================================================
--- geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/testLogin.jsp (added)
+++ geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/testLogin.jsp Sun Nov 20 00:40:24 2005
@@ -0,0 +1,81 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<portlet:defineObjects/>
+
+<p><b>Create Security Realm</b> -- Step 4: Test Login</p>
+
+<p>From here you can enter a username and password for the main login module in the realm, and
+see if the login is successful and which Principals are generated for the user.  This is
+menat to be an indication of whether the settings for the main login module are correct.  It
+does not invoke advanced features such as auditing or lockout.</p>
+
+<!--   FORM TO COLLECT DATA FOR THIS PAGE   -->
+<form name="<portlet:namespace/>RealmForm" action="<portlet:actionURL/>">
+    <input type="hidden" name="mode" value="process-test" />
+    <input type="hidden" name="name" value="${realm.name}" />
+    <input type="hidden" name="realmType" value="${realm.realmType}" />
+    <input type="hidden" name="jar" value="${realm.jar}" />
+  <c:forEach var="option" items="${realm.options}">
+    <input type="hidden" name="option-${option.key}" value="${option.value}" />
+  </c:forEach>
+    <input type="hidden" name="auditPath" value="${realm.auditPath}" />
+    <input type="hidden" name="lockoutCount" value="${realm.lockoutCount}" />
+    <input type="hidden" name="lockoutWindow" value="${realm.lockoutWindow}" />
+    <input type="hidden" name="lockoutDuration" value="${realm.lockoutDuration}" />
+    <input type="hidden" name="storePassword" value="${realm.storePassword}" />
+    <input type="hidden" name="objectName" value="${realm.objectName}" />
+    <input type="hidden" name="module-domain-0" value="${realm.modules[0].loginDomainName}" />
+    <input type="hidden" name="module-class-0" value="${realm.modules[0].className}" />
+    <input type="hidden" name="module-control-0" value="${realm.modules[0].controlFlag}" />
+    <input type="hidden" name="module-server-0" value="${realm.modules[0].serverSide}" />
+    <input type="hidden" name="module-options-0" value="${realm.modules[0].optionString}" />
+    <input type="hidden" name="module-domain-1" value="${realm.modules[1].loginDomainName}" />
+    <input type="hidden" name="module-class-1" value="${realm.modules[1].className}" />
+    <input type="hidden" name="module-control-1" value="${realm.modules[1].controlFlag}" />
+    <input type="hidden" name="module-server-1" value="${realm.modules[1].serverSide}" />
+    <input type="hidden" name="module-options-1" value="${realm.modules[1].optionString}" />
+    <input type="hidden" name="module-domain-2" value="${realm.modules[2].loginDomainName}" />
+    <input type="hidden" name="module-class-2" value="${realm.modules[2].className}" />
+    <input type="hidden" name="module-control-2" value="${realm.modules[2].controlFlag}" />
+    <input type="hidden" name="module-server-2" value="${realm.modules[2].serverSide}" />
+    <input type="hidden" name="module-options-2" value="${realm.modules[2].optionString}" />
+    <input type="hidden" name="module-domain-3" value="${realm.modules[3].loginDomainName}" />
+    <input type="hidden" name="module-class-3" value="${realm.modules[3].className}" />
+    <input type="hidden" name="module-control-3" value="${realm.modules[3].controlFlag}" />
+    <input type="hidden" name="module-server-3" value="${realm.modules[3].serverSide}" />
+    <input type="hidden" name="module-options-3" value="${realm.modules[3].optionString}" />
+    <input type="hidden" name="module-domain-4" value="${realm.modules[4].loginDomainName}" />
+    <input type="hidden" name="module-class-4" value="${realm.modules[4].className}" />
+    <input type="hidden" name="module-control-4" value="${realm.modules[4].controlFlag}" />
+    <input type="hidden" name="module-server-4" value="${realm.modules[4].serverSide}" />
+    <input type="hidden" name="module-options-4" value="${realm.modules[4].optionString}" />
+    <table border="0">
+    <!-- ENTRY FIELD: Username -->
+      <tr>
+        <th><div align="right">Username:</div></th>
+        <td><input name="username" type="text" size="20" /></td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>The username to use to log in to the realm.</td>
+      </tr>
+    <!-- ENTRY FIELD: Password -->
+      <tr>
+        <th><div align="right">Password:</div></th>
+        <td><input name="password" type="password" size="20" /></td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>The password to use to log in to the realm.</td>
+      </tr>
+      <tr>
+        <td></td>
+        <td><input type="submit" value="Next" /></td>
+      </tr>
+    </table>
+</form>
+<!--   END OF FORM TO COLLECT DATA FOR THIS PAGE   -->
+
+<p><a href="<portlet:actionURL portletMode="view">
+              <portlet:param name="mode" value="list" />
+            </portlet:actionURL>">Cancel</a></p>

Propchange: geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/testLogin.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/testResults.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/testResults.jsp?rev=345728&view=auto
==============================================================================
--- geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/testResults.jsp (added)
+++ geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/testResults.jsp Sun Nov 20 00:40:24 2005
@@ -0,0 +1,83 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<portlet:defineObjects/>
+
+<p><b>Create Security Realm</b> -- Step 5: Login Results</p>
+
+<!--   FORM TO COLLECT DATA FOR THIS PAGE   -->
+<form name="<portlet:namespace/>RealmForm" action="<portlet:actionURL/>">
+    <input type="hidden" name="mode" value="test" />
+    <input type="hidden" name="name" value="${realm.name}" />
+    <input type="hidden" name="realmType" value="${realm.realmType}" />
+    <input type="hidden" name="jar" value="${realm.jar}" />
+  <c:forEach var="option" items="${realm.options}">
+    <input type="hidden" name="option-${option.key}" value="${option.value}" />
+  </c:forEach>
+    <input type="hidden" name="auditPath" value="${realm.auditPath}" />
+    <input type="hidden" name="lockoutCount" value="${realm.lockoutCount}" />
+    <input type="hidden" name="lockoutWindow" value="${realm.lockoutWindow}" />
+    <input type="hidden" name="lockoutDuration" value="${realm.lockoutDuration}" />
+    <input type="hidden" name="storePassword" value="${realm.storePassword}" />
+    <input type="hidden" name="objectName" value="${realm.objectName}" />
+    <input type="hidden" name="module-domain-0" value="${realm.modules[0].loginDomainName}" />
+    <input type="hidden" name="module-class-0" value="${realm.modules[0].className}" />
+    <input type="hidden" name="module-control-0" value="${realm.modules[0].controlFlag}" />
+    <input type="hidden" name="module-server-0" value="${realm.modules[0].serverSide}" />
+    <input type="hidden" name="module-options-0" value="${realm.modules[0].optionString}" />
+    <input type="hidden" name="module-domain-1" value="${realm.modules[1].loginDomainName}" />
+    <input type="hidden" name="module-class-1" value="${realm.modules[1].className}" />
+    <input type="hidden" name="module-control-1" value="${realm.modules[1].controlFlag}" />
+    <input type="hidden" name="module-server-1" value="${realm.modules[1].serverSide}" />
+    <input type="hidden" name="module-options-1" value="${realm.modules[1].optionString}" />
+    <input type="hidden" name="module-domain-2" value="${realm.modules[2].loginDomainName}" />
+    <input type="hidden" name="module-class-2" value="${realm.modules[2].className}" />
+    <input type="hidden" name="module-control-2" value="${realm.modules[2].controlFlag}" />
+    <input type="hidden" name="module-server-2" value="${realm.modules[2].serverSide}" />
+    <input type="hidden" name="module-options-2" value="${realm.modules[2].optionString}" />
+    <input type="hidden" name="module-domain-3" value="${realm.modules[3].loginDomainName}" />
+    <input type="hidden" name="module-class-3" value="${realm.modules[3].className}" />
+    <input type="hidden" name="module-control-3" value="${realm.modules[3].controlFlag}" />
+    <input type="hidden" name="module-server-3" value="${realm.modules[3].serverSide}" />
+    <input type="hidden" name="module-options-3" value="${realm.modules[3].optionString}" />
+    <input type="hidden" name="module-domain-4" value="${realm.modules[4].loginDomainName}" />
+    <input type="hidden" name="module-class-4" value="${realm.modules[4].className}" />
+    <input type="hidden" name="module-control-4" value="${realm.modules[4].controlFlag}" />
+    <input type="hidden" name="module-server-4" value="${realm.modules[4].serverSide}" />
+    <input type="hidden" name="module-options-4" value="${realm.modules[4].optionString}" />
+    <table border="0">
+    <!-- STATUS FIELD: Results -->
+      <tr>
+        <th><div align="right">Test Results:</div></th>
+        <td colspan="2">${LoginResults}</td>
+      </tr>
+    <!-- STATUS FIELD: Principals -->
+    <c:if test="${!(empty principals)}">
+      <tr>
+        <th rowspan="${fn:length(principals)}" valign="top"><div align="right">Principals:</div></th>
+      <c:forEach var="principal" items="${principals}" varStatus="status">
+      <c:if test="${!status.first}">
+      <tr>
+      </c:if>
+        <td>${principal.name}</td>
+        <td>${principal.class.name}</td>
+      </tr>
+      </c:forEach>
+    </c:if>
+    <!-- SUBMIT BUTTONS -->
+      <tr>
+        <td></td>
+        <td colspan="2">
+          <input type="submit" value="Test Again" />
+          <input type="button" value="Edit Realm" onclick="document.<portlet:namespace/>RealmForm.mode.value='configure';document.<portlet:namespace/>RealmForm.submit();return false;" />
+          <input type="button" value="Show Plan" onclick="document.<portlet:namespace/>RealmForm.mode.value='plan';document.<portlet:namespace/>RealmForm.submit();return false;" />
+          <input type="button" value="Deploy Realm" onclick="document.<portlet:namespace/>RealmForm.mode.value='save';document.<portlet:namespace/>RealmForm.submit();return false;" />
+        </td>
+      </tr>
+    </table>
+</form>
+<!--   END OF FORM TO COLLECT DATA FOR THIS PAGE   -->
+
+<p><a href="<portlet:actionURL portletMode="view">
+              <portlet:param name="mode" value="list" />
+            </portlet:actionURL>">Cancel</a></p>

Propchange: geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/testResults.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/webmanager/connector/normal.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/webmanager/connector/normal.jsp?rev=345728&r1=345727&r2=345728&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/webmanager/connector/normal.jsp (original)
+++ geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/webmanager/connector/normal.jsp Sun Nov 20 00:40:24 2005
@@ -13,8 +13,6 @@
           <c:when test="${empty(container.connectors)}"><p>There are no connectors defined for ${container.name}</p></c:when>
           <c:otherwise>
 <table width="100%">
-  <tr>
-    <td style="padding: 0 20px">
           <tr>
             <td class="DarkBackground">Name</td>
             <td class="DarkBackground" align="center">Protocol</td>
@@ -60,7 +58,7 @@
                  <portlet:param name="managerObjectName" value="${container.managerObjectName}" />
                  <portlet:param name="containerObjectName" value="${container.containerObjectName}" />
                </portlet:actionURL>">delete</a>
-             </td>
+            </td>
             <td>${info.description}</td>
           </tr>
 </c:forEach>

Modified: geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/web.xml?rev=345728&r1=345727&r2=345728&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/web.xml (original)
+++ geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/web.xml Sun Nov 20 00:40:24 2005
@@ -251,6 +251,20 @@
     </servlet>
     <servlet>
         <description>Automated generated Portlet Wrapper</description>
+        <display-name>Pluto Wrapper for Security Realm Wizard Portlet</display-name>
+        <servlet-name>RealmWizard</servlet-name>
+        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+        <init-param>
+            <param-name>portlet-class</param-name>
+            <param-value>org.apache.geronimo.console.securitymanager.realm.SecurityRealmPortlet</param-value>
+        </init-param>
+        <init-param>
+            <param-name>portlet-guid</param-name>
+            <param-value>console-standard.RealmWizard</param-value>
+        </init-param>
+    </servlet>
+    <servlet>
+        <description>Automated generated Portlet Wrapper</description>
         <display-name>Pluto Wrapper for JMS ConnectionFactory Portlet</display-name>
         <servlet-name>JMSConnections</servlet-name>
         <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
@@ -749,6 +763,10 @@
     <servlet-mapping>
         <servlet-name>DBWizard</servlet-name>
         <url-pattern>/DBWizard/*</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>RealmWizard</servlet-name>
+        <url-pattern>/RealmWizard/*</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
         <servlet-name>SEUsers</servlet-name>

Modified: geronimo/trunk/modules/assembly/src/plan/webconsole-jetty-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/webconsole-jetty-plan.xml?rev=345728&r1=345727&r2=345728&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/webconsole-jetty-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/webconsole-jetty-plan.xml Sun Nov 20 00:40:24 2005
@@ -1 +1,133 @@
-<?xml version="1.0" encoding="UTF-8"?>
<application
    xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.0"
    configId="org/apache/geronimo/Console/Jetty"
    parentId="org/apache/geronimo/Server">
    
    <import>
      <uri>org/apache/geronimo/Jetty</uri>
    </import>

    <!-- these dependencies must be kept here so that their classes are loaded in the "EARs" classloader. -->
    <dependency>
        <groupId>portlet-api</groupId>
        <artifactId>portlet-api</artifactId>
        <version>${portlet_api_version}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.pluto</groupId>
        <artifactId>pluto</artifactId>
        <version>${pluto_version}</version>
    </dependency>
    <dependency>
        <groupId>geronimo</groupId>
        <artifactId>geronimo-console-core</artifactId>
        <version>${geronimo_version}</version>
    </dependency>
    <!-- The following are for configuration and deployment via JSR-88 -->
    <dependen
 cy>
        <groupId>geronimo</groupId>
        <artifactId>geronimo-test-ddbean</artifactId>
        <version>${geronimo_version}</version>
    </dependency>
    <dependency>
        <groupId>geronimo</groupId>
        <artifactId>geronimo-deploy-jsr88</artifactId>
        <version>${geronimo_version}</version>
    </dependency>
    <dependency>
        <groupId>geronimo</groupId>
        <artifactId>geronimo-deploy-config</artifactId>
        <version>${geronimo_version}</version>
    </dependency>
    <dependency>
        <groupId>geronimo</groupId>
        <artifactId>geronimo-service-builder</artifactId>
        <version>${geronimo_version}</version>
    </dependency>
    <dependency>
        <groupId>geronimo</groupId>
        <artifactId>geronimo-connector-builder</artifactId>
        <version>${geronimo_version}</version>
    </dependency>
    <dependency>
        <groupId>geronimo</groupId>
        <artifactId>geronimo-j2ee-schema</artifactId>
        <version>${ger
 onimo_version}</version>
    </dependency>
    <dependency>
        <groupId>xmlbeans</groupId>
        <artifactId>xbean</artifactId>
        <version>${xmlbeans_version}</version>
    </dependency>
    <dependency>
        <groupId>stax</groupId>
        <artifactId>stax-api</artifactId>
        <version>${stax_api_version}</version>
    </dependency>

    <!-- Keystore dependency -->
    <dependency>
        <groupId>geronimo</groupId>
        <artifactId>geronimo-util</artifactId>
        <version>${geronimo_version}</version>
    </dependency>
    <module>
        <web>geronimo-console-framework-${pom.currentVersion}.war</web>
        <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0" configId="console">
            <context-root>/console</context-root>
            <context-priority-classloader>false</context-priority-classloader>
            <security-realm-name>geronimo-properties-realm</security-realm-name>
            <security>
                <d
 efault-principal>
                    <principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="system"/>
                </default-principal>
                <role-mappings>
                    <role role-name="admin">
                        <principal class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal" name="admin" designated-run-as="true"/>
                    </role>
                </role-mappings>
            </security>
        </web-app>
    </module>

    <module>
        <web>geronimo-console-standard-${pom.currentVersion}.war</web>
        <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0" configId="console-standard">
            <context-root>/console-standard</context-root>
            <context-priority-classloader>false</context-priority-classloader>
        </web-app>
    </module>

    <!-- Console specific server info -->
    <gbean name="PropertiesLoginManager" class="org.apache.g
 eronimo.console.core.security.PropertiesLoginModuleManager">
        <reference name="ServerInfo">
            <gbean-name>geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/System,J2EEServer=geronimo,j2eeType=GBean,name=ServerInfo</gbean-name>
        </reference>
        <reference name="LoginModule">
            <!--            <gbean-name>geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Server,J2EEServer=geronimo,j2eeType=LoginModule,name=properties-login</gbean-name>-->
            <gbean-name>geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Security,J2EEServer=geronimo,j2eeType=LoginModule,name=properties-login</gbean-name>
        </reference>
    </gbean>

    <!-- Keystore configuration -->
    <gbean gbeanName="geronimo.security:type=KeyStore" class="org.apache.geronimo.console.core.keystore.KeyStoreGBean">
        <attribute name="keyStoreLocation">var/security/ssl-keystore-1</attribute>
        <attribute nam
 e="keyStoreType">jks</attribute>
        <attribute name="keyStoreProvider">SUN</attribute>
        <attribute name="keyStorePassword">password</attribute>
        <reference name="serverInfo">
            <application>null</application>
            <moduleType>J2EEModule</moduleType>
            <module>org/apache/geronimo/System</module>
            <type>GBean</type>
            <name>ServerInfo</name>
        </reference>
    </gbean>

</application>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<application
+    xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.0"
+    configId="org/apache/geronimo/Console/Jetty"
+    parentId="org/apache/geronimo/Server">
+    
+    <import>
+      <uri>org/apache/geronimo/Jetty</uri>
+    </import>
+
+    <!-- these dependencies must be kept here so that their classes are loaded in the "EARs" classloader. -->
+    <dependency>
+        <groupId>portlet-api</groupId>
+        <artifactId>portlet-api</artifactId>
+        <version>${portlet_api_version}</version>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.pluto</groupId>
+        <artifactId>pluto</artifactId>
+        <version>${pluto_version}</version>
+    </dependency>
+    <dependency>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-console-core</artifactId>
+        <version>${geronimo_version}</version>
+    </dependency>
+    <!-- The following are for configuration and deployment via JSR-88 -->
+    <dependency>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-test-ddbean</artifactId>
+        <version>${geronimo_version}</version>
+    </dependency>
+    <dependency>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-deploy-jsr88</artifactId>
+        <version>${geronimo_version}</version>
+    </dependency>
+    <dependency>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-deploy-config</artifactId>
+        <version>${geronimo_version}</version>
+    </dependency>
+    <dependency>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-service-builder</artifactId>
+        <version>${geronimo_version}</version>
+    </dependency>
+    <dependency>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-connector-builder</artifactId>
+        <version>${geronimo_version}</version>
+    </dependency>
+    <dependency>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-security-builder</artifactId>
+        <version>${geronimo_version}</version>
+    </dependency>
+    <dependency>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-j2ee-schema</artifactId>
+        <version>${geronimo_version}</version>
+    </dependency>
+    <dependency>
+        <groupId>xmlbeans</groupId>
+        <artifactId>xbean</artifactId>
+        <version>${xmlbeans_version}</version>
+    </dependency>
+    <dependency>
+        <groupId>stax</groupId>
+        <artifactId>stax-api</artifactId>
+        <version>${stax_api_version}</version>
+    </dependency>
+
+    <!-- Keystore dependency -->
+    <dependency>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-util</artifactId>
+        <version>${geronimo_version}</version>
+    </dependency>
+    <module>
+        <web>geronimo-console-framework-${pom.currentVersion}.war</web>
+        <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0" configId="console">
+            <context-root>/console</context-root>
+            <context-priority-classloader>false</context-priority-classloader>
+            <security-realm-name>geronimo-properties-realm</security-realm-name>
+            <security>
+                <default-principal>
+                    <principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="system"/>
+                </default-principal>
+                <role-mappings>
+                    <role role-name="admin">
+                        <principal class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal" name="admin" designated-run-as="true"/>
+                    </role>
+                </role-mappings>
+            </security>
+        </web-app>
+    </module>
+
+    <module>
+        <web>geronimo-console-standard-${pom.currentVersion}.war</web>
+        <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0" configId="console-standard">
+            <context-root>/console-standard</context-root>
+            <context-priority-classloader>false</context-priority-classloader>
+        </web-app>
+    </module>
+
+    <!-- Console specific server info -->
+    <gbean name="PropertiesLoginManager" class="org.apache.geronimo.console.core.security.PropertiesLoginModuleManager">
+        <reference name="ServerInfo">
+            <gbean-name>geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/System,J2EEServer=geronimo,j2eeType=GBean,name=ServerInfo</gbean-name>
+        </reference>
+        <reference name="LoginModule">
+            <!--            <gbean-name>geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Server,J2EEServer=geronimo,j2eeType=LoginModule,name=properties-login</gbean-name>-->
+            <gbean-name>geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Security,J2EEServer=geronimo,j2eeType=LoginModule,name=properties-login</gbean-name>
+        </reference>
+    </gbean>
+
+    <!-- Keystore configuration -->
+    <gbean gbeanName="geronimo.security:type=KeyStore" class="org.apache.geronimo.console.core.keystore.KeyStoreGBean">
+        <attribute name="keyStoreLocation">var/security/ssl-keystore-1</attribute>
+        <attribute name="keyStoreType">jks</attribute>
+        <attribute name="keyStoreProvider">SUN</attribute>
+        <attribute name="keyStorePassword">password</attribute>
+        <reference name="serverInfo">
+            <application>null</application>
+            <moduleType>J2EEModule</moduleType>
+            <module>org/apache/geronimo/System</module>
+            <type>GBean</type>
+            <name>ServerInfo</name>
+        </reference>
+    </gbean>
+
+</application>



Mime
View raw message