added ORB listener lazy initialization check boxes to admin console (#…

…1693)
payara · Jun 20, 2017 · 80289e7 · 80289e7
1 parent 8238d5d
commit 80289e7
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 10 deletions.
diff --git a/appserver/admingui/corba/src/main/resources/iiopListenerAttrs.inc b/appserver/admingui/corba/src/main/resources/iiopListenerAttrs.inc
@@ -38,14 +38,15 @@
     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]
 -->
 
 <!-- iiopListener.inc  -->
 
 <sun:propertySheet id="propertySheet">
 #include "/common/shared/configNameSection.inc"
     <!-- General Settings section -->
-    <sun:propertySheetSection id="generalSettingsSetion">
+    <sun:propertySheetSection id="generalSettingsSection">
         <sun:property id="IiopNameProp"  rendered="#{pageSession.edit}" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" label="$resource{i18n.common.Name}" >
             <sun:staticText id="IiopName" text="#{pageSession.valueMap['id']}" />
         </sun:property>
@@ -59,11 +60,13 @@
             <sun:textField id="ListenerPort" styleClass="required port" columns="$int{20}" maxLength="#{sessionScope.fieldLengths['maxLength.iiopListener.listPort']}" text="#{pageSession.valueMap['port']}" required="#{true}" />
         </sun:property>
         <sun:property id="ListenerProp"  labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" label="$resource{i18n_corba.iiopListener.listenerLabel}" helpText="$resource{i18n_corba.iiopListener.listenerHelp}" >
-            <sun:checkbox label="$resource{i18n.desc.Enabled}" selected="#{pageSession.valueMap['enabled']}" selectedValue="true" />
+            <sun:checkbox id="listenerEnabled" label="$resource{i18n.desc.Enabled}" selected="#{pageSession.valueMap['enabled']}" selectedValue="true" />
         </sun:property>
         <sun:property id="SecurityProp"  labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" label="$resource{i18n_corba.iiopListener.securityEnable}" >
             <sun:checkbox id="Security" label="$resource{i18n.desc.Enabled}" selected="#{pageSession.valueMap['securityEnabled']}" selectedValue="true" />
         </sun:property>
+        <sun:property id="LazyInitProp"  labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" label="$resource{i18n_corba.iiopListener.lazyInitLabel}" helpText="$resource{i18n_corba.iiopListener.lazyInitHelp}" >
+            <sun:checkbox id="lazyInit" label="$resource{i18n.desc.Enabled}" selected="#{pageSession.valueMap['lazyInit']}" selectedValue="true" />
+        </sun:property>
     </sun:propertySheetSection>
 </sun:propertySheet>    
-
diff --git 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]
 -->
 
 <!-- iiopListenerEdit.jsf -->
@@ -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
@@ -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]
 -->
 
 <!-- configuration/iiopListenerNew.jsf -->
@@ -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
@@ -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
@@ -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}