From: Andreas Kohlbecker <a.kohlbecker@bgbm.org>
Date: Wed, 24 Oct 2012 10:13:08 +0000 (+0000)
Subject: adding missing dependency and switching to cdmlib 3.0.13 RELEASE
X-Git-Tag: 3.6.0~1022^2~4
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/bb23a6374dcfe7aacf1962e44a5ba6bc6b1b84b5

adding missing dependency and switching to cdmlib 3.0.13 RELEASE
---

diff --git a/.gitattributes b/.gitattributes
index 832721e8e..36da77d50 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -188,6 +188,8 @@ eu.etaxonomy.taxeditor.cdmlib/lib/httpclient-4.0.1.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/httpclient-4.0.1src.zip -text
 eu.etaxonomy.taxeditor.cdmlib/lib/httpcore-4.0.1.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/httpcore-4.0.1src.zip -text
+eu.etaxonomy.taxeditor.cdmlib/lib/identificationKeyAPI-1.0-SNAPSHOT-sources.jar -text
+eu.etaxonomy.taxeditor.cdmlib/lib/identificationKeyAPI-1.0-SNAPSHOT.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/javassist.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-api-2.1.6.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-impl-2.1.6.jar -text
diff --git a/eu.etaxonomy.taxeditor.cdmlib/.classpath b/eu.etaxonomy.taxeditor.cdmlib/.classpath
index 9114f423c..4655de356 100644
--- a/eu.etaxonomy.taxeditor.cdmlib/.classpath
+++ b/eu.etaxonomy.taxeditor.cdmlib/.classpath
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry exported="true" kind="lib" path="lib/identificationKeyAPI-1.0-SNAPSHOT-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/identificationKeyAPI-1.0-SNAPSHOT.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry exported="true" kind="lib" path="lib/activation-1.1.jar" sourcepath="lib/activation-1.1src.zip"/>
@@ -107,22 +110,22 @@
 	<classpathentry exported="true" kind="lib" path="lib/xstream-1.3.1.jar" sourcepath="lib/xstream-1.3.1src.zip"/>
 	<classpathentry exported="true" kind="lib" path="lib/hibernate-envers-3.4.0-SNAPSHOT.jar" sourcepath="lib/hibernate-envers-3.4.0-SNAPSHOTsrc.zip"/>
 	<classpathentry exported="true" kind="lib" path="lib/spring-xml-1.5.6.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.0.13-SNAPSHOT-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.0.13-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.0.13-SNAPSHOT-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.0.13-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.0.13-SNAPSHOT-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.0.13-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.0.13-SNAPSHOT-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.0.13-SNAPSHOT.jar" sourcepath="lib/cdmlib-model-3.0.13-SNAPSHOT-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.0.13-SNAPSHOT-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.0.13-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.0.13-SNAPSHOT-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.0.13-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.0.13-SNAPSHOT-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.0.13-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.0.13-SNAPSHOT-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.0.13-SNAPSHOT.jar" sourcepath="lib/cdmlib-services-3.0.13-SNAPSHOT-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/postgresql-9.1-901.jdbc4.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.0.13-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.0.13.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.0.13-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.0.13.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.0.13-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.0.13.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.0.13-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.0.13.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.0.13-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.0.13.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.0.13-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.0.13.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.0.13-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.0.13.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.0.13-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.0.13.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
index 9b5ebd81f..69e62d53e 100644
--- a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
@@ -878,20 +878,22 @@ Bundle-ClassPath: .,
  lib/xstream-1.3.1.jar,
  lib/hibernate-envers-3.4.0-SNAPSHOT.jar,
  lib/spring-xml-1.5.6.jar,
