From 08aab3fa59308c302e82ff580d7f2e549acd0a77 Mon Sep 17 00:00:00 2001
From: Karthik Ramachandran <kramachandran@commvault.com>
Date: Mon, 2 Oct 2017 11:10:46 -0400
Subject: [PATCH 1/6] SOLR-11331: Ability to Debug Solr With Eclipse IDE

---
 build.xml                          | 13 +++++++++++--
 dev-tools/eclipse/solr.launch      | 20 ++++++++++++++++++++
 dev-tools/eclipse/solr_nogc.launch | 20 ++++++++++++++++++++
 dev-tools/eclipse/testSolr.launch  | 17 +++++++++++++++++
 4 files changed, 68 insertions(+), 2 deletions(-)
 create mode 100644 dev-tools/eclipse/solr.launch
 create mode 100644 dev-tools/eclipse/solr_nogc.launch
 create mode 100644 dev-tools/eclipse/testSolr.launch

diff --git a/build.xml b/build.xml
index 5335957bea03..e2d89ebbc980 100755
--- a/build.xml
+++ b/build.xml
@@ -472,16 +472,25 @@
 
   <target name="eclipse" depends="resolve" description="Setup Eclipse configuration">
     <basename file="${basedir}" property="eclipseprojectname"/>
-      <copy file="dev-tools/eclipse/dot.project" tofile=".project" overwrite="false" encoding="UTF-8">
+    <copy file="dev-tools/eclipse/dot.project" tofile=".project" overwrite="false" encoding="UTF-8">
       <filterset>
         <filter token="ECLIPSEPROJECTNAME" value="${eclipseprojectname}"/>
       </filterset>
     </copy>
+	<copy overwrite="false" todir="eclipse-build" encoding="UTF-8">
+      <fileset dir="dev-tools/eclipse" includes="*.launch"/>
+      <filterset>
+        <filter token="ECLIPSEPROJECTNAME" value="${eclipseprojectname}"/>
+      </filterset>
+	</copy>	
     <mkdir dir=".settings"/>
     <copy todir=".settings/" overwrite="true">
       <fileset dir="dev-tools/eclipse/dot.settings" includes="*.prefs" />
     </copy>
-    
+	<mkdir dir="solr/server/solr-webapp/webapp"/>
+	<copy todir="solr/server/solr-webapp/webapp" overwrite="true">
+      <fileset dir="solr/webapp/web" includes="**/*" />
+	</copy>    
     <pathconvert property="eclipse.fileset.sourcefolders" pathsep="|" dirsep="/">
       <dirset dir="${basedir}/lucene" includes="**/src/java, **/src/resources, **/src/test, **/src/test-files, **/src/examples" excludes="tools/**, build/**" />
       <dirset dir="${basedir}/solr" includes="**/src/java, **/src/resources, **/src/test, **/src/test-files, **/src/examples" excludes="build/**" />
diff --git a/dev-tools/eclipse/solr.launch b/dev-tools/eclipse/solr.launch
new file mode 100644
index 000000000000..1f4fcf7bbcc5
--- /dev/null
+++ b/dev-tools/eclipse/solr.launch
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
+	<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+		<listEntry value="/@ECLIPSEPROJECTNAME@"/>
+	</listAttribute>
+	<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+		<listEntry value="4"/>
+	</listAttribute>
+	<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+	<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
+		<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8&quot; javaProject=&quot;@ECLIPSEPROJECTNAME@&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#13;&#10;"/>
+		<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry id=&quot;org.eclipse.jdt.launching.classpathentry.defaultClasspath&quot;&gt;&#13;&#10;&lt;memento exportedEntriesOnly=&quot;false&quot; project=&quot;@ECLIPSEPROJECTNAME@&quot;/&gt;&#13;&#10;&lt;/runtimeClasspathEntry&gt;&#13;&#10;"/>
+		<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/@ECLIPSEPROJECTNAME@/solr/server/start.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
+	</listAttribute>
+	<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
+	<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.jetty.start.Main"/>
+	<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="--module=http"/>
+	<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="@ECLIPSEPROJECTNAME@"/>
+	<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms512m &#13;&#10;-Xmx2g&#13;&#10;-Xss256k&#13;&#10;-XX:NewRatio=3&#13;&#10;-XX:SurvivorRatio=4&#13;&#10;-XX:TargetSurvivorRatio=90&#13;&#10;-XX:MaxTenuringThreshold=8&#13;&#10;-XX:+UseConcMarkSweepGC&#13;&#10;-XX:+UseParNewGC&#13;&#10;-XX:ConcGCThreads=4&#13;&#10;-XX:ParallelGCThreads=4&#13;&#10;-XX:+CMSScavengeBeforeRemark&#13;&#10;-XX:PretenureSizeThreshold=64m&#13;&#10;-XX:+UseCMSInitiatingOccupancyOnly&#13;&#10;-XX:CMSInitiatingOccupancyFraction=50&#13;&#10;-XX:CMSMaxAbortablePrecleanTime=6000&#13;&#10;-XX:+CMSParallelRemarkEnabled&#13;&#10;-XX:+ParallelRefProcEnabled&#13;&#10;-verbose:gc &#13;&#10;-XX:+PrintHeapAtGC&#13;&#10;-XX:+PrintGCDetails&#13;&#10;-XX:+PrintGCDateStamps&#13;&#10;-XX:+PrintGCTimeStamps&#13;&#10;-XX:+PrintTenuringDistribution&#13;&#10;-XX:+PrintGCApplicationStoppedTime&#13;&#10;-Djetty.port=8983&#13;&#10;-DSTOP.PORT=7983 &#13;&#10;-DSTOP.KEY=solrrock&#13;&#10;-Dlog4j.configuration=&quot;file:${workspace_loc:@ECLIPSEPROJECTNAME@}/solr/server/resources/log4j.properties&quot;&#13;&#10;-Djetty.home=&quot;${workspace_loc:@ECLIPSEPROJECTNAME@}/solr/server&quot;&#13;&#10;-Djetty.base=&quot;${workspace_loc:@ECLIPSEPROJECTNAME@}/solr/server&quot;&#13;&#10;-Dsolr.log=&quot;${workspace_loc:@ECLIPSEPROJECTNAME@}/solr/server/logs&quot;&#13;&#10;-Dsolr.solr.home=&quot;${workspace_loc:@ECLIPSEPROJECTNAME@}/solr/server/solr&quot;"/>
+</launchConfiguration>
diff --git a/dev-tools/eclipse/solr_nogc.launch b/dev-tools/eclipse/solr_nogc.launch
new file mode 100644
index 000000000000..ef22b4c19482
--- /dev/null
+++ b/dev-tools/eclipse/solr_nogc.launch
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
+	<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+		<listEntry value="/@ECLIPSEPROJECTNAME@"/>
+	</listAttribute>
+	<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+		<listEntry value="4"/>
+	</listAttribute>
+	<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+	<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
+		<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8&quot; javaProject=&quot;@ECLIPSEPROJECTNAME@&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#13;&#10;"/>
+		<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry id=&quot;org.eclipse.jdt.launching.classpathentry.defaultClasspath&quot;&gt;&#13;&#10;&lt;memento exportedEntriesOnly=&quot;false&quot; project=&quot;@ECLIPSEPROJECTNAME@&quot;/&gt;&#13;&#10;&lt;/runtimeClasspathEntry&gt;&#13;&#10;"/>
+		<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/@ECLIPSEPROJECTNAME@/solr/server/start.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
+	</listAttribute>
+	<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
+	<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.jetty.start.Main"/>
+	<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="--module=http"/>
+	<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="@ECLIPSEPROJECTNAME@"/>
+	<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms512m &#13;&#10;-Xmx2g&#13;&#10;-Xss256k&#13;&#10;-XX:NewRatio=3&#13;&#10;-XX:SurvivorRatio=4&#13;&#10;-XX:TargetSurvivorRatio=90&#13;&#10;-XX:MaxTenuringThreshold=8&#13;&#10;-XX:+UseConcMarkSweepGC&#13;&#10;-XX:+UseParNewGC&#13;&#10;-XX:ConcGCThreads=4&#13;&#10;-XX:ParallelGCThreads=4&#13;&#10;-XX:+CMSScavengeBeforeRemark&#13;&#10;-XX:PretenureSizeThreshold=64m&#13;&#10;-XX:+UseCMSInitiatingOccupancyOnly&#13;&#10;-XX:CMSInitiatingOccupancyFraction=50&#13;&#10;-XX:CMSMaxAbortablePrecleanTime=6000&#13;&#10;-XX:+CMSParallelRemarkEnabled&#13;&#10;-XX:+ParallelRefProcEnabled&#13;&#10;-Djetty.port=8983&#13;&#10;-DSTOP.PORT=7983 &#13;&#10;-DSTOP.KEY=solrrock&#13;&#10;-Dlog4j.configuration=&quot;file:${workspace_loc:@ECLIPSEPROJECTNAME@}/solr/server/resources/log4j.properties&quot;&#13;&#10;-Djetty.home=&quot;${workspace_loc:@ECLIPSEPROJECTNAME@}/solr/server&quot;&#13;&#10;-Djetty.base=&quot;${workspace_loc:@ECLIPSEPROJECTNAME@}/solr/server&quot;&#13;&#10;-Dsolr.log=&quot;${workspace_loc:@ECLIPSEPROJECTNAME@}/solr/server/logs&quot;&#13;&#10;-Dsolr.solr.home=&quot;${workspace_loc:@ECLIPSEPROJECTNAME@}/solr/server/solr&quot;"/>
+</launchConfiguration>
diff --git a/dev-tools/eclipse/testSolr.launch b/dev-tools/eclipse/testSolr.launch
new file mode 100644
index 000000000000..3fcac78a3755
--- /dev/null
+++ b/dev-tools/eclipse/testSolr.launch
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
+	<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+		<listEntry value="/@ECLIPSEPROJECTNAME@"/>
+	</listAttribute>
+	<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+		<listEntry value="4"/>
+	</listAttribute>
+	<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value="=@ECLIPSEPROJECTNAME@"/>
+	<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+	<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+	<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+	<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+	<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/>
+	<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="@ECLIPSEPROJECTNAME@"/>
+	<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea"/>
+</launchConfiguration>
\ No newline at end of file

