merge-update from trunk

diff --combined .gitattributes
index be88228bab65c756e9af2c4f683d7a33ec8d0823,b01fe4098f9499247d0213ec10653d4d62d61424..1418a6a7908278c2c0c3e0c66eb730ae994a96c0
--- 1/.gitattributes
--- 2/.gitattributes
+++ b/.gitattributes
@@@ -7,6 -7,7 +7,7 @@@ eu.etaxonomy.taxeditor.application/META
  eu.etaxonomy.taxeditor.application/OSGI-INF/l10n/plugin.properties -text
  eu.etaxonomy.taxeditor.application/OSGI-INF/l10n/plugin_de.properties -text
  eu.etaxonomy.taxeditor.application/OSGI-INF/l10n/plugin_en.properties -text
+ eu.etaxonomy.taxeditor.application/about.mappings -text
  eu.etaxonomy.taxeditor.application/build.properties -text
  eu.etaxonomy.taxeditor.application/icons/256color_16x16.gif -text
  eu.etaxonomy.taxeditor.application/icons/256color_32x32.gif -text
@@@ -14,7 -15,6 +15,6 @@@ eu.etaxonomy.taxeditor.application/icon
  eu.etaxonomy.taxeditor.application/icons/256color_48x48.ico -text
  eu.etaxonomy.taxeditor.application/icons/edit_16x16.gif -text
  eu.etaxonomy.taxeditor.application/icons/specimen_derivate-16x16-32.png -text
- eu.etaxonomy.taxeditor.application/p2.inf -text
  eu.etaxonomy.taxeditor.application/plugin.xml -text
  eu.etaxonomy.taxeditor.application/plugin_customization.ini -text
  eu.etaxonomy.taxeditor.application/pom.xml -text
@@@ -27,7 -27,6 +27,6 @@@ eu.etaxonomy.taxeditor.application/src/
  eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/OpenExternalAboutPlatformHandler.java -text
  eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/OpenExternalHelpHandler.java -text
  eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/OpenExternalParserHelpHandler.java -text
- eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/P2Util.java -text
  eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/SaveAllHandler.java -text
  eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/SaveHandler.java -text
  eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/TaxonomicEditorPlugin.java -text
@@@ -37,6 -36,10 +36,10 @@@ eu.etaxonomy.taxeditor.application/src/
  eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/perspective/PolytomousKey.java -text
  eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/perspective/Taxonomic.java -text
  eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/perspective/Uses.java -text
+ eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/update/InstallNewSoftwareHandler.java -text
+ eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/update/P2Util.java -text
+ eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/update/PreloadingRepositoryHandler.java -text
+ eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/update/UpdateHandler.java -text
  eu.etaxonomy.taxeditor.application/src/main/resources/log4j.properties -text
  eu.etaxonomy.taxeditor.bulkeditor/.classpath -text
  eu.etaxonomy.taxeditor.bulkeditor/.project -text
@@@ -1043,7 -1046,6 +1046,7 @@@ eu.etaxonomy.taxeditor.store/icons/bina
  eu.etaxonomy.taxeditor.store/icons/bookmark.gif -text
  eu.etaxonomy.taxeditor.store/icons/category.gif -text
  eu.etaxonomy.taxeditor.store/icons/change.gif -text
 +eu.etaxonomy.taxeditor.store/icons/character_data_derivate-16x16-32.png -text
  eu.etaxonomy.taxeditor.store/icons/clear.gif -text
  eu.etaxonomy.taxeditor.store/icons/close.gif -text
  eu.etaxonomy.taxeditor.store/icons/close_view.gif -text
@@@ -1436,7 -1438,6 +1439,7 @@@ eu.etaxonomy.taxeditor.store/src/main/j
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/MinMaxTextSection.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/MultilanguageTextElement.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/NumberWithLabelElement.java -text
 +eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/OriginalLabelDataElement.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/PartialElement.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/PointElement.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/RootElement.java -text
@@@ -1454,7 -1455,8 +1457,7 @@@ eu.etaxonomy.taxeditor.store/src/main/j
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/AbstractCdmComposite.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/DerivedUnitGeneralDetailElementMVC.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/GeographicPointElement.java -text
 -eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/OriginalLabelDataController.java -text
 -eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/OriginalLabelDataElement.java -text
 +eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/OriginalLabelDataField.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/combo/EnumTermCombo.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/combo/EnumTermComboController.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/element/DateElement.java -text

diff --combined eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.equinox.common-3.6.0.v20110523.jar
index 9fb167cc8644ced846238dee40784f7341832719,9fb167cc8644ced846238dee40784f7341832719..4cf488ee33f1a17bac6e7badc2adfac6cf54f75d
Binary files differ

diff --combined eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.osgi-3.7.2.v20120110-1415.jar
index 25f118068392d39fda76feea6c855dfb3633db17,25f118068392d39fda76feea6c855dfb3633db17..f131a431cbf20a8f2194c84912950bd3e0a6485b
Binary files differ

