[Geoserver-devel] providence review - three issues remaining

GeoServer GeoServer Developer
1

With a bit of encouragement from Andrea I have knocked over a lot of the issues that turned up during review. The most significant change was referencing the Apache 2.0 and Apache 1.1 license from our documentation (and adding a license section to our developers manual).

Here is what is left on the GeoServer Provenance Review page:

Just focusing on whacky licenses here is what has been fixed up:

validation

  • extension/validation/src/main/java/org/vfny/geoserver/config/validation/ArgumentConfig.java (GEOS-5426)
  • extension/validation/src/main/java/org/vfny/geoserver/config/validation/ValidationConfig.java (GEOS-5426)
  • extension/validation/src/main/java/org/vfny/geoserver/global/GeoValidator.java (GEOS-5426)

imagemap

  • extension/imagemap/src/main/java/org/vfny/geoserver/wms/responses/map/htmlimagemap/Decimator.java - modified from GeoTools LGPL (GEOS-5416)

wps

  • extension/wps/wps-core/src/main/java/org/geoserver/wps/ppio/JAIToolsRangeConverterFactory.java - GeoTools LGPL Header (GEOS-5469)
  • extension/wps/wps-core/src/main/java/org/geoserver/wps/resource/CoverageResource.java - missing header
  • extension/wps/wps-core/src/main/java/org/geoserver/wps/resource/GridCoverageResource.java - missing header

gwc

  • gwc/src/main/java/org/geoserver/gwc/dispatch/package-info.java - missing header

main

  • main/test/org/vfny/geoserver/config/ValidationTest.java - GEOS-5455
  • main/src/main/java/org/vfny/geoserver/global/xml/NameSpaceElement.java - GEOS-5455
  • main/src/main/java/org/vfny/geoserver/global/xml/GMLSchemaTranslator.java - GEOS-5455
  • main/src/main/java/org/vfny/geoserver/global/xml/XMLSchemaTranslator.java - GEOS-5455
  • main/src/main/java/org/vfny/geoserver/global/xml/NameSpaceTranslatorFactory.java - GEOS-5455
  • main/src/main/java/org/vfny/geoserver/global/xml/NameSpaceTranslator.java - GEOS-5455
  • main/src/main/java/org/vfny/geoserver/filters/SetCharacterEncodingFilter.java - Apache License Version 2.0 (GEOS-5470)
  • main/src/main/java/org/geoserver/jai/JAIInfo.java - seems fine?
  • main/src/main/java/org/geoserver/filters/GZIPFilter.java GEOS-5460
  • main/src/main/java/org/geoserver/filters/GZIPResponseWrapper.java GEOS-5460
  • main/src/main/java/org/geoserver/filters/GZIPResponseStream.java GEOS-5460

ows

  • ows/src/main/java/org/geoserver/ows/util/RewindableInputStream.java GEOS-5454
  • ows/src/main/java/org/geoserver/ows/util/UCSReader.java GEOS-5453

release

  • release/installer/mac/console/src/main/java/org/geoserver/console/Browser.java GEOS-5456

rest

  • rest/src/test/java/org/geoserver/rest/FormatTest.java.patch - um that looks like an accident (removed file)

wcs

  • wcs/src/main/java/org/geoserver/wcs/CoverageCleanerCallback.java - missing header

wcs1_1

  • wcs1_1/src/main/java/org/geoserver/wcs/xml/v1_1_1/bindings/TimeSequenceTypeBinding.java GEOS-5459
  • wcs1_1/src/main/java/org/geoserver/wcs/xml/v1_1_1/bindings/TimePeriodTypeBinding.java GEOS-5459

web core

  • web/core/src/test/java/org/geoserver/web/ComponentBuilder.java - empty header

