change sun.rmi.rmic to org.glassfish.rmic

Signed-off-by: hs536 <sawamura.hiroki@fujitsu.com>
hs536 · Feb 14, 2020 · 6da9614 · 6da9614
1 parent faa1e8c
commit 6da9614
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 2 deletions.
diff --git a/appserver/ejb/ejb-container/osgi.bundle b/appserver/ejb/ejb-container/osgi.bundle
@@ -38,6 +38,7 @@ Import-Package: \
                         javax.jws;resolution:=optional, \
                         org.glassfish.apf.context, \
                         org.glassfish.ejb.deployment.archive, \
+                        org.glassfish.rmic, \
                         *
 
 Bundle-SymbolicName: \

diff --git a/appserver/ejb/ejb-container/pom.xml b/appserver/ejb/ejb-container/pom.xml
@@ -225,5 +225,9 @@
             <artifactId>logging-annotation-processor</artifactId>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>org.glassfish.corba</groupId>
+            <artifactId>rmic</artifactId>
+        </dependency>
     </dependencies>
 </project>
diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/codegen/StaticRmiStubGenerator.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/codegen/StaticRmiStubGenerator.java
@@ -244,7 +244,7 @@ private void rmic(String classPath, Set<String> stubClasses, File destDir,
 
         if( toolsJarPath == null && !OS.isDarwin()) {
             _logger.log(Level.INFO,  "[RMIC] tools.jar location was not found");
-            return;
+//            return;
         }
 
         progress(localStrings.getStringWithDefault(
@@ -271,7 +271,7 @@ private void rmic(String classPath, Set<String> stubClasses, File destDir,
         _logger.info("[RMIC] options: " + cmds);
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
 
-        sun.rmi.rmic.Main compiler = new sun.rmi.rmic.Main(baos, "rmic");
+        org.glassfish.rmic.Main compiler = new org.glassfish.rmic.Main(baos, "rmic");
         boolean success = compiler.compile(cmds.toArray(new String[cmds.size()]));
         //success = true;  // it ALWAYS returns an "error" if -Xnocompile is used!!
 

diff --git a/nucleus/featuresets/nucleus/pom.xml b/nucleus/featuresets/nucleus/pom.xml
@@ -234,6 +234,16 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.glassfish.corba</groupId>
+            <artifactId>rmic</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <dependency>
             <groupId>org.glassfish.pfl</groupId>
             <artifactId>pfl-asm</artifactId>

diff --git a/nucleus/parent/pom.xml b/nucleus/parent/pom.xml
@@ -796,6 +796,11 @@
                 <artifactId>glassfish-corba-internal-api</artifactId>
                 <version>${glassfish-corba.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.glassfish.corba</groupId>
+                <artifactId>rmic</artifactId>
+                <version>${glassfish-corba.version}</version>
+            </dependency>
             <dependency>
                 <groupId>jakarta.mail</groupId>
                 <artifactId>jakarta.mail-api</artifactId>