Author: kwright
Date: Tue Jan 1 20:06:15 2013
New Revision: 1427547
URL: http://svn.apache.org/viewvc?rev=1427547&view=rev
Log:
Fix for CONNECTORS-594. Still need Japanese localizations for newly added
strings.
Modified:
manifoldcf/trunk/ (props changed)
manifoldcf/trunk/CHANGES.txt
manifoldcf/trunk/build.xml
manifoldcf/trunk/connectors/solr/build.xml
manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java
manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConfig.java
manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java
manifoldcf/trunk/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_en_US.properties
manifoldcf/trunk/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_ja_JP.properties
manifoldcf/trunk/connectors/solr/pom.xml
manifoldcf/trunk/pom.xml
Propchange: manifoldcf/trunk/
------------------------------------------------------------------------------
Merged /manifoldcf/branches/CONNECTORS-594:r1426180-1427546
Modified: manifoldcf/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1427547&r1=1427546&r2=1427547&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Tue Jan 1 20:06:15 2013
@@ -3,6 +3,10 @@ $Id$
======================= 1.1-dev =====================
+CONNECTORS-594: Port Solr connector to use SolrJ, and add
+capability to work with SolrCloud installations.
+(Minoru Osuka, Ryan McKinley, Karl Wright)
+
CONNECTORS-593: Skip hidden files in JCIFS connector.
(Shigeki Kobayashi, Karl Wright)
Modified: manifoldcf/trunk/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/build.xml?rev=1427547&r1=1427546&r2=1427547&view=diff
==============================================================================
--- manifoldcf/trunk/build.xml (original)
+++ manifoldcf/trunk/build.xml Tue Jan 1 20:06:15 2013
@@ -2832,6 +2832,13 @@ Use Apache Forrest version forrest-0.9-d
<param name="artifact-name" value="httpclient"/>
<param name="artifact-type" value="jar"/>
</antcall -->
+ <antcall target="download-via-maven">
+ <param name="target" value="lib"/>
+ <param name="project-path" value="org/apache/httpcomponents"/>
+ <param name="artifact-version" value="4.2.1"/>
+ <param name="artifact-name" value="httpmime"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
</target>
<target name="download-json">
@@ -3052,7 +3059,7 @@ Use Apache Forrest version forrest-0.9-d
</antcall>
<antcall target="download-via-maven"><param name="target" value="lib"/>
<param name="project-path" value="commons-io"/>
- <param name="artifact-version" value="1.3.2"/>
+ <param name="artifact-version" value="2.1"/>
<param name="artifact-name" value="commons-io"/>
<param name="artifact-type" value="jar"/>
</antcall>
@@ -3072,7 +3079,7 @@ Use Apache Forrest version forrest-0.9-d
<target name="download-slf4j">
<mkdir dir="lib"/>
- <property name="slf4j-version" value="1.6.4"/>
+ <property name="slf4j-version" value="1.6.6"/>
<property name="slf4j-package" value="org/slf4j"/>
<antcall target="download-via-maven"><param name="project-path"
value="${slf4j-package}"/><param name="artifact-version"
value="${slf4j-version}"/><param name="target" value="lib"/>
<param name="artifact-name" value="slf4j-api"/>
@@ -3082,6 +3089,10 @@ Use Apache Forrest version forrest-0.9-d
<param name="artifact-name" value="slf4j-simple"/>
<param name="artifact-type" value="jar"/>
</antcall>
+ <antcall target="download-via-maven"><param name="project-path"
value="${slf4j-package}"/><param name="artifact-version"
value="${slf4j-version}"/><param name="target" value="lib"/>
+ <param name="artifact-name" value="jcl-over-slf4j"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
</target>
<target name="download-jetty">
@@ -3481,7 +3492,7 @@ Use Apache Forrest version forrest-0.9-d
<mkdir dir="lib"/>
<antcall target="download-via-maven"><param name="target" value="lib"/>
<param name="project-path" value="org/codehaus/woodstox"/>
- <param name="artifact-version" value="3.2.3"/>
+ <param name="artifact-version" value="3.2.9"/>
<param name="artifact-name" value="wstx-asl"/>
<param name="artifact-type" value="jar"/>
</antcall>
@@ -3547,7 +3558,25 @@ Use Apache Forrest version forrest-0.9-d
</copy>
</target>
- <target name="make-core-deps"
depends="download-httpcomponents,download-json,download-hsqldb,download-xerces,download-commons,download-solr-plugins,download-sharepoint-plugins,download-jstl,download-xmlgraphics-commons,download-wstx-asl,download-xmlsec,download-xml-apis,download-wss4j,download-velocity,download-streambuffer,download-stax,download-servlet-api,download-xml-resolver,download-osgi,download-opensaml,download-mimepull,download-mail,download-log4j,download-junit,download-jaxws,download-glassfish,download-jaxb,download-tomcat,download-h2,download-h2-support,download-geronimo-specs,download-fop,download-derby,download-postgresql,download-axis,download-saaj,download-wsdl4j,download-castor,download-jetty,download-slf4j,download-xalan,download-activation,download-avalon-framework,download-poi,download-chemistry,download-ecj">
+ <target name="download-solrj">
+ <mkdir dir="lib"/>
+ <antcall target="download-via-maven">
+ <param name="target" value="lib"/>
+ <param name="project-path" value="org/apache/solr"/>
+ <param name="artifact-version" value="4.0.0"/>
+ <param name="artifact-name" value="solr-solrj"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven">
+ <param name="target" value="lib"/>
+ <param name="project-path" value="org/apache/zookeeper"/>
+ <param name="artifact-version" value="3.3.6"/>
+ <param name="artifact-name" value="zookeeper"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ </target>
+
+ <target name="make-core-deps"
depends="download-solrj,download-httpcomponents,download-json,download-hsqldb,download-xerces,download-commons,download-solr-plugins,download-sharepoint-plugins,download-jstl,download-xmlgraphics-commons,download-wstx-asl,download-xmlsec,download-xml-apis,download-wss4j,download-velocity,download-streambuffer,download-stax,download-servlet-api,download-xml-resolver,download-osgi,download-opensaml,download-mimepull,download-mail,download-log4j,download-junit,download-jaxws,download-glassfish,download-jaxb,download-tomcat,download-h2,download-h2-support,download-geronimo-specs,download-fop,download-derby,download-postgresql,download-axis,download-saaj,download-wsdl4j,download-castor,download-jetty,download-slf4j,download-xalan,download-activation,download-avalon-framework,download-poi,download-chemistry,download-ecj">
<copy todir="lib">
<fileset dir="lib-license" includes="*.txt"/>
</copy>
Modified: manifoldcf/trunk/connectors/solr/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/solr/build.xml?rev=1427547&r1=1427546&r2=1427547&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/solr/build.xml (original)
+++ manifoldcf/trunk/connectors/solr/build.xml Tue Jan 1 20:06:15 2013
@@ -19,6 +19,30 @@
<import file="../connector-build.xml"/>
+ <path id="connector-classpath">
+ <path refid="mcf-connector-build.connector-classpath"/>
+ <fileset dir="../../lib">
+ <include name="solr-solrj*.jar"/>
+ <include name="httpmime*.jar"/>
+ <include name="zookeeper*.jar"/>
+ <include name="wstx-asl*.jar"/>
+ <include name="jcl-over-slf4j*.jar"/>
+ </fileset>
+ </path>
+
+ <target name="lib" depends="mcf-connector-build.lib,precompile-check"
if="canBuild">
+ <mkdir dir="dist/lib"/>
+ <copy todir="dist/lib">
+ <fileset dir="../../lib">
+ <include name="solr-solrj*.jar"/>
+ <include name="httpmime*.jar"/>
+ <include name="zookeeper*.jar"/>
+ <include name="wstx-asl*.jar"/>
+ <include name="jcl-over-slf4j*.jar"/>
+ </fileset>
+ </copy>
+ </target>
+
<target name="integration">
<mkdir dir="dist/integration/solr-3.x"/>
<copy todir="dist/integration/solr-3.x">
