admin@glassfish.java.net

Diff: Security Plugin JS Fixes

From: Jason Lee <jasondlee_at_sun.com>
Date: Sat, 23 Aug 2008 15:21:11 -0500

This diff shows the changes I made for issues 5528, 5575, and 5576.



Property changes on: src/main/resources/realms
___________________________________________________________________
Added: svn:ignore
    + .realmjs.inc.swp


Index: src/main/resources/realms/manageUserNew.jsf
===================================================================
--- src/main/resources/realms/manageUserNew.jsf (revision 22036)
+++ src/main/resources/realms/manageUserNew.jsf (working copy)
@@ -45,6 +45,7 @@
      <sun:html id="html2">
          <sun:head id="propertyhead"
title="$resource{i18n.manageUsers.NewPageTitle}">
              <sun:script url="/resource/js/restart.js" />
+ <sun:script url="/resource/js/adminjsf.js" />
          </sun:head>
          <sun:body id="body3" onLoad="javascript:
synchronizeRestartRequired('#{requestScope.restartRequired}',
'#{sessionScope.restartRequired}')">
              <sun:form id="propertyForm">
@@ -109,7 +110,6 @@
                      </sun:propertySheet>
                          <sun:hidden id="helpKey"
value="$resource{help.manageUserNew}" />
              </sun:form>
- </sun:body>


  <f:verbatim>
@@ -127,5 +127,6 @@
  </script>
  </f:verbatim>

+ </sun:body>
      </sun:html>
  </sun:page>
Index: src/main/resources/realms/realm.inc
===================================================================
--- src/main/resources/realms/realm.inc (revision 22036)
+++ src/main/resources/realms/realm.inc (working copy)
@@ -56,14 +56,13 @@
  </event>

  <sun:html id="html">
- <sun:head id="propertyhead" title="#{pageTitle}">
+ <sun:head id="propertyhead" title="#{pageTitle}"
parseOnLoad="false">
          <sun:script url="/resource/js/selectElements.js" />
          <sun:script url="/resource/js/adminjsf.js" />
      </sun:head>

      <sun:body id="body"
- onLoad="initClassname('#{myOption}');
-
synchronizeRestartRequired('#{requestScope.restartRequired}',
'#{sessionScope.restartRequired}')">
+ onLoad="initClassname('#{myOption}');
synchronizeRestartRequired('#{requestScope.restartRequired}',
'#{sessionScope.restartRequired}')">
          <sun:form id="form1">

  #include "/shared/treeBreadcrumbs.inc"
@@ -100,9 +99,6 @@
      "<br/><br/>

      </sun:body>
-
  #include "/security/realms/realmjs.inc"
  #include "/shared/changeButtonsJS.inc"
-
-</sun:html>
-
+</sun:html>
\ No newline at end of file


Jason Lee - x31197
Senior Java Developer, Sun Microsystems
GlassFish Admin Console Team
Email: jasondlee_at_sun.com