FISH-5747 Upgrade Corba to version 4.2.4.payara-p1

appserver/common/glassfish-naming/pom.xml

@@ -40,7 +40,7 @@
     holder.
 
 -->
-
+<!-- Portions Copyright [2022] Payara Foundation and/or affiliates -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <parent>
         <groupId>fish.payara.server.internal.common</groupId>
@@ -102,5 +102,9 @@
             <artifactId>common-util</artifactId>
             <version>${project.version}</version>
         </dependency>
-   </dependencies>
+        <dependency>
+            <groupId>org.glassfish.corba</groupId>
+            <artifactId>glassfish-corba-orb</artifactId>
+        </dependency>
+    </dependencies>
 </project>

appserver/common/glassfish-naming/src/main/java/com/sun/enterprise/naming/impl/GlassfishNamingManagerImpl.java

@@ -37,7 +37,7 @@
  * only if the new code is made subject to such option by the copyright
  * holder.
  *
- * Portions Copyright [2017-2019] Payara Foundation and/or affiliates
+ * Portions Copyright [2017-2022] Payara Foundation and/or affiliates
  */
 
 package com.sun.enterprise.naming.impl;
@@ -165,7 +165,7 @@ public Remote initializeRemoteNamingSupport(ORB orb) throws NamingException {
             // Now that we have an ORB, initialize the CosNaming service
             // and set it on the server's naming service.
             Hashtable<String, Object> cosNamingEnv = new Hashtable<>();
-            cosNamingEnv.put("java.naming.factory.initial", "com.sun.jndi.cosnaming.CNCtxFactory");
+            cosNamingEnv.put("java.naming.factory.initial", org.glassfish.jndi.cosnaming.CNCtxFactory.class.getName());
             cosNamingEnv.put("java.naming.corba.orb", orb);
             cosContext = new InitialContext(cosNamingEnv);
             ProviderManager pm = ProviderManager.getProviderManager();

appserver/common/glassfish-naming/src/main/java/com/sun/enterprise/naming/util/IIOPObjectFactory.java

@@ -36,6 +36,9 @@
  * and therefore, elected the GPL Version 2 license, then the option applies
  * only if the new code is made subject to such option by the copyright
  * holder.
+ *
+ * Portions Copyright [2022] Payara Foundation and/or affiliates
+ *
  */
 
 package com.sun.enterprise.naming.util;
@@ -59,7 +62,7 @@ public Object getObjectInstance(Object obj,
                                     Name name,
                                     Context nameCtx,
                                     Hashtable env) throws Exception {
-        env.put("java.naming.factory.initial", "com.sun.jndi.cosnaming.CNCtxFactory");
+        env.put("java.naming.factory.initial", org.glassfish.jndi.cosnaming.CNCtxFactory.class.getName());
 
         InitialContext ic = new InitialContext(env);
 

appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/GlassFishORBManager.java

@@ -750,7 +750,7 @@ private String checkORBInitialPort(Properties props) {
         }
 
         // Make sure we set initial port in System properties so that
-        // any instantiations of com.sun.jndi.cosnaming.CNCtxFactory
+        // any instantiations of org.glassfish.jndi.cosnaming.CNCtxFactory
         // use same port.
         props.setProperty(ORBConstants.INITIAL_PORT_PROPERTY, initialPort);
 

appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/RoundRobinPolicy.java

@@ -37,13 +37,13 @@
  * only if the new code is made subject to such option by the copyright
  * holder.
  */
-// Portions Copyright [2017] [Payara Foundation and/or its affiliates]
+// Portions Copyright [2017-2022] [Payara Foundation and/or its affiliates]
 
 package org.glassfish.enterprise.iiop.impl;
 
 import com.sun.corba.ee.spi.folb.ClusterInstanceInfo;
 import com.sun.corba.ee.spi.folb.SocketInfo;
-import com.sun.jndi.cosnaming.IiopUrl;
+import org.glassfish.jndi.cosnaming.IiopUrl;
 import org.glassfish.internal.api.ORBLocator;
 import org.glassfish.logging.annotation.LogMessageInfo;
 

nucleus/core/extra-jre-packages/pom.xml

@@ -40,7 +40,7 @@
     holder.
 
 -->
-<!-- Portions Copyright [2018-2019] [Payara Foundation and/or its affiliates] -->
+<!-- Portions Copyright [2018-2022] [Payara Foundation and/or its affiliates] -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
@@ -94,7 +94,6 @@
                                     com.sun.j3d.utils.image,
                                     com.sun.j3d.utils.timer,
                                     com.sun.java.swing.plaf.windows,
-                                    com.sun.jndi.cosnaming,
                                     com.sun.jndi.ldap,
                                     com.sun.mirror.apt,
                                     com.sun.mirror.declaration,

nucleus/pom.xml

@@ -137,7 +137,7 @@
         <hk2.plugin.version>2.6.1.payara-p1</hk2.plugin.version>
         <tiger.types.version>1.4.payara-p1</tiger.types.version>
 
-        <glassfish-corba.version>4.1.1.payara-p4</glassfish-corba.version>
+        <glassfish-corba.version>4.2.4.payara-p1</glassfish-corba.version>
         <saaj-api.version>1.4.0</saaj-api.version>
 
         <!-- Library for introspecting types with full generic information including resolving of field and method types. -->