manually set version numbers

diff --git a/eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF
index d06acdf25284ae26c5b6e05c67b1d563fbca3d6f..65d8c101d8ef3dc303d7741bf859bbbe695d4cfd 100644 (file)
--- a/eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Application
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.application;singleton:=true
 Bundle-ManifestVersion: 2
 Bundle-Name: Application
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.application;singleton:=true

-Bundle-Version: 4.5.1
+Bundle-Version: 4.6.0.qualifier

 Bundle-Activator: eu.etaxonomy.taxeditor.TaxonomicEditorPlugin
 Bundle-Vendor: EDIT
 Bundle-Localization: OSGI-INF/l10n/plugin
 Bundle-Activator: eu.etaxonomy.taxeditor.TaxonomicEditorPlugin
 Bundle-Vendor: EDIT
 Bundle-Localization: OSGI-INF/l10n/plugin

diff --git a/eu.etaxonomy.taxeditor.application/pom.xml b/eu.etaxonomy.taxeditor.application/pom.xml
index cc9c8a03692304ce3a23b3850ae4051ce768e6e6..9cbf849207cd65c6d080413c05f0105cb4ab457b 100644 (file)
--- a/eu.etaxonomy.taxeditor.application/pom.xml
+++ b/eu.etaxonomy.taxeditor.application/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>

-    <version>4.5.1</version>
+    <version>4.6.0-SNAPSHOT</version>

   </parent>
 
   <modelVersion>4.0.0</modelVersion>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF
index 0c072823fb87bb8792cd95789282ec239636cc9e..e4d6fccef94f451519227b265aa97a2a2b0ad130 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Bulkeditor Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.bulkeditor;singleton:=true
 Bundle-ManifestVersion: 2
 Bundle-Name: Bulkeditor Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.bulkeditor;singleton:=true

-Bundle-Version: 4.5.1
+Bundle-Version: 4.6.0.qualifier

 Bundle-Activator: eu.etaxonomy.taxeditor.bulkeditor.internal.TaxeditorBulkeditorPlugin
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.taxeditor.annotatedlineeditor,
 Bundle-Activator: eu.etaxonomy.taxeditor.bulkeditor.internal.TaxeditorBulkeditorPlugin
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.taxeditor.annotatedlineeditor,

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/pom.xml b/eu.etaxonomy.taxeditor.bulkeditor/pom.xml
index 0e68d40502bf4635b4b0ec68f95768c2f1a0f629..cb43dbd41a36ab80256cd07a372cdf82a0c31ff6 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/pom.xml
+++ b/eu.etaxonomy.taxeditor.bulkeditor/pom.xml
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>

-               <version>4.5.1</version>
+               <version>4.6.0-SNAPSHOT</version>

        </parent>
 
        <modelVersion>4.0.0</modelVersion>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>

diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
index 0617377c376866d496f0ba162414704cbfb3307f..abadbf5bed95263506b55de439503277750f1105 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CDM Library Dependencies Plugin
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.cdmlib;singleton:=true
 Bundle-ManifestVersion: 2
 Bundle-Name: CDM Library Dependencies Plugin
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.cdmlib;singleton:=true

-Bundle-Version: 4.5.1
+Bundle-Version: 4.6.0.qualifier

 Eclipse-BundleShape: dir
 Export-Package: com.google.api,
  com.google.api.detect,
 Eclipse-BundleShape: dir
 Export-Package: com.google.api,
  com.google.api.detect,

diff --git a/eu.etaxonomy.taxeditor.cdmlib/pom.xml b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
index 01f3d536c3f4019269a7f01374404fb44e3e9e27..2fb8cb2c5b4925a1dec8be05bf788c2bbbbe3444 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/pom.xml
+++ b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
@@ -4,7 +4,7 @@
   <parent>\r
     <groupId>eu.etaxonomy</groupId>\r
     <artifactId>taxeditor-parent</artifactId>\r
   <parent>\r
     <groupId>eu.etaxonomy</groupId>\r
     <artifactId>taxeditor-parent</artifactId>\r

