Return-Path: 
 <scm-return-9411-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 19490 invoked from network); 12 Dec 2005 06:12:16 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 12 Dec 2005 06:12:16 -0000
Received: (qmail 94793 invoked by uid 500); 12 Dec 2005 06:12:16 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 94769 invoked by uid 500); 12 Dec 2005 06:12:16 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 94756 invoked by uid 99); 12 Dec 2005 06:12:15 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 11 Dec 2005 22:12:15 -0800
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Sun, 11 Dec 2005 22:12:14 -0800
Received: (qmail 19395 invoked by uid 65534); 12 Dec 2005 06:11:54 -0000
Message-ID: <20051212061154.19393.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r356170 - in
 /geronimo/trunk/applications/console-standard/src:
 java/org/apache/geronimo/console/securitymanager/realm/
 webapp/WEB-INF/view/realmwizard/
Date: Mon, 12 Dec 2005 06:11:52 -0000
To: scm@geronimo.apache.org
From: ammulder@apache.org
X-Mailer: svnmailer-1.0.5
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: ammulder
Date: Sun Dec 11 22:11:47 2005
New Revision: 356170

URL: http://svn.apache.org/viewcvs?rev=356170&view=rev
Log:
Merge wrap-principals portlet change from branch

Modified:
    geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java
    geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/advanced.jsp
    geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/configure.jsp
    geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/edit.jsp
    geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/selectType.jsp
    geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/showPlan.jsp
    geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/testLogin.jsp
    geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/testResults.jsp

Modified: geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java?rev=356170&r1=356169&r2=356170&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java (original)
+++ geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java Sun Dec 11 22:11:47 2005
@@ -355,6 +355,7 @@
             module.setServerSide(details.isServerSide());
             module.setLoginDomainName(details.getLoginDomainName());
             module.setLoginModuleClass(details.getClassName());
+            module.setWrapPrincipals(details.isWrapPrincipals());
             for (Iterator it = details.getOptions().entrySet().iterator(); it.hasNext();) {
                 Map.Entry entry = (Map.Entry) it.next();
                 GerOptionType option = module.addNewOption();
@@ -474,6 +475,7 @@
                 LoginModuleSettings module = (LoginModuleSettings) PortletManager.getManagedBean(request, node.getLoginModuleName());
                 module.setOptions(details.getOptions());
                 module.setServerSide(details.isServerSide());
+                module.setWrapPrincipals(details.isWrapPrincipals());
                 module.setLoginModuleClass(details.getClassName());
             }
         }
@@ -777,9 +779,12 @@
                 String flag = request.getParameter("module-control-"+index);
                 if(flag == null || flag.equals("")) continue;
                 details.setControlFlag(flag);
+                String wrap = request.getParameter("module-wrap-"+index);
+                if(wrap == null || wrap.equals("")) continue;
+                details.setWrapPrincipals(Boolean.valueOf(wrap).booleanValue());
                 String server = request.getParameter("module-server-"+index);
                 if(server == null || server.equals("")) continue;
-                details.setServerSide(new Boolean(server).booleanValue());
+                details.setServerSide(Boolean.valueOf(server).booleanValue());
                 String options = request.getParameter("module-options-"+index);
                 if(options != null && !options.equals("")) {
                     BufferedReader in = new BufferedReader(new StringReader(options));
@@ -841,7 +846,8 @@
                     if(module.getLoginDomainName() != null) response.setRenderParameter("module-domain-"+i, module.getLoginDomainName());
                     if(module.getClassName() != null) response.setRenderParameter("module-class-"+i, module.getClassName());
                     if(module.getControlFlag() != null) response.setRenderParameter("module-control-"+i, module.getControlFlag());
-                    response.setRenderParameter("module-server-"+i, module.isServerSide() ? "true" : "false");
+                    response.setRenderParameter("module-wrap-"+i, Boolean.toString(module.isWrapPrincipals()));
+                    response.setRenderParameter("module-server-"+i, Boolean.toString(module.isServerSide()));
                     if(module.getOptions().size() > 0) response.setRenderParameter("module-options-"+i, module.getOptionString());
                 }
             }
@@ -909,6 +915,7 @@
         private String className;
         private String controlFlag;
         private boolean serverSide = true;
