From 57c58de18c43010e66c9e7306340a9cd088952b9 Mon Sep 17 00:00:00 2001
From: ulrich <not disclosed>
Date: Sun, 08 Jan 2017 17:45:27 +0000
Subject: [PATCH] Integration in WebBox
---
web/ui/index.html | 2 +-
web/wegkopiert/ui/stile-bootstrap.css | 0
web/wegkopiert/ui/stile-skeleton.css | 0
src/java/de/uhilger/um/web/Initialiser.java | 7 +++++++
web/WEB-INF/create_database.sql | 3 +++
web/fehler.html | 10 ++++++++++
web/WEB-INF/web.xml | 2 ++
web/wegkopiert/ui/user-neutral.html | 0
web/wegkopiert/ui/user-skeleton.html | 0
web/wegkopiert/ui/user.html | 4 ++--
web/fehler.jsp | 26 ++++++++++++++++++++++++++
web/wegkopiert/ui/user-bootstrap.html | 0
web/wegkopiert/ui/stile-neutral.css | 0
13 files changed, 51 insertions(+), 3 deletions(-)
diff --git a/src/java/de/uhilger/um/web/Initialiser.java b/src/java/de/uhilger/um/web/Initialiser.java
index 41da73b..1895344 100644
--- a/src/java/de/uhilger/um/web/Initialiser.java
+++ b/src/java/de/uhilger/um/web/Initialiser.java
@@ -21,6 +21,7 @@
import de.uhilger.baselink.PersistenceManager;
import de.uhilger.baselink.Record;
import de.uhilger.um.api.UserMgr;
+import de.uhilger.um.daten.User;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
@@ -127,6 +128,12 @@
if(!dbVorhanden(db, sql.getProperty(SQL_DB_VORHANDEN))) {
logger.info("Datenbank ist nicht vorhanden");
int[] ergebnis = db.executeScript(getSqlSkript());
+ User admin = new User();
+ admin.setId("admin");
+ admin.setPw("admin");
+ UserMgr um = new UserMgr();
+ um.setServletContext(servletContext);
+ um.createUser(admin);
}
} catch(Exception ex) {
logger.log(Level.INFO, ex.getMessage(), ex);
diff --git a/web/WEB-INF/create_database.sql b/web/WEB-INF/create_database.sql
index a568dfb..4b58c22 100644
--- a/web/WEB-INF/create_database.sql
+++ b/web/WEB-INF/create_database.sql
@@ -17,6 +17,9 @@
ROLE_NAME VARCHAR(250) NOT NULL,
PRIMARY KEY (USER_NAME, ROLE_NAME)
);
+insert into APP.USER_ROLES (user_name, role_name) values ('admin', 'manager-gui');
+insert into APP.USER_ROLES (user_name, role_name) values ('admin', 'nutzerAdmin');
+insert into APP.USER_ROLES (user_name, role_name) values ('admin', 'sqlKonsole');
create table APP.keytable (
key_name varchar(80) not null primary key,
diff --git a/web/WEB-INF/web.xml b/web/WEB-INF/web.xml
index b9bd9d8..4c06470 100644
--- a/web/WEB-INF/web.xml
+++ b/web/WEB-INF/web.xml
@@ -43,6 +43,8 @@
<web-resource-name>nutzerAdmin</web-resource-name>
<description>Nutzer-Administration</description>
<url-pattern>/ui/*</url-pattern>
+ <url-pattern>/svc/*</url-pattern>
+ <url-pattern>/api/*</url-pattern>
</web-resource-collection>
<auth-constraint>
<description>nutzerAdminAuthContraint</description>
diff --git a/web/fehler.html b/web/fehler.html
new file mode 100644
index 0000000..53fa66a
--- /dev/null
+++ b/web/fehler.html
@@ -0,0 +1,10 @@
+<html>
+ <head>
+ <meta name="viewport" content="width=device-width">
+ <title>Fehler</title>
+ </head>
+ <body>
+ <p>Hoppla!</p>
+ <p>Die Seite wurde nicht gefunden.</p>
+ </body>
+</html>
diff --git a/web/fehler.jsp b/web/fehler.jsp
new file mode 100644
index 0000000..69ef39f
--- /dev/null
+++ b/web/fehler.jsp
@@ -0,0 +1,26 @@
+<%@page contentType="text/html" pageEncoding="ISO-8859-1"%>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+ "http://www.w3.org/TR/html4/loose.dtd">
+
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+ <meta name="viewport" content="width=device-width">
+ <style>
+ body {
+ font-family:Arial,Helvetica,sans-serif;
+ font-size:10pt;
+ }
+ </style>
+ <title>Fehler</title>
+ <%
+ String url = request.getRequestURL().toString();
+ url = url.substring(0, url.lastIndexOf("/"));
+ %>
+</head>
+<body>
+<p>Hoppla! Diese Seite wurde nicht gefunden.</p>
+
+<p>Klicken Sie <a href="<%=url%>">hier</a> um zur Hauptseite zu gelangen.</p>
+</body>
+</html>
diff --git a/web/ui/user.html b/web/ui/index.html
similarity index 97%
rename from web/ui/user.html
rename to web/ui/index.html
index 70e1369..03f8dc8 100644
--- a/web/ui/user.html
+++ b/web/ui/index.html
@@ -11,7 +11,7 @@
<div id="inhalt">
<div class="breadcrumb">
<a class="breadcrumb-item" href="/">WebBox</a>
- <a class="breadcrumb-item" href="/mng/index.html">Verwaltung</a>
+ <a class="breadcrumb-item" href="/wbx/">Verwaltung</a>
<span class="breadcrumb-item active">Benutzer</span>
</div>
<!-- <h1>Benutzer</h1> -->
diff --git a/web/ui/stile-bootstrap.css b/web/wegkopiert/ui/stile-bootstrap.css
similarity index 100%
rename from web/ui/stile-bootstrap.css
rename to web/wegkopiert/ui/stile-bootstrap.css
diff --git a/web/ui/stile-neutral.css b/web/wegkopiert/ui/stile-neutral.css
similarity index 100%
rename from web/ui/stile-neutral.css
rename to web/wegkopiert/ui/stile-neutral.css
diff --git a/web/ui/stile-skeleton.css b/web/wegkopiert/ui/stile-skeleton.css
similarity index 100%
rename from web/ui/stile-skeleton.css
rename to web/wegkopiert/ui/stile-skeleton.css
diff --git a/web/ui/user-bootstrap.html b/web/wegkopiert/ui/user-bootstrap.html
similarity index 100%
rename from web/ui/user-bootstrap.html
rename to web/wegkopiert/ui/user-bootstrap.html
diff --git a/web/ui/user-neutral.html b/web/wegkopiert/ui/user-neutral.html
similarity index 100%
rename from web/ui/user-neutral.html
rename to web/wegkopiert/ui/user-neutral.html
diff --git a/web/ui/user-skeleton.html b/web/wegkopiert/ui/user-skeleton.html
similarity index 100%
rename from web/ui/user-skeleton.html
rename to web/wegkopiert/ui/user-skeleton.html
diff --git a/web/ui/user.html b/web/wegkopiert/ui/user.html
similarity index 94%
copy from web/ui/user.html
copy to web/wegkopiert/ui/user.html
index 70e1369..5e71f24 100644
--- a/web/ui/user.html
+++ b/web/wegkopiert/ui/user.html
@@ -10,8 +10,8 @@
<body>
<div id="inhalt">
<div class="breadcrumb">
- <a class="breadcrumb-item" href="/">WebBox</a>
- <a class="breadcrumb-item" href="/mng/index.html">Verwaltung</a>
+ <a class="breadcrumb-item" href="/wbx/">WebBox</a>
+ <a class="breadcrumb-item" href="/wbx/mng/index.html">Verwaltung</a>
<span class="breadcrumb-item active">Benutzer</span>
</div>
<!-- <h1>Benutzer</h1> -->
--
Gitblit v1.9.3