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:33:04 UTC
svn commit: r777698 - in /incubator/rat/main/trunk/apache-rat-core/src: main/java/org/apache/rat/analysis/ main/java/org/apache/rat/report/analyser/ main/java/org/apache/rat/report/xml/ test/java/org/apache/rat/analysis/ test/java/org/apache/rat/report...

Author: rdonkin
Date: Fri May 22 20:33:03 2009
New Revision: 777698

URL: http://svn.apache.org/viewvc?rev=777698&view=rev
Log:
RAT-53 Separate reports from analysis. https://issues.apache.org/jira/browse/RAT-53

Added:
    incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/DefaultAnalyserFactory.java
      - copied, changed from r777694, 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/analysis/DocumentHeaderAnalyser.java
      - copied, changed from r777694, 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/analysis/HeaderCheckWorker.java
      - copied, changed from r777694, 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/analysis/RatReportAnalysisResultException.java
      - copied, changed from r777694, 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/test/java/org/apache/rat/analysis/AnalyserFactoryTest.java
      - copied, changed from r777697, 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/analysis/HeaderCheckWorkerTest.java
      - copied, changed from r777697, incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/report/analyser/HeaderCheckWorkerTest.java
Removed:
    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/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
Modified:
    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/report/xml/XmlReportTest.java

