adding missing dependency and switching to cdmlib 3.0.13 RELEASE
authorAndreas Kohlbecker <a.kohlbecker@bgbm.org>
Wed, 24 Oct 2012 10:13:08 +0000 (10:13 +0000)
committerAndreas Kohlbecker <a.kohlbecker@bgbm.org>
Wed, 24 Oct 2012 10:13:08 +0000 (10:13 +0000)
.gitattributes
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.cdmlib/build.properties
eu.etaxonomy.taxeditor.cdmlib/lib/identificationKeyAPI-1.0-SNAPSHOT-sources.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/identificationKeyAPI-1.0-SNAPSHOT.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/pom.xml
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java
pom.xml

index 832721e8e5ed2bb4fec21c49412076370e075097..36da77d50a871dce0c61e38c8b22f415576fb1cc 100644 (file)
@@ -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
index 9114f423cfd10c39850a73d053faec653585ed6c..4655de356d34476a831599f1f4c54ab314f5727c 100644 (file)
@@ -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"/>
        <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>
index 9b5ebd81f9eb2586c58dbce77ec272209de189c2..69e62d53eb68cd5b383d325a9a3d099d9361a8e3 100644 (file)
@@ -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
index 2150c80f3e5a6868aad108f188621ed4c86524e4..3dab30dfe3ed35824e2cad88f4b97374a4096d74 100644 (file)
@@ -120,23 +120,25 @@ bin.includes = META-INF/,\
                lib/poi-3.6.jar,\\r
                lib/hibernate-envers-3.4.0-SNAPSHOT.jar,\\r
                lib/spring-xml-1.5.6.jar,\\r
-               lib/cdmlib-commons-3.0.13-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-commons-3.0.13-SNAPSHOT.jar,\\r
-               lib/cdmlib-ext-3.0.13-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-ext-3.0.13-SNAPSHOT.jar,\\r
-               lib/cdmlib-io-3.0.13-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-io-3.0.13-SNAPSHOT.jar,\\r
-               lib/cdmlib-model-3.0.13-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-model-3.0.13-SNAPSHOT.jar,\\r
-               lib/cdmlib-persistence-3.0.13-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-persistence-3.0.13-SNAPSHOT.jar,\\r
-               lib/cdmlib-print-3.0.13-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-print-3.0.13-SNAPSHOT.jar,\\r
-               lib/cdmlib-remote-3.0.13-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-remote-3.0.13-SNAPSHOT.jar,\\r
-               lib/cdmlib-services-3.0.13-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-services-3.0.13-SNAPSHOT.jar,\\r
-               lib/postgresql-9.1-901.jdbc4.jar\r
+               lib/postgresql-9.1-901.jdbc4.jar,\\r
+               lib/cdmlib-commons-3.0.13-sources.jar,\\r
+               lib/cdmlib-commons-3.0.13.jar,\\r
+               lib/cdmlib-ext-3.0.13-sources.jar,\\r
+               lib/cdmlib-ext-3.0.13.jar,\\r
+               lib/cdmlib-io-3.0.13-sources.jar,\\r
+               lib/cdmlib-io-3.0.13.jar,\\r
+               lib/cdmlib-model-3.0.13-sources.jar,\\r
+               lib/cdmlib-model-3.0.13.jar,\\r
+               lib/cdmlib-persistence-3.0.13-sources.jar,\\r
+               lib/cdmlib-persistence-3.0.13.jar,\\r
+               lib/cdmlib-print-3.0.13-sources.jar,\\r
+               lib/cdmlib-print-3.0.13.jar,\\r
+               lib/cdmlib-remote-3.0.13-sources.jar,\\r
+               lib/cdmlib-remote-3.0.13.jar,\\r
+               lib/cdmlib-services-3.0.13-sources.jar,\\r
+               lib/cdmlib-services-3.0.13.jar,\\r
+               lib/identificationKeyAPI-1.0-SNAPSHOT-sources.jar,\\r
+               lib/identificationKeyAPI-1.0-SNAPSHOT.jar\r
 jars.compile.order = cdmLibrary.jar\r
 src.includes = lib/\r
 bin.excludes = lib/activation-1.1src.zip,\\r
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 (file)
index 0000000..2ec64a8
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 (file)
index 0000000..1955f94
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/identificationKeyAPI-1.0-SNAPSHOT.jar differ
index f0b19015779f7d707ff83873b4ecf1c2ec38166c..1ae3f3f49fb1a3d550d1c1ff29671576cbf5edf5 100644 (file)
                        <artifactId>cdmlib-ext</artifactId>\r
                        <version>${cdmlib.version}</version>\r
                </dependency>\r
+        <!--  for ikey-plus \r
+               TODO this should not be needed but the utils class contained  in this jar \r
+               seems to be loaded as bean by spring\r
+        -->\r
+        <dependency>\r
+            <groupId>identificationKeyAPI</groupId>\r
+            <artifactId>identificationKeyAPI</artifactId>\r
+            <version>1.0-SNAPSHOT</version>\r
+        </dependency>\r
        </dependencies>\r
 </project>\r
index 9a8c1668f7bc4587416447e2c5753c1b6371b1c2..cf0133919fc607a35cea903ddcfb07d87babc20a 100644 (file)
@@ -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 04ca36d5f9994408b11c5f715952298eb6dd2480..087844f6285505bd7de2c861a5472a4c23d00af3 100644 (file)
--- 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>