- lib/cdmlib-commons-3.0.13-SNAPSHOT-sources.jar,
- lib/cdmlib-commons-3.0.13-SNAPSHOT.jar,
- lib/cdmlib-ext-3.0.13-SNAPSHOT-sources.jar,
- lib/cdmlib-ext-3.0.13-SNAPSHOT.jar,
- lib/cdmlib-io-3.0.13-SNAPSHOT-sources.jar,
- lib/cdmlib-io-3.0.13-SNAPSHOT.jar,
- lib/cdmlib-model-3.0.13-SNAPSHOT-sources.jar,
- lib/cdmlib-model-3.0.13-SNAPSHOT.jar,
- lib/cdmlib-persistence-3.0.13-SNAPSHOT-sources.jar,
- lib/cdmlib-persistence-3.0.13-SNAPSHOT.jar,
- lib/cdmlib-print-3.0.13-SNAPSHOT-sources.jar,
- lib/cdmlib-print-3.0.13-SNAPSHOT.jar,
- lib/cdmlib-remote-3.0.13-SNAPSHOT-sources.jar,
- lib/cdmlib-remote-3.0.13-SNAPSHOT.jar,
- lib/cdmlib-services-3.0.13-SNAPSHOT-sources.jar,
- lib/cdmlib-services-3.0.13-SNAPSHOT.jar,
- lib/postgresql-9.1-901.jdbc4.jar
+ lib/postgresql-9.1-901.jdbc4.jar,
+ lib/cdmlib-commons-3.0.13-sources.jar,
+ lib/cdmlib-commons-3.0.13.jar,
+ lib/cdmlib-ext-3.0.13-sources.jar,
+ lib/cdmlib-ext-3.0.13.jar,
+ lib/cdmlib-io-3.0.13-sources.jar,
+ lib/cdmlib-io-3.0.13.jar,
+ lib/cdmlib-model-3.0.13-sources.jar,
+ lib/cdmlib-model-3.0.13.jar,
+ lib/cdmlib-persistence-3.0.13-sources.jar,
+ lib/cdmlib-persistence-3.0.13.jar,
+ lib/cdmlib-print-3.0.13-sources.jar,
+ lib/cdmlib-print-3.0.13.jar,
+ lib/cdmlib-remote-3.0.13-sources.jar,
+ lib/cdmlib-remote-3.0.13.jar,
+ lib/cdmlib-services-3.0.13-sources.jar,
+ lib/cdmlib-services-3.0.13.jar,
+ lib/identificationKeyAPI-1.0-SNAPSHOT-sources.jar,
+ lib/identificationKeyAPI-1.0-SNAPSHOT.jar
diff --git a/eu.etaxonomy.taxeditor.cdmlib/build.properties b/eu.etaxonomy.taxeditor.cdmlib/build.properties
index 2150c80f3..3dab30dfe 100644
--- a/eu.etaxonomy.taxeditor.cdmlib/build.properties
+++ b/eu.etaxonomy.taxeditor.cdmlib/build.properties
@@ -120,23 +120,25 @@ bin.includes = META-INF/,\
                lib/poi-3.6.jar,\
                lib/hibernate-envers-3.4.0-SNAPSHOT.jar,\
                lib/spring-xml-1.5.6.jar,\
