Author: rdonkin
Date: Sat Dec 7 08:55:31 2013
New Revision: 1548820
URL: http://svn.apache.org/r1548820
Log:
Convert OASISLicense to use LicenseFamily constructor
Modified:
creadur/rat/branches/gsoc/apache-rat-api/src/main/java/org/apache/rat/api/domain/RatLicenseFamily.java
creadur/rat/branches/gsoc/apache-rat-api/src/test/java/org/apache/rat/api/domain/RatLicenseFamilyTest.java
creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/analysis/license/OASISLicense.java
creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/api/MetaData.java
creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/license/OASISLicenseFamily.java
creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/policy/DefaultPolicy.java
creadur/rat/branches/gsoc/apache-rat-core/src/test/java/org/apache/rat/analysis/license/OASISLicenseTest.java
creadur/rat/branches/gsoc/apache-rat-core/src/test/java/org/apache/rat/policy/DefaultPolicyTest.java
Modified:
creadur/rat/branches/gsoc/apache-rat-api/src/main/java/org/apache/rat/api/domain/RatLicenseFamily.java
URL:
http://svn.apache.org/viewvc/creadur/rat/branches/gsoc/apache-rat-api/src/main/java/org/apache/rat/api/domain/RatLicenseFamily.java?rev=1548820&r1=1548819&r2=1548820&view=diff
==============================================================================
---
creadur/rat/branches/gsoc/apache-rat-api/src/main/java/org/apache/rat/api/domain/RatLicenseFamily.java
(original)
+++
creadur/rat/branches/gsoc/apache-rat-api/src/main/java/org/apache/rat/api/domain/RatLicenseFamily.java
Sat Dec 7 08:55:31 2013
@@ -49,6 +49,10 @@ public enum RatLicenseFamily {
"COMMON DEVELOPMENT AND DISTRIBUTION LICENSE Version
1.0",
"CDDL1",
"Note that CDDL1 requires a NOTICE. All modifications
require notes. See https://oss.oracle.com/licenses/CDDL.";),
+ OASIS(
+ "OASIS Open License",
+ "OASIS",
+ "Note that OASIS requires a NOTICE. All modifications
require notes. See https://www.oasis-open.org/policies-guidelines/ipr.";),
W3C(
"W3C Software Copyright",
"W3C ",
Modified:
creadur/rat/branches/gsoc/apache-rat-api/src/test/java/org/apache/rat/api/domain/RatLicenseFamilyTest.java
URL:
http://svn.apache.org/viewvc/creadur/rat/branches/gsoc/apache-rat-api/src/test/java/org/apache/rat/api/domain/RatLicenseFamilyTest.java?rev=1548820&r1=1548819&r2=1548820&view=diff
==============================================================================
---
creadur/rat/branches/gsoc/apache-rat-api/src/test/java/org/apache/rat/api/domain/RatLicenseFamilyTest.java
(original)
+++
creadur/rat/branches/gsoc/apache-rat-api/src/test/java/org/apache/rat/api/domain/RatLicenseFamilyTest.java
Sat Dec 7 08:55:31 2013
@@ -24,6 +24,7 @@ import static org.apache.rat.api.domain.
import static org.apache.rat.api.domain.RatLicenseFamily.GPL2;
import static org.apache.rat.api.domain.RatLicenseFamily.GPL3;
import static org.apache.rat.api.domain.RatLicenseFamily.MIT;
+import static org.apache.rat.api.domain.RatLicenseFamily.OASIS;
import static org.apache.rat.api.domain.RatLicenseFamily.W3C;
import static org.apache.rat.api.domain.RatLicenseFamily.W3C_DOCUMENTATION;
import static org.hamcrest.CoreMatchers.is;
@@ -169,4 +170,22 @@ public class RatLicenseFamilyTest {
CDDL1.getNotes(),
is("Note that CDDL1 requires a NOTICE. All
modifications require notes. See https://oss.oracle.com/licenses/CDDL.";));
}
+
+ @Test
+ public void testOASISLicenseFamilyCategory() {
+ assertThat(OASIS.getCategory(), is("OASIS"));
+ }
+
+ @Test
+ public void testOASISLicenseFamilyName() {
+ assertThat(OASIS.getName(),
+ is("OASIS Open License"));
+ }
+
+ @Test
+ public void testOASISLicenseFamilyNotes() {
+ assertThat(
+ OASIS.getNotes(),
+ is("Note that OASIS requires a NOTICE. All
modifications require notes. See
https://www.oasis-open.org/policies-guidelines/ipr.";));
+ }
}
Modified:
creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/analysis/license/OASISLicense.java
URL:
http://svn.apache.org/viewvc/creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/analysis/license/OASISLicense.java?rev=1548820&r1=1548819&r2=1548820&view=diff
==============================================================================
---
creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/analysis/license/OASISLicense.java
(original)
+++
creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/analysis/license/OASISLicense.java
Sat Dec 7 08:55:31 2013
@@ -18,10 +18,11 @@
*/
package org.apache.rat.analysis.license;
+import static org.apache.rat.api.domain.RatLicenseFamily.OASIS;
+
import java.util.regex.Pattern;
import org.apache.rat.api.Document;
-import org.apache.rat.api.MetaData;
/**
* Looks for documents contain the OASIS copyright claim plus derivative work
clause.
@@ -42,15 +43,13 @@ public class OASISLicense extends FullTe
private static final Pattern COPYRIGHT_PATTERN =
Pattern.compile(COPYRIGHT_PATTERN_DEFN);
/** The copyright match. */
- private boolean copyrightMatch;
+ private boolean copyrightMatch;
/**
* Instantiates a new oASIS license.
*/
public OASISLicense() {
- super(MetaData.RAT_LICENSE_FAMILY_CATEGORY_DATUM_OASIS,
- MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_OASIS_OPEN_LICENSE,
- "No modifications allowed",
+ super(OASIS.licenseFamily(),
CLAUSE_DEFN);
}
@@ -62,7 +61,7 @@ public class OASISLicense extends FullTe
* .rat.api.Document, java.lang.String)
*/
@Override
- public boolean match(final Document subject, final String line) {
+ public boolean match(final Document subject, final String line) {
boolean result = false;
if (copyrightMatch) {
result = super.match(subject, line);
Modified:
creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/api/MetaData.java
URL:
http://svn.apache.org/viewvc/creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/api/MetaData.java?rev=1548820&r1=1548819&r2=1548820&view=diff
==============================================================================
---
creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/api/MetaData.java
(original)
+++
creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/api/MetaData.java
Sat Dec 7 08:55:31 2013
@@ -64,7 +64,6 @@ public class MetaData {
// Shortcuts used in report output, must be exactly 5 characters
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_OASIS =
"OASIS";
public static final String RAT_LICENSE_FAMILY_CATEGORY_VALUE_DOJO = "DOJO
";
public static final String RAT_LICENSE_FAMILY_CATEGORY_VALUE_TMF = "TMF ";
@@ -74,9 +73,6 @@ public class MetaData {
public static final Datum RAT_LICENSE_FAMILY_CATEGORY_DATUM_UNKNOWN = new
Datum(
RAT_URL_LICENSE_FAMILY_CATEGORY,
RAT_LICENSE_FAMILY_CATEGORY_VALUE_UNKNOWN);
- public static final Datum RAT_LICENSE_FAMILY_CATEGORY_DATUM_OASIS = new
Datum(
- RAT_URL_LICENSE_FAMILY_CATEGORY,
- RAT_LICENSE_FAMILY_CATEGORY_VALUE_OASIS);
public static final Datum RAT_LICENSE_FAMILY_CATEGORY_DATUM_DOJO = new
Datum(
RAT_URL_LICENSE_FAMILY_CATEGORY,
RAT_LICENSE_FAMILY_CATEGORY_VALUE_DOJO);
@@ -88,13 +84,9 @@ public class MetaData {
public static final String RAT_URL_LICENSE_FAMILY_NAME = RAT_BASE_URL
+ "#LicenseFamilyName";
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";
public static final String
RAT_LICENSE_FAMILY_NAME_VALUE_MODIFIED_BSD_LICENSE = "Modified BSD License";
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 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);
Modified:
creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/license/OASISLicenseFamily.java
URL:
http://svn.apache.org/viewvc/creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/license/OASISLicenseFamily.java?rev=1548820&r1=1548819&r2=1548820&view=diff
==============================================================================
---
creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/license/OASISLicenseFamily.java
(original)
+++
creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/license/OASISLicenseFamily.java
Sat Dec 7 08:55:31 2013
@@ -18,10 +18,10 @@
*/
package org.apache.rat.license;
-import org.apache.rat.api.MetaData;
+import static org.apache.rat.api.domain.RatLicenseFamily.OASIS;
public final class OASISLicenseFamily extends SimpleLicenseFamily {
public OASISLicenseFamily() {
- super(MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_OASIS_OPEN_LICENSE);
+ super(OASIS.getName());
}
}
Modified:
creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/policy/DefaultPolicy.java
URL:
http://svn.apache.org/viewvc/creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/policy/DefaultPolicy.java?rev=1548820&r1=1548819&r2=1548820&view=diff
==============================================================================
---
creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/policy/DefaultPolicy.java
(original)
+++
creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/policy/DefaultPolicy.java
Sat Dec 7 08:55:31 2013
@@ -22,6 +22,7 @@ package org.apache.rat.policy;
import static org.apache.rat.api.domain.RatLicenseFamily.APACHE;
import static org.apache.rat.api.domain.RatLicenseFamily.CDDL1;
import static org.apache.rat.api.domain.RatLicenseFamily.MIT;
+import static org.apache.rat.api.domain.RatLicenseFamily.OASIS;
import static org.apache.rat.api.domain.RatLicenseFamily.W3C;
import static org.apache.rat.api.domain.RatLicenseFamily.W3C_DOCUMENTATION;
@@ -35,7 +36,7 @@ import org.apache.rat.license.ILicenseFa
public class DefaultPolicy implements IDocumentAnalyser {
private static final String[] APPROVED_LICENSES = { APACHE.getName(),
- MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_OASIS_OPEN_LICENSE,
+ OASIS.getName(),
W3C.getName(), W3C_DOCUMENTATION.getName(),
MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_MODIFIED_BSD_LICENSE,
MIT.getName(), CDDL1.getName(), };
Modified:
creadur/rat/branches/gsoc/apache-rat-core/src/test/java/org/apache/rat/analysis/license/OASISLicenseTest.java
URL:
http://svn.apache.org/viewvc/creadur/rat/branches/gsoc/apache-rat-core/src/test/java/org/apache/rat/analysis/license/OASISLicenseTest.java?rev=1548820&r1=1548819&r2=1548820&view=diff
==============================================================================
---
creadur/rat/branches/gsoc/apache-rat-core/src/test/java/org/apache/rat/analysis/license/OASISLicenseTest.java
(original)
+++
creadur/rat/branches/gsoc/apache-rat-core/src/test/java/org/apache/rat/analysis/license/OASISLicenseTest.java
Sat Dec 7 08:55:31 2013
@@ -18,7 +18,9 @@
*/
package org.apache.rat.analysis.license;
+import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import java.io.BufferedReader;
@@ -52,10 +54,10 @@ public class OASISLicenseTest {
"This document and the information contained herein is provided on
an \"AS IS\" basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED,
INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION
HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF
MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.\n" +
"-->\n";
- private OASISLicense license;
+ private OASISLicense license;
@Before
- public void setUp() {
+ public void setUp() {
license = new OASISLicense();
}
@@ -80,5 +82,22 @@ public class OASISLicenseTest {
boolean result = license.match(subject, "New line");
assertFalse("After reset, content should build up again",
result);
}
+
+ @Test
+ public void testNotes() {
+ assertThat(
+ license.getNotes(),
+ is("Note that OASIS requires a NOTICE. All
modifications require notes. See
https://www.oasis-open.org/policies-guidelines/ipr.";));
+ }
+
+ @Test
+ public void testCategory() {
+ assertThat(license.getLicenseFamilyCategory(), is("OASIS"));
+ }
+
+ @Test
+ public void testName() {
+ assertThat(license.getLicenseFamilyName(), is("OASIS Open
License"));
+ }
}
Modified:
creadur/rat/branches/gsoc/apache-rat-core/src/test/java/org/apache/rat/policy/DefaultPolicyTest.java
URL:
http://svn.apache.org/viewvc/creadur/rat/branches/gsoc/apache-rat-core/src/test/java/org/apache/rat/policy/DefaultPolicyTest.java?rev=1548820&r1=1548819&r2=1548820&view=diff
==============================================================================
---
creadur/rat/branches/gsoc/apache-rat-core/src/test/java/org/apache/rat/policy/DefaultPolicyTest.java
(original)
+++
creadur/rat/branches/gsoc/apache-rat-core/src/test/java/org/apache/rat/policy/DefaultPolicyTest.java
Sat Dec 7 08:55:31 2013
@@ -20,6 +20,7 @@ package org.apache.rat.policy;
import static org.apache.rat.api.domain.RatLicenseFamily.APACHE;
import static org.apache.rat.api.domain.RatLicenseFamily.MIT;
+import static org.apache.rat.api.domain.RatLicenseFamily.OASIS;
import static org.apache.rat.api.domain.RatLicenseFamily.W3C;
import static org.apache.rat.api.domain.RatLicenseFamily.W3C_DOCUMENTATION;
import static org.junit.Assert.assertEquals;
@@ -56,12 +57,14 @@ public class DefaultPolicyTest {
assertEquals(pApproved,
MetaData.RAT_APPROVED_LICENSE_VALUE_TRUE.equals(subject.getMetaData().value(MetaData.RAT_URL_APPROVED_LICENSE)));
}
- @Test
- public void testOASISFamily() throws Exception {
-
subject.getMetaData().set(MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_OASIS_OPEN_LICENSE);
- policy.analyse(subject);
- assertApproval(true);
- }
+ @Test
+ public void testOASISFamily() throws Exception {
+ subject.getMetaData().set(
+ new
MetaData.Datum(MetaData.RAT_URL_LICENSE_FAMILY_NAME, OASIS
+ .getName()));
+ policy.analyse(subject);
+ assertApproval(true);
+ }
@Test
public void testW3CFamily() throws Exception {
