merging jar updates from trunk

diff --cc eu.etaxonomy.taxeditor.cdmlib/.classpath
index 3e423bab853b46f0442484b7b2ef84163ac8ad69,4d61c998469e75bcacfb01a8544982dd6d7bc14c..d9d5f4d71515c72f554ebfaad2870b189376c8d1
--- 1/eu.etaxonomy.taxeditor.cdmlib/.classpath
--- 2/eu.etaxonomy.taxeditor.cdmlib/.classpath
+++ b/eu.etaxonomy.taxeditor.cdmlib/.classpath
@@@ -55,23 -44,13 +44,13 @@@
        <classpathentry exported="true" kind="lib" path="lib/cglib-nodep-2.2.2.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/com.springsource.org.aopalliance-1.0.0.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/com.springsource.org.apache.commons.logging-1.1.1.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/commons-beanutils-1.8.3-sources.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/commons-beanutils-1.8.3.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/commons-codec-1.7-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/commons-codec-1.7.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/commons-codec-20041127.091804.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/commons-collections-3.2.1.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/commons-collections-3.2.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/commons-dbcp-1.4-sources.jar"/>
--      <classpathentry exported="true" kind="lib" path="lib/commons-dbcp-1.4.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/commons-io-2.4-sources.jar"/>
++      <classpathentry exported="true" kind="lib" path="lib/commons-dbcp-1.4.jar" sourcepath="lib/commons-dbcp-1.4-sources.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/commons-io-2.4.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/commons-lang-2.6-sources.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/commons-lang-2.6.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/commons-logging-1.1.1-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/commons-logging-1.1.1.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/commons-logging-1.1.2.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/commons-pool-1.5.4-sources.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/commons-pool-1.5.4.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/concurrent-1.3.4.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/dbunit-2.4.9.jar"/>
@@@ -97,15 -71,11 +71,11 @@@
        <classpathentry exported="true" kind="lib" path="lib/hamcrest-core-1.3.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/hibernate-c3p0-4.1.10.Final.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/hibernate-cglib-repack-2.1_3.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/hibernate-commons-annotations-4.0.1.Final-sources.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/hibernate-commons-annotations-4.0.1.Final.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/hibernate-core-4.1.10.Final-sources.jar"/>
--      <classpathentry exported="true" kind="lib" path="lib/hibernate-core-4.1.10.Final.jar"/>
++      <classpathentry exported="true" kind="lib" path="lib/hibernate-core-4.1.10.Final.jar" sourcepath="lib/hibernate-core-4.1.10.Final-sources.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/hibernate-ehcache-4.1.10.Final.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/hibernate-entitymanager-4.1.10.Final.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/hibernate-envers-4.1.10.Final-sources.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/hibernate-envers-4.1.10.Final.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/hibernate-jpa-2.0-api-1.0.1.Final-sources.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/hibernate-jpa-2.0-api-1.0.1.Final.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/hibernate-search-4.2.0.Final.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/hibernate-search-analyzers-4.2.0.Final.jar"/>
@@@ -189,39 -131,21 +131,21 @@@
        <classpathentry exported="true" kind="lib" path="lib/odfdom-java-0.8.7.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/ognl-2.6.9.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/opencsv-2.3.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/org.apache.commons.codec-1.3.0.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/org.eclipse.equinox.common-3.6.0.v20110523.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/org.eclipse.osgi-3.7.2.v20120110-1415.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/org.osgi.core-1.0.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/org.springframework.aop-3.2.2.RELEASE-sources.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/org.springframework.aop-3.2.2.RELEASE.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/org.springframework.aspects-3.2.2.RELEASE-sources.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/org.springframework.aspects-3.2.2.RELEASE.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/org.springframework.beans-3.2.2.RELEASE-sources.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/org.springframework.beans-3.2.2.RELEASE.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/org.springframework.context-3.2.2.RELEASE-sources.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/org.springframework.context-3.2.2.RELEASE.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/org.springframework.context.support-3.2.2.RELEASE-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/org.springframework.context.support-3.2.2.RELEASE.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/org.springframework.core-3.2.2.RELEASE-sources.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/org.springframework.core-3.2.2.RELEASE.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/org.springframework.expression-3.2.2.RELEASE-sources.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/org.springframework.expression-3.2.2.RELEASE.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/org.springframework.jdbc-3.2.2.RELEASE-sources.jar"/>
