You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2012/09/07 00:55:19 UTC
svn commit: r1381793 - in /lucene/dev/branches/branch_4x: ./ solr/
solr/common-build.xml solr/core/ solr/core/build.xml solr/core/lib/
solr/lib/ solr/solrj/ solr/solrj/build.xml solr/solrj/lib/ solr/webapp/
solr/webapp/build.xml
Author: rmuir
Date: Thu Sep 6 22:55:18 2012
New Revision: 1381793
URL: http://svn.apache.org/viewvc?rev=1381793&view=rev
Log:
SOLR-3686: fix solr/core and solr/solrj not to share a lib directory
Added:
lucene/dev/branches/branch_4x/solr/core/lib/ (props changed)
- copied from r1381792, lucene/dev/trunk/solr/core/lib/
lucene/dev/branches/branch_4x/solr/solrj/lib/ (props changed)
- copied from r1381792, lucene/dev/trunk/solr/solrj/lib/
Removed:
lucene/dev/branches/branch_4x/solr/lib/
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/common-build.xml (contents, props changed)
lucene/dev/branches/branch_4x/solr/core/ (props changed)
lucene/dev/branches/branch_4x/solr/core/build.xml
lucene/dev/branches/branch_4x/solr/solrj/ (props changed)
lucene/dev/branches/branch_4x/solr/solrj/build.xml
lucene/dev/branches/branch_4x/solr/webapp/ (props changed)
lucene/dev/branches/branch_4x/solr/webapp/build.xml
Modified: lucene/dev/branches/branch_4x/solr/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/common-build.xml?rev=1381793&r1=1381792&r2=1381793&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/common-build.xml (original)
+++ lucene/dev/branches/branch_4x/solr/common-build.xml Thu Sep 6 22:55:18 2012
@@ -55,7 +55,8 @@
<import file="${common-solr.dir}/../lucene/module-build.xml"/>
<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/example-DIH/solr/db/lib" excludes="${common.classpath.excludes}"/>
<fileset dir="lib" excludes="${common.classpath.excludes}" erroronmissingdir="false"/>
Modified: lucene/dev/branches/branch_4x/solr/core/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/build.xml?rev=1381793&r1=1381792&r2=1381793&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/build.xml (original)
+++ lucene/dev/branches/branch_4x/solr/core/build.xml Thu Sep 6 22:55:18 2012
@@ -18,12 +18,6 @@
<project name="solr-core" default="default">
<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 -->
<property name="rat.excludes" value="**/htmlStripReaderTest.html"/>
Modified: lucene/dev/branches/branch_4x/solr/solrj/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/solrj/build.xml?rev=1381793&r1=1381792&r2=1381793&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/solrj/build.xml (original)
+++ lucene/dev/branches/branch_4x/solr/solrj/build.xml Thu Sep 6 22:55:18 2012
@@ -18,11 +18,6 @@
<project name="solr-solrj" default="default">
<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"/>
<!-- Specialized common-solr.test.classpath, to remove the Solr core test output -->
@@ -35,16 +30,8 @@
<target name="dist" depends="common-solr.dist">
<mkdir dir="${dist}/solrj-lib" />
<copy todir="${dist}/solrj-lib">
- <fileset dir="${common-solr.dir}/lib">
- <include name="commons-codec-*.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 dir="${common-solr.dir}/solrj/lib">
+ <include name="*.jar"/>
</fileset>
</copy>
</target>
Modified: lucene/dev/branches/branch_4x/solr/webapp/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/webapp/build.xml?rev=1381793&r1=1381792&r2=1381793&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/webapp/build.xml (original)
+++ lucene/dev/branches/branch_4x/solr/webapp/build.xml Thu Sep 6 22:55:18 2012
@@ -47,11 +47,11 @@
<war destfile="${dist}/apache-solr-${version}${solr.war.suffix}.war"
webxml="web/WEB-INF/web.xml"
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="easymock-*.jar" />
- <exclude name="junit-*.jar" />
</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="${dist}" excludes="${exclude.from.war},${common.classpath.excludes}">
<include name="apache-solr-solrj-${version}.jar" />