Return-Path: X-Original-To: apmail-incubator-rat-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-rat-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 85EC9953F for ; Tue, 8 Nov 2011 05:11:40 +0000 (UTC) Received: (qmail 68489 invoked by uid 500); 8 Nov 2011 05:11:39 -0000 Delivered-To: apmail-incubator-rat-commits-archive@incubator.apache.org Received: (qmail 68463 invoked by uid 500); 8 Nov 2011 05:11:37 -0000 Mailing-List: contact rat-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: rat-dev@incubator.apache.org Delivered-To: mailing list rat-commits@incubator.apache.org Received: (qmail 68455 invoked by uid 99); 8 Nov 2011 05:11:36 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 Nov 2011 05:11:36 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 Nov 2011 05:11:33 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 9DC082388A67; Tue, 8 Nov 2011 05:11:13 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1199109 - in /incubator/rat/main/trunk: apache-rat-core/src/main/java/org/apache/rat/analysis/license/ apache-rat-plugin/src/site/apt/examples/ apache-rat-plugin/src/test/invoker/ apache-rat-plugin/src/test/invoker/it1/ Date: Tue, 08 Nov 2011 05:11:13 -0000 To: rat-commits@incubator.apache.org From: bodewig@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111108051113.9DC082388A67@eris.apache.org> Author: bodewig Date: Tue Nov 8 05:11:12 2011 New Revision: 1199109 URL: http://svn.apache.org/viewvc?rev=1199109&view=rev Log: native line ends Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/license/SimplePatternBasedLicense.java (contents, props changed) incubator/rat/main/trunk/apache-rat-plugin/src/site/apt/examples/custom-license.apt.vm (contents, props changed) incubator/rat/main/trunk/apache-rat-plugin/src/test/invoker/it1/invoker.properties (contents, props changed) incubator/rat/main/trunk/apache-rat-plugin/src/test/invoker/it1/pom.xml (contents, props changed) incubator/rat/main/trunk/apache-rat-plugin/src/test/invoker/it1/src.apt (contents, props changed) incubator/rat/main/trunk/apache-rat-plugin/src/test/invoker/it1/verify.bsh (contents, props changed) incubator/rat/main/trunk/apache-rat-plugin/src/test/invoker/settings.xml (contents, props changed) Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/license/SimplePatternBasedLicense.java URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/license/SimplePatternBasedLicense.java?rev=1199109&r1=1199108&r2=1199109&view=diff ============================================================================== --- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/license/SimplePatternBasedLicense.java (original) +++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/license/SimplePatternBasedLicense.java Tue Nov 8 05:11:12 2011 @@ -1,122 +1,122 @@ -/* - * 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. * - */ -package org.apache.rat.analysis.license; - -import org.apache.rat.analysis.IHeaderMatcher; -import org.apache.rat.analysis.RatHeaderAnalysisException; -import org.apache.rat.api.Document; -import org.apache.rat.api.MetaData; -import org.apache.rat.api.MetaData.Datum; - - -/** - * @since RAT 0.8 - */ -public class SimplePatternBasedLicense implements IHeaderMatcher { - private String licenseFamilyCategory; - private String licenseFamilyName; - private String notes; - private String[] patterns; - - public SimplePatternBasedLicense() { - } - - protected SimplePatternBasedLicense(Datum pLicenseFamilyCategory, Datum pLicenseFamilyName, - String pNotes, String[] pPatterns) { - if (!MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY.equals(pLicenseFamilyCategory.getName())) { - throw new IllegalStateException("Expected " + MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY - + ", got " + pLicenseFamilyCategory.getName()); - } - setLicenseFamilyCategory(pLicenseFamilyCategory.getValue()); - if (!MetaData.RAT_URL_LICENSE_FAMILY_NAME.equals(pLicenseFamilyName.getName())) { - throw new IllegalStateException("Expected " + MetaData.RAT_URL_LICENSE_FAMILY_NAME - + ", got " + pLicenseFamilyName.getName()); - } - setLicenseFamilyName(pLicenseFamilyName.getValue()); - setNotes(pNotes); - setPatterns(pPatterns); - } - - public String[] getPatterns() { - return patterns; - } - - public void setPatterns(String[] pPatterns) { - patterns = pPatterns; - } - - public String getLicenseFamilyCategory() { - return licenseFamilyCategory; - } - - public void setLicenseFamilyCategory(String pDocumentCategory) { - licenseFamilyCategory = pDocumentCategory; - } - - public String getLicenseFamilyName() { - return licenseFamilyName; - } - - public void setLicenseFamilyName(String pLicenseFamilyCategory) { - licenseFamilyName = pLicenseFamilyCategory; - } - - public String getNotes() { - return notes; - } - - public void setNotes(String pNotes) { - notes = pNotes; - } - - protected void reportOnLicense(Document subject) throws RatHeaderAnalysisException { - final MetaData metaData = subject.getMetaData(); - metaData.set(new MetaData.Datum(MetaData.RAT_URL_HEADER_SAMPLE, notes)); - final String licFamilyCategory = getLicenseFamilyCategory(); - metaData.set(new MetaData.Datum(MetaData.RAT_URL_HEADER_CATEGORY, licFamilyCategory)); - metaData.set(new MetaData.Datum(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY, licFamilyCategory)); - metaData.set(new MetaData.Datum(MetaData.RAT_URL_LICENSE_FAMILY_NAME, getLicenseFamilyName())); - } - - protected boolean matches(String pLine) { - if (pLine != null) { - final String[] pttrns = getPatterns(); - if (pttrns != null) { - for (int i = 0; i < pttrns.length; i++) { - if (pLine.indexOf(pttrns [i], 0) >= 0) { - return true; - } - } - } - } - return false; - } - - public void reset() { - // Nothing to do - } - - public boolean match(Document pSubject, String pLine) throws RatHeaderAnalysisException { - final boolean result = matches(pLine); - if (result) { - reportOnLicense(pSubject); - } - return result; - } -} +/* + * 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. * + */ +package org.apache.rat.analysis.license; + +import org.apache.rat.analysis.IHeaderMatcher; +import org.apache.rat.analysis.RatHeaderAnalysisException; +import org.apache.rat.api.Document; +import org.apache.rat.api.MetaData; +import org.apache.rat.api.MetaData.Datum; + + +/** + * @since RAT 0.8 + */ +public class SimplePatternBasedLicense implements IHeaderMatcher { + private String licenseFamilyCategory; + private String licenseFamilyName; + private String notes; + private String[] patterns; + + public SimplePatternBasedLicense() { + } + + protected SimplePatternBasedLicense(Datum pLicenseFamilyCategory, Datum pLicenseFamilyName, + String pNotes, String[] pPatterns) { + if (!MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY.equals(pLicenseFamilyCategory.getName())) { + throw new IllegalStateException("Expected " + MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY + + ", got " + pLicenseFamilyCategory.getName()); + } + setLicenseFamilyCategory(pLicenseFamilyCategory.getValue()); + if (!MetaData.RAT_URL_LICENSE_FAMILY_NAME.equals(pLicenseFamilyName.getName())) { + throw new IllegalStateException("Expected " + MetaData.RAT_URL_LICENSE_FAMILY_NAME + + ", got " + pLicenseFamilyName.getName()); + } + setLicenseFamilyName(pLicenseFamilyName.getValue()); + setNotes(pNotes); + setPatterns(pPatterns); + } + + public String[] getPatterns() { + return patterns; + } + + public void setPatterns(String[] pPatterns) { + patterns = pPatterns; + } + + public String getLicenseFamilyCategory() { + return licenseFamilyCategory; + } + + public void setLicenseFamilyCategory(String pDocumentCategory) { + licenseFamilyCategory = pDocumentCategory; + } + + public String getLicenseFamilyName() { + return licenseFamilyName; + } + + public void setLicenseFamilyName(String pLicenseFamilyCategory) { + licenseFamilyName = pLicenseFamilyCategory; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String pNotes) { + notes = pNotes; + } + + protected void reportOnLicense(Document subject) throws RatHeaderAnalysisException { + final MetaData metaData = subject.getMetaData(); + metaData.set(new MetaData.Datum(MetaData.RAT_URL_HEADER_SAMPLE, notes)); + final String licFamilyCategory = getLicenseFamilyCategory(); + metaData.set(new MetaData.Datum(MetaData.RAT_URL_HEADER_CATEGORY, licFamilyCategory)); + metaData.set(new MetaData.Datum(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY, licFamilyCategory)); + metaData.set(new MetaData.Datum(MetaData.RAT_URL_LICENSE_FAMILY_NAME, getLicenseFamilyName())); + } + + protected boolean matches(String pLine) { + if (pLine != null) { + final String[] pttrns = getPatterns(); + if (pttrns != null) { + for (int i = 0; i < pttrns.length; i++) { + if (pLine.indexOf(pttrns [i], 0) >= 0) { + return true; + } + } + } + } + return false; + } + + public void reset() { + // Nothing to do + } + + public boolean match(Document pSubject, String pLine) throws RatHeaderAnalysisException { + final boolean result = matches(pLine); + if (result) { + reportOnLicense(pSubject); + } + return result; + } +} Propchange: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/license/SimplePatternBasedLicense.java ------------------------------------------------------------------------------ svn:eol-style = native Modified: incubator/rat/main/trunk/apache-rat-plugin/src/site/apt/examples/custom-license.apt.vm URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-plugin/src/site/apt/examples/custom-license.apt.vm?rev=1199109&r1=1199108&r2=1199109&view=diff ============================================================================== --- incubator/rat/main/trunk/apache-rat-plugin/src/site/apt/examples/custom-license.apt.vm (original) +++ incubator/rat/main/trunk/apache-rat-plugin/src/site/apt/examples/custom-license.apt.vm Tue Nov 8 05:11:12 2011 @@ -1,133 +1,133 @@ -~~ 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. - - ----------------------- - Custom License Matchers - ----------------------- - -Custom License Matchers - - Rat comes with a set of predefined license matchers, that can be used - some typical licenses. However, they will not always be sufficient. - In such cases, you may use a custom license matcher. - - A custom license matcher is an implementation of - <<>>. Suggest that your - source files must contain a header like the following: - ------------------------------------------------------------------- - /** - * Yet Another Software License, 1.0 - * - * Lots of text, specifying the users rights, and whatever ... - */ ------------------------------------------------------------------- - - A very easy way to search for such headers would be to scan - for the string "Yet Another Software License, 1.0". And here's - how you would do that in your POM: - ------------------------------------------------------------------- - - - ... - - org.apache.rat - apache-rat-plugin - ${currentVersion} - - - - YASL1 - Yet Another Software License (YASL) 1.0 - - - Yet Another Software License, 1.0 - - - - - - ... - - ------------------------------------------------------------------- - - The following terms are used in the example: - -*-----------------------+-----------+ -| licenseFamilyCategory | The license family category is a very short string (exactly 5 characters, preferrably no blanks), -| | which identifies the license. For example, this could be <<>> to identify the Apache -| | Software License, 2.0. -*-----------------------+-----------+ -| licenseFamilyName | The license family name is a longer string, which gives the licenses full name. For example, -| | this could be <<>>. -*-----------------------+-----------+ -| notes | You might specify additional notes here, like "Dual licensed GPL/MPL". -*-----------------------+-----------+ -| patterns | Specifies a set of patterns being searched. The source file is assumed to contain the -| | license header, if at least one of these patterns is found. -*-----------------------+-----------+ - -Approved License Families - - Detecting the license is not enough in many cases as the "new" - license may not be considered approved by RAT. In order to make a - license approved you provide a custom implementation of - <<>>. Usually all you need - to provide the name of the license, in which case the built-in - <<>> will do. - - To continue the example, in order to make the YASL1 license approved - you'd use - ------------------------------------------------------------------- - - - ... - - org.apache.rat - apache-rat-plugin - ${currentVersion} - - - - YASL1 - Yet Another Software License (YASL) 1.0 - - - Yet Another Software License, 1.0 - - - - - - Yet Another Software License - - - - - ... - - ------------------------------------------------------------------- - - The following terms are used in the example: - -*-----------------------+-----------+ -| familyName | The name of the license family name that is approved. -| | This should match <<>> of your <<>> -*-----------------------+-----------+ - +~~ 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. + + ----------------------- + Custom License Matchers + ----------------------- + +Custom License Matchers + + Rat comes with a set of predefined license matchers, that can be used + some typical licenses. However, they will not always be sufficient. + In such cases, you may use a custom license matcher. + + A custom license matcher is an implementation of + <<>>. Suggest that your + source files must contain a header like the following: + +------------------------------------------------------------------ + /** + * Yet Another Software License, 1.0 + * + * Lots of text, specifying the users rights, and whatever ... + */ +------------------------------------------------------------------ + + A very easy way to search for such headers would be to scan + for the string "Yet Another Software License, 1.0". And here's + how you would do that in your POM: + +------------------------------------------------------------------ + + + ... + + org.apache.rat + apache-rat-plugin + ${currentVersion} + + + + YASL1 + Yet Another Software License (YASL) 1.0 + + + Yet Another Software License, 1.0 + + + + + + ... + + +------------------------------------------------------------------ + + The following terms are used in the example: + +*-----------------------+-----------+ +| licenseFamilyCategory | The license family category is a very short string (exactly 5 characters, preferrably no blanks), +| | which identifies the license. For example, this could be <<>> to identify the Apache +| | Software License, 2.0. +*-----------------------+-----------+ +| licenseFamilyName | The license family name is a longer string, which gives the licenses full name. For example, +| | this could be <<>>. +*-----------------------+-----------+ +| notes | You might specify additional notes here, like "Dual licensed GPL/MPL". +*-----------------------+-----------+ +| patterns | Specifies a set of patterns being searched. The source file is assumed to contain the +| | license header, if at least one of these patterns is found. +*-----------------------+-----------+ + +Approved License Families + + Detecting the license is not enough in many cases as the "new" + license may not be considered approved by RAT. In order to make a + license approved you provide a custom implementation of + <<>>. Usually all you need + to provide the name of the license, in which case the built-in + <<>> will do. + + To continue the example, in order to make the YASL1 license approved + you'd use + +------------------------------------------------------------------ + + + ... + + org.apache.rat + apache-rat-plugin + ${currentVersion} + + + + YASL1 + Yet Another Software License (YASL) 1.0 + + + Yet Another Software License, 1.0 + + + + + + Yet Another Software License + + + + + ... + + +------------------------------------------------------------------ + + The following terms are used in the example: + +*-----------------------+-----------+ +| familyName | The name of the license family name that is approved. +| | This should match <<>> of your <<>> +*-----------------------+-----------+ + Propchange: incubator/rat/main/trunk/apache-rat-plugin/src/site/apt/examples/custom-license.apt.vm ------------------------------------------------------------------------------ svn:eol-style = native Modified: incubator/rat/main/trunk/apache-rat-plugin/src/test/invoker/it1/invoker.properties URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-plugin/src/test/invoker/it1/invoker.properties?rev=1199109&r1=1199108&r2=1199109&view=diff ============================================================================== --- incubator/rat/main/trunk/apache-rat-plugin/src/test/invoker/it1/invoker.properties (original) +++ incubator/rat/main/trunk/apache-rat-plugin/src/test/invoker/it1/invoker.properties Tue Nov 8 05:11:12 2011 @@ -1 +1 @@ -invoker.goals = clean org.apache.rat:apache-rat-plugin::check +invoker.goals = clean org.apache.rat:apache-rat-plugin::check Propchange: incubator/rat/main/trunk/apache-rat-plugin/src/test/invoker/it1/invoker.properties ------------------------------------------------------------------------------ svn:eol-style = native Modified: incubator/rat/main/trunk/apache-rat-plugin/src/test/invoker/it1/pom.xml URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-plugin/src/test/invoker/it1/pom.xml?rev=1199109&r1=1199108&r2=1199109&view=diff ============================================================================== --- incubator/rat/main/trunk/apache-rat-plugin/src/test/invoker/it1/pom.xml (original) +++ incubator/rat/main/trunk/apache-rat-plugin/src/test/invoker/it1/pom.xml Tue Nov 8 05:11:12 2011 @@ -1,55 +1,55 @@ - - - - 4.0.0 - org.apache.rat.test - it1 - 1.0 - - - - org.apache.rat - apache-rat-plugin - @pom.version@ - - - - YAL__ - Yet Another Software License - - - Yet Another License - - - - - - Yet Another Software License - - - - src.apt - - - - - - + + + + 4.0.0 + org.apache.rat.test + it1 + 1.0 + + + + org.apache.rat + apache-rat-plugin + @pom.version@ + + + + YAL__ + Yet Another Software License + + + Yet Another License + + + + + + Yet Another Software License + + + + src.apt + + + + + + Propchange: incubator/rat/main/trunk/apache-rat-plugin/src/test/invoker/it1/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Modified: incubator/rat/main/trunk/apache-rat-plugin/src/test/invoker/it1/src.apt URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-plugin/src/test/invoker/it1/src.apt?rev=1199109&r1=1199108&r2=1199109&view=diff ============================================================================== --- incubator/rat/main/trunk/apache-rat-plugin/src/test/invoker/it1/src.apt (original) +++ incubator/rat/main/trunk/apache-rat-plugin/src/test/invoker/it1/src.apt Tue Nov 8 05:11:12 2011 @@ -1,12 +1,12 @@ -~~ Yet Another License, just for test purposes - - -------------- - Some text file - -------------- - -Some text file - - This is a text file, which intentionally has no Apache License Header. - Instead, it contains a dummy license header. The RAT plugin should - accept it with a proper custom license matcher. - +~~ Yet Another License, just for test purposes + + -------------- + Some text file + -------------- + +Some text file + + This is a text file, which intentionally has no Apache License Header. + Instead, it contains a dummy license header. The RAT plugin should + accept it with a proper custom license matcher. + Propchange: incubator/rat/main/trunk/apache-rat-plugin/src/test/invoker/it1/src.apt ------------------------------------------------------------------------------ svn:eol-style = native Modified: incubator/rat/main/trunk/apache-rat-plugin/src/test/invoker/it1/verify.bsh URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-plugin/src/test/invoker/it1/verify.bsh?rev=1199109&r1=1199108&r2=1199109&view=diff ============================================================================== --- incubator/rat/main/trunk/apache-rat-plugin/src/test/invoker/it1/verify.bsh (original) +++ incubator/rat/main/trunk/apache-rat-plugin/src/test/invoker/it1/verify.bsh Tue Nov 8 05:11:12 2011 @@ -1,23 +1,23 @@ -import java.io.*; - -File f = new File(basedir, "target/rat.txt").getAbsoluteFile(); -FileInputStream fis = new FileInputStream(f); -Reader r = new InputStreamReader(fis); -BufferedReader br = new BufferedReader(r); -boolean found = false; -for (;;) { - String line = br.readLine(); - if (line == null) { - break; - } - if (line.indexOf("YAL__ src.apt") >= 0) { - found = true; - break; - } -} -br.close(); -r.close(); -fis.close(); -if (!found) { - throw new IllegalStateException("Expecting Yet Another License for src.apt"); +import java.io.*; + +File f = new File(basedir, "target/rat.txt").getAbsoluteFile(); +FileInputStream fis = new FileInputStream(f); +Reader r = new InputStreamReader(fis); +BufferedReader br = new BufferedReader(r); +boolean found = false; +for (;;) { + String line = br.readLine(); + if (line == null) { + break; + } + if (line.indexOf("YAL__ src.apt") >= 0) { + found = true; + break; + } +} +br.close(); +r.close(); +fis.close(); +if (!found) { + throw new IllegalStateException("Expecting Yet Another License for src.apt"); } \ No newline at end of file Propchange: incubator/rat/main/trunk/apache-rat-plugin/src/test/invoker/it1/verify.bsh ------------------------------------------------------------------------------ svn:eol-style = native Modified: incubator/rat/main/trunk/apache-rat-plugin/src/test/invoker/settings.xml URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-plugin/src/test/invoker/settings.xml?rev=1199109&r1=1199108&r2=1199109&view=diff ============================================================================== --- incubator/rat/main/trunk/apache-rat-plugin/src/test/invoker/settings.xml (original) +++ incubator/rat/main/trunk/apache-rat-plugin/src/test/invoker/settings.xml Tue Nov 8 05:11:12 2011 @@ -1,55 +1,55 @@ - - - - - - - - it-repo - - true - - - - local.central - @localRepositoryUrl@ - - true - - - true - - - - - - local.central - @localRepositoryUrl@ - - true - - - true - - - - - - + + + + + + + + it-repo + + true + + + + local.central + @localRepositoryUrl@ + + true + + + true + + + + + + local.central + @localRepositoryUrl@ + + true + + + true + + + + + + Propchange: incubator/rat/main/trunk/apache-rat-plugin/src/test/invoker/settings.xml ------------------------------------------------------------------------------ svn:eol-style = native