fix the taxeditor tests

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/csv/caryophyllales/out/CsvNameExport.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/csv/caryophyllales/out/CsvNameExport.java
index b41d510193cc73003f15d7cafdd3566a9bc3e5f6..5b49a772069e89334bd39768510526e6c082b054 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/csv/caryophyllales/out/CsvNameExport.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/csv/caryophyllales/out/CsvNameExport.java
@@ -47,6 +47,14 @@ import eu.etaxonomy.cdm.persistence.query.MatchMode;
 \r
 @Component\r
 public class CsvNameExport extends CsvNameExportBase {\r
+    /**\r
+     *\r
+     */\r
+    private static final long serialVersionUID = 1L;\r
+    /**\r
+     *\r
+     */\r
+\r
     private static final Logger logger = Logger.getLogger(CsvNameExport.class);\r
 \r
     public CsvNameExport() {\r
@@ -291,17 +299,25 @@ public class CsvNameExport extends CsvNameExportBase {
         nameRecord.put("familyName", name.getNameCache());\r
         extractDescriptions(nameRecord, taxon, Feature.INTRODUCTION(), "descriptionsFam");\r
 \r
-\r
-        taxon = (Taxon) getTaxonService().load(genusNode.getTaxon().getUuid());\r
-        taxon = HibernateProxyHelper.deproxy(taxon, Taxon.class);\r
-        //  if (taxon.isPublish()){\r
-        nameRecord.put("genusTaxon", taxon.getTitleCache());\r
-        if (taxon.getSec()!= null){\r
-            nameRecord.put("secRef", taxon.getSec().getTitleCache());\r
+        if (genusNode.getTaxon() == null){\r
+            nameRecord.put("genusTaxon", null);\r
+            return nameRecord;\r
         }else{\r
-            nameRecord.put("secRef", null);\r
+            taxon = (Taxon) getTaxonService().load(genusNode.getTaxon().getUuid());\r
+            taxon = HibernateProxyHelper.deproxy(taxon, Taxon.class);\r
+            nameRecord.put("genusTaxon", taxon.getTitleCache());\r
+\r
+            if (taxon.getSec()!= null){\r
+                nameRecord.put("secRef", taxon.getSec().getTitleCache());\r
+            }else{\r
+                nameRecord.put("secRef", null);\r
+            }\r
         }\r
 \r
+        //  if (taxon.isPublish()){\r
+\r
+\r
+\r
         name = HibernateProxyHelper.deproxy(getNameService().load(taxon.getName().getUuid()), BotanicalName.class);\r
         nameRecord.put("genusName",name.getTitleCache());\r
         nameRecord.put("nameId", String.valueOf(name.getId()));\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/csv/caryophyllales/out/CsvNameExportConfigurator.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/csv/caryophyllales/out/CsvNameExportConfigurator.java
index b9dcef30b924ee9dc96e9a83041e235a306b44e0..479b68451fa2bf92bbb7aa750a5909d23c362126 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/csv/caryophyllales/out/CsvNameExportConfigurator.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/csv/caryophyllales/out/CsvNameExportConfigurator.java
@@ -11,7 +11,10 @@ import eu.etaxonomy.cdm.io.common.mapping.out.IExportTransformer;
 \r
 public class CsvNameExportConfigurator extends XmlExportConfiguratorBase<CsvNameExportState>{\r
 \r
-       private ByteArrayOutputStream byteOutputStream;\r
+    private static final long serialVersionUID = 1L;\r
+\r
+\r
+    private ByteArrayOutputStream byteOutputStream;\r
        private String encoding = "UTF-8";\r
        private String linesTerminatedBy = "\r\n";\r
        private String fieldsEnclosedBy = "\"";\r

diff --git a/cdmlib-remote-webapp/ide/eclipse/RunJettyRun/cdmlib-remote-webapp-unit-tests.launch b/cdmlib-remote-webapp/ide/eclipse/RunJettyRun/cdmlib-remote-webapp-unit-tests.launch
index 0a972dbb0e82db30f8730808e52b69992375e37a..4a9627f058ec34003e0a569c86926240e8e59c2f 100644 (file)
--- a/cdmlib-remote-webapp/ide/eclipse/RunJettyRun/cdmlib-remote-webapp-unit-tests.launch
+++ b/cdmlib-remote-webapp/ide/eclipse/RunJettyRun/cdmlib-remote-webapp-unit-tests.launch
@@ -10,7 +10,7 @@
 <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="RunJettyRunWebAppClassPathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="runjettyrun.Bootstrap"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="cdmlib-remote-webapp"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx800M&#13;&#10;-Dlog4j.configDebug=true&#10;-Dorg.mortbay.jetty.webapp.parentLoaderPriority=true&#10;-Dspring.profiles.active=remoting&#10;-Dcdm.datasource=local-cdmTest"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx800M&#13;&#10;-Dlog4j.configDebug=true&#13;&#10;&#10;-Dorg.mortbay.jetty.webapp.parentLoaderPriority=true&#13;&#10;&#10;-Dspring.profiles.active=remoting&#10;&#13;&#10;-Dcdm.datasource=local-cdmTest"/>
 <stringAttribute key="run_jetty_run.CONTEXT_ATTR" value="/"/>
 <booleanAttribute key="run_jetty_run.ENABLE_JNDI_ATTR" value="false"/>
 <booleanAttribute key="run_jetty_run.ENABLE_MAVEN_TEST_CLASSES_ATTR" value="true"/>