-    <version>4.5.1</version>\r
+    <version>4.6.0-SNAPSHOT</version>\r

   </parent>\r
   <modelVersion>4.0.0</modelVersion>\r
   <artifactId>eu.etaxonomy.taxeditor.cdmlib</artifactId>\r
   </parent>\r
   <modelVersion>4.0.0</modelVersion>\r
   <artifactId>eu.etaxonomy.taxeditor.cdmlib</artifactId>\r

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/mappings/hibernate.cfg.xml b/eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/mappings/hibernate.cfg.xml
index 56a8e35096a57f3a283fd9bce7ad99a3d61293ce..954af2e222f82cbb828bdfb9cc52df53433d4a4c 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/mappings/hibernate.cfg.xml
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/mappings/hibernate.cfg.xml
@@ -1,215 +1,212 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<!DOCTYPE hibernate-configuration PUBLIC\r
- "-//Hibernate/Hibernate Configuration DTD 3.0//EN"\r
- "http://www.hibernate.org/dtd/hibernate-configuration-3.0.dtd">\r
-\r
-<hibernate-configuration>\r
-    <session-factory>\r
-\r
-      <property name="connection.release_mode">after_transaction</property>\r
-      \r
-      <property name="hibernate.implicit_naming_strategy">org.hibernate.boot.model.naming.ImplicitNamingStrategyComponentPathImpl</property>\r
-      \r
-\r
-      <!-- Connection Pooling -->\r
-<!--       <property name="hibernate.connection.provider_class">org.hibernate.service.jdbc.connections.internal.C3P0ConnectionProvider</property> -->\r
-      <!-- <property name="hibernate.connection.provider_class">org.hibernate.engine.jdbc.connections.internal.DatasourceConnectionProviderImpl</property>\r
-          -->\r
-             <property name="hibernate.connection.provider_class">eu.etaxonomy.taxeditor.remoting.cache.CdmModelCacherConnectionProvider</property>\r
-          \r
-            <!--\r
-          Configuring the C3P0ConnectionProvider\r
-          ========================================\r
-          see http://www.mchange.com/projects/c3p0/index.html#hibernate-specific\r
-          and also org.springframework.orm.hibernate3.AbstractSessionFactoryBean.setDataSource(DataSource dataSource)\r
-\r
-          IMPORTANT:\r
-          Because of the constraint (1) the org.hibernate.connection.C3P0ConnectionProvider are not be used\r
-          for the Cdm Library because it requires the dataSource bean in some cases.\r
-\r
-          (1)\r
-          Do NOT specify the dataSource in the sessionFactory for example in the\r
-          org.springframework.orm.hibernate3.LocalSessionFactoryBean\r
-          !!!==> If *dataSource* is set, this will override corresponding settings in Hibernate properties.!!!\r
-                         If this is set, the Hibernate settings should not define a connection provider to\r
-                     avoid meaningless double configuration.\r
-          (2)\r
-          Hibernate uses the hibernate.c3p0.max_size property to determine if c3p0\r
-          is beeing used.  Therefore the max_size property MUST be set. - maybe not need in hibernate 3.4 +\r
-\r
-          (3) If you are using Hibernate's C3P0ConnectionProvider you must set the following properties\r
-          in your hibernate configuration, using hibernate-specific configuration keys.\r
-          All other properties must be defined as usual in a c3p0.properties file.\r
-          This is confusing, and will hopefully be simplified some time in the future, but for now...\r
-          \r
-          DOCUMENTATION UPDATE (2015-05-22):\r
-          Hibernate's C3P0ConnectionProvider renames 7 c3p0 configuration properties, which, \r
-          if set in your hibernate configuration, will override any configuration you may have set \r
-          in a c3p0.properties file.\r
-          TODO: are points (2) and (3) still valid? I don't think so! (AK)\r
-\r
-            hibernate.c3p0.acquire_increment\r
-                       hibernate.c3p0.idle_test_period\r
-                       hibernate.c3p0.timeout\r
-                       hibernate.c3p0.max_size\r
-                       hibernate.c3p0.max_statements\r
-                       hibernate.c3p0.min_size\r
-                       hibernate.c3p0.validate\r
-      -->\r
-      <mapping package="eu.etaxonomy.cdm.model.common"/>\r
-      <!-- Annotation Package -->\r
-      <mapping class="eu.etaxonomy.cdm.model.agent.Address"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.agent.AgentBase"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.agent.Contact"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.agent.Institution"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.agent.InstitutionalMembership"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.agent.Person"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.agent.Team"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.agent.TeamOrPersonBase"/>\r
-      <!-- Common Package -->\r
-      <mapping class="eu.etaxonomy.cdm.model.common.Annotation"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.common.AnnotationType"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.common.Credit"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.common.DefinedTerm"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.common.DefinedTermBase"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.common.Extension"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.common.ExtensionType"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.common.IdentifiableSource"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.common.Identifier"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.common.IntextReference"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.common.GrantedAuthorityImpl"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.common.Group"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.common.Language"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.common.LanguageString"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.common.LSID"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.common.LSIDAuthority"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.common.Marker"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.common.MarkerType"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.common.OrderedTerm"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.common.OrderedTermBase"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.common.OrderedTermVocabulary"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.common.OriginalSourceBase"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.common.RelationshipTermBase"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.common.Representation"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.common.TermVocabulary"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.common.User"/>\r
-      <!-- Description Package -->\r
-      <mapping class="eu.etaxonomy.cdm.model.description.CategoricalData"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.description.CommonTaxonName"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.description.DescriptionBase"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.description.DescriptionElementBase"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.description.DescriptionElementSource"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.description.Distribution"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.description.Feature"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.description.FeatureNode"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.description.FeatureTree"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.description.KeyStatement"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.description.MediaKey"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.description.IndividualsAssociation"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.description.MeasurementUnit"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.description.MultiAccessKey"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.description.PolytomousKey"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.description.PolytomousKeyNode"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.description.PresenceAbsenceTerm"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.description.QuantitativeData"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.description.SpecimenDescription"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.description.State"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.description.StateData"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.description.StatisticalMeasure"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.description.StatisticalMeasurementValue"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.description.TaxonDescription"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.description.TaxonInteraction"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.description.TaxonNameDescription"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.description.TextData"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.description.TextFormat"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.description.WorkingSet"/>\r
-      <!-- Location Package -->\r
-      <mapping class="eu.etaxonomy.cdm.model.location.NamedArea"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.location.NamedAreaLevel"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.location.NamedAreaType"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.location.ReferenceSystem"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.location.Point"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.location.Country"/>\r
-      <!-- Media Package -->\r
-      <mapping class="eu.etaxonomy.cdm.model.media.AudioFile"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.media.ImageFile"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.media.Media"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.media.MediaRepresentation"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.media.MediaRepresentationPart"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.media.MovieFile"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.media.Rights"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.media.RightsType"/>\r
-      <!-- Meta Data Package -->\r
-      <mapping class="eu.etaxonomy.cdm.model.metadata.CdmMetaData"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.metadata.CdmPreference"/>\r
-      <!-- Molecular Package -->\r
-      <mapping class="eu.etaxonomy.cdm.model.molecular.PhylogeneticTree"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.molecular.DnaQuality"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.molecular.DnaSample"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.molecular.Amplification"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.molecular.AmplificationResult"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.molecular.Primer"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.molecular.Sequence"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.molecular.SequenceString"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.molecular.SingleRead"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.molecular.SingleReadAlignment"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.molecular.Cloning"/>\r
-      <!-- Name Package -->\r
-      <mapping class="eu.etaxonomy.cdm.model.name.BacterialName"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.name.BotanicalName"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.name.CultivarPlantName"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.name.HomotypicalGroup"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.name.HybridRelationship"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.name.HybridRelationshipType"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.name.NameRelationship"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.name.NameRelationshipType"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.name.NameTypeDesignation"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.name.NameTypeDesignationStatus"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.name.NomenclaturalCode"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.name.NomenclaturalStatus"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.name.NomenclaturalStatusType"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.name.NonViralName"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.name.Rank"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.name.SpecimenTypeDesignation"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.name.SpecimenTypeDesignationStatus"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.name.TaxonNameBase"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.name.TypeDesignationBase"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.name.ViralName"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.name.ZoologicalName"/>\r
-      <!-- Occurrence Package -->\r
-      <mapping class="eu.etaxonomy.cdm.model.occurrence.Collection"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.occurrence.DerivationEvent"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.occurrence.DerivationEventType"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.occurrence.DerivedUnit"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.occurrence.MaterialOrMethodEvent"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.occurrence.MediaSpecimen"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.occurrence.DeterminationEvent"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.occurrence.FieldUnit"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.occurrence.GatheringEvent"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.occurrence.PreservationMethod"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase"/>\r
-      <!-- Reference Package -->\r
-      <mapping class="eu.etaxonomy.cdm.model.reference.Reference"/>\r
-\r
-      <!-- Taxon Package -->\r
-      <mapping class="eu.etaxonomy.cdm.model.taxon.Synonym"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.taxon.SynonymType"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.taxon.Taxon"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.taxon.TaxonBase"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.taxon.TaxonNode"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.taxon.TaxonNodeAgentRelation"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.taxon.Classification"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.taxon.TaxonRelationship"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType"/>\r
-      \r
-      <!-- Validation Package -->\r
-      <mapping class="eu.etaxonomy.cdm.model.validation.EntityValidation"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.validation.EntityConstraintViolation"/>\r
-      \r
-      <!-- View Package -->\r
-      <mapping class="eu.etaxonomy.cdm.model.view.AuditEvent"/>\r
-      \r
-\r
-\r
-    </session-factory>\r
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-configuration PUBLIC
+ "-//Hibernate/Hibernate Configuration DTD 3.0//EN"
+ "http://www.hibernate.org/dtd/hibernate-configuration-3.0.dtd">
+
+<hibernate-configuration>
+    <session-factory>
+
+      <property name="connection.release_mode">after_transaction</property>
+
+      <!-- Connection Pooling -->
+<!--       <property name="hibernate.connection.provider_class">org.hibernate.service.jdbc.connections.internal.C3P0ConnectionProvider</property> -->
+      <property name="hibernate.connection.provider_class">org.hibernate.engine.jdbc.connections.internal.DatasourceConnectionProviderImpl</property>
+           <!--
+          Configuring the C3P0ConnectionProvider
+          ========================================
+          see http://www.mchange.com/projects/c3p0/index.html#hibernate-specific
+          and also org.springframework.orm.hibernate3.AbstractSessionFactoryBean.setDataSource(DataSource dataSource)
+
+          IMPORTANT:
+          Because of the constraint (1) the org.hibernate.connection.C3P0ConnectionProvider are not be used
+          for the Cdm Library because it requires the dataSource bean in some cases.
+
+          (1)
+          Do NOT specify the dataSource in the sessionFactory for example in the
+          org.springframework.orm.hibernate3.LocalSessionFactoryBean
+          !!!==> If *dataSource* is set, this will override corresponding settings in Hibernate properties.!!!
+                         If this is set, the Hibernate settings should not define a connection provider to
+                     avoid meaningless double configuration.
+          (2)
+          Hibernate uses the hibernate.c3p0.max_size property to determine if c3p0
+          is beeing used.  Therefore the max_size property MUST be set. - maybe not need in hibernate 3.4 +
+
+          (3) If you are using Hibernate's C3P0ConnectionProvider you must set the following properties
+          in your hibernate configuration, using hibernate-specific configuration keys.
+          All other properties must be defined as usual in a c3p0.properties file.
+          This is confusing, and will hopefully be simplified some time in the future, but for now...
+          
+          DOCUMENTATION UPDATE (2015-05-22):
+          Hibernate's C3P0ConnectionProvider renames 7 c3p0 configuration properties, which, 
+          if set in your hibernate configuration, will override any configuration you may have set 
+          in a c3p0.properties file.
+          TODO: are points (2) and (3) still valid? I don't think so! (AK)
+
+            hibernate.c3p0.acquire_increment
+                       hibernate.c3p0.idle_test_period
+                       hibernate.c3p0.timeout
+                       hibernate.c3p0.max_size
+                       hibernate.c3p0.max_statements
+                       hibernate.c3p0.min_size
+                       hibernate.c3p0.validate
+      -->
+      <mapping package="eu.etaxonomy.cdm.model.common"/>
+      <!-- Annotation Package -->
+      <mapping class="eu.etaxonomy.cdm.model.agent.Address"/>
+      <mapping class="eu.etaxonomy.cdm.model.agent.AgentBase"/>
+      <mapping class="eu.etaxonomy.cdm.model.agent.Contact"/>
+      <mapping class="eu.etaxonomy.cdm.model.agent.Institution"/>
+      <mapping class="eu.etaxonomy.cdm.model.agent.InstitutionalMembership"/>
+      <mapping class="eu.etaxonomy.cdm.model.agent.Person"/>
+      <mapping class="eu.etaxonomy.cdm.model.agent.Team"/>
+      <mapping class="eu.etaxonomy.cdm.model.agent.TeamOrPersonBase"/>
+      <!-- Common Package -->
+      <mapping class="eu.etaxonomy.cdm.model.common.Annotation"/>
+      <mapping class="eu.etaxonomy.cdm.model.common.AnnotationType"/>
+      <mapping class="eu.etaxonomy.cdm.model.common.Credit"/>
+      <mapping class="eu.etaxonomy.cdm.model.common.DefinedTerm"/>
+      <mapping class="eu.etaxonomy.cdm.model.common.DefinedTermBase"/>
+      <mapping class="eu.etaxonomy.cdm.model.common.Extension"/>
+      <mapping class="eu.etaxonomy.cdm.model.common.ExtensionType"/>
+      <mapping class="eu.etaxonomy.cdm.model.common.IdentifiableSource"/>
+      <mapping class="eu.etaxonomy.cdm.model.common.Identifier"/>
+      <mapping class="eu.etaxonomy.cdm.model.common.IntextReference"/>
+      <mapping class="eu.etaxonomy.cdm.model.common.GrantedAuthorityImpl"/>
+      <mapping class="eu.etaxonomy.cdm.model.common.Group"/>
+      <mapping class="eu.etaxonomy.cdm.model.common.Language"/>
+      <mapping class="eu.etaxonomy.cdm.model.common.LanguageString"/>
+      <mapping class="eu.etaxonomy.cdm.model.common.LSID"/>
+      <mapping class="eu.etaxonomy.cdm.model.common.LSIDAuthority"/>
+      <mapping class="eu.etaxonomy.cdm.model.common.Marker"/>
+      <mapping class="eu.etaxonomy.cdm.model.common.MarkerType"/>
+      <mapping class="eu.etaxonomy.cdm.model.common.OrderedTerm"/>
+      <mapping class="eu.etaxonomy.cdm.model.common.OrderedTermBase"/>
+      <mapping class="eu.etaxonomy.cdm.model.common.OrderedTermVocabulary"/>
+      <mapping class="eu.etaxonomy.cdm.model.common.OriginalSourceBase"/>
+      <mapping class="eu.etaxonomy.cdm.model.common.RelationshipTermBase"/>
+      <mapping class="eu.etaxonomy.cdm.model.common.Representation"/>
+      <mapping class="eu.etaxonomy.cdm.model.common.TermVocabulary"/>
+      <mapping class="eu.etaxonomy.cdm.model.common.User"/>
+      <!-- Description Package -->
+      <mapping class="eu.etaxonomy.cdm.model.description.CategoricalData"/>
+      <mapping class="eu.etaxonomy.cdm.model.description.CommonTaxonName"/>
+      <mapping class="eu.etaxonomy.cdm.model.description.DescriptionBase"/>
+      <mapping class="eu.etaxonomy.cdm.model.description.DescriptionElementBase"/>
+      <mapping class="eu.etaxonomy.cdm.model.description.DescriptionElementSource"/>
+      <mapping class="eu.etaxonomy.cdm.model.description.Distribution"/>
+      <mapping class="eu.etaxonomy.cdm.model.description.Feature"/>
+      <mapping class="eu.etaxonomy.cdm.model.description.FeatureNode"/>
+      <mapping class="eu.etaxonomy.cdm.model.description.FeatureTree"/>
+      <mapping class="eu.etaxonomy.cdm.model.description.KeyStatement"/>
+      <mapping class="eu.etaxonomy.cdm.model.description.MediaKey"/>
+      <mapping class="eu.etaxonomy.cdm.model.description.IndividualsAssociation"/>
+      <mapping class="eu.etaxonomy.cdm.model.description.MeasurementUnit"/>
+      <mapping class="eu.etaxonomy.cdm.model.description.MultiAccessKey"/>
+      <mapping class="eu.etaxonomy.cdm.model.description.PolytomousKey"/>
+      <mapping class="eu.etaxonomy.cdm.model.description.PolytomousKeyNode"/>
+      <mapping class="eu.etaxonomy.cdm.model.description.PresenceAbsenceTerm"/>
+      <mapping class="eu.etaxonomy.cdm.model.description.QuantitativeData"/>
+      <mapping class="eu.etaxonomy.cdm.model.description.SpecimenDescription"/>
+      <mapping class="eu.etaxonomy.cdm.model.description.State"/>
+      <mapping class="eu.etaxonomy.cdm.model.description.StateData"/>
+      <mapping class="eu.etaxonomy.cdm.model.description.StatisticalMeasure"/>
+      <mapping class="eu.etaxonomy.cdm.model.description.StatisticalMeasurementValue"/>
+      <mapping class="eu.etaxonomy.cdm.model.description.TaxonDescription"/>
+      <mapping class="eu.etaxonomy.cdm.model.description.TaxonInteraction"/>
+      <mapping class="eu.etaxonomy.cdm.model.description.TaxonNameDescription"/>
+      <mapping class="eu.etaxonomy.cdm.model.description.TextData"/>
+      <mapping class="eu.etaxonomy.cdm.model.description.TextFormat"/>
+      <mapping class="eu.etaxonomy.cdm.model.description.WorkingSet"/>
+      <!-- Location Package -->
+      <mapping class="eu.etaxonomy.cdm.model.location.NamedArea"/>
+      <mapping class="eu.etaxonomy.cdm.model.location.NamedAreaLevel"/>
+      <mapping class="eu.etaxonomy.cdm.model.location.NamedAreaType"/>
+      <mapping class="eu.etaxonomy.cdm.model.location.ReferenceSystem"/>
+      <mapping class="eu.etaxonomy.cdm.model.location.Point"/>
+      <mapping class="eu.etaxonomy.cdm.model.location.Country"/>
+      <!-- Media Package -->
+      <mapping class="eu.etaxonomy.cdm.model.media.AudioFile"/>
+      <mapping class="eu.etaxonomy.cdm.model.media.ImageFile"/>
+      <mapping class="eu.etaxonomy.cdm.model.media.Media"/>
+      <mapping class="eu.etaxonomy.cdm.model.media.MediaRepresentation"/>
+      <mapping class="eu.etaxonomy.cdm.model.media.MediaRepresentationPart"/>
+      <mapping class="eu.etaxonomy.cdm.model.media.MovieFile"/>
+      <mapping class="eu.etaxonomy.cdm.model.media.Rights"/>
+      <mapping class="eu.etaxonomy.cdm.model.media.RightsType"/>
+      <!-- Meta Data Package -->
+      <mapping class="eu.etaxonomy.cdm.model.metadata.CdmMetaData"/>
+      <mapping class="eu.etaxonomy.cdm.model.metadata.CdmPreference"/>
+      <!-- Molecular Package -->
+      <mapping class="eu.etaxonomy.cdm.model.molecular.PhylogeneticTree"/>
+      <mapping class="eu.etaxonomy.cdm.model.molecular.DnaQuality"/>
+      <mapping class="eu.etaxonomy.cdm.model.molecular.DnaSample"/>
+      <mapping class="eu.etaxonomy.cdm.model.molecular.Amplification"/>
+      <mapping class="eu.etaxonomy.cdm.model.molecular.AmplificationResult"/>
+      <mapping class="eu.etaxonomy.cdm.model.molecular.Primer"/>
+      <mapping class="eu.etaxonomy.cdm.model.molecular.Sequence"/>
+      <mapping class="eu.etaxonomy.cdm.model.molecular.SequenceString"/>
+      <mapping class="eu.etaxonomy.cdm.model.molecular.SingleRead"/>
+      <mapping class="eu.etaxonomy.cdm.model.molecular.SingleReadAlignment"/>
+      <mapping class="eu.etaxonomy.cdm.model.molecular.Cloning"/>
+      <!-- Name Package -->
+      <mapping class="eu.etaxonomy.cdm.model.name.BacterialName"/>
+      <mapping class="eu.etaxonomy.cdm.model.name.BotanicalName"/>
+      <mapping class="eu.etaxonomy.cdm.model.name.CultivarPlantName"/>
+      <mapping class="eu.etaxonomy.cdm.model.name.HomotypicalGroup"/>
+      <mapping class="eu.etaxonomy.cdm.model.name.HybridRelationship"/>
+      <mapping class="eu.etaxonomy.cdm.model.name.HybridRelationshipType"/>
+      <mapping class="eu.etaxonomy.cdm.model.name.NameRelationship"/>
+      <mapping class="eu.etaxonomy.cdm.model.name.NameRelationshipType"/>
+      <mapping class="eu.etaxonomy.cdm.model.name.NameTypeDesignation"/>
+      <mapping class="eu.etaxonomy.cdm.model.name.NameTypeDesignationStatus"/>
+      <mapping class="eu.etaxonomy.cdm.model.name.NomenclaturalCode"/>
+      <mapping class="eu.etaxonomy.cdm.model.name.NomenclaturalStatus"/>
+      <mapping class="eu.etaxonomy.cdm.model.name.NomenclaturalStatusType"/>
+      <mapping class="eu.etaxonomy.cdm.model.name.NonViralName"/>
+      <mapping class="eu.etaxonomy.cdm.model.name.Rank"/>
+      <mapping class="eu.etaxonomy.cdm.model.name.SpecimenTypeDesignation"/>
+      <mapping class="eu.etaxonomy.cdm.model.name.SpecimenTypeDesignationStatus"/>
+      <mapping class="eu.etaxonomy.cdm.model.name.TaxonNameBase"/>
+      <mapping class="eu.etaxonomy.cdm.model.name.TypeDesignationBase"/>
+      <mapping class="eu.etaxonomy.cdm.model.name.ViralName"/>
+      <mapping class="eu.etaxonomy.cdm.model.name.ZoologicalName"/>
+      <!-- Occurrence Package -->
+      <mapping class="eu.etaxonomy.cdm.model.occurrence.Collection"/>
+      <mapping class="eu.etaxonomy.cdm.model.occurrence.DerivationEvent"/>
+      <mapping class="eu.etaxonomy.cdm.model.occurrence.DerivationEventType"/>
+      <mapping class="eu.etaxonomy.cdm.model.occurrence.DerivedUnit"/>
+      <mapping class="eu.etaxonomy.cdm.model.occurrence.MaterialOrMethodEvent"/>
+      <mapping class="eu.etaxonomy.cdm.model.occurrence.MediaSpecimen"/>
+      <mapping class="eu.etaxonomy.cdm.model.occurrence.DeterminationEvent"/>
+      <mapping class="eu.etaxonomy.cdm.model.occurrence.FieldUnit"/>
+      <mapping class="eu.etaxonomy.cdm.model.occurrence.GatheringEvent"/>
+      <mapping class="eu.etaxonomy.cdm.model.occurrence.PreservationMethod"/>
+      <mapping class="eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase"/>
+      <!-- Reference Package -->
+      <mapping class="eu.etaxonomy.cdm.model.reference.Reference"/>
+
+      <!-- Taxon Package -->
+      <mapping class="eu.etaxonomy.cdm.model.taxon.Synonym"/>
+      <mapping class="eu.etaxonomy.cdm.model.taxon.SynonymType"/>
+      <mapping class="eu.etaxonomy.cdm.model.taxon.Taxon"/>
+      <mapping class="eu.etaxonomy.cdm.model.taxon.TaxonBase"/>
+      <mapping class="eu.etaxonomy.cdm.model.taxon.TaxonNode"/>
+      <mapping class="eu.etaxonomy.cdm.model.taxon.TaxonNodeAgentRelation"/>
+      <mapping class="eu.etaxonomy.cdm.model.taxon.Classification"/>
+      <mapping class="eu.etaxonomy.cdm.model.taxon.TaxonRelationship"/>
+      <mapping class="eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType"/>
+      
+      <!-- Validation Package -->
+      <mapping class="eu.etaxonomy.cdm.model.validation.EntityValidation"/>
+      <mapping class="eu.etaxonomy.cdm.model.validation.EntityConstraintViolation"/>
+      
+      <!-- View Package -->
+      <mapping class="eu.etaxonomy.cdm.model.view.AuditEvent"/>
+      
+      <!-- for filling caches -->
+      <!-- since hibernate 4 listeners are not handled via hibernate.cfg.xml anymore -->
+      <!--  http://stackoverflow.com/questions/8616146/eventlisteners-using-hibernate-4-0-with-spring-3-1-0-release
+            https://community.jboss.org/wiki/HibernateCoreMigrationGuide40 -->
+
+    </session-factory>

 </hibernate-configuration>
