SOLR-8929: Add an idea module for solr/server to enable launching start.jar

This commit is contained in:
Scott Blum 2016-04-19 21:06:15 -04:00
parent 71a5870ae7
commit af92294b0c
5 changed files with 36 additions and 3 deletions

2
.gitignore vendored
View File

@ -48,5 +48,7 @@ solr/contrib/morphlines-core/test-lib/
solr/core/test-lib/ solr/core/test-lib/
solr/server/logs/
solr/server/solr/zoo_data/
solr/server/solr-webapp solr/server/solr-webapp
solr/server/start.jar solr/server/start.jar

View File

@ -43,6 +43,7 @@
<module group="Solr" filepath="$PROJECT_DIR$/solr/core/src/java/solr-core.iml" /> <module group="Solr" filepath="$PROJECT_DIR$/solr/core/src/java/solr-core.iml" />
<module group="Solr" filepath="$PROJECT_DIR$/solr/core/src/solr-core-tests.iml" /> <module group="Solr" filepath="$PROJECT_DIR$/solr/core/src/solr-core-tests.iml" />
<module group="Solr" filepath="$PROJECT_DIR$/solr/server/server.iml" />
<module group="Solr" filepath="$PROJECT_DIR$/solr/solrj/src/java/solrj.iml" /> <module group="Solr" filepath="$PROJECT_DIR$/solr/solrj/src/java/solrj.iml" />
<module group="Solr" filepath="$PROJECT_DIR$/solr/solrj/src/solrj-tests.iml" /> <module group="Solr" filepath="$PROJECT_DIR$/solr/solrj/src/solrj-tests.iml" />
<module group="Solr" filepath="$PROJECT_DIR$/solr/test-framework/solr-test-framework.iml" /> <module group="Solr" filepath="$PROJECT_DIR$/solr/test-framework/solr-test-framework.iml" />

View File

@ -340,8 +340,16 @@
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option> <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
<patterns><pattern testClass=".*\.Test[^.]*|.*\.[^.]*Test" /></patterns> <patterns><pattern testClass=".*\.Test[^.]*|.*\.[^.]*Test" /></patterns>
</configuration> </configuration>
<configuration default="false" name="solrcloud" type="Application" factoryName="Application" singleton="true">
<list size="41"> <option name="MAIN_CLASS_NAME" value="org.eclipse.jetty.start.Main" />
<option name="VM_PARAMETERS" value="-DzkRun -Dhost=127.0.0.1 -Duser.timezone=UTC -Djetty.home=$PROJECT_DIR$/solr/server -Dsolr.solr.home=$PROJECT_DIR$/solr/server/solr -Dsolr.install.dir=$PROJECT_DIR$/solr -Dsolr.log=$PROJECT_DIR$/solr/server/logs/solr.log" />
<option name="PROGRAM_PARAMETERS" value="--module=http" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/solr/server" />
<option name="PARENT_ENVS" value="true" />
<module name="server" />
</configuration>
<list size="42">
<item index="0" class="java.lang.String" itemvalue="JUnit.Lucene core" /> <item index="0" class="java.lang.String" itemvalue="JUnit.Lucene core" />
<item index="1" class="java.lang.String" itemvalue="JUnit.Module analyzers-common" /> <item index="1" class="java.lang.String" itemvalue="JUnit.Module analyzers-common" />
<item index="2" class="java.lang.String" itemvalue="JUnit.Module analyzers-icu" /> <item index="2" class="java.lang.String" itemvalue="JUnit.Module analyzers-icu" />
@ -383,6 +391,7 @@
<item index="38" class="java.lang.String" itemvalue="JUnit.Solr uima contrib" /> <item index="38" class="java.lang.String" itemvalue="JUnit.Solr uima contrib" />
<item index="39" class="java.lang.String" itemvalue="JUnit.Solr velocity contrib" /> <item index="39" class="java.lang.String" itemvalue="JUnit.Solr velocity contrib" />
<item index="40" class="java.lang.String" itemvalue="JUnit.Solrj" /> <item index="40" class="java.lang.String" itemvalue="JUnit.Solrj" />
<item index="41" class="java.lang.String" itemvalue="Application.solrcloud" />
</list> </list>
</component> </component>
</project> </project>

View File

@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/../../idea-build/solr/server/classes/java" />
<exclude-output />
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/start.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
</component>
</module>

View File

@ -158,6 +158,8 @@ Optimizations
* SOLR-8937: bin/post (SimplePostTool) now streams the standard input instead of buffering fully. * SOLR-8937: bin/post (SimplePostTool) now streams the standard input instead of buffering fully.
(David Smiley) (David Smiley)
* SOLR-8973: Zookeeper frenzy when a core is first created. (Janmejay Singh, Scott Blum, shalin)
Other Changes Other Changes
---------------------- ----------------------
* SOLR-7516: Improve javadocs for JavaBinCodec, ObjectResolver and enforce the single-usage policy. * SOLR-7516: Improve javadocs for JavaBinCodec, ObjectResolver and enforce the single-usage policy.
@ -190,7 +192,7 @@ Other Changes
* SOLR-9015: Adds SelectStream as a default function in the StreamHandler (Dennis Gove) * SOLR-9015: Adds SelectStream as a default function in the StreamHandler (Dennis Gove)
* SOLR-8973: Zookeeper frenzy when a core is first created. (Janmejay Singh, Scott Blum, shalin) * SOLR-8929: Add an idea module for solr/server to enable launching start.jar (Scott Blum, Steve Rowe)
================== 6.0.0 ================== ================== 6.0.0 ==================