Revision a81acd75
Added by Katja Luther over 5 years ago
| cdmlib-remote-webapp/ide/eclipse/Jetty Launcher/cdmlib-remote-webapp-unit-test.launch | ||
|---|---|---|
| 21 | 21 |
<stringAttribute key="net.sourceforge.eclipsejetty.launcher.jetty.config.type.0" value="DEFAULT"/> |
| 22 | 22 |
<booleanAttribute key="net.sourceforge.eclipsejetty.launcher.jetty.embedded" value="false"/> |
| 23 | 23 |
<intAttribute key="net.sourceforge.eclipsejetty.launcher.jetty.microVersion" value="1"/> |
| 24 |
<<<<<<< HEAD |
|
| 24 | 25 |
<intAttribute key="net.sourceforge.eclipsejetty.launcher.jetty.minorVersion" value="2"/> |
| 25 | 26 |
<stringAttribute key="net.sourceforge.eclipsejetty.launcher.jetty.path" value="C:\Program Files\jetty-distribution-9.2.14.v20151106"/> |
| 26 | 27 |
<stringAttribute key="net.sourceforge.eclipsejetty.launcher.jetty.version" value="JETTY_9"/> |
| 28 |
======= |
|
| 29 |
<intAttribute key="net.sourceforge.eclipsejetty.launcher.jetty.minorVersion" value="4"/> |
|
| 30 |
<stringAttribute key="net.sourceforge.eclipsejetty.launcher.jetty.path" value="${jetty-runtime-9}"/>
|
|
| 31 |
<stringAttribute key="net.sourceforge.eclipsejetty.launcher.jetty.version" value="JETTY_9_3"/> |
|
| 32 |
>>>>>>> parent of ff21181c06... mend |
|
| 27 | 33 |
<stringAttribute key="net.sourceforge.eclipsejetty.launcher.jmx.enabled" value="false"/> |
| 28 | 34 |
<stringAttribute key="net.sourceforge.eclipsejetty.launcher.jndi.enabled" value="false"/> |
| 29 | 35 |
<stringAttribute key="net.sourceforge.eclipsejetty.launcher.jsp.enabled" value="true"/> |
Also available in: Unified diff
revert commit ff21181c