move children up to parent in code

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonNode.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonNode.java
index 66485c9cbd41d1d6da1bf832340895f58260a948..8d8544aab996fbd3ed64673925bf30cae765f195 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonNode.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonNode.java
@@ -116,20 +116,6 @@ public class TaxonNode
 //    @Cascade({CascadeType.SAVE_UPDATE, CascadeType.MERGE})
     private TaxonNode parent;
 
-    @XmlElement(name = "treeIndex")
-    @Column(length=255)
-    @Field(store = Store.YES, index = Index.YES, analyze = Analyze.NO)
-    private String treeIndex;
-
-    @XmlElement(name = "classification")
-    @XmlIDREF
-    @XmlSchemaType(name = "IDREF")
-    @ManyToOne(fetch = FetchType.LAZY)
-    @Cascade({CascadeType.SAVE_UPDATE,CascadeType.MERGE})
-//     TODO @NotNull // avoids creating a UNIQUE key for this field
-    @IndexedEmbedded(includeEmbeddedObjectId=true)
-    private Classification classification;
-
     @XmlElementWrapper(name = "childNodes")
     @XmlElement(name = "childNode")
     @XmlIDREF
@@ -146,6 +132,20 @@ public class TaxonNode
     @XmlElement(name = "countChildren")
     private int countChildren;
 
+    @XmlElement(name = "treeIndex")
+    @Column(length=255)
+    @Field(store = Store.YES, index = Index.YES, analyze = Analyze.NO)
+    private String treeIndex;
+
+    @XmlElement(name = "classification")
+    @XmlIDREF
+    @XmlSchemaType(name = "IDREF")
+    @ManyToOne(fetch = FetchType.LAZY)
+    @Cascade({CascadeType.SAVE_UPDATE,CascadeType.MERGE})
+//     TODO @NotNull // avoids creating a UNIQUE key for this field
+    @IndexedEmbedded(includeEmbeddedObjectId=true)
+    private Classification classification;
+
     @XmlElementWrapper(name = "agentRelations")
     @XmlElement(name = "agentRelation")
     @XmlIDREF