Skip to content

Commit a3991b3

Browse files
yersanyersan
authored
Merge branch 'main' into WFCORE-7094
2 parents cf98626 + 19240ed commit a3991b3

File tree

119 files changed

+646
-213
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

119 files changed

+646
-213
lines changed

‎bootable-jar/boot/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<groupId>org.wildfly.core</groupId>
1111
<artifactId>wildfly-jar-parent</artifactId>
12-
<version>27.0.0.Beta6-SNAPSHOT</version>
12+
<version>27.0.0.Final-SNAPSHOT</version>
1313
</parent>
1414

1515
<artifactId>wildfly-jar-boot</artifactId>

‎bootable-jar/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<parent>
1111
<groupId>org.wildfly.core</groupId>
1212
<artifactId>wildfly-core-parent</artifactId>
13-
<version>27.0.0.Beta6-SNAPSHOT</version>
13+
<version>27.0.0.Final-SNAPSHOT</version>
1414
</parent>
1515

1616
<artifactId>wildfly-jar-parent</artifactId>

‎bootable-jar/runtime/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<groupId>org.wildfly.core</groupId>
1111
<artifactId>wildfly-jar-parent</artifactId>
12-
<version>27.0.0.Beta6-SNAPSHOT</version>
12+
<version>27.0.0.Final-SNAPSHOT</version>
1313
</parent>
1414

1515
<artifactId>wildfly-jar-runtime</artifactId>

‎build/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<parent>
1414
<groupId>org.wildfly.core</groupId>
1515
<artifactId>wildfly-core-parent</artifactId>
16-
<version>27.0.0.Beta6-SNAPSHOT</version>
16+
<version>27.0.0.Final-SNAPSHOT</version>
1717
</parent>
1818

1919
<artifactId>wildfly-core-build</artifactId>

‎cli/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<parent>
1313
<groupId>org.wildfly.core</groupId>
1414
<artifactId>wildfly-core-parent</artifactId>
15-
<version>27.0.0.Beta6-SNAPSHOT</version>
15+
<version>27.0.0.Final-SNAPSHOT</version>
1616
</parent>
1717

1818
<artifactId>wildfly-cli</artifactId>

‎component-matrix-builder/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
Maintain separation between the artifact id and the version to help prevent
1414
merge conflicts between commits changing the GA and those changing the V.
1515
-->
16-
<version>27.0.0.Beta6-SNAPSHOT</version>
16+
<version>27.0.0.Final-SNAPSHOT</version>
1717
</parent>
1818

1919
<groupId>org.wildfly.core</groupId>

‎controller-client/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<parent>
1313
<groupId>org.wildfly.core</groupId>
1414
<artifactId>wildfly-core-parent</artifactId>
15-
<version>27.0.0.Beta6-SNAPSHOT</version>
15+
<version>27.0.0.Final-SNAPSHOT</version>
1616
</parent>
1717

1818
<artifactId>wildfly-controller-client</artifactId>

‎controller/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<parent>
1313
<groupId>org.wildfly.core</groupId>
1414
<artifactId>wildfly-core-parent</artifactId>
15-
<version>27.0.0.Beta6-SNAPSHOT</version>
15+
<version>27.0.0.Final-SNAPSHOT</version>
1616
</parent>
1717

1818
<artifactId>wildfly-controller</artifactId>