diff --combined eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java
index 0d4cdafc7d7703dc338d0b8d62ece251500a40d8,9d915e29ad188b8063b81a1a381cabe460d9885b..c0e6e555db475dd2f5ddd1002b96323237a1587e
--- 1/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java
--- 2/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
@@@ -31,12 -31,12 +31,13 @@@ import eu.etaxonomy.cdm.api.service.Del
  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.dto.DerivateHierarchyDTO;
  import eu.etaxonomy.cdm.api.service.pager.Pager;
  import eu.etaxonomy.cdm.api.service.search.SearchResult;
  import eu.etaxonomy.cdm.api.service.util.TaxonRelationshipEdge;
  import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
  import eu.etaxonomy.cdm.model.common.Annotation;
+ import eu.etaxonomy.cdm.model.common.ICdmBase;
  import eu.etaxonomy.cdm.model.common.ISourceable;
  import eu.etaxonomy.cdm.model.common.IdentifiableSource;
  import eu.etaxonomy.cdm.model.common.LSID;
@@@ -916,21 -916,11 +917,11 @@@ public class TransientOccurenceService 
        }
  
      /* (non-Javadoc)
-      * @see eu.etaxonomy.cdm.api.service.IOccurrenceService#listFieldUnitsByAssociatedTaxon(java.util.Set, eu.etaxonomy.cdm.model.taxon.Taxon, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List)
+      * @see eu.etaxonomy.cdm.api.service.IOccurrenceService#getNonCascadedAssociatedElements(eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase, eu.etaxonomy.cdm.api.conversation.ConversationHolder)
       */
      @Override
-     public Collection<FieldUnit> listFieldUnitsByAssociatedTaxon(Set<TaxonRelationshipEdge> includeRelationships,
-             Taxon associatedTaxon, Integer maxDepth, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints,
-             List<String> propertyPaths) {
-         return defaultService.listFieldUnitsByAssociatedTaxon(includeRelationships, associatedTaxon, maxDepth, pageSize, pageNumber, orderHints, propertyPaths);
-     }
- 
-     /* (non-Javadoc)
-      * @see eu.etaxonomy.cdm.api.service.IOccurrenceService#assembleDerivateHierarchyDTO(eu.etaxonomy.cdm.model.occurrence.FieldUnit, java.util.UUID)
-      */
-     @Override
-     public DerivateHierarchyDTO assembleDerivateHierarchyDTO(FieldUnit fieldUnit, UUID associatedTaxonUuid) {
-         return defaultService.assembleDerivateHierarchyDTO(fieldUnit, associatedTaxonUuid);
+     public Collection<ICdmBase> getNonCascadedAssociatedElements(SpecimenOrObservationBase<?> specimen) {
+         return defaultService.getNonCascadedAssociatedElements(specimen);
      }
  
  }

diff --combined pom.xml
index 7a73c8888453abb83b74a2baf3b63f6360a46e9f,5faf642af1b562b659730fcd70497e37da8036b8..269207f56dd22b2adaaf3f9f99e8e6c6c4905fe1
--- 1/pom.xml
--- 2/pom.xml
+++ b/pom.xml
@@@ -1,5 -1,6 +1,6 @@@
  <?xml version="1.0" encoding="UTF-8"?>
- <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <prerequisites>
      <maven>3.0</maven>
@@@ -15,10 -16,11 +16,11 @@@
    <properties>
      <java.codelevel>1.6</java.codelevel>
      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 -    <cdmlib.version>3.3.8-SNAPSHOT</cdmlib.version>
 +    <cdmlib.version>3.4.0-SNAPSHOT</cdmlib.version>
      <!-- TODO can we use project.version ????? -->
      <tycho.version>0.14.0</tycho.version>
      <taxeditor.version>3.3.8-SNAPSHOT</taxeditor.version>
+     <update.dir>snapshot</update.dir>
    </properties>
    <modules>
      <module>eu.etaxonomy.taxeditor.cdmlib</module>
@@@ -27,12 -29,12 +29,12 @@@
      <module>eu.etaxonomy.taxeditor.editor</module>
      <module>eu.etaxonomy.taxeditor.bulkeditor</module>
      <module>eu.etaxonomy.taxeditor.printpublisher</module>
-     <!--module>eu.etaxonomy.taxeditor.annotatedlineeditor</module-->
      <module>eu.etaxonomy.taxeditor.help</module>
      <module>eu.etaxonomy.taxeditor.application</module>
      <module>eu.etaxonomy.taxeditor.feature.platform</module>
      <module>eu.etaxonomy.taxeditor.feature</module>
      <module>eu.etaxonomy.taxeditor</module>
+ 
    </modules>
    <scm>
      <connection>scm:svn:http://dev.e-taxonomy.eu/svn/trunk/taxeditor/</connection>
@@@ -76,7 -78,7 +78,7 @@@
          <role>Java Developer</role>
          <role>Architect</role>
        </roles>
