# HG changeset patch # User Sascha L. Teichmann # Date 1366883676 -7200 # Node ID 18619c1e7c2a45d7a753cf9f4d223470750c0854 # Parent dfb26b03b179dd3cb1d19473fd8cd50561c15392 Repaired internal references. diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/de/intevation/hibernate/MapResultTransformer.java --- a/flys-backend/src/main/java/de/intevation/hibernate/MapResultTransformer.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/de/intevation/hibernate/MapResultTransformer.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.hibernate; +package org.dive4elements.hibernate; import java.util.HashMap; import java.util.Map; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/de/intevation/seddb/model/Bezugspegel.java --- a/flys-backend/src/main/java/de/intevation/seddb/model/Bezugspegel.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/de/intevation/seddb/model/Bezugspegel.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.seddb.model; +package org.dive4elements.seddb.model; // Generated 14.06.2012 11:30:57 by Hibernate Tools 3.4.0.CR1 diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/de/intevation/seddb/model/Bezugspegelgew.java --- a/flys-backend/src/main/java/de/intevation/seddb/model/Bezugspegelgew.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/de/intevation/seddb/model/Bezugspegelgew.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.seddb.model; +package org.dive4elements.seddb.model; // Generated 14.06.2012 11:30:57 by Hibernate Tools 3.4.0.CR1 diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/de/intevation/seddb/model/BezugspegelgewId.java --- a/flys-backend/src/main/java/de/intevation/seddb/model/BezugspegelgewId.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/de/intevation/seddb/model/BezugspegelgewId.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.seddb.model; +package org.dive4elements.seddb.model; // Generated 14.06.2012 11:30:57 by Hibernate Tools 3.4.0.CR1 diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/de/intevation/seddb/model/Bild.java --- a/flys-backend/src/main/java/de/intevation/seddb/model/Bild.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/de/intevation/seddb/model/Bild.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.seddb.model; +package org.dive4elements.seddb.model; // Generated 14.06.2012 11:30:57 by Hibernate Tools 3.4.0.CR1 diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/de/intevation/seddb/model/Gewaesser.java --- a/flys-backend/src/main/java/de/intevation/seddb/model/Gewaesser.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/de/intevation/seddb/model/Gewaesser.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.seddb.model; +package org.dive4elements.seddb.model; // Generated 14.06.2012 11:30:57 by Hibernate Tools 3.4.0.CR1 diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/de/intevation/seddb/model/Gfaenger.java --- a/flys-backend/src/main/java/de/intevation/seddb/model/Gfaenger.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/de/intevation/seddb/model/Gfaenger.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.seddb.model; +package org.dive4elements.seddb.model; // Generated 14.06.2012 11:30:57 by Hibernate Tools 3.4.0.CR1 diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/de/intevation/seddb/model/Glotlinks.java --- a/flys-backend/src/main/java/de/intevation/seddb/model/Glotlinks.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/de/intevation/seddb/model/Glotlinks.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.seddb.model; +package org.dive4elements.seddb.model; // Generated 14.06.2012 11:30:57 by Hibernate Tools 3.4.0.CR1 diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/de/intevation/seddb/model/GlotlinksId.java --- a/flys-backend/src/main/java/de/intevation/seddb/model/GlotlinksId.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/de/intevation/seddb/model/GlotlinksId.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.seddb.model; +package org.dive4elements.seddb.model; // Generated 14.06.2012 11:30:57 by Hibernate Tools 3.4.0.CR1 diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/de/intevation/seddb/model/Glotrechte.java --- a/flys-backend/src/main/java/de/intevation/seddb/model/Glotrechte.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/de/intevation/seddb/model/Glotrechte.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.seddb.model; +package org.dive4elements.seddb.model; // Generated 14.06.2012 11:30:57 by Hibernate Tools 3.4.0.CR1 diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/de/intevation/seddb/model/Gprobe.java --- a/flys-backend/src/main/java/de/intevation/seddb/model/Gprobe.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/de/intevation/seddb/model/Gprobe.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.seddb.model; +package org.dive4elements.seddb.model; // Generated 14.06.2012 11:30:57 by Hibernate Tools 3.4.0.CR1 diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/de/intevation/seddb/model/GprobeId.java --- a/flys-backend/src/main/java/de/intevation/seddb/model/GprobeId.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/de/intevation/seddb/model/GprobeId.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.seddb.model; +package org.dive4elements.seddb.model; // Generated 14.06.2012 11:30:57 by Hibernate Tools 3.4.0.CR1 diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/de/intevation/seddb/model/Gsiebsatz.java --- a/flys-backend/src/main/java/de/intevation/seddb/model/Gsiebsatz.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/de/intevation/seddb/model/Gsiebsatz.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.seddb.model; +package org.dive4elements.seddb.model; // Generated 14.06.2012 11:30:57 by Hibernate Tools 3.4.0.CR1 diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/de/intevation/seddb/model/Gsiebung.java --- a/flys-backend/src/main/java/de/intevation/seddb/model/Gsiebung.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/de/intevation/seddb/model/Gsiebung.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.seddb.model; +package org.dive4elements.seddb.model; // Generated 14.06.2012 11:30:57 by Hibernate Tools 3.4.0.CR1 diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/de/intevation/seddb/model/Gsiebungsieb.java --- a/flys-backend/src/main/java/de/intevation/seddb/model/Gsiebungsieb.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/de/intevation/seddb/model/Gsiebungsieb.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.seddb.model; +package org.dive4elements.seddb.model; // Generated 14.06.2012 11:30:57 by Hibernate Tools 3.4.0.CR1 diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/de/intevation/seddb/model/GsiebungsiebId.java --- a/flys-backend/src/main/java/de/intevation/seddb/model/GsiebungsiebId.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/de/intevation/seddb/model/GsiebungsiebId.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.seddb.model; +package org.dive4elements.seddb.model; // Generated 14.06.2012 11:30:57 by Hibernate Tools 3.4.0.CR1 diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/de/intevation/seddb/model/Hpeilpunkt.java --- a/flys-backend/src/main/java/de/intevation/seddb/model/Hpeilpunkt.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/de/intevation/seddb/model/Hpeilpunkt.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.seddb.model; +package org.dive4elements.seddb.model; // Generated 14.06.2012 11:30:57 by Hibernate Tools 3.4.0.CR1 diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/de/intevation/seddb/model/HpeilpunktId.java --- a/flys-backend/src/main/java/de/intevation/seddb/model/HpeilpunktId.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/de/intevation/seddb/model/HpeilpunktId.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.seddb.model; +package org.dive4elements.seddb.model; // Generated 14.06.2012 11:30:57 by Hibernate Tools 3.4.0.CR1 diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/de/intevation/seddb/model/Hpeilung.java --- a/flys-backend/src/main/java/de/intevation/seddb/model/Hpeilung.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/de/intevation/seddb/model/Hpeilung.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.seddb.model; +package org.dive4elements.seddb.model; // Generated 14.06.2012 11:30:57 by Hibernate Tools 3.4.0.CR1 diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/de/intevation/seddb/model/Messung.java --- a/flys-backend/src/main/java/de/intevation/seddb/model/Messung.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/de/intevation/seddb/model/Messung.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.seddb.model; +package org.dive4elements.seddb.model; // Generated 14.06.2012 11:30:57 by Hibernate Tools 3.4.0.CR1 diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/de/intevation/seddb/model/Messunglotcount.java --- a/flys-backend/src/main/java/de/intevation/seddb/model/Messunglotcount.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/de/intevation/seddb/model/Messunglotcount.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.seddb.model; +package org.dive4elements.seddb.model; // Generated 14.06.2012 11:30:57 by Hibernate Tools 3.4.0.CR1 diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/de/intevation/seddb/model/MessunglotcountId.java --- a/flys-backend/src/main/java/de/intevation/seddb/model/MessunglotcountId.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/de/intevation/seddb/model/MessunglotcountId.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.seddb.model; +package org.dive4elements.seddb.model; // Generated 14.06.2012 11:30:57 by Hibernate Tools 3.4.0.CR1 diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/de/intevation/seddb/model/Messungsta.java --- a/flys-backend/src/main/java/de/intevation/seddb/model/Messungsta.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/de/intevation/seddb/model/Messungsta.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.seddb.model; +package org.dive4elements.seddb.model; // Generated 14.06.2012 11:30:57 by Hibernate Tools 3.4.0.CR1 diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/de/intevation/seddb/model/MessungstaId.java --- a/flys-backend/src/main/java/de/intevation/seddb/model/MessungstaId.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/de/intevation/seddb/model/MessungstaId.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.seddb.model; +package org.dive4elements.seddb.model; // Generated 14.06.2012 11:30:57 by Hibernate Tools 3.4.0.CR1 diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/de/intevation/seddb/model/Messunguferbezug.java --- a/flys-backend/src/main/java/de/intevation/seddb/model/Messunguferbezug.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/de/intevation/seddb/model/Messunguferbezug.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.seddb.model; +package org.dive4elements.seddb.model; // Generated 14.06.2012 11:30:57 by Hibernate Tools 3.4.0.CR1 diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/de/intevation/seddb/model/MessunguferbezugId.java --- a/flys-backend/src/main/java/de/intevation/seddb/model/MessunguferbezugId.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/de/intevation/seddb/model/MessunguferbezugId.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.seddb.model; +package org.dive4elements.seddb.model; // Generated 14.06.2012 11:30:57 by Hibernate Tools 3.4.0.CR1 diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/de/intevation/seddb/model/Mpeilpunkt.java --- a/flys-backend/src/main/java/de/intevation/seddb/model/Mpeilpunkt.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/de/intevation/seddb/model/Mpeilpunkt.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.seddb.model; +package org.dive4elements.seddb.model; // Generated 14.06.2012 11:30:57 by Hibernate Tools 3.4.0.CR1 diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/de/intevation/seddb/model/MpeilpunktId.java --- a/flys-backend/src/main/java/de/intevation/seddb/model/MpeilpunktId.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/de/intevation/seddb/model/MpeilpunktId.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.seddb.model; +package org.dive4elements.seddb.model; // Generated 14.06.2012 11:30:57 by Hibernate Tools 3.4.0.CR1 diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/de/intevation/seddb/model/Mpeilung.java --- a/flys-backend/src/main/java/de/intevation/seddb/model/Mpeilung.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/de/intevation/seddb/model/Mpeilung.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.seddb.model; +package org.dive4elements.seddb.model; // Generated 14.06.2012 11:30:57 by Hibernate Tools 3.4.0.CR1 diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/de/intevation/seddb/model/Probebild.java --- a/flys-backend/src/main/java/de/intevation/seddb/model/Probebild.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/de/intevation/seddb/model/Probebild.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.seddb.model; +package org.dive4elements.seddb.model; // Generated 14.06.2012 11:30:57 by Hibernate Tools 3.4.0.CR1 diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/de/intevation/seddb/model/Siebanalyse.java --- a/flys-backend/src/main/java/de/intevation/seddb/model/Siebanalyse.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/de/intevation/seddb/model/Siebanalyse.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.seddb.model; +package org.dive4elements.seddb.model; // Generated 14.06.2012 11:30:57 by Hibernate Tools 3.4.0.CR1 diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/de/intevation/seddb/model/Slotlinks.java --- a/flys-backend/src/main/java/de/intevation/seddb/model/Slotlinks.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/de/intevation/seddb/model/Slotlinks.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.seddb.model; +package org.dive4elements.seddb.model; // Generated 14.06.2012 11:30:57 by Hibernate Tools 3.4.0.CR1 diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/de/intevation/seddb/model/SlotlinksId.java --- a/flys-backend/src/main/java/de/intevation/seddb/model/SlotlinksId.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/de/intevation/seddb/model/SlotlinksId.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.seddb.model; +package org.dive4elements.seddb.model; // Generated 14.06.2012 11:30:57 by Hibernate Tools 3.4.0.CR1 diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/de/intevation/seddb/model/Slotrechte.java --- a/flys-backend/src/main/java/de/intevation/seddb/model/Slotrechte.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/de/intevation/seddb/model/Slotrechte.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.seddb.model; +package org.dive4elements.seddb.model; // Generated 14.06.2012 11:30:57 by Hibernate Tools 3.4.0.CR1 diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/de/intevation/seddb/model/Sohlprobe.java --- a/flys-backend/src/main/java/de/intevation/seddb/model/Sohlprobe.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/de/intevation/seddb/model/Sohlprobe.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.seddb.model; +package org.dive4elements.seddb.model; // Generated 14.06.2012 11:30:57 by Hibernate Tools 3.4.0.CR1 diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/de/intevation/seddb/model/Sohltest.java --- a/flys-backend/src/main/java/de/intevation/seddb/model/Sohltest.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/de/intevation/seddb/model/Sohltest.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.seddb.model; +package org.dive4elements.seddb.model; // Generated 14.06.2012 11:30:57 by Hibernate Tools 3.4.0.CR1 diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/de/intevation/seddb/model/Sprobe.java --- a/flys-backend/src/main/java/de/intevation/seddb/model/Sprobe.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/de/intevation/seddb/model/Sprobe.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.seddb.model; +package org.dive4elements.seddb.model; // Generated 14.06.2012 11:30:57 by Hibernate Tools 3.4.0.CR1 diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/de/intevation/seddb/model/SprobeId.java --- a/flys-backend/src/main/java/de/intevation/seddb/model/SprobeId.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/de/intevation/seddb/model/SprobeId.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.seddb.model; +package org.dive4elements.seddb.model; // Generated 14.06.2012 11:30:57 by Hibernate Tools 3.4.0.CR1 diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/de/intevation/seddb/model/Ssiebung.java --- a/flys-backend/src/main/java/de/intevation/seddb/model/Ssiebung.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/de/intevation/seddb/model/Ssiebung.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.seddb.model; +package org.dive4elements.seddb.model; // Generated 14.06.2012 11:30:57 by Hibernate Tools 3.4.0.CR1 diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/de/intevation/seddb/model/Ssiebungsieb.java --- a/flys-backend/src/main/java/de/intevation/seddb/model/Ssiebungsieb.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/de/intevation/seddb/model/Ssiebungsieb.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.seddb.model; +package org.dive4elements.seddb.model; // Generated 14.06.2012 11:30:57 by Hibernate Tools 3.4.0.CR1 diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/de/intevation/seddb/model/SsiebungsiebId.java --- a/flys-backend/src/main/java/de/intevation/seddb/model/SsiebungsiebId.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/de/intevation/seddb/model/SsiebungsiebId.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.seddb.model; +package org.dive4elements.seddb.model; // Generated 14.06.2012 11:30:57 by Hibernate Tools 3.4.0.CR1 diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/de/intevation/seddb/model/Station.java --- a/flys-backend/src/main/java/de/intevation/seddb/model/Station.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/de/intevation/seddb/model/Station.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.seddb.model; +package org.dive4elements.seddb.model; // Generated 14.06.2012 11:30:57 by Hibernate Tools 3.4.0.CR1 diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/de/intevation/seddb/model/Stationgew.java --- a/flys-backend/src/main/java/de/intevation/seddb/model/Stationgew.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/de/intevation/seddb/model/Stationgew.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.seddb.model; +package org.dive4elements.seddb.model; // Generated 14.06.2012 11:30:57 by Hibernate Tools 3.4.0.CR1 diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/de/intevation/seddb/model/StationgewId.java --- a/flys-backend/src/main/java/de/intevation/seddb/model/StationgewId.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/de/intevation/seddb/model/StationgewId.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.seddb.model; +package org.dive4elements.seddb.model; // Generated 14.06.2012 11:30:57 by Hibernate Tools 3.4.0.CR1 diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/de/intevation/seddb/model/TmpGloChanged.java --- a/flys-backend/src/main/java/de/intevation/seddb/model/TmpGloChanged.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/de/intevation/seddb/model/TmpGloChanged.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.seddb.model; +package org.dive4elements.seddb.model; // Generated 14.06.2012 11:30:57 by Hibernate Tools 3.4.0.CR1 diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/de/intevation/seddb/model/TmpMesAchanged.java --- a/flys-backend/src/main/java/de/intevation/seddb/model/TmpMesAchanged.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/de/intevation/seddb/model/TmpMesAchanged.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.seddb.model; +package org.dive4elements.seddb.model; // Generated 14.06.2012 11:30:57 by Hibernate Tools 3.4.0.CR1 diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/de/intevation/seddb/model/TmpMesGchanged.java --- a/flys-backend/src/main/java/de/intevation/seddb/model/TmpMesGchanged.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/de/intevation/seddb/model/TmpMesGchanged.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.seddb.model; +package org.dive4elements.seddb.model; // Generated 14.06.2012 11:30:57 by Hibernate Tools 3.4.0.CR1 diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/de/intevation/seddb/model/TmpMesQchanged.java --- a/flys-backend/src/main/java/de/intevation/seddb/model/TmpMesQchanged.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/de/intevation/seddb/model/TmpMesQchanged.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.seddb.model; +package org.dive4elements.seddb.model; // Generated 14.06.2012 11:30:57 by Hibernate Tools 3.4.0.CR1 diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/de/intevation/seddb/model/TmpMesSchanged.java --- a/flys-backend/src/main/java/de/intevation/seddb/model/TmpMesSchanged.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/de/intevation/seddb/model/TmpMesSchanged.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.seddb.model; +package org.dive4elements.seddb.model; // Generated 14.06.2012 11:30:57 by Hibernate Tools 3.4.0.CR1 diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/de/intevation/seddb/model/Zzarchiv.java --- a/flys-backend/src/main/java/de/intevation/seddb/model/Zzarchiv.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/de/intevation/seddb/model/Zzarchiv.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.seddb.model; +package org.dive4elements.seddb.model; // Generated 14.06.2012 11:30:57 by Hibernate Tools 3.4.0.CR1 diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/de/intevation/seddb/model/Zzprobenahmeart.java --- a/flys-backend/src/main/java/de/intevation/seddb/model/Zzprobenahmeart.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/de/intevation/seddb/model/Zzprobenahmeart.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.seddb.model; +package org.dive4elements.seddb.model; // Generated 14.06.2012 11:30:57 by Hibernate Tools 3.4.0.CR1 diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/de/intevation/seddb/model/Zzsondierungart.java --- a/flys-backend/src/main/java/de/intevation/seddb/model/Zzsondierungart.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/de/intevation/seddb/model/Zzsondierungart.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.seddb.model; +package org.dive4elements.seddb.model; // Generated 14.06.2012 11:30:57 by Hibernate Tools 3.4.0.CR1 diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/de/intevation/seddb/model/Zzthema.java --- a/flys-backend/src/main/java/de/intevation/seddb/model/Zzthema.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/de/intevation/seddb/model/Zzthema.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.seddb.model; +package org.dive4elements.seddb.model; // Generated 14.06.2012 11:30:57 by Hibernate Tools 3.4.0.CR1 diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/App.java --- a/flys-backend/src/main/java/org/dive4elements/river/App.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/App.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,7 +1,7 @@ -package de.intevation.flys; +package org.dive4elements.flys; -import de.intevation.flys.backend.SessionFactoryProvider; -import de.intevation.flys.backend.FLYSCredentials; +import org.dive4elements.river.backend.SessionFactoryProvider; +import org.dive4elements.river.backend.FLYSCredentials; import org.hibernate.cfg.Configuration; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/backend/Credentials.java --- a/flys-backend/src/main/java/org/dive4elements/river/backend/Credentials.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/backend/Credentials.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.backend; +package org.dive4elements.river.backend; public abstract class Credentials { diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/backend/FLYSCredentials.java --- a/flys-backend/src/main/java/org/dive4elements/river/backend/FLYSCredentials.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/backend/FLYSCredentials.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,81 +1,81 @@ -package de.intevation.flys.backend; - -import de.intevation.artifacts.common.utils.Config; +package org.dive4elements.river.backend; -import de.intevation.flys.model.Annotation; -import de.intevation.flys.model.AnnotationType; -import de.intevation.flys.model.Attribute; -import de.intevation.flys.model.AxisKind; -import de.intevation.flys.model.BedHeightEpoch; -import de.intevation.flys.model.BedHeightEpochValue; -import de.intevation.flys.model.BedHeightSingle; -import de.intevation.flys.model.BedHeightSingleValue; -import de.intevation.flys.model.BedHeightType; -import de.intevation.flys.model.Building; -import de.intevation.flys.model.BoundaryKind; -import de.intevation.flys.model.CrossSection; -import de.intevation.flys.model.CrossSectionLine; -import de.intevation.flys.model.CrossSectionPoint; -import de.intevation.flys.model.CrossSectionTrack; -import de.intevation.flys.model.CrossSectionTrackKind; -import de.intevation.flys.model.DGM; -import de.intevation.flys.model.Depth; -import de.intevation.flys.model.DischargeTable; -import de.intevation.flys.model.DischargeTableValue; -import de.intevation.flys.model.DischargeZone; -import de.intevation.flys.model.Edge; -import de.intevation.flys.model.ElevationModel; -import de.intevation.flys.model.FedState; -import de.intevation.flys.model.Fixpoint; -import de.intevation.flys.model.Floodmaps; -import de.intevation.flys.model.Floodmark; -import de.intevation.flys.model.Floodplain; -import de.intevation.flys.model.FloodplainKind; -import de.intevation.flys.model.FlowVelocityMeasurement; -import de.intevation.flys.model.FlowVelocityMeasurementValue; -import de.intevation.flys.model.FlowVelocityModel; -import de.intevation.flys.model.FlowVelocityModelValue; -import de.intevation.flys.model.Gauge; -import de.intevation.flys.model.GaugeLocation; -import de.intevation.flys.model.GrainFraction; -import de.intevation.flys.model.HWSKind; -import de.intevation.flys.model.HWSLine; -import de.intevation.flys.model.HWSPoint; -import de.intevation.flys.model.HYK; -import de.intevation.flys.model.HYKEntry; -import de.intevation.flys.model.HYKFlowZone; -import de.intevation.flys.model.HYKFlowZoneType; -import de.intevation.flys.model.HYKFormation; -import de.intevation.flys.model.HydrBoundary; -import de.intevation.flys.model.HydrBoundaryPoly; -import de.intevation.flys.model.Jetty; -import de.intevation.flys.model.LocationSystem; -import de.intevation.flys.model.MainValue; -import de.intevation.flys.model.MainValueType; -import de.intevation.flys.model.MeasurementStation; -import de.intevation.flys.model.MorphologicalWidth; -import de.intevation.flys.model.MorphologicalWidthValue; -import de.intevation.flys.model.NamedMainValue; -import de.intevation.flys.model.Position; -import de.intevation.flys.model.Range; -import de.intevation.flys.model.River; -import de.intevation.flys.model.RiverAxis; -import de.intevation.flys.model.RiverAxisKm; -import de.intevation.flys.model.SQRelation; -import de.intevation.flys.model.SQRelationValue; -import de.intevation.flys.model.SectieKind; -import de.intevation.flys.model.SobekKind; -import de.intevation.flys.model.SedimentDensity; -import de.intevation.flys.model.SedimentDensityValue; -import de.intevation.flys.model.SedimentYield; -import de.intevation.flys.model.SedimentYieldValue; -import de.intevation.flys.model.TimeInterval; -import de.intevation.flys.model.Unit; -import de.intevation.flys.model.Wst; -import de.intevation.flys.model.WstColumn; -import de.intevation.flys.model.WstColumnQRange; -import de.intevation.flys.model.WstColumnValue; -import de.intevation.flys.model.WstQRange; +import org.dive4elements.artifacts.common.utils.Config; + +import org.dive4elements.river.model.Annotation; +import org.dive4elements.river.model.AnnotationType; +import org.dive4elements.river.model.Attribute; +import org.dive4elements.river.model.AxisKind; +import org.dive4elements.river.model.BedHeightEpoch; +import org.dive4elements.river.model.BedHeightEpochValue; +import org.dive4elements.river.model.BedHeightSingle; +import org.dive4elements.river.model.BedHeightSingleValue; +import org.dive4elements.river.model.BedHeightType; +import org.dive4elements.river.model.Building; +import org.dive4elements.river.model.BoundaryKind; +import org.dive4elements.river.model.CrossSection; +import org.dive4elements.river.model.CrossSectionLine; +import org.dive4elements.river.model.CrossSectionPoint; +import org.dive4elements.river.model.CrossSectionTrack; +import org.dive4elements.river.model.CrossSectionTrackKind; +import org.dive4elements.river.model.DGM; +import org.dive4elements.river.model.Depth; +import org.dive4elements.river.model.DischargeTable; +import org.dive4elements.river.model.DischargeTableValue; +import org.dive4elements.river.model.DischargeZone; +import org.dive4elements.river.model.Edge; +import org.dive4elements.river.model.ElevationModel; +import org.dive4elements.river.model.FedState; +import org.dive4elements.river.model.Fixpoint; +import org.dive4elements.river.model.Floodmaps; +import org.dive4elements.river.model.Floodmark; +import org.dive4elements.river.model.Floodplain; +import org.dive4elements.river.model.FloodplainKind; +import org.dive4elements.river.model.FlowVelocityMeasurement; +import org.dive4elements.river.model.FlowVelocityMeasurementValue; +import org.dive4elements.river.model.FlowVelocityModel; +import org.dive4elements.river.model.FlowVelocityModelValue; +import org.dive4elements.river.model.Gauge; +import org.dive4elements.river.model.GaugeLocation; +import org.dive4elements.river.model.GrainFraction; +import org.dive4elements.river.model.HWSKind; +import org.dive4elements.river.model.HWSLine; +import org.dive4elements.river.model.HWSPoint; +import org.dive4elements.river.model.HYK; +import org.dive4elements.river.model.HYKEntry; +import org.dive4elements.river.model.HYKFlowZone; +import org.dive4elements.river.model.HYKFlowZoneType; +import org.dive4elements.river.model.HYKFormation; +import org.dive4elements.river.model.HydrBoundary; +import org.dive4elements.river.model.HydrBoundaryPoly; +import org.dive4elements.river.model.Jetty; +import org.dive4elements.river.model.LocationSystem; +import org.dive4elements.river.model.MainValue; +import org.dive4elements.river.model.MainValueType; +import org.dive4elements.river.model.MeasurementStation; +import org.dive4elements.river.model.MorphologicalWidth; +import org.dive4elements.river.model.MorphologicalWidthValue; +import org.dive4elements.river.model.NamedMainValue; +import org.dive4elements.river.model.Position; +import org.dive4elements.river.model.Range; +import org.dive4elements.river.model.River; +import org.dive4elements.river.model.RiverAxis; +import org.dive4elements.river.model.RiverAxisKm; +import org.dive4elements.river.model.SQRelation; +import org.dive4elements.river.model.SQRelationValue; +import org.dive4elements.river.model.SectieKind; +import org.dive4elements.river.model.SobekKind; +import org.dive4elements.river.model.SedimentDensity; +import org.dive4elements.river.model.SedimentDensityValue; +import org.dive4elements.river.model.SedimentYield; +import org.dive4elements.river.model.SedimentYieldValue; +import org.dive4elements.river.model.TimeInterval; +import org.dive4elements.river.model.Unit; +import org.dive4elements.river.model.Wst; +import org.dive4elements.river.model.WstColumn; +import org.dive4elements.river.model.WstColumnQRange; +import org.dive4elements.river.model.WstColumnValue; +import org.dive4elements.river.model.WstQRange; public class FLYSCredentials extends Credentials diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/backend/SedDBCredentials.java --- a/flys-backend/src/main/java/org/dive4elements/river/backend/SedDBCredentials.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/backend/SedDBCredentials.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,59 +1,59 @@ -package de.intevation.flys.backend; - -import de.intevation.artifacts.common.utils.Config; +package org.dive4elements.river.backend; -import de.intevation.seddb.model.Bezugspegel; -import de.intevation.seddb.model.Bezugspegelgew; -import de.intevation.seddb.model.BezugspegelgewId; -import de.intevation.seddb.model.Bild; -import de.intevation.seddb.model.Gewaesser; -import de.intevation.seddb.model.Gfaenger; -import de.intevation.seddb.model.Glotlinks; -import de.intevation.seddb.model.GlotlinksId; -import de.intevation.seddb.model.Glotrechte; -import de.intevation.seddb.model.Gprobe; -import de.intevation.seddb.model.GprobeId; -import de.intevation.seddb.model.Gsiebsatz; -import de.intevation.seddb.model.Gsiebung; -import de.intevation.seddb.model.Gsiebungsieb; -import de.intevation.seddb.model.GsiebungsiebId; -import de.intevation.seddb.model.Hpeilpunkt; -import de.intevation.seddb.model.HpeilpunktId; -import de.intevation.seddb.model.Hpeilung; -import de.intevation.seddb.model.Messung; -import de.intevation.seddb.model.Messunglotcount; -import de.intevation.seddb.model.MessunglotcountId; -import de.intevation.seddb.model.Messungsta; -import de.intevation.seddb.model.MessungstaId; -import de.intevation.seddb.model.Messunguferbezug; -import de.intevation.seddb.model.MessunguferbezugId; -import de.intevation.seddb.model.Mpeilpunkt; -import de.intevation.seddb.model.MpeilpunktId; -import de.intevation.seddb.model.Mpeilung; -import de.intevation.seddb.model.Probebild; -import de.intevation.seddb.model.Siebanalyse; -import de.intevation.seddb.model.Slotlinks; -import de.intevation.seddb.model.SlotlinksId; -import de.intevation.seddb.model.Slotrechte; -import de.intevation.seddb.model.Sohlprobe; -import de.intevation.seddb.model.Sohltest; -import de.intevation.seddb.model.Sprobe; -import de.intevation.seddb.model.SprobeId; -import de.intevation.seddb.model.Ssiebung; -import de.intevation.seddb.model.Ssiebungsieb; -import de.intevation.seddb.model.SsiebungsiebId; -import de.intevation.seddb.model.Station; -import de.intevation.seddb.model.Stationgew; -import de.intevation.seddb.model.StationgewId; -import de.intevation.seddb.model.TmpGloChanged; -import de.intevation.seddb.model.TmpMesAchanged; -import de.intevation.seddb.model.TmpMesGchanged; -import de.intevation.seddb.model.TmpMesQchanged; -import de.intevation.seddb.model.TmpMesSchanged; -import de.intevation.seddb.model.Zzarchiv; -import de.intevation.seddb.model.Zzprobenahmeart; -import de.intevation.seddb.model.Zzsondierungart; -import de.intevation.seddb.model.Zzthema; +import org.dive4elements.artifacts.common.utils.Config; + +import org.dive4elements.seddb.model.Bezugspegel; +import org.dive4elements.seddb.model.Bezugspegelgew; +import org.dive4elements.seddb.model.BezugspegelgewId; +import org.dive4elements.seddb.model.Bild; +import org.dive4elements.seddb.model.Gewaesser; +import org.dive4elements.seddb.model.Gfaenger; +import org.dive4elements.seddb.model.Glotlinks; +import org.dive4elements.seddb.model.GlotlinksId; +import org.dive4elements.seddb.model.Glotrechte; +import org.dive4elements.seddb.model.Gprobe; +import org.dive4elements.seddb.model.GprobeId; +import org.dive4elements.seddb.model.Gsiebsatz; +import org.dive4elements.seddb.model.Gsiebung; +import org.dive4elements.seddb.model.Gsiebungsieb; +import org.dive4elements.seddb.model.GsiebungsiebId; +import org.dive4elements.seddb.model.Hpeilpunkt; +import org.dive4elements.seddb.model.HpeilpunktId; +import org.dive4elements.seddb.model.Hpeilung; +import org.dive4elements.seddb.model.Messung; +import org.dive4elements.seddb.model.Messunglotcount; +import org.dive4elements.seddb.model.MessunglotcountId; +import org.dive4elements.seddb.model.Messungsta; +import org.dive4elements.seddb.model.MessungstaId; +import org.dive4elements.seddb.model.Messunguferbezug; +import org.dive4elements.seddb.model.MessunguferbezugId; +import org.dive4elements.seddb.model.Mpeilpunkt; +import org.dive4elements.seddb.model.MpeilpunktId; +import org.dive4elements.seddb.model.Mpeilung; +import org.dive4elements.seddb.model.Probebild; +import org.dive4elements.seddb.model.Siebanalyse; +import org.dive4elements.seddb.model.Slotlinks; +import org.dive4elements.seddb.model.SlotlinksId; +import org.dive4elements.seddb.model.Slotrechte; +import org.dive4elements.seddb.model.Sohlprobe; +import org.dive4elements.seddb.model.Sohltest; +import org.dive4elements.seddb.model.Sprobe; +import org.dive4elements.seddb.model.SprobeId; +import org.dive4elements.seddb.model.Ssiebung; +import org.dive4elements.seddb.model.Ssiebungsieb; +import org.dive4elements.seddb.model.SsiebungsiebId; +import org.dive4elements.seddb.model.Station; +import org.dive4elements.seddb.model.Stationgew; +import org.dive4elements.seddb.model.StationgewId; +import org.dive4elements.seddb.model.TmpGloChanged; +import org.dive4elements.seddb.model.TmpMesAchanged; +import org.dive4elements.seddb.model.TmpMesGchanged; +import org.dive4elements.seddb.model.TmpMesQchanged; +import org.dive4elements.seddb.model.TmpMesSchanged; +import org.dive4elements.seddb.model.Zzarchiv; +import org.dive4elements.seddb.model.Zzprobenahmeart; +import org.dive4elements.seddb.model.Zzsondierungart; +import org.dive4elements.seddb.model.Zzthema; public class SedDBCredentials extends Credentials diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/backend/SedDBSessionHolder.java --- a/flys-backend/src/main/java/org/dive4elements/river/backend/SedDBSessionHolder.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/backend/SedDBSessionHolder.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.backend; +package org.dive4elements.river.backend; import org.apache.log4j.Logger; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/backend/SessionFactoryProvider.java --- a/flys-backend/src/main/java/org/dive4elements/river/backend/SessionFactoryProvider.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/backend/SessionFactoryProvider.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.backend; +package org.dive4elements.river.backend; import java.util.Properties; @@ -124,7 +124,7 @@ // We rely on our own connection pool props.setProperty( "hibernate.connection.provider_class", - "de.intevation.flys.utils.DBCPConnectionProvider"); + "org.dive4elements.river.utils.DBCPConnectionProvider"); props.setProperty(Environment.DIALECT, credentials.getDialect()); props.setProperty(Environment.USER, credentials.getUser()); diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/backend/SessionHolder.java --- a/flys-backend/src/main/java/org/dive4elements/river/backend/SessionHolder.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/backend/SessionHolder.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.backend; +package org.dive4elements.river.backend; import org.apache.log4j.Logger; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/backend/SpatialInfo.java --- a/flys-backend/src/main/java/org/dive4elements/river/backend/SpatialInfo.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/backend/SpatialInfo.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.backend; +package org.dive4elements.river.backend; import java.util.List; @@ -8,12 +8,12 @@ import org.hibernate.Query; import org.hibernate.Session; -import de.intevation.flys.model.Building; -import de.intevation.flys.model.CrossSectionTrack; -import de.intevation.flys.model.Fixpoint; -import de.intevation.flys.model.River; -import de.intevation.flys.model.RiverAxis; -import de.intevation.flys.model.HWSLine; +import org.dive4elements.river.model.Building; +import org.dive4elements.river.model.CrossSectionTrack; +import org.dive4elements.river.model.Fixpoint; +import org.dive4elements.river.model.River; +import org.dive4elements.river.model.RiverAxis; +import org.dive4elements.river.model.HWSLine; public class SpatialInfo { diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/Config.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/Config.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/Config.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.importer; +package org.dive4elements.river.importer; public class Config { diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/ImportAnnotation.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/ImportAnnotation.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/ImportAnnotation.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,12 +1,12 @@ -package de.intevation.flys.importer; +package org.dive4elements.river.importer; -import de.intevation.flys.model.Annotation; -import de.intevation.flys.model.AnnotationType; -import de.intevation.flys.model.Range; -import de.intevation.flys.model.Position; -import de.intevation.flys.model.Attribute; -import de.intevation.flys.model.River; -import de.intevation.flys.model.Edge; +import org.dive4elements.river.model.Annotation; +import org.dive4elements.river.model.AnnotationType; +import org.dive4elements.river.model.Range; +import org.dive4elements.river.model.Position; +import org.dive4elements.river.model.Attribute; +import org.dive4elements.river.model.River; +import org.dive4elements.river.model.Edge; import org.hibernate.Session; import org.hibernate.Query; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/ImportAnnotationType.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/ImportAnnotationType.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/ImportAnnotationType.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,6 +1,6 @@ -package de.intevation.flys.importer; +package org.dive4elements.river.importer; -import de.intevation.flys.model.AnnotationType; +import org.dive4elements.river.model.AnnotationType; import org.hibernate.Session; import org.hibernate.Query; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/ImportAttribute.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/ImportAttribute.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/ImportAttribute.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,6 +1,6 @@ -package de.intevation.flys.importer; +package org.dive4elements.river.importer; -import de.intevation.flys.model.Attribute; +import org.dive4elements.river.model.Attribute; import org.hibernate.Session; import org.hibernate.Query; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/ImportBedHeight.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/ImportBedHeight.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/ImportBedHeight.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,11 +1,11 @@ -package de.intevation.flys.importer; +package org.dive4elements.river.importer; import java.sql.SQLException; import org.hibernate.exception.ConstraintViolationException; -import de.intevation.flys.model.River; +import org.dive4elements.river.model.River; public interface ImportBedHeight { diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/ImportBedHeightEpoch.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/ImportBedHeightEpoch.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/ImportBedHeightEpoch.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.importer; +package org.dive4elements.river.importer; import java.util.ArrayList; import java.util.List; @@ -7,11 +7,11 @@ import org.hibernate.Query; import org.hibernate.Session; -import de.intevation.flys.model.BedHeightEpoch; -import de.intevation.flys.model.ElevationModel; -import de.intevation.flys.model.Range; -import de.intevation.flys.model.River; -import de.intevation.flys.model.TimeInterval; +import org.dive4elements.river.model.BedHeightEpoch; +import org.dive4elements.river.model.ElevationModel; +import org.dive4elements.river.model.Range; +import org.dive4elements.river.model.River; +import org.dive4elements.river.model.TimeInterval; /** Import Bed Height Data, 'epoch' type from csv file. */ diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/ImportBedHeightEpochValue.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/ImportBedHeightEpochValue.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/ImportBedHeightEpochValue.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.importer; +package org.dive4elements.river.importer; import java.util.List; @@ -9,8 +9,8 @@ import org.hibernate.Session; import org.hibernate.Query; -import de.intevation.flys.model.BedHeightEpoch; -import de.intevation.flys.model.BedHeightEpochValue; +import org.dive4elements.river.model.BedHeightEpoch; +import org.dive4elements.river.model.BedHeightEpochValue; public class ImportBedHeightEpochValue implements ImportBedHeightValue { diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/ImportBedHeightSingle.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/ImportBedHeightSingle.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/ImportBedHeightSingle.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.importer; +package org.dive4elements.river.importer; import java.util.ArrayList; import java.util.List; @@ -8,11 +8,11 @@ import org.hibernate.Session; import org.hibernate.Query; -import de.intevation.flys.model.BedHeightSingle; -import de.intevation.flys.model.BedHeightType; -import de.intevation.flys.model.ElevationModel; -import de.intevation.flys.model.Range; -import de.intevation.flys.model.River; +import org.dive4elements.river.model.BedHeightSingle; +import org.dive4elements.river.model.BedHeightType; +import org.dive4elements.river.model.ElevationModel; +import org.dive4elements.river.model.Range; +import org.dive4elements.river.model.River; public class ImportBedHeightSingle implements ImportBedHeight diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/ImportBedHeightSingleValue.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/ImportBedHeightSingleValue.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/ImportBedHeightSingleValue.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.importer; +package org.dive4elements.river.importer; import java.util.List; @@ -9,8 +9,8 @@ import org.hibernate.Session; import org.hibernate.Query; -import de.intevation.flys.model.BedHeightSingle; -import de.intevation.flys.model.BedHeightSingleValue; +import org.dive4elements.river.model.BedHeightSingle; +import org.dive4elements.river.model.BedHeightSingleValue; public class ImportBedHeightSingleValue implements ImportBedHeightValue { diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/ImportBedHeightType.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/ImportBedHeightType.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/ImportBedHeightType.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.importer; +package org.dive4elements.river.importer; import java.util.List; @@ -7,7 +7,7 @@ import org.hibernate.Session; import org.hibernate.Query; -import de.intevation.flys.model.BedHeightType; +import org.dive4elements.river.model.BedHeightType; public class ImportBedHeightType { diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/ImportBedHeightValue.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/ImportBedHeightValue.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/ImportBedHeightValue.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.importer; +package org.dive4elements.river.importer; public interface ImportBedHeightValue { diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/ImportCrossSection.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/ImportCrossSection.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/ImportCrossSection.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,8 +1,8 @@ -package de.intevation.flys.importer; +package org.dive4elements.river.importer; -import de.intevation.flys.model.River; -import de.intevation.flys.model.CrossSection; -import de.intevation.flys.model.TimeInterval; +import org.dive4elements.river.model.River; +import org.dive4elements.river.model.CrossSection; +import org.dive4elements.river.model.TimeInterval; import org.hibernate.Session; import org.hibernate.Query; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/ImportCrossSectionLine.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/ImportCrossSectionLine.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/ImportCrossSectionLine.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,8 +1,8 @@ -package de.intevation.flys.importer; +package org.dive4elements.river.importer; -import de.intevation.flys.model.CrossSection; -import de.intevation.flys.model.CrossSectionPoint; -import de.intevation.flys.model.CrossSectionLine; +import org.dive4elements.river.model.CrossSection; +import org.dive4elements.river.model.CrossSectionPoint; +import org.dive4elements.river.model.CrossSectionLine; import org.hibernate.Session; import org.hibernate.Query; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/ImportDepth.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/ImportDepth.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/ImportDepth.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.importer; +package org.dive4elements.river.importer; import java.math.BigDecimal; @@ -9,7 +9,7 @@ import org.hibernate.Session; import org.hibernate.Query; -import de.intevation.flys.model.Depth; +import org.dive4elements.river.model.Depth; public class ImportDepth { diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/ImportDischargeTable.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/ImportDischargeTable.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/ImportDischargeTable.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.importer; +package org.dive4elements.river.importer; import java.util.ArrayList; import java.util.List; @@ -6,9 +6,9 @@ import org.hibernate.Session; import org.hibernate.Query; -import de.intevation.flys.model.DischargeTable; -import de.intevation.flys.model.Gauge; -import de.intevation.flys.model.TimeInterval; +import org.dive4elements.river.model.DischargeTable; +import org.dive4elements.river.model.Gauge; +import org.dive4elements.river.model.TimeInterval; import org.apache.log4j.Logger; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/ImportDischargeTableValue.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/ImportDischargeTableValue.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/ImportDischargeTableValue.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,9 +1,9 @@ -package de.intevation.flys.importer; +package org.dive4elements.river.importer; import java.math.BigDecimal; -import de.intevation.flys.model.DischargeTable; -import de.intevation.flys.model.DischargeTableValue; +import org.dive4elements.river.model.DischargeTable; +import org.dive4elements.river.model.DischargeTableValue; public class ImportDischargeTableValue diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/ImportDischargeZone.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/ImportDischargeZone.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/ImportDischargeZone.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.importer; +package org.dive4elements.river.importer; import java.math.BigDecimal; import java.util.List; @@ -8,8 +8,8 @@ import org.hibernate.Session; import org.hibernate.Query; -import de.intevation.flys.model.DischargeZone; -import de.intevation.flys.model.River; +import org.dive4elements.river.model.DischargeZone; +import org.dive4elements.river.model.River; public class ImportDischargeZone { diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/ImportEdge.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/ImportEdge.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/ImportEdge.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,6 +1,6 @@ -package de.intevation.flys.importer; +package org.dive4elements.river.importer; -import de.intevation.flys.model.Edge; +import org.dive4elements.river.model.Edge; import org.hibernate.Session; import org.hibernate.Query; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/ImportElevationModel.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/ImportElevationModel.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/ImportElevationModel.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.importer; +package org.dive4elements.river.importer; import java.util.List; @@ -7,7 +7,7 @@ import org.hibernate.Session; import org.hibernate.Query; -import de.intevation.flys.model.ElevationModel; +import org.dive4elements.river.model.ElevationModel; public class ImportElevationModel { diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/ImportFlowVelocityMeasurement.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/ImportFlowVelocityMeasurement.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/ImportFlowVelocityMeasurement.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.importer; +package org.dive4elements.river.importer; import java.util.ArrayList; import java.util.List; @@ -8,8 +8,8 @@ import org.hibernate.Session; import org.hibernate.Query; -import de.intevation.flys.model.FlowVelocityMeasurement; -import de.intevation.flys.model.River; +import org.dive4elements.river.model.FlowVelocityMeasurement; +import org.dive4elements.river.model.River; public class ImportFlowVelocityMeasurement { diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/ImportFlowVelocityMeasurementValue.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/ImportFlowVelocityMeasurementValue.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/ImportFlowVelocityMeasurementValue.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.importer; +package org.dive4elements.river.importer; import java.math.BigDecimal; @@ -10,8 +10,8 @@ import org.hibernate.Session; import org.hibernate.Query; -import de.intevation.flys.model.FlowVelocityMeasurement; -import de.intevation.flys.model.FlowVelocityMeasurementValue; +import org.dive4elements.river.model.FlowVelocityMeasurement; +import org.dive4elements.river.model.FlowVelocityMeasurementValue; public class ImportFlowVelocityMeasurementValue { diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/ImportFlowVelocityModel.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/ImportFlowVelocityModel.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/ImportFlowVelocityModel.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.importer; +package org.dive4elements.river.importer; import java.util.ArrayList; import java.util.List; @@ -8,9 +8,9 @@ import org.hibernate.Session; import org.hibernate.Query; -import de.intevation.flys.model.DischargeZone; -import de.intevation.flys.model.FlowVelocityModel; -import de.intevation.flys.model.River; +import org.dive4elements.river.model.DischargeZone; +import org.dive4elements.river.model.FlowVelocityModel; +import org.dive4elements.river.model.River; public class ImportFlowVelocityModel { diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/ImportFlowVelocityModelValue.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/ImportFlowVelocityModelValue.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/ImportFlowVelocityModelValue.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.importer; +package org.dive4elements.river.importer; import java.math.BigDecimal; @@ -7,8 +7,8 @@ import org.hibernate.Session; import org.hibernate.Query; -import de.intevation.flys.model.FlowVelocityModel; -import de.intevation.flys.model.FlowVelocityModelValue; +import org.dive4elements.river.model.FlowVelocityModel; +import org.dive4elements.river.model.FlowVelocityModelValue; public class ImportFlowVelocityModelValue { diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/ImportGauge.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/ImportGauge.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/ImportGauge.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.importer; +package org.dive4elements.river.importer; import java.io.File; @@ -7,10 +7,10 @@ import java.math.BigDecimal; -import de.intevation.artifacts.common.utils.FileTools; +import org.dive4elements.artifacts.common.utils.FileTools; -import de.intevation.flys.model.River; -import de.intevation.flys.model.Gauge; +import org.dive4elements.river.model.River; +import org.dive4elements.river.model.Gauge; import org.hibernate.Session; import org.hibernate.Query; @@ -19,8 +19,8 @@ import org.apache.log4j.Logger; -import de.intevation.flys.importer.parsers.AtFileParser; -import de.intevation.flys.importer.parsers.StaFileParser; +import org.dive4elements.river.importer.parsers.AtFileParser; +import org.dive4elements.river.importer.parsers.StaFileParser; /** Gauge not in DB. */ public class ImportGauge diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/ImportGrainFraction.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/ImportGrainFraction.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/ImportGrainFraction.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.importer; +package org.dive4elements.river.importer; import java.util.List; @@ -7,7 +7,7 @@ import org.hibernate.Session; import org.hibernate.Query; -import de.intevation.flys.model.GrainFraction; +import org.dive4elements.river.model.GrainFraction; public class ImportGrainFraction { diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/ImportHYK.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/ImportHYK.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/ImportHYK.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,7 +1,7 @@ -package de.intevation.flys.importer; +package org.dive4elements.river.importer; -import de.intevation.flys.model.HYK; -import de.intevation.flys.model.River; +import org.dive4elements.river.model.HYK; +import org.dive4elements.river.model.River; import java.util.List; import java.util.ArrayList; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/ImportHYKEntry.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/ImportHYKEntry.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/ImportHYKEntry.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,7 +1,7 @@ -package de.intevation.flys.importer; +package org.dive4elements.river.importer; -import de.intevation.flys.model.HYKEntry; -import de.intevation.flys.model.HYK; +import org.dive4elements.river.model.HYKEntry; +import org.dive4elements.river.model.HYK; import java.util.Date; import java.util.List; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/ImportHYKFlowZone.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/ImportHYKFlowZone.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/ImportHYKFlowZone.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,8 +1,8 @@ -package de.intevation.flys.importer; +package org.dive4elements.river.importer; -import de.intevation.flys.model.HYKFormation; -import de.intevation.flys.model.HYKFlowZone; -import de.intevation.flys.model.HYKFlowZoneType; +import org.dive4elements.river.model.HYKFormation; +import org.dive4elements.river.model.HYKFlowZone; +import org.dive4elements.river.model.HYKFlowZoneType; import org.hibernate.Session; import org.hibernate.Query; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/ImportHYKFlowZoneType.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/ImportHYKFlowZoneType.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/ImportHYKFlowZoneType.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,6 +1,6 @@ -package de.intevation.flys.importer; +package org.dive4elements.river.importer; -import de.intevation.flys.model.HYKFlowZoneType; +import org.dive4elements.river.model.HYKFlowZoneType; import org.hibernate.Session; import org.hibernate.Query; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/ImportHYKFormation.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/ImportHYKFormation.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/ImportHYKFormation.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,7 +1,7 @@ -package de.intevation.flys.importer; +package org.dive4elements.river.importer; -import de.intevation.flys.model.HYKFormation; -import de.intevation.flys.model.HYKEntry; +import org.dive4elements.river.model.HYKFormation; +import org.dive4elements.river.model.HYKEntry; import java.util.ArrayList; import java.util.List; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/ImportLocationSystem.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/ImportLocationSystem.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/ImportLocationSystem.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.importer; +package org.dive4elements.river.importer; import java.util.List; @@ -7,7 +7,7 @@ import org.hibernate.Session; import org.hibernate.Query; -import de.intevation.flys.model.LocationSystem; +import org.dive4elements.river.model.LocationSystem; public class ImportLocationSystem { diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/ImportMainValue.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/ImportMainValue.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/ImportMainValue.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,14 +1,14 @@ -package de.intevation.flys.importer; +package org.dive4elements.river.importer; import java.util.List; import java.math.BigDecimal; -import de.intevation.flys.model.MainValue; -import de.intevation.flys.model.Gauge; -import de.intevation.flys.model.River; -import de.intevation.flys.model.NamedMainValue; -import de.intevation.flys.model.TimeInterval; +import org.dive4elements.river.model.MainValue; +import org.dive4elements.river.model.Gauge; +import org.dive4elements.river.model.River; +import org.dive4elements.river.model.NamedMainValue; +import org.dive4elements.river.model.TimeInterval; import org.hibernate.Session; import org.hibernate.Query; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/ImportMainValueType.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/ImportMainValueType.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/ImportMainValueType.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,6 +1,6 @@ -package de.intevation.flys.importer; +package org.dive4elements.river.importer; -import de.intevation.flys.model.MainValueType; +import org.dive4elements.river.model.MainValueType; import org.hibernate.Session; import org.hibernate.Query; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/ImportMeasurementStation.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/ImportMeasurementStation.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/ImportMeasurementStation.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,15 +1,15 @@ -package de.intevation.flys.importer; +package org.dive4elements.river.importer; import java.util.List; import org.apache.log4j.Logger; import org.hibernate.Session; -import de.intevation.flys.model.Gauge; -import de.intevation.flys.model.MeasurementStation; -import de.intevation.flys.model.Range; -import de.intevation.flys.model.River; -import de.intevation.flys.model.TimeInterval; +import org.dive4elements.river.model.Gauge; +import org.dive4elements.river.model.MeasurementStation; +import org.dive4elements.river.model.Range; +import org.dive4elements.river.model.River; +import org.dive4elements.river.model.TimeInterval; public class ImportMeasurementStation { diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/ImportMorphWidth.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/ImportMorphWidth.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/ImportMorphWidth.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,7 +1,7 @@ -package de.intevation.flys.importer; +package org.dive4elements.river.importer; -import de.intevation.flys.model.MorphologicalWidth; -import de.intevation.flys.model.River; +import org.dive4elements.river.model.MorphologicalWidth; +import org.dive4elements.river.model.River; import java.util.ArrayList; import java.util.List; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/ImportMorphWidthValue.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/ImportMorphWidthValue.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/ImportMorphWidthValue.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.importer; +package org.dive4elements.river.importer; import java.math.BigDecimal; @@ -9,8 +9,8 @@ import org.hibernate.Session; import org.hibernate.Query; -import de.intevation.flys.model.MorphologicalWidth; -import de.intevation.flys.model.MorphologicalWidthValue; +import org.dive4elements.river.model.MorphologicalWidth; +import org.dive4elements.river.model.MorphologicalWidthValue; public class ImportMorphWidthValue { diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/ImportNamedMainValue.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/ImportNamedMainValue.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/ImportNamedMainValue.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,9 +1,9 @@ -package de.intevation.flys.importer; +package org.dive4elements.river.importer; import java.util.List; -import de.intevation.flys.model.NamedMainValue; -import de.intevation.flys.model.MainValueType; +import org.dive4elements.river.model.NamedMainValue; +import org.dive4elements.river.model.MainValueType; import org.hibernate.Session; import org.hibernate.Query; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/ImportPosition.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/ImportPosition.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/ImportPosition.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,6 +1,6 @@ -package de.intevation.flys.importer; +package org.dive4elements.river.importer; -import de.intevation.flys.model.Position; +import org.dive4elements.river.model.Position; import org.hibernate.Session; import org.hibernate.Query; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/ImportRange.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/ImportRange.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/ImportRange.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,7 +1,7 @@ -package de.intevation.flys.importer; +package org.dive4elements.river.importer; -import de.intevation.flys.model.Range; -import de.intevation.flys.model.River; +import org.dive4elements.river.model.Range; +import org.dive4elements.river.model.River; import java.math.BigDecimal; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/ImportRiver.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/ImportRiver.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/ImportRiver.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,34 +1,34 @@ -package de.intevation.flys.importer; - -import de.intevation.artifacts.common.utils.FileTools.HashedFile; - -import de.intevation.artifacts.common.utils.FileTools; +package org.dive4elements.river.importer; -import de.intevation.flys.importer.parsers.AnnotationClassifier; -import de.intevation.flys.importer.parsers.AnnotationsParser; -import de.intevation.flys.importer.parsers.BedHeightEpochParser; -import de.intevation.flys.importer.parsers.BedHeightSingleParser; -import de.intevation.flys.importer.parsers.CrossSectionParser; -import de.intevation.flys.importer.parsers.DA50Parser; -import de.intevation.flys.importer.parsers.DA66Parser; -import de.intevation.flys.importer.parsers.FlowVelocityMeasurementParser; -import de.intevation.flys.importer.parsers.FlowVelocityModelParser; -import de.intevation.flys.importer.parsers.HYKParser; -import de.intevation.flys.importer.parsers.MeasurementStationsParser; -import de.intevation.flys.importer.parsers.MorphologicalWidthParser; -import de.intevation.flys.importer.parsers.PRFParser; -import de.intevation.flys.importer.parsers.PegelGltParser; -import de.intevation.flys.importer.parsers.SQRelationParser; -import de.intevation.flys.importer.parsers.SedimentDensityParser; -import de.intevation.flys.importer.parsers.SedimentYieldParser; -import de.intevation.flys.importer.parsers.W80Parser; -import de.intevation.flys.importer.parsers.W80CSVParser; -import de.intevation.flys.importer.parsers.WaterlevelDifferencesParser; -import de.intevation.flys.importer.parsers.WaterlevelParser; -import de.intevation.flys.importer.parsers.WstParser; +import org.dive4elements.artifacts.common.utils.FileTools.HashedFile; -import de.intevation.flys.model.River; -import de.intevation.flys.model.Unit; +import org.dive4elements.artifacts.common.utils.FileTools; + +import org.dive4elements.river.importer.parsers.AnnotationClassifier; +import org.dive4elements.river.importer.parsers.AnnotationsParser; +import org.dive4elements.river.importer.parsers.BedHeightEpochParser; +import org.dive4elements.river.importer.parsers.BedHeightSingleParser; +import org.dive4elements.river.importer.parsers.CrossSectionParser; +import org.dive4elements.river.importer.parsers.DA50Parser; +import org.dive4elements.river.importer.parsers.DA66Parser; +import org.dive4elements.river.importer.parsers.FlowVelocityMeasurementParser; +import org.dive4elements.river.importer.parsers.FlowVelocityModelParser; +import org.dive4elements.river.importer.parsers.HYKParser; +import org.dive4elements.river.importer.parsers.MeasurementStationsParser; +import org.dive4elements.river.importer.parsers.MorphologicalWidthParser; +import org.dive4elements.river.importer.parsers.PRFParser; +import org.dive4elements.river.importer.parsers.PegelGltParser; +import org.dive4elements.river.importer.parsers.SQRelationParser; +import org.dive4elements.river.importer.parsers.SedimentDensityParser; +import org.dive4elements.river.importer.parsers.SedimentYieldParser; +import org.dive4elements.river.importer.parsers.W80Parser; +import org.dive4elements.river.importer.parsers.W80CSVParser; +import org.dive4elements.river.importer.parsers.WaterlevelDifferencesParser; +import org.dive4elements.river.importer.parsers.WaterlevelParser; +import org.dive4elements.river.importer.parsers.WstParser; + +import org.dive4elements.river.model.River; +import org.dive4elements.river.model.Unit; import java.io.File; import java.io.IOException; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/ImportSQRelation.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/ImportSQRelation.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/ImportSQRelation.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.importer; +package org.dive4elements.river.importer; import java.sql.SQLException; import java.util.ArrayList; @@ -10,9 +10,9 @@ import org.hibernate.Session; import org.hibernate.exception.ConstraintViolationException; -import de.intevation.flys.model.River; -import de.intevation.flys.model.SQRelation; -import de.intevation.flys.model.TimeInterval; +import org.dive4elements.river.model.River; +import org.dive4elements.river.model.SQRelation; +import org.dive4elements.river.model.TimeInterval; public class ImportSQRelation { diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/ImportSQRelationValue.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/ImportSQRelationValue.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/ImportSQRelationValue.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.importer; +package org.dive4elements.river.importer; import java.math.BigDecimal; import java.sql.SQLException; @@ -10,9 +10,9 @@ import org.hibernate.Session; import org.hibernate.exception.ConstraintViolationException; -import de.intevation.flys.model.MeasurementStation; -import de.intevation.flys.model.SQRelation; -import de.intevation.flys.model.SQRelationValue; +import org.dive4elements.river.model.MeasurementStation; +import org.dive4elements.river.model.SQRelation; +import org.dive4elements.river.model.SQRelationValue; public class ImportSQRelationValue { diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/ImportSedimentDensity.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/ImportSedimentDensity.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/ImportSedimentDensity.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.importer; +package org.dive4elements.river.importer; import java.util.ArrayList; import java.util.List; @@ -7,8 +7,8 @@ import org.hibernate.Query; import org.hibernate.Session; -import de.intevation.flys.model.River; -import de.intevation.flys.model.SedimentDensity; +import org.dive4elements.river.model.River; +import org.dive4elements.river.model.SedimentDensity; public class ImportSedimentDensity { diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/ImportSedimentDensityValue.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/ImportSedimentDensityValue.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/ImportSedimentDensityValue.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.importer; +package org.dive4elements.river.importer; import java.math.BigDecimal; @@ -9,8 +9,8 @@ import org.hibernate.Session; import org.hibernate.Query; -import de.intevation.flys.model.SedimentDensity; -import de.intevation.flys.model.SedimentDensityValue; +import org.dive4elements.river.model.SedimentDensity; +import org.dive4elements.river.model.SedimentDensityValue; public class ImportSedimentDensityValue { diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/ImportSedimentYield.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/ImportSedimentYield.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/ImportSedimentYield.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.importer; +package org.dive4elements.river.importer; import java.util.ArrayList; import java.util.List; @@ -8,11 +8,11 @@ import org.hibernate.Session; import org.hibernate.Query; -import de.intevation.flys.model.GrainFraction; -import de.intevation.flys.model.River; -import de.intevation.flys.model.SedimentYield; -import de.intevation.flys.model.TimeInterval; -import de.intevation.flys.model.Unit; +import org.dive4elements.river.model.GrainFraction; +import org.dive4elements.river.model.River; +import org.dive4elements.river.model.SedimentYield; +import org.dive4elements.river.model.TimeInterval; +import org.dive4elements.river.model.Unit; public class ImportSedimentYield { diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/ImportSedimentYieldValue.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/ImportSedimentYieldValue.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/ImportSedimentYieldValue.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,12 +1,12 @@ -package de.intevation.flys.importer; +package org.dive4elements.river.importer; import java.util.List; import org.hibernate.Session; import org.hibernate.Query; -import de.intevation.flys.model.SedimentYield; -import de.intevation.flys.model.SedimentYieldValue; +import org.dive4elements.river.model.SedimentYield; +import org.dive4elements.river.model.SedimentYieldValue; public class ImportSedimentYieldValue { diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/ImportTimeInterval.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/ImportTimeInterval.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/ImportTimeInterval.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,6 +1,6 @@ -package de.intevation.flys.importer; +package org.dive4elements.river.importer; -import de.intevation.flys.model.TimeInterval; +import org.dive4elements.river.model.TimeInterval; import org.hibernate.Session; import org.hibernate.Query; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/ImportUnit.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/ImportUnit.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/ImportUnit.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.importer; +package org.dive4elements.river.importer; import java.util.List; @@ -7,7 +7,7 @@ import org.hibernate.Session; import org.hibernate.Query; -import de.intevation.flys.model.Unit; +import org.dive4elements.river.model.Unit; public class ImportUnit diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/ImportWst.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/ImportWst.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/ImportWst.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,7 +1,7 @@ -package de.intevation.flys.importer; +package org.dive4elements.river.importer; -import de.intevation.flys.model.Wst; -import de.intevation.flys.model.River; +import org.dive4elements.river.model.Wst; +import org.dive4elements.river.model.River; import org.apache.log4j.Logger; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/ImportWstColumn.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/ImportWstColumn.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/ImportWstColumn.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,9 +1,9 @@ -package de.intevation.flys.importer; +package org.dive4elements.river.importer; -import de.intevation.flys.model.Wst; -import de.intevation.flys.model.WstColumn; -import de.intevation.flys.model.River; -import de.intevation.flys.model.TimeInterval; +import org.dive4elements.river.model.Wst; +import org.dive4elements.river.model.WstColumn; +import org.dive4elements.river.model.River; +import org.dive4elements.river.model.TimeInterval; import org.hibernate.Session; import org.hibernate.Query; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/ImportWstColumnQRange.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/ImportWstColumnQRange.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/ImportWstColumnQRange.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,9 +1,9 @@ -package de.intevation.flys.importer; +package org.dive4elements.river.importer; -import de.intevation.flys.model.WstColumnQRange; -import de.intevation.flys.model.WstQRange; -import de.intevation.flys.model.WstColumn; -import de.intevation.flys.model.River; +import org.dive4elements.river.model.WstColumnQRange; +import org.dive4elements.river.model.WstQRange; +import org.dive4elements.river.model.WstColumn; +import org.dive4elements.river.model.River; import org.hibernate.Session; import org.hibernate.Query; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/ImportWstColumnValue.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/ImportWstColumnValue.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/ImportWstColumnValue.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,8 +1,8 @@ -package de.intevation.flys.importer; +package org.dive4elements.river.importer; -import de.intevation.flys.model.WstColumnValue; -import de.intevation.flys.model.WstColumn; -import de.intevation.flys.model.River; +import org.dive4elements.river.model.WstColumnValue; +import org.dive4elements.river.model.WstColumn; +import org.dive4elements.river.model.River; import java.math.BigDecimal; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/ImportWstQRange.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/ImportWstQRange.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/ImportWstQRange.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,10 +1,10 @@ -package de.intevation.flys.importer; +package org.dive4elements.river.importer; import java.math.BigDecimal; -import de.intevation.flys.model.WstQRange; -import de.intevation.flys.model.River; -import de.intevation.flys.model.Range; +import org.dive4elements.river.model.WstQRange; +import org.dive4elements.river.model.River; +import org.dive4elements.river.model.Range; import org.hibernate.Session; import org.hibernate.Query; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/Importer.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/Importer.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/Importer.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,10 +1,10 @@ -package de.intevation.flys.importer; +package org.dive4elements.river.importer; -import de.intevation.artifacts.common.utils.XMLUtils; +import org.dive4elements.artifacts.common.utils.XMLUtils; -import de.intevation.flys.importer.parsers.AnnotationClassifier; -import de.intevation.flys.importer.parsers.BundesWasserStrassenParser; -import de.intevation.flys.importer.parsers.InfoGewParser; +import org.dive4elements.river.importer.parsers.AnnotationClassifier; +import org.dive4elements.river.importer.parsers.BundesWasserStrassenParser; +import org.dive4elements.river.importer.parsers.InfoGewParser; import java.io.File; import java.io.IOException; @@ -22,7 +22,7 @@ import org.w3c.dom.Document; -import de.intevation.flys.utils.StringUtil; +import org.dive4elements.river.utils.StringUtil; /** Data Importer. Further processing happens per-river. */ public class Importer diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/ImporterSession.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/ImporterSession.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/ImporterSession.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.importer; +package org.dive4elements.river.importer; import java.util.Iterator; import java.util.Map; @@ -11,18 +11,18 @@ import org.hibernate.Query; import org.hibernate.FlushMode; -import de.intevation.flys.backend.SessionFactoryProvider; +import org.dive4elements.river.backend.SessionFactoryProvider; -import de.intevation.flys.model.WstColumnValue; -import de.intevation.flys.model.WstColumn; -import de.intevation.flys.model.DischargeTableValue; -import de.intevation.flys.model.DischargeTable; -import de.intevation.flys.model.Range; -import de.intevation.flys.model.River; +import org.dive4elements.river.model.WstColumnValue; +import org.dive4elements.river.model.WstColumn; +import org.dive4elements.river.model.DischargeTableValue; +import org.dive4elements.river.model.DischargeTable; +import org.dive4elements.river.model.Range; +import org.dive4elements.river.model.River; import org.apache.log4j.Logger; -import de.intevation.artifacts.common.utils.LRUCache; +import org.dive4elements.artifacts.common.utils.LRUCache; public class ImporterSession { diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/ValueKey.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/ValueKey.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/ValueKey.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.importer; +package org.dive4elements.river.importer; import java.math.BigDecimal; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/XY.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/XY.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/XY.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.importer; +package org.dive4elements.river.importer; /** Two doubles and an int index. */ diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/parsers/AnnotationClassifier.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/parsers/AnnotationClassifier.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/parsers/AnnotationClassifier.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.importer.parsers; +package org.dive4elements.river.importer.parsers; import org.w3c.dom.Document; import org.w3c.dom.NodeList; @@ -16,10 +16,10 @@ import org.apache.log4j.Logger; -import de.intevation.artifacts.common.utils.XMLUtils; +import org.dive4elements.artifacts.common.utils.XMLUtils; -import de.intevation.flys.importer.ImportAnnotationType; -import de.intevation.flys.importer.Importer; +import org.dive4elements.river.importer.ImportAnnotationType; +import org.dive4elements.river.importer.Importer; public class AnnotationClassifier { diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/parsers/AnnotationsParser.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/parsers/AnnotationsParser.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/parsers/AnnotationsParser.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.importer.parsers; +package org.dive4elements.river.importer.parsers; import java.util.HashMap; import java.util.TreeSet; @@ -15,14 +15,14 @@ import org.apache.log4j.Logger; -import de.intevation.artifacts.common.utils.FileTools; +import org.dive4elements.artifacts.common.utils.FileTools; -import de.intevation.flys.importer.ImportAnnotation; -import de.intevation.flys.importer.ImportRange; -import de.intevation.flys.importer.ImportEdge; -import de.intevation.flys.importer.ImportAnnotationType; -import de.intevation.flys.importer.ImportAttribute; -import de.intevation.flys.importer.ImportPosition; +import org.dive4elements.river.importer.ImportAnnotation; +import org.dive4elements.river.importer.ImportRange; +import org.dive4elements.river.importer.ImportEdge; +import org.dive4elements.river.importer.ImportAnnotationType; +import org.dive4elements.river.importer.ImportAttribute; +import org.dive4elements.river.importer.ImportPosition; public class AnnotationsParser { diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/parsers/AtFileParser.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/parsers/AtFileParser.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/parsers/AtFileParser.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.importer.parsers; +package org.dive4elements.river.importer.parsers; import java.io.BufferedReader; import java.io.File; @@ -9,8 +9,8 @@ import org.apache.log4j.Logger; -import de.intevation.flys.importer.ImportDischargeTable; -import de.intevation.flys.importer.ImportDischargeTableValue; +import org.dive4elements.river.importer.ImportDischargeTable; +import org.dive4elements.river.importer.ImportDischargeTableValue; import java.util.regex.Pattern; import java.util.regex.Matcher; @@ -18,7 +18,7 @@ import java.util.Date; import java.util.Calendar; -import de.intevation.flys.importer.ImportTimeInterval; +import org.dive4elements.river.importer.ImportTimeInterval; /** Parse *.at (Abflusstafeln?) files. */ public class AtFileParser { diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/parsers/BedHeightEpochParser.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/parsers/BedHeightEpochParser.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/parsers/BedHeightEpochParser.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.importer.parsers; +package org.dive4elements.river.importer.parsers; import java.math.BigDecimal; @@ -6,9 +6,9 @@ import org.apache.log4j.Logger; -import de.intevation.flys.importer.ImportBedHeight; -import de.intevation.flys.importer.ImportBedHeightEpoch; -import de.intevation.flys.importer.ImportBedHeightEpochValue; +import org.dive4elements.river.importer.ImportBedHeight; +import org.dive4elements.river.importer.ImportBedHeightEpoch; +import org.dive4elements.river.importer.ImportBedHeightEpochValue; /** Parses BedHeightEpochs from csv file. */ diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/parsers/BedHeightParser.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/parsers/BedHeightParser.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/parsers/BedHeightParser.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.importer.parsers; +package org.dive4elements.river.importer.parsers; import java.io.File; @@ -23,15 +23,15 @@ import org.apache.log4j.Logger; -import de.intevation.flys.importer.ImportBedHeight; -import de.intevation.flys.importer.ImportBedHeightType; -import de.intevation.flys.importer.ImportElevationModel; -import de.intevation.flys.importer.ImportLocationSystem; -import de.intevation.flys.importer.ImportRange; -import de.intevation.flys.importer.ImportTimeInterval; -import de.intevation.flys.importer.ImportUnit; -import de.intevation.flys.model.BedHeightType; -import de.intevation.flys.importer.ImporterSession; +import org.dive4elements.river.importer.ImportBedHeight; +import org.dive4elements.river.importer.ImportBedHeightType; +import org.dive4elements.river.importer.ImportElevationModel; +import org.dive4elements.river.importer.ImportLocationSystem; +import org.dive4elements.river.importer.ImportRange; +import org.dive4elements.river.importer.ImportTimeInterval; +import org.dive4elements.river.importer.ImportUnit; +import org.dive4elements.river.model.BedHeightType; +import org.dive4elements.river.importer.ImporterSession; public abstract class BedHeightParser { diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/parsers/BedHeightSingleParser.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/parsers/BedHeightSingleParser.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/parsers/BedHeightSingleParser.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.importer.parsers; +package org.dive4elements.river.importer.parsers; import java.math.BigDecimal; @@ -6,9 +6,9 @@ import org.apache.log4j.Logger; -import de.intevation.flys.importer.ImportBedHeight; -import de.intevation.flys.importer.ImportBedHeightSingle; -import de.intevation.flys.importer.ImportBedHeightSingleValue; +import org.dive4elements.river.importer.ImportBedHeight; +import org.dive4elements.river.importer.ImportBedHeightSingle; +import org.dive4elements.river.importer.ImportBedHeightSingleValue; public class BedHeightSingleParser extends BedHeightParser { diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/parsers/BundesWasserStrassenParser.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/parsers/BundesWasserStrassenParser.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/parsers/BundesWasserStrassenParser.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.importer.parsers; +package org.dive4elements.river.importer.parsers; import java.util.HashMap; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/parsers/CrossSectionParser.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/parsers/CrossSectionParser.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/parsers/CrossSectionParser.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,6 +1,6 @@ -package de.intevation.flys.importer.parsers; +package org.dive4elements.river.importer.parsers; -import de.intevation.flys.importer.XY; +import org.dive4elements.river.importer.XY; import java.io.File; import java.util.List; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/parsers/DA50Parser.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/parsers/DA50Parser.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/parsers/DA50Parser.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.importer.parsers; +package org.dive4elements.river.importer.parsers; import java.util.ArrayList; import java.util.Map; @@ -10,11 +10,11 @@ import org.apache.log4j.Logger; -import de.intevation.flys.importer.XY; +import org.dive4elements.river.importer.XY; -import de.intevation.artifacts.common.utils.FileTools; +import org.dive4elements.artifacts.common.utils.FileTools; -import de.intevation.flys.utils.EpsilonComparator; +import org.dive4elements.river.utils.EpsilonComparator; /** diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/parsers/DA66Parser.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/parsers/DA66Parser.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/parsers/DA66Parser.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,10 +1,10 @@ -package de.intevation.flys.importer.parsers; +package org.dive4elements.river.importer.parsers; -import de.intevation.artifacts.common.utils.FileTools; +import org.dive4elements.artifacts.common.utils.FileTools; -import de.intevation.flys.importer.XY; +import org.dive4elements.river.importer.XY; -import de.intevation.flys.utils.EpsilonComparator; +import org.dive4elements.river.utils.EpsilonComparator; import java.io.File; import java.io.IOException; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/parsers/FlowVelocityMeasurementParser.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/parsers/FlowVelocityMeasurementParser.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/parsers/FlowVelocityMeasurementParser.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,7 +1,7 @@ -package de.intevation.flys.importer.parsers; +package org.dive4elements.river.importer.parsers; -import de.intevation.flys.importer.ImportFlowVelocityMeasurement; -import de.intevation.flys.importer.ImportFlowVelocityMeasurementValue; +import org.dive4elements.river.importer.ImportFlowVelocityMeasurement; +import org.dive4elements.river.importer.ImportFlowVelocityMeasurementValue; import java.math.BigDecimal; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/parsers/FlowVelocityModelParser.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/parsers/FlowVelocityModelParser.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/parsers/FlowVelocityModelParser.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.importer.parsers; +package org.dive4elements.river.importer.parsers; import java.io.File; import java.io.IOException; @@ -14,10 +14,10 @@ import org.apache.log4j.Logger; -import de.intevation.flys.importer.ImportDischargeZone; -import de.intevation.flys.importer.ImportFlowVelocityModel; -import de.intevation.flys.importer.ImportFlowVelocityModelValue; -import de.intevation.flys.utils.EpsilonComparator; +import org.dive4elements.river.importer.ImportDischargeZone; +import org.dive4elements.river.importer.ImportFlowVelocityModel; +import org.dive4elements.river.importer.ImportFlowVelocityModelValue; +import org.dive4elements.river.utils.EpsilonComparator; public class FlowVelocityModelParser extends LineParser { diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/parsers/HYKParser.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/parsers/HYKParser.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/parsers/HYKParser.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,12 +1,12 @@ -package de.intevation.flys.importer.parsers; - -import de.intevation.artifacts.common.utils.FileTools; +package org.dive4elements.river.importer.parsers; -import de.intevation.flys.importer.ImportHYK; -import de.intevation.flys.importer.ImportHYKEntry; -import de.intevation.flys.importer.ImportHYKFormation; -import de.intevation.flys.importer.ImportHYKFlowZone; -import de.intevation.flys.importer.ImportHYKFlowZoneType; +import org.dive4elements.artifacts.common.utils.FileTools; + +import org.dive4elements.river.importer.ImportHYK; +import org.dive4elements.river.importer.ImportHYKEntry; +import org.dive4elements.river.importer.ImportHYKFormation; +import org.dive4elements.river.importer.ImportHYKFlowZone; +import org.dive4elements.river.importer.ImportHYKFlowZoneType; import java.io.File; import java.io.IOException; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/parsers/InfoGewParser.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/parsers/InfoGewParser.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/parsers/InfoGewParser.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.importer.parsers; +package org.dive4elements.river.importer.parsers; import java.io.File; @@ -15,9 +15,9 @@ import org.apache.log4j.Logger; -import de.intevation.artifacts.common.utils.FileTools; +import org.dive4elements.artifacts.common.utils.FileTools; -import de.intevation.flys.importer.ImportRiver; +import org.dive4elements.river.importer.ImportRiver; /** Processes files mentioned in an info file for a river. */ diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/parsers/LineParser.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/parsers/LineParser.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/parsers/LineParser.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.importer.parsers; +package org.dive4elements.river.importer.parsers; import java.io.File; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/parsers/MeasurementStationsParser.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/parsers/MeasurementStationsParser.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/parsers/MeasurementStationsParser.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.importer.parsers; +package org.dive4elements.river.importer.parsers; import java.math.BigDecimal; import java.text.ParseException; @@ -8,9 +8,9 @@ import org.apache.log4j.Logger; -import de.intevation.flys.importer.ImportMeasurementStation; -import de.intevation.flys.importer.ImportRange; -import de.intevation.flys.importer.ImportTimeInterval; +import org.dive4elements.river.importer.ImportMeasurementStation; +import org.dive4elements.river.importer.ImportRange; +import org.dive4elements.river.importer.ImportTimeInterval; public class MeasurementStationsParser extends LineParser { diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/parsers/MorphologicalWidthParser.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/parsers/MorphologicalWidthParser.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/parsers/MorphologicalWidthParser.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.importer.parsers; +package org.dive4elements.river.importer.parsers; import java.math.BigDecimal; @@ -12,9 +12,9 @@ import org.apache.log4j.Logger; -import de.intevation.flys.importer.ImportMorphWidth; -import de.intevation.flys.importer.ImportMorphWidthValue; -import de.intevation.flys.importer.ImportUnit; +import org.dive4elements.river.importer.ImportMorphWidth; +import org.dive4elements.river.importer.ImportMorphWidthValue; +import org.dive4elements.river.importer.ImportUnit; public class MorphologicalWidthParser extends LineParser { diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/parsers/PRFParser.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/parsers/PRFParser.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/parsers/PRFParser.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.importer.parsers; +package org.dive4elements.river.importer.parsers; import java.util.Map; import java.util.TreeMap; @@ -17,9 +17,9 @@ import org.apache.log4j.Logger; -import de.intevation.flys.importer.XY; +import org.dive4elements.river.importer.XY; -import de.intevation.artifacts.common.utils.FileTools; +import org.dive4elements.artifacts.common.utils.FileTools; /** diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/parsers/PegelGltParser.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/parsers/PegelGltParser.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/parsers/PegelGltParser.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.importer.parsers; +package org.dive4elements.river.importer.parsers; import java.io.File; @@ -14,10 +14,10 @@ import org.apache.log4j.Logger; -import de.intevation.artifacts.common.utils.FileTools; +import org.dive4elements.artifacts.common.utils.FileTools; -import de.intevation.flys.importer.ImportGauge; -import de.intevation.flys.importer.ImportRange; +import org.dive4elements.river.importer.ImportGauge; +import org.dive4elements.river.importer.ImportRange; public class PegelGltParser { diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/parsers/SQRelationParser.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/parsers/SQRelationParser.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/parsers/SQRelationParser.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.importer.parsers; +package org.dive4elements.river.importer.parsers; import java.io.File; import java.io.IOException; @@ -11,9 +11,9 @@ import org.apache.log4j.Logger; -import de.intevation.flys.importer.ImportSQRelation; -import de.intevation.flys.importer.ImportSQRelationValue; -import de.intevation.flys.importer.ImportTimeInterval; +import org.dive4elements.river.importer.ImportSQRelation; +import org.dive4elements.river.importer.ImportSQRelationValue; +import org.dive4elements.river.importer.ImportTimeInterval; public class SQRelationParser extends LineParser { diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/parsers/SedimentDensityParser.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/parsers/SedimentDensityParser.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/parsers/SedimentDensityParser.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,8 +1,8 @@ -package de.intevation.flys.importer.parsers; +package org.dive4elements.river.importer.parsers; -import de.intevation.flys.importer.ImportDepth; -import de.intevation.flys.importer.ImportSedimentDensity; -import de.intevation.flys.importer.ImportSedimentDensityValue; +import org.dive4elements.river.importer.ImportDepth; +import org.dive4elements.river.importer.ImportSedimentDensity; +import org.dive4elements.river.importer.ImportSedimentDensityValue; import java.io.File; import java.io.IOException; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/parsers/SedimentYieldParser.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/parsers/SedimentYieldParser.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/parsers/SedimentYieldParser.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.importer.parsers; +package org.dive4elements.river.importer.parsers; import java.io.File; import java.io.IOException; @@ -13,12 +13,12 @@ import org.apache.log4j.Logger; -import de.intevation.flys.importer.ImportGrainFraction; -import de.intevation.flys.importer.ImportSedimentYield; -import de.intevation.flys.importer.ImportSedimentYieldValue; -import de.intevation.flys.importer.ImportTimeInterval; -import de.intevation.flys.importer.ImportUnit; -import de.intevation.flys.model.GrainFraction; +import org.dive4elements.river.importer.ImportGrainFraction; +import org.dive4elements.river.importer.ImportSedimentYield; +import org.dive4elements.river.importer.ImportSedimentYieldValue; +import org.dive4elements.river.importer.ImportTimeInterval; +import org.dive4elements.river.importer.ImportUnit; +import org.dive4elements.river.model.GrainFraction; public class SedimentYieldParser extends LineParser { diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/parsers/StaFileParser.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/parsers/StaFileParser.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/parsers/StaFileParser.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.importer.parsers; +package org.dive4elements.river.importer.parsers; import java.io.File; import java.io.IOException; @@ -18,12 +18,12 @@ import org.apache.log4j.Logger; -import de.intevation.flys.importer.ImportMainValueType; -import de.intevation.flys.importer.ImportMainValue; -import de.intevation.flys.importer.ImportNamedMainValue; -import de.intevation.flys.importer.ImportGauge; -import de.intevation.flys.importer.ImportTimeInterval; -import de.intevation.flys.utils.DateGuesser; +import org.dive4elements.river.importer.ImportMainValueType; +import org.dive4elements.river.importer.ImportMainValue; +import org.dive4elements.river.importer.ImportNamedMainValue; +import org.dive4elements.river.importer.ImportGauge; +import org.dive4elements.river.importer.ImportTimeInterval; +import org.dive4elements.river.utils.DateGuesser; public class StaFileParser { diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/parsers/W80CSVParser.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/parsers/W80CSVParser.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/parsers/W80CSVParser.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,13 +1,13 @@ -package de.intevation.flys.importer.parsers; - -import de.intevation.artifacts.common.utils.FileTools; +package org.dive4elements.river.importer.parsers; -import de.intevation.flys.importer.XY; +import org.dive4elements.artifacts.common.utils.FileTools; -import de.intevation.flys.importer.parsers.tim.Coordinate; +import org.dive4elements.river.importer.XY; -import de.intevation.flys.utils.DateGuesser; -import de.intevation.flys.utils.EpsilonComparator; +import org.dive4elements.river.importer.parsers.tim.Coordinate; + +import org.dive4elements.river.utils.DateGuesser; +import org.dive4elements.river.utils.EpsilonComparator; import java.io.File; import java.io.IOException; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/parsers/W80Parser.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/parsers/W80Parser.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/parsers/W80Parser.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,13 +1,13 @@ -package de.intevation.flys.importer.parsers; - -import de.intevation.artifacts.common.utils.FileTools; +package org.dive4elements.river.importer.parsers; -import de.intevation.flys.importer.XY; +import org.dive4elements.artifacts.common.utils.FileTools; -import de.intevation.flys.importer.parsers.tim.Coordinate; +import org.dive4elements.river.importer.XY; -import de.intevation.flys.utils.DateGuesser; -import de.intevation.flys.utils.EpsilonComparator; +import org.dive4elements.river.importer.parsers.tim.Coordinate; + +import org.dive4elements.river.utils.DateGuesser; +import org.dive4elements.river.utils.EpsilonComparator; import java.io.File; import java.io.IOException; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/parsers/WaterlevelDifferencesParser.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/parsers/WaterlevelDifferencesParser.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/parsers/WaterlevelDifferencesParser.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.importer.parsers; +package org.dive4elements.river.importer.parsers; import java.io.File; import java.io.IOException; @@ -12,10 +12,10 @@ import org.apache.log4j.Logger; -import de.intevation.flys.importer.ImportUnit; +import org.dive4elements.river.importer.ImportUnit; -import de.intevation.flys.importer.ImportWst; -import de.intevation.flys.importer.ImportWstColumn; +import org.dive4elements.river.importer.ImportWst; +import org.dive4elements.river.importer.ImportWstColumn; /** diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/parsers/WaterlevelParser.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/parsers/WaterlevelParser.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/parsers/WaterlevelParser.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.importer.parsers; +package org.dive4elements.river.importer.parsers; import java.io.File; import java.io.IOException; @@ -12,13 +12,13 @@ import org.apache.log4j.Logger; -import de.intevation.flys.importer.ImportUnit; +import org.dive4elements.river.importer.ImportUnit; -import de.intevation.flys.importer.ImportRange; -import de.intevation.flys.importer.ImportWst; -import de.intevation.flys.importer.ImportWstColumn; -import de.intevation.flys.importer.ImportWstColumnValue; -import de.intevation.flys.importer.ImportWstQRange; +import org.dive4elements.river.importer.ImportRange; +import org.dive4elements.river.importer.ImportWst; +import org.dive4elements.river.importer.ImportWstColumn; +import org.dive4elements.river.importer.ImportWstColumnValue; +import org.dive4elements.river.importer.ImportWstQRange; /** diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/parsers/WstParser.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/parsers/WstParser.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/parsers/WstParser.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.importer.parsers; +package org.dive4elements.river.importer.parsers; import java.util.ArrayList; import java.util.HashSet; @@ -13,20 +13,20 @@ import org.apache.log4j.Logger; -import de.intevation.flys.utils.StringUtil; -import de.intevation.flys.utils.DateGuesser; +import org.dive4elements.river.utils.StringUtil; +import org.dive4elements.river.utils.DateGuesser; import java.util.regex.Pattern; import java.util.regex.Matcher; import java.math.BigDecimal; -import de.intevation.flys.importer.ImportWstQRange; -import de.intevation.flys.importer.ImportWstColumn; -import de.intevation.flys.importer.ImportTimeInterval; -import de.intevation.flys.importer.ImportRange; -import de.intevation.flys.importer.ImportUnit; -import de.intevation.flys.importer.ImportWst; +import org.dive4elements.river.importer.ImportWstQRange; +import org.dive4elements.river.importer.ImportWstColumn; +import org.dive4elements.river.importer.ImportTimeInterval; +import org.dive4elements.river.importer.ImportRange; +import org.dive4elements.river.importer.ImportUnit; +import org.dive4elements.river.importer.ImportWst; public class WstParser { diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/parsers/tim/Coordinate.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/parsers/tim/Coordinate.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/parsers/tim/Coordinate.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.importer.parsers.tim; +package org.dive4elements.river.importer.parsers.tim; /** X,Y,Z- triple. */ public class Coordinate diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/parsers/tim/LexiComparator.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/parsers/tim/LexiComparator.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/parsers/tim/LexiComparator.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.importer.parsers.tim; +package org.dive4elements.river.importer.parsers.tim; import java.util.Comparator; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/parsers/tim/Line.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/parsers/tim/Line.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/parsers/tim/Line.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.importer.parsers.tim; +package org.dive4elements.river.importer.parsers.tim; /** Two coordinates and a helper. */ public class Line { diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/importer/parsers/tim/TIMParser.java --- a/flys-backend/src/main/java/org/dive4elements/river/importer/parsers/tim/TIMParser.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/importer/parsers/tim/TIMParser.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.importer.parsers.tim; +package org.dive4elements.river.importer.parsers.tim; import java.io.BufferedReader; import java.io.FileInputStream; @@ -13,7 +13,7 @@ import org.apache.log4j.Logger; -import de.intevation.flys.utils.EpsilonComparator; +import org.dive4elements.river.utils.EpsilonComparator; /** Parser for single .tim files. */ public class TIMParser diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/Annotation.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/Annotation.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/Annotation.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; import java.io.Serializable; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/AnnotationType.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/AnnotationType.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/AnnotationType.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; import java.io.Serializable; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/Attribute.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/Attribute.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/Attribute.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; import java.io.Serializable; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/AxisKind.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/AxisKind.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/AxisKind.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; import java.io.Serializable; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/BedHeightEpoch.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/BedHeightEpoch.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/BedHeightEpoch.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; import java.io.Serializable; @@ -19,7 +19,7 @@ import org.hibernate.Session; import org.hibernate.Query; -import de.intevation.flys.backend.SessionHolder; +import org.dive4elements.river.backend.SessionHolder; @Entity diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/BedHeightEpochValue.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/BedHeightEpochValue.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/BedHeightEpochValue.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; import java.util.List; @@ -20,7 +20,7 @@ import org.hibernate.Session; import org.hibernate.Query; -import de.intevation.flys.backend.SessionHolder; +import org.dive4elements.river.backend.SessionHolder; @Entity diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/BedHeightSingle.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/BedHeightSingle.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/BedHeightSingle.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; import java.io.Serializable; @@ -19,7 +19,7 @@ import org.hibernate.Session; import org.hibernate.Query; -import de.intevation.flys.backend.SessionHolder; +import org.dive4elements.river.backend.SessionHolder; @Entity diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/BedHeightSingleValue.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/BedHeightSingleValue.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/BedHeightSingleValue.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; import java.util.List; @@ -20,7 +20,7 @@ import org.hibernate.Session; import org.hibernate.Query; -import de.intevation.flys.backend.SessionHolder; +import org.dive4elements.river.backend.SessionHolder; @Entity diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/BedHeightType.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/BedHeightType.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/BedHeightType.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; import java.io.Serializable; @@ -17,7 +17,7 @@ import org.hibernate.Query; import org.hibernate.Session; -import de.intevation.flys.backend.SessionHolder; +import org.dive4elements.river.backend.SessionHolder; @Entity @Table(name = "bed_height_type") diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/BoundaryKind.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/BoundaryKind.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/BoundaryKind.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; import java.io.Serializable; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/Building.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/Building.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/Building.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; import java.io.Serializable; import java.util.List; @@ -16,7 +16,7 @@ import com.vividsolutions.jts.geom.LineString; -import de.intevation.flys.backend.SessionHolder; +import org.dive4elements.river.backend.SessionHolder; @Entity diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/CrossSection.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/CrossSection.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/CrossSection.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; import java.io.Serializable; @@ -28,7 +28,7 @@ import org.hibernate.type.StandardBasicTypes; -import de.intevation.flys.backend.SessionHolder; +import org.dive4elements.river.backend.SessionHolder; @Entity @Table(name = "cross_sections") diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/CrossSectionLine.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/CrossSectionLine.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/CrossSectionLine.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; import java.io.Serializable; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/CrossSectionPoint.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/CrossSectionPoint.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/CrossSectionPoint.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; import java.io.Serializable; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/CrossSectionTrack.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/CrossSectionTrack.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/CrossSectionTrack.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; import java.io.Serializable; import java.math.BigDecimal; @@ -17,7 +17,7 @@ import com.vividsolutions.jts.geom.LineString; -import de.intevation.flys.backend.SessionHolder; +import org.dive4elements.river.backend.SessionHolder; @Entity diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/CrossSectionTrackKind.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/CrossSectionTrackKind.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/CrossSectionTrackKind.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; import java.io.Serializable; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/DGM.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/DGM.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/DGM.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; import java.io.Serializable; import java.util.List; @@ -17,7 +17,7 @@ import org.hibernate.Session; import org.hibernate.Query; -import de.intevation.flys.backend.SessionHolder; +import org.dive4elements.river.backend.SessionHolder; @Entity diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/Depth.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/Depth.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/Depth.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; import java.io.Serializable; import java.math.BigDecimal; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/DischargeTable.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/DischargeTable.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/DischargeTable.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; import java.io.Serializable; import java.util.Date; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/DischargeTableValue.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/DischargeTableValue.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/DischargeTableValue.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; import java.math.BigDecimal; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/DischargeZone.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/DischargeZone.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/DischargeZone.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; import java.io.Serializable; import java.math.BigDecimal; @@ -19,7 +19,7 @@ import org.apache.log4j.Logger; -import de.intevation.flys.backend.SessionHolder; +import org.dive4elements.river.backend.SessionHolder; @Entity diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/Edge.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/Edge.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/Edge.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; import java.io.Serializable; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/ElevationModel.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/ElevationModel.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/ElevationModel.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; import java.io.Serializable; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/FastAnnotations.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/FastAnnotations.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/FastAnnotations.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; import java.util.Comparator; import java.util.ArrayList; @@ -15,7 +15,7 @@ import org.hibernate.type.StandardBasicTypes; -import de.intevation.flys.backend.SessionHolder; +import org.dive4elements.river.backend.SessionHolder; public class FastAnnotations implements Serializable diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/FastCrossSectionLine.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/FastCrossSectionLine.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/FastCrossSectionLine.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; import java.util.List; import java.util.Comparator; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/FedState.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/FedState.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/FedState.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; import java.io.Serializable; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/Fixpoint.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/Fixpoint.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/Fixpoint.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; import java.io.Serializable; import java.math.BigDecimal; @@ -17,7 +17,7 @@ import com.vividsolutions.jts.geom.Point; -import de.intevation.flys.backend.SessionHolder; +import org.dive4elements.river.backend.SessionHolder; @Entity diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/Floodmaps.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/Floodmaps.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/Floodmaps.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; import java.io.Serializable; import java.math.BigDecimal; @@ -17,7 +17,7 @@ import com.vividsolutions.jts.geom.Geometry; -import de.intevation.flys.backend.SessionHolder; +import org.dive4elements.river.backend.SessionHolder; @Entity diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/Floodmark.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/Floodmark.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/Floodmark.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; import java.io.Serializable; import java.math.BigDecimal; @@ -17,7 +17,7 @@ import com.vividsolutions.jts.geom.Point; -import de.intevation.flys.backend.SessionHolder; +import org.dive4elements.river.backend.SessionHolder; @Entity diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/Floodplain.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/Floodplain.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/Floodplain.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; import java.io.Serializable; import java.util.List; @@ -17,7 +17,7 @@ import com.vividsolutions.jts.geom.Polygon; -import de.intevation.flys.backend.SessionHolder; +import org.dive4elements.river.backend.SessionHolder; @Entity diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/FloodplainKind.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/FloodplainKind.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/FloodplainKind.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; import java.io.Serializable; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/FlowVelocityMeasurement.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/FlowVelocityMeasurement.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/FlowVelocityMeasurement.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; import java.io.Serializable; import java.util.List; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/FlowVelocityMeasurementValue.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/FlowVelocityMeasurementValue.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/FlowVelocityMeasurementValue.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; import java.io.Serializable; import java.math.BigDecimal; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/FlowVelocityModel.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/FlowVelocityModel.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/FlowVelocityModel.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,6 +1,6 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; -import de.intevation.flys.backend.SessionHolder; +import org.dive4elements.river.backend.SessionHolder; import java.io.Serializable; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/FlowVelocityModelValue.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/FlowVelocityModelValue.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/FlowVelocityModelValue.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; import java.io.Serializable; import java.math.BigDecimal; @@ -19,7 +19,7 @@ import org.apache.log4j.Logger; -import de.intevation.flys.backend.SessionHolder; +import org.dive4elements.river.backend.SessionHolder; @Entity diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/Gauge.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/Gauge.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/Gauge.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; import java.math.BigDecimal; @@ -20,7 +20,7 @@ import org.hibernate.Session; import org.hibernate.Query; -import de.intevation.flys.backend.SessionHolder; +import org.dive4elements.river.backend.SessionHolder; /** Database-mapped Gauge with all info about it. */ @Entity diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/GaugeLocation.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/GaugeLocation.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/GaugeLocation.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,8 +1,8 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; import com.vividsolutions.jts.geom.Point; -import de.intevation.flys.backend.SessionHolder; +import org.dive4elements.river.backend.SessionHolder; import java.io.Serializable; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/GrainFraction.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/GrainFraction.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/GrainFraction.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; import java.io.Serializable; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/HWSKind.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/HWSKind.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/HWSKind.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; import java.io.Serializable; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/HWSLine.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/HWSLine.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/HWSLine.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,8 +1,8 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; import com.vividsolutions.jts.geom.Geometry; -import de.intevation.flys.model.HWSKind; +import org.dive4elements.river.model.HWSKind; import java.io.Serializable; import java.util.List; @@ -21,7 +21,7 @@ import org.hibernate.Query; import org.hibernate.annotations.Type; -import de.intevation.flys.backend.SessionHolder; +import org.dive4elements.river.backend.SessionHolder; @Entity @Table(name = "hws_lines") diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/HWSPoint.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/HWSPoint.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/HWSPoint.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; import com.vividsolutions.jts.geom.Geometry; @@ -21,7 +21,7 @@ import org.hibernate.Session; import org.hibernate.Query; -import de.intevation.flys.backend.SessionHolder; +import org.dive4elements.river.backend.SessionHolder; @Entity @Table(name = "hws_points") diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/HYK.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/HYK.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/HYK.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; import java.io.Serializable; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/HYKEntry.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/HYKEntry.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/HYKEntry.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; import java.io.Serializable; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/HYKFlowZone.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/HYKFlowZone.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/HYKFlowZone.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; import java.io.Serializable; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/HYKFlowZoneType.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/HYKFlowZoneType.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/HYKFlowZoneType.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; import java.io.Serializable; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/HYKFormation.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/HYKFormation.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/HYKFormation.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; import java.io.Serializable; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/HydrBoundary.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/HydrBoundary.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/HydrBoundary.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; import java.io.Serializable; import java.util.List; @@ -19,7 +19,7 @@ import com.vividsolutions.jts.geom.MultiLineString; -import de.intevation.flys.backend.SessionHolder; +import org.dive4elements.river.backend.SessionHolder; @Entity diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/HydrBoundaryPoly.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/HydrBoundaryPoly.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/HydrBoundaryPoly.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; import java.io.Serializable; import java.util.List; @@ -19,7 +19,7 @@ import com.vividsolutions.jts.geom.Geometry; -import de.intevation.flys.backend.SessionHolder; +import org.dive4elements.river.backend.SessionHolder; @Entity diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/Jetty.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/Jetty.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/Jetty.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; import java.io.Serializable; import java.util.List; @@ -16,7 +16,7 @@ import org.hibernate.Query; import org.hibernate.annotations.Type; -import de.intevation.flys.backend.SessionHolder; +import org.dive4elements.river.backend.SessionHolder; @Entity @Table(name = "jetties") diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/LocationSystem.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/LocationSystem.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/LocationSystem.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; import java.io.Serializable; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/MainValue.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/MainValue.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/MainValue.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; import java.io.Serializable; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/MainValueType.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/MainValueType.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/MainValueType.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; import java.io.Serializable; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/MeasurementStation.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/MeasurementStation.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/MeasurementStation.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; import javax.persistence.Column; import javax.persistence.Entity; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/MinMaxWQ.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/MinMaxWQ.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/MinMaxWQ.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; import java.io.Serializable; import java.math.BigDecimal; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/MorphologicalWidth.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/MorphologicalWidth.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/MorphologicalWidth.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; import java.io.Serializable; import java.util.List; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/MorphologicalWidthValue.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/MorphologicalWidthValue.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/MorphologicalWidthValue.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; import java.io.Serializable; import java.math.BigDecimal; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/NamedMainValue.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/NamedMainValue.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/NamedMainValue.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; import java.io.Serializable; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/Position.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/Position.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/Position.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; import java.io.Serializable; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/Range.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/Range.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/Range.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; import java.io.Serializable; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/River.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/River.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/River.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,6 +1,6 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; -import de.intevation.flys.backend.SessionHolder; +import org.dive4elements.river.backend.SessionHolder; import java.io.Serializable; import java.math.BigDecimal; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/RiverAxis.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/RiverAxis.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/RiverAxis.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; import java.io.Serializable; import java.util.List; @@ -17,8 +17,8 @@ import com.vividsolutions.jts.geom.MultiLineString; -import de.intevation.flys.backend.SessionHolder; -import de.intevation.flys.model.AxisKind; +import org.dive4elements.river.backend.SessionHolder; +import org.dive4elements.river.model.AxisKind; /** diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/RiverAxisKm.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/RiverAxisKm.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/RiverAxisKm.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; import java.io.Serializable; import java.math.BigDecimal; @@ -17,7 +17,7 @@ import com.vividsolutions.jts.geom.Point; -import de.intevation.flys.backend.SessionHolder; +import org.dive4elements.river.backend.SessionHolder; @Entity diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/SQRelation.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/SQRelation.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/SQRelation.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; import java.io.Serializable; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/SQRelationValue.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/SQRelationValue.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/SQRelationValue.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; import java.io.Serializable; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/SectieKind.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/SectieKind.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/SectieKind.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; import java.io.Serializable; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/SedimentDensity.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/SedimentDensity.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/SedimentDensity.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; import java.io.Serializable; import java.util.List; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/SedimentDensityValue.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/SedimentDensityValue.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/SedimentDensityValue.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; import java.io.Serializable; import java.math.BigDecimal; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/SedimentYield.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/SedimentYield.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/SedimentYield.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; import java.io.Serializable; import java.util.ArrayList; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/SedimentYieldValue.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/SedimentYieldValue.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/SedimentYieldValue.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; import java.io.Serializable; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/SobekKind.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/SobekKind.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/SobekKind.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; import java.io.Serializable; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/TimeInterval.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/TimeInterval.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/TimeInterval.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; import java.io.Serializable; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/Unit.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/Unit.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/Unit.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; import java.io.Serializable; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/Wst.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/Wst.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/Wst.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; import java.io.Serializable; import java.math.BigDecimal; @@ -22,7 +22,7 @@ import org.hibernate.Query; import org.hibernate.type.StandardBasicTypes; -import de.intevation.flys.backend.SessionHolder; +import org.dive4elements.river.backend.SessionHolder; @Entity diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/WstColumn.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/WstColumn.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/WstColumn.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; import java.util.List; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/WstColumnQRange.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/WstColumnQRange.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/WstColumnQRange.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; import java.io.Serializable; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/WstColumnValue.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/WstColumnValue.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/WstColumnValue.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; import java.math.BigDecimal; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/model/WstQRange.java --- a/flys-backend/src/main/java/org/dive4elements/river/model/WstQRange.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/model/WstQRange.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.model; +package org.dive4elements.river.model; import java.math.BigDecimal; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/utils/DBCPConnectionProvider.java --- a/flys-backend/src/main/java/org/dive4elements/river/utils/DBCPConnectionProvider.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/utils/DBCPConnectionProvider.java Thu Apr 25 11:54:36 2013 +0200 @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.intevation.flys.utils; +package org.dive4elements.river.utils; import java.sql.Connection; import java.sql.SQLException; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/utils/DateGuesser.java --- a/flys-backend/src/main/java/org/dive4elements/river/utils/DateGuesser.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/utils/DateGuesser.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.utils; +package org.dive4elements.river.utils; /** * Copyright (c) 2006 by Intevation GmbH diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/utils/EpsilonComparator.java --- a/flys-backend/src/main/java/org/dive4elements/river/utils/EpsilonComparator.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/utils/EpsilonComparator.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.utils; +package org.dive4elements.river.utils; import java.util.Comparator; diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/main/java/org/dive4elements/river/utils/StringUtil.java --- a/flys-backend/src/main/java/org/dive4elements/river/utils/StringUtil.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/main/java/org/dive4elements/river/utils/StringUtil.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys.utils; +package org.dive4elements.river.utils; /** * Copyright (c) 2006 by Intevation GmbH diff -r dfb26b03b179 -r 18619c1e7c2a flys-backend/src/test/java/org/dive4elements/river/AppTest.java --- a/flys-backend/src/test/java/org/dive4elements/river/AppTest.java Thu Apr 25 11:53:11 2013 +0200 +++ b/flys-backend/src/test/java/org/dive4elements/river/AppTest.java Thu Apr 25 11:54:36 2013 +0200 @@ -1,4 +1,4 @@ -package de.intevation.flys; +package org.dive4elements.flys; import junit.framework.Test; import junit.framework.TestCase;