AS7-3724: DO NOT UPSTREAM! an ugly patch to remove IIOP functionality

fedora-jboss-as · Feb 16, 2012 · 41efa6c · 41efa6c
1 parent 235f73e
commit 41efa6c
Show file tree

Hide file tree

Showing 19 changed files with 167 additions and 79 deletions.
diff --git a/build/build.xml b/build/build.xml
@@ -659,9 +659,11 @@
             <maven-resource group="org.infinispan" artifact="infinispan-client-hotrod" />
         </module-def>
 
+        <!--
         <module-def name="org.jacorb">
             <maven-resource group="org.jacorb" artifact="jacorb"/>
         </module-def>
+        -->
 
         <module-def name="org.javassist">
             <maven-resource group="org.javassist" artifact="javassist"/>
@@ -763,9 +765,11 @@
             <maven-resource group="org.jboss.as" artifact="jboss-as-jsr77"/>
         </module-def>
 
+        <!--
         <module-def name="org.jboss.as.jacorb">
             <maven-resource group="org.jboss.as" artifact="jboss-as-jacorb"/>
         </module-def>
+        -->
 
         <module-def name="org.jboss.as.jaxr">
             <maven-resource group="org.jboss.as" artifact="jboss-as-jaxr"/>
@@ -935,11 +939,11 @@
         </module-def>
 
         <module-def name="org.jboss.jts">
-            <maven-resource group="org.jboss.jbossts" artifact="jbossjts"/>
+            <maven-resource group="org.jboss.jbossts" artifact="jbossjta"/>
         </module-def>
 
         <module-def name="org.jboss.jts.integration">
-            <maven-resource group="org.jboss.jbossts" artifact="jbossjts-integration"/>
+            <maven-resource group="org.jboss.jbossts" artifact="jbossjta-integration"/>
         </module-def>
 
         <module-def name="org.jboss.metadata">

diff --git a/build/pom.xml b/build/pom.xml
@@ -273,10 +273,12 @@
                     <artifactId>getopt</artifactId>
                 </dependency>
 
+                <!--
                 <dependency>
                     <groupId>org.jacorb</groupId>
                     <artifactId>jacorb</artifactId>
                 </dependency>
+                -->
 
                 <dependency>
                     <groupId>javax.activation</groupId>
@@ -850,10 +852,12 @@
                     <artifactId>jboss-as-host-controller</artifactId>
                 </dependency>
 
+                <!--
                 <dependency>
                     <groupId>org.jboss.as</groupId>
                     <artifactId>jboss-as-jacorb</artifactId>
                 </dependency>
+                -->
 
                 <dependency>
                     <groupId>org.jboss.as</groupId>
@@ -955,10 +959,12 @@
                     <artifactId>jboss-as-webservices-server-integration</artifactId>
                 </dependency>
 
+                <!--
                 <dependency>
                     <groupId>org.jboss.as</groupId>
                     <artifactId>jboss-as-xts</artifactId>
                 </dependency>
+                -->
 
                 <dependency>
                     <groupId>org.jboss.classfilewriter</groupId>
@@ -1077,19 +1083,20 @@
 
                 <dependency>
                     <groupId>org.jboss.jbossts</groupId>
-                    <artifactId>jbossjts</artifactId>
+                    <artifactId>jbossjta</artifactId>
                 </dependency>
 
                 <dependency>
                     <groupId>org.jboss.jbossts</groupId>
-                    <artifactId>jbossjts-integration</artifactId>
+                    <artifactId>jbossjta-integration</artifactId>
                 </dependency>
 
                 <dependency>
                     <groupId>org.jboss.jbossts</groupId>
                     <artifactId>jbosstxbridge</artifactId>
                 </dependency>
 
+                <!--
                 <dependency>
                     <groupId>org.jboss.jbossts</groupId>
                     <artifactId>jbossxts</artifactId>
@@ -1099,6 +1106,7 @@
                     <groupId>org.jboss.jbossts</groupId>
                     <artifactId>jbossxts-api</artifactId>
                 </dependency>
+                -->
 
                 <dependency>
                     <groupId>org.jboss.metadata</groupId>

diff --git a/build/src/main/resources/modules/org/jboss/as/ejb3/main/module.xml b/build/src/main/resources/modules/org/jboss/as/ejb3/main/module.xml
@@ -41,7 +41,7 @@
         <module name="javax.resource.api"/>
         <module name="javax.rmi.api"/>
         <module name="org.hibernate"/>
-        <module name="org.jacorb"/>
+        <module name="org.jacorb" optional="true"/>
         <module name="org.jboss.as.clustering.api"/>
         <module name="org.jboss.as.clustering.ejb3.infinispan" services="import" optional="true"/>
         <module name="org.jboss.as.clustering.infinispan"/>
@@ -51,7 +51,7 @@
         <!-- So we can access its integration API -->
         <module name="org.jboss.as.connector"/>
         <module name="org.jboss.as.ee"/>
