moving sdd export to out folder and renaming SDDDescriptionIO -> SDDImport

diff --git a/.gitattributes b/.gitattributes
index 7d42fa15817ba777a1cdb8fa5ec6b4057d3f3794..88159c06717cf0c8a680a89340cb40a99e2a686c 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1572,15 +1572,16 @@ cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/reference/endnote/in/EndnoteImportCo
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/reference/endnote/in/EndnoteImportState.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/reference/endnote/in/EndnoteRecordsImport.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/reference/endnote/in/IEndnotePlaceholderClass.java -text
-cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/SDDCdmExporter.java -text
-cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/SDDDataSet.java -text
-cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/SDDDescriptionIO.java -text
-cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/SDDDocumentBuilder.java -text
-cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/SDDExportConfigurator.java -text
-cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/SDDExportState.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/SDDImport.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/SDDImportConfigurator.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/SDDImportState.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/SDDIoBase.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/SDDTransformer.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/out/SDDCdmExporter.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/out/SDDDataSet.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/out/SDDDocumentBuilder.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/out/SDDExportConfigurator.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/out/SDDExportState.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/SpecimenIoBase.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/UnitsGatheringArea.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/UnitsGatheringEvent.java -text
@@ -1666,8 +1667,8 @@ cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/jaxb/TermTest.java -text
 cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/jaxb/TestCdmSchemaGenerator.java -text
 cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/jaxb/URIEncoder.java -text
 cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/reference/EndnoteRecordsImportTest.java -text
-cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/sdd/SDDCdmExporterTest.java -text
 cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/sdd/SDDDescriptionIOTest.java -text
+cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/sdd/out/SDDCdmExporterTest.java -text
 cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/specimen/abcd206/SpecimenImportConfiguratorTest.java -text
 cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/taxonx/TaxonXImportConfiguratorTest.java -text
 cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/tcsrdf/TcsRdfImportConfiguratorTest.java -text

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/sdd/ViolaExportActivator.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/sdd/ViolaExportActivator.java
index 5bdf9454de0accfa4af8fb27206f2e0660a0ed5d..91868c8ae3d9f44991589dbfaa01c2af7657d4bf 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/app/sdd/ViolaExportActivator.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/sdd/ViolaExportActivator.java
@@ -15,7 +15,7 @@ import eu.etaxonomy.cdm.database.DbSchemaValidation;
 import eu.etaxonomy.cdm.database.ICdmDataSource;\r
 import eu.etaxonomy.cdm.io.common.CdmDefaultExport;\r
 import eu.etaxonomy.cdm.io.common.IImportConfigurator.DO_REFERENCES;\r
