Repository: camel Updated Branches: refs/heads/master bd1eb2764 -> db2b2c33e
Update camel-web-standalone to work with Jetty9 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/db2b2c33 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/db2b2c33 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/db2b2c33 Branch: refs/heads/master Commit: db2b2c33e733714e990c245eb5e7d7eec1387311 Parents: f815dee Author: Daniel Kulp <dk...@apache.org> Authored: Fri Nov 14 14:57:31 2014 -0500 Committer: Daniel Kulp <dk...@apache.org> Committed: Fri Nov 14 15:30:40 2014 -0500 ---------------------------------------------------------------------- .../src/main/java/org/apache/camel/web/Main.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/db2b2c33/components/camel-web-standalone/src/main/java/org/apache/camel/web/Main.java ---------------------------------------------------------------------- diff --git a/components/camel-web-standalone/src/main/java/org/apache/camel/web/Main.java b/components/camel-web-standalone/src/main/java/org/apache/camel/web/Main.java index f9b6165..1defda8 100755 --- a/components/camel-web-standalone/src/main/java/org/apache/camel/web/Main.java +++ b/components/camel-web-standalone/src/main/java/org/apache/camel/web/Main.java @@ -26,8 +26,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.mortbay.jetty.runner.Runner; - /** * A bootstrap class for starting Jetty Runner using an embedded war * @@ -66,7 +64,16 @@ public final class Main { argsList.addAll(Arrays.asList(args)); } argsList.add(warFile.getCanonicalPath()); - Runner.main(argsList.toArray(new String[argsList.size()])); + + Class<?> runnerCls = null; + try { + runnerCls = Class.forName("org.mortbay.jetty.runner.Runner"); + } catch (Throwable t) { + runnerCls = Class.forName("org.eclipse.jetty.runner.Runner"); + } + + runnerCls.getMethod("main", String[].class) + .invoke(null, new Object[] {argsList.toArray(new String[argsList.size()])}); System.exit(0); }
