You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by gs...@apache.org on 2011/03/18 21:29:41 UTC
svn commit: r1083051 - in /lucene/dev/branches/branch_3x: ./ lucene/
lucene/contrib/benchmark/lib/ lucene/contrib/icu/lib/
lucene/src/test-framework/org/apache/lucene/validation/ solr/
Author: gsingers
Date: Fri Mar 18 20:29:40 2011
New Revision: 1083051
URL: http://svn.apache.org/viewvc?rev=1083051&view=rev
Log:
LUCENE-2952: backport
Added:
lucene/dev/branches/branch_3x/common-build.xml (with props)
lucene/dev/branches/branch_3x/lucene/contrib/benchmark/lib/commons-beanutils-LICENSE-ASL.txt (props changed)
- copied unchanged from r1083018, lucene/dev/branches/branch_3x/lucene/contrib/benchmark/lib/commons-beanutils-LICENSE.txt
lucene/dev/branches/branch_3x/lucene/contrib/benchmark/lib/commons-collections-LICENSE-ASL.txt (props changed)
- copied unchanged from r1083018, lucene/dev/branches/branch_3x/lucene/contrib/benchmark/lib/commons-collections-LICENSE.txt
lucene/dev/branches/branch_3x/lucene/contrib/benchmark/lib/commons-compress-LICENSE-ASL.txt (props changed)
- copied unchanged from r1083018, lucene/dev/branches/branch_3x/lucene/contrib/benchmark/lib/commons-compress-LICENSE.txt
lucene/dev/branches/branch_3x/lucene/contrib/benchmark/lib/commons-digester-LICENSE-ASL.txt (props changed)
- copied unchanged from r1083018, lucene/dev/branches/branch_3x/lucene/contrib/benchmark/lib/commons-digester-LICENSE.txt
lucene/dev/branches/branch_3x/lucene/contrib/benchmark/lib/commons-logging-LICENSE-ASL.txt (props changed)
- copied unchanged from r1083018, lucene/dev/branches/branch_3x/lucene/contrib/benchmark/lib/commons-logging-LICENSE.txt
lucene/dev/branches/branch_3x/lucene/contrib/benchmark/lib/xercesImpl-LICENSE-ASL.txt (props changed)
- copied unchanged from r1083018, lucene/dev/branches/branch_3x/lucene/contrib/benchmark/lib/xerces-LICENSE.txt
lucene/dev/branches/branch_3x/lucene/contrib/benchmark/lib/xercesImpl-NOTICE.txt (props changed)
- copied unchanged from r1083018, lucene/dev/branches/branch_3x/lucene/contrib/benchmark/lib/xerces-NOTICE.txt
lucene/dev/branches/branch_3x/lucene/contrib/icu/lib/icu4j-LICENSE-ASL.txt (props changed)
- copied unchanged from r1083018, lucene/dev/branches/branch_3x/lucene/contrib/icu/lib/ICU-LICENSE.txt
lucene/dev/branches/branch_3x/lucene/contrib/icu/lib/icu4j-NOTICE.txt (with props)
lucene/dev/branches/branch_3x/lucene/src/test-framework/org/apache/lucene/validation/
- copied from r1083010, lucene/dev/trunk/lucene/src/test-framework/org/apache/lucene/validation/
lucene/dev/branches/branch_3x/lucene/src/test-framework/org/apache/lucene/validation/DependencyChecker.java
- copied unchanged from r1083010, lucene/dev/trunk/lucene/src/test-framework/org/apache/lucene/validation/DependencyChecker.java
lucene/dev/branches/branch_3x/lucene/src/test-framework/org/apache/lucene/validation/LicenseType.java
- copied unchanged from r1083010, lucene/dev/trunk/lucene/src/test-framework/org/apache/lucene/validation/LicenseType.java
Removed:
lucene/dev/branches/branch_3x/lucene/contrib/benchmark/lib/commons-beanutils-LICENSE.txt
lucene/dev/branches/branch_3x/lucene/contrib/benchmark/lib/commons-collections-LICENSE.txt
lucene/dev/branches/branch_3x/lucene/contrib/benchmark/lib/commons-compress-LICENSE.txt
lucene/dev/branches/branch_3x/lucene/contrib/benchmark/lib/commons-digester-LICENSE.txt
lucene/dev/branches/branch_3x/lucene/contrib/benchmark/lib/commons-logging-LICENSE.txt
lucene/dev/branches/branch_3x/lucene/contrib/benchmark/lib/xerces-LICENSE.txt
lucene/dev/branches/branch_3x/lucene/contrib/benchmark/lib/xerces-NOTICE.txt
lucene/dev/branches/branch_3x/lucene/contrib/icu/lib/ICU-LICENSE.txt
Modified:
lucene/dev/branches/branch_3x/ (props changed)
lucene/dev/branches/branch_3x/build.xml
lucene/dev/branches/branch_3x/lucene/ (props changed)
lucene/dev/branches/branch_3x/lucene/common-build.xml
lucene/dev/branches/branch_3x/solr/ (props changed)
lucene/dev/branches/branch_3x/solr/common-build.xml
Modified: lucene/dev/branches/branch_3x/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/build.xml?rev=1083051&r1=1083050&r2=1083051&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/build.xml (original)
+++ lucene/dev/branches/branch_3x/build.xml Fri Mar 18 20:29:40 2011
@@ -29,9 +29,15 @@
</subant>
</sequential>
</target>
-
- <target name="compile" description="Compile Lucene and Solr">
+ <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" />
Added: lucene/dev/branches/branch_3x/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/common-build.xml?rev=1083051&view=auto
==============================================================================
--- lucene/dev/branches/branch_3x/common-build.xml (added)
+++ lucene/dev/branches/branch_3x/common-build.xml Fri Mar 18 20:29:40 2011
@@ -0,0 +1,32 @@
+<!--
+ 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="all-common" default="validate" basedir="."
+ xmlns:artifact="antlib:org.apache.maven.artifact.ant">
+
+ <dirname file="${ant.file.all-common}" property="all.common.dir"/>
+ <path id="validation.runtime.classpath">
+ <pathelement location="${all.common.dir}/lucene/build/classes/test-framework"/>
+ </path>
+ <target name="compile-test-framework" description="Compile the Test Framework and Validation tools">
+ <sequential>
+ <subant target="compile-test-framework" inheritall="false" failonerror="true">
+ <fileset dir="${all.common.dir}/lucene" includes="build.xml" />
+ </subant>
+ </sequential>
+ </target>
+</project>
\ No newline at end of file
Modified: lucene/dev/branches/branch_3x/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/common-build.xml?rev=1083051&r1=1083050&r2=1083051&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/common-build.xml (original)
+++ lucene/dev/branches/branch_3x/lucene/common-build.xml Fri Mar 18 20:29:40 2011
@@ -24,7 +24,7 @@
</description>
<dirname file="${ant.file.common}" property="common.dir"/>
-
+ <import file="${common.dir}/../common-build.xml"/>
<property name="dev-tools.dir" value="${common.dir}/../dev-tools"/>
<property name="prettify.dir" value="${dev-tools.dir}/prettify"/>
<property name="maven.build.dir" value="${common.dir}/build/maven"/>
@@ -298,7 +298,7 @@
</copy>
</target>
- <target name="compile" depends="compile-core">
+ <target name="compile" depends="compile-core, validate-lucene">
<!-- convenience target to compile core -->
</target>
@@ -784,4 +784,59 @@
</macrodef>
+ <!-- VALIDATION work -->
+ <!--
+ >find . -name lib
+./lucene/backwards/lib
+./lucene/contrib/ant/lib
+./lucene/contrib/benchmark/lib
+./lucene/contrib/db/bdb/lib
+./lucene/contrib/db/bdb-je/lib
+./lucene/contrib/icu/lib
+./lucene/contrib/lucli/lib
+./lucene/contrib/queries/lib
+./lucene/lib
+
+
+ -->
+ <target name="check-legal-lucene" depends="compile-test-framework">
+ <java classname="org.apache.lucene.validation.DependencyChecker" failonerror="true" fork="true">
+ <classpath>
+ <path refid="validation.runtime.classpath" />
+ </classpath>
+ <!-- TODO: it might be better to just automatically find all directories that contain jar files, but that could take a
+ long time. This should be faster, but we could miss a directory
+ -->
+ <!-- Lucene -->
+ <arg value="-c" />
+ <arg value="${basedir}/lib" />
+ <arg value="-c" />
+ <arg value="${basedir}/contrib/ant/lib" />
+ <!-- BDB libs are downloaded, don't check them -->
+ <!--<arg value="-c" />
+ <arg value="${toplevel.dir}/lucene/contrib/db/bdb/lib" />
+ <arg value="-c" />
+ <arg value="${toplevel.dir}/lucene/contrib/db/bdb-je/lib" />-->
+ <arg value="-c" />
+ <arg value="${basedir}/contrib/benchmark/lib" />
+ <arg value="-c" />
+ <arg value="${basedir}/contrib/icu/lib" />
+
+ <arg value="-c" />
+ <arg value="${basedir}/contrib/lucli/lib" />
+ <arg value="-c" />
+ <arg value="${basedir}/contrib/queries/lib" />
+ </java>
+ </target>
+
+ <target name="check-legal" depends="check-legal-lucene"/>
+
+ <target name="validate-lucene" depends="check-legal-lucene" unless="validated-lucene"/>
+
+
+ <!-- Generic placeholder target for if we add other validation tasks -->
+ <target name="validate" depends="validate-lucene"/>
+
+
+
</project>
Added: lucene/dev/branches/branch_3x/lucene/contrib/icu/lib/icu4j-NOTICE.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/icu/lib/icu4j-NOTICE.txt?rev=1083051&view=auto
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/icu/lib/icu4j-NOTICE.txt (added)
+++ lucene/dev/branches/branch_3x/lucene/contrib/icu/lib/icu4j-NOTICE.txt Fri Mar 18 20:29:40 2011
@@ -0,0 +1,3 @@
+ICU4J, (under contrib/icu) is licensed under an MIT styles license
+(contrib/icu/lib/ICU-LICENSE.txt) and Copyright (c) 1995-2008
+International Business Machines Corporation and others
\ No newline at end of file
Modified: lucene/dev/branches/branch_3x/solr/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/common-build.xml?rev=1083051&r1=1083050&r2=1083051&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/common-build.xml (original)
+++ lucene/dev/branches/branch_3x/solr/common-build.xml Fri Mar 18 20:29:40 2011
@@ -22,7 +22,8 @@
</description>
<dirname file="${ant.file.common-solr}" property="common-solr.dir"/>
-
+ <import file="${common-solr.dir}/../common-build.xml"/>
+
<!-- change this together with the default and test's solrconfig.xml after starting a new development branch: -->
<property name="tests.luceneMatchVersion" value="3.1"/>
@@ -573,5 +574,40 @@
##########################################################################
</fail>
</target>
+ <!-- Validation -->
+ <target name="validate" depends="validate-solr"/>
+ <target name="validate-solr" depends="check-legal-solr" unless="validated-solr"/>
+
+ <target name="check-legal-solr" depends="compile-test-framework">
+ <java classname="org.apache.lucene.validation.DependencyChecker" failonerror="true" fork="true">
+ <classpath>
+ <path refid="validation.runtime.classpath" />
+ </classpath>
+ <!-- TODO: it might be better to just automatically find all directories that contain jar files, but that could take a
+ long time. This should be faster, but we could miss a directory
+ -->
+ <!-- Solr -->
+ <arg value="-c" />
+ <arg value="${basedir}/lib" />
+ <arg value="-c" />
+ <arg value="${basedir}/contrib/analysis-extras/lib" />
+ <arg value="-c" />
+ <arg value="${basedir}/contrib/clustering/lib" />
+ <arg value="-c" />
+ <arg value="${basedir}/contrib/dataimporthandler/lib" />
+ <arg value="-c" />
+ <arg value="${basedir}/contrib/extraction/lib" />
+ <arg value="-c" />
+ <arg value="${basedir}/contrib/uima/lib" />
+ <arg value="-c" />
+ <arg value="${basedir}/example/example-DIH/solr/db/lib" />
+ <arg value="-c" />
+ <arg value="${basedir}/example/example-DIH/solr/mail/lib" />
+ <arg value="-c" />
+ <arg value="${basedir}/example/example/lib" />
+ <arg value="-c" />
+ <arg value="${basedir}/src/test-files/solr/lib" />
+ </java>
+ </target>
</project>