.gitattributes

   1 * text=auto !eol
   2 pom.xml merge=ours
   3 ide/eclipse/cdm-vaadin.launch -text
   4 /pom.xml -text
   5 src/main/java/eu/etaxonomy/cdm/vaadin/AppWidgetSet.gwt.xml -text
   6 src/main/java/eu/etaxonomy/cdm/vaadin/CdmAppInitializer.java.bkp -text
   7 src/main/java/eu/etaxonomy/cdm/vaadin/component/ConceptRelationshipComposite.java -text
   8 src/main/java/eu/etaxonomy/cdm/vaadin/component/ConfigWindow.java -text
   9 src/main/java/eu/etaxonomy/cdm/vaadin/component/DetailWindow.java -text
  10 src/main/java/eu/etaxonomy/cdm/vaadin/component/EditConceptRelationshipComposite.java -text
  11 src/main/java/eu/etaxonomy/cdm/vaadin/component/HorizontalToolbar.java -text
  12 src/main/java/eu/etaxonomy/cdm/vaadin/component/NewTaxonBaseComposite.java -text
  13 src/main/java/eu/etaxonomy/cdm/vaadin/component/StatusComposite.java -text
  14 src/main/java/eu/etaxonomy/cdm/vaadin/container/CdmSQLContainer.java -text
  15 src/main/java/eu/etaxonomy/cdm/vaadin/container/CdmSpringConnectionPool.java -text
  16 src/main/java/eu/etaxonomy/cdm/vaadin/container/IdAndUuid.java -text
  17 src/main/java/eu/etaxonomy/cdm/vaadin/container/LeafNodeTaxonContainer.java -text
  18 src/main/java/eu/etaxonomy/cdm/vaadin/jscomponent/D3ConceptRelationshipTree.java -text
  19 src/main/java/eu/etaxonomy/cdm/vaadin/jscomponent/D3ConceptRelationshipTreeState.java -text
  20 src/main/java/eu/etaxonomy/cdm/vaadin/model/BeanItemContainerExample.java -text
  21 src/main/java/eu/etaxonomy/cdm/vaadin/model/CdmTaxonTableCollection.java -text
  22 src/main/java/eu/etaxonomy/cdm/vaadin/model/DbTableDTO.java -text
  23 src/main/java/eu/etaxonomy/cdm/vaadin/model/DbTableDTOS.java -text
  24 src/main/java/eu/etaxonomy/cdm/vaadin/model/DistributionDTO.java -text
  25 src/main/java/eu/etaxonomy/cdm/vaadin/model/LazyLoadedContainer.java -text
  26 src/main/java/eu/etaxonomy/cdm/vaadin/model/StatusDTO.java -text
  27 src/main/java/eu/etaxonomy/cdm/vaadin/model/taxonDTO.java -text
  28 src/main/java/eu/etaxonomy/cdm/vaadin/presenter/AuthenticationPresenter.java -text
  29 src/main/java/eu/etaxonomy/cdm/vaadin/presenter/ConceptRelationshipPresenter.java -text
  30 src/main/java/eu/etaxonomy/cdm/vaadin/presenter/EditConceptRelationshipPresenter.java -text
  31 src/main/java/eu/etaxonomy/cdm/vaadin/presenter/NewTaxonBasePresenter.java -text
  32 src/main/java/eu/etaxonomy/cdm/vaadin/presenter/StatusPresenter.java -text
  33 src/main/java/eu/etaxonomy/cdm/vaadin/presenter/distributionStatus/DistributionSelectionPresenter.java -text
  34 src/main/java/eu/etaxonomy/cdm/vaadin/presenter/distributionStatus/DistributionTablePresenter.java -text
  35 src/main/java/eu/etaxonomy/cdm/vaadin/presenter/distributionStatus/settings/SettingsPresenter.java -text
  36 src/main/java/eu/etaxonomy/cdm/vaadin/servlet/CdmVaadinConversationalServlet.java -text
  37 src/main/java/eu/etaxonomy/cdm/vaadin/session/CdmChangeEvent.java -text
  38 src/main/java/eu/etaxonomy/cdm/vaadin/session/CdmDataChangeService.java -text
  39 src/main/java/eu/etaxonomy/cdm/vaadin/session/ICdmChangeListener.java -text
  40 src/main/java/eu/etaxonomy/cdm/vaadin/session/ISelectionListener.java -text
  41 src/main/java/eu/etaxonomy/cdm/vaadin/session/SelectionEvent.java -text
  42 src/main/java/eu/etaxonomy/cdm/vaadin/session/SelectionService.java -text
  43 src/main/java/eu/etaxonomy/cdm/vaadin/statement/CdmStatementDelegate.java -text
  44 src/main/java/eu/etaxonomy/cdm/vaadin/ui/AbstractAuthenticatedUI.java -text
  45 src/main/java/eu/etaxonomy/cdm/vaadin/ui/CdmBaseUI.java -text
  46 src/main/java/eu/etaxonomy/cdm/vaadin/ui/CheckUI.java -text
  47 src/main/java/eu/etaxonomy/cdm/vaadin/ui/ConceptRelationshipUI.java -text
  48 src/main/java/eu/etaxonomy/cdm/vaadin/ui/DistributionStatusUI.java -text
  49 src/main/java/eu/etaxonomy/cdm/vaadin/ui/StatusEditorUI.java -text
  50 src/main/java/eu/etaxonomy/cdm/vaadin/util/CdmQueryFactory.java -text
  51 src/main/java/eu/etaxonomy/cdm/vaadin/util/CdmSQLStringDecorator.java -text
  52 src/main/java/eu/etaxonomy/cdm/vaadin/util/CdmSpringContextHelper.java -text
  53 src/main/java/eu/etaxonomy/cdm/vaadin/util/CdmVaadinSessionUtilities.java -text
  54 src/main/java/eu/etaxonomy/cdm/vaadin/util/CdmVaadinUtilities.java -text
  55 src/main/java/eu/etaxonomy/cdm/vaadin/util/SQLUtils.java -text
  56 src/main/java/eu/etaxonomy/cdm/vaadin/view/AuthenticationView.java -text
  57 src/main/java/eu/etaxonomy/cdm/vaadin/view/ConceptRelationshipView.java -text
  58 src/main/java/eu/etaxonomy/cdm/vaadin/view/IAuthenticationComponent.java -text
  59 src/main/java/eu/etaxonomy/cdm/vaadin/view/IConceptRelationshipComponentListener.java -text
  60 src/main/java/eu/etaxonomy/cdm/vaadin/view/INewTaxonBaseComponentListener.java -text
  61 src/main/java/eu/etaxonomy/cdm/vaadin/view/INewTaxonBaseComposite.java -text
  62 src/main/java/eu/etaxonomy/cdm/vaadin/view/IStatusComposite.java -text
  63 src/main/java/eu/etaxonomy/cdm/vaadin/view/distributionStatus/DistributionSelectionView.java -text
  64 src/main/java/eu/etaxonomy/cdm/vaadin/view/distributionStatus/DistributionTableView.java -text
  65 src/main/java/eu/etaxonomy/cdm/vaadin/view/distributionStatus/IDistributionSelectionComponent.java -text
  66 src/main/java/eu/etaxonomy/cdm/vaadin/view/distributionStatus/IDistributionTableComponent.java -text
  67 src/main/resources/eu/etaxonomy/cdm/vaadin/jscomponent/css/d3.conceptrelationshiptree.css -text
  68 src/main/resources/eu/etaxonomy/cdm/vaadin/jscomponent/extlib/d3.min.js -text
  69 src/main/resources/eu/etaxonomy/cdm/vaadin/jscomponent/lib/d3.conceptrelationshiptree_connector.js -text
  70 src/main/resources/log4j.properties -text
  71 src/main/resources/test.txt -text
  72 src/main/webapp/META-INF/MANIFEST.MF -text
  73 src/main/webapp/META-INF/context.xml -text
  74 src/main/webapp/META-INF/services/javax.servlet.ServletContainerInitializer -text
  75 src/main/webapp/VAADIN/themes/edit/addons.scss -text
  76 src/main/webapp/VAADIN/themes/edit/edit.scss -text
  77 src/main/webapp/VAADIN/themes/edit/favicon.ico -text
  78 src/main/webapp/VAADIN/themes/edit/styles.css -text
  79 src/main/webapp/VAADIN/themes/edit/styles.scss -text
  80 src/main/webapp/VAADIN/themes/macosx/addons.scss -text
  81 src/main/webapp/VAADIN/themes/macosx/favicon.ico -text
  82 src/main/webapp/VAADIN/themes/macosx/icons/32/Thumbs.db -text
  83 src/main/webapp/VAADIN/themes/macosx/icons/32/VLineSeparator.png -text
  84 src/main/webapp/VAADIN/themes/macosx/icons/32/arrow-down.png -text
  85 src/main/webapp/VAADIN/themes/macosx/icons/32/arrow-left.png -text
  86 src/main/webapp/VAADIN/themes/macosx/icons/32/arrow-right.png -text
  87 src/main/webapp/VAADIN/themes/macosx/icons/32/arrow-up.png -text
  88 src/main/webapp/VAADIN/themes/macosx/icons/32/attention.png -text
  89 src/main/webapp/VAADIN/themes/macosx/icons/32/bg-column.jpg -text
  90 src/main/webapp/VAADIN/themes/macosx/icons/32/bg-right-column.jpg -text
  91 src/main/webapp/VAADIN/themes/macosx/icons/32/bottom-left.png -text
  92 src/main/webapp/VAADIN/themes/macosx/icons/32/bottom-right.png -text
  93 src/main/webapp/VAADIN/themes/macosx/icons/32/calendar.png -text
  94 src/main/webapp/VAADIN/themes/macosx/icons/32/cancel.png -text
  95 src/main/webapp/VAADIN/themes/macosx/icons/32/document-add.png -text
  96 src/main/webapp/VAADIN/themes/macosx/icons/32/document-delete.png -text
  97 src/main/webapp/VAADIN/themes/macosx/icons/32/document-doc.png -text
  98 src/main/webapp/VAADIN/themes/macosx/icons/32/document-edit.png -text
  99 src/main/webapp/VAADIN/themes/macosx/icons/32/document-image.png -text
 100 src/main/webapp/VAADIN/themes/macosx/icons/32/document-pdf.png -text
 101 src/main/webapp/VAADIN/themes/macosx/icons/32/document-ppt.png -text
 102 src/main/webapp/VAADIN/themes/macosx/icons/32/document-save.png -text
 103 src/main/webapp/VAADIN/themes/macosx/icons/32/document-txt.png -text
 104 src/main/webapp/VAADIN/themes/macosx/icons/32/document-web.png -text
 105 src/main/webapp/VAADIN/themes/macosx/icons/32/document-xsl.png -text
 106 src/main/webapp/VAADIN/themes/macosx/icons/32/document.png -text
 107 src/main/webapp/VAADIN/themes/macosx/icons/32/email-reply.png -text
 108 src/main/webapp/VAADIN/themes/macosx/icons/32/email-send.png -text
 109 src/main/webapp/VAADIN/themes/macosx/icons/32/email.png -text
 110 src/main/webapp/VAADIN/themes/macosx/icons/32/folder-add.png -text
 111 src/main/webapp/VAADIN/themes/macosx/icons/32/folder-delete.png -text
 112 src/main/webapp/VAADIN/themes/macosx/icons/32/folder.png -text
 113 src/main/webapp/VAADIN/themes/macosx/icons/32/globe.png -text
 114 src/main/webapp/VAADIN/themes/macosx/icons/32/help.png -text
 115 src/main/webapp/VAADIN/themes/macosx/icons/32/lock.png -text
 116 src/main/webapp/VAADIN/themes/macosx/icons/32/loginpanel.png -text
 117 src/main/webapp/VAADIN/themes/macosx/icons/32/note.png -text
 118 src/main/webapp/VAADIN/themes/macosx/icons/32/ok.png -text
 119 src/main/webapp/VAADIN/themes/macosx/icons/32/reload.png -text
 120 src/main/webapp/VAADIN/themes/macosx/icons/32/settings.png -text
 121 src/main/webapp/VAADIN/themes/macosx/icons/32/settings_1.png -text
 122 src/main/webapp/VAADIN/themes/macosx/icons/32/top-left.png -text
 123 src/main/webapp/VAADIN/themes/macosx/icons/32/top-right.png -text
 124 src/main/webapp/VAADIN/themes/macosx/icons/32/trash-full.png -text
 125 src/main/webapp/VAADIN/themes/macosx/icons/32/trash.png -text
 126 src/main/webapp/VAADIN/themes/macosx/icons/32/user.png -text
 127 src/main/webapp/VAADIN/themes/macosx/icons/32/users.png -text
 128 src/main/webapp/VAADIN/themes/macosx/icons/32/vseparator.png -text
 129 src/main/webapp/VAADIN/themes/macosx/icons/32/vseparator1.png -text
 130 src/main/webapp/VAADIN/themes/macosx/icons/wizard/OSStack.png -text
 131 src/main/webapp/VAADIN/themes/macosx/icons/wizard/arrow-down.png -text
 132 src/main/webapp/VAADIN/themes/macosx/icons/wizard/arrow-up.png -text
 133 src/main/webapp/VAADIN/themes/macosx/icons/wizard/red_nose_reindeer.jpg -text
 134 src/main/webapp/VAADIN/themes/macosx/icons/wizard/reindeer.jpg -text
 135 src/main/webapp/VAADIN/themes/macosx/icons/wizard/vaadin.png -text
 136 src/main/webapp/VAADIN/themes/macosx/images/document-edit.png -text
 137 src/main/webapp/VAADIN/themes/macosx/images/gradient.png -text
 138 src/main/webapp/VAADIN/themes/macosx/images/logo.png -text
 139 src/main/webapp/VAADIN/themes/macosx/images/table-header-bg.png -text
 140 src/main/webapp/VAADIN/themes/macosx/styles.css -text
 141 src/main/webapp/WEB-INF/applicationContext.xml -text
 142 src/main/webapp/WEB-INF/cdm-vaadin-servlet.xml -text
 143 src/main/webapp/WEB-INF/datasources/configurable.xml -text
 144 src/main/webapp/WEB-INF/web.xml -text
 145 src/test/java/eu/etaxonomy/cdm/remote/config/AbstractWebApplicationConfigurer.java -text
 146 src/test/java/eu/etaxonomy/cdm/remote/config/DataSourceConfigurer.java -text
 147 src/test/java/eu/etaxonomy/cdm/remote/config/DataSourceProperties.java -text
 148 src/test/java/eu/etaxonomy/cdm/remote/config/LoggingConfigurer.java -text
 149 src/test/java/eu/etaxonomy/cdm/unitils/CdmTestDataSourceFactory.java -text
 150 src/test/java/eu/etaxonomy/cdm/vaadin/CdmVaadinBaseTest.java -text
 151 src/test/java/eu/etaxonomy/cdm/vaadin/container/CdmSQLContainerTest.java -text
 152 src/test/java/eu/etaxonomy/cdm/vaadin/jscomponent/D3CTree.java -text
 153 src/test/java/eu/etaxonomy/cdm/vaadin/jscomponent/D3CTreeState.java -text
 154 src/test/java/eu/etaxonomy/cdm/vaadin/presenter/ConceptRelationshipPresenterTest.java -text
 155 src/test/java/eu/etaxonomy/cdm/vaadin/presenter/EditConceptRelationshipPresenterTest.java -text
 156 src/test/java/eu/etaxonomy/cdm/vaadin/presenter/NewTaxonBasePresenterTest.java -text
 157 src/test/java/eu/etaxonomy/cdm/vaadin/presenter/StatusPresenterTest.java -text
 158 src/test/java/eu/etaxonomy/cdm/vaadin/ui/CheckTestUI.java -text
 159 src/test/java/eu/etaxonomy/cdm/vaadin/ui/D3CTreeUI.java -text
 160 src/test/java/eu/etaxonomy/cdm/vaadin/ui/NavigatorTestUI.java -text
 161 src/test/java/eu/etaxonomy/cdm/vaadin/util/CdmSpringContextHelperTest.java -text
 162 src/test/java/eu/etaxonomy/cdm/vaadin/view/NaviTestView.java -text
 163 src/test/resources/datasources.xml -text
 164 src/test/resources/dbscripts/001-cdm.h2.sql -text
 165 src/test/resources/etc/jetty/jetty.xml -text
 166 src/test/resources/eu/etaxonomy/cdm/remote/ehcache.xml -text
 167 src/test/resources/eu/etaxonomy/cdm/vaadin/PUBLIC.xsd -text
 168 src/test/resources/eu/etaxonomy/cdm/vaadin/container/CdmSQLContainerTest.xml -text
 169 src/test/resources/eu/etaxonomy/cdm/vaadin/dataset.xsd -text
 170 src/test/resources/eu/etaxonomy/cdm/vaadin/jscomponent/css/d3.ctree.css -text
 171 src/test/resources/eu/etaxonomy/cdm/vaadin/jscomponent/extlib/d3.min.js -text
 172 src/test/resources/eu/etaxonomy/cdm/vaadin/jscomponent/lib/d3ctree_connector.js -text
 173 src/test/resources/eu/etaxonomy/cdm/vaadin/presenter/ConceptRelationshipPresenterTest.xml -text
 174 src/test/resources/eu/etaxonomy/cdm/vaadin/presenter/NewTaxonBasePresenterTest.xml -text
 175 src/test/resources/eu/etaxonomy/cdm/vaadin/presenter/StatusPresenterTest.xml -text
 176 src/test/resources/eu/etaxonomy/cdm/vaadin/util/CdmSpringContextHelperTest.xml -text
 177 src/test/resources/h2/cdmTest.h2.db -text
 178 src/test/resources/h2/cdmTest.trace.db -text
 179 src/test/resources/log4j.properties -text
 180 src/test/resources/override.properties -text
 181 src/test/resources/unitils.properties -text
 182 src/test/resources/webapp/WEB-INF/applicationContext.xml -text