-import eu.etaxonomy.cdm.io.sdd.SDDExportConfigurator;\r
+import eu.etaxonomy.cdm.io.sdd.out.SDDExportConfigurator;\r
 \r
 /**\r
  * @author h.fradin (from a.babadshanjan eu.etaxonomy.cdm.app.jaxb.CdmExportImportActivator)\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/pilotOutputHtml/PilotOutputDescriptionExporter.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/pilotOutputHtml/PilotOutputDescriptionExporter.java
index 924d9e0416edd4a43ff1ebb50b1ef79041340418..28ab9d7c0801a30c318dc4c81bc535de3e13b224 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/pilotOutputHtml/PilotOutputDescriptionExporter.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/pilotOutputHtml/PilotOutputDescriptionExporter.java
@@ -25,7 +25,7 @@ import eu.etaxonomy.cdm.io.common.CdmExportBase;
 import eu.etaxonomy.cdm.io.common.ICdmExport;\r
 import eu.etaxonomy.cdm.io.common.IExportConfigurator;\r
 import eu.etaxonomy.cdm.io.common.IImportConfigurator;\r
-import eu.etaxonomy.cdm.io.sdd.SDDDataSet;\r
+import eu.etaxonomy.cdm.io.sdd.out.SDDDataSet;\r
 import eu.etaxonomy.cdm.model.agent.AgentBase;\r
 import eu.etaxonomy.cdm.model.common.DefinedTermBase;\r
 import eu.etaxonomy.cdm.model.common.RelationshipBase;\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/pilotOutputHtml/PilotOutputDocumentBuilder.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/pilotOutputHtml/PilotOutputDocumentBuilder.java
index 977a8bf73cb571ea663d7c85ccbdb4349ce78b95..53dae092b1762229b78df567d0383d1679b22ed6 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/pilotOutputHtml/PilotOutputDocumentBuilder.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/pilotOutputHtml/PilotOutputDocumentBuilder.java
@@ -19,7 +19,7 @@ import javax.xml.bind.Marshaller;
 import org.apache.log4j.Logger;\r
 \r
 import eu.etaxonomy.cdm.io.jaxb.CdmMarshallerListener;\r
-import eu.etaxonomy.cdm.io.sdd.SDDDataSet;\r
+import eu.etaxonomy.cdm.io.sdd.out.SDDDataSet;\r
 import eu.etaxonomy.cdm.model.common.Language;\r
 import eu.etaxonomy.cdm.model.common.LanguageString;\r
 import eu.etaxonomy.cdm.model.common.Representation;\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/pilotOutputHtml/PilotOutputExporter.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/pilotOutputHtml/PilotOutputExporter.java
index b8e34370c81b022714657241567318e4d0190898..61b3dd3b601bf29875d477ba0cd146a0cc0492f1 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/pilotOutputHtml/PilotOutputExporter.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/pilotOutputHtml/PilotOutputExporter.java
@@ -25,7 +25,7 @@ import eu.etaxonomy.cdm.io.common.CdmExportBase;
 import eu.etaxonomy.cdm.io.common.ICdmExport;\r
 import eu.etaxonomy.cdm.io.common.IExportConfigurator;\r
 import eu.etaxonomy.cdm.io.common.IImportConfigurator;\r
-import eu.etaxonomy.cdm.io.sdd.SDDDataSet;\r
+import eu.etaxonomy.cdm.io.sdd.out.SDDDataSet;\r
 import eu.etaxonomy.cdm.model.agent.AgentBase;\r
 import eu.etaxonomy.cdm.model.common.DefinedTermBase;\r
 import eu.etaxonomy.cdm.model.common.RelationshipBase;\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/SDDDescriptionIO.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/SDDImport.java
similarity index 96%
rename from cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/SDDDescriptionIO.java
rename to cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/SDDImport.java
index 0b5e4bbe28f4a3f9259e7f348b1dbeabb83352b3..c46e7757e9f469cdfd782b7aac43ed61c8c1278b 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/SDDDescriptionIO.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/SDDImport.java
@@ -23,7 +23,6 @@ import java.util.Map;
 import java.util.Set;\r
 \r
 import org.apache.log4j.Logger;\r
-import org.apache.log4j.spi.Configurator;\r
 import org.jdom.Element;\r
 import org.jdom.Namespace;\r
 import org.joda.time.DateTime;\r
@@ -34,9 +33,6 @@ import eu.etaxonomy.cdm.api.service.IDescriptionService;
 import eu.etaxonomy.cdm.api.service.IReferenceService;\r
 import eu.etaxonomy.cdm.api.service.ITaxonService;\r
 import eu.etaxonomy.cdm.api.service.ITermService;\r
-import eu.etaxonomy.cdm.api.service.config.ITaxonServiceConfigurator;\r
-import eu.etaxonomy.cdm.api.service.config.impl.TaxonServiceConfiguratorImpl;\r
-import eu.etaxonomy.cdm.api.service.pager.Pager;\r
 import eu.etaxonomy.cdm.common.mediaMetaData.ImageMetaData;\r
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;\r
 import eu.etaxonomy.cdm.io.common.CdmImportBase;\r
@@ -87,10 +83,8 @@ import eu.etaxonomy.cdm.model.reference.ReferenceBase;
 import eu.etaxonomy.cdm.model.reference.ReferenceFactory;\r
 import eu.etaxonomy.cdm.model.taxon.Synonym;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
-import eu.etaxonomy.cdm.model.taxon.TaxonBase;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonomicTree;\r
-import eu.etaxonomy.cdm.persistence.query.MatchMode;\r
 \r
 /**\r
  * @author h.fradin\r
@@ -98,8 +92,8 @@ import eu.etaxonomy.cdm.persistence.query.MatchMode;
  * @version 1.0\r
  */\r
 @Component("sddDescriptionIO")\r
