Author: sebb
Date: Mon May 20 18:39:18 2013
New Revision: 1484559
URL: http://svn.apache.org/r1484559
Log:
RAT-128 Use the proper name for Apache License
Added:
creadur/rat/trunk/apache-rat-core/src/test/resources/appliedAL20/
- copied from r1484335,
creadur/rat/trunk/apache-rat-core/src/test/resources/appliedASL20/
creadur/rat/trunk/apache-rat-core/src/test/resources/appliedAL20/bad/aal20bad1.txt
- copied unchanged from r1484335,
creadur/rat/trunk/apache-rat-core/src/test/resources/appliedASL20/bad/aasl20bad1.txt
creadur/rat/trunk/apache-rat-core/src/test/resources/appliedAL20/bad/aal20bad2.txt
- copied unchanged from r1484335,
creadur/rat/trunk/apache-rat-core/src/test/resources/appliedASL20/bad/aasl20bad2.txt
creadur/rat/trunk/apache-rat-core/src/test/resources/appliedAL20/good/aal20good1.txt
- copied unchanged from r1484335,
creadur/rat/trunk/apache-rat-core/src/test/resources/appliedASL20/good/aasl20good1.txt
Removed:
creadur/rat/trunk/apache-rat-core/src/test/resources/appliedAL20/bad/aasl20bad1.txt
creadur/rat/trunk/apache-rat-core/src/test/resources/appliedAL20/bad/aasl20bad2.txt
creadur/rat/trunk/apache-rat-core/src/test/resources/appliedAL20/good/aasl20good1.txt
creadur/rat/trunk/apache-rat-core/src/test/resources/appliedASL20/
Modified:
creadur/rat/trunk/RELEASE_NOTES.txt
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/license/AppliedApacheSoftwareLicense20.java
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/ReportTest.java
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AppliedApacheSoftwareLicense20Test.java
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/policy/DefaultPolicyTest.java
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportTest.java
creadur/rat/trunk/apache-rat-core/src/test/resources/elements/Source.java
creadur/rat/trunk/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatCheckMojoTest.java
creadur/rat/trunk/apache-rat-tasks/src/test/java/org/apache/rat/anttasks/ReportTest.java
creadur/rat/trunk/apache-rat-tasks/src/test/resources/antunit/report-junit.xml
creadur/rat/trunk/apache-rat-tasks/src/test/resources/antunit/report-normal-operation.xml
Modified: creadur/rat/trunk/RELEASE_NOTES.txt
URL:
http://svn.apache.org/viewvc/creadur/rat/trunk/RELEASE_NOTES.txt?rev=1484559&r1=1484558&r2=1484559&view=diff
==============================================================================
--- creadur/rat/trunk/RELEASE_NOTES.txt (original)
+++ creadur/rat/trunk/RELEASE_NOTES.txt Mon May 20 18:39:18 2013
@@ -30,7 +30,7 @@ Rat 0.9
* [RAT-108] - Add native support for thrift generated code to be
ignored
* [RAT-111] - RAT does not ignore javah generated files
- * [RAT-125] - Support applied ASL20 license headers, including
+ * [RAT-125] - Support applied AL20 license headers, including
checking for required copyright header line
* New Features
* [RAT-78] - Support doxia 1.1.2
Modified:
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/license/AppliedApacheSoftwareLicense20.java
URL:
http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/license/AppliedApacheSoftwareLicense20.java?rev=1484559&r1=1484558&r2=1484559&view=diff
==============================================================================
---
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/license/AppliedApacheSoftwareLicense20.java
(original)
+++
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/license/AppliedApacheSoftwareLicense20.java
Mon May 20 18:39:18 2013
@@ -23,9 +23,9 @@ import org.apache.rat.api.Document;
import org.apache.rat.api.MetaData;
/**
- * Matches an applied ASL 2.0 License header, including a <em>required</em>
+ * Matches an applied AL 2.0 License header, including a <em>required</em>
* initial copyright header line, conforming the <a
href="http://apache.org/licenses/LICENSE-2.0.html#apply";>template</a>
- * from the ASL 2.0 license itself.
+ * from the AL 2.0 license itself.
*
* @since Rat 0.9
*/
Modified:
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/ReportTest.java
URL:
http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/ReportTest.java?rev=1484559&r1=1484558&r2=1484559&view=diff
==============================================================================
---
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/ReportTest.java
(original)
+++
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/ReportTest.java
Mon May 20 18:39:18 2013
@@ -91,7 +91,7 @@ public class ReportTest {
"package elements;\n" +
"\n" +
"/*\n" +
- " * This file does intentionally *NOT* contain an ASL license
header,\n" +
+ " * This file does intentionally *NOT* contain an AL license
header,\n" +
" * because it is used in the test suite.\n" +
" */\n" +
"public class Source {\n" +
Modified:
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AppliedApacheSoftwareLicense20Test.java
URL:
http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AppliedApacheSoftwareLicense20Test.java?rev=1484559&r1=1484558&r2=1484559&view=diff
==============================================================================
---
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AppliedApacheSoftwareLicense20Test.java
(original)
+++
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AppliedApacheSoftwareLicense20Test.java
Mon May 20 18:39:18 2013
@@ -70,7 +70,7 @@ public class AppliedApacheSoftwareLicens
result = license.match(subject, line);
line = in.readLine();
}
- assertTrue("Applied ASL2.0 license should be matched", result);
+ assertTrue("Applied AL2.0 license should be matched", result);
license.reset();
result = license.match(subject, "New line");
assertFalse("After reset, content should build up again", result);
@@ -86,17 +86,17 @@ public class AppliedApacheSoftwareLicens
result = license.match(subject, line);
line = in.readLine();
}
- assertFalse("Applied ASL2.0 license should not be matched", result);
+ assertFalse("Applied AL2.0 license should not be matched", result);
license.reset();
}
@Test(timeout=2000) // may need to be adjusted if many more files are added
public void goodFiles() throws Exception {
- DirectoryScanner.testFilesInDir("appliedASL20/good", license, true);
+ DirectoryScanner.testFilesInDir("appliedAL20/good", license, true);
}
@Test(timeout=2000) // may need to be adjusted if many more files are added
public void baddFiles() throws Exception {
- DirectoryScanner.testFilesInDir("appliedASL20/bad", license, false);
+ DirectoryScanner.testFilesInDir("appliedAL20/bad", license, false);
}
}
Modified:
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/policy/DefaultPolicyTest.java
URL:
http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/policy/DefaultPolicyTest.java?rev=1484559&r1=1484558&r2=1484559&view=diff
==============================================================================
---
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/policy/DefaultPolicyTest.java
(original)
+++
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/policy/DefaultPolicyTest.java
Mon May 20 18:39:18 2013
@@ -42,7 +42,7 @@ public class DefaultPolicyTest {
}
@Test
- public void testASLFamily() throws Exception {
+ public void testALFamily() throws Exception {
subject.getMetaData().set(MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_APACHE_LICENSE_VERSION_2_0);
policy.analyse(subject);
assertApproval(true);
Modified:
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportTest.java
URL:
http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportTest.java?rev=1484559&r1=1484558&r2=1484559&view=diff
==============================================================================
---
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportTest.java
(original)
+++
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportTest.java
Mon May 20 18:39:18 2013
@@ -94,7 +94,7 @@ public class XmlReportTest {
"<resource name='" + elementsPath +
"/Source.java'><header-sample>package elements;\n" +
"\n" +
"/*\n" +
-" * This file does intentionally *NOT* contain an ASL license header,\n" +
+" * This file does intentionally *NOT* contain an AL license header,\n" +
" * because it is used in the test suite.\n" +
" */\n" +
"public class Source {\n" +
Modified:
creadur/rat/trunk/apache-rat-core/src/test/resources/elements/Source.java
URL:
http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/test/resources/elements/Source.java?rev=1484559&r1=1484558&r2=1484559&view=diff
==============================================================================
--- creadur/rat/trunk/apache-rat-core/src/test/resources/elements/Source.java
(original)
+++ creadur/rat/trunk/apache-rat-core/src/test/resources/elements/Source.java
Mon May 20 18:39:18 2013
@@ -1,7 +1,7 @@
package elements;
/*
- * This file does intentionally *NOT* contain an ASL license header,
+ * This file does intentionally *NOT* contain an AL license header,
* because it is used in the test suite.
*/
public class Source {
Modified:
creadur/rat/trunk/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatCheckMojoTest.java
URL:
http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatCheckMojoTest.java?rev=1484559&r1=1484558&r2=1484559&view=diff
==============================================================================
---
creadur/rat/trunk/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatCheckMojoTest.java
(original)
+++
creadur/rat/trunk/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatCheckMojoTest.java
Mon May 20 18:39:18 2013
@@ -310,16 +310,16 @@ public class RatCheckMojoTest extends Ab
* Reads the created report file and verifies, whether the detected numbers
* are matching.
* @param pRatTxtFile The file to read.
- * @param pNumAslFiles The number of files with ASL.
+ * @param pNumALFiles The number of files with AL.
* @param pNumNoLicenseFiles The number of files without license.
* @throws IOException An error occurred while reading the file.
*/
- private void checkResult( File pRatTxtFile, int pNumAslFiles, int
pNumNoLicenseFiles )
+ private void checkResult( File pRatTxtFile, int pNumALFiles, int
pNumNoLicenseFiles )
throws IOException
{
assertTrue( pRatTxtFile.exists() );
BufferedReader reader = new BufferedReader( new FileReader(
pRatTxtFile ) );
- Integer numAslFiles = null;
+ Integer numALFiles = null;
Integer numNoLicenseFiles = null;
for (;;)
{
@@ -331,7 +331,7 @@ public class RatCheckMojoTest extends Ab
int offset = line.indexOf( "Apache Licensed: " );
if ( offset >= 0 )
{
- numAslFiles = new Integer( line.substring( offset + "Apache
Licensed: ".length() ).trim() );
+ numALFiles = new Integer( line.substring( offset + "Apache
Licensed: ".length() ).trim() );
}
offset = line.indexOf( "Unknown Licenses" );
if ( offset >= 0 )
@@ -340,7 +340,7 @@ public class RatCheckMojoTest extends Ab
}
}
reader.close();
- assertEquals( new Integer( pNumAslFiles), numAslFiles );
+ assertEquals( new Integer( pNumALFiles), numALFiles );
assertEquals( new Integer( pNumNoLicenseFiles ), numNoLicenseFiles );
}
Modified:
creadur/rat/trunk/apache-rat-tasks/src/test/java/org/apache/rat/anttasks/ReportTest.java
URL:
http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-tasks/src/test/java/org/apache/rat/anttasks/ReportTest.java?rev=1484559&r1=1484558&r2=1484559&view=diff
==============================================================================
---
creadur/rat/trunk/apache-rat-tasks/src/test/java/org/apache/rat/anttasks/ReportTest.java
(original)
+++
creadur/rat/trunk/apache-rat-tasks/src/test/java/org/apache/rat/anttasks/ReportTest.java
Mon May 20 18:39:18 2013
@@ -54,8 +54,8 @@ public class ReportTest extends Abstract
assertFileMatches(reportFile, alLine);
}
- public void testWithASLUnknown() throws Exception {
- executeTarget("testWithASLUnknown");
+ public void testWithALUnknown() throws Exception {
+ executeTarget("testWithALUnknown");
assertLogDoesntMatch("AL +\\Q" + getAntFileName() + "\\E");
assertLogMatches("\\!\\?\\?\\?\\?\\? +\\Q" + getAntFileName() + "\\E");
}
Modified:
creadur/rat/trunk/apache-rat-tasks/src/test/resources/antunit/report-junit.xml
URL:
http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-tasks/src/test/resources/antunit/report-junit.xml?rev=1484559&r1=1484558&r2=1484559&view=diff
==============================================================================
---
creadur/rat/trunk/apache-rat-tasks/src/test/resources/antunit/report-junit.xml
(original)
+++
creadur/rat/trunk/apache-rat-tasks/src/test/resources/antunit/report-junit.xml
Mon May 20 18:39:18 2013
@@ -54,7 +54,7 @@
</rat:report>
</target>
- <target name="testWithASLUnknown">
+ <target name="testWithALUnknown">
<rat:report addDefaultLicenseMatchers="false">
<file file="${ant.file}"/>
<rat:w3c/>
Modified:
creadur/rat/trunk/apache-rat-tasks/src/test/resources/antunit/report-normal-operation.xml
URL:
http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-tasks/src/test/resources/antunit/report-normal-operation.xml?rev=1484559&r1=1484558&r2=1484559&view=diff
==============================================================================
---
creadur/rat/trunk/apache-rat-tasks/src/test/resources/antunit/report-normal-operation.xml
(original)
+++
creadur/rat/trunk/apache-rat-tasks/src/test/resources/antunit/report-normal-operation.xml
Mon May 20 18:39:18 2013
@@ -99,7 +99,7 @@
file="${report.file}.xml"/>
</target>
- <target name="xtestWithASLUnknown">
+ <target name="xtestWithALUnknown">
<rat:report addDefaultLicenseMatchers="false">
<file file="${ant.file}"/>
<rat:w3c/>
@@ -108,7 +108,7 @@
<au:assertLogContains text="!????? ${file.name}"/>
</target>
- <target name="testWithASLUnknownSentToFile" depends="fileReportTest">
+ <target name="testWithALUnknownSentToFile" depends="fileReportTest">
<rat:report addDefaultLicenseMatchers="false" reportFile="${report.file}">
<file file="${ant.file}"/>
<rat:w3c/>
