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.

Sign up for GitHub

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

Jump to bottom

[GEOS-11284] Promote community module "datadir catalog loader" to core #7421

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

[GEOS-11284] Promote community module "datadir catalog loader" to core #7421

wants to merge 5 commits into from

Commits on May 30, 2024

  1. [GEOS-11284] Promote community module "datadir catalog loader" to core

    @groldan
    groldan committed May 30, 2024
    Configuration menu
    Copy the full SHA
    4a4a86d View commit details
    Browse the repository at this point in the history

  2. [GEOS-11284] retrofit DataDirectoryGeoServerLoader as a DefaultCatalo… 

    …gLoader subclass

Retrofit DataDirectoryGeoServerLoader as a DefaultCatalogLoader
subclass, now it's no longer a community module and can make protected
GeoServerLoader.readCatalog(XStreamPersister):Catalog
    @groldan
    groldan committed May 30, 2024
    Configuration menu
    Copy the full SHA
    5f1de8b View commit details
    Browse the repository at this point in the history

  3. [GEOS-11284] Load DataDirectoryGeoServerLoader through GeoserverLoade… 

    …rProxy

Let GeoServerLoaderProxy decide whether to instantiate a
DefaultGeoServerLoader or a DataDirectoryGeoServerLoader based on
externalized configuration, and remove the spring @configuration class
for DataDirectoryGeoServerLoader.

This preserves the behavior of allowing only one GeoServerLoader bean
contributed by an external plugin. Otherwise the jdcconfig one would
fail.
    @groldan
    groldan committed May 30, 2024
    Configuration menu
    Copy the full SHA
    560a430 View commit details
    Browse the repository at this point in the history

  4. [GEOS-11284] Move DataDirectoryGeoServerLoader alongside DefaultGeoSe… 

    …rverLaoder and improve javadocs
    @groldan
    groldan committed May 30, 2024
    Configuration menu
    Copy the full SHA
    6289098 View commit details
    Browse the repository at this point in the history

  5. [GEOS-11284] Fix issues from pull request revision 

    * Add missing StyleInfo.setCatalog(Catalog) call in
  AbsractCatalogFacade.resolve(StyleInfo)
* Rename config property datadir.load.parallelism as
  datdir.loader.parallelism for consistency with datadir.loader.enabled,
  and make it either a config property (i.e. lower.case and
  dot-separated) or an environment variable (i.e. UPPER_CASE)
* Fix logic to dispose the catalog loader when both the Catalog and
  GeoServer have been loaded.
* Rename CatalogConfigLoader.save(...) to CatalogConfigLoader.add(...)
  for correct semantics.
* Rename method getXstream() to getXStream()
* Clear GeoServerExtensionsHelper (init(null) does it all) after tests
  that use it.
    @groldan
    groldan committed May 30, 2024
    Configuration menu
    Copy the full SHA
    80a9d3c View commit details
    Browse the repository at this point in the history