From e0f2ab266b260a834710db5a4622739e0f3a97ca Mon Sep 17 00:00:00 2001
From: Karthik Ramachandran <kramachandran@commvault.com>
Date: Wed, 6 Dec 2017 18:22:41 -0500
Subject: [PATCH 2/6] SOLR-11331: Fix Ability to Debug Solr With Eclipse IDE

---
 build.xml                           | 13 +++++++++----
 dev-tools/eclipse/dot.classpath.xsl | 19 ++++++++++++++++++-
 dev-tools/eclipse/solr.launch       |  2 +-
 dev-tools/eclipse/solr_nogc.launch  |  2 +-
 4 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/build.xml b/build.xml
index 6e5aac312f91..1eec079938f3 100755
--- a/build.xml
+++ b/build.xml
@@ -496,10 +496,6 @@
     <copy todir=".settings/" overwrite="true">
       <fileset dir="dev-tools/eclipse/dot.settings" includes="*.prefs" />
     </copy>
-	<mkdir dir="solr/server/solr-webapp/webapp"/>
-	<copy todir="solr/server/solr-webapp/webapp" overwrite="true">
-      <fileset dir="solr/webapp/web" includes="**/*" />
-	</copy>    
     <pathconvert property="eclipse.fileset.sourcefolders" pathsep="|" dirsep="/">
       <dirset dir="${basedir}/lucene" includes="**/src/java, **/src/resources, **/src/test, **/src/test-files, **/src/examples" excludes="tools/**, build/**" />
       <dirset dir="${basedir}/solr" includes="**/src/java, **/src/resources, **/src/test, **/src/test-files, **/src/examples" excludes="build/**" />
@@ -511,10 +507,19 @@
       <fileset dir="${basedir}/solr" includes="**/test-lib/*.jar,**/lib/*.jar" excludes="core/test-lib/*servlet-api*.jar, contrib/analysis-extras/**, test-framework/lib/junit*, test-framework/lib/ant*, test-framework/lib/randomizedtesting*, build/**, dist/**, package/**" />
       <map from="${basedir}/" to=""/>
     </pathconvert>
+    <pathconvert property="eclipse.fileset.webfolders" pathsep="|" dirsep="/">
+    	<dirset dir="${basedir}/solr/server/contexts" excludes="**/*" />
+    	<dirset dir="${basedir}/solr/server/etc" excludes="**/*" />
+    	<dirset dir="${basedir}/solr/server/modules" excludes="**/*" />
+    	<dirset dir="${basedir}/solr/server/solr" excludes="**/*" />
+    	<dirset dir="${basedir}/solr/webapp/web" excludes="**/*" />
+    	<map from="${basedir}/" to=""/>
+    </pathconvert>
     <xslt in="${ant.file}" out=".classpath" style="dev-tools/eclipse/dot.classpath.xsl" force="true">
       <outputproperty name="indent" value="yes"/>
       <param name="eclipse.fileset.libs" expression="${eclipse.fileset.libs}"/>
       <param name="eclipse.fileset.sourcefolders" expression="${eclipse.fileset.sourcefolders}"/>
+      <param name="eclipse.fileset.webfolders" expression="${eclipse.fileset.webfolders}"/>
     </xslt>
 
     <echo>
diff --git a/dev-tools/eclipse/dot.classpath.xsl b/dev-tools/eclipse/dot.classpath.xsl
index e8c0e92a4337..eefd421d74a9 100644
--- a/dev-tools/eclipse/dot.classpath.xsl
+++ b/dev-tools/eclipse/dot.classpath.xsl
@@ -22,6 +22,7 @@
 >
   <xsl:param name="eclipse.fileset.sourcefolders"/>
   <xsl:param name="eclipse.fileset.libs"/>
+  <xsl:param name="eclipse.fileset.webfolders"/>
   
   <!--
     NOTE: This template matches the root element of any given input XML document!
@@ -54,7 +55,23 @@
           <classpathentry excluding="src" including="conf/**" kind="src" path="lucene/benchmark"/>
         </xsl:if>
       </xsl:for-each>
