Skip to content

Commit 8f5e88d

Browse files
jknackjknack
committed
rename module jooby-hotreload to jooby-run fix #410 
1 parent dcd3777 commit 8f5e88d

7 files changed

Lines changed: 31 additions & 31 deletions

File tree

‎jooby-maven-plugin/src/main/java/org/jooby/JoobyMojo.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
import org.apache.maven.plugins.annotations.Parameter;
4646
import org.apache.maven.plugins.annotations.ResolutionScope;
4747
import org.apache.maven.project.MavenProject;
48-
import org.jooby.hotreload.Watcher;
48+
import org.jooby.run.Watcher;
4949

5050
import javaslang.control.Try;
5151

‎jooby-maven-plugin/src/main/java/org/jooby/RunApp.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import java.io.File;
2222
import java.util.Set;
2323

24-
import org.jooby.hotreload.AppModule;
24+
import org.jooby.run.Main;
2525

2626
import edu.emory.mathcs.backport.java.util.Arrays;
2727
import edu.emory.mathcs.backport.java.util.concurrent.CountDownLatch;
@@ -53,14 +53,14 @@ public void stop() throws InterruptedException {
5353

5454
@Override
5555
public void execute() throws Exception {
56-
AppModule module = new AppModule(mId, mainClass, cp);
56+
Main launcher = new Main(mId, mainClass, cp);
5757
if (includes != null) {
58-
module.includes(includes);
58+
launcher.includes(includes);
5959
}
6060
if (excludes != null) {
61-
module.excludes(excludes);
61+
launcher.excludes(excludes);
6262
}
63-
module.run();
63+
launcher.run();
6464
latch.await();
6565
}
6666

‎jooby-maven-plugin/src/main/java/org/jooby/RunForkedApp.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import java.util.stream.Collectors;
3030

3131
import org.apache.maven.plugin.MojoFailureException;
32-
import org.jooby.hotreload.AppModule;
32+
import org.jooby.run.Main;
3333

3434
public class RunForkedApp implements Command {
3535

@@ -49,7 +49,7 @@ public RunForkedApp(final File basedir, final String debug, final List<String> v
4949
args.add("-cp");
5050
args.add(
5151
cp.stream().map(File::getAbsolutePath).collect(Collectors.joining(File.pathSeparator)));
52-
args.add(AppModule.class.getName());
52+
args.add(Main.class.getName());
5353
args.add(mId);
5454
args.add(mainClass);
5555
args.add(appcp.stream().map(File::getAbsolutePath).collect(Collectors.joining(":", "deps=", ""))

jooby-run/src/main/java/org/jooby/hotreload/AppModuleLoader.java renamed to jooby-run/src/main/java/org/jooby/run/AppModuleLoader.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19-
package org.jooby.hotreload;
19+
package org.jooby.run;
2020

2121
import java.io.BufferedReader;
2222
import java.io.File;
@@ -83,7 +83,7 @@ private static Map<ModuleIdentifier, ModuleSpec> newModule(final String name,
8383
ModuleSpec.Builder builder = ModuleSpec.build(ModuleIdentifier.fromString(mId));
8484

8585
int l = (prefix.length() + mId.length() + level);
86-
AppModule.debug("%1$" + l + "s", prefix + mId);
86+
Main.debug("%1$" + l + "s", prefix + mId);
8787
for (File file : cp) {
8888
String fname = "└── " + file.getAbsolutePath();
8989
if (file.getName().startsWith("j2v8") && !name.equals(file.getName())) {
@@ -95,7 +95,7 @@ private static Map<ModuleIdentifier, ModuleSpec> newModule(final String name,
9595
DependencySpec.createModuleDependencySpec(dependency.getModuleIdentifier()));
9696
modules.put(dependency.getModuleIdentifier(), dependency);
9797
} else {
98-
AppModule.debug("%1$" + (fname.length() + level + 2) + "s", fname);
98+
Main.debug("%1$" + (fname.length() + level + 2) + "s", fname);
9999
if (file.getName().endsWith(".jar")) {
100100
builder.addResourceRoot(ResourceLoaderSpec
101101
.createResourceLoaderSpec(ResourceLoaders
@@ -109,8 +109,8 @@ private static Map<ModuleIdentifier, ModuleSpec> newModule(final String name,
109109
}
110110
Set<String> sysPaths = sysPaths();
111111

112-
AppModule.trace("system packages:");
113-
sysPaths.forEach(p -> AppModule.trace(" %s", p));
112+
Main.trace("system packages:");
113+
sysPaths.forEach(p -> Main.trace(" %s", p));
114114

115115
builder.addDependency(DependencySpec.createSystemDependencySpec(sysPaths));
116116
builder.addDependency(DependencySpec.createLocalDependencySpec());
@@ -136,7 +136,7 @@ private static Set<String> sysPaths() throws Exception {
136136
Set<String> pkgs = new LinkedHashSet<>();
137137

138138
pkgs.addAll(jdkPaths());
139-
pkgs.addAll(pkgs(new InputStreamReader(AppModule.class.getResourceAsStream("pkgs"))));
139+
pkgs.addAll(pkgs(new InputStreamReader(Main.class.getResourceAsStream("pkgs"))));
140140

141141
/**
142142
* Hack to let users to configure system packages, javax.transaction cause issues with

jooby-run/src/main/java/org/jooby/hotreload/AppModule.java renamed to jooby-run/src/main/java/org/jooby/run/Main.java

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19-
package org.jooby.hotreload;
19+
package org.jooby.run;
2020

2121
import java.io.File;
2222
import java.io.FileInputStream;
@@ -45,7 +45,7 @@
4545
import org.jboss.modules.ModuleLoader;
4646
import org.jboss.modules.log.ModuleLogger;
4747

48-
public class AppModule {
48+
public class Main {
4949

5050
private static boolean DEBUG;
5151

@@ -67,7 +67,7 @@ public class AppModule {
6767
private String mainClass;
6868
private volatile Module module;
6969

70-
public AppModule(final String mId, final String mainClass, final File... cp)
70+
public Main(final String mId, final String mainClass, final File... cp)
7171
throws Exception {
7272
this.mainClass = mainClass;
7373
loader = AppModuleLoader.build(mId, mainClass, cp);
@@ -115,7 +115,7 @@ public static void main(final String[] args) throws Exception {
115115
cp.add(new File(System.getProperty("user.dir")));
116116
}
117117

118-
AppModule launcher = new AppModule(args[0], args[1], cp.toArray(new File[cp.size()]))
118+
Main launcher = new Main(args[0], args[1], cp.toArray(new File[cp.size()]))
119119
.includes(includes)
120120
.excludes(excludes);
121121
launcher.run();
@@ -203,12 +203,12 @@ private void stopApp(final Object app) {
203203

204204
}
205205

206-
public AppModule includes(final String includes) {
206+
public Main includes(final String includes) {
207207
this.includes = pathMatcher(includes);
208208
return this;
209209
}
210210

211-
public AppModule excludes(final String excludes) {
211+
public Main excludes(final String excludes) {
212212
this.excludes = pathMatcher(excludes);
213213
return this;
214214
}
@@ -280,58 +280,58 @@ private static void logLevel() {
280280
@Override
281281
public void trace(final Throwable t, final String format, final Object arg1,
282282
final Object arg2, final Object arg3) {
283-
AppModule.trace(format, arg1, arg2, arg3, t);
283+
Main.trace(format, arg1, arg2, arg3, t);
284284
}
285285

286286
@Override
287287
public void trace(final Throwable t, final String format, final Object arg1,
288288
final Object arg2) {
289-
AppModule.trace(format, arg1, arg2, t);
289+
Main.trace(format, arg1, arg2, t);
290290
}
291291

292292
@Override
293293
public void trace(final String format, final Object arg1, final Object arg2,
294294
final Object arg3) {
295-
AppModule.trace(format, arg1, arg2, arg3);
295+
Main.trace(format, arg1, arg2, arg3);
296296
}
297297

298298
@Override
299299
public void trace(final Throwable t, final String format, final Object... args) {
300300
Object[] values = new Object[args.length + 1];
301301
System.arraycopy(args, 0, values, 0, args.length);
302302
values[values.length - 1] = t;
303-
AppModule.trace(format, values);
303+
Main.trace(format, values);
304304
}
305305

306306
@Override
307307
public void trace(final Throwable t, final String format, final Object arg1) {
308-
AppModule.trace(format, arg1, t);
308+
Main.trace(format, arg1, t);
309309
}
310310

311311
@Override
312312
public void trace(final String format, final Object arg1, final Object arg2) {
313-
AppModule.trace(format, arg1, arg2);
313+
Main.trace(format, arg1, arg2);
314314

315315
}
316316

317317
@Override
318318
public void trace(final Throwable t, final String message) {
319-
AppModule.trace(message, t);
319+
Main.trace(message, t);
320320
}
321321

322322
@Override
323323
public void trace(final String format, final Object... args) {
324-
AppModule.trace(format, args);
324+
Main.trace(format, args);
325325
}
326326

327327
@Override
328328
public void trace(final String format, final Object arg1) {
329-
AppModule.trace(format, arg1);
329+
Main.trace(format, arg1);
330330
}
331331

332332
@Override
333333
public void trace(final String message) {
334-
AppModule.trace(message);
334+
Main.trace(message);
335335
}
336336

337337
@Override

jooby-run/src/main/java/org/jooby/hotreload/Watcher.java renamed to jooby-run/src/main/java/org/jooby/run/Watcher.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19-
package org.jooby.hotreload;
19+
package org.jooby.run;
2020

2121
import static java.nio.file.LinkOption.NOFOLLOW_LINKS;
2222
import static java.nio.file.StandardWatchEventKinds.ENTRY_CREATE;

jooby-run/src/main/resources/org/jooby/hotreload/pkgs renamed to jooby-run/src/main/resources/org/jooby/run/pkgs

File renamed without changes.

0 commit comments

Comments
 (0)