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

Spring mvc #366

Closed
wants to merge 32 commits into from
Closed

Spring mvc #366

wants to merge 32 commits into from

Commits on Dec 17, 2012

  1. Merge pull request geonetwork#4 from geonetwork/master 

    Pull request to synch with geonetwork/core-geonetwork repository
    @josegar74
    josegar74 committed Dec 17, 2012
    Configuration menu
    Copy the full SHA
    86702de View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2013

  1. Merge pull request geonetwork#6 from geonetwork/master 

    Update to master
    @josegar74
    josegar74 committed Feb 9, 2013
    Configuration menu
    Copy the full SHA
    734f5cd View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2013

  1. Merge remote-tracking branch 'upstream/develop' into develop

    @josegar74
    josegar74 committed Nov 12, 2013
    Configuration menu
    Copy the full SHA
    0649074 View commit details
    Browse the repository at this point in the history

  2. Generic Spring MVC controller to replace JeevesServlet.

    @josegar74
    josegar74 committed Nov 12, 2013
    Configuration menu
    Copy the full SHA
    e5d6099 View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2013

  1. Test to create specific Spring MVC controllers for GeoNetwork service… 

    …s (for groups list/edit)
    @josegar74
    josegar74 committed Nov 20, 2013
    Configuration menu
    Copy the full SHA
    c925817 View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2013

  1. Get service migrated. Testing how to do it more easily. This is pure … 

    …Spring MVC
    @Delawen
    Delawen committed Nov 27, 2013
    Configuration menu
    Copy the full SHA
    b055950 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' of https://github.com/geonetwork/core-geonetwork… 

    … into spring-mvc
    @Delawen
    Delawen committed Nov 27, 2013
    Configuration menu
    Copy the full SHA
    b5accfd View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2013

  1. Adding contentNegotiation and basic beans

    @Delawen
    Delawen committed Dec 19, 2013
    Configuration menu
    Copy the full SHA
    a200399 View commit details
    Browse the repository at this point in the history

  2. Return xml by default

    @Delawen
    Delawen committed Dec 19, 2013
    Configuration menu
    Copy the full SHA
    ad6c9dc View commit details
    Browse the repository at this point in the history

  3. More spring MVC tweaks

    @Delawen
    Delawen committed Dec 19, 2013
    Configuration menu
    Copy the full SHA
    a72a9ae View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2014

  1. Missing version on spring-oxm

    @Delawen
    Delawen committed Jan 23, 2014
    Configuration menu
    Copy the full SHA
    d300fc4 View commit details
    Browse the repository at this point in the history

  2. Findbugs errors fixed

    @Delawen
    Delawen committed Jan 23, 2014
    Configuration menu
    Copy the full SHA
    fa435ea View commit details
    Browse the repository at this point in the history

  3. Adding version for jackson

    @Delawen
    Delawen committed Jan 23, 2014
    Configuration menu
    Copy the full SHA
    3308f83 View commit details
    Browse the repository at this point in the history

  4. Removing tmp file

    @Delawen
    Delawen committed Jan 23, 2014
    Configuration menu
    Copy the full SHA
    776fcf7 View commit details
    Browse the repository at this point in the history

  5. FindBugs fixes

    @Delawen
    Delawen committed Jan 23, 2014
    Configuration menu
    Copy the full SHA
    12be144 View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2014

  1. Service config.Get.java done, but Jeeves still wants to work over Spring

    @Delawen
    Delawen committed Jan 24, 2014
    Configuration menu
    Copy the full SHA
    69dd64a View commit details
    Browse the repository at this point in the history

  2. Fixing SettingManager error on compile (eclipse didn't notice??)

    @Delawen
    Delawen committed Jan 24, 2014
    Configuration menu
    Copy the full SHA
    3ab7804 View commit details
    Browse the repository at this point in the history

Commits on Jan 27, 2014

  1. Adding json endpoint

    @Delawen
    Delawen committed Jan 27, 2014
    Configuration menu
    Copy the full SHA
    a8716f6 View commit details
    Browse the repository at this point in the history

  2. Adding internacionalization filter on url /srv/{lang}/service

    @Delawen
    Delawen committed Jan 27, 2014
    Configuration menu
    Copy the full SHA
    bf8a263 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' of https://github.com/geonetwork/core-geonetwork… 

    … into spring-mvc

Conflicts:
	core/src/main/java/org/fao/geonet/kernel/setting/SettingManager.java
	core/src/main/resources/config-spring-geonetwork.xml
	domain/src/main/java/org/fao/geonet/domain/GeonetEntity.java
	domain/src/main/java/org/fao/geonet/domain/StatusValue.java
	pom.xml
	web/pom.xml
	web/src/main/webResources/WEB-INF/web.xml
	web/src/main/webapp/WEB-INF/classes/JZKitConfig.xml
	web/src/main/webapp/WEB-INF/config-security/config-security-mapping.xml
	web/src/main/webapp/WEB-INF/config-spring-geonetwork.xml
    @Delawen
    Delawen committed Jan 27, 2014
    Configuration menu
    Copy the full SHA
    4b7b9bc View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2014

  1. Fixing merging

    @Delawen
    Delawen committed Jan 30, 2014
    Configuration menu
    Copy the full SHA
    3de2d3a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' of https://github.com/geonetwork/core-geonetwork… 

    … into spring-mvc
    @Delawen
    Delawen committed Jan 30, 2014
    Configuration menu
    Copy the full SHA
    4a454b0 View commit details
    Browse the repository at this point in the history

  3. Solving findbug errors

    @Delawen
    Delawen committed Jan 30, 2014
    Configuration menu
    Copy the full SHA
    39990af View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2014

  1. Merge branch 'develop' of https://github.com/geonetwork/core-geonetwork… 

    … into spring-mvc

Conflicts:
	common/src/main/java/org/fao/geonet/utils/GeonetHttpRequestFactory.java
    @Delawen
    Delawen committed Jan 31, 2014
    Configuration menu
    Copy the full SHA
    905fea4 View commit details
    Browse the repository at this point in the history

  2. Simpler pom.xml for controllers

    @Delawen
    Delawen committed Jan 31, 2014
    Configuration menu
    Copy the full SHA
    e3461c7 View commit details
    Browse the repository at this point in the history

  3. Simpler pom.xml dependencies

    @Delawen
    Delawen committed Jan 31, 2014
    Configuration menu
    Copy the full SHA
    ec7f4ac View commit details
    Browse the repository at this point in the history

  4. Removing "srv" from Locale Interceptor

    @Delawen
    Delawen committed Jan 31, 2014
    Configuration menu
    Copy the full SHA
    f8a3d2c View commit details
    Browse the repository at this point in the history

  5. What happened with the other web.xml commit??

    @Delawen
    Delawen committed Jan 31, 2014
    Configuration menu
    Copy the full SHA
    b35193a View commit details
    Browse the repository at this point in the history

Commits on Feb 4, 2014

  1. Small bugfixes, but jpa does not start

    @Delawen
    Delawen committed Feb 4, 2014
    Configuration menu
    Copy the full SHA
    9aa5b2e View commit details
    Browse the repository at this point in the history

  2. Replacing for autowired

    @Delawen
    Delawen committed Feb 4, 2014
    Configuration menu
    Copy the full SHA
    327184e View commit details
    Browse the repository at this point in the history

Commits on Feb 5, 2014

  1. Refactoring config-spring-geonetwork to not duplicate beans

    @Delawen
    Delawen committed Feb 5, 2014
    Configuration menu
    Copy the full SHA
    b761122 View commit details
    Browse the repository at this point in the history

  2. Spring now launches but does not find any mapping

    @Delawen
    Delawen committed Feb 5, 2014
    Configuration menu
    Copy the full SHA
    07696b7 View commit details
    Browse the repository at this point in the history