-      
+	  
+	  <xsl:for-each select="str:split($eclipse.fileset.webfolders,'|')">
+        <xsl:sort select="text()" order="ascending" lang="en"/>
+        <classpathentry kind="src" path="{.}">
+            <xsl:attribute name="output">
+              <xsl:choose>
+                <xsl:when test="contains(.,'solr/webapp/web')">
+				  <xsl:text>eclipse-build/solr-server/solr-webapp/webapp</xsl:text>
+			    </xsl:when>
+			    <xsl:otherwise>
+				  <xsl:text>eclipse-build/solr-server/</xsl:text><xsl:value-of select="substring(text(), 13)"/>
+			    </xsl:otherwise>
+			  </xsl:choose>
+            </xsl:attribute>
+		</classpathentry>		
+      </xsl:for-each>
+
       <!-- the main resources folder is here (see above), so it's listed after the test-framework resources, making preflex-override work: -->
       <classpathentry kind="output" path="eclipse-build/main"/>
       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
diff --git a/dev-tools/eclipse/solr.launch b/dev-tools/eclipse/solr.launch
index 1f4fcf7bbcc5..4d9c7d7860bd 100644
--- a/dev-tools/eclipse/solr.launch
+++ b/dev-tools/eclipse/solr.launch
@@ -16,5 +16,5 @@
 	<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.jetty.start.Main"/>
 	<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="--module=http"/>
 	<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="@ECLIPSEPROJECTNAME@"/>
-	<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms512m &#13;&#10;-Xmx2g&#13;&#10;-Xss256k&#13;&#10;-XX:NewRatio=3&#13;&#10;-XX:SurvivorRatio=4&#13;&#10;-XX:TargetSurvivorRatio=90&#13;&#10;-XX:MaxTenuringThreshold=8&#13;&#10;-XX:+UseConcMarkSweepGC&#13;&#10;-XX:+UseParNewGC&#13;&#10;-XX:ConcGCThreads=4&#13;&#10;-XX:ParallelGCThreads=4&#13;&#10;-XX:+CMSScavengeBeforeRemark&#13;&#10;-XX:PretenureSizeThreshold=64m&#13;&#10;-XX:+UseCMSInitiatingOccupancyOnly&#13;&#10;-XX:CMSInitiatingOccupancyFraction=50&#13;&#10;-XX:CMSMaxAbortablePrecleanTime=6000&#13;&#10;-XX:+CMSParallelRemarkEnabled&#13;&#10;-XX:+ParallelRefProcEnabled&#13;&#10;-verbose:gc &#13;&#10;-XX:+PrintHeapAtGC&#13;&#10;-XX:+PrintGCDetails&#13;&#10;-XX:+PrintGCDateStamps&#13;&#10;-XX:+PrintGCTimeStamps&#13;&#10;-XX:+PrintTenuringDistribution&#13;&#10;-XX:+PrintGCApplicationStoppedTime&#13;&#10;-Djetty.port=8983&#13;&#10;-DSTOP.PORT=7983 &#13;&#10;-DSTOP.KEY=solrrock&#13;&#10;-Dlog4j.configuration=&quot;file:${workspace_loc:@ECLIPSEPROJECTNAME@}/solr/server/resources/log4j.properties&quot;&#13;&#10;-Djetty.home=&quot;${workspace_loc:@ECLIPSEPROJECTNAME@}/solr/server&quot;&#13;&#10;-Djetty.base=&quot;${workspace_loc:@ECLIPSEPROJECTNAME@}/solr/server&quot;&#13;&#10;-Dsolr.log=&quot;${workspace_loc:@ECLIPSEPROJECTNAME@}/solr/server/logs&quot;&#13;&#10;-Dsolr.solr.home=&quot;${workspace_loc:@ECLIPSEPROJECTNAME@}/solr/server/solr&quot;"/>
+	<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms512m &#13;&#10;-Xmx2g&#13;&#10;-Xss256k&#13;&#10;-XX:NewRatio=3&#13;&#10;-XX:SurvivorRatio=4&#13;&#10;-XX:TargetSurvivorRatio=90&#13;&#10;-XX:MaxTenuringThreshold=8&#13;&#10;-XX:+UseConcMarkSweepGC&#13;&#10;-XX:+UseParNewGC&#13;&#10;-XX:ConcGCThreads=4&#13;&#10;-XX:ParallelGCThreads=4&#13;&#10;-XX:+CMSScavengeBeforeRemark&#13;&#10;-XX:PretenureSizeThreshold=64m&#13;&#10;-XX:+UseCMSInitiatingOccupancyOnly&#13;&#10;-XX:CMSInitiatingOccupancyFraction=50&#13;&#10;-XX:CMSMaxAbortablePrecleanTime=6000&#13;&#10;-XX:+CMSParallelRemarkEnabled&#13;&#10;-XX:+ParallelRefProcEnabled&#13;&#10;-verbose:gc &#13;&#10;-XX:+PrintHeapAtGC&#13;&#10;-XX:+PrintGCDetails&#13;&#10;-XX:+PrintGCDateStamps&#13;&#10;-XX:+PrintGCTimeStamps&#13;&#10;-XX:+PrintTenuringDistribution&#13;&#10;-XX:+PrintGCApplicationStoppedTime&#13;&#10;-Djetty.port=8983&#13;&#10;-DSTOP.PORT=7983 &#13;&#10;-DSTOP.KEY=solrrock&#13;&#10;-Dlog4j.configuration=&quot;file:${workspace_loc:@ECLIPSEPROJECTNAME@}/solr/server/resources/log4j.properties&quot;&#13;&#10;-Djetty.home=&quot;${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build/solr-server&quot;&#13;&#10;-Djetty.base=&quot;${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build/solr-server&quot;&#13;&#10;-Dsolr.log=&quot;${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build&quot;&#13;&#10;-Dsolr.solr.home=&quot;${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build/solr-server/solr&quot;"/>
 </launchConfiguration>
diff --git a/dev-tools/eclipse/solr_nogc.launch b/dev-tools/eclipse/solr_nogc.launch
index ef22b4c19482..678f0310ca67 100644
--- a/dev-tools/eclipse/solr_nogc.launch
+++ b/dev-tools/eclipse/solr_nogc.launch
@@ -16,5 +16,5 @@
 	<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.jetty.start.Main"/>
 	<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="--module=http"/>
 	<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="@ECLIPSEPROJECTNAME@"/>
