Subversion Repositories WebE

Compare Revisions

Last modification

Ignore whitespace Rev 17 → Rev 18

/trunk/.classpath
13,6 → 13,5
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
<classpathentry kind="lib" path="WebContent/WEB-INF/lib/log4j-1.2.16.jar"/>
<classpathentry kind="output" path="build/classes"/>
</classpath>
/trunk/src/struts.xml
0,0 → 1,21
<!DOCTYPE struts PUBLIC
"-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
"http://struts.apache.org/dtds/struts-2.0.dtd">
 
<struts>
 
<package name="default" extends="hibernate-default">
<action name="LoginDo" class="ch.ffhs.webE.action.LoginAction">
<result name="success" type="redirect">/user_index.jsp</result>
<result name="failed" type="redirect">/index.jsp</result>
</action>
<action name="addUser" method="add" class="ch.ffhs.webE.web.UserAction">
<result name="success" type="redirect">listUser</result>
</action>
<action name="listUser" method="list" class="ch.ffhs.webE.web.UserAction">
<result name="success">/register.jsp</result>
</action>
</package>
</struts>
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: trunk/src/ch/ffhs/webE/dao/UserDAO.java
===================================================================
--- trunk/src/ch/ffhs/webE/dao/UserDAO.java (nonexistent)
+++ trunk/src/ch/ffhs/webE/dao/UserDAO.java (revision 18)
@@ -0,0 +1,12 @@
+package ch.ffhs.webE.dao;
+
+import java.util.List;
+
+import ch.ffhs.webE.domain.User;
+
+public interface UserDAO {
+
+ List<User> listUser();
+ void saveUser(User user);
+
+}
/trunk/src/ch/ffhs/webE/dao/UserDAO.java
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: trunk/src/ch/ffhs/webE/dao/UserDAOImpl.java
===================================================================
--- trunk/src/ch/ffhs/webE/dao/UserDAOImpl.java (nonexistent)
+++ trunk/src/ch/ffhs/webE/dao/UserDAOImpl.java (revision 18)
@@ -0,0 +1,39 @@
+package ch.ffhs.webE.dao;
+
+import java.util.List;
+
+import org.hibernate.Session;
+import org.hibernate.Transaction;
+
+import com.googlecode.s2hibernate.struts2.plugin.annotations.SessionTarget;
+import com.googlecode.s2hibernate.struts2.plugin.annotations.TransactionTarget;
+import ch.ffhs.webE.domain.*;
+
+public class UserDAOImpl implements UserDAO {
+ @SessionTarget
+ Session session;
+ @TransactionTarget
+ Transaction transaction;
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public List<User> listUser() {
+ List<User> courses = null;
+ try {
+ courses = session.createQuery("from User").list();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return courses;
+ }
+
+ @Override
+ public void saveUser(User user) {
+ try {
+ session.save(user);
+ } catch (Exception e) {
+ transaction.rollback();
+ e.printStackTrace();
+ }
+ }
+}
/trunk/src/ch/ffhs/webE/dao/UserDAOImpl.java
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: trunk/src/ch/ffhs/webE/domain/User.java
===================================================================
--- trunk/src/ch/ffhs/webE/domain/User.java (nonexistent)
+++ trunk/src/ch/ffhs/webE/domain/User.java (revision 18)
@@ -0,0 +1,71 @@
+package ch.ffhs.webE.domain;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Entity
+@Table(name="user")
+public class User {
+
+
+ private int id;
+ private String username;
+ private String password;
+
+ private String firstname;
+ private String lastname;
+ private boolean admin;
+
+ @Id
+ @GeneratedValue
+ @Column(name="id")
+ public int getId() {
+ return id;
+ }
+ public void setId(int id) {
+ this.id = id;
+ }
+
+ @Column(name="username")
+ public String getUsername() {
+ return username;
+ }
+ public void setUsername(String username) {
+ this.username = username;
+ }
+
+ @Column(name="lastname")
+ public String getLastname() {
+ return lastname;
+ }
+ public void setLastname(String lastname) {
+ this.lastname = lastname;
+ }
+
+ @Column(name="admin")
+ public boolean isAdmin() {
+ return admin;
+ }
+ public void setAdmin(boolean admin) {
+ this.admin = admin;
+ }
+
+ @Column(name="firstname")
+ public void setFirstname(String firstname) {
+ this.firstname = firstname;
+ }
+ public String getFirstname() {
+ return firstname;
+ }
+
+ @Column(name="password")
+ public String getPassword() {
+ return password;
+ }
+ public void setPassword(String password) {
+ this.password = password;
+ }
+}
/trunk/src/ch/ffhs/webE/domain/User.java
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: trunk/src/ch/ffhs/webE/action/LoginAction.java
===================================================================
--- trunk/src/ch/ffhs/webE/action/LoginAction.java (nonexistent)
+++ trunk/src/ch/ffhs/webE/action/LoginAction.java (revision 18)
@@ -0,0 +1,42 @@
+package ch.ffhs.webE.action;
+
+import com.opensymphony.xwork2.ActionSupport;
+
+public class LoginAction extends ActionSupport {
+
+ private static final long serialVersionUID = 1799753056277211344L;
+
+ private String userName ;
+ private String password;
+
+ public LoginAction() {
+ }
+
+ public String execute() {
+ //TODO: DB Abfrage für Login
+ if("moos".equals(getUserName())) {
+ return "success";
+ } else {
+ return "failed";
+ }
+ }
+
+ public String getUserName() {
+ return userName;
+ }
+
+ public void setUserName(String userName) {
+ this.userName = userName;
+ }
+
+ public String getPassword() {
+ return password;
+ }
+ public void setPassword(String password) {
+ this.password = password;
+ }
+
+
+
+
+}
/trunk/src/ch/ffhs/webE/action/LoginAction.java
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: trunk/src/ch/ffhs/webE/web/UserAction.java
===================================================================
--- trunk/src/ch/ffhs/webE/web/UserAction.java (nonexistent)
+++ trunk/src/ch/ffhs/webE/web/UserAction.java (revision 18)
@@ -0,0 +1,54 @@
+package ch.ffhs.webE.web;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.opensymphony.xwork2.ActionSupport;
+import com.opensymphony.xwork2.ModelDriven;
+import ch.ffhs.webE.dao.UserDAO;
+import ch.ffhs.webE.dao.UserDAOImpl;
+
+import ch.ffhs.webE.domain.User;
+
+public class UserAction extends ActionSupport implements ModelDriven<User> {
+
+ private static final long serialVersionUID = -6659925652584240539L;
+
+ private User user = new User();
+ private List<User> userList = new ArrayList<User>();
+ private UserDAO userDAO = new UserDAOImpl();
+
+ @Override
+ public User getModel() {
+ return user;
+ }
+
+ public String add()
+ {
+ userDAO.saveUser(user);
+ return SUCCESS;
+ }
+
+ public String list()
+ {
+ userList = userDAO.listUser();
+ return SUCCESS;
+ }
+
+ public User getUser() {
+ return user;
+ }
+
+ public void setUser(User user) {
+ this.user = user;
+ }
+
+ public List<User> getUserList() {
+ return userList;
+ }
+
+ public void setUserList(List<User> userList) {
+ this.userList = userList;
+ }
+
+}
/trunk/src/ch/ffhs/webE/web/UserAction.java
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: trunk/src/log4j.properties
===================================================================
--- trunk/src/log4j.properties (nonexistent)
+++ trunk/src/log4j.properties (revision 18)
@@ -0,0 +1,6 @@
+### 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.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
+log4j.rootLogger=debug, stdout
\ No newline at end of file
/trunk/src/log4j.properties
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: trunk/src/hibernate.cfg.xml
===================================================================
--- trunk/src/hibernate.cfg.xml (nonexistent)
+++ trunk/src/hibernate.cfg.xml (revision 18)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-configuration PUBLIC
+ "-//Hibernate/Hibernate Configuration DTD 3.0//EN"
+ "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
+<hibernate-configuration>
+ <session-factory>
+ <property name="hibernate.connection.driver_class">com.mysql.jdbc.Driver</property>
+
+ <property name="hibernate.connection.url">jdbc:mysql://localhost/webengineering</property>
+ <property name="hibernate.connection.username">webEngineering</property>
+ <property name="connection.password">ontologie</property>
+
+ <property name="connection.pool_size">1</property>
+ <property name="hibernate.dialect">org.hibernate.dialect.MySQLDialect</property>
+ <property name="show_sql">true</property>
+ <property name="hbm2ddl.auto">create</property>
+ <mapping class="ch.ffhs.webE.domain.User" />
+ </session-factory>
+</hibernate-configuration>
/trunk/src/hibernate.cfg.xml
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: trunk/WebContent/html_head.jsp
===================================================================
--- trunk/WebContent/html_head.jsp (revision 17)
+++ trunk/WebContent/html_head.jsp (revision 18)
@@ -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: trunk/WebContent/index.jsp
===================================================================
--- trunk/WebContent/index.jsp (revision 17)
+++ trunk/WebContent/index.jsp (revision 18)
@@ -1,19 +1,15 @@
+<%@ 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>
+ <%@ include file="login.jsp" %>
</div>
</body>
/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: trunk/WebContent/login.jsp
===================================================================
--- trunk/WebContent/login.jsp (revision 17)
+++ trunk/WebContent/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: trunk/WebContent/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: trunk/WebContent/WEB-INF/lib/struts2-convention-plugin-2.1.6.jar
===================================================================
--- trunk/WebContent/WEB-INF/lib/struts2-convention-plugin-2.1.6.jar (nonexistent)
+++ trunk/WebContent/WEB-INF/lib/struts2-convention-plugin-2.1.6.jar (revision 18)
/trunk/WebContent/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: trunk/WebContent/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: trunk/WebContent/WEB-INF/lib/mysql-connector-java-5.1.13-bin.jar
===================================================================
--- trunk/WebContent/WEB-INF/lib/mysql-connector-java-5.1.13-bin.jar (nonexistent)
+++ trunk/WebContent/WEB-INF/lib/mysql-connector-java-5.1.13-bin.jar (revision 18)
/trunk/WebContent/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: trunk/WebContent/WEB-INF/lib/ejb3-persistence.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: trunk/WebContent/WEB-INF/lib/ejb3-persistence.jar
===================================================================
--- trunk/WebContent/WEB-INF/lib/ejb3-persistence.jar (nonexistent)
+++ trunk/WebContent/WEB-INF/lib/ejb3-persistence.jar (revision 18)
/trunk/WebContent/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: trunk/WebContent/WEB-INF/lib/freemarker-2.3.13.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: trunk/WebContent/WEB-INF/lib/freemarker-2.3.13.jar
===================================================================
--- trunk/WebContent/WEB-INF/lib/freemarker-2.3.13.jar (nonexistent)
+++ trunk/WebContent/WEB-INF/lib/freemarker-2.3.13.jar (revision 18)
/trunk/WebContent/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: trunk/WebContent/WEB-INF/lib/hibernate-commons-annotations.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: trunk/WebContent/WEB-INF/lib/hibernate-commons-annotations.jar
===================================================================
--- trunk/WebContent/WEB-INF/lib/hibernate-commons-annotations.jar (nonexistent)
+++ trunk/WebContent/WEB-INF/lib/hibernate-commons-annotations.jar (revision 18)
/trunk/WebContent/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: trunk/WebContent/WEB-INF/lib/xwork-2.1.2.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: trunk/WebContent/WEB-INF/lib/xwork-2.1.2.jar
===================================================================
--- trunk/WebContent/WEB-INF/lib/xwork-2.1.2.jar (nonexistent)
+++ trunk/WebContent/WEB-INF/lib/xwork-2.1.2.jar (revision 18)
/trunk/WebContent/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: trunk/WebContent/WEB-INF/lib/slf4j-log4j12-1.5.8.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: trunk/WebContent/WEB-INF/lib/slf4j-log4j12-1.5.8.jar
===================================================================
--- trunk/WebContent/WEB-INF/lib/slf4j-log4j12-1.5.8.jar (nonexistent)
+++ trunk/WebContent/WEB-INF/lib/slf4j-log4j12-1.5.8.jar (revision 18)
/trunk/WebContent/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: trunk/WebContent/WEB-INF/lib/jta-1.1.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: trunk/WebContent/WEB-INF/lib/jta-1.1.jar
===================================================================
--- trunk/WebContent/WEB-INF/lib/jta-1.1.jar (nonexistent)
+++ trunk/WebContent/WEB-INF/lib/jta-1.1.jar (revision 18)
/trunk/WebContent/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: trunk/WebContent/WEB-INF/lib/hsqldb.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: trunk/WebContent/WEB-INF/lib/hsqldb.jar
===================================================================
--- trunk/WebContent/WEB-INF/lib/hsqldb.jar (nonexistent)
+++ trunk/WebContent/WEB-INF/lib/hsqldb.jar (revision 18)
/trunk/WebContent/WEB-INF/lib/hsqldb.jar
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: trunk/WebContent/WEB-INF/lib/struts2-core-2.1.6.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: trunk/WebContent/WEB-INF/lib/struts2-core-2.1.6.jar
===================================================================
--- trunk/WebContent/WEB-INF/lib/struts2-core-2.1.6.jar (nonexistent)
+++ trunk/WebContent/WEB-INF/lib/struts2-core-2.1.6.jar (revision 18)
/trunk/WebContent/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: trunk/WebContent/WEB-INF/lib/dom4j-1.6.1.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: trunk/WebContent/WEB-INF/lib/dom4j-1.6.1.jar
===================================================================
--- trunk/WebContent/WEB-INF/lib/dom4j-1.6.1.jar (nonexistent)
+++ trunk/WebContent/WEB-INF/lib/dom4j-1.6.1.jar (revision 18)
/trunk/WebContent/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: trunk/WebContent/WEB-INF/lib/commons-io-1.3.2.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: trunk/WebContent/WEB-INF/lib/commons-io-1.3.2.jar
===================================================================
--- trunk/WebContent/WEB-INF/lib/commons-io-1.3.2.jar (nonexistent)
+++ trunk/WebContent/WEB-INF/lib/commons-io-1.3.2.jar (revision 18)
/trunk/WebContent/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: trunk/WebContent/WEB-INF/lib/ognl-2.6.11.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: trunk/WebContent/WEB-INF/lib/ognl-2.6.11.jar
===================================================================
--- trunk/WebContent/WEB-INF/lib/ognl-2.6.11.jar (nonexistent)
+++ trunk/WebContent/WEB-INF/lib/ognl-2.6.11.jar (revision 18)
/trunk/WebContent/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: trunk/WebContent/WEB-INF/lib/hibernate-validator.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: trunk/WebContent/WEB-INF/lib/hibernate-validator.jar
===================================================================
--- trunk/WebContent/WEB-INF/lib/hibernate-validator.jar (nonexistent)
+++ trunk/WebContent/WEB-INF/lib/hibernate-validator.jar (revision 18)
/trunk/WebContent/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: trunk/WebContent/WEB-INF/lib/hibernate3.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: trunk/WebContent/WEB-INF/lib/hibernate3.jar
===================================================================
--- trunk/WebContent/WEB-INF/lib/hibernate3.jar (nonexistent)
+++ trunk/WebContent/WEB-INF/lib/hibernate3.jar (revision 18)
/trunk/WebContent/WEB-INF/lib/hibernate3.jar
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: trunk/WebContent/WEB-INF/lib/commons-collections-3.1.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: trunk/WebContent/WEB-INF/lib/commons-collections-3.1.jar
===================================================================
--- trunk/WebContent/WEB-INF/lib/commons-collections-3.1.jar (nonexistent)
+++ trunk/WebContent/WEB-INF/lib/commons-collections-3.1.jar (revision 18)
/trunk/WebContent/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: trunk/WebContent/WEB-INF/lib/antlr-2.7.6.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: trunk/WebContent/WEB-INF/lib/antlr-2.7.6.jar
===================================================================
--- trunk/WebContent/WEB-INF/lib/antlr-2.7.6.jar (nonexistent)
+++ trunk/WebContent/WEB-INF/lib/antlr-2.7.6.jar (revision 18)
/trunk/WebContent/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: trunk/WebContent/WEB-INF/lib/commons-lang-2.3.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: trunk/WebContent/WEB-INF/lib/commons-lang-2.3.jar
===================================================================
--- trunk/WebContent/WEB-INF/lib/commons-lang-2.3.jar (nonexistent)
+++ trunk/WebContent/WEB-INF/lib/commons-lang-2.3.jar (revision 18)
/trunk/WebContent/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: trunk/WebContent/WEB-INF/lib/commons-fileupload-1.2.1.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: trunk/WebContent/WEB-INF/lib/commons-fileupload-1.2.1.jar
===================================================================
--- trunk/WebContent/WEB-INF/lib/commons-fileupload-1.2.1.jar (nonexistent)
+++ trunk/WebContent/WEB-INF/lib/commons-fileupload-1.2.1.jar (revision 18)
/trunk/WebContent/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: trunk/WebContent/WEB-INF/lib/hibernate-annotations.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: trunk/WebContent/WEB-INF/lib/hibernate-annotations.jar
===================================================================
--- trunk/WebContent/WEB-INF/lib/hibernate-annotations.jar (nonexistent)
+++ trunk/WebContent/WEB-INF/lib/hibernate-annotations.jar (revision 18)
/trunk/WebContent/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: trunk/WebContent/WEB-INF/lib/commons-logging-1.1.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: trunk/WebContent/WEB-INF/lib/commons-logging-1.1.jar
===================================================================
--- trunk/WebContent/WEB-INF/lib/commons-logging-1.1.jar (nonexistent)
+++ trunk/WebContent/WEB-INF/lib/commons-logging-1.1.jar (revision 18)
/trunk/WebContent/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: trunk/WebContent/WEB-INF/lib/junit-3.8.1.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: trunk/WebContent/WEB-INF/lib/junit-3.8.1.jar
===================================================================
--- trunk/WebContent/WEB-INF/lib/junit-3.8.1.jar (nonexistent)
+++ trunk/WebContent/WEB-INF/lib/junit-3.8.1.jar (revision 18)
/trunk/WebContent/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: trunk/WebContent/WEB-INF/lib/slf4j-api-1.5.8.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: trunk/WebContent/WEB-INF/lib/slf4j-api-1.5.8.jar
===================================================================
--- trunk/WebContent/WEB-INF/lib/slf4j-api-1.5.8.jar (nonexistent)
+++ trunk/WebContent/WEB-INF/lib/slf4j-api-1.5.8.jar (revision 18)
/trunk/WebContent/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: trunk/WebContent/WEB-INF/lib/log4j-1.2.15.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: trunk/WebContent/WEB-INF/lib/log4j-1.2.15.jar
===================================================================
--- trunk/WebContent/WEB-INF/lib/log4j-1.2.15.jar (nonexistent)
+++ trunk/WebContent/WEB-INF/lib/log4j-1.2.15.jar (revision 18)
/trunk/WebContent/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: trunk/WebContent/WEB-INF/lib/javassist-3.9.0.GA.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: trunk/WebContent/WEB-INF/lib/javassist-3.9.0.GA.jar
===================================================================
--- trunk/WebContent/WEB-INF/lib/javassist-3.9.0.GA.jar (nonexistent)
+++ trunk/WebContent/WEB-INF/lib/javassist-3.9.0.GA.jar (revision 18)
/trunk/WebContent/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: trunk/WebContent/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: trunk/WebContent/WEB-INF/lib/struts2-fullhibernatecore-plugin-1.4-GA.jar
===================================================================
--- trunk/WebContent/WEB-INF/lib/struts2-fullhibernatecore-plugin-1.4-GA.jar (nonexistent)
+++ trunk/WebContent/WEB-INF/lib/struts2-fullhibernatecore-plugin-1.4-GA.jar (revision 18)
/trunk/WebContent/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: trunk/WebContent/WEB-INF/web.xml
===================================================================
--- trunk/WebContent/WEB-INF/web.xml (revision 17)
+++ trunk/WebContent/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: trunk/WebContent/WEB-INF/classes/log4j.properties
===================================================================
--- trunk/WebContent/WEB-INF/classes/log4j.properties (nonexistent)
+++ trunk/WebContent/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
/trunk/WebContent/WEB-INF/classes/log4j.properties
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: trunk/WebContent/user_main.jsp
===================================================================
--- trunk/WebContent/user_main.jsp (revision 17)
+++ trunk/WebContent/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: trunk/WebContent/user_nav.jsp
===================================================================
--- trunk/WebContent/user_nav.jsp (revision 17)
+++ trunk/WebContent/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>