-public class SDDDescriptionIO extends CdmImportBase<SDDImportConfigurator, SDDImportState> implements ICdmImport<SDDImportConfigurator, SDDImportState> {\r
-       private static final Logger logger = Logger.getLogger(SDDDescriptionIO.class);\r
+public class SDDImport extends CdmImportBase<SDDImportConfigurator, SDDImportState> implements ICdmImport<SDDImportConfigurator, SDDImportState> {\r
+       private static final Logger logger = Logger.getLogger(SDDImport.class);\r
 \r
        private static int modCount = 1000;\r
 \r
@@ -148,7 +142,7 @@ public class SDDDescriptionIO extends CdmImportBase<SDDImportConfigurator, SDDIm
 \r
        private int taxonNamesCount = 0; //XIM ajout\r
        \r
-       public SDDDescriptionIO(){\r
+       public SDDImport(){\r
                super();\r
        }\r
 \r
@@ -163,14 +157,14 @@ public class SDDDescriptionIO extends CdmImportBase<SDDImportConfigurator, SDDIm
        //      public boolean doInvoke(IImportConfigurator config, Map<String, MapWrapper<? extends CdmBase>> stores){\r
        @Override\r
        public boolean doInvoke(SDDImportState state){\r
-\r
+               boolean success = true;\r
+               \r
                TransactionStatus ts = startTransaction();\r
                SDDImportConfigurator sddConfig = state.getConfig();\r
 \r
                logger.info("start Datasets ...");\r
                // <Datasets xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://rs.tdwg.org/UBIF/2006/" xsi:schemaLocation="http://rs.tdwg.org/UBIF/2006/ ../SDD.xsd">\r
                Element root = sddConfig.getSourceRoot();\r
-               boolean success = true;\r
                Namespace sddNamespace = sddConfig.getSddNamespace();\r
 \r
                logger.info("start TechnicalMetadata ...");\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/SDDImportConfigurator.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/SDDImportConfigurator.java
index 9dd6e2dd33d295ff170e299212c00d23ad68ccca..13fe0e25f60bb3c88d6f8c09441c4653571e6622 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/SDDImportConfigurator.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/SDDImportConfigurator.java
@@ -46,7 +46,7 @@ public class SDDImportConfigurator extends ImportConfiguratorBase implements IIm
 \r
        protected void makeIoClassList(){\r
                ioClassList = new Class[]{\r
-                               SDDDescriptionIO.class\r
+                               SDDImport.class\r
                };\r
        };\r
        \r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/SDDTransformer.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/SDDTransformer.java
new file mode 100644 (file)
index 0000000..fbb2e9e
--- /dev/null
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/SDDTransformer.java
@@ -0,0 +1,104 @@
+// $Id$\r
+/**\r
+* Copyright (C) 2007 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.io.sdd;\r
+\r
+import java.util.UUID;\r
+\r
+import org.apache.log4j.Logger;\r
+\r
+import eu.etaxonomy.cdm.common.CdmUtils;\r
+import eu.etaxonomy.cdm.io.common.mapping.InputTransformerBase;\r
+import eu.etaxonomy.cdm.io.common.mapping.UndefinedTransformerMethodException;\r
+import eu.etaxonomy.cdm.model.common.MarkerType;\r
+import eu.etaxonomy.cdm.model.description.Feature;\r
+\r
+/**\r
+ * @author a.mueller\r
+ * @created 01.03.2010\r
+ * @version 1.0\r
+ */\r
+public class SDDTransformer extends InputTransformerBase {\r
+       @SuppressWarnings("unused")\r
+       private static final Logger logger = Logger.getLogger(SDDTransformer.class);\r
+       \r
+       \r
+       \r
+       //feature uuids\r
+       public static final UUID uuidNote = UUID.fromString("b9af1489-6b68-497f-8d4b-260a9f886827");\r
+       \r
+       //extension type uuids\r
+       public static final UUID uuidTitle = UUID.fromString("5d9ca987-81f1-4d6c-b06a-eaa8311ca249");\r
+       \r
+       //marker type uuid\r
+       public static final UUID uuidExcludedTaxon = UUID.fromString("e729a22d-8c94-4859-9f91-3e3ae212c91d");\r
+       \r
+\r
+       /* (non-Javadoc)\r
+        * @see eu.etaxonomy.cdm.io.common.mapping.InputTransformerBase#getFeatureByKey(java.lang.String)\r
+        */\r
+       @Override\r
+       public Feature getFeatureByKey(String key) throws UndefinedTransformerMethodException {\r
+               if (CdmUtils.isEmpty(key)){return null;\r
+               }else if (key.equalsIgnoreCase("distribution")){return Feature.DISTRIBUTION();\r
+               }else if (key.equalsIgnoreCase("habitatecology")){return Feature.ECOLOGY();\r
+               }else{\r
+                       return null;\r
+               }\r
+       }\r
+\r
+       /* (non-Javadoc)\r
+        * @see eu.etaxonomy.cdm.io.common.mapping.InputTransformerBase#getFeatureUuid(java.lang.String)\r
+        */\r
+       @Override\r
+       public UUID getFeatureUuid(String key)  throws UndefinedTransformerMethodException {\r
+               if (CdmUtils.isEmpty(key)){return null;\r
+\r
+               }else if (key.equalsIgnoreCase("lifeform")){return uuidNote;\r
+               \r
+               }else{\r
+                       return null;\r
+               }\r
+               \r
+       }\r
+\r
+       \r
+\r
+       /* (non-Javadoc)\r
+        * @see eu.etaxonomy.cdm.io.common.mapping.InputTransformerBase#getMarkerTypeByKey(java.lang.String)\r
+        */\r
+       @Override\r
+       public MarkerType getMarkerTypeByKey(String key) throws UndefinedTransformerMethodException {\r
+               if (CdmUtils.isEmpty(key)){return null;\r
+//             }else if (key.equalsIgnoreCase("distribution")){return MarkerType.;\r
+//             }else if (key.equalsIgnoreCase("habitatecology")){return Feature.ECOLOGY();\r
+               }else{\r
+                       return null;\r
+               }\r
+       }\r
+\r
+       @Override\r
+       public UUID getMarkerTypeUuid(String key) throws UndefinedTransformerMethodException {\r
+               if (CdmUtils.isEmpty(key)){return null;\r
+               }else if (key.equalsIgnoreCase("excluded")){return uuidExcludedTaxon;\r
+               }else if (key.equalsIgnoreCase("EXCLUDED SPECIES, OF UNCERTAIN AFHNITIES PTELEOCARPA")){return uuidExcludedTaxon;\r
+               }else if (key.equalsIgnoreCase("EXCLUDED GENUS, OF UNCERTAIN AFHNITIES PTELEOCARPA")){return uuidExcludedTaxon;\r
+               }else if (key.equalsIgnoreCase("INCOMPLETELY KNOWN SPECIES")){return uuidNote;\r
+               }else{\r
+                       return null;\r
+               }\r
+               \r
+       }\r
+       \r
+       \r
+       \r
+       \r
+       \r
+}\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/SDDCdmExporter.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/out/SDDCdmExporter.java
similarity index 97%
rename from cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/SDDCdmExporter.java
rename to cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/out/SDDCdmExporter.java
index 62dbce0634512a66b2a2eb089843c36156a9544b..6dcbcba9ac23a265a2fb9f3c4c995f79f793bc77 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/SDDCdmExporter.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/out/SDDCdmExporter.java
@@ -7,7 +7,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.\r
 */\r
 \r
-package eu.etaxonomy.cdm.io.sdd;\r
+package eu.etaxonomy.cdm.io.sdd.out;\r
 \r
 import java.io.File;\r
 import java.io.FileOutputStream;\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/SDDDataSet.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/out/SDDDataSet.java
similarity index 97%
rename from cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/SDDDataSet.java
rename to cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/out/SDDDataSet.java
index 6e1610ded6f5ac2d2052d8658e181bfb38b859c6..82bf133434696e762889163c448950888ce61ecf 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/SDDDataSet.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/out/SDDDataSet.java
@@ -7,7 +7,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.\r
 */\r
 \r
-package eu.etaxonomy.cdm.io.sdd;\r
+package eu.etaxonomy.cdm.io.sdd.out;\r
 \r
 import java.util.ArrayList;\r
 import java.util.Collection;\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/SDDDocumentBuilder.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/out/SDDDocumentBuilder.java
similarity index 97%
rename from cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/SDDDocumentBuilder.java
rename to cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/out/SDDDocumentBuilder.java
index f6125b174fce75788c8911d7d1ef011baf04b86c..eca8a95eb15a91780efc8f6b913cbee4e5ef1f24 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/SDDDocumentBuilder.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/out/SDDDocumentBuilder.java
@@ -7,7 +7,7 @@
  * See LICENSE.TXT at the top of this package for the full license terms.\r
  */\r
 \r
-package eu.etaxonomy.cdm.io.sdd;\r
+package eu.etaxonomy.cdm.io.sdd.out;\r
 \r
 import java.io.File;\r
 import java.io.FileOutputStream;\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/SDDExportConfigurator.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/out/SDDExportConfigurator.java
similarity index 94%
rename from cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/SDDExportConfigurator.java
rename to cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/out/SDDExportConfigurator.java
index 978916383a6c3dcfc2d82063368c31da3b8821a3..5265912b593353d6b6162ed0b9e8fe9124bf09ef 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/SDDExportConfigurator.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/out/SDDExportConfigurator.java
@@ -7,7 +7,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.\r
 */\r
 \r
-package eu.etaxonomy.cdm.io.sdd;\r
+package eu.etaxonomy.cdm.io.sdd.out;\r
 \r
 import java.io.File;\r
 \r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/SDDExportState.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/out/SDDExportState.java
similarity index 91%
rename from cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/SDDExportState.java
rename to cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/out/SDDExportState.java
index 7ce8344a9cb1b7fd196ab7bc6b3cf89c3a50cc91..a9fab01876789e86001c5f6928edd98bd88420df 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/SDDExportState.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/out/SDDExportState.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.\r
 */\r
 \r
-package eu.etaxonomy.cdm.io.sdd;\r
+package eu.etaxonomy.cdm.io.sdd.out;\r
 \r
 import org.apache.log4j.Logger;\r
 \r

diff --git a/cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/sdd/SDDDescriptionIOTest.java b/cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/sdd/SDDDescriptionIOTest.java
index 03ffff7362e62a5541f7b56fd71de1762980eec3..fb07d78ec8f64b2b8daf0e8acf1700417c17bd04 100644 (file)
--- a/cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/sdd/SDDDescriptionIOTest.java
+++ b/cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/sdd/SDDDescriptionIOTest.java
@@ -36,7 +36,7 @@ import eu.etaxonomy.cdm.test.integration.CdmTransactionalIntegrationTest;
 public class SDDDescriptionIOTest extends CdmTransactionalIntegrationTest {\r
        \r
        @SpringBeanByType\r
-       SDDDescriptionIO sddDescriptionIo;\r
+       SDDImport sddDescriptionIo;\r
        \r
        @SpringBeanByType\r
        INameService nameService;\r

diff --git a/cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/sdd/SDDCdmExporterTest.java b/cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/sdd/out/SDDCdmExporterTest.java
similarity index 91%
rename from cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/sdd/SDDCdmExporterTest.java
rename to cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/sdd/out/SDDCdmExporterTest.java
index fde192bc282b8017cdae9a12633d0d213212dc3a..0bef5626ee6602f5d5ca64917cc5b161923f6ad7 100644 (file)
--- a/cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/sdd/SDDCdmExporterTest.java
+++ b/cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/sdd/out/SDDCdmExporterTest.java
@@ -7,7 +7,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.\r
 */\r
 \r
-package eu.etaxonomy.cdm.io.sdd;\r
+package eu.etaxonomy.cdm.io.sdd.out;\r
 \r
 import static org.junit.Assert.assertEquals;\r
 import static org.junit.Assert.assertNotNull;\r
@@ -22,6 +22,7 @@ import eu.etaxonomy.cdm.api.service.INameService;
 import eu.etaxonomy.cdm.database.ICdmDataSource;\r
 import eu.etaxonomy.cdm.io.common.IExportConfigurator;\r
 import eu.etaxonomy.cdm.io.common.IImportConfigurator;\r
+import eu.etaxonomy.cdm.io.sdd.out.SDDCdmExporter;\r
 import eu.etaxonomy.cdm.test.integration.CdmTransactionalIntegrationTest;\r
 /**\r
  * @author a.mueller\r