-        <module name="org.jboss.as.jacorb"/>
+        <module name="org.jboss.as.jacorb" optional="true"/>
         <module name="org.jboss.as.naming"/>
         <module name="org.jboss.as.network"/>
         <module name="org.jboss.as.remoting"/>

diff --git a/build/src/main/resources/modules/org/jboss/jts/main/module.xml b/build/src/main/resources/modules/org/jboss/jts/main/module.xml
@@ -41,6 +41,6 @@
         <module name="javax.transaction.api"/>
         <module name="javax.resource.api"/>
         <module name="org.hornetq"/>
-        <module name="org.jacorb"/>
+        <module name="org.jacorb" optional="true"/>
     </dependencies>
 </module>
diff --git a/build/src/main/resources/modules/org/omg/api/main/module.xml b/build/src/main/resources/modules/org/omg/api/main/module.xml
@@ -23,7 +23,7 @@
   -->
 <module xmlns="urn:jboss:module:1.1" name="org.omg.api">
     <dependencies>
-        <module name="org.jacorb" export="false">
+        <module name="org.jacorb" export="false" optional="true">
             <exports>
                 <include-set>
                     <path name="org/omg/ATLAS"/>

diff --git a/ejb3/pom.xml b/ejb3/pom.xml
@@ -47,6 +47,13 @@ vi:ts=4:sw=4:expandtab
                     <compilerArgument>
                         -AgeneratedTranslationFilesPath=${project.build.directory}/generated-translation-files
                     </compilerArgument>
+                    <excludes>
+                        <exclude>**/*IIOP*.java</exclude>
+                        <exclude>**/*iiop*/*.java</exclude>
+                        <exclude>org/jboss/as/ejb3/deployment/processors/*IIOP*.java</exclude>
+                        <exclude>org/jboss/as/ejb3/iiop/**/*.java</exclude>
+                    </excludes>
+                    <verbose>true</verbose>
                 </configuration>
             </plugin>
             <plugin>
@@ -90,10 +97,12 @@ vi:ts=4:sw=4:expandtab
             <artifactId>jboss-as-ee</artifactId>
         </dependency>
 
+        <!--
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>jboss-as-jacorb</artifactId>
         </dependency>
+        -->
 
         <dependency>
             <groupId>${project.groupId}</groupId>

diff --git a/ejb3/src/main/java/org/jboss/as/ejb3/deployment/EjbDeploymentInformation.java b/ejb3/src/main/java/org/jboss/as/ejb3/deployment/EjbDeploymentInformation.java
@@ -1,13 +1,12 @@
 package org.jboss.as.ejb3.deployment;
 
+import java.util.Collection;
+import java.util.Map;
+
 import org.jboss.as.ee.component.ComponentView;
 import org.jboss.as.ejb3.component.EJBComponent;
-import org.jboss.as.ejb3.iiop.EjbIIOPService;
 import org.jboss.msc.value.InjectedValue;
 
-import java.util.Collection;
-import java.util.Map;
-
 /**
  * Runtime information about an EJB in a module
  *
@@ -23,14 +22,18 @@ public class EjbDeploymentInformation {
 
     private final Map<String, InjectedValue<ComponentView>> componentViews;
 
+    /*
     private final InjectedValue<EjbIIOPService> iorFactory;
+    */
 
-    public EjbDeploymentInformation(final String ejbName, final InjectedValue<EJBComponent> ejbComponent, final Map<String, InjectedValue<ComponentView>> componentViews, final ClassLoader deploymentClassLoader, final InjectedValue<EjbIIOPService> iorFactory) {
+    public EjbDeploymentInformation(final String ejbName, final InjectedValue<EJBComponent> ejbComponent, final Map<String, InjectedValue<ComponentView>> componentViews, final ClassLoader deploymentClassLoader, final InjectedValue<?> iorFactory) {
         this.ejbName = ejbName;
         this.ejbComponent = ejbComponent;
         this.componentViews = componentViews;
         this.deploymentClassLoader = deploymentClassLoader;
+        /*
         this.iorFactory = iorFactory;
+        */
     }
 
     public String getEjbName() {
@@ -57,7 +60,9 @@ public ClassLoader getDeploymentClassLoader() {
         return deploymentClassLoader;
     }
 
+    /*
     public EjbIIOPService getIorFactory() {
         return iorFactory.getOptionalValue();
     }
+    */
 }
diff --git a/.../src/main/java/org/jboss/as/ejb3/deployment/processors/DeploymentRepositoryProcessor.java b/.../src/main/java/org/jboss/as/ejb3/deployment/processors/DeploymentRepositoryProcessor.java
@@ -15,7 +15,6 @@
 import org.jboss.as.ejb3.deployment.DeploymentRepository;
 import org.jboss.as.ejb3.deployment.EjbDeploymentInformation;
 import org.jboss.as.ejb3.deployment.ModuleDeployment;
-import org.jboss.as.ejb3.iiop.EjbIIOPService;
 import org.jboss.as.server.deployment.DeploymentPhaseContext;
 import org.jboss.as.server.deployment.DeploymentUnit;
 import org.jboss.as.server.deployment.DeploymentUnitProcessingException;
@@ -67,10 +66,13 @@ public void deploy(final DeploymentPhaseContext phaseContext) throws DeploymentU
                     views.put(view.getViewClassName(), componentViewInjectedValue);
                     injectedValues.put(view.getServiceName(), componentViewInjectedValue);
                 }
