On 24 February 2015 at 07:01, P. Ottlinger <[email protected]> wrote: > Hi Sebb, > > since you seem to have write access to the SVN as well - feel free to > change it .... that's why I introduce the changes step-by-step :-)
I'm not entirely sure what it should be, because the Javadoc is somewhat lacking. > Could you be so kind to quote in case you answer mails - it's quite hard > to spot your comments in these long commit mails .... Not sure what you mean by that. I replied to the commit mail, and trimmed the irrelevant stuff - what more do you want me to do? > Am 24.02.2015 um 01:06 schrieb sebb: >>> Added: >>> creadur/rat/trunk/apache-rat-api/src/main/java/org/apache/rat/api/domain/RatLicenseFamily.java >>> URL: >>> http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-api/src/main/java/org/apache/rat/api/domain/RatLicenseFamily.java?rev=1661803&view=auto >>> ============================================================================== >>> --- >>> creadur/rat/trunk/apache-rat-api/src/main/java/org/apache/rat/api/domain/RatLicenseFamily.java >>> (added) >>> +++ >>> creadur/rat/trunk/apache-rat-api/src/main/java/org/apache/rat/api/domain/RatLicenseFamily.java >>> Mon Feb 23 22:25:53 2015 >> >> -1 >> >> This class looks wrong to me. >> >>> @@ -0,0 +1,137 @@ >>> +/* >>> + * Licensed to the Apache Software Foundation (ASF) under one >>> + * or more contributor license agreements. See the NOTICE file >>> + * distributed with this work for additional information >>> + * regarding copyright ownership. The ASF licenses this file >>> + * to you under the Apache License, Version 2.0 (the >>> + * "License"); you may not use this file except in compliance >>> + * with the License. You may obtain a copy of the License at >>> + * >>> + * http://www.apache.org/licenses/LICENSE-2.0 >>> + * >>> + * Unless required by applicable law or agreed to in writing, >>> + * software distributed under the License is distributed on an >>> + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY >>> + * KIND, either express or implied. See the License for the >>> + * specific language governing permissions and limitations >>> + * under the License. >>> + */ >>> +package org.apache.rat.api.domain; >>> + >>> +import static >>> org.apache.rat.api.domain.LicenseFamilyBuilder.aLicenseFamily; >>> + >>> +/** >>> + * Enumerates standard license families known to Rat. >>> + */ >>> +public enum RatLicenseFamily { >>> + >>> + APACHE( >>> + "Apache License Version 2.0", >>> + "AL ", >>> + "Note that APACHE requires a NOTICE. All >>> modifications require notes. See >>> http://www.apache.org/licenses/LICENSE-2.0.";), >> >> What does "All modifications require notes." actually mean? >> >> It could be taken to mean that all code modifications require entries >> in the NOTICE file - which is definitely not the case for APACHE. >> >> I don't think RAT should be in the business of interpreting license >> conditions. >> >>> + GPL1( >>> + "GNU General Public License, version 1", >>> + "GPL1 ", >>> + "Note that GPL1 requires a NOTICE. All >>> modifications require notes. See >>> http://www.gnu.org/licenses/gpl-1.0.html.";), >>> + GPL2( >>> + "GNU General Public License, version 2", >>> + "GPL2 ", >>> + "Note that GPL2 requires a NOTICE. All >>> modifications require notes. See >>> http://www.gnu.org/licenses/gpl-2.0.html.";), >>> + GPL3( >>> + "GNU General Public License, version 3", >>> + "GPL3 ", >>> + "Note that GPL3 requires a NOTICE. All >>> modifications require notes. See >>> http://www.gnu.org/licenses/gpl-3.0.html.";), >>> + MIT( >>> + "The MIT License", >>> + "MIT ", >>> + "Note that MIT requires a NOTICE. All modifications >>> require notes. See http://opensource.org/licenses/MIT.";), >>> + CDDL1( >>> + "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.";), >>> + TMF854( >>> + "Modified BSD License", >>> + "TMF ", >>> + "Note that TMF854 requires a NOTICE. All >>> modifications require notes. See >>> http://opensource.org/licenses/BSD-3-Clause.";), >>> + DOJO( >>> + "Modified BSD License", >>> + "DOJO ", >>> + "Note that DOJO requires a NOTICE. All >>> modifications require notes. See >>> http://dojotoolkit.org/community/licensing.shtml.";), >>> + W3C( >>> + "W3C Software Copyright", >>> + "W3C ", >>> + "Note that W3C requires a NOTICE. All modifications require >>> notes. See >>> http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231.";), >>> + >>> + W3C_DOCUMENTATION( >>> + "W3C Document Copyright", >>> + "W3CD ", >>> + "Note that W3CD does not allow modifications. See >>> http://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231.";); >>> + >>> + /** @see LicenseFamily#getName() */ >>> + private final String name; >>> + /** @see LicenseFamily#getCategory() */ >>> + private final String category; >>> + /** @see LicenseFamily#getNotes() */ >>> + private final String notes; >>> + /** Constructed from other data */ >>> + private final LicenseFamily licenseFamily; >>> + >> >> The 3rd string in each of the enums appears to be a mixture of several >> different attributes. >> >> These should be split into separate fields, and their purpose should >> be documented. > > +1 > Go ahead, please. I would, but I'm not entirely clear what their purpose is. > Thanks > Phil > >
