Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move com.ibm.jvm classes to named module openj9.jvm #58

Merged
merged 1 commit into from
Sep 21, 2017
Merged

Move com.ibm.jvm classes to named module openj9.jvm #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions jcl/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<classpathentry excluding="**/module-info.java" kind="src" path="src/java.logging/share/classes"/>
<classpathentry excluding="**/module-info.java" kind="src" path="src/java.management/share/classes"/>
<classpathentry excluding="**/module-info.java" kind="src" path="src/jdk.attach/share/classes"/>
<classpathentry excluding="**/module-info.java" kind="src" path="src/openj9.jvm/share/classes"/>
<classpathentry excluding="**/module-info.java" kind="src" path="src/jdk.management/share/classes"/>
<classpathentry excluding="**/module-info.java" kind="src" path="src/openj9.cuda/share/classes"/>
<classpathentry excluding="**/module-info.java" kind="src" path="src/com.ibm.dataaccess/share/classes"/>
Expand Down
1 change: 1 addition & 0 deletions jcl/j9modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ com.ibm.dataaccess
openj9.sharedclasses
com.ibm.traceformat
jdk.attach
openj9.jvm

# requires openj9.cuda
openj9.gpu
Expand Down
2 changes: 2 additions & 0 deletions jcl/j9modules.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
<case value="java.base">
<removeexport package="com.ibm.cuda" />
<removeexport package="com.ibm.dataaccess" />
<removeexport package="com.ibm.jvm" />
<removeexport package="com.ibm.oti.shared" />
<removeexport package="com.ibm.sharedclasses.spi" />

Expand All @@ -78,6 +79,7 @@
<include name="com/ibm/dataaccess/*" />
<include name="com/ibm/gpu/*" />
<include name="com/ibm/oti/shared/*" />
<include name="com/ibm/jvm/*" />
</fileset>
</delete>

