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

mapfishapp - datadir #1038

Merged
merged 12 commits into from Oct 13, 2015
Merged

mapfishapp - datadir #1038

merged 12 commits into from Oct 13, 2015

Commits on Sep 7, 2015

  1. mapfishapp - datadir

    - Exports the contexts, addons, JS configuration (including
      GEOR_custom.js) into the datadir
    - Makes the rest of the webapp configurable outside of the webapp WAR
      (using the same mechanisms as previously)
    - Allows mapfishapp to be easily customized by server-side addons (it
      allows automatic scanning of jars which classes begin with
      org.georchestra.mapfishapp.addons)
    
    As the other PR, it requires the introduction of the georchestra-module.
    pmauduit committed Sep 7, 2015
    Copy the full SHA
    bd340bd View commit details
    Browse the repository at this point in the history
  2. mapfishapp datadir - fixing path

    Fixing path to the addons in the webapp when no georchestra.datadir is
    provided.
    pmauduit committed Sep 7, 2015
    Copy the full SHA
    cc26a6c View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2015

  1. mapfishapp datadir - PR 1038 feedbacks #1

    Changing maintainer name/email to PSC
    pmauduit committed Sep 8, 2015
    Copy the full SHA
    2cf0a3d View commit details
    Browse the repository at this point in the history
  2. mfapp datadir - rework on addon controller

    See comment here:
    #1038 (comment)
    
    Tests: Utests adapted, tested at runtime with jetty:run (with and
    without datadir option).
    pmauduit committed Sep 8, 2015
    Copy the full SHA
    0452c0e View commit details
    Browse the repository at this point in the history
  3. mapfishapp datadir - taking into account comments

    Sync GEOR_custom.js with the one provided by the template configuration.
    pmauduit committed Sep 8, 2015
    Copy the full SHA
    3d35f35 View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    14b84a4 View commit details
    Browse the repository at this point in the history
  5. Copy the full SHA
    0f98436 View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2015

  1. Copy the full SHA
    ee1bc3d View commit details
    Browse the repository at this point in the history
  2. mfapp - datadir & addon management

    Do not check too early if the addon is activated or not, check it at the
    very end of the process.
    
    This allows to deactivate addons provided by default in mapfishapp,
    simply by copying it into the datadir and explicitely setting it as
    disabled in the config.json spec.
    pmauduit committed Sep 18, 2015
    Copy the full SHA
    4ffa961 View commit details
    Browse the repository at this point in the history
  3. mfapp datadir - contexts & addons controller rework

    - Hardenning tests when trying to find files on the FS
    - Aslo allows to set images from different formats (JPEG) for context
      capions.
    
    Tests: utests added for NPE avoidance
    runtime tests for the context captions
    pmauduit committed Sep 18, 2015
    Copy the full SHA
    b156143 View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    fad9f74 View commit details
    Browse the repository at this point in the history
  5. mfapp datadir - fixing WxS access

    Now using the controller systematically, irregardless if
    georchestra.datadir is configured or not. Getting the relevant file in
    both cases (like it is done for other controllers).
    pmauduit committed Sep 18, 2015
    Copy the full SHA
    97a1243 View commit details
    Browse the repository at this point in the history