-	<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms512m &#13;&#10;-Xmx2g&#13;&#10;-Xss256k&#13;&#10;-XX:NewRatio=3&#13;&#10;-XX:SurvivorRatio=4&#13;&#10;-XX:TargetSurvivorRatio=90&#13;&#10;-XX:MaxTenuringThreshold=8&#13;&#10;-XX:+UseConcMarkSweepGC&#13;&#10;-XX:+UseParNewGC&#13;&#10;-XX:ConcGCThreads=4&#13;&#10;-XX:ParallelGCThreads=4&#13;&#10;-XX:+CMSScavengeBeforeRemark&#13;&#10;-XX:PretenureSizeThreshold=64m&#13;&#10;-XX:+UseCMSInitiatingOccupancyOnly&#13;&#10;-XX:CMSInitiatingOccupancyFraction=50&#13;&#10;-XX:CMSMaxAbortablePrecleanTime=6000&#13;&#10;-XX:+CMSParallelRemarkEnabled&#13;&#10;-XX:+ParallelRefProcEnabled&#13;&#10;-Djetty.port=8983&#13;&#10;-DSTOP.PORT=7983 &#13;&#10;-DSTOP.KEY=solrrock&#13;&#10;-Dlog4j.configuration=&quot;file:${workspace_loc:@ECLIPSEPROJECTNAME@}/solr/server/resources/log4j.properties&quot;&#13;&#10;-Djetty.home=&quot;${workspace_loc:@ECLIPSEPROJECTNAME@}/solr/server&quot;&#13;&#10;-Djetty.base=&quot;${workspace_loc:@ECLIPSEPROJECTNAME@}/solr/server&quot;&#13;&#10;-Dsolr.log=&quot;${workspace_loc:@ECLIPSEPROJECTNAME@}/solr/server/logs&quot;&#13;&#10;-Dsolr.solr.home=&quot;${workspace_loc:@ECLIPSEPROJECTNAME@}/solr/server/solr&quot;"/>
+	<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms512m &#13;&#10;-Xmx2g&#13;&#10;-Xss256k&#13;&#10;-XX:NewRatio=3&#13;&#10;-XX:SurvivorRatio=4&#13;&#10;-XX:TargetSurvivorRatio=90&#13;&#10;-XX:MaxTenuringThreshold=8&#13;&#10;-XX:+UseConcMarkSweepGC&#13;&#10;-XX:+UseParNewGC&#13;&#10;-XX:ConcGCThreads=4&#13;&#10;-XX:ParallelGCThreads=4&#13;&#10;-XX:+CMSScavengeBeforeRemark&#13;&#10;-XX:PretenureSizeThreshold=64m&#13;&#10;-XX:+UseCMSInitiatingOccupancyOnly&#13;&#10;-XX:CMSInitiatingOccupancyFraction=50&#13;&#10;-XX:CMSMaxAbortablePrecleanTime=6000&#13;&#10;-XX:+CMSParallelRemarkEnabled&#13;&#10;-XX:+ParallelRefProcEnabled&#13;&#10;-Djetty.port=8983&#13;&#10;-DSTOP.PORT=7983 &#13;&#10;-DSTOP.KEY=solrrock&#13;&#10;-Dlog4j.configuration=&quot;file:${workspace_loc:@ECLIPSEPROJECTNAME@}/solr/server/resources/log4j.properties&quot;&#13;&#10;-Djetty.home=&quot;${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build/solr-server&quot;&#13;&#10;-Djetty.base=&quot;${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build/solr-server&quot;&#13;&#10;-Dsolr.log=&quot;${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build&quot;&#13;&#10;-Dsolr.solr.home=&quot;${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build/solr-server/solr&quot;"/>
 </launchConfiguration>

From 08633153ba52facd05680aa86c2cd05a681d6e27 Mon Sep 17 00:00:00 2001
From: Karthik Ramachandran <kramachandran@commvault.com>
Date: Mon, 12 Mar 2018 17:01:27 -0400
Subject: [PATCH 3/6] SOLR-11331: Ability to Debug Solr With Eclipse IDE

---
 dev-tools/eclipse/{solr_nogc.launch => run-solr-cloud.launch} | 2 +-
 dev-tools/eclipse/{solr.launch => run-solr.launch}            | 2 +-
 dev-tools/eclipse/{testSolr.launch => run-test-cases.launch}  | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename dev-tools/eclipse/{solr_nogc.launch => run-solr-cloud.launch} (63%)
 rename dev-tools/eclipse/{solr.launch => run-solr.launch} (59%)
 rename dev-tools/eclipse/{testSolr.launch => run-test-cases.launch} (100%)

diff --git a/dev-tools/eclipse/solr_nogc.launch b/dev-tools/eclipse/run-solr-cloud.launch
similarity index 63%
rename from dev-tools/eclipse/solr_nogc.launch
rename to dev-tools/eclipse/run-solr-cloud.launch
index 678f0310ca67..188e033105d4 100644
--- a/dev-tools/eclipse/solr_nogc.launch
+++ b/dev-tools/eclipse/run-solr-cloud.launch
@@ -16,5 +16,5 @@
 	<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.jetty.start.Main"/>
 	<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="--module=http"/>
 	<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="@ECLIPSEPROJECTNAME@"/>
-	<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms512m &#13;&#10;-Xmx2g&#13;&#10;-Xss256k&#13;&#10;-XX:NewRatio=3&#13;&#10;-XX:SurvivorRatio=4&#13;&#10;-XX:TargetSurvivorRatio=90&#13;&#10;-XX:MaxTenuringThreshold=8&#13;&#10;-XX:+UseConcMarkSweepGC&#13;&#10;-XX:+UseParNewGC&#13;&#10;-XX:ConcGCThreads=4&#13;&#10;-XX:ParallelGCThreads=4&#13;&#10;-XX:+CMSScavengeBeforeRemark&#13;&#10;-XX:PretenureSizeThreshold=64m&#13;&#10;-XX:+UseCMSInitiatingOccupancyOnly&#13;&#10;-XX:CMSInitiatingOccupancyFraction=50&#13;&#10;-XX:CMSMaxAbortablePrecleanTime=6000&#13;&#10;-XX:+CMSParallelRemarkEnabled&#13;&#10;-XX:+ParallelRefProcEnabled&#13;&#10;-Djetty.port=8983&#13;&#10;-DSTOP.PORT=7983 &#13;&#10;-DSTOP.KEY=solrrock&#13;&#10;-Dlog4j.configuration=&quot;file:${workspace_loc:@ECLIPSEPROJECTNAME@}/solr/server/resources/log4j.properties&quot;&#13;&#10;-Djetty.home=&quot;${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build/solr-server&quot;&#13;&#10;-Djetty.base=&quot;${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build/solr-server&quot;&#13;&#10;-Dsolr.log=&quot;${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build&quot;&#13;&#10;-Dsolr.solr.home=&quot;${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build/solr-server/solr&quot;"/>
+	<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms512m&#13;&#10;-Djetty.port=8983&#13;&#10;-DSTOP.PORT=7983 &#13;&#10;-DSTOP.KEY=solrrock&#13;&#10;-Dlog4j.configuration=&quot;file:${workspace_loc:lucene-solr}/solr/server/resources/log4j.properties&quot;&#13;&#10;-Djetty.home=&quot;${workspace_loc:lucene-solr}/solr/server&quot;&#13;&#10;-Djetty.base=&quot;${workspace_loc:lucene-solr}/solr/server&quot;&#13;&#10;-Dsolr.log=&quot;${workspace_loc:lucene-solr}/solr/server/logs&quot;&#13;&#10;-Dsolr.solr.home=&quot;${workspace_loc:lucene-solr}/solr/server/solr&quot;&#13;&#10;-DzkRun"/>
 </launchConfiguration>
