Jdkorb

ejb3/pom.xml

@@ -69,10 +69,10 @@ vi:ts=4:sw=4:expandtab
             <groupId>org.wildfly</groupId>
             <artifactId>wildfly-ee</artifactId>
         </dependency>
-
+ 
         <dependency>
             <groupId>org.wildfly</groupId>
-            <artifactId>wildfly-jacorb</artifactId>
+            <artifactId>wildfly-iiop-openjdk</artifactId>
         </dependency>
 
         <dependency>
@@ -203,5 +203,11 @@ projects that depend on this project.-->
             <artifactId>groovy-all</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.jboss.spec.javax.rmi</groupId>
+            <artifactId>jboss-rmi-api_1.0_spec</artifactId>
+            <scope>test</scope>
+      </dependency>
     </dependencies>
 </project>

ejb3/src/main/java/org/jboss/as/ejb3/deployment/processors/EjbDependencyDeploymentUnitProcessor.java

@@ -22,9 +22,10 @@
 
 package org.jboss.as.ejb3.deployment.processors;
 
+import static org.jboss.as.server.deployment.EjbDeploymentMarker.isEjbDeployment;
+
 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;
@@ -35,8 +36,7 @@
 import org.jboss.modules.Module;
 import org.jboss.modules.ModuleIdentifier;
 import org.jboss.modules.ModuleLoader;
-
-import static org.jboss.as.server.deployment.EjbDeploymentMarker.isEjbDeployment;
+import org.wildfly.iiop.openjdk.deployment.IIOPDeploymentMarker;
 
 /**
  * Responsible for adding appropriate Java EE {@link org.jboss.as.server.deployment.module.ModuleDependency module dependencies}
@@ -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 JACORB = ModuleIdentifier.create("org.jboss.as.jacorb");
+    private static final ModuleIdentifier IIOP_OPENJDK = ModuleIdentifier.create("org.wildfly.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 (JacORBDeploymentMarker.isJacORBDeployment(deploymentUnit)) {
+        if (IIOPDeploymentMarker.isIIOPDeployment(deploymentUnit)) {
             //needed for dynamic IIOP stubs
-            moduleSpecification.addSystemDependency(new ModuleDependency(moduleLoader, JACORB, false, false, false, false));
+            moduleSpecification.addSystemDependency(new ModuleDependency(moduleLoader, IIOP_OPENJDK, false, false, false, false));
         }
 
         // fetch the EjbJarMetaData

ejb3/src/main/java/org/jboss/as/ejb3/deployment/processors/EjbIIOPDeploymentUnitProcessor.java

@@ -21,7 +21,6 @@
  */
 package org.jboss.as.ejb3.deployment.processors;
 
-
 import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.List;
@@ -47,16 +46,6 @@
 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.jacorb.deployment.JacORBDeploymentMarker;
-import org.jboss.as.jacorb.rmi.AttributeAnalysis;
-import org.jboss.as.jacorb.rmi.InterfaceAnalysis;
-import org.jboss.as.jacorb.rmi.OperationAnalysis;
-import org.jboss.as.jacorb.rmi.RMIIIOPViolationException;
-import org.jboss.as.jacorb.rmi.marshal.strategy.SkeletonStrategy;
-import org.jboss.as.jacorb.service.CorbaNamingService;
-import org.jboss.as.jacorb.service.CorbaORBService;
-import org.jboss.as.jacorb.service.CorbaPOAService;
-import org.jboss.as.jacorb.service.IORSecConfigMetaDataService;
 import org.jboss.as.server.Services;
 import org.jboss.as.server.deployment.DeploymentPhaseContext;
 import org.jboss.as.server.deployment.DeploymentUnit;
@@ -77,6 +66,16 @@
 import org.omg.CORBA.ORB;
 import org.omg.CosNaming.NamingContextExt;
 import org.omg.PortableServer.POA;
