change sun.rmi.rmic to org.glassfish.rmic
Signed-off-by: hs536 <sawamura.hiroki@fujitsu.com>
diff --git a/appserver/ejb/ejb-container/osgi.bundle b/appserver/ejb/ejb-container/osgi.bundle
index 78a67c7..4461d13 100644
--- a/appserver/ejb/ejb-container/osgi.bundle
+++ b/appserver/ejb/ejb-container/osgi.bundle
@@ -38,6 +38,7 @@
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
index f4104f6..24637c6 100755
--- 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
index 586b906..7efba9c 100644
--- 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
@@ -34,6 +34,7 @@
import com.sun.enterprise.deployment.EjbDescriptor;
import com.sun.enterprise.deployment.EjbBundleDescriptor;
import com.sun.enterprise.deployment.util.TypeUtil;
+import com.sun.enterprise.util.JDK;
import com.sun.enterprise.util.OS;
import org.glassfish.api.admin.ServerEnvironment;
@@ -242,7 +243,7 @@
return;
}
- if( toolsJarPath == null && !OS.isDarwin()) {
+ if( toolsJarPath == null && !OS.isDarwin() && JDK.getMajor() < 9) {
_logger.log(Level.INFO, "[RMIC] tools.jar location was not found");
return;
}
@@ -271,7 +272,7 @@
_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
index 0ce8154..fc37904 100644
--- a/nucleus/featuresets/nucleus/pom.xml
+++ b/nucleus/featuresets/nucleus/pom.xml
@@ -235,6 +235,16 @@
</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>
<exclusions>
diff --git a/nucleus/parent/pom.xml b/nucleus/parent/pom.xml
index fbd0515..83a9267 100644
--- a/nucleus/parent/pom.xml
+++ b/nucleus/parent/pom.xml
@@ -797,6 +797,11 @@
<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>
<version>${mail.version}</version>
