diff --git a/symmetricds-root-svr/DEBUGME.TXT b/symmetricds-root-svr/DEBUGME.TXT
new file mode 100644
index 0000000000..82c409f417
--- /dev/null
+++ b/symmetricds-root-svr/DEBUGME.TXT
@@ -0,0 +1,3 @@
+To debug this project in Eclipse:
+1. Run the External Tool shortcut called 'symmetricds-root-svr mvn jetty'
+2. Run the Debug shortcut called 'symmetricds-root-svr debug jetty'
\ No newline at end of file
diff --git a/symmetricds-root-svr/pom.xml b/symmetricds-root-svr/pom.xml
index f44602d469..55f990d8a3 100644
--- a/symmetricds-root-svr/pom.xml
+++ b/symmetricds-root-svr/pom.xml
@@ -39,10 +39,12 @@
                     <webAppSourceDirectory>${basedir}/target/${projectName}</webAppSourceDirectory>
                     <connectors>
                         <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
-                            <port>9090</port>
+                            <port>9090</port>                            
                             <maxIdleTime>60000</maxIdleTime>
                         </connector>
                     </connectors>
+                    <stopKey>boo</stopKey>                    
+                    <stopPort>9999</stopPort>
                 </configuration>
                 <dependencies>
                     <dependency>
diff --git a/symmetricds-root-svr/src/shortcuts/symmetricds-root-svr - debug jetty.launch b/symmetricds-root-svr/src/shortcuts/symmetricds-root-svr - debug jetty.launch
new file mode 100644
index 0000000000..d8e491fc8f
--- /dev/null
+++ b/symmetricds-root-svr/src/shortcuts/symmetricds-root-svr - debug jetty.launch	
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.launching.remoteJavaApplication">
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/symmetricds-root-svr"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="4"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
+</listAttribute>
+<booleanAttribute key="org.eclipse.jdt.launching.ALLOW_TERMINATE" value="false"/>
+<mapAttribute key="org.eclipse.jdt.launching.CONNECT_MAP">
+<mapEntry key="port" value="4000"/>
+<mapEntry key="hostname" value="localhost"/>
+</mapAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="symmetricds-root-svr"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_CONNECTOR_ID" value="org.eclipse.jdt.launching.socketAttachConnector"/>
+</launchConfiguration>
diff --git a/symmetricds-root-svr/src/shortcuts/symmetricds-root-svr - eclipse.launch b/symmetricds-root-svr/src/shortcuts/symmetricds-root-svr - mvn eclipse.launch
similarity index 100%
rename from symmetricds-root-svr/src/shortcuts/symmetricds-root-svr - eclipse.launch
rename to symmetricds-root-svr/src/shortcuts/symmetricds-root-svr - mvn eclipse.launch
diff --git a/symmetricds-root-svr/src/shortcuts/symmetricds-root-svr - jetty stop.launch b/symmetricds-root-svr/src/shortcuts/symmetricds-root-svr - mvn jetty stop.launch
similarity index 100%
rename from symmetricds-root-svr/src/shortcuts/symmetricds-root-svr - jetty stop.launch
rename to symmetricds-root-svr/src/shortcuts/symmetricds-root-svr - mvn jetty stop.launch
diff --git a/symmetricds-root-svr/src/shortcuts/symmetricds-root-svr - jetty.launch b/symmetricds-root-svr/src/shortcuts/symmetricds-root-svr - mvn jetty.launch
similarity index 80%
rename from symmetricds-root-svr/src/shortcuts/symmetricds-root-svr - jetty.launch
rename to symmetricds-root-svr/src/shortcuts/symmetricds-root-svr - mvn jetty.launch
index 066aafe800..bb9ac49d59 100644
--- a/symmetricds-root-svr/src/shortcuts/symmetricds-root-svr - jetty.launch	
+++ b/symmetricds-root-svr/src/shortcuts/symmetricds-root-svr - mvn jetty.launch	
@@ -3,10 +3,13 @@
 <stringAttribute key="bad_container_name" value="\symmetric-we\src\shortcuts"/>
 <stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;launchConfigurationWorkingSet editPageId=&quot;org.eclipse.ui.resourceWorkingSetPage&quot; factoryID=&quot;org.eclipse.ui.internal.WorkingSetFactory&quot; label=&quot;working set&quot; name=&quot;working set&quot;&gt;&#13;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/symmetricds-root-svr&quot; type=&quot;4&quot;/&gt;&#13;&#10;&lt;/launchConfigurationWorkingSet&gt;}"/>
 <booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
+<mapAttribute key="org.eclipse.debug.core.environmentVariables">
+<mapEntry key="MAVEN_OPTS" value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=4000,server=y,suspend=y -Dlog4j.configuration=file:src/test/resources/log4j.xml"/>
+</mapAttribute>
 <listAttribute key="org.eclipse.debug.ui.favoriteGroups">
 <listEntry value="org.eclipse.ui.externaltools.launchGroup"/>
 </listAttribute>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${system_path:/mvn.bat}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-Dlog4j.configuration=file:src/test/resources/log4j.xml jetty:run"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="jetty:run"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/symmetricds-root-svr}"/>
 </launchConfiguration>