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 [2/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...
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=777689&r1=777688&r2=777689&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 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 MockLocation implements IDocument {
+public class MockLocation implements Document {
public String name;
public String url;
Modified: incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/document/impl/SingularFileDocumentTest.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/document/impl/SingularFileDocumentTest.java?rev=777689&r1=777688&r2=777689&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/document/impl/SingularFileDocumentTest.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/document/impl/SingularFileDocumentTest.java Fri May 22 20:15:28 2009
@@ -24,11 +24,11 @@
import junit.framework.TestCase;
-import org.apache.rat.document.IDocument;
+import org.apache.rat.api.Document;
import org.apache.rat.test.utils.Resources;
public class SingularFileDocumentTest extends TestCase {
- private IDocument document;
+ private Document document;
private File file;
protected void setUp() throws Exception {
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=777689&r1=777688&r2=777689&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 Fri May 22 20:15:28 2009
@@ -20,8 +20,8 @@
import junit.framework.TestCase;
+import org.apache.rat.api.Document;
import org.apache.rat.api.MetaData;
-import org.apache.rat.document.IDocument;
import org.apache.rat.document.MockLocation;
import org.apache.rat.report.claim.impl.xml.MockClaimReporter;
@@ -30,7 +30,7 @@
MockClaimReporter reporter;
DefaultPolicy policy;
- private IDocument subject;
+ private Document subject;
protected void setUp() throws Exception {
super.setUp();
Modified: incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/report/analyser/AnalyserFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/report/analyser/AnalyserFactoryTest.java?rev=777689&r1=777688&r2=777689&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/report/analyser/AnalyserFactoryTest.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/report/analyser/AnalyserFactoryTest.java Fri May 22 20:15:28 2009
@@ -25,10 +25,10 @@
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.impl.MonolithicFileDocument;
-import org.apache.rat.report.claim.IClaimReporter;
import org.apache.rat.report.claim.impl.xml.SimpleXmlClaimReporter;
import org.apache.rat.report.xml.writer.impl.base.XmlWriter;
@@ -45,7 +45,7 @@
reporter = new SimpleXmlClaimReporter(writer);
matcherStub = new IHeaderMatcher() {
- public boolean match(IDocument subject, String line, IClaimReporter reporter) throws RatHeaderAnalysisException {
+ public boolean match(Document subject, String line, Reporter reporter) throws RatHeaderAnalysisException {
return false;
}
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=777689&r1=777688&r2=777689&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 Fri May 22 20:15:28 2009
@@ -24,7 +24,7 @@
import junit.framework.TestCase;
import org.apache.rat.analysis.license.ApacheSoftwareLicense20;
-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;
@@ -41,7 +41,7 @@
}
public void testIsFinished() throws Exception {
- final IDocument subject = new MockLocation("subject");
+ final Document 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/MockClaimReporter.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/report/claim/impl/xml/MockClaimReporter.java?rev=777689&r1=777688&r2=777689&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/report/claim/impl/xml/MockClaimReporter.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/report/claim/impl/xml/MockClaimReporter.java Fri May 22 20:15:28 2009
@@ -18,12 +18,12 @@
*/
package org.apache.rat.report.claim.impl.xml;
-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 MockClaimReporter implements IClaimReporter {
+public class MockClaimReporter implements Reporter {
- public void report(IDocument document) throws RatReportFailedException {
+ public void report(Document document) throws RatException {
}
}
Modified: incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportTest.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportTest.java?rev=777689&r1=777688&r2=777689&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportTest.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportTest.java Fri May 22 20:15:28 2009
@@ -27,10 +27,10 @@
import org.apache.rat.DirectoryWalker;
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.report.analyser.DefaultAnalyserFactory;
-import org.apache.rat.report.claim.IClaimReporter;
import org.apache.rat.report.claim.impl.xml.SimpleXmlClaimReporter;
import org.apache.rat.report.xml.writer.IXmlWriter;
import org.apache.rat.report.xml.writer.impl.base.XmlWriter;
@@ -51,7 +51,7 @@
final SimpleXmlClaimReporter reporter = new SimpleXmlClaimReporter(writer);
final IHeaderMatcher matcher = new IHeaderMatcher() {
- public boolean match(IDocument subject, String line, IClaimReporter reporter) throws RatHeaderAnalysisException {
+ public boolean match(Document subject, String line, Reporter reporter) throws RatHeaderAnalysisException {
return false;
}
Modified: incubator/rat/main/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java?rev=777689&r1=777688&r2=777689&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java (original)
+++ incubator/rat/main/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java Fri May 22 20:15:28 2009
@@ -39,9 +39,9 @@
import org.apache.rat.Report;
import org.apache.rat.analysis.IHeaderMatcher;
import org.apache.rat.analysis.util.HeaderMatcherMultiplexer;
+import org.apache.rat.api.RatException;
import org.apache.rat.license.ILicenseFamily;
import org.apache.rat.report.IReportable;
-import org.apache.rat.report.RatReportFailedException;
import org.apache.rat.report.claim.ClaimStatistic;
import org.codehaus.plexus.util.DirectoryScanner;
@@ -353,7 +353,7 @@
{
throw new MojoExecutionException( e.getMessage(), e );
}
- catch ( RatReportFailedException e )
+ catch ( RatException e )
{
throw new MojoExecutionException( e.getMessage(), e );
}
Modified: incubator/rat/main/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/FilesReportable.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/FilesReportable.java?rev=777689&r1=777688&r2=777689&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/FilesReportable.java (original)
+++ incubator/rat/main/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/FilesReportable.java Fri May 22 20:15:28 2009
@@ -26,12 +26,12 @@
import java.io.InputStreamReader;
import java.io.Reader;
+import org.apache.rat.api.Document;
import org.apache.rat.api.MetaData;
-import org.apache.rat.document.IDocument;
+import org.apache.rat.api.RatException;
import org.apache.rat.document.impl.DocumentImplUtils;
import org.apache.rat.report.IReportable;
import org.apache.rat.report.RatReport;
-import org.apache.rat.report.RatReportFailedException;
/**
@@ -59,7 +59,7 @@
this.files = files;
}
- public void run( RatReport report ) throws RatReportFailedException
+ public void run( RatReport report ) throws RatException
{
FileDocument document = new FileDocument();
for ( int i = 0; i < files.length; i++ )
@@ -70,7 +70,7 @@
}
}
- private class FileDocument implements IDocument
+ private class FileDocument implements Document
{
private File file;
private final MetaData metaData = new MetaData();
Modified: incubator/rat/main/trunk/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java?rev=777689&r1=777688&r2=777689&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java (original)
+++ incubator/rat/main/trunk/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java Fri May 22 20:15:28 2009
@@ -38,8 +38,8 @@
import org.apache.rat.Defaults;
import org.apache.rat.analysis.IHeaderMatcher;
import org.apache.rat.analysis.util.HeaderMatcherMultiplexer;
+import org.apache.rat.api.RatException;
import org.apache.rat.license.ILicenseFamily;
-import org.apache.rat.report.RatReportFailedException;
/**
* A basic Ant task that generates a report on all files specified by
@@ -129,7 +129,7 @@
throw new BuildException(e);
} catch (InterruptedException e) {
throw new BuildException(e);
- } catch (RatReportFailedException e) {
+ } catch (RatException e) {
throw new BuildException(e);
} finally {
if (reportFile != null) {
@@ -156,9 +156,9 @@
* Writes the report to the given stream.
* @throws InterruptedException
* @throws TransformerException
- * @throws RatReportFailedException
+ * @throws RatException
*/
- private void createReport(PrintWriter out) throws IOException, TransformerException, InterruptedException, RatReportFailedException {
+ private void createReport(PrintWriter out) throws IOException, TransformerException, InterruptedException, RatException {
HeaderMatcherMultiplexer m = new HeaderMatcherMultiplexer(getLicenseMatchers());
ResourceCollectionContainer rcElement =
new ResourceCollectionContainer(nestedResources);
Modified: incubator/rat/main/trunk/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/ResourceCollectionContainer.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/ResourceCollectionContainer.java?rev=777689&r1=777688&r2=777689&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/ResourceCollectionContainer.java (original)
+++ incubator/rat/main/trunk/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/ResourceCollectionContainer.java Fri May 22 20:15:28 2009
@@ -25,12 +25,12 @@
import java.io.Reader;
import java.util.Iterator;
+import org.apache.rat.api.Document;
import org.apache.rat.api.MetaData;
-import org.apache.rat.document.IDocument;
+import org.apache.rat.api.RatException;
import org.apache.rat.document.impl.DocumentImplUtils;
import org.apache.rat.report.IReportable;
import org.apache.rat.report.RatReport;
-import org.apache.rat.report.RatReportFailedException;
import org.apache.tools.ant.types.Resource;
import org.apache.tools.ant.types.ResourceCollection;
import org.apache.tools.ant.types.resources.FileResource;
@@ -46,7 +46,7 @@
this.rc = rc;
}
- public void run(RatReport report) throws RatReportFailedException {
+ public void run(RatReport report) throws RatException {
ResourceDocument document = new ResourceDocument();
for (Iterator iter = rc.iterator(); iter.hasNext(); ) {
Resource r = (Resource) iter.next();
@@ -59,7 +59,7 @@
}
}
}
- private class ResourceDocument implements IDocument {
+ private class ResourceDocument implements Document {
private Resource resource;
private final MetaData metaData = new MetaData();
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=777689&r1=777688&r2=777689&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 Fri May 22 20:15:28 2009
@@ -19,9 +19,9 @@
import org.apache.rat.analysis.IHeaderMatcher;
import org.apache.rat.analysis.RatHeaderAnalysisException;
import org.apache.rat.analysis.license.BaseLicense;
+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 Matcher extends BaseLicense implements IHeaderMatcher {
@@ -31,7 +31,7 @@
}
public void reset() {}
- public boolean match(IDocument subject, String line, IClaimReporter reporter) throws RatHeaderAnalysisException {
+ public boolean match(Document subject, String line, Reporter reporter) throws RatHeaderAnalysisException {
reportOnLicense(subject, reporter);
return true;
}