classpath changed to cdmlib-3.0.6

diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
index e64dd1779e2f660facdd64eabc15b75b0c36b326..d4ccb89a7db249be8a66571074d71d8e4bd53cb4 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
@@ -105,14 +105,15 @@ Bundle-ClassPath: lib/activation-1.1.jar,
  lib/org.springframework.web.servlet-3.0.4.RELEASE.jar,
  lib/dozer-5.3.0.jar,
  lib/google-api-translate-java-0.92.jar,
  lib/org.springframework.web.servlet-3.0.4.RELEASE.jar,
  lib/dozer-5.3.0.jar,
  lib/google-api-translate-java-0.92.jar,

- lib/cdmlib-commons-3.0.5-SNAPSHOT.jar,
- lib/cdmlib-ext-3.0.5-SNAPSHOT.jar,
- lib/cdmlib-io-3.0.5-SNAPSHOT.jar,
- lib/cdmlib-model-3.0.5-SNAPSHOT.jar,
- lib/cdmlib-persistence-3.0.5-SNAPSHOT.jar,
- lib/cdmlib-print-3.0.5-SNAPSHOT.jar,
- lib/cdmlib-remote-3.0.5-SNAPSHOT.jar,
- lib/cdmlib-services-3.0.5-SNAPSHOT.jar
+ lib/cdmlib-services-3.0.5-SNAPSHOT.jar,
+ lib/cdmlib-commons-3.0.6-SNAPSHOT.jar,
+ lib/cdmlib-ext-3.0.6-SNAPSHOT.jar,
+ lib/cdmlib-io-3.0.6-SNAPSHOT.jar,
+ lib/cdmlib-model-3.0.6-SNAPSHOT.jar,
+ lib/cdmlib-persistence-3.0.6-SNAPSHOT.jar,
+ lib/cdmlib-print-3.0.6-SNAPSHOT.jar,
+ lib/cdmlib-remote-3.0.6-SNAPSHOT.jar,
+ lib/cdmlib-services-3.0.6-SNAPSHOT.jar

 Export-Package: com.google.api,
  com.google.api.detect,
  com.google.api.translate,
 Export-Package: com.google.api,
  com.google.api.detect,
  com.google.api.translate,

diff --git a/eu.etaxonomy.taxeditor.cdmlib/build.properties b/eu.etaxonomy.taxeditor.cdmlib/build.properties
index cee965f6863705bfab965be1fa3e0915dfe30eb4..50bc58f9a79805f5296851bad7a3f519362c09a0 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/build.properties
+++ b/eu.etaxonomy.taxeditor.cdmlib/build.properties
@@ -2,14 +2,15 @@ bin.includes = META-INF/,\
                lib/,\\r
                lib/mysql-connector-java-5.0.5.jar,\\r
                lib/junit-4.8.1.jar,\\r
                lib/,\\r
                lib/mysql-connector-java-5.0.5.jar,\\r
                lib/junit-4.8.1.jar,\\r

-               lib/cdmlib-commons-3.0.5-SNAPSHOT.jar,\\r
-               lib/cdmlib-ext-3.0.5-SNAPSHOT.jar,\\r
-               lib/cdmlib-io-3.0.5-SNAPSHOT.jar,\\r
-               lib/cdmlib-model-3.0.5-SNAPSHOT.jar,\\r
-               lib/cdmlib-persistence-3.0.5-SNAPSHOT.jar,\\r
-               lib/cdmlib-print-3.0.5-SNAPSHOT.jar,\\r
-               lib/cdmlib-remote-3.0.5-SNAPSHOT.jar,\\r
-               lib/cdmlib-services-3.0.5-SNAPSHOT.jar\r
+               lib/cdmlib-services-3.0.5-SNAPSHOT.jar,\\r
+               lib/cdmlib-commons-3.0.6-SNAPSHOT.jar,\\r
+               lib/cdmlib-ext-3.0.6-SNAPSHOT.jar,\\r
+               lib/cdmlib-io-3.0.6-SNAPSHOT.jar,\\r
+               lib/cdmlib-model-3.0.6-SNAPSHOT.jar,\\r
+               lib/cdmlib-persistence-3.0.6-SNAPSHOT.jar,\\r
+               lib/cdmlib-print-3.0.6-SNAPSHOT.jar,\\r
+               lib/cdmlib-remote-3.0.6-SNAPSHOT.jar,\\r
+               lib/cdmlib-services-3.0.6-SNAPSHOT.jar\r

 jars.compile.order = cdmLibrary.jar\r
 src.includes = lib/\r
 jre.compilation.profile = J2SE-1.6\r
 jars.compile.order = cdmLibrary.jar\r
 src.includes = lib/\r
 jre.compilation.profile = J2SE-1.6\r

diff --git a/eu.etaxonomy.taxeditor.feature/build.properties b/eu.etaxonomy.taxeditor.feature/build.properties
index 44a7ba5d61b9a077a59ea6b47ce67e115dc69b09..e10104d9e67165a498d54a65308b541f25456873 100644 (file)
--- a/eu.etaxonomy.taxeditor.feature/build.properties
+++ b/eu.etaxonomy.taxeditor.feature/build.properties
@@ -1,3 +1,3 @@
-bin.includes = plugin_customization.ini,\\r
-               feature.xml\r
-p2.gathering = true
\ No newline at end of file
+bin.includes = plugin_customization.ini,\
+               feature.xml
+p2.gathering = true

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/FeatureDistributionDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/FeatureDistributionDetailElement.java
index 1dccfcdcdbe6eca14383dc86744d062868aa9e2c..1d57b686c125d6bc439a4c8f17628df803a9acbf 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/FeatureDistributionDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/FeatureDistributionDetailElement.java
@@ -115,7 +115,7 @@ public class FeatureDistributionDetailElement extends AbstractCdmDetailElement<F
 
                List<Language> languages = Arrays.asList(new Language[]{CdmStore.getDefaultLanguage()});
                
 
                List<Language> languages = Arrays.asList(new Language[]{CdmStore.getDefaultLanguage()});
                

-               String parameter = EditGeoServiceUtilities.getDistributionServiceRequestParameterString(getDistributions(), presenceAbsenceTermColors, width, 0, bbox, backLayer, languages);
+               String parameter = EditGeoServiceUtilities.getDistributionServiceRequestParameterString(getDistributions(), presenceAbsenceTermColors, width, 0, bbox, backLayer, null, languages);

                
                
                String mapUriString = accessPoint + "?" + parameter + "&ms=1000";
                
                
                String mapUriString = accessPoint + "?" + parameter + "&ms=1000";

diff --git a/eu.etaxonomy.taxeditor.test/.classpath b/eu.etaxonomy.taxeditor.test/.classpath
index 566550d95723c43269c99921040a6a2039c4bfa6..aa10eff0aab962ade66006d1cb32d1162e885d79 100644 (file)
--- a/eu.etaxonomy.taxeditor.test/.classpath
+++ b/eu.etaxonomy.taxeditor.test/.classpath
@@ -1,8 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<classpath>\r
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>\r
-       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
-       <classpathentry kind="src" path="src/test/java"/>\r
-       <classpathentry kind="src" path="src/main/resources"/>\r
-       <classpathentry kind="output" path="bin"/>\r
-</classpath>\r
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+       <classpathentry kind="src" path="src/test/java"/>
+       <classpathentry kind="src" path="src/main/resources"/>
+       <classpathentry kind="src" path="src_/"/>
+       <classpathentry kind="output" path="bin"/>
+</classpath>