BGBM BDI Projects / taxeditor.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
improved versioning of plugins and features
[taxeditor.git] / .gitattributes
diff --git a/.gitattributes b/.gitattributes
index e3f1d70f63db30b4f15d03f896419a744cf1fcc6..e29de822a435fb74585c5722368195a1b47db725 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -647,6 +647,10 @@ taxeditor-bulkeditor/icons/merge_candidate.gif -text
 taxeditor-bulkeditor/icons/merge_target.gif -text
 taxeditor-bulkeditor/plugin.xml -text
 taxeditor-bulkeditor/pom.xml -text
+taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/AnnotatedLineEditor.java -text
+taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/AnnotatedLineEditorDocumentProvider.java -text
+taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/AnnotatedLineEditorReconcilingStrategy.java -text
+taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/AnnotatedLineEditorSourceViewerConfiguration.java -text
 taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditor.java -text
 taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditorInput.java -text
 taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditorLineDisplay.java -text
@@ -734,6 +738,19 @@ taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/Languag
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/TaxonDescriptionEditor.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/handler/CreateDescriptionElementHandler.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/handler/DeleteDescriptionElementHandler.java -text
+taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptionnew/AbstractDescriptionDetailsPage.java -text
+taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptionnew/CommonNameDetailsPage.java -text
+taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptionnew/DescriptionContentProvider.java -text
+taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptionnew/DescriptionLabelProvider.java -text
+taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptionnew/DescriptionMasterDetailsBlock.java -text
+taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptionnew/DescriptiveInformationProvider.java -text
+taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptionnew/DistributionDetailsPage.java -text
+taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptionnew/IDescriptiveInformationProvider.java -text
+taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptionnew/TaxonDescriptionDetailsPage.java -text
+taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptionnew/TaxonDescriptionFeature.java -text
+taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptionnew/TaxonDescriptionTreeEditor.java -text
+taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptionnew/TextDataDetailsPage.java -text
+taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptionnew/handler/AddDescriptionHandler.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/CreateChildTaxonHandler.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/EditNewTaxonHandler.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/NextMemberHandler.java -text
@@ -1027,6 +1044,7 @@ taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/SelectionDialogDeta
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/SelectionDialogSelectionLabelProvider.java -text
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/UriDialog.java -text
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/handler/ShowDataSourceViewHandler.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/handler/ShowLoginWindowHandler.java -text
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/handler/ShowUserManagerViewHandler.java -text
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/AbstractExcelExportWizard.java -text
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/AbstractExcelImportWizard.java -text
@@ -1034,8 +1052,9 @@ taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/AbstractExportWizard.jav
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/AbstractImportWizard.java -text
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/BerlinModelExportWizard.java -text
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/BerlinModelImportWizard.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/ExportToFileDestinationWizardPage.java -text
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/GenericConfiguratorWizardPage.java -text
-taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/JaxbExportDestinationWizardPage.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/ImportFromFileDataSourceWizardPage.java -text
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/JaxbExportWizard.java -text
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/JaxbImportSourceWizardPage.java -text
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/JaxbImportWizard.java -text
@@ -1148,100 +1167,13 @@ taxeditor-store/src/test/resources/eu/etaxonomy/cdm/cdmfs.xml -text
 taxeditor-store/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet-with_auditing_info.xml -text
 taxeditor-store/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet.xml -text
 taxeditor-store/src/test/resources/eu/etaxonomy/cdm/database/dataset.dtd -text
+taxeditor-store/src/test/resources/eu/etaxonomy/taxeditor/io/TcsXmlImportConfiguratorTest-input.xml -text
 taxeditor-store/src/test/resources/eu/etaxonomy/taxeditor/store/CdmStoreTest.xml -text
 taxeditor-store/src/test/resources/eu/etaxonomy/taxeditor/store/ConcurrentSessionTest.xml -text
 taxeditor-store/src/test/resources/log4j.properties -text
 taxeditor-store/src/test/resources/unitils.properties -text
 taxeditor-updateSite/.project -text
