merge-update from trunk

diff --git a/.gitattributes b/.gitattributes
index 0de962a860089f2afb404cd1115360ae0ef95aad..801c135a8a2c7a9fc472eb60c84ff2ef6867e9d5 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1868,7 +1868,6 @@ eu.etaxonomy.taxeditor/.project -text
 eu.etaxonomy.taxeditor/README.txt -text
 eu.etaxonomy.taxeditor/deploy_nightly.sh -text
 eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product -text
-eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product.with.jre -text
 eu.etaxonomy.taxeditor/plugin_customization.ini -text
 eu.etaxonomy.taxeditor/pom.xml -text
 eu.etaxonomy.taxeditor/rcp.target -text

diff --git a/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/ApplicationUtil.java b/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/ApplicationUtil.java
index a587a61f47b7b02c80f7480154d0c0944d7ce7f4..e3eacfd685dc6e07503a3821867913c05bc1960e 100644 (file)
--- a/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/ApplicationUtil.java
+++ b/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/ApplicationUtil.java
@@ -45,7 +45,7 @@ public class ApplicationUtil extends AbstractUtility {
             // this is a stable version
             return version;
         } else {
-            return BETA_PREFIX + " " + version;
+            return BETA_PREFIX + " " + version + " UTC";
         }
 
     }

diff --git a/eu.etaxonomy.taxeditor.cdmlib/pom.xml b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
index 97745fa49809330d09bba46f0fce31b187fbd5fb..baba4ed68d05542935568cf4aaf7769c964e4f67 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/pom.xml
+++ b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
@@ -24,7 +24,7 @@
              <goal>copy-dependencies</goal>\r
            </goals>\r
            <configuration>\r
-             <excludeArtifactIds>junit,log4j,unitils</excludeArtifactIds>\r
+             <includeArtifactIds>cdmlib-commons,cdmlib-model,cdmlib-persistence,cdmlib-remote,cdmlib-print,cdmlib-services,cdmlib-ext,cdmlib-io</includeArtifactIds>\r
              <outputDirectory>lib</outputDirectory>\r
              <overWriteReleases>true</overWriteReleases>\r
              <overWriteSnapshots>true</overWriteSnapshots>\r
@@ -39,7 +39,7 @@
            </goals>\r
            <configuration>\r
              <classifier>sources</classifier>\r
-             <excludeArtifactIds>junit,log4j,unitils</excludeArtifactIds>\r
+             <includeArtifactIds>cdmlib-commons,cdmlib-model,cdmlib-persistence,cdmlib-remote,cdmlib-print,cdmlib-services,cdmlib-ext,cdmlib-io</includeArtifactIds>\r
              <outputDirectory>lib</outputDirectory>\r
              <overWriteReleases>true</overWriteReleases>\r
              <overWriteSnapshots>true</overWriteSnapshots>\r

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java
index 7231136c0cc6d416f772ca4d007b5d0e8bb4e29f..8e467db0087348752cc21137415f369fd9a56415 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java
@@ -32,8 +32,10 @@ import eu.etaxonomy.cdm.api.service.IOccurrenceService;
 import eu.etaxonomy.cdm.api.service.config.DeleteConfiguratorBase;
 import eu.etaxonomy.cdm.api.service.config.IIdentifiableEntityServiceConfigurator;
 import eu.etaxonomy.cdm.api.service.config.SpecimenDeleteConfigurator;
-import eu.etaxonomy.cdm.api.service.dto.DerivateHierarchyDTO;
+import eu.etaxonomy.cdm.api.service.dto.DerivateDTO;
+import eu.etaxonomy.cdm.api.service.dto.FieldUnitDTO;
 import eu.etaxonomy.cdm.api.service.dto.FindByIdentifierDTO;
+import eu.etaxonomy.cdm.api.service.dto.PreservedSpecimenDTO;
 import eu.etaxonomy.cdm.api.service.pager.Pager;
 import eu.etaxonomy.cdm.api.service.search.SearchResult;
 import eu.etaxonomy.cdm.api.service.util.TaxonRelationshipEdge;
@@ -50,6 +52,7 @@ import eu.etaxonomy.cdm.model.common.Marker;
 import eu.etaxonomy.cdm.model.common.MarkerType;
 import eu.etaxonomy.cdm.model.common.UuidAndTitleCache;
 import eu.etaxonomy.cdm.model.description.DescriptionBase;
+import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
 import eu.etaxonomy.cdm.model.description.IndividualsAssociation;
 import eu.etaxonomy.cdm.model.location.Country;
 import eu.etaxonomy.cdm.model.media.Media;
@@ -936,10 +939,21 @@ public class TransientOccurenceService implements IOccurrenceService {
        }
 
 
