WFLY-1077 IIOP subsystem: Rename subsystem to iiop-openjdk + refactor

wildfly · Jan 13, 2015 · 6bf0450 · 6bf0450
1 parent 643b7f3
commit 6bf0450
Show file tree

Hide file tree

Showing 163 changed files with 1,053 additions and 1,032 deletions.
diff --git a/ejb3/pom.xml b/ejb3/pom.xml
@@ -72,7 +72,7 @@ vi:ts=4:sw=4:expandtab
 
         <dependency>
             <groupId>org.wildfly</groupId>
-            <artifactId>wildfly-jdkorb</artifactId>
+            <artifactId>wildfly-iiop-openjdk</artifactId>
         </dependency>
 
         <dependency>

diff --git a/...in/java/org/jboss/as/ejb3/deployment/processors/EjbDependencyDeploymentUnitProcessor.java b/...in/java/org/jboss/as/ejb3/deployment/processors/EjbDependencyDeploymentUnitProcessor.java
@@ -26,7 +26,7 @@
 
 import org.jboss.as.ee.structure.DeploymentType;
 import org.jboss.as.ee.structure.DeploymentTypeMarker;
-import org.jboss.as.jdkorb.deployment.JdkORBDeploymentMarker;
+import org.jboss.as.iiop.openjdk.deployment.IIOPDeploymentMarker;
 import org.jboss.as.server.deployment.Attachments;
 import org.jboss.as.server.deployment.DeploymentPhaseContext;
 import org.jboss.as.server.deployment.DeploymentUnit;
@@ -52,7 +52,7 @@ public class EjbDependencyDeploymentUnitProcessor implements DeploymentUnitProce
     private static final ModuleIdentifier EJB_SUBSYSTEM = ModuleIdentifier.create("org.jboss.as.ejb3");
     private static final ModuleIdentifier EJB_CLIENT = ModuleIdentifier.create("org.jboss.ejb-client");
     private static final ModuleIdentifier EJB_IIOP_CLIENT = ModuleIdentifier.create("org.jboss.iiop-client");
-    private static final ModuleIdentifier JDKORB = ModuleIdentifier.create("org.jboss.as.jdkorb");
+    private static final ModuleIdentifier IIOP_OPENJDK = ModuleIdentifier.create("org.jboss.as.iiop-openjdk");
     private static final ModuleIdentifier EJB_API = ModuleIdentifier.create("javax.ejb.api");
 
 
@@ -82,9 +82,9 @@ 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, true, false));
 