-       <url/>
+       <url />
      </developer>
      <developer>
        <!-- your SVN account id please! -->
@@@ -94,7 -96,7 +96,7 @@@
          <role>Java Developer</role>
          <role>Architect</role>
        </roles>
-       <url/>
+       <url />
      </developer>
    </developers>
    <issueManagement>
@@@ -129,6 -131,38 +131,38 @@@
          </repository>
        </repositories>
      </profile>
+     <profile>
+       <!-- Upload the repo to the server -->
+       <id>uploadRepo</id>
+       <build>
+         <plugins>
+           <plugin>
+             <groupId>org.codehaus.mojo</groupId>
+             <artifactId>wagon-maven-plugin</artifactId>
+             <version>1.0-beta-3</version>
+             <!-- Problems with the wagon-maven-plugin have been encounterd 
+               on Windows, it should work properly on linux though. -->
+             <executions>
+               <execution>
+                 <phase>package</phase>
+                 <goals>
+                   <goal>upload</goal>
+                 </goals>
+               </execution>
+             </executions>
+             <configuration>
+               <fromDir>eu.etaxonomy.taxeditor/target/repository</fromDir>
+               <url>scpexe://wp5.e-taxonomy.eu/var/www/download/taxeditor/update/${update.dir}</url>
+               <includes>binary/*,content.jar,artifacts.jar,**/eu.etaxonomy.*.jar</includes>
+               <!-- Comment out the above and uncomment the below to upload 
+                 all jars -->
+               <!-- <includes>**/*</includes> -->
+               <serverId>wp5.e-taxonomy.eu</serverId>
+             </configuration>
+           </plugin>
+         </plugins>
+       </build>
+     </profile>
    </profiles>
    <repositories>
      <!-- the cdm internal repository -->
@@@ -168,6 -202,14 +202,14 @@@
            <strictVersions>true</strictVersions>
          </configuration>
        </plugin>
+       <plugin>
+         <groupId>org.eclipse.tycho</groupId>
+         <artifactId>tycho-p2-repository-plugin</artifactId>
+         <version>${tycho.version}</version>
+         <configuration>
+           <includeAllDependencies>true</includeAllDependencies>
+         </configuration>
+       </plugin>
        <plugin>
          <groupId>org.eclipse.tycho</groupId>
          <artifactId>target-platform-configuration</artifactId>
@@@ -301,35 -343,13 +343,13 @@@
          <configuration>
            <allowTimestampedSnapshots>true</allowTimestampedSnapshots>
            <autoVersionSubmodules>false</autoVersionSubmodules>
-           <!--preparationGoals>clean verify install</preparationGoals-->
-           <!--goals>deploy</goals-->
+           <!--preparationGoals>clean verify install</preparationGoals -->
+           <!--goals>deploy</goals -->
            <!-- skipping site-deploy by explicitly configuring the goal here -->
            <tagBase>http://dev.e-taxonomy.eu/svn/tags/taxeditor</tagBase>
          </configuration>
        </plugin>
-       <plugin>
-         <groupId>org.codehaus.mojo</groupId>
-         <artifactId>wagon-maven-plugin</artifactId>
-         <version>1.0-beta-3</version>
-         <!--
-                               Problems with the wagon-maven-plugin have been encounterd on Windows,
-                                       it should work properly on linux though.
-                                -->
-         <executions>
-           <execution>
-             <phase>deploy</phase>
-             <goals>
-               <goal>upload</goal>
-             </goals>
-           </execution>
-         </executions>
-         <configuration>
-           <fromDir>eu.etaxonomy.taxeditor/target/products</fromDir>
-           <includes>*.zip</includes>
-           <url>scpexe://wp5.e-taxonomy.eu/var/www/download/taxeditor/${project.version}</url>
-           <serverId>wp5.e-taxonomy.eu</serverId>
-         </configuration>
-       </plugin>
+ 
      </plugins>
      <extensions>
        <extension>
@@@ -386,7 -406,8 +406,8 @@@
          </configuration>
        </plugin>
        <plugin>
-         <!-- this will generate an indexed and cross-referenced HTML version of your source code -->
+         <!-- this will generate an indexed and cross-referenced HTML version 
+           of your source code -->
          <groupId>org.apache.maven.plugins</groupId>
          <artifactId>maven-jxr-plugin</artifactId>
          <version>2.2</version>
@@@ -410,7 -431,7 +431,7 @@@
        </plugin>
      </plugins>
    </reporting>
-   <!--         DISTRIBUTION MANAGEMENT -->
+   <!-- DISTRIBUTION MANAGEMENT -->
    <distributionManagement>
      <site>
        <id>wp5.e-taxonomy.eu</id>
@@@ -424,4 -445,5 +445,5 @@@
        <url>scpexe://wp5.e-taxonomy.eu/var/www/wp5.e-taxonomy.eu/mavenrepo/</url>
      </repository>
    </distributionManagement>
+ 
  </project>