fixing namespaces

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/oaipmh/ReferenceOaiPmhController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/oaipmh/ReferenceOaiPmhController.java
index c42763459a0a12da54180d86ec8dcf0698eb4207..945a38a07f4fd7a1208c54ee6091ebfd58042f72 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/oaipmh/ReferenceOaiPmhController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/oaipmh/ReferenceOaiPmhController.java
@@ -1,3 +1,12 @@
+// $Id$\r
+/**\r
+* Copyright (C) 2009 EDIT\r
+* European Distributed Institute of Taxonomy \r
+* http://www.e-taxonomy.eu\r
+* \r
+* The contents of this file are subject to the Mozilla Public License Version 1.1\r
+* See LICENSE.TXT at the top of this package for the full license terms.\r
+*/\r
 package eu.etaxonomy.cdm.remote.controller.oaipmh;\r
 \r
 import static eu.etaxonomy.cdm.remote.dto.oaipmh.MetadataPrefix.DWC;\r

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/oaipmh/TaxonOaiPmhController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/oaipmh/TaxonOaiPmhController.java
index ab5a63c8fed208d4380ad58de59005a25f686b8b..e3f30f2b9ce0165fc5adcc6e69dba94759ffa252 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/oaipmh/TaxonOaiPmhController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/oaipmh/TaxonOaiPmhController.java
@@ -1,3 +1,12 @@
+// $Id$\r
+/**\r
+* Copyright (C) 2009 EDIT\r
+* European Distributed Institute of Taxonomy \r
+* http://www.e-taxonomy.eu\r
+* \r
+* The contents of this file are subject to the Mozilla Public License Version 1.1\r
+* See LICENSE.TXT at the top of this package for the full license terms.\r
+*/\r
 package eu.etaxonomy.cdm.remote.controller.oaipmh;\r
 \r
 import java.util.ArrayList;\r

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/oaipmh/DarwinCoreSimple.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/oaipmh/DarwinCoreSimple.java
index efdc5065558957c798b0d52326832545cb06c02d..0834010df8e9c7242ff049f8a0dde7fde67332af 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/oaipmh/DarwinCoreSimple.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/oaipmh/DarwinCoreSimple.java
@@ -1,4 +1,15 @@
+// $Id$\r
+/**\r
+* Copyright (C) 2009 EDIT\r
+* European Distributed Institute of Taxonomy \r
+* http://www.e-taxonomy.eu\r
+* \r
+* The contents of this file are subject to the Mozilla Public License Version 1.1\r
+* See LICENSE.TXT at the top of this package for the full license terms.\r
+*/\r
+\r
 package eu.etaxonomy.cdm.remote.dto.oaipmh;\r
+// TODO move into other package :  eu.etaxonomy.cdm.remote.dto.dwc\r
 \r
 import javax.xml.bind.annotation.XmlAccessType;\r
 import javax.xml.bind.annotation.XmlAccessorType;\r
@@ -47,7 +58,7 @@ import org.joda.time.DateTime;
  *\r
  */\r
 @XmlAccessorType(XmlAccessType.FIELD)\r
-@XmlType(name = "dwc_type", namespace = "http://rs.tdwg.org/dwc/xsd/simpledarwincore/", propOrder = {\r
+@XmlType(name = "SimpleDarwinRecord", namespace = "http://rs.tdwg.org/dwc/xsd/simpledarwincore/", propOrder = {\r
                "type",\r
                "modified",\r
                "language",\r

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/oaipmh/Metadata.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/oaipmh/Metadata.java
index d76711a712847957f2280c46ab4da68e71e2a355..de8416e09584ccba89f86705c1ede4f1b030c055 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/oaipmh/Metadata.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/oaipmh/Metadata.java
@@ -51,7 +51,7 @@ public class Metadata {
            @XmlElement(name = "dc", namespace = "http://www.openarchives.org/OAI/2.0/oai_dc/", type = OaiDc.class),\r
            @XmlElement(name = "TaxonConcept", namespace = "http://rs.tdwg.org/ontology/voc/TaxonConcept#", type = TaxonConcept.class),\r
            @XmlElement(name = "SpeciesProfileModel", namespace = "http://rs.tdwg.org/ontology/voc/SpeciesProfileModel#", type = SpeciesProfileModel.class),\r
-           @XmlElement(name = "dwc", namespace = "http://rs.tdwg.org/dwc/xsd/simpledarwincore/SimpleDarwinRecord/", type = DarwinCoreSimple.class)\r
+           @XmlElement(name = "SimpleDarwinRecord", namespace = "http://rs.tdwg.org/dwc/xsd/simpledarwincore/", type = DarwinCoreSimple.class)\r
        })\r
     protected Object any;\r
 \r