Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-3686: fix solr/core and solr/solrj not to share a lib directory 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1381792 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Robert Muir 2012-09-06 22:47:01 +00:00
parent 25fe03ae90
commit ddda1b6089
4 changed files with 6 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
solr/common-build.xml
View File

@ -55,7 +55,8 @@
<import file="${common-solr.dir}/../lucene/module-build.xml"/> <import file="${common-solr.dir}/../lucene/module-build.xml"/>
<path id="additional.dependencies"> <path id="additional.dependencies">
<fileset dir="${common-solr.dir}/lib" excludes="${common.classpath.excludes}"/> <fileset dir="${common-solr.dir}/core/lib" excludes="${common.classpath.excludes}"/>
<fileset dir="${common-solr.dir}/solrj/lib" excludes="${common.classpath.excludes}"/>
<fileset dir="${common-solr.dir}/example/lib" excludes="${common.classpath.excludes}"/> <fileset dir="${common-solr.dir}/example/lib" excludes="${common.classpath.excludes}"/>
<fileset dir="${common-solr.dir}/example/example-DIH/solr/db/lib" excludes="${common.classpath.excludes}"/> <fileset dir="${common-solr.dir}/example/example-DIH/solr/db/lib" excludes="${common.classpath.excludes}"/>
<fileset dir="lib" excludes="${common.classpath.excludes}" erroronmissingdir="false"/> <fileset dir="lib" excludes="${common.classpath.excludes}" erroronmissingdir="false"/>

6
solr/core/build.xml
View File

@ -18,12 +18,6 @@
<project name="solr-core" default="default"> <project name="solr-core" default="default">
<description>Solr Core</description> <description>Solr Core</description>
<!-- hackidty-hack-hack -->
<property name="ivy.retrieve.pattern" value="${common-solr.dir}/lib/[artifact]-[revision].[ext]"/>
<!-- we cannot sync because solr/core and solr/solrj share the same lib/... clean this up! -->
<property name="ivy.sync" value="false"/>
<!-- html file for testing --> <!-- html file for testing -->
<property name="rat.excludes" value="**/htmlStripReaderTest.html"/> <property name="rat.excludes" value="**/htmlStripReaderTest.html"/>

17
solr/solrj/build.xml
View File

@ -18,11 +18,6 @@
<project name="solr-solrj" default="default"> <project name="solr-solrj" default="default">
<description>Solrj - Solr Java Client</description> <description>Solrj - Solr Java Client</description>
<property name="ivy.retrieve.pattern" value="${common-solr.dir}/lib/[artifact]-[revision].[ext]"/>
<!-- we cannot sync because solr/core and solr/solrj share the same lib/... clean this up! -->
<property name="ivy.sync" value="false"/>
<import file="../common-build.xml"/> <import file="../common-build.xml"/>
<!-- Specialized common-solr.test.classpath, to remove the Solr core test output --> <!-- Specialized common-solr.test.classpath, to remove the Solr core test output -->
@ -35,16 +30,8 @@
<target name="dist" depends="common-solr.dist"> <target name="dist" depends="common-solr.dist">
<mkdir dir="${dist}/solrj-lib" /> <mkdir dir="${dist}/solrj-lib" />
<copy todir="${dist}/solrj-lib"> <copy todir="${dist}/solrj-lib">
<fileset dir="${common-solr.dir}/lib"> <fileset dir="${common-solr.dir}/solrj/lib">
<include name="commons-codec-*.jar"/> <include name="*.jar"/>
<include name="commons-io-*.jar"/>
<include name="httpcore*.jar"/>
<include name="httpclient*.jar"/>
<include name="httpmime*.jar"/>
<include name="*stax-*.jar" />
<include name="wstx-*.jar" />
<include name="jcl-over-slf4j-*.jar" />
<include name="slf4j-api-*.jar" />
</fileset> </fileset>
</copy> </copy>
</target> </target>

4
solr/webapp/build.xml
View File

@ -47,11 +47,11 @@
<war destfile="${dist}/apache-solr-${version}${solr.war.suffix}.war" <war destfile="${dist}/apache-solr-${version}${solr.war.suffix}.war"
webxml="web/WEB-INF/web.xml" webxml="web/WEB-INF/web.xml"
manifest="${manifest.file}"> manifest="${manifest.file}">
<lib dir="${common-solr.dir}/lib" excludes="${exclude.from.war},${common.classpath.excludes}"> <lib dir="${common-solr.dir}/core/lib" excludes="${exclude.from.war},${common.classpath.excludes}">
<exclude name="servlet-api*.jar" /> <exclude name="servlet-api*.jar" />
<exclude name="easymock-*.jar" /> <exclude name="easymock-*.jar" />
<exclude name="junit-*.jar" />
</lib> </lib>
<lib dir="${common-solr.dir}/solrj/lib" excludes="${exclude.from.war},${common.classpath.excludes}"/>
<lib dir="${lucene-libs}" excludes="${exclude.from.war},${common.classpath.excludes}" /> <lib dir="${lucene-libs}" excludes="${exclude.from.war},${common.classpath.excludes}" />
<lib dir="${dist}" excludes="${exclude.from.war},${common.classpath.excludes}"> <lib dir="${dist}" excludes="${exclude.from.war},${common.classpath.excludes}">
<include name="apache-solr-solrj-${version}.jar" /> <include name="apache-solr-solrj-${version}.jar" />