Merge pull request #1182 from hchiorean/MODE-2259-3.x

MODE-2259-3.x Fixed the EAP domain mode deployment issues on the 3.x branch
ModeShape · Jul 18, 2014 · 63f2064 · 63f2064
2 parents 5056840 + a912000
commit 63f2064
Show file tree

Hide file tree

Showing 24 changed files with 302 additions and 319 deletions.
diff --git a/...pe-jbossas-subsystem/src/main/java/org/modeshape/jboss/metric/ModeShapeMetricHandler.java b/...pe-jbossas-subsystem/src/main/java/org/modeshape/jboss/metric/ModeShapeMetricHandler.java
@@ -23,15 +23,14 @@
  */
 package org.modeshape.jboss.metric;
 
-import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP_ADDR;
 import org.jboss.as.controller.AbstractRuntimeOnlyHandler;
 import org.jboss.as.controller.OperationContext;
 import org.jboss.as.controller.OperationFailedException;
-import org.jboss.as.controller.PathAddress;
 import org.jboss.dmr.ModelNode;
 import org.jboss.logging.Logger;
 import org.jboss.msc.service.ServiceController;
 import org.modeshape.common.util.CheckArg;
+import org.modeshape.jboss.subsystem.AddressContext;
 import org.modeshape.jboss.subsystem.ModeShapeServiceNames;
 import org.modeshape.jcr.api.monitor.History;
 import org.modeshape.jcr.api.monitor.RepositoryMonitor;