\ No newline at end of file
 </hibernate-configuration>
\ No newline at end of file

diff --git a/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
index fe6879c11948d7569b11fcfe125dc816246caf11..04008b3c569eece3a9b7418fe9fb0a440884ab8a 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Editor Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.editor;singleton:=true
 Bundle-ManifestVersion: 2
 Bundle-Name: Editor Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.editor;singleton:=true

-Bundle-Version: 4.5.1
+Bundle-Version: 4.6.0.qualifier

 Bundle-Activator: eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin
 Bundle-Vendor: %Bundle-Vendor.0
 Bundle-Localization: OSGI-INF/l10n/plugin
 Bundle-Activator: eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin
 Bundle-Vendor: %Bundle-Vendor.0
 Bundle-Localization: OSGI-INF/l10n/plugin

diff --git a/eu.etaxonomy.taxeditor.editor/pom.xml b/eu.etaxonomy.taxeditor.editor/pom.xml
index 9665708d464dc4b92cb9d77f3734c16b7cd6da9b..480f66df86d78610e85a8fd23b5ff318775be481 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/pom.xml
+++ b/eu.etaxonomy.taxeditor.editor/pom.xml
@@ -4,7 +4,7 @@
   <parent>
        <groupId>eu.etaxonomy</groupId>
        <artifactId>taxeditor-parent</artifactId>
   <parent>
        <groupId>eu.etaxonomy</groupId>
        <artifactId>taxeditor-parent</artifactId>

