You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@creadur.apache.org by rd...@apache.org on 2009/05/19 10:10:20 UTC
svn commit: r776225 - in /incubator/rat/main/trunk:
apache-rat-core/src/main/java/org/apache/rat/analysis/
apache-rat-core/src/main/java/org/apache/rat/analysis/generation/
apache-rat-core/src/main/java/org/apache/rat/analysis/license/
apache-rat-core/...
Author: rdonkin
Date: Tue May 19 08:10:18 2009
New Revision: 776225
URL: http://svn.apache.org/viewvc?rev=776225&view=rev
Log:
IResource is unnecessary. Simplify by concentrating on just IDocument.
Removed:
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/IResource.java
Modified:
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/Claims.java
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/IHeaderMatcher.java
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/generation/GeneratedLicenseNotRequired.java
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/generation/JavaDocLicenseNotRequired.java
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/license/ApacheSoftwareLicense20.java
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/license/BaseLicense.java
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/license/DojoLicenseHeader.java
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/license/OASISLicense.java
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/license/TMF854LicenseHeader.java
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/license/W3CDocLicense.java
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/license/W3CLicense.java
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/util/HeaderMatcherMultiplexer.java
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/IDocument.java
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/ToNameTransformer.java
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/analyser/HeaderCheckWorker.java
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/IClaim.java
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/AbstractClaim.java
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/ArchiveFileTypeClaim.java
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/FileTypeClaim.java
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/LicenseApprovalClaim.java
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/LicenseFamilyClaim.java
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/LicenseHeaderClaim.java
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/xml/CustomClaim.java
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/xml/SimpleXmlClaimReporter.java
incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/MockLicenseMatcher.java
incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/generation/GeneratedLicenseNotRequiredTest.java
incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/generation/JavaDocLicenseNotRequiredTest.java
incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/license/ApacheSoftwareLicense20Test.java
incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/license/OASISLicenseTest.java
incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/license/W3CLicenseTest.java
incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/util/MatcherMultiplexerTest.java
incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/document/MockLocation.java
incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/policy/DefaultPolicyTest.java
incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/report/analyser/HeaderCheckWorkerTest.java
incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/report/claim/impl/xml/SimpleXmlClaimReporterTest.java
incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/report/claim/util/ClaimReporterMultiplexerTest.java
incubator/rat/main/trunk/apache-rat-tasks/src/test/java/org/example/Matcher.java
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/Claims.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/Claims.java?rev=776225&r1=776224&r2=776225&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/Claims.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/Claims.java Tue May 19 08:10:18 2009
@@ -18,7 +18,7 @@
*/
package org.apache.rat.analysis;
-import org.apache.rat.document.IResource;
+import org.apache.rat.document.IDocument;
import org.apache.rat.report.RatReportFailedException;
import org.apache.rat.report.claim.IClaimReporter;
import org.apache.rat.report.claim.LicenseFamilyCode;
@@ -26,7 +26,7 @@
public class Claims {
- public static void reportLicenseApprovalClaim(final IResource subject, final boolean isAcceptable, final IClaimReporter reporter) throws RatReportFailedException {
+ public static void reportLicenseApprovalClaim(final IDocument subject, final boolean isAcceptable, final IClaimReporter reporter) throws RatReportFailedException {
reporter.claim(new LicenseApprovalClaim(subject, isAcceptable));
}
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/IHeaderMatcher.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/IHeaderMatcher.java?rev=776225&r1=776224&r2=776225&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/IHeaderMatcher.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/IHeaderMatcher.java Tue May 19 08:10:18 2009
@@ -18,7 +18,7 @@
*/
package org.apache.rat.analysis;
-import org.apache.rat.document.IResource;
+import org.apache.rat.document.IDocument;
import org.apache.rat.report.claim.IClaimReporter;
/**
@@ -41,5 +41,5 @@
* @param reporter TODO
* @return TODO
*/
- public boolean match(IResource subject, String line, IClaimReporter reporter) throws RatHeaderAnalysisException;
+ public boolean match(IDocument subject, String line, IClaimReporter reporter) throws RatHeaderAnalysisException;
}
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/generation/GeneratedLicenseNotRequired.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/generation/GeneratedLicenseNotRequired.java?rev=776225&r1=776224&r2=776225&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/generation/GeneratedLicenseNotRequired.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/generation/GeneratedLicenseNotRequired.java Tue May 19 08:10:18 2009
@@ -22,7 +22,7 @@
import org.apache.rat.analysis.IHeaderMatcher;
import org.apache.rat.analysis.RatHeaderAnalysisException;
-import org.apache.rat.document.IResource;
+import org.apache.rat.document.IDocument;
import org.apache.rat.report.RatReportFailedException;
import org.apache.rat.report.claim.IClaimReporter;
import org.apache.rat.report.claim.LicenseFamilyCode;
@@ -66,7 +66,7 @@
this.numberOfPatterns = linePatterns.length;
}
- public boolean match(IResource subject, String line, IClaimReporter reporter) throws RatHeaderAnalysisException {
+ public boolean match(IDocument subject, String line, IClaimReporter reporter) throws RatHeaderAnalysisException {
boolean result = false;
for (int i=0;i<numberOfPatterns;i++) {
if (linePatterns[i].matcher(line).matches()) {
@@ -78,7 +78,7 @@
return result;
}
- private void reportOnLicense(IResource subject, IClaimReporter reporter) throws RatHeaderAnalysisException {
+ private void reportOnLicense(IDocument subject, IClaimReporter reporter) throws RatHeaderAnalysisException {
try {
reporter.claim(new LicenseHeaderClaim(subject, LicenseFamilyCode.GENERATED,
"Generated files do not required license headers"));
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/generation/JavaDocLicenseNotRequired.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/generation/JavaDocLicenseNotRequired.java?rev=776225&r1=776224&r2=776225&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/generation/JavaDocLicenseNotRequired.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/generation/JavaDocLicenseNotRequired.java Tue May 19 08:10:18 2009
@@ -22,7 +22,7 @@
import org.apache.rat.analysis.IHeaderMatcher;
import org.apache.rat.analysis.RatHeaderAnalysisException;
-import org.apache.rat.document.IResource;
+import org.apache.rat.document.IDocument;
import org.apache.rat.report.RatReportFailedException;
import org.apache.rat.report.claim.IClaimReporter;
import org.apache.rat.report.claim.LicenseFamilyCode;
@@ -38,7 +38,7 @@
private static final Pattern JAVADOC_REGEX = Pattern.compile(JAVADOC_REGEX_DEFN);
- public boolean match(IResource subject, String line, IClaimReporter reporter) throws RatHeaderAnalysisException {
+ public boolean match(IDocument subject, String line, IClaimReporter reporter) throws RatHeaderAnalysisException {
boolean result = JAVADOC_REGEX.matcher(line).matches();
if (result) {
reportOnLicense(subject, reporter);
@@ -46,7 +46,7 @@
return result;
}
- private void reportOnLicense(IResource subject, IClaimReporter reporter) throws RatHeaderAnalysisException {
+ private void reportOnLicense(IDocument subject, IClaimReporter reporter) throws RatHeaderAnalysisException {
try {
reporter.claim(new LicenseHeaderClaim(subject, LicenseFamilyCode.GENERATED,
"JavaDocs are generated and so license header is optional"));
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/license/ApacheSoftwareLicense20.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/license/ApacheSoftwareLicense20.java?rev=776225&r1=776224&r2=776225&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/license/ApacheSoftwareLicense20.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/license/ApacheSoftwareLicense20.java Tue May 19 08:10:18 2009
@@ -21,7 +21,7 @@
import org.apache.rat.analysis.Claims;
import org.apache.rat.analysis.IHeaderMatcher;
import org.apache.rat.analysis.RatHeaderAnalysisException;
-import org.apache.rat.document.IResource;
+import org.apache.rat.document.IDocument;
import org.apache.rat.license.Apache20LicenseFamily;
import org.apache.rat.report.claim.IClaimReporter;
@@ -39,7 +39,7 @@
super(Claims.ASL_CODE, Apache20LicenseFamily.APACHE_SOFTWARE_LICENSE_NAME, "");
}
- public boolean match(IResource subject, String line, IClaimReporter reporter) throws RatHeaderAnalysisException {
+ public boolean match(IDocument subject, String line, IClaimReporter reporter) throws RatHeaderAnalysisException {
final boolean result = matches(line);
if (result) {
reportOnLicense(subject, reporter);
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/license/BaseLicense.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/license/BaseLicense.java?rev=776225&r1=776224&r2=776225&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/license/BaseLicense.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/license/BaseLicense.java Tue May 19 08:10:18 2009
@@ -19,7 +19,7 @@
package org.apache.rat.analysis.license;
import org.apache.rat.analysis.RatHeaderAnalysisException;
-import org.apache.rat.document.IResource;
+import org.apache.rat.document.IDocument;
import org.apache.rat.report.RatReportFailedException;
import org.apache.rat.report.claim.IClaimReporter;
import org.apache.rat.report.claim.LicenseFamilyCode;
@@ -38,7 +38,7 @@
this.notes = notes;
}
- public final void reportOnLicense(IResource subject, IClaimReporter reporter) throws RatHeaderAnalysisException {
+ public final void reportOnLicense(IDocument subject, IClaimReporter reporter) throws RatHeaderAnalysisException {
final LicenseFamilyName name = getName();
final LicenseFamilyCode code = getCode();
final String notes = getNotes();
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/license/DojoLicenseHeader.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/license/DojoLicenseHeader.java?rev=776225&r1=776224&r2=776225&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/license/DojoLicenseHeader.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/license/DojoLicenseHeader.java Tue May 19 08:10:18 2009
@@ -21,7 +21,7 @@
import org.apache.rat.analysis.Claims;
import org.apache.rat.analysis.IHeaderMatcher;
import org.apache.rat.analysis.RatHeaderAnalysisException;
-import org.apache.rat.document.IResource;
+import org.apache.rat.document.IDocument;
import org.apache.rat.license.ModifiedBSDLicenseFamily;
import org.apache.rat.report.claim.IClaimReporter;
@@ -50,7 +50,7 @@
}
- public boolean match(IResource subject, String line, IClaimReporter reporter) throws RatHeaderAnalysisException {
+ public boolean match(IDocument subject, String line, IClaimReporter reporter) throws RatHeaderAnalysisException {
final boolean result = matches(line);
if (result) {
reportOnLicense(subject, reporter);
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/license/OASISLicense.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/license/OASISLicense.java?rev=776225&r1=776224&r2=776225&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/license/OASISLicense.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/license/OASISLicense.java Tue May 19 08:10:18 2009
@@ -23,7 +23,7 @@
import org.apache.rat.analysis.Claims;
import org.apache.rat.analysis.IHeaderMatcher;
import org.apache.rat.analysis.RatHeaderAnalysisException;
-import org.apache.rat.document.IResource;
+import org.apache.rat.document.IDocument;
import org.apache.rat.license.OASISLicenseFamily;
import org.apache.rat.report.claim.IClaimReporter;
@@ -49,7 +49,7 @@
super(Claims.OASIS_CODE, OASISLicenseFamily.OASIS_OPEN_LICENSE_NAME, "No modifications allowed");
}
- public boolean match(IResource subject, String line, IClaimReporter reporter) throws RatHeaderAnalysisException {
+ public boolean match(IDocument subject, String line, IClaimReporter reporter) throws RatHeaderAnalysisException {
boolean result = false;
if (copyrightMatch) {
line = line.toLowerCase();
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/license/TMF854LicenseHeader.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/license/TMF854LicenseHeader.java?rev=776225&r1=776224&r2=776225&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/license/TMF854LicenseHeader.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/license/TMF854LicenseHeader.java Tue May 19 08:10:18 2009
@@ -21,7 +21,7 @@
import org.apache.rat.analysis.Claims;
import org.apache.rat.analysis.IHeaderMatcher;
import org.apache.rat.analysis.RatHeaderAnalysisException;
-import org.apache.rat.document.IResource;
+import org.apache.rat.document.IDocument;
import org.apache.rat.license.ModifiedBSDLicenseFamily;
import org.apache.rat.report.claim.IClaimReporter;
@@ -42,7 +42,7 @@
}
- public boolean match(IResource subject, String line, IClaimReporter reporter) throws RatHeaderAnalysisException {
+ public boolean match(IDocument subject, String line, IClaimReporter reporter) throws RatHeaderAnalysisException {
final boolean result = matches(line);
if (result) {
reportOnLicense(subject, reporter);
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/license/W3CDocLicense.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/license/W3CDocLicense.java?rev=776225&r1=776224&r2=776225&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/license/W3CDocLicense.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/license/W3CDocLicense.java Tue May 19 08:10:18 2009
@@ -21,7 +21,7 @@
import org.apache.rat.analysis.Claims;
import org.apache.rat.analysis.IHeaderMatcher;
import org.apache.rat.analysis.RatHeaderAnalysisException;
-import org.apache.rat.document.IResource;
+import org.apache.rat.document.IDocument;
import org.apache.rat.license.W3CDocumentLicenseFamily;
import org.apache.rat.report.claim.IClaimReporter;
@@ -37,7 +37,7 @@
}
- public boolean match(IResource subject, String line, IClaimReporter reporter) throws RatHeaderAnalysisException {
+ public boolean match(IDocument subject, String line, IClaimReporter reporter) throws RatHeaderAnalysisException {
boolean result = line != null && line.indexOf(COPYRIGHT_URL) != -1;
if (result) {
reportOnLicense(subject, reporter);
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/license/W3CLicense.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/license/W3CLicense.java?rev=776225&r1=776224&r2=776225&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/license/W3CLicense.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/license/W3CLicense.java Tue May 19 08:10:18 2009
@@ -21,7 +21,7 @@
import org.apache.rat.analysis.Claims;
import org.apache.rat.analysis.IHeaderMatcher;
import org.apache.rat.analysis.RatHeaderAnalysisException;
-import org.apache.rat.document.IResource;
+import org.apache.rat.document.IDocument;
import org.apache.rat.license.W3CSoftwareLicenseFamily;
import org.apache.rat.report.claim.IClaimReporter;
@@ -37,7 +37,7 @@
}
- public boolean match(IResource subject, String line, IClaimReporter reporter) throws RatHeaderAnalysisException {
+ public boolean match(IDocument subject, String line, IClaimReporter reporter) throws RatHeaderAnalysisException {
boolean result = line != null && line.indexOf(COPYRIGHT_URL) != -1;
if (result) {
reportOnLicense(subject, reporter);
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/util/HeaderMatcherMultiplexer.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/util/HeaderMatcherMultiplexer.java?rev=776225&r1=776224&r2=776225&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/util/HeaderMatcherMultiplexer.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/util/HeaderMatcherMultiplexer.java Tue May 19 08:10:18 2009
@@ -20,7 +20,7 @@
import org.apache.rat.analysis.IHeaderMatcher;
import org.apache.rat.analysis.RatHeaderAnalysisException;
-import org.apache.rat.document.IResource;
+import org.apache.rat.document.IDocument;
import org.apache.rat.report.claim.IClaimReporter;
/**
@@ -37,7 +37,7 @@
numberOfMatchers = matchers.length;
}
- public boolean match(IResource subject, String line, IClaimReporter reporter) throws RatHeaderAnalysisException {
+ public boolean match(IDocument subject, String line, IClaimReporter reporter) throws RatHeaderAnalysisException {
boolean result = false;
for (int i=0;i<numberOfMatchers;i++) {
result = matchers[i].match(subject, line, reporter);
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/IDocument.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/IDocument.java?rev=776225&r1=776224&r2=776225&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/IDocument.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/IDocument.java Tue May 19 08:10:18 2009
@@ -21,8 +21,10 @@
import java.io.IOException;
import java.io.Reader;
-public interface IDocument extends IResource {
+public interface IDocument {
+ public String getName();
+
/**
* Reads the content of this document.
* @return <code>Reader</code> not null
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/ToNameTransformer.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/ToNameTransformer.java?rev=776225&r1=776224&r2=776225&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/ToNameTransformer.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/ToNameTransformer.java Tue May 19 08:10:18 2009
@@ -30,8 +30,8 @@
public Object transform(Object subject) {
Object result = null;
- if (subject != null && subject instanceof IResource) {
- IResource location = (IResource) subject;
+ if (subject != null && subject instanceof IDocument) {
+ IDocument location = (IDocument) subject;
result = location.getName();
}
return result;
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/analyser/HeaderCheckWorker.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/analyser/HeaderCheckWorker.java?rev=776225&r1=776224&r2=776225&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/analyser/HeaderCheckWorker.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/analyser/HeaderCheckWorker.java Tue May 19 08:10:18 2009
@@ -24,7 +24,7 @@
import org.apache.rat.analysis.IHeaderMatcher;
import org.apache.rat.analysis.RatHeaderAnalysisException;
-import org.apache.rat.document.IResource;
+import org.apache.rat.document.IDocument;
import org.apache.rat.report.RatReportFailedException;
import org.apache.rat.report.claim.IClaimReporter;
import org.apache.rat.report.claim.LicenseFamilyCode;
@@ -43,7 +43,7 @@
private final BufferedReader reader;
private final IHeaderMatcher matcher;
private final IClaimReporter reporter;
- private final IResource name;
+ private final IDocument name;
private boolean match = false;
@@ -51,7 +51,7 @@
private boolean finished = false;
public HeaderCheckWorker(Reader reader, int numberOfRetainedHeaderLine,
- final IHeaderMatcher matcher, final IClaimReporter reporter, final IResource name) {
+ final IHeaderMatcher matcher, final IClaimReporter reporter, final IDocument name) {
this(new BufferedReader(reader), numberOfRetainedHeaderLine, matcher, reporter, name);
}
@@ -62,17 +62,17 @@
* @param name the name of the checked content, possibly null
* @param reader a <code>Reader</code> for the content, not null
*/
- public HeaderCheckWorker(Reader reader, final IHeaderMatcher matcher, final IClaimReporter reporter, final IResource name) {
+ public HeaderCheckWorker(Reader reader, final IHeaderMatcher matcher, final IClaimReporter reporter, final IDocument name) {
this(new BufferedReader(reader), matcher, reporter, name);
}
public HeaderCheckWorker(BufferedReader reader, final IHeaderMatcher matcher,
- final IClaimReporter reporter, final IResource name) {
+ final IClaimReporter reporter, final IDocument name) {
this(reader, DEFAULT_NUMBER_OF_RETAINED_HEADER_LINES, matcher, reporter, name);
}
public HeaderCheckWorker(BufferedReader reader, int numberOfRetainedHeaderLine, final IHeaderMatcher matcher,
- final IClaimReporter reporter, final IResource name) {
+ final IClaimReporter reporter, final IDocument name) {
this.reader = reader;
this.numberOfRetainedHeaderLines = numberOfRetainedHeaderLine;
this.matcher = matcher;
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/IClaim.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/IClaim.java?rev=776225&r1=776224&r2=776225&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/IClaim.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/IClaim.java Tue May 19 08:10:18 2009
@@ -1,6 +1,6 @@
package org.apache.rat.report.claim;
-import org.apache.rat.document.IResource;
+import org.apache.rat.document.IDocument;
@@ -13,5 +13,5 @@
/**
* Returns the claims subject.
*/
- IResource getSubject();
+ IDocument getSubject();
}
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/AbstractClaim.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/AbstractClaim.java?rev=776225&r1=776224&r2=776225&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/AbstractClaim.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/AbstractClaim.java Tue May 19 08:10:18 2009
@@ -1,6 +1,6 @@
package org.apache.rat.report.claim.impl;
-import org.apache.rat.document.IResource;
+import org.apache.rat.document.IDocument;
import org.apache.rat.report.claim.IClaim;
@@ -9,13 +9,13 @@
* Abstract base class for deriving instances of {@link IClaim}.
*/
public abstract class AbstractClaim implements IClaim {
- private final IResource subject;
+ private final IDocument subject;
- protected AbstractClaim(IResource pSubject) {
+ protected AbstractClaim(IDocument pSubject) {
subject = pSubject;
}
- public IResource getSubject() {
+ public IDocument getSubject() {
return subject;
}
}
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/ArchiveFileTypeClaim.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/ArchiveFileTypeClaim.java?rev=776225&r1=776224&r2=776225&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/ArchiveFileTypeClaim.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/ArchiveFileTypeClaim.java Tue May 19 08:10:18 2009
@@ -1,6 +1,6 @@
package org.apache.rat.report.claim.impl;
-import org.apache.rat.document.IResource;
+import org.apache.rat.document.IDocument;
import org.apache.rat.report.claim.FileType;
@@ -14,7 +14,7 @@
/**
* Creates a new instance with the given subject.
*/
- public ArchiveFileTypeClaim(IResource pSubject, boolean pReadable) {
+ public ArchiveFileTypeClaim(IDocument pSubject, boolean pReadable) {
super(pSubject, FileType.ARCHIVE);
readable = pReadable;
}
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/FileTypeClaim.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/FileTypeClaim.java?rev=776225&r1=776224&r2=776225&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/FileTypeClaim.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/FileTypeClaim.java Tue May 19 08:10:18 2009
@@ -1,6 +1,6 @@
package org.apache.rat.report.claim.impl;
-import org.apache.rat.document.IResource;
+import org.apache.rat.document.IDocument;
import org.apache.rat.report.claim.FileType;
import org.apache.rat.report.claim.IClaim;
@@ -15,7 +15,7 @@
/**
* Creates a new instance with the given file type.
*/
- public FileTypeClaim(IResource pSubject, FileType pType) {
+ public FileTypeClaim(IDocument pSubject, FileType pType) {
super(pSubject);
type = pType;
}
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/LicenseApprovalClaim.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/LicenseApprovalClaim.java?rev=776225&r1=776224&r2=776225&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/LicenseApprovalClaim.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/LicenseApprovalClaim.java Tue May 19 08:10:18 2009
@@ -1,6 +1,6 @@
package org.apache.rat.report.claim.impl;
-import org.apache.rat.document.IResource;
+import org.apache.rat.document.IDocument;
import org.apache.rat.report.claim.IClaim;
@@ -16,7 +16,7 @@
* which indicates whether a license was approved or
* not.
*/
- public LicenseApprovalClaim(IResource pSubject, boolean pApproved) {
+ public LicenseApprovalClaim(IDocument pSubject, boolean pApproved) {
super(pSubject);
approved = pApproved;
}
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/LicenseFamilyClaim.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/LicenseFamilyClaim.java?rev=776225&r1=776224&r2=776225&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/LicenseFamilyClaim.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/LicenseFamilyClaim.java Tue May 19 08:10:18 2009
@@ -1,6 +1,6 @@
package org.apache.rat.report.claim.impl;
-import org.apache.rat.document.IResource;
+import org.apache.rat.document.IDocument;
import org.apache.rat.report.claim.LicenseFamilyCode;
import org.apache.rat.report.claim.LicenseFamilyName;
@@ -16,7 +16,7 @@
* Creates a new instance with the given subject and
* the given license family name.
*/
- public LicenseFamilyClaim(IResource pSubject, LicenseFamilyName pName,
+ public LicenseFamilyClaim(IDocument pSubject, LicenseFamilyName pName,
LicenseFamilyCode pCode, String pHeaderSample) {
super(pSubject, pCode, pHeaderSample);
licenseFamilyName = pName;
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/LicenseHeaderClaim.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/LicenseHeaderClaim.java?rev=776225&r1=776224&r2=776225&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/LicenseHeaderClaim.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/LicenseHeaderClaim.java Tue May 19 08:10:18 2009
@@ -1,6 +1,6 @@
package org.apache.rat.report.claim.impl;
-import org.apache.rat.document.IResource;
+import org.apache.rat.document.IDocument;
import org.apache.rat.report.claim.IClaim;
import org.apache.rat.report.claim.LicenseFamilyCode;
@@ -18,7 +18,7 @@
* Creates a new instance with the given subject, license
* family code, and header sample.
*/
- public LicenseHeaderClaim(IResource pSubject, LicenseFamilyCode pCode, String pHeaderSample) {
+ public LicenseHeaderClaim(IDocument pSubject, LicenseFamilyCode pCode, String pHeaderSample) {
super(pSubject);
licenseFamilyCode = pCode;
headerSample = pHeaderSample;
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/xml/CustomClaim.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/xml/CustomClaim.java?rev=776225&r1=776224&r2=776225&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/xml/CustomClaim.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/xml/CustomClaim.java Tue May 19 08:10:18 2009
@@ -3,7 +3,7 @@
*/
package org.apache.rat.report.claim.impl.xml;
-import org.apache.rat.document.IResource;
+import org.apache.rat.document.IDocument;
import org.apache.rat.report.claim.IClaim;
@@ -12,12 +12,12 @@
* suite and possibly not so useful otherwise.
*/
public class CustomClaim implements IClaim {
- private final IResource subject;
+ private final IDocument subject;
private final String predicate;
private final String object;
private final boolean isLiteral;
- public CustomClaim(final IResource subject, final String predicate, final String object, final boolean isLiteral) {
+ public CustomClaim(final IDocument subject, final String predicate, final String object, final boolean isLiteral) {
this.subject = subject;
this.predicate = predicate;
this.object = object;
@@ -34,7 +34,7 @@
return result;
}
- public IResource getSubject() {
+ public IDocument getSubject() {
return subject;
}
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/xml/SimpleXmlClaimReporter.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/xml/SimpleXmlClaimReporter.java?rev=776225&r1=776224&r2=776225&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/xml/SimpleXmlClaimReporter.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/xml/SimpleXmlClaimReporter.java Tue May 19 08:10:18 2009
@@ -20,7 +20,7 @@
import java.io.IOException;
-import org.apache.rat.document.IResource;
+import org.apache.rat.document.IDocument;
import org.apache.rat.report.RatReportFailedException;
import org.apache.rat.report.claim.IClaim;
import org.apache.rat.report.claim.IClaimReporter;
@@ -43,7 +43,7 @@
private static final String NAME = "name";
private final IXmlWriter writer;
- private IResource lastSubject;
+ private IDocument lastSubject;
public SimpleXmlClaimReporter(final IXmlWriter writer) {
this.writer = writer;
@@ -119,7 +119,7 @@
}
public void claim(IClaim pClaim) throws RatReportFailedException {
- final IResource subject = pClaim.getSubject();
+ final IDocument subject = pClaim.getSubject();
try {
if (!(subject.equals(lastSubject))) {
if (lastSubject != null) {
Modified: incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/MockLicenseMatcher.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/MockLicenseMatcher.java?rev=776225&r1=776224&r2=776225&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/MockLicenseMatcher.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/MockLicenseMatcher.java Tue May 19 08:10:18 2009
@@ -21,7 +21,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.rat.document.IResource;
+import org.apache.rat.document.IDocument;
import org.apache.rat.report.claim.IClaimReporter;
public class MockLicenseMatcher implements IHeaderMatcher {
@@ -30,7 +30,7 @@
public int resets = 0;
public boolean result = true;
- public boolean match(IResource subject, String line, IClaimReporter reporter) {
+ public boolean match(IDocument subject, String line, IClaimReporter reporter) {
lines.add(line);
return result;
}
Modified: incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/generation/GeneratedLicenseNotRequiredTest.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/generation/GeneratedLicenseNotRequiredTest.java?rev=776225&r1=776224&r2=776225&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/generation/GeneratedLicenseNotRequiredTest.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/generation/GeneratedLicenseNotRequiredTest.java Tue May 19 08:10:18 2009
@@ -22,7 +22,7 @@
import junit.framework.TestCase;
-import org.apache.rat.document.IResource;
+import org.apache.rat.document.IDocument;
import org.apache.rat.document.MockLocation;
import org.apache.rat.report.claim.impl.xml.MockClaimReporter;
@@ -43,7 +43,7 @@
}
public void testMatch() throws Exception {
- final IResource subject = new MockLocation("subject");
+ final IDocument subject = new MockLocation("subject");
assertFalse("Does not match regex", license.match(subject, "Not at all", reporter));
assertTrue("Matches regex", license.match(subject, "This is Generated", reporter));
}
Modified: incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/generation/JavaDocLicenseNotRequiredTest.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/generation/JavaDocLicenseNotRequiredTest.java?rev=776225&r1=776224&r2=776225&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/generation/JavaDocLicenseNotRequiredTest.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/generation/JavaDocLicenseNotRequiredTest.java Tue May 19 08:10:18 2009
@@ -24,7 +24,7 @@
import junit.framework.TestCase;
-import org.apache.rat.document.IResource;
+import org.apache.rat.document.IDocument;
import org.apache.rat.document.MockLocation;
import org.apache.rat.report.claim.impl.xml.MockClaimReporter;
import org.apache.rat.test.utils.Resources;
@@ -64,7 +64,7 @@
boolean result = false;
BufferedReader in = new BufferedReader(new FileReader(file));
String line = in.readLine();
- final IResource subject = new MockLocation("subject");
+ final IDocument subject = new MockLocation("subject");
while (line != null && !result) {
result = license.match(subject, line, reporter);
line = in.readLine();
Modified: incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/license/ApacheSoftwareLicense20Test.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/license/ApacheSoftwareLicense20Test.java?rev=776225&r1=776224&r2=776225&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/license/ApacheSoftwareLicense20Test.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/license/ApacheSoftwareLicense20Test.java Tue May 19 08:10:18 2009
@@ -20,7 +20,7 @@
import junit.framework.TestCase;
-import org.apache.rat.document.IResource;
+import org.apache.rat.document.IDocument;
import org.apache.rat.document.MockLocation;
import org.apache.rat.report.claim.impl.xml.MockClaimReporter;
@@ -53,7 +53,7 @@
public void testMatch() throws Exception {
ApacheSoftwareLicense20 worker = new ApacheSoftwareLicense20();
- final IResource subject = new MockLocation("subject");
+ final IDocument subject = new MockLocation("subject");
assertTrue(worker.match(subject, ApacheSoftwareLicense20.FIRST_LICENSE_LINE, reporter));
assertTrue(worker.match(subject, " Licensed under the Apache License, Version 2.0 (the \"License\");", reporter));
assertTrue(worker.match(subject, "Licensed under the Apache License, Version 2.0 (the \"License\");", reporter));
Modified: incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/license/OASISLicenseTest.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/license/OASISLicenseTest.java?rev=776225&r1=776224&r2=776225&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/license/OASISLicenseTest.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/license/OASISLicenseTest.java Tue May 19 08:10:18 2009
@@ -23,7 +23,7 @@
import junit.framework.TestCase;
-import org.apache.rat.document.IResource;
+import org.apache.rat.document.IDocument;
import org.apache.rat.document.MockLocation;
import org.apache.rat.report.claim.impl.xml.MockClaimReporter;
import org.apache.rat.test.utils.Resources;
@@ -68,7 +68,7 @@
BufferedReader in = new BufferedReader(new StringReader(LICENSE));
String line = in.readLine();
boolean result = false;
- final IResource subject = new MockLocation("subject");
+ final IDocument subject = new MockLocation("subject");
while (line != null) {
result = license.match(subject, line, reporter);
line = in.readLine();
@@ -83,7 +83,7 @@
BufferedReader in = Resources.getBufferedResourceReader("elements/Source.java");
String line = in.readLine();
boolean result = false;
- final IResource subject = new MockLocation("subject");
+ final IDocument subject = new MockLocation("subject");
while (line != null) {
result = license.match(subject, line, reporter);
line = in.readLine();
Modified: incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/license/W3CLicenseTest.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/license/W3CLicenseTest.java?rev=776225&r1=776224&r2=776225&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/license/W3CLicenseTest.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/license/W3CLicenseTest.java Tue May 19 08:10:18 2009
@@ -20,7 +20,7 @@
import junit.framework.TestCase;
-import org.apache.rat.document.IResource;
+import org.apache.rat.document.IDocument;
import org.apache.rat.document.MockLocation;
import org.apache.rat.report.claim.impl.xml.MockClaimReporter;
@@ -49,7 +49,7 @@
}
public void testMatch() throws Exception {
- final IResource subject = new MockLocation("subject");
+ final IDocument subject = new MockLocation("subject");
assertTrue("Expected matcher to return license", license.match(subject, COPYRIGHT_URL, reporter));
assertTrue("Expected matcher to return license", license.match(subject, COPYRIGHT_URL_COMMENTED, reporter));
assertTrue("Expected matcher to return license", license.match(subject, COPYRIGHT_URL_XML, reporter));
Modified: incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/util/MatcherMultiplexerTest.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/util/MatcherMultiplexerTest.java?rev=776225&r1=776224&r2=776225&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/util/MatcherMultiplexerTest.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/util/MatcherMultiplexerTest.java Tue May 19 08:10:18 2009
@@ -22,7 +22,7 @@
import org.apache.rat.analysis.IHeaderMatcher;
import org.apache.rat.analysis.MockLicenseMatcher;
-import org.apache.rat.document.IResource;
+import org.apache.rat.document.IDocument;
import org.apache.rat.document.MockLocation;
import org.apache.rat.report.claim.impl.xml.MockClaimReporter;
@@ -53,7 +53,7 @@
public void testMatcherLine() throws Exception {
matcherOne.result = false;
matcherTwo.result = false;
- final IResource subject = new MockLocation("subject");
+ final IDocument subject = new MockLocation("subject");
multiplexer.match(subject, LINE_ONE, reporter);
assertEquals("One line", 1, matcherOne.lines.size());
assertEquals("Same as line passed", LINE_ONE, matcherOne.lines.get(0));
Modified: incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/document/MockLocation.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/document/MockLocation.java?rev=776225&r1=776224&r2=776225&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/document/MockLocation.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/document/MockLocation.java Tue May 19 08:10:18 2009
@@ -18,7 +18,10 @@
*/
package org.apache.rat.document;
-public class MockLocation implements IResource {
+import java.io.IOException;
+import java.io.Reader;
+
+public class MockLocation implements IDocument {
public String name;
public String url;
@@ -45,4 +48,13 @@
return url;
}
+ public boolean isComposite() {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ public Reader reader() throws IOException {
+ throw new UnsupportedOperationException();
+ }
+
}
Modified: incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/policy/DefaultPolicyTest.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/policy/DefaultPolicyTest.java?rev=776225&r1=776224&r2=776225&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/policy/DefaultPolicyTest.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/policy/DefaultPolicyTest.java Tue May 19 08:10:18 2009
@@ -21,7 +21,7 @@
import junit.framework.TestCase;
import org.apache.rat.analysis.Claims;
-import org.apache.rat.document.IResource;
+import org.apache.rat.document.IDocument;
import org.apache.rat.document.MockLocation;
import org.apache.rat.license.Apache20LicenseFamily;
import org.apache.rat.license.OASISLicenseFamily;
@@ -52,7 +52,7 @@
}
public void testOtherPredicate() throws Exception {
- final IResource subject = new MockLocation("subject");
+ final IDocument subject = new MockLocation("subject");
final String predicate = "predicate";
final String object = "object";
policy.claim(new CustomClaim(subject, predicate, object, true));
@@ -60,7 +60,7 @@
}
public void testASLFamily() throws Exception {
- final IResource subject = new MockLocation("subject");
+ final IDocument subject = new MockLocation("subject");
policy.claim(new LicenseFamilyClaim(subject, Apache20LicenseFamily.APACHE_SOFTWARE_LICENSE_NAME, Claims.ASL_CODE, ""));
assertEquals("Approved claim", 1, reporter.claims.size());
assertApproval(true);
@@ -81,28 +81,28 @@
}
public void testOASISFamily() throws Exception {
- final IResource subject = new MockLocation("subject");
+ final IDocument subject = new MockLocation("subject");
policy.claim(new LicenseFamilyClaim(subject, OASISLicenseFamily.OASIS_OPEN_LICENSE_NAME, Claims.OASIS_CODE, ""));
assertEquals("Approved claim", 1, reporter.claims.size());
assertApproval(true);
}
public void testW3CFamily() throws Exception {
- final IResource subject = new MockLocation("subject");
+ final IDocument subject = new MockLocation("subject");
policy.claim(new LicenseFamilyClaim(subject, W3CSoftwareLicenseFamily.W3C_SOFTWARE_COPYRIGHT_NAME, Claims.W3C_CODE, ""));
assertEquals("Approved claim", 1, reporter.claims.size());
assertApproval(true);
}
public void testW3CDocFamily() throws Exception {
- final IResource subject = new MockLocation("subject");
+ final IDocument subject = new MockLocation("subject");
policy.claim(new LicenseFamilyClaim(subject, W3CDocumentLicenseFamily.W3C_DOCUMENT_COPYRIGHT_NAME, Claims.W3CD_CODE, ""));
assertEquals("Approved claim", 1, reporter.claims.size());
assertApproval(true);
}
public void testUnknownFamily() throws Exception {
- final IResource subject = new MockLocation("subject");
+ final IDocument subject = new MockLocation("subject");
policy.claim(new LicenseFamilyClaim(subject, LicenseFamilyName.UNKNOWN_LICENSE_FAMILY, LicenseFamilyCode.UNKNOWN, ""));
assertEquals("Approved claim", 1, reporter.claims.size());
assertApproval(false);
@@ -112,7 +112,7 @@
reporter = new MockClaimReporter();
LicenseFamilyName[] custom = {new LicenseFamilyName("Example")};
policy = new DefaultPolicy(reporter, custom);
- final IResource subject = new MockLocation("subject");
+ final IDocument subject = new MockLocation("subject");
policy.claim(new LicenseFamilyClaim(subject, LicenseFamilyName.UNKNOWN_LICENSE_FAMILY, LicenseFamilyCode.UNKNOWN, ""));
policy.claim(new LicenseFamilyClaim(subject, W3CDocumentLicenseFamily.W3C_DOCUMENT_COPYRIGHT_NAME, Claims.W3CD_CODE, ""));
policy.claim(new LicenseFamilyClaim(subject, W3CSoftwareLicenseFamily.W3C_SOFTWARE_COPYRIGHT_NAME, Claims.W3C_CODE, ""));
Modified: incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/report/analyser/HeaderCheckWorkerTest.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/report/analyser/HeaderCheckWorkerTest.java?rev=776225&r1=776224&r2=776225&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/report/analyser/HeaderCheckWorkerTest.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/report/analyser/HeaderCheckWorkerTest.java Tue May 19 08:10:18 2009
@@ -24,7 +24,7 @@
import junit.framework.TestCase;
import org.apache.rat.analysis.license.ApacheSoftwareLicense20;
-import org.apache.rat.document.IResource;
+import org.apache.rat.document.IDocument;
import org.apache.rat.document.MockLocation;
import org.apache.rat.report.claim.impl.xml.MockClaimReporter;
@@ -41,7 +41,7 @@
}
public void testIsFinished() throws Exception {
- final IResource subject = new MockLocation("subject");
+ final IDocument subject = new MockLocation("subject");
HeaderCheckWorker worker = new HeaderCheckWorker(new StringReader(""), new ApacheSoftwareLicense20(), reporter, subject);
assertFalse(worker.isFinished());
worker.read();
Modified: incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/report/claim/impl/xml/SimpleXmlClaimReporterTest.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/report/claim/impl/xml/SimpleXmlClaimReporterTest.java?rev=776225&r1=776224&r2=776225&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/report/claim/impl/xml/SimpleXmlClaimReporterTest.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/report/claim/impl/xml/SimpleXmlClaimReporterTest.java Tue May 19 08:10:18 2009
@@ -20,7 +20,7 @@
import junit.framework.TestCase;
-import org.apache.rat.document.IResource;
+import org.apache.rat.document.IDocument;
import org.apache.rat.document.MockLocation;
import org.apache.rat.report.xml.MockXmlWriter;
@@ -40,7 +40,7 @@
}
public void testClaimsAboutOneResource() throws Exception {
- final IResource subject = new MockLocation("subject");
+ final IDocument subject = new MockLocation("subject");
final String predicate = "predicate";
final String object = "object";
reporter.claim(new CustomClaim(subject, predicate, object, false));
@@ -60,7 +60,7 @@
}
public void testClaimsAboutTwoResource() throws Exception {
- final IResource subject = new MockLocation("subject");
+ final IDocument subject = new MockLocation("subject");
final String predicate = "predicate";
final String object = "object";
reporter.claim(new CustomClaim(subject, predicate, object, false));
@@ -70,7 +70,7 @@
assertTrue("Third call is predicate element", mockWriter.isOpenElement(predicate, 2));
assertTrue("Forth call is object attribute", mockWriter.isAttribute("name", object, 3));
assertTrue("Fifth call is close element", mockWriter.isCloseElement(4));
- final IResource subjectTwo = new MockLocation("another-subject");
+ final IDocument subjectTwo = new MockLocation("another-subject");
reporter.claim(new CustomClaim(subjectTwo, predicate, object, false));
assertEquals("Another found calls made", 11, mockWriter.calls.size());
assertTrue("Sixth call is close element", mockWriter.isCloseElement(5));
@@ -82,7 +82,7 @@
}
public void testLiteralClaim() throws Exception {
- final IResource subject = new MockLocation("subject");
+ final IDocument subject = new MockLocation("subject");
final String predicate = "predicate";
final String object = "object";
reporter.claim(new CustomClaim(subject, predicate, object, true));
Modified: incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/report/claim/util/ClaimReporterMultiplexerTest.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/report/claim/util/ClaimReporterMultiplexerTest.java?rev=776225&r1=776224&r2=776225&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/report/claim/util/ClaimReporterMultiplexerTest.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/report/claim/util/ClaimReporterMultiplexerTest.java Tue May 19 08:10:18 2009
@@ -20,7 +20,7 @@
import junit.framework.TestCase;
-import org.apache.rat.document.IResource;
+import org.apache.rat.document.IDocument;
import org.apache.rat.document.MockLocation;
import org.apache.rat.report.claim.IClaimReporter;
import org.apache.rat.report.claim.impl.xml.CustomClaim;
@@ -47,9 +47,9 @@
}
public void testClaim() throws Exception {
- final IResource subject = new MockLocation("subject");
+ final IDocument subject = new MockLocation("subject");
final String predicate = "predicate";
- final IResource otherSubject = new MockLocation("another subject");
+ final IDocument otherSubject = new MockLocation("another subject");
final String otherPredicate = "another predicate";
final String object = "object";
final String otherObject = "another object";
Modified: incubator/rat/main/trunk/apache-rat-tasks/src/test/java/org/example/Matcher.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-tasks/src/test/java/org/example/Matcher.java?rev=776225&r1=776224&r2=776225&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-tasks/src/test/java/org/example/Matcher.java (original)
+++ incubator/rat/main/trunk/apache-rat-tasks/src/test/java/org/example/Matcher.java Tue May 19 08:10:18 2009
@@ -19,7 +19,7 @@
import org.apache.rat.analysis.IHeaderMatcher;
import org.apache.rat.analysis.RatHeaderAnalysisException;
import org.apache.rat.analysis.license.BaseLicense;
-import org.apache.rat.document.IResource;
+import org.apache.rat.document.IDocument;
import org.apache.rat.report.claim.IClaimReporter;
import org.apache.rat.report.claim.LicenseFamilyCode;
import org.apache.rat.report.claim.LicenseFamilyName;
@@ -31,7 +31,7 @@
}
public void reset() {}
- public boolean match(IResource subject, String line, IClaimReporter reporter) throws RatHeaderAnalysisException {
+ public boolean match(IDocument subject, String line, IClaimReporter reporter) throws RatHeaderAnalysisException {
reportOnLicense(subject, reporter);
return true;
}