Skip to content

Commit

Permalink
Back out the support for embedded launching
Browse files Browse the repository at this point in the history
  • Loading branch information
gbevin committed Jun 24, 2024
1 parent 7f74bb0 commit 177a2e3
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 20 deletions.
14 changes: 1 addition & 13 deletions src/main/java/rife/bld/BuildExecutor.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
import rife.bld.help.HelpHelp;
import rife.bld.operations.HelpOperation;
import rife.bld.operations.exceptions.ExitStatusException;
import rife.bld.wrapper.Wrapper;
import rife.ioc.HierarchicalProperties;
import rife.tools.ExceptionUtils;

Expand Down Expand Up @@ -272,18 +271,7 @@ public int execute(String[] arguments) {
* @since 1.5.1
*/
public void start(String[] arguments) {
boolean embedded = false;
if (arguments != null) {
var arg_list = new ArrayList<>(Arrays.asList(arguments));
embedded = arg_list.remove(Wrapper.EMBEDDED_ARGUMENT);
if (embedded) {
arguments = arg_list.toArray(arguments);
}
}
var status = execute(arguments);
if (!embedded) {
System.exit(status);
}
System.exit(execute(arguments));
}

/**
Expand Down
8 changes: 1 addition & 7 deletions src/main/java/rife/bld/wrapper/Wrapper.java
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
*/
public class Wrapper {
public static final String BUILD_ARGUMENT = "--build";
public static final String EMBEDDED_ARGUMENT = "--embedded";

static final String MAVEN_CENTRAL = "https://repo1.maven.org/maven2/";
static final String SONATYPE_SNAPSHOTS = "https://s01.oss.sonatype.org/content/repositories/snapshots/";
Expand Down Expand Up @@ -82,12 +81,7 @@ public class Wrapper {
* @since 1.5
*/
public static void main(String[] arguments) {
var arg_list = new ArrayList<>(Arrays.asList(arguments));
var embedded = arg_list.remove(EMBEDDED_ARGUMENT);
var status = new Wrapper().installAndLaunch(arg_list);
if (!embedded) {
System.exit(status);
}
System.exit(new Wrapper().installAndLaunch(new ArrayList<>(Arrays.asList(arguments))));
}

/**
Expand Down

0 comments on commit 177a2e3

Please sign in to comment.