Refactored webapplication specific configurations into a new project. cdmlib-remote...

[cdmlib.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index 170d29672624be9900317074a66b05367bd5fd81..7d4e45a31dd6fbd092165bbdeded614655fb1985 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -8,6 +8,7 @@ app-import/src/main/java/eu/etaxonomy/cdm/app/abcdImport/SynthesysCacheActivator
 app-import/src/main/java/eu/etaxonomy/cdm/app/berlinModelImport/AlgaTerraActivator.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/berlinModelImport/BerlinModelDestinations.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/berlinModelImport/BerlinModelSources.java -text
+app-import/src/main/java/eu/etaxonomy/cdm/app/berlinModelImport/CampanulaceaeActivator.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/berlinModelImport/SalvadorActivator.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/berlinModelImport/SalvadorExport.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/berlinModelImport/TreeCreator.java -text
@@ -16,7 +17,7 @@ app-import/src/main/java/eu/etaxonomy/cdm/app/common/CdmImportSources.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/common/ImportUtils.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/common/TestActivator.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/eflora/EfloraSources.java -text
-app-import/src/main/java/eu/etaxonomy/cdm/app/eflora/SapindaceaeActivator.java -text
+app-import/src/main/java/eu/etaxonomy/cdm/app/eflora/FloraMalesianaActivator.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/excelImport/distribution/CichorieaeDistributionActivator.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/excelImport/taxa/NormalExplicitActivator.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/globis/GlobisActivator.java -text
@@ -82,11 +83,12 @@ app-import/src/main/java/eu/etaxonomy/cdm/io/CichorieaeImageImport.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/io/PalmaeImageImport.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/io/PalmaeProtologueImport.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/io/ProtologueImport.java -text
-app-import/src/main/java/eu/etaxonomy/cdm/io/eflora/sapindaceae/SapindaceaTransformer.java -text
-app-import/src/main/java/eu/etaxonomy/cdm/io/eflora/sapindaceae/SapindaceaeImportBase.java -text
-app-import/src/main/java/eu/etaxonomy/cdm/io/eflora/sapindaceae/SapindaceaeImportConfigurator.java -text
-app-import/src/main/java/eu/etaxonomy/cdm/io/eflora/sapindaceae/SapindaceaeImportState.java -text
-app-import/src/main/java/eu/etaxonomy/cdm/io/eflora/sapindaceae/SapindaceaeTaxonImport.java -text
+app-import/src/main/java/eu/etaxonomy/cdm/io/eflora/floraMalesiana/FloraMalesianaImportBase.java -text
+app-import/src/main/java/eu/etaxonomy/cdm/io/eflora/floraMalesiana/FloraMalesianaImportConfigurator.java -text
+app-import/src/main/java/eu/etaxonomy/cdm/io/eflora/floraMalesiana/FloraMalesianaImportState.java -text
+app-import/src/main/java/eu/etaxonomy/cdm/io/eflora/floraMalesiana/FloraMalesianaTaxonImport.java -text
+app-import/src/main/java/eu/etaxonomy/cdm/io/eflora/floraMalesiana/FloraMalesianaTransformer.java -text
+app-import/src/main/java/eu/etaxonomy/cdm/io/eflora/floraMalesiana/UnmatchedLeads.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/io/globis/GlobisImportBase.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/io/globis/GlobisImportConfigurator.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/io/globis/GlobisImportState.java -text
@@ -1186,6 +1188,7 @@ cdm-server/src/main/java/eu/etaxonomy/cdm/server/Bootloader.java -text
 cdm-server/src/main/java/eu/etaxonomy/cdm/server/CdmInstanceProperties.java -text
 cdm-server/src/main/java/eu/etaxonomy/cdm/server/CommandOptions.java -text
 cdm-server/src/main/java/eu/etaxonomy/cdm/server/DataSourcePropertyParser.java -text
+cdm-server/src/main/java/eu/etaxonomy/cdm/server/JvmManager.java -text
 cdm-server/src/main/resources/c3p0.properties -text
 cdm-server/src/main/resources/log4j.properties -text
 cdm-server/src/main/webapp/WEB-INF/web.xml -text
@@ -1243,6 +1246,13 @@ cdmlib-ext/src/test/resources/eu/etaxonomy/cdm.datasources.xml -text
 cdmlib-ext/src/test/resources/eu/etaxonomy/cdm/applicationContext.xml -text
 cdmlib-ext/src/test/resources/eu/etaxonomy/cdm/cdm.datasources.xml -text
 cdmlib-ext/src/test/resources/log4j.properties -text
+cdmlib-feature-source/.project -text
+cdmlib-feature-source/build.properties -text
+cdmlib-feature-source/feature.xml -text
+cdmlib-feature/.classpath -text
+cdmlib-feature/.project -text
+cdmlib-feature/build.properties -text
+cdmlib-feature/feature.xml -text
 cdmlib-io/LICENSE.TXT -text
 cdmlib-io/README.TXT -text
 cdmlib-io/pom.xml -text
@@ -2136,6 +2146,7 @@ cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/reference/ArticleDefa
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/reference/BookDefaultCacheStrategyTest.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/reference/BookSectionDefaultCacheStrategyTest.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/reference/CdDvdDefaultCacheStrategyTest.java -text
+cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/reference/ReferenceTypeTest.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/taxon/TaxonBaseDefaultCacheStrategyTest.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/match/DefaultMatchStrategyTest.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/merge/DefaultMergeStrategyTest.java -text
@@ -2189,11 +2200,13 @@ cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/types/SqlServer2000Da
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/types/SqlServer2005DatabaseType.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/types/SybaseDatabaseType.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/AbstractBeanInitializer.java -text
+cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/AutoPropertyInitializer.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/BeanInitializer.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/IAlternativeSpellingSuggestionParser.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/IMethodCache.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/MethodCacheImpl.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/QueryParseException.java -text
+cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/TitleCacheAutoInitializer.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/agent/IAgentDao.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/common/AuditEventSort.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/common/IAnnotatableDao.java -text
@@ -2460,17 +2473,197 @@ cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/override.prop
 cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/override.properties-testPersistentDataSource -text
 cdmlib-persistence/src/test/resources/log4j.properties -text
 cdmlib-persistence/src/test/resources/unitils.properties -text
+cdmlib-plugin/.classpath -text
+cdmlib-plugin/.project -text
+cdmlib-plugin/META-INF/MANIFEST.MF -text
+cdmlib-plugin/_makeSources.bat -text
+cdmlib-plugin/_makeSources.sh -text
+cdmlib-plugin/activation-1.1.jar -text
+cdmlib-plugin/activation-1.1src.zip -text
+cdmlib-plugin/antlr-2.7.6.jar -text
+cdmlib-plugin/aopalliance-1.0.jar -text
+cdmlib-plugin/asm-attrs.jar -text
+cdmlib-plugin/asm.jar -text
+cdmlib-plugin/aspectjrt-1.6.3.jar -text
+cdmlib-plugin/aspectjtools-1.6.3.jar -text
+cdmlib-plugin/aspectjweaver-1.6.3.jar -text
+cdmlib-plugin/build.properties -text
+cdmlib-plugin/build_ant.xml -text
+cdmlib-plugin/c3p0-0.9.1.jar -text
+cdmlib-plugin/c3p0-0.9.1src.zip -text
+cdmlib-plugin/cglib-2.1.3.jar -text
+cdmlib-plugin/commons-beanutils-1.7.0.jar -text
+cdmlib-plugin/commons-beanutils-1.7.0src.zip -text
+cdmlib-plugin/commons-collections-3.2.jar -text
+cdmlib-plugin/commons-collections-3.2src.zip -text
+cdmlib-plugin/commons-dbcp-1.2.2.jar -text
+cdmlib-plugin/commons-dbcp-1.2.2src.zip -text
+cdmlib-plugin/commons-io-1.4.jar -text
+cdmlib-plugin/commons-io-1.4src.zip -text
+cdmlib-plugin/commons-lang-2.4.jar -text
+cdmlib-plugin/commons-logging-1.0.4.jar -text
+cdmlib-plugin/commons-pool-1.3.jar -text
+cdmlib-plugin/commons-pool-1.3src.zip -text
+cdmlib-plugin/dom4j-1.6.1.jar -text
+cdmlib-plugin/dozer-4.4.jar -text
+cdmlib-plugin/dozer-4.4src.zip -text
+cdmlib-plugin/ehcache-1.2.3.jar -text
+cdmlib-plugin/ehcache-1.2.3src.zip -text
+cdmlib-plugin/ejb3-persistence.jar -text
+cdmlib-plugin/ezmorph-1.0.4.jar -text
+cdmlib-plugin/ezmorph-1.0.4src.zip -text
+cdmlib-plugin/h2-1.1.115.jar -text
+cdmlib-plugin/hibernate-3.2.6.ga.jar -text
+cdmlib-plugin/hibernate-3.2.6.gasrc.zip -text
+cdmlib-plugin/hibernate-annotations-3.4.0-SNAPSHOT.jar -text
+cdmlib-plugin/hibernate-annotations-3.4.0-SNAPSHOTsrc.zip -text
+cdmlib-plugin/hibernate-commons-annotations-3.4.0-SNAPSHOT.jar -text
+cdmlib-plugin/hibernate-commons-annotations-3.4.0-SNAPSHOTsrc.zip -text
+cdmlib-plugin/hibernate-core-3.4.0-SNAPSHOT.jar -text
+cdmlib-plugin/hibernate-core-3.4.0-SNAPSHOTsrc.zip -text
+cdmlib-plugin/hibernate-envers-3.4.0-SNAPSHOT.jar -text
+cdmlib-plugin/hibernate-envers-3.4.0-SNAPSHOTsrc.zip -text
+cdmlib-plugin/hibernate-search-3.0.1.GA.jar -text
+cdmlib-plugin/hibernate-search-3.1.0.GA.jar -text
+cdmlib-plugin/hibernate-search-3.1.0.GAsrc.zip -text
+cdmlib-plugin/hibernate-tools-3.2.0.ga.jar -text
+cdmlib-plugin/hibernate-validator-3.1.0.GA.jar -text
+cdmlib-plugin/hibernate-validator-4.0.0.CR1.jar -text
+cdmlib-plugin/hibernate-validator-4.0.0.CR1src.zip -text
+cdmlib-plugin/hibernate-validator.jar -text
+cdmlib-plugin/hibernate3.jar -text
+cdmlib-plugin/hibernate3src.zip -text
+cdmlib-plugin/hsqldb.jar -text
+cdmlib-plugin/javassist.jar -text
+cdmlib-plugin/jaxb-api-2.1.6.jar -text
+cdmlib-plugin/jaxb-impl-2.1.6-sources.jar -text
+cdmlib-plugin/jaxb-impl-2.1.6.jar -text
+cdmlib-plugin/jdbc-1.2.jar -text
+cdmlib-plugin/jdbc2_0-stdext.jar -text
+cdmlib-plugin/jdom-1.0.jar -text
+cdmlib-plugin/joda-time-1.5.jar -text
+cdmlib-plugin/joda-time-1.5src.zip -text
+cdmlib-plugin/joda-time-hibernate-1.0.jar -text
+cdmlib-plugin/json-lib-2.2.3-jdk15.jar -text
+cdmlib-plugin/json-lib-2.2.3-jdk15src.zip -text
+cdmlib-plugin/jsr250-api-1.0.jar -text
+cdmlib-plugin/jsr250-api-1.0src.zip -text
+cdmlib-plugin/jta.jar -text
+cdmlib-plugin/jtds-1.2.2.jar -text
+cdmlib-plugin/junit-4.4.jar -text
+cdmlib-plugin/log4j-1.2.14.jar -text
+cdmlib-plugin/log4j-1.2.14src.zip -text
+cdmlib-plugin/lsid-client-1.1.2.jar -text
+cdmlib-plugin/lsid-server-1.1.2.jar -text
+cdmlib-plugin/lucene-core-2.4.0.jar -text
+cdmlib-plugin/lucene-core-2.4.0src.zip -text
+cdmlib-plugin/lucene-spellchecker-2.4.0.jar -text
+cdmlib-plugin/lucene-spellchecker-2.4.0src.zip -text
+cdmlib-plugin/mail-1.4.jar -text
+cdmlib-plugin/mail-1.4src.zip -text
+cdmlib-plugin/msbase-2000.3.jar -text
+cdmlib-plugin/mssqlserver-2000.3.jar -text
+cdmlib-plugin/msutil-2000.3.jar -text
+cdmlib-plugin/mysql-connector-java-3.1.14-bin.jar -text
+cdmlib-plugin/opencsv-1.8.jar -text
+cdmlib-plugin/org.apache.commons.codec-1.3.0.jar -text
+cdmlib-plugin/org.springframework.aop-3.0.0.RELEASE.jar -text
+cdmlib-plugin/org.springframework.aop-3.0.0.RELEASEsrc.zip -text
+cdmlib-plugin/org.springframework.asm-3.0.0.RELEASE.jar -text
+cdmlib-plugin/org.springframework.asm-3.0.0.RELEASEsrc.zip -text
+cdmlib-plugin/org.springframework.aspects-3.0.0.RELEASE.jar -text
+cdmlib-plugin/org.springframework.aspects-3.0.0.RELEASEsrc.zip -text
+cdmlib-plugin/org.springframework.beans-3.0.0.RELEASE.jar -text
+cdmlib-plugin/org.springframework.beans-3.0.0.RELEASEsrc.zip -text
+cdmlib-plugin/org.springframework.context-3.0.0.RELEASE.jar -text
+cdmlib-plugin/org.springframework.context-3.0.0.RELEASEsrc.zip -text
+cdmlib-plugin/org.springframework.context.support-3.0.0.RELEASE.jar -text
+cdmlib-plugin/org.springframework.context.support-3.0.0.RELEASEsrc.zip -text
+cdmlib-plugin/org.springframework.core-3.0.0.RELEASE.jar -text
+cdmlib-plugin/org.springframework.core-3.0.0.RELEASEsrc.zip -text
+cdmlib-plugin/org.springframework.expression-3.0.0.RELEASE.jar -text
+cdmlib-plugin/org.springframework.expression-3.0.0.RELEASEsrc.zip -text
+cdmlib-plugin/org.springframework.jdbc-3.0.0.RELEASE.jar -text
+cdmlib-plugin/org.springframework.jdbc-3.0.0.RELEASEsrc.zip -text
+cdmlib-plugin/org.springframework.orm-3.0.0.RELEASE.jar -text
+cdmlib-plugin/org.springframework.orm-3.0.0.RELEASEsrc.zip -text
+cdmlib-plugin/org.springframework.oxm-3.0.0.RC1.jar -text
+cdmlib-plugin/org.springframework.oxm-3.0.0.RC1src.zip -text
+cdmlib-plugin/org.springframework.oxm-3.0.0.RELEASE.jar -text
+cdmlib-plugin/org.springframework.oxm-3.0.0.RELEASEsrc.zip -text
+cdmlib-plugin/org.springframework.test-3.0.0.RELEASE.jar -text
+cdmlib-plugin/org.springframework.test-3.0.0.RELEASEsrc.zip -text
+cdmlib-plugin/org.springframework.transaction-3.0.0.RELEASE.jar -text
+cdmlib-plugin/org.springframework.transaction-3.0.0.RELEASEsrc.zip -text
+cdmlib-plugin/org.springframework.web-3.0.0.RELEASE.jar -text
+cdmlib-plugin/org.springframework.web-3.0.0.RELEASEsrc.zip -text
+cdmlib-plugin/org.springframework.web.servlet-3.0.0.RELEASE.jar -text
+cdmlib-plugin/org.springframework.web.servlet-3.0.0.RELEASEsrc.zip -text
+cdmlib-plugin/plugin.xml -text
+cdmlib-plugin/poi-3.1-FINAL.jar -text
+cdmlib-plugin/pom.xml -text
+cdmlib-plugin/postgresql-8.2-504.jdbc4.jar -text
+cdmlib-plugin/sanselan-0.94-incubator.jar -text
+cdmlib-plugin/servlet-api-2.5.jar -text
+cdmlib-plugin/servlet-api-2.5src.zip -text
+cdmlib-plugin/slf4j-api-1.5.2.jar -text
+cdmlib-plugin/slf4j-api-1.5.2src.zip -text
+cdmlib-plugin/slf4j-log4j12-1.5.2.jar -text
+cdmlib-plugin/slf4j-log4j12-1.5.2src.zip -text
+cdmlib-plugin/spring-beans-2.5.6-sources.jar -text
+cdmlib-plugin/spring-beans-2.5.6.jar -text
+cdmlib-plugin/spring-beans-3.0.0.RELEASE.jar -text
+cdmlib-plugin/spring-beans-3.0.0.RELEASEsrc.zip -text
+cdmlib-plugin/spring-expression-3.0.0.RELEASE.jar -text
+cdmlib-plugin/spring-expression-3.0.0.RELEASEsrc.zip -text
+cdmlib-plugin/spring-modules-cache-0.7.jar -text
+cdmlib-plugin/spring-modules-cache-0.7src.zip -text
+cdmlib-plugin/spring-modules-lucene-0.8a.jar -text
+cdmlib-plugin/spring-modules-lucene-0.8asrc.zip -text
+cdmlib-plugin/spring-security-core-3.0.0.RELEASE.jar -text
+cdmlib-plugin/spring-security-core-3.0.0.RELEASEsrc.zip -text
+cdmlib-plugin/spring-tx-3.0.0.RELEASE.jar -text
+cdmlib-plugin/spring-tx-3.0.0.RELEASEsrc.zip -text
+cdmlib-plugin/src/main/assembly/assembly.xml -text
+cdmlib-plugin/src/test/java/eu/etaxonomy/cdm/aspectj/PropertyChangeTest.java -text
+cdmlib-plugin/wsdl4j-1.6.1.jar -text
+cdmlib-plugin/wsdl4j-1.6.1src.zip -text
+cdmlib-plugin/xercesImpl.jar -text
+cdmlib-plugin/xml-apis.jar -text
+cdmlib-plugin/xml-resolver-1.2.jar -text
+cdmlib-plugin/xml-resolver-1.2src.zip -text
+cdmlib-plugin/xom-1.0.jar -text
+cdmlib-plugin/xstream-1.3.1.jar -text
+cdmlib-plugin/xstream-1.3.1src.zip -text
+cdmlib-plugin/yjp-controller-api-redist-8.0.1.jar -text
+cdmlib-remote-webapp/LICENSE.TXT -text
+cdmlib-remote-webapp/README.TXT -text
+cdmlib-remote-webapp/ide/eclipse/cdmserver[!!-~]-[!!-~]run.launch -text
+cdmlib-remote-webapp/pom.xml -text
+cdmlib-remote-webapp/src/main/java/eu/etaxonomy/cdm/remote/config/AbstractWebApplicationConfigurer.java -text
+cdmlib-remote-webapp/src/main/java/eu/etaxonomy/cdm/remote/config/DataSourceConfigurer.java -text
+cdmlib-remote-webapp/src/main/java/eu/etaxonomy/cdm/remote/config/LoggingConfigurer.java -text
+cdmlib-remote-webapp/src/main/webapp/WEB-INF/applicationContext.views.xml -text
+cdmlib-remote-webapp/src/main/webapp/WEB-INF/applicationContext.xml -text
+cdmlib-remote-webapp/src/main/webapp/WEB-INF/cdmrest-servlet.xml -text
+cdmlib-remote-webapp/src/main/webapp/WEB-INF/datasources/configurable.xml -text
+cdmlib-remote-webapp/src/main/webapp/WEB-INF/datasources/datasources-local.xml -text
+cdmlib-remote-webapp/src/main/webapp/WEB-INF/datasources/empty-default-datasource.xml -text
+cdmlib-remote-webapp/src/main/webapp/WEB-INF/datasources/p6spy.xml -text
+cdmlib-remote-webapp/src/main/webapp/WEB-INF/datasources/routing-datasource.xml -text
+cdmlib-remote-webapp/src/main/webapp/WEB-INF/views.xml -text
+cdmlib-remote-webapp/src/main/webapp/WEB-INF/web.xml -text
+cdmlib-remote-webapp/src/main/webapp/human.xsl -text
+cdmlib-remote-webapp/src/main/webapp/oai2.xsl -text
+cdmlib-remote-webapp/src/site/site.xml -text
+cdmlib-remote-webapp/src/test/java/eu/etaxonomy/AppTest.java -text
 cdmlib-remote/LICENSE.TXT -text
 cdmlib-remote/README.TXT -text
-cdmlib-remote/ide/eclipse/cdmlib-remote[!!-~]-[!!-~]remote[!!-~]debug.launch -text
-cdmlib-remote/ide/eclipse/cdmserver[!!-~]-[!!-~]profile.launch -text
-cdmlib-remote/ide/eclipse/cdmserver[!!-~]-[!!-~]run.launch -text
 cdmlib-remote/pom.xml -text
 cdmlib-remote/src/main/java/carbonfive/spring/web/pathparameter/ParameterizedPathFilter.java -text
 cdmlib-remote/src/main/java/carbonfive/spring/web/pathparameter/ParameterizedPathMatcher.java -text
 cdmlib-remote/src/main/java/carbonfive/spring/web/pathparameter/ParameterizedPathMatcherException.java -text
 cdmlib-remote/src/main/java/carbonfive/spring/web/pathparameter/ParameterizedUrlHandlerMapping.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/config/DataSourceConfig.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/AbstractController.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/AbstractListController.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/AbstractOaiPmhController.java -text
@@ -2508,11 +2701,15 @@ cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonNodeListCont
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonPortalController.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonomicTreePortalController.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonomicTreePortalListController.java -text
+cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TermController.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TermListController.java -text
+cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/VocabularyController.java -text
+cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/VocabularyListController.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/interceptor/ContentNegociationHandlerInterceptor.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/interceptor/DatasourceContextHandlerInterceptor.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/interceptor/LocaleContextHandlerInterceptor.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/oaipmh/TaxonOaiPmhController.java -text
+cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/util/CdmAntPathMatcher.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/TagEnum.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/TaggedText.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/assembler/DozerBeanMapperFactoryBean.java -text
@@ -2600,10 +2797,10 @@ cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/NameRela
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/ReferenceBaseBeanProcessor.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/TaxonBeanProcessor.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/TaxonNameBaseBeanProcessor.java -text
+cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/TaxonNameDescriptionBeanProcessor.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/TaxonNodeBeanProcessor.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/TaxonNodeDaoBeanProcessor.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/TaxonRelationshipBeanProcessor.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/TaxonomyNodeBeanProcessor.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/TermBaseBeanProcessor.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/TextDataBeanProcessor.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/TypeDesignationBaseBeanProcessor.java -text
@@ -2654,26 +2851,9 @@ cdmlib-remote/src/main/resources/eu/etaxonomy/cdm/remote/dto/tdwg/mappings-deep.
 cdmlib-remote/src/main/resources/eu/etaxonomy/cdm/remote/dto/tdwg/mappings-shallow.xml -text
 cdmlib-remote/src/main/resources/eu/etaxonomy/cdm/remote/dto/tdwg/mappings.xml -text
 cdmlib-remote/src/main/resources/eu/etaxonomy/cdm/remote/ehcache.xml -text
+cdmlib-remote/src/main/resources/eu/etaxonomy/cdm/remote/json/jsonConfigurations.xml -text
 cdmlib-remote/src/main/resources/log4j.properties -text
 cdmlib-remote/src/main/resources/spy.properties -text
-cdmlib-remote/src/main/webapp/WEB-INF/applicationContext.views.xml -text
-cdmlib-remote/src/main/webapp/WEB-INF/applicationContext.xml -text
-cdmlib-remote/src/main/webapp/WEB-INF/cdmrest-servlet.xml -text
-cdmlib-remote/src/main/webapp/WEB-INF/datasources/configurable.xml -text
-cdmlib-remote/src/main/webapp/WEB-INF/datasources/datasources-local.xml -text
-cdmlib-remote/src/main/webapp/WEB-INF/datasources/empty-default-datasource.xml -text
-cdmlib-remote/src/main/webapp/WEB-INF/datasources/example.cdmlibrary/datasources-set-A.xml -text
-cdmlib-remote/src/main/webapp/WEB-INF/datasources/example.cdmlibrary/datasources-set-B.xml -text
-cdmlib-remote/src/main/webapp/WEB-INF/datasources/example.cdmlibrary/use-A-set.sh -text
-cdmlib-remote/src/main/webapp/WEB-INF/datasources/example.cdmlibrary/use-B-set.sh -text
-cdmlib-remote/src/main/webapp/WEB-INF/datasources/p6spy.xml -text
-cdmlib-remote/src/main/webapp/WEB-INF/datasources/routing-datasource.xml -text
-cdmlib-remote/src/main/webapp/WEB-INF/jsonConfigurations.xml -text
-cdmlib-remote/src/main/webapp/WEB-INF/views.xml -text
-cdmlib-remote/src/main/webapp/WEB-INF/web.xml -text
-cdmlib-remote/src/main/webapp/human.xsl -text
-cdmlib-remote/src/main/webapp/oai2.xsl -text
-cdmlib-remote/src/site/site.xml -text
 cdmlib-remote/src/test/java/eu/etaxonomy/cdm/remote/dto/assembler/lsid/AssemblerTest.java -text
 cdmlib-remote/src/test/java/eu/etaxonomy/cdm/remote/service/AuthorityControllerTest.java -text
 cdmlib-remote/src/test/java/eu/etaxonomy/cdm/remote/service/DataControllerTest.java -text
@@ -2751,6 +2931,7 @@ cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IVersionableService.j
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IVocabularyService.java -text
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IWorkingSetService.java -text
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IdentifiableServiceBase.java -text
+cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IdentificationKeyGenerator.java -text
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IdentificationKeyServiceImpl.java -text
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/LocationServiceImpl.java -text
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/MarkerServiceImpl.java -text
@@ -2857,7 +3038,7 @@ cdmlib-services/src/test/java/eu/etaxonomy/cdm/validation/TaxonNameCannotBeAccep
 cdmlib-services/src/test/java/eu/etaxonomy/cdm/validation/ValidationTest.java -text
 cdmlib-services/src/test/resources/dbscripts/001_cdm.ddl -text
 cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/CommonServiceImplTest.xml -text
-cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/IdentifiableServiceBaseTest.testGenerateTitleCache-result.xml -text
+cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/IdentifiableServiceBaseTest.testUpdateTitleCache-result.xml -text
 cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/IdentifiableServiceBaseTest.xml -text
 cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/MediaDaoImplTest.xml -text
 cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/OregonScientificDS6639-DSC_0307-small.jpg -text
@@ -2880,158 +3061,9 @@ cdmlib-services/src/test/resources/eu/etaxonomy/cdm/validation/ValidationTest.xm
 cdmlib-services/src/test/resources/log4j.properties -text
 cdmlib-services/src/test/resources/override.properties -text
 cdmlib-services/src/test/resources/unitils.properties -text
-eclipse-feature-source/.project -text
-eclipse-feature-source/build.properties -text
-eclipse-feature-source/feature.xml -text
-eclipse-feature/.classpath -text
-eclipse-feature/.project -text
-eclipse-feature/build.properties -text
-eclipse-feature/feature.xml -text
-eclipse-plugin/.classpath -text
-eclipse-plugin/.project -text
-eclipse-plugin/META-INF/MANIFEST.MF -text
-eclipse-plugin/_makeSources.bat -text
-eclipse-plugin/_makeSources.sh -text
-eclipse-plugin/activation-1.1.jar -text
-eclipse-plugin/activation-1.1src.zip -text
-eclipse-plugin/antlr-2.7.6.jar -text
-eclipse-plugin/aopalliance-1.0.jar -text
-eclipse-plugin/asm-attrs.jar -text
-eclipse-plugin/asm.jar -text
-eclipse-plugin/aspectjrt-1.6.3.jar -text
-eclipse-plugin/aspectjtools-1.6.3.jar -text
-eclipse-plugin/aspectjweaver-1.6.3.jar -text
-eclipse-plugin/build.properties -text
-eclipse-plugin/build_ant.xml -text
-eclipse-plugin/c3p0-0.9.1.jar -text
-eclipse-plugin/c3p0-0.9.1src.zip -text
-eclipse-plugin/cglib-2.1.3.jar -text
-eclipse-plugin/commons-beanutils-1.7.0.jar -text
-eclipse-plugin/commons-beanutils-1.7.0src.zip -text
-eclipse-plugin/commons-collections-3.2.jar -text
-eclipse-plugin/commons-collections-3.2src.zip -text
-eclipse-plugin/commons-dbcp-1.2.2.jar -text
-eclipse-plugin/commons-dbcp-1.2.2src.zip -text
-eclipse-plugin/commons-io-1.4.jar -text
-eclipse-plugin/commons-io-1.4src.zip -text
-eclipse-plugin/commons-lang-2.4.jar -text
-eclipse-plugin/commons-logging-1.0.4.jar -text
-eclipse-plugin/commons-pool-1.3.jar -text
-eclipse-plugin/commons-pool-1.3src.zip -text
-eclipse-plugin/dom4j-1.6.1.jar -text
-eclipse-plugin/ehcache-1.2.3.jar -text
-eclipse-plugin/ejb3-persistence.jar -text
-eclipse-plugin/h2-1.1.115.jar -text
-eclipse-plugin/hibernate-3.2.6.ga.jar -text
-eclipse-plugin/hibernate-3.2.6.gasrc.zip -text
-eclipse-plugin/hibernate-annotations-3.4.0-SNAPSHOT.jar -text
-eclipse-plugin/hibernate-annotations-3.4.0-SNAPSHOTsrc.zip -text
-eclipse-plugin/hibernate-commons-annotations-3.4.0-SNAPSHOT.jar -text
-eclipse-plugin/hibernate-commons-annotations-3.4.0-SNAPSHOTsrc.zip -text
-eclipse-plugin/hibernate-core-3.4.0-SNAPSHOT.jar -text
-eclipse-plugin/hibernate-core-3.4.0-SNAPSHOTsrc.zip -text
-eclipse-plugin/hibernate-envers-3.4.0-SNAPSHOT.jar -text
-eclipse-plugin/hibernate-envers-3.4.0-SNAPSHOTsrc.zip -text
-eclipse-plugin/hibernate-search-3.0.1.GA.jar -text
-eclipse-plugin/hibernate-search-3.1.0.GA.jar -text
-eclipse-plugin/hibernate-search-3.1.0.GAsrc.zip -text
-eclipse-plugin/hibernate-tools-3.2.0.ga.jar -text
-eclipse-plugin/hibernate-validator-3.1.0.GA.jar -text
-eclipse-plugin/hibernate-validator-4.0.0.CR1.jar -text
-eclipse-plugin/hibernate-validator-4.0.0.CR1src.zip -text
-eclipse-plugin/hibernate-validator.jar -text
-eclipse-plugin/hibernate3.jar -text
-eclipse-plugin/hibernate3src.zip -text
-eclipse-plugin/hsqldb.jar -text
-eclipse-plugin/javassist.jar -text
-eclipse-plugin/jaxb-api-2.1.6.jar -text
-eclipse-plugin/jaxb-impl-2.1.6-sources.jar -text
-eclipse-plugin/jaxb-impl-2.1.6.jar -text
-eclipse-plugin/jdbc-1.2.jar -text
-eclipse-plugin/jdbc2_0-stdext.jar -text
-eclipse-plugin/jdom-1.0.jar -text
-eclipse-plugin/joda-time-1.5.jar -text
-eclipse-plugin/joda-time-1.5src.zip -text
-eclipse-plugin/joda-time-hibernate-1.0.jar -text
-eclipse-plugin/jsr250-api-1.0.jar -text
-eclipse-plugin/jsr250-api-1.0src.zip -text
-eclipse-plugin/jta.jar -text
-eclipse-plugin/jtds-1.2.2.jar -text
-eclipse-plugin/junit-4.4.jar -text
-eclipse-plugin/log4j-1.2.14.jar -text
-eclipse-plugin/log4j-1.2.14src.zip -text
-eclipse-plugin/lsid-client-1.1.2.jar -text
-eclipse-plugin/lsid-server-1.1.2.jar -text
-eclipse-plugin/lucene-core-2.4.0.jar -text
-eclipse-plugin/lucene-core-2.4.0src.zip -text
-eclipse-plugin/lucene-spellchecker-2.4.0.jar -text
-eclipse-plugin/lucene-spellchecker-2.4.0src.zip -text
-eclipse-plugin/mail-1.4.jar -text
-eclipse-plugin/mail-1.4src.zip -text
-eclipse-plugin/msbase-2000.3.jar -text
-eclipse-plugin/mssqlserver-2000.3.jar -text
-eclipse-plugin/msutil-2000.3.jar -text
-eclipse-plugin/mysql-connector-java-3.1.14-bin.jar -text
-eclipse-plugin/opencsv-1.8.jar -text
-eclipse-plugin/org.apache.commons.codec-1.3.0.jar -text
-eclipse-plugin/org.springframework.aop-3.0.0.RELEASE.jar -text
-eclipse-plugin/org.springframework.aop-3.0.0.RELEASEsrc.zip -text
-eclipse-plugin/org.springframework.asm-3.0.0.RELEASE.jar -text
-eclipse-plugin/org.springframework.asm-3.0.0.RELEASEsrc.zip -text
-eclipse-plugin/org.springframework.aspects-3.0.0.RELEASE.jar -text
-eclipse-plugin/org.springframework.aspects-3.0.0.RELEASEsrc.zip -text
-eclipse-plugin/org.springframework.beans-3.0.0.RELEASE.jar -text
-eclipse-plugin/org.springframework.beans-3.0.0.RELEASEsrc.zip -text
-eclipse-plugin/org.springframework.context-3.0.0.RELEASE.jar -text
-eclipse-plugin/org.springframework.context-3.0.0.RELEASEsrc.zip -text
-eclipse-plugin/org.springframework.core-3.0.0.RELEASE.jar -text
-eclipse-plugin/org.springframework.core-3.0.0.RELEASEsrc.zip -text
-eclipse-plugin/org.springframework.expression-3.0.0.RELEASE.jar -text
-eclipse-plugin/org.springframework.expression-3.0.0.RELEASEsrc.zip -text
-eclipse-plugin/org.springframework.jdbc-3.0.0.RELEASE.jar -text
-eclipse-plugin/org.springframework.jdbc-3.0.0.RELEASEsrc.zip -text
-eclipse-plugin/org.springframework.orm-3.0.0.RELEASE.jar -text
-eclipse-plugin/org.springframework.orm-3.0.0.RELEASEsrc.zip -text
-eclipse-plugin/org.springframework.oxm-3.0.0.RC1.jar -text
-eclipse-plugin/org.springframework.oxm-3.0.0.RC1src.zip -text
-eclipse-plugin/org.springframework.oxm-3.0.0.RELEASE.jar -text
-eclipse-plugin/org.springframework.oxm-3.0.0.RELEASEsrc.zip -text
-eclipse-plugin/org.springframework.test-3.0.0.RELEASE.jar -text
-eclipse-plugin/org.springframework.test-3.0.0.RELEASEsrc.zip -text
-eclipse-plugin/org.springframework.transaction-3.0.0.RELEASE.jar -text
-eclipse-plugin/org.springframework.transaction-3.0.0.RELEASEsrc.zip -text
-eclipse-plugin/plugin.xml -text
-eclipse-plugin/poi-3.1-FINAL.jar -text
-eclipse-plugin/pom.xml -text
-eclipse-plugin/postgresql-8.2-504.jdbc4.jar -text
-eclipse-plugin/sanselan-0.94-incubator.jar -text
-eclipse-plugin/slf4j-api-1.5.2.jar -text
-eclipse-plugin/slf4j-api-1.5.2src.zip -text
-eclipse-plugin/slf4j-log4j12-1.5.2.jar -text
-eclipse-plugin/slf4j-log4j12-1.5.2src.zip -text
-eclipse-plugin/spring-beans-2.5.6-sources.jar -text
-eclipse-plugin/spring-beans-2.5.6.jar -text
-eclipse-plugin/spring-beans-3.0.0.RELEASE.jar -text
-eclipse-plugin/spring-beans-3.0.0.RELEASEsrc.zip -text
-eclipse-plugin/spring-expression-3.0.0.RELEASE.jar -text
-eclipse-plugin/spring-expression-3.0.0.RELEASEsrc.zip -text
-eclipse-plugin/spring-modules-lucene-0.8a.jar -text
-eclipse-plugin/spring-modules-lucene-0.8asrc.zip -text
-eclipse-plugin/spring-security-core-3.0.0.RELEASE.jar -text
-eclipse-plugin/spring-security-core-3.0.0.RELEASEsrc.zip -text
-eclipse-plugin/spring-tx-3.0.0.RELEASE.jar -text
-eclipse-plugin/spring-tx-3.0.0.RELEASEsrc.zip -text
-eclipse-plugin/src/test/java/eu/etaxonomy/cdm/aspectj/PropertyChangeTest.java -text
-eclipse-plugin/wsdl4j-1.6.1.jar -text
-eclipse-plugin/wsdl4j-1.6.1src.zip -text
-eclipse-plugin/xercesImpl.jar -text
-eclipse-plugin/xml-apis.jar -text
-eclipse-plugin/xml-resolver-1.2.jar -text
-eclipse-plugin/xml-resolver-1.2src.zip -text
-eclipse-plugin/yjp-controller-api-redist-8.0.1.jar -text
-eclipse-updateSite/.project -text
-eclipse-updateSite/index.html -text
-eclipse-updateSite/site.xml -text
+cdmlib-updateSite/.project -text
+cdmlib-updateSite/index.html -text
+cdmlib-updateSite/site.xml -text
 pdfdocs/cdm.pdf -text
 pdfdocs/cdmlib-config.properties -text
 pdfdocs/cdmlib-doc.sh -text