+                final InjectedValue<?> iorFactory = null;
+                /*
                 final InjectedValue<EjbIIOPService> iorFactory = new InjectedValue<EjbIIOPService>();
                 if (ejbComponentDescription.isExposedViaIiop()) {
                     injectedValues.put(ejbComponentDescription.getServiceName().append(EjbIIOPService.SERVICE_NAME), iorFactory);
                 }
+                */
 
                 EjbDeploymentInformation info = new EjbDeploymentInformation(ejbComponentDescription.getEJBName(), componentInjectedValue, views, module.getClassLoader(), iorFactory);
                 deploymentInformationMap.put(ejbComponentDescription.getEJBName(), info);

diff --git a/...in/java/org/jboss/as/ejb3/deployment/processors/EjbDependencyDeploymentUnitProcessor.java b/...in/java/org/jboss/as/ejb3/deployment/processors/EjbDependencyDeploymentUnitProcessor.java
@@ -24,7 +24,6 @@
 
 import org.jboss.as.ee.structure.DeploymentType;
 import org.jboss.as.ee.structure.DeploymentTypeMarker;
-import org.jboss.as.jacorb.deployment.JacORBDeploymentMarker;
 import org.jboss.as.server.deployment.Attachments;
 import org.jboss.as.server.deployment.DeploymentPhaseContext;
 import org.jboss.as.server.deployment.DeploymentUnit;
@@ -85,10 +84,12 @@ public void deploy(DeploymentPhaseContext phaseContext) throws DeploymentUnitPro
         //we always have to add this, as even non-ejb deployments may still lookup IIOP ejb's
         moduleSpecification.addSystemDependency(new ModuleDependency(moduleLoader, EJB_SUBSYSTEM, false, false, false, false));
 
+        /*
         if (JacORBDeploymentMarker.isJacORBDeployment(deploymentUnit)) {
             //needed for dynamic IIOP stubs
             moduleSpecification.addSystemDependency(new ModuleDependency(moduleLoader, JACORB, false, false, false, false));
         }
+        */
 
         // fetch the EjbJarMetaData
         //TODO: remove the app client bit after the next EJB release

diff --git a/ejb3/src/main/java/org/jboss/as/ejb3/subsystem/EJB3Extension.java b/ejb3/src/main/java/org/jboss/as/ejb3/subsystem/EJB3Extension.java
@@ -22,10 +22,6 @@
 
 package org.jboss.as.ejb3.subsystem;
 
-import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.DESCRIBE;
-
-import java.util.EnumSet;
-
 import org.jboss.as.controller.Extension;
 import org.jboss.as.controller.ExtensionContext;
 import org.jboss.as.controller.PathElement;
@@ -39,7 +35,6 @@
 import org.jboss.as.controller.parsing.ExtensionParsingContext;
 import org.jboss.as.controller.registry.ManagementResourceRegistration;
 import org.jboss.as.controller.registry.OperationEntry;
-import org.jboss.as.controller.registry.OperationEntry.Flag;
 import org.jboss.as.ejb3.subsystem.deployment.EntityBeanResourceDefinition;
 import org.jboss.as.ejb3.subsystem.deployment.MessageDrivenBeanResourceDefinition;
 import org.jboss.as.ejb3.subsystem.deployment.SingletonBeanDeploymentResourceDefinition;
@@ -49,6 +44,8 @@
 import org.jboss.as.threads.ThreadsServices;
 import org.jboss.as.threads.UnboundedQueueThreadPoolResourceDefinition;
 
+import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.DESCRIBE;
+
 /**
  * Extension that provides the EJB3 subsystem.
  *
@@ -106,7 +103,9 @@ public void initialize(ExtensionContext context) {
                 new EJB3ThreadFactoryResolver(), EJB3SubsystemModel.BASE_THREAD_POOL_SERVICE_NAME, registerRuntimeOnly));
 
         // subsystem=ejb3/service=iiop
+        /*
         subsystemRegistration.registerSubModel(EJB3IIOPResourceDefinition.INSTANCE);
+        */
 
         if (registerRuntimeOnly) {
             ResourceDefinition deploymentsDef = new SimpleResourceDefinition(PathElement.pathElement(ModelDescriptionConstants.SUBSYSTEM, SUBSYSTEM_NAME),