Fisheye: changeset 7043

Sedlack, Aron

committed

7043

on 27 Apr 16

APPDEV-5168: Create branch for testing merging

7041

APPDEV-5168-testmergec

Options

branches APPDEV-5168-testmergec
- File .classpath
- File .gitignore
- File .project
- .settings
- File application.properties
- codenarc
  - File rules.groovy
- grails-app
  - conf
    - File BootStrap.groovy
    - File BuildConfig.groovy
    - File Config.groovy
    - File DataSource.groovy
    - File UrlMappings.groovy
    - File WebXmlConfig.groovy
    - com lemanscorp filters
      - File SecurityFilters.groovy
    - File ehcache.xml
    - filters
    - hibernate
    - spring
      - File applicationContext-security.xml
      - File resources.groovy
      - File resources.xml
  - controllers com
    - lemans
      - api
        
        File MediatorApiController.groovy
      - correspondence
        
        File ApiCorrespondenceController.groovy
        
        File ApiCorrespondenceFormSubmitController.groovy
        
        File LemansApiCorrespondenceController.groovy
      - dealer
        
        File ApiDealerAddressController.groovy
        
        File ApiDealerContactController.groovy
        
        File ApiDealerController.groovy
        
        File LemansApiDealerController.groovy
    - lemanscorp mediator
  - domain
  - i18n
    - File messages.properties
    - File messages_cs_CZ.properties
    - File messages_da.properties
    - File messages_de.properties
    - File messages_es.properties
    - File messages_fr.properties
    - File messages_it.properties
    - File messages_ja.properties
    - File messages_nl.properties
    - File messages_pt_BR.properties
    - File messages_pt_PT.properties
    - File messages_ru.properties
    - File messages_sv.properties
    - File messages_th.properties
    - File messages_zh_CN.properties
  - services com lemanscorp
    - File EndPointInventoryService.groovy
    - File LemansInetOrgPersonContextMapper.groovy
    - File MediationUserDetails.groovy
    - File MediationUserDetailsService.groovy
    - mediation
    - mediator
    - validators
  - taglib
  - utils com lemanscorp mediation
  - views
    - admin
      - File cache.gsp
    - File error.gsp
    - File index.gsp
    - layouts
      - File main.gsp
    - loginPage
      - File login.gsp
- lib
  - File camel-script-2.5.0.jar
  - File js.jar
  - File script-api.jar
  - File script-js.jar
- scripts
  - File _Events.groovy
- src
  - groovy
    - com
      - lemans api
      - lemanscorp
        
        mediation
        
        mediator
        
        security
    - oldtests
  - java com lemanscorp mediation
  - templates war
    - File web.xml
- target-eclipse classes
- test
  - functional com
    - grailsrocks functionaltest
    - lemans
      - admin
      - api
      - modules
      - program
      - security
      - testing
    - lemanscorp mediator
  - integration com lemanscorp
    - mediation
    - mediator
  - unit smoke-test
    - File mediator-service-test-prd-camel01vm.urls
    - File mediator-service-test-prd-camel02vm.urls
    - File mediator-service-test.urls
- File test.xml
- File urls.html
- web-app
  - META-INF
  - WEB-INF
    - File applicationContext.xml
    - grails-app views loginPage
    - File my-style.xsl
    - tld
      - File c.tld
      - File fmt.tld
      - File grails.tld
      - File spring.tld
    - File xml-to-json.xsl
  - css
    - File errors.css
    - File main.css
    - File mobile.css
  - images
    - File apple-touch-icon-retina.png
    - File apple-touch-icon.png
    - File favicon.ico
    - File grails_logo.jpg
    - File grails_logo.png
    - File leftnav_btm.png
    - File leftnav_midstretch.png
    - File leftnav_top.png
    - skin
      - File database_add.png
      - File database_delete.png
      - File database_edit.png
      - File database_save.png
      - File database_table.png
      - File exclamation.png
      - File house.png
      - File information.png
      - File shadow.jpg
      - File sorted_asc.gif
      - File sorted_desc.gif
    - File spinner.gif
    - File springsource.png
  - js
    - File application.js
    - prototype
      - File animation.js
      - File builder.js
      - File controls.js
      - File dragdrop.js
      - File effects.js
      - File prototype.js
      - File rico.js
      - File scriptaculous.js
      - File slider.js
      - File sound.js
      - File unittest.js