‎controller/src/main/java/org/jboss/as/controller/AbstractOperationContext.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1242,6 +1242,7 @@ public final void reloadRequired() {
12421242
@Override
12431243
public final void restartRequired() {
12441244
if (isBooting()) {
1245+
MGMT_OP_LOGGER.debug("Server is booting so we didn't set the restart required flag");
12451246
return;
12461247
}
12471248
activeStep.setRestartStamp(processState.setRestartRequired());

‎core-feature-pack/channel/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<parent>
1414
<groupId>org.wildfly.core</groupId>
1515
<artifactId>wildfly-core-feature-pack-parent</artifactId>
16-
<version>27.0.0.Beta6-SNAPSHOT</version>
16+
<version>27.0.0.Final-SNAPSHOT</version>
1717
</parent>
1818

1919
<artifactId>wildfly-core-channel</artifactId>

‎core-feature-pack/common/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<parent>
1313
<groupId>org.wildfly.core</groupId>
1414
<artifactId>wildfly-core-feature-pack-parent</artifactId>
15-
<version>27.0.0.Beta6-SNAPSHOT</version>
15+
<version>27.0.0.Final-SNAPSHOT</version>
1616
</parent>
1717

1818
<artifactId>wildfly-core-feature-pack-common</artifactId>

‎core-feature-pack/common/src/main/resources/modules/system/layers/base/org/wildfly/security/elytron-base/main/module.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
<artifact name="${org.wildfly.security:wildfly-elytron-credential-source-impl}"/>
3535
<artifact name="${org.wildfly.security:wildfly-elytron-credential-store}"/>
3636
<artifact name="${org.wildfly.security:wildfly-elytron-digest}"/>
37-
<artifact name="${org.wildfly.security:wildfly-elytron-dynamic-ssl}"/>
3837
<artifact name="${org.wildfly.security:wildfly-elytron-encryption}"/>
3938
<artifact name="${org.wildfly.security:wildfly-elytron-http}"/>
4039
<artifact name="${org.wildfly.security:wildfly-elytron-http-basic}"/>
@@ -112,5 +111,6 @@
112111
modules use the parser, they need to have visibility to this module.
113112
-->
114113
<module name="org.wildfly.client.config" export="true"/>
114+
<module name="org.wildfly.security.elytron-dynamic-ssl" export="true" optional="true"/>
115115
</dependencies>
116116
</module>

‎core-feature-pack/common/src/main/resources/modules/system/layers/base/org/wildfly/security/elytron-dynamic-ssl/main/module.xml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
3+
<!--
4+
~ Copyright The WildFly Authors
5+
~ SPDX-License-Identifier: Apache-2.0
6+
-->
7+
<module xmlns="urn:jboss:module:1.9" name="org.wildfly.security.elytron-dynamic-ssl">
8+
9+
<properties>
10+
<property name="jboss.api" value="private"/>
11+
<property name="jboss.stability" value="community"/>
12+
</properties>
13+
14+
<resources>
15+
<artifact name="${org.wildfly.security:wildfly-elytron-dynamic-ssl}"/>
16+
</resources>
17+
18+
<dependencies>
19+
<module name="java.logging"/>
20+
<module name="org.jboss.logging" />
21+
<module name="org.jboss.logmanager" />
22+
<module name="org.wildfly.security.elytron-base"/>
23+
<module name="org.wildfly.common"/>
24+
<module name="org.wildfly.client.config"/>
25+
</dependencies>
26+
</module>

‎core-feature-pack/ee-10-api/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<parent>
1313
<groupId>org.wildfly.core</groupId>
1414
<artifactId>wildfly-core-feature-pack-parent</artifactId>
15-
<version>27.0.0.Beta6-SNAPSHOT</version>
15+
<version>27.0.0.Final-SNAPSHOT</version>
1616
</parent>
1717

1818
<artifactId>wildfly-core-feature-pack-ee-10-api</artifactId>

‎core-feature-pack/galleon-common/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<parent>
1313
<groupId>org.wildfly.core</groupId>
1414
<artifactId>wildfly-core-feature-pack-parent</artifactId>
15-
<version>27.0.0.Beta6-SNAPSHOT</version>
15+
<version>27.0.0.Final-SNAPSHOT</version>
1616
</parent>
1717

1818
<artifactId>wildfly-core-feature-pack-galleon-common</artifactId>

‎core-feature-pack/galleon-common/src/main/resources/layers/standalone/elytron/layer-spec.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,9 @@
1717
<!-- required by default configuration-->
1818
<package name="org.wildfly.extension.elytron.jaas-realm"/>
1919
<package name="org.wildfly.openssl"/>
20+
<!-- In case the feature-pack containing this package is constrained at build time
21+
to a level that doesn't imply 'community', this package will be not packaged inside the feature-pack.
22+
'valid-for-stability' attribute allows to keep this dependency that will be ignored at provisioning time. -->
23+
<package name="org.wildfly.security.elytron-dynamic-ssl" optional="true" valid-for-stability="community"/>
2024
</packages>
2125
</layer-spec>

‎core-feature-pack/galleon-feature-pack/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<parent>
1414
<groupId>org.wildfly.core</groupId>
1515
<artifactId>wildfly-core-feature-pack-parent</artifactId>
16-
<version>27.0.0.Beta6-SNAPSHOT</version>
16+
<version>27.0.0.Final-SNAPSHOT</version>
1717
</parent>
1818

1919
<artifactId>wildfly-core-galleon-pack</artifactId>

‎core-feature-pack/manifest/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<parent>
1414
<groupId>org.wildfly.core</groupId>
1515
<artifactId>wildfly-core-feature-pack-parent</artifactId>
16-
<version>27.0.0.Beta6-SNAPSHOT</version>
16+
<version>27.0.0.Final-SNAPSHOT</version>
1717
</parent>
1818

1919
<artifactId>wildfly-core-manifest</artifactId>

‎core-feature-pack/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<parent>
1313
<groupId>org.wildfly.core</groupId>
1414
<artifactId>wildfly-core-parent</artifactId>
15-
<version>27.0.0.Beta6-SNAPSHOT</version>
15+
<version>27.0.0.Final-SNAPSHOT</version>
1616
</parent>
1717

1818
<artifactId>wildfly-core-feature-pack-parent</artifactId>

‎core-management/core-management-client/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<parent>
1313
<groupId>org.wildfly.core</groupId>
1414
<artifactId>wildfly-core-management</artifactId>
15-
<version>27.0.0.Beta6-SNAPSHOT</version>
15+
<version>27.0.0.Final-SNAPSHOT</version>
1616
</parent>
1717

1818
<artifactId>wildfly-core-management-client</artifactId>

‎core-management/core-management-subsystem/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<parent>
1313
<groupId>org.wildfly.core</groupId>
1414
<artifactId>wildfly-core-management</artifactId>
15-
<version>27.0.0.Beta6-SNAPSHOT</version>
15+
<version>27.0.0.Final-SNAPSHOT</version>
1616
</parent>
1717

1818
<artifactId>wildfly-core-management-subsystem</artifactId>

‎core-management/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<parent>
1313
<groupId>org.wildfly.core</groupId>
1414
<artifactId>wildfly-core-parent</artifactId>
15-
<version>27.0.0.Beta6-SNAPSHOT</version>
15+
<version>27.0.0.Final-SNAPSHOT</version>
1616
</parent>
1717

1818
<artifactId>wildfly-core-management</artifactId>

‎core-model-test/framework/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<parent>
1313
<groupId>org.wildfly.core</groupId>
1414
<artifactId>wildfly-core-model-test</artifactId>
15-
<version>27.0.0.Beta6-SNAPSHOT</version>
15+
<version>27.0.0.Final-SNAPSHOT</version>
1616
</parent>
1717

1818
<artifactId>wildfly-core-model-test-framework</artifactId>

‎core-model-test/framework/src/main/java/org/jboss/as/core/model/bridge/impl/ChildFirstClassLoaderKernelServicesFactory.java

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import org.jboss.as.host.controller.HostRunningModeControl;
3030
import org.jboss.as.host.controller.RestartMode;
3131
import org.jboss.as.model.test.ModelTestOperationValidatorFilter;
32+
import org.jboss.as.version.Stability;
3233
import org.jboss.dmr.ModelNode;
3334
import org.jboss.staxmapper.XMLMapper;
3435

@@ -54,6 +55,28 @@ public static KernelServices create(List<ModelNode> bootOperations, ModelTestOpe
5455
return AbstractKernelServicesImpl.create(ProcessType.HOST_CONTROLLER, runningModeControl, validateOpsFilter, bootOperations, testParser, legacyModelVersion, type, modelInitializer, extensionRegistry, null);
5556
}
5657

58+
public static KernelServices create(List<ModelNode> bootOperations, ModelTestOperationValidatorFilter validateOpsFilter, ModelVersion legacyModelVersion,
59+
List<LegacyModelInitializerEntry> modelInitializerEntries, String stabilityStr) throws Exception {
60+
61+
Stability stability = Stability.fromString(stabilityStr);
62+
TestModelType type = TestModelType.DOMAIN;
63+
XMLMapper xmlMapper = XMLMapper.Factory.create();
64+
TestParser testParser = TestParser.create(stability, null, xmlMapper, type);
65+
ModelInitializer modelInitializer = null;
66+
if (modelInitializerEntries != null && !modelInitializerEntries.isEmpty()) {
67+
modelInitializer = new LegacyModelInitializer(modelInitializerEntries);
68+
}
69+
70+
RunningModeControl runningModeControl = new HostRunningModeControl(RunningMode.ADMIN_ONLY, RestartMode.HC_ONLY);
71+
72+
ExtensionRegistry extensionRegistry = ExtensionRegistry.builder(ProcessType.HOST_CONTROLLER)
73+
.withRunningMode(runningModeControl.getRunningMode())
74+
.withStability(stability)
75+
.build();
76+
77+
return AbstractKernelServicesImpl.create(ProcessType.HOST_CONTROLLER, runningModeControl, validateOpsFilter, bootOperations, testParser, legacyModelVersion, type, modelInitializer, extensionRegistry, null);
78+
}
79+
5780
private static class LegacyModelInitializer implements ModelInitializer {
5881

5982
private final List<LegacyModelInitializerEntry> entries;

‎core-model-test/framework/src/main/java/org/jboss/as/core/model/bridge/local/ScopedKernelServicesBootstrap.java

Lines changed: 56 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -14,58 +14,89 @@
1414
import org.jboss.as.core.model.bridge.impl.LegacyControllerKernelServicesProxy;
1515
import org.jboss.as.core.model.test.LegacyModelInitializerEntry;
1616
import org.jboss.as.model.test.ModelTestOperationValidatorFilter;
17+
import org.jboss.as.version.Stability;
1718
import org.jboss.dmr.ModelNode;
1819

1920
/**
20-
*
2121
* @author <a href="kabir.khan@jboss.com">Kabir Khan</a>
2222
*/
2323
public class ScopedKernelServicesBootstrap {
24+
Stability stability;
2425
ClassLoader legacyChildFirstClassLoader;
2526
ClassLoaderObjectConverter objectConverter;
2627

27-
public ScopedKernelServicesBootstrap(ClassLoader legacyChildFirstClassLoader) {
28+
public ScopedKernelServicesBootstrap(ClassLoader legacyChildFirstClassLoader, Stability stability) {
2829
this.legacyChildFirstClassLoader = legacyChildFirstClassLoader;
2930
this.objectConverter = new ClassLoaderObjectConverterImpl(this.getClass().getClassLoader(), legacyChildFirstClassLoader);
31+
this.stability = stability;
3032
}
3133

32-
3334
public LegacyControllerKernelServicesProxy createKernelServices(List<ModelNode> bootOperations, ModelTestOperationValidatorFilter validateOpsFilter, ModelVersion legacyModelVersion, List<LegacyModelInitializerEntry> modelInitializerEntries) throws Exception {
3435

3536
Object childClassLoaderKernelServices = createChildClassLoaderKernelServices(bootOperations, validateOpsFilter, legacyModelVersion, modelInitializerEntries);
3637
return new LegacyControllerKernelServicesProxy(legacyChildFirstClassLoader, childClassLoaderKernelServices, objectConverter);
3738
}
3839

39-
private Object createChildClassLoaderKernelServices(List<ModelNode> bootOperations, ModelTestOperationValidatorFilter validateOpsFilter, ModelVersion legacyModelVersion, List<LegacyModelInitializerEntry> modelInitializerEntries){
40+
private Object createChildClassLoaderKernelServices(List<ModelNode> bootOperations, ModelTestOperationValidatorFilter validateOpsFilter, ModelVersion legacyModelVersion, List<LegacyModelInitializerEntry> modelInitializerEntries) {
4041
try {
4142
Class<?> clazz = legacyChildFirstClassLoader.loadClass(ChildFirstClassLoaderKernelServicesFactory.class.getName());
43+
List<Object> convertedBootOps = getConvertedBootOps(bootOperations);
44+
List<Object> convertedModelInitializerEntries = convertModelInitializer(modelInitializerEntries);
4245

43-
Method m = clazz.getMethod("create",
44-
List.class,
45-
legacyChildFirstClassLoader.loadClass(ModelTestOperationValidatorFilter.class.getName()),
46-
legacyChildFirstClassLoader.loadClass(ModelVersion.class.getName()),
47-
List.class);
48-
49-
List<Object> convertedBootOps = new ArrayList<Object>();
50-
for (int i = 0 ; i < bootOperations.size() ; i++) {
51-
ModelNode node = bootOperations.get(i);
52-
if (node != null) {
53-
convertedBootOps.add(objectConverter.convertModelNodeToChildCl(node));
54-
}
55-
}
46+
Object convertedValidationFilter = objectConverter.convertValidateOperationsFilterToChildCl(validateOpsFilter);
47+
Object convertedLegacyModelVersion = objectConverter.convertModelVersionToChildCl(legacyModelVersion);
5648

57-
List<Object> convertedModelInitializerEntries = null;
58-
if (modelInitializerEntries != null) {
59-
convertedModelInitializerEntries = new ArrayList<Object>();
60-
for (LegacyModelInitializerEntry entry : modelInitializerEntries) {
61-
convertedModelInitializerEntries.add(objectConverter.convertLegacyModelInitializerEntryToChildCl(entry));
62-
}
63-
}
49+
if (!Stability.DEFAULT.equals(stability)) {
50+
Method m = clazz.getMethod("create",
51+
List.class,
52+
legacyChildFirstClassLoader.loadClass(ModelTestOperationValidatorFilter.class.getName()),
53+
legacyChildFirstClassLoader.loadClass(ModelVersion.class.getName()),
54+
List.class,
55+
String.class);
6456

65-
return m.invoke(null, convertedBootOps, objectConverter.convertValidateOperationsFilterToChildCl(validateOpsFilter), objectConverter.convertModelVersionToChildCl(legacyModelVersion), convertedModelInitializerEntries);
57+
return m.invoke(null,
58+
convertedBootOps,
59+
convertedValidationFilter,
60+
convertedLegacyModelVersion,
61+
convertedModelInitializerEntries,
62+
stability.toString());
63+
} else {
64+
Method m = clazz.getMethod("create",
65+
List.class,
66+
legacyChildFirstClassLoader.loadClass(ModelTestOperationValidatorFilter.class.getName()),
67+
legacyChildFirstClassLoader.loadClass(ModelVersion.class.getName()),
68+
List.class);
6669

70+
return m.invoke(null,
71+
convertedBootOps,
72+
convertedValidationFilter,
73+
convertedLegacyModelVersion,
74+
convertedModelInitializerEntries);
75+
}
6776
} catch (Exception e) {
6877
throw new RuntimeException(e);
6978
}
7079
}
80+
81+
private List<Object> convertModelInitializer(List<LegacyModelInitializerEntry> modelInitializerEntries) {
82+
List<Object> converted = null;
83+
if (modelInitializerEntries != null) {
84+
converted = new ArrayList<>();
85+
for (LegacyModelInitializerEntry entry : modelInitializerEntries) {
86+
converted.add(objectConverter.convertLegacyModelInitializerEntryToChildCl(entry));
87+
}
88+
}
89+
return converted;
90+
}
91+
92+
private List<Object> getConvertedBootOps(List<ModelNode> bootOperations) {
93+
List<Object> converted = new ArrayList<>();
94+
for (ModelNode node : bootOperations) {
95+
if (node != null) {
96+
converted.add(objectConverter.convertModelNodeToChildCl(node));
97+
}
98+
}
99+
return converted;
100+
}
71101
}
102+

0 commit comments

Comments
 (0)