You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@creadur.apache.org by bo...@apache.org on 2011/04/18 07:19:10 UTC
svn commit: r1094226 - in /incubator/rat/main/trunk/apache-rat-core/src:
main/java/org/apache/rat/annotation/AbstractLicenceAppender.java
test/java/org/apache/rat/annotation/TestLicenceAppender.java
Author: bodewig
Date: Mon Apr 18 05:19:10 2011
New Revision: 1094226
URL: http://svn.apache.org/viewvc?rev=1094226&view=rev
Log:
Support for Perl, C#, C++, TCL and PHP. RAT-89
Modified:
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/annotation/AbstractLicenceAppender.java
incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/annotation/TestLicenceAppender.java
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/annotation/AbstractLicenceAppender.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/annotation/AbstractLicenceAppender.java?rev=1094226&r1=1094225&r2=1094226&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/annotation/AbstractLicenceAppender.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/annotation/AbstractLicenceAppender.java Mon Apr 18 05:19:10 2011
@@ -51,16 +51,22 @@ public abstract class AbstractLicenceApp
private static final int TYPE_VM = 13;
private static final int TYPE_SCALA = 14;
private static final int TYPE_RUBY = 15;
+ private static final int TYPE_PERL = 16;
+ private static final int TYPE_TCL = 17;
+ private static final int TYPE_CPP = 18;
+ private static final int TYPE_CSHARP = 19;
+ private static final int TYPE_PHP = 20;
private static final int[] FAMILY_C = new int[] {
TYPE_JAVA, TYPE_JAVASCRIPT, TYPE_C, TYPE_H, TYPE_SCALA,
- TYPE_CSS,
+ TYPE_CSS, TYPE_CPP, TYPE_CSHARP, TYPE_PHP,
};
private static final int[] FAMILY_SGML = new int[] {
TYPE_XML, TYPE_HTML,
};
private static final int[] FAMILY_SH = new int[] {
- TYPE_PROPERTIES, TYPE_PYTHON, TYPE_SH, TYPE_RUBY,
+ TYPE_PROPERTIES, TYPE_PYTHON, TYPE_SH, TYPE_RUBY, TYPE_PERL,
+ TYPE_TCL,
};
private static final int[] FAMILY_BAT = new int[] {
TYPE_BAT,
@@ -72,7 +78,7 @@ public abstract class AbstractLicenceApp
TYPE_VM,
};
private static final int[] EXPECTS_HASH_PLING = new int[] {
- TYPE_PYTHON, TYPE_SH, TYPE_RUBY,
+ TYPE_PYTHON, TYPE_SH, TYPE_RUBY, TYPE_PERL, TYPE_TCL
};
private static final int[] EXPECTS_AT_ECHO = new int[] {
TYPE_BAT,
@@ -83,6 +89,9 @@ public abstract class AbstractLicenceApp
private static final int[] EXPECTS_XML_DECL = new int[] {
TYPE_XML,
};
+ private static final int[] EXPECTS_PHP_PI = new int[] {
+ TYPE_PHP,
+ };
private static final Map/*<String, Integer>*/ EXT2TYPE = new HashMap();
@@ -104,18 +113,26 @@ public abstract class AbstractLicenceApp
EXT2TYPE.put("apt", Integer.valueOf(TYPE_APT));
EXT2TYPE.put("bat", Integer.valueOf(TYPE_BAT));
EXT2TYPE.put("c", Integer.valueOf(TYPE_C));
+ EXT2TYPE.put("cc", Integer.valueOf(TYPE_CPP));
+ EXT2TYPE.put("cpp", Integer.valueOf(TYPE_CPP));
+ EXT2TYPE.put("cs", Integer.valueOf(TYPE_CSHARP));
EXT2TYPE.put("css", Integer.valueOf(TYPE_CSS));
EXT2TYPE.put("h", Integer.valueOf(TYPE_H));
+ EXT2TYPE.put("hh", Integer.valueOf(TYPE_H));
+ EXT2TYPE.put("hpp", Integer.valueOf(TYPE_H));
EXT2TYPE.put("htm", Integer.valueOf(TYPE_HTML));
EXT2TYPE.put("html", Integer.valueOf(TYPE_HTML));
EXT2TYPE.put("java", Integer.valueOf(TYPE_JAVA));
EXT2TYPE.put("js", Integer.valueOf(TYPE_JAVASCRIPT));
+ EXT2TYPE.put("php", Integer.valueOf(TYPE_PHP));
+ EXT2TYPE.put("pl", Integer.valueOf(TYPE_PERL));
EXT2TYPE.put("properties", Integer.valueOf(TYPE_PROPERTIES));
EXT2TYPE.put("py", Integer.valueOf(TYPE_PYTHON));
EXT2TYPE.put("rb", Integer.valueOf(TYPE_RUBY));
EXT2TYPE.put("rdf", Integer.valueOf(TYPE_XML));
EXT2TYPE.put("scala", Integer.valueOf(TYPE_SCALA));
EXT2TYPE.put("sh", Integer.valueOf(TYPE_SH));
+ EXT2TYPE.put("tcl", Integer.valueOf(TYPE_TCL));
EXT2TYPE.put("vm", Integer.valueOf(TYPE_VM));
EXT2TYPE.put("xml", Integer.valueOf(TYPE_XML));
EXT2TYPE.put("xsl", Integer.valueOf(TYPE_XML));
@@ -149,11 +166,13 @@ public abstract class AbstractLicenceApp
boolean expectsAtEcho = expectsAtEcho(type);
boolean expectsPackage = expectsPackage(type);
boolean expectsXMLDecl = expectsXMLDecl(type);
+ boolean expectsPhpPI = expectsPhpPI(type);
if (!expectsHashPling
&& !expectsAtEcho
&& !expectsPackage
- && !expectsXMLDecl) {
+ && !expectsXMLDecl
+ && !expectsPhpPI) {
writer.write(getLicenceHeader(document));
writer.write('\n');
}
@@ -173,8 +192,10 @@ public abstract class AbstractLicenceApp
if (expectsPackage && line.startsWith("package ")) {
writer.write(getLicenceHeader(document));
writer.write('\n');
- }
- if (expectsXMLDecl && line.startsWith("<?xml ")) {
+ } else if (expectsXMLDecl && line.startsWith("<?xml ")) {
+ writer.write(getLicenceHeader(document));
+ writer.write('\n');
+ } else if (expectsPhpPI && line.startsWith("<?php")) {
writer.write(getLicenceHeader(document));
writer.write('\n');
}
@@ -347,6 +368,9 @@ public abstract class AbstractLicenceApp
private static boolean expectsXMLDecl(int type) {
return isIn(EXPECTS_XML_DECL, type);
}
+ private static boolean expectsPhpPI(int type) {
+ return isIn(EXPECTS_PHP_PI, type);
+ }
private static boolean isIn(int[] arr, int key) {
return Arrays.binarySearch(arr, key) >= 0;
}
Modified: incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/annotation/TestLicenceAppender.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/annotation/TestLicenceAppender.java?rev=1094226&r1=1094225&r2=1094226&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/annotation/TestLicenceAppender.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/annotation/TestLicenceAppender.java Mon Apr 18 05:19:10 2011
@@ -304,4 +304,111 @@ public class TestLicenceAppender extends
},
checkLines(firstLine, secondLine));
}
+
+ public void testAddLicenseToPerlWithoutHashBang()
+ throws IOException {
+ String filename = "tmp.pl";
+ String firstLine = "#";
+
+ commonTestTemplate(filename, new FileCreator() {
+ public void createFile(Writer writer)
+ throws IOException {
+ writer.write("print \"Hello world\"\n");
+ }
+ },
+ checkLines(firstLine, null));
+ }
+
+ public void testAddLicenseToPerlWithHashBang() throws IOException {
+ String filename = "tmp.pl";
+ final String firstLine = "#!/usr/bin/env perl";
+ String secondLine = "#";
+
+ commonTestTemplate(filename, new FileCreator() {
+ public void createFile(Writer writer)
+ throws IOException {
+ writer.write(firstLine + "\n");
+ writer.write("print \"Hello world\"\n");
+ }
+ },
+ checkLines(firstLine, secondLine));
+ }
+
+ public void testAddLicenseToTclWithoutHashBang()
+ throws IOException {
+ String filename = "tmp.tcl";
+ String firstLine = "#";
+
+ commonTestTemplate(filename, new FileCreator() {
+ public void createFile(Writer writer)
+ throws IOException {
+ writer.write("puts \"Hello world\"\n");
+ }
+ },
+ checkLines(firstLine, null));
+ }
+
+ public void testAddLicenseToTclWithHashBang() throws IOException {
+ String filename = "tmp.tcl";
+ final String firstLine = "#!/usr/bin/env tcl";
+ String secondLine = "#";
+
+ commonTestTemplate(filename, new FileCreator() {
+ public void createFile(Writer writer)
+ throws IOException {
+ writer.write(firstLine + "\n");
+ writer.write("puts \"Hello world\"\n");
+ }
+ },
+ checkLines(firstLine, secondLine));
+ }
+
+ public void testAddLicenceToPHP() throws IOException {
+ String filename = "tmp.php";
+ final String firstLine = "<?php";
+ String secondLine = "/*";
+
+ commonTestTemplate(filename, new FileCreator() {
+ public void createFile(Writer writer)
+ throws IOException {
+ writer.write(firstLine + "\n");
+ writer.write("echo 'Hello World'\n");
+ writer.write("?>\n");
+ }
+ },
+ checkLines(firstLine, secondLine));
+ }
+
+ public void testAddLicenceToCSharp() throws IOException {
+ String filename = "tmp.cs";
+ String firstLine = "/*";
+
+ commonTestTemplate(filename, new FileCreator() {
+ public void createFile(Writer writer)
+ throws IOException {
+ writer.write("namespace org.example {\n");
+ writer.write(" public class Foo {\n");
+ writer.write(" }\n");
+ writer.write("}\n");
+ }
+ },
+ checkLines(firstLine, null));
+ }
+
+ public void testAddLicenceToCPlusPlus() throws IOException {
+ String filename = "tmp.cpp";
+ String firstLine = "/*";
+
+ commonTestTemplate(filename, new FileCreator() {
+ public void createFile(Writer writer)
+ throws IOException {
+ writer.write("namespace org.example {\n");
+ writer.write(" public class Foo {\n");
+ writer.write(" }\n");
+ writer.write("}\n");
+ }
+ },
+ checkLines(firstLine, null));
+ }
+
}