wfs

  • wfs/src/main/java/org/geoserver/wfs/xml/NameSpaceElement.java (GEOS-5455)
  • wfs/src/main/java/org/geoserver/wfs/xml/GMLSchemaTranslator.java (GEOS-5455)
  • wfs/src/main/java/org/geoserver/wfs/xml/XMLSchemaTranslator.java (GEOS-5455)
  • wfs/src/main/java/org/geoserver/wfs/xml/NameSpaceTranslatorFactory.java (GEOS-5455)
  • wfs/src/main/java/org/geoserver/wfs/xml/NameSpaceTranslator.java (GEOS-5455)
  • wfs/src/main/java/org/geoserver/wfs/JoinExtractingVisitor.java - missing header

wms

  • wms/src/test/java/org/geoserver/wms/WMSFilterMosaicTestSupport.java - missing header
  • wms/src/test/java/org/geoserver/wms/decoration/ScaleRatioDecorationTest.java - GeoTools LGPL header (GEOS-5468)
  • wms/src/test/java/org/geoserver/wms/map/quantize/ColorIndexerTest.java - GeoTools LGPL header (GEOS-5468)
  • wms/src/test/java/org/geoserver/wms/wms_1_1_1/LayerGroupWorkspaceTest.java - missing header
  • wms/src/main/java/org/geoserver/wms/map/quantize/ColorIndexerCRIF.java - GeoTools LGPL header (GEOS-5468)
  • wms/src/main/java/org/geoserver/wms/map/quantize/ColorIndexerOpImage.java - GeoTools LGPL header (GEOS-5468)
  • wms/src/main/java/org/geoserver/wms/map/quantize/ColorIndexerDescriptor.java - GeoTools LGPL (GEOS-5468)

–
Jody Garnett

2

I stand corrected …

Ben can you tell me where the test data for data/app-schema comes from?
https://github.com/geoserver/geoserver/tree/master/data/app-schema-tutorial

I have been creating a README.rst to capture this information, just so we have something readable in github to point to.

–
Jody Garnett

On Monday, 19 November 2012 at 12:56 AM, Jody Garnett wrote:

With a bit of encouragement from Andrea I have knocked over a lot of the issues that turned up during review. The most significant change was referencing the Apache 2.0 and Apache 1.1 license from our documentation (and adding a license section to our developers manual).

Here is what is left on the GeoServer Provenance Review page:

3

On Sun, Nov 18, 2012 at 3:56 PM, Jody Garnett <jody.garnett@anonymised.com> wrote:

With a bit of encouragement from Andrea I have knocked over a lot of the issues that turned up during review. The most significant change was referencing the Apache 2.0 and Apache 1.1 license from our documentation (and adding a license section to our developers manual).

Do we have a list of those files? Wondering if we can just rewrite them so that we don’t
have a source code base with mixed licenses, or anyways we if we can find some library
providing them

Cheers
Andrea

–

==
Our support, Your Success! Visit http://opensdi.geo-solutions.it for more information.

Ing. Andrea Aime
@geowolf
Technical Lead

GeoSolutions S.A.S.
Via Poggio alle Viti 1187
55054 Massarosa (LU)
Italy
phone: +39 0584 962313
fax: +39 0584 1660272
mob: +39 339 8844549

http://www.geo-solutions.it
http://twitter.com/geosolutions_it

4

On Monday, 19 November 2012 at 1:22 AM, Andrea Aime wrote:

On Sun, Nov 18, 2012 at 3:56 PM, Jody Garnett <jody.garnett@anonymised.com> wrote:

With a bit of encouragement from Andrea I have knocked over a lot of the issues that turned up during review. The most significant change was referencing the Apache 2.0 and Apache 1.1 license from our documentation (and adding a license section to our developers manual).

Do we have a list of those files? Wondering if we can just rewrite them so that we don’t
have a source code base with mixed licenses, or anyways we if we can find some library
providing them

Sure - the files were referenced on that page - here they are…

Apache 2.0:
GEOS-5470 SetCharacterEncodingFilter provided under Apache License 2.0
GEOS-5454 RewindableInputStream borrowed from Xerces

Apache 1.1:
GEOS-5453 Use of Apache License Version 1.1, need Apache license in jar and docs

And one odd duck:
GEOS-5460 GZIPResponseStream freely use commercially and non-commercially

–
Jody Garnett

5

