Subversion Repositories WebE

Compare Revisions

Last modification

Regard whitespace Rev 17 → Rev 18

/trunk/WebContent/html_head.jsp
1,3 → 1,5
 
<%@ page pageEncoding="UTF-8" %>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
<html xmlns="http://www.w3.org/1999/xhtml">
/trunk/WebContent/user_index.jsp
0,0 → 1,21
<%@ page errorPage="ErrorHandler.jsp" %>
<%@ include file="html_head.jsp" %>
 
<%-- Only serves as a container for the different site elements!
Do not write any text directly into the container div! --%>
<div id="page-container">
<div id="header">
<%@ include file="header.jsp" %>
</div>
<div id="navbar">
<%@ include file="user_nav.jsp" %>
</div>
<div id="content">
<%@ include file="user_main.jsp" %>
</div>
</div>
</body>
</html>
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: index.jsp
===================================================================
--- index.jsp (revision 17)
+++ index.jsp (revision 18)
@@ -1,20 +1,16 @@
+<%@ page errorPage="ErrorHandler.jsp" %>
<%@ include file="html_head.jsp" %>
<%-- Only serves as a container for the different site elements!
Do not write any text directly into the container div! --%>
+
<div id="page-container">
<div id="header">
<%@ include file="header.jsp" %>
</div>
- <div id="navbar">
- <%@ include file="user_nav.jsp" %>
+ <%@ include file="login.jsp" %>
</div>
- <div id="content">
- <%@ include file="user_main.jsp" %>
- </div>
- </div>
-
</body>
</html>
/trunk/WebContent/errorHandler.jsp
0,0 → 1,14
<?xml version="1.0" encoding="ISO-8859-1" ?>
<%@ page isErrorPage=true %>
<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
pageEncoding="utf-8"%>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
<title>Error page</title>
</head>
<body>
Die Seite hat einen Fehler verursacht. Bitte versuchen Sie es nochmals.
</body>
</html>
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: login.jsp
===================================================================
--- login.jsp (revision 17)
+++ login.jsp (revision 18)
@@ -0,0 +1,13 @@
+<%@taglib uri="/struts-tags" prefix="s"%>
+<div id="login">
+ <h1>Login</h1>
+
+ <s:form action="LoginDo">
+ <s:textfield name="userName" label="Benutzername" />
+ <s:password name="password" label="Passwort" />
+ <s:submit />
+ </s:form>
+ <p>
+ Klicken Sie <a href="index.jsp">hier</a> wenn Sie Ihr Passwort vergessen haben.
+ </p>
+</div>
\ No newline at end of file
Index: WEB-INF/lib/struts2-convention-plugin-2.1.6.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: WEB-INF/lib/struts2-convention-plugin-2.1.6.jar
===================================================================
--- WEB-INF/lib/struts2-convention-plugin-2.1.6.jar (nonexistent)
+++ WEB-INF/lib/struts2-convention-plugin-2.1.6.jar (revision 18)
/WEB-INF/lib/struts2-convention-plugin-2.1.6.jar
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: WEB-INF/lib/mysql-connector-java-5.1.13-bin.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: WEB-INF/lib/mysql-connector-java-5.1.13-bin.jar
===================================================================
--- WEB-INF/lib/mysql-connector-java-5.1.13-bin.jar (nonexistent)
+++ WEB-INF/lib/mysql-connector-java-5.1.13-bin.jar (revision 18)
/WEB-INF/lib/mysql-connector-java-5.1.13-bin.jar
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: WEB-INF/lib/ejb3-persistence.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: WEB-INF/lib/ejb3-persistence.jar
===================================================================
--- WEB-INF/lib/ejb3-persistence.jar (nonexistent)
+++ WEB-INF/lib/ejb3-persistence.jar (revision 18)
/WEB-INF/lib/ejb3-persistence.jar
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: WEB-INF/lib/freemarker-2.3.13.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: WEB-INF/lib/freemarker-2.3.13.jar
===================================================================
--- WEB-INF/lib/freemarker-2.3.13.jar (nonexistent)
+++ WEB-INF/lib/freemarker-2.3.13.jar (revision 18)
/WEB-INF/lib/freemarker-2.3.13.jar
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: WEB-INF/lib/hibernate-commons-annotations.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: WEB-INF/lib/hibernate-commons-annotations.jar
===================================================================
--- WEB-INF/lib/hibernate-commons-annotations.jar (nonexistent)
+++ WEB-INF/lib/hibernate-commons-annotations.jar (revision 18)
/WEB-INF/lib/hibernate-commons-annotations.jar
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: WEB-INF/lib/xwork-2.1.2.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: WEB-INF/lib/xwork-2.1.2.jar
===================================================================
--- WEB-INF/lib/xwork-2.1.2.jar (nonexistent)
+++ WEB-INF/lib/xwork-2.1.2.jar (revision 18)
/WEB-INF/lib/xwork-2.1.2.jar
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: WEB-INF/lib/slf4j-log4j12-1.5.8.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: WEB-INF/lib/slf4j-log4j12-1.5.8.jar
===================================================================
--- WEB-INF/lib/slf4j-log4j12-1.5.8.jar (nonexistent)
+++ WEB-INF/lib/slf4j-log4j12-1.5.8.jar (revision 18)
/WEB-INF/lib/slf4j-log4j12-1.5.8.jar
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: WEB-INF/lib/jta-1.1.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: WEB-INF/lib/jta-1.1.jar
===================================================================
--- WEB-INF/lib/jta-1.1.jar (nonexistent)
+++ WEB-INF/lib/jta-1.1.jar (revision 18)
/WEB-INF/lib/jta-1.1.jar
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: WEB-INF/lib/hsqldb.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: WEB-INF/lib/hsqldb.jar
===================================================================
--- WEB-INF/lib/hsqldb.jar (nonexistent)
+++ WEB-INF/lib/hsqldb.jar (revision 18)
/WEB-INF/lib/hsqldb.jar
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: WEB-INF/lib/struts2-core-2.1.6.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: WEB-INF/lib/struts2-core-2.1.6.jar
===================================================================
--- WEB-INF/lib/struts2-core-2.1.6.jar (nonexistent)
+++ WEB-INF/lib/struts2-core-2.1.6.jar (revision 18)
/WEB-INF/lib/struts2-core-2.1.6.jar
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: WEB-INF/lib/dom4j-1.6.1.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: WEB-INF/lib/dom4j-1.6.1.jar
===================================================================
--- WEB-INF/lib/dom4j-1.6.1.jar (nonexistent)
+++ WEB-INF/lib/dom4j-1.6.1.jar (revision 18)
/WEB-INF/lib/dom4j-1.6.1.jar
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: WEB-INF/lib/commons-io-1.3.2.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: WEB-INF/lib/commons-io-1.3.2.jar
===================================================================
--- WEB-INF/lib/commons-io-1.3.2.jar (nonexistent)
+++ WEB-INF/lib/commons-io-1.3.2.jar (revision 18)
/WEB-INF/lib/commons-io-1.3.2.jar
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: WEB-INF/lib/ognl-2.6.11.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: WEB-INF/lib/ognl-2.6.11.jar
===================================================================
--- WEB-INF/lib/ognl-2.6.11.jar (nonexistent)
+++ WEB-INF/lib/ognl-2.6.11.jar (revision 18)
/WEB-INF/lib/ognl-2.6.11.jar
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: WEB-INF/lib/hibernate-validator.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: WEB-INF/lib/hibernate-validator.jar
===================================================================
--- WEB-INF/lib/hibernate-validator.jar (nonexistent)
+++ WEB-INF/lib/hibernate-validator.jar (revision 18)
/WEB-INF/lib/hibernate-validator.jar
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: WEB-INF/lib/hibernate3.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: WEB-INF/lib/hibernate3.jar
===================================================================
--- WEB-INF/lib/hibernate3.jar (nonexistent)
+++ WEB-INF/lib/hibernate3.jar (revision 18)
/WEB-INF/lib/hibernate3.jar
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: WEB-INF/lib/commons-collections-3.1.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: WEB-INF/lib/commons-collections-3.1.jar
===================================================================
--- WEB-INF/lib/commons-collections-3.1.jar (nonexistent)
+++ WEB-INF/lib/commons-collections-3.1.jar (revision 18)
/WEB-INF/lib/commons-collections-3.1.jar
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: WEB-INF/lib/antlr-2.7.6.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: WEB-INF/lib/antlr-2.7.6.jar
===================================================================
--- WEB-INF/lib/antlr-2.7.6.jar (nonexistent)
+++ WEB-INF/lib/antlr-2.7.6.jar (revision 18)
/WEB-INF/lib/antlr-2.7.6.jar
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: WEB-INF/lib/commons-lang-2.3.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: WEB-INF/lib/commons-lang-2.3.jar
===================================================================
--- WEB-INF/lib/commons-lang-2.3.jar (nonexistent)
+++ WEB-INF/lib/commons-lang-2.3.jar (revision 18)
/WEB-INF/lib/commons-lang-2.3.jar
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: WEB-INF/lib/commons-fileupload-1.2.1.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: WEB-INF/lib/commons-fileupload-1.2.1.jar
===================================================================
--- WEB-INF/lib/commons-fileupload-1.2.1.jar (nonexistent)
+++ WEB-INF/lib/commons-fileupload-1.2.1.jar (revision 18)
/WEB-INF/lib/commons-fileupload-1.2.1.jar
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: WEB-INF/lib/hibernate-annotations.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: WEB-INF/lib/hibernate-annotations.jar
===================================================================
--- WEB-INF/lib/hibernate-annotations.jar (nonexistent)
+++ WEB-INF/lib/hibernate-annotations.jar (revision 18)
/WEB-INF/lib/hibernate-annotations.jar
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: WEB-INF/lib/commons-logging-1.1.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: WEB-INF/lib/commons-logging-1.1.jar
===================================================================
--- WEB-INF/lib/commons-logging-1.1.jar (nonexistent)
+++ WEB-INF/lib/commons-logging-1.1.jar (revision 18)
/WEB-INF/lib/commons-logging-1.1.jar
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: WEB-INF/lib/junit-3.8.1.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: WEB-INF/lib/junit-3.8.1.jar
===================================================================
--- WEB-INF/lib/junit-3.8.1.jar (nonexistent)
+++ WEB-INF/lib/junit-3.8.1.jar (revision 18)
/WEB-INF/lib/junit-3.8.1.jar
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: WEB-INF/lib/slf4j-api-1.5.8.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: WEB-INF/lib/slf4j-api-1.5.8.jar
===================================================================
--- WEB-INF/lib/slf4j-api-1.5.8.jar (nonexistent)
+++ WEB-INF/lib/slf4j-api-1.5.8.jar (revision 18)
/WEB-INF/lib/slf4j-api-1.5.8.jar
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: WEB-INF/lib/log4j-1.2.15.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: WEB-INF/lib/log4j-1.2.15.jar
===================================================================
--- WEB-INF/lib/log4j-1.2.15.jar (nonexistent)
+++ WEB-INF/lib/log4j-1.2.15.jar (revision 18)
/WEB-INF/lib/log4j-1.2.15.jar
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: WEB-INF/lib/javassist-3.9.0.GA.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: WEB-INF/lib/javassist-3.9.0.GA.jar
===================================================================
--- WEB-INF/lib/javassist-3.9.0.GA.jar (nonexistent)
+++ WEB-INF/lib/javassist-3.9.0.GA.jar (revision 18)
/WEB-INF/lib/javassist-3.9.0.GA.jar
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: WEB-INF/lib/struts2-fullhibernatecore-plugin-1.4-GA.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: WEB-INF/lib/struts2-fullhibernatecore-plugin-1.4-GA.jar
===================================================================
--- WEB-INF/lib/struts2-fullhibernatecore-plugin-1.4-GA.jar (nonexistent)
+++ WEB-INF/lib/struts2-fullhibernatecore-plugin-1.4-GA.jar (revision 18)
/WEB-INF/lib/struts2-fullhibernatecore-plugin-1.4-GA.jar
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: WEB-INF/web.xml
===================================================================
--- WEB-INF/web.xml (revision 17)
+++ WEB-INF/web.xml (revision 18)
@@ -1,6 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" id="WebApp_ID" version="2.5">
- <display-name>Web Engineering</display-name>
+ <display-name>WebEngineeringProject</display-name>
+
+ <filter>
+ <filter-name>struts2</filter-name>
+ <filter-class>
+ org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter</filter-class>
+ </filter>
+ <filter-mapping>
+ <filter-name>struts2</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
+
<welcome-file-list>
<welcome-file>index.html</welcome-file>
<welcome-file>index.htm</welcome-file>
@@ -9,4 +20,14 @@
<welcome-file>default.htm</welcome-file>
<welcome-file>default.jsp</welcome-file>
</welcome-file-list>
+ <servlet>
+ <description></description>
+ <display-name>Servlet</display-name>
+ <servlet-name>Servlet</servlet-name>
+ <servlet-class>Servlet</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>Servlet</servlet-name>
+ <url-pattern>/Servlet</url-pattern>
+ </servlet-mapping>
</web-app>
\ No newline at end of file
Index: WEB-INF/classes/log4j.properties
===================================================================
--- WEB-INF/classes/log4j.properties (nonexistent)
+++ WEB-INF/classes/log4j.properties (revision 18)
@@ -0,0 +1,5 @@
+### direct log messages to stdout ###
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.Target=System.out
+log4j.appender.stdout.layout=org.apache.log4j.SimpleLayout
+log4j.rootLogger=debug, stdout
\ No newline at end of file
/WEB-INF/classes/log4j.properties
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: user_main.jsp
===================================================================
--- user_main.jsp (revision 17)
+++ user_main.jsp (revision 18)
@@ -1 +1 @@
-<h1>Der Main</h1>
\ No newline at end of file
+<p>Willkommen im User-Bereich</p>
\ No newline at end of file
Index: user_nav.jsp
===================================================================
--- user_nav.jsp (revision 17)
+++ user_nav.jsp (revision 18)
@@ -1,12 +1,36 @@
<div id="navigation">
<ul>
<li>
- Oberkategorie
+ Ontologie
<ul>
<li>
- <a href="?p=customer&amp;a=customer_list">Unterkategorie</a>
+ <a href="">Ansehen</a>
</li>
</ul>
</li>
+
+ <li>
+ Begriffe
+ <ul>
+ <li>
+ <a href="">Hinzuf&uuml;gen</a>
+ </li>
+ <li>
+ <a href="">&Auml;ndern, L&ouml;schen</a>
+ </li>
</ul>
+ </li>
+
+ <li>
+ Beziehungen
+ <ul>
+ <li>
+ <a href="">Hinzuf&uuml;gen</a>
+ </li>
+ <li>
+ <a href="">&Auml;ndern, L&ouml;schen</a>
+ </li>
+ </ul>
+ </li>
+ </ul>
</div>