Expand Down
11 changes: 11 additions & 0 deletions jcl/jpp_configuration.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@
<source path="src/java.logging/share/classes"/>
<source path="src/java.management/share/classes"/>
<source path="src/jdk.attach/share/classes"/>
<source path="src/openj9.jvm/share/classes"/>
<source path="src/jdk.management/share/classes"/>
<source path="src/openj9.cuda/share/classes" />
<source path="src/com.ibm.dataaccess/share/classes"/>
Expand All @@ -93,6 +94,7 @@
<classpathentry kind="src" path="src/java.base/share/classes"/>
<classpathentry kind="src" path="src/java.management/share/classes"/>
<classpathentry kind="src" path="src/jdk.attach/share/classes"/>
<classpathentry kind="src" path="src/openj9.jvm/share/classes"/>
<classpathentry kind="src" path="src/jdk.management/share/classes"/>
<classpathentry kind="src" path="src/openj9.cuda/share/classes"/>
<classpathentry kind="src" path="src/com.ibm.dataaccess/share/classes"/>
Expand All @@ -119,6 +121,7 @@
<classpathentry kind="src" path="src/java.base/share/classes"/>
<classpathentry kind="src" path="src/java.management/share/classes"/>
<classpathentry kind="src" path="src/jdk.attach/share/classes"/>
<classpathentry kind="src" path="src/openj9.jvm/share/classes"/>
<classpathentry kind="src" path="src/jdk.management/share/classes"/>
<classpathentry kind="src" path="src/openj9.cuda/share/classes"/>
<classpathentry kind="src" path="src/com.ibm.dataaccess/share/classes"/>
Expand All @@ -145,6 +148,7 @@
<classpathentry kind="src" path="src/java.base/share/classes"/>
<classpathentry kind="src" path="src/java.management/share/classes"/>
<classpathentry kind="src" path="src/jdk.attach/share/classes"/>
<classpathentry kind="src" path="src/openj9.jvm/share/classes"/>
<classpathentry kind="src" path="src/jdk.management/share/classes"/>
<classpathentry kind="src" path="src/openj9.cuda/share/classes"/>
<classpathentry kind="src" path="src/com.ibm.dataaccess/share/classes"/>
Expand All @@ -171,6 +175,7 @@
<classpathentry kind="src" path="src/java.base/share/classes"/>
<classpathentry kind="src" path="src/java.management/share/classes"/>
<classpathentry kind="src" path="src/jdk.attach/share/classes"/>
<classpathentry kind="src" path="src/openj9.jvm/share/classes"/>
<classpathentry kind="src" path="src/jdk.management/share/classes"/>
<classpathentry kind="src" path="src/openj9.cuda/share/classes"/>
<classpathentry kind="src" path="src/com.ibm.dataaccess/share/classes"/>
Expand All @@ -197,6 +202,7 @@
<classpathentry kind="src" path="src/java.base/share/classes"/>
<classpathentry kind="src" path="src/java.management/share/classes"/>
<classpathentry kind="src" path="src/jdk.attach/share/classes"/>
<classpathentry kind="src" path="src/openj9.jvm/share/classes"/>
<classpathentry kind="src" path="src/jdk.management/share/classes"/>
<classpathentry kind="src" path="src/openj9.cuda/share/classes"/>
<classpathentry kind="src" path="src/com.ibm.dataaccess/share/classes"/>
Expand All @@ -223,6 +229,7 @@
<classpathentry kind="src" path="src/java.base/share/classes"/>
<classpathentry kind="src" path="src/java.management/share/classes"/>
<classpathentry kind="src" path="src/jdk.attach/share/classes"/>
<classpathentry kind="src" path="src/openj9.jvm/share/classes"/>
<classpathentry kind="src" path="src/jdk.management/share/classes"/>
<classpathentry kind="src" path="src/openj9.cuda/share/classes"/>
<classpathentry kind="src" path="src/com.ibm.dataaccess/share/classes"/>
Expand All @@ -249,6 +256,7 @@
<classpathentry kind="src" path="src/java.base/share/classes"/>
<classpathentry kind="src" path="src/java.management/share/classes"/>
<classpathentry kind="src" path="src/jdk.attach/share/classes"/>
<classpathentry kind="src" path="src/openj9.jvm/share/classes"/>
<classpathentry kind="src" path="src/jdk.management/share/classes"/>
<classpathentry kind="src" path="src/openj9.cuda/share/classes"/>
<classpathentry kind="src" path="src/com.ibm.dataaccess/share/classes"/>
Expand All @@ -275,6 +283,7 @@
<classpathentry kind="src" path="src/java.base/share/classes"/>
<classpathentry kind="src" path="src/java.management/share/classes"/>
<classpathentry kind="src" path="src/jdk.attach/share/classes"/>
<classpathentry kind="src" path="src/openj9.jvm/share/classes"/>
<classpathentry kind="src" path="src/jdk.management/share/classes"/>
<classpathentry kind="src" path="src/openj9.cuda/share/classes"/>
<classpathentry kind="src" path="src/com.ibm.dataaccess/share/classes"/>
Expand All @@ -301,6 +310,7 @@
<classpathentry kind="src" path="src/java.base/share/classes"/>
<classpathentry kind="src" path="src/java.management/share/classes"/>
<classpathentry kind="src" path="src/jdk.attach/share/classes"/>
<classpathentry kind="src" path="src/openj9.jvm/share/classes"/>
<classpathentry kind="src" path="src/jdk.management/share/classes"/>
<classpathentry kind="src" path="src/openj9.cuda/share/classes"/>
<classpathentry kind="src" path="src/com.ibm.dataaccess/share/classes"/>
Expand Down Expand Up @@ -331,6 +341,7 @@
<source path="src/java.management/share/classes"/>
<source path="src/jdk.management/share/classes"/>
<source path="src/jdk.attach/share/classes"/>
<source path="src/openj9.jvm/share/classes"/>
<source path="src/com.ibm.dataaccess/share/classes"/>
<source path="src/com.ibm.management/share/classes"/>
<source path="src/openj9.sharedclasses/share/classes"/>
Expand Down
3 changes: 1 addition & 2 deletions jcl/src/java.base/share/classes/module-info.java.extra
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,12 @@
* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
*******************************************************************************/
module java.base {
exports com.ibm.jvm;
exports com.ibm.le.conditionhandling;
/*[IF PLATFORM-mz31 | PLATFORM-mz64 | PLATFORM-xz64]*/
exports com.ibm.jit.crypto to ibm.crypto.hdwrcca;
/*[ENDIF]*/
exports com.ibm.sharedclasses.spi to openj9.sharedclasses, java.management, java.rmi;
exports com.ibm.oti.vm to com.ibm.management, java.management, jdk.attach, openj9.sharedclasses;
exports com.ibm.oti.vm to com.ibm.management, java.management, jdk.attach, openj9.jvm, openj9.sharedclasses;
exports com.ibm.oti.util to com.ibm.management, java.management, jdk.attach, jdk.management, openj9.sharedclasses;
exports com.ibm.tools.attach.target to jdk.attach;
exports jdk.internal.org.objectweb.asm to com.ibm.dtfj, com.ibm.dtfjview;
Expand Down
0 ...share/classes/com/ibm/jvm/Debuggable.java → ...share/classes/com/ibm/jvm/Debuggable.java
View file
Open in desktop
File renamed without changes.
0 ....base/share/classes/com/ibm/jvm/Dump.java → ...9.jvm/share/classes/com/ibm/jvm/Dump.java
View file
Open in desktop
File renamed without changes.
0 ...umpConfigurationUnavailableException.java → ...umpConfigurationUnavailableException.java
View file
Open in desktop
File renamed without changes.
0 ...e/classes/com/ibm/jvm/DumpPermission.java → ...e/classes/com/ibm/jvm/DumpPermission.java
View file
Open in desktop
File renamed without changes.
0 ...m/ibm/jvm/InvalidDumpOptionException.java → ...m/ibm/jvm/InvalidDumpOptionException.java
View file
Open in desktop
File renamed without changes.
0 ...a.base/share/classes/com/ibm/jvm/Log.java → ...j9.jvm/share/classes/com/ibm/jvm/Log.java
View file
Open in desktop
File renamed without changes.
0 ...re/classes/com/ibm/jvm/LogPermission.java → ...re/classes/com/ibm/jvm/LogPermission.java
View file
Open in desktop
File renamed without changes.
0 ...base/share/classes/com/ibm/jvm/Stats.java → ....jvm/share/classes/com/ibm/jvm/Stats.java
View file
Open in desktop
File renamed without changes.
0 ...asses/com/ibm/jvm/ToolDumpPermission.java → ...asses/com/ibm/jvm/ToolDumpPermission.java
View file
Open in desktop
File renamed without changes.
0 ...base/share/classes/com/ibm/jvm/Trace.java → ....jvm/share/classes/com/ibm/jvm/Trace.java
View file
Open in desktop
File renamed without changes.
0 .../classes/com/ibm/jvm/TracePermission.java → .../classes/com/ibm/jvm/TracePermission.java
View file
Open in desktop
File renamed without changes.
25 changes: 25 additions & 0 deletions jcl/src/openj9.jvm/share/classes/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
/*[INCLUDE-IF Sidecar19-SE]*/
/*******************************************************************************
* Copyright (c) 2017, 2017 IBM Corp. and others
*
* This program and the accompanying materials are made available under
* the terms of the Eclipse Public License 2.0 which accompanies this
* distribution and is available at https://www.eclipse.org/legal/epl-2.0/
* or the Apache License, Version 2.0 which accompanies this distribution and
* is available at https://www.apache.org/licenses/LICENSE-2.0.
*
* This Source Code may also be made available under the following
* Secondary Licenses when the conditions for such availability set
* forth in the Eclipse Public License, v. 2.0 are satisfied: GNU
* General Public License, version 2 with the GNU Classpath
* Exception [1] and GNU General Public License, version 2 with the
* OpenJDK Assembly Exception [2].
*
* [1] https://www.gnu.org/software/classpath/license.html
* [2] http://openjdk.java.net/legal/assembly-exception.html
*
* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
*******************************************************************************/
module openj9.jvm {
exports com.ibm.jvm;
}