-    <version>4.5.1</version>
+    <version>4.6.0-SNAPSHOT</version>

   </parent>
   
   <modelVersion>4.0.0</modelVersion>
   </parent>
   
   <modelVersion>4.0.0</modelVersion>

diff --git a/eu.etaxonomy.taxeditor.feature.jre.linux64/feature.xml b/eu.etaxonomy.taxeditor.feature.jre.linux64/feature.xml
index b48681decc388a376250ea62775138db7a3b08c8..f0f25926f7e06618f846e9704d4697b1b1ddc11e 100644 (file)
--- a/eu.etaxonomy.taxeditor.feature.jre.linux64/feature.xml
+++ b/eu.etaxonomy.taxeditor.feature.jre.linux64/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="eu.etaxonomy.taxeditor.feature.jre.linux64"
       label="Taxonomic Editor JRE Linux64"
 <feature
       id="eu.etaxonomy.taxeditor.feature.jre.linux64"
       label="Taxonomic Editor JRE Linux64"

-      version="4.5.1"
+      version="4.6.0.qualifier"

       provider-name="EDIT"
       plugin="eu.etaxonomy.taxeditor.application"
       os="linux"
       provider-name="EDIT"
       plugin="eu.etaxonomy.taxeditor.application"
       os="linux"

diff --git a/eu.etaxonomy.taxeditor.feature.jre.linux64/pom.xml b/eu.etaxonomy.taxeditor.feature.jre.linux64/pom.xml
index 5b4e2e44af6ec3d793139021c58fe3bfab6ad484..936ab39f5b057d7524df4d3a0e2be0a7a2916f76 100644 (file)
--- a/eu.etaxonomy.taxeditor.feature.jre.linux64/pom.xml
+++ b/eu.etaxonomy.taxeditor.feature.jre.linux64/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>