Copied: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/DefaultAnalyserFactory.java (from r777694, 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/analysis/DefaultAnalyserFactory.java?p2=incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/DefaultAnalyserFactory.java&p1=incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/analyser/DefaultAnalyserFactory.java&r1=777694&r2=777698&rev=777698&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/analysis/DefaultAnalyserFactory.java Fri May 22 20:33:03 2009
@@ -16,9 +16,8 @@
  * specific language governing permissions and limitations      *
  * under the License.                                           *
  */ 
-package org.apache.rat.report.analyser;
+package org.apache.rat.analysis;
 
-import org.apache.rat.analysis.IHeaderMatcher;
 import org.apache.rat.api.Document;
 import org.apache.rat.api.MetaData;
 import org.apache.rat.document.IDocumentAnalyser;

Copied: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/DocumentHeaderAnalyser.java (from r777694, 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/analysis/DocumentHeaderAnalyser.java?p2=incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/DocumentHeaderAnalyser.java&p1=incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/analyser/DocumentHeaderAnalyser.java&r1=777694&r2=777698&rev=777698&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/analysis/DocumentHeaderAnalyser.java Fri May 22 20:33:03 2009
@@ -16,13 +16,11 @@
  * specific language governing permissions and limitations      *
  * under the License.                                           *
  */ 
-package org.apache.rat.report.analyser;
+package org.apache.rat.analysis;
 
 import java.io.IOException;
 import java.io.Reader;
 
-import org.apache.rat.analysis.IHeaderMatcher;
-import org.apache.rat.analysis.RatHeaderAnalysisException;
 import org.apache.rat.api.Document;
 import org.apache.rat.document.IDocumentAnalyser;
 import org.apache.rat.document.RatDocumentAnalysisException;

Copied: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/HeaderCheckWorker.java (from r777694, 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/analysis/HeaderCheckWorker.java?p2=incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/HeaderCheckWorker.java&p1=incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/analyser/HeaderCheckWorker.java&r1=777694&r2=777698&rev=777698&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/analysis/HeaderCheckWorker.java Fri May 22 20:33:03 2009
@@ -1,4 +1,4 @@
-package org.apache.rat.report.analyser;
+package org.apache.rat.analysis;
 /*
  * Licensed to the Apache Software Foundation (ASF) under one   *
  * or more contributor license agreements.  See the NOTICE file *
@@ -22,8 +22,6 @@
 import java.io.IOException;
 import java.io.Reader;
 
-import org.apache.rat.analysis.IHeaderMatcher;
-import org.apache.rat.analysis.RatHeaderAnalysisException;
 import org.apache.rat.api.Document;
 import org.apache.rat.api.MetaData;
 

Copied: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/RatReportAnalysisResultException.java (from r777694, 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/analysis/RatReportAnalysisResultException.java?p2=incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/RatReportAnalysisResultException.java&p1=incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/analyser/RatReportAnalysisResultException.java&r1=777694&r2=777698&rev=777698&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/analysis/RatReportAnalysisResultException.java Fri May 22 20:33:03 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations      *
  * under the License.                                           *
  */ 
-package org.apache.rat.report.analyser;
+package org.apache.rat.analysis;
 
 import org.apache.rat.api.RatException;
 import org.apache.rat.document.RatDocumentAnalysisException;

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=777698&r1=777697&r2=777698&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:33:03 2009
@@ -18,6 +18,7 @@
  */ 
 package org.apache.rat.report.xml;
 
+import org.apache.rat.analysis.DefaultAnalyserFactory;
 import org.apache.rat.analysis.IHeaderMatcher;
 import org.apache.rat.api.Document;
 import org.apache.rat.api.RatException;
@@ -27,7 +28,6 @@
 import org.apache.rat.license.ILicenseFamily;
 import org.apache.rat.policy.DefaultPolicy;
 import org.apache.rat.report.RatReport;
-import org.apache.rat.report.analyser.DefaultAnalyserFactory;
 import org.apache.rat.report.claim.ClaimStatistic;
 import org.apache.rat.report.claim.impl.ClaimAggregator;
 import org.apache.rat.report.claim.impl.xml.SimpleXmlClaimReporter;

Copied: incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/AnalyserFactoryTest.java (from r777697, 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/analysis/AnalyserFactoryTest.java?p2=incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/AnalyserFactoryTest.java&p1=incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/report/analyser/AnalyserFactoryTest.java&r1=777697&r2=777698&rev=777698&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/analysis/AnalyserFactoryTest.java Fri May 22 20:33:03 2009
@@ -16,13 +16,14 @@
  * specific language governing permissions and limitations      *
  * under the License.                                           *
  */ 
-package org.apache.rat.report.analyser;
+package org.apache.rat.analysis;
 
 import java.io.File;
 import java.io.StringWriter;
 
 import junit.framework.TestCase;
 
+import org.apache.rat.analysis.DefaultAnalyserFactory;
 import org.apache.rat.analysis.IHeaderMatcher;
 import org.apache.rat.analysis.RatHeaderAnalysisException;
 import org.apache.rat.api.Document;

Copied: incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/HeaderCheckWorkerTest.java (from r777697, 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/analysis/HeaderCheckWorkerTest.java?p2=incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/HeaderCheckWorkerTest.java&p1=incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/report/analyser/HeaderCheckWorkerTest.java&r1=777697&r2=777698&rev=777698&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/analysis/HeaderCheckWorkerTest.java Fri May 22 20:33:03 2009
@@ -17,23 +17,22 @@
  * under the License.                                           *
  */ 
 
-package org.apache.rat.report.analyser;
+package org.apache.rat.analysis;
 
 import java.io.StringReader;
 
 import junit.framework.TestCase;
 
+import org.apache.rat.analysis.HeaderCheckWorker;
 import org.apache.rat.analysis.license.ApacheSoftwareLicense20;
 import org.apache.rat.api.Document;
 import org.apache.rat.document.MockLocation;
 import org.apache.rat.report.claim.impl.xml.MockClaimReporter;
 
 public class HeaderCheckWorkerTest extends TestCase {
-	MockClaimReporter reporter;
     
 	protected void setUp() throws Exception {
 		super.setUp();
-        reporter = new MockClaimReporter();
 	}
 
 	protected void tearDown() throws Exception {

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=777698&r1=777697&r2=777698&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:33:03 2009
@@ -25,11 +25,11 @@
 import junit.framework.TestCase;
 
 import org.apache.rat.DirectoryWalker;
+import org.apache.rat.analysis.DefaultAnalyserFactory;
 import org.apache.rat.analysis.IHeaderMatcher;
 import org.apache.rat.analysis.RatHeaderAnalysisException;
 import org.apache.rat.api.Document;
 import org.apache.rat.document.IDocumentAnalyser;
-import org.apache.rat.report.analyser.DefaultAnalyserFactory;
 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;