# This patch file was generated by NetBeans IDE # Following Index: paths are relative to: /Users/anilam/Awork/V3/v3/admingui # This patch can be applied using context Tools: Patch action on respective folder. # It uses platform neutral UTF-8 encoding and \n newlines. # Above lines and this line are ignored by the patching process. Index: jca/src/main/java/org/glassfish/jca/admingui/handlers/ConnectorsHandlers.java --- jca/src/main/java/org/glassfish/jca/admingui/handlers/ConnectorsHandlers.java Base (BASE) +++ jca/src/main/java/org/glassfish/jca/admingui/handlers/ConnectorsHandlers.java Locally Modified (Based On LOCAL) @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-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 @@ -194,7 +194,7 @@ if (resAdapter != null) { resAdapter = resAdapter.trim(); } - if (resAdapter == null || resAdapter.equals("")) { + if (GuiUtil.isEmpty(resAdapter) && Boolean.parseBoolean((String)GuiUtil.getSessionValue("_jms_exist"))){ resAdapter = "jmsra"; } Index: jca/src/main/resources/adminObjectAttr.inc --- jca/src/main/resources/adminObjectAttr.inc Base (BASE) +++ jca/src/main/resources/adminObjectAttr.inc Locally Modified (Based On LOCAL) @@ -2,7 +2,7 @@ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 1997-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 @@ -69,8 +69,14 @@ $page{resAdaptorPropId}); Index: jca/src/main/resources/adminObjectNew.jsf --- jca/src/main/resources/adminObjectNew.jsf Base (BASE) +++ jca/src/main/resources/adminObjectNew.jsf Locally Modified (Based On LOCAL) @@ -2,7 +2,7 @@ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 1997-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 @@ -81,6 +81,7 @@ currentMap="#{pageSession.valueMap}" valueMap=>$pageSession{valueMap}); //To get the resource types + if ("#{pageSession.valueMap.resAdapter}"){ createMap(result="#{pageSession.attrsMap}"); mapPut(map="#{pageSession.attrsMap}" key="rarName" value="#{pageSession.valueMap.resAdapter}"); gf.restRequest(endpoint="#{sessionScope.REST_URL}/resources/get-admin-object-interface-names" @@ -90,6 +91,10 @@ setAttribute(key="resourceTypes" value="#{requestScope.result.data.extraProperties.adminObjectInterfaceNames}"); setAttribute(key="zero" value="$int{0}"); setAttribute(key="size" value="#{requestScope.resourceTypes.size()}"); + + if ("!#{requestScope.resourceTypes}"){ + setAttribute(key="size" value="$int{0}"); + } if (#{requestScope.size} > #{requestScope.zero}) { if("!(#{pageSession.valueMap['resType']})") { mapPut(map="#{pageSession.valueMap}" key="resType" value="#{requestScope.resourceTypes[0]}"); @@ -123,7 +128,7 @@ listAdd(list="#{pageSession.tableList}" value="#{requestScope.oneRowMap}"); } } - + } /> Index: jca/src/main/resources/connectorConnectionPoolEdit.jsf --- jca/src/main/resources/connectorConnectionPoolEdit.jsf Base (BASE) +++ jca/src/main/resources/connectorConnectionPoolEdit.jsf Locally Modified (Based On LOCAL) @@ -2,7 +2,7 @@ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 1997-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 @@ -102,10 +102,13 @@ gfr.getApplicationsBySnifferType(); setAttribute(key="rarList" value="#{pageSession.snifferTypeApplicationsList}"); //Add SystemConnectors + setPageSessionAttribute(key="modList" value={}); + if ("#{sessionScope._jms_exist}"){ gf.restRequest(endpoint="#{sessionScope.REST_URL}/resources/get-system-rars-allowing-pool-creation" method="GET" result="#{requestScope.result}"); setPageSessionAttribute(key="modList" value="#{requestScope.result.data.extraProperties.rarList}"); + } gf.listCombine(list="#{pageSession.modList}" list2="#{requestScope.rarList}"); filterOutRarExtension(inList="#{pageSession.modList}" convertedList="#{pageSession.modList}"); /> Index: jca/src/main/resources/connectorConnectionPoolNew1.jsf --- jca/src/main/resources/connectorConnectionPoolNew1.jsf Base (BASE) +++ jca/src/main/resources/connectorConnectionPoolNew1.jsf Locally Modified (Based On LOCAL) @@ -2,7 +2,7 @@ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 1997-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 @@ -118,9 +118,12 @@ filterOutRarExtension(inList="#{requestScope.tmpList}" convertedList="#{requestScope.rarList}") //Add SystemConnectors + setAttribute(key="modList" value={}); + if ("#{sessionScope._jms_exist}"){ gf.restRequest(endpoint="#{sessionScope.REST_URL}/resources/get-system-rars-allowing-pool-creation" method="GET", result="#{requestScope.result}"); setAttribute(key="modList" value="#{requestScope.result.data.extraProperties.rarList}"); + } gf.listCombine(list="#{requestScope.modList}" list2="#{requestScope.rarList}"); addEmptyFirstElement(in="$attribute{modList}" out="#{pageSession.modules}") gf.getConnectorConnectionPoolWizard( Index: jca/src/main/resources/resourceAdapterConfigAttr.inc --- jca/src/main/resources/resourceAdapterConfigAttr.inc Base (BASE) +++ jca/src/main/resources/resourceAdapterConfigAttr.inc Locally Modified (Based On LOCAL) @@ -2,7 +2,7 @@ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - Copyright (c) 2009-2010 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2009-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 @@ -68,7 +68,9 @@ gfr.getApplicationsBySnifferType(); setPageSessionAttribute(key="connectorList" value="#{pageSession.snifferTypeApplicationsList}"); filterOutRarExtension(inList="#{pageSession.connectorList}" convertedList="#{pageSession.connectorList}"); + if (#{sessionScope._jms_exist}){ listAdd(list="#{pageSession.connectorList}" value="jmsra" index="$int{0}") + } /> Index: jms-plugin/src/main/resources/resourcesNodes.jsf --- jms-plugin/src/main/resources/resourcesNodes.jsf Base (BASE) +++ jms-plugin/src/main/resources/resourcesNodes.jsf Locally Modified (Based On LOCAL) @@ -2,7 +2,7 @@ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved. + 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 @@ -53,6 +53,7 @@ text="$resource{i18n.tree.connectionFactories}" url="#{request.contextPath}/jms/jmsConnections.jsf"> + setSessionAttribute(key="_jms_exist" value="true"); gf.restRequest(endpoint="#{sessionScope.REST_URL}/resources/connector-connection-pool.json" method="get" result="#{requestScope.resp}"); setAttribute(key="children" value="#{requestScope.resp.data.extraProperties.childResources}");