Updated cascade sematics for determinations

[cdmlib.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 63251fcba2b3f06aef61707d8f850052bc158e7d..fac4844dbdcc66674f40c0d555851dcdfd17aa92 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -4,10 +4,24 @@ app-import/.project
 app-import/.settings
 app-import/.umlproject
 app-import/app-import.uml
 app-import/.settings
 app-import/.umlproject
 app-import/app-import.uml

+app-import/eu.etaxonomy.cdm.model.common.DefinedTermBase
+app-import/eu.etaxonomy.cdm.model.common.LanguageString
+app-import/eu.etaxonomy.cdm.model.description.DescriptionBase
+app-import/eu.etaxonomy.cdm.model.description.DescriptionElementBase
+app-import/eu.etaxonomy.cdm.model.name.TaxonNameBase
+app-import/eu.etaxonomy.cdm.model.taxon.TaxonBase
+app-import/src/main/resources/TaxonX_all_to_rename_no_types.zip
+app-import/src/main/resources/TaxonX_all_to_rename_with_types.zip
+app-import/src/main/resources/TaxonX_to_rename_Nov2008.zip
+app-import/src/main/resources/TaxonX_to_rename_Nov2008_korr.zip

 app-import/src/main/resources/arecaceae.rdf_alt
 app-import/src/main/resources/arecaceae.zip
 app-import/src/main/resources/arecaceae.zip_alt
 app-import/src/main/resources/arecaceae_alt.rdf
 app-import/src/main/resources/arecaceae.rdf_alt
 app-import/src/main/resources/arecaceae.zip
 app-import/src/main/resources/arecaceae.zip_alt
 app-import/src/main/resources/arecaceae_alt.rdf

+app-import/src/main/resources/arecaceae_old.rdf
+app-import/src/main/resources/arecaceae_old.zip
+app-import/src/main/resources/arecaceae_old2.rdf
+app-import/src/main/resources/tmp

 app-import/target
 cdmlib-commons/.classpath
 cdmlib-commons/.project
 app-import/target
 cdmlib-commons/.classpath
 cdmlib-commons/.project


@@ -24,11 +38,16 @@ cdmlib-io/.project
 cdmlib-io/.settings
 cdmlib-io/.umlproject
 cdmlib-io/cdmlib-io.uml
 cdmlib-io/.settings
 cdmlib-io/.umlproject
 cdmlib-io/cdmlib-io.uml

+cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/PUBLIC.xsd
+cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/dataset.xsd

 cdmlib-io/src/test/resources/log4j.properties
 cdmlib-io/target
 cdmlib-model/.classpath
 cdmlib-io/src/test/resources/log4j.properties
 cdmlib-io/target
 cdmlib-model/.classpath

+cdmlib-model/.externalToolBuilders

 cdmlib-model/.project
 cdmlib-model/.settings
 cdmlib-model/.project
 cdmlib-model/.settings

+cdmlib-model/ajcore.*.txt
+cdmlib-model/bin

 cdmlib-model/doc
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/ParserProblemRange.java
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/OrderedTermBaseTest.java
 cdmlib-model/doc
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/ParserProblemRange.java
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/OrderedTermBaseTest.java


@@ -38,13 +57,26 @@ cdmlib-persistence/.classpath
 cdmlib-persistence/.project
 cdmlib-persistence/.settings
 cdmlib-persistence/.umlproject
 cdmlib-persistence/.project
 cdmlib-persistence/.settings
 cdmlib-persistence/.umlproject

+cdmlib-persistence/002_cdm.dll

 cdmlib-persistence/cdmlib-persistence.uml
 cdmlib-persistence/cdmlib-persistence.uml

+cdmlib-persistence/out.xml

 cdmlib-persistence/src/test/resources/Copy[!!-~]of[!!-~]test.cdm.datasource.xml
 cdmlib-persistence/src/test/resources/Copy[!!-~]of[!!-~]test.cdm.datasource.xml

+cdmlib-persistence/src/test/resources/dbscripts/Kopie[!!-~]von[!!-~]001_cdm.ddl
+cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/PUBLIC.xsd
+cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/dataset.xsd

 cdmlib-persistence/target
 cdmlib-persistence/target

+cdmlib-persistence/test.xml

 cdmlib-remote/.classpath
 cdmlib-remote/.project
 cdmlib-remote/.settings
 cdmlib-remote/.classpath
 cdmlib-remote/.project
 cdmlib-remote/.settings

+cdmlib-remote/eu.etaxonomy.cdm.model.common.DefinedTermBase
+cdmlib-remote/eu.etaxonomy.cdm.model.common.LanguageString
+cdmlib-remote/eu.etaxonomy.cdm.model.description.DescriptionBase
+cdmlib-remote/eu.etaxonomy.cdm.model.description.DescriptionElementBase
+cdmlib-remote/eu.etaxonomy.cdm.model.name.TaxonNameBase
+cdmlib-remote/eu.etaxonomy.cdm.model.taxon.TaxonBase

 cdmlib-remote/null
 cdmlib-remote/null

+cdmlib-remote/secret-accounts.diff

 cdmlib-remote/target
 cdmlib-services/.classpath
 cdmlib-services/.project
 cdmlib-remote/target
 cdmlib-services/.classpath
 cdmlib-services/.project


@@ -53,41 +85,52 @@ cdmlib-services/.umlproject
 cdmlib-services/bin
 cdmlib-services/cdmlib-services.uml
 cdmlib-services/src/main/resources/log4j.properties
 cdmlib-services/bin
 cdmlib-services/cdmlib-services.uml
 cdmlib-services/src/main/resources/log4j.properties

+cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/PUBLIC.xsd
+cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/dataset.xsd

 cdmlib-services/src/test/resources/eu/etaxonomy/cdm/integrationTest.xml
 cdmlib-services/target
 cdmlib-services/src/test/resources/eu/etaxonomy/cdm/integrationTest.xml
 cdmlib-services/target

-eclipse-feature-sources/.classpath
-eclipse-feature-sources/.project
-eclipse-plugin-sources/.classpath
-eclipse-plugin-sources/.project
-eclipse-plugin-sources/.settings
-eclipse-plugin-sources/target
+eclipse-feature-source/.classpath
+eclipse-feature-source/.settings
+eclipse-feature-source/src
+eclipse-feature/.settings

 eclipse-plugin/.settings
 eclipse-plugin/.settings

+eclipse-plugin/cdmlib-*.jar
+eclipse-plugin/cdmlib-*.zip

 eclipse-plugin/cdmlib-commons-1.3.jar
 eclipse-plugin/cdmlib-commons-1.3src.zip
 eclipse-plugin/cdmlib-commons-1.3.jar
 eclipse-plugin/cdmlib-commons-1.3src.zip

+eclipse-plugin/cdmlib-commons-2.0.jar

 eclipse-plugin/cdmlib-commons-2.0src.zip
 eclipse-plugin/cdmlib-commons-2.0src.zip

+eclipse-plugin/cdmlib-ext-2.0.jar

 eclipse-plugin/cdmlib-ext-2.0src.zip
 eclipse-plugin/cdmlib-io-1.3.jar
 eclipse-plugin/cdmlib-io-1.3src.zip
 eclipse-plugin/cdmlib-ext-2.0src.zip
 eclipse-plugin/cdmlib-io-1.3.jar
 eclipse-plugin/cdmlib-io-1.3src.zip

+eclipse-plugin/cdmlib-io-2.0.jar

 eclipse-plugin/cdmlib-io-2.0src.zip
 eclipse-plugin/cdmlib-model-1.3.jar
 eclipse-plugin/cdmlib-model-1.3src.zip
 eclipse-plugin/cdmlib-io-2.0src.zip
 eclipse-plugin/cdmlib-model-1.3.jar
 eclipse-plugin/cdmlib-model-1.3src.zip

+eclipse-plugin/cdmlib-model-2.0.jar

 eclipse-plugin/cdmlib-model-2.0src.zip
 eclipse-plugin/cdmlib-persistence-1.3.jar
 eclipse-plugin/cdmlib-persistence-1.3src.zip
 eclipse-plugin/cdmlib-model-2.0src.zip
 eclipse-plugin/cdmlib-persistence-1.3.jar
 eclipse-plugin/cdmlib-persistence-1.3src.zip

+eclipse-plugin/cdmlib-persistence-2.0.jar

 eclipse-plugin/cdmlib-persistence-2.0src.zip
 eclipse-plugin/cdmlib-services-1.3.jar
 eclipse-plugin/cdmlib-services-1.3src.zip
 eclipse-plugin/cdmlib-persistence-2.0src.zip
 eclipse-plugin/cdmlib-services-1.3.jar
 eclipse-plugin/cdmlib-services-1.3src.zip

+eclipse-plugin/cdmlib-services-2.0.jar

 eclipse-plugin/cdmlib-services-2.0src.zip
 eclipse-plugin/dist
 eclipse-plugin/log4j-1.2.14src.zip
 eclipse-plugin/target
 eclipse-updateSite/.classpath
 eclipse-plugin/cdmlib-services-2.0src.zip
 eclipse-plugin/dist
 eclipse-plugin/log4j-1.2.14src.zip
 eclipse-plugin/target
 eclipse-updateSite/.classpath

+eclipse-updateSite/.settings

 eclipse-updateSite/artifacts.xml
 eclipse-updateSite/content.xml
 eclipse-updateSite/artifacts.xml
 eclipse-updateSite/content.xml

-eclipse-updateSite/features/eu.etaxonomy.cdmLibrary_1.2.3.04.jar
-eclipse-updateSite/features/eu.etaxonomy.cdmLibrary_1.2.4.01.jar
-eclipse-updateSite/plugins/eu.etaxonomy.cdmLibrary_1.2.3.04.jar
-eclipse-updateSite/plugins/eu.etaxonomy.cdmLibrary_1.2.4.01.jar
+eclipse-updateSite/features/*.jar
+eclipse-updateSite/plugins/*.jar
+eclipse-updateSite/plugins/*.zip
+eclipse-updateSite/src

 musiclib-hibernatetest/.classpath
 musiclib-hibernatetest/.project
 musiclib-hibernatetest/.settings
 musiclib-hibernatetest/.classpath
 musiclib-hibernatetest/.project
 musiclib-hibernatetest/.settings

+/target
+/testANTLR