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 16:13:33 UTC
svn commit: r777537 - 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/report/analyser/
apache-rat-core/src/main/java/org/apache/rat/report/claim/
apache-rat-core/...
Author: rdonkin
Date: Fri May 22 14:13:32 2009
New Revision: 777537
URL: http://svn.apache.org/viewvc?rev=777537&view=rev
Log:
RAT-53 License family category 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/LicenseFamilyCode.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/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/ClaimAggregator.java
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/LicenseFamilyClaim.java
incubator/rat/main/trunk/apache-rat-core/src/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/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=777537&r1=777536&r2=777537&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 14:13:32 2009
@@ -20,9 +20,9 @@
import org.apache.rat.analysis.IHeaderMatcher;
import org.apache.rat.analysis.RatHeaderAnalysisException;
+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.LicenseFamilyCode;
import org.apache.rat.report.claim.LicenseFamilyName;
/**
@@ -36,7 +36,7 @@
public static final String LICENSE_REFERENCE_LINE = "http://www.apache.org/licenses/LICENSE-2.0";
public ApacheSoftwareLicense20() {
- super(LicenseFamilyCode.ASL_CODE, LicenseFamilyName.APACHE_SOFTWARE_LICENSE_NAME, "");
+ super(MetaData.RAT_LICENSE_FAMILY_CATEGORY_DATUM_ASL, LicenseFamilyName.APACHE_SOFTWARE_LICENSE_NAME, "");
}
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=777537&r1=777536&r2=777537&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 14:13:32 2009
@@ -23,40 +23,35 @@
import org.apache.rat.document.IDocument;
import org.apache.rat.report.RatReportFailedException;
import org.apache.rat.report.claim.IClaimReporter;
-import org.apache.rat.report.claim.LicenseFamilyCode;
import org.apache.rat.report.claim.LicenseFamilyName;
import org.apache.rat.report.claim.impl.LicenseFamilyClaim;
public class BaseLicense {
- private final LicenseFamilyCode code;
+ private final MetaData.Datum licenseFamilyCategory;
private final LicenseFamilyName name;
private final String notes;
- public BaseLicense(final LicenseFamilyCode code, final LicenseFamilyName name, final String notes)
+ public BaseLicense(final MetaData.Datum licenseFamilyCategory, final LicenseFamilyName name, final String notes)
{
- this.code = code;
+ this.licenseFamilyCategory = licenseFamilyCategory;
this.name = name;
this.notes = notes;
}
public final void reportOnLicense(IDocument subject, IClaimReporter reporter) throws RatHeaderAnalysisException {
final LicenseFamilyName name = getName();
- final LicenseFamilyCode code = getCode();
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, code.getName()));
+ subject.getMetaData().set(new MetaData.Datum(MetaData.RAT_URL_HEADER_CATEGORY,licenseFamilyCategory.getValue()));
+ subject.getMetaData().set(licenseFamilyCategory);
try {
- reporter.claim(new LicenseFamilyClaim(subject, name, code));
+ reporter.claim(new LicenseFamilyClaim(subject, name));
} catch (RatReportFailedException e) {
// Cannot recover
throw new RatHeaderAnalysisException("Cannot report on license information", e);
}
}
- public LicenseFamilyCode getCode() {
- return code;
- }
-
public LicenseFamilyName getName() {
return name;
}
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=777537&r1=777536&r2=777537&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 14:13:32 2009
@@ -20,9 +20,9 @@
import org.apache.rat.analysis.IHeaderMatcher;
import org.apache.rat.analysis.RatHeaderAnalysisException;
+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.LicenseFamilyCode;
import org.apache.rat.report.claim.LicenseFamilyName;
@@ -42,7 +42,7 @@
public DojoLicenseHeader() {
// TODO: support for dual licensing
// TODO: support for or higher clauses
- super(LicenseFamilyCode.DOJO, LicenseFamilyName.MODIFIED_BSD_LICENSE_NAME, "Dual license AFL/BSD");
+ super(MetaData.RAT_LICENSE_FAMILY_CATEGORY_DATUM_DOJO, LicenseFamilyName.MODIFIED_BSD_LICENSE_NAME, "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=777537&r1=777536&r2=777537&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 14:13:32 2009
@@ -22,9 +22,9 @@
import org.apache.rat.analysis.IHeaderMatcher;
import org.apache.rat.analysis.RatHeaderAnalysisException;
+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.LicenseFamilyCode;
import org.apache.rat.report.claim.LicenseFamilyName;
/**
@@ -46,7 +46,7 @@
final StringBuffer buffer = new StringBuffer();
public OASISLicense() {
- super(LicenseFamilyCode.OASIS_CODE, LicenseFamilyName.OASIS_OPEN_LICENSE_NAME, "No modifications allowed");
+ super(MetaData.RAT_LICENSE_FAMILY_CATEGORY_DATUM_OASIS, LicenseFamilyName.OASIS_OPEN_LICENSE_NAME, "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=777537&r1=777536&r2=777537&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 14:13:32 2009
@@ -20,9 +20,9 @@
import org.apache.rat.analysis.IHeaderMatcher;
import org.apache.rat.analysis.RatHeaderAnalysisException;
+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.LicenseFamilyCode;
import org.apache.rat.report.claim.LicenseFamilyName;
@@ -34,7 +34,7 @@
// TMF854 Version 1.0 - Copyright TeleManagement Forum
public TMF854LicenseHeader() {
- super(LicenseFamilyCode.TMF854, LicenseFamilyName.MODIFIED_BSD_LICENSE_NAME, "BSD");
+ super(MetaData.RAT_LICENSE_FAMILY_CATEGORY_DATUM_TMF, LicenseFamilyName.MODIFIED_BSD_LICENSE_NAME, "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=777537&r1=777536&r2=777537&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 14:13:32 2009
@@ -20,9 +20,9 @@
import org.apache.rat.analysis.IHeaderMatcher;
import org.apache.rat.analysis.RatHeaderAnalysisException;
+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.LicenseFamilyCode;
import org.apache.rat.report.claim.LicenseFamilyName;
public class W3CDocLicense extends BaseLicense implements IHeaderMatcher {
@@ -33,7 +33,7 @@
= "http://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231";
public W3CDocLicense() {
- super(LicenseFamilyCode.W3CD_CODE, LicenseFamilyName.W3C_DOCUMENT_COPYRIGHT_NAME, NOTES);
+ super(MetaData.RAT_LICENSE_FAMILY_CATEGORY_DATUM_W3CD, LicenseFamilyName.W3C_DOCUMENT_COPYRIGHT_NAME, 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=777537&r1=777536&r2=777537&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 14:13:32 2009
@@ -20,9 +20,9 @@
import org.apache.rat.analysis.IHeaderMatcher;
import org.apache.rat.analysis.RatHeaderAnalysisException;
+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.LicenseFamilyCode;
import org.apache.rat.report.claim.LicenseFamilyName;
public class W3CLicense extends BaseLicense implements IHeaderMatcher {
@@ -33,7 +33,7 @@
= "http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231";
public W3CLicense() {
- super(LicenseFamilyCode.W3C_CODE, LicenseFamilyName.W3C_SOFTWARE_COPYRIGHT_NAME, NOTES);
+ super(MetaData.RAT_LICENSE_FAMILY_CATEGORY_DATUM_W3C, LicenseFamilyName.W3C_SOFTWARE_COPYRIGHT_NAME, NOTES);
}
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=777537&r1=777536&r2=777537&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 14:13:32 2009
@@ -28,7 +28,6 @@
import org.apache.rat.document.IDocument;
import org.apache.rat.report.RatReportFailedException;
import org.apache.rat.report.claim.IClaimReporter;
-import org.apache.rat.report.claim.LicenseFamilyCode;
import org.apache.rat.report.claim.LicenseFamilyName;
import org.apache.rat.report.claim.impl.LicenseFamilyClaim;
@@ -95,7 +94,7 @@
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, LicenseFamilyCode.UNKNOWN));
+ reporter.claim(new LicenseFamilyClaim(subject, LicenseFamilyName.UNKNOWN_LICENSE_FAMILY));
}
} catch (IOException e) {
throw new RatHeaderAnalysisException("Cannot read header for " + subject, e);
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=777537&r1=777536&r2=777537&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 14:13:32 2009
@@ -115,7 +115,7 @@
/**
* Returns a map with the license family codes. The map
- * keys are instances of {@link LicenseFamilyCode} and
+ * keys are license family category names,
* the map values are integers with the number of resources
* matching the license family code.
*/
@@ -125,7 +125,7 @@
/**
* Sets a map with the license family codes. The map
- * keys are instances of {@link LicenseFamilyCode} and
+ * keys are instances of license family category names and
* the map values are integers with the number of resources
* matching the license family code.
*/
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=777537&r1=777536&r2=777537&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 14:13:32 2009
@@ -9,7 +9,6 @@
import org.apache.rat.report.claim.ClaimStatistic;
import org.apache.rat.report.claim.IClaim;
import org.apache.rat.report.claim.IClaimReporter;
-import org.apache.rat.report.claim.LicenseFamilyCode;
import org.apache.rat.report.claim.impl.xml.CustomClaim;
@@ -64,10 +63,10 @@
if (MetaData.RAT_LICENSE_FAMILY_CATEGORY_VALUE_GEN.equals(headerCategory)) {
numGenerated++;
- incMapValue(numsByLicenseFamilyCode, LicenseFamilyCode.GENERATED);
+ incMapValue(numsByLicenseFamilyCode, MetaData.RAT_LICENSE_FAMILY_CATEGORY_VALUE_GEN);
} else if (MetaData.RAT_LICENSE_FAMILY_CATEGORY_VALUE_UNKNOWN.equals(headerCategory)) {
numUnknown++;
- incMapValue(numsByLicenseFamilyCode, LicenseFamilyCode.UNKNOWN);
+ incMapValue(numsByLicenseFamilyCode, MetaData.RAT_LICENSE_FAMILY_CATEGORY_VALUE_UNKNOWN);
}
}
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/LicenseFamilyClaim.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/LicenseFamilyClaim.java?rev=777537&r1=777536&r2=777537&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/LicenseFamilyClaim.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/LicenseFamilyClaim.java Fri May 22 14:13:32 2009
@@ -1,7 +1,6 @@
package org.apache.rat.report.claim.impl;
import org.apache.rat.document.IDocument;
-import org.apache.rat.report.claim.LicenseFamilyCode;
import org.apache.rat.report.claim.LicenseFamilyName;
@@ -11,23 +10,16 @@
*/
public class LicenseFamilyClaim extends AbstractClaim {
private final LicenseFamilyName licenseFamilyName;
- private final LicenseFamilyCode code;
/**
* Creates a new instance with the given subject and
* the given license family name.
*/
- public LicenseFamilyClaim(IDocument pSubject, LicenseFamilyName pName,
- LicenseFamilyCode pCode) {
+ public LicenseFamilyClaim(IDocument pSubject, LicenseFamilyName pName) {
super(pSubject);
licenseFamilyName = pName;
- this.code = pCode;
}
- public LicenseFamilyCode getCode() {
- return code;
- }
-
/**
* Returns the license family name.
*/
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=777537&r1=777536&r2=777537&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 14:13:32 2009
@@ -21,7 +21,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.rat.report.claim.LicenseFamilyCode;
+import org.apache.rat.api.MetaData;
import org.apache.rat.report.claim.LicenseFamilyName;
@@ -30,6 +30,6 @@
public List visitors = new ArrayList();
public MockStandardLicense() {
- super(new LicenseFamilyCode(""), new LicenseFamilyName(""), "");
+ super(new MetaData.Datum(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY, ""), new LicenseFamilyName(""), "");
}
}
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=777537&r1=777536&r2=777537&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 14:13:32 2009
@@ -23,7 +23,6 @@
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.LicenseFamilyCode;
import org.apache.rat.report.claim.LicenseFamilyName;
import org.apache.rat.report.claim.impl.LicenseApprovalClaim;
import org.apache.rat.report.claim.impl.LicenseFamilyClaim;
@@ -56,7 +55,7 @@
public void testASLFamily() throws Exception {
final IDocument subject = new MockLocation("subject");
- policy.claim(new LicenseFamilyClaim(subject, LicenseFamilyName.APACHE_SOFTWARE_LICENSE_NAME, LicenseFamilyCode.ASL_CODE));
+ policy.claim(new LicenseFamilyClaim(subject, LicenseFamilyName.APACHE_SOFTWARE_LICENSE_NAME));
assertEquals("Approved claim", 1, reporter.claims.size());
assertApproval(true);
}
@@ -77,28 +76,28 @@
public void testOASISFamily() throws Exception {
final IDocument subject = new MockLocation("subject");
- policy.claim(new LicenseFamilyClaim(subject, LicenseFamilyName.OASIS_OPEN_LICENSE_NAME, LicenseFamilyCode.OASIS_CODE));
+ policy.claim(new LicenseFamilyClaim(subject, LicenseFamilyName.OASIS_OPEN_LICENSE_NAME));
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, LicenseFamilyCode.W3C_CODE));
+ policy.claim(new LicenseFamilyClaim(subject, LicenseFamilyName.W3C_SOFTWARE_COPYRIGHT_NAME));
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, LicenseFamilyCode.W3CD_CODE));
+ policy.claim(new LicenseFamilyClaim(subject, LicenseFamilyName.W3C_DOCUMENT_COPYRIGHT_NAME));
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, LicenseFamilyCode.UNKNOWN));
+ policy.claim(new LicenseFamilyClaim(subject, LicenseFamilyName.UNKNOWN_LICENSE_FAMILY));
assertEquals("Approved claim", 1, reporter.claims.size());
assertApproval(false);
}
@@ -108,16 +107,16 @@
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, LicenseFamilyCode.UNKNOWN));
- policy.claim(new LicenseFamilyClaim(subject, LicenseFamilyName.W3C_DOCUMENT_COPYRIGHT_NAME, LicenseFamilyCode.W3CD_CODE));
- policy.claim(new LicenseFamilyClaim(subject, LicenseFamilyName.W3C_SOFTWARE_COPYRIGHT_NAME, LicenseFamilyCode.W3C_CODE));
- policy.claim(new LicenseFamilyClaim(subject, LicenseFamilyName.APACHE_SOFTWARE_LICENSE_NAME, LicenseFamilyCode.ASL_CODE));
+ 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], new LicenseFamilyCode("EXAMP")));
+ 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/Matcher.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-tasks/src/test/java/org/example/Matcher.java?rev=777537&r1=777536&r2=777537&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 14:13:32 2009
@@ -19,15 +19,15 @@
import org.apache.rat.analysis.IHeaderMatcher;
import org.apache.rat.analysis.RatHeaderAnalysisException;
import org.apache.rat.analysis.license.BaseLicense;
+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.LicenseFamilyCode;
import org.apache.rat.report.claim.LicenseFamilyName;
public class Matcher extends BaseLicense implements IHeaderMatcher {
public Matcher() {
- super(new LicenseFamilyCode("EXMPL"), new LicenseFamilyName("Example License"), "");
+ super(new MetaData.Datum(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY, "EXMPL"), new LicenseFamilyName("Example License"), "");
}
public void reset() {}