Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,14 @@
public abstract class BaseHttpInterfaceAddStepHandler extends ManagementInterfaceAddStepHandler {

private static final String PROPERTY_BASE = "org.wildfly.management.";
// Do not use the system properties, use the management API to configure them in the model
@Deprecated(since = "30.0.0", forRemoval = true)
private static final String BACKLOG_PROPERTY = PROPERTY_BASE + "backlog";
@Deprecated(since = "30.0.0", forRemoval = true)
private static final String CONNECTION_HIGH_WATER_PROPERTY = PROPERTY_BASE + "connection-high-water";
@Deprecated(since = "30.0.0", forRemoval = true)
private static final String CONNECTION_LOW_WATER_PROPERTY = PROPERTY_BASE + "connection-low-water";
@Deprecated(since = "30.0.0", forRemoval = true)
private static final String NO_REQUEST_TIMEOUT_PROPERTY = PROPERTY_BASE + "no-request-timeout";

protected static final String HTTP_AUTHENTICATION_FACTORY_CAPABILITY = "org.wildfly.security.http-authentication-factory";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@
import org.jboss.as.controller.parsing.Attribute;
import org.jboss.as.controller.registry.AttributeAccess;
import org.jboss.as.controller.registry.ManagementResourceRegistration;
import org.jboss.as.version.Stability;
import org.jboss.dmr.ModelNode;
import org.jboss.dmr.ModelType;

Expand Down Expand Up @@ -187,29 +186,25 @@ public void validateParameter(String parameterName, ModelNode value) throws Oper
.setAllowExpression(true)
.setDefaultValue(new ModelNode(50))
.setFlags(AttributeAccess.Flag.RESTART_RESOURCE_SERVICES)
.setStability(Stability.COMMUNITY)
.build();

public static final SimpleAttributeDefinition NO_REQUEST_TIMEOUT = new SimpleAttributeDefinitionBuilder(ModelDescriptionConstants.NO_REQUEST_TIMEOUT, ModelType.INT, true)
.setAllowExpression(true)
.setMeasurementUnit(MeasurementUnit.MILLISECONDS)
.setDefaultValue(new ModelNode(60000))
.setFlags(AttributeAccess.Flag.RESTART_RESOURCE_SERVICES)
.setStability(Stability.COMMUNITY)
.build();

public static final SimpleAttributeDefinition CONNECTION_HIGH_WATER = new SimpleAttributeDefinitionBuilder(ModelDescriptionConstants.CONNECTION_HIGH_WATER, ModelType.INT, true)
.setAllowExpression(true)
.setDefaultValue(new ModelNode(100))
.setFlags(AttributeAccess.Flag.RESTART_RESOURCE_SERVICES)
.setStability(Stability.COMMUNITY)
.build();

public static final SimpleAttributeDefinition CONNECTION_LOW_WATER = new SimpleAttributeDefinitionBuilder(ModelDescriptionConstants.CONNECTION_LOW_WATER, ModelType.INT, true)
.setAllowExpression(true)
.setDefaultValue(new ModelNode(75))
.setFlags(AttributeAccess.Flag.RESTART_RESOURCE_SERVICES)
.setStability(Stability.COMMUNITY)
.build();

protected static final AttributeDefinition[] COMMON_ATTRIBUTES = new AttributeDefinition[] { HTTP_AUTHENTICATION_FACTORY, SSL_CONTEXT, CONSOLE_ENABLED, HTTP_UPGRADE_ENABLED,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
public abstract class ManagementSchemas {

// TODO Maybe this could be calculated from static method, sometimes tests want to use "latest".
public static final String CURRENT = "urn:jboss:domain:20.0";
public static final String CURRENT = "urn:jboss:domain:21.0";

private enum Version implements Feature {

Expand Down Expand Up @@ -57,6 +57,7 @@ private enum Version implements Feature {
VERSION_19(19),
VERSION_20(20),
VERSION_20_COMMUNITY(20, Stability.COMMUNITY),
VERSION_21(21),
;

private final int majorVersion;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ public void testEmptyAllowedOriginsConfiguration() throws Exception {
}

@Test
public void testResourceConstraints_Community() throws Exception {
// Test for https://issues.redhat.com/browse/WFCORE-6830
testConfiguration("host_resource_constraints_community.xml", Stability.COMMUNITY);
public void testResourceConstraints() throws Exception {
// Test for https://issues.redhat.com/browse/WFCORE-7317
testConfiguration("host_resource_constraints.xml");
}

private void testConfiguration(String fileName) throws Exception {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,12 @@ public void testEmptyAllowedOriginsConfiguration() throws Exception {
}

@Test
public void testResourceConstraints_Community() throws Exception {
// Test for https://issues.redhat.com/browse/WFCORE-6830
testConfiguration("standalone_resource_constraints_community.xml", Stability.COMMUNITY);
public void testResourceConstraints() throws Exception {
// Test for https://issues.redhat.com/browse/WFCORE-7317
testConfiguration("standalone_resource_constraints.xml");
}


public void testConfiguration(String fileName) throws Exception {
testConfiguration(fileName, Stability.DEFAULT);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
~ SPDX-License-Identifier: Apache-2.0
-->

<server xmlns="urn:jboss:domain:20.0">
<server xmlns="urn:jboss:domain:21.0">

<management>
<access-control provider="rbac">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
~ SPDX-License-Identifier: Apache-2.0
-->

<domain xmlns="urn:jboss:domain:20.0">
<domain xmlns="urn:jboss:domain:21.0">
<management>
<access-control provider="rbac" use-identity-roles="true" permission-combination-policy="rejecting">
<server-group-scoped-roles>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
~ SPDX-License-Identifier: Apache-2.0
-->

<domain xmlns="urn:jboss:domain:20.0">
<domain xmlns="urn:jboss:domain:21.0">
<management>
<access-control provider="simple" permission-combination-policy="rejecting">
<server-group-scoped-roles>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
~ SPDX-License-Identifier: Apache-2.0
-->

<domain xmlns="urn:jboss:domain:20.0">
<domain xmlns="urn:jboss:domain:21.0">
<management>
<access-control provider="rbac">
<role-mapping>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
~ SPDX-License-Identifier: Apache-2.0
-->

<host xmlns="urn:jboss:domain:20.0">
<host xmlns="urn:jboss:domain:21.0">

<!-- An interface is always required by the parser -->
<management>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
~ SPDX-License-Identifier: Apache-2.0
-->

<server xmlns="urn:jboss:domain:20.0">
<server xmlns="urn:jboss:domain:21.0">
<management>
<access-control provider="rbac" use-identity-roles="true" permission-combination-policy="rejecting">
<role-mapping>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
~ SPDX-License-Identifier: Apache-2.0
-->

<host xmlns="urn:jboss:domain:20.0">
<host xmlns="urn:jboss:domain:21.0">
<management>
<configuration-changes max-history="3" />
<audit-log>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
~ SPDX-License-Identifier: Apache-2.0
-->

<host xmlns="urn:jboss:domain:20.0">
<host xmlns="urn:jboss:domain:21.0">
<management>
<configuration-changes max-history="3" />
<audit-log>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
~ SPDX-License-Identifier: Apache-2.0
-->

<server xmlns="urn:jboss:domain:20.0">
<server xmlns="urn:jboss:domain:21.0">
<management>
<configuration-changes max-history="3" />
<audit-log>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
~ SPDX-License-Identifier: Apache-2.0
-->

<host xmlns="urn:jboss:domain:20.0">
<host xmlns="urn:jboss:domain:21.0">
<management>
<audit-log>
<formatters>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
~ SPDX-License-Identifier: Apache-2.0
-->

<server xmlns="urn:jboss:domain:20.0">
<server xmlns="urn:jboss:domain:21.0">
<management>
<audit-log>
<formatters>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
~ SPDX-License-Identifier: Apache-2.0
-->

<domain xmlns="urn:jboss:domain:20.0">
<domain xmlns="urn:jboss:domain:21.0">
<deployments>
<deployment name="myFirstApp" runtime-name="abc.war">
<content sha1="12345678901234567890"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
~ SPDX-License-Identifier: Apache-2.0
-->

<domain xmlns="urn:jboss:domain:20.0">
<domain xmlns="urn:jboss:domain:21.0">
<deployments>
<deployment name="myThirdApp" runtime-name="ghi.war">
<content sha1="12345678901234567890" archive="false"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
~ SPDX-License-Identifier: Apache-2.0
-->

<server xmlns="urn:jboss:domain:20.0">
<server xmlns="urn:jboss:domain:21.0">
<deployments>
<deployment name="myFirstApp" runtime-name="abc.war">
<content sha1="12345678901234567890"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
~ SPDX-License-Identifier: Apache-2.0
-->

<server xmlns="urn:jboss:domain:20.0">
<server xmlns="urn:jboss:domain:21.0">
<deployments>
<deployment name="myFirstApp" runtime-name="abc.war">
<content sha1="12345678901234567890"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
This is the shipped configuration with the extensions and profiles removed
-->

<domain xmlns="urn:jboss:domain:20.0">
<domain xmlns="urn:jboss:domain:21.0">
<deployment-overlays>
<deployment-overlay name="test-overlay">
<content path="/test/123" content="12345678901234567890"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
This is the shipped configuration with the extensions and profiles removed
-->

<domain xmlns="urn:jboss:domain:20.0">
<domain xmlns="urn:jboss:domain:21.0">
<deployment-overlays>
<deployment-overlay name="test-overlay">
<content path="/test/123" content="12345678901234567890"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
~ SPDX-License-Identifier: Apache-2.0
-->

<server xmlns="urn:jboss:domain:20.0">
<server xmlns="urn:jboss:domain:21.0">
<deployment-overlays>
<deployment-overlay name="test-overlay">
<content path="/test/123" content="12345678901234567890"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
~ SPDX-License-Identifier: Apache-2.0
-->

<host name="primary" xmlns="urn:jboss:domain:20.0">
<host name="primary" xmlns="urn:jboss:domain:21.0">

<management>
<management-interfaces>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
~ SPDX-License-Identifier: Apache-2.0
-->

<host name="primary" xmlns="urn:jboss:domain:20.0">
<host name="primary" xmlns="urn:jboss:domain:21.0">

<management>
<management-interfaces>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
~ SPDX-License-Identifier: Apache-2.0
-->

<host name="primary" xmlns="urn:jboss:domain:20.0">
<host name="primary" xmlns="urn:jboss:domain:21.0">

<management>
<management-interfaces>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
~ SPDX-License-Identifier: Apache-2.0
-->

<host name="primary" xmlns="urn:jboss:domain:20.0">
<host name="primary" xmlns="urn:jboss:domain:21.0">

<management>
<management-interfaces>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
~ SPDX-License-Identifier: Apache-2.0
-->

<host name="primary" xmlns="urn:jboss:domain:20.0">
<host name="primary" xmlns="urn:jboss:domain:21.0">

<management>
<management-interfaces>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
~ SPDX-License-Identifier: Apache-2.0
-->

<host name="primary" xmlns="urn:jboss:domain:20.0">
<host name="primary" xmlns="urn:jboss:domain:21.0">

<management>
<management-interfaces>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
~ SPDX-License-Identifier: Apache-2.0
-->

<domain xmlns="urn:jboss:domain:20.0">
<domain xmlns="urn:jboss:domain:21.0">

<host-excludes>
<host-exclude name="WildFly10" active-server-groups="a b" active-socket-binding-groups="c d e">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
~ SPDX-License-Identifier: Apache-2.0
-->

<domain xmlns="urn:jboss:domain:20.0">
<domain xmlns="urn:jboss:domain:21.0">
<interfaces>
</interfaces>
</domain>
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
~ SPDX-License-Identifier: Apache-2.0
-->

<domain xmlns="urn:jboss:domain:20.0">
<domain xmlns="urn:jboss:domain:21.0">
<interfaces>
<interface name="external">
<any-address/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
~ SPDX-License-Identifier: Apache-2.0
-->

<host xmlns="urn:jboss:domain:20.0">
<host xmlns="urn:jboss:domain:21.0">

<!-- An interface is always required by the parser -->
<management>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
~ SPDX-License-Identifier: Apache-2.0
-->

<server xmlns="urn:jboss:domain:20.0">
<server xmlns="urn:jboss:domain:21.0">
<interfaces>
<interface name="external">
<any-address/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
~ SPDX-License-Identifier: Apache-2.0
-->

<domain xmlns="urn:jboss:domain:20.0">
<domain xmlns="urn:jboss:domain:21.0">
<server-groups>
<server-group name="test" profile="test">
<jvm name="empty"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
~ SPDX-License-Identifier: Apache-2.0
-->

<domain xmlns="urn:jboss:domain:20.0">
<domain xmlns="urn:jboss:domain:21.0">
<server-groups>
<server-group name="test" profile="test">
<jvm name="full" java-home="javaHome" type="SUN" env-classpath-ignored="true">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
~ SPDX-License-Identifier: Apache-2.0
-->

<domain xmlns="urn:jboss:domain:20.0">
<domain xmlns="urn:jboss:domain:21.0">
<server-groups>
<server-group name="test" profile="test">
<jvm name="full" java-home="${mytest.java-home:javaHome}" env-classpath-ignored="${mytest.env-classpath-ignored:true}">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
~ SPDX-License-Identifier: Apache-2.0
-->

<host name="primary" xmlns="urn:jboss:domain:20.0">
<host name="primary" xmlns="urn:jboss:domain:21.0">

<!-- An interface is always required by the parser -->
<management>
Expand Down
Loading
Loading