Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

PAYARA-3703 Update-file-users command now works when there are instances with different configs #3965

Merged
merged 2 commits into from May 22, 2019
Merged

PAYARA-3703 Update-file-users command now works when there are instances with different configs #3965

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
76efb01
PAYARA-3703 Update-file-users command now owkrs when there are instan…
Cousjava May 21, 2019
366c0c3
PAYARA-3703 Added deployment group as target type
Cousjava May 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion appserver/admingui/common/src/main/resources/security/realms/manageUsers.jsf
View file
Open in desktop
Expand Up @@ -39,6 +39,7 @@
holder.

-->
<!-- Portions Copyright [2019] Payara Foundation and/or affiliates -->

<!initPage
setResourceBundle(key="i18nc" bundle="org.glassfish.common.admingui.Strings")
Expand All @@ -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}" )
Expand Down
4 changes: 2 additions & 2 deletions nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CreateFileUser.java
View file
Open in desktop
Expand Up @@ -37,7 +37,7 @@
* only if the new code is made subject to such option by the copyright
* holder.
*/
// Portions Copyright [2018] [Payara Foundation and/or its affiliates]
// Portions Copyright [2018-2019] [Payara Foundation and/or its affiliates]
package com.sun.enterprise.security.cli;

import com.sun.enterprise.config.serverbeans.AdminService;
Expand Down Expand Up @@ -95,7 +95,7 @@
@Service(name = "create-file-user")
@PerLookup
@I18n("create.file.user")
@ExecuteOn({ RuntimeType.ALL })
@ExecuteOn({ RuntimeType.INSTANCE, RuntimeType.DAS })
@TargetType({ DAS, STANDALONE_INSTANCE, CLUSTER, CONFIG })
Cousjava marked this conversation as resolved.
Show resolved Hide resolved
@RestEndpoints({
@RestEndpoint(configBean = AuthRealm.class, opType = RestEndpoint.OpType.POST, path = "create-user", description = "Create", params = {
Expand Down
4 changes: 2 additions & 2 deletions nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/DeleteFileUser.java
View file
Open in desktop
Expand Up @@ -37,7 +37,7 @@
* only if the new code is made subject to such option by the copyright
* holder.
*/
// Portions Copyright [2018] [Payara Foundation and/or its affiliates]
// Portions Copyright [2018-2019] [Payara Foundation and/or its affiliates]
package com.sun.enterprise.security.cli;

import java.beans.PropertyVetoException;
Expand Down Expand Up @@ -90,7 +90,7 @@
@Service(name = "delete-file-user")
@PerLookup
@I18n("delete.file.user")
@ExecuteOn({ RuntimeType.ALL })
@ExecuteOn({ RuntimeType.DAS, RuntimeType.INSTANCE })
@TargetType({ CommandTarget.DAS, CommandTarget.STANDALONE_INSTANCE, CommandTarget.CLUSTER, CommandTarget.CONFIG })
Cousjava marked this conversation as resolved.
Show resolved Hide resolved
@RestEndpoints({
@RestEndpoint(configBean = AuthRealm.class, opType = RestEndpoint.OpType.DELETE, path = "delete-user", description = "Delete", params = {
Expand Down
6 changes: 3 additions & 3 deletions nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/UpdateFileUser.java
View file
Open in desktop
Expand Up @@ -37,11 +37,11 @@
* only if the new code is made subject to such option by the copyright
* holder.
*/
// Portions Copyright [2018] [Payara Foundation and/or its affiliates]
// Portions Copyright [2018-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 static org.glassfish.api.admin.RuntimeType.ALL;
import static org.glassfish.config.support.CommandTarget.CLUSTER;
import static org.glassfish.config.support.CommandTarget.CONFIG;
import static org.glassfish.config.support.CommandTarget.DAS;
Expand Down Expand Up @@ -95,7 +95,7 @@
@Service(name = "update-file-user")
@PerLookup
@I18n("update.file.user")
@ExecuteOn({ ALL })
@ExecuteOn({ RuntimeType.INSTANCE, RuntimeType.DAS })
@TargetType({ DAS, STANDALONE_INSTANCE, CLUSTER, CONFIG })
@RestEndpoints({
@RestEndpoint(configBean = AuthRealm.class, opType = POST, path = "update-user", description = "Update Users",
Expand Down