BGBM BDI Projects / cdmlib.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Refactored webapplication specific configurations into a new project. cdmlib-remote...
[cdmlib.git] / .gitattributes
diff --git a/.gitattributes b/.gitattributes
index 01a7a56c1848959bec8555dee7aca4a1d445abf7..7d4e45a31dd6fbd092165bbdeded614655fb1985 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -17,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
@@ -83,12 +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/sapindaceae/UnmatchedLeads.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
@@ -1188,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
@@ -2199,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
@@ -2502,8 +2505,13 @@ 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
@@ -2536,6 +2544,8 @@ 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
@@ -2567,6 +2577,8 @@ 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
@@ -2583,11 +2595,17 @@ 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
@@ -2598,12 +2616,15 @@ 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
@@ -2611,20 +2632,38 @@ 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/AbstractWebApplicationConfigurer.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/config/DataSourceConfigurer.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/config/LoggingConfigurer.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
@@ -2662,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
@@ -2754,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
@@ -2808,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