Merged in Cousjath/payara/PAYARA-3703-maint-4 (pull request payara#648)

PAYARA-3703 Update-file-users command now works when there are instances with different configs Approved-by: Patrik Duditš <patrik.dudits@payara.fish>
Pandrex247 · Jun 4, 2019 · 5571c8f · 5571c8f
2 parents 1ac6635 + 81145fa
commit 5571c8f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/appserver/admingui/common/src/main/resources/security/realms/manageUsers.jsf b/appserver/admingui/common/src/main/resources/security/realms/manageUsers.jsf
@@ -39,6 +39,7 @@
     holder.
 
 -->
+<!-- Portions Copyright [2019] Payara Foundation and/or affiliates -->
 
 <!initPage
     setResourceBundle(key="i18nc" bundle="org.glassfish.common.admingui.Strings")
@@ -57,7 +58,7 @@
             method="get", result="#{requestScope.listUsersResult}");
         setPageSessionAttribute(key="listOfRows", value="#{requestScope.listUsersResult.data.extraProperties.users}");
         gf.restRequest(endpoint="#{sessionScope.REST_URL}/configs/config/#{pageSession.configName}/admin-service/jmx-connector/system.json", method="get", result="#{requestScope.result}");
-        setPageSessionAttribute(key="AuthRealmName" value="#{requestScope.result.entity['authRealmName']");
+        setPageSessionAttribute(key="AuthRealmName" value="#{requestScope.result.entity['authRealmName']}");
         if ("#{pageSession.Name}=#{pageSession.authRealm}"){
             setPageSessionAttribute(key="tableTitle", value="$resource{i18nc.manageAdminUsers.TableTitle}")
             setPageSessionAttribute(key="helpKey", value="$resource{help_common.manageAdminUsers}" )

diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CreateFileUser.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CreateFileUser.java
@@ -37,6 +37,7 @@
  * only if the new code is made subject to such option by the copyright
  * holder.
  */
+// Portions Copyright [2019] [Payara Foundation and/or its affiliates]
 
 package com.sun.enterprise.security.cli;
 
@@ -90,8 +91,8 @@
 @Service(name="create-file-user")
 @PerLookup
 @I18n("create.file.user")
-@ExecuteOn({RuntimeType.ALL})
 @TargetType({CommandTarget.DAS,CommandTarget.STANDALONE_INSTANCE,CommandTarget.CLUSTER, CommandTarget.CONFIG})
+@ExecuteOn({ RuntimeType.INSTANCE, RuntimeType.DAS })
 @RestEndpoints({
     @RestEndpoint(configBean=AuthRealm.class,
         opType=RestEndpoint.OpType.POST, 

diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/DeleteFileUser.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/DeleteFileUser.java
@@ -37,6 +37,7 @@
  * only if the new code is made subject to such option by the copyright
  * holder.
  */
+// Portions Copyright [2019] [Payara Foundation and/or its affiliates]
 
 package com.sun.enterprise.security.cli;
 
@@ -87,8 +88,8 @@
 @Service(name="delete-file-user")
 @PerLookup
 @I18n("delete.file.user")
-@ExecuteOn({RuntimeType.ALL})
-@TargetType({CommandTarget.DAS,CommandTarget.STANDALONE_INSTANCE,CommandTarget.CLUSTER, CommandTarget.CONFIG})
+@ExecuteOn({ RuntimeType.DAS, RuntimeType.INSTANCE })
+@TargetType({ CommandTarget.DAS, CommandTarget.STANDALONE_INSTANCE, CommandTarget.CLUSTER, CommandTarget.CONFIG })
 @RestEndpoints({
     @RestEndpoint(configBean=AuthRealm.class,
         opType=RestEndpoint.OpType.DELETE, 

diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/UpdateFileUser.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/UpdateFileUser.java
@@ -37,9 +37,13 @@
  * only if the new code is made subject to such option by the copyright
  * holder.
  */
+// Portions Copyright [2019] [Payara Foundation and/or its affiliates]
 
 package com.sun.enterprise.security.cli;
 
+import org.glassfish.api.admin.RuntimeType;
+import static org.glassfish.api.admin.RestEndpoint.OpType.POST;
+
 import com.sun.enterprise.config.serverbeans.AdminService;
 import java.util.List;
 
@@ -87,8 +91,8 @@
 @Service(name="update-file-user")
 @PerLookup
 @I18n("update.file.user")
-@ExecuteOn({RuntimeType.ALL})
 @TargetType({CommandTarget.DAS,CommandTarget.STANDALONE_INSTANCE,CommandTarget.CLUSTER, CommandTarget.CONFIG})
+@ExecuteOn({ RuntimeType.INSTANCE, RuntimeType.DAS })
 @RestEndpoints({
     @RestEndpoint(configBean=AuthRealm.class,
         opType=RestEndpoint.OpType.POST,