geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shiv...@apache.org
Subject svn commit: r585559 - in /geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main: java/org/apache/geronimo/console/configcreator/ webapp/WEB-INF/view/configcreator/
Date Wed, 17 Oct 2007 16:29:50 GMT
Author: shivahr
Date: Wed Oct 17 09:29:48 2007
New Revision: 585559

URL: http://svn.apache.org/viewvc?rev=585559&view=rev
Log:
GERONIMO-3428 Updating user documentation in "Create Plan" portlet's jsp files
+ Minor bug fixes
+ Beautify 'Resolve References' page.

Modified:
    geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/AbstractHandler.java
    geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/ReferencesHandler.java
    geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/dependencies.jsp
    geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/displayPlan.jsp
    geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/environment.jsp
    geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/references.jsp
    geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/security.jsp

Modified: geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/AbstractHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/AbstractHandler.java?rev=585559&r1=585558&r2=585559&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/AbstractHandler.java
(original)
+++ geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/AbstractHandler.java
Wed Oct 17 09:29:48 2007
@@ -239,6 +239,9 @@
                 String prefix1 = "security.roleMappings" + "." + index + ".";
                 GerRoleType role = roles[index];
 
+                for (int i = role.sizeOfPrincipalArray() - 1; i >= 0; i--) {
+                    role.removePrincipal(i);
+                }
                 int lastIndex = Integer.parseInt(request.getParameter(prefix1 + "principal.lastIndex"));
                 for (int i = 0; i < lastIndex; i++) {
                     String prefix2 = prefix1 + "principal" + "." + i + ".";
@@ -250,6 +253,9 @@
                     principal.setClass1(request.getParameter(prefix2 + "class"));
                 }
 
+                for (int i = role.sizeOfLoginDomainPrincipalArray() - 1; i >= 0; i--)
{
+                    role.removeLoginDomainPrincipal(i);
+                }
                 lastIndex = Integer.parseInt(request.getParameter(prefix1 + "loginDomainPrincipal.lastIndex"));
                 for (int i = 0; i < lastIndex; i++) {
                     String prefix2 = prefix1 + "loginDomainPrincipal" + "." + i + ".";
@@ -262,6 +268,9 @@
                     loginDomainPrincipal.setDomainName(request.getParameter(prefix2 + "domainName"));
                 }
 
+                for (int i = role.sizeOfRealmPrincipalArray() - 1; i >= 0; i--) {
+                    role.removeRealmPrincipal(i);
+                }
                 lastIndex = Integer.parseInt(request.getParameter(prefix1 + "realmPrincipal.lastIndex"));
                 for (int i = 0; i < lastIndex; i++) {
                     String prefix2 = prefix1 + "realmPrincipal" + "." + i + ".";
@@ -275,6 +284,9 @@
                     realmPrincipal.setRealmName(request.getParameter(prefix2 + "realmName"));
                 }
 