+import org.wildfly.iiop.openjdk.deployment.IIOPDeploymentMarker;
+import org.wildfly.iiop.openjdk.rmi.AttributeAnalysis;
+import org.wildfly.iiop.openjdk.rmi.InterfaceAnalysis;
+import org.wildfly.iiop.openjdk.rmi.OperationAnalysis;
+import org.wildfly.iiop.openjdk.rmi.RMIIIOPViolationException;
+import org.wildfly.iiop.openjdk.rmi.marshal.strategy.SkeletonStrategy;
+import org.wildfly.iiop.openjdk.service.CorbaNamingService;
+import org.wildfly.iiop.openjdk.service.CorbaORBService;
+import org.wildfly.iiop.openjdk.service.CorbaPOAService;
+import org.wildfly.iiop.openjdk.service.IORSecConfigMetaDataService;
 
 /**
  * This is the DUP that sets up IIOP for EJB's
@@ -92,8 +91,9 @@ public EjbIIOPDeploymentUnitProcessor(final IIOPSettingsService settingsService)
     @Override
     public void deploy(final DeploymentPhaseContext phaseContext) throws DeploymentUnitProcessingException {
 
+
         final DeploymentUnit deploymentUnit = phaseContext.getDeploymentUnit();
-        if (!JacORBDeploymentMarker.isJacORBDeployment(deploymentUnit)) {
+        if (!IIOPDeploymentMarker.isIIOPDeployment(deploymentUnit)) {
             return;
         }
 
@@ -102,6 +102,7 @@ public void deploy(final DeploymentPhaseContext phaseContext) throws DeploymentU
             return;
         }
 
+
         // a bean-name -> IIOPMetaData map, reflecting the assembly descriptor IIOP configuration.
         Map<String, IIOPMetaData> iiopMetaDataMap = new HashMap<String, IIOPMetaData>();
         final EjbJarMetaData ejbMetaData = deploymentUnit.getAttachment(EjbDeploymentAttachmentKeys.EJB_JAR_METADATA);
@@ -152,6 +153,7 @@ private void processEjb(final EJBComponentDescription componentDescription, fina
 
         // Create bean method mappings for container invoker
 
+
         final EJBViewDescription remoteView = componentDescription.getEjbRemoteView();
         final ClassIndex remoteClass;
         try {
@@ -167,6 +169,7 @@ private void processEjb(final EJBComponentDescription componentDescription, fina
             throw EjbLogger.ROOT_LOGGER.failedToLoadViewClassForComponent(e, componentDescription.getEJBClassName());
         }
 
+
         componentDescription.getEjbHomeView().getConfigurators().add(new IIOPInterceptorViewConfigurator());
         componentDescription.getEjbRemoteView().getConfigurators().add(new IIOPInterceptorViewConfigurator());
 
@@ -245,6 +248,7 @@ private void processEjb(final EJBComponentDescription componentDescription, fina
         // Initialize repository ids of home interface
         final String[] homeRepositoryIds = homeInterfaceAnalysis.getAllTypeIds();
 
+
         final EjbIIOPService service = new EjbIIOPService(beanMethodMap, beanRepositoryIds, homeMethodMap, homeRepositoryIds,
                 settingsService.isUseQualifiedName(), iiopMetaData, module);
         final ServiceBuilder<EjbIIOPService> builder = serviceTarget.addService(componentDescription.getServiceName().append(EjbIIOPService.SERVICE_NAME), service);

ejb3/src/main/java/org/jboss/as/ejb3/deployment/processors/IIOPJndiBindingProcessor.java

@@ -28,8 +28,6 @@
 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.jacorb.deployment.JacORBDeploymentMarker;
-import org.jboss.as.jacorb.service.CorbaORBService;
 import org.jboss.as.naming.ManagedReferenceInjector;
 import org.jboss.as.naming.ServiceBasedNamingStore;
 import org.jboss.as.naming.ValueManagedReferenceFactory;
@@ -44,6 +42,8 @@
 import org.jboss.msc.service.ServiceTarget;
 import org.jboss.msc.value.ImmediateValue;
 import org.omg.CORBA.ORB;
+import org.wildfly.iiop.openjdk.deployment.IIOPDeploymentMarker;
+import org.wildfly.iiop.openjdk.service.CorbaORBService;
 
 /**
  * Processor responsible for binding IIOP related resources to JNDI.
@@ -65,7 +65,7 @@ public void deploy(DeploymentPhaseContext phaseContext) throws DeploymentUnitPro
         }
 
         //do not bind if jacORB not present
-        if (!JacORBDeploymentMarker.isJacORBDeployment(deploymentUnit)) {
+        if (!IIOPDeploymentMarker.isIIOPDeployment(deploymentUnit)) {
             return;
         }
 

ejb3/src/main/java/org/jboss/as/ejb3/iiop/EjbCorbaServant.java

@@ -42,9 +42,7 @@
 import org.jboss.as.ee.component.ComponentView;
 import org.jboss.as.ejb3.component.entity.EntityBeanComponent;
 import org.jboss.as.ejb3.component.stateful.StatefulSessionComponent;
-import org.jboss.as.jacorb.csiv2.idl.SASCurrent;
-import org.jboss.as.jacorb.rmi.RmiIdlUtil;
-import org.jboss.as.jacorb.rmi.marshal.strategy.SkeletonStrategy;
+import org.jboss.iiop.csiv2.SASCurrent;
 import org.jboss.as.naming.context.NamespaceContextSelector;
 import org.jboss.ejb.client.SessionID;
 import org.jboss.ejb.iiop.HandleImplIIOP;
@@ -70,6 +68,8 @@
 import org.omg.PortableServer.CurrentPackage.NoContext;
 import org.omg.PortableServer.POA;
 import org.omg.PortableServer.Servant;
+import org.wildfly.iiop.openjdk.rmi.RmiIdlUtil;
+import org.wildfly.iiop.openjdk.rmi.marshal.strategy.SkeletonStrategy;
 import org.wildfly.security.manager.WildFlySecurityManager;
 
 /**

ejb3/src/main/java/org/jboss/as/ejb3/iiop/EjbIIOPService.java

@@ -32,18 +32,12 @@
 import javax.ejb.EJBMetaData;
 import javax.rmi.PortableRemoteObject;
 
-import org.jacorb.ssl.SSLPolicyValue;
-import org.jacorb.ssl.SSLPolicyValueHelper;
-import org.jacorb.ssl.SSL_POLICY_TYPE;
 import org.jboss.as.ee.component.ComponentView;
 import org.jboss.as.ejb3.logging.EjbLogger;
 import org.jboss.as.ejb3.component.EJBComponent;
 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.jacorb.csiv2.CSIv2Policy;
-import org.jboss.as.jacorb.rmi.ir.InterfaceRepository;
-import org.jboss.as.jacorb.rmi.marshal.strategy.SkeletonStrategy;
 import org.jboss.as.server.moduleservice.ServiceModuleLoader;
 import org.jboss.ejb.client.EJBHomeLocator;
 import org.jboss.ejb.client.EJBLocator;
@@ -85,8 +79,13 @@
 import org.omg.PortableServer.Current;
 import org.omg.PortableServer.CurrentHelper;
 import org.omg.PortableServer.POA;
+import org.wildfly.iiop.openjdk.csiv2.CSIv2Policy;
+import org.wildfly.iiop.openjdk.rmi.ir.InterfaceRepository;
+import org.wildfly.iiop.openjdk.rmi.marshal.strategy.SkeletonStrategy;
 import org.wildfly.security.manager.WildFlySecurityManager;
 
+import com.sun.corba.se.spi.extension.ZeroPortPolicy;
+
 /**
  * This is an IIOP "proxy factory" for <code>EJBHome</code>s and
  * <code>EJBObject</code>s. Rather than creating Java proxies (as the JRMP
@@ -236,6 +235,7 @@ public EjbIIOPService(final Map<String, SkeletonStrategy> beanMethodMap, final S
 
     public synchronized void start(final StartContext startContext) throws StartException {
 
+
         try {
             final RiverMarshallerFactory factory = new RiverMarshallerFactory();
             final MarshallingConfiguration configuration = new MarshallingConfiguration();
@@ -265,6 +265,7 @@ public synchronized void start(final StartContext startContext) throws StartExce
             }
             name = name.replace(".", "_");
 
+
             final ORB orb = this.orb.getValue();
             if (interfaceRepositorySupported) {
                 // Create a CORBA interface repository for the enterprise bean
@@ -288,22 +289,20 @@ public synchronized void start(final StartContext startContext) throws StartExce
                 final Any secPolicy = orb.create_any();
                 secPolicy.insert_Value(iorSecurityConfigMetaData);
                 Policy csiv2Policy = orb.create_policy(CSIv2Policy.TYPE, secPolicy);
+
                 policyList.add(csiv2Policy);
 
-                // Create SSLPolicy (SSL_REQUIRED ensures home and remote IORs will have port 0 in the primary address).
+                //  Add ZeroPortPolicy if ssl is required (it ensures home and remote IORs will have port 0 in the primary address).
                 boolean sslRequired = false;
                 if (iorSecurityConfigMetaData != null && iorSecurityConfigMetaData.getTransportConfig() != null) {
                     IORTransportConfigMetaData tc = iorSecurityConfigMetaData.getTransportConfig();
                     sslRequired = IORTransportConfigMetaData.INTEGRITY_REQUIRED.equals(tc.getIntegrity())
                             || IORTransportConfigMetaData.CONFIDENTIALITY_REQUIRED.equals(tc.getConfidentiality())
                             || IORTransportConfigMetaData.ESTABLISH_TRUST_IN_CLIENT_REQUIRED.equals(tc.getEstablishTrustInClient());
                 }
-                final Any sslPolicyValue = orb.create_any();
-                SSLPolicyValueHelper.insert(sslPolicyValue, (sslRequired) ? SSLPolicyValue.SSL_REQUIRED : SSLPolicyValue.SSL_NOT_REQUIRED);
-                Policy sslPolicy = orb.create_policy(SSL_POLICY_TYPE.value, sslPolicyValue);
-                policyList.add(sslPolicy);
-
-                EjbLogger.ROOT_LOGGER.debugf("container's SSL policy: %s", sslPolicy);
+                if(sslRequired){
+                    policyList.add(ZeroPortPolicy.getPolicy());
+                }
             }
 
             String securityDomain = "CORBA_REMOTE"; //TODO: what should this default to
@@ -508,6 +507,7 @@ public static synchronized void rebind(final NamingContextExt ctx, final String
         final NameComponent[] name = ctx.to_name(strName);
         NamingContext intermediateCtx = ctx;
 
+
         for (int i = 0; i < name.length - 1; i++) {
             final NameComponent[] relativeName = new NameComponent[]{name[i]};
             try {

ejb3/src/main/java/org/jboss/as/ejb3/iiop/EjbIIOPTransactionInterceptor.java

@@ -30,12 +30,12 @@
 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.jacorb.tm.ForeignTransaction;
-import org.jboss.as.jacorb.tm.TxServerInterceptor;
 import org.jboss.invocation.ImmediateInterceptorFactory;
 import org.jboss.invocation.Interceptor;
 import org.jboss.invocation.InterceptorContext;
 import org.jboss.invocation.InterceptorFactory;
+import org.wildfly.iiop.openjdk.tm.ForeignTransaction;
+import org.wildfly.iiop.openjdk.tm.TxServerInterceptor;
 
 /**
  * @author Stuart Douglas

ejb3/src/main/java/org/jboss/as/ejb3/iiop/POARegistry.java

@@ -103,7 +103,7 @@ public synchronized void start(final StartContext startContext) throws StartExce
         // Policies for per-servant transient POAs
         transientPoaPolicies = new Policy[]{rootPOA.create_lifespan_policy(
                 LifespanPolicyValue.TRANSIENT),
-                rootPOA.create_id_assignment_policy(IdAssignmentPolicyValue.USER_ID),
+                rootPOA.create_id_assignment_policy(IdAssignmentPolicyValue.SYSTEM_ID),
                 rootPOA.create_servant_retention_policy(ServantRetentionPolicyValue.NON_RETAIN),
                 rootPOA.create_request_processing_policy(RequestProcessingPolicyValue.USE_DEFAULT_SERVANT),
                 rootPOA.create_id_uniqueness_policy( IdUniquenessPolicyValue.MULTIPLE_ID),

ejb3/src/main/java/org/jboss/as/ejb3/iiop/RemoteObjectSubstitutionService.java

@@ -27,7 +27,7 @@
 import org.jboss.as.ejb3.deployment.DeploymentRepository;
 import org.jboss.as.ejb3.deployment.EjbDeploymentInformation;
 import org.jboss.as.ejb3.deployment.ModuleDeployment;
-import org.jboss.com.sun.corba.se.impl.javax.rmi.RemoteObjectSubstitution;
+import org.jboss.javax.rmi.RemoteObjectSubstitution;
 import org.jboss.ejb.client.EJBClient;
 import org.jboss.ejb.client.EJBHandle;
 import org.jboss.ejb.client.EJBHomeHandle;
@@ -54,6 +54,8 @@ public class RemoteObjectSubstitutionService implements RemoteObjectSubstitution
 
     @Override
     public Object writeReplaceRemote(final Object object) {
+
+
         final DeploymentRepository deploymentRepository = deploymentRepositoryInjectedValue.getOptionalValue();
         //if we are not started yet just return
         if (deploymentRepository == null) {