diff --git a/superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_update/edustore_kern_man_unload_config_ids.xml b/superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_update/edustore_kern_man_unload_config_ids.xml
new file mode 100644
index 0000000..b9f6d8e
--- /dev/null
+++ b/superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_update/edustore_kern_man_unload_config_ids.xml
@@ -0,0 +1,3 @@
+
+
+
diff --git a/superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_update/edustore_kern_man_unload_config_pg.xml b/superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_update/edustore_kern_man_unload_config_pg.xml
new file mode 100644
index 0000000..24ac2d1
--- /dev/null
+++ b/superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_update/edustore_kern_man_unload_config_pg.xml
@@ -0,0 +1,776 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_update/edustore_kern_man_upload_config_ids.xml b/superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_update/edustore_kern_man_upload_config_ids.xml
new file mode 100644
index 0000000..b9f6d8e
--- /dev/null
+++ b/superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_update/edustore_kern_man_upload_config_ids.xml
@@ -0,0 +1,3 @@
+
+
+
diff --git a/superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_update/edustore_kern_man_upload_config_pg.xml b/superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_update/edustore_kern_man_upload_config_pg.xml
new file mode 100644
index 0000000..adfc8d2
--- /dev/null
+++ b/superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_update/edustore_kern_man_upload_config_pg.xml
@@ -0,0 +1,267 @@
+
+
+
+
+
+eduetl:CREATE TABLE tmp_userinfo (tid integer, benutzer char(30), kennwort char(16), name char(50), max_versuch smallint, akt_versuch smallint, email char(255), administration smallint, archiv_recht smallint, passwd_sha char(40), info char(255), extern_account_id varchar(255), extern_person_id varchar(255),sieht_projekte SMALLINT, extern_role_id integer,gueltig_von date,gueltig_bis date);
+eduetl:CREATE TABLE tmp_user_group_bez (userinfo_id integer, groupinfo_id integer, external_entry smallint);
+eduetl:CREATE TABLE tmp_user_institution (userid integer, name char(50), ch110_institut char(10), hierarchie smallint, gueltig_seit date, gueltig_bis date, lehre smallint, external_entry smallint, externalid varchar(200));
+eduetl:CREATE TABLE tmp_user_masken_bez (userinfo_id integer, maskeninfo_id integer, external_entry smallint);
+eduetl:CREATE TABLE tmp_user_pw (userinfo_id integer, pw_gueltig_bis date, last_login timestamptz, old_sha1 char(40), zeitpunkt1 timestamptz, old_sha2 char(40), zeitpunkt2 timestamptz, old_sha3 char(40), zeitpunkt3 timestamptz, old_sha4 char(40), zeitpunkt4 timestamptz, old_sha5 char(40), zeitpunkt5 timestamptz, old_sha6 char(40), zeitpunkt6 timestamptz, old_sha7 char(40), zeitpunkt7 timestamptz);
+
+eduetl:CREATE TABLE tmp_user_sachgeb_bez (userinfo_id integer, sachgebiete_id integer, external_entry smallint);
+eduetl:CREATE TABLE tmp_user_sichtarten (userinfo_id integer, sichtart char(255), external_entry smallint);
+eduetl:CREATE TABLE tmp_user_sichten (userinfo_id integer, sicht_name_intern char(200), external_entry smallint);
+eduetl:CREATE TABLE tmp_group_field_pref (tid integer, groupinfo_id integer, field_id integer, pref varchar(255));
+eduetl:CREATE TABLE tmp_group_masken_bez (groupinfo_id integer, maskeninfo_id integer);
+eduetl:CREATE TABLE tmp_group_sachgeb_bez (groupinfo_id integer, sachgebiete_id integer);
+eduetl:CREATE TABLE tmp_group_sichtarten (groupinfo_id integer, sichtart char(255));
+eduetl:CREATE TABLE tmp_group_sichten (groupinfo_id integer, sicht_name_intern char(200));
+eduetl:CREATE TABLE tmp_groupinfo (tid integer, name char(255));
+eduetl:CREATE TABLE tmp_fin_user_kam (tid integer, userid INTEGER , kapitel CHAR(5) , dr CHAR(5) , titel CHAR(255) , untertitel CHAR(5) , kostenstellen CHAR(255) , buchungsab_fb CHAR(10) , projnr_ins CHAR(255) , ins2 CHAR(10) default '0' , ins3 CHAR(10) default '0' , restrict_konten VARCHAR(255) , restrict_buchungen VARCHAR(255) , gueltig_von DATE , gueltig_bis DATE);
+
+eduetl:CREATE TABLE tmp_konstanten (tid INTEGER not null, apnr INTEGER , beschreibung VARCHAR(255) , defaultvalue INTEGER , description VARCHAR(255) , systeminfo_id INTEGER , sachgebiete_id INTEGER , doku_link VARCHAR(255) , read_only INTEGER , wertebereich VARCHAR(255) , ab_version VARCHAR(20) , gruppe VARCHAR(100), priority INTEGER, sourcesystem INTEGER);
+eduetl:CREATE TABLE tmp_unload_params (tid INTEGER, param_id VARCHAR(255), param_val VARCHAR(255), default_val VARCHAR(255), description VARCHAR(255), systeminfo_id INTEGER, priority INTEGER, sourcesystem INTEGER, wertebereich VARCHAR(255) , ab_version VARCHAR(20) , gruppe VARCHAR(100));
+eduetl:CREATE TABLE tmp_sx_repository (tid integer, id char(200), content text, caption char(200), comment text, version smallint, art char(200), art2 char(200), art3 char(200), sachgebiete_id integer, sort1 integer, sort2 integer, sort3 integer, geaendert_am date, aktiv smallint, gueltig_seit date, gueltig_bis date);
+eduetl:CREATE TABLE tmp_themenbaum (tid integer, name varchar(255), maskeninfo_id integer, parent integer, gueltig_seit date, gueltig_bis date, erlaeuterung char(240), sort integer, css_class character varying(255));
+eduetl:CREATE TABLE tmp_maskeninfo (tid integer, name char(255), select_stmt text, xil_proplist text, chart_xtitel char(50), chart_ytitel char(50), erlaeuterung char(255), cleanup_stmt char(240), default_file char(200), frontend smallint, breite integer, hoehe integer, ampel smallint, hilfe smallint, hinweis text);
+eduetl:CREATE TABLE tmp_felderinfo (tid integer, name char(255), nummer integer, x integer, y integer, buttonbreite integer, feldbreite integer, zeilenanzahl integer, typ char(15), laenge integer, obligatorisch integer, art integer, relation text, attribut char(100), defaultwert text);
+eduetl:CREATE TABLE tmp_masken_felder_bez (maskeninfo_id integer, felderinfo_id integer);
+eduetl:CREATE TABLE tmp_maske_system_bez (maskeninfo_id integer, systeminfo_id integer);
+eduetl:CREATE TABLE tmp_sachgeb_maske_bez (sachgebiete_id integer, maskeninfo_id integer);
+eduetl:CREATE TABLE tmp_sx_stylesheets (tid integer, filename char(255), caption char(255), description char(255), relation char(10), useragent char(255), contenttype char(200),is_generic smallint, toolbar_icon_filepath VARCHAR(255) , usage_resultset_data CHAR(10), stylesheet_type CHAR(10) , jr_datasource CHAR(10), uniquename varchar(255));
+eduetl:CREATE TABLE tmp_sx_mask_style (tid integer, maskeninfo_id integer, stylesheet_id integer, ord smallint);
+eduetl:CREATE TABLE tmp_stylesheet_field (tid integer, stylesheet_id integer, tablename varchar(255), fieldname varchar(255));
+eduetl:CREATE TABLE tmp_macro_masken_bez (maskeninfo_id1 integer, maskeninfo_id2 integer, active integer, sortnr smallint, schleifenrelation char(255), schleifenfeldname char(255), alias char(255), schleifenfstand char(255), schleifenfsicht char(255), aktion char(255));
+eduetl:CREATE TABLE tmp_macro_feld_wert (macro integer, sortnr integer, feldname char(255), alias char(255), value char(255), value_caption char(255), feldstand char(255), feldsicht char(255), active integer);
+eduetl:CREATE TABLE tmp_sx_captions (tid integer, id char(200), table_name char(200), field_name char(200), record_no integer, locale char(10), contents_short char(255), contents_long text, equalitystatus smallint, sachgebiete_id integer, doku_link varchar(255), export_to_glossar integer);
+eduetl:CREATE TABLE tmp_sichten (tid integer, parent char(255), systeminfoid integer, art char(40), type integer, name_intern char(200), name char(200), beschreibung char(255), sortnr integer, quelle text, alt_hier_id char(150), treecfgtable char(255), treecfgid char(150), label smallint, user_rechte smallint, rechtequelle char(255), sesamkey char(100), standbutton smallint, attribut1 char(255), attribut2 char(255), attribut3 integer, attribut4 integer, xmlmaxentries integer, gueltig_seit date, gueltig_bis date, cacheapplet char(255), cachexml char(255), aktiv smallint);
+eduetl:CREATE TABLE tmp_man_catalogue (tid integer NOT NULL, id character varying(100) NOT NULL, shortname character varying(255), name character varying(255), description text, timeunit character varying(3), decimalplaces smallint, sqlchunk text, linksub text, linktimeline text, restrictedgroupids character(255), ismanual smallint, requiredfields character varying(255), calcratio smallint, gueltig_von date, gueltig_bis date, cleanup text, preparation text, techdetails text, moreinfo text, attrib1 integer DEFAULT 0 NOT NULL, fld_semester character varying(255), fld_jahr character varying(255), fld_studiengang character varying(255), fld_institut character varying(255), fld_geschlecht character varying(255), fromclause character varying(255), whereclause text, aggrfunction character varying(255), cacheing integer DEFAULT 0 NOT NULL, linktable character varying(255), linkmask character varying(255));
+eduetl:CREATE TABLE tmp_man_catalogue_rpt (tid integer, report_id varchar(40), catalogue_id varchar(100), description text, sortnr integer, sortnr2 integer, grouping1 char(40), grouping2 char(40), valid_from date, valid_till date, active smallint);
+eduetl:create table tmp_man_zahl_wert(tid integer, hs_nr integer , kenn_zahl CHAR(40) not null, jahr SMALLINT , sem SMALLINT , ch110_institut CHAR(10) , stugkey CHAR(20) , stg CHAR(10) , bund_fachgebiet CHAR(10) , wert decimal(14,2) , geschlecht SMALLINT , abschluss CHAR(10) , kz_fach CHAR(10) , generic_dim1 CHAR(100));
+eduetl:create table tmp_kenn_zahl_wert(tid integer,hs_nr INTEGER ,kenn_zahl CHAR(40),jahr SMALLINT ,sem SMALLINT ,ch110_institut CHAR(10) ,stugkey CHAR(20) ,bund_fachgebiet CHAR(10) ,titel CHAR(10) ,wert double precision ,wert_str varchar(255) ,geschlecht SMALLINT ,ca12_staat SMALLINT,generic_dim1 varchar(255),generic_dim2 varchar(255));
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/superx/WEB-INF/web.xml.bak b/superx/WEB-INF/web.xml.bak
deleted file mode 100644
index ce9f361..0000000
--- a/superx/WEB-INF/web.xml.bak
+++ /dev/null
@@ -1,553 +0,0 @@
-
-
- SuperX
- SuperX
-
-
-
-
-
-
-
-
-
-
-
-
- mondrian.web.taglib.Listener
-
-
-
-
- Set Character Encoding
- org.dbforms.util.external.SetCharacterEncodingFilter
-
- encoding
- UTF-8
-
-
-
- Set Character Encoding
- /servlet/control
-
-
-
-
- org.dbforms.ConfigServlet
-
- de.superx.servlet.SxDbformsConfigServlet
-
- log4j.configuration
- /WEB-INF/log4j.properties
-
-
- digesterDebugLevel
- 0
-
-
- localeKey
- de_DE
-
-
- resourceBundle
- ApplicationResources
-
-
- 1
-
-
-
- control
- org.dbforms.servlets.Controller
-
- maxUploadSize
- 800000
-
-
-
-
- file
- org.dbforms.servlets.FileServlet
- 2
-
-
-
-
- SuperXManager
- de.superx.servlet.SuperXManager
- 50
-
- sharedSecret
- sYyOvWDtISVNG6Xgh7MBk4hC9uLuyPQ3i
-
-
- xml_return_link
- false
-
-
- xsl_processor
- net.sf.saxon.TransformerFactoryImpl
-
-
-
-
- sichtenCaching
- false
-
-
-
- field1Cache
- 1=0
-
-
-
- defaultMaskXsl
- maske_html.xsl
-
-
- maxRows
- 30000
-
-
-
-
- SuperXUpload
- de.superx.servlet.SuperXUpload
-
-
- default
-
- vorlage.xls,*.gif,*.png,*.htm
-
-
-
-
- de.superx.servlet.Entwicklung
- de.superx.servlet.Entwicklung
-
-
- SuperXhtmlAnmeldung
- de.superx.servlet.SuperXhtmlAnmeldung
-
-
-
- SuperXDBServlet
- de.superx.servlet.SuperXDBServlet
-
-
- maxRows
- 17000
-
-
-
- SuperXmlAnmeldung
- de.superx.servlet.SuperXmlAnmeldung
-
- maxRows
- 17000
-
-
-
- SuperXmlAbmeldung
- de.superx.servlet.SuperXmlAbmeldung
-
- alt_redirect_url
- /superx/xml
-
-
-
- SuperXmlMaske
- de.superx.servlet.SuperXmlMaske
-
- maxRows
- 17000
-
-
-
- SuperXmlTabelle
- de.superx.servlet.SuperXmlTabelle
-
- maxRows
- 17000
-
-
- maxOffset
- 30
-
-
-
- SuperXmlPwChanger
- de.superx.servlet.SuperXmlPwChanger
-
-
- de.superx.servlet.SuperXmlMenu
- de.superx.servlet.SuperXmlMenu
-
-
- SuperXmlMenu
- de.superx.servlet.SuperXmlMenu
-
-
- ImageServlet
- net.sf.jasperreports.j2ee.servlets.ImageServlet
-
-
-
- ImageServlet
- /servlet/image
-
-
-
- control
- /servlet/control
-
-
- file
- /servlet/file
-
-
-
- SuperXmlAnmeldung
- /servlet/SuperXmlAnmeldung
-
-
- SuperXmlAnmeldung
- /servlet/de.superx.servlet.SuperXmlAnmeldung
-
-
- SuperXDBServlet
- /servlet/SuperXDBServlet
-
-
- SuperXmlAbmeldung
- /servlet/SuperXmlAbmeldung
-
-
- SuperXmlMaske
- /servlet/SuperXmlMaske
-
-
- SuperXmlTabelle
- /servlet/SuperXmlTabelle
-
-
- SuperXmlPwChanger
- /servlet/de.superx.servlet.SuperXmlPwChanger
-
-
- SuperXmlPwChanger
- /servlet/SuperXmlPwChanger
-
-
- SuperXManager
- /servlet/SuperXManager
-
-
- SuperXUpload
- /servlet/SuperXUpload
-
-
- SuperXmlMenu
- /servlet/SuperXmlMenu
-
-
- de.superx.servlet.Entwicklung
- /servlet/de.superx.servlet.Entwicklung
-
-
-
- /WEB-INF/dbforms.tld
- /WEB-INF/dbforms.tld
-
-
-
-
- Example Security Constraint
-
- Protected Area
-
- /security/protected/*
-
- DELETE
- GET
- POST
- PUT
-
-
-
- tomcat
- role1
-
-
-
-
- FORM
- Example Form-Based Authentication Area
-
- /security/protected/login.jsp
- /security/protected/error.jsp
-
-
-
-
- role1
-
-
- tomcat
-
-
- SuperX Datasource
- jdbc/superx
- javax.sql.DataSource
- Container
-
-
-
-
- 180
-
-
-
- Jersey REST Service
-
- com.sun.jersey.spi.container.servlet.ServletContainer
-
-
- com.sun.jersey.config.property.packages
- de.superx.sxrest
-
- 1
-
-
- Jersey REST Service
- /sxrest/*
-
-
-
-
-
-