diff options
| author | Hugues Malphettes | 2010-06-22 17:15:41 +0000 |
|---|---|---|
| committer | Hugues Malphettes | 2010-06-22 17:15:41 +0000 |
| commit | 351feb4edcfcbfeb56e563979357d0712ca452e3 (patch) | |
| tree | a177cbd471d97d9cdf0b2331d8e1e3a022fae785 /jetty-osgi | |
| parent | ca3ad1b7d5fae50161edae125d4b4b408f2f7d09 (diff) | |
| download | org.eclipse.jetty.project-351feb4edcfcbfeb56e563979357d0712ca452e3.tar.gz org.eclipse.jetty.project-351feb4edcfcbfeb56e563979357d0712ca452e3.tar.xz org.eclipse.jetty.project-351feb4edcfcbfeb56e563979357d0712ca452e3.zip | |
now that bug 317231 is fixed, we can support the default attribute in the <Property> instead of overriding it with some hardcodded values.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2038 7e9141cc-0065-0410-87d8-b60c137991c4
Diffstat (limited to 'jetty-osgi')
| -rw-r--r-- | jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/WebappRegistrationHelper.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/WebappRegistrationHelper.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/WebappRegistrationHelper.java index ca6fa6cbab..090b3e4916 100644 --- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/WebappRegistrationHelper.java +++ b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/WebappRegistrationHelper.java @@ -311,9 +311,9 @@ public class WebappRegistrationHelper { properties.put("jetty.home",jettyHome); } - properties.put("jetty.host",System.getProperty("jetty.host","")); - properties.put("jetty.port",System.getProperty("jetty.port","8080")); - properties.put("jetty.port.ssl",System.getProperty("jetty.port.ssl","8443")); + properties.put("jetty.host",System.getProperty("jetty.host")); + properties.put("jetty.port",System.getProperty("jetty.port")); + properties.put("jetty.port.ssl",System.getProperty("jetty.port.ssl")); while (tokenizer.hasMoreTokens()) { |