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 11:56:55 UTC
svn commit: r777444 - in /incubator/rat/main/trunk/apache-rat-core/src:
main/java/org/apache/rat/analysis/
main/java/org/apache/rat/analysis/license/ main/java/org/apache/rat/api/
main/java/org/apache/rat/policy/ main/java/org/apache/rat/report/claim/ ...
Author: rdonkin
Date: Fri May 22 09:56:55 2009
New Revision: 777444
URL: http://svn.apache.org/viewvc?rev=777444&view=rev
Log:
RAT-53 Simplify by eliminated unnecessary class. https://issues.apache.org/jira/browse/RAT-53
Removed:
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/Claims.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/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/policy/DefaultPolicy.java
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/LicenseFamilyCode.java
incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/policy/DefaultPolicyTest.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=777444&r1=777443&r2=777444&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 09:56:55 2009
@@ -18,12 +18,12 @@
*/
package org.apache.rat.analysis.license;
-import org.apache.rat.analysis.Claims;
import org.apache.rat.analysis.IHeaderMatcher;
import org.apache.rat.analysis.RatHeaderAnalysisException;
import org.apache.rat.document.IDocument;
import org.apache.rat.license.Apache20LicenseFamily;
import org.apache.rat.report.claim.IClaimReporter;
+import org.apache.rat.report.claim.LicenseFamilyCode;
/**
* Matches Apache Software License, Version 2.0
@@ -36,7 +36,7 @@
public static final String LICENSE_REFERENCE_LINE = "http://www.apache.org/licenses/LICENSE-2.0";
public ApacheSoftwareLicense20() {
- super(Claims.ASL_CODE, Apache20LicenseFamily.APACHE_SOFTWARE_LICENSE_NAME, "");
+ super(LicenseFamilyCode.ASL_CODE, Apache20LicenseFamily.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/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=777444&r1=777443&r2=777444&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 09:56:55 2009
@@ -18,12 +18,12 @@
*/
package org.apache.rat.analysis.license;
-import org.apache.rat.analysis.Claims;
import org.apache.rat.analysis.IHeaderMatcher;
import org.apache.rat.analysis.RatHeaderAnalysisException;
import org.apache.rat.document.IDocument;
import org.apache.rat.license.ModifiedBSDLicenseFamily;
import org.apache.rat.report.claim.IClaimReporter;
+import org.apache.rat.report.claim.LicenseFamilyCode;
public class DojoLicenseHeader extends BaseLicense implements IHeaderMatcher {
@@ -42,7 +42,7 @@
public DojoLicenseHeader() {
// TODO: support for dual licensing
// TODO: support for or higher clauses
- super(Claims.DOJO, ModifiedBSDLicenseFamily.MODIFIED_BSD_LICENSE_NAME, "Dual license AFL/BSD");
+ super(LicenseFamilyCode.DOJO, ModifiedBSDLicenseFamily.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=777444&r1=777443&r2=777444&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 09:56:55 2009
@@ -20,12 +20,12 @@
import java.util.regex.Pattern;
-import org.apache.rat.analysis.Claims;
import org.apache.rat.analysis.IHeaderMatcher;
import org.apache.rat.analysis.RatHeaderAnalysisException;
import org.apache.rat.document.IDocument;
import org.apache.rat.license.OASISLicenseFamily;
import org.apache.rat.report.claim.IClaimReporter;
+import org.apache.rat.report.claim.LicenseFamilyCode;
/**
* Looks for documents contain the OASIS copyright claim plus derivative work clause.
@@ -46,7 +46,7 @@
final StringBuffer buffer = new StringBuffer();
public OASISLicense() {
- super(Claims.OASIS_CODE, OASISLicenseFamily.OASIS_OPEN_LICENSE_NAME, "No modifications allowed");
+ super(LicenseFamilyCode.OASIS_CODE, OASISLicenseFamily.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=777444&r1=777443&r2=777444&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 09:56:55 2009
@@ -18,12 +18,12 @@
*/
package org.apache.rat.analysis.license;
-import org.apache.rat.analysis.Claims;
import org.apache.rat.analysis.IHeaderMatcher;
import org.apache.rat.analysis.RatHeaderAnalysisException;
import org.apache.rat.document.IDocument;
import org.apache.rat.license.ModifiedBSDLicenseFamily;
import org.apache.rat.report.claim.IClaimReporter;
+import org.apache.rat.report.claim.LicenseFamilyCode;
public class TMF854LicenseHeader extends BaseLicense implements IHeaderMatcher {
@@ -34,7 +34,7 @@
// TMF854 Version 1.0 - Copyright TeleManagement Forum
public TMF854LicenseHeader() {
- super(Claims.TMF854, ModifiedBSDLicenseFamily.MODIFIED_BSD_LICENSE_NAME, "BSD");
+ super(LicenseFamilyCode.TMF854, ModifiedBSDLicenseFamily.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=777444&r1=777443&r2=777444&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 09:56:55 2009
@@ -18,12 +18,12 @@
*/
package org.apache.rat.analysis.license;
-import org.apache.rat.analysis.Claims;
import org.apache.rat.analysis.IHeaderMatcher;
import org.apache.rat.analysis.RatHeaderAnalysisException;
import org.apache.rat.document.IDocument;
import org.apache.rat.license.W3CDocumentLicenseFamily;
import org.apache.rat.report.claim.IClaimReporter;
+import org.apache.rat.report.claim.LicenseFamilyCode;
public class W3CDocLicense extends BaseLicense implements IHeaderMatcher {
@@ -33,7 +33,7 @@
= "http://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231";
public W3CDocLicense() {
- super(Claims.W3CD_CODE, W3CDocumentLicenseFamily.W3C_DOCUMENT_COPYRIGHT_NAME, NOTES);
+ super(LicenseFamilyCode.W3CD_CODE, W3CDocumentLicenseFamily.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=777444&r1=777443&r2=777444&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 09:56:55 2009
@@ -18,12 +18,12 @@
*/
package org.apache.rat.analysis.license;
-import org.apache.rat.analysis.Claims;
import org.apache.rat.analysis.IHeaderMatcher;
import org.apache.rat.analysis.RatHeaderAnalysisException;
import org.apache.rat.document.IDocument;
import org.apache.rat.license.W3CSoftwareLicenseFamily;
import org.apache.rat.report.claim.IClaimReporter;
+import org.apache.rat.report.claim.LicenseFamilyCode;
public class W3CLicense extends BaseLicense implements IHeaderMatcher {
@@ -33,7 +33,7 @@
= "http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231";
public W3CLicense() {
- super(Claims.W3C_CODE, W3CSoftwareLicenseFamily.W3C_SOFTWARE_COPYRIGHT_NAME, NOTES);
+ super(LicenseFamilyCode.W3C_CODE, W3CSoftwareLicenseFamily.W3C_SOFTWARE_COPYRIGHT_NAME, 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=777444&r1=777443&r2=777444&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 09:56:55 2009
@@ -45,6 +45,12 @@
* so trade some performance for simplicity.
*/
private final List/*<Datum>*/ data;
+ public static final String RAT_LICENSE_FAMILY_VALUE_ASL = "AL ";
+ public static final String RAT_LICENSE_FAMILY_VALUE_OASIS = "OASIS";
+ public static final String RAT_LICENSE_FAMILY_VALUE_W3CD = "W3CD ";
+ public static final String RAT_LICENSE_FAMILY_VALUE_W3C = "W3C ";
+ public static final String RAT_LICENSE_FAMILY_VALUE_DOJO = "DOJO ";
+ public static final String RAT_LICENSE_FAMILY_VALUE_TMF = "TMF ";
public MetaData() {
this(null);
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=777444&r1=777443&r2=777444&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 09:56:55 2009
@@ -21,7 +21,6 @@
import java.util.Arrays;
import java.util.Comparator;
-import org.apache.rat.analysis.Claims;
import org.apache.rat.document.IDocument;
import org.apache.rat.license.Apache20LicenseFamily;
import org.apache.rat.license.ILicenseFamily;
@@ -33,6 +32,7 @@
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 {
@@ -89,10 +89,14 @@
if (pClaim instanceof LicenseFamilyClaim) {
final LicenseFamilyClaim lfc = (LicenseFamilyClaim) pClaim;
final boolean isApproved = Arrays.binarySearch(approvedLicenseNames, lfc.getLicenseFamilyName(), licenseFamilyComparator) >= 0;
- Claims.reportLicenseApprovalClaim(subject, isApproved, reporter);
+ reportLicenseApprovalClaim(subject, isApproved, reporter);
}
}
+ public void reportLicenseApprovalClaim(final IDocument subject, final boolean isAcceptable, final IClaimReporter reporter) throws RatReportFailedException {
+ reporter.claim(new LicenseApprovalClaim(subject, isAcceptable));
+ }
+
public void report(final IDocument subject) throws RatReportFailedException {
this.subject = subject;
}
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/LicenseFamilyCode.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/LicenseFamilyCode.java?rev=777444&r1=777443&r2=777444&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/LicenseFamilyCode.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/LicenseFamilyCode.java Fri May 22 09:56:55 2009
@@ -1,5 +1,7 @@
package org.apache.rat.report.claim;
+import org.apache.rat.api.MetaData;
+
/**
* This class provides a pseudo enumeration for license family
@@ -7,6 +9,12 @@
*/
public class LicenseFamilyCode {
private final String name;
+ public static final LicenseFamilyCode TMF854 = new LicenseFamilyCode(MetaData.RAT_LICENSE_FAMILY_VALUE_TMF);
+ public static final LicenseFamilyCode DOJO = new LicenseFamilyCode(MetaData.RAT_LICENSE_FAMILY_VALUE_DOJO);
+ public static final LicenseFamilyCode W3C_CODE = new LicenseFamilyCode(MetaData.RAT_LICENSE_FAMILY_VALUE_W3C);
+ public static final LicenseFamilyCode W3CD_CODE = new LicenseFamilyCode(MetaData.RAT_LICENSE_FAMILY_VALUE_W3CD);
+ public static final LicenseFamilyCode OASIS_CODE = new LicenseFamilyCode(MetaData.RAT_LICENSE_FAMILY_VALUE_OASIS);
+ public static final LicenseFamilyCode ASL_CODE = new LicenseFamilyCode(MetaData.RAT_LICENSE_FAMILY_VALUE_ASL);
/**
* Creates a new instance with the given family code.
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=777444&r1=777443&r2=777444&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 09:56:55 2009
@@ -20,7 +20,6 @@
import junit.framework.TestCase;
-import org.apache.rat.analysis.Claims;
import org.apache.rat.document.IDocument;
import org.apache.rat.document.MockLocation;
import org.apache.rat.license.Apache20LicenseFamily;
@@ -61,7 +60,7 @@
public void testASLFamily() throws Exception {
final IDocument subject = new MockLocation("subject");
- policy.claim(new LicenseFamilyClaim(subject, Apache20LicenseFamily.APACHE_SOFTWARE_LICENSE_NAME, Claims.ASL_CODE, ""));
+ policy.claim(new LicenseFamilyClaim(subject, Apache20LicenseFamily.APACHE_SOFTWARE_LICENSE_NAME, LicenseFamilyCode.ASL_CODE, ""));
assertEquals("Approved claim", 1, reporter.claims.size());
assertApproval(true);
}
@@ -82,21 +81,21 @@
public void testOASISFamily() throws Exception {
final IDocument subject = new MockLocation("subject");
- policy.claim(new LicenseFamilyClaim(subject, OASISLicenseFamily.OASIS_OPEN_LICENSE_NAME, Claims.OASIS_CODE, ""));
+ policy.claim(new LicenseFamilyClaim(subject, OASISLicenseFamily.OASIS_OPEN_LICENSE_NAME, LicenseFamilyCode.OASIS_CODE, ""));
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, W3CSoftwareLicenseFamily.W3C_SOFTWARE_COPYRIGHT_NAME, Claims.W3C_CODE, ""));
+ policy.claim(new LicenseFamilyClaim(subject, W3CSoftwareLicenseFamily.W3C_SOFTWARE_COPYRIGHT_NAME, LicenseFamilyCode.W3C_CODE, ""));
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, W3CDocumentLicenseFamily.W3C_DOCUMENT_COPYRIGHT_NAME, Claims.W3CD_CODE, ""));
+ policy.claim(new LicenseFamilyClaim(subject, W3CDocumentLicenseFamily.W3C_DOCUMENT_COPYRIGHT_NAME, LicenseFamilyCode.W3CD_CODE, ""));
assertEquals("Approved claim", 1, reporter.claims.size());
assertApproval(true);
}
@@ -114,9 +113,9 @@
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, W3CDocumentLicenseFamily.W3C_DOCUMENT_COPYRIGHT_NAME, Claims.W3CD_CODE, ""));
- policy.claim(new LicenseFamilyClaim(subject, W3CSoftwareLicenseFamily.W3C_SOFTWARE_COPYRIGHT_NAME, Claims.W3C_CODE, ""));
- policy.claim(new LicenseFamilyClaim(subject, Apache20LicenseFamily.APACHE_SOFTWARE_LICENSE_NAME, Claims.ASL_CODE, ""));
+ policy.claim(new LicenseFamilyClaim(subject, W3CDocumentLicenseFamily.W3C_DOCUMENT_COPYRIGHT_NAME, LicenseFamilyCode.W3CD_CODE, ""));
+ policy.claim(new LicenseFamilyClaim(subject, W3CSoftwareLicenseFamily.W3C_SOFTWARE_COPYRIGHT_NAME, LicenseFamilyCode.W3C_CODE, ""));
+ policy.claim(new LicenseFamilyClaim(subject, Apache20LicenseFamily.APACHE_SOFTWARE_LICENSE_NAME, LicenseFamilyCode.ASL_CODE, ""));
assertEquals("Four unapproved claims", 4, reporter.claims.size());
assertApproval(false, (IClaim) reporter.claims.get(0));
assertApproval(false, (IClaim) reporter.claims.get(1));