Subversion Repositories WebE

Compare Revisions

Last modification

Ignore whitespace Rev 18 → Rev 17

/trunk/WebContent/user_index.jsp
File deleted
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: errorHandler.jsp
===================================================================
--- errorHandler.jsp (revision 18)
+++ errorHandler.jsp (nonexistent)
@@ -1,14 +0,0 @@
-<?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>
\ No newline at end of file
/errorHandler.jsp
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: html_head.jsp
===================================================================
--- html_head.jsp (revision 18)
+++ html_head.jsp (revision 17)
@@ -1,5 +1,3 @@
-
-<%@ 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/index.jsp
1,15 → 1,19
<%@ 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>
<%@ include file="login.jsp" %>
<div id="navbar">
<%@ include file="user_nav.jsp" %>
</div>
<div id="content">
<%@ include file="user_main.jsp" %>
</div>
</div>
</body>
/trunk/WebContent/login.jsp
File deleted
\ No newline at end of file
/trunk/WebContent/user_main.jsp
1,0 → 0,0
<p>Willkommen im User-Bereich</p>
<h1>Der Main</h1>
/trunk/WebContent/user_nav.jsp
1,36 → 1,12
<div id="navigation">
<ul>
<li>
Ontologie
Oberkategorie
<ul>
<li>
<a href="">Ansehen</a>
<a href="?p=customer&amp;a=customer_list">Unterkategorie</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>
/trunk/WebContent/WEB-INF/classes/log4j.properties
File deleted
\ No newline at end of file
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ 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 (revision 18)
+++ WEB-INF/lib/jta-1.1.jar (nonexistent)
/WEB-INF/lib/jta-1.1.jar
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-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 (revision 18)
+++ WEB-INF/lib/struts2-fullhibernatecore-plugin-1.4-GA.jar (nonexistent)
/WEB-INF/lib/struts2-fullhibernatecore-plugin-1.4-GA.jar
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-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 (revision 18)
+++ WEB-INF/lib/commons-logging-1.1.jar (nonexistent)
/WEB-INF/lib/commons-logging-1.1.jar
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-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 (revision 18)
+++ WEB-INF/lib/commons-fileupload-1.2.1.jar (nonexistent)
/WEB-INF/lib/commons-fileupload-1.2.1.jar
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-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 (revision 18)
+++ WEB-INF/lib/hibernate-validator.jar (nonexistent)
/WEB-INF/lib/hibernate-validator.jar
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-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 (revision 18)
+++ WEB-INF/lib/commons-io-1.3.2.jar (nonexistent)
/WEB-INF/lib/commons-io-1.3.2.jar
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-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 (revision 18)
+++ WEB-INF/lib/hibernate-commons-annotations.jar (nonexistent)
/WEB-INF/lib/hibernate-commons-annotations.jar
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-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 (revision 18)
+++ WEB-INF/lib/commons-lang-2.3.jar (nonexistent)
/WEB-INF/lib/commons-lang-2.3.jar
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
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 (revision 18)
+++ WEB-INF/lib/struts2-convention-plugin-2.1.6.jar (nonexistent)
/WEB-INF/lib/struts2-convention-plugin-2.1.6.jar
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-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 (revision 18)
+++ WEB-INF/lib/dom4j-1.6.1.jar (nonexistent)
/WEB-INF/lib/dom4j-1.6.1.jar
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-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 (revision 18)
+++ WEB-INF/lib/commons-collections-3.1.jar (nonexistent)
/WEB-INF/lib/commons-collections-3.1.jar
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-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 (revision 18)
+++ WEB-INF/lib/log4j-1.2.15.jar (nonexistent)
/WEB-INF/lib/log4j-1.2.15.jar
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-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 (revision 18)
+++ WEB-INF/lib/hibernate3.jar (nonexistent)
/WEB-INF/lib/hibernate3.jar
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-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 (revision 18)
+++ WEB-INF/lib/ognl-2.6.11.jar (nonexistent)
/WEB-INF/lib/ognl-2.6.11.jar
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-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 (revision 18)
+++ WEB-INF/lib/hsqldb.jar (nonexistent)
/WEB-INF/lib/hsqldb.jar
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-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 (revision 18)
+++ WEB-INF/lib/slf4j-api-1.5.8.jar (nonexistent)
/WEB-INF/lib/slf4j-api-1.5.8.jar
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-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 (revision 18)
+++ WEB-INF/lib/struts2-core-2.1.6.jar (nonexistent)
/WEB-INF/lib/struts2-core-2.1.6.jar
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-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 (revision 18)
+++ WEB-INF/lib/ejb3-persistence.jar (nonexistent)
/WEB-INF/lib/ejb3-persistence.jar
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-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 (revision 18)
+++ WEB-INF/lib/antlr-2.7.6.jar (nonexistent)
/WEB-INF/lib/antlr-2.7.6.jar
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-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 (revision 18)
+++ WEB-INF/lib/mysql-connector-java-5.1.13-bin.jar (nonexistent)
/WEB-INF/lib/mysql-connector-java-5.1.13-bin.jar
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-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 (revision 18)
+++ WEB-INF/lib/freemarker-2.3.13.jar (nonexistent)
/WEB-INF/lib/freemarker-2.3.13.jar
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-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 (revision 18)
+++ WEB-INF/lib/slf4j-log4j12-1.5.8.jar (nonexistent)
/WEB-INF/lib/slf4j-log4j12-1.5.8.jar
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-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 (revision 18)
+++ WEB-INF/lib/xwork-2.1.2.jar (nonexistent)
/WEB-INF/lib/xwork-2.1.2.jar
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-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 (revision 18)
+++ WEB-INF/lib/javassist-3.9.0.GA.jar (nonexistent)
/WEB-INF/lib/javassist-3.9.0.GA.jar
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-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 (revision 18)
+++ WEB-INF/lib/junit-3.8.1.jar (nonexistent)
/WEB-INF/lib/junit-3.8.1.jar
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-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 (revision 18)
+++ WEB-INF/lib/hibernate-annotations.jar (nonexistent)
/WEB-INF/lib/hibernate-annotations.jar
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: WEB-INF/web.xml
===================================================================
--- WEB-INF/web.xml (revision 18)
+++ WEB-INF/web.xml (revision 17)
@@ -1,17 +1,6 @@
<?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>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>
-
+ <display-name>Web Engineering</display-name>
<welcome-file-list>
<welcome-file>index.html</welcome-file>
<welcome-file>index.htm</welcome-file>
@@ -20,14 +9,4 @@
<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