diff options
Diffstat (limited to 'gerrit-pgm')
4 files changed, 5 insertions, 5 deletions
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Cat.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Cat.java index f8f943e3a6..da6a42e31b 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Cat.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Cat.java @@ -14,7 +14,7 @@ package com.google.gerrit.pgm; -import com.google.gerrit.main.GerritLauncher; +import com.google.gerrit.launcher.GerritLauncher; import com.google.gerrit.pgm.util.AbstractProgram; import org.kohsuke.args4j.Argument; diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Ls.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Ls.java index 09f0f36746..7e7b602889 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Ls.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Ls.java @@ -14,7 +14,7 @@ package com.google.gerrit.pgm; -import com.google.gerrit.main.GerritLauncher; +import com.google.gerrit.launcher.GerritLauncher; import com.google.gerrit.pgm.util.AbstractProgram; import java.io.IOException; diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/JettyServer.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/JettyServer.java index 3613024a28..fdf485f024 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/JettyServer.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/JettyServer.java @@ -17,8 +17,8 @@ package com.google.gerrit.pgm.http.jetty; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.TimeUnit.SECONDS; +import com.google.gerrit.launcher.GerritLauncher; import com.google.gerrit.lifecycle.LifecycleListener; -import com.google.gerrit.main.GerritLauncher; import com.google.gerrit.server.config.GerritServerConfig; import com.google.gerrit.server.config.SitePaths; import com.google.inject.Inject; @@ -364,7 +364,7 @@ public class JettyServer { if (ze.isDirectory()) continue; if (name.startsWith("WEB-INF/")) continue; if (name.startsWith("META-INF/")) continue; - if (name.startsWith("com/google/gerrit/main/")) continue; + if (name.startsWith("com/google/gerrit/launcher/")) continue; if (name.equals("Main.class")) continue; final File rawtmp = new File(dstwar, name); diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitContainer.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitContainer.java index 749eda28c6..ef95d87b7f 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitContainer.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitContainer.java @@ -18,7 +18,7 @@ import static com.google.gerrit.pgm.init.InitUtil.copy; import static com.google.gerrit.pgm.init.InitUtil.die; import static com.google.gerrit.pgm.init.InitUtil.username; -import com.google.gerrit.main.GerritLauncher; +import com.google.gerrit.launcher.GerritLauncher; import com.google.gerrit.pgm.util.ConsoleUI; import com.google.gerrit.server.config.SitePaths; import com.google.inject.Inject; |