diff --git a/dev-tools/eclipse/solr.launch b/dev-tools/eclipse/run-solr.launch
similarity index 59%
rename from dev-tools/eclipse/solr.launch
rename to dev-tools/eclipse/run-solr.launch
index 4d9c7d7860bd..e31d68a2e1f7 100644
--- a/dev-tools/eclipse/solr.launch
+++ b/dev-tools/eclipse/run-solr.launch
@@ -16,5 +16,5 @@
 	<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.jetty.start.Main"/>
 	<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="--module=http"/>
 	<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="@ECLIPSEPROJECTNAME@"/>
-	<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms512m &#13;&#10;-Xmx2g&#13;&#10;-Xss256k&#13;&#10;-XX:NewRatio=3&#13;&#10;-XX:SurvivorRatio=4&#13;&#10;-XX:TargetSurvivorRatio=90&#13;&#10;-XX:MaxTenuringThreshold=8&#13;&#10;-XX:+UseConcMarkSweepGC&#13;&#10;-XX:+UseParNewGC&#13;&#10;-XX:ConcGCThreads=4&#13;&#10;-XX:ParallelGCThreads=4&#13;&#10;-XX:+CMSScavengeBeforeRemark&#13;&#10;-XX:PretenureSizeThreshold=64m&#13;&#10;-XX:+UseCMSInitiatingOccupancyOnly&#13;&#10;-XX:CMSInitiatingOccupancyFraction=50&#13;&#10;-XX:CMSMaxAbortablePrecleanTime=6000&#13;&#10;-XX:+CMSParallelRemarkEnabled&#13;&#10;-XX:+ParallelRefProcEnabled&#13;&#10;-verbose:gc &#13;&#10;-XX:+PrintHeapAtGC&#13;&#10;-XX:+PrintGCDetails&#13;&#10;-XX:+PrintGCDateStamps&#13;&#10;-XX:+PrintGCTimeStamps&#13;&#10;-XX:+PrintTenuringDistribution&#13;&#10;-XX:+PrintGCApplicationStoppedTime&#13;&#10;-Djetty.port=8983&#13;&#10;-DSTOP.PORT=7983 &#13;&#10;-DSTOP.KEY=solrrock&#13;&#10;-Dlog4j.configuration=&quot;file:${workspace_loc:@ECLIPSEPROJECTNAME@}/solr/server/resources/log4j.properties&quot;&#13;&#10;-Djetty.home=&quot;${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build/solr-server&quot;&#13;&#10;-Djetty.base=&quot;${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build/solr-server&quot;&#13;&#10;-Dsolr.log=&quot;${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build&quot;&#13;&#10;-Dsolr.solr.home=&quot;${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build/solr-server/solr&quot;"/>
+	<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms512m&#13;&#10;-Djetty.port=8983&#13;&#10;-DSTOP.PORT=7983 &#13;&#10;-DSTOP.KEY=solrrock&#13;&#10;-Dlog4j.configuration=&quot;file:${workspace_loc:lucene-solr}/solr/server/resources/log4j.properties&quot;&#13;&#10;-Djetty.home=&quot;${workspace_loc:lucene-solr}/solr/server&quot;&#13;&#10;-Djetty.base=&quot;${workspace_loc:lucene-solr}/solr/server&quot;&#13;&#10;-Dsolr.log=&quot;${workspace_loc:lucene-solr}/solr/server/logs&quot;&#13;&#10;-Dsolr.solr.home=&quot;${workspace_loc:lucene-solr}/solr/server/solr&quot;"/>
 </launchConfiguration>
diff --git a/dev-tools/eclipse/testSolr.launch b/dev-tools/eclipse/run-test-cases.launch
similarity index 100%
rename from dev-tools/eclipse/testSolr.launch
rename to dev-tools/eclipse/run-test-cases.launch

From e4d0b28f80780bde82d5a3de88126a2afb81d9ef Mon Sep 17 00:00:00 2001
From: Karthik Ramachandran <kramachandran@commvault.com>
Date: Mon, 12 Mar 2018 22:24:36 -0400
Subject: [PATCH 4/6] SOLR-11331: Ability to Debug Solr With Eclipse IDE

---
 dev-tools/eclipse/run-solr-cloud.launch | 2 +-
 dev-tools/eclipse/run-solr.launch       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-tools/eclipse/run-solr-cloud.launch b/dev-tools/eclipse/run-solr-cloud.launch
index 188e033105d4..2d4972ebac03 100644
--- a/dev-tools/eclipse/run-solr-cloud.launch
+++ b/dev-tools/eclipse/run-solr-cloud.launch
@@ -16,5 +16,5 @@
 	<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.jetty.start.Main"/>
 	<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="--module=http"/>
 	<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="@ECLIPSEPROJECTNAME@"/>
-	<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms512m&#13;&#10;-Djetty.port=8983&#13;&#10;-DSTOP.PORT=7983 &#13;&#10;-DSTOP.KEY=solrrock&#13;&#10;-Dlog4j.configuration=&quot;file:${workspace_loc:lucene-solr}/solr/server/resources/log4j.properties&quot;&#13;&#10;-Djetty.home=&quot;${workspace_loc:lucene-solr}/solr/server&quot;&#13;&#10;-Djetty.base=&quot;${workspace_loc:lucene-solr}/solr/server&quot;&#13;&#10;-Dsolr.log=&quot;${workspace_loc:lucene-solr}/solr/server/logs&quot;&#13;&#10;-Dsolr.solr.home=&quot;${workspace_loc:lucene-solr}/solr/server/solr&quot;&#13;&#10;-DzkRun"/>
+	<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms512m &#13;&#10;-Djetty.port=8983&#13;&#10;-DSTOP.PORT=7983 &#13;&#10;-DSTOP.KEY=solrrock&#13;&#10;-Dlog4j.configuration=&quot;file:${workspace_loc:@ECLIPSEPROJECTNAME@}/solr/server/resources/log4j.properties&quot;&#13;&#10;-Djetty.home=&quot;${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build/solr-server&quot;&#13;&#10;-Djetty.base=&quot;${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build/solr-server&quot;&#13;&#10;-Dsolr.log=&quot;${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build&quot;&#13;&#10;-Dsolr.solr.home=&quot;${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build/solr-server/solr&quot;&#13;&#10;-DzkRun"/>
 </launchConfiguration>
diff --git a/dev-tools/eclipse/run-solr.launch b/dev-tools/eclipse/run-solr.launch
index e31d68a2e1f7..adb2ca78029f 100644
--- a/dev-tools/eclipse/run-solr.launch
+++ b/dev-tools/eclipse/run-solr.launch
@@ -16,5 +16,5 @@
 	<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.jetty.start.Main"/>
 	<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="--module=http"/>
 	<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="@ECLIPSEPROJECTNAME@"/>
