A bit of cleanup...

jaxrs-server-integration/src/main/java/org/jboss/as/jaxrs/JaxrsDeploymentDefinition.java

@@ -61,6 +61,7 @@
  *
  * @author <a href="mailto:ehugonne@redhat.com">Emmanuel Hugonnet</a> (c) 2014 Red Hat, inc.
  */
+//TODO!!! Restore management
 public class JaxrsDeploymentDefinition extends SimpleResourceDefinition {
 
     public static final JaxrsDeploymentDefinition DEPLOYMENT_INSTANCE = new JaxrsDeploymentDefinition(true);

jaxrs-server-integration/src/main/java/org/jboss/as/jaxrs/JaxrsSubsystemAdd.java

@@ -28,7 +28,6 @@
 import org.jboss.as.controller.registry.Resource;
 import org.jboss.as.jaxrs.deployment.AspectDeploymentProcessor;
 import org.jboss.as.jaxrs.deployment.JaxrsAnnotationProcessor;
-import org.jboss.as.jaxrs.deployment.JaxrsCdiIntegrationProcessor;
 import org.jboss.as.jaxrs.deployment.JaxrsComponentDeployer;
 import org.jboss.as.jaxrs.deployment.JaxrsDependencyProcessor;
 import org.jboss.as.jaxrs.deployment.JaxrsIntegrationProcessor;
@@ -56,15 +55,13 @@ protected void populateModel(ModelNode operation, ModelNode model) {
     protected void performBoottime(final OperationContext context, ModelNode operation, Resource resource) {
 
         ModuleJAXRSClassLoaderProvider.register();
-//        final ServiceTarget serviceTarget = context.getServiceTarget();
         context.addStep(new AbstractDeploymentChainStep() {
             public void execute(DeploymentProcessorTarget processorTarget) {
                 processorTarget.addDeploymentProcessor(JaxrsExtension.SUBSYSTEM_NAME, Phase.PARSE, Phase.PARSE_JAXRS_ANNOTATIONS, new JaxrsAnnotationProcessor());
-//                processorTarget.addDeploymentProcessor(JaxrsExtension.SUBSYSTEM_NAME, Phase.DEPENDENCIES, Phase.DEPENDENCIES_JAXRS_SPRING, new JaxrsSpringProcessor(serviceTarget));
                 processorTarget.addDeploymentProcessor(JaxrsExtension.SUBSYSTEM_NAME, Phase.DEPENDENCIES, Phase.DEPENDENCIES_JAXRS, new JaxrsDependencyProcessor());
                 processorTarget.addDeploymentProcessor(JaxrsExtension.SUBSYSTEM_NAME, Phase.POST_MODULE, Phase.POST_MODULE_JAXRS_SCANNING, new JaxrsScanningProcessor());
                 processorTarget.addDeploymentProcessor(JaxrsExtension.SUBSYSTEM_NAME, Phase.POST_MODULE, Phase.POST_MODULE_JAXRS_COMPONENT, new JaxrsComponentDeployer());
-                processorTarget.addDeploymentProcessor(JaxrsExtension.SUBSYSTEM_NAME, Phase.POST_MODULE, Phase.POST_MODULE_JAXRS_CDI_INTEGRATION, new JaxrsCdiIntegrationProcessor());
+//                processorTarget.addDeploymentProcessor(JaxrsExtension.SUBSYSTEM_NAME, Phase.POST_MODULE, Phase.POST_MODULE_JAXRS_CDI_INTEGRATION, new JaxrsCdiIntegrationProcessor()); //TODO remove Phase
                 processorTarget.addDeploymentProcessor(JaxrsExtension.SUBSYSTEM_NAME, Phase.INSTALL, Phase.INSTALL_JAXRS_DEPLOYMENT, new JaxrsIntegrationProcessor());
                 processorTarget.addDeploymentProcessor(JaxrsExtension.SUBSYSTEM_NAME, Phase.INSTALL, Phase.INSTALL_JAXRS_DEPLOYMENT + 1, new ModelDeploymentProcessor()); //TODO Phase
                 processorTarget.addDeploymentProcessor(JaxrsExtension.SUBSYSTEM_NAME, Phase.INSTALL, Phase.INSTALL_JAXRS_DEPLOYMENT + 2,

jaxrs-server-integration/src/main/java/org/jboss/as/jaxrs/deployment/AspectDeploymentProcessor.java

@@ -23,8 +23,8 @@
 
 import org.jboss.as.ee.structure.DeploymentType;
 import org.jboss.as.ee.structure.DeploymentTypeMarker;
-import org.jboss.as.jaxrs.ASHelper;
 import org.jboss.as.jaxrs.logging.JaxrsLogger;
+import org.jboss.as.server.deployment.AttachmentKey;
 import org.jboss.as.server.deployment.DeploymentPhaseContext;
 import org.jboss.as.server.deployment.DeploymentUnit;
 import org.jboss.as.server.deployment.DeploymentUnitProcessingException;
@@ -65,7 +65,7 @@ public void deploy(final DeploymentPhaseContext phaseContext) throws DeploymentU
         final DeploymentUnit unit = phaseContext.getDeploymentUnit();
         if (JaxrsDeploymentMarker.isJaxrsDeployment(unit) && DeploymentTypeMarker.isType(DeploymentType.WAR, unit)) {
             ensureAspectInitialized();
-            final Deployment dep = ASHelper.getRequiredAttachment(unit, JaxrsAttachments.JAXRS_DEPLOYMENT_KEY);
+            final Deployment dep = getRequiredAttachment(unit, JaxrsAttachments.JAXRS_DEPLOYMENT_KEY);
             JaxrsLogger.JAXRS_LOGGER.tracef("%s start: %s", aspect, unit.getName());
             ClassLoader origClassLoader = WildFlySecurityManager.getCurrentContextClassLoaderPrivileged();
             try {
@@ -82,7 +82,7 @@ public void deploy(final DeploymentPhaseContext phaseContext) throws DeploymentU
     @Override
     public void undeploy(final DeploymentUnit unit) {
         if (JaxrsDeploymentMarker.isJaxrsDeployment(unit) && DeploymentTypeMarker.isType(DeploymentType.WAR, unit)) {
-            final Deployment dep = ASHelper.getRequiredAttachment(unit, JaxrsAttachments.JAXRS_DEPLOYMENT_KEY);
+            final Deployment dep = getRequiredAttachment(unit, JaxrsAttachments.JAXRS_DEPLOYMENT_KEY);
             JaxrsLogger.JAXRS_LOGGER.tracef("%s stop: %s", aspect, unit.getName());
             ClassLoader origClassLoader = WildFlySecurityManager.getCurrentContextClassLoaderPrivileged();
             try {
@@ -108,5 +108,14 @@ private void ensureAspectInitialized() throws DeploymentUnitProcessingException
             }
         }
     }
+
+    private static <A> A getRequiredAttachment(final DeploymentUnit unit, final AttachmentKey<A> key) {
+       final A value = unit.getAttachment(key);
+       if (value == null) {
+           throw new IllegalStateException();
+       }
+
+       return value;
+   }
 }