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/22 22:15:29 UTC
svn commit: r777689 [1/2] - in /incubator/rat/main/trunk:
apache-rat-core/src/main/java/org/apache/rat/
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/ja...
Author: rdonkin
Date: Fri May 22 20:15:28 2009
New Revision: 777689
URL: http://svn.apache.org/viewvc?rev=777689&view=rev
Log:
RAT-53 Repackaged and renamed key classes. https://issues.apache.org/jira/browse/RAT-53
Added:
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/api/Document.java
- copied, changed from r777688, 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/api/RatException.java
- copied, changed from r777688, incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/RatReportFailedException.java
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/api/Reporter.java
- copied, changed from r777688, incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/IClaimReporter.java
Removed:
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/report/RatReportFailedException.java
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/IClaimReporter.java
Modified:
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/DirectoryWalker.java
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/Report.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/IDocumentAnalyser.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/document/impl/AbstractMonolithicDocument.java
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/FileDocument.java
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/MonolithicFileDocument.java
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/guesser/ArchiveGuesser.java
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/guesser/BinaryGuesser.java
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/guesser/NoteGuesser.java
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/util/DocumentAnalyserMultiplexer.java
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/policy/DefaultPolicy.java
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/IReportable.java
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/RatReport.java
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/analyser/DefaultAnalyserFactory.java
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/analyser/DocumentHeaderAnalyser.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/analyser/RatReportAnalysisResultException.java
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/AbstractClaimReporter.java
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/ClaimAggregator.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/main/java/org/apache/rat/report/claim/util/ClaimReporterMultiplexer.java
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/xml/XmlReport.java
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/xml/XmlReportFactory.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/MockDocument.java
incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/document/MockDocumentAnalyser.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/document/impl/SingularFileDocumentTest.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/AnalyserFactoryTest.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/MockClaimReporter.java
incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportTest.java
incubator/rat/main/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java
incubator/rat/main/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/FilesReportable.java
incubator/rat/main/trunk/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
incubator/rat/main/trunk/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/ResourceCollectionContainer.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/DirectoryWalker.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/DirectoryWalker.java?rev=777689&r1=777688&r2=777689&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/DirectoryWalker.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/DirectoryWalker.java Fri May 22 20:15:28 2009
@@ -23,11 +23,11 @@
import java.util.Arrays;
import java.util.regex.Pattern;
-import org.apache.rat.document.IDocument;
+import org.apache.rat.api.Document;
+import org.apache.rat.api.RatException;
import org.apache.rat.document.impl.FileDocument;
import org.apache.rat.report.IReportable;
import org.apache.rat.report.RatReport;
-import org.apache.rat.report.RatReportFailedException;
/**
* Walks directories.
@@ -79,9 +79,9 @@
*
* @param report The report to process the directory with
* @param file the directory to process
- * @throws RatReportFailedException
+ * @throws RatException
*/
- private void processDirectory(RatReport report, final File file) throws RatReportFailedException {
+ private void processDirectory(RatReport report, final File file) throws RatException {
if (!isRestricted(file)) {
process(report, file);
}
@@ -94,7 +94,7 @@
* @param report the defined RatReport to run on this Directory walker.
*
*/
- public void run(final RatReport report) throws RatReportFailedException {
+ public void run(final RatReport report) throws RatException {
process(report, file);
}
@@ -103,9 +103,9 @@
*
* @param report the report to use in processing
* @param file the run the report against
- * @throws RatReportFailedException
+ * @throws RatException
*/
- private void process(final RatReport report, final File file) throws RatReportFailedException {
+ private void process(final RatReport report, final File file) throws RatException {
final File[] files = file.listFiles();
Arrays.sort(files, COMPARATOR);
if (files != null) {
@@ -120,9 +120,9 @@
*
* @param report the report to use in processing
* @param files the files to process (only directories will be processed)
- * @throws RatReportFailedException
+ * @throws RatException
*/
- private void processDirectories(final RatReport report, final File[] files) throws RatReportFailedException {
+ private void processDirectories(final RatReport report, final File[] files) throws RatException {
for (int i = 0; i < files.length; i++) {
final File file = files[i];
final String name = file.getName();
@@ -139,9 +139,9 @@
*
* @param report the report to use in processing
* @param files the files to process (only files will be processed)
- * @throws RatReportFailedException
+ * @throws RatException
*/
- private void processNonDirectories(final RatReport report, final File[] files) throws RatReportFailedException {
+ private void processNonDirectories(final RatReport report, final File[] files) throws RatException {
for (int i = 0; i < files.length; i++) {
final File file = files[i];
final String name = file.getName();
@@ -158,11 +158,11 @@
*
* @param report the report to process the file with
* @param file the file to be reported on
- * @throws RatReportFailedException
+ * @throws RatException
*/
- private void report(final RatReport report, File file) throws RatReportFailedException {
+ private void report(final RatReport report, File file) throws RatException {
- IDocument document = new FileDocument(file);
+ Document document = new FileDocument(file);
report.report(document);
}
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/Report.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/Report.java?rev=777689&r1=777688&r2=777689&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/Report.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/Report.java Fri May 22 20:15:28 2009
@@ -43,10 +43,10 @@
import org.apache.rat.analysis.IHeaderMatcher;
import org.apache.rat.annotation.AbstractLicenceAppender;
import org.apache.rat.annotation.ApacheV2LicenceAppender;
+import org.apache.rat.api.RatException;
import org.apache.rat.license.ILicenseFamily;
import org.apache.rat.report.IReportable;
import org.apache.rat.report.RatReport;
-import org.apache.rat.report.RatReportFailedException;
import org.apache.rat.report.claim.ClaimStatistic;
import org.apache.rat.report.xml.XmlReportFactory;
import org.apache.rat.report.xml.writer.IXmlWriter;
@@ -238,12 +238,12 @@
* @throws IOException
* @throws TransformerConfigurationException
* @throws InterruptedException
- * @throws RatReportFailedException
+ * @throws RatException
*/
public static void report(PrintStream out, IReportable base, final InputStream style, final IHeaderMatcher matcher,
final ILicenseFamily[] approvedLicenseNames)
throws IOException, TransformerConfigurationException,
- InterruptedException, RatReportFailedException {
+ InterruptedException, RatException {
report(new OutputStreamWriter(out), base, style, matcher, approvedLicenseNames);
}
@@ -260,11 +260,11 @@
* @throws TransformerConfigurationException
* @throws FileNotFoundException
* @throws InterruptedException
- * @throws RatReportFailedException
+ * @throws RatException
*/
public static ClaimStatistic report(Writer out, IReportable base, final InputStream style,
final IHeaderMatcher matcher, final ILicenseFamily[] approvedLicenseNames)
- throws IOException, TransformerConfigurationException, FileNotFoundException, InterruptedException, RatReportFailedException {
+ throws IOException, TransformerConfigurationException, FileNotFoundException, InterruptedException, RatException {
PipedReader reader = new PipedReader();
PipedWriter writer = new PipedWriter(reader);
ReportTransformer transformer = new ReportTransformer(out, style, reader);
@@ -284,10 +284,10 @@
* @param matcher the header matcher for matching licence headers
* @param approvedLicenseNames a list of licence families that are approved for use in the project
* @throws IOException
- * @throws RatReportFailedException
+ * @throws RatException
*/
public static ClaimStatistic report(final IReportable container, final Writer out, final IHeaderMatcher matcher,
- final ILicenseFamily[] approvedLicenseNames) throws IOException, RatReportFailedException {
+ final ILicenseFamily[] approvedLicenseNames) throws IOException, RatException {
IXmlWriter writer = new XmlWriter(out);
final ClaimStatistic statistic = new ClaimStatistic();
RatReport report = XmlReportFactory.createStandardReport(writer, matcher, approvedLicenseNames, statistic);
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=777689&r1=777688&r2=777689&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 Fri May 22 20:15:28 2009
@@ -18,8 +18,8 @@
*/
package org.apache.rat.analysis;
-import org.apache.rat.document.IDocument;
-import org.apache.rat.report.claim.IClaimReporter;
+import org.apache.rat.api.Document;
+import org.apache.rat.api.Reporter;
/**
* Matches text headers to known licenses.
@@ -41,5 +41,5 @@
* @param reporter TODO
* @return TODO
*/
- public boolean match(IDocument subject, String line, IClaimReporter reporter) throws RatHeaderAnalysisException;
+ public boolean match(Document subject, String line, Reporter 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=777689&r1=777688&r2=777689&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 Fri May 22 20:15:28 2009
@@ -22,9 +22,9 @@
import org.apache.rat.analysis.IHeaderMatcher;
import org.apache.rat.analysis.RatHeaderAnalysisException;
+import org.apache.rat.api.Document;
+import org.apache.rat.api.Reporter;
import org.apache.rat.api.MetaData;
-import org.apache.rat.document.IDocument;
-import org.apache.rat.report.claim.IClaimReporter;
public class GeneratedLicenseNotRequired implements IHeaderMatcher {
@@ -64,7 +64,7 @@
this.numberOfPatterns = linePatterns.length;
}
- public boolean match(IDocument subject, String line, IClaimReporter reporter) throws RatHeaderAnalysisException {
+ public boolean match(Document subject, String line, Reporter reporter) throws RatHeaderAnalysisException {
boolean result = false;
for (int i=0;i<numberOfPatterns;i++) {
if (linePatterns[i].matcher(line).matches()) {
@@ -76,7 +76,7 @@
return result;
}
- private void reportOnLicense(IDocument subject, IClaimReporter reporter) throws RatHeaderAnalysisException {
+ private void reportOnLicense(Document subject, Reporter reporter) throws RatHeaderAnalysisException {
subject.getMetaData().set(MetaData.RAT_LICENSE_FAMILY_CATEGORY_DATUM_GEN);
}
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=777689&r1=777688&r2=777689&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 Fri May 22 20:15:28 2009
@@ -22,9 +22,9 @@
import org.apache.rat.analysis.IHeaderMatcher;
import org.apache.rat.analysis.RatHeaderAnalysisException;
+import org.apache.rat.api.Document;
+import org.apache.rat.api.Reporter;
import org.apache.rat.api.MetaData;
-import org.apache.rat.document.IDocument;
-import org.apache.rat.report.claim.IClaimReporter;
/**
* JavaDocs are generated and so no license is required.
@@ -36,7 +36,7 @@
private static final Pattern JAVADOC_REGEX = Pattern.compile(JAVADOC_REGEX_DEFN);
- public boolean match(IDocument subject, String line, IClaimReporter reporter) throws RatHeaderAnalysisException {
+ public boolean match(Document subject, String line, Reporter reporter) throws RatHeaderAnalysisException {
boolean result = JAVADOC_REGEX.matcher(line).matches();
if (result) {
reportOnLicense(subject, reporter);
@@ -44,7 +44,7 @@
return result;
}
- private void reportOnLicense(IDocument subject, IClaimReporter reporter) throws RatHeaderAnalysisException {
+ private void reportOnLicense(Document subject, Reporter reporter) throws RatHeaderAnalysisException {
subject.getMetaData().set(MetaData.RAT_LICENSE_FAMILY_CATEGORY_DATUM_GEN);
}
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=777689&r1=777688&r2=777689&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 Fri May 22 20:15:28 2009
@@ -20,9 +20,9 @@
import org.apache.rat.analysis.IHeaderMatcher;
import org.apache.rat.analysis.RatHeaderAnalysisException;
+import org.apache.rat.api.Document;
+import org.apache.rat.api.Reporter;
import org.apache.rat.api.MetaData;
-import org.apache.rat.document.IDocument;
-import org.apache.rat.report.claim.IClaimReporter;
/**
* Matches Apache Software License, Version 2.0
@@ -38,7 +38,7 @@
super(MetaData.RAT_LICENSE_FAMILY_CATEGORY_DATUM_ASL, MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_APACHE_LICENSE_VERSION_2_0, "");
}
- public boolean match(IDocument subject, String line, IClaimReporter reporter) throws RatHeaderAnalysisException {
+ public boolean match(Document subject, String line, Reporter 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=777689&r1=777688&r2=777689&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 Fri May 22 20:15:28 2009
@@ -19,9 +19,9 @@
package org.apache.rat.analysis.license;
import org.apache.rat.analysis.RatHeaderAnalysisException;
+import org.apache.rat.api.Document;
+import org.apache.rat.api.Reporter;
import org.apache.rat.api.MetaData;
-import org.apache.rat.document.IDocument;
-import org.apache.rat.report.claim.IClaimReporter;
public class BaseLicense {
private final MetaData.Datum licenseFamilyCategory;
@@ -35,7 +35,7 @@
this.notes = notes;
}
- public final void reportOnLicense(IDocument subject, IClaimReporter reporter) throws RatHeaderAnalysisException {
+ public final void reportOnLicense(Document subject, Reporter reporter) throws RatHeaderAnalysisException {
final MetaData metaData = subject.getMetaData();
metaData.set(new MetaData.Datum(MetaData.RAT_URL_HEADER_SAMPLE, notes));
metaData.set(new MetaData.Datum(MetaData.RAT_URL_HEADER_CATEGORY,licenseFamilyCategory.getValue()));
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=777689&r1=777688&r2=777689&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 Fri May 22 20:15:28 2009
@@ -20,9 +20,9 @@
import org.apache.rat.analysis.IHeaderMatcher;
import org.apache.rat.analysis.RatHeaderAnalysisException;
+import org.apache.rat.api.Document;
+import org.apache.rat.api.Reporter;
import org.apache.rat.api.MetaData;
-import org.apache.rat.document.IDocument;
-import org.apache.rat.report.claim.IClaimReporter;
public class DojoLicenseHeader extends BaseLicense implements IHeaderMatcher {
@@ -49,7 +49,7 @@
}
- public boolean match(IDocument subject, String line, IClaimReporter reporter) throws RatHeaderAnalysisException {
+ public boolean match(Document subject, String line, Reporter 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=777689&r1=777688&r2=777689&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 Fri May 22 20:15:28 2009
@@ -22,9 +22,9 @@
import org.apache.rat.analysis.IHeaderMatcher;
import org.apache.rat.analysis.RatHeaderAnalysisException;
+import org.apache.rat.api.Document;
+import org.apache.rat.api.Reporter;
import org.apache.rat.api.MetaData;
-import org.apache.rat.document.IDocument;
-import org.apache.rat.report.claim.IClaimReporter;
/**
* Looks for documents contain the OASIS copyright claim plus derivative work clause.
@@ -48,7 +48,7 @@
super(MetaData.RAT_LICENSE_FAMILY_CATEGORY_DATUM_OASIS, MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_OASIS_OPEN_LICENSE, "No modifications allowed");
}
- public boolean match(IDocument subject, String line, IClaimReporter reporter) throws RatHeaderAnalysisException {
+ public boolean match(Document subject, String line, Reporter 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=777689&r1=777688&r2=777689&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 Fri May 22 20:15:28 2009
@@ -20,9 +20,9 @@
import org.apache.rat.analysis.IHeaderMatcher;
import org.apache.rat.analysis.RatHeaderAnalysisException;
+import org.apache.rat.api.Document;
+import org.apache.rat.api.Reporter;
import org.apache.rat.api.MetaData;
-import org.apache.rat.document.IDocument;
-import org.apache.rat.report.claim.IClaimReporter;
public class TMF854LicenseHeader extends BaseLicense implements IHeaderMatcher {
@@ -42,7 +42,7 @@
}
- public boolean match(IDocument subject, String line, IClaimReporter reporter) throws RatHeaderAnalysisException {
+ public boolean match(Document subject, String line, Reporter 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=777689&r1=777688&r2=777689&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 Fri May 22 20:15:28 2009
@@ -20,9 +20,9 @@
import org.apache.rat.analysis.IHeaderMatcher;
import org.apache.rat.analysis.RatHeaderAnalysisException;
+import org.apache.rat.api.Document;
+import org.apache.rat.api.Reporter;
import org.apache.rat.api.MetaData;
-import org.apache.rat.document.IDocument;
-import org.apache.rat.report.claim.IClaimReporter;
public class W3CDocLicense extends BaseLicense implements IHeaderMatcher {
@@ -37,7 +37,7 @@
}
- public boolean match(IDocument subject, String line, IClaimReporter reporter) throws RatHeaderAnalysisException {
+ public boolean match(Document subject, String line, Reporter 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=777689&r1=777688&r2=777689&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 Fri May 22 20:15:28 2009
@@ -20,9 +20,9 @@
import org.apache.rat.analysis.IHeaderMatcher;
import org.apache.rat.analysis.RatHeaderAnalysisException;
+import org.apache.rat.api.Document;
+import org.apache.rat.api.Reporter;
import org.apache.rat.api.MetaData;
-import org.apache.rat.document.IDocument;
-import org.apache.rat.report.claim.IClaimReporter;
public class W3CLicense extends BaseLicense implements IHeaderMatcher {
@@ -37,7 +37,7 @@
}
- public boolean match(IDocument subject, String line, IClaimReporter reporter) throws RatHeaderAnalysisException {
+ public boolean match(Document subject, String line, Reporter 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=777689&r1=777688&r2=777689&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 Fri May 22 20:15:28 2009
@@ -20,8 +20,8 @@
import org.apache.rat.analysis.IHeaderMatcher;
import org.apache.rat.analysis.RatHeaderAnalysisException;
-import org.apache.rat.document.IDocument;
-import org.apache.rat.report.claim.IClaimReporter;
+import org.apache.rat.api.Document;
+import org.apache.rat.api.Reporter;
/**
* Delegates to an ordered set of matchers.
@@ -37,7 +37,7 @@
numberOfMatchers = matchers.length;
}
- public boolean match(IDocument subject, String line, IClaimReporter reporter) throws RatHeaderAnalysisException {
+ public boolean match(Document subject, String line, Reporter reporter) throws RatHeaderAnalysisException {
boolean result = false;
for (int i=0;i<numberOfMatchers;i++) {
result = matchers[i].match(subject, line, reporter);
Copied: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/api/Document.java (from r777688, 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/api/Document.java?p2=incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/api/Document.java&p1=incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/IDocument.java&r1=777688&r2=777689&rev=777689&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/api/Document.java Fri May 22 20:15:28 2009
@@ -16,15 +16,15 @@
* specific language governing permissions and limitations *
* under the License. *
*/
-package org.apache.rat.document;
+package org.apache.rat.api;
import java.io.IOException;
import java.io.InputStream;
import java.io.Reader;
-import org.apache.rat.api.MetaData;
+import org.apache.rat.document.CompositeDocumentException;
-public interface IDocument {
+public interface Document {
public String getName();
Copied: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/api/RatException.java (from r777688, incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/RatReportFailedException.java)
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/api/RatException.java?p2=incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/api/RatException.java&p1=incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/RatReportFailedException.java&r1=777688&r2=777689&rev=777689&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/RatReportFailedException.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/api/RatException.java Fri May 22 20:15:28 2009
@@ -16,25 +16,25 @@
* specific language governing permissions and limitations *
* under the License. *
*/
-package org.apache.rat.report;
+package org.apache.rat.api;
-public class RatReportFailedException extends Exception {
+public class RatException extends Exception {
private static final long serialVersionUID = 4940711222435919034L;
- public RatReportFailedException() {
+ public RatException() {
super();
}
- public RatReportFailedException(String message, Throwable cause) {
+ public RatException(String message, Throwable cause) {
super(message, cause);
}
- public RatReportFailedException(String message) {
+ public RatException(String message) {
super(message);
}
- public RatReportFailedException(Throwable cause) {
+ public RatException(Throwable cause) {
super(cause);
}
}
Copied: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/api/Reporter.java (from r777688, incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/IClaimReporter.java)
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/api/Reporter.java?p2=incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/api/Reporter.java&p1=incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/IClaimReporter.java&r1=777688&r2=777689&rev=777689&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/IClaimReporter.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/api/Reporter.java Fri May 22 20:15:28 2009
@@ -16,12 +16,10 @@
* specific language governing permissions and limitations *
* under the License. *
*/
-package org.apache.rat.report.claim;
+package org.apache.rat.api;
-import org.apache.rat.document.IDocument;
-import org.apache.rat.report.RatReportFailedException;
-public interface IClaimReporter {
+public interface Reporter {
/**
* Starts a report on the given document.
@@ -29,5 +27,5 @@
* @param subject not null
* @throws RatReportFailedException
*/
- void report(IDocument subject) throws RatReportFailedException;
+ void report(Document subject) throws RatException;
}
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/IDocumentAnalyser.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/IDocumentAnalyser.java?rev=777689&r1=777688&r2=777689&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/IDocumentAnalyser.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/IDocumentAnalyser.java Fri May 22 20:15:28 2009
@@ -18,8 +18,10 @@
*/
package org.apache.rat.document;
+import org.apache.rat.api.Document;
+
public interface IDocumentAnalyser {
- public void analyse(IDocument document) throws RatDocumentAnalysisException;
+ public void analyse(Document document) throws RatDocumentAnalysisException;
}
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=777689&r1=777688&r2=777689&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 Fri May 22 20:15:28 2009
@@ -19,6 +19,7 @@
package org.apache.rat.document;
import org.apache.commons.collections.Transformer;
+import org.apache.rat.api.Document;
public class ToNameTransformer implements Transformer {
@@ -30,8 +31,8 @@
public Object transform(Object subject) {
Object result = null;
- if (subject != null && subject instanceof IDocument) {
- IDocument location = (IDocument) subject;
+ if (subject != null && subject instanceof Document) {
+ Document location = (Document) subject;
result = location.getName();
}
return result;
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/AbstractMonolithicDocument.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/AbstractMonolithicDocument.java?rev=777689&r1=777688&r2=777689&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/AbstractMonolithicDocument.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/AbstractMonolithicDocument.java Fri May 22 20:15:28 2009
@@ -18,14 +18,14 @@
*/
package org.apache.rat.document.impl;
+import org.apache.rat.api.Document;
import org.apache.rat.api.MetaData;
-import org.apache.rat.document.IDocument;
/**
* Abstract base class for monolithic documents.
*/
-public abstract class AbstractMonolithicDocument implements IDocument {
+public abstract class AbstractMonolithicDocument implements Document {
private final String name;
private final MetaData metaData;
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/FileDocument.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/FileDocument.java?rev=777689&r1=777688&r2=777689&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/FileDocument.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/FileDocument.java Fri May 22 20:15:28 2009
@@ -25,14 +25,14 @@
import java.io.InputStream;
import java.io.Reader;
+import org.apache.rat.api.Document;
import org.apache.rat.api.MetaData;
-import org.apache.rat.document.IDocument;
/**
* Document wrapping a file of undetermined composition.
*
*/
-public class FileDocument implements IDocument {
+public class FileDocument implements Document {
private final File file;
private final String name;
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/MonolithicFileDocument.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/MonolithicFileDocument.java?rev=777689&r1=777688&r2=777689&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/MonolithicFileDocument.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/MonolithicFileDocument.java Fri May 22 20:15:28 2009
@@ -27,7 +27,7 @@
import java.io.Reader;
import java.net.URL;
-import org.apache.rat.document.IDocument;
+import org.apache.rat.api.Document;
public class MonolithicFileDocument extends AbstractMonolithicDocument {
@@ -37,7 +37,7 @@
* Creates a new instance. The document is read from the
* given URL.
*/
- public static IDocument newInstance(final URL url) {
+ public static Document newInstance(final URL url) {
if ("file".equals(url.getProtocol())) {
final File f = new File(url.getFile());
return new MonolithicFileDocument(f);
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/guesser/ArchiveGuesser.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/guesser/ArchiveGuesser.java?rev=777689&r1=777688&r2=777689&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/guesser/ArchiveGuesser.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/guesser/ArchiveGuesser.java Fri May 22 20:15:28 2009
@@ -20,7 +20,7 @@
import java.util.Locale;
-import org.apache.rat.document.IDocument;
+import org.apache.rat.api.Document;
public class ArchiveGuesser {
@@ -31,7 +31,7 @@
"rar", "war",
};
- public static final boolean isArchive(final IDocument document) {
+ public static final boolean isArchive(final Document document) {
final String name = document.getName();
final boolean result = isArchive(name);
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/guesser/BinaryGuesser.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/guesser/BinaryGuesser.java?rev=777689&r1=777688&r2=777689&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/guesser/BinaryGuesser.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/guesser/BinaryGuesser.java Fri May 22 20:15:28 2009
@@ -22,14 +22,14 @@
import java.io.Reader;
import java.util.Locale;
-import org.apache.rat.document.IDocument;
+import org.apache.rat.api.Document;
/**
* TODO: factor into MIME guesser and MIME->binary guesser
*/
public class BinaryGuesser {
- private static boolean isBinaryDocument(IDocument document) {
+ private static boolean isBinaryDocument(Document document) {
boolean result = false;
Reader reader = null;
try
@@ -267,7 +267,7 @@
public static final int NON_ASCII_THREASHOLD = 256;
public static final int ASCII_CHAR_THREASHOLD = 8;
- public static final boolean isBinary(final IDocument document) {
+ public static final boolean isBinary(final Document document) {
// TODO: reimplement the binary test algorithm?
// TODO: more efficient to move into standard analysis
// TODO: then use binary as default
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/guesser/NoteGuesser.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/guesser/NoteGuesser.java?rev=777689&r1=777688&r2=777689&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/guesser/NoteGuesser.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/guesser/NoteGuesser.java Fri May 22 20:15:28 2009
@@ -21,7 +21,7 @@
import java.util.Arrays;
import java.util.List;
-import org.apache.rat.document.IDocument;
+import org.apache.rat.api.Document;
public class NoteGuesser {
@@ -67,7 +67,7 @@
return result;
}
- public static final boolean isNote(final IDocument document) {
+ public static final boolean isNote(final Document document) {
final String name = document.getName();
final boolean result = isNote(name);
return result;
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/util/DocumentAnalyserMultiplexer.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/util/DocumentAnalyserMultiplexer.java?rev=777689&r1=777688&r2=777689&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/util/DocumentAnalyserMultiplexer.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/util/DocumentAnalyserMultiplexer.java Fri May 22 20:15:28 2009
@@ -18,7 +18,7 @@
*/
package org.apache.rat.document.impl.util;
-import org.apache.rat.document.IDocument;
+import org.apache.rat.api.Document;
import org.apache.rat.document.IDocumentAnalyser;
import org.apache.rat.document.RatDocumentAnalysisException;
@@ -31,7 +31,7 @@
this.analysers = analysers;
}
- public void analyse(IDocument document) throws RatDocumentAnalysisException {
+ public void analyse(Document document) throws RatDocumentAnalysisException {
final int length = analysers.length;
for (int i=0;i<length;i++) {
analysers[i].analyse(document);
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/policy/DefaultPolicy.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/policy/DefaultPolicy.java?rev=777689&r1=777688&r2=777689&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/policy/DefaultPolicy.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/policy/DefaultPolicy.java Fri May 22 20:15:28 2009
@@ -20,9 +20,9 @@
import java.util.Arrays;
+import org.apache.rat.api.Document;
import org.apache.rat.api.MetaData;
import org.apache.rat.api.MetaData.Datum;
-import org.apache.rat.document.IDocument;
import org.apache.rat.document.IDocumentAnalyser;
import org.apache.rat.document.RatDocumentAnalysisException;
import org.apache.rat.license.ILicenseFamily;
@@ -69,7 +69,7 @@
Arrays.sort(this.approvedLicenseNames);
}
- public void reportLicenseApprovalClaim(final IDocument subject, final boolean isAcceptable) {
+ public void reportLicenseApprovalClaim(final Document subject, final boolean isAcceptable) {
final Datum datum;
if (isAcceptable) {
datum = MetaData.RAT_APPROVED_LICENSE_DATIM_TRUE;
@@ -79,7 +79,7 @@
subject.getMetaData().set(datum);
}
- public void analyse(final IDocument subject) throws RatDocumentAnalysisException {
+ public void analyse(final Document subject) throws RatDocumentAnalysisException {
if (subject != null) {
final String name = subject.getMetaData().value(MetaData.RAT_URL_LICENSE_FAMILY_NAME);
if (name != null) {
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/IReportable.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/IReportable.java?rev=777689&r1=777688&r2=777689&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/IReportable.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/IReportable.java Fri May 22 20:15:28 2009
@@ -18,7 +18,9 @@
*/
package org.apache.rat.report;
+import org.apache.rat.api.RatException;
+
public interface IReportable {
- public void run(RatReport report) throws RatReportFailedException;
+ public void run(RatReport report) throws RatException;
}
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/RatReport.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/RatReport.java?rev=777689&r1=777688&r2=777689&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/RatReport.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/RatReport.java Fri May 22 20:15:28 2009
@@ -18,13 +18,14 @@
*/
package org.apache.rat.report;
-import org.apache.rat.document.IDocument;
+import org.apache.rat.api.Document;
+import org.apache.rat.api.RatException;
public interface RatReport {
- public void startReport() throws RatReportFailedException;
+ public void startReport() throws RatException;
- public void report(IDocument document) throws RatReportFailedException;
+ public void report(Document document) throws RatException;
- public void endReport() throws RatReportFailedException;
+ public void endReport() throws RatException;
}
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/analyser/DefaultAnalyserFactory.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/analyser/DefaultAnalyserFactory.java?rev=777689&r1=777688&r2=777689&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/analyser/DefaultAnalyserFactory.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/analyser/DefaultAnalyserFactory.java Fri May 22 20:15:28 2009
@@ -19,14 +19,14 @@
package org.apache.rat.report.analyser;
import org.apache.rat.analysis.IHeaderMatcher;
+import org.apache.rat.api.Document;
+import org.apache.rat.api.Reporter;
import org.apache.rat.api.MetaData;
-import org.apache.rat.document.IDocument;
import org.apache.rat.document.IDocumentAnalyser;
import org.apache.rat.document.RatDocumentAnalysisException;
import org.apache.rat.document.impl.guesser.ArchiveGuesser;
import org.apache.rat.document.impl.guesser.BinaryGuesser;
import org.apache.rat.document.impl.guesser.NoteGuesser;
-import org.apache.rat.report.claim.IClaimReporter;
/**
* Creates default analysers.
@@ -34,7 +34,7 @@
*/
public class DefaultAnalyserFactory {
- public static final IDocumentAnalyser createDefaultAnalyser(final IClaimReporter reporter,
+ public static final IDocumentAnalyser createDefaultAnalyser(final Reporter reporter,
final IHeaderMatcher matcher) {
return new DefaultAnalyser(reporter, matcher);
@@ -42,16 +42,16 @@
private final static class DefaultAnalyser implements IDocumentAnalyser {
- private final IClaimReporter reporter;
+ private final Reporter reporter;
private final IHeaderMatcher matcher;
- public DefaultAnalyser(final IClaimReporter reporter, final IHeaderMatcher matcher) {
+ public DefaultAnalyser(final Reporter reporter, final IHeaderMatcher matcher) {
super();
this.reporter = reporter;
this.matcher = matcher;
}
- public void analyse(IDocument subject) throws RatDocumentAnalysisException {
+ public void analyse(Document subject) throws RatDocumentAnalysisException {
final MetaData.Datum documentCategory;
if (NoteGuesser.isNote(subject)) {
documentCategory = MetaData.RAT_DOCUMENT_CATEGORY_DATUM_NOTICE;
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/analyser/DocumentHeaderAnalyser.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/analyser/DocumentHeaderAnalyser.java?rev=777689&r1=777688&r2=777689&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/analyser/DocumentHeaderAnalyser.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/analyser/DocumentHeaderAnalyser.java Fri May 22 20:15:28 2009
@@ -23,24 +23,24 @@
import org.apache.rat.analysis.IHeaderMatcher;
import org.apache.rat.analysis.RatHeaderAnalysisException;
-import org.apache.rat.document.IDocument;
+import org.apache.rat.api.Document;
+import org.apache.rat.api.Reporter;
import org.apache.rat.document.IDocumentAnalyser;
import org.apache.rat.document.RatDocumentAnalysisException;
-import org.apache.rat.report.claim.IClaimReporter;
public class DocumentHeaderAnalyser implements IDocumentAnalyser {
private final IHeaderMatcher matcher;
// TODO: coupling to unknown license should be replaced
- private final IClaimReporter reporter;
+ private final Reporter reporter;
- public DocumentHeaderAnalyser(final IHeaderMatcher matcher, final IClaimReporter reporter) {
+ public DocumentHeaderAnalyser(final IHeaderMatcher matcher, final Reporter reporter) {
super();
this.matcher = matcher;
this.reporter = reporter;
}
- public void analyse(IDocument document) throws RatDocumentAnalysisException {
+ public void analyse(Document document) throws RatDocumentAnalysisException {
Reader reader = null;
try {
reader = document.reader();
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=777689&r1=777688&r2=777689&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 Fri May 22 20:15:28 2009
@@ -24,9 +24,9 @@
import org.apache.rat.analysis.IHeaderMatcher;
import org.apache.rat.analysis.RatHeaderAnalysisException;
+import org.apache.rat.api.Document;
+import org.apache.rat.api.Reporter;
import org.apache.rat.api.MetaData;
-import org.apache.rat.document.IDocument;
-import org.apache.rat.report.claim.IClaimReporter;
/**
* <p>Reads from a stream to check license.</p>
@@ -39,8 +39,8 @@
private final int numberOfRetainedHeaderLines;
private final BufferedReader reader;
private final IHeaderMatcher matcher;
- private final IClaimReporter reporter;
- private final IDocument subject;
+ private final Reporter reporter;
+ private final Document subject;
private boolean match = false;
@@ -48,7 +48,7 @@
private boolean finished = false;
public HeaderCheckWorker(Reader reader, int numberOfRetainedHeaderLine,
- final IHeaderMatcher matcher, final IClaimReporter reporter, final IDocument name) {
+ final IHeaderMatcher matcher, final Reporter reporter, final Document name) {
this(new BufferedReader(reader), numberOfRetainedHeaderLine, matcher, reporter, name);
}
@@ -59,17 +59,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 IDocument name) {
+ public HeaderCheckWorker(Reader reader, final IHeaderMatcher matcher, final Reporter reporter, final Document name) {
this(new BufferedReader(reader), matcher, reporter, name);
}
public HeaderCheckWorker(BufferedReader reader, final IHeaderMatcher matcher,
- final IClaimReporter reporter, final IDocument name) {
+ final Reporter reporter, final Document 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 IDocument name) {
+ final Reporter reporter, final Document 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/analyser/RatReportAnalysisResultException.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/analyser/RatReportAnalysisResultException.java?rev=777689&r1=777688&r2=777689&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/analyser/RatReportAnalysisResultException.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/analyser/RatReportAnalysisResultException.java Fri May 22 20:15:28 2009
@@ -18,8 +18,8 @@
*/
package org.apache.rat.report.analyser;
+import org.apache.rat.api.RatException;
import org.apache.rat.document.RatDocumentAnalysisException;
-import org.apache.rat.report.RatReportFailedException;
public class RatReportAnalysisResultException extends RatDocumentAnalysisException {
@@ -30,11 +30,11 @@
super(MESSAGE);
}
- public RatReportAnalysisResultException(RatReportFailedException cause) {
+ public RatReportAnalysisResultException(RatException cause) {
super(MESSAGE, cause);
}
- public RatReportAnalysisResultException(String msg, RatReportFailedException cause) {
+ public RatReportAnalysisResultException(String msg, RatException cause) {
super(msg, cause);
}
}
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/AbstractClaimReporter.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/AbstractClaimReporter.java?rev=777689&r1=777688&r2=777689&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/AbstractClaimReporter.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/AbstractClaimReporter.java Fri May 22 20:15:28 2009
@@ -1,17 +1,17 @@
package org.apache.rat.report.claim.impl;
+import org.apache.rat.api.Document;
+import org.apache.rat.api.RatException;
+import org.apache.rat.api.Reporter;
import org.apache.rat.api.MetaData;
-import org.apache.rat.document.IDocument;
-import org.apache.rat.report.RatReportFailedException;
-import org.apache.rat.report.claim.IClaimReporter;
/**
- * Abstract base implementation of {@link IClaimReporter}.
+ * Abstract base implementation of {@link Reporter}.
* It is strongly suggested, that implementations derive from
* this class.
*/
-public abstract class AbstractClaimReporter implements IClaimReporter {
+public abstract class AbstractClaimReporter implements Reporter {
protected void handleDocumentCategoryClaim(String documentCategoryName) {
// Does nothing
@@ -29,7 +29,7 @@
// Does nothing
}
- private void writeDocumentClaim(IDocument subject) {
+ private void writeDocumentClaim(Document subject) {
final MetaData metaData = subject.getMetaData();
writeHeaderCategory(metaData);
writeLicenseFamilyName(metaData);
@@ -77,7 +77,7 @@
}
}
- public void report(IDocument subject) throws RatReportFailedException {
+ public void report(Document subject) throws RatException {
writeDocumentClaim(subject);
}
}
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/ClaimAggregator.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/ClaimAggregator.java?rev=777689&r1=777688&r2=777689&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/ClaimAggregator.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/ClaimAggregator.java Fri May 22 20:15:28 2009
@@ -3,11 +3,11 @@
import java.util.HashMap;
import java.util.Map;
+import org.apache.rat.api.Document;
+import org.apache.rat.api.RatException;
+import org.apache.rat.api.Reporter;
import org.apache.rat.api.MetaData;
-import org.apache.rat.document.IDocument;
-import org.apache.rat.report.RatReportFailedException;
import org.apache.rat.report.claim.ClaimStatistic;
-import org.apache.rat.report.claim.IClaimReporter;
/**
@@ -15,13 +15,13 @@
* of claims.
*/
public class ClaimAggregator extends AbstractClaimReporter {
- private final IClaimReporter reporter;
+ private final Reporter reporter;
private final Map numsByLicenseFamilyName = new HashMap();
private final Map numsByLicenseFamilyCode = new HashMap();
private final Map numsByFileType = new HashMap();
private int numApproved, numUnApproved, numGenerated, numUnknown;
- public ClaimAggregator(IClaimReporter pReporter) {
+ public ClaimAggregator(Reporter pReporter) {
reporter = pReporter;
}
@@ -74,7 +74,7 @@
}
- public void report(IDocument document) throws RatReportFailedException {
+ public void report(Document document) throws RatException {
super.report(document);
if (reporter != null) {
reporter.report(document);
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=777689&r1=777688&r2=777689&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 Fri May 22 20:15:28 2009
@@ -20,13 +20,13 @@
import java.io.IOException;
+import org.apache.rat.api.Document;
+import org.apache.rat.api.RatException;
+import org.apache.rat.api.Reporter;
import org.apache.rat.api.MetaData;
-import org.apache.rat.document.IDocument;
-import org.apache.rat.report.RatReportFailedException;
-import org.apache.rat.report.claim.IClaimReporter;
import org.apache.rat.report.xml.writer.IXmlWriter;
-public class SimpleXmlClaimReporter implements IClaimReporter {
+public class SimpleXmlClaimReporter implements Reporter {
public static final String LICENSE_APPROVAL_PREDICATE = "license-approval";
public static final String LICENSE_FAMILY_PREDICATE = "license-family";
public static final String HEADER_SAMPLE_PREDICATE = "header-sample";
@@ -52,10 +52,10 @@
* @param pLiteral Whether to write the object as an element (true),
* or an attribute (false).
* @throws IOException An I/O error occurred while writing the claim.
- * @throws RatReportFailedException Another error occurred while writing the claim.
+ * @throws RatException Another error occurred while writing the claim.
*/
protected void writeClaim(String pPredicate, String pObject, boolean pLiteral)
- throws IOException, RatReportFailedException {
+ throws IOException, RatException {
if (pLiteral) {
writer.openElement(pPredicate).content(pObject).closeElement();
} else {
@@ -63,7 +63,7 @@
}
}
- public void report(final IDocument subject) throws RatReportFailedException {
+ public void report(final Document subject) throws RatException {
try {
if (firstTime) {
firstTime = false;
@@ -73,12 +73,12 @@
writer.openElement("resource").attribute(NAME, subject.getName());
writeDocumentClaims(subject);
} catch (IOException e) {
- throw new RatReportFailedException("XML writing failure: " + e.getMessage()
+ throw new RatException("XML writing failure: " + e.getMessage()
+ " subject: " + subject, e);
}
}
- private void writeDocumentClaims(final IDocument subject) throws IOException, RatReportFailedException {
+ private void writeDocumentClaims(final Document subject) throws IOException, RatException {
final MetaData metaData = subject.getMetaData();
writeHeaderSample(metaData);
writeLicenseFamilyCategory(metaData);
@@ -88,42 +88,42 @@
writeDocumentCategory(metaData);
}
- private void writeApprovedLicense(final MetaData metaData) throws IOException, RatReportFailedException {
+ private void writeApprovedLicense(final MetaData metaData) throws IOException, RatException {
final String approvedLicense = metaData.value(MetaData.RAT_URL_APPROVED_LICENSE);
if (approvedLicense != null) {
writeClaim(LICENSE_APPROVAL_PREDICATE, approvedLicense, false);
}
}
- private void writeLicenseFamilyName(final MetaData metaData) throws IOException, RatReportFailedException {
+ private void writeLicenseFamilyName(final MetaData metaData) throws IOException, RatException {
final String licenseFamilyName = metaData.value(MetaData.RAT_URL_LICENSE_FAMILY_NAME);
if (licenseFamilyName != null) {
writeClaim(LICENSE_FAMILY_PREDICATE, licenseFamilyName, false);
}
}
- private void writeHeaderCategory(final MetaData metaData) throws IOException, RatReportFailedException {
+ private void writeHeaderCategory(final MetaData metaData) throws IOException, RatException {
final String headerCategory = metaData.value(MetaData.RAT_URL_HEADER_CATEGORY);
if (headerCategory != null) {
writeClaim(HEADER_TYPE_PREDICATE, headerCategory, false);
}
}
- private void writeLicenseFamilyCategory(final MetaData metaData) throws IOException, RatReportFailedException {
+ private void writeLicenseFamilyCategory(final MetaData metaData) throws IOException, RatException {
final String licenseFamilyCategory = metaData.value(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY);
if (licenseFamilyCategory != null) {
writeClaim(LICENSE_FAMILY_PREDICATE, licenseFamilyCategory, false);
}
}
- private void writeHeaderSample(final MetaData metaData) throws IOException, RatReportFailedException {
+ private void writeHeaderSample(final MetaData metaData) throws IOException, RatException {
final String sample = metaData.value(MetaData.RAT_URL_HEADER_SAMPLE);
if (sample != null) {
writeClaim(HEADER_SAMPLE_PREDICATE, sample, true);
}
}
- private void writeDocumentCategory(final MetaData metaData) throws IOException, RatReportFailedException {
+ private void writeDocumentCategory(final MetaData metaData) throws IOException, RatException {
final String documentCategory = metaData.value(MetaData.RAT_URL_DOCUMENT_CATEGORY);
if (documentCategory != null) {
writeClaim(FILE_TYPE_PREDICATE, documentCategory, false);
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/util/ClaimReporterMultiplexer.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/util/ClaimReporterMultiplexer.java?rev=777689&r1=777688&r2=777689&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/util/ClaimReporterMultiplexer.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/util/ClaimReporterMultiplexer.java Fri May 22 20:15:28 2009
@@ -18,20 +18,20 @@
*/
package org.apache.rat.report.claim.util;
-import org.apache.rat.document.IDocument;
-import org.apache.rat.report.RatReportFailedException;
-import org.apache.rat.report.claim.IClaimReporter;
+import org.apache.rat.api.Document;
+import org.apache.rat.api.RatException;
+import org.apache.rat.api.Reporter;
-public class ClaimReporterMultiplexer implements IClaimReporter {
+public class ClaimReporterMultiplexer implements Reporter {
- private final IClaimReporter[] reporters;
+ private final Reporter[] reporters;
- public ClaimReporterMultiplexer(final IClaimReporter[] reporters) {
+ public ClaimReporterMultiplexer(final Reporter[] reporters) {
super();
this.reporters = reporters;
}
- public void report(IDocument document) throws RatReportFailedException {
+ public void report(Document document) throws RatException {
final int length = reporters.length;
for (int i=0;i<length;i++) {
reporters[i].report(document);
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/xml/XmlReport.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/xml/XmlReport.java?rev=777689&r1=777688&r2=777689&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/xml/XmlReport.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/xml/XmlReport.java Fri May 22 20:15:28 2009
@@ -20,39 +20,39 @@
import java.io.IOException;
-import org.apache.rat.document.IDocument;
+import org.apache.rat.api.Document;
+import org.apache.rat.api.RatException;
+import org.apache.rat.api.Reporter;
import org.apache.rat.document.IDocumentAnalyser;
import org.apache.rat.document.RatDocumentAnalysisException;
import org.apache.rat.report.RatReport;
-import org.apache.rat.report.RatReportFailedException;
-import org.apache.rat.report.claim.IClaimReporter;
import org.apache.rat.report.xml.writer.IXmlWriter;
class XmlReport implements RatReport {
private final IDocumentAnalyser analyser;
private final IXmlWriter writer;
- private final IClaimReporter reporter;
+ private final Reporter reporter;
- public XmlReport(final IXmlWriter writer, IDocumentAnalyser analyser, final IClaimReporter reporter) {
+ public XmlReport(final IXmlWriter writer, IDocumentAnalyser analyser, final Reporter reporter) {
this.analyser = analyser;
this.writer = writer;
this.reporter = reporter;
}
- public void startReport() throws RatReportFailedException {
+ public void startReport() throws RatException {
try {
writer.openElement("rat-report");
} catch (IOException e) {
- throw new RatReportFailedException("Cannot open start element", e);
+ throw new RatException("Cannot open start element", e);
}
}
- public void endReport() throws RatReportFailedException {
+ public void endReport() throws RatException {
try {
writer.closeDocument();
} catch (IOException e) {
- throw new RatReportFailedException("Cannot close last element", e);
+ throw new RatException("Cannot close last element", e);
}
}
@@ -62,12 +62,12 @@
*
* @param document the document to report on.
*/
- public void report(IDocument subject) throws RatReportFailedException {
+ public void report(Document subject) throws RatException {
try {
analyser.analyse(subject);
reporter.report(subject);
} catch (RatDocumentAnalysisException e) {
- throw new RatReportFailedException("Analysis failed", e);
+ throw new RatException("Analysis failed", e);
}
}
}
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/xml/XmlReportFactory.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/xml/XmlReportFactory.java?rev=777689&r1=777688&r2=777689&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/xml/XmlReportFactory.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/xml/XmlReportFactory.java Fri May 22 20:15:28 2009
@@ -19,16 +19,16 @@
package org.apache.rat.report.xml;
import org.apache.rat.analysis.IHeaderMatcher;
-import org.apache.rat.document.IDocument;
+import org.apache.rat.api.Document;
+import org.apache.rat.api.RatException;
+import org.apache.rat.api.Reporter;
import org.apache.rat.document.IDocumentAnalyser;
import org.apache.rat.document.impl.util.DocumentAnalyserMultiplexer;
import org.apache.rat.license.ILicenseFamily;
import org.apache.rat.policy.DefaultPolicy;
import org.apache.rat.report.RatReport;
-import org.apache.rat.report.RatReportFailedException;
import org.apache.rat.report.analyser.DefaultAnalyserFactory;
import org.apache.rat.report.claim.ClaimStatistic;
-import org.apache.rat.report.claim.IClaimReporter;
import org.apache.rat.report.claim.impl.ClaimAggregator;
import org.apache.rat.report.claim.impl.xml.SimpleXmlClaimReporter;
import org.apache.rat.report.xml.writer.IXmlWriter;
@@ -48,7 +48,7 @@
final ClaimStatistic pStatistic) {
// TODO: this isn't very elegant :-/
// TODO: should really pass in analysers but this means injecting reporter
- final IClaimReporter reporter;
+ final Reporter reporter;
if (pStatistic == null) {
reporter = new SimpleXmlClaimReporter(writer);
} else {
@@ -66,15 +66,15 @@
return result;
}
return new RatReport(){
- public void endReport() throws RatReportFailedException {
+ public void endReport() throws RatException {
result.endReport();
((ClaimAggregator) reporter).fillClaimStatistic(pStatistic);
}
- public void report(IDocument pDocument)
- throws RatReportFailedException {
+ public void report(Document pDocument)
+ throws RatException {
result.report(pDocument);
}
- public void startReport() throws RatReportFailedException {
+ public void startReport() throws RatException {
result.startReport();
}
};
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=777689&r1=777688&r2=777689&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 Fri May 22 20:15:28 2009
@@ -21,8 +21,8 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.rat.document.IDocument;
-import org.apache.rat.report.claim.IClaimReporter;
+import org.apache.rat.api.Document;
+import org.apache.rat.api.Reporter;
public class MockLicenseMatcher implements IHeaderMatcher {
@@ -30,7 +30,7 @@
public int resets = 0;
public boolean result = true;
- public boolean match(IDocument subject, String line, IClaimReporter reporter) {
+ public boolean match(Document subject, String line, Reporter 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=777689&r1=777688&r2=777689&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 Fri May 22 20:15:28 2009
@@ -22,7 +22,7 @@
import junit.framework.TestCase;
-import org.apache.rat.document.IDocument;
+import org.apache.rat.api.Document;
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 IDocument subject = new MockLocation("subject");
+ final Document 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=777689&r1=777688&r2=777689&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 Fri May 22 20:15:28 2009
@@ -24,7 +24,7 @@
import junit.framework.TestCase;
-import org.apache.rat.document.IDocument;
+import org.apache.rat.api.Document;
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 IDocument subject = new MockLocation("subject");
+ final Document 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=777689&r1=777688&r2=777689&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 Fri May 22 20:15:28 2009
@@ -20,7 +20,7 @@
import junit.framework.TestCase;
-import org.apache.rat.document.IDocument;
+import org.apache.rat.api.Document;
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 IDocument subject = new MockLocation("subject");
+ final Document 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=777689&r1=777688&r2=777689&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 Fri May 22 20:15:28 2009
@@ -23,7 +23,7 @@
import junit.framework.TestCase;
-import org.apache.rat.document.IDocument;
+import org.apache.rat.api.Document;
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 IDocument subject = new MockLocation("subject");
+ final Document 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 IDocument subject = new MockLocation("subject");
+ final Document 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=777689&r1=777688&r2=777689&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 Fri May 22 20:15:28 2009
@@ -20,7 +20,7 @@
import junit.framework.TestCase;
-import org.apache.rat.document.IDocument;
+import org.apache.rat.api.Document;
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 IDocument subject = new MockLocation("subject");
+ final Document 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=777689&r1=777688&r2=777689&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 Fri May 22 20:15:28 2009
@@ -22,7 +22,7 @@
import org.apache.rat.analysis.IHeaderMatcher;
import org.apache.rat.analysis.MockLicenseMatcher;
-import org.apache.rat.document.IDocument;
+import org.apache.rat.api.Document;
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 IDocument subject = new MockLocation("subject");
+ final Document 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/MockDocument.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/document/MockDocument.java?rev=777689&r1=777688&r2=777689&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/document/MockDocument.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/document/MockDocument.java Fri May 22 20:15:28 2009
@@ -22,9 +22,10 @@
import java.io.InputStream;
import java.io.Reader;
+import org.apache.rat.api.Document;
import org.apache.rat.api.MetaData;
-public class MockDocument implements IDocument {
+public class MockDocument implements Document {
public Reader reader;
public String name;
Modified: incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/document/MockDocumentAnalyser.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/document/MockDocumentAnalyser.java?rev=777689&r1=777688&r2=777689&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/document/MockDocumentAnalyser.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/document/MockDocumentAnalyser.java Fri May 22 20:15:28 2009
@@ -21,11 +21,13 @@
import java.util.ArrayList;
import java.util.List;
+import org.apache.rat.api.Document;
+
public class MockDocumentAnalyser implements IDocumentAnalyser {
public List matches = new ArrayList();
- public void analyse(IDocument document) throws RatDocumentAnalysisException {
+ public void analyse(Document document) throws RatDocumentAnalysisException {
matches.add(document);
}