-	<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms512m&#13;&#10;-Djetty.port=8983&#13;&#10;-DSTOP.PORT=7983 &#13;&#10;-DSTOP.KEY=solrrock&#13;&#10;-Dlog4j.configuration=&quot;file:${workspace_loc:lucene-solr}/solr/server/resources/log4j.properties&quot;&#13;&#10;-Djetty.home=&quot;${workspace_loc:lucene-solr}/solr/server&quot;&#13;&#10;-Djetty.base=&quot;${workspace_loc:lucene-solr}/solr/server&quot;&#13;&#10;-Dsolr.log=&quot;${workspace_loc:lucene-solr}/solr/server/logs&quot;&#13;&#10;-Dsolr.solr.home=&quot;${workspace_loc:lucene-solr}/solr/server/solr&quot;"/>
+    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms512m &#13;&#10;-Djetty.port=8983&#13;&#10;-DSTOP.PORT=7983 &#13;&#10;-DSTOP.KEY=solrrock&#13;&#10;-Dlog4j.configuration=&quot;file:${workspace_loc:@ECLIPSEPROJECTNAME@}/solr/server/resources/log4j.properties&quot;&#13;&#10;-Djetty.home=&quot;${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build/solr-server&quot;&#13;&#10;-Djetty.base=&quot;${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build/solr-server&quot;&#13;&#10;-Dsolr.log=&quot;${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build&quot;&#13;&#10;-Dsolr.solr.home=&quot;${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build/solr-server/solr&quot;"/>
 </launchConfiguration>

From cf057fc2563305c8ae126e6995d94514b96e475b Mon Sep 17 00:00:00 2001
From: Karthik Ramachandran <kramachandran@commvault.com>
Date: Mon, 12 Mar 2018 23:01:54 -0400
Subject: [PATCH 5/6] SOLR-11331: Ability to Debug Solr With Eclipse IDE

---
 dev-tools/eclipse/run-solr-cloud.launch | 2 +-
 dev-tools/eclipse/run-solr.launch       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-tools/eclipse/run-solr-cloud.launch b/dev-tools/eclipse/run-solr-cloud.launch
index 2d4972ebac03..493cb7592f58 100644
--- a/dev-tools/eclipse/run-solr-cloud.launch
+++ b/dev-tools/eclipse/run-solr-cloud.launch
@@ -16,5 +16,5 @@
 	<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.jetty.start.Main"/>
 	<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="--module=http"/>
 	<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="@ECLIPSEPROJECTNAME@"/>
-	<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms512m &#13;&#10;-Djetty.port=8983&#13;&#10;-DSTOP.PORT=7983 &#13;&#10;-DSTOP.KEY=solrrock&#13;&#10;-Dlog4j.configuration=&quot;file:${workspace_loc:@ECLIPSEPROJECTNAME@}/solr/server/resources/log4j.properties&quot;&#13;&#10;-Djetty.home=&quot;${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build/solr-server&quot;&#13;&#10;-Djetty.base=&quot;${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build/solr-server&quot;&#13;&#10;-Dsolr.log=&quot;${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build&quot;&#13;&#10;-Dsolr.solr.home=&quot;${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build/solr-server/solr&quot;&#13;&#10;-DzkRun"/>
+	<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms512m &#13;&#10;-Djetty.port=8983&#13;&#10;-DSTOP.PORT=7983 &#13;&#10;-DSTOP.KEY=solrrock&#13;&#10;-Dlog4j.configuration=&quot;file:${workspace_loc:@ECLIPSEPROJECTNAME@}/solr/server/resources/log4j.properties&quot;&#13;&#10;-Djetty.home=&quot;${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build/solr-server&quot;&#13;&#10;-Djetty.base=&quot;${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build/solr-server&quot;&#13;&#10;-Dsolr.log=&quot;${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build&quot;&#13;&#10;-Dsolr.log.dir=&quot;${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build&quot;&#13;&#10;-Dsolr.solr.home=&quot;${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build/solr-server/solr&quot;&#13;&#10;-DzkRun"/>
 </launchConfiguration>
diff --git a/dev-tools/eclipse/run-solr.launch b/dev-tools/eclipse/run-solr.launch
index adb2ca78029f..dc167d0e74f0 100644
--- a/dev-tools/eclipse/run-solr.launch
+++ b/dev-tools/eclipse/run-solr.launch
@@ -16,5 +16,5 @@
 	<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.jetty.start.Main"/>
 	<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="--module=http"/>
 	<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="@ECLIPSEPROJECTNAME@"/>
-    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms512m &#13;&#10;-Djetty.port=8983&#13;&#10;-DSTOP.PORT=7983 &#13;&#10;-DSTOP.KEY=solrrock&#13;&#10;-Dlog4j.configuration=&quot;file:${workspace_loc:@ECLIPSEPROJECTNAME@}/solr/server/resources/log4j.properties&quot;&#13;&#10;-Djetty.home=&quot;${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build/solr-server&quot;&#13;&#10;-Djetty.base=&quot;${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build/solr-server&quot;&#13;&#10;-Dsolr.log=&quot;${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build&quot;&#13;&#10;-Dsolr.solr.home=&quot;${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build/solr-server/solr&quot;"/>
+    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms512m &#13;&#10;-Djetty.port=8983&#13;&#10;-DSTOP.PORT=7983 &#13;&#10;-DSTOP.KEY=solrrock&#13;&#10;-Dlog4j.configuration=&quot;file:${workspace_loc:@ECLIPSEPROJECTNAME@}/solr/server/resources/log4j.properties&quot;&#13;&#10;-Djetty.home=&quot;${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build/solr-server&quot;&#13;&#10;-Djetty.base=&quot;${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build/solr-server&quot;&#13;&#10;-Dsolr.log=&quot;${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build&quot;&#13;&#10;-Dsolr.log.dir=&quot;${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build&quot;&#13;&#10;-Dsolr.solr.home=&quot;${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build/solr-server/solr&quot;"/>
 </launchConfiguration>

From ff42ed8c3666495b2ce42fdc1346f1e014e7cfd3 Mon Sep 17 00:00:00 2001
From: Karthik Ramachandran <kramachandran@commvault.com>
Date: Thu, 15 Mar 2018 17:17:15 -0400
Subject: [PATCH 6/6] SOLR-11331: Ability to Debug Solr With Eclipse IDE

---
 build.xml                               | 16 ++++++------
 dev-tools/eclipse/dot.classpath.xsl     | 18 ++++++-------
 dev-tools/eclipse/dot.project           | 28 ++++++++++----------
 dev-tools/eclipse/run-solr-cloud.launch | 34 ++++++++++++-------------
 dev-tools/eclipse/run-solr.launch       | 32 +++++++++++------------
 dev-tools/eclipse/run-test-cases.launch | 28 ++++++++++----------
 solr/CHANGES.txt                        |  3 +++
 solr/build.xml                          | 19 ++++++++------
 8 files changed, 92 insertions(+), 86 deletions(-)

diff --git a/build.xml b/build.xml
index faf08a7de363..a4a5cb762aa2 100755
--- a/build.xml
+++ b/build.xml
@@ -293,12 +293,12 @@
         <filter token="ECLIPSEPROJECTNAME" value="${eclipseprojectname}"/>
       </filterset>
     </copy>
-	<copy overwrite="false" todir="eclipse-build" encoding="UTF-8">
+    <copy overwrite="false" todir="eclipse-build" encoding="UTF-8">
       <fileset dir="dev-tools/eclipse" includes="*.launch"/>
       <filterset>
         <filter token="ECLIPSEPROJECTNAME" value="${eclipseprojectname}"/>
       </filterset>