@@ -61,9 +60,8 @@ protected ModeShapeMetricHandler( final Window metricWindow ) {
     @Override
     protected void executeRuntimeStep( final OperationContext context,
                                        final ModelNode operation ) throws OperationFailedException {
-        final ModelNode address = operation.require(OP_ADDR);
-        final PathAddress pathAddress = PathAddress.pathAddress(address);
-        final String repositoryName = pathAddress.getLastElement().getValue();
+        AddressContext addressContext = AddressContext.forOperation(operation);
+        final String repositoryName = addressContext.repositoryName();
         final ServiceController<?> sc = context.getServiceRegistry(false).getService(ModeShapeServiceNames.monitorServiceName(repositoryName));
         if (sc == null) {
             logger().debugv("ModeShape metric handler for repository {0} ignoring runtime step because the monitoring service is unavailable." +

diff --git a/...ossas-subsystem/src/main/java/org/modeshape/jboss/subsystem/AbstractAddBinaryStorage.java b/...ossas-subsystem/src/main/java/org/modeshape/jboss/subsystem/AbstractAddBinaryStorage.java
@@ -23,15 +23,13 @@
  */
 package org.modeshape.jboss.subsystem;
 
-import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP_ADDR;
 import java.util.List;
 import org.infinispan.schematic.Schematic;
 import org.infinispan.schematic.document.EditableDocument;
 import org.jboss.as.controller.AbstractAddStepHandler;
 import org.jboss.as.controller.AttributeDefinition;
 import org.jboss.as.controller.OperationContext;
 import org.jboss.as.controller.OperationFailedException;
-import org.jboss.as.controller.PathAddress;
 import org.jboss.as.controller.ServiceVerificationHandler;
 import org.jboss.dmr.ModelNode;
 import org.jboss.msc.service.ServiceBuilder;
@@ -64,9 +62,8 @@ protected void performRuntime( final OperationContext context,
 
         ServiceTarget target = context.getServiceTarget();
 
-        final ModelNode address = operation.require(OP_ADDR);
-        final PathAddress pathAddress = PathAddress.pathAddress(address);
-        final String repositoryName = pathAddress.getElement(1).getValue();
+        final AddressContext addressContext = AddressContext.forOperation(operation);
+        final String repositoryName = addressContext.repositoryName();
 
         // Build the 'binaryStorage' document ...
         EditableDocument binaries = Schematic.newDocument();

diff --git a/...bossas-subsystem/src/main/java/org/modeshape/jboss/subsystem/AbstractAddIndexStorage.java b/...bossas-subsystem/src/main/java/org/modeshape/jboss/subsystem/AbstractAddIndexStorage.java
@@ -23,14 +23,12 @@
  */
 package org.modeshape.jboss.subsystem;
 
-import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP_ADDR;
 import java.util.List;
 import org.infinispan.schematic.document.EditableDocument;
 import org.jboss.as.controller.AbstractAddStepHandler;
 import org.jboss.as.controller.AttributeDefinition;
 import org.jboss.as.controller.OperationContext;
 import org.jboss.as.controller.OperationFailedException;
-import org.jboss.as.controller.PathAddress;
 import org.jboss.as.controller.ServiceVerificationHandler;
 import org.jboss.dmr.ModelNode;
 import org.jboss.msc.service.ServiceBuilder;
@@ -66,9 +64,9 @@ protected void performRuntime( final OperationContext context,
 
         ServiceTarget target = context.getServiceTarget();
 
-        final ModelNode address = operation.require(OP_ADDR);
-        final PathAddress pathAddress = PathAddress.pathAddress(address);
-        final String repositoryName = pathAddress.getElement(1).getValue();
+
+        final AddressContext addressContext = AddressContext.forOperation(operation);
+        final String repositoryName = addressContext.repositoryName();
         ServiceName indexStorageServiceName = ModeShapeServiceNames.indexStorageServiceName(repositoryName);
 
         //get the default service registered by "AddRepository
@@ -99,11 +97,6 @@ protected void performRuntime( final OperationContext context,
         newControllers.add(indexBuilder.install());
     }
 
-    @Override
-    protected boolean requiresRuntime( OperationContext context ) {
-        return true;
-    }
-
     protected abstract void writeIndexStorageConfiguration( final OperationContext context,
                                                             final ModelNode storage,
                                                             EditableDocument indexStorage,

diff --git a/...ystem/src/main/java/org/modeshape/jboss/subsystem/AbstractModeShapeRemoveStepHandler.java b/...ystem/src/main/java/org/modeshape/jboss/subsystem/AbstractModeShapeRemoveStepHandler.java
@@ -24,15 +24,12 @@
 
 package org.modeshape.jboss.subsystem;
 
-import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP_ADDR;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import org.jboss.as.controller.AbstractRemoveStepHandler;
 import org.jboss.as.controller.OperationContext;
 import org.jboss.as.controller.OperationFailedException;
-import org.jboss.as.controller.PathAddress;
-import org.jboss.as.controller.PathElement;
 import org.jboss.dmr.ModelNode;
 import org.jboss.logging.Logger;
 import org.jboss.msc.service.Service;
@@ -105,13 +102,12 @@ protected void recoverServices( OperationContext context,
     }
 
     String repositoryName( ModelNode operation ) throws OperationFailedException {
-        PathAddress pathAddress = PathAddress.pathAddress(operation.get(OP_ADDR));
-        for (PathElement pathElement : pathAddress) {
-            if (pathElement.getKey().equalsIgnoreCase(ModelKeys.REPOSITORY)) {
-                return pathElement.getValue();
-            }
+        AddressContext addressContext = AddressContext.forOperation(operation);
+        String repositoryName = addressContext.repositoryName();
+        if (repositoryName == null) {
+            throw new OperationFailedException("Cannot determine repository name for: " + operation.asString());
         }
-        throw new OperationFailedException("Cannot determine repository name for: " + operation.asString());
+        return repositoryName;
     }
 
     abstract List<ServiceName> servicesToRemove( OperationContext context,

diff --git a/...ain/java/org/modeshape/jboss/subsystem/AbstractRepositoryConfigWriteAttributeHandler.java b/...ain/java/org/modeshape/jboss/subsystem/AbstractRepositoryConfigWriteAttributeHandler.java
@@ -23,7 +23,6 @@
  */
 package org.modeshape.jboss.subsystem;
 
-import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP_ADDR;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
@@ -34,8 +33,6 @@
 import org.jboss.as.controller.OperationContext;
 import org.jboss.as.controller.OperationFailedException;
 import org.jboss.as.controller.OperationStepHandler;
-import org.jboss.as.controller.PathAddress;
-import org.jboss.as.controller.PathElement;
 import org.jboss.as.controller.registry.ManagementResourceRegistration;
 import org.jboss.dmr.ModelNode;
 import org.jboss.msc.service.ServiceController;
@@ -92,9 +89,8 @@ protected void revertUpdateToRuntime( OperationContext context,
     }
 
     protected final String repositoryName( ModelNode operation ) {
-        PathAddress address = PathAddress.pathAddress(operation.get(OP_ADDR));
-        PathElement element = address.getElement(1);
-        return element.getValue();
+        AddressContext addressContext = AddressContext.forOperation(operation);
+        return addressContext.repositoryName();
     }
 
     protected boolean changeConfiguration( OperationContext context,

diff --git a/...shape-jbossas-subsystem/src/main/java/org/modeshape/jboss/subsystem/AddAuthenticator.java b/...shape-jbossas-subsystem/src/main/java/org/modeshape/jboss/subsystem/AddAuthenticator.java
@@ -26,14 +26,12 @@
 import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.ADDRESS;
 import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP;
 import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OPERATION_HEADERS;
-import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP_ADDR;
 import java.util.List;
 import java.util.Properties;
 import org.jboss.as.controller.AbstractAddStepHandler;
 import org.jboss.as.controller.AttributeDefinition;
 import org.jboss.as.controller.OperationContext;
 import org.jboss.as.controller.OperationFailedException;
-import org.jboss.as.controller.PathAddress;
 import org.jboss.as.controller.ServiceVerificationHandler;
 import org.jboss.dmr.ModelNode;
 import org.jboss.dmr.Property;
@@ -66,11 +64,6 @@ static void populate( ModelNode operation,
         }
     }
 
-    @Override
-    protected boolean requiresRuntime( OperationContext context ) {
-        return true;
-    }
-
     @Override
     protected void performRuntime( final OperationContext context,
                                    final ModelNode operation,
@@ -79,13 +72,11 @@ protected void performRuntime( final OperationContext context,
                                    final List<ServiceController<?>> newControllers ) {
 
         ServiceTarget target = context.getServiceTarget();
-
         Properties props = new Properties();
+        final AddressContext addressContext = AddressContext.forOperation(operation);
 
-        final ModelNode address = operation.require(OP_ADDR);
-        final PathAddress pathAddress = PathAddress.pathAddress(address);
-        final String repositoryName = pathAddress.getElement(1).getValue();
-        final String authenticatorName = pathAddress.getLastElement().getValue();
+        final String repositoryName = addressContext.repositoryName();
+        final String authenticatorName = addressContext.lastPathElementValue();
 
         // Record the properties ...
         props.put(FieldName.NAME, authenticatorName);

diff --git a/...-jbossas-subsystem/src/main/java/org/modeshape/jboss/subsystem/AddModeShapeSubsystem.java b/...-jbossas-subsystem/src/main/java/org/modeshape/jboss/subsystem/AddModeShapeSubsystem.java
@@ -67,19 +67,13 @@ protected void performRuntime( final OperationContext context,
         initializeModeShapeEngine(context, operation, model, newControllers);
     }
 
-    @Override
-    protected boolean requiresRuntime( OperationContext context ) {
-        return true;
-    }
-
     private void initializeModeShapeEngine( final OperationContext context,
                                             final ModelNode operation,
                                             ModelNode model,
                                             final List<ServiceController<?>> newControllers ) {
         ServiceTarget target = context.getServiceTarget();
 
-        final JBossLifeCycleListener shutdownListener = new JBossLifeCycleListener(); // what is right, this or one defined in
-                                                                                      // top?
+        final JBossLifeCycleListener shutdownListener = new JBossLifeCycleListener();
 
         EngineService engine = new EngineService(new ModeShapeEngine());
 

diff --git a/...odeshape-jbossas-subsystem/src/main/java/org/modeshape/jboss/subsystem/AddRepository.java b/...odeshape-jbossas-subsystem/src/main/java/org/modeshape/jboss/subsystem/AddRepository.java
@@ -23,7 +23,6 @@
  */
 package org.modeshape.jboss.subsystem;
 
-import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP_ADDR;
 import java.util.List;
 import org.infinispan.manager.CacheContainer;
 import org.infinispan.schematic.Schematic;
@@ -34,7 +33,6 @@
 import org.jboss.as.controller.AttributeDefinition;
 import org.jboss.as.controller.OperationContext;
 import org.jboss.as.controller.OperationFailedException;
-import org.jboss.as.controller.PathAddress;
 import org.jboss.as.controller.ServiceVerificationHandler;
 import org.jboss.as.controller.services.path.RelativePathService;
 import org.jboss.as.naming.ManagedReferenceFactory;
@@ -120,9 +118,8 @@ protected void performRuntime( final OperationContext context,
                                    final List<ServiceController<?>> newControllers ) throws OperationFailedException {
 
         final ServiceTarget target = context.getServiceTarget();
-        final ModelNode address = operation.require(OP_ADDR);
-        final PathAddress pathAddress = PathAddress.pathAddress(address);
-        final String repositoryName = pathAddress.getLastElement().getValue();
+        final AddressContext addressContext = AddressContext.forOperation(operation);
+        final String repositoryName = addressContext.repositoryName();
         final String cacheName = attribute(context, model, ModelAttributes.CACHE_NAME, repositoryName);
         final String clusterChannelName = attribute(context, model, ModelAttributes.CLUSTER_NAME, null);
         final String clusterStackName = attribute(context, model, ModelAttributes.CLUSTER_STACK, null);
@@ -328,11 +325,6 @@ protected void performRuntime( final OperationContext context,
         newControllers.add(monitorBuilder.install());
     }
 
-    @Override
-    protected boolean requiresRuntime( OperationContext context ) {
-        return true;
-    }
-
     private void parseClustering( String clusterChannelName,
                                   EditableDocument configDoc ) {
         if (clusterChannelName != null) {

diff --git a/...modeshape-jbossas-subsystem/src/main/java/org/modeshape/jboss/subsystem/AddSequencer.java b/...modeshape-jbossas-subsystem/src/main/java/org/modeshape/jboss/subsystem/AddSequencer.java
@@ -26,15 +26,13 @@
 import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.ADDRESS;
 import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP;
 import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OPERATION_HEADERS;
-import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP_ADDR;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
 import org.jboss.as.controller.AbstractAddStepHandler;
 import org.jboss.as.controller.AttributeDefinition;
 import org.jboss.as.controller.OperationContext;
 import org.jboss.as.controller.OperationFailedException;
-import org.jboss.as.controller.PathAddress;
 import org.jboss.as.controller.ServiceVerificationHandler;
 import org.jboss.dmr.ModelNode;
 import org.jboss.dmr.Property;
@@ -82,10 +80,9 @@ protected void performRuntime( final OperationContext context,
 
         Properties props = new Properties();
 
-        final ModelNode address = operation.require(OP_ADDR);
-        final PathAddress pathAddress = PathAddress.pathAddress(address);
-        final String repositoryName = pathAddress.getElement(1).getValue();
-        final String sequencerName = pathAddress.getLastElement().getValue();
+        final AddressContext addressContext = AddressContext.forOperation(operation);
+        final String repositoryName = addressContext.repositoryName();
+        final String sequencerName = addressContext.lastPathElementValue();
 
         // Record the properties ...
         props.put(FieldName.NAME, sequencerName);
@@ -132,11 +129,6 @@ protected void performRuntime( final OperationContext context,
         newControllers.add(controller);
     }
 
-    @Override
-    protected boolean requiresRuntime( OperationContext context ) {
-        return true;
-    }
-
     private void ensureClassLoadingPropertyIsSet( Properties sequencerProperties ) {
         // could be already set if the "module" element is present in the xml (AddSequencer)
         if (sequencerProperties.containsKey(FieldName.CLASSLOADER)) {

diff --git a/...as/modeshape-jbossas-subsystem/src/main/java/org/modeshape/jboss/subsystem/AddSource.java b/...as/modeshape-jbossas-subsystem/src/main/java/org/modeshape/jboss/subsystem/AddSource.java
@@ -27,7 +27,6 @@
 import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.ADDRESS;
 import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP;
 import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OPERATION_HEADERS;
-import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP_ADDR;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -36,7 +35,6 @@
 import org.jboss.as.controller.AttributeDefinition;
 import org.jboss.as.controller.OperationContext;
 import org.jboss.as.controller.OperationFailedException;
-import org.jboss.as.controller.PathAddress;
 import org.jboss.as.controller.ServiceVerificationHandler;
 import org.jboss.dmr.ModelNode;
 import org.jboss.dmr.Property;
@@ -93,10 +91,9 @@ protected void performRuntime( final OperationContext context,
         ServiceTarget target = context.getServiceTarget();
 
 
-        final ModelNode address = operation.require(OP_ADDR);
-        final PathAddress pathAddress = PathAddress.pathAddress(address);
-        final String repositoryName = pathAddress.getElement(1).getValue();
-        final String sourceName = pathAddress.getLastElement().getValue();
+        final AddressContext addressContext = AddressContext.forOperation(operation);
+        final String repositoryName = addressContext.repositoryName();
+        final String sourceName = addressContext.lastPathElementValue();
 
         Properties props = new Properties();
 
@@ -151,11 +148,6 @@ protected void performRuntime( final OperationContext context,
         newControllers.add(controller);
     }
 
-    @Override
-    protected boolean requiresRuntime( OperationContext context ) {
-        return true;
-    }
-
     private Object propertyValue(Property property) {
         String propertyName = property.getName();
         String valueAsString = property.getValue().asString();

diff --git a/...shape-jbossas-subsystem/src/main/java/org/modeshape/jboss/subsystem/AddTextExtractor.java b/...shape-jbossas-subsystem/src/main/java/org/modeshape/jboss/subsystem/AddTextExtractor.java
@@ -26,14 +26,12 @@
 import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.ADDRESS;
 import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP;
 import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OPERATION_HEADERS;
-import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP_ADDR;
 import java.util.List;
 import java.util.Properties;
 import org.jboss.as.controller.AbstractAddStepHandler;
 import org.jboss.as.controller.AttributeDefinition;
 import org.jboss.as.controller.OperationContext;
 import org.jboss.as.controller.OperationFailedException;
-import org.jboss.as.controller.PathAddress;
 import org.jboss.as.controller.ServiceVerificationHandler;
 import org.jboss.dmr.ModelNode;
 import org.jboss.dmr.Property;
@@ -82,10 +80,9 @@ protected void performRuntime( final OperationContext context,
 
         Properties props = new Properties();
 
-        final ModelNode address = operation.require(OP_ADDR);
-        final PathAddress pathAddress = PathAddress.pathAddress(address);
-        final String repositoryName = pathAddress.getElement(1).getValue();
-        final String extractorName = pathAddress.getLastElement().getValue();
+        final AddressContext addressContext = AddressContext.forOperation(operation);
+        final String repositoryName = addressContext.repositoryName();
+        final String extractorName = addressContext.lastPathElementValue();
 
         // Record the properties ...
         props.put(FieldName.NAME, extractorName);
@@ -126,11 +123,6 @@ protected void performRuntime( final OperationContext context,
         newControllers.add(controller);
     }
 
-    @Override
-    protected boolean requiresRuntime( OperationContext context ) {
-        return true;
-    }
-
     private void ensureClassLoadingPropertyIsSet( Properties properties ) {
         // could be already set if the "module" element is present in the xml
         if (properties.containsKey(FieldName.CLASSLOADER)) {