-        if (JdkORBDeploymentMarker.isJdkORBDeployment(deploymentUnit)) {
+        if (IIOPDeploymentMarker.isIIOPDeployment(deploymentUnit)) {
             //needed for dynamic IIOP stubs
-            moduleSpecification.addSystemDependency(new ModuleDependency(moduleLoader, JDKORB, false, false, false, false));
+            moduleSpecification.addSystemDependency(new ModuleDependency(moduleLoader, IIOP_OPENJDK, false, false, false, false));
         }
 
         // fetch the EjbJarMetaData

diff --git a/...src/main/java/org/jboss/as/ejb3/deployment/processors/EjbIIOPDeploymentUnitProcessor.java b/...src/main/java/org/jboss/as/ejb3/deployment/processors/EjbIIOPDeploymentUnitProcessor.java
@@ -46,16 +46,16 @@
 import org.jboss.as.ejb3.iiop.EjbIIOPTransactionInterceptor;
 import org.jboss.as.ejb3.iiop.POARegistry;
 import org.jboss.as.ejb3.subsystem.IIOPSettingsService;
-import org.jboss.as.jdkorb.deployment.JdkORBDeploymentMarker;
+import org.jboss.as.iiop.openjdk.deployment.IIOPDeploymentMarker;
-import org.jboss.as.jdkorb.rmi.AttributeAnalysis;
+import org.jboss.as.iiop.openjdk.rmi.AttributeAnalysis;
-import org.jboss.as.jdkorb.rmi.InterfaceAnalysis;
+import org.jboss.as.iiop.openjdk.rmi.InterfaceAnalysis;
-import org.jboss.as.jdkorb.rmi.OperationAnalysis;
+import org.jboss.as.iiop.openjdk.rmi.OperationAnalysis;
-import org.jboss.as.jdkorb.rmi.RMIIIOPViolationException;
+import org.jboss.as.iiop.openjdk.rmi.RMIIIOPViolationException;
-import org.jboss.as.jdkorb.rmi.marshal.strategy.SkeletonStrategy;
+import org.jboss.as.iiop.openjdk.rmi.marshal.strategy.SkeletonStrategy;
-import org.jboss.as.jdkorb.service.CorbaNamingService;
+import org.jboss.as.iiop.openjdk.service.CorbaNamingService;
-import org.jboss.as.jdkorb.service.CorbaORBService;
+import org.jboss.as.iiop.openjdk.service.CorbaORBService;
-import org.jboss.as.jdkorb.service.CorbaPOAService;
+import org.jboss.as.iiop.openjdk.service.CorbaPOAService;
-import org.jboss.as.jdkorb.service.IORSecConfigMetaDataService;
+import org.jboss.as.iiop.openjdk.service.IORSecConfigMetaDataService;
 import org.jboss.as.server.Services;
 import org.jboss.as.server.deployment.DeploymentPhaseContext;
 import org.jboss.as.server.deployment.DeploymentUnit;
@@ -93,7 +93,7 @@ public void deploy(final DeploymentPhaseContext phaseContext) throws DeploymentU
 
 
         final DeploymentUnit deploymentUnit = phaseContext.getDeploymentUnit();
-        if (!JdkORBDeploymentMarker.isJdkORBDeployment(deploymentUnit)) {
+        if (!IIOPDeploymentMarker.isIIOPDeployment(deploymentUnit)) {
             return;
         }
 

diff --git a/ejb3/src/main/java/org/jboss/as/ejb3/deployment/processors/IIOPJndiBindingProcessor.java b/ejb3/src/main/java/org/jboss/as/ejb3/deployment/processors/IIOPJndiBindingProcessor.java
@@ -28,8 +28,8 @@
 import org.jboss.as.ee.structure.DeploymentType;
 import org.jboss.as.ee.structure.DeploymentTypeMarker;
 import org.jboss.as.ejb3.iiop.handle.HandleDelegateImpl;
-import org.jboss.as.jdkorb.deployment.JdkORBDeploymentMarker;
+import org.jboss.as.iiop.openjdk.deployment.IIOPDeploymentMarker;
-import org.jboss.as.jdkorb.service.CorbaORBService;
+import org.jboss.as.iiop.openjdk.service.CorbaORBService;
 import org.jboss.as.naming.ManagedReferenceInjector;
 import org.jboss.as.naming.ServiceBasedNamingStore;
 import org.jboss.as.naming.ValueManagedReferenceFactory;
@@ -65,7 +65,7 @@ public void deploy(DeploymentPhaseContext phaseContext) throws DeploymentUnitPro
         }
 
         //do not bind if jacORB not present
-        if (!JdkORBDeploymentMarker.isJdkORBDeployment(deploymentUnit)) {
+        if (!IIOPDeploymentMarker.isIIOPDeployment(deploymentUnit)) {
             return;
         }
 

diff --git a/ejb3/src/main/java/org/jboss/as/ejb3/iiop/EjbCorbaServant.java b/ejb3/src/main/java/org/jboss/as/ejb3/iiop/EjbCorbaServant.java
@@ -43,8 +43,8 @@
 import org.jboss.as.ejb3.component.entity.EntityBeanComponent;
 import org.jboss.as.ejb3.component.stateful.StatefulSessionComponent;
 import org.jboss.iiop.csiv2.SASCurrent;
-import org.jboss.as.jdkorb.rmi.RmiIdlUtil;
+import org.jboss.as.iiop.openjdk.rmi.RmiIdlUtil;
-import org.jboss.as.jdkorb.rmi.marshal.strategy.SkeletonStrategy;
+import org.jboss.as.iiop.openjdk.rmi.marshal.strategy.SkeletonStrategy;
 import org.jboss.as.naming.context.NamespaceContextSelector;
 import org.jboss.ejb.client.SessionID;
 import org.jboss.ejb.iiop.HandleImplIIOP;

diff --git a/ejb3/src/main/java/org/jboss/as/ejb3/iiop/EjbIIOPService.java b/ejb3/src/main/java/org/jboss/as/ejb3/iiop/EjbIIOPService.java
@@ -38,9 +38,9 @@
 import org.jboss.as.ejb3.component.entity.EntityBeanComponent;
 import org.jboss.as.ejb3.component.stateless.StatelessSessionComponent;
 import org.jboss.as.ejb3.iiop.stub.DynamicStubFactoryFactory;
-import org.jboss.as.jdkorb.csiv2.CSIv2Policy;
+import org.jboss.as.iiop.openjdk.csiv2.CSIv2Policy;
-import org.jboss.as.jdkorb.rmi.ir.InterfaceRepository;
+import org.jboss.as.iiop.openjdk.rmi.ir.InterfaceRepository;
-import org.jboss.as.jdkorb.rmi.marshal.strategy.SkeletonStrategy;
+import org.jboss.as.iiop.openjdk.rmi.marshal.strategy.SkeletonStrategy;
 import org.jboss.as.server.moduleservice.ServiceModuleLoader;
 import org.jboss.ejb.client.EJBHomeLocator;
 import org.jboss.ejb.client.EJBLocator;

diff --git a/ejb3/src/main/java/org/jboss/as/ejb3/iiop/EjbIIOPTransactionInterceptor.java b/ejb3/src/main/java/org/jboss/as/ejb3/iiop/EjbIIOPTransactionInterceptor.java
@@ -30,8 +30,8 @@
 import org.jboss.as.ejb3.logging.EjbLogger;
 import org.jboss.as.ejb3.component.EJBComponent;
 import org.jboss.as.ejb3.component.MethodIntf;
-import org.jboss.as.jdkorb.tm.ForeignTransaction;
+import org.jboss.as.iiop.openjdk.tm.ForeignTransaction;
-import org.jboss.as.jdkorb.tm.TxServerInterceptor;
+import org.jboss.as.iiop.openjdk.tm.TxServerInterceptor;
 import org.jboss.invocation.ImmediateInterceptorFactory;
 import org.jboss.invocation.Interceptor;
 import org.jboss.invocation.InterceptorContext;

diff --git a/ejb3/src/main/java/org/jboss/as/ejb3/iiop/stub/DynamicIIOPStub.java b/ejb3/src/main/java/org/jboss/as/ejb3/iiop/stub/DynamicIIOPStub.java
@@ -25,7 +25,6 @@
 
 import java.security.PrivilegedAction;
 import org.jboss.as.ejb3.logging.EjbLogger;
-
 import javax.rmi.CORBA.Util;
 import org.jboss.as.jdkorb.rmi.marshal.strategy.StubStrategy;
 import org.jboss.ejb.iiop.HandleImplIIOP;

diff --git a/ejb3/src/main/java/org/jboss/as/ejb3/iiop/stub/IIOPStubCompiler.java b/ejb3/src/main/java/org/jboss/as/ejb3/iiop/stub/IIOPStubCompiler.java
@@ -28,13 +28,13 @@
 import java.lang.reflect.Modifier;
 import java.rmi.RemoteException;
 
-import org.jboss.as.jdkorb.rmi.AttributeAnalysis;
+import org.jboss.as.iiop.openjdk.rmi.AttributeAnalysis;
-import org.jboss.as.jdkorb.rmi.ExceptionAnalysis;
+import org.jboss.as.iiop.openjdk.rmi.ExceptionAnalysis;
-import org.jboss.as.jdkorb.rmi.InterfaceAnalysis;
+import org.jboss.as.iiop.openjdk.rmi.InterfaceAnalysis;
-import org.jboss.as.jdkorb.rmi.OperationAnalysis;
+import org.jboss.as.iiop.openjdk.rmi.OperationAnalysis;
-import org.jboss.as.jdkorb.rmi.RMIIIOPViolationException;
+import org.jboss.as.iiop.openjdk.rmi.RMIIIOPViolationException;
-import org.jboss.as.jdkorb.rmi.marshal.CDRStream;
+import org.jboss.as.iiop.openjdk.rmi.marshal.CDRStream;
-import org.jboss.as.jdkorb.rmi.marshal.strategy.StubStrategy;
+import org.jboss.as.iiop.openjdk.rmi.marshal.strategy.StubStrategy;
 import org.jboss.classfilewriter.ClassFile;
 import org.jboss.classfilewriter.ClassMethod;
 import org.jboss.classfilewriter.code.CodeAttribute;
@@ -152,7 +152,7 @@ private static void generateMethodCode(ClassFile asm,
                     + typeName.substring(1));
             ret = DescriptorUtils.makeDescriptor(returnType);
         }
-        ca.invokevirtual(superclass.getName(), invoke, "(Ljava/lang/String;Lorg/jboss/as/jdkorb/rmi/marshal/strategy/StubStrategy;[Ljava/lang/Object;)" + ret);
+        ca.invokevirtual(superclass.getName(), invoke, "(Ljava/lang/String;Lorg/jboss/as/iiop/openjdk/rmi/marshal/strategy/StubStrategy;[Ljava/lang/Object;)" + ret);
         if (!returnType.isPrimitive() && returnType != Object.class) {
             ca.checkcast(returnType);
         }
@@ -229,7 +229,7 @@ private static void generateMethodCode(ClassFile asm,
             init.aconstNull();
 
             // Constructs the StubStrategy
-            init.invokestatic(StubStrategy.class.getName(), "forMethod", "([Ljava/lang/String;[Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;Ljava/lang/ClassLoader;)Lorg/jboss/as/jdkorb/rmi/marshal/strategy/StubStrategy;");
+            init.invokestatic(StubStrategy.class.getName(), "forMethod", "([Ljava/lang/String;[Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;Ljava/lang/ClassLoader;)Lorg/jboss/as/iiop/openjdk/rmi/marshal/strategy/StubStrategy;");
 
             // Set the strategy field of this stub class
             init.putstatic(asm.getName(), strategyField, StubStrategy.class);

diff --git a/ejb3/src/main/java/org/jboss/as/ejb3/subsystem/EJB3SubsystemAdd.java b/ejb3/src/main/java/org/jboss/as/ejb3/subsystem/EJB3SubsystemAdd.java
@@ -117,8 +117,8 @@
 import org.jboss.as.ejb3.remote.RegistryCollector;
 import org.jboss.as.ejb3.remote.RegistryCollectorService;
 import org.jboss.as.ejb3.remote.TCCLEJBClientContextSelectorService;
-import org.jboss.as.jdkorb.rmi.DelegatingStubFactoryFactory;
+import org.jboss.as.iiop.openjdk.rmi.DelegatingStubFactoryFactory;
-import org.jboss.as.jdkorb.service.CorbaPOAService;
+import org.jboss.as.iiop.openjdk.service.CorbaPOAService;
 import org.jboss.as.naming.InitialContext;
 import org.jboss.as.remoting.RemotingServices;
 import org.jboss.as.security.service.SimpleSecurityManagerService;

diff --git a/feature-pack/pom.xml b/feature-pack/pom.xml
@@ -2275,7 +2275,7 @@
 
         <dependency>
             <groupId>org.wildfly</groupId>
-            <artifactId>wildfly-jdkorb</artifactId>
+            <artifactId>wildfly-iiop-openjdk</artifactId>
             <exclusions>
                 <exclusion>
                     <groupId>*</groupId>

diff --git a/feature-pack/src/main/resources/configuration/domain/subsystems.xml b/feature-pack/src/main/resources/configuration/domain/subsystems.xml
@@ -73,7 +73,7 @@
       <subsystem supplement="full">ejb3.xml</subsystem>
       <subsystem>io.xml</subsystem>
       <subsystem>infinispan.xml</subsystem>
-      <subsystem>jdkorb.xml</subsystem>
+      <subsystem>iiop-openjdk.xml</subsystem>
       <subsystem>jaxrs.xml</subsystem>
       <subsystem>jca.xml</subsystem>
       <subsystem>jdr.xml</subsystem>
@@ -106,7 +106,7 @@
       <subsystem supplement="full-ha">ejb3.xml</subsystem>
       <subsystem>io.xml</subsystem>
       <subsystem supplement="ha">infinispan.xml</subsystem>
-      <subsystem>jdkorb.xml</subsystem>
+      <subsystem>iiop-openjdk.xml</subsystem>
       <subsystem>jaxrs.xml</subsystem>
       <subsystem>jca.xml</subsystem>
       <subsystem>jdr.xml</subsystem>

diff --git a/feature-pack/src/main/resources/configuration/examples/subsystems-genericjms.xml b/feature-pack/src/main/resources/configuration/examples/subsystems-genericjms.xml
@@ -11,7 +11,7 @@
         <subsystem supplement="full">ejb3.xml</subsystem>
         <subsystem>io.xml</subsystem>
         <subsystem>infinispan.xml</subsystem>
-        <subsystem>jdkorb.xml</subsystem>
+        <subsystem>iiop-openjdk.xml</subsystem>
         <subsystem>jaxrs.xml</subsystem>
         <subsystem>jca.xml</subsystem>
         <subsystem>jdr.xml</subsystem>

diff --git a/feature-pack/src/main/resources/configuration/examples/subsystems-hornetq-colocated.xml b/feature-pack/src/main/resources/configuration/examples/subsystems-hornetq-colocated.xml
@@ -10,7 +10,7 @@
       <subsystem>ejb3.xml</subsystem>
       <subsystem>io.xml</subsystem>
       <subsystem>infinispan.xml</subsystem>
-      <subsystem>jdkorb.xml</subsystem>
+      <subsystem>iiop-openjdk.xml</subsystem>
       <subsystem>jaxrs.xml</subsystem>
       <subsystem>jca.xml</subsystem>
       <subsystem>jmx.xml</subsystem>

diff --git a/feature-pack/src/main/resources/configuration/examples/subsystems-jts.xml b/feature-pack/src/main/resources/configuration/examples/subsystems-jts.xml
@@ -11,7 +11,7 @@
       <subsystem>ejb3.xml</subsystem>
       <subsystem>io.xml</subsystem>
       <subsystem>infinispan.xml</subsystem>
-      <subsystem>jdkorb.xml</subsystem>
+      <subsystem>iiop-openjdk.xml</subsystem>
       <subsystem>jaxrs.xml</subsystem>
       <subsystem>jca.xml</subsystem>
       <subsystem>jdr.xml</subsystem>

diff --git a/feature-pack/src/main/resources/configuration/examples/subsystems-picketlink.xml b/feature-pack/src/main/resources/configuration/examples/subsystems-picketlink.xml
@@ -10,7 +10,7 @@
       <subsystem supplement="full">ejb3.xml</subsystem>
       <subsystem>io.xml</subsystem>
       <subsystem>infinispan.xml</subsystem>
-      <subsystem>jdkorb.xml</subsystem>
+      <subsystem>iiop-openjdk.xml</subsystem>
       <subsystem>jaxrs.xml</subsystem>
       <subsystem>jca.xml</subsystem>
       <subsystem>jdr.xml</subsystem>

diff --git a/feature-pack/src/main/resources/configuration/examples/subsystems-rts.xml b/feature-pack/src/main/resources/configuration/examples/subsystems-rts.xml
@@ -11,7 +11,7 @@
       <subsystem supplement="full">ejb3.xml</subsystem>
       <subsystem>io.xml</subsystem>
       <subsystem>infinispan.xml</subsystem>
-      <subsystem>jdkorb.xml</subsystem>
+      <subsystem>iiop-openjdk.xml</subsystem>
       <subsystem>jaxrs.xml</subsystem>
       <subsystem>jca.xml</subsystem>
       <subsystem>jdr.xml</subsystem>

diff --git a/feature-pack/src/main/resources/configuration/examples/subsystems-xts.xml b/feature-pack/src/main/resources/configuration/examples/subsystems-xts.xml
@@ -10,7 +10,7 @@
       <subsystem supplement="full">ejb3.xml</subsystem>
       <subsystem>io.xml</subsystem>
       <subsystem>infinispan.xml</subsystem>
-      <subsystem>jdkorb.xml</subsystem>
+      <subsystem>iiop-openjdk.xml</subsystem>
       <subsystem>jaxrs.xml</subsystem>
       <subsystem>jca.xml</subsystem>
       <subsystem>jdr.xml</subsystem>

diff --git a/feature-pack/src/main/resources/configuration/standalone/subsystems-full-ha.xml b/feature-pack/src/main/resources/configuration/standalone/subsystems-full-ha.xml
@@ -11,7 +11,7 @@
         <subsystem supplement="full-ha">ejb3.xml</subsystem>
         <subsystem>io.xml</subsystem>
         <subsystem supplement="ha">infinispan.xml</subsystem>
-        <subsystem>jdkorb.xml</subsystem>
+        <subsystem>iiop-openjdk.xml</subsystem>
         <subsystem>jaxrs.xml</subsystem>
         <subsystem>jca.xml</subsystem>
         <subsystem>jdr.xml</subsystem>

diff --git a/feature-pack/src/main/resources/configuration/standalone/subsystems-full.xml b/feature-pack/src/main/resources/configuration/standalone/subsystems-full.xml
@@ -11,7 +11,7 @@
         <subsystem supplement="full">ejb3.xml</subsystem>
         <subsystem>io.xml</subsystem>
         <subsystem>infinispan.xml</subsystem>
-        <subsystem>jdkorb.xml</subsystem>
+        <subsystem>iiop-openjdk.xml</subsystem>
         <subsystem>jaxrs.xml</subsystem>
         <subsystem>jca.xml</subsystem>
         <subsystem>jdr.xml</subsystem>

diff --git a/feature-pack/src/main/resources/content/appclient/configuration/appclient.xml b/feature-pack/src/main/resources/content/appclient/configuration/appclient.xml
@@ -26,7 +26,7 @@
         <extension module="org.jboss.as.connector"/>
         <extension module="org.jboss.as.ee"/>
         <extension module="org.jboss.as.ejb3"/>
-        <extension module="org.jboss.as.jdkorb"/>
+        <extension module="org.jboss.as.iiop-openjdk"/>
         <extension module="org.jboss.as.jpa"/>
         <extension module="org.jboss.as.logging"/>
         <extension module="org.jboss.as.naming"/>
@@ -58,11 +58,10 @@
             <logger category="sun.rmi">
                 <level name="WARN"/>
             </logger>
-            <logger category="jdkorb">
+            <logger category="iiop">
                 <level name="WARN"/>
             </logger>
-            <!-- set jdkorb.config to ERROR to avoid the "jdkorb.properties not found" messages during startup -->
+            <logger category="iiop.config">
-            <logger category="jdkorb.config">
                 <level name="ERROR"/>
             </logger>
             <root-logger>
@@ -121,7 +120,7 @@
                               managed-thread-factory="java:jboss/ee/concurrency/factory/default"/>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:ejb3:3.0"/>
-        <subsystem xmlns="urn:jboss:domain:jdkorb:1.0"/>
+        <subsystem xmlns="urn:jboss:domain:iiop-openjdk:1.0"/>
         <subsystem xmlns="urn:jboss:domain:jca:2.0">
             <archive-validation enabled="false" />
             <bean-validation enabled="true" />
@@ -185,8 +184,8 @@
     </interfaces>
 
     <socket-binding-group name="standard-sockets" default-interface="public">
-        <socket-binding name="jdkorb" port="3628"/>
+        <socket-binding name="iiop" port="3628"/>
-        <socket-binding name="jdkorb-ssl" port="3629"/>
+        <socket-binding name="iiop-ssl" port="3629"/>
         <socket-binding name="txn-recovery-environment" port="4712"/>
         <socket-binding name="txn-status-manager" port="4713"/>
     </socket-binding-group>

diff --git a/feature-pack/src/main/resources/modules/system/layers/base/javax/orb/api/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/javax/orb/api/main/module.xml
@@ -28,7 +28,7 @@
 
     <dependencies>
       <module name="sun.jdk"/>
-      <module name="org.jboss.as.jdkorb"/>
+      <module name="org.jboss.as.iiop-openjdk"/>
       <module name="org.jboss.jts"/>
       <module name="org.jboss.jts.integration"/>
       <module name="javax.transaction.api"/>

diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/ejb3/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/ejb3/main/module.xml
@@ -60,7 +60,7 @@
          in EJB client context-->
         <module name="org.jboss.as.domain-management"/>
         <module name="org.jboss.as.ee"/>
-	<module name="org.jboss.as.jdkorb"/>
+	<module name="org.jboss.as.iiop-openjdk"/>
         <module name="org.jboss.as.naming"/>
         <module name="org.jboss.as.network"/>
         <module name="org.jboss.as.remoting"/>

diff --git a/.../base/org/jboss/as/jdkorb/main/module.xml → ...org/jboss/as/iiop-openjdk/main/module.xml b/.../base/org/jboss/as/jdkorb/main/module.xml → ...org/jboss/as/iiop-openjdk/main/module.xml
@@ -22,13 +22,13 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.as.jdkorb">
+<module xmlns="urn:jboss:module:1.3" name="org.jboss.as.iiop-openjdk">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
 
     <resources>
-        <artifact name="${org.wildfly:wildfly-jdkorb}"/>
+        <artifact name="${org.wildfly:wildfly-iiop-openjdk}"/>
     </resources>
 
     <dependencies>

diff --git a/...k/src/main/resources/modules/system/layers/base/org/jboss/as/transactions/main/module.xml b/...k/src/main/resources/modules/system/layers/base/org/jboss/as/transactions/main/module.xml
@@ -52,7 +52,7 @@
         <module name="org.jboss.jts"/>
         <module name="org.jboss.jts.integration"/>
         <module name="org.omg.api"/>
-        <module name="org.jboss.as.jdkorb"/>
+        <module name="org.jboss.as.iiop-openjdk"/>
         <module name="org.jboss.jandex"/>
         <module name="org.jboss.modules"/>
         <module name="org.jboss.narayana.compensations"/>

diff --git a/jdkorb/pom.xml → iiop-openjdk/pom.xml b/jdkorb/pom.xml → iiop-openjdk/pom.xml
@@ -33,11 +33,10 @@
         <version>9.0.0.Alpha2-SNAPSHOT</version>
     </parent>
 
-    <artifactId>wildfly-jdkorb</artifactId>
+    <artifactId>wildfly-iiop-openjdk</artifactId>
-    <version>9.0.0.Alpha2-SNAPSHOT</version>
     <packaging>jar</packaging>
 
-    <name>WildFly: JdkORB Subsystem</name>
+    <name>WildFly: IIOP Openjdk Subsystem</name>
 
     <build>
        <plugins>