From 80289e75603e495f47f6d35633ad3608c9ee8d4c Mon Sep 17 00:00:00 2001 From: lprimak Date: Tue, 20 Jun 2017 15:08:13 -0500 Subject: [PATCH] added ORB listener lazy initialization check boxes to admin console (#1693) --- .../corba/src/main/resources/iiopListenerAttrs.inc | 9 ++++++--- .../corba/src/main/resources/iiopListenerEdit.jsf | 3 ++- .../corba/src/main/resources/iiopListenerNew.jsf | 3 ++- .../org/glassfish/corba/admingui/Strings.properties | 6 +++++- .../org/glassfish/orb/admin/config/IiopListener.java | 6 ++---- 5 files changed, 17 insertions(+), 10 deletions(-) diff --git a/appserver/admingui/corba/src/main/resources/iiopListenerAttrs.inc b/appserver/admingui/corba/src/main/resources/iiopListenerAttrs.inc index 3b22cd55656..624e21f48f4 100644 --- a/appserver/admingui/corba/src/main/resources/iiopListenerAttrs.inc +++ b/appserver/admingui/corba/src/main/resources/iiopListenerAttrs.inc @@ -38,6 +38,7 @@ only if the new code is made subject to such option by the copyright holder. + Portions Copyright [2016-2017] [Payara Foundation and/or its affiliates] --> @@ -45,7 +46,7 @@ #include "/common/shared/configNameSection.inc" - + @@ -59,11 +60,13 @@ - + + + + - diff --git a/appserver/admingui/corba/src/main/resources/iiopListenerEdit.jsf b/appserver/admingui/corba/src/main/resources/iiopListenerEdit.jsf index d5f6faf606e..1a945a87d4f 100644 --- a/appserver/admingui/corba/src/main/resources/iiopListenerEdit.jsf +++ b/appserver/admingui/corba/src/main/resources/iiopListenerEdit.jsf @@ -38,6 +38,7 @@ only if the new code is made subject to such option by the copyright holder. + Portions Copyright [2016-2017] [Payara Foundation and/or its affiliates] --> @@ -65,7 +66,7 @@ gf.restRequest(endpoint="#{pageSession.selfUrl}/property.json" method="GET" result="#{requestScope.propTable}"); setPageSessionAttribute(key="tableList" value="#{requestScope.propTable.data.extraProperties.properties}"); //set the following for including buttons.inc - setPageSessionAttribute(key="convertToFalseList" value={"securityEnabled" "enabled"}) + setPageSessionAttribute(key="convertToFalseList" value={"securityEnabled" "enabled" "lazyInit"}) setPageSessionAttribute(key="edit" value="#{true}" ) setPageSessionAttribute(key="showDefaultButton" value="#{true}" ) setPageSessionAttribute(key="showCancelButton" value="#{true}" ) diff --git a/appserver/admingui/corba/src/main/resources/iiopListenerNew.jsf b/appserver/admingui/corba/src/main/resources/iiopListenerNew.jsf index 078d57a92e4..c5b9dd14378 100644 --- a/appserver/admingui/corba/src/main/resources/iiopListenerNew.jsf +++ b/appserver/admingui/corba/src/main/resources/iiopListenerNew.jsf @@ -38,6 +38,7 @@ only if the new code is made subject to such option by the copyright holder. + Portions Copyright [2016-2017] [Payara Foundation and/or its affiliates] --> @@ -60,7 +61,7 @@ gf.getDefaultValues(endpoint="#{pageSession.selfUrl}", valueMap="#{pageSession.valueMap}"); mapPut(map="#{pageSession.valueMap}" key="target" value="#{pageSession.configName}"); //set the following for including buttons.inc - setPageSessionAttribute(key="convertToFalseList" value={"securityEnabled" "enabled"}) + setPageSessionAttribute(key="convertToFalseList" value={"securityEnabled" "enabled" "lazyInit"}) setPageSessionAttribute(key="edit" value="#{false}" ); setPageSessionAttribute(key="skipAttrsList" value={"Enabled", "Port", "Security-enabled"}); setPageSessionAttribute(key="showDefaultButton" value="#{true}" ); diff --git a/appserver/admingui/corba/src/main/resources/org/glassfish/corba/admingui/Strings.properties b/appserver/admingui/corba/src/main/resources/org/glassfish/corba/admingui/Strings.properties index 7fc38ae74d1..fa3a5bd86a0 100644 --- a/appserver/admingui/corba/src/main/resources/org/glassfish/corba/admingui/Strings.properties +++ b/appserver/admingui/corba/src/main/resources/org/glassfish/corba/admingui/Strings.properties @@ -37,7 +37,9 @@ # only if the new code is made subject to such option by the copyright # holder. # -# Portions Copyright [2016] [Payara Foundation] +# Portions Copyright [2016-2017] [Payara Foundation and/or its affiliates] +# +# ## All the msg.JS.xxx strings are showed by JavaScript in a popup window. Ensure that no ' (apostrophe) is included in them msg.JS.confirmDeleteIiopListener=Selected IIOP Listener(s) will be deleted. Continue? @@ -70,6 +72,8 @@ iiopListener.listPortLabel=Listener Port: iiopListener.listPortHelp=ORB listener port for IIOP connections. iiopListener.listenerLabel=Listener: iiopListener.listenerHelp=Enables ORB IIOP inbound connections to the application server. +iiopListener.lazyInitLabel=Lazy Initialization: +iiopListener.lazyInitHelp=Initialize this ORB IIOP listener only when there is a client request. iiopListener.securityEnable=Security: iiop.editIiopTab=IIOP Listener diff --git a/appserver/orb/orb-enabler/src/main/java/org/glassfish/orb/admin/config/IiopListener.java b/appserver/orb/orb-enabler/src/main/java/org/glassfish/orb/admin/config/IiopListener.java index 69059ce4f3f..58de897a02b 100644 --- a/appserver/orb/orb-enabler/src/main/java/org/glassfish/orb/admin/config/IiopListener.java +++ b/appserver/orb/orb-enabler/src/main/java/org/glassfish/orb/admin/config/IiopListener.java @@ -37,6 +37,7 @@ * only if the new code is made subject to such option by the copyright * holder. */ +// Portions Copyright [2017] [Payara Foundation and/or its affiliates] package org.glassfish.orb.admin.config; @@ -55,11 +56,8 @@ import org.glassfish.api.admin.RestRedirect; import org.glassfish.grizzly.config.dom.Ssl; import static org.glassfish.config.support.Constants.NAME_REGEX; -import com.sun.enterprise.util.LocalStringManagerImpl; import org.glassfish.quality.ToDo; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; import javax.validation.constraints.NotNull; import javax.validation.constraints.Pattern; import javax.validation.Payload; @@ -225,7 +223,7 @@ public interface IiopListener extends ConfigBeanProxy, PropertyBag, Payload { * * @param value true if the listener is to be started lazily; false otherwise */ - void String(boolean value); + void setLazyInit(boolean value) throws PropertyVetoException; /** Properties as per {@link org.jvnet.hk2.config.types.PropertyBag}