Merge pull request logstash-plugins#15 from ceharris/wildfly14

Support for Wildfly 14
sfuhrm · Dec 11, 2018 · 074fc5c · 074fc5c
2 parents 4479a1d + 09184ac
commit 074fc5c
Show file tree

Hide file tree

Showing 8 changed files with 260 additions and 33 deletions.
diff --git a/cas-subsystem/src/main/java/org/soulwing/cas/extension/AttributeTransformDefinition.java b/cas-subsystem/src/main/java/org/soulwing/cas/extension/AttributeTransformDefinition.java
@@ -24,7 +24,6 @@
 import org.jboss.as.controller.PathAddress;
 import org.jboss.as.controller.RestartParentResourceAddHandler;
 import org.jboss.as.controller.RestartParentResourceRemoveHandler;
-import org.jboss.as.controller.ServiceVerificationHandler;
 import org.jboss.as.controller.SimpleResourceDefinition;
 import org.jboss.as.controller.registry.ManagementResourceRegistration;
 import org.jboss.dmr.ModelNode;
@@ -102,8 +101,7 @@ protected void populateModel(ModelNode operation, ModelNode model)
      */
     @Override
     protected void recreateParentService(OperationContext context,
-        PathAddress parentAddress, ModelNode parentModel,
-        ServiceVerificationHandler verificationHandler)
+        PathAddress parentAddress, ModelNode parentModel)
         throws OperationFailedException {
       ProfileService.ServiceUtil.installService(context, parentModel, 
           parentAddress);
@@ -134,8 +132,7 @@ private AttributeTransformRemove() {
      */
     @Override
     protected void recreateParentService(OperationContext context,
-        PathAddress parentAddress, ModelNode parentModel,
-        ServiceVerificationHandler verificationHandler)
+        PathAddress parentAddress, ModelNode parentModel)
         throws OperationFailedException {
       ProfileService.ServiceUtil.installService(context, parentModel, 
           parentAddress);

diff --git a/cas-subsystem/src/main/java/org/soulwing/cas/extension/HostnameVerifierDefinition.java b/cas-subsystem/src/main/java/org/soulwing/cas/extension/HostnameVerifierDefinition.java
@@ -27,7 +27,6 @@
 import org.jboss.as.controller.PathElement;
 import org.jboss.as.controller.RestartParentResourceAddHandler;
 import org.jboss.as.controller.RestartParentResourceRemoveHandler;
-import org.jboss.as.controller.ServiceVerificationHandler;
 import org.jboss.as.controller.SimpleAttributeDefinition;
 import org.jboss.as.controller.SimpleAttributeDefinitionBuilder;
 import org.jboss.as.controller.SimpleListAttributeDefinition;
@@ -138,8 +137,7 @@ protected ServiceName getParentServiceName(PathAddress parentAddress) {
      */
     @Override
     protected void recreateParentService(OperationContext context,
-        PathAddress parentAddress, ModelNode parentModel,
-        ServiceVerificationHandler verificationHandler)
+        PathAddress parentAddress, ModelNode parentModel)
         throws OperationFailedException {
       ProfileService.ServiceUtil.installService(context, parentModel, 
           parentAddress);
@@ -187,8 +185,7 @@ protected ServiceName getParentServiceName(PathAddress parentAddress) {
      */
     @Override
     protected void recreateParentService(OperationContext context,
-        PathAddress parentAddress, ModelNode parentModel,
-        ServiceVerificationHandler verificationHandler)
+        PathAddress parentAddress, ModelNode parentModel)
         throws OperationFailedException {
       ProfileService.ServiceUtil.installService(context, parentModel, 
           parentAddress);

diff --git a/cas-subsystem/src/main/java/org/soulwing/cas/extension/ProfileDefinition.java b/cas-subsystem/src/main/java/org/soulwing/cas/extension/ProfileDefinition.java
@@ -27,7 +27,6 @@
 import org.jboss.as.controller.OperationFailedException;
 import org.jboss.as.controller.PathAddress;
 import org.jboss.as.controller.RestartParentWriteAttributeHandler;
-import org.jboss.as.controller.ServiceVerificationHandler;
 import org.jboss.as.controller.SimpleAttributeDefinition;
 import org.jboss.as.controller.SimpleAttributeDefinitionBuilder;
 import org.jboss.as.controller.SimpleResourceDefinition;
@@ -244,18 +243,19 @@ private ProfileAdd() {
      */
     @Override
     protected void performRuntime(OperationContext context,
-        ModelNode operation, ModelNode model,
-        ServiceVerificationHandler verificationHandler,
-        List<ServiceController<?>> newControllers)
+        ModelNode operation, ModelNode model)
         throws OperationFailedException {
 
       ServiceController<?> controller = 
           ProfileService.ServiceUtil.installService(context, model, 
               PathAddress.pathAddress(
                   operation.get(ModelDescriptionConstants.OP_ADDR)));
-
-      newControllers.add(
-          (ServiceController<?>) controller);
+
+      //,
+      //        ServiceVerificationHandler verificationHandler,
+      //        List<ServiceController<?>> newControllers
+      //newControllers.add(
+      //    (ServiceController<?>) controller);
     }
 
   }
@@ -316,8 +316,7 @@ protected ServiceName getParentServiceName(PathAddress parentAddress) {
      */
     @Override
     protected void recreateParentService(OperationContext context,
-        PathAddress parentAddress, ModelNode parentModel,
-        ServiceVerificationHandler verificationHandler)
+        PathAddress parentAddress, ModelNode parentModel)
         throws OperationFailedException {
       ProfileService.ServiceUtil.installService(context, parentModel, 
           parentAddress);

diff --git a/cas-subsystem/src/main/java/org/soulwing/cas/extension/ProxyChainDefinition.java b/cas-subsystem/src/main/java/org/soulwing/cas/extension/ProxyChainDefinition.java
@@ -24,7 +24,6 @@
 import org.jboss.as.controller.PathAddress;
 import org.jboss.as.controller.RestartParentResourceAddHandler;
 import org.jboss.as.controller.RestartParentResourceRemoveHandler;
-import org.jboss.as.controller.ServiceVerificationHandler;
 import org.jboss.as.controller.SimpleAttributeDefinition;
 import org.jboss.as.controller.SimpleAttributeDefinitionBuilder;
 import org.jboss.as.controller.SimpleListAttributeDefinition;
@@ -121,8 +120,7 @@ protected ServiceName getParentServiceName(PathAddress parentAddress) {
      */
     @Override
     protected void recreateParentService(OperationContext context,
-        PathAddress parentAddress, ModelNode parentModel,
-        ServiceVerificationHandler verificationHandler)
+        PathAddress parentAddress, ModelNode parentModel)
         throws OperationFailedException {
       ProfileService.ServiceUtil.installService(context, parentModel, 
           parentAddress);
@@ -152,8 +150,7 @@ protected ServiceName getParentServiceName(PathAddress parentAddress) {
      */
     @Override
     protected void recreateParentService(OperationContext context,
-        PathAddress parentAddress, ModelNode parentModel,
-        ServiceVerificationHandler verificationHandler)
+        PathAddress parentAddress, ModelNode parentModel)
         throws OperationFailedException {
       ProfileService.ServiceUtil.installService(context, parentModel, 
           parentAddress);

diff --git a/cas-subsystem/src/main/java/org/soulwing/cas/extension/SubsystemDefinition.java b/cas-subsystem/src/main/java/org/soulwing/cas/extension/SubsystemDefinition.java
@@ -24,7 +24,6 @@
 import org.jboss.as.controller.AbstractRemoveStepHandler;
 import org.jboss.as.controller.OperationContext;
 import org.jboss.as.controller.OperationFailedException;
-import org.jboss.as.controller.ServiceVerificationHandler;
 import org.jboss.as.controller.SimpleResourceDefinition;
 import org.jboss.as.controller.operations.common.GenericSubsystemDescribeHandler;
 import org.jboss.as.controller.registry.ManagementResourceRegistration;
@@ -85,8 +84,7 @@ protected void populateModel(ModelNode operation, ModelNode model)
      */
     @Override
     public void performBoottime(OperationContext context, ModelNode operation,
-        ModelNode model, ServiceVerificationHandler verificationHandler,
-        List<ServiceController<?>> newControllers)
+        ModelNode model)
         throws OperationFailedException {
 
       DescriptorDeploymentProcessor.addStepHandler(context);

diff --git a/cas-subsystem/src/main/java/org/soulwing/cas/extension/TransformerDefinition.java b/cas-subsystem/src/main/java/org/soulwing/cas/extension/TransformerDefinition.java
@@ -24,7 +24,6 @@
 import org.jboss.as.controller.PathAddress;
 import org.jboss.as.controller.RestartParentResourceAddHandler;
 import org.jboss.as.controller.RestartParentResourceRemoveHandler;
-import org.jboss.as.controller.ServiceVerificationHandler;
 import org.jboss.as.controller.SimpleAttributeDefinition;
 import org.jboss.as.controller.SimpleAttributeDefinitionBuilder;
 import org.jboss.as.controller.SimpleMapAttributeDefinition;
@@ -130,8 +129,7 @@ protected void populateModel(ModelNode operation, ModelNode model)
      */
     @Override
     protected void recreateParentService(OperationContext context,
-        PathAddress parentAddress, ModelNode parentModel,
-        ServiceVerificationHandler verificationHandler)
+        PathAddress parentAddress, ModelNode parentModel)
         throws OperationFailedException {
       ProfileService.ServiceUtil.installService(context, parentModel, 
           parentAddress);
@@ -162,8 +160,7 @@ private TransformerRemove() {
      */
     @Override
     protected void recreateParentService(OperationContext context,
-        PathAddress parentAddress, ModelNode parentModel,
-        ServiceVerificationHandler verificationHandler)
+        PathAddress parentAddress, ModelNode parentModel)
         throws OperationFailedException {
       ProfileService.ServiceUtil.installService(context, parentModel, 
           parentAddress);

diff --git a/pom.xml b/pom.xml
@@ -15,7 +15,7 @@
     An extension for Wildfly that supports CAS authentication.
   </description>
   <properties>
-    <version.org.jasig.cas.client>3.4.1</version.org.jasig.cas.client>
+    <version.org.jasig.cas.client>3.5.0</version.org.jasig.cas.client>
     <module.name>cas</module.name>
   </properties>
   <scm>
@@ -70,6 +70,15 @@
     </dependencies>
   </dependencyManagement>
   <profiles>
+    <profile>
+      <id>wildfly14</id>
+      <properties>
+        <java.version>1.8</java.version>
+        <version.org.wildfly>14.0.1.Final</version.org.wildfly>
+        <version.org.wildfly.core>6.0.2.Final</version.org.wildfly.core>
+        <version.io.undertow>2.0.13.Final</version.io.undertow>
+      </properties>
+    </profile>
     <profile>
       <id>wildfly10</id>
       <properties>
@@ -143,6 +152,12 @@
       </dependencyManagement>
     </profile>
   </profiles>
+  <repositories>
+    <repository> 
+      <id>jboss</id>
+      <url>http://repository.jboss.org/nexus/content/groups/public-jboss/</url>
+    </repository>
+  </repositories>
   <modules>
     <module>cas-subsystem</module>
     <module>cas-opensaml</module>