-               lib/cdmlib-commons-3.0.13-SNAPSHOT-sources.jar,\
-               lib/cdmlib-commons-3.0.13-SNAPSHOT.jar,\
-               lib/cdmlib-ext-3.0.13-SNAPSHOT-sources.jar,\
-               lib/cdmlib-ext-3.0.13-SNAPSHOT.jar,\
-               lib/cdmlib-io-3.0.13-SNAPSHOT-sources.jar,\
-               lib/cdmlib-io-3.0.13-SNAPSHOT.jar,\
-               lib/cdmlib-model-3.0.13-SNAPSHOT-sources.jar,\
-               lib/cdmlib-model-3.0.13-SNAPSHOT.jar,\
-               lib/cdmlib-persistence-3.0.13-SNAPSHOT-sources.jar,\
-               lib/cdmlib-persistence-3.0.13-SNAPSHOT.jar,\
-               lib/cdmlib-print-3.0.13-SNAPSHOT-sources.jar,\
-               lib/cdmlib-print-3.0.13-SNAPSHOT.jar,\
-               lib/cdmlib-remote-3.0.13-SNAPSHOT-sources.jar,\
-               lib/cdmlib-remote-3.0.13-SNAPSHOT.jar,\
-               lib/cdmlib-services-3.0.13-SNAPSHOT-sources.jar,\
-               lib/cdmlib-services-3.0.13-SNAPSHOT.jar,\
-               lib/postgresql-9.1-901.jdbc4.jar
+               lib/postgresql-9.1-901.jdbc4.jar,\
+               lib/cdmlib-commons-3.0.13-sources.jar,\
+               lib/cdmlib-commons-3.0.13.jar,\
+               lib/cdmlib-ext-3.0.13-sources.jar,\
+               lib/cdmlib-ext-3.0.13.jar,\
+               lib/cdmlib-io-3.0.13-sources.jar,\
+               lib/cdmlib-io-3.0.13.jar,\
+               lib/cdmlib-model-3.0.13-sources.jar,\
+               lib/cdmlib-model-3.0.13.jar,\
+               lib/cdmlib-persistence-3.0.13-sources.jar,\
+               lib/cdmlib-persistence-3.0.13.jar,\
+               lib/cdmlib-print-3.0.13-sources.jar,\
+               lib/cdmlib-print-3.0.13.jar,\
+               lib/cdmlib-remote-3.0.13-sources.jar,\
+               lib/cdmlib-remote-3.0.13.jar,\
+               lib/cdmlib-services-3.0.13-sources.jar,\
+               lib/cdmlib-services-3.0.13.jar,\
+               lib/identificationKeyAPI-1.0-SNAPSHOT-sources.jar,\
+               lib/identificationKeyAPI-1.0-SNAPSHOT.jar
 jars.compile.order = cdmLibrary.jar
 src.includes = lib/
 bin.excludes = lib/activation-1.1src.zip,\
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/identificationKeyAPI-1.0-SNAPSHOT-sources.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/identificationKeyAPI-1.0-SNAPSHOT-sources.jar
new file mode 100644
index 000000000..2ec64a81a
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/identificationKeyAPI-1.0-SNAPSHOT-sources.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/identificationKeyAPI-1.0-SNAPSHOT.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/identificationKeyAPI-1.0-SNAPSHOT.jar
new file mode 100644
index 000000000..1955f94e4
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/identificationKeyAPI-1.0-SNAPSHOT.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/pom.xml b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
index f0b190157..1ae3f3f49 100644
--- a/eu.etaxonomy.taxeditor.cdmlib/pom.xml
+++ b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
@@ -92,5 +92,14 @@
 			<artifactId>cdmlib-ext</artifactId>
 			<version>${cdmlib.version}</version>
 		</dependency>
+        <!--  for ikey-plus 
+        	TODO this should not be needed but the utils class contained  in this jar 
+        	seems to be loaded as bean by spring
+        -->
+        <dependency>
+            <groupId>identificationKeyAPI</groupId>
+            <artifactId>identificationKeyAPI</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
 	</dependencies>
 </project>
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java
index 9a8c1668f..cf0133919 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java
@@ -292,7 +292,7 @@ public class PreferencesUtil implements IPreferenceKeys {
 		// match mode is a simple like, actually all other match modes are kind
 		// of bogus
 		configurator
-				.setMatchMode(eu.etaxonomy.cdm.persistence.query.MatchMode.LIKE);
+				.setMatchMode(eu.etaxonomy.cdm.persistence.query.MatchMode.ANYWHERE);
 		// we set page number and size here as this should always be unlimited
 		configurator.setPageNumber(0);
 		// TODO currently limit results to 10000
diff --git a/pom.xml b/pom.xml
index 04ca36d5f..087844f62 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   <packaging>pom</packaging>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <cdmlib.version>3.0.13-SNAPSHOT</cdmlib.version><!-- TODO can we use project.version ????? -->
+    <cdmlib.version>3.0.13</cdmlib.version><!-- TODO can we use project.version ????? -->
     <tycho.version>0.14.0</tycho.version>
     <taxeditor.version>3.0.13-SNAPSHOT</taxeditor.version>
   </properties>