Revert "Revert "WFLY-5489 Fix and and add missing transformations for…

… EAP in modcluster subsystem""

This reverts commit df351c8.

mod_cluster/extension/src/main/java/org/wildfly/extension/mod_cluster/ModClusterConfigResourceDefinition.java

@@ -73,7 +73,7 @@ class ModClusterConfigResourceDefinition extends SimpleResourceDefinition {
     static final SimpleAttributeDefinition SESSION_DRAINING_STRATEGY = SimpleAttributeDefinitionBuilder.create(CommonAttributes.SESSION_DRAINING_STRATEGY, ModelType.STRING, true)
             .setAllowExpression(true)
             .setDefaultValue(new ModelNode(SessionDrainingStrategyEnum.DEFAULT.name()))
-            .setValidator(new EnumValidator<SessionDrainingStrategyEnum>(SessionDrainingStrategyEnum.class, true, true,
+            .setValidator(new EnumValidator<>(SessionDrainingStrategyEnum.class, true, true,
                     SessionDrainingStrategyEnum.ALWAYS,
                     SessionDrainingStrategyEnum.DEFAULT,
                     SessionDrainingStrategyEnum.NEVER))
@@ -310,7 +310,7 @@ public static void buildTransformation(ModelVersion version, ResourceTransformat
                     .end();
         }
 
-        if (ModClusterModel.VERSION_2_0_0.requiresTransformation(version)) {
+        if (ModClusterModel.VERSION_1_5_0.requiresTransformation(version)) {
             builder.getAttributeBuilder()
                     .addRejectCheck(SessionDrainingStrategyChecker.INSTANCE, SESSION_DRAINING_STRATEGY)
                     .setDiscard(SessionDrainingStrategyChecker.INSTANCE, SESSION_DRAINING_STRATEGY)

mod_cluster/extension/src/main/java/org/wildfly/extension/mod_cluster/ModClusterModel.java

@@ -32,6 +32,7 @@
 public enum ModClusterModel {
 
     VERSION_1_4_0(1, 4, 0),
+    VERSION_1_5_0(1, 5, 0),
     VERSION_2_0_0(2, 0, 0),
     VERSION_3_0_0(3, 0, 0),
     ;

mod_cluster/extension/src/test/java/org/wildfly/extension/mod_cluster/ModClusterSubsystemParsingTestCase.java

@@ -0,0 +1,120 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2015, Red Hat, Inc., and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.wildfly.extension.mod_cluster;
+
+import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.SSL;
+import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.SUBSYSTEM;
+import static org.wildfly.extension.mod_cluster.CommonAttributes.CONFIGURATION;
+import static org.wildfly.extension.mod_cluster.CommonAttributes.MOD_CLUSTER_CONFIG;
+
+import java.io.IOException;
+
+import org.jboss.as.subsystem.test.AbstractSubsystemBaseTest;
+import org.jboss.as.subsystem.test.AdditionalInitialization;
+import org.jboss.as.subsystem.test.KernelServices;
+import org.jboss.as.subsystem.test.KernelServicesBuilder;
+import org.jboss.dmr.ModelNode;
+import org.jboss.modcluster.config.MCMPHandlerConfiguration;
+import org.jboss.msc.service.ServiceController;
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * @author <a href="kabir.khan@jboss.com">Kabir Khan</a>
+ * @author Jean-Frederic Clere
+ * @author Radoslav Husar
+ * @version Apr 2015
+ */
+public class ModClusterSubsystemParsingTestCase extends AbstractSubsystemBaseTest {
+
+    public ModClusterSubsystemParsingTestCase() {
+        super(ModClusterExtension.SUBSYSTEM_NAME, new ModClusterExtension());
+    }
+
+    // --------------------------------------------------- Standard Subsystem tests
+
+    @Test
+    public void testXsd10() throws Exception {
+        standardSubsystemTest("subsystem_1_0.xml", false);
+    }
+
+    @Test
+    public void testXsd11() throws Exception {
+        standardSubsystemTest("subsystem_1_1.xml", false);
+    }
+
+    @Test
+    public void testXsd12() throws Exception {
+        standardSubsystemTest("subsystem_1_2.xml", false);
+    }
+
+    @Test
+    public void testSubsystemWithSimpleLoadProvider() throws Exception {
+        super.standardSubsystemTest("subsystem_2_0_simple-load-provider.xml");
+    }
+
+    @Override
+    protected String getSubsystemXml() throws IOException {
+        return readResource("subsystem_2_0.xml");
+    }
+
+    @Override
+    protected String getSubsystemXsdPath() throws Exception {
+        return "schema/jboss-as-mod-cluster_2_0.xsd";
+    }
+
+    @Override
+    protected String[] getSubsystemTemplatePaths() throws IOException {
+        return new String[] {
+                "/subsystem-templates/mod_cluster.xml"
+        };
+    }
+
+    @Test
+    public void testSSL() throws Exception {
+        KernelServicesBuilder builder = createKernelServicesBuilder(new AdditionalInitialization()).setSubsystemXml(getSubsystemXml());
+        KernelServices services = builder.build();
+        ModelNode model = services.readWholeModel();
+        ModelNode config = model.get(SUBSYSTEM, getMainSubsystemName()).get(MOD_CLUSTER_CONFIG, CONFIGURATION);
+        ModelNode ssl = config.get(SSL, CONFIGURATION);
+        Assert.assertEquals("/home/rhusar/client-keystore.jks", ssl.get("ca-certificate-file").resolve().asString());
+        Assert.assertEquals("/home/rhusar/revocations", ssl.get("ca-revocation-url").resolve().asString());
+        Assert.assertEquals("/home/rhusar/client-keystore.jks", ssl.get("certificate-key-file").resolve().asString());
+        Assert.assertEquals("SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA,SSL_RSA_WITH_RC4_128_MD5,SSL_RSA_WITH_RC4_128_SHA,SSL_RSA_WITH_3DES_EDE_CBC_SHA", ssl.get("cipher-suite").resolve().asString());
+        Assert.assertEquals("mykeyalias", ssl.get("key-alias").resolve().asString());
+        Assert.assertEquals("mypassword", ssl.get("password").resolve().asString());
+        Assert.assertEquals("TLSv1", ssl.get("protocol").resolve().asString());
+        ServiceController<?> service = services.getContainer().getService(ContainerEventHandlerService.CONFIG_SERVICE_NAME);
+        MCMPHandlerConfiguration sslConfig = (MCMPHandlerConfiguration) service.getValue();
+        Assert.assertTrue(sslConfig.isSsl());
+        Assert.assertEquals("mykeyalias", sslConfig.getSslKeyAlias());
+        Assert.assertEquals("mypassword", sslConfig.getSslTrustStorePassword());
+        Assert.assertEquals("mypassword", sslConfig.getSslKeyStorePassword());
+        Assert.assertEquals("/home/rhusar/client-keystore.jks", sslConfig.getSslKeyStore());
+        Assert.assertEquals("SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA,SSL_RSA_WITH_RC4_128_MD5,SSL_RSA_WITH_RC4_128_SHA,SSL_RSA_WITH_3DES_EDE_CBC_SHA", sslConfig.getSslCiphers());
+        Assert.assertEquals("TLSv1", sslConfig.getSslProtocol());
+        Assert.assertEquals("/home/rhusar/client-keystore.jks", sslConfig.getSslTrustStore());
+        Assert.assertEquals("/home/rhusar/revocations", sslConfig.getSslCrlFile());
+    }
+
+}