You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2011/10/03 00:38:42 UTC
svn commit: r1178266 [3/3] - in /incubator/lcf/integration/solr-3.x/trunk:
./ dev-tools/ lucene/ mcf/ mcf/src/java/org/apache/solr/mcf/
Added: incubator/lcf/integration/solr-3.x/trunk/NOTICE.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/integration/solr-3.x/trunk/NOTICE.txt?rev=1178266&view=auto
==============================================================================
--- incubator/lcf/integration/solr-3.x/trunk/NOTICE.txt (added)
+++ incubator/lcf/integration/solr-3.x/trunk/NOTICE.txt Sun Oct 2 22:38:41 2011
@@ -0,0 +1,5 @@
+Apache Solr-3.x ManifoldCF Plugin
+Copyright 2010-2011 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
Propchange: incubator/lcf/integration/solr-3.x/trunk/NOTICE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/lcf/integration/solr-3.x/trunk/NOTICE.txt
------------------------------------------------------------------------------
svn:keywords = Id
Modified: incubator/lcf/integration/solr-3.x/trunk/README.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/integration/solr-3.x/trunk/README.txt?rev=1178266&r1=1178265&r2=1178266&view=diff
==============================================================================
--- incubator/lcf/integration/solr-3.x/trunk/README.txt (original)
+++ incubator/lcf/integration/solr-3.x/trunk/README.txt Sun Oct 2 22:38:41 2011
@@ -1,13 +1,80 @@
-Apache Lucene/Solr
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
-lucene/ is a search engine library
-solr/ is a search engine server that uses lucene
-To compile the sources run 'ant compile'
-To run all the tests run 'ant test'
-To setup your ide run 'ant idea' or 'ant eclipse'
-For Maven info, see dev-tools/maven/README.maven.
-
-For more information on how to contribute see:
-http://wiki.apache.org/lucene-java/HowToContribute
-http://wiki.apache.org/solr/HowToContribute
+Instructions for Building Apache Solr 3.x ManifoldCF Plugin from Source
+-------------------------------------------------------------------
+
+1. Download the Java SE 5 JDK (Java Development Kit), or greater, from http://java.sun.com.
+ You will need the JDK installed, and the %JAVA_HOME%\bin directory included
+ on your command path. To test this, issue a "java -version" command from your
+ shell and verify that the Java version is 1.5 or greater.
+
+2. Download the Apache Ant binary distribution (1.7.0 or greater) from http://ant.apache.org.
+ You will need Ant installed and the %ANT_HOME%\bin directory included on your
+ command path. To test this, issue a "ant -version" command from your
+ shell and verify that Ant is available.
+
+3. In a shell, change to the root directory of the source (where you find the outermost
+ build.xml file), and type "ant" for directions.
+
+
+Some Files Included In Apache Solr 3.x ManifoldCF Plugin Distributions
+------------------------------------------------------------------
+
+dist/apache-solr-mcf*.jar
+ The Apache Solr 3.x ManifoldCF plugin jar.
+
+Licensing
+---------
+
+Apache Solr-3.x ManifoldCF Plugin is licensed under the
+Apache License 2.0. See the files called LICENSE.txt and NOTICE.txt
+for more information.
+
+Cryptographic Software Notice
+-----------------------------
+
+This distribution may include software that has been designed for use
+with cryptographic software. The country in which you currently reside
+may have restrictions on the import, possession, use, and/or re-export
+to another country, of encryption software. BEFORE using any encryption
+software, please check your country's laws, regulations and policies
+concerning the import, possession, or use, and re-export of encryption
+software, to see if this is permitted. See <http://www.wassenaar.org/>
+for more information.
+
+The U.S. Government Department of Commerce, Bureau of Industry and
+Security (BIS), has classified this software as Export Commodity
+Control Number (ECCN) 5D002.C.1, which includes information security
+software using or performing cryptographic functions with asymmetric
+algorithms. The form and manner of this Apache Software Foundation
+distribution makes it eligible for export under the License Exception
+ENC Technology Software Unrestricted (TSU) exception (see the BIS
+Export Administration Regulations, Section 740.13) for both object
+code and source code.
+
+The following provides more details on the included software that
+may be subject to export controls on cryptographic software:
+
+ The ManifoldCF plugin for Apache Solr 3.x does not include any
+ implementation or usage of cryptographic software at this time.
+
+Contact
+-------
+
+ o For general information visit the main project site at
+ http://incubator.apache.org/connectors
+
Modified: incubator/lcf/integration/solr-3.x/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/integration/solr-3.x/trunk/build.xml?rev=1178266&r1=1178265&r2=1178266&view=diff
==============================================================================
--- incubator/lcf/integration/solr-3.x/trunk/build.xml (original)
+++ incubator/lcf/integration/solr-3.x/trunk/build.xml Sun Oct 2 22:38:41 2011
@@ -1,112 +1,120 @@
-<?xml version="1.0"?>
-
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache Licens2e, Version 2.0
- the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<project name="lucene-solr" default="test" basedir=".">
- <target name="test" description="Test both Lucene and Solr">
- <sequential>
- <subant target="test" inheritall="false" failonerror="true">
- <fileset dir="lucene" includes="build.xml" />
- </subant>
-
- <subant target="test" inheritall="false" failonerror="true">
- <fileset dir="solr" includes="build.xml" />
- </subant>
- </sequential>
- </target>
- <target name="validate" description="Validate dependencies, licenses, etc.">
- <sequential><subant target="validate" inheritall="false" failonerror="true">
- <fileset dir="lucene" includes="build.xml" />
- <fileset dir="solr" includes="build.xml" />
- </subant></sequential>
- </target>
- <target name="compile" depends="validate" description="Compile Lucene and Solr">
- <sequential>
-
- <subant target="compile" inheritall="false" failonerror="true">
- <!--<fileset dir="lucene" includes="build.xml" /> -->
- <fileset dir="solr" includes="build.xml" />
- </subant>
- </sequential>
- </target>
-
- <property name="version" value="3.5-SNAPSHOT"/>
- <target name="get-maven-poms"
- description="Copy Maven POMs from dev-tools/maven/ to their target locations">
- <copy todir="." overwrite="true">
- <fileset dir="${basedir}/dev-tools/maven"/>
- <filterset begintoken="@" endtoken="@">
- <filter token="version" value="${version}"/>
- </filterset>
- <globmapper from="*.template" to="*"/>
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<project name="mcf-solr-3.x-plugin" default="help">
+
+ <target name="clean">
+ <delete dir="solr"/>
+ <delete dir="dist"/>
+ </target>
+
+ <target name="download-solr">
+ <mkdir dir="solr" />
+ <exec dir="solr" executable="svn" failifexecutionfails="true">
+ <arg value="checkout" />
+ <arg value="http://svn.apache.org/repos/asf/lucene/dev/branches/branch_3x" />
+ <arg value="." />
+ </exec>
+ </target>
+
+ <target name="copy-sources" depends="download-solr">
+ <mkdir dir="solr/solr/contrib/mcf"/>
+ <copy todir="solr/solr/contrib/mcf">
+ <fileset dir="mcf">
+ <include name="**/*"/>
+ </fileset>
</copy>
</target>
-
- <target name="generate-maven-artifacts" description="Generate Maven Artifacts for Lucene and Solr">
- <property name="maven.dist.dir" location="dist/maven" />
- <mkdir dir="${maven.dist.dir}" />
-
- <sequential>
- <subant target="generate-maven-artifacts" inheritall="false" failonerror="true">
- <property name="maven.dist.dir" location="${maven.dist.dir}" />
- <fileset dir="lucene" includes="build.xml" />
- <fileset dir="solr" includes="build.xml" />
- </subant>
- </sequential>
- </target>
-
- <target name="eclipse" description="Setup Eclipse configuration">
- <copy file="dev-tools/eclipse/dot.project" tofile=".project" overwrite="false"/>
- <copy file="dev-tools/eclipse/dot.classpath" tofile=".classpath" overwrite="true"/>
- <mkdir dir=".settings"/>
- <copy file="dev-tools/eclipse/resources.prefs"
- tofile=".settings/org.eclipse.core.resources.prefs" overwrite="true"/>
- <echo>
- SUCCESS: You must right-click your project and choose Refresh
- </echo>
+
+ <target name="compile" depends="copy-sources">
+ <ant dir="solr/solr/contrib/mcf" target="default"/>
+ </target>
+
+ <target name="test" depends="copy-sources">
+ <ant dir="solr/solr/contrib/mcf" target="test"/>
+ </target>
+
+ <target name="deliver" depends="compile">
+ <mkdir dir="dist"/>
+ <copy todir="dist">
+ <fileset dir="solr/solr/build/contrib/solr-mcf">
+ <include name="*.jar"/>
+ </fileset>
+ </copy>
</target>
- <target name="idea" description="Setup IntelliJ IDEA configuration">
- <copy todir=".">
- <fileset dir="dev-tools/idea"/>
- </copy>
- <echo>
- To complete IntelliJ IDEA setup, you must manually configure
- Project Structure | Project | Project SDK.
+ <target name="build" depends="deliver"/>
+
+ <target name="set-version">
+ <property name="release-version" value="0.1-incubating-dev"/>
+ </target>
+
+ <target name="create-source-zip" depends="set-version">
+ <zip destfile="apache-solr-3.x-manifoldcf-plugin-${release-version}-src.zip" update="false">
+ <zipfileset dir="." prefix="apache-solr-3.x-manifoldcf-plugin-${release-version}">
+ <exclude name="/solr/"/>
+ <exclude name="/dist/"/>
+ <exclude name="/apache-solr-3.x-manifoldcf-plugin-*"/>
+ </zipfileset>
+ </zip>
+ </target>
+
+ <target name="create-source-tar" depends="set-version">
+ <tar destfile="apache-solr-3.x-manifoldcf-plugin-${release-version}-src.tar.gz" compression="gzip" longfile="gnu">
+ <tarfileset dir="." prefix="apache-solr-3.x-manifoldcf-plugin-${release-version}">
+ <exclude name="/solr/"/>
+ <exclude name="/dist/"/>
+ <exclude name="/apache-solr-3.x-manifoldcf-plugin-*"/>
+ </tarfileset>
+ </tar>
+ </target>
+
+ <target name="help">
+ <echo level="info">
+Apache Solr 3.x ManifoldCF Plugin build file. Use this file to
+build the plugin distributables and run the tests.
+
+Useful targets are:
+
+clean - Clean the build area
+build - Build jar under the 'dist' directory
+test - Run the tests
+
+Prerequisites: This build requires Subversion (svn) to be
+installed, and svn internet access to the Apache repository.
+It also requires Java jdk1.6.0 or above.
</echo>
</target>
- <target name="clean-idea"
- description="Removes all IntelliJ IDEA configuration files">
- <delete dir=".idea" failonerror="true"/>
- <delete failonerror="true">
- <fileset dir="." includes="*.iml,*.ipr,*.iws"/>
- <fileset dir="solr" includes="**/*.iml"/>
- <fileset dir="lucene" includes="**/*.iml"/>
- </delete>
- </target>
-
- <target name="clean" description="Clean Lucene and Solr">
- <sequential>
- <subant target="clean" inheritall="false" failonerror="true">
- <fileset dir="lucene" includes="build.xml" />
- <fileset dir="solr" includes="build.xml" />
- </subant>
- </sequential>
+
+ <target name="-taskdef">
+ <typedef resource="org/apache/rat/anttasks/antlib.xml" uri="antlib:rat.anttasks">
+ <classpath>
+ <fileset dir="." includes="rat*.jar"/>
+ </classpath>
+ </typedef>
+ </target>
+ <target name="rat-sources" depends="-taskdef"
+ description="runs the tasks over src/java excluding the license directory">
+ <rat:report xmlns:rat="antlib:org.apache.rat.anttasks">
+ <fileset dir="src/">
+ <exclude name="solr/"/>
+ <exclude name="dist/"/>
+ </fileset>
+ </rat:report>
</target>
</project>
Modified: incubator/lcf/integration/solr-3.x/trunk/mcf/src/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java
URL: http://svn.apache.org/viewvc/incubator/lcf/integration/solr-3.x/trunk/mcf/src/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java?rev=1178266&r1=1177807&r2=1178266&view=diff
==============================================================================
--- incubator/lcf/integration/solr-3.x/trunk/mcf/src/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java (original)
+++ incubator/lcf/integration/solr-3.x/trunk/mcf/src/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java Sun Oct 2 22:38:41 2011
@@ -78,7 +78,6 @@ public class ManifoldCFQParserPlugin ext
super();
}
- @Override
public void init(NamedList args)
{
authorityBaseURL = (String)args.get("AuthorityServiceBaseURL");