-    <version>4.5.1</version>
+    <version>4.6.0-SNAPSHOT</version>

   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>eu.etaxonomy.taxeditor.feature.jre.linux64</artifactId>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>eu.etaxonomy.taxeditor.feature.jre.linux64</artifactId>

diff --git a/eu.etaxonomy.taxeditor.feature.platform/feature.xml b/eu.etaxonomy.taxeditor.feature.platform/feature.xml
index 1b9421d4e6f8714e0931eed1839bc3b9653b1645..291cf1e81683a64c71cfd602ad63fb15a9531245 100644 (file)
--- a/eu.etaxonomy.taxeditor.feature.platform/feature.xml
+++ b/eu.etaxonomy.taxeditor.feature.platform/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="eu.etaxonomy.taxeditor.feature.platform"
       label="Taxeditor Dependencies"
 <feature
       id="eu.etaxonomy.taxeditor.feature.platform"
       label="Taxeditor Dependencies"

-      version="4.5.1"
+      version="4.6.0.qualifier"

       os="linux,macosx,win32"
       ws="cocoa,gtk,win32"
       arch="x86,x86_64">
       os="linux,macosx,win32"
       ws="cocoa,gtk,win32"
       arch="x86,x86_64">

diff --git a/eu.etaxonomy.taxeditor.feature.platform/pom.xml b/eu.etaxonomy.taxeditor.feature.platform/pom.xml
index 3fffe0c2807406e13336609d3120a330adc3d629..34746256f7de57faeee6a0e880fa7c5af7a38f5b 100644 (file)
--- a/eu.etaxonomy.taxeditor.feature.platform/pom.xml
+++ b/eu.etaxonomy.taxeditor.feature.platform/pom.xml
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>

