Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[GEOS-8240] Fix "Forwarded" header name, add user docs #2968

Merged
merged 3 commits into from Jul 5, 2018

Conversation

lmorandini
Copy link
Contributor

@lmorandini lmorandini commented Jul 4, 2018

  • Fixed the name of the "Forwarded" header
  • Added user documentation (English only)

See discussion: 3c05cfb#commitcomment-29588575

- Fixed the name of the "Forwarded" header
- Added user documentation (English only)
@bencaradocdavies bencaradocdavies changed the title GEOS-8240 (coda) [GEOS-8240] Fix "Forwarded" header name, add user docs Jul 4, 2018
@bencaradocdavies
Copy link
Contributor

@lmoran the Travis CI failure is a formatting check failure in src/main/src/test/java/org/vfny/geoserver/util/URLProxifyingTest.java. Building the gs-main module is a convenient way to run the formatter and fix this problem.

@lmorandini
Copy link
Contributor Author

The formatting... well, I wasn't able to build the main module once I pulled the latest changes from master, because of:

/geoserver/src/main/src/main/java/org/geoserver/catalog/util/LegacyCatalogImporter.java:[455,16]` error: no suitable constructor found for ReferencedEnvelope(org.locationtech.jts.geom.Envelope,DefaultGeographicCRS)
[ERROR]     constructor ReferencedEnvelope.ReferencedEnvelope(Rectangle2D,CoordinateReferenceSystem) is not applicable
[ERROR]       (argument mismatch; org.locationtech.jts.geom.Envelope cannot be converted to Rectangle2D)

There are similar-sounding errors in other classes as well.

@aaime
Copy link
Member

aaime commented Jul 4, 2018

@lmoran it's likely due to the recent switch to JTS 1.15.1, which changed package from "com.vividsolutions" to "org.locationtech". Long story short, you need a fresh build of geotools and an up to date checkout of GeoServer.

- Fixed a bug that threw an NPE when the configuration was read
  using XStream
- Improved documentation on the use of templates for the proxy base URL
- Improved comments on QuickTemplate class
@lmorandini
Copy link
Contributor Author

IIUC, the failing tests are unrelated to my commits, is that so?

@dromagnoli
Copy link
Contributor

The fix looks correct to me. I have applied that "PR" on my code since I was having issues with the layerPreview so now I can see the layerPreviews. Travis tests are failing but I think they are unrelated to the changes made by @lmoran.
I did a full build without -Prelease,communityRelease and it was successfully.
Adding those profiles to my maven build, I'm getting some different test failures (on worldwind and some others) but they look unrelated to this fix again.

Anyone else has other feedbacks?

@aaime
Copy link
Member

aaime commented Jul 5, 2018

@dromagnoli If you have tests running in the build, -Prelease is all you can do, community modules are run in a secondary build with tests disabled and have indeed many failure (getting test coverage and making that a blocker for people changing core is a privilege for extension modules, it's the reason to push people to go and make the module supported).
So when you run -PcommunityRelease, you should always also add -DskipTests.

@aaime
Copy link
Member

aaime commented Jul 5, 2018

By the way, I've restarted the build again... already did once this morning, think I saw the same WCS failures, though I agree I don't understand where they are coming from.

@dromagnoli
Copy link
Contributor

travis is back to green! :)

@aaime
Copy link
Member

aaime commented Jul 5, 2018

image

@aaime
Copy link
Member

aaime commented Jul 5, 2018

Changes look fair to me, merging

@aaime aaime merged commit 829e82c into geoserver:master Jul 5, 2018
@bencaradocdavies
Copy link
Contributor

I kicked the Jenkins CITE tests as they should now be fixed.

@lmorandini
Copy link
Contributor Author

Fixed as a consequence of this PR @bencaradocdavies ?

@bencaradocdavies
Copy link
Contributor

Yes @lmoran, the CITE tests have recovered.

@lmorandini lmorandini deleted the GEOS-8240-2 branch July 20, 2018 03:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
4 participants