+                for (int i = role.sizeOfDistinguishedNameArray() - 1; i >= 0; i--) {
+                    role.removeDistinguishedName(i);
+                }
                 lastIndex = Integer.parseInt(request.getParameter(prefix1 + "distinguishedName.lastIndex"));
                 for (int i = 0; i < lastIndex; i++) {
                     String prefix2 = prefix1 + "distinguishedName" + "." + i + ".";
@@ -287,6 +299,7 @@
 
                 String prefix2 = prefix1 + "runAsSubject" + ".";
                 if (map.containsKey(prefix2 + "realm")) {
+                    role.unsetRunAsSubject();
                     GerSubjectInfoType runAsSubject = role.addNewRunAsSubject();
                     runAsSubject.setRealm(request.getParameter(prefix2 + "realm"));
                     runAsSubject.setId(request.getParameter(prefix2 + "id"));
@@ -294,6 +307,7 @@
             }
             String prefix = "security" + "." + "defaultSubject" + ".";
             if (map.containsKey(prefix + "realm")) {
+                security.unsetDefaultSubject();
                 GerSubjectInfoType runAsSubject = security.addNewDefaultSubject();
                 runAsSubject.setRealm(request.getParameter(prefix + "realm"));
                 runAsSubject.setId(request.getParameter(prefix + "id"));

Modified: geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/ReferencesHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/ReferencesHandler.java?rev=585559&r1=585558&r2=585559&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/ReferencesHandler.java
(original)
+++ geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/ReferencesHandler.java
Wed Oct 17 09:29:48 2007
@@ -67,6 +67,7 @@
                 && processRefs(data.getJdbcPoolRefs(), dependenciesSet)
                 && processRefs(data.getJmsConnectionFactoryRefs(), dependenciesSet)
                 && processRefs(data.getJmsDestinationRefs(), dependenciesSet)) {
+            data.getDependencies().clear();
             data.getDependencies().addAll(dependenciesSet);
             if (data.getSecurity() != null) {
                 return SECURITY_MODE + "-before";

Modified: geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/dependencies.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/dependencies.jsp?rev=585559&r1=585558&r2=585559&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/dependencies.jsp
(original)
+++ geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/dependencies.jsp
Wed Oct 17 09:29:48 2007
@@ -21,9 +21,10 @@
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
 <portlet:defineObjects />
 
-<p><b>WAR - Dependencies</b> -- Select the dependencies your WAR has on
other Archives</p>
+<p><b>WAR - Dependencies</b> -- Select the dependencies your Web Application
has on other Modules</p>
 
-<p>Description goes here ...</p>
+<p>All the modules available in the server repository are shown below. Select the ones
on which your 
+web-application is dependent. Default selections should be sufficient in most scenarios.</p>
 
 <!--   FORM TO COLLECT DATA FOR THIS PAGE   -->
 <form name="<portlet:namespace/>DependenciesForm" action="<portlet:actionURL/>"
method="POST">

Modified: geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/displayPlan.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/displayPlan.jsp?rev=585559&r1=585558&r2=585559&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/displayPlan.jsp
(original)
+++ geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/displayPlan.jsp
Wed Oct 17 09:29:48 2007
@@ -21,14 +21,22 @@
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
 <portlet:defineObjects />
 
-<p><b>Created Plan</b> -- Show Deployment Plan</p>
+<p><b>Created Plan</b> -- Copy/Edit Deployment Plan</p>
 
-<p>Description goes here ...</p>
+<p>The generated Geronimo Deployment Plan is shown below in an edit box. If you would
like to make any changes 
+(default should be enough in most scenarios), do it now and then press "Deploy WAR" to deploy
the Web application.</p>
 
 <!--   FORM TO COLLECT DATA FOR THIS PAGE   -->
 <form name="<portlet:namespace/>DisplayPlan" action="<portlet:actionURL/>"
method="POST">
     <input type="hidden" name="mode" value="displayPlan-after" />
     <table border="0">
+    <!-- SUBMIT BUTTON -->
+      <tr>
+        <td></td>
+        <td>
+            <input type="submit" value="Deploy WAR" />
+        </td>
+      </tr>
     <!-- STATUS FIELD: Deployment Plan -->
       <tr>
         <th valign="top" style="min-width: 140px"><div align="right">Deployment
Plan:</div></th>

Modified: geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/environment.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/environment.jsp?rev=585559&r1=585558&r2=585559&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/environment.jsp
(original)
+++ geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/environment.jsp
Wed Oct 17 09:29:48 2007
@@ -30,6 +30,12 @@
 <input type="hidden" name="mode" value="environment-after" />
 
 <table border="0">
+  <!-- SUBMIT BUTTON -->
+  <tr>
+    <td></td>
+    <td><input type="submit" value="Next" /></td>
+  </tr>
+
   <!-- ENTRY FIELD: Context Root -->
   <tr>
     <th><div align="right">Web Context Root:</div></th>

Modified: geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/references.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/references.jsp?rev=585559&r1=585558&r2=585559&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/references.jsp
(original)
+++ geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/references.jsp
Wed Oct 17 09:29:48 2007
@@ -22,9 +22,13 @@
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
 <portlet:defineObjects />
 
-<p><b>WAR - References</b> -- Resolve following objects referred in the
WAR</p>
+<p><b>WAR - References</b> -- Resolve EJB, EJB Local, JDBC Connection Pool,
JMS Connection Factory and 
+JMS Destination references</p>
 
-<p>Description goes here ...</p>
+<p>Map the references declared in your Web application to specific items available
in the server environment. 
+References declared in your web-app (ex. EJB, EJB Local, JDBC Connection Pool, JMS Connection
Factory and 
+JMS Destination references) are shown below to the left and the resources (available in the
server environment) 
+to which they can be linked are shown to the right.</p>
 
 <!-- References not resolved -->
 <c:if test="${data.referenceNotResolved}">
@@ -35,135 +39,210 @@
 <form name="<portlet:namespace/>ReferencesForm" action="<portlet:actionURL/>"
method="POST">
 <input type="hidden" name="mode" value="references-after" />
 
-<table border="0">
-  <!-- ENTRY FIELD: EJB References -->
-  <c:if test="${!empty(data.ejbRefs)}">
+<!-- ENTRY FIELD: EJB References -->
+<c:if test="${!empty(data.ejbRefs)}">
+  <p><b>EJB References:</b></p>
+  <table border="0" width="100%">
     <tr>
-      <th colspan="2" align="left">
-      <div>EJB References</div>
-      </th>
+      <th class="DarkBackground" align="center">EJB Ref</th>
+      <th class="DarkBackground" align="center">EJBs Deployed</th>
     </tr>
+    <c:set var="backgroundClass" value='MediumBackground'/>
     <c:forEach var="refData" items="${data.ejbRefs}" varStatus="status">
+      <c:choose>
+        <c:when test="${backgroundClass == 'MediumBackground'}" >
+          <c:set var="backgroundClass" value='LightBackground'/>
+        </c:when>
+        <c:otherwise>
+          <c:set var="backgroundClass" value='MediumBackground'/>
+        </c:otherwise>
+      </c:choose>
       <input type="hidden" name="ejbRef.${status.index}.refName" value="${refData.refName}"
/>
       <tr>
-        <td>
-        <div align="right">${refData.refName}</div>
+        <td class="${backgroundClass}">
+          <div align="right">${refData.refName}</div>
+        </td>
+        <td class="${backgroundClass}">
+          <select name="ejbRef.${status.index}.refLink">
+            <c:forEach var="ejb" items="${deployedEjbs}">
+              <option value="${ejb.patternName}">${ejb.displayName}</option>
+            </c:forEach>
+          </select>
         </td>
-        <td><select name="ejbRef.${status.index}.refLink">
-          <c:forEach var="ejb" items="${deployedEjbs}">
-            <option value="${ejb.patternName}">${ejb.displayName}</option>
-          </c:forEach>
-        </select></td>
       </tr>
     </c:forEach>
-  </c:if>
+  </table>
+</c:if>
 
-  <!-- ENTRY FIELD: EJB Local References -->
-  <c:if test="${!empty(data.ejbLocalRefs)}">
+<!-- ENTRY FIELD: EJB Local References -->
+<c:if test="${!empty(data.ejbLocalRefs)}">
+  <p><b>EJB Local References:</b></p>
+  <table border="0" width="100%">
     <tr>
-      <th colspan="2" align="left">
-      <div>EJB Local References</div>
-      </th>
+      <th class="DarkBackground" align="center">EJB Local Ref</th>
+      <th class="DarkBackground" align="center">EJBs Deployed</th>
     </tr>
+    <c:set var="backgroundClass" value='MediumBackground'/>
     <c:forEach var="refData" items="${data.ejbLocalRefs}" varStatus="status">
+      <c:choose>
+        <c:when test="${backgroundClass == 'MediumBackground'}" >
+          <c:set var="backgroundClass" value='LightBackground'/>
+        </c:when>
+        <c:otherwise>
+          <c:set var="backgroundClass" value='MediumBackground'/>
+        </c:otherwise>
+      </c:choose>
       <input type="hidden" name="ejbLocalRef.${status.index}.refName" value="${refData.refName}"
/>
       <tr>
-        <td>
-        <div align="right">${refData.refName}</div>
+        <td class="${backgroundClass}">
+          <div align="right">${refData.refName}</div>
+        </td>
+        <td class="${backgroundClass}">
+          <select name="ejbLocalRef.${status.index}.refLink">
+            <c:forEach var="ejb" items="${deployedEjbs}">
+              <option value="${ejb.patternName}">${ejb.displayName}</option>
+            </c:forEach>
+          </select>
         </td>
-        <td><select name="ejbLocalRef.${status.index}.refLink">
-          <c:forEach var="ejb" items="${deployedEjbs}">
-            <option value="${ejb.patternName}">${ejb.displayName}</option>
-          </c:forEach>
-        </select></td>
       </tr>
     </c:forEach>
-  </c:if>
+  </table>
+</c:if>
 
-  <!-- ENTRY FIELD: JDBC Connection Pool References -->
-  <c:if test="${!empty(data.jdbcPoolRefs)}">
+<!-- ENTRY FIELD: JDBC Connection Pool References -->
+<c:if test="${!empty(data.jdbcPoolRefs)}">
+  <p><b>JDBC Pool References:</b></p>
+  <table border="0" width="100%">
     <tr>
-      <th colspan="2" align="left">
-      <div>JDBC Pool References</div>
-      </th>
+      <th class="DarkBackground" align="center">JDBC Ref</th>
+      <th class="DarkBackground" align="center">JDBC Pools</th>
     </tr>
+    <c:set var="backgroundClass" value='MediumBackground'/>
     <c:forEach var="refData" items="${data.jdbcPoolRefs}" varStatus="status">
+      <c:choose>
+        <c:when test="${backgroundClass == 'MediumBackground'}" >
+          <c:set var="backgroundClass" value='LightBackground'/>
+        </c:when>
+        <c:otherwise>
+          <c:set var="backgroundClass" value='MediumBackground'/>
+        </c:otherwise>
+      </c:choose>
       <input type="hidden" name="jdbcPoolRef.${status.index}.refName" value="${refData.refName}"
/>
       <tr>
-        <td>
-        <div align="right">${refData.refName}</div>
+        <td class="${backgroundClass}">
+          <div align="right">${refData.refName}</div>
         </td>
-        <td><select name="jdbcPoolRef.${status.index}.refLink">
+        <td class="${backgroundClass}">
+          <select name="jdbcPoolRef.${status.index}.refLink">
           <c:forEach var="jdbcPool" items="${deployedJdbcConnectionPools}">
             <option value="${jdbcPool.patternName}">${jdbcPool.displayName}</option>
           </c:forEach>
-        </select></td>
+          </select>
+        </td>
       </tr>
     </c:forEach>
-  </c:if>
+  </table>
+</c:if>
 
-  <!-- ENTRY FIELD: JMS Connection Factory References -->
-  <c:if test="${!empty(data.jmsConnectionFactoryRefs)}">
+<!-- ENTRY FIELD: JMS Connection Factory References -->
+<c:if test="${!empty(data.jmsConnectionFactoryRefs)}">
+  <p><b>JMS Connection Factory References:</b></p>
+  <table border="0" width="100%">
     <tr>
-      <th colspan="2" align="left">
-      <div>JMS Connection Factory References</div>
-      </th>
+      <th class="DarkBackground" align="center">JMS Ref</th>
+      <th class="DarkBackground" align="center">JMS Factories</th>
     </tr>
+    <c:set var="backgroundClass" value='MediumBackground'/>
     <c:forEach var="refData" items="${data.jmsConnectionFactoryRefs}" varStatus="status">
+      <c:choose>
+        <c:when test="${backgroundClass == 'MediumBackground'}" >
+          <c:set var="backgroundClass" value='LightBackground'/>
+        </c:when>
+        <c:otherwise>
+          <c:set var="backgroundClass" value='MediumBackground'/>
+        </c:otherwise>
+      </c:choose>
       <input type="hidden" name="jmsConnectionFactoryRef.${status.index}.refName" value="${refData.refName}"
/>
       <tr>
-        <td>
-        <div align="right">${refData.refName}</div>
+        <td class="${backgroundClass}">
+          <div align="right">${refData.refName}</div>
+        </td>
+        <td class="${backgroundClass}">
+          <select name="jmsConnectionFactoryRef.${status.index}.refLink">
+            <c:forEach var="jmsFactory" items="${deployedJmsConnectionFactories}">
+              <option value="${jmsFactory.patternName}">${jmsFactory.displayName}</option>
+            </c:forEach>
+          </select>
         </td>
-        <td><select name="jmsConnectionFactoryRef.${status.index}.refLink">
-          <c:forEach var="jmsFactory" items="${deployedJmsConnectionFactories}">
-            <option value="${jmsFactory.patternName}">${jmsFactory.displayName}</option>
-          </c:forEach>
-        </select></td>
       </tr>
     </c:forEach>
-  </c:if>
+  </table>
+</c:if>
 
-  <!-- ENTRY FIELD: JMS Destination References -->
-  <c:if test="${!empty(data.jmsDestinationRefs) || !empty(data.messageDestinations)}">
+<!-- ENTRY FIELD: JMS Destination References -->
+<c:if test="${!empty(data.jmsDestinationRefs) || !empty(data.messageDestinations)}">
+  <p><b>JMS Destination References:</b></p>
+  <table border="0" width="100%">
     <tr>
-      <th colspan="2" align="left">
-      <div>JMS Destination References</div>
-      </th>
+      <th class="DarkBackground" align="center">JMS Ref</th>
+      <th class="DarkBackground" align="center">JMS Destinations</th>
     </tr>
+    <c:set var="backgroundClass" value='MediumBackground'/>
     <c:forEach var="refData" items="${data.jmsDestinationRefs}" varStatus="status">
+      <c:choose>
+        <c:when test="${backgroundClass == 'MediumBackground'}" >
+          <c:set var="backgroundClass" value='LightBackground'/>
+        </c:when>
+        <c:otherwise>
+          <c:set var="backgroundClass" value='MediumBackground'/>
+        </c:otherwise>
+      </c:choose>
       <input type="hidden" name="jmsDestinationRef.${status.index}.refName" value="${refData.refName}"
/>
       <tr>
-        <td>
-        <div align="right">${refData.refName}</div>
+        <td class="${backgroundClass}">
+          <div align="right">${refData.refName}</div>
+        </td>
+        <td class="${backgroundClass}">
+          <select name="jmsDestinationRef.${status.index}.refLink">
+            <c:forEach var="jmsDestination" items="${deployedJmsDestinations}">
+              <option value="${jmsDestination.patternName}" 
+                <c:if test="${fn:startsWith(jmsDestination.displayName, refData.refLink)}">
selected="selected"</c:if>
+              >${jmsDestination.displayName}</option>
+            </c:forEach>
+          </select>
         </td>
-        <td><select name="jmsDestinationRef.${status.index}.refLink">
-          <c:forEach var="jmsDestination" items="${deployedJmsDestinations}">
-            <option value="${jmsDestination.patternName}" 
-              <c:if test="${fn:startsWith(jmsDestination.displayName, refData.refLink)}">
selected="selected"</c:if>
-            >${jmsDestination.displayName}</option>
-          </c:forEach>
-        </select></td>
       </tr>
     </c:forEach>
     <c:forEach var="refData" items="${data.messageDestinations}" varStatus="status">
+      <c:choose>
+        <c:when test="${backgroundClass == 'MediumBackground'}" >
+          <c:set var="backgroundClass" value='LightBackground'/>
+        </c:when>
+        <c:otherwise>
+          <c:set var="backgroundClass" value='MediumBackground'/>
+        </c:otherwise>
+      </c:choose>
       <input type="hidden" name="messageDestination.${status.index}.refName" value="${refData.refName}"
/>
       <tr>
-        <td>
-        <div align="right">${refData.refName}</div>
+        <td class="${backgroundClass}">
+          <div align="right">${refData.refName}</div>
+        </td>
+        <td class="${backgroundClass}">
+          <select name="messageDestination.${status.index}.refLink">
+            <c:forEach var="jmsDestination" items="${deployedJmsDestinations}">
+              <option value="${jmsDestination.patternName}" 
+                <c:if test="${fn:startsWith(jmsDestination.displayName, refData.refLink)}">
selected="selected"</c:if>
+              >${jmsDestination.displayName}</option>
+            </c:forEach>
+          </select>
         </td>
-        <td><select name="messageDestination.${status.index}.refLink">
-          <c:forEach var="jmsDestination" items="${deployedJmsDestinations}">
-            <option value="${jmsDestination.patternName}" 
-              <c:if test="${fn:startsWith(jmsDestination.displayName, refData.refLink)}">
selected="selected"</c:if>
-            >${jmsDestination.displayName}</option>
-          </c:forEach>
-        </select></td>
       </tr>
     </c:forEach>
-  </c:if>
+  </table>
+</c:if>
 
-  <!-- SUBMIT BUTTON -->
+<!-- SUBMIT BUTTON -->
+<table border="0">
   <tr>
     <th>
     <div align="right"></div>

Modified: geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/security.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/security.jsp?rev=585559&r1=585558&r2=585559&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/security.jsp
(original)
+++ geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/security.jsp
Wed Oct 17 09:29:48 2007
@@ -231,7 +231,9 @@
 
 <p><b>WAR - Security</b> -- Specify Security Realm and Role Mappings</p>
 
-<p>Description goes here ...</p>
+<p>Map security roles declared in web.xml deployment descriptor to specific users or
groups in the security 
+realms configured in Geronimo. You can also specify a default user or group to be used when
the end user has 
+not yet logged in.</p>
 
 <!--   FORM TO COLLECT DATA FOR THIS PAGE   -->
 <form name="<portlet:namespace/>SecurityForm" action="<portlet:actionURL/>"
method="POST">
@@ -253,15 +255,16 @@
   </tr>
   <tr>
     <td></td>
-    <td>Enter description about Security Realm Name here</td>
+    <td>Select the Geronimo security realm that will authenticate user logins.</td>
   </tr>
+</table>
 
-  <!-- Security Role Mappings -->
-  <tr>
-    <th colspan="2" align="left">
-    <div>Security Role Mappings</div>
-    </th>
-  </tr>
+<!-- Security Role Mappings -->
+<p><b>Security Role Mappings:</b><br><br>
+Security roles declared in web.xml are shown below to the left. Map them to specific principals
present 
+in Geronimo's security realms by adding Principals, Login Domain Principals, Realm Principals
and/or 
+Distinguished Names.</p>
+<table border="0">
   <c:set var="backgroundClass" value='MediumBackground'/>
   <c:forEach var="role" items="${data.security.roleMappings.roleArray}" varStatus="status1">
     <c:choose>



Mime
View raw message