Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LUCENE-4199, LUCENE-4202, LUCENE-4206: Remove noise by not-existing XML CDATA in task; cleanup build.xmls 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1360451 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Uwe Schindler 2012-07-11 22:34:39 +00:00
parent b3c82dac85
commit 53cfbcda0d
3 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lucene/build.xml
View File

@ -189,11 +189,8 @@
</target> </target>
<target name="-check-forbidden-test-apis"> <target name="-check-forbidden-test-apis">
<forbidden-apis> <forbidden-apis apiFile="${custom-tasks.dir}/forbiddenApis/tests.txt">
<classpath refid="junit-path"/> <classpath refid="junit-path"/>
<apiFileSet dir="${custom-tasks.dir}/forbiddenApis">
<include name="tests.txt" />
</apiFileSet>
<fileset dir="${basedir}/build" includes="**/classes/test/**/*.class,test-framework/**/*.class" /> <fileset dir="${basedir}/build" includes="**/classes/test/**/*.class,test-framework/**/*.class" />
</forbidden-apis> </forbidden-apis>
</target> </target>

7
lucene/tools/src/java/org/apache/lucene/validation/ForbiddenApisCheckTask.java
View File

@ -343,8 +343,11 @@ public class ForbiddenApisCheckTask extends Task {
throw new BuildException("Resource does not exist: " + r); throw new BuildException("Resource does not exist: " + r);
} }
if (r instanceof StringResource) { if (r instanceof StringResource) {
log("Reading inline API signatures...", Project.MSG_INFO); final String s = ((StringResource) r).getValue();
parseApiFile(new StringReader(((StringResource) r).getValue())); if (s != null && s.trim().length() > 0) {
log("Reading inline API signatures...", Project.MSG_INFO);
parseApiFile(new StringReader(s));
}
} else { } else {
log("Reading API signatures: " + r, Project.MSG_INFO); log("Reading API signatures: " + r, Project.MSG_INFO);
parseApiFile(new InputStreamReader(r.getInputStream(), "UTF-8")); parseApiFile(new InputStreamReader(r.getInputStream(), "UTF-8"));

5
solr/build.xml
View File

@ -210,11 +210,8 @@
</target> </target>
<target name="-check-forbidden-test-apis"> <target name="-check-forbidden-test-apis">
<forbidden-apis> <forbidden-apis apiFile="${custom-tasks.dir}/forbiddenApis/tests.txt">
<classpath refid="junit-path"/> <classpath refid="junit-path"/>
<apiFileSet dir="${custom-tasks.dir}/forbiddenApis">
<include name="tests.txt" />
</apiFileSet>
<fileset dir="${basedir}/build"> <fileset dir="${basedir}/build">
<include name="**/classes/test/**/*.class"/> <include name="**/classes/test/**/*.class"/>
<include name="solr-test-framework/**/*.class"/> <include name="solr-test-framework/**/*.class"/>