-               <version>4.5.1</version>
+               <version>4.6.0-SNAPSHOT</version>

        </parent>
        <modelVersion>4.0.0</modelVersion>
        <artifactId>eu.etaxonomy.taxeditor.feature.platform</artifactId>
        </parent>
        <modelVersion>4.0.0</modelVersion>
        <artifactId>eu.etaxonomy.taxeditor.feature.platform</artifactId>

diff --git a/eu.etaxonomy.taxeditor.feature/feature.xml b/eu.etaxonomy.taxeditor.feature/feature.xml
index df074a58d5171fae06cc7a2408fd0b773d2911af..36e3b41c160cf556b1f9b4b6024366233329cae5 100644 (file)
--- a/eu.etaxonomy.taxeditor.feature/feature.xml
+++ b/eu.etaxonomy.taxeditor.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="eu.etaxonomy.taxeditor.feature"
       label="Taxonomic Editor"
 <feature
       id="eu.etaxonomy.taxeditor.feature"
       label="Taxonomic Editor"

-      version="4.5.1"
+      version="4.6.0.qualifier"

       provider-name="EDIT"
       plugin="eu.etaxonomy.taxeditor.application"
       os="linux,macosx,win32"
       provider-name="EDIT"
       plugin="eu.etaxonomy.taxeditor.application"
       os="linux,macosx,win32"

diff --git a/eu.etaxonomy.taxeditor.feature/pom.xml b/eu.etaxonomy.taxeditor.feature/pom.xml
index e111a5490a8483a49635a77ece064f2819099730..2affb8ec39611c8b775af9569ba9aa9f5ccd097c 100644 (file)
--- a/eu.etaxonomy.taxeditor.feature/pom.xml
+++ b/eu.etaxonomy.taxeditor.feature/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>

-    <version>4.5.1</version>
+    <version>4.6.0-SNAPSHOT</version>

   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>eu.etaxonomy.taxeditor.feature</artifactId>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>eu.etaxonomy.taxeditor.feature</artifactId>

diff --git a/eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF
index a6c3addba9dbaaa3e6914436e3f214abcb167a7b..64fca06f0b8911faacddfd2b4954af2ea4321e4c 100644 (file)
--- a/eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Help
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.help; singleton:=true
 Bundle-ManifestVersion: 2
 Bundle-Name: Help
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.help; singleton:=true

