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 17:48:33 UTC
svn commit: r777588 - in /incubator/rat/main/trunk:
apache-rat-core/src/main/java/org/apache/rat/analysis/license/
apache-rat-core/src/main/java/org/apache/rat/api/
apache-rat-core/src/main/java/org/apache/rat/license/
apache-rat-core/src/main/java/org...
Author: rdonkin
Date: Fri May 22 15:48:32 2009
New Revision: 777588
URL: http://svn.apache.org/viewvc?rev=777588&view=rev
Log:
RAT-53 License family name now stored in meta data. https://issues.apache.org/jira/browse/RAT-53
Removed:
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/LicenseFamilyName.java
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/LicenseFamilyClaim.java
Modified:
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/api/MetaData.java
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/license/AcademicFree21LicenseFamily.java
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/license/Apache20LicenseFamily.java
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseFamily.java
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/license/ModifiedBSDLicenseFamily.java
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/license/OASISLicenseFamily.java
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/license/W3CDocumentLicenseFamily.java
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/license/W3CSoftwareLicenseFamily.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/analyser/HeaderCheckWorker.java
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/ClaimStatistic.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/test/java/org/apache/rat/analysis/license/MockStandardLicense.java
incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/policy/DefaultPolicyTest.java
incubator/rat/main/trunk/apache-rat-tasks/src/test/java/org/example/LicenseFamily.java
incubator/rat/main/trunk/apache-rat-tasks/src/test/java/org/example/Matcher.java
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/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=777588&r1=777587&r2=777588&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 15:48:32 2009
@@ -23,7 +23,6 @@
import org.apache.rat.api.MetaData;
import org.apache.rat.document.IDocument;
import org.apache.rat.report.claim.IClaimReporter;
-import org.apache.rat.report.claim.LicenseFamilyName;
/**
* Matches Apache Software License, Version 2.0
@@ -36,7 +35,7 @@
public static final String LICENSE_REFERENCE_LINE = "http://www.apache.org/licenses/LICENSE-2.0";
public ApacheSoftwareLicense20() {
- super(MetaData.RAT_LICENSE_FAMILY_CATEGORY_DATUM_ASL, LicenseFamilyName.APACHE_SOFTWARE_LICENSE_NAME, "");
+ 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 {
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=777588&r1=777587&r2=777588&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 15:48:32 2009
@@ -21,42 +21,25 @@
import org.apache.rat.analysis.RatHeaderAnalysisException;
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.claim.LicenseFamilyName;
-import org.apache.rat.report.claim.impl.LicenseFamilyClaim;
public class BaseLicense {
private final MetaData.Datum licenseFamilyCategory;
- private final LicenseFamilyName name;
+ private final MetaData.Datum licenseFamilyName;
private final String notes;
- public BaseLicense(final MetaData.Datum licenseFamilyCategory, final LicenseFamilyName name, final String notes)
+ public BaseLicense(final MetaData.Datum licenseFamilyCategory, final MetaData.Datum licenseFamilyName, final String notes)
{
this.licenseFamilyCategory = licenseFamilyCategory;
- this.name = name;
+ this.licenseFamilyName = licenseFamilyName;
this.notes = notes;
}
public final void reportOnLicense(IDocument subject, IClaimReporter reporter) throws RatHeaderAnalysisException {
- final LicenseFamilyName name = getName();
- final String notes = getNotes();
- subject.getMetaData().set(new MetaData.Datum(MetaData.RAT_URL_HEADER_SAMPLE, notes));
- subject.getMetaData().set(new MetaData.Datum(MetaData.RAT_URL_HEADER_CATEGORY,licenseFamilyCategory.getValue()));
- subject.getMetaData().set(licenseFamilyCategory);
- try {
- reporter.claim(new LicenseFamilyClaim(subject, name));
- } catch (RatReportFailedException e) {
- // Cannot recover
- throw new RatHeaderAnalysisException("Cannot report on license information", e);
- }
+ 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()));
+ metaData.set(licenseFamilyCategory);
+ metaData.set(licenseFamilyName);
}
-
- public LicenseFamilyName getName() {
- return name;
- }
-
- public String getNotes() {
- return notes;
- }
}
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=777588&r1=777587&r2=777588&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 15:48:32 2009
@@ -23,7 +23,6 @@
import org.apache.rat.api.MetaData;
import org.apache.rat.document.IDocument;
import org.apache.rat.report.claim.IClaimReporter;
-import org.apache.rat.report.claim.LicenseFamilyName;
public class DojoLicenseHeader extends BaseLicense implements IHeaderMatcher {
@@ -42,7 +41,7 @@
public DojoLicenseHeader() {
// TODO: support for dual licensing
// TODO: support for or higher clauses
- super(MetaData.RAT_LICENSE_FAMILY_CATEGORY_DATUM_DOJO, LicenseFamilyName.MODIFIED_BSD_LICENSE_NAME, "Dual license AFL/BSD");
+ super(MetaData.RAT_LICENSE_FAMILY_CATEGORY_DATUM_DOJO, MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_MODIFIED_BSD_LICENSE, "Dual license AFL/BSD");
}
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=777588&r1=777587&r2=777588&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 15:48:32 2009
@@ -25,7 +25,6 @@
import org.apache.rat.api.MetaData;
import org.apache.rat.document.IDocument;
import org.apache.rat.report.claim.IClaimReporter;
-import org.apache.rat.report.claim.LicenseFamilyName;
/**
* Looks for documents contain the OASIS copyright claim plus derivative work clause.
@@ -46,7 +45,7 @@
final StringBuffer buffer = new StringBuffer();
public OASISLicense() {
- super(MetaData.RAT_LICENSE_FAMILY_CATEGORY_DATUM_OASIS, LicenseFamilyName.OASIS_OPEN_LICENSE_NAME, "No modifications allowed");
+ 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 {
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=777588&r1=777587&r2=777588&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 15:48:32 2009
@@ -23,7 +23,6 @@
import org.apache.rat.api.MetaData;
import org.apache.rat.document.IDocument;
import org.apache.rat.report.claim.IClaimReporter;
-import org.apache.rat.report.claim.LicenseFamilyName;
public class TMF854LicenseHeader extends BaseLicense implements IHeaderMatcher {
@@ -34,7 +33,8 @@
// TMF854 Version 1.0 - Copyright TeleManagement Forum
public TMF854LicenseHeader() {
- super(MetaData.RAT_LICENSE_FAMILY_CATEGORY_DATUM_TMF, LicenseFamilyName.MODIFIED_BSD_LICENSE_NAME, "BSD");
+ super(MetaData.RAT_LICENSE_FAMILY_CATEGORY_DATUM_TMF,
+ MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_MODIFIED_BSD_LICENSE, "BSD");
}
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=777588&r1=777587&r2=777588&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 15:48:32 2009
@@ -23,7 +23,6 @@
import org.apache.rat.api.MetaData;
import org.apache.rat.document.IDocument;
import org.apache.rat.report.claim.IClaimReporter;
-import org.apache.rat.report.claim.LicenseFamilyName;
public class W3CDocLicense extends BaseLicense implements IHeaderMatcher {
@@ -33,7 +32,8 @@
= "http://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231";
public W3CDocLicense() {
- super(MetaData.RAT_LICENSE_FAMILY_CATEGORY_DATUM_W3CD, LicenseFamilyName.W3C_DOCUMENT_COPYRIGHT_NAME, NOTES);
+ super(MetaData.RAT_LICENSE_FAMILY_CATEGORY_DATUM_W3CD,
+ MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_W3C_DOCUMENT_COPYRIGHT, NOTES);
}
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=777588&r1=777587&r2=777588&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 15:48:32 2009
@@ -23,7 +23,6 @@
import org.apache.rat.api.MetaData;
import org.apache.rat.document.IDocument;
import org.apache.rat.report.claim.IClaimReporter;
-import org.apache.rat.report.claim.LicenseFamilyName;
public class W3CLicense extends BaseLicense implements IHeaderMatcher {
@@ -33,7 +32,8 @@
= "http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231";
public W3CLicense() {
- super(MetaData.RAT_LICENSE_FAMILY_CATEGORY_DATUM_W3C, LicenseFamilyName.W3C_SOFTWARE_COPYRIGHT_NAME, NOTES);
+ super(MetaData.RAT_LICENSE_FAMILY_CATEGORY_DATUM_W3C,
+ MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_W3C_SOFTWARE_COPYRIGHT, NOTES);
}
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/api/MetaData.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/api/MetaData.java?rev=777588&r1=777587&r2=777588&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/api/MetaData.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/api/MetaData.java Fri May 22 15:48:32 2009
@@ -43,10 +43,10 @@
public static final String RAT_URL_DOCUMENT_CATEGORY = RAT_BASE_URL + "#FileCategory";
// Header Categories
- public static final String RAT_URL_HEADER_CATEGORY= RAT_BASE_URL + "HeaderCategory";
+ public static final String RAT_URL_HEADER_CATEGORY= RAT_BASE_URL + "#HeaderCategory";
// License Family Categories
- public static final String RAT_URL_LICENSE_FAMILY_CATEGORY= RAT_BASE_URL + "LicenseFamilyCategory";
+ public static final String RAT_URL_LICENSE_FAMILY_CATEGORY= RAT_BASE_URL + "#LicenseFamilyCategory";
public static final String RAT_LICENSE_FAMILY_CATEGORY_VALUE_GEN = "GEN ";
public static final String RAT_LICENSE_FAMILY_CATEGORY_VALUE_UNKNOWN = "?????";
public static final String RAT_LICENSE_FAMILY_CATEGORY_VALUE_ASL = "AL ";
@@ -65,6 +65,7 @@
public static final Datum RAT_LICENSE_FAMILY_CATEGORY_DATUM_TMF = new Datum(RAT_URL_LICENSE_FAMILY_CATEGORY, RAT_LICENSE_FAMILY_CATEGORY_VALUE_TMF);
// License Family Standard Names
+ public static final String RAT_URL_LICENSE_FAMILY_NAME= RAT_BASE_URL + "#LicenseFamilyName";
public static final String RAT_LICENSE_FAMILY_NAME_VALUE_W3C_SOFTWARE_COPYRIGHT = "W3C Software Copyright";
public static final String RAT_LICENSE_FAMILY_NAME_VALUE_W3C_DOCUMENT_COPYRIGHT = "W3C Document Copyright";
public static final String RAT_LICENSE_FAMILY_NAME_VALUE_OASIS_OPEN_LICENSE = "OASIS Open License";
@@ -72,7 +73,20 @@
public static final String RAT_LICENSE_FAMILY_NAME_VALUE_APACHE_LICENSE_VERSION_2_0 = "Apache License Version 2.0";
public static final String RAT_LICENSE_FAMILY_NAME_VALUE_ACADEMIC_FREE_LICENSE_VERSION_2_1 = "Academic Free License, Version 2.1";
public static final String RAT_LICENSE_FAMILY_NAME_VALUE_UNKNOWN = "?????";
- public static final String RAT_URL_LICENSE_FAMILY_NAME= RAT_BASE_URL + "LicenseFamilyName";
+ public static final Datum RAT_LICENSE_FAMILY_NAME_DATUM_W3C_SOFTWARE_COPYRIGHT
+ = new Datum(RAT_URL_LICENSE_FAMILY_NAME, RAT_LICENSE_FAMILY_NAME_VALUE_W3C_SOFTWARE_COPYRIGHT);
+ public static final Datum RAT_LICENSE_FAMILY_NAME_DATUM_W3C_DOCUMENT_COPYRIGHT
+ = new Datum(RAT_URL_LICENSE_FAMILY_NAME, RAT_LICENSE_FAMILY_NAME_VALUE_W3C_DOCUMENT_COPYRIGHT);
+ public static final Datum RAT_LICENSE_FAMILY_NAME_DATUM_OASIS_OPEN_LICENSE
+ = new Datum(RAT_URL_LICENSE_FAMILY_NAME, RAT_LICENSE_FAMILY_NAME_VALUE_OASIS_OPEN_LICENSE);
+ public static final Datum RAT_LICENSE_FAMILY_NAME_DATUM_MODIFIED_BSD_LICENSE
+ = new Datum(RAT_URL_LICENSE_FAMILY_NAME, RAT_LICENSE_FAMILY_NAME_VALUE_MODIFIED_BSD_LICENSE);
+ public static final Datum RAT_LICENSE_FAMILY_NAME_DATUM_APACHE_LICENSE_VERSION_2_0
+ = new Datum(RAT_URL_LICENSE_FAMILY_NAME, RAT_LICENSE_FAMILY_NAME_VALUE_APACHE_LICENSE_VERSION_2_0);
+ public static final Datum RAT_LICENSE_FAMILY_NAME_DATUM_ACADEMIC_FREE_LICENSE_VERSION_2_1
+ = new Datum(RAT_URL_LICENSE_FAMILY_NAME, RAT_LICENSE_FAMILY_NAME_VALUE_ACADEMIC_FREE_LICENSE_VERSION_2_1);
+ public static final Datum RAT_LICENSE_FAMILY_NAME_DATUM_UNKNOWN
+ = new Datum(RAT_URL_LICENSE_FAMILY_NAME, RAT_LICENSE_FAMILY_NAME_VALUE_UNKNOWN);
// Header sample
public static final String RAT_URL_HEADER_SAMPLE = RAT_BASE_URL + "HeaderSample";
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/license/AcademicFree21LicenseFamily.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/license/AcademicFree21LicenseFamily.java?rev=777588&r1=777587&r2=777588&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/license/AcademicFree21LicenseFamily.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/license/AcademicFree21LicenseFamily.java Fri May 22 15:48:32 2009
@@ -18,10 +18,10 @@
*/
package org.apache.rat.license;
-import org.apache.rat.report.claim.LicenseFamilyName;
+import org.apache.rat.api.MetaData;
public class AcademicFree21LicenseFamily implements ILicenseFamily {
- public LicenseFamilyName getFamilyName() {
- return LicenseFamilyName.ACADEMIC_FREE_LICENSE_FAMILY;
+ public String getFamilyName() {
+ return MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_ACADEMIC_FREE_LICENSE_VERSION_2_1;
}
}
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/license/Apache20LicenseFamily.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/license/Apache20LicenseFamily.java?rev=777588&r1=777587&r2=777588&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/license/Apache20LicenseFamily.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/license/Apache20LicenseFamily.java Fri May 22 15:48:32 2009
@@ -18,11 +18,11 @@
*/
package org.apache.rat.license;
-import org.apache.rat.report.claim.LicenseFamilyName;
+import org.apache.rat.api.MetaData;
public final class Apache20LicenseFamily implements ILicenseFamily {
- public LicenseFamilyName getFamilyName() {
- return LicenseFamilyName.APACHE_SOFTWARE_LICENSE_NAME;
+ public String getFamilyName() {
+ return MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_APACHE_LICENSE_VERSION_2_0;
}
}
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseFamily.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseFamily.java?rev=777588&r1=777587&r2=777588&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseFamily.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseFamily.java Fri May 22 15:48:32 2009
@@ -18,8 +18,7 @@
*/
package org.apache.rat.license;
-import org.apache.rat.report.claim.LicenseFamilyName;
public interface ILicenseFamily {
- public LicenseFamilyName getFamilyName();
+ public String getFamilyName();
}
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/license/ModifiedBSDLicenseFamily.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/license/ModifiedBSDLicenseFamily.java?rev=777588&r1=777587&r2=777588&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/license/ModifiedBSDLicenseFamily.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/license/ModifiedBSDLicenseFamily.java Fri May 22 15:48:32 2009
@@ -18,10 +18,10 @@
*/
package org.apache.rat.license;
-import org.apache.rat.report.claim.LicenseFamilyName;
+import org.apache.rat.api.MetaData;
public class ModifiedBSDLicenseFamily implements ILicenseFamily {
- public LicenseFamilyName getFamilyName() {
- return LicenseFamilyName.MODIFIED_BSD_LICENSE_NAME;
+ public String getFamilyName() {
+ return MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_MODIFIED_BSD_LICENSE;
}
}
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/license/OASISLicenseFamily.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/license/OASISLicenseFamily.java?rev=777588&r1=777587&r2=777588&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/license/OASISLicenseFamily.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/license/OASISLicenseFamily.java Fri May 22 15:48:32 2009
@@ -18,11 +18,11 @@
*/
package org.apache.rat.license;
-import org.apache.rat.report.claim.LicenseFamilyName;
+import org.apache.rat.api.MetaData;
public final class OASISLicenseFamily implements ILicenseFamily {
- public LicenseFamilyName getFamilyName() {
- return LicenseFamilyName.OASIS_OPEN_LICENSE_NAME;
+ public String getFamilyName() {
+ return MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_OASIS_OPEN_LICENSE;
}
}
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/license/W3CDocumentLicenseFamily.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/license/W3CDocumentLicenseFamily.java?rev=777588&r1=777587&r2=777588&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/license/W3CDocumentLicenseFamily.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/license/W3CDocumentLicenseFamily.java Fri May 22 15:48:32 2009
@@ -18,11 +18,11 @@
*/
package org.apache.rat.license;
-import org.apache.rat.report.claim.LicenseFamilyName;
+import org.apache.rat.api.MetaData;
public class W3CDocumentLicenseFamily implements ILicenseFamily {
- public LicenseFamilyName getFamilyName() {
- return LicenseFamilyName.W3C_DOCUMENT_COPYRIGHT_NAME;
+ public String getFamilyName() {
+ return MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_W3C_DOCUMENT_COPYRIGHT;
}
}
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/license/W3CSoftwareLicenseFamily.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/license/W3CSoftwareLicenseFamily.java?rev=777588&r1=777587&r2=777588&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/license/W3CSoftwareLicenseFamily.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/license/W3CSoftwareLicenseFamily.java Fri May 22 15:48:32 2009
@@ -18,10 +18,10 @@
*/
package org.apache.rat.license;
-import org.apache.rat.report.claim.LicenseFamilyName;
+import org.apache.rat.api.MetaData;
public class W3CSoftwareLicenseFamily implements ILicenseFamily {
- public LicenseFamilyName getFamilyName() {
- return LicenseFamilyName.W3C_SOFTWARE_COPYRIGHT_NAME;
+ public String getFamilyName() {
+ return MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_W3C_SOFTWARE_COPYRIGHT;
}
}
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=777588&r1=777587&r2=777588&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 15:48:32 2009
@@ -21,27 +21,28 @@
import java.util.Arrays;
import java.util.Comparator;
+import org.apache.rat.api.MetaData;
import org.apache.rat.document.IDocument;
import org.apache.rat.license.ILicenseFamily;
import org.apache.rat.report.RatReportFailedException;
import org.apache.rat.report.claim.IClaim;
import org.apache.rat.report.claim.IClaimReporter;
-import org.apache.rat.report.claim.LicenseFamilyName;
import org.apache.rat.report.claim.impl.LicenseApprovalClaim;
-import org.apache.rat.report.claim.impl.LicenseFamilyClaim;
public class DefaultPolicy implements IClaimReporter {
- private static final LicenseFamilyName[] APPROVED_LICENSES = {
- LicenseFamilyName.APACHE_SOFTWARE_LICENSE_NAME, LicenseFamilyName.OASIS_OPEN_LICENSE_NAME,
- LicenseFamilyName.W3C_SOFTWARE_COPYRIGHT_NAME, LicenseFamilyName.W3C_DOCUMENT_COPYRIGHT_NAME,
- LicenseFamilyName.MODIFIED_BSD_LICENSE_NAME
+ private static final String[] APPROVED_LICENSES = {
+ MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_APACHE_LICENSE_VERSION_2_0,
+ MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_OASIS_OPEN_LICENSE,
+ MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_W3C_SOFTWARE_COPYRIGHT,
+ MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_W3C_DOCUMENT_COPYRIGHT,
+ MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_MODIFIED_BSD_LICENSE
};
- private static final LicenseFamilyName[] toNames(final ILicenseFamily[] approvedLicenses) {
- LicenseFamilyName[] results = null;
+ private static final String[] toNames(final ILicenseFamily[] approvedLicenses) {
+ String[] results = null;
if (approvedLicenses != null) {
final int length = approvedLicenses.length;
- results = new LicenseFamilyName[length];
+ results = new String[length];
for (int i=0;i<length;i++) {
results[i] = approvedLicenses[i].getFamilyName();
}
@@ -50,8 +51,9 @@
}
private final IClaimReporter reporter;
- private final LicenseFamilyName[] approvedLicenseNames;
+ private final String[] approvedLicenseNames;
private IDocument subject;
+ private boolean testedDocument = false;
public DefaultPolicy(final IClaimReporter reporter) {
this(reporter, APPROVED_LICENSES);
@@ -61,30 +63,32 @@
this(reporter, toNames(approvedLicenses));
}
- private static final Comparator licenseFamilyComparator = new Comparator(){
- public int compare(Object arg0, Object arg1) {
- return ((LicenseFamilyName) arg0).getName().compareTo(((LicenseFamilyName) arg1).getName());
- }
- };
-
- public DefaultPolicy(final IClaimReporter reporter, final LicenseFamilyName[] approvedLicenseNames) {
+ public DefaultPolicy(final IClaimReporter reporter, final String[] approvedLicenseNames) {
this.reporter = reporter;
if (approvedLicenseNames == null) {
this.approvedLicenseNames = APPROVED_LICENSES;
} else {
final int length = approvedLicenseNames.length;
- this.approvedLicenseNames = new LicenseFamilyName[length];
+ this.approvedLicenseNames = new String[length];
System.arraycopy(approvedLicenseNames, 0, this.approvedLicenseNames, 0, length);
}
- Arrays.sort(this.approvedLicenseNames, licenseFamilyComparator);
+ Arrays.sort(this.approvedLicenseNames);
}
public void claim(IClaim pClaim)
throws RatReportFailedException {
- if (pClaim instanceof LicenseFamilyClaim) {
- final LicenseFamilyClaim lfc = (LicenseFamilyClaim) pClaim;
- final boolean isApproved = Arrays.binarySearch(approvedLicenseNames, lfc.getLicenseFamilyName(), licenseFamilyComparator) >= 0;
- reportLicenseApprovalClaim(subject, isApproved, reporter);
+ testDocumentWhenNecessary(subject);
+ }
+
+ private void testDocumentWhenNecessary(final IDocument subject) throws RatReportFailedException {
+ if (!testedDocument && subject != null) {
+ final MetaData.Datum nameDatum = subject.getMetaData().get(MetaData.RAT_URL_LICENSE_FAMILY_NAME);
+ if (nameDatum != null) {
+ final String name = nameDatum.getValue();
+ final boolean isApproved = Arrays.binarySearch(approvedLicenseNames, name) >= 0;
+ reportLicenseApprovalClaim(subject, isApproved, reporter);
+ }
+ testedDocument = true;
}
}
@@ -92,7 +96,10 @@
reporter.claim(new LicenseApprovalClaim(subject, isAcceptable));
}
+
public void report(final IDocument subject) throws RatReportFailedException {
+ testDocumentWhenNecessary(this.subject);
this.subject = subject;
+ testedDocument = false;
}
}
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=777588&r1=777587&r2=777588&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 15:48:32 2009
@@ -26,10 +26,7 @@
import org.apache.rat.analysis.RatHeaderAnalysisException;
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.claim.LicenseFamilyName;
-import org.apache.rat.report.claim.impl.LicenseFamilyClaim;
/**
* <p>Reads from a stream to check license.</p>
@@ -92,14 +89,13 @@
while(readLine(headers));
if (!match) {
final String notes = headers.toString();
- subject.getMetaData().set(new MetaData.Datum(MetaData.RAT_URL_HEADER_SAMPLE, notes));
- subject.getMetaData().set(new MetaData.Datum(MetaData.RAT_URL_HEADER_CATEGORY, MetaData.RAT_LICENSE_FAMILY_CATEGORY_VALUE_UNKNOWN));
- reporter.claim(new LicenseFamilyClaim(subject, LicenseFamilyName.UNKNOWN_LICENSE_FAMILY));
+ 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, MetaData.RAT_LICENSE_FAMILY_CATEGORY_VALUE_UNKNOWN));
+ metaData.set(MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_UNKNOWN);
}
} catch (IOException e) {
throw new RatHeaderAnalysisException("Cannot read header for " + subject, e);
- } catch (RatReportFailedException e) {
- throw new RatHeaderAnalysisException("Cannot write claim for " + subject, e);
}
try {
reader.close();
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/ClaimStatistic.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/ClaimStatistic.java?rev=777588&r1=777587&r2=777588&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/ClaimStatistic.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/ClaimStatistic.java Fri May 22 15:48:32 2009
@@ -135,7 +135,7 @@
/**
* Returns a map with the license family codes. The map
- * keys are instances of {@link LicenseFamilyName} and
+ * keys are the names of the license families and
* the map values are integers with the number of resources
* matching the license family name.
*/
@@ -145,7 +145,7 @@
/**
* Returns a map with the license family codes. The map
- * keys are instances of {@link LicenseFamilyName} and
+ * keys are the name of the license families and
* the map values are integers with the number of resources
* matching the license family name.
*/
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=777588&r1=777587&r2=777588&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 15:48:32 2009
@@ -26,7 +26,7 @@
// Does nothing
}
- protected void handleClaim(LicenseFamilyClaim pClaim) {
+ protected void handleLicenseFamilyNameClaim(String licenseFamilyName) {
// Does Nothing
}
@@ -44,8 +44,6 @@
handleClaim((FileTypeClaim) pClaim);
} else if (pClaim instanceof LicenseApprovalClaim) {
handleClaim((LicenseApprovalClaim) pClaim);
- } else if (pClaim instanceof LicenseFamilyClaim) {
- handleClaim((LicenseFamilyClaim) pClaim);
} else if (pClaim instanceof CustomClaim) {
handleClaim((CustomClaim) pClaim);
} else {
@@ -65,6 +63,13 @@
handleHeaderCategoryClaim(headerCategory);
}
}
+ final MetaData.Datum licenseFamilyNameDatum = subject.getMetaData().get(MetaData.RAT_URL_LICENSE_FAMILY_NAME);
+ if (licenseFamilyNameDatum != null) {
+ final String licenseFamilyName = licenseFamilyNameDatum.getName();
+ if (licenseFamilyName != null) {
+ handleLicenseFamilyNameClaim(licenseFamilyName);
+ }
+ }
}
public void report(IDocument subject) throws RatReportFailedException {
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=777588&r1=777587&r2=777588&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 15:48:32 2009
@@ -54,9 +54,8 @@
}
}
- protected void handleClaim(LicenseFamilyClaim pClaim) {
- super.handleClaim(pClaim);
- incMapValue(numsByLicenseFamilyName, pClaim.getLicenseFamilyName());
+ protected void handleLicenseFamilyNameClaim(String licenseFamilyName) {
+ incMapValue(numsByLicenseFamilyName, licenseFamilyName);
}
protected void handleHeaderCategoryClaim(String headerCategory) {
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=777588&r1=777587&r2=777588&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 15:48:32 2009
@@ -27,7 +27,6 @@
import org.apache.rat.report.claim.IClaimReporter;
import org.apache.rat.report.claim.impl.FileTypeClaim;
import org.apache.rat.report.claim.impl.LicenseApprovalClaim;
-import org.apache.rat.report.claim.impl.LicenseFamilyClaim;
import org.apache.rat.report.xml.writer.IXmlWriter;
public class SimpleXmlClaimReporter implements IClaimReporter {
@@ -60,11 +59,6 @@
writeClaim(LICENSE_APPROVAL_PREDICATE, Boolean.toString(pClaim.isApproved()), false);
}
- protected void handleClaim(LicenseFamilyClaim pClaim)
- throws IOException, RatReportFailedException {
- writeClaim(LICENSE_FAMILY_PREDICATE, pClaim.getLicenseFamilyName().getName(), false);
- }
-
protected void handleClaim(CustomClaim pClaim)
throws IOException, RatReportFailedException {
@@ -94,8 +88,6 @@
handleClaim((FileTypeClaim) pClaim);
} else if (pClaim instanceof LicenseApprovalClaim) {
handleClaim((LicenseApprovalClaim) pClaim);
- } else if (pClaim instanceof LicenseFamilyClaim) {
- handleClaim((LicenseFamilyClaim) pClaim);
} else if (pClaim instanceof CustomClaim) {
handleClaim((CustomClaim) pClaim);
} else {
@@ -139,22 +131,45 @@
private void writeDocumentClaims(final IDocument subject) throws IOException, RatReportFailedException {
final MetaData metaData = subject.getMetaData();
+ writeHeaderSample(metaData);
+ writeLicenseFamilyCategory(metaData);
+ writeHeaderCategory(metaData);
+ writeLicenseFamilyName(metaData);
+ }
+
+ private void writeLicenseFamilyName(final MetaData metaData) throws IOException, RatReportFailedException {
+ final MetaData.Datum licenseFamilyNameDatum = metaData.get(MetaData.RAT_URL_LICENSE_FAMILY_NAME);
+ if (licenseFamilyNameDatum != null) {
+ final String licenseFamilyName = licenseFamilyNameDatum.getValue();
+ if (licenseFamilyName != null) {
+ writeClaim(LICENSE_FAMILY_PREDICATE, licenseFamilyName, false);
+ }
+ }
+ }
+
+ private void writeHeaderCategory(final MetaData metaData) throws IOException, RatReportFailedException {
+ final MetaData.Datum headerCategoryDatum = metaData.get(MetaData.RAT_URL_HEADER_CATEGORY);
+ if (headerCategoryDatum != null) {
+ final String headerCategory = headerCategoryDatum.getValue();
+ writeClaim(HEADER_TYPE_PREDICATE, headerCategory, false);
+ }
+ }
+
+ private void writeLicenseFamilyCategory(final MetaData metaData) throws IOException, RatReportFailedException {
+ final MetaData.Datum licenseFamilyCategoryDatum = metaData.get(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY);
+ if (licenseFamilyCategoryDatum != null) {
+ final String licenseFamilyCategory = licenseFamilyCategoryDatum.getValue();
+ writeClaim(LICENSE_FAMILY_PREDICATE, licenseFamilyCategory, false);
+ }
+ }
+
+ private void writeHeaderSample(final MetaData metaData) throws IOException, RatReportFailedException {
final MetaData.Datum sampleDatum = metaData.get(MetaData.RAT_URL_HEADER_SAMPLE);
if (sampleDatum != null) {
final String sample = sampleDatum.getValue();
if (sample != null) {
writeClaim(HEADER_SAMPLE_PREDICATE, sample, true);
}
- final MetaData.Datum licenseFamilyCategoryDatum = metaData.get(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY);
- if (licenseFamilyCategoryDatum != null) {
- final String licenseFamilyCategory = licenseFamilyCategoryDatum.getValue();
- writeClaim(LICENSE_FAMILY_PREDICATE, licenseFamilyCategory, false);
- }
- final MetaData.Datum headerCategoryDatum = metaData.get(MetaData.RAT_URL_HEADER_CATEGORY);
- if (headerCategoryDatum != null) {
- final String headerCategory = headerCategoryDatum.getValue();
- writeClaim(HEADER_TYPE_PREDICATE, headerCategory, false);
- }
}
}
Modified: incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/license/MockStandardLicense.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/license/MockStandardLicense.java?rev=777588&r1=777587&r2=777588&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/license/MockStandardLicense.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/license/MockStandardLicense.java Fri May 22 15:48:32 2009
@@ -22,7 +22,6 @@
import java.util.List;
import org.apache.rat.api.MetaData;
-import org.apache.rat.report.claim.LicenseFamilyName;
public class MockStandardLicense extends BaseLicense {
@@ -30,6 +29,7 @@
public List visitors = new ArrayList();
public MockStandardLicense() {
- super(new MetaData.Datum(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY, ""), new LicenseFamilyName(""), "");
+ super(new MetaData.Datum(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY, ""),
+ new MetaData.Datum(MetaData.RAT_URL_LICENSE_FAMILY_NAME, ""), "");
}
}
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=777588&r1=777587&r2=777588&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 15:48:32 2009
@@ -20,12 +20,11 @@
import junit.framework.TestCase;
+import org.apache.rat.api.MetaData;
import org.apache.rat.document.IDocument;
import org.apache.rat.document.MockLocation;
import org.apache.rat.report.claim.IClaim;
-import org.apache.rat.report.claim.LicenseFamilyName;
import org.apache.rat.report.claim.impl.LicenseApprovalClaim;
-import org.apache.rat.report.claim.impl.LicenseFamilyClaim;
import org.apache.rat.report.claim.impl.xml.CustomClaim;
import org.apache.rat.report.claim.impl.xml.MockClaimReporter;
@@ -55,7 +54,9 @@
public void testASLFamily() throws Exception {
final IDocument subject = new MockLocation("subject");
- policy.claim(new LicenseFamilyClaim(subject, LicenseFamilyName.APACHE_SOFTWARE_LICENSE_NAME));
+ subject.getMetaData().set(MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_APACHE_LICENSE_VERSION_2_0);
+ policy.report(subject);
+ policy.claim(null);
assertEquals("Approved claim", 1, reporter.claims.size());
assertApproval(true);
}
@@ -76,48 +77,37 @@
public void testOASISFamily() throws Exception {
final IDocument subject = new MockLocation("subject");
- policy.claim(new LicenseFamilyClaim(subject, LicenseFamilyName.OASIS_OPEN_LICENSE_NAME));
+ subject.getMetaData().set(MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_OASIS_OPEN_LICENSE);
+ policy.report(subject);
+ policy.claim(null);
assertEquals("Approved claim", 1, reporter.claims.size());
assertApproval(true);
}
public void testW3CFamily() throws Exception {
final IDocument subject = new MockLocation("subject");
- policy.claim(new LicenseFamilyClaim(subject, LicenseFamilyName.W3C_SOFTWARE_COPYRIGHT_NAME));
+ subject.getMetaData().set(MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_W3C_SOFTWARE_COPYRIGHT);
+ policy.report(subject);
+ policy.claim(null);
assertEquals("Approved claim", 1, reporter.claims.size());
assertApproval(true);
}
public void testW3CDocFamily() throws Exception {
final IDocument subject = new MockLocation("subject");
- policy.claim(new LicenseFamilyClaim(subject, LicenseFamilyName.W3C_DOCUMENT_COPYRIGHT_NAME));
+ subject.getMetaData().set(MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_W3C_DOCUMENT_COPYRIGHT);
+ policy.report(subject);
+ policy.claim(null);
assertEquals("Approved claim", 1, reporter.claims.size());
assertApproval(true);
}
public void testUnknownFamily() throws Exception {
final IDocument subject = new MockLocation("subject");
- policy.claim(new LicenseFamilyClaim(subject, LicenseFamilyName.UNKNOWN_LICENSE_FAMILY));
+ subject.getMetaData().set(MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_UNKNOWN);
+ policy.report(subject);
+ policy.claim(null);
assertEquals("Approved claim", 1, reporter.claims.size());
assertApproval(false);
}
-
- public void testCustomNames() throws Exception {
- reporter = new MockClaimReporter();
- LicenseFamilyName[] custom = {new LicenseFamilyName("Example")};
- policy = new DefaultPolicy(reporter, custom);
- final IDocument subject = new MockLocation("subject");
- policy.claim(new LicenseFamilyClaim(subject, LicenseFamilyName.UNKNOWN_LICENSE_FAMILY));
- policy.claim(new LicenseFamilyClaim(subject, LicenseFamilyName.W3C_DOCUMENT_COPYRIGHT_NAME));
- policy.claim(new LicenseFamilyClaim(subject, LicenseFamilyName.W3C_SOFTWARE_COPYRIGHT_NAME));
- policy.claim(new LicenseFamilyClaim(subject, LicenseFamilyName.APACHE_SOFTWARE_LICENSE_NAME));
- assertEquals("Four unapproved claims", 4, reporter.claims.size());
- assertApproval(false, (IClaim) reporter.claims.get(0));
- assertApproval(false, (IClaim) reporter.claims.get(1));
- assertApproval(false, (IClaim) reporter.claims.get(2));
- assertApproval(false, (IClaim) reporter.claims.get(3));
- policy.claim(new LicenseFamilyClaim(subject, custom[0]));
- assertEquals("Approved claim", 5, reporter.claims.size());
- assertApproval(true, (IClaim) reporter.claims.get(4));
- }
}
Modified: incubator/rat/main/trunk/apache-rat-tasks/src/test/java/org/example/LicenseFamily.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-tasks/src/test/java/org/example/LicenseFamily.java?rev=777588&r1=777587&r2=777588&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-tasks/src/test/java/org/example/LicenseFamily.java (original)
+++ incubator/rat/main/trunk/apache-rat-tasks/src/test/java/org/example/LicenseFamily.java Fri May 22 15:48:32 2009
@@ -17,13 +17,10 @@
package org.example;
import org.apache.rat.license.ILicenseFamily;
-import org.apache.rat.report.claim.LicenseFamilyName;
public class LicenseFamily implements ILicenseFamily {
- private static final LicenseFamilyName LICENSE_FAMILY_NAME = new LicenseFamilyName("Example License");
-
- public LicenseFamilyName getFamilyName() {
- return LICENSE_FAMILY_NAME;
+ public String getFamilyName() {
+ return "Example License";
}
}
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=777588&r1=777587&r2=777588&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 15:48:32 2009
@@ -22,12 +22,12 @@
import org.apache.rat.api.MetaData;
import org.apache.rat.document.IDocument;
import org.apache.rat.report.claim.IClaimReporter;
-import org.apache.rat.report.claim.LicenseFamilyName;
public class Matcher extends BaseLicense implements IHeaderMatcher {
public Matcher() {
- super(new MetaData.Datum(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY, "EXMPL"), new LicenseFamilyName("Example License"), "");
+ super(new MetaData.Datum(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY, "EXMPL"),
+ new MetaData.Datum(MetaData.RAT_URL_LICENSE_FAMILY_NAME, "Example License"), "");
}
public void reset() {}