Author: pottlinger
Date: Mon May 25 21:19:03 2015
New Revision: 1681655
URL: http://svn.apache.org/r1681655
Log:
RAT-203: Renaming classes to License.
* After changing usage inside of the class within the 1st commit,
the 2nd commit changes the class/file names itself.
Added:
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/annotation/AbstractLicenseAppender.java
- copied, changed from r1681535,
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/annotation/AbstractLicenceAppender.java
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/annotation/ApacheV2LicenseAppender.java
- copied, changed from r1681535,
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/annotation/ApacheV2LicenceAppender.java
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/annotation/TestLicenseAppender.java
- copied, changed from r1681535,
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/annotation/TestLicenceAppender.java
Removed:
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/annotation/AbstractLicenceAppender.java
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/annotation/ApacheV2LicenceAppender.java
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/annotation/TestLicenceAppender.java
Modified:
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/util/LicenseAddingReport.java
Copied:
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/annotation/AbstractLicenseAppender.java
(from r1681535,
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/annotation/AbstractLicenceAppender.java)
URL:
http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/annotation/AbstractLicenseAppender.java?p2=creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/annotation/AbstractLicenseAppender.java&p1=creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/annotation/AbstractLicenceAppender.java&r1=1681535&r2=1681655&rev=1681655&view=diff
==============================================================================
---
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/annotation/AbstractLicenceAppender.java
(original)
+++
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/annotation/AbstractLicenseAppender.java
Mon May 25 21:19:03 2015
@@ -37,7 +37,7 @@ import java.util.Map;
* license header is intentional or that there is no license header present
* already.
*/
-public abstract class AbstractLicenceAppender {
+public abstract class AbstractLicenseAppender {
private static final String DOT = ".";
private static final int TYPE_UNKNOWN = 0;
private static final int TYPE_JAVA = 1;
@@ -183,7 +183,7 @@ public abstract class AbstractLicenceApp
private boolean isForced;
- public AbstractLicenceAppender() {
+ public AbstractLicenseAppender() {
super();
}
Copied:
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/annotation/ApacheV2LicenseAppender.java
(from r1681535,
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/annotation/ApacheV2LicenceAppender.java)
URL:
http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/annotation/ApacheV2LicenseAppender.java?p2=creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/annotation/ApacheV2LicenseAppender.java&p1=creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/annotation/ApacheV2LicenceAppender.java&r1=1681535&r2=1681655&rev=1681655&view=diff
==============================================================================
---
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/annotation/ApacheV2LicenceAppender.java
(original)
+++
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/annotation/ApacheV2LicenseAppender.java
Mon May 25 21:19:03 2015
@@ -28,14 +28,14 @@ import java.io.File;
* license header is intentional or that there is no license header present
* already.
*/
-public class ApacheV2LicenceAppender extends AbstractLicenceAppender {
+public class ApacheV2LicenseAppender extends AbstractLicenseAppender {
private String copyright;
/**
* Create a license appender with the standard ASF license header.
*/
- public ApacheV2LicenceAppender() {
+ public ApacheV2LicenseAppender() {
super();
}
@@ -45,7 +45,7 @@ public class ApacheV2LicenceAppender ext
*
* @param copyright copyright line.
*/
- public ApacheV2LicenceAppender(String copyright) {
+ public ApacheV2LicenseAppender(String copyright) {
super();
this.copyright = copyright;
}
Modified:
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/util/LicenseAddingReport.java
URL:
http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/util/LicenseAddingReport.java?rev=1681655&r1=1681654&r2=1681655&view=diff
==============================================================================
---
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/util/LicenseAddingReport.java
(original)
+++
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/util/LicenseAddingReport.java
Mon May 25 21:19:03 2015
@@ -21,8 +21,8 @@ package org.apache.rat.report.claim.util
import java.io.File;
import java.io.IOException;
-import org.apache.rat.annotation.AbstractLicenceAppender;
-import org.apache.rat.annotation.ApacheV2LicenceAppender;
+import org.apache.rat.annotation.AbstractLicenseAppender;
+import org.apache.rat.annotation.ApacheV2LicenseAppender;
import org.apache.rat.api.MetaData;
import org.apache.rat.api.MetaData.Datum;
import org.apache.rat.api.RatException;
@@ -30,10 +30,10 @@ import org.apache.rat.report.AbstractRep
public class LicenseAddingReport extends AbstractReport {
- private final AbstractLicenceAppender appender;
+ private final AbstractLicenseAppender appender;
public LicenseAddingReport(String pCopyrightMsg, boolean pForced) {
- appender = pCopyrightMsg == null ? new ApacheV2LicenceAppender() : new
ApacheV2LicenceAppender(pCopyrightMsg);
+ appender = pCopyrightMsg == null ? new ApacheV2LicenseAppender() : new
ApacheV2LicenseAppender(pCopyrightMsg);
appender.setForce(pForced);
}
Copied:
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/annotation/TestLicenseAppender.java
(from r1681535,
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/annotation/TestLicenceAppender.java)
URL:
http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/annotation/TestLicenseAppender.java?p2=creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/annotation/TestLicenseAppender.java&p1=creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/annotation/TestLicenceAppender.java&r1=1681535&r2=1681655&rev=1681655&view=diff
==============================================================================
---
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/annotation/TestLicenceAppender.java
(original)
+++
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/annotation/TestLicenseAppender.java
Mon May 25 21:19:03 2015
@@ -32,7 +32,7 @@ import java.util.Random;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
-public class TestLicenceAppender {
+public class TestLicenseAppender {
// TODO pottlinger refactor test to use:
//@Rule
@@ -86,8 +86,8 @@ public class TestLicenceAppender {
try {
createTestFile(name, creator);
- ApacheV2LicenceAppender appender =
- new ApacheV2LicenceAppender();
+ ApacheV2LicenseAppender appender =
+ new ApacheV2LicenseAppender();
appender.append(new File(name));
BufferedReader r = null;
@@ -158,8 +158,8 @@ public class TestLicenceAppender {
});
file = new File(filename);
- ApacheV2LicenceAppender appender =
- new ApacheV2LicenceAppender();
+ ApacheV2LicenseAppender appender =
+ new ApacheV2LicenseAppender();
appender.append(file);
newFile = new File(filename + ".new");
@@ -518,8 +518,8 @@ public class TestLicenceAppender {
public void fileWithBOM() throws IOException {
File f = Resources.getResourceFile("violations/FilterTest.cs");
try {
- ApacheV2LicenceAppender appender =
- new ApacheV2LicenceAppender();
+ ApacheV2LicenseAppender appender =
+ new ApacheV2LicenseAppender();
appender.append(f);
BufferedReader r = null;
