aboutsummaryrefslogtreecommitdiff
path: root/id/ConfigWebTool/src/main/resources
diff options
context:
space:
mode:
Diffstat (limited to 'id/ConfigWebTool/src/main/resources')
-rw-r--r--id/ConfigWebTool/src/main/resources/applicationResources_de.properties18
-rw-r--r--id/ConfigWebTool/src/main/resources/applicationResources_en.properties18
-rw-r--r--id/ConfigWebTool/src/main/resources/moaid.configurationtool.beans.xml20
-rw-r--r--id/ConfigWebTool/src/main/resources/struts.xml8
4 files changed, 46 insertions, 18 deletions
diff --git a/id/ConfigWebTool/src/main/resources/applicationResources_de.properties b/id/ConfigWebTool/src/main/resources/applicationResources_de.properties
index c888a2d77..2575fa104 100644
--- a/id/ConfigWebTool/src/main/resources/applicationResources_de.properties
+++ b/id/ConfigWebTool/src/main/resources/applicationResources_de.properties
@@ -1,4 +1,4 @@
-title=MOA-ID 2.x Configuration Tool
+title=MOA-ID 3.x Configuration Tool
config.01=Configfile is not found. ({0})
@@ -19,7 +19,7 @@ error.db.oa.store=Die Konfiguration konnte nicht in der Datenbank gespeichert we
errors.notallowed=Sie besitzen nicht die n\u00F6tigen Rechte um diese Funktion zu benutzen.
errors.importexport.nofile=Es wurde keine Datei angegeben.
errors.importexport.legacyimport=Der Importvorgang der Legacy-Konfiguration wurde mit einem Fehler abgebrochen (Fehler={0}).
-errors.importexport.export=Die MOA-ID 2.x Konfiguration konnte nicht in ein XML File exportiert werden. (Fehler={0})
+errors.importexport.export=Die MOA-ID 3.x Konfiguration konnte nicht in eine Datei exportiert werden. (Fehler={0})
errors.importexport.import=Der Importvorgang der XML Konfiguration wurde mit einem Fehler abgebrochen (Fehler={0}).
errors.importexport.export.noconfig=Die Konfiguration kann nicht exportiert werden da keine MOA-ID Konfiguration vorhanden ist.
errors.edit.user.userid=Es wurde keine g\u00FCtige User ID \u00FCbergeben.
@@ -36,13 +36,13 @@ error.oa.oauth.keyname=Key-Name darf nicht leer sein
error.oa.oauth.keystore=Keystore darf nicht leer sein und muss eine richtige URL sein.
-mail.userrequest.subject=Accountanforderung MOA-ID 2.x Konfigurationstool
+mail.userrequest.subject=Accountanforderung MOA-ID 3.x Konfigurationstool
webpages.slo.error=Der Abmeldevorgang bei allen Online-Applikationen war nicht erfolgreich. Bitte schlie \t\u00DFen Sie aus Sicherheitsgr\u00FCnden ihren Browser.
webpages.slo.success=Sie wurden erfolgreich bei allen Online-Applikationen abgemeldet.
webpages.error.header=Es ist ein Fehler aufgetreten
-webpages.index.header=Willkommen bei der MOA-ID 2.x Konfigurationsapplikation
+webpages.index.header=Willkommen bei der MOA-ID 3.x Konfigurationsapplikation
webpages.index.desciption.head=Um dieses Service nutzen zu k\u00F6nnen m\u00FCssen sie sich einloggen.
webpages.index.login=Anmelden
webpages.index.logout=Abmelden
@@ -54,11 +54,11 @@ webpages.index.password.false=Das Passwort stimmt nicht.
webpages.inportexport.header=Konfiguration Importieren/Exportieren
webpages.inportexport.success=Die Konfiguration konnte erfolgreich importiert werden.
-webpages.inportexport.legacyimport.header=Legacy Konfiguration importieren (MOA-ID < 2.0)
-webpages.inportexport.legacyimport.upload=Legacy Konfiguration
+webpages.inportexport.legacyimport.header=MOA-ID 2.x.x Konfiguration importieren
+webpages.inportexport.legacyimport.upload=2.x.x Konfiguration
webpages.edit.import=Importieren
webpages.edit.export=Exportieren
-webpages.inportexport.import.header=MOA-ID 2.x Konfiguration
+webpages.inportexport.import.header=MOA-ID 3.x Konfiguration
webpages.inportexport.import.upload=Konfiguration importieren
webpages.inportexport.import.download=Konfiguration exportieren
webpages.inportexport.descripten=ACHTUNG\: Die importierte Konfiguration ersetzt eine aktuell vorhandene Konfiguration vollst\u00E4ndig\!
@@ -183,6 +183,10 @@ webpages.searchoa.header=Online-Applikation suchen
webpages.searchoa.search.friendlyname=Name der Online-Applikation
webpages.searchoa.butten.search=Suchen
+webpages.oaconfig.revisionsLog.header=Revisions Logging
+webpages.oaconfig.revisionsLog.active=Aktiv
+webpages.oaconfig.revisionsLog.eventCodes=EventCodes (CSV)
+
webpages.oaconfig.header=Konfiguration der Onlineapplikation
webpages.oaconfig.general.isActive=Online-Applikation ist aktiviert
webpages.oaconfig.general.bku.header=BKU Konfiguration
diff --git a/id/ConfigWebTool/src/main/resources/applicationResources_en.properties b/id/ConfigWebTool/src/main/resources/applicationResources_en.properties
index 43dcfeac8..e017b6dc3 100644
--- a/id/ConfigWebTool/src/main/resources/applicationResources_en.properties
+++ b/id/ConfigWebTool/src/main/resources/applicationResources_en.properties
@@ -1,4 +1,4 @@
-title=MOA-ID 2.x Configuration Tool
+title=MOA-ID 3.x Configuration Tool
config.01=Configfile is not found. ({0})
@@ -19,7 +19,7 @@ error.db.oa.store=The configuration could not be saved in the database.
errors.notallowed=You do not posses necessary righs in order to use this function.
errors.importexport.nofile=There is no file provided.
errors.importexport.legacyimport=The Import of the legacy configuration was interrupted due to the error. (Error={0}).
-errors.importexport.export=The MOA-ID 2.x configuration could not be exported to XML file. (Error={0})
+errors.importexport.export=The MOA-ID 3.x configuration could not be exported to file. (Error={0})
errors.importexport.import=The import of XML configuration was interrupted due to the error. (Error={0}).
errors.importexport.export.noconfig=The configuration could not be exported as there is no MOA-ID configuration available.
errors.edit.user.userid=There is no valid user ID provided.
@@ -35,14 +35,14 @@ error.oa.oauth.clientSecret=Client-Secret cannot be blank
error.oa.oauth.keyname=Key-Name cannot be blank
error.oa.oauth.keystore=Keystore cannot be blank and has to be provided in the form of valid URL.
-mail.userrequest.subject=Requesting accounts - MOA-ID 2.x Config Tool
+mail.userrequest.subject=Requesting accounts - MOA-ID 3.x Config Tool
webpages.slo.error=LogOut process finished with an error. For security reasons, please close your browser.
webpages.slo.success=LogOut process finished successful
webpages.error.header=The error occured
-webpages.index.header=Welcome to MOA-ID 2.x Configuration
+webpages.index.header=Welcome to MOA-ID 3.x Configuration
webpages.index.desciption.head=In order to use this service you should log in
webpages.index.login=Login
webpages.index.logout=Logout
@@ -54,11 +54,11 @@ webpages.index.password.false=The password is not valid.
webpages.inportexport.header=Import/export configuration
webpages.inportexport.success=The configuration was imported successfully
-webpages.inportexport.legacyimport.header=Import legacy configuration (MOA-ID < 2.0)
-webpages.inportexport.legacyimport.upload=Legacy configuration
+webpages.inportexport.legacyimport.header=Import MOA-ID 2.x.x configuration
+webpages.inportexport.legacyimport.upload=2.x.x configuration
webpages.edit.import=Import
webpages.edit.export=Export
-webpages.inportexport.import.header=MOA-ID 2.x configuration
+webpages.inportexport.import.header=MOA-ID 3.x configuration
webpages.inportexport.import.upload=Import configuration
webpages.inportexport.import.download=Export configuration
webpages.inportexport.descripten=WARNING\: The imported configuration will completely replace currently active configuration\!
@@ -198,6 +198,10 @@ webpages.oaconfig.general.testing.header=Test Credentials
webpages.oaconfig.general.testing.usetesting=Allow test credentials
webpages.oaconfig.general.testing.oids=Use special test credential OIDs
+webpages.oaconfig.revisionsLog.header=Revisions Logging
+webpages.oaconfig.revisionsLog.active=Activ
+webpages.oaconfig.revisionsLog.eventCodes=EventCodes (CSV)
+
webpages.oaconfig.general.bku.delete=Remove
webpages.oaconfig.general.bku.bkuselection.header=CCE-Selection Template
webpages.oaconfig.general.bku.bkuselection.filename=Filename
diff --git a/id/ConfigWebTool/src/main/resources/moaid.configurationtool.beans.xml b/id/ConfigWebTool/src/main/resources/moaid.configurationtool.beans.xml
new file mode 100644
index 000000000..a9859752e
--- /dev/null
+++ b/id/ConfigWebTool/src/main/resources/moaid.configurationtool.beans.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xmlns:tx="http://www.springframework.org/schema/tx"
+ xmlns:aop="http://www.springframework.org/schema/aop"
+ xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd
+ http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd">
+
+ <bean id="NewConfigurationDBRead" class="at.gv.egovernment.moa.id.commons.db.NewConfigurationDBRead">
+
+ </bean>
+
+ <bean id="userManagement" class="at.gv.egovernment.moa.id.configuration.config.usermanagement.FileBasedUserConfiguration">
+
+ </bean>
+
+</beans> \ No newline at end of file
diff --git a/id/ConfigWebTool/src/main/resources/struts.xml b/id/ConfigWebTool/src/main/resources/struts.xml
index 39c38ae43..701cc99a3 100644
--- a/id/ConfigWebTool/src/main/resources/struts.xml
+++ b/id/ConfigWebTool/src/main/resources/struts.xml
@@ -16,10 +16,10 @@
<interceptors>
- <interceptor name="HibernateSessionInterceptor" class="at.gv.egovernment.moa.id.configuration.struts.interceptor.HibernateSessionInterceptor"/>
+ <!-- <interceptor name="HibernateSessionInterceptor" class="at.gv.egovernment.moa.id.configuration.struts.interceptor.HibernateSessionInterceptor"/> -->
<interceptor-stack name="OwnStack">
- <interceptor-ref name="HibernateSessionInterceptor" />
+ <!-- <interceptor-ref name="HibernateSessionInterceptor" /> -->
<interceptor-ref name="params">
<param
name="excludeParams">^class\..*,^dojo\..*,^struts\..*,^session\..*,^request\..*,^application\..*,^servlet(Request|Response)\..*,^parameters\..*,^method:.*</param>
@@ -88,10 +88,10 @@
<package name="secure" namespace="/secure" extends="struts-default">
<interceptors>
- <interceptor name="HibernateSessionInterceptor" class="at.gv.egovernment.moa.id.configuration.struts.interceptor.HibernateSessionInterceptor"/>
+ <!-- <interceptor name="HibernateSessionInterceptor" class="at.gv.egovernment.moa.id.configuration.struts.interceptor.HibernateSessionInterceptor"/> -->
<interceptor-stack name="OwnStack">
- <interceptor-ref name="HibernateSessionInterceptor" />
+ <!-- <interceptor-ref name="HibernateSessionInterceptor" /> -->
<interceptor-ref name="params">
<param
name="excludeParams">^class\..*,^dojo\..*,^struts\..*,^session\..*,^request\..*,^application\..*,^servlet(Request|Response)\..*,^parameters\..*,^method:.*</param>