Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug 329621 in case jetty.home is quoted, remove the quotes. 

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2480 7e9141cc-0065-0410-87d8-b60c137991c4
This commit is contained in:
Hugues Malphettes 2010-11-08 03:29:37 +00:00
parent df79fb183b
commit d3c5317c7f
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/serverfactory/DefaultJettyAtJettyHomeHelper.java
View File

@ -66,7 +66,6 @@ public class DefaultJettyAtJettyHomeHelper {
*/ */
public static final String SYS_PROP_JETTY_PORT_SSL = "jetty.port.ssl"; public static final String SYS_PROP_JETTY_PORT_SSL = "jetty.port.ssl";
/** /**
* Called by the JettyBootStrapActivator. * Called by the JettyBootStrapActivator.
* If the system property jetty.home is defined and points to a folder, * If the system property jetty.home is defined and points to a folder,
@ -93,15 +92,19 @@ public class DefaultJettyAtJettyHomeHelper {
Bundle jettyHomeBundle = null; Bundle jettyHomeBundle = null;
if (jettyHomeSysProp != null) if (jettyHomeSysProp != null)
{ {
//bug 329621
if (jettyHomeSysProp.startsWith("\"") && jettyHomeSysProp.endsWith("\"")) {
jettyHomeSysProp = jettyHomeSysProp.substring(1, jettyHomeSysProp.length() - 1);
}
if (jettyHomeBundleSysProp != null) if (jettyHomeBundleSysProp != null)
{ {
System.err.println("WARN: both the jetty.home property and the jetty.home.bundle property are defined." Log.warn("Both the jetty.home property and the jetty.home.bundle property are defined."
+ " jetty.home.bundle is not taken into account."); + " jetty.home.bundle is not taken into account.");
} }
jettyHome = new File(jettyHomeSysProp); jettyHome = new File(jettyHomeSysProp);
if (!jettyHome.exists() || !jettyHome.isDirectory()) if (!jettyHome.exists() || !jettyHome.isDirectory())
{ {
System.err.println("Unable to locate the jetty.home folder " + jettyHomeSysProp); Log.warn("Unable to locate the jetty.home folder " + jettyHomeSysProp);
return; return;
} }
} }
@ -117,14 +120,14 @@ public class DefaultJettyAtJettyHomeHelper {
} }
if (jettyHomeBundle == null) if (jettyHomeBundle == null)
{ {
System.err.println("Unable to find the jetty.home.bundle named " + jettyHomeSysProp); Log.warn("Unable to find the jetty.home.bundle named " + jettyHomeSysProp);
return; return;
} }
} }
if (jettyHome == null && jettyHomeBundle == null) if (jettyHome == null && jettyHomeBundle == null)
{ {
System.err.println("No default jetty started."); Log.warn("No default jetty started.");
return; return;
} }
try try