-Bundle-Version: 4.5.1
+Bundle-Version: 4.6.0.qualifier

 Bundle-Activator: eu.etaxonomy.taxeditor.help.Activator
 Bundle-Vendor: EDIT
 Require-Bundle: org.eclipse.ui,
 Bundle-Activator: eu.etaxonomy.taxeditor.help.Activator
 Bundle-Vendor: EDIT
 Require-Bundle: org.eclipse.ui,

diff --git a/eu.etaxonomy.taxeditor.help/pom.xml b/eu.etaxonomy.taxeditor.help/pom.xml
index ead08fddf3fcece0d53465955074e57c4e4d7f00..5b94069989e5381f293dd610b234d1c553503ae7 100644 (file)
--- a/eu.etaxonomy.taxeditor.help/pom.xml
+++ b/eu.etaxonomy.taxeditor.help/pom.xml
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>

-               <version>4.5.1</version>
+               <version>4.6.0-SNAPSHOT</version>

        </parent>
 
        <modelVersion>4.0.0</modelVersion>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>

diff --git a/eu.etaxonomy.taxeditor.molecular.lib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.molecular.lib/META-INF/MANIFEST.MF
index 57bab91958af2e0b0b7d93da405e5e7b381b8ebb..af39394f26819fb1d348c6362340b40b34fc604f 100644 (file)
--- a/eu.etaxonomy.taxeditor.molecular.lib/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.molecular.lib/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: eu.etaxonomy.taxeditor.molecular.lib
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.molecular.lib;singleton:=true
 Bundle-ManifestVersion: 2
 Bundle-Name: eu.etaxonomy.taxeditor.molecular.lib
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.molecular.lib;singleton:=true

-Bundle-Version: 4.5.1
+Bundle-Version: 4.6.0.qualifier

 Bundle-ClassPath: .,
  lib/owlapi-xmlutils-4.1.4.jar,
  lib/commons-collections4-4.1.jar,
 Bundle-ClassPath: .,
  lib/owlapi-xmlutils-4.1.4.jar,
  lib/commons-collections4-4.1.jar,

diff --git a/eu.etaxonomy.taxeditor.molecular.lib/pom.xml b/eu.etaxonomy.taxeditor.molecular.lib/pom.xml
index 55d10338a8eb012eece902a21acaa3723ab852db..1ccaa932024295a4426d0ee8aa0d3496b028dbf0 100644 (file)
--- a/eu.etaxonomy.taxeditor.molecular.lib/pom.xml
+++ b/eu.etaxonomy.taxeditor.molecular.lib/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>

-    <version>4.5.1</version>
+    <version>4.6.0-SNAPSHOT</version>

   </parent>
 
   <build>
   </parent>
 
   <build>

diff --git a/eu.etaxonomy.taxeditor.molecular/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.molecular/META-INF/MANIFEST.MF
index d9123c23d01343fab94ba0a500da6c3fa3b28b0e..c44ca475a20a5e1af742d2ffdda944eb72f9adc6 100644 (file)
--- a/eu.etaxonomy.taxeditor.molecular/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.molecular/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Molecular Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.molecular;singleton:=true
 Bundle-ManifestVersion: 2
 Bundle-Name: Molecular Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.molecular;singleton:=true

-Bundle-Version: 4.5.1
+Bundle-Version: 4.6.0.qualifier

 Bundle-Activator: eu.etaxonomy.taxeditor.molecular.TaxeditorMolecularPlugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
 Bundle-Activator: eu.etaxonomy.taxeditor.molecular.TaxeditorMolecularPlugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,

diff --git a/eu.etaxonomy.taxeditor.molecular/pom.xml b/eu.etaxonomy.taxeditor.molecular/pom.xml
index 24c56950ef07854961e69b5ed82b84c25c163f40..6c1a6aa63f88527ddb70c3b4c10ca3149cb233ea 100644 (file)
--- a/eu.etaxonomy.taxeditor.molecular/pom.xml
+++ b/eu.etaxonomy.taxeditor.molecular/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>

-    <version>4.5.1</version>
+    <version>4.6.0-SNAPSHOT</version>

   </parent>
 
   <modelVersion>4.0.0</modelVersion>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF
index 03b6c6c067c0bed6b89f3f341768f6abb9fda283..97783d1e932bbc76e63d94fc20c1c092c07e9938 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Navigation Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.navigation;singleton:=true
 Bundle-ManifestVersion: 2
 Bundle-Name: Navigation Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.navigation;singleton:=true

-Bundle-Version: 4.5.1
+Bundle-Version: 4.6.0.qualifier

 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.cdm,
  eu.etaxonomy.taxeditor.navigation,
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.cdm,
  eu.etaxonomy.taxeditor.navigation,

diff --git a/eu.etaxonomy.taxeditor.navigation/pom.xml b/eu.etaxonomy.taxeditor.navigation/pom.xml
index b84288be007e22322a699087e429c77e70541568..60031b062bfe474819833a7b5944f1a06cdb1d90 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/pom.xml
+++ b/eu.etaxonomy.taxeditor.navigation/pom.xml
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>

-               <version>4.5.1</version>
+               <version>4.6.0-SNAPSHOT</version>

        </parent>
 
        <modelVersion>4.0.0</modelVersion>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>

diff --git a/eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF
index 0a300156793123442c4c667a6be45a7f0f7e8999..0cd15b6769398b508e0b965519c2b1bca65d7e9e 100644 (file)
--- a/eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Printpublisher Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.printpublisher;singleton:=true
 Bundle-ManifestVersion: 2
 Bundle-Name: Printpublisher Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.printpublisher;singleton:=true

-Bundle-Version: 4.5.1
+Bundle-Version: 4.6.0.qualifier

 Require-Bundle: org.eclipse.osgi,
  org.eclipse.ui,
  eu.etaxonomy.taxeditor.cdmlib,
 Require-Bundle: org.eclipse.osgi,
  org.eclipse.ui,
  eu.etaxonomy.taxeditor.cdmlib,

