glassfish
  1. glassfish
  2. GLASSFISH-16572

The following page should display the name of the resources to be consistent with other page.

    Details

    • Type: Bug Bug
    • Status: Closed
    • Priority: Major Major
    • Resolution: Fixed
    • Affects Version/s: 3.1
    • Fix Version/s: 3.1.1_dev, 3.1.1, 4.0
    • Component/s: admin_gui
    • Labels:
      None

      Description

      • Target page of JDBC resource
      • Manage Target page of JDBC resource
      • Additional Properties of JDBC Connector Pool
      • Target page of Connector Resource
      • Additional properties of Connector Resource
      • Security Maps tab of Connector Resource
      • Target page of Admin Object Resource

        Activity

        Hide
        Anissa Lam added a comment -

        Will be nice to get this in for 3.1.1. But i add the tag 3_1-next which means not committed.

        Show
        Anissa Lam added a comment - Will be nice to get this in for 3.1.1. But i add the tag 3_1-next which means not committed.
        Hide
        sumasri added a comment -

        Why fix this issue in 3.1.1?
        o Resource name and pool name is not present in some page which is inconsistent with other pages.

        Which is the targeted build of 3.1.1 for this fix?
        o MS4

        Do regression tests exist for this issue?
        o No. Manual testing should be sufficient

        Which tests should QA (re)run to verify the fix did not destabilize GlassFish?
        o verify the bug reported is fixed

        Diffs:

        Index: common/src/main/resources/resourceNode/resourceNameSection.inc
        ===================================================================
        — common/src/main/resources/resourceNode/resourceNameSection.inc (revision 0)
        +++ common/src/main/resources/resourceNode/resourceNameSection.inc (revision 0)
        @@ -0,0 +1,51 @@
        +<!--
        +
        + DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
        +
        + Copyright (c) 2011 Oracle and/or its affiliates. All rights reserved.
        +
        + The contents of this file are subject to the terms of either the GNU
        + General Public License Version 2 only ("GPL") or the Common Development
        + and Distribution License("CDDL") (collectively, the "License"). You
        + may not use this file except in compliance with the License. You can
        + obtain a copy of the License at
        + https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
        + or packager/legal/LICENSE.txt. See the License for the specific
        + language governing permissions and limitations under the License.
        +
        + When distributing the software, include this License Header Notice in each
        + file and include the License file at packager/legal/LICENSE.txt.
        +
        + GPL Classpath Exception:
        + Oracle designates this particular file as subject to the "Classpath"
        + exception as provided by Oracle in the GPL Version 2 section of the License
        + file that accompanied this code.
        +
        + Modifications:
        + If applicable, add the following below the License Header, with the fields
        + enclosed by brackets [] replaced by your own identifying information:
        + "Portions Copyright [year] [name of copyright owner]"
        +
        + Contributor(s):
        + If you wish your version of this file to be governed by only the CDDL or
        + only the GPL Version 2, indicate your decision by adding "[Contributor]
        + elects to include this software in this distribution under the [CDDL or GPL
        + Version 2] license." If you don't indicate a single choice of license, a
        + recipient has the option to distribute your version of this file under
        + either the CDDL, the GPL Version 2 or to extend the choice of license to
        + its licensees as provided above. However, if you add GPL Version 2 code
        + and therefore, elected the GPL Version 2 license, then the option applies
        + only if the new code is made subject to such option by the copyright
        + holder.
        +
        +-->
        +
        + <sun:propertySheet id="resourceNameSheet">
        + <!-- Resource Name Field section -->
        + <sun:propertySheetSection id="propertySectionTextField">
        + <sun:property id="resourceNameProp" labelAlign="left" noWrap="#

        {true}" overlapLabel="#{false}" label="$resource{i18n.common.jndiName}" >
        + <sun:staticText id="resourceName"text="#{pageSession.resourceName}" />
        + </sun:property>
        + </sun:propertySheetSection>
        + </sun:propertySheet>
        + "<br/>
        Index: common/src/main/resources/resourceNode/poolNameSection.inc
        ===================================================================
        — common/src/main/resources/resourceNode/poolNameSection.inc (revision 0)
        +++ common/src/main/resources/resourceNode/poolNameSection.inc (revision 0)
        @@ -0,0 +1,51 @@
        +<!--
        +
        + DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
        +
        + Copyright (c) 2011 Oracle and/or its affiliates. All rights reserved.
        +
        + The contents of this file are subject to the terms of either the GNU
        + General Public License Version 2 only ("GPL") or the Common Development
        + and Distribution License("CDDL") (collectively, the "License"). You
        + may not use this file except in compliance with the License. You can
        + obtain a copy of the License at
        + https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
        + or packager/legal/LICENSE.txt. See the License for the specific
        + language governing permissions and limitations under the License.
        +
        + When distributing the software, include this License Header Notice in each
        + file and include the License file at packager/legal/LICENSE.txt.
        +
        + GPL Classpath Exception:
        + Oracle designates this particular file as subject to the "Classpath"
        + exception as provided by Oracle in the GPL Version 2 section of the License
        + file that accompanied this code.
        +
        + Modifications:
        + If applicable, add the following below the License Header, with the fields
        + enclosed by brackets [] replaced by your own identifying information:
        + "Portions Copyright [year] [name of copyright owner]"
        +
        + Contributor(s):
        + If you wish your version of this file to be governed by only the CDDL or
        + only the GPL Version 2, indicate your decision by adding "[Contributor]
        + elects to include this software in this distribution under the [CDDL or GPL
        + Version 2] license." If you don't indicate a single choice of license, a
        + recipient has the option to distribute your version of this file under
        + either the CDDL, the GPL Version 2 or to extend the choice of license to
        + its licensees as provided above. However, if you add GPL Version 2 code
        + and therefore, elected the GPL Version 2 license, then the option applies
        + only if the new code is made subject to such option by the copyright
        + holder.
        +
        +-->
        +
        + <sun:propertySheet id="resourceNameSheet">
        + <!-- Connection Pool Name Field section -->
        + <sun:propertySheetSection id="propertySectionTextField">
        + <sun:property id="resourceNameProp" labelAlign="left" noWrap="#{true}

        " overlapLabel="#

        {false}" label="$resource{i18n.common.poolName}" >
        + <sun:staticText id="resourceName"text="#{pageSession.Name}" />
        + </sun:property>
        + </sun:propertySheetSection>
        + </sun:propertySheet>
        + "<br/>
        Index: common/src/main/resources/resourceNode/resourceEditTargets.jsf
        ===================================================================
        — common/src/main/resources/resourceNode/resourceEditTargets.jsf (revision 47043)
        +++ common/src/main/resources/resourceNode/resourceEditTargets.jsf (working copy)
        @@ -54,6 +54,7 @@
        <event>
        <!beforeCreate
        getRequestValue(key="name" value="#{pageSession.Name}");
        + setPageSessionAttribute(key="resourceName" value="#{pageSession.Name}");
        urlencode(value="#{pageSession.Name}" encoding="UTF-8" result="#{pageSession.encodedName}");
        //For resourceEditTabs.inc
        setSessionAttribute(key="resEditTabs" value="targetTab");
        @@ -68,7 +69,7 @@
        #include "/common/shared/alertMsg.inc"
        <sun:title id="propertyContentPage" title="$resource{i18n.resourceTargetListing.PageTitle}" helpText="$resource{i18n.resourceTargetListing.PageTitleHelp}"/>
        "<br />
        -
        +#include "/common/resourceNode/resourceNameSection.inc"
        <sun:table id="targetTable" title="$resource{i18n.common.TargetTableTitle}" sortPanelToggleButton="#{false}

        "
        deselectMultipleButton="$boolean

        {true}

        "
        deselectMultipleButtonOnClick="setTimeout('admingui.table.changeThreeTableButtons(\\\\\'#

        {pageSession.topActionGroup}

        \\\\\', \\\\\'#

        {pageSession.tableId}

        \\\\\');', 0)"
        Index: common/src/main/resources/resourceNode/resourceManageTargets.jsf
        ===================================================================
        — common/src/main/resources/resourceNode/resourceManageTargets.jsf (revision 47043)
        +++ common/src/main/resources/resourceNode/resourceManageTargets.jsf (working copy)
        @@ -53,6 +53,7 @@
        <!beforeCreate
        getRequestValue(key="resName" value="#

        {pageSession.resName}");
        getRequestValue(key="generalPage" value="#{pageSession.generalPage}");
        + setPageSessionAttribute(key="resourceName" value="#{pageSession.resName}

        ");
        urlencode(value="#

        {pageSession.resName}

        " encoding="UTF-8" result="#

        {pageSession.encodedResName}

        ");
        #include "/common/shared/targetsList.inc"
        setPageSessionAttribute(key="resTargets" value={});
        @@ -136,6 +137,7 @@
        </sun:panelGroup>
        </facet>
        </sun:title>
        +#include "/common/resourceNode/resourceNameSection.inc"
        <event>
        <!afterCreate
        getUIComponent(clientId="#

        {formId}

        " component=>$attribute

        {component}

        )
        Index: jca/src/main/resources/connectorSecurityMaps.jsf
        ===================================================================
        — jca/src/main/resources/connectorSecurityMaps.jsf (revision 47043)
        +++ jca/src/main/resources/connectorSecurityMaps.jsf (working copy)
        @@ -72,7 +72,7 @@
        <sun:title id="propertyContentPage" title="$resource

        {i18njca.connectorSecurityMaps.pageTitle}

        "
        helpText="$resource

        {i18njca.connectorSecurityMaps.pageTitleHelp}

        " />
        "<br /> <br />
        -
        +#include "/common/resourceNode/poolNameSection.inc"
        #include "/jca/securityMapsTable.inc"

        <sun:hidden id="helpKey" value="$resource

        {help_jca.connectorSecurityMaps}

        " />
        Index: jca/src/main/resources/connectorConnectionPoolProperty.jsf
        ===================================================================
        — jca/src/main/resources/connectorConnectionPoolProperty.jsf (revision 47043)
        +++ jca/src/main/resources/connectorConnectionPoolProperty.jsf (working copy)
        @@ -106,6 +106,7 @@
        </facet>
        </sun:title>
        "<br>
        +#include "/common/resourceNode/poolNameSection.inc"
        #include "/common/shared/propertyDescTable.inc"

        <sun:hidden id="helpKey" value="$resource

        {help_jca.connectorConnectionPoolProperty}

        " />
        Index: jdbc/src/main/resources/jdbcConnectionPoolProperty.jsf
        ===================================================================
        — jdbc/src/main/resources/jdbcConnectionPoolProperty.jsf (revision 47043)
        +++ jdbc/src/main/resources/jdbcConnectionPoolProperty.jsf (working copy)
        @@ -104,6 +104,7 @@

        </sun:title>
        "<br>
        +#include "/common/resourceNode/poolNameSection.inc"
        #include "/common/shared/propertyDescTable.inc"
        <sun:hidden id="helpKey" value="$resource

        {help_jdbc.jdbcConnectionPoolProperty}

        " />
        </sun:form>

        Show
        sumasri added a comment - Why fix this issue in 3.1.1? o Resource name and pool name is not present in some page which is inconsistent with other pages. Which is the targeted build of 3.1.1 for this fix? o MS4 Do regression tests exist for this issue? o No. Manual testing should be sufficient Which tests should QA (re)run to verify the fix did not destabilize GlassFish? o verify the bug reported is fixed Diffs: Index: common/src/main/resources/resourceNode/resourceNameSection.inc =================================================================== — common/src/main/resources/resourceNode/resourceNameSection.inc (revision 0) +++ common/src/main/resources/resourceNode/resourceNameSection.inc (revision 0) @@ -0,0 +1,51 @@ +<!-- + + DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + + Copyright (c) 2011 Oracle and/or its affiliates. All rights reserved. + + The contents of this file are subject to the terms of either the GNU + General Public License Version 2 only ("GPL") or the Common Development + and Distribution License("CDDL") (collectively, the "License"). You + may not use this file except in compliance with the License. You can + obtain a copy of the License at + https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html + or packager/legal/LICENSE.txt. See the License for the specific + language governing permissions and limitations under the License. + + When distributing the software, include this License Header Notice in each + file and include the License file at packager/legal/LICENSE.txt. + + GPL Classpath Exception: + Oracle designates this particular file as subject to the "Classpath" + exception as provided by Oracle in the GPL Version 2 section of the License + file that accompanied this code. + + Modifications: + If applicable, add the following below the License Header, with the fields + enclosed by brackets [] replaced by your own identifying information: + "Portions Copyright [year] [name of copyright owner] " + + Contributor(s): + If you wish your version of this file to be governed by only the CDDL or + only the GPL Version 2, indicate your decision by adding " [Contributor] + elects to include this software in this distribution under the [CDDL or GPL + Version 2] license." If you don't indicate a single choice of license, a + recipient has the option to distribute your version of this file under + either the CDDL, the GPL Version 2 or to extend the choice of license to + its licensees as provided above. However, if you add GPL Version 2 code + and therefore, elected the GPL Version 2 license, then the option applies + only if the new code is made subject to such option by the copyright + holder. + +--> + + <sun:propertySheet id="resourceNameSheet"> + <!-- Resource Name Field section --> + <sun:propertySheetSection id="propertySectionTextField"> + <sun:property id="resourceNameProp" labelAlign="left" noWrap="# {true}" overlapLabel="#{false}" label="$resource{i18n.common.jndiName}" > + <sun:staticText id="resourceName"text="#{pageSession.resourceName}" /> + </sun:property> + </sun:propertySheetSection> + </sun:propertySheet> + "<br/> Index: common/src/main/resources/resourceNode/poolNameSection.inc =================================================================== — common/src/main/resources/resourceNode/poolNameSection.inc (revision 0) +++ common/src/main/resources/resourceNode/poolNameSection.inc (revision 0) @@ -0,0 +1,51 @@ +<!-- + + DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + + Copyright (c) 2011 Oracle and/or its affiliates. All rights reserved. + + The contents of this file are subject to the terms of either the GNU + General Public License Version 2 only ("GPL") or the Common Development + and Distribution License("CDDL") (collectively, the "License"). You + may not use this file except in compliance with the License. You can + obtain a copy of the License at + https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html + or packager/legal/LICENSE.txt. See the License for the specific + language governing permissions and limitations under the License. + + When distributing the software, include this License Header Notice in each + file and include the License file at packager/legal/LICENSE.txt. + + GPL Classpath Exception: + Oracle designates this particular file as subject to the "Classpath" + exception as provided by Oracle in the GPL Version 2 section of the License + file that accompanied this code. + + Modifications: + If applicable, add the following below the License Header, with the fields + enclosed by brackets [] replaced by your own identifying information: + "Portions Copyright [year] [name of copyright owner] " + + Contributor(s): + If you wish your version of this file to be governed by only the CDDL or + only the GPL Version 2, indicate your decision by adding " [Contributor] + elects to include this software in this distribution under the [CDDL or GPL + Version 2] license." If you don't indicate a single choice of license, a + recipient has the option to distribute your version of this file under + either the CDDL, the GPL Version 2 or to extend the choice of license to + its licensees as provided above. However, if you add GPL Version 2 code + and therefore, elected the GPL Version 2 license, then the option applies + only if the new code is made subject to such option by the copyright + holder. + +--> + + <sun:propertySheet id="resourceNameSheet"> + <!-- Connection Pool Name Field section --> + <sun:propertySheetSection id="propertySectionTextField"> + <sun:property id="resourceNameProp" labelAlign="left" noWrap="#{true} " overlapLabel="# {false}" label="$resource{i18n.common.poolName}" > + <sun:staticText id="resourceName"text="#{pageSession.Name}" /> + </sun:property> + </sun:propertySheetSection> + </sun:propertySheet> + "<br/> Index: common/src/main/resources/resourceNode/resourceEditTargets.jsf =================================================================== — common/src/main/resources/resourceNode/resourceEditTargets.jsf (revision 47043) +++ common/src/main/resources/resourceNode/resourceEditTargets.jsf (working copy) @@ -54,6 +54,7 @@ <event> <!beforeCreate getRequestValue(key="name" value="#{pageSession.Name}"); + setPageSessionAttribute(key="resourceName" value="#{pageSession.Name}"); urlencode(value="#{pageSession.Name}" encoding="UTF-8" result="#{pageSession.encodedName}"); //For resourceEditTabs.inc setSessionAttribute(key="resEditTabs" value="targetTab"); @@ -68,7 +69,7 @@ #include "/common/shared/alertMsg.inc" <sun:title id="propertyContentPage" title="$resource{i18n.resourceTargetListing.PageTitle}" helpText="$resource{i18n.resourceTargetListing.PageTitleHelp}"/> "<br /> - +#include "/common/resourceNode/resourceNameSection.inc" <sun:table id="targetTable" title="$resource{i18n.common.TargetTableTitle}" sortPanelToggleButton="#{false} " deselectMultipleButton="$boolean {true} " deselectMultipleButtonOnClick="setTimeout('admingui.table.changeThreeTableButtons(\\\\\'# {pageSession.topActionGroup} \\\\\', \\\\\'# {pageSession.tableId} \\\\\');', 0)" Index: common/src/main/resources/resourceNode/resourceManageTargets.jsf =================================================================== — common/src/main/resources/resourceNode/resourceManageTargets.jsf (revision 47043) +++ common/src/main/resources/resourceNode/resourceManageTargets.jsf (working copy) @@ -53,6 +53,7 @@ <!beforeCreate getRequestValue(key="resName" value="# {pageSession.resName}"); getRequestValue(key="generalPage" value="#{pageSession.generalPage}"); + setPageSessionAttribute(key="resourceName" value="#{pageSession.resName} "); urlencode(value="# {pageSession.resName} " encoding="UTF-8" result="# {pageSession.encodedResName} "); #include "/common/shared/targetsList.inc" setPageSessionAttribute(key="resTargets" value={}); @@ -136,6 +137,7 @@ </sun:panelGroup> </facet> </sun:title> +#include "/common/resourceNode/resourceNameSection.inc" <event> <!afterCreate getUIComponent(clientId="# {formId} " component=>$attribute {component} ) Index: jca/src/main/resources/connectorSecurityMaps.jsf =================================================================== — jca/src/main/resources/connectorSecurityMaps.jsf (revision 47043) +++ jca/src/main/resources/connectorSecurityMaps.jsf (working copy) @@ -72,7 +72,7 @@ <sun:title id="propertyContentPage" title="$resource {i18njca.connectorSecurityMaps.pageTitle} " helpText="$resource {i18njca.connectorSecurityMaps.pageTitleHelp} " /> "<br /> <br /> - +#include "/common/resourceNode/poolNameSection.inc" #include "/jca/securityMapsTable.inc" <sun:hidden id="helpKey" value="$resource {help_jca.connectorSecurityMaps} " /> Index: jca/src/main/resources/connectorConnectionPoolProperty.jsf =================================================================== — jca/src/main/resources/connectorConnectionPoolProperty.jsf (revision 47043) +++ jca/src/main/resources/connectorConnectionPoolProperty.jsf (working copy) @@ -106,6 +106,7 @@ </facet> </sun:title> "<br> +#include "/common/resourceNode/poolNameSection.inc" #include "/common/shared/propertyDescTable.inc" <sun:hidden id="helpKey" value="$resource {help_jca.connectorConnectionPoolProperty} " /> Index: jdbc/src/main/resources/jdbcConnectionPoolProperty.jsf =================================================================== — jdbc/src/main/resources/jdbcConnectionPoolProperty.jsf (revision 47043) +++ jdbc/src/main/resources/jdbcConnectionPoolProperty.jsf (working copy) @@ -104,6 +104,7 @@ </sun:title> "<br> +#include "/common/resourceNode/poolNameSection.inc" #include "/common/shared/propertyDescTable.inc" <sun:hidden id="helpKey" value="$resource {help_jdbc.jdbcConnectionPoolProperty} " /> </sun:form>
        Hide
        scatari added a comment -

        Approved for 3.1.1.

        Show
        scatari added a comment - Approved for 3.1.1.
        Hide
        Anissa Lam added a comment -

        Change looks good. Please check into both trunk & 3.1.1 branch.

        Show
        Anissa Lam added a comment - Change looks good. Please check into both trunk & 3.1.1 branch.
        Hide
        sumasri added a comment -

        Added resource name in all resources targets page and manage targets pages.
        Added pool name in jdbc connection pool property page, connector connection pool property and security maps pages.

        Checked in to both trunk and branch 3.1.1

        Show
        sumasri added a comment - Added resource name in all resources targets page and manage targets pages. Added pool name in jdbc connection pool property page, connector connection pool property and security maps pages. Checked in to both trunk and branch 3.1.1
        Hide
        shaline added a comment -

        Verified on 3.1.1 promoted b08.

        Show
        shaline added a comment - Verified on 3.1.1 promoted b08.
        Hide
        Anissa Lam added a comment -

        re-open issue to mark the fixed version.

        Show
        Anissa Lam added a comment - re-open issue to mark the fixed version.
        Hide
        Anissa Lam added a comment -

        mark fixed for 4.0 (trunk) and 3.1.1

        Show
        Anissa Lam added a comment - mark fixed for 4.0 (trunk) and 3.1.1
        Hide
        Anissa Lam added a comment -

        close issue again.

        Show
        Anissa Lam added a comment - close issue again.

          People

          • Assignee:
            sumasri
            Reporter:
            Anissa Lam
          • Votes:
            0 Vote for this issue
            Watchers:
            0 Start watching this issue

            Dates

            • Created:
              Updated:
              Resolved: