BGBM BDI Projects / cdm-vaadin.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
cleanup
[cdm-vaadin.git] / .gitattributes
diff --git a/.gitattributes b/.gitattributes
index 6db14a93db90ca0c5da107b1f5eb4daa15574b06..adfaa69ff633f84bb5293a517178ec3992ffe482 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,50 +1,180 @@
 * text=auto !eol
+pom.xml merge=ours
 ide/eclipse/cdm-vaadin.launch -text
 /pom.xml -text
-src/main/java/eu/etaxonomy/AppWidgetSet.gwt.xml -text
-src/main/java/eu/etaxonomy/MyVaadinUI.java -text
-src/main/java/eu/etaxonomy/cdm/remote/config/AbstractWebApplicationConfigurer.java -text
-src/main/java/eu/etaxonomy/cdm/remote/config/DataSourceConfigurer.java -text
-src/main/java/eu/etaxonomy/cdm/remote/config/DataSourceProperties.java -text
-src/main/java/eu/etaxonomy/cdm/remote/config/LoggingConfigurer.java -text
-src/main/java/eu/etaxonomy/cdm/vaadin/CdmAppInitializer.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/AppWidgetSet.gwt.xml -text
+src/main/java/eu/etaxonomy/cdm/vaadin/CdmAppInitializer.java.bkp -text
+src/main/java/eu/etaxonomy/cdm/vaadin/component/ConceptRelationshipComposite.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/component/ConfigWindow.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/component/DetailWindow.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/component/EditConceptRelationshipComposite.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/component/HorizontalToolbar.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/component/NewTaxonBaseComposite.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/component/StatusComposite.java -text
 src/main/java/eu/etaxonomy/cdm/vaadin/container/CdmSQLContainer.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/container/IdAndUuid.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/container/LeafNodeTaxonContainer.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/jscomponent/D3ConceptRelationshipTree.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/jscomponent/D3ConceptRelationshipTreeState.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/model/BeanItemContainerExample.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/model/CdmTaxonTableCollection.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/model/DbTableDTO.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/model/DbTableDTOS.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/model/DistributionDTO.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/model/LazyLoadedContainer.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/model/StatusDTO.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/model/taxonDTO.java -text
 src/main/java/eu/etaxonomy/cdm/vaadin/presenter/AuthenticationPresenter.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/presenter/ConceptRelationshipPresenter.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/presenter/EditConceptRelationshipPresenter.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/presenter/NewTaxonBasePresenter.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/presenter/StatusPresenter.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/presenter/distributionStatus/DistributionSelectionPresenter.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/presenter/distributionStatus/DistributionTablePresenter.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/presenter/distributionStatus/settings/SettingsPresenter.java -text
 src/main/java/eu/etaxonomy/cdm/vaadin/servlet/CdmVaadinConversationalServlet.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/session/CdmChangeEvent.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/session/CdmDataChangeService.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/session/ICdmChangeListener.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/session/ISelectionListener.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/session/SelectionEvent.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/session/SelectionService.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/statement/CdmStatementDelegate.java -text
 src/main/java/eu/etaxonomy/cdm/vaadin/ui/AbstractAuthenticatedUI.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/ui/CdmBaseUI.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/ui/CheckUI.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/ui/ConceptRelationshipUI.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/ui/DistributionStatusUI.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/ui/StatusEditorUI.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/util/CdmQueryFactory.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/util/CdmSQLStringDecorator.java -text
 src/main/java/eu/etaxonomy/cdm/vaadin/util/CdmSpringContextHelper.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/util/CdmVaadinSessionUtilities.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/util/CdmVaadinUtilities.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/util/SQLUtils.java -text
 src/main/java/eu/etaxonomy/cdm/vaadin/view/AuthenticationView.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/view/ConceptRelationshipView.java -text
 src/main/java/eu/etaxonomy/cdm/vaadin/view/IAuthenticationComponent.java -text
-src/main/resources/eu/etaxonomy/cdm/remote/ehcache.xml -text
-src/main/resources/log4j.properties -text
+src/main/java/eu/etaxonomy/cdm/vaadin/view/IConceptRelationshipComponentListener.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/view/INewTaxonBaseComponentListener.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/view/INewTaxonBaseComposite.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/view/IStatusComposite.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/view/distributionStatus/DistributionSelectionView.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/view/distributionStatus/DistributionTableView.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/view/distributionStatus/IDistributionSelectionComponent.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/view/distributionStatus/IDistributionTableComponent.java -text
+src/main/resources/eu/etaxonomy/cdm/vaadin/jscomponent/css/d3.conceptrelationshiptree.css -text
+src/main/resources/eu/etaxonomy/cdm/vaadin/jscomponent/extlib/d3.min.js -text
+src/main/resources/eu/etaxonomy/cdm/vaadin/jscomponent/lib/d3.conceptrelationshiptree_connector.js -text
+src/main/resources/log4j2.xml -text
+src/main/resources/test.txt -text
 src/main/webapp/META-INF/MANIFEST.MF -text
 src/main/webapp/META-INF/context.xml -text
 src/main/webapp/META-INF/services/javax.servlet.ServletContainerInitializer -text
-src/main/webapp/VAADIN/themes/mytheme/addons.scss -text
-src/main/webapp/VAADIN/themes/mytheme/favicon.ico -text
-src/main/webapp/VAADIN/themes/mytheme/mytheme.scss -text
-src/main/webapp/VAADIN/themes/mytheme/styles.css -text
-src/main/webapp/VAADIN/themes/mytheme/styles.scss -text
+src/main/webapp/VAADIN/themes/edit/addons.scss -text
+src/main/webapp/VAADIN/themes/edit/edit.scss -text
+src/main/webapp/VAADIN/themes/edit/favicon.ico -text
+src/main/webapp/VAADIN/themes/edit/styles.css -text
+src/main/webapp/VAADIN/themes/edit/styles.scss -text
+src/main/webapp/VAADIN/themes/macosx/addons.scss -text
+src/main/webapp/VAADIN/themes/macosx/favicon.ico -text
+src/main/webapp/VAADIN/themes/macosx/icons/32/Thumbs.db -text
+src/main/webapp/VAADIN/themes/macosx/icons/32/VLineSeparator.png -text
+src/main/webapp/VAADIN/themes/macosx/icons/32/arrow-down.png -text
+src/main/webapp/VAADIN/themes/macosx/icons/32/arrow-left.png -text
+src/main/webapp/VAADIN/themes/macosx/icons/32/arrow-right.png -text
+src/main/webapp/VAADIN/themes/macosx/icons/32/arrow-up.png -text
+src/main/webapp/VAADIN/themes/macosx/icons/32/attention.png -text
+src/main/webapp/VAADIN/themes/macosx/icons/32/bg-column.jpg -text
+src/main/webapp/VAADIN/themes/macosx/icons/32/bg-right-column.jpg -text
+src/main/webapp/VAADIN/themes/macosx/icons/32/bottom-left.png -text
+src/main/webapp/VAADIN/themes/macosx/icons/32/bottom-right.png -text
+src/main/webapp/VAADIN/themes/macosx/icons/32/calendar.png -text
+src/main/webapp/VAADIN/themes/macosx/icons/32/cancel.png -text
+src/main/webapp/VAADIN/themes/macosx/icons/32/document-add.png -text
+src/main/webapp/VAADIN/themes/macosx/icons/32/document-delete.png -text
+src/main/webapp/VAADIN/themes/macosx/icons/32/document-doc.png -text
+src/main/webapp/VAADIN/themes/macosx/icons/32/document-edit.png -text
+src/main/webapp/VAADIN/themes/macosx/icons/32/document-image.png -text
+src/main/webapp/VAADIN/themes/macosx/icons/32/document-pdf.png -text
+src/main/webapp/VAADIN/themes/macosx/icons/32/document-ppt.png -text
+src/main/webapp/VAADIN/themes/macosx/icons/32/document-save.png -text
+src/main/webapp/VAADIN/themes/macosx/icons/32/document-txt.png -text
+src/main/webapp/VAADIN/themes/macosx/icons/32/document-web.png -text
+src/main/webapp/VAADIN/themes/macosx/icons/32/document-xsl.png -text
+src/main/webapp/VAADIN/themes/macosx/icons/32/document.png -text
+src/main/webapp/VAADIN/themes/macosx/icons/32/email-reply.png -text
+src/main/webapp/VAADIN/themes/macosx/icons/32/email-send.png -text
+src/main/webapp/VAADIN/themes/macosx/icons/32/email.png -text
+src/main/webapp/VAADIN/themes/macosx/icons/32/folder-add.png -text
+src/main/webapp/VAADIN/themes/macosx/icons/32/folder-delete.png -text
+src/main/webapp/VAADIN/themes/macosx/icons/32/folder.png -text
+src/main/webapp/VAADIN/themes/macosx/icons/32/globe.png -text
+src/main/webapp/VAADIN/themes/macosx/icons/32/help.png -text
+src/main/webapp/VAADIN/themes/macosx/icons/32/lock.png -text
+src/main/webapp/VAADIN/themes/macosx/icons/32/loginpanel.png -text
+src/main/webapp/VAADIN/themes/macosx/icons/32/note.png -text
+src/main/webapp/VAADIN/themes/macosx/icons/32/ok.png -text
+src/main/webapp/VAADIN/themes/macosx/icons/32/reload.png -text
+src/main/webapp/VAADIN/themes/macosx/icons/32/settings.png -text
+src/main/webapp/VAADIN/themes/macosx/icons/32/settings_1.png -text
+src/main/webapp/VAADIN/themes/macosx/icons/32/top-left.png -text
+src/main/webapp/VAADIN/themes/macosx/icons/32/top-right.png -text
+src/main/webapp/VAADIN/themes/macosx/icons/32/trash-full.png -text
+src/main/webapp/VAADIN/themes/macosx/icons/32/trash.png -text
+src/main/webapp/VAADIN/themes/macosx/icons/32/user.png -text
+src/main/webapp/VAADIN/themes/macosx/icons/32/users.png -text
+src/main/webapp/VAADIN/themes/macosx/icons/32/vseparator.png -text
+src/main/webapp/VAADIN/themes/macosx/icons/32/vseparator1.png -text
+src/main/webapp/VAADIN/themes/macosx/icons/wizard/OSStack.png -text
+src/main/webapp/VAADIN/themes/macosx/icons/wizard/arrow-down.png -text
+src/main/webapp/VAADIN/themes/macosx/icons/wizard/arrow-up.png -text
+src/main/webapp/VAADIN/themes/macosx/icons/wizard/red_nose_reindeer.jpg -text
+src/main/webapp/VAADIN/themes/macosx/icons/wizard/reindeer.jpg -text
+src/main/webapp/VAADIN/themes/macosx/icons/wizard/vaadin.png -text
+src/main/webapp/VAADIN/themes/macosx/images/document-edit.png -text
+src/main/webapp/VAADIN/themes/macosx/images/gradient.png -text
+src/main/webapp/VAADIN/themes/macosx/images/logo.png -text
+src/main/webapp/VAADIN/themes/macosx/images/table-header-bg.png -text
+src/main/webapp/VAADIN/themes/macosx/styles.css -text
 src/main/webapp/WEB-INF/applicationContext.xml -text
 src/main/webapp/WEB-INF/cdm-vaadin-servlet.xml -text
 src/main/webapp/WEB-INF/datasources/configurable.xml -text
 src/main/webapp/WEB-INF/web.xml -text
-src/main/webapp/jetty.xml -text
+src/test/java/eu/etaxonomy/cdm/remote/config/AbstractWebApplicationConfigurer.java -text
+src/test/java/eu/etaxonomy/cdm/remote/config/DataSourceConfigurer.java -text
+src/test/java/eu/etaxonomy/cdm/remote/config/DataSourceProperties.java -text
+src/test/java/eu/etaxonomy/cdm/unitils/CdmTestDataSourceFactory.java -text
 src/test/java/eu/etaxonomy/cdm/vaadin/CdmVaadinBaseTest.java -text
 src/test/java/eu/etaxonomy/cdm/vaadin/container/CdmSQLContainerTest.java -text
+src/test/java/eu/etaxonomy/cdm/vaadin/jscomponent/D3CTree.java -text
+src/test/java/eu/etaxonomy/cdm/vaadin/jscomponent/D3CTreeState.java -text
+src/test/java/eu/etaxonomy/cdm/vaadin/presenter/ConceptRelationshipPresenterTest.java -text
+src/test/java/eu/etaxonomy/cdm/vaadin/presenter/EditConceptRelationshipPresenterTest.java -text
+src/test/java/eu/etaxonomy/cdm/vaadin/presenter/NewTaxonBasePresenterTest.java -text
+src/test/java/eu/etaxonomy/cdm/vaadin/presenter/StatusPresenterTest.java -text
+src/test/java/eu/etaxonomy/cdm/vaadin/ui/CheckTestUI.java -text
+src/test/java/eu/etaxonomy/cdm/vaadin/ui/D3CTreeUI.java -text
 src/test/java/eu/etaxonomy/cdm/vaadin/ui/NavigatorTestUI.java -text
 src/test/java/eu/etaxonomy/cdm/vaadin/util/CdmSpringContextHelperTest.java -text
 src/test/java/eu/etaxonomy/cdm/vaadin/view/NaviTestView.java -text
+src/test/resources/datasources.xml -text
 src/test/resources/dbscripts/001-cdm.h2.sql -text
-src/test/resources/dbscripts/hibernate.properties -text
-src/test/resources/eu/etaxonomy/cdm/applicationContext-securityTest.xml -text
-src/test/resources/eu/etaxonomy/cdm/applicationContext-test.xml -text
-src/test/resources/eu/etaxonomy/cdm/applicationContextSecurity.unused.xml -text
+src/test/resources/etc/jetty/jetty.xml -text
+src/test/resources/eu/etaxonomy/cdm/remote/ehcache.xml -text
 src/test/resources/eu/etaxonomy/cdm/vaadin/PUBLIC.xsd -text
 src/test/resources/eu/etaxonomy/cdm/vaadin/container/CdmSQLContainerTest.xml -text
 src/test/resources/eu/etaxonomy/cdm/vaadin/dataset.xsd -text
+src/test/resources/eu/etaxonomy/cdm/vaadin/jscomponent/css/d3.ctree.css -text
+src/test/resources/eu/etaxonomy/cdm/vaadin/jscomponent/extlib/d3.min.js -text
+src/test/resources/eu/etaxonomy/cdm/vaadin/jscomponent/lib/d3ctree_connector.js -text
+src/test/resources/eu/etaxonomy/cdm/vaadin/presenter/ConceptRelationshipPresenterTest.xml -text
+src/test/resources/eu/etaxonomy/cdm/vaadin/presenter/NewTaxonBasePresenterTest.xml -text
+src/test/resources/eu/etaxonomy/cdm/vaadin/presenter/StatusPresenterTest.xml -text
 src/test/resources/eu/etaxonomy/cdm/vaadin/util/CdmSpringContextHelperTest.xml -text
-src/test/resources/log4j.properties -text
+src/test/resources/h2/cdmTest.h2.db -text
+src/test/resources/h2/cdmTest.trace.db -text
+src/test/resources/log4j2.xml -text
 src/test/resources/override.properties -text
 src/test/resources/unitils.properties -text
 src/test/resources/webapp/WEB-INF/applicationContext.xml -text