-	</copy>	
+    </copy> 
     <mkdir dir=".settings"/>
     <copy todir=".settings/" overwrite="true">
       <fileset dir="dev-tools/eclipse/dot.settings" includes="*.prefs" />
@@ -315,12 +315,12 @@
       <map from="${basedir}/" to=""/>
     </pathconvert>
     <pathconvert property="eclipse.fileset.webfolders" pathsep="|" dirsep="/">
-    	<dirset dir="${basedir}/solr/server/contexts" excludes="**/*" />
-    	<dirset dir="${basedir}/solr/server/etc" excludes="**/*" />
-    	<dirset dir="${basedir}/solr/server/modules" excludes="**/*" />
-    	<dirset dir="${basedir}/solr/server/solr" excludes="**/*" />
-    	<dirset dir="${basedir}/solr/webapp/web" excludes="**/*" />
-    	<map from="${basedir}/" to=""/>
+        <dirset dir="${basedir}/solr/server/contexts" excludes="**/*" />
+        <dirset dir="${basedir}/solr/server/etc" excludes="**/*" />
+        <dirset dir="${basedir}/solr/server/modules" excludes="**/*" />
+        <dirset dir="${basedir}/solr/server/solr" excludes="**/*" />
+        <dirset dir="${basedir}/solr/webapp/web" excludes="**/*" />
+        <map from="${basedir}/" to=""/>
     </pathconvert>
     <xslt in="${ant.file}" out=".classpath" style="dev-tools/eclipse/dot.classpath.xsl" force="true">
       <outputproperty name="indent" value="yes"/>
diff --git a/dev-tools/eclipse/dot.classpath.xsl b/dev-tools/eclipse/dot.classpath.xsl
index eefd421d74a9..c5a7cb46d672 100644
--- a/dev-tools/eclipse/dot.classpath.xsl
+++ b/dev-tools/eclipse/dot.classpath.xsl
@@ -55,21 +55,21 @@
           <classpathentry excluding="src" including="conf/**" kind="src" path="lucene/benchmark"/>
         </xsl:if>
       </xsl:for-each>
-	  
-	  <xsl:for-each select="str:split($eclipse.fileset.webfolders,'|')">
+      
+      <xsl:for-each select="str:split($eclipse.fileset.webfolders,'|')">
         <xsl:sort select="text()" order="ascending" lang="en"/>
         <classpathentry kind="src" path="{.}">
             <xsl:attribute name="output">
               <xsl:choose>
                 <xsl:when test="contains(.,'solr/webapp/web')">
-				  <xsl:text>eclipse-build/solr-server/solr-webapp/webapp</xsl:text>
-			    </xsl:when>
-			    <xsl:otherwise>
-				  <xsl:text>eclipse-build/solr-server/</xsl:text><xsl:value-of select="substring(text(), 13)"/>
-			    </xsl:otherwise>
-			  </xsl:choose>
+                  <xsl:text>eclipse-build/solr-server/solr-webapp/webapp</xsl:text>
+                </xsl:when>
+                <xsl:otherwise>
+                  <xsl:text>eclipse-build/solr-server/</xsl:text><xsl:value-of select="substring(text(), 13)"/>
+                </xsl:otherwise>
+              </xsl:choose>
             </xsl:attribute>
-		</classpathentry>		
+        </classpathentry>       
       </xsl:for-each>
 
       <!-- the main resources folder is here (see above), so it's listed after the test-framework resources, making preflex-override work: -->
diff --git a/dev-tools/eclipse/dot.project b/dev-tools/eclipse/dot.project
index dcd7970c681e..d5cca5ae84a3 100644
--- a/dev-tools/eclipse/dot.project
+++ b/dev-tools/eclipse/dot.project
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>@ECLIPSEPROJECTNAME@</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
+    <name>@ECLIPSEPROJECTNAME@</name>
+    <comment></comment>
+    <projects>
+    </projects>
+    <buildSpec>
+        <buildCommand>
+            <name>org.eclipse.jdt.core.javabuilder</name>
+            <arguments>
+            </arguments>
+        </buildCommand>
+    </buildSpec>
+    <natures>
+        <nature>org.eclipse.jdt.core.javanature</nature>
+    </natures>
         <filteredResources>
                 <filter>
                         <id>1353353379237</id>
diff --git a/dev-tools/eclipse/run-solr-cloud.launch b/dev-tools/eclipse/run-solr-cloud.launch
index 493cb7592f58..d57ffcec96d3 100644
--- a/dev-tools/eclipse/run-solr-cloud.launch
+++ b/dev-tools/eclipse/run-solr-cloud.launch
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-	<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-		<listEntry value="/@ECLIPSEPROJECTNAME@"/>
-	</listAttribute>
-	<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-		<listEntry value="4"/>
-	</listAttribute>
-	<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-	<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
-		<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8&quot; javaProject=&quot;@ECLIPSEPROJECTNAME@&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#13;&#10;"/>
-		<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry id=&quot;org.eclipse.jdt.launching.classpathentry.defaultClasspath&quot;&gt;&#13;&#10;&lt;memento exportedEntriesOnly=&quot;false&quot; project=&quot;@ECLIPSEPROJECTNAME@&quot;/&gt;&#13;&#10;&lt;/runtimeClasspathEntry&gt;&#13;&#10;"/>
-		<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/@ECLIPSEPROJECTNAME@/solr/server/start.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
-	</listAttribute>
-	<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
-	<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.jetty.start.Main"/>
-	<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="--module=http"/>
-	<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="@ECLIPSEPROJECTNAME@"/>
-	<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms512m &#13;&#10;-Djetty.port=8983&#13;&#10;-DSTOP.PORT=7983 &#13;&#10;-DSTOP.KEY=solrrock&#13;&#10;-Dlog4j.configuration=&quot;file:${workspace_loc:@ECLIPSEPROJECTNAME@}/solr/server/resources/log4j.properties&quot;&#13;&#10;-Djetty.home=&quot;${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build/solr-server&quot;&#13;&#10;-Djetty.base=&quot;${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build/solr-server&quot;&#13;&#10;-Dsolr.log=&quot;${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build&quot;&#13;&#10;-Dsolr.log.dir=&quot;${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build&quot;&#13;&#10;-Dsolr.solr.home=&quot;${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build/solr-server/solr&quot;&#13;&#10;-DzkRun"/>
+    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+        <listEntry value="/@ECLIPSEPROJECTNAME@"/>
+    </listAttribute>
+    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+        <listEntry value="4"/>
+    </listAttribute>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+    <listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
+        <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8&quot; javaProject=&quot;@ECLIPSEPROJECTNAME@&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#13;&#10;"/>
+        <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry id=&quot;org.eclipse.jdt.launching.classpathentry.defaultClasspath&quot;&gt;&#13;&#10;&lt;memento exportedEntriesOnly=&quot;false&quot; project=&quot;@ECLIPSEPROJECTNAME@&quot;/&gt;&#13;&#10;&lt;/runtimeClasspathEntry&gt;&#13;&#10;"/>
+        <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/@ECLIPSEPROJECTNAME@/solr/server/start.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
+    </listAttribute>
+    <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
+    <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.jetty.start.Main"/>
+    <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="--module=http"/>
+    <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="@ECLIPSEPROJECTNAME@"/>
+    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms512m &#13;&#10;-Djetty.port=8983&#13;&#10;-DSTOP.PORT=7983 &#13;&#10;-DSTOP.KEY=solrrock&#13;&#10;-Dlog4j.configuration=&quot;file:${workspace_loc:@ECLIPSEPROJECTNAME@}/solr/server/resources/log4j.properties&quot;&#13;&#10;-Djetty.home=&quot;${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build/solr-server&quot;&#13;&#10;-Djetty.base=&quot;${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build/solr-server&quot;&#13;&#10;-Dsolr.log=&quot;${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build&quot;&#13;&#10;-Dsolr.log.dir=&quot;${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build&quot;&#13;&#10;-Dsolr.solr.home=&quot;${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build/solr-server/solr&quot;&#13;&#10;-DzkRun"/>
 </launchConfiguration>