--      <classpathentry exported="true" kind="lib" path="lib/org.springframework.jdbc-3.2.2.RELEASE.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/org.springframework.orm-3.2.2.RELEASE-sources.jar"/>
--      <classpathentry exported="true" kind="lib" path="lib/org.springframework.orm-3.2.2.RELEASE.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/org.springframework.oxm-3.2.2.RELEASE-sources.jar"/>
++      <classpathentry exported="true" kind="lib" path="lib/org.springframework.jdbc-3.2.2.RELEASE.jar" sourcepath="lib/org.springframework.jdbc-3.2.2.RELEASE-sources.jar"/>
++      <classpathentry exported="true" kind="lib" path="lib/org.springframework.orm-3.2.2.RELEASE.jar" sourcepath="lib/org.springframework.orm-3.2.2.RELEASE-sources.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/org.springframework.oxm-3.2.2.RELEASE.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/org.springframework.security.core-3.1.3.RELEASE-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/org.springframework.security.core-3.1.3.RELEASE.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/org.springframework.security.web-3.1.1.RELEASE-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/org.springframework.security.web-3.1.1.RELEASE.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/org.springframework.test-3.2.2.RELEASE.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/org.springframework.transaction-3.2.2.RELEASE-sources.jar"/>
--      <classpathentry exported="true" kind="lib" path="lib/org.springframework.transaction-3.2.2.RELEASE.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/org.springframework.web-3.2.2.RELEASE-sources.jar"/>
++      <classpathentry exported="true" kind="lib" path="lib/org.springframework.transaction-3.2.2.RELEASE.jar" sourcepath="lib/org.springframework.transaction-3.2.2.RELEASE-sources.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/org.springframework.web-3.2.2.RELEASE.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/org.springframework.web.servlet-3.2.2.RELEASE-sources.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/org.springframework.web.servlet-3.2.2.RELEASE.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/osgi-3.6.0.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/p6spy-1.3.jar"/>

diff --cc eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/SearchBar.java
index 347a5998770085ca81c1324af11cd7508e6e94a3,347a5998770085ca81c1324af11cd7508e6e94a3..bb5206ed7ae29edb080c6b8cc45cb106f89d4f89
--- 1/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/SearchBar.java
--- 2/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/SearchBar.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/SearchBar.java
@@@ -10,6 -10,6 +10,8 @@@
  
  package eu.etaxonomy.taxeditor.navigation.search;
  
++import java.util.Map;
++
  import org.eclipse.swt.SWT;
  import org.eclipse.swt.events.FocusEvent;
  import org.eclipse.swt.events.FocusListener;
@@@ -33,6 -33,6 +35,7 @@@ import org.eclipse.ui.PartInitException
  import org.eclipse.ui.PlatformUI;
  import org.eclipse.ui.menus.WorkbenchWindowControlContribution;
  import org.eclipse.ui.swt.IFocusService;
++import org.springframework.transaction.support.TransactionSynchronizationManager;
  
  import eu.etaxonomy.cdm.api.service.config.IFindTaxaAndNamesConfigurator;
  import eu.etaxonomy.taxeditor.navigation.NavigationUtil;
@@@ -212,6 -212,6 +215,7 @@@ public class SearchBar extends Workbenc
                                        .getWorkbench().getActiveWorkbenchWindow()
                                        .getActivePage().showView(SearchResultView.ID, secondaryId,
                                                        IWorkbenchPage.VIEW_ACTIVATE);
++                      Map rmap = TransactionSynchronizationManager.getResourceMap();
                        ((SearchResultView) resultsView).performSearch(configurator);
                } catch (PartInitException e) {
                        NavigationUtil.error(this.getClass(), "Error opening search result.", e);

diff --cc eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/SearchResultView.java
index d5984d1c502772217fe194b37d1946fd86e92bc3,d5984d1c502772217fe194b37d1946fd86e92bc3..83ad37fbc11ac831b76b731503ddc499a89aee12
--- 1/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/SearchResultView.java
--- 2/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/SearchResultView.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/SearchResultView.java
@@@ -11,6 -11,6 +11,7 @@@ package eu.etaxonomy.taxeditor.navigati
  
  import java.util.ArrayList;
  import java.util.List;
++import java.util.Map;
  
  import org.eclipse.core.runtime.IProgressMonitor;
  import org.eclipse.core.runtime.IStatus;
@@@ -34,6 -34,6 +35,7 @@@ import org.eclipse.swt.widgets.Text
  import org.eclipse.ui.IMemento;
  import org.eclipse.ui.IWorkbenchActionConstants;
  import org.eclipse.ui.part.ViewPart;
++import org.springframework.transaction.support.TransactionSynchronizationManager;
  
  import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
  import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
@@@ -289,6 -289,6 +291,7 @@@ public class SearchResultView extends V
                        monitor.beginTask("", 100);
                        monitor.worked(20);
                        
++                      Map rmap = TransactionSynchronizationManager.getResourceMap();
                        final List<UuidAndTitleCache<TaxonBase>> searchResult = CdmStore.getSearchManager().findTaxaAndNames(configurator);
                        monitor.worked(40);
                        

diff --cc eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/TermStore.java
index ab52136365b62548298657675f3629e01fe29a6a,ab52136365b62548298657675f3629e01fe29a6a..9d4a156162c91d52759ee7820b090cc8a32f0b56
--- 1/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/TermStore.java
--- 2/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/TermStore.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/TermStore.java
@@@ -87,6 -87,6 +87,7 @@@ public class TermStore 
                        comparator = new DefaultTermComparator<T>();
                }
                
++              
                List<T> terms = CdmStore.getService(ITermService.class).listByTermClass(termClass, null, null, null, null);
                Collections.sort(terms, comparator);
                return terms;