diff --git a/build-clover.xml b/build-clover.xml deleted file mode 100644 index 119b4bd8692..00000000000 --- a/build-clover.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - Clover not enabled! - - - - - - - - - - - - - - - - You can find the merged Lucene/Solr Clover report in '${clover.report.dir}'. - - - diff --git a/build.xml b/build.xml index 880b5458719..5bcd84ee6b5 100644 --- a/build.xml +++ b/build.xml @@ -75,12 +75,6 @@ The following files contain @author tags or nocommits:${line.separator}${validate.patternsFound} - - - - - - @@ -254,17 +248,21 @@ + + + + + + - + - - + @@ -288,31 +286,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/extra-targets.xml b/extra-targets.xml new file mode 100644 index 00000000000..1a78b581884 --- /dev/null +++ b/extra-targets.xml @@ -0,0 +1,114 @@ + + + + + + + This file is designed for importing into a main build file, and not intended + for standalone use. + + + + + + + Clover not enabled! + + + + + + + + + + + + + + + + You can find the merged Lucene/Solr Clover report in '${clover.report.dir}'. + + + + + + + + + diff --git a/lucene/build.xml b/lucene/build.xml index d6ed8074af0..8d9c2986ca9 100644 --- a/lucene/build.xml +++ b/lucene/build.xml @@ -198,16 +198,6 @@ - - - - - - - - - - diff --git a/lucene/common-build.xml b/lucene/common-build.xml index bb9b887a820..83a018ca95c 100644 --- a/lucene/common-build.xml +++ b/lucene/common-build.xml @@ -508,6 +508,9 @@ + + + - - - - - + - + diff --git a/lucene/tools/src/java/lucene-solr.antlib.xml b/lucene/tools/src/java/lucene-solr.antlib.xml index f3ae1c23f3d..f18d8a3287b 100644 --- a/lucene/tools/src/java/lucene-solr.antlib.xml +++ b/lucene/tools/src/java/lucene-solr.antlib.xml @@ -21,7 +21,4 @@ - diff --git a/lucene/tools/src/java/org/apache/lucene/validation/SVNEolCheckTask.java b/lucene/tools/src/java/org/apache/lucene/validation/SVNEolCheckTask.java deleted file mode 100644 index 83a6e685ad6..00000000000 --- a/lucene/tools/src/java/org/apache/lucene/validation/SVNEolCheckTask.java +++ /dev/null @@ -1,126 +0,0 @@ -package org.apache.lucene.validation; - -/* - * 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. - */ - -import java.io.BufferedReader; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.nio.charset.Charset; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.Task; -import org.apache.tools.ant.types.Resource; -import org.apache.tools.ant.types.ResourceCollection; -import org.apache.tools.ant.types.resources.FileResource; -import org.apache.tools.ant.types.resources.Resources; - -/** - * Checks all files to ensure they have svn:eol-style, or - * have a binary svn:mime-type. - *

- * TODO: check that this value is actually correct, not just present. - *

- * WARNING: slow! - */ -public class SVNEolCheckTask extends Task { - - private final Resources files = new Resources(); - - private String svnExecutable; - - /** Set of files to check */ - public void add(ResourceCollection rc) { - files.add(rc); - } - - /** svn.exe executable */ - public void setSvnExecutable(String svnExecutable) { - this.svnExecutable = svnExecutable; - } - - @Override - public void execute() throws BuildException { - if (svnExecutable == null) { - throw new BuildException("svnExecutable parameter must be set!"); - } - boolean success = true; - files.setProject(getProject()); - Iterator iter = (Iterator) files.iterator(); - while (iter.hasNext()) { - Resource r = iter.next(); - if (!(r instanceof FileResource)) { - throw new BuildException("Only filesystem resource are supported: " + r.getName() - + ", was: " + r.getClass().getName()); - } - - File f = ((FileResource) r).getFile(); - List cmd = new ArrayList(); - cmd.add(svnExecutable); - cmd.add("pget"); - cmd.add("svn:eol-style"); - cmd.add(f.getAbsolutePath()); - String eolStyle = exec(cmd); - if (eolStyle.isEmpty()) { - cmd.clear(); - cmd.add(svnExecutable); - cmd.add("pget"); - cmd.add("svn:mime-type"); - cmd.add(f.getAbsolutePath()); - String binProp = exec(cmd); - if (!binProp.startsWith("application/") && !binProp.startsWith("image/")) { - success = false; - log(r.getName() + " missing svn:eol-style (or binary svn:mime-type)."); - } - } - } - if (!success) { - throw new BuildException("Some svn properties are missing"); - } - } - - private String exec(List cmd) throws BuildException { - ProcessBuilder pb = new ProcessBuilder(cmd); - pb.redirectErrorStream(true); - BufferedReader r = null; - StringBuilder sb = new StringBuilder(); - try { - Process p = pb.start(); - InputStream is = p.getInputStream(); - r = new BufferedReader(new InputStreamReader(is, Charset.defaultCharset())); - int ch; - while ((ch = r.read()) > 0) { - sb.append((char)ch); - } - p.waitFor(); - return sb.toString(); - } catch (Exception e) { - throw new BuildException(e); - } finally { - if (r != null) { - try { - r.close(); - } catch (IOException e) {} - } - } - } -} diff --git a/solr/build.xml b/solr/build.xml index 5764f7b90eb..80b12b2c58c 100644 --- a/solr/build.xml +++ b/solr/build.xml @@ -638,12 +638,6 @@ - - - - - - diff --git a/solr/webapp/build.xml b/solr/webapp/build.xml index cf32a9e5bfd..8195438721d 100644 --- a/solr/webapp/build.xml +++ b/solr/webapp/build.xml @@ -40,10 +40,6 @@ - - -