diff --git a/eu.etaxonomy.taxeditor.printpublisher/pom.xml b/eu.etaxonomy.taxeditor.printpublisher/pom.xml
index e4b725bce52d31d6bbf43f9b0f8ccb44ba0a79d3..f31fd269544a8ee12228a2d2dcb1356395a7266d 100644 (file)
--- a/eu.etaxonomy.taxeditor.printpublisher/pom.xml
+++ b/eu.etaxonomy.taxeditor.printpublisher/pom.xml
@@ -3,7 +3,7 @@
        <parent>
                <artifactId>taxeditor-parent</artifactId>
                <groupId>eu.etaxonomy</groupId>
        <parent>
                <artifactId>taxeditor-parent</artifactId>
                <groupId>eu.etaxonomy</groupId>

-               <version>4.5.1</version>
+               <version>4.6.0-SNAPSHOT</version>

        </parent>
 
        <modelVersion>4.0.0</modelVersion>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>

diff --git a/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
index 3c018f39191a4447e3f85c6ee2143e0ef85f687d..1f28fea39c18b0d1b9b7b46c445ed2fbc5356419 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: DataStore Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.store;singleton:=true
 Bundle-ManifestVersion: 2
 Bundle-Name: DataStore Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.store;singleton:=true

-Bundle-Version: 4.5.1
+Bundle-Version: 4.6.0.qualifier

 Bundle-Activator: eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.cdm,
 Bundle-Activator: eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.cdm,

diff --git a/eu.etaxonomy.taxeditor.store/pom.xml b/eu.etaxonomy.taxeditor.store/pom.xml
index e9237e4dc6452733cf3af6e3d1a5c65c4b4ec16f..d99ed65a8548eb7a1a9ca941b7235b62ffd95720 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/pom.xml
+++ b/eu.etaxonomy.taxeditor.store/pom.xml
@@ -3,7 +3,7 @@
   <parent>
        <groupId>eu.etaxonomy</groupId>
        <artifactId>taxeditor-parent</artifactId>
   <parent>
        <groupId>eu.etaxonomy</groupId>
        <artifactId>taxeditor-parent</artifactId>

-       <version>4.5.1</version>
+       <version>4.6.0-SNAPSHOT</version>

   </parent>
 
   <modelVersion>4.0.0</modelVersion>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF
index b9753f4dc4bf5e078b63ff13a35d9d6c3c6be39a..987dc18900ae444f051bc43d1e502ed13a06a81f 100644 (file)
--- a/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: eu.etaxonomy.taxeditor.test
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.test;singleton:=true
 Bundle-ManifestVersion: 2
 Bundle-Name: eu.etaxonomy.taxeditor.test
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.test;singleton:=true

-Bundle-Version: 4.4.0.qualifier
+Bundle-Version: 4.6.0.qualifier

 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: EDIT
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: EDIT
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7

diff --git a/eu.etaxonomy.taxeditor.test/pom.xml b/eu.etaxonomy.taxeditor.test/pom.xml
index 19f896ffdc5cb0a97d385af56c2a16611942c913..736b5aa3a8aa8d1b526183cbfcc9075e48b72ce0 100644 (file)
--- a/eu.etaxonomy.taxeditor.test/pom.xml
+++ b/eu.etaxonomy.taxeditor.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>

-    <version>4.4.0-SNAPSHOT</version>
+    <version>4.6.0-SNAPSHOT</version>

   </parent>
   <artifactId>eu.etaxonomy.taxeditor.test</artifactId>
   <packaging>eclipse-test-plugin</packaging>
   </parent>
   <artifactId>eu.etaxonomy.taxeditor.test</artifactId>
   <packaging>eclipse-test-plugin</packaging>

diff --git a/eu.etaxonomy.taxeditor.webapp/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.webapp/META-INF/MANIFEST.MF
index 17ef6326510995d5fbb749a2df147393ad1861e9..2555e2b004114dc147640cef380e6e4972d8a0fb 100644 (file)
--- a/eu.etaxonomy.taxeditor.webapp/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.webapp/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Webapp
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.webapp;singleton:=true
 Bundle-ManifestVersion: 2
 Bundle-Name: Webapp
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.webapp;singleton:=true

-Bundle-Version: 4.5.1
+Bundle-Version: 4.6.0.qualifier

 Require-Bundle: org.eclipse.core.runtime
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.core.runtime
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy

diff --git a/eu.etaxonomy.taxeditor.webapp/pom.xml b/eu.etaxonomy.taxeditor.webapp/pom.xml
index f886609a8888afbe26852480dc24fe9cb2a72ba7..cc1f71d45982578f049d949927cf293be6005726 100644 (file)
--- a/eu.etaxonomy.taxeditor.webapp/pom.xml
+++ b/eu.etaxonomy.taxeditor.webapp/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>

-    <version>4.5.1</version>
+    <version>4.6.0-SNAPSHOT</version>

   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>eu.etaxonomy.taxeditor.webapp</artifactId>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>eu.etaxonomy.taxeditor.webapp</artifactId>

diff --git a/eu.etaxonomy.taxeditor/pom.xml b/eu.etaxonomy.taxeditor/pom.xml
index fc2f6738a8b54a3495853a950e4342faec739007..57dd38b03deee8ea7b47822b7e6ae7737b566b28 100644 (file)
--- a/eu.etaxonomy.taxeditor/pom.xml
+++ b/eu.etaxonomy.taxeditor/pom.xml
@@ -2,7 +2,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>

-    <version>4.5.1</version>
+    <version>4.6.0-SNAPSHOT</version>

   </parent>
 
   <modelVersion>4.0.0</modelVersion>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/pom.xml b/pom.xml
index 5de75986fef992ef2d2e7e0a03be9be76fd41741..2bd5e53fa848d6800ae2e7a9e4c4b64786cc55e6 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
   </prerequisites>
   <groupId>eu.etaxonomy</groupId>
   <artifactId>taxeditor-parent</artifactId>
   </prerequisites>
   <groupId>eu.etaxonomy</groupId>
   <artifactId>taxeditor-parent</artifactId>

-  <version>4.5.1</version>
+  <version>4.6.0-SNAPSHOT</version>

   <name>EDIT Taxonomic Editor</name>
   <description>The Taxonomic Editor for EDIT's platform for
     cybertaxonomy
   <name>EDIT Taxonomic Editor</name>
   <description>The Taxonomic Editor for EDIT's platform for
     cybertaxonomy