EDIT

#5657 futher fixes for the static swagger doc

#5657 incomplete static swagger documentation fixed

java spring configuration for remoting services

removing all (almost all) spy6 references and dependencies

updating data in swagger doc

easier string profile selection

removing test dependencies from java doc

fixing spring profiles setup

serving swagger api doc in production mode (default) from static files:

• default spring profile with StaticSwaggerApiDoc controller
• swagger spring profiles with generically generated documentaiton only for integration test environments
• creating the resulting war file after running the integration tests...

Adapt log4j.properties to hibernate deprecated logging problem

resolving conflicts after merge of ticket_4716 into develop

Revert remote-webapp changes partly to test what the error is

try to fix remote-webapp test

#5397 exclusion of paths in swagger config fixed

#5397 swagger-ui web application working, layout fixed

#5397 support for menu instead of select in springfox-ui

#5397 replacing swagger-ui by springfox-swagger-ui

#5397 replacing swagger-springmvc by springfox-swagger2

adding note with link to the cdmlib-remote-webapp configuration and bootstrapping wiki page

#4716 fixing setup of cdmlib-remote-webapp

• swagger disabled due to https://github.com/springfox/springfox/issues/1055
  • eu.etaxonomy.cdm.remote.config.CdmSpringMVCConfig.CdmSwaggerConfig.java renamed to CdmSwaggerConfig.java.disabled
  • @EnableSwagger commented in eu.etaxonomy.cdm.remote.config.CdmSpringMVCConfig...

Hibernate, lucene and search upgradet to 4.3.11, 4.10.4 and 5.2.1 #4716

Only compiling, test not running due to leak in connection pooling for
tests

Fix classloading priority of patched hibernate class

Merge branch 'master' of wp5.e-taxonomy.eu:/var/git/cdmlib into remoting-4.0

Conflicts:
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/DefinedTerm.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/NonViralName.java
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/INameService.java...

update cdmlib-remote-webapp test h2 to model 3.6

fixing broken image in swagger-ui

doumentation

Merge branch 'master' of wp5.e-taxonomy.eu:/var/git/cdmlib into remoting-4.0

Conflicts:
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/DefinedTerm.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/DefinedTermBase.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/Reference.java...

AnnotatableEntity : removed dynamic generation of marker set
Taxon : reverted
TaxonServiceImpl : added affected object on delete

removing invalid link from swagger-ui

update test H2 in remote webapp

updated cdmTest in remote webapp to new model

working on documentation and fixing include pattern for catalogue services

DeleteResult : made serializable
remote-security : added remoting url intercept
remoting-services : made user service public
web.xml : added filter chain for securing remoting services

adding hand written documentation to the swagger ui and redirecting to doc/ automatically fromt the index page

PolytomousKey, PolytomousKeyNode : Added merge to cascade annotation
cdmlib-remote-servlet.xml, ConcurrentSessionTest.java : spelling checks
CdmCacher : made cache lement getter methods public
remoting-services.xml, httpInvokerServices : added new services

fixing swagger api-docs url

first fully working swagger doc on the cdm remote api. Model scan ist still disabled to allow faster application startup. Remote api organized in multiple swagger groups. Adding support for swagger goups to the swagger-ui. Cuostomization of the swagger-ui: branding and adding a menu to link to the swagger groups.

removing duplicate link in index.html

experimenting with multiple swager groups and fixing the bean loading order

index.html links to swagger-ui

activating the swagger rest service documentation by reverting the revertion of the premature committed experimental branch (swagger) svn: r21387, git: be528c1edf

removed vaadin references

pom.xml : added maven dependency goal to unpack the corresponding cdm-vaadin war into a directory in the target dir and added this directory as a resource when building the cdmlib-remote-webapp war
pom.xml, applicationContext.xml, cdmlib-remote-servlet.xml, web.xml, SpringMVCConfig.java : removed references to Vaadin...

updated webapp h2 test database

Fix (more of a hack) for conversation holder problem, subclassing the current servlet and setting the conversation so that it is bound every time a service call is made.

add DNA Quality Type vocabulary

fixing component scan in jars

Changes for production mode for vaadin

changed startup parameter for vaadin. Only for testing.

latest changes for Vaadin Editor

• added in Web.XML production mode

removed useless widgetset

update remote-WebApp H2 database

update cdmTest version for remoteWebApp

merge-update from trunk

HandlingCdmEntitiesTest.java / HandlingCdmEntitiesTest.xml : Added new test to describe save, update, merge of cdm entities (mimicking remoting)
cdmlib-remote-servlet.xml : added commented option to expose remoting
CdmIntegrationTest.java : added comment on how to disable transactional behaviour in tests

merge-update from trunk

first attempt to fix #4294 (order of map legend entries conforms to term order)

reverting erroneously committed experimental branch (swagger)

adding swagger-ui

working configuration of java based spring mvc config for swagger

renaming SpringMVCConfig

merge-update from trunk

reenabling vaadin + more specific component scan for mvc

comment explaining the need to extend WebMvcConfigurationSupport

first fully functional pure java based spring mvc configuration, vaadin has been excluded so far, welcome file configuration is working now in web.xml

switching to java based spring mvc configuration (work in progress)

turning the static index.jsp into a index.html

switching fom spring mvc xml configuration to java configuration

merge-update from trunk

untracked files on mvc-java-config: 9847e2f fixing bugs, resolvin a conflict and cleaning up of ClassificationPortalListController, this changes the thre return type of the list method in the controller

refactoring - related to #4268 (allow defining custom presence and absence term colors for EditGeoServiceUtilities)

logging json serialization

fixing #4168 (performance problem with DescriptionListPortalController.getDescriptionElementsForTaxon())

lowering log level

solving TODO: using AbstractPagerImpl.hasResultsInRange() in dao method

fixing #4151 (AdvancedBeanInitializer causes problems when initializing taxonnode hierarchies)

add new webservice for exporting occurrences for a specific taxon uuid
definition in xml files (web-inf)

redlist WS export added .json and .xml functionality

fixing broken dependencies by excluding spring-expression

setting correct port number for remote integration tests

changing ports in config to avoid conflics

automatically testing of cdmlib-remote-webapp during the maven lifecycle - #4094: automatically test cdmlib-remote-webapp

Spring Security configuration added for remote and web app

switching off remoting

CdmApplicationDefaultConfiguration : moved autowiring for sessionFactory and transactionManager from members to set functions
to allow for remoting
CdmApplicationController : catching UnsupportedOperationException for database service call to allow for remoting...

refactoring http invoker section to a separate config file to make it easy to test / switch to / from remoting

httpInvokerServices : remoting services spring config file
ConversationHolder : constructor made protected for ConversationHolderMock
ConversationHolderMock : empty conversation holder for remoting
cdmlib-remote-servlet.xml : added http invoker service configuration (currently commented)

WS CSV for redlist project

cleaned package cdmlib-remote-webapp

cleaned Vaadin Data...to generate these you have to run mvn vaadin:compile in package cdmlib-remote

restructering vaadin package -- new view

restructering packet for reintegration
*fixed save error which seems to occur totally radomly
*fixed vaadin:compile error
*fixed build path in pom file

Merge with trunk

added delete function for example data...

Clean Up of prototype and added some documentation...

enabling xsl for statistics also

changes on TaxonTable, hooked it up with dto and bean item container