merge validation editor branch to trunk

diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
index af54e6d845dcfd2eb3e490e48aee8a63df0defc0..a8798c87687986d36af7c1ef194ee084cc2248df 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
@@ -94,6 +94,7 @@ Export-Package: com.google.api,
  eu.etaxonomy.cdm.model.occurrence,
  eu.etaxonomy.cdm.model.reference,
  eu.etaxonomy.cdm.model.taxon,
  eu.etaxonomy.cdm.model.occurrence,
  eu.etaxonomy.cdm.model.reference,
  eu.etaxonomy.cdm.model.taxon,

+ eu.etaxonomy.cdm.model.validation,

  eu.etaxonomy.cdm.model.view,
  eu.etaxonomy.cdm.model.view.context,
  eu.etaxonomy.cdm.persistence.dao,
  eu.etaxonomy.cdm.model.view,
  eu.etaxonomy.cdm.model.view.context,
  eu.etaxonomy.cdm.persistence.dao,


@@ -109,12 +110,14 @@ Export-Package: com.google.api,
  eu.etaxonomy.cdm.persistence.dao.hibernate.occurrence,
  eu.etaxonomy.cdm.persistence.dao.hibernate.reference,
  eu.etaxonomy.cdm.persistence.dao.hibernate.taxon,
  eu.etaxonomy.cdm.persistence.dao.hibernate.occurrence,
  eu.etaxonomy.cdm.persistence.dao.hibernate.reference,
  eu.etaxonomy.cdm.persistence.dao.hibernate.taxon,

+ eu.etaxonomy.cdm.persistence.dao.hibernate.validation,

  eu.etaxonomy.cdm.persistence.dao.hibernate.view,
  eu.etaxonomy.cdm.persistence.dao.media,
  eu.etaxonomy.cdm.persistence.dao.name,
  eu.etaxonomy.cdm.persistence.dao.occurrence,
  eu.etaxonomy.cdm.persistence.dao.reference,
  eu.etaxonomy.cdm.persistence.dao.taxon,
  eu.etaxonomy.cdm.persistence.dao.hibernate.view,
  eu.etaxonomy.cdm.persistence.dao.media,
  eu.etaxonomy.cdm.persistence.dao.name,
  eu.etaxonomy.cdm.persistence.dao.occurrence,
  eu.etaxonomy.cdm.persistence.dao.reference,
  eu.etaxonomy.cdm.persistence.dao.taxon,

+ eu.etaxonomy.cdm.persistence.dao.validation,

  eu.etaxonomy.cdm.persistence.fetch,
  eu.etaxonomy.cdm.persistence.hibernate,
  eu.etaxonomy.cdm.persistence.hibernate.permission,
  eu.etaxonomy.cdm.persistence.fetch,
  eu.etaxonomy.cdm.persistence.hibernate,
  eu.etaxonomy.cdm.persistence.hibernate.permission,


@@ -178,6 +181,7 @@ Export-Package: com.google.api,
  eu.etaxonomy.cdm.strategy.merge,
  eu.etaxonomy.cdm.strategy.parser,
  eu.etaxonomy.cdm.strategy.parser.location,
  eu.etaxonomy.cdm.strategy.merge,
  eu.etaxonomy.cdm.strategy.parser,
  eu.etaxonomy.cdm.strategy.parser.location,

+ eu.etaxonomy.cdm.validation,

  eu.etaxonomy.cdm.validation.annotation,
  eu.etaxonomy.cdm.validation.constraint,
  eu.etaxonomy.remote.dto.rdf,
  eu.etaxonomy.cdm.validation.annotation,
  eu.etaxonomy.cdm.validation.constraint,
  eu.etaxonomy.remote.dto.rdf,