Author: shalin
Date: Fri Dec 11 07:14:12 2009
New Revision: 889519
URL: http://svn.apache.org/viewvc?rev=889519&view=rev
Log:
SOLR-1643 -- Moved dataimporthandler extras into dataimporthandler core
Added:
lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/MailEntityProcessor.java
(props changed)
- copied unchanged from r889126,
lucene/solr/trunk/contrib/dataimporthandler/src/extras/main/java/org/apache/solr/handler/dataimport/MailEntityProcessor.java
lucene/solr/trunk/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestMailEntityProcessor.java
(props changed)
- copied unchanged from r889126,
lucene/solr/trunk/contrib/dataimporthandler/src/extras/test/java/org/apache/solr/handler/dataimport/TestMailEntityProcessor.java
Removed:
lucene/solr/trunk/contrib/dataimporthandler/solr-dataimporthandler-extras-pom.xml.template
lucene/solr/trunk/contrib/dataimporthandler/src/extras/
Modified:
lucene/solr/trunk/build.xml
lucene/solr/trunk/contrib/dataimporthandler/CHANGES.txt
lucene/solr/trunk/contrib/dataimporthandler/build.xml
Modified: lucene/solr/trunk/build.xml
URL:
http://svn.apache.org/viewvc/lucene/solr/trunk/build.xml?rev=889519&r1=889518&r2=889519&view=diff
==============================================================================
--- lucene/solr/trunk/build.xml (original)
+++ lucene/solr/trunk/build.xml Fri Dec 11 07:14:12 2009
@@ -529,8 +529,6 @@
<solr-jar
destfile="${dist}/apache-solr-dataimporthandler-src-${version}.jar"
basedir="contrib/dataimporthandler/src/main/java" />
- <solr-jar
destfile="${dist}/apache-solr-dataimporthandler-extras-src-${version}.jar"
- basedir="contrib/dataimporthandler/src/extras/main/java" />
<solr-jar destfile="${dist}/apache-solr-cell-src-${version}.jar"
basedir="contrib/extraction/src" />
@@ -733,7 +731,6 @@
<sign-maven-dependency-artifacts artifact.id="solr-commons-csv"
gpg.passphrase="${gpg.passphrase}"/>
<sign-maven-artifacts artifact.id="solr-core"
gpg.passphrase="${gpg.passphrase}"/>
<sign-maven-artifacts artifact.id="solr-dataimporthandler"
gpg.passphrase="${gpg.passphrase}"/>
- <sign-maven-artifacts artifact.id="solr-dataimporthandler-extras"
gpg.passphrase="${gpg.passphrase}"/>
<sign-maven-artifacts artifact.id="solr-clustering"
gpg.passphrase="${gpg.passphrase}"/>
<sign-maven-artifacts artifact.id="solr-cell"
gpg.passphrase="${gpg.passphrase}"/>
@@ -797,15 +794,6 @@
</artifact-attachments>
</m2-deploy>
- <m2-deploy
pom.xml="contrib/dataimporthandler/solr-dataimporthandler-extras-pom.xml.template"
-
jar.file="${dist}/apache-solr-dataimporthandler-extras-${version}.jar">
-
- <artifact-attachments>
- <attach
file="${dist}/apache-solr-dataimporthandler-extras-src-${version}.jar"
classifier="sources"/>
- <attach
file="${dist}/apache-solr-dataimporthandler-docs-${version}.jar"
classifier="javadoc"/>
- </artifact-attachments>
- </m2-deploy>
-
<m2-deploy pom.xml="contrib/extraction/solr-cell-pom.xml.template"
jar.file="${dist}/apache-solr-cell-${version}.jar">
<artifact-attachments>
Modified: lucene/solr/trunk/contrib/dataimporthandler/CHANGES.txt
URL:
http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/dataimporthandler/CHANGES.txt?rev=889519&r1=889518&r2=889519&view=diff
==============================================================================
--- lucene/solr/trunk/contrib/dataimporthandler/CHANGES.txt (original)
+++ lucene/solr/trunk/contrib/dataimporthandler/CHANGES.txt Fri Dec 11 07:14:12
2009
@@ -42,7 +42,7 @@
Build
----------------------
-
+* SOLR-1643: Moved dataimporthandler extras into dataimporthandler core
(shalin)
Documentation
----------------------
Modified: lucene/solr/trunk/contrib/dataimporthandler/build.xml
URL:
http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/dataimporthandler/build.xml?rev=889519&r1=889518&r2=889519&view=diff
==============================================================================
--- lucene/solr/trunk/contrib/dataimporthandler/build.xml (original)
+++ lucene/solr/trunk/contrib/dataimporthandler/build.xml Fri Dec 11 07:14:12
2009
@@ -37,17 +37,10 @@
<pathelement location="${solr-path}/build/solr" />
<pathelement location="${solr-path}/build/solrj" />
<fileset dir="${solr-path}/lib" includes="*.jar"/>
- </path>
-
- <path id="extras.classpath">
- <pathelement location="${solr-path}/build/solr" />
- <pathelement location="${solr-path}/build/solrj" />
- <pathelement location="target/classes" />
- <fileset dir="${solr-path}/lib" includes="*.jar"/>
- <fileset dir="lib/" includes="*.jar"/>
+ <fileset dir="lib/" includes="*.jar"/>
<fileset dir="${tikalibs-path}" includes="*.jar"/>
</path>
-
+
<path id="test.classpath">
<path refid="common.classpath" />
<path refid="classpath.jetty" />
@@ -56,16 +49,6 @@
<pathelement path="${java.class.path}"/>
</path>
- <path id="test.extras.classpath">
- <path refid="extras.classpath" />
- <path refid="classpath.jetty" />
- <pathelement path="target/classes" />
- <pathelement path="target/extras/classes" />
- <pathelement path="target/test-classes" />
- <pathelement path="target/extras/test-classes" />
- <pathelement path="${java.class.path}"/>
- </path>
-
<target name="clean">
<delete failonerror="false" dir="target"/>
<delete failonerror="false">
@@ -94,18 +77,9 @@
</solr-javac>
</target>
- <target name="compileExtras" depends="compile">
- <solr-javac destdir="target/extras/classes"
- classpathref="extras.classpath">
- <src path="src/extras/main/java" />
- </solr-javac>
- </target>
-
- <target name="build" depends="compile,compileExtras">
+ <target name="build" depends="compile">
<solr-jar destfile="target/${fullnamever}.jar" basedir="target/classes"
manifest="${common.dir}/${dest}/META-INF/MANIFEST.MF" />
- <solr-jar
destfile="target/apache-${ant.project.name}-extras-${version}.jar"
basedir="target/extras/classes"
- manifest="${common.dir}/${dest}/META-INF/MANIFEST.MF" />
</target>
<target name="compileTests" depends="compile">
@@ -115,16 +89,7 @@
</solr-javac>
</target>
- <target name="compileExtrasTests" depends="compileExtras">
- <solr-javac destdir="target/extras/test-classes"
- classpathref="test.classpath">
- <src path="src/extras/test/java" />
- </solr-javac>
- </target>
-
- <target name="test" depends="testCore,testExtras"/>
-
- <target name="testCore" depends="compileTests">
+ <target name="test" depends="compileTests">
<mkdir dir="${junit.output.dir}"/>
<junit printsummary="on"
@@ -147,29 +112,6 @@
<fail if="tests.failed">Tests failed!</fail>
</target>
- <target name="testExtras" depends="compileExtrasTests">
- <mkdir dir="${junit.output.dir}"/>
-
- <junit printsummary="on"
- haltonfailure="no"
- errorProperty="tests.failed"
- failureProperty="tests.failed"
- dir="src/extras/test/resources/"
- >
- <formatter type="brief" usefile="false" if="junit.details"/>
- <classpath refid="test.extras.classpath"/>
- <formatter type="xml"/>
- <batchtest fork="yes" todir="${junit.output.dir}" unless="testcase">
- <fileset dir="src/extras/test/java" includes="${junit.includes}"/>
- </batchtest>
- <batchtest fork="yes" todir="${junit.output.dir}" if="testcase">
- <fileset dir="src/extras/test/java" includes="**/${testcase}.java"/>
- </batchtest>
- </junit>
-
- <fail if="tests.failed">Tests failed!</fail>
- </target>
-
<target name="dist" depends="build">
<copy todir="../../build/web">
<fileset dir="src/main/webapp" includes="**" />
@@ -177,7 +119,6 @@
<mkdir dir="../../build/web/WEB-INF/lib"/>
<copy file="target/${fullnamever}.jar"
todir="${solr-path}/build/web/WEB-INF/lib"></copy>
<copy file="target/${fullnamever}.jar" todir="${solr-path}/dist"></copy>
- <copy file="target/apache-${ant.project.name}-extras-${version}.jar"
todir="${solr-path}/dist"></copy>
</target>
<target name="javadoc">
@@ -186,7 +127,6 @@
<path id="javadoc.classpath">
<path refid="common.classpath"/>
- <path refid="extras.classpath"/>
</path>
<invoke-javadoc
@@ -194,7 +134,6 @@
title="${Name} ${version} contrib-${fullnamever} API">
<sources>
<packageset dir="src/main/java"/>
- <packageset dir="src/extras/main/java"/>
</sources>
</invoke-javadoc>
</sequential>
Propchange:
lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/MailEntityProcessor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/MailEntityProcessor.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange:
lucene/solr/trunk/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestMailEntityProcessor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
lucene/solr/trunk/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestMailEntityProcessor.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