On Sun, Nov 18, 2012 at 3:56 PM, Jody Garnett <jody.garnett@anonymised.com> wrote:

With a bit of encouragement from Andrea I have knocked over a lot of the issues that turned up during review. The most significant change was referencing the Apache 2.0 and Apache 1.1 license from our documentation (and adding a license section to our developers manual).

Btw… I would let providence alone, seems like a good gal that does not need review.
Provenance, on the other side… :-p

Cheers
Andrea

–

==
Our support, Your Success! Visit http://opensdi.geo-solutions.it for more information.

Ing. Andrea Aime
@geowolf
Technical Lead

GeoSolutions S.A.S.
Via Poggio alle Viti 1187
55054 Massarosa (LU)
Italy
phone: +39 0584 962313
fax: +39 0584 1660272
mob: +39 339 8844549

http://www.geo-solutions.it
http://twitter.com/geosolutions_it

6

On 18/11/12 23:03, Jody Garnett wrote:

Ben can you tell me where the test data for data/app-schema comes from?
https://github.com/geoserver/geoserver/tree/master/data/app-schema-tutorial

Jody, there are three data files:

(1) data/app-schema-tutorial/workspaces/tut/tut_RoadSegment/tut_RoadSegment.properties (added by Rob Atkinson)

is identical to GeoTools modules/extension/app-schema/app-schema/src/test/resources/test-data/RoadSegments.properties . It also looks very similar to GeoServer src/main/src/test/java/org/geoserver/data/test/RoadSegments.properties, having different fields and types but similar values. In both projects try:

find . -name "*.properties" -exec grep -H "Dirt Road by Green Forest" {} \;

I am pretty sure the GeoTools version is older and, as LGPL, can be included in GeoServer without problem. I do not know the original authorship. Rob Atkinson, can you comment?

(2) data/app-schema-tutorial/workspaces/gsml/gsml_GeologicUnit/gsml_GeologicUnit.properties and

(3) data/app-schema-tutorial//workspaces/gsml/gsml_MappedFeature/gsml_MappedFeature.properties

are derived from a test data set provided by GeoScience Victoria, a branch of the Department of Primary Industries of Victoria, Australia. This is the same source as the refdataset jar deployed by Victor on the osgeo maven repo and used in app-schema-test online reference data tests (but not distributed with GeoServer). As a derived product:

"The only requirement is that you acknowledge the Victorian Department of Primary Industries as the source of data from which the product was constructed." (Linda Bibby, Manager, Geoscience Information, GeoScience Victoria, Department of Primary Industries)

We do not do this for the tutorial as it uses only a minuscule, much-edited subset of an older version, but as a matter of principle we should credit DPI Vic with something like:

"Derived from data provided by the Victorian Department of Primary Industries."

Kind regards,

--
Ben Caradoc-Davies <Ben.Caradoc-Davies@anonymised.com>
Software Engineer
CSIRO Earth Science and Resource Engineering
Australian Resources Research Centre

7

On Mon, Nov 19, 2012 at 8:54 AM, Ben Caradoc-Davies <Ben.Caradoc-Davies@anonymised.com> wrote:

On 18/11/12 23:03, Jody Garnett wrote:

Ben can you tell me where the test data for data/app-schema comes from?
https://github.com/geoserver/geoserver/tree/master/data/app-schema-tutorial

Jody, there are three data files:

(1)
data/app-schema-tutorial/workspaces/tut/tut_RoadSegment/tut_RoadSegment.properties
(added by Rob Atkinson)

is identical to GeoTools
modules/extension/app-schema/app-schema/src/test/resources/test-data/RoadSegments.properties

Mumble… wondering, wasn’t this part of the OGC CITE WMS test data set?

Cheers
Andrea

–

==
Our support, Your Success! Visit http://opensdi.geo-solutions.it for more information.

Ing. Andrea Aime
@geowolf
Technical Lead

GeoSolutions S.A.S.
Via Poggio alle Viti 1187
55054 Massarosa (LU)
Italy
phone: +39 0584 962313
fax: +39 0584 1660272
mob: +39 339 8844549