-    @Override
-    public DerivateHierarchyDTO assembleDerivateHierarchyDTO(FieldUnit fieldUnit, UUID associatedTaxonUuid) {
-        return defaultService.assembleDerivateHierarchyDTO(fieldUnit, associatedTaxonUuid);
-    }
+       /* (non-Javadoc)
+        * @see eu.etaxonomy.cdm.api.service.IOccurrenceService#assembleFieldUnitDTO(eu.etaxonomy.cdm.model.occurrence.FieldUnit, java.util.UUID)
+        */
+       @Override
+       public FieldUnitDTO assembleFieldUnitDTO(FieldUnit fieldUnit, UUID associatedTaxonUuid) {
+           return defaultService.assembleFieldUnitDTO(fieldUnit, associatedTaxonUuid);
+       }
+
+       /* (non-Javadoc)
+        * @see eu.etaxonomy.cdm.api.service.IOccurrenceService#assemblePreservedSpecimenDTO(eu.etaxonomy.cdm.model.occurrence.DerivedUnit)
+        */
+       @Override
+       public PreservedSpecimenDTO assemblePreservedSpecimenDTO(DerivedUnit derivedUnit) {
+           return defaultService.assemblePreservedSpecimenDTO(derivedUnit);
+       }
 
     @Override
     public Collection<ICdmBase> getNonCascadedAssociatedElements(SpecimenOrObservationBase<?> specimen) {
@@ -995,4 +1009,20 @@ public class TransientOccurenceService implements IOccurrenceService {
                return defaultService.findByIdentifier(clazz, identifier, identifierType, matchmode, includeEntity, pageSize, pageNumber, propertyPaths);
        }
 
+       /* (non-Javadoc)
+        * @see eu.etaxonomy.cdm.api.service.IOccurrenceService#getCharacterDataForSpecimen(eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase)
+        */
+       @Override
+       public Collection<DescriptionElementBase> getCharacterDataForSpecimen(SpecimenOrObservationBase<?> arg0) {
+           return defaultService.getCharacterDataForSpecimen(arg0);
+       }
+
+       /* (non-Javadoc)
+        * @see eu.etaxonomy.cdm.api.service.IOccurrenceService#getCharacterDataForSpecimen(java.util.UUID)
+        */
+       @Override
+       public Collection<DescriptionElementBase> getCharacterDataForSpecimen(UUID arg0) {
+           return getCharacterDataForSpecimen(arg0);
+       }
+
 }

diff --git a/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product.with.jre b/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product.with.jre
deleted file mode 100644 (file)
index 3237ef9..0000000
--- a/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product.with.jre
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<?pde version="3.5"?>\r
-\r
-<product name="EDIT Taxonomic Editor" uid="eu.etaxonomy.taxeditor.product.jre" id="eu.etaxonomy.taxeditor.application.eu_etaxonomy_taxeditor_product" application="eu.etaxonomy.taxeditor.application.application" version="3.5.0.qualifier" useFeatures="true" includeLaunchers="true">\r
-\r
-   <aboutInfo>\r
-      <image path="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>\r
-      <text>\r
-         %productBlurb\r
-      </text>\r
-   </aboutInfo>\r
-\r
-   <configIni use="default">\r
-   </configIni>\r
-\r
-   <launcherArgs>\r
-      <programArgs>-data @user.home/.cdmLibrary -Dserver_port=58080  -vm jre/bin </programArgs>\r
-      <vmArgs>-Xmx512M -XX:MaxPermSize=256M -Dorg.eclipse.update.reconcile=false -Declipse.p2.unsignedPolicy=allow</vmArgs>\r
-      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>\r
-   </launcherArgs>\r
-\r
-   <windowImages i16="/eu.etaxonomy.taxeditor.application/icons/256color_16x16.gif" i32="/eu.etaxonomy.taxeditor.application/icons/256color_32x32.gif" i48="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>\r
-\r
-   <splash\r
-      location="eu.etaxonomy.taxeditor.application"\r
-      startupProgressRect="5,447,366,15"\r
-      startupMessageRect="7,432,360,20"\r
-      startupForegroundColor="000000" />\r
-   <launcher name="TaxonomicEditor">\r
-      <solaris/>\r
-      <win useIco="false">\r
-         <bmp/>\r
-      </win>\r
-   </launcher>\r
-\r
-   <vm>\r
-   </vm>\r
-\r
-   <plugins>\r
-   </plugins>\r
-\r
-   <features>\r
-      <feature id="eu.etaxonomy.taxeditor.feature"/>\r
-   </features>\r
-\r
-   <configurations>\r
-      <plugin id="eu.etaxonomy.taxeditor.application" autoStart="true" startLevel="5" />\r
-      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />\r
-      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />\r
-      <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" />\r
-      <plugin id="org.eclipse.equinox.p2.transport.ecf" autoStart="true" startLevel="4" />\r
-      <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />\r
-   </configurations>\r
-\r
-</product>\r