-taxeditor-updateSite/artifacts.xml -text
-taxeditor-updateSite/content.xml -text
-taxeditor-updateSite/features/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/META-INF/MANIFEST.MF -text
-taxeditor-updateSite/features/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/feature.xml -text
 taxeditor-updateSite/index.html -text
-taxeditor-updateSite/logs.zip -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/META-INF/MANIFEST.MF -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/cdmlib-io-2.1src.zip -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/cdmlib-model-2.1.jar -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/cdmlib-model-2.1src.zip -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/cdmlib-persistence-2.1-tests.jar -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/cdmlib-persistence-2.1.jar -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/cdmlib-persistence-2.1src.zip -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/cdmlib-services-2.1.jar -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/cdmlib-services-2.1src.zip -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/cglib-2.1.3.jar -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/commons-collections-3.2.jar -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/commons-logging-1.0.4.jar -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/dom4j-1.6.1.jar -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/ehcache-1.2.3.jar -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/ejb3-persistence.jar -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/h2-1.0.73.jar -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/hibernate-annotations-3.4.0-SNAPSHOT-sources.jar -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/hibernate-annotations-3.4.0-SNAPSHOT.jar -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/hibernate-commons-annotations-3.4.0-SNAPSHOT-sources.jar -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/hibernate-commons-annotations-3.4.0-SNAPSHOT.jar -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/hibernate-core-3.4.0-SNAPSHOT-sources.jar -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/hibernate-core-3.4.0-SNAPSHOT.jar -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/hibernate-envers-3.4.0-SNAPSHOT-sources.jar -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/hibernate-envers-3.4.0-SNAPSHOT.jar -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/hibernate-search-3.1.0.GA-sources.jar -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/hibernate-search-3.1.0.GA.jar -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/hibernate-tools-3.2.0.ga.jar -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/hibernate-validator-3.1.0.GA.jar -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/hsqldb.jar -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/javassist.jar -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/jaxb-api.jar -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/jaxb-impl-2.0.jar -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/jdbc-1.2.jar -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/jdbc2_0-stdext.jar -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/jdom-1.0.jar -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/joda-time-1.5.jar -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/joda-time-hibernate-1.0.jar -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/jsr250-api-1.0.jar -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/jta.jar -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/jtds-1.2.2.jar -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/junit-4.4.jar -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/log4j-1.2.14.jar -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/log4j-1.2.14src.zip -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/lsid-client-1.1.2.jar -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/lsid-server-1.1.2.jar -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/lucene-core-2.4.0.jar -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/lucene-spellchecker-2.4.0.jar -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/mysql-connector-java-3.1.14-bin.jar -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/opencsv-1.8.jar -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/plugin.xml -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/poi-3.1-FINAL.jar -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/postgresql-8.2-504.jdbc4.jar -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/sanselan-0.94-incubator.jar -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/slf4j-api-1.5.2.jar -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/slf4j-log4j12-1.5.2.jar -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/spring-2.5.6.jar -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/spring-agent-2.5.6.jar -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/spring-aop-2.5.6.jar -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/spring-aop-2.5src.zip -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/spring-aspects-2.5.6.jar -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/spring-beans-2.5.6.jar -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/spring-beans-2.5src.zip -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/spring-context-2.5.6.jar -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/spring-context-2.5src.zip -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/spring-context-support-2.5src.zip -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/spring-core-2.5.6.jar -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/spring-core-2.5src.zip -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/spring-jdbc-2.5.6.jar -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/spring-jdbc-2.5src.zip -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/spring-modules-lucene-0.8a.jar -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/spring-orm-2.5.6.jar -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/spring-orm-2.5src.zip -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/spring-security-core-2.0.4-tests.jar -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/spring-security-core-2.0.4.jar -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/spring-test-2.5.6.jar -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/spring-test-2.5src.zip -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/spring-tx-2.5src.zip -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/spring-web-2.5.6.jar -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/spring-webmvc-2.5.6.jar -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/unitils-1.0.jar -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/wsdl4j-1.6.1.jar -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/xercesImpl.jar -text
-taxeditor-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.1.0.v20090625-1925/xml-apis.jar -text
 taxeditor-updateSite/site.xml -text
 taxeditor-updateSite/web/site.css -text
 taxeditor-updateSite/web/site.xsl -text