http://www.geo-solutions.it
http://twitter.com/geosolutions_it

8

Perfect Ben can you add that to a Readme.rst and we can get on with life :slight_smile:

–
Jody

Sent with Sparrow

On Monday, 19 November 2012 at 17:54, Ben Caradoc-Davies wrote:

On 18/11/12 23:03, Jody Garnett wrote:

Ben can you tell me where the test data for data/app-schema comes from?
https://github.com/geoserver/geoserver/tree/master/data/app-schema-tutorial

Jody, there are three data files:

(1)
data/app-schema-tutorial/workspaces/tut/tut_RoadSegment/tut_RoadSegment.properties
(added by Rob Atkinson)

is identical to GeoTools
modules/extension/app-schema/app-schema/src/test/resources/test-data/RoadSegments.properties
. It also looks very similar to GeoServer
src/main/src/test/java/org/geoserver/data/test/RoadSegments.properties,
having different fields and types but similar values. In both projects try:

find . -name “*.properties” -exec grep -H “Dirt Road by Green Forest” {} ;

I am pretty sure the GeoTools version is older and, as LGPL, can be
included in GeoServer without problem. I do not know the original
authorship. Rob Atkinson, can you comment?

(2)
data/app-schema-tutorial/workspaces/gsml/gsml_GeologicUnit/gsml_GeologicUnit.properties
and

(3)
data/app-schema-tutorial//workspaces/gsml/gsml_MappedFeature/gsml_MappedFeature.properties

are derived from a test data set provided by GeoScience Victoria, a
branch of the Department of Primary Industries of Victoria, Australia.
This is the same source as the refdataset jar deployed by Victor on the
osgeo maven repo and used in app-schema-test online reference data tests
(but not distributed with GeoServer). As a derived product:

“The only requirement is that you acknowledge the Victorian Department
of Primary Industries as the source of data from which the product was
constructed.” (Linda Bibby, Manager, Geoscience Information, GeoScience
Victoria, Department of Primary Industries)

We do not do this for the tutorial as it uses only a minuscule,
much-edited subset of an older version, but as a matter of principle we
should credit DPI Vic with something like:

“Derived from data provided by the Victorian Department of Primary
Industries.”

Kind regards,

–
Ben Caradoc-Davies <Ben.Caradoc-Davies@anonymised.com4…>
Software Engineer
CSIRO Earth Science and Resource Engineering
Australian Resources Research Centre

9

On 19/11/12 16:01, Andrea Aime wrote:

On Mon, Nov 19, 2012 at 8:54 AM, Ben Caradoc-Davies
<Ben.Caradoc-Davies@anonymised.com <mailto:Ben.Caradoc-Davies@anonymised.com>> wrote:
    On 18/11/12 23:03, Jody Garnett wrote:
     > Ben can you tell me where the test data for data/app-schema comes
    from?
     >
    https://github.com/geoserver/geoserver/tree/master/data/app-schema-tutorial
    Jody, there are three data files:
    (1)
    data/app-schema-tutorial/workspaces/tut/tut_RoadSegment/tut_RoadSegment.properties
    (added by Rob Atkinson)
    is identical to GeoTools
    modules/extension/app-schema/app-schema/src/test/resources/test-data/RoadSegments.properties

Mumble... wondering, wasn't this part of the OGC CITE WMS test data set?

Thanks! You are correct. I'll add that to the app-schema-tutorial README.rst.

Kind regards,

--
Ben Caradoc-Davies <Ben.Caradoc-Davies@anonymised.com>
Software Engineer
CSIRO Earth Science and Resource Engineering
Australian Resources Research Centre

10

Done:
https://github.com/geoserver/geoserver/tree/master/data/app-schema-tutorial

On 19/11/12 16:56, Jody wrote:

Perfect Ben can you add that to a Readme.rst and we can get on with life :slight_smile:

--
Ben Caradoc-Davies <Ben.Caradoc-Davies@anonymised.com>
Software Engineer
CSIRO Earth Science and Resource Engineering
Australian Resources Research Centre