+        private boolean wrapPrincipals = false;
         private Properties options = new Properties();
 
         public String getLoginDomainName() {
@@ -949,6 +956,14 @@
 
         public void setOptions(Properties options) {
             this.options = options;
+        }
+
+        public boolean isWrapPrincipals() {
+            return wrapPrincipals;
+        }
+
+        public void setWrapPrincipals(boolean wrapPrincipals) {
+            this.wrapPrincipals = wrapPrincipals;
         }
 
         public String getOptionString() {

Modified: 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=356170&r1=356169&r2=356170&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/advanced.jsp (original)
+++ geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/advanced.jsp Sun Dec 11 22:11:47 2005
@@ -20,26 +20,31 @@
     <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-wrap-0" value="${realm.modules[0].wrapPrincipals}" />
     <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-wrap-1" value="${realm.modules[1].wrapPrincipals}" />
     <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-wrap-2" value="${realm.modules[2].wrapPrincipals}" />
     <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-wrap-3" value="${realm.modules[3].wrapPrincipals}" />
     <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-wrap-4" value="${realm.modules[4].wrapPrincipals}" />
     <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">

Modified: 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=356170&r1=356169&r2=356170&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/configure.jsp (original)
+++ geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/configure.jsp Sun Dec 11 22:11:47 2005
@@ -24,26 +24,31 @@
     <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-wrap-0" value="${realm.modules[0].wrapPrincipals}" />
     <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-wrap-1" value="${realm.modules[1].wrapPrincipals}" />
     <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-wrap-2" value="${realm.modules[2].wrapPrincipals}" />
     <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-wrap-3" value="${realm.modules[3].wrapPrincipals}" />
     <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-wrap-4" value="${realm.modules[4].wrapPrincipals}" />
     <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">

Modified: 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=356170&r1=356169&r2=356170&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/edit.jsp (original)
+++ geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/edit.jsp Sun Dec 11 22:11:47 2005
@@ -120,6 +120,23 @@
           of the client OS.</td>
       </tr>
       <tr>
+        <th><div align="right">Support Advanced Mapping:</div></th>
+        <td>
+          <select name="module-wrap-${status.index}">
+            <option value="true"<c:if test="${module.wrapPrincipals}"> selected</c:if>>Yes</option>
+            <option value="false"<c:if test="${!module.wrapPrincipals}"> selected</c:if>>No</option>
+          </select>
+        </td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>Normally Geronimo can't distinguish between two different principals that have the same name
+          and same principal class but were produced by two different login modules.  If this option is
+          enabled, Geronimo will "wrap" principals to track which login module and realm each
+          principal came from.  This lets you use the "realm-principal" and "login-domain-principal"
+          elements in your security mapping in Geronimo deployment plans.</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>

Modified: 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=356170&r1=356169&r2=356170&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/selectType.jsp (original)
+++ geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/selectType.jsp Sun Dec 11 22:11:47 2005
@@ -20,26 +20,31 @@
     <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-wrap-0" value="${realm.modules[0].wrapPrincipals}" />
     <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-wrap-1" value="${realm.modules[1].wrapPrincipals}" />
     <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-wrap-2" value="${realm.modules[2].wrapPrincipals}" />
     <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-wrap-3" value="${realm.modules[3].wrapPrincipals}" />
     <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-wrap-4" value="${realm.modules[4].wrapPrincipals}" />
     <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">

Modified: 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=356170&r1=356169&r2=356170&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/showPlan.jsp (original)
+++ geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/showPlan.jsp Sun Dec 11 22:11:47 2005
@@ -22,26 +22,31 @@
     <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-wrap-0" value="${realm.modules[0].wrapPrincipals}" />
     <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-wrap-1" value="${realm.modules[1].wrapPrincipals}" />
     <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-wrap-2" value="${realm.modules[2].wrapPrincipals}" />
     <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-wrap-3" value="${realm.modules[3].wrapPrincipals}" />
     <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-wrap-4" value="${realm.modules[4].wrapPrincipals}" />
     <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">

Modified: 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=356170&r1=356169&r2=356170&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/testLogin.jsp (original)
+++ geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/testLogin.jsp Sun Dec 11 22:11:47 2005
@@ -27,26 +27,31 @@
     <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-wrap-0" value="${realm.modules[0].wrapPrincipals}" />
     <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-wrap-1" value="${realm.modules[1].wrapPrincipals}" />
     <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-wrap-2" value="${realm.modules[2].wrapPrincipals}" />
     <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-wrap-3" value="${realm.modules[3].wrapPrincipals}" />
     <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-wrap-4" value="${realm.modules[4].wrapPrincipals}" />
     <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">

Modified: 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=356170&r1=356169&r2=356170&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/testResults.jsp (original)
+++ geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/testResults.jsp Sun Dec 11 22:11:47 2005
@@ -23,26 +23,31 @@
     <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-wrap-0" value="${realm.modules[0].wrapPrincipals}" />
     <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-wrap-1" value="${realm.modules[1].wrapPrincipals}" />
     <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-wrap-2" value="${realm.modules[2].wrapPrincipals}" />
     <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-wrap-3" value="${realm.modules[3].wrapPrincipals}" />
     <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-wrap-4" value="${realm.modules[4].wrapPrincipals}" />
     <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">