diff --git a/dev-tools/eclipse/run-solr.launch b/dev-tools/eclipse/run-solr.launch
index dc167d0e74f0..41c72194033d 100644
--- a/dev-tools/eclipse/run-solr.launch
+++ b/dev-tools/eclipse/run-solr.launch
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-	<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-		<listEntry value="/@ECLIPSEPROJECTNAME@"/>
-	</listAttribute>
-	<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-		<listEntry value="4"/>
-	</listAttribute>
-	<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-	<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
-		<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8&quot; javaProject=&quot;@ECLIPSEPROJECTNAME@&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#13;&#10;"/>
-		<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry id=&quot;org.eclipse.jdt.launching.classpathentry.defaultClasspath&quot;&gt;&#13;&#10;&lt;memento exportedEntriesOnly=&quot;false&quot; project=&quot;@ECLIPSEPROJECTNAME@&quot;/&gt;&#13;&#10;&lt;/runtimeClasspathEntry&gt;&#13;&#10;"/>
-		<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/@ECLIPSEPROJECTNAME@/solr/server/start.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
-	</listAttribute>
-	<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
-	<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.jetty.start.Main"/>
-	<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="--module=http"/>
-	<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="@ECLIPSEPROJECTNAME@"/>
+    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+        <listEntry value="/@ECLIPSEPROJECTNAME@"/>
+    </listAttribute>
+    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+        <listEntry value="4"/>
+    </listAttribute>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+    <listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
+        <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8&quot; javaProject=&quot;@ECLIPSEPROJECTNAME@&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#13;&#10;"/>
+        <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry id=&quot;org.eclipse.jdt.launching.classpathentry.defaultClasspath&quot;&gt;&#13;&#10;&lt;memento exportedEntriesOnly=&quot;false&quot; project=&quot;@ECLIPSEPROJECTNAME@&quot;/&gt;&#13;&#10;&lt;/runtimeClasspathEntry&gt;&#13;&#10;"/>
+        <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/@ECLIPSEPROJECTNAME@/solr/server/start.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
+    </listAttribute>
+    <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
+    <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.jetty.start.Main"/>
+    <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="--module=http"/>
+    <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="@ECLIPSEPROJECTNAME@"/>
     <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms512m &#13;&#10;-Djetty.port=8983&#13;&#10;-DSTOP.PORT=7983 &#13;&#10;-DSTOP.KEY=solrrock&#13;&#10;-Dlog4j.configuration=&quot;file:${workspace_loc:@ECLIPSEPROJECTNAME@}/solr/server/resources/log4j.properties&quot;&#13;&#10;-Djetty.home=&quot;${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build/solr-server&quot;&#13;&#10;-Djetty.base=&quot;${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build/solr-server&quot;&#13;&#10;-Dsolr.log=&quot;${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build&quot;&#13;&#10;-Dsolr.log.dir=&quot;${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build&quot;&#13;&#10;-Dsolr.solr.home=&quot;${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build/solr-server/solr&quot;"/>
 </launchConfiguration>
diff --git a/dev-tools/eclipse/run-test-cases.launch b/dev-tools/eclipse/run-test-cases.launch
index 3fcac78a3755..3e90360baa01 100644
--- a/dev-tools/eclipse/run-test-cases.launch
+++ b/dev-tools/eclipse/run-test-cases.launch
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
-	<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-		<listEntry value="/@ECLIPSEPROJECTNAME@"/>
-	</listAttribute>
-	<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-		<listEntry value="4"/>
-	</listAttribute>
-	<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value="=@ECLIPSEPROJECTNAME@"/>
-	<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-	<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-	<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-	<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-	<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/>
-	<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="@ECLIPSEPROJECTNAME@"/>
-	<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea"/>
+    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+        <listEntry value="/@ECLIPSEPROJECTNAME@"/>
+    </listAttribute>
+    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+        <listEntry value="4"/>
+    </listAttribute>
+    <stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value="=@ECLIPSEPROJECTNAME@"/>
+    <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+    <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+    <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+    <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/>
+    <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="@ECLIPSEPROJECTNAME@"/>
+    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea"/>
 </launchConfiguration>
\ No newline at end of file
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index a49106a8b422..61d2eb01067f 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -49,6 +49,9 @@ Apache UIMA 2.3.1
 Apache ZooKeeper 3.4.11
 Jetty 9.4.8.v20171121
 
+* SOLR-11331: Ability to run and debug standalone Solr and a single node SolrCloud server from Eclipse.
+  Also being able to run all lucene and solr tests as a configuration (Karthik Ramachandran via Varun Thacker)
+
 
 Upgrade Notes
 ----------------------
diff --git a/solr/build.xml b/solr/build.xml
index 3f0596fc9cea..28ade70701be 100644
--- a/solr/build.xml
+++ b/solr/build.xml
@@ -641,17 +641,20 @@
   <target name="resolve" depends="resolve-example,resolve-server">
      <sequential>
      <ant dir="core" target="resolve" inheritall="false">
-         <propertyset refid="uptodate.and.compiled.properties"/>
-      </ant>
+       <propertyset refid="uptodate.and.compiled.properties"/>
+     </ant>
      <ant dir="solrj" target="resolve" inheritall="false">
-         <propertyset refid="uptodate.and.compiled.properties"/>
-      </ant>
+        <propertyset refid="uptodate.and.compiled.properties"/>
+     </ant>
      <ant dir="test-framework" target="resolve" inheritall="false">
-         <propertyset refid="uptodate.and.compiled.properties"/>
-      </ant>
+       <propertyset refid="uptodate.and.compiled.properties"/>
+     </ant>
+     <ant dir="server" target="resolve" inheritall="false">
+       <propertyset refid="uptodate.and.compiled.properties"/>
+     </ant>
      <ant dir="solr-ref-guide" target="resolve" inheritall="false">
-         <propertyset refid="uptodate.and.compiled.properties"/>
-      </ant>
+       <propertyset refid="uptodate.and.compiled.properties"/>
+     </ant>
      <contrib-crawl target="resolve"/>
     </sequential>
   </target>