Skip to content

Commit e5d923f

Browse files
committed
Moved code to 'jdk.jsplitpkgscan' to fix #38
In additon also the module name was changed to the same name as the package and fixed build bradge link.
1 parent cdcd27c commit e5d923f

File tree

8 files changed

+12
-39
lines changed

8 files changed

+12
-39
lines changed

README.adoc

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Patrick Reinhart <https://github.com/reinhapa[@reinhapa]>
1111

1212
image:https://img.shields.io/badge/license-GPL2+CPE-blue.svg["GNU General Public License, version 2, with the Classpath Exception", link="https://github.com/{project-full-path}/blob/{github-branch}/LICENSE"]
1313
image:https://img.shields.io/badge/Java-{jdk-version}-blue.svg["Supported Versions", link="https://travis-ci.org/{project-full-path}"]
14-
image:https://github.com/{project-full-path}/workflows/Java%20CI/badge.svg["Java CI with Gradle", link="https://github.com/{project-full-path}/actions?query=workflow%3ACI"]
14+
image:https://github.com/{project-full-path}/actions/workflows/gradle.yml/badge.svg["Java CI with Gradle", link="https://github.com/{project-full-path}/actions/workflows/gradle.yml"]
1515
image:https://img.shields.io/maven-central/v/{group-name}/{project-name}.svg?label=Maven%20Central["Maven Central", link="https://search.maven.org/search?q=g:%22{group-name}%22%20AND%20a:%22{project-name}%22"]
1616

1717
This project contains a proposal for http://openjdk.java.net[OpenJDK] split package scanner addition.
@@ -39,7 +39,7 @@ After the build was successful you can now start it using:
3939

4040
[source, bash, subs="attributes"]
4141
----
42-
java -p build/libs/jsplitpkgscan-{jsplitpkgscan-version}.jar -m org.adoptopenjdk.jsplitpkgscan
42+
java -p build/libs/jsplitpkgscan-{jsplitpkgscan-version}.jar -m jdk.jsplitpkgscan
4343
----
4444

4545
The usage is as follows

build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ java {
1717
}
1818

1919
application {
20-
mainClass = "jdk.Main"
21-
mainModule = "org.adoptopenjdk.jsplitpkgscan"
20+
mainClass = "jdk.jsplitpkgscan.Main"
21+
mainModule = "jdk.jsplitpkgscan"
2222
}
2323

2424
// Uncomment the section below if you want to just ./gradlew publishToMavenLocal locally

build.xml

-26
This file was deleted.

src/main/java/jdk/JsplitpgkscanTask.java src/main/java/jdk/jsplitpkgscan/JsplitpgkscanTask.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
* questions.
2424
*/
2525

26-
package jdk;
26+
package jdk.jsplitpkgscan;
2727

2828
import java.io.BufferedWriter;
2929
import java.io.IOException;
@@ -130,9 +130,9 @@ private static class ResourceBundleHelper {
130130
static {
131131
Locale locale = Locale.getDefault();
132132
try {
133-
bundle = ResourceBundle.getBundle("jdk.resources.jsplitpkgscan", locale);
133+
bundle = ResourceBundle.getBundle("jdk.jsplitpkgscan.resources.jsplitpkgscan", locale);
134134
} catch (MissingResourceException e) {
135-
throw new InternalError("Cannot find jsplitpkgscan resource bundle for locale " + locale);
135+
throw new InternalError("Cannot find jdk.jsplitpkgscan resource bundle for locale " + locale);
136136
}
137137
}
138138
}

src/main/java/jdk/Library.java src/main/java/jdk/jsplitpkgscan/Library.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
* questions.
2424
*/
2525

26-
package jdk;
26+
package jdk.jsplitpkgscan;
2727

2828
import java.io.File;
2929
import java.io.IOException;

src/main/java/jdk/Main.java src/main/java/jdk/jsplitpkgscan/Main.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,10 @@
2323
* questions.
2424
*/
2525

26-
package jdk;
26+
package jdk.jsplitpkgscan;
2727

2828
import java.io.InputStream;
2929
import java.io.OutputStream;
30-
import java.io.PrintStream;
3130
import java.io.PrintWriter;
3231
import java.util.Collections;
3332
import java.util.Set;

src/main/java/module-info.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
module org.adoptopenjdk.jsplitpkgscan {
1+
module jdk.jsplitpkgscan {
22
requires java.compiler;
33
provides java.util.spi.ToolProvider
4-
with jdk.Main.JsplitpgkscanToolProvider;
4+
with jdk.jsplitpkgscan.Main.JsplitpgkscanToolProvider;
55
provides javax.tools.Tool
6-
with jdk.Main.JsplitpgkscanTool;
6+
with jdk.jsplitpkgscan.Main.JsplitpgkscanTool;
77
}

0 commit comments

Comments
 (0)