Home / Browse / elateXam e-assessment / Mail / Archive

elateXam e-assessment

Email Archive: elateportal-devel (read-only)

[Elateportal-devel] SF.net SVN: elateportal:[1175] trunk/examServer/src/main

From: <sdienst@us...> - 2009-12-28 20:03

Revision: 1175
          http://elateportal.svn.sourceforge.net/elateportal/?rev=1175&view=rev
Author:   sdienst
Date:     2009-12-28 20:03:22 +0000 (Mon, 28 Dec 2009)

Log Message:
-----------
[feature] export zip archive of the ExamserverRepository* directory.

Modified Paths:
--------------
    trunk/examServer/src/main/webapp/WEB-INF/pages/systemConfig.jsp
    trunk/examServer/src/main/webapp/WEB-INF/struts-config.xml

Added Paths:
-----------
    trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/action/ArchiveServerAction.java

Added: trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/action/ArchiveServerAction.java
===================================================================
--- trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/action/ArchiveServerAction.java	                        (rev 0)
+++ trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/action/ArchiveServerAction.java	2009-12-28 20:03:22 UTC (rev 1175)
@@ -0,0 +1,89 @@
+/*
+
+Copyright (C) 2009 Steffen Dienst
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+package de.thorstenberger.examServer.webapp.action;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+
+import de.thorstenberger.examServer.service.ExamServerManager;
+
+/**
+ * @author Steffen Dienst
+ * 
+ */
+public class ArchiveServerAction extends BaseAction {
+	@Override
+	public ActionForward execute(
+	    final ActionMapping mapping,
+	    final ActionForm form,
+	    final HttpServletRequest request,
+	    final HttpServletResponse response)
+	    throws Exception {
+
+		final ExamServerManager esm = (ExamServerManager) getBean("examServerManager");
+		File repositoryDirectory = esm.getRepositoryFile();
+		String zipName = repositoryDirectory.getName() + ".zip";
+
+		response.setContentType("application/zip");
+		response.setHeader("Content-Disposition", "attachment; filename=" + zipName);
+		ZipOutputStream out = new ZipOutputStream(response.getOutputStream());
+		addToZip(repositoryDirectory, out);
+
+		out.flush();
+		out.close();
+		return null;
+	}
+
+	/**
+	 * Add directory contents to a {@link ZipOutputStream} recursively.
+	 * 
+	 * @param directory
+	 * @param out
+	 * @throws IOException
+	 */
+	void addToZip(File directory, ZipOutputStream out) throws IOException {
+		File[] files = directory.listFiles();
+		byte[] buffer = new byte[20 * 1024];
+
+    for (File file : files) {
+			if (file.isDirectory()) {
+				addToZip(file, out);
+				continue;
+			}
+			FileInputStream in = new FileInputStream(file.getAbsolutePath());
+			out.putNextEntry(new ZipEntry(file.getAbsolutePath()));
+			int len;
+			while ((len = in.read(buffer)) > 0) {
+				out.write(buffer, 0, len);
+			}
+			out.closeEntry();
+			in.close();
+		}
+	}
+}


Property changes on: trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/action/ArchiveServerAction.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Modified: trunk/examServer/src/main/webapp/WEB-INF/pages/systemConfig.jsp
===================================================================
--- trunk/examServer/src/main/webapp/WEB-INF/pages/systemConfig.jsp	2009-12-28 20:01:07 UTC (rev 1174)
+++ trunk/examServer/src/main/webapp/WEB-INF/pages/systemConfig.jsp	2009-12-28 20:03:22 UTC (rev 1175)
@@ -34,4 +34,6 @@
 </table>
 <br/><br/>
 <html:submit>Speichern</html:submit>
-</html:form>
\ No newline at end of file
+</html:form>
+<br/>
+Archivieren aller Serverdaten: <html:link action="/ArchiveServer">Archiv erstellen</html:link>
\ No newline at end of file

Modified: trunk/examServer/src/main/webapp/WEB-INF/struts-config.xml
===================================================================
--- trunk/examServer/src/main/webapp/WEB-INF/struts-config.xml	2009-12-28 20:01:07 UTC (rev 1174)
+++ trunk/examServer/src/main/webapp/WEB-INF/struts-config.xml	2009-12-28 20:03:22 UTC (rev 1175)
@@ -149,6 +149,9 @@
   <action path="/BulkPdfExport" roles="tutor,admin"
    type="de.thorstenberger.examServer.webapp.action.PDFBulkExport">
   </action>
+  <action path="/ArchiveServer" roles="admin"
+   type="de.thorstenberger.examServer.webapp.action.ArchiveServerAction">
+  </action>
 
    <!-- The following action's purpose is to collect some information the students should submit on their Main Menu Page -->
   <action input="/studentMainMenu" path="/submitStudentsInfo" roles="student"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Thread View

Thread	Author	Date
[Elateportal-devel] SF.net SVN: elateportal:[1148] trunk/examServer/src/main	<sdienst@us...>

[Elateportal-devel] SF.net SVN: elateportal:[1170] trunk/examServer/src/main

From: <sdienst@us...> - 2009-11-19 09:47

Revision: 1170
          http://elateportal.svn.sourceforge.net/elateportal/?rev=1170&view=rev
Author:   sdienst
Date:     2009-11-19 09:47:18 +0000 (Thu, 19 Nov 2009)

Log Message:
-----------
[feature] increase deadline by 5 minutes for individual users, fixes #32

Modified Paths:
--------------
    trunk/examServer/src/main/webapp/WEB-INF/classes/ApplicationResources_de.properties
    trunk/examServer/src/main/webapp/WEB-INF/menu-config.xml
    trunk/examServer/src/main/webapp/WEB-INF/pages/mainMenu.jsp
    trunk/examServer/src/main/webapp/WEB-INF/struts-config.xml

Added Paths:
-----------
    trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/action/ActiveTaskUserListAction.java
    trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/action/IncreaseTimeExtensionAction.java
    trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/vo/ActiveUserVO.java
    trunk/examServer/src/main/webapp/WEB-INF/pages/activeTaskUsers.jsp

Added: trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/action/ActiveTaskUserListAction.java
===================================================================
--- trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/action/ActiveTaskUserListAction.java	                        (rev 0)
+++ trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/action/ActiveTaskUserListAction.java	2009-11-19 09:47:18 UTC (rev 1170)
@@ -0,0 +1,80 @@
+/*
+
+Copyright (C) 2009 Steffen Dienst
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+/**
+ *
+ */
+package de.thorstenberger.examServer.webapp.action;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+
+import de.thorstenberger.examServer.webapp.vo.ActiveUserVO;
+import de.thorstenberger.taskmodel.TaskDef;
+import de.thorstenberger.taskmodel.TaskManager;
+import de.thorstenberger.taskmodel.Tasklet;
+import de.thorstenberger.taskmodel.TaskletContainer;
+import de.thorstenberger.taskmodel.Tasklet.Status;
+import de.thorstenberger.taskmodel.complex.ComplexTasklet;
+
+public class ActiveTaskUserListAction extends BaseAction {
+
+	/* (non-Javadoc)
+	 * @see org.apache.struts.action.Action#execute(org.apache.struts.action.ActionMapping, org.apache.struts.action.ActionForm, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
+	 */
+	@Override
+	public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws Exception {
+		TaskManager manager = (TaskManager)getBean( "TaskManager" );
+		TaskletContainer container = (TaskletContainer)getBean( "TaskletContainer" );
+
+		List<TaskDef> allTaskDefs = manager.getTaskDefs();
+		
+		List<Tasklet> allTasklets = new ArrayList<Tasklet>();
+		for(TaskDef td: allTaskDefs)
+			allTasklets.addAll(container.getTasklets(td.getId()));
+		
+		List<ActiveUserVO> vos = new ArrayList<ActiveUserVO>();
+
+		for( Tasklet tasklet : allTasklets ){
+			if(tasklet.getStatus() != Status.INPROGRESS)
+				continue;
+
+			ActiveUserVO vo = new ActiveUserVO();
+        	vo.setTaskId( "" + tasklet.getTaskId() );
+        	vo.setTaskTitle(manager.getTaskDef(tasklet.getTaskId()).getTitle());
+        	vo.setUsername(tasklet.getUserId() );
+        	if(tasklet instanceof ComplexTasklet) {        		
+        	    vo.setTimeExtension(((ComplexTasklet) tasklet).getActiveTry().getTimeExtension()/1000/60);
+        	}
+        	vos.add(vo);
+		}
+
+		request.setAttribute( "ActiveUsers", vos );
+
+		return mapping.findForward( "success" );
+	}
+
+
+}


Property changes on: trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/action/ActiveTaskUserListAction.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Added: trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/action/IncreaseTimeExtensionAction.java
===================================================================
--- trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/action/IncreaseTimeExtensionAction.java	                        (rev 0)
+++ trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/action/IncreaseTimeExtensionAction.java	2009-11-19 09:47:18 UTC (rev 1170)
@@ -0,0 +1,69 @@
+/*
+
+Copyright (C) 2009 Steffen Dienst
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+package de.thorstenberger.examServer.webapp.action;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.ActionMessage;
+import org.apache.struts.action.ActionMessages;
+
+import de.thorstenberger.taskmodel.TaskManager;
+import de.thorstenberger.taskmodel.Tasklet;
+import de.thorstenberger.taskmodel.TaskletContainer;
+import de.thorstenberger.taskmodel.complex.ComplexTasklet;
+import de.thorstenberger.taskmodel.complex.complextaskhandling.Try;
+
+/**
+ * @author Steffen Dienst
+ *
+ */
+public class IncreaseTimeExtensionAction extends BaseAction {
+	@Override
+	public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws Exception {
+		ActionMessages errors = new ActionMessages();
+		
+		long taskId;
+		try {
+			taskId = Long.parseLong( request.getParameter("taskId") );
+		} catch (NumberFormatException e) {
+			errors.add( ActionMessages.GLOBAL_MESSAGE, new ActionMessage( "misc.error", e.getMessage() ) );
+			saveErrors( request, errors );
+			return mapping.findForward( "noSelection" );
+		}
+		String userId = request.getParameter("userId");
+		
+		TaskManager manager = (TaskManager)getBean( "TaskManager" );
+		TaskletContainer container = (TaskletContainer)getBean( "TaskletContainer" );
+		
+		Tasklet tasklet = container.getTasklet(taskId, userId);
+		if(tasklet instanceof ComplexTasklet) {
+			ComplexTasklet ct = (ComplexTasklet) tasklet;
+			Try activeTry = ct.getActiveTry();
+			// increase time by 5 minutes
+			// TODO make configurable
+			activeTry.setTimeExtension(activeTry.getTimeExtension()+5*60*1000);
+			container.storeTasklet(tasklet);
+		}
+		return mapping.findForward( "success" );
+	}
+}


Property changes on: trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/action/IncreaseTimeExtensionAction.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Added: trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/vo/ActiveUserVO.java
===================================================================
--- trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/vo/ActiveUserVO.java	                        (rev 0)
+++ trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/vo/ActiveUserVO.java	2009-11-19 09:47:18 UTC (rev 1170)
@@ -0,0 +1,67 @@
+/*
+
+Copyright (C) 2009 Steffen Dienst
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+package de.thorstenberger.examServer.webapp.vo;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author Steffen Dienst
+ *
+ */
+public class ActiveUserVO {
+	private String username;
+	private String taskTitle;
+	private HashMap<String, String> loginAndTaskId;
+	
+	public String getTaskTitle() {
+  	return taskTitle;
+  }
+	public void setTaskTitle(String taskTitle) {
+  	this.taskTitle = taskTitle;
+  }
+	public String getUsername() {
+  	return username;
+  }
+	public void setUsername(String username) {
+  	this.username = username;
+  }
+	public String getTaskId() {
+  	return taskId;
+  }
+	public void setTaskId(String taskId) {
+  	this.taskId = taskId;
+  }
+	public long getTimeExtension() {
+  	return timeExtension;
+  }
+	public void setTimeExtension(long milliseconds) {
+  	this.timeExtension = milliseconds;
+  }
+	public Map getLoginAndTaskId() {
+		if( loginAndTaskId == null ){
+			loginAndTaskId = new HashMap<String, String>();
+			loginAndTaskId.put( "taskId", "" + getTaskId() );
+			loginAndTaskId.put( "userId", getUsername() );
+		}
+		return loginAndTaskId;
+	}
+	private String taskId;
+	private long timeExtension;
+}


Property changes on: trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/vo/ActiveUserVO.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Modified: trunk/examServer/src/main/webapp/WEB-INF/classes/ApplicationResources_de.properties
===================================================================
--- trunk/examServer/src/main/webapp/WEB-INF/classes/ApplicationResources_de.properties	2009-11-18 18:17:51 UTC (rev 1169)
+++ trunk/examServer/src/main/webapp/WEB-INF/classes/ApplicationResources_de.properties	2009-11-19 09:47:18 UTC (rev 1170)
@@ -79,6 +79,8 @@
 menu.admin.loginConfig=Login-Konfiguration
 menu.admin.systemConfig=System-Konfiguration
 menu.admin.tasks=Aufgaben-Verwaltung
+menu.admin.activetasks=Aufgaben-Verwaltung
+menu.admin.activeTaskUsers=Pr&uuml;fungszeit-verl&auml;ngerung
 
 menu.user=Benutzerprofil
 menu.selectFile=Datei hochladen
@@ -193,6 +195,14 @@
 activeUsers.message=Nachfolgend eine Liste aller angemeldeten Benutzer, deren Sizung nicht abgelaufen ist.
 activeUsers.fullName=Name
 
+# -- exam taking users
+activeTaskUsers.title=Momentane Pr&uuml;flinge
+activeTaskUsers.taskttitle=Name der Pr&uuml;fung
+activeTaskUsers.timeextension=Zeitverl&auml;ngerung in min
+activeTaskUsers.message=Nachfolgend eine Liste aller angemeldeten Benutzer, die gerade eine Pr&uuml;fung bearbeiten.
+activeTaskUsers.increaseTime=Zeit verl&auml;ngern
+activeTaskUsers.increaseLink=5min
+
 # -- loginConfig
 loginConfig.title = Login-Konfiguration
 loginConfig.heading = Login-Konfiguration

Modified: trunk/examServer/src/main/webapp/WEB-INF/menu-config.xml
===================================================================
--- trunk/examServer/src/main/webapp/WEB-INF/menu-config.xml	2009-11-18 18:17:51 UTC (rev 1169)
+++ trunk/examServer/src/main/webapp/WEB-INF/menu-config.xml	2009-11-19 09:47:18 UTC (rev 1170)
@@ -13,6 +13,7 @@
             <Item name="ViewUsers" title="menu.admin.users" forward="viewUsers"/>
             <Item name="TaskMenu" title="menu.admin.tasks" action="TaskConfigList"/>
             <Item name="ActiveUsers" title="mainMenu.activeUsers" action="activeUsers"/>
+            <Item name="ActiveTaskUsers" title="menu.admin.activeTaskUsers" action="activeTaskUsers"/>
             <!--Item name="ReloadContext" title="menu.admin.reload" action="reload"/-->
             <!--Item name="FlushCache" title="menu.flushCache" action="flush"/-->
             <Item name="Clickstream" title="menu.clickstream" page="/clickstreams.jsp"/>

Added: trunk/examServer/src/main/webapp/WEB-INF/pages/activeTaskUsers.jsp
===================================================================
--- trunk/examServer/src/main/webapp/WEB-INF/pages/activeTaskUsers.jsp	                        (rev 0)
+++ trunk/examServer/src/main/webapp/WEB-INF/pages/activeTaskUsers.jsp	2009-11-19 09:47:18 UTC (rev 1170)
@@ -0,0 +1,25 @@
+<%@ include file="/common/taglibs.jsp"%>
+
+<head>
+    <title><fmt:message key="activeTaskUsers.title"/></title>
+    <content tag="heading"><fmt:message key="activeTaskUsers.title"/></content>
+    <meta name="menu" content="AdminMenu"/>
+</head>
+<body id="activeUsers"/>
+
+<p><fmt:message key="activeTaskUsers.message"/></p>
+
+<div class="separator"></div>
+
+<input type="button" onclick="location.href='<html:rewrite forward="mainMenu"/>'" value="<fmt:message key="button.done"/>"/>
+
+<display:table name="ActiveUsers" id="user" cellspacing="0" cellpadding="0"
+    defaultsort="1" class="table" pagesize="50" requestURI="">
+  
+    <display:column property="username" escapeXml="true" style="width: 30%" titleKey="userForm.username" sortable="true"/>
+    <display:column property="taskTitle" escapeXml="true" style="width: 30%" titleKey="activeTaskUsers.taskttitle" sortable="true"/>
+    <display:column property="timeExtension" escapeXml="true" style="width: 30%" titleKey="activeTaskUsers.timeextension" sortable="true"/>
+    <display:column titleKey="activeTaskUsers.increaseTime" sortable="true">
+		<html:link action="/increaseTime" name="user" property="loginAndTaskId"><fmt:message key="activeTaskUsers.increaseLink"/></html:link>
+	</display:column>
+</display:table>


Property changes on: trunk/examServer/src/main/webapp/WEB-INF/pages/activeTaskUsers.jsp
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Modified: trunk/examServer/src/main/webapp/WEB-INF/pages/mainMenu.jsp
===================================================================
--- trunk/examServer/src/main/webapp/WEB-INF/pages/mainMenu.jsp	2009-11-18 18:17:51 UTC (rev 1169)
+++ trunk/examServer/src/main/webapp/WEB-INF/pages/mainMenu.jsp	2009-11-19 09:47:18 UTC (rev 1170)
@@ -27,4 +27,7 @@
     <li>
         <a href="<c:url value="/tutorMainMenu.html"/>">Aufgaben-Korrektur</a>
     </li>
+    <li>
+        <a href="<c:url value="/activeTaskUsers.html"/>">Pr&uuml;fungszeitverl&auml;ngerung</a>
+    </li>
 </ul>

Modified: trunk/examServer/src/main/webapp/WEB-INF/struts-config.xml
===================================================================
--- trunk/examServer/src/main/webapp/WEB-INF/struts-config.xml	2009-11-18 18:17:51 UTC (rev 1169)
+++ trunk/examServer/src/main/webapp/WEB-INF/struts-config.xml	2009-11-19 09:47:18 UTC (rev 1170)
@@ -155,7 +155,15 @@
    type="de.thorstenberger.examServer.webapp.action.StudentsInfoSubmitAction" validate="false">
 	<forward name="success" path="/studentMainMenu.html"/>
   </action>
-
+  
+  <!-- show a table with all users that are currently working on a task. -->
+  <action path="/activeTaskUsers" roles="admin" type="de.thorstenberger.examServer.webapp.action.ActiveTaskUserListAction">
+	<forward name="success" path="/WEB-INF/pages/activeTaskUsers.jsp"/>
+  </action>
+   
+  <action path="/increaseTime" roles="admin" type="de.thorstenberger.examServer.webapp.action.IncreaseTimeExtensionAction">
+    <forward name="success" path="/activeTaskUsers.html" redirect="true"/>
+  </action>
   <action path="/TaskConfigList" type="de.thorstenberger.examServer.webapp.action.TaskConfigMainAction">
    <forward name="success" path="/WEB-INF/pages/taskList.jsp"/>
   </action>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Elateportal-devel] SF.net SVN: elateportal:[1173] trunk/examServer/src/main

From: <sdienst@us...> - 2009-12-24 13:17

Revision: 1173
          http://elateportal.svn.sourceforge.net/elateportal/?rev=1173&view=rev
Author:   sdienst
Date:     2009-12-24 13:17:18 +0000 (Thu, 24 Dec 2009)

Log Message:
-----------
[internal] added xslt transformation scripts for updating older examrepository files (tries and taskdefs)
[internal[ added JMeter testplan, to be used for performance regression tests

Added Paths:
-----------
    trunk/examServer/src/main/performance/
    trunk/examServer/src/main/performance/examserver.jmx
    trunk/examServer/src/main/schemaevolution/
    trunk/examServer/src/main/schemaevolution/complexTaskHandling.nice.xsd
    trunk/examServer/src/main/schemaevolution/refactor-complextaskdef.xslt
    trunk/examServer/src/main/schemaevolution/refactor-tries.xslt

Added: trunk/examServer/src/main/performance/examserver.jmx
===================================================================
--- trunk/examServer/src/main/performance/examserver.jmx	                        (rev 0)
+++ trunk/examServer/src/main/performance/examserver.jmx	2009-12-24 13:17:18 UTC (rev 1173)
@@ -0,0 +1,2470 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jmeterTestPlan version="1.2" properties="2.1">
+  <hashTree>
+    <TestPlan guiclass="TestPlanGui" testclass="TestPlan" testname="Testplan" enabled="true">
+      <stringProp name="TestPlan.comments"></stringProp>
+      <boolProp name="TestPlan.functional_mode">false</boolProp>
+      <boolProp name="TestPlan.serialize_threadgroups">false</boolProp>
+      <elementProp name="TestPlan.user_defined_variables" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="Benutzer definierte Variablen" enabled="true">
+        <collectionProp name="Arguments.arguments"/>
+      </elementProp>
+      <stringProp name="TestPlan.user_define_classpath"></stringProp>
+    </TestPlan>
+    <hashTree>
+      <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Thread-Gruppe" enabled="true">
+        <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Schleifen-Controller (Loop Controller)" enabled="true">
+          <boolProp name="LoopController.continue_forever">false</boolProp>
+          <intProp name="LoopController.loops">-1</intProp>
+        </elementProp>
+        <stringProp name="ThreadGroup.num_threads">100</stringProp>
+        <stringProp name="ThreadGroup.ramp_time">60</stringProp>
+        <longProp name="ThreadGroup.start_time">1240556422000</longProp>
+        <longProp name="ThreadGroup.end_time">1240556422000</longProp>
+        <boolProp name="ThreadGroup.scheduler">false</boolProp>
+        <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
+        <stringProp name="ThreadGroup.duration"></stringProp>
+        <stringProp name="ThreadGroup.delay"></stringProp>
+      </ThreadGroup>
+      <hashTree>
+        <CSVDataSet guiclass="TestBeanGUI" testclass="CSVDataSet" testname="CSV Einstellungen" enabled="true">
+          <stringProp name="delimiter">,</stringProp>
+          <stringProp name="fileEncoding"></stringProp>
+          <stringProp name="filename">examusers.csv</stringProp>
+          <boolProp name="quotedData">false</boolProp>
+          <boolProp name="recycle">true</boolProp>
+          <stringProp name="shareMode">All threads</stringProp>
+          <boolProp name="stopThread">false</boolProp>
+          <stringProp name="variableNames">USER,PASSWORD</stringProp>
+        </CSVDataSet>
+        <hashTree/>
+        <CookieManager guiclass="CookiePanel" testclass="CookieManager" testname="HTTP Cookie Manager" enabled="true">
+          <collectionProp name="CookieManager.cookies"/>
+          <boolProp name="CookieManager.clearEachIteration">true</boolProp>
+          <stringProp name="CookieManager.policy">rfc2109</stringProp>
+        </CookieManager>
+        <hashTree/>
+        <GaussianRandomTimer guiclass="GaussianRandomTimerGui" testclass="GaussianRandomTimer" testname="Gauss&apos;scher Zufalls-Zeitgeber" enabled="true">
+          <stringProp name="ConstantTimer.delay">1000</stringProp>
+          <stringProp name="RandomTimer.range">500</stringProp>
+        </GaussianRandomTimer>
+        <hashTree/>
+        <ConfigTestElement guiclass="HttpDefaultsGui" testclass="ConfigTestElement" testname="HTTP Request Default Einstellungen" enabled="true">
+          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="Benutzer definierte Variablen" enabled="true">
+            <collectionProp name="Arguments.arguments"/>
+          </elementProp>
+          <stringProp name="HTTPSampler.domain">localhost</stringProp>
+          <stringProp name="HTTPSampler.port">8080</stringProp>
+          <stringProp name="HTTPSampler.protocol">http</stringProp>
+          <stringProp name="HTTPSampler.contentEncoding"></stringProp>
+          <stringProp name="HTTPSampler.path"></stringProp>
+        </ConfigTestElement>
+        <hashTree/>
+        <HTTPSampler guiclass="HttpTestSampleGui" testclass="HTTPSampler" testname="/examServer/ComplexTaskOverview.html" enabled="true">
+          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+            <collectionProp name="Arguments.arguments">
+              <elementProp name="taskId" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                <stringProp name="Argument.name">taskId</stringProp>
+                <stringProp name="Argument.value">0</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              </elementProp>
+            </collectionProp>
+          </elementProp>
+          <stringProp name="HTTPSampler.domain"></stringProp>
+          <stringProp name="HTTPSampler.port"></stringProp>
+          <stringProp name="HTTPSampler.protocol"></stringProp>
+          <stringProp name="HTTPSampler.contentEncoding"></stringProp>
+          <stringProp name="HTTPSampler.path">/examServer/ComplexTaskOverview.html</stringProp>
+          <stringProp name="HTTPSampler.method">GET</stringProp>
+          <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+          <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+          <stringProp name="HTTPSampler.FILE_NAME"></stringProp>
+          <stringProp name="HTTPSampler.FILE_FIELD"></stringProp>
+          <stringProp name="HTTPSampler.mimetype"></stringProp>
+          <stringProp name="HTTPSampler.monitor">false</stringProp>
+          <stringProp name="HTTPSampler.embedded_url_re"></stringProp>
+        </HTTPSampler>
+        <hashTree>
+          <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="Browser-derived headers" enabled="true">
+            <collectionProp name="HeaderManager.headers">
+              <elementProp name="Accept-Language" elementType="Header">
+                <stringProp name="Header.name">Accept-Language</stringProp>
+                <stringProp name="Header.value">de-de,de;q=0.8,en-us;q=0.5,en;q=0.3</stringProp>
+              </elementProp>
+              <elementProp name="Host" elementType="Header">
+                <stringProp name="Header.name">Host</stringProp>
+                <stringProp name="Header.value">localhost:8080</stringProp>
+              </elementProp>
+              <elementProp name="Accept" elementType="Header">
+                <stringProp name="Header.name">Accept</stringProp>
+                <stringProp name="Header.value">text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8</stringProp>
+              </elementProp>
+              <elementProp name="Keep-Alive" elementType="Header">
+                <stringProp name="Header.name">Keep-Alive</stringProp>
+                <stringProp name="Header.value">300</stringProp>
+              </elementProp>
+              <elementProp name="User-Agent" elementType="Header">
+                <stringProp name="Header.name">User-Agent</stringProp>
+                <stringProp name="Header.value">Mozilla/5.0 (Windows; U; Windows NT 5.1; de; rv:1.9.1b2) Gecko/20081201 Firefox/3.1b2</stringProp>
+              </elementProp>
+              <elementProp name="Referer" elementType="Header">
+                <stringProp name="Header.name">Referer</stringProp>
+                <stringProp name="Header.value">http://localhost:8080/examServer/mainMenu.html</stringProp>
+              </elementProp>
+              <elementProp name="Accept-Encoding" elementType="Header">
+                <stringProp name="Header.name">Accept-Encoding</stringProp>
+                <stringProp name="Header.value">gzip,deflate</stringProp>
+              </elementProp>
+              <elementProp name="Accept-Charset" elementType="Header">
+                <stringProp name="Header.name">Accept-Charset</stringProp>
+                <stringProp name="Header.value">ISO-8859-1,utf-8;q=0.7,*;q=0.7</stringProp>
+              </elementProp>
+            </collectionProp>
+          </HeaderManager>
+          <hashTree/>
+        </hashTree>
+        <HTTPSampler guiclass="HttpTestSampleGui" testclass="HTTPSampler" testname="/examServer" enabled="true">
+          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+            <collectionProp name="Arguments.arguments"/>
+          </elementProp>
+          <stringProp name="HTTPSampler.domain"></stringProp>
+          <stringProp name="HTTPSampler.port"></stringProp>
+          <stringProp name="HTTPSampler.protocol"></stringProp>
+          <stringProp name="HTTPSampler.contentEncoding"></stringProp>
+          <stringProp name="HTTPSampler.path">/examServer</stringProp>
+          <stringProp name="HTTPSampler.method">GET</stringProp>
+          <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+          <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+          <stringProp name="HTTPSampler.FILE_NAME"></stringProp>
+          <stringProp name="HTTPSampler.FILE_FIELD"></stringProp>
+          <stringProp name="HTTPSampler.mimetype"></stringProp>
+          <stringProp name="HTTPSampler.monitor">false</stringProp>
+          <stringProp name="HTTPSampler.embedded_url_re"></stringProp>
+        </HTTPSampler>
+        <hashTree>
+          <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="Browser-derived headers" enabled="true">
+            <collectionProp name="HeaderManager.headers">
+              <elementProp name="Accept-Language" elementType="Header">
+                <stringProp name="Header.name">Accept-Language</stringProp>
+                <stringProp name="Header.value">de-de,de;q=0.8,en-us;q=0.5,en;q=0.3</stringProp>
+              </elementProp>
+              <elementProp name="Host" elementType="Header">
+                <stringProp name="Header.name">Host</stringProp>
+                <stringProp name="Header.value">localhost:8080</stringProp>
+              </elementProp>
+              <elementProp name="Accept" elementType="Header">
+                <stringProp name="Header.name">Accept</stringProp>
+                <stringProp name="Header.value">text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8</stringProp>
+              </elementProp>
+              <elementProp name="Keep-Alive" elementType="Header">
+                <stringProp name="Header.name">Keep-Alive</stringProp>
+                <stringProp name="Header.value">300</stringProp>
+              </elementProp>
+              <elementProp name="User-Agent" elementType="Header">
+                <stringProp name="Header.name">User-Agent</stringProp>
+                <stringProp name="Header.value">Mozilla/5.0 (Windows; U; Windows NT 5.1; de; rv:1.9.1b2) Gecko/20081201 Firefox/3.1b2</stringProp>
+              </elementProp>
+              <elementProp name="Accept-Encoding" elementType="Header">
+                <stringProp name="Header.name">Accept-Encoding</stringProp>
+                <stringProp name="Header.value">gzip,deflate</stringProp>
+              </elementProp>
+              <elementProp name="Accept-Charset" elementType="Header">
+                <stringProp name="Header.name">Accept-Charset</stringProp>
+                <stringProp name="Header.value">ISO-8859-1,utf-8;q=0.7,*;q=0.7</stringProp>
+              </elementProp>
+            </collectionProp>
+          </HeaderManager>
+          <hashTree/>
+        </hashTree>
+        <HTTPSampler guiclass="HttpTestSampleGui" testclass="HTTPSampler" testname="/examServer/" enabled="true">
+          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+            <collectionProp name="Arguments.arguments"/>
+          </elementProp>
+          <stringProp name="HTTPSampler.domain"></stringProp>
+          <stringProp name="HTTPSampler.port"></stringProp>
+          <stringProp name="HTTPSampler.protocol"></stringProp>
+          <stringProp name="HTTPSampler.contentEncoding"></stringProp>
+          <stringProp name="HTTPSampler.path">/examServer/</stringProp>
+          <stringProp name="HTTPSampler.method">GET</stringProp>
+          <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+          <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+          <stringProp name="HTTPSampler.FILE_NAME"></stringProp>
+          <stringProp name="HTTPSampler.FILE_FIELD"></stringProp>
+          <stringProp name="HTTPSampler.mimetype"></stringProp>
+          <stringProp name="HTTPSampler.monitor">false</stringProp>
+          <stringProp name="HTTPSampler.embedded_url_re"></stringProp>
+        </HTTPSampler>
+        <hashTree>
+          <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="Browser-derived headers" enabled="true">
+            <collectionProp name="HeaderManager.headers">
+              <elementProp name="Accept-Language" elementType="Header">
+                <stringProp name="Header.name">Accept-Language</stringProp>
+                <stringProp name="Header.value">de-de,de;q=0.8,en-us;q=0.5,en;q=0.3</stringProp>
+              </elementProp>
+              <elementProp name="Host" elementType="Header">
+                <stringProp name="Header.name">Host</stringProp>
+                <stringProp name="Header.value">localhost:8080</stringProp>
+              </elementProp>
+              <elementProp name="Accept" elementType="Header">
+                <stringProp name="Header.name">Accept</stringProp>
+                <stringProp name="Header.value">text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8</stringProp>
+              </elementProp>
+              <elementProp name="Keep-Alive" elementType="Header">
+                <stringProp name="Header.name">Keep-Alive</stringProp>
+                <stringProp name="Header.value">300</stringProp>
+              </elementProp>
+              <elementProp name="User-Agent" elementType="Header">
+                <stringProp name="Header.name">User-Agent</stringProp>
+                <stringProp name="Header.value">Mozilla/5.0 (Windows; U; Windows NT 5.1; de; rv:1.9.1b2) Gecko/20081201 Firefox/3.1b2</stringProp>
+              </elementProp>
+              <elementProp name="Accept-Encoding" elementType="Header">
+                <stringProp name="Header.name">Accept-Encoding</stringProp>
+                <stringProp name="Header.value">gzip,deflate</stringProp>
+              </elementProp>
+              <elementProp name="Accept-Charset" elementType="Header">
+                <stringProp name="Header.name">Accept-Charset</stringProp>
+                <stringProp name="Header.value">ISO-8859-1,utf-8;q=0.7,*;q=0.7</stringProp>
+              </elementProp>
+            </collectionProp>
+          </HeaderManager>
+          <hashTree/>
+        </hashTree>
+        <HTTPSampler guiclass="HttpTestSampleGui" testclass="HTTPSampler" testname="/examServer/mainMenu.html" enabled="true">
+          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+            <collectionProp name="Arguments.arguments"/>
+          </elementProp>
+          <stringProp name="HTTPSampler.domain"></stringProp>
+          <stringProp name="HTTPSampler.port"></stringProp>
+          <stringProp name="HTTPSampler.protocol"></stringProp>
+          <stringProp name="HTTPSampler.contentEncoding"></stringProp>
+          <stringProp name="HTTPSampler.path">/examServer/mainMenu.html</stringProp>
+          <stringProp name="HTTPSampler.method">GET</stringProp>
+          <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+          <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+          <stringProp name="HTTPSampler.FILE_NAME"></stringProp>
+          <stringProp name="HTTPSampler.FILE_FIELD"></stringProp>
+          <stringProp name="HTTPSampler.mimetype"></stringProp>
+          <stringProp name="HTTPSampler.monitor">false</stringProp>
+          <stringProp name="HTTPSampler.embedded_url_re"></stringProp>
+        </HTTPSampler>
+        <hashTree>
+          <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="Browser-derived headers" enabled="true">
+            <collectionProp name="HeaderManager.headers">
+              <elementProp name="Accept-Language" elementType="Header">
+                <stringProp name="Header.name">Accept-Language</stringProp>
+                <stringProp name="Header.value">de-de,de;q=0.8,en-us;q=0.5,en;q=0.3</stringProp>
+              </elementProp>
+              <elementProp name="Host" elementType="Header">
+                <stringProp name="Header.name">Host</stringProp>
+                <stringProp name="Header.value">localhost:8080</stringProp>
+              </elementProp>
+              <elementProp name="Accept" elementType="Header">
+                <stringProp name="Header.name">Accept</stringProp>
+                <stringProp name="Header.value">text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8</stringProp>
+              </elementProp>
+              <elementProp name="Keep-Alive" elementType="Header">
+                <stringProp name="Header.name">Keep-Alive</stringProp>
+                <stringProp name="Header.value">300</stringProp>
+              </elementProp>
+              <elementProp name="User-Agent" elementType="Header">
+                <stringProp name="Header.name">User-Agent</stringProp>
+                <stringProp name="Header.value">Mozilla/5.0 (Windows; U; Windows NT 5.1; de; rv:1.9.1b2) Gecko/20081201 Firefox/3.1b2</stringProp>
+              </elementProp>
+              <elementProp name="Accept-Encoding" elementType="Header">
+                <stringProp name="Header.name">Accept-Encoding</stringProp>
+                <stringProp name="Header.value">gzip,deflate</stringProp>
+              </elementProp>
+              <elementProp name="Accept-Charset" elementType="Header">
+                <stringProp name="Header.name">Accept-Charset</stringProp>
+                <stringProp name="Header.value">ISO-8859-1,utf-8;q=0.7,*;q=0.7</stringProp>
+              </elementProp>
+            </collectionProp>
+          </HeaderManager>
+          <hashTree/>
+        </hashTree>
+        <HTTPSampler guiclass="HttpTestSampleGui" testclass="HTTPSampler" testname="/examServer/login.jsp" enabled="true">
+          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+            <collectionProp name="Arguments.arguments"/>
+          </elementProp>
+          <stringProp name="HTTPSampler.domain"></stringProp>
+          <stringProp name="HTTPSampler.port"></stringProp>
+          <stringProp name="HTTPSampler.protocol"></stringProp>
+          <stringProp name="HTTPSampler.contentEncoding"></stringProp>
+          <stringProp name="HTTPSampler.path">/examServer/login.jsp</stringProp>
+          <stringProp name="HTTPSampler.method">GET</stringProp>
+          <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+          <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+          <stringProp name="HTTPSampler.FILE_NAME"></stringProp>
+          <stringProp name="HTTPSampler.FILE_FIELD"></stringProp>
+          <stringProp name="HTTPSampler.mimetype"></stringProp>
+          <stringProp name="HTTPSampler.monitor">false</stringProp>
+          <stringProp name="HTTPSampler.embedded_url_re"></stringProp>
+        </HTTPSampler>
+        <hashTree>
+          <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="Browser-derived headers" enabled="true">
+            <collectionProp name="HeaderManager.headers">
+              <elementProp name="Accept-Language" elementType="Header">
+                <stringProp name="Header.name">Accept-Language</stringProp>
+                <stringProp name="Header.value">de-de,de;q=0.8,en-us;q=0.5,en;q=0.3</stringProp>
+              </elementProp>
+              <elementProp name="Host" elementType="Header">
+                <stringProp name="Header.name">Host</stringProp>
+                <stringProp name="Header.value">localhost:8080</stringProp>
+              </elementProp>
+              <elementProp name="Accept" elementType="Header">
+                <stringProp name="Header.name">Accept</stringProp>
+                <stringProp name="Header.value">text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8</stringProp>
+              </elementProp>
+              <elementProp name="Keep-Alive" elementType="Header">
+                <stringProp name="Header.name">Keep-Alive</stringProp>
+                <stringProp name="Header.value">300</stringProp>
+              </elementProp>
+              <elementProp name="User-Agent" elementType="Header">
+                <stringProp name="Header.name">User-Agent</stringProp>
+                <stringProp name="Header.value">Mozilla/5.0 (Windows; U; Windows NT 5.1; de; rv:1.9.1b2) Gecko/20081201 Firefox/3.1b2</stringProp>
+              </elementProp>
+              <elementProp name="Accept-Encoding" elementType="Header">
+                <stringProp name="Header.name">Accept-Encoding</stringProp>
+                <stringProp name="Header.value">gzip,deflate</stringProp>
+              </elementProp>
+              <elementProp name="Accept-Charset" elementType="Header">
+                <stringProp name="Header.name">Accept-Charset</stringProp>
+                <stringProp name="Header.value">ISO-8859-1,utf-8;q=0.7,*;q=0.7</stringProp>
+              </elementProp>
+            </collectionProp>
+          </HeaderManager>
+          <hashTree/>
+        </hashTree>
+        <HTTPSampler guiclass="HttpTestSampleGui" testclass="HTTPSampler" testname="/examServer/j_security_check" enabled="true">
+          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+            <collectionProp name="Arguments.arguments">
+              <elementProp name="j_username" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                <stringProp name="Argument.name">j_username</stringProp>
+                <stringProp name="Argument.value">${USER}</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              </elementProp>
+              <elementProp name="j_password" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                <stringProp name="Argument.name">j_password</stringProp>
+                <stringProp name="Argument.value">${PASSWORD}</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              </elementProp>
+              <elementProp name="login" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                <stringProp name="Argument.name">login</stringProp>
+                <stringProp name="Argument.value">Anmelden</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              </elementProp>
+            </collectionProp>
+          </elementProp>
+          <stringProp name="HTTPSampler.domain"></stringProp>
+          <stringProp name="HTTPSampler.port"></stringProp>
+          <stringProp name="HTTPSampler.protocol"></stringProp>
+          <stringProp name="HTTPSampler.contentEncoding"></stringProp>
+          <stringProp name="HTTPSampler.path">/examServer/j_security_check</stringProp>
+          <stringProp name="HTTPSampler.method">POST</stringProp>
+          <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+          <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+          <stringProp name="HTTPSampler.FILE_NAME"></stringProp>
+          <stringProp name="HTTPSampler.FILE_FIELD"></stringProp>
+          <stringProp name="HTTPSampler.mimetype"></stringProp>
+          <stringProp name="HTTPSampler.monitor">false</stringProp>
+          <stringProp name="HTTPSampler.embedded_url_re"></stringProp>
+        </HTTPSampler>
+        <hashTree>
+          <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="Browser-derived headers" enabled="true">
+            <collectionProp name="HeaderManager.headers">
+              <elementProp name="Content-Type" elementType="Header">
+                <stringProp name="Header.name">Content-Type</stringProp>
+                <stringProp name="Header.value">application/x-www-form-urlencoded</stringProp>
+              </elementProp>
+              <elementProp name="Accept-Language" elementType="Header">
+                <stringProp name="Header.name">Accept-Language</stringProp>
+                <stringProp name="Header.value">de-de,de;q=0.8,en-us;q=0.5,en;q=0.3</stringProp>
+              </elementProp>
+              <elementProp name="Host" elementType="Header">
+                <stringProp name="Header.name">Host</stringProp>
+                <stringProp name="Header.value">localhost:8080</stringProp>
+              </elementProp>
+              <elementProp name="Accept" elementType="Header">
+                <stringProp name="Header.name">Accept</stringProp>
+                <stringProp name="Header.value">text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8</stringProp>
+              </elementProp>
+              <elementProp name="Keep-Alive" elementType="Header">
+                <stringProp name="Header.name">Keep-Alive</stringProp>
+                <stringProp name="Header.value">300</stringProp>
+              </elementProp>
+              <elementProp name="User-Agent" elementType="Header">
+                <stringProp name="Header.name">User-Agent</stringProp>
+                <stringProp name="Header.value">Mozilla/5.0 (Windows; U; Windows NT 5.1; de; rv:1.9.1b2) Gecko/20081201 Firefox/3.1b2</stringProp>
+              </elementProp>
+              <elementProp name="Referer" elementType="Header">
+                <stringProp name="Header.name">Referer</stringProp>
+                <stringProp name="Header.value">http://localhost:8080/examServer/login.jsp</stringProp>
+              </elementProp>
+              <elementProp name="Accept-Encoding" elementType="Header">
+                <stringProp name="Header.name">Accept-Encoding</stringProp>
+                <stringProp name="Header.value">gzip,deflate</stringProp>
+              </elementProp>
+              <elementProp name="Accept-Charset" elementType="Header">
+                <stringProp name="Header.name">Accept-Charset</stringProp>
+                <stringProp name="Header.value">ISO-8859-1,utf-8;q=0.7,*;q=0.7</stringProp>
+              </elementProp>
+            </collectionProp>
+          </HeaderManager>
+          <hashTree/>
+        </hashTree>
+        <HTTPSampler guiclass="HttpTestSampleGui" testclass="HTTPSampler" testname="/examServer/mainMenu.html" enabled="true">
+          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+            <collectionProp name="Arguments.arguments"/>
+          </elementProp>
+          <stringProp name="HTTPSampler.domain"></stringProp>
+          <stringProp name="HTTPSampler.port"></stringProp>
+          <stringProp name="HTTPSampler.protocol"></stringProp>
+          <stringProp name="HTTPSampler.contentEncoding"></stringProp>
+          <stringProp name="HTTPSampler.path">/examServer/mainMenu.html</stringProp>
+          <stringProp name="HTTPSampler.method">GET</stringProp>
+          <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+          <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+          <stringProp name="HTTPSampler.FILE_NAME"></stringProp>
+          <stringProp name="HTTPSampler.FILE_FIELD"></stringProp>
+          <stringProp name="HTTPSampler.mimetype"></stringProp>
+          <stringProp name="HTTPSampler.monitor">false</stringProp>
+          <stringProp name="HTTPSampler.embedded_url_re"></stringProp>
+        </HTTPSampler>
+        <hashTree>
+          <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="Browser-derived headers" enabled="true">
+            <collectionProp name="HeaderManager.headers">
+              <elementProp name="Accept-Language" elementType="Header">
+                <stringProp name="Header.name">Accept-Language</stringProp>
+                <stringProp name="Header.value">de-de,de;q=0.8,en-us;q=0.5,en;q=0.3</stringProp>
+              </elementProp>
+              <elementProp name="Host" elementType="Header">
+                <stringProp name="Header.name">Host</stringProp>
+                <stringProp name="Header.value">localhost:8080</stringProp>
+              </elementProp>
+              <elementProp name="Accept" elementType="Header">
+                <stringProp name="Header.name">Accept</stringProp>
+                <stringProp name="Header.value">text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8</stringProp>
+              </elementProp>
+              <elementProp name="Keep-Alive" elementType="Header">
+                <stringProp name="Header.name">Keep-Alive</stringProp>
+                <stringProp name="Header.value">300</stringProp>
+              </elementProp>
+              <elementProp name="User-Agent" elementType="Header">
+                <stringProp name="Header.name">User-Agent</stringProp>
+                <stringProp name="Header.value">Mozilla/5.0 (Windows; U; Windows NT 5.1; de; rv:1.9.1b2) Gecko/20081201 Firefox/3.1b2</stringProp>
+              </elementProp>
+              <elementProp name="Referer" elementType="Header">
+                <stringProp name="Header.name">Referer</stringProp>
+                <stringProp name="Header.value">http://localhost:8080/examServer/login.jsp</stringProp>
+              </elementProp>
+              <elementProp name="Accept-Encoding" elementType="Header">
+                <stringProp name="Header.name">Accept-Encoding</stringProp>
+                <stringProp name="Header.value">gzip,deflate</stringProp>
+              </elementProp>
+              <elementProp name="Accept-Charset" elementType="Header">
+                <stringProp name="Header.name">Accept-Charset</stringProp>
+                <stringProp name="Header.value">ISO-8859-1,utf-8;q=0.7,*;q=0.7</stringProp>
+              </elementProp>
+            </collectionProp>
+          </HeaderManager>
+          <hashTree/>
+        </hashTree>
+        <HTTPSampler guiclass="HttpTestSampleGui" testclass="HTTPSampler" testname="/examServer/TaskViewFactory.html" enabled="true">
+          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+            <collectionProp name="Arguments.arguments">
+              <elementProp name="taskId" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                <stringProp name="Argument.name">taskId</stringProp>
+                <stringProp name="Argument.value">0</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              </elementProp>
+            </collectionProp>
+          </elementProp>
+          <stringProp name="HTTPSampler.domain"></stringProp>
+          <stringProp name="HTTPSampler.port"></stringProp>
+          <stringProp name="HTTPSampler.protocol"></stringProp>
+          <stringProp name="HTTPSampler.contentEncoding"></stringProp>
+          <stringProp name="HTTPSampler.path">/examServer/TaskViewFactory.html</stringProp>
+          <stringProp name="HTTPSampler.method">GET</stringProp>
+          <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+          <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+          <stringProp name="HTTPSampler.FILE_NAME"></stringProp>
+          <stringProp name="HTTPSampler.FILE_FIELD"></stringProp>
+          <stringProp name="HTTPSampler.mimetype"></stringProp>
+          <stringProp name="HTTPSampler.monitor">false</stringProp>
+          <stringProp name="HTTPSampler.embedded_url_re"></stringProp>
+        </HTTPSampler>
+        <hashTree>
+          <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="Browser-derived headers" enabled="true">
+            <collectionProp name="HeaderManager.headers">
+              <elementProp name="Accept-Language" elementType="Header">
+                <stringProp name="Header.name">Accept-Language</stringProp>
+                <stringProp name="Header.value">de-de,de;q=0.8,en-us;q=0.5,en;q=0.3</stringProp>
+              </elementProp>
+              <elementProp name="Host" elementType="Header">
+                <stringProp name="Header.name">Host</stringProp>
+                <stringProp name="Header.value">localhost:8080</stringProp>
+              </elementProp>
+              <elementProp name="Accept" elementType="Header">
+                <stringProp name="Header.name">Accept</stringProp>
+                <stringProp name="Header.value">text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8</stringProp>
+              </elementProp>
+              <elementProp name="Keep-Alive" elementType="Header">
+                <stringProp name="Header.name">Keep-Alive</stringProp>
+                <stringProp name="Header.value">300</stringProp>
+              </elementProp>
+              <elementProp name="User-Agent" elementType="Header">
+                <stringProp name="Header.name">User-Agent</stringProp>
+                <stringProp name="Header.value">Mozilla/5.0 (Windows; U; Windows NT 5.1; de; rv:1.9.1b2) Gecko/20081201 Firefox/3.1b2</stringProp>
+              </elementProp>
+              <elementProp name="Referer" elementType="Header">
+                <stringProp name="Header.name">Referer</stringProp>
+                <stringProp name="Header.value">http://localhost:8080/examServer/mainMenu.html</stringProp>
+              </elementProp>
+              <elementProp name="Accept-Encoding" elementType="Header">
+                <stringProp name="Header.name">Accept-Encoding</stringProp>
+                <stringProp name="Header.value">gzip,deflate</stringProp>
+              </elementProp>
+              <elementProp name="Accept-Charset" elementType="Header">
+                <stringProp name="Header.name">Accept-Charset</stringProp>
+                <stringProp name="Header.value">ISO-8859-1,utf-8;q=0.7,*;q=0.7</stringProp>
+              </elementProp>
+            </collectionProp>
+          </HeaderManager>
+          <hashTree/>
+        </hashTree>
+        <HTTPSampler guiclass="HttpTestSampleGui" testclass="HTTPSampler" testname="/taskmodel-core-view/execute.do" enabled="true">
+          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+            <collectionProp name="Arguments.arguments">
+              <elementProp name="action" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                <stringProp name="Argument.name">action</stringProp>
+                <stringProp name="Argument.value">ComplexTaskExecute</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              </elementProp>
+              <elementProp name="id" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                <stringProp name="Argument.name">id</stringProp>
+                <stringProp name="Argument.value">0</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              </elementProp>
+              <elementProp name="todo" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                <stringProp name="Argument.name">todo</stringProp>
+                <stringProp name="Argument.value">new</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              </elementProp>
+              <elementProp name="try" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                <stringProp name="Argument.name">try</stringProp>
+                <stringProp name="Argument.value">1800000</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              </elementProp>
+            </collectionProp>
+          </elementProp>
+          <stringProp name="HTTPSampler.domain"></stringProp>
+          <stringProp name="HTTPSampler.port"></stringProp>
+          <stringProp name="HTTPSampler.protocol"></stringProp>
+          <stringProp name="HTTPSampler.contentEncoding"></stringProp>
+          <stringProp name="HTTPSampler.path">/taskmodel-core-view/execute.do</stringProp>
+          <stringProp name="HTTPSampler.method">GET</stringProp>
+          <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+          <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+          <stringProp name="HTTPSampler.FILE_NAME"></stringProp>
+          <stringProp name="HTTPSampler.FILE_FIELD"></stringProp>
+          <stringProp name="HTTPSampler.mimetype"></stringProp>
+          <stringProp name="HTTPSampler.monitor">false</stringProp>
+          <stringProp name="HTTPSampler.embedded_url_re"></stringProp>
+        </HTTPSampler>
+        <hashTree>
+          <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="Browser-derived headers" enabled="true">
+            <collectionProp name="HeaderManager.headers">
+              <elementProp name="Accept-Language" elementType="Header">
+                <stringProp name="Header.name">Accept-Language</stringProp>
+                <stringProp name="Header.value">de-de,de;q=0.8,en-us;q=0.5,en;q=0.3</stringProp>
+              </elementProp>
+              <elementProp name="Host" elementType="Header">
+                <stringProp name="Header.name">Host</stringProp>
+                <stringProp name="Header.value">localhost:8080</stringProp>
+              </elementProp>
+              <elementProp name="Accept" elementType="Header">
+                <stringProp name="Header.name">Accept</stringProp>
+                <stringProp name="Header.value">text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8</stringProp>
+              </elementProp>
+              <elementProp name="Keep-Alive" elementType="Header">
+                <stringProp name="Header.name">Keep-Alive</stringProp>
+                <stringProp name="Header.value">300</stringProp>
+              </elementProp>
+              <elementProp name="User-Agent" elementType="Header">
+                <stringProp name="Header.name">User-Agent</stringProp>
+                <stringProp name="Header.value">Mozilla/5.0 (Windows; U; Windows NT 5.1; de; rv:1.9.1b2) Gecko/20081201 Firefox/3.1b2</stringProp>
+              </elementProp>
+              <elementProp name="Referer" elementType="Header">
+                <stringProp name="Header.name">Referer</stringProp>
+                <stringProp name="Header.value">http://localhost:8080/examServer/ComplexTaskOverview.html?taskId=0</stringProp>
+              </elementProp>
+              <elementProp name="Accept-Encoding" elementType="Header">
+                <stringProp name="Header.name">Accept-Encoding</stringProp>
+                <stringProp name="Header.value">gzip,deflate</stringProp>
+              </elementProp>
+              <elementProp name="Accept-Charset" elementType="Header">
+                <stringProp name="Header.name">Accept-Charset</stringProp>
+                <stringProp name="Header.value">ISO-8859-1,utf-8;q=0.7,*;q=0.7</stringProp>
+              </elementProp>
+            </collectionProp>
+          </HeaderManager>
+          <hashTree/>
+          <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor" enabled="true">
+            <stringProp name="RegexExtractor.useHeaders">false</stringProp>
+            <stringProp name="RegexExtractor.refname">HASHCODE</stringProp>
+            <stringProp name="RegexExtractor.regex">&lt;input type=&quot;hidden&quot; name=&quot;hashCode&quot; value=&quot;(.+?)&quot;&gt;</stringProp>
+            <stringProp name="RegexExtractor.template">$1$</stringProp>
+            <stringProp name="RegexExtractor.default"></stringProp>
+            <stringProp name="RegexExtractor.match_number"></stringProp>
+          </RegexExtractor>
+          <hashTree/>
+        </hashTree>
+        <HTTPSampler guiclass="HttpTestSampleGui" testclass="HTTPSampler" testname="/taskmodel-core-view/savePage.do" enabled="true">
+          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+            <collectionProp name="Arguments.arguments">
+              <elementProp name="hashCode" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                <stringProp name="Argument.name">hashCode</stringProp>
+                <stringProp name="Argument.value">${HASHCODE}</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              </elementProp>
+              <elementProp name="id" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                <stringProp name="Argument.name">id</stringProp>
+                <stringProp name="Argument.value">0</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              </elementProp>
+              <elementProp name="todo" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                <stringProp name="Argument.name">todo</stringProp>
+                <stringProp name="Argument.value">continue</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              </elementProp>
+              <elementProp name="task%5B0%5D.ms_answer_0" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                <stringProp name="Argument.name">task%5B0%5D.ms_answer_0</stringProp>
+                <stringProp name="Argument.value">selected</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              </elementProp>
+              <elementProp name="task%5B0%5D.ms_answer_1" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                <stringProp name="Argument.name">task%5B0%5D.ms_answer_1</stringProp>
+                <stringProp name="Argument.value">selected</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              </elementProp>
+              <elementProp name="page" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                <stringProp name="Argument.name">page</stringProp>
+                <stringProp name="Argument.value">1</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              </elementProp>
+              <elementProp name="save" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                <stringProp name="Argument.name">save</stringProp>
+                <stringProp name="Argument.value">Speichern</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              </elementProp>
+            </collectionProp>
+          </elementProp>
+          <stringProp name="HTTPSampler.domain"></stringProp>
+          <stringProp name="HTTPSampler.port"></stringProp>
+          <stringProp name="HTTPSampler.protocol"></stringProp>
+          <stringProp name="HTTPSampler.contentEncoding"></stringProp>
+          <stringProp name="HTTPSampler.path">/taskmodel-core-view/savePage.do</stringProp>
+          <stringProp name="HTTPSampler.method">POST</stringProp>
+          <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+          <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+          <stringProp name="HTTPSampler.FILE_NAME"></stringProp>
+          <stringProp name="HTTPSampler.FILE_FIELD"></stringProp>
+          <stringProp name="HTTPSampler.mimetype"></stringProp>
+          <stringProp name="HTTPSampler.monitor">false</stringProp>
+          <stringProp name="HTTPSampler.embedded_url_re"></stringProp>
+        </HTTPSampler>
+        <hashTree>
+          <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="Browser-derived headers" enabled="true">
+            <collectionProp name="HeaderManager.headers">
+              <elementProp name="Content-Type" elementType="Header">
+                <stringProp name="Header.name">Content-Type</stringProp>
+                <stringProp name="Header.value">application/x-www-form-urlencoded</stringProp>
+              </elementProp>
+              <elementProp name="Accept-Language" elementType="Header">
+                <stringProp name="Header.name">Accept-Language</stringProp>
+                <stringProp name="Header.value">de-de,de;q=0.8,en-us;q=0.5,en;q=0.3</stringProp>
+              </elementProp>
+              <elementProp name="Host" elementType="Header">
+                <stringProp name="Header.name">Host</stringProp>
+                <stringProp name="Header.value">localhost:8080</stringProp>
+              </elementProp>
+              <elementProp name="Accept" elementType="Header">
+                <stringProp name="Header.name">Accept</stringProp>
+                <stringProp name="Header.value">text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8</stringProp>
+              </elementProp>
+              <elementProp name="Keep-Alive" elementType="Header">
+                <stringProp name="Header.name">Keep-Alive</stringProp>
+                <stringProp name="Header.value">300</stringProp>
+              </elementProp>
+              <elementProp name="User-Agent" elementType="Header">
+                <stringProp name="Header.name">User-Agent</stringProp>
+                <stringProp name="Header.value">Mozilla/5.0 (Windows; U; Windows NT 5.1; de; rv:1.9.1b2) Gecko/20081201 Firefox/3.1b2</stringProp>
+              </elementProp>
+              <elementProp name="Referer" elementType="Header">
+                <stringProp name="Header.name">Referer</stringProp>
+                <stringProp name="Header.value">http://localhost:8080/taskmodel-core-view/execute.do?action=ComplexTaskExecute&amp;id=0&amp;todo=new&amp;try=3</stringProp>
+              </elementProp>
+              <elementProp name="Accept-Encoding" elementType="Header">
+                <stringProp name="Header.name">Accept-Encoding</stringProp>
+                <stringProp name="Header.value">gzip,deflate</stringProp>
+              </elementProp>
+              <elementProp name="Accept-Charset" elementType="Header">
+                <stringProp name="Header.name">Accept-Charset</stringProp>
+                <stringProp name="Header.value">ISO-8859-1,utf-8;q=0.7,*;q=0.7</stringProp>
+              </elementProp>
+            </collectionProp>
+          </HeaderManager>
+          <hashTree/>
+        </hashTree>
+        <HTTPSampler guiclass="HttpTestSampleGui" testclass="HTTPSampler" testname="/taskmodel-core-view/execute.do" enabled="true">
+          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+            <collectionProp name="Arguments.arguments">
+              <elementProp name="id" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                <stringProp name="Argument.name">id</stringProp>
+                <stringProp name="Argument.value">0</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              </elementProp>
+              <elementProp name="todo" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                <stringProp name="Argument.name">todo</stringProp>
+                <stringProp name="Argument.value">continue</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              </elementProp>
+              <elementProp name="page" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                <stringProp name="Argument.name">page</stringProp>
+                <stringProp name="Argument.value">2</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              </elementProp>
+            </collectionProp>
+          </elementProp>
+          <stringProp name="HTTPSampler.domain"></stringProp>
+          <stringProp name="HTTPSampler.port"></stringProp>
+          <stringProp name="HTTPSampler.protocol"></stringProp>
+          <stringProp name="HTTPSampler.contentEncoding">UTF-8</stringProp>
+          <stringProp name="HTTPSampler.path">/taskmodel-core-view/execute.do</stringProp>
+          <stringProp name="HTTPSampler.method">GET</stringProp>
+          <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+          <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+          <stringProp name="HTTPSampler.FILE_NAME"></stringProp>
+          <stringProp name="HTTPSampler.FILE_FIELD"></stringProp>
+          <stringProp name="HTTPSampler.mimetype"></stringProp>
+          <stringProp name="HTTPSampler.monitor">false</stringProp>
+          <stringProp name="HTTPSampler.embedded_url_re"></stringProp>
+        </HTTPSampler>
+        <hashTree>
+          <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="Browser-derived headers" enabled="true">
+            <collectionProp name="HeaderManager.headers">
+              <elementProp name="Accept-Language" elementType="Header">
+                <stringProp name="Header.name">Accept-Language</stringProp>
+                <stringProp name="Header.value">de-de,de;q=0.8,en-us;q=0.5,en;q=0.3</stringProp>
+              </elementProp>
+              <elementProp name="Host" elementType="Header">
+                <stringProp name="Header.name">Host</stringProp>
+                <stringProp name="Header.value">localhost:8080</stringProp>
+              </elementProp>
+              <elementProp name="Accept" elementType="Header">
+                <stringProp name="Header.name">Accept</stringProp>
+                <stringProp name="Header.value">text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8</stringProp>
+              </elementProp>
+              <elementProp name="Keep-Alive" elementType="Header">
+                <stringProp name="Header.name">Keep-Alive</stringProp>
+                <stringProp name="Header.value">300</stringProp>
+              </elementProp>
+              <elementProp name="User-Agent" elementType="Header">
+                <stringProp name="Header.name">User-Agent</stringProp>
+                <stringProp name="Header.value">Mozilla/5.0 (Windows; U; Windows NT 5.1; de; rv:1.9.1b2) Gecko/20081201 Firefox/3.1b2</stringProp>
+              </elementProp>
+              <elementProp name="Referer" elementType="Header">
+                <stringProp name="Header.name">Referer</stringProp>
+                <stringProp name="Header.value">http://localhost:8080/taskmodel-core-view/savePage.do</stringProp>
+              </elementProp>
+              <elementProp name="Accept-Encoding" elementType="Header">
+                <stringProp name="Header.name">Accept-Encoding</stringProp>
+                <stringProp name="Header.value">gzip,deflate</stringProp>
+              </elementProp>
+              <elementProp name="Accept-Charset" elementType="Header">
+                <stringProp name="Header.name">Accept-Charset</stringProp>
+                <stringProp name="Header.value">ISO-8859-1,utf-8;q=0.7,*;q=0.7</stringProp>
+              </elementProp>
+            </collectionProp>
+          </HeaderManager>
+          <hashTree/>
+          <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor" enabled="true">
+            <stringProp name="RegexExtractor.useHeaders">false</stringProp>
+            <stringProp name="RegexExtractor.refname">HASHCODE</stringProp>
+            <stringProp name="RegexExtractor.regex">&lt;input type=&quot;hidden&quot; name=&quot;hashCode&quot; value=&quot;(.+?)&quot;&gt;</stringProp>
+            <stringProp name="RegexExtractor.template">$1$</stringProp>
+            <stringProp name="RegexExtractor.default"></stringProp>
+            <stringProp name="RegexExtractor.match_number"></stringProp>
+          </RegexExtractor>
+          <hashTree/>
+        </hashTree>
+        <HTTPSampler guiclass="HttpTestSampleGui" testclass="HTTPSampler" testname="/taskmodel-core-view/savePage.do" enabled="true">
+          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+            <collectionProp name="Arguments.arguments">
+              <elementProp name="hashCode" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                <stringProp name="Argument.name">hashCode</stringProp>
+                <stringProp name="Argument.value">${HASHCODE}</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              </elementProp>
+              <elementProp name="id" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                <stringProp name="Argument.name">id</stringProp>
+                <stringProp name="Argument.value">0</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              </elementProp>
+              <elementProp name="todo" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                <stringProp name="Argument.name">todo</stringProp>
+                <stringProp name="Argument.value">continue</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              </elementProp>
+              <elementProp name="task[0].ms_answer_0" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                <stringProp name="Argument.name">task[0].ms_answer_0</stringProp>
+                <stringProp name="Argument.value">selected</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              </elementProp>
+              <elementProp name="task[1].ms_answer_0" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                <stringProp name="Argument.name">task[1].ms_answer_0</stringProp>
+                <stringProp name="Argument.value">selected</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              </elementProp>
+              <elementProp name="page" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                <stringProp name="Argument.name">page</stringProp>
+                <stringProp name="Argument.value">2</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              </elementProp>
+              <elementProp name="save" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                <stringProp name="Argument.name">save</stringProp>
+                <stringProp name="Argument.value">Speichern</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              </elementProp>
+            </collectionProp>
+          </elementProp>
+          <stringProp name="HTTPSampler.domain"></stringProp>
+          <stringProp name="HTTPSampler.port"></stringProp>
+          <stringProp name="HTTPSampler.protocol"></stringProp>
+          <stringProp name="HTTPSampler.contentEncoding">UTF-8</stringProp>
+          <stringProp name="HTTPSampler.path">/taskmodel-core-view/savePage.do</stringProp>
+          <stringProp name="HTTPSampler.method">POST</stringProp>
+          <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+          <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+          <stringProp name="HTTPSampler.FILE_NAME"></stringProp>
+          <stringProp name="HTTPSampler.FILE_FIELD"></stringProp>
+          <stringProp name="HTTPSampler.mimetype"></stringProp>
+          <stringProp name="HTTPSampler.monitor">false</stringProp>
+          <stringProp name="HTTPSampler.embedded_url_re"></stringProp>
+        </HTTPSampler>
+        <hashTree>
+          <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="Browser-derived headers" enabled="true">
+            <collectionProp name="HeaderManager.headers">
+              <elementProp name="Content-Type" elementType="Header">
+                <stringProp name="Header.name">Content-Type</stringProp>
+                <stringProp name="Header.value">application/x-www-form-urlencoded</stringProp>
+              </elementProp>
+              <elementProp name="Accept-Language" elementType="Header">
+                <stringProp name="Header.name">Accept-Language</stringProp>
+                <stringProp name="Header.value">de-de,de;q=0.8,en-us;q=0.5,en;q=0.3</stringProp>
+              </elementProp>
+              <elementProp name="Host" elementType="Header">
+                <stringProp name="Header.name">Host</stringProp>
+                <stringProp name="Header.value">localhost:8080</stringProp>
+              </elementProp>
+              <elementProp name="Accept" elementType="Header">
+                <stringProp name="Header.name">Accept</stringProp>
+                <stringProp name="Header.value">text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8</stringProp>
+              </elementProp>
+              <elementProp name="Keep-Alive" elementType="Header">
+                <stringProp name="Header.name">Keep-Alive</stringProp>
+                <stringProp name="Header.value">300</stringProp>
+              </elementProp>
+              <elementProp name="User-Agent" elementType="Header">
+                <stringProp name="Header.name">User-Agent</stringProp>
+                <stringProp name="Header.value">Mozilla/5.0 (Windows; U; Windows NT 5.1; de; rv:1.9.1b2) Gecko/20081201 Firefox/3.1b2</stringProp>
+              </elementProp>
+              <elementProp name="Referer" elementType="Header">
+                <stringProp name="Header.name">Referer</stringProp>
+                <stringProp name="Header.value">http://localhost:8080/taskmodel-core-view/execute.do?id=0&amp;todo=continue&amp;page=2</stringProp>
+              </elementProp>
+              <elementProp name="Accept-Encoding" elementType="Header">
+                <stringProp name="Header.name">Accept-Encoding</stringProp>
+                <stringProp name="Header.value">gzip,deflate</stringProp>
+              </elementProp>
+              <elementProp name="Accept-Charset" elementType="Header">
+                <stringProp name="Header.name">Accept-Charset</stringProp>
+                <stringProp name="Header.value">ISO-8859-1,utf-8;q=0.7,*;q=0.7</stringProp>
+              </elementProp>
+            </collectionProp>
+          </HeaderManager>
+          <hashTree/>
+        </hashTree>
+        <HTTPSampler guiclass="HttpTestSampleGui" testclass="HTTPSampler" testname="/taskmodel-core-view/execute.do" enabled="true">
+          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+            <collectionProp name="Arguments.arguments">
+              <elementProp name="id" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                <stringProp name="Argument.name">id</stringProp>
+                <stringProp name="Argument.value">0</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              </elementProp>
+              <elementProp name="todo" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                <stringProp name="Argument.name">todo</stringProp>
+                <stringProp name="Argument.value">continue</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              </elementProp>
+              <elementProp name="page" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                <stringProp name="Argument.name">page</stringProp>
+                <stringProp name="Argument.value">3</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              </elementProp>
+            </collectionProp>
+          </elementProp>
+          <stringProp name="HTTPSampler.domain"></stringProp>
+          <stringProp name="HTTPSampler.port"></stringProp>
+          <stringProp name="HTTPSampler.protocol"></stringProp>
+          <stringProp name="HTTPSampler.contentEncoding">UTF-8</stringProp>
+          <stringProp name="HTTPSampler.path">/taskmodel-core-view/execute.do</stringProp>
+          <stringProp name="HTTPSampler.method">GET</stringProp>
+          <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+          <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+          <stringProp name="HTTPSampler.FILE_NAME"></stringProp>
+          <stringProp name="HTTPSampler.FILE_FIELD"></stringProp>
+          <stringProp name="HTTPSampler.mimetype"></stringProp>
+          <stringProp name="HTTPSampler.monitor">false</stringProp>
+          <stringProp name="HTTPSampler.embedded_url_re"></stringProp>
+        </HTTPSampler>
+        <hashTree>
+          <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="Browser-derived headers" enabled="true">
+            <collectionProp name="HeaderManager.headers">
+              <elementProp name="Accept-Language" elementType="Header">
+                <stringProp name="Header.name">Accept-Language</stringProp>
+                <stringProp name="Header.value">de-de,de;q=0.8,en-us;q=0.5,en;q=0.3</stringProp>
+              </elementProp>
+              <elementProp name="Host" elementType="Header">
+                <stringProp name="Header.name">Host</stringProp>
+                <stringProp name="Header.value">localhost:8080</stringProp>
+              </elementProp>
+              <elementProp name="Accept" elementType="Header">
+                <stringProp name="Header.name">Accept</stringProp>
+                <stringProp name="Header.value">text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8</stringProp>
+              </elementProp>
+              <elementProp name="Keep-Alive" elementType="Header">
+                <stringProp name="Header.name">Keep-Alive</stringProp>
+                <stringProp name="Header.value">300</stringProp>
+              </elementProp>
+              <elementProp name="User-Agent" elementType="Header">
+                <stringProp name="Header.name">User-Agent</stringProp>
+                <stringProp name="Header.value">Mozilla/5.0 (Windows; U; Windows NT 5.1; de; rv:1.9.1b2) Gecko/20081201 Firefox/3.1b2</stringProp>
+              </elementProp>
+              <elementProp name="Referer" elementType="Header">
+                <stringProp name="Header.name">Referer</stringProp>
+                <stringProp name="Header.value">http://localhost:8080/taskmodel-core-view/savePage.do</stringProp>
+              </elementProp>
+              <elementProp name="Accept-Encoding" elementType="Header">
+                <stringProp name="Header.name">Accept-Encoding</stringProp>
+                <stringProp name="Header.value">gzip,deflate</stringProp>
+              </elementProp>
+              <elementProp name="Accept-Charset" elementType="Header">
+                <stringProp name="Header.name">Accept-Charset</stringProp>
+                <stringProp name="Header.value">ISO-8859-1,utf-8;q=0.7,*;q=0.7</stringProp>
+              </elementProp>
+            </collectionProp>
+          </HeaderManager>
+          <hashTree/>
+          <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor" enabled="true">
+            <stringProp name="RegexExtractor.useHeaders">false</stringProp>
+            <stringProp name="RegexExtractor.refname">HASHCODE</stringProp>
+            <stringProp name="RegexExtractor.regex">&lt;input type=&quot;hidden&quot; name=&quot;hashCode&quot; value=&quot;(.+?)&quot;&gt;</stringProp>
+            <stringProp name="RegexExtractor.template">$1$</stringProp>
+            <stringProp name="RegexExtractor.default"></stringProp>
+            <stringProp name="RegexExtractor.match_number"></stringProp>
+          </RegexExtractor>
+          <hashTree/>
+        </hashTree>
+        <HTTPSampler guiclass="HttpTestSampleGui" testclass="HTTPSampler" testname="/taskmodel-core-view/savePage.do" enabled="true">
+          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+            <collectionProp name="Arguments.arguments">
+              <elementProp name="hashCode" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                <stringProp name="Argument.name">hashCode</stringProp>
+                <stringProp name="Argument.value">${HASHCODE}</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              </elementProp>
+              <elementProp name="id" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                <stringProp name="Argument.name">id</stringProp>
+                <stringProp name="Argument.value">0</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              </elementProp>
+              <elementProp name="todo" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                <stringProp name="Argument.name">todo</stringProp>
+                <stringProp name="Argument.value">continue</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              </elementProp>
+              <elementProp name="task[0].concept_0" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                <stringProp name="Argument.name">task[0].concept_0</stringProp>
+                <stringProp name="Argument.value">0</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              </elementProp>
+              <elementProp name="task[0].concept_1" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                <stringProp name="Argument.name">task[0].concept_1</stringProp>
+                <stringProp name="Argument.value">3</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              </elementProp>
+              <elementProp name="task[0].concept_2" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                <stringProp name="Argument.name">task[0].concept_2</stringProp>
+                <stringProp name="Argument.value">null</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              </elementProp>
+              <elementProp name="task[0].concept_3" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                <stringProp name="Argument.name">task[0].concept_3</stringProp>
+                <stringProp name="Argument.value">2</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              </elementProp>
+              <elementProp name="task[0].concept_4" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                <stringProp name="Argument.name">task[0].concept_4</stringProp>
+                <stringProp name="Argument.value">null</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              </elementProp>
+              <elementProp name="task[1].concept_0" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                <stringProp name="Argument.name">task[1].concept_0</stringProp>
+                <stringProp name="Argument.value">null</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              </elementProp>
+              <elementProp name="task[1].concept_1" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                <stringProp name="Argument.name">task[1].concept_1</stringProp>
+                <stringProp name="Argument.value">4</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              </elementProp>
+              <elementProp name="task[1].concept_2" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                <stringProp name="Argument.name">task[1].concept_2</stringProp>
+                <stringProp name="Argument.value">null</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              </elementProp>
+              <elementProp name="task[1].concept_3" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                <stringProp name="Argument.name">task[1].concept_3</stringProp>
+                <stringProp name="Argument.value">4</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              </elementProp>
+              <elementProp name="task[1].concept_4" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                <stringProp name="Argument.name">task[1].concept_4</stringProp>
+                <stringProp name="Argument.value">2</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              </elementProp>
+              <elementProp name="page" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                <stringProp name="Argument.name">page</stringProp>
+                <stringProp name="Argument.value">3</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              </elementProp>
+              <elementProp name="save" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                <stringProp name="Argument.name">save</stringProp>
+                <stringProp name="Argument.value">Speichern</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              </elementProp>
+            </collectionProp>
+          </elementProp>
+          <stringProp name="HTTPSampler.domain"></stringProp>
+          <stringProp name="HTTPSampler.port"></stringProp>
+          <stringProp name="HTTPSampler.protocol"></stringProp>
+          <stringProp name="HTTPSampler.contentEncoding">UTF-8</stringProp>
+          <stringProp name="HTTPSampler.path">/taskmodel-core-view/savePage.do</stringProp>
+          <stringProp name="HTTPSampler.method">POST</stringProp>
+          <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+          <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+          <stringProp name="HTTPSampler.FILE_NAME"></stringProp>
+          <stringProp name="HTTPSampler.FILE_FIELD"></stringProp>
+          <stringProp name="HTTPSampler.mimetype"></stringProp>
+          <stringProp name="HTTPSampler.monitor">false</stringProp>
+          <stringProp name="HTTPSampler.embedded_url_re"></stringProp>
+        </HTTPSampler>
+        <hashTree>
+          <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="Browser-derived headers" enabled="true">
+            <collectionProp name="HeaderManager.headers">
+              <elementProp name="Content-Type" elementType="Header">
+                <stringProp name="Header.name">Content-Type</stringProp>
+                <stringProp name="Header.value">application/x-www-form-urlencoded</stringProp>
+              </elementProp>
+              <elementProp name="Accept-Language" elementType="Header">
+                <stringProp name="Header.name">Accept-Language</stringProp>
+                <stringProp name="Header.value">de-de,de;q=0.8,en-us;q=0.5,en;q=0.3</stringProp>
+              </elementProp>
+              <elementProp name="Host" elementType="Header">
+                <stringProp name="Header.name">Host</stringProp>
+                <stringProp name="Header.value">localhost:8080</stringProp>
+              </elementProp>
+              <elementProp name="Accept" elementType="Header">
+                <stringProp name="Header.name">Accept</stringProp>
+                <stringProp name="Header.value">text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8</stringProp>
+              </elementProp>
+              <elementProp name="Keep-Alive" elementType="Header">
+                <stringProp name="Header.name">Keep-Alive</stringProp>
+                <stringProp name="Header.value">300</stringProp>
+              </elementProp>
+              <elementProp name="User-Agent" elementType="Header">
+                <stringProp name="Header.name">User-Agent</stringProp>
+                <stringProp name="Header.value">Mozilla/5.0 (Windows; U; Windows NT 5.1; de; rv:1.9.1b2) Gecko/20081201 Firefox/3.1b2</stringProp>
+              </elementProp>
+              <elementProp name="Referer" elementType="Header">
+                <stringProp name="Header.name">Referer</stringProp>
+                <stringProp name="Header.value">http://localhost:8080/taskmodel-core-view/execute.do?id=0&amp;todo=continue&amp;page=3</stringProp>
+              </elementProp>
+              <elementProp name="Accept-Encoding" elementType="Header">
+                <stringProp name="Header.name">Accept-Encoding</stringProp>
+                <stringProp name="Header.value">gzip,deflate</stringProp>
+              </elementProp>
+              <elementProp name="Accept-Charset" elementType="Header">
+                <stringProp name="Header.name">Accept-Charset</stringProp>
+                <stringProp name="Header.value">ISO-8859-1,utf-8;q=0.7,*;q=0.7</stringProp>
+              </elementProp>
+            </collectionProp>
+          </HeaderManager>
+          <hashTree/>
+        </hashTree>
+        <HTTPSampler guiclass="HttpTestSampleGui" testclass="HTTPSampler" testname="/taskmodel-core-view/execute.do" enabled="true">
+          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+            <collectionProp name="Arguments.arguments">
+              <elementProp name="id" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                <stringProp name="Argument.name">id</stringProp>
+                <stringProp name="Argument.value">0</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              </elementProp>
+              <elementProp name="todo" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                <stringProp name="Argument.name">todo</stringProp>
+                <stringProp name="Argument.value">continue</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              </elementProp>
+              <elementProp name="page" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                <stringProp name="Argument.name">page</stringProp>
+                <stringProp name="Argument.value">5</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              </elementProp>
+            </collectionProp>
+          </elementProp>
+          <stringProp name="HTTPSampler.domain"></stringProp>
+          <stringProp name="HTTPSampler.port"></stringProp>
+          <stringProp name="HTTPSampler.protocol"></stringProp>
+          <stringProp name="HTTPSampler.contentEncoding">UTF-8</stringProp>
+          <stringProp name="HTTPSampler.path">/taskmodel-core-view/execute.do</stringProp>
+          <stringProp name="HTTPSampler.method">GET</stringProp>
+          <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+          <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+          <stringProp name="HTTPSampler.FILE_NAME"></stringProp>
+          <stringProp name="HTTPSampler.FILE_FIELD"></stringProp>
+          <stringProp name="HTTPSampler.mimetype"></stringProp>
+          <stringProp name="HTTPSampler.monitor">false</stringProp>
+          <stringProp name="HTTPSampler.embedded_url_re"></stringProp>
+        </HTTPSampler>
+        <hashTree>
+          <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="Browser-derived headers" enabled="true">
+            <collectionProp name="HeaderManager.headers">
+              <elementProp name="Accept-Language" elementType="Header">
+                <stringProp name="Header.name">Accept-Language</stringProp>
+                <stringProp name="Header.value">de-de,de;q=0.8,en-us;q=0.5,en;q=0.3</stringProp>
+              </elementProp>
+              <elementProp name="Host" elementType="Header">
+                <stringProp name="Header.name">Host</stringProp>
+                <stringProp name="Header.value">localhost:8080</stringProp>
+              </elementProp>
+              <elementProp name="Accept" elementType="Header">
+                <stringProp name="Header.name">Accept</stringProp>
+                <stringProp name="Header.value">text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8</stringProp>
+              </elementProp>
+              <elementProp name="Keep-Alive" elementType="Header">
+                <stringProp name="Header.name">Keep-Alive</stringProp>
+                <stringProp name="Header.value">300</stringProp>
+              </elementProp>
+              <elementProp name="User-Agent" elementType="Header">
+                <stringProp name="Header.name">User-Agent</stringProp>
+                <stringProp name="Header.value">Mozilla/5.0 (Windows; U; Windows NT 5.1; de; rv:1.9.1b2) Gecko/20081201 Firefox/3.1b2</stringProp>
+              </elementProp>
+              <elementProp name="Referer" elementType="Header">
+                <stringProp name="Header.name">Referer</stringProp>
+                <stringProp name="Header.value">http://localhost:8080/taskmodel-core-view/savePage.do</stringProp>
+              </elementProp>
+              <elementProp name="Accept-Encoding" elementType="Header">
+                <stringProp name="Header.name">Accept-Encoding</stringProp>
+                <stringProp name="Header.value">gzip,deflate</stringProp>
+              </elementProp>
+              <elementProp name="Accept-Charset" elementType="Header">
+                <stringProp name="Header.name">Accept-Charset</stringProp>
+                <stringProp name="Header.value">ISO-8859-1,utf-8;q=0.7,*;q=0.7</stringProp>
+              </elementProp>
+            </collectionProp>
+          </HeaderManager>
+          <hashTree/>
+          <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor" enabled="true">
+            <stringProp name="RegexExtractor.useHeaders">false</stringProp>
+            <stringProp name="RegexExtractor.refname">HASHCODE</stringProp>
+            <stringProp name="RegexExtractor.regex">&lt;input type=&quot;hidden&quot; name=&quot;hashCode&quot; value=&quot;(.+?)&quot;&gt;</stringProp>
+            <stringProp name="RegexExtractor.template">$1$</stringProp>
+            <stringProp name="RegexExtractor.default"></stringProp>
+            <stringProp name="RegexExtractor.match_number"></stringProp>
+          </RegexExtractor>
+          <hashTree/>
+        </hashTree>
+        <HTTPSampler guiclass="HttpTestSampleGui" testclass="HTTPSampler" testname="/taskmodel-core-view/savePage.do" enabled="true">
+          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+            <collectionProp name="Arguments.arguments">
+              <elementProp name="hashCode" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                <stringProp name="Argument.name">hashCode</stringProp>
+                <stringProp name="Argument.value">${HASHCODE}</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              </elementProp>
+              <elementProp name="id" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                <stringProp name="Argument.name">id</stringProp>
+                <stringProp name="Argument.value">0</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              </elementProp>
+              <elementProp name="todo" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                <stringProp name="Argument.name">todo</stringProp>
+                <stringProp name="Argument.value">continue</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              </elementProp>
+              <elementProp name="task[0].gap_0" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                <stringProp name="Argument.name">task[0].gap_0</stringProp>
+                <stringProp name="Argument.value"></stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              </elementProp>
+              <elementProp name="task[0].gap_1" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                <stringProp name="Argument.name">task[0].gap_1</stringProp>
+                <stringProp name="Argument.value"></stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              </elementProp>
+              <elementProp name="task[0].gap_2" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                <stringProp name="Argument.name">task[0].gap_2</stringProp>
+                <stringProp name="Argument.value">as</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              </elementProp>
+              <elementProp name="task[0].gap_3" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                <stringProp name="Argument.name">task[0].gap_3</stringProp>
+                <stringProp name="Argument.value"></stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              </elementProp>
+              <elementProp name="task[0].gap_4" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                <stringProp name="Argument.name">task[0].gap_4</stringProp>
+                <stringProp name="Argument.value">asfd</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              </elementProp>
+              <elementProp name="task[1].gap_0" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                <stringProp name="Argument.name">task[1].gap_0</stringProp>
+                <stringProp name="Argument.value"></stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              </elementProp>
+              <elementProp name="task[1].gap_1" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                <stringProp name="Argument.name">task[1].gap_1</stringProp>
+                <stringProp name="Argument.value">fa</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              </elementProp>
+              <elementProp name="task[1].gap_2" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                <stringProp name="Argument.name">task[1].gap_2</stringProp>
+                <stringProp name="Argument.value"></stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              </elementProp>
+              <elementProp name="task[1].gap_3" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                <stringProp name="Argument.name">task[1].gap_3</stringProp>
+                <stringProp name="Argument.value">af</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              </elementProp>
+              <elementProp name="task[1].gap_4" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                <stringProp name="Argument.name">task[1].gap_4</stringProp>
+                <stringProp name="Argument.value"></stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+              </elementProp>
+              <elementProp name="page" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                <stringProp name="Argument.name">page</stringProp>
+                <stringProp name="Argument.value">5</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+              </elementProp>
+              <elementProp name="save" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                <stringProp name="Argument.name">save</stringProp>
+                <stringProp name="Argument.value">Speichern</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+              </elementProp>
+            </collectionProp>
+          </elementProp>
+          <stringProp name="HTTPSampler.domain"></stringProp>
+          <stringProp name="HTTPSampler.port"></stringProp>
+          <stringProp name="HTTPSampler.protocol"></stringProp>
+          <stringProp name="HTTPSampler.contentEncoding">UTF-8</stringProp>
+          <stringProp name="HTTPSampler.path">/taskmodel-core-view/savePage.do</stringProp>
+          <stringProp name="HTTPSampler.method">POST</stringProp>
+          <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+          <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+          <stringProp name="HTTPSampler.FILE_NAME"></stringProp>
+          <stringProp name="HTTPSampler.FILE_FIELD"></stringProp>
+          <stringProp name="HTTPSampler.mimetype"></stringProp>
+          <stringProp name="HTTPSampler.monitor">false</stringProp>
+          <stringProp name="HTTPSampler.embedded_url_re"></stringProp>
+        </HTTPSampler>
+        <hashTree>
+          <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="Browser-derived headers" enabled="true">
+            <collectionProp name="HeaderManager.headers">
+              <elementProp name="Content-Type" elementType="Header">
+                <stringProp name="Header.name">Content-Type</stringProp>
+                <stringProp name="Header.value">application/x-www-form-urlencoded</stringProp>
+              </elementProp>
+              <elementProp name="Accept-Language" elementType="Header">
+                <stringProp name="Header.name">Accept-Language</stringProp>
+                <stringProp name="Header.value">de-de,de;q=0.8,en-us;q=0.5,en;q=0.3</stringProp>
+              </elementProp>
+              <elementProp name="Host" elementType="Header">
+                <stringProp name="Header.name">Host</stringProp>
+                <stringProp name="Header.value">localhost:8080</stringProp>
+              </elementProp>
+              <elementProp name="Accept" elementType="Header">
+                <stringProp name="Header.name">Accept</stringProp>
+                <stringProp name="Header.value">text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8</stringProp>
+              </elementProp>
+              <elementProp name="Keep-Alive" elementType="Header">
+                <stringProp name="Header.name">Keep-Alive</stringProp>
+                <stringProp name="Header.value">300</stringProp>
+              </elementProp>
+              <elementProp name="User-Agent" elementType="Header">
+                <stringProp name="Header.name">User-Agent</stringProp>
+                <stringProp name="Header.value">Mozilla/5.0 (Windows; U; Windows NT 5.1; de; rv:1.9.1b2) Gecko/20081201 Firefox/3.1b2</stringProp>
+              </elementProp>
+              <elementProp name="Referer" elementType="Header">
+                <stringProp name="Header.name">Referer</stringProp>
+                <stringProp name="Header.value">http://localhost:8080/taskmodel-core-view/execute.do?id=0&amp;todo=continue&amp;page=5</stringProp>
+              </elementProp>
+              <elementProp name="Accept-Encoding" elementType="Header">
+                <stringProp name="Header.name">Accept-Encoding</stringProp>
+                <stringProp name="Header.value">gzip,deflate</stringProp>
+              </elementProp>
+              <elementProp name="Accept-Charset" elementType="Header">
+                <stringProp name="Header.name">Accept-Charset</stringProp>
+                <stringProp name="Header.value">ISO-8859-1,utf-8;q=0.7,*;q=0.7</stringProp>
+              </elementProp>
+            </collectionProp>
+          </HeaderManager>
+          <hashTree/>
+        </hashTree>
+        <HTTPSampler guiclass="HttpTestSampleGui" testclass="HTTPSampler" testname="/taskmodel-core-view/execute.do" enabled="true">
+          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+            <collectionProp name="Arguments.arguments">
+              <elementProp name="id" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                <stringProp name="Argument.name">id</stringProp>
+                <stringProp name="Argument.value">0</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              </elementProp>
+              <elementProp name="todo" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                <stringProp name="Argument.name">todo</stringProp>
+                <stringProp name="Argument.value">continue</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              </elementProp>
+              <elementProp name="page" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                <stringProp name="Argument.name">page</stringProp>
+                <stringProp name="Argument.value">6</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              </elementProp>
+            </collectionProp>
+          </elementProp>
+          <stringProp name="HTTPSampler.domain"></stringProp>
+          <stringProp name="HTTPSampler.port"></stringProp>
+          <stringProp name="HTTPSampler.protocol"></stringProp>
+          <stringProp name="HTTPSampler.contentEncoding">UTF-8</stringProp>
+          <stringProp name="HTTPSampler.path">/taskmodel-core-view/execute.do</stringProp>
+          <stringProp name="HTTPSampler.method">GET</stringProp>
+          <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+          <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+          <stringProp name="HTTPSampler.FILE_NAME"></stringProp>
+          <stringProp name="HTTPSampler.FILE_FIELD"></stringProp>

@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Elateportal-devel] SF.net SVN: elateportal:[1175] trunk/examServer/src/main

From: <sdienst@us...> - 2009-12-28 20:03

Revision: 1175
          http://elateportal.svn.sourceforge.net/elateportal/?rev=1175&view=rev
Author:   sdienst
Date:     2009-12-28 20:03:22 +0000 (Mon, 28 Dec 2009)

Log Message:
-----------
[feature] export zip archive of the ExamserverRepository* directory.

Modified Paths:
--------------
    trunk/examServer/src/main/webapp/WEB-INF/pages/systemConfig.jsp
    trunk/examServer/src/main/webapp/WEB-INF/struts-config.xml

Added Paths:
-----------
    trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/action/ArchiveServerAction.java

Added: trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/action/ArchiveServerAction.java
===================================================================
--- trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/action/ArchiveServerAction.java	                        (rev 0)
+++ trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/action/ArchiveServerAction.java	2009-12-28 20:03:22 UTC (rev 1175)
@@ -0,0 +1,89 @@
+/*
+
+Copyright (C) 2009 Steffen Dienst
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+package de.thorstenberger.examServer.webapp.action;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+
+import de.thorstenberger.examServer.service.ExamServerManager;
+
+/**
+ * @author Steffen Dienst
+ * 
+ */
+public class ArchiveServerAction extends BaseAction {
+	@Override
+	public ActionForward execute(
+	    final ActionMapping mapping,
+	    final ActionForm form,
+	    final HttpServletRequest request,
+	    final HttpServletResponse response)
+	    throws Exception {
+
+		final ExamServerManager esm = (ExamServerManager) getBean("examServerManager");
+		File repositoryDirectory = esm.getRepositoryFile();
+		String zipName = repositoryDirectory.getName() + ".zip";
+
+		response.setContentType("application/zip");
+		response.setHeader("Content-Disposition", "attachment; filename=" + zipName);
+		ZipOutputStream out = new ZipOutputStream(response.getOutputStream());
+		addToZip(repositoryDirectory, out);
+
+		out.flush();
+		out.close();
+		return null;
+	}
+
+	/**
+	 * Add directory contents to a {@link ZipOutputStream} recursively.
+	 * 
+	 * @param directory
+	 * @param out
+	 * @throws IOException
+	 */
+	void addToZip(File directory, ZipOutputStream out) throws IOException {
+		File[] files = directory.listFiles();
+		byte[] buffer = new byte[20 * 1024];
+
+    for (File file : files) {
+			if (file.isDirectory()) {
+				addToZip(file, out);
+				continue;
+			}
+			FileInputStream in = new FileInputStream(file.getAbsolutePath());
+			out.putNextEntry(new ZipEntry(file.getAbsolutePath()));
+			int len;
+			while ((len = in.read(buffer)) > 0) {
+				out.write(buffer, 0, len);
+			}
+			out.closeEntry();
+			in.close();
+		}
+	}
+}


Property changes on: trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/action/ArchiveServerAction.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Modified: trunk/examServer/src/main/webapp/WEB-INF/pages/systemConfig.jsp
===================================================================
--- trunk/examServer/src/main/webapp/WEB-INF/pages/systemConfig.jsp	2009-12-28 20:01:07 UTC (rev 1174)
+++ trunk/examServer/src/main/webapp/WEB-INF/pages/systemConfig.jsp	2009-12-28 20:03:22 UTC (rev 1175)
@@ -34,4 +34,6 @@
 </table>
 <br/><br/>
 <html:submit>Speichern</html:submit>
-</html:form>
\ No newline at end of file
+</html:form>
+<br/>
+Archivieren aller Serverdaten: <html:link action="/ArchiveServer">Archiv erstellen</html:link>
\ No newline at end of file

Modified: trunk/examServer/src/main/webapp/WEB-INF/struts-config.xml
===================================================================
--- trunk/examServer/src/main/webapp/WEB-INF/struts-config.xml	2009-12-28 20:01:07 UTC (rev 1174)
+++ trunk/examServer/src/main/webapp/WEB-INF/struts-config.xml	2009-12-28 20:03:22 UTC (rev 1175)
@@ -149,6 +149,9 @@
   <action path="/BulkPdfExport" roles="tutor,admin"
    type="de.thorstenberger.examServer.webapp.action.PDFBulkExport">
   </action>
+  <action path="/ArchiveServer" roles="admin"
+   type="de.thorstenberger.examServer.webapp.action.ArchiveServerAction">
+  </action>
 
    <!-- The following action's purpose is to collect some information the students should submit on their Main Menu Page -->
   <action input="/studentMainMenu" path="/submitStudentsInfo" roles="student"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Elateportal-devel] SF.net SVN: elateportal:[1180] trunk/examServer/src/main

From: <sdienst@us...> - 2010-02-10 18:02

Revision: 1180
          http://elateportal.svn.sourceforge.net/elateportal/?rev=1180&view=rev
Author:   sdienst
Date:     2010-02-10 18:02:08 +0000 (Wed, 10 Feb 2010)

Log Message:
-----------
[feature] show task processing progress and remaining minutes per user

Modified Paths:
--------------
    trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/action/ActiveTaskUserListAction.java
    trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/vo/ActiveUserVO.java
    trunk/examServer/src/main/webapp/WEB-INF/classes/ApplicationResources_de.properties
    trunk/examServer/src/main/webapp/WEB-INF/pages/activeTaskUsers.jsp

Modified: trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/action/ActiveTaskUserListAction.java
===================================================================
--- trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/action/ActiveTaskUserListAction.java	2010-01-20 10:02:19 UTC (rev 1179)
+++ trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/action/ActiveTaskUserListAction.java	2010-02-10 18:02:08 UTC (rev 1180)
@@ -38,6 +38,10 @@
 import de.thorstenberger.taskmodel.TaskletContainer;
 import de.thorstenberger.taskmodel.Tasklet.Status;
 import de.thorstenberger.taskmodel.complex.ComplexTasklet;
+import de.thorstenberger.taskmodel.complex.complextaskhandling.Page;
+import de.thorstenberger.taskmodel.complex.complextaskhandling.SubTasklet;
+import de.thorstenberger.taskmodel.complex.complextaskhandling.Try;
+import de.thorstenberger.taskmodel.complex.complextaskhandling.Try.ProgressInformation;
 
 public class ActiveTaskUserListAction extends BaseAction {
 
@@ -66,7 +70,23 @@
         	vo.setTaskTitle(manager.getTaskDef(tasklet.getTaskId()).getTitle());
         	vo.setUsername(tasklet.getUserId() );
         	if(tasklet instanceof ComplexTasklet) {        		
-        	    vo.setTimeExtension(((ComplexTasklet) tasklet).getActiveTry().getTimeExtension()/1000/60);
+        	    ComplexTasklet ct = (ComplexTasklet) tasklet;
+				Try activeTry = ct.getActiveTry();
+				
+				// count subtasklets
+				ProgressInformation progressInformation = activeTry.getProgressInformation();
+				int numSubtasklets = progressInformation.getNumOfSubtasklets();
+				int numProcessedSubtasklets = progressInformation.getNumOfProcessedSubtasklets();
+				vo.setStatus(numProcessedSubtasklets+"/"+numSubtasklets);
+				
+				if (ct.getComplexTaskDefRoot().hasTimeRestriction()) {
+		            final long deadline = ct.getActiveTry().getStartTime() + ct.getActiveTry().getTimeExtension() + ct.getComplexTaskDefRoot().getTimeInMinutesWithoutKindnessExtensionTime() * 60 * 1000;
+		            long remainingMillis = deadline - System.currentTimeMillis();
+		            vo.setRemainingMinutes(Long.toString(remainingMillis/60000));
+		        } 					
+        	}else{
+        		vo.setRemainingMinutes("-");
+        		vo.setStatus("aktiv");
         	}
         	vos.add(vo);
 		}

Modified: trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/vo/ActiveUserVO.java
===================================================================
--- trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/vo/ActiveUserVO.java	2010-01-20 10:02:19 UTC (rev 1179)
+++ trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/vo/ActiveUserVO.java	2010-02-10 18:02:08 UTC (rev 1180)
@@ -28,6 +28,13 @@
 public class ActiveUserVO {
 	private String username;
 	private String taskTitle;
+	private String status;
+	public String getStatus() {
+		return status;
+	}
+	public void setStatus(String status) {
+		this.status = status;
+	}
 	private HashMap<String, String> loginAndTaskId;
 	
 	public String getTaskTitle() {
@@ -48,11 +55,11 @@
 	public void setTaskId(String taskId) {
   	this.taskId = taskId;
   }
-	public long getTimeExtension() {
-  	return timeExtension;
+	public String getRemainingMinutes() {
+  	return remainingMinutes;
   }
-	public void setTimeExtension(long milliseconds) {
-  	this.timeExtension = milliseconds;
+	public void setRemainingMinutes(String minutes) {
+  	this.remainingMinutes = minutes;
   }
 	public Map getLoginAndTaskId() {
 		if( loginAndTaskId == null ){
@@ -63,5 +70,5 @@
 		return loginAndTaskId;
 	}
 	private String taskId;
-	private long timeExtension;
+	private String remainingMinutes;
 }

Modified: trunk/examServer/src/main/webapp/WEB-INF/classes/ApplicationResources_de.properties
===================================================================
--- trunk/examServer/src/main/webapp/WEB-INF/classes/ApplicationResources_de.properties	2010-01-20 10:02:19 UTC (rev 1179)
+++ trunk/examServer/src/main/webapp/WEB-INF/classes/ApplicationResources_de.properties	2010-02-10 18:02:08 UTC (rev 1180)
@@ -198,10 +198,11 @@
 # -- exam taking users
 activeTaskUsers.title=Momentane Pr&uuml;flinge
 activeTaskUsers.taskttitle=Name der Pr&uuml;fung
-activeTaskUsers.timeextension=Zeitverl&auml;ngerung in min
+activeTaskUsers.status=Bearbeitungsstand
+activeTaskUsers.remainingminutes=Restzeit in min
 activeTaskUsers.message=Nachfolgend eine Liste aller angemeldeten Benutzer, die gerade eine Pr&uuml;fung bearbeiten.
 activeTaskUsers.increaseTime=Zeit verl&auml;ngern
-activeTaskUsers.increaseLink=5min
+activeTaskUsers.increaseLink=+5min
 
 # -- loginConfig
 loginConfig.title = Login-Konfiguration

Modified: trunk/examServer/src/main/webapp/WEB-INF/pages/activeTaskUsers.jsp
===================================================================
--- trunk/examServer/src/main/webapp/WEB-INF/pages/activeTaskUsers.jsp	2010-01-20 10:02:19 UTC (rev 1179)
+++ trunk/examServer/src/main/webapp/WEB-INF/pages/activeTaskUsers.jsp	2010-02-10 18:02:08 UTC (rev 1180)
@@ -16,9 +16,10 @@
 <display:table name="ActiveUsers" id="user" cellspacing="0" cellpadding="0"
     defaultsort="1" class="table" pagesize="50" requestURI="">
   
-    <display:column property="username" escapeXml="true" style="width: 30%" titleKey="userForm.username" sortable="true"/>
-    <display:column property="taskTitle" escapeXml="true" style="width: 30%" titleKey="activeTaskUsers.taskttitle" sortable="true"/>
-    <display:column property="timeExtension" escapeXml="true" style="width: 30%" titleKey="activeTaskUsers.timeextension" sortable="true"/>
+    <display:column property="username" escapeXml="true" style="width: 20%" titleKey="userForm.username" sortable="true"/>
+    <display:column property="taskTitle" escapeXml="true" style="width: 25%" titleKey="activeTaskUsers.taskttitle" sortable="true"/>
+    <display:column property="status" escapeXml="true" style="width: 20%" titleKey="activeTaskUsers.status" sortable="true"/>
+    <display:column property="remainingMinutes" escapeXml="true" style="width: 20%" titleKey="activeTaskUsers.remainingminutes" sortable="true"/>
     <display:column titleKey="activeTaskUsers.increaseTime" sortable="true">
 		<html:link action="/increaseTime" name="user" property="loginAndTaskId"><fmt:message key="activeTaskUsers.increaseLink"/></html:link>
 	</display:column>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Elateportal-devel] SF.net SVN: elateportal:[1184] trunk/examServer/src/main

From: <sdienst@us...> - 2010-02-23 09:34

Revision: 1184
          http://elateportal.svn.sourceforge.net/elateportal/?rev=1184&view=rev
Author:   sdienst
Date:     2010-02-23 09:34:40 +0000 (Tue, 23 Feb 2010)

Log Message:
-----------
[build] centralize property expression configuration for builds. Needed because multiple PropertyConfigurer beans are not allowed in spring

Modified Paths:
--------------
    trunk/examServer/src/main/java/de/thorstenberger/examServer/ws/remoteusermanager/FreeForAllAuthenticationProvider.java
    trunk/examServer/src/main/webapp/WEB-INF/applicationContext-resources.xml
    trunk/examServer/src/main/webapp/WEB-INF/security.xml

Added Paths:
-----------
    trunk/examServer/src/main/resources/authentication.properties

Modified: trunk/examServer/src/main/java/de/thorstenberger/examServer/ws/remoteusermanager/FreeForAllAuthenticationProvider.java
===================================================================
--- trunk/examServer/src/main/java/de/thorstenberger/examServer/ws/remoteusermanager/FreeForAllAuthenticationProvider.java	2010-02-15 16:04:59 UTC (rev 1183)
+++ trunk/examServer/src/main/java/de/thorstenberger/examServer/ws/remoteusermanager/FreeForAllAuthenticationProvider.java	2010-02-23 09:34:40 UTC (rev 1184)
@@ -44,139 +44,147 @@
  * 
  */
 public class FreeForAllAuthenticationProvider extends AbstractUserDetailsAuthenticationProvider implements
-        AuthenticationProvider, MessageSourceAware {
+AuthenticationProvider, MessageSourceAware {
 
-    private MessageSourceAccessor messageSourceAccessor;
-    private final ConfigManager configManager;
-    private final UserManager userManager;
-    private final RoleManager roleManager;
+  private MessageSourceAccessor messageSourceAccessor;
+  private final ConfigManager configManager;
+  private final UserManager userManager;
+  private final RoleManager roleManager;
 
-    private boolean forcePrincipalAsString = false;
+  private boolean forcePrincipalAsString = false;
+  private boolean enabled = false;
 
-    /**
-	 * 
-	 */
-    public FreeForAllAuthenticationProvider(final ConfigManager configManager, final UserManager userManager,
-            final RoleManager roleManager) {
-        this.configManager = configManager;
-        this.userManager = userManager;
-        this.roleManager = roleManager;
-    }
+  /**
+   * 
+   */
+  public FreeForAllAuthenticationProvider(final ConfigManager configManager, final UserManager userManager,
+      final RoleManager roleManager) {
+    this.configManager = configManager;
+    this.userManager = userManager;
+    this.roleManager = roleManager;
+  }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.acegisecurity.providers.dao.AbstractUserDetailsAuthenticationProvider#additionalAuthenticationChecks(org.
-     * acegisecurity.userdetails.UserDetails, org.acegisecurity.providers.UsernamePasswordAuthenticationToken)
-     */
-    @Override
-    protected void additionalAuthenticationChecks(final UserDetails arg0, final UsernamePasswordAuthenticationToken arg1) throws AuthenticationException {
+  /*
+   * (non-Javadoc)
+   * 
+   * @see
+   * org.acegisecurity.providers.dao.AbstractUserDetailsAuthenticationProvider#additionalAuthenticationChecks(org.
+   * acegisecurity.userdetails.UserDetails, org.acegisecurity.providers.UsernamePasswordAuthenticationToken)
+   */
+  @Override
+  protected void additionalAuthenticationChecks(final UserDetails arg0, final UsernamePasswordAuthenticationToken arg1) throws AuthenticationException {
+  }
+
+  /*
+   * (non-Javadoc)
+   * 
+   * @see org.acegisecurity.providers.AuthenticationProvider#authenticate(org.acegisecurity.Authentication)
+   */
+  @Override
+  public Authentication authenticate(final Authentication authentication)
+  throws AuthenticationException {
+
+    if (!enabled) {
+      return null;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.acegisecurity.providers.AuthenticationProvider#authenticate(org.acegisecurity.Authentication)
-     */
-    @Override
-    public Authentication authenticate(final Authentication authentication)
-            throws AuthenticationException {
+    Assert.isInstanceOf(UsernamePasswordAuthenticationToken.class, authentication,
+        messageSourceAccessor.getMessage("AbstractUserDetailsAuthenticationProvider.onlySupports",
+        "Only UsernamePasswordAuthenticationToken is supported"));
 
-        Assert.isInstanceOf(UsernamePasswordAuthenticationToken.class, authentication,
-                messageSourceAccessor.getMessage("AbstractUserDetailsAuthenticationProvider.onlySupports",
-                "Only UsernamePasswordAuthenticationToken is supported"));
+    if (!configManager.isStudentsLoginEnabled()) {
+      throw new AuthenticationServiceException("Login disabled for student role.");
+    }
+    User user = null;
+    try {
+      user = userManager.getUserByUsername(authentication.getName());
+      // if we know this user, make sure the password matches
+      if (!user.getPassword().equals(StringUtil.encodePassword((String) authentication.getCredentials(), "SHA"))) {
+        throw new BadCredentialsException(messages.getMessage(
+            "AbstractUserDetailsAuthenticationProvider.badCredentials", "Invalid username or password."));
+      }
+    } catch (final UsernameNotFoundException e) {
+      // doesn't matter, we'll create him in a second...
+    }
+    if (user == null) {
+      // create a new user with the entered username/password
+      user = new User();
+      user.setEnabled(true);
+      final String name = authentication.getName();
+      user.setUsername(name);
+      user.setFirstName(Character.toUpperCase(name.charAt(0)) + name.substring(1));
+      user.setLastName("Mustermann");
+      user.setPassword(StringUtil.encodePassword((String) authentication.getCredentials(), "SHA"));
+      user.addRole(roleManager.getRole("student"));
+      try {
+        userManager.saveUser(user);
+      } catch (final UserExistsException e2) {
+        // should not happen
+        throw new RuntimeException(e2);
+      }
+    }
 
-        if (!configManager.isStudentsLoginEnabled()) {
-            throw new AuthenticationServiceException("Login disabled for student role.");
-        }
-        User user = null;
-        try {
-            user = userManager.getUserByUsername(authentication.getName());
-            // if we know this user, make sure the password matches
-            if (!user.getPassword().equals(StringUtil.encodePassword((String) authentication.getCredentials(), "SHA"))) {
-                throw new BadCredentialsException(messages.getMessage(
-                        "AbstractUserDetailsAuthenticationProvider.badCredentials", "Invalid username or password."));
-            }
-        } catch (final UsernameNotFoundException e) {
-            // doesn't matter, we'll create him in a second...
-        }
-        if (user == null) {
-            // create a new user with the entered username/password
-            user = new User();
-            user.setEnabled(true);
-            final String name = authentication.getName();
-            user.setUsername(name);
-            user.setFirstName(Character.toUpperCase(name.charAt(0)) + name.substring(1));
-            user.setLastName("Mustermann");
-            user.setPassword(StringUtil.encodePassword((String) authentication.getCredentials(), "SHA"));
-            user.addRole(roleManager.getRole("student"));
-            try {
-                userManager.saveUser(user);
-            } catch (final UserExistsException e2) {
-                // should not happen
-                throw new RuntimeException(e2);
-            }
-        }
+    final UserDetails userDetails = userManager.getUserByUsername(user.getUsername());
 
-        final UserDetails userDetails = userManager.getUserByUsername(user.getUsername());
+    Object principalToReturn = userDetails;
 
-        Object principalToReturn = userDetails;
+    if (forcePrincipalAsString) {
+      principalToReturn = userDetails.getUsername();
+    }
 
-        if (forcePrincipalAsString) {
-            principalToReturn = userDetails.getUsername();
-        }
+    return createSuccessAuthentication(principalToReturn, authentication, userDetails);
 
-        return createSuccessAuthentication(principalToReturn, authentication, userDetails);
+  }
 
-    }
+  public void setEnabled(final boolean value) {
+    this.enabled = value;
+  }
+  /**
+   * @return Returns the forcePrincipalAsString.
+   */
+  @Override
+  public boolean isForcePrincipalAsString() {
+    return forcePrincipalAsString;
+  }
 
-    /**
-     * @return Returns the forcePrincipalAsString.
-     */
-    @Override
-    public boolean isForcePrincipalAsString() {
-        return forcePrincipalAsString;
-    }
+  /*
+   * (non-Javadoc)
+   * 
+   * @see org.acegisecurity.providers.dao.AbstractUserDetailsAuthenticationProvider#retrieveUser(java.lang.String,
+   * org.acegisecurity.providers.UsernamePasswordAuthenticationToken)
+   */
+  @Override
+  protected UserDetails retrieveUser(final String arg0, final UsernamePasswordAuthenticationToken arg1) throws AuthenticationException {
+    return null;
+  }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.acegisecurity.providers.dao.AbstractUserDetailsAuthenticationProvider#retrieveUser(java.lang.String,
-     * org.acegisecurity.providers.UsernamePasswordAuthenticationToken)
-     */
-    @Override
-    protected UserDetails retrieveUser(final String arg0, final UsernamePasswordAuthenticationToken arg1) throws AuthenticationException {
-        return null;
-    }
+  /**
+   * @param forcePrincipalAsString
+   *            The forcePrincipalAsString to set.
+   */
+  @Override
+  public void setForcePrincipalAsString(final boolean forcePrincipalAsString) {
+    this.forcePrincipalAsString = forcePrincipalAsString;
+  }
 
-    /**
-     * @param forcePrincipalAsString
-     *            The forcePrincipalAsString to set.
-     */
-    @Override
-    public void setForcePrincipalAsString(final boolean forcePrincipalAsString) {
-        this.forcePrincipalAsString = forcePrincipalAsString;
-    }
+  /*
+   * (non-Javadoc)
+   * 
+   * @see org.springframework.context.MessageSourceAware#setMessageSource(org.springframework.context.MessageSource)
+   */
+  @Override
+  public void setMessageSource(final MessageSource messageSource) {
+    this.messageSourceAccessor = new MessageSourceAccessor(messageSource);
+  }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.springframework.context.MessageSourceAware#setMessageSource(org.springframework.context.MessageSource)
-     */
-    @Override
-    public void setMessageSource(final MessageSource messageSource) {
-        this.messageSourceAccessor = new MessageSourceAccessor(messageSource);
-    }
+  /*
+   * (non-Javadoc)
+   * 
+   * @see org.acegisecurity.providers.AuthenticationProvider#supports(java.lang.Class)
+   */
+  @Override
+  public boolean supports(final Class authentication) {
+    return (UsernamePasswordAuthenticationToken.class.isAssignableFrom(authentication));
+  }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.acegisecurity.providers.AuthenticationProvider#supports(java.lang.Class)
-     */
-    @Override
-    public boolean supports(final Class authentication) {
-        return (UsernamePasswordAuthenticationToken.class.isAssignableFrom(authentication));
-    }
-
 }

Added: trunk/examServer/src/main/resources/authentication.properties
===================================================================
--- trunk/examServer/src/main/resources/authentication.properties	                        (rev 0)
+++ trunk/examServer/src/main/resources/authentication.properties	2010-02-23 09:34:40 UTC (rev 1184)
@@ -0,0 +1 @@
+additionalprovider=${springbean.additionalprovider}
\ No newline at end of file


Property changes on: trunk/examServer/src/main/resources/authentication.properties
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Modified: trunk/examServer/src/main/webapp/WEB-INF/applicationContext-resources.xml
===================================================================
--- trunk/examServer/src/main/webapp/WEB-INF/applicationContext-resources.xml	2010-02-15 16:04:59 UTC (rev 1183)
+++ trunk/examServer/src/main/webapp/WEB-INF/applicationContext-resources.xml	2010-02-23 09:34:40 UTC (rev 1184)
@@ -8,6 +8,7 @@
         <property name="locations">
             <list>
                 <value>classpath:mail.properties</value>
+                <value>classpath:authentication.properties</value>
             </list>
         </property>
     </bean>

Modified: trunk/examServer/src/main/webapp/WEB-INF/security.xml
===================================================================
--- trunk/examServer/src/main/webapp/WEB-INF/security.xml	2010-02-15 16:04:59 UTC (rev 1183)
+++ trunk/examServer/src/main/webapp/WEB-INF/security.xml	2010-02-23 09:34:40 UTC (rev 1184)
@@ -2,9 +2,12 @@
 <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN"
     "http://www.springframework.org/dtd/spring-beans.dtd">
 
-<beans>
+<beans><!--
 
-    <!-- ======================== FILTER CHAIN ======================= -->
+  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+    <property name="location" value="classpath:authentication.properties"/>
+  </bean>
+    --><!-- ======================== FILTER CHAIN ======================= -->
     <bean id="filterChainProxy" class="org.acegisecurity.util.FilterChainProxy">
         <property name="filterInvocationDefinitionSource">
             <value>
@@ -102,21 +105,19 @@
                 <ref local="daoAuthenticationProvider"/>
                 <ref local="httpauthAuthenticationProvider"/>
 	            <ref local="wsAuthenticationProvider"/>
-                <ref local="${springbean.additionalprovider}"/>
+                <ref local="freeForAllAuthenticationProvider"/>
                 <!--ref local="anonymousAuthenticationProvider"/-->
                 <!--ref local="rememberMeAuthenticationProvider"/-->
             </list>
         </property>
     </bean>
     
-    <bean id="donothingAuthenticationProvider" class="de.thorstenberger.examServer.ws.remoteusermanager.DoNothingAuthenticationProvider">
-    <description>Disallow any authentication. Effectively do nothing.</description>
-    </bean>
     <bean id="freeForAllAuthenticationProvider" class="de.thorstenberger.examServer.ws.remoteusermanager.FreeForAllAuthenticationProvider">
         <description>Allow all logins as students, create a new user if the username was unknown.</description>
     	<constructor-arg ref="configManager"></constructor-arg>
     	<constructor-arg ref="userManager"></constructor-arg>
     	<constructor-arg ref="roleManager"></constructor-arg>
+      <property name="enabled" value="${additionalprovider}"/>
     </bean>
     
     <bean id="wsAuthenticationProvider" class="de.thorstenberger.examServer.ws.remoteusermanager.WSAuthenticationProvider">


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Elateportal-devel] SF.net SVN: elateportal:[1185] trunk/examServer/src/main

From: <sdienst@us...> - 2010-02-23 09:37

Revision: 1185
          http://elateportal.svn.sourceforge.net/elateportal/?rev=1185&view=rev
Author:   sdienst
Date:     2010-02-23 09:37:33 +0000 (Tue, 23 Feb 2010)

Log Message:
-----------
[internal] removed static paths, use classloader resources instead

Modified Paths:
--------------
    trunk/examServer/src/main/java/de/thorstenberger/examServer/service/impl/ExamServerManagerImpl.java
    trunk/examServer/src/main/webapp/WEB-INF/examServer.tld
    trunk/examServer/src/main/webapp/WEB-INF/pages/menu.jsp
    trunk/examServer/src/main/webapp/decorators/default.jsp

Modified: trunk/examServer/src/main/java/de/thorstenberger/examServer/service/impl/ExamServerManagerImpl.java
===================================================================
--- trunk/examServer/src/main/java/de/thorstenberger/examServer/service/impl/ExamServerManagerImpl.java	2010-02-23 09:34:40 UTC (rev 1184)
+++ trunk/examServer/src/main/java/de/thorstenberger/examServer/service/impl/ExamServerManagerImpl.java	2010-02-23 09:37:33 UTC (rev 1185)
@@ -25,6 +25,7 @@
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.net.URISyntaxException;
 import java.util.Properties;
 
 import javax.servlet.ServletContext;
@@ -43,137 +44,142 @@
  */
 public class ExamServerManagerImpl implements ExamServerManager, ApplicationContextAware {
 
-    static final String HOME = "home";
-    static final String TASKDEFS = "taskdefs";
-    static final String SYSTEM = "system";
+  static final String HOME = "home";
+  static final String TASKDEFS = "taskdefs";
+  static final String SYSTEM = "system";
 
-    private ApplicationContext ac;
-    private File repositoryFile;
+  private ApplicationContext ac;
+  private File repositoryFile;
 
-    /**
-	 * 
-	 */
-    public ExamServerManagerImpl() {
-        super();
-        // TODO Auto-generated constructor stub
-    }
+  /**
+   * 
+   */
+  public ExamServerManagerImpl() {
+    super();
+    // TODO Auto-generated constructor stub
+  }
 
-    private void configLogging(final File log4JConfigFile) {
+  private void configLogging(final File log4JConfigFile) {
 
-        final Properties p = new Properties();
-        try {
-            p.load(new FileInputStream(log4JConfigFile));
-        } catch (final FileNotFoundException e) {
-            throw new RuntimeException(e);
-        } catch (final IOException e) {
-            throw new RuntimeException(e);
-        }
-        p.setProperty("examServer.repository.path", repositoryFile.getAbsolutePath());
-        PropertyConfigurator.configure(p);
-
+    final Properties p = new Properties();
+    try {
+      p.load(new FileInputStream(log4JConfigFile));
+    } catch (final FileNotFoundException e) {
+      throw new RuntimeException(e);
+    } catch (final IOException e) {
+      throw new RuntimeException(e);
     }
+    p.setProperty("examServer.repository.path", repositoryFile.getAbsolutePath());
+    PropertyConfigurator.configure(p);
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see de.thorstenberger.examServer.service.ExamServerManager#getHomeDir()
-     */
-    public File getHomeDir() {
-        return new File(repositoryFile, HOME);
-    }
+  }
 
-    /**
-     * @return Returns the repositoryFile.
-     */
-    public File getRepositoryFile() {
-        return repositoryFile;
-    }
+  /*
+   * (non-Javadoc)
+   * 
+   * @see de.thorstenberger.examServer.service.ExamServerManager#getHomeDir()
+   */
+  public File getHomeDir() {
+    return new File(repositoryFile, HOME);
+  }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see de.thorstenberger.examServer.service.ExamServerManager#getSystemDir()
-     */
-    public File getSystemDir() {
-        return new File(repositoryFile, SYSTEM);
-    }
+  /**
+   * @return Returns the repositoryFile.
+   */
+  public File getRepositoryFile() {
+    return repositoryFile;
+  }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see de.thorstenberger.examServer.service.ExamServerManager#getTaskDefDir()
-     */
-    public File getTaskDefDir() {
-        return new File(repositoryFile, TASKDEFS);
-    }
+  /*
+   * (non-Javadoc)
+   * 
+   * @see de.thorstenberger.examServer.service.ExamServerManager#getSystemDir()
+   */
+  public File getSystemDir() {
+    return new File(repositoryFile, SYSTEM);
+  }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see de.thorstenberger.examServer.service.ExamServerManager#init()
-     */
-    public void init() {
+  /*
+   * (non-Javadoc)
+   * 
+   * @see de.thorstenberger.examServer.service.ExamServerManager#getTaskDefDir()
+   */
+  public File getTaskDefDir() {
+    return new File(repositoryFile, TASKDEFS);
+  }
 
-        String contextName = null;
-        ServletContext sc = null;
+  /*
+   * (non-Javadoc)
+   * 
+   * @see de.thorstenberger.examServer.service.ExamServerManager#init()
+   */
+  public void init() {
 
-        if (ac instanceof WebApplicationContext) {
-            sc = ((WebApplicationContext) ac).getServletContext();
-            final String path = sc.getRealPath("");
-            int pos = path.lastIndexOf('\\');
-            if (pos != -1) {
-                contextName = path.substring(pos + 1, path.length());
-            } else {
-                pos = path.lastIndexOf('/');
-                if (pos != -1) {
-                    contextName = path.substring(pos + 1, path.length());
-                }
-            }
-        }
+    String contextName = null;
+    ServletContext sc = null;
 
-        final String repositoryPath = System.getProperty("user.home") + File.separatorChar +
-                "ExamServerRepository" + (contextName != null ? "_" + contextName : "");
-
-        repositoryFile = new File(repositoryPath);
-
-        // create if not exists
-        if (!repositoryFile.exists()) {
-            repositoryFile.mkdirs();
+    if (ac instanceof WebApplicationContext) {
+      sc = ((WebApplicationContext) ac).getServletContext();
+      final String path = sc.getRealPath("");
+      int pos = path.lastIndexOf('\\');
+      if (pos != -1) {
+        contextName = path.substring(pos + 1, path.length());
+      } else {
+        pos = path.lastIndexOf('/');
+        if (pos != -1) {
+          contextName = path.substring(pos + 1, path.length());
         }
+      }
+    }
 
-        // system dir
-        final File system = new File(repositoryPath + File.separatorChar + SYSTEM);
-        if (!system.exists()) {
-            system.mkdirs();
-        }
+    final String repositoryPath = System.getProperty("user.home") + File.separatorChar +
+    "ExamServerRepository" + (contextName != null ? "_" + contextName : "");
 
-        // homes dir
-        final File home = new File(repositoryPath + File.separatorChar + HOME);
-        if (!home.exists()) {
-            home.mkdirs();
-        }
+    repositoryFile = new File(repositoryPath);
 
-        // taskDefs dir
-        final File taskDefs = new File(repositoryPath + File.separatorChar + TASKDEFS);
-        if (!taskDefs.exists()) {
-            taskDefs.mkdirs();
-        }
+    // create if not exists
+    if (!repositoryFile.exists()) {
+      repositoryFile.mkdirs();
+    }
 
-        if (sc != null) {
-            final File log4j = new File(sc.getRealPath("/WEB-INF/classes/log4j.properties"));
-            configLogging(log4j);
-        }
+    // system dir
+    final File system = new File(repositoryPath + File.separatorChar + SYSTEM);
+    if (!system.exists()) {
+      system.mkdirs();
+    }
 
+    // homes dir
+    final File home = new File(repositoryPath + File.separatorChar + HOME);
+    if (!home.exists()) {
+      home.mkdirs();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @seeorg.springframework.context.ApplicationContextAware#setApplicationContext(org.springframework.context.
-     * ApplicationContext)
-     */
-    public void setApplicationContext(final ApplicationContext ac) throws BeansException {
-        this.ac = ac;
+    // taskDefs dir
+    final File taskDefs = new File(repositoryPath + File.separatorChar + TASKDEFS);
+    if (!taskDefs.exists()) {
+      taskDefs.mkdirs();
     }
 
+    if (sc != null) {
+      File log4j;
+      try {
+        log4j = new File(this.getClass().getClassLoader().getResource("log4j.properties").toURI());
+        configLogging(log4j);
+      } catch (final URISyntaxException e) {
+        throw new RuntimeException(e);
+      }
+    }
+
+  }
+
+  /*
+   * (non-Javadoc)
+   * 
+   * @seeorg.springframework.context.ApplicationContextAware#setApplicationContext(org.springframework.context.
+   * ApplicationContext)
+   */
+  public void setApplicationContext(final ApplicationContext ac) throws BeansException {
+    this.ac = ac;
+  }
+
 }

Modified: trunk/examServer/src/main/webapp/WEB-INF/examServer.tld
===================================================================
--- trunk/examServer/src/main/webapp/WEB-INF/examServer.tld	2010-02-23 09:34:40 UTC (rev 1184)
+++ trunk/examServer/src/main/webapp/WEB-INF/examServer.tld	2010-02-23 09:37:33 UTC (rev 1185)
@@ -9,13 +9,6 @@
 
    <description><![CDATA[Custom tag library for this application]]></description>
 
-   <listener>
-      <listener-class>de.thorstenberger.examServer.webapp.listener.StartupListener</listener-class>
-   </listener>
-   <listener>
-      <listener-class>de.thorstenberger.examServer.webapp.listener.UserCounterListener</listener-class>
-   </listener>
-
    <tag>
 
       <name>country</name>

Modified: trunk/examServer/src/main/webapp/WEB-INF/pages/menu.jsp
===================================================================
--- trunk/examServer/src/main/webapp/WEB-INF/pages/menu.jsp	2010-02-23 09:34:40 UTC (rev 1184)
+++ trunk/examServer/src/main/webapp/WEB-INF/pages/menu.jsp	2010-02-23 09:37:33 UTC (rev 1185)
@@ -1,6 +1,6 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<menu:useMenuDisplayer name="Velocity" config="WEB-INF/classes/cssHorizontalMenu.vm" permissions="rolesAdapter">
+<menu:useMenuDisplayer name="Velocity" config="cssHorizontalMenu.vm" permissions="rolesAdapter">
 <ul id="primary-nav" class="menuList">
     <li class="pad">&nbsp;</li>
     <c:if test="${empty pageContext.request.remoteUser}"><li><a href="<c:url value="/login.jsp"/>" class="current"><fmt:message key="login.title"/></a></li></c:if>

Modified: trunk/examServer/src/main/webapp/decorators/default.jsp
===================================================================
--- trunk/examServer/src/main/webapp/decorators/default.jsp	2010-02-23 09:34:40 UTC (rev 1184)
+++ trunk/examServer/src/main/webapp/decorators/default.jsp	2010-02-23 09:37:33 UTC (rev 1185)
@@ -29,7 +29,7 @@
             <c:set var="currentMenu" scope="request"><decorator:getProperty property="meta.menu"/></c:set>
             <c:if test="${currentMenu == 'AdminMenu'}">
             <div id="sub">
-                <menu:useMenuDisplayer name="Velocity" config="WEB-INF/classes/cssVerticalMenu.vm" permissions="rolesAdapter">
+                <menu:useMenuDisplayer name="Velocity" config="cssVerticalMenu.vm" permissions="rolesAdapter">
                     <menu:displayMenu name="AdminMenu"/>
                 </menu:useMenuDisplayer>
             </div>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Elateportal-devel] SF.net SVN: elateportal:[1219] trunk/examServer/src/main

From: <sdienst@us...> - 2010-03-09 14:10

Revision: 1219
          http://elateportal.svn.sourceforge.net/elateportal/?rev=1219&view=rev
Author:   sdienst
Date:     2010-03-09 14:09:58 +0000 (Tue, 09 Mar 2010)

Log Message:
-----------
[internal] Remove 'signup' as well as 'upload files' features. The aren't needed in our usage scenario, they are more of a security risk.

Modified Paths:
--------------
    trunk/examServer/src/main/webapp/WEB-INF/struts-config.xml

Removed Paths:
-------------
    trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/action/SignupAction.java
    trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/action/UploadAction.java
    trunk/examServer/src/main/webapp/WEB-INF/pages/signup.jsp
    trunk/examServer/src/main/webapp/WEB-INF/pages/uploadDisplay.jsp
    trunk/examServer/src/main/webapp/WEB-INF/pages/uploadForm.jsp

Deleted: trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/action/SignupAction.java
===================================================================
--- trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/action/SignupAction.java	2010-03-09 12:39:35 UTC (rev 1218)
+++ trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/action/SignupAction.java	2010-03-09 14:09:58 UTC (rev 1219)
@@ -1,149 +0,0 @@
-package de.thorstenberger.examServer.webapp.action;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.acegisecurity.Authentication;
-import org.acegisecurity.context.SecurityContextHolder;
-import org.acegisecurity.providers.ProviderManager;
-import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
-
-import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionForward;
-import org.apache.struts.action.ActionMapping;
-import org.apache.struts.action.ActionMessage;
-import org.apache.struts.action.ActionMessages;
-import org.apache.struts.util.MessageResources;
-import de.thorstenberger.examServer.Constants;
-import de.thorstenberger.examServer.model.User;
-import de.thorstenberger.examServer.service.MailEngine;
-import de.thorstenberger.examServer.service.RoleManager;
-import de.thorstenberger.examServer.service.UserExistsException;
-import de.thorstenberger.examServer.service.UserManager;
-import de.thorstenberger.examServer.util.StringUtil;
-import de.thorstenberger.examServer.webapp.form.UserForm;
-import de.thorstenberger.examServer.webapp.util.RequestUtil;
-import org.springframework.beans.factory.NoSuchBeanDefinitionException;
-import org.springframework.mail.SimpleMailMessage;
-
-/**
- * Action class to allow users to self-register.
- *
- * <p/>
- * <a href="SignupAction.java.html"><i>View Source</i></a>
- * </p>
- *
- * @author <a href="mailto:matt@... Raible</a>
- * 
- * @struts.action name="userForm" path="/signup" scope="request"
- *  validate="false" input="failure"
- * 
- * @struts.action-forward name="failure" path="/WEB-INF/pages/signup.jsp"
- * @struts.action-forward name="success" path="/mainMenu.html" redirect="true"
- */
-public final class SignupAction extends BaseAction {
-    
-    public ActionForward execute(ActionMapping mapping, ActionForm form,
-                                 HttpServletRequest request,
-                                 HttpServletResponse response)
-    throws Exception {
-        
-        // if it's an HTTP GET, simply forward to jsp
-        if (request.getMethod().equals("GET")) {
-            return mapping.findForward("failure");
-        // user clicked cancel button
-        } else if (isCancelled(request)) {
-            return new ActionForward("/");
-        // run validation
-        } else {
-            // run validation rules on this form
-            ActionMessages errors = form.validate(mapping, request);
-            if (!errors.isEmpty()) {
-                saveErrors(request, errors);
-                return mapping.findForward("failure");
-            }
-        }
-
-        if (log.isDebugEnabled()) {
-            log.debug("registering user...");
-        }
-
-        ActionMessages errors = new ActionMessages();
-        UserForm userForm = (UserForm) form;
-        User user = (User) convert(form);
-
-        // Set the default user role on this new user
-        RoleManager roleMgr = (RoleManager) getBean("roleManager");
-        user.addRole(roleMgr.getRole(Constants.USER_ROLE));
-
-        try {
-            Boolean encrypt = (Boolean) getConfiguration().get(Constants.ENCRYPT_PASSWORD);
-            
-            if (encrypt != null && encrypt.booleanValue()) {
-                String algorithm = (String) getConfiguration().get(Constants.ENC_ALGORITHM);
-                if (algorithm == null) { // should only happen for test case
-                    log.debug("assuming testcase, setting algorigthm to 'SHA'");
-                    algorithm = "SHA";
-                }
-
-                user.setPassword(StringUtil.encodePassword(user.getPassword(), algorithm));
-            }
-            
-            user.setEnabled(true);
-            UserManager mgr = (UserManager) getBean("userManager");
-            mgr.saveUser(user);
-        } catch (UserExistsException e) {
-            log.warn(e.getMessage());
-            errors.add(ActionMessages.GLOBAL_MESSAGE,
-                    new ActionMessage("errors.existing.user",
-                            userForm.getUsername(),
-                            userForm.getEmail()));
-            saveErrors(request, errors);
-            return mapping.getInputForward();
-        }
-
-        ActionMessages messages = new ActionMessages();
-        MessageResources resources = getResources(request);
-
-        messages.add(ActionMessages.GLOBAL_MESSAGE,
-                new ActionMessage("user.registered", userForm.getUsername()));
-
-        saveMessages(request.getSession(), messages);
-        request.getSession().setAttribute(Constants.REGISTERED, Boolean.TRUE);
-
-        // log user in automatically
-        Authentication auth = new UsernamePasswordAuthenticationToken(user.getUsername(), user.getConfirmPassword());
-        try {
-            ProviderManager authenticationManager = (ProviderManager) getBean("authenticationManager");
-            SecurityContextHolder.getContext().setAuthentication(authenticationManager.doAuthentication(auth));
-        } catch (NoSuchBeanDefinitionException n) {
-            // ignore, should only happen when testing
-        }
-
-        // Send user an e-mail
-        if (log.isDebugEnabled()) {
-            log.debug("Sending user '" + userForm.getUsername()
-                    + "' an account information e-mail");
-        }
-
-        SimpleMailMessage message = (SimpleMailMessage) getBean("mailMessage");
-        message.setTo(user.getFullName() + "<" + user.getEmail() + ">");
-        
-        StringBuffer msg = new StringBuffer();
-        msg.append(resources.getMessage("signup.email.message"));
-        msg.append("\n\n" + resources.getMessage("userForm.username"));
-        msg.append(": " + userForm.getUsername() + "\n");
-        msg.append(resources.getMessage("userForm.password") + ": ");
-        msg.append(userForm.getPassword());
-        msg.append("\n\nLogin at: " + RequestUtil.getAppURL(request));
-        message.setText(msg.toString());
-        
-        message.setSubject(resources.getMessage("signup.email.subject"));
-        
-        MailEngine engine = (MailEngine) getBean("mailEngine");
-        engine.send(message);
-
-        return mapping.findForward("success");
-    }
-
-}

Deleted: trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/action/UploadAction.java
===================================================================
--- trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/action/UploadAction.java	2010-03-09 12:39:35 UTC (rev 1218)
+++ trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/action/UploadAction.java	2010-03-09 14:09:58 UTC (rev 1219)
@@ -1,128 +0,0 @@
-package de.thorstenberger.examServer.webapp.action;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.struts.action.Action;
-import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionForward;
-import org.apache.struts.action.ActionMapping;
-import org.apache.struts.upload.FormFile;
-import de.thorstenberger.examServer.Constants;
-import de.thorstenberger.examServer.webapp.form.UploadForm;
-
-
-/**
- * This class handles the uploading of a resume (or any file) and writing it to
- * the filesystem.  Eventually, it will also add support for persisting the
- * files information into the database.
- *
- * <p>
- * <a href="UploadAction.java.html"><i>View Source</i></a>
- * </p>
- *
- * @author <a href="mailto:matt@... Raible</a>
- * 
- * @struts.action name="uploadForm" path="/uploadFile" scope="request" validate="true" input="failure"
- * @struts.action-set-property property="cancellable" value="true"
- * @struts.action-forward name="failure" path="/WEB-INF/pages/uploadForm.jsp"
- * @struts.action-forward name="success" path="/WEB-INF/pages/uploadDisplay.jsp"
- */
-public class UploadAction extends Action {
-    public ActionForward execute(ActionMapping mapping, ActionForm form,
-                                 HttpServletRequest request,
-                                 HttpServletResponse response)
-      throws Exception {
-        // Did the user click the cancel button?
-        if (isCancelled(request)) {    
-            request.removeAttribute(mapping.getAttribute());
-            return (mapping.findForward("mainMenu"));
-        }
-
-        //this line is here for when the input page is upload-utf8.jsp,
-        //it sets the correct character encoding for the response
-        String encoding = request.getCharacterEncoding();
-
-        if ((encoding != null) && (encoding.equalsIgnoreCase("utf-8"))) {
-            response.setContentType("text/html; charset=utf-8");
-        }
-
-        UploadForm theForm = (UploadForm) form;
-
-        //retrieve the name
-        String name = theForm.getName();
-
-        //retrieve the file representation
-        FormFile file = theForm.getFile();
-
-        if (file == null) {
-            return mapping.findForward("failure");
-        }
-
-        //retrieve the file name
-        String fileName = file.getFileName();
-
-        //retrieve the content type
-        String contentType = file.getContentType();
-
-        //retrieve the file size
-        String size = (file.getFileSize() + " bytes");
-
-        String data = null;
-        String filePath = null;
-
-        // the directory to upload to
-        String uploadDir =
-            servlet.getServletContext().getRealPath("/resources") + "/"
-            + request.getRemoteUser() + "/";
-
-        //write the file to the file specified
-        File dirPath = new File(uploadDir);
-
-        if (!dirPath.exists()) {
-            dirPath.mkdirs();
-        }
-
-        //retrieve the file data
-        InputStream stream = file.getInputStream();
-
-        //write the file to the file specified
-        OutputStream bos = new FileOutputStream(uploadDir + fileName);
-        int bytesRead = 0;
-        byte[] buffer = new byte[8192];
-
-        while ((bytesRead = stream.read(buffer, 0, 8192)) != -1) {
-            bos.write(buffer, 0, bytesRead);
-        }
-
-        bos.close();
-
-        filePath = dirPath.getAbsolutePath() + Constants.FILE_SEP + file.getFileName(); 
-
-        //close the stream
-        stream.close();
-
-        // place the data into the request for retrieval on next page
-        request.setAttribute("friendlyName", name);
-        request.setAttribute("fileName", fileName);
-        request.setAttribute("contentType", contentType);
-        request.setAttribute("size", size);
-        request.setAttribute("data", data);
-        request.setAttribute("filePath", filePath);
-
-        String url = request.getContextPath() + "/resources" + "/" +
-            request.getRemoteUser() + "/" + file.getFileName();
-        request.setAttribute("url", url); 
-        
-        //destroy the temporary file created
-        file.destroy();
-
-        //return a forward to display.jsp
-        return mapping.findForward("success");
-    }
-}

Deleted: trunk/examServer/src/main/webapp/WEB-INF/pages/signup.jsp
===================================================================
--- trunk/examServer/src/main/webapp/WEB-INF/pages/signup.jsp	2010-03-09 12:39:35 UTC (rev 1218)
+++ trunk/examServer/src/main/webapp/WEB-INF/pages/signup.jsp	2010-03-09 14:09:58 UTC (rev 1219)
@@ -1,123 +0,0 @@
-<%@ include file="/common/taglibs.jsp"%>
-
-<title><fmt:message key="signup.title"/></title>
-<content tag="heading"><fmt:message key="signup.heading"/></content>
-<body id="signup"/>
-
-<html:form action="/signup" styleId="userForm" onsubmit="return validateUserForm(this)">
-<ul>
-    <li class="info">
-       <fmt:message key="signup.message"/>
-    </li>
-    <li>
-        <examServer:label styleClass="desc" key="userForm.username"/>
-        <html:errors property="username"/>
-        <html:text styleClass="text large" property="username" styleId="username"/>
-    </li>
-    <li>
-        <div>
-            <div class="left">
-                <examServer:label styleClass="desc" key="userForm.password"/>
-                <html:errors property="password"/>
-                <html:password styleClass="text medium" property="password" styleId="password" redisplay="true"/>
-            </div>
-            <div>
-                <examServer:label styleClass="desc" key="userForm.confirmPassword"/>
-                <html:errors property="confirmPassword"/>
-                <html:password styleClass="text medium" property="confirmPassword" styleId="confirmPassword" redisplay="true"/>
-            </div>
-        </div>
-    </li>
-    <li>
-        <examServer:label styleClass="desc" key="userForm.passwordHint"/>
-        <html:errors property="passwordHint"/>
-        <html:text styleClass="text large" property="passwordHint" styleId="passwordHint"/>
-    </li>
-    <li>
-        <div>
-            <div class="left">
-                <examServer:label styleClass="desc" key="userForm.firstName"/>
-                <html:errors property="firstName"/>
-                <html:text styleClass="text medium" property="firstName" styleId="firstName" maxlength="50"/>
-            </div>
-            <div>
-                <examServer:label styleClass="desc" key="userForm.lastName"/>
-                <html:errors property="lastName"/>
-                <html:text styleClass="text medium" property="lastName" styleId="lastName" maxlength="50"/>
-            </div>
-        </div>
-    </li>
-    <li>
-        <div>
-            <div class="left">
-                <examServer:label styleClass="desc" key="userForm.email"/>
-                <html:errors property="email"/>
-                <html:text styleClass="text medium" property="email" styleId="email"/>
-            </div>
-            <div>
-                <examServer:label styleClass="desc" key="userForm.phoneNumber"/>
-                <html:errors property="phoneNumber"/>
-                <html:text styleClass="text medium" property="phoneNumber" styleId="phoneNumber"/>
-            </div>
-        </div>
-    </li>
-    <li>
-        <examServer:label styleClass="desc" key="userForm.website"/>
-        <html:errors property="website"/>
-        <html:text styleClass="text large" property="website" styleId="website"/>
-    </li>
-    <li>
-        <label class="desc"><fmt:message key="userForm.addressForm.address"/></label>
-        <div class="group">
-            <div>
-                <html:text styleClass="text large" property="addressForm.address"
-                    styleId="addressForm.address"/>
-                <html:errors property="addressForm.address"/>
-                <p><examServer:label key="userForm.addressForm.address"/></p>
-            </div>
-            <div class="left">
-                <html:text styleClass="text medium" property="addressForm.city"
-                    styleId="addressForm.city"/>
-                <html:errors property="addressForm.city"/>
-                <p><examServer:label key="userForm.addressForm.city"/></p>
-            </div>
-            <div>
-                <html:text styleClass="text state" property="addressForm.province"
-                    styleId="addressForm.province" size="2"/>
-                <html:errors property="addressForm.province"/>
-                <p><examServer:label key="userForm.addressForm.province"/></p>
-            </div>
-            <div class="left">
-                <html:text styleClass="text zip" property="addressForm.postalCode"
-                    styleId="addressForm.postalCode"/>
-                <html:errors property="addressForm.postalCode"/>
-                <p><examServer:label key="userForm.addressForm.postalCode"/></p>
-            </div>
-            <div>
-                <examServer:country name="countries" toScope="page"/>
-                <html:select property="addressForm.country" styleClass="select">
-                    <html:option value=""/>
-                    <html:options collection="countries" property="value" labelProperty="label"/>
-                </html:select>
-                <html:errors property="addressForm.country"/>
-                <p><examServer:label key="userForm.addressForm.country"/></p>
-            </div>
-        </div>
-    </li>
-    <li class="buttonBar bottom">
-        <html:submit styleClass="button" onclick="bCancel=false">
-            <fmt:message key="button.register"/>
-        </html:submit>
-
-        <html:cancel styleClass="button" onclick="bCancel=true">
-            <fmt:message key="button.cancel"/>
-        </html:cancel>
-    </li>
-</ul>
-</html:form>
-
-<script type="text/javascript">
-    Form.focusFirstElement($('userForm'));
-</script>
-<html:javascript formName="userForm" cdata="false" dynamicJavascript="true" staticJavascript="false"/>
-<script type="text/javascript" src="<c:url value="/scripts/validator.jsp"/>"></script>

Deleted: trunk/examServer/src/main/webapp/WEB-INF/pages/uploadDisplay.jsp
===================================================================
--- trunk/examServer/src/main/webapp/WEB-INF/pages/uploadDisplay.jsp	2010-03-09 12:39:35 UTC (rev 1218)
+++ trunk/examServer/src/main/webapp/WEB-INF/pages/uploadDisplay.jsp	2010-03-09 14:09:58 UTC (rev 1219)
@@ -1,44 +0,0 @@
-<%@ include file="/common/taglibs.jsp"%>
-
-<title><fmt:message key="display.title"/></title>
-<content tag="heading"><fmt:message key="display.heading"/></content>
-<meta name="menu" content="FileUpload"/>
-
-<p>Below is a list of attributes that were gathered in UploadAction.java.</p>
-
-<div class="separator"></div>
-
-<table class="detail" cellpadding="5">
-    <tr>
-        <th>Friendly Name:</th>
-        <td><c:out value="${friendlyName}"/></td>
-    </tr>
-    <tr>
-        <th>Filename:</th>
-        <td><c:out value="${fileName}"/></td>
-    </tr>
-    <tr>
-        <th>File content type:</th>
-        <td><c:out value="${contentType}"/></td>
-    </tr>
-    <tr>
-        <th>File size:</th>
-        <td><c:out value="${size}"/></td>
-    </tr>
-    <tr>
-        <th class="tallCell">File Location:</th>
-        <td>The file has been written to: <br />
-            <a href="<c:out value='${url}'/>"><c:out value="${filePath}"/></a>
-        </td>
-    </tr>
-    <tr>
-        <td></td>
-        <td class="buttonBar">
-            <input type="button" class="button" name="done" value="Done"
-                onclick="location.href='<html:rewrite forward="mainMenu"/>'" />
-            <input type="button" class="button" style="width: 120px" value="Upload Another"
-                onclick="location.href='<html:rewrite forward="selectFile"/>'" />
-        </td>
-    </tr>
-</table>
-</form>

Deleted: trunk/examServer/src/main/webapp/WEB-INF/pages/uploadForm.jsp
===================================================================
--- trunk/examServer/src/main/webapp/WEB-INF/pages/uploadForm.jsp	2010-03-09 12:39:35 UTC (rev 1218)
+++ trunk/examServer/src/main/webapp/WEB-INF/pages/uploadForm.jsp	2010-03-09 14:09:58 UTC (rev 1219)
@@ -1,42 +0,0 @@
-<%@ include file="/common/taglibs.jsp"%>
-
-<title><fmt:message key="upload.title"/></title>
-<content tag="heading"><fmt:message key="upload.heading"/></content>
-<meta name="menu" content="FileUpload"/>
-
-<!--
-    The most important part is to declare your form's enctype to be "multipart/form-data",
-    and to have a form:file element that maps to your ActionForm's FormFile property
--->
-
-<html:form action="uploadFile" method="post" styleId="uploadForm"
-    enctype="multipart/form-data" onsubmit="return validateUploadForm(this)">
-<ul>
-    <li class="info">
-        <fmt:message key="upload.message"/>
-    </li>
-    <li>
-        <examServer:label key="uploadForm.name" styleClass="desc"/>
-        <html:text property="name" styleId="name" styleClass="text medium"/>
-    </li>
-    <li>
-        <examServer:label key="uploadForm.file" styleClass="desc"/>
-        <html:file property="file" styleClass="file medium" styleId="file" />
-    </li>
-    <li class="buttonBar">
-        <html:submit styleClass="button" onclick="bCancel=false">
-            <fmt:message key="button.upload"/>
-        </html:submit>
-        <html:cancel styleClass="button" onclick="bCancel=true">
-            <fmt:message key="button.cancel"/>
-        </html:cancel>
-    </li>
-</ul>
-</html:form>
-
-<script type="text/javascript">
-    Form.focusFirstElement($('uploadForm'));
-    highlightFormElements();
-</script>
-<html:javascript formName="uploadForm" cdata="false" dynamicJavascript="true" staticJavascript="false"/>
-<script type="text/javascript" src="<c:url value="/scripts/validator.jsp"/>"></script>

Modified: trunk/examServer/src/main/webapp/WEB-INF/struts-config.xml
===================================================================
--- trunk/examServer/src/main/webapp/WEB-INF/struts-config.xml	2010-03-09 12:39:35 UTC (rev 1218)
+++ trunk/examServer/src/main/webapp/WEB-INF/struts-config.xml	2010-03-09 14:09:58 UTC (rev 1219)
@@ -49,20 +49,9 @@
  </global-forwards>
  <!-- ========== Action Mapping Definitions =================================== -->
  <action-mappings>
-  <action input="failure" name="uploadForm" path="/uploadFile"
-   scope="request"
-   type="de.thorstenberger.examServer.webapp.action.UploadAction" validate="true">
-   <!--<set-property property="cancellable" value="true"/>-->
-   <forward name="failure" path="/WEB-INF/pages/uploadForm.jsp" redirect="false"/>
-   <forward name="success" path="/WEB-INF/pages/uploadDisplay.jsp" redirect="false"/>
-  </action>
   <action path="/reload" roles="admin"
    type="de.thorstenberger.examServer.webapp.action.ReloadAction" validate="false"/>
-  <action input="failure" name="userForm" path="/signup" scope="request"
-   type="de.thorstenberger.examServer.webapp.action.SignupAction" validate="false">
-   <forward name="failure" path="/WEB-INF/pages/signup.jsp" redirect="false"/>
-   <forward name="success" path="/mainMenu.html" redirect="true"/>
-  </action>
+   
   <action input="mainMenu" name="userForm" parameter="method"
    path="/users" roles="admin" scope="request"
    type="de.thorstenberger.examServer.webapp.action.UserAction" validate="false">


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Elateportal-devel] SF.net SVN: elateportal:[1221] trunk/examServer/src/main

From: <sdienst@us...> - 2010-03-09 16:12

Revision: 1221
          http://elateportal.svn.sourceforge.net/elateportal/?rev=1221&view=rev
Author:   sdienst
Date:     2010-03-09 16:12:24 +0000 (Tue, 09 Mar 2010)

Log Message:
-----------
Shrinked user profile to data that is relevant for exam settings. Hide everything else.
Made 'semester' an explicit data instead of using 'telephone' for storing it.

Modified Paths:
--------------
    trunk/examServer/src/main/java/de/thorstenberger/examServer/dao/xml/UserDaoJAXB.java
    trunk/examServer/src/main/java/de/thorstenberger/examServer/model/User.java
    trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/action/StudentMainAction.java
    trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/action/StudentsInfoSubmitAction.java
    trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/form/UserForm.java
    trunk/examServer/src/main/jaxb/users.xsd
    trunk/examServer/src/main/resources/ApplicationResources_de.properties
    trunk/examServer/src/main/resources/ApplicationResources_en.properties
    trunk/examServer/src/main/webapp/WEB-INF/pages/userForm.jsp

Modified: trunk/examServer/src/main/java/de/thorstenberger/examServer/dao/xml/UserDaoJAXB.java
===================================================================
--- trunk/examServer/src/main/java/de/thorstenberger/examServer/dao/xml/UserDaoJAXB.java	2010-03-09 15:58:08 UTC (rev 1220)
+++ trunk/examServer/src/main/java/de/thorstenberger/examServer/dao/xml/UserDaoJAXB.java	2010-03-09 16:12:24 UTC (rev 1221)
@@ -231,7 +231,8 @@
         ret.setUsername(u.getUsername());
         ret.setVersion(u.getVersion());
         ret.setWebsite(u.getWebsite());
-
+        ret.setMatrikel(u.getMatrikel());
+        ret.setSemester(u.getSemester());
         final List<String> roles = u.getRoleRef();
         for (final String role : roles) {
             ret.addRole(roleDao.getRoleByName(role));
@@ -264,7 +265,9 @@
         userType.setUsername(user.getUsername());
         userType.setVersion(user.getVersion());
         userType.setWebsite(user.getWebsite());
-
+        userType.setSemester(user.getSemester());
+        userType.setMatrikel(user.getMatrikel());
+        
         final Iterator it = user.getRoles().iterator();
         userType.getRoleRef().clear();
         while (it.hasNext()) {

Modified: trunk/examServer/src/main/java/de/thorstenberger/examServer/model/User.java
===================================================================
--- trunk/examServer/src/main/java/de/thorstenberger/examServer/model/User.java	2010-03-09 15:58:08 UTC (rev 1220)
+++ trunk/examServer/src/main/java/de/thorstenberger/examServer/model/User.java	2010-03-09 16:12:24 UTC (rev 1221)
@@ -35,6 +35,8 @@
     protected String firstName;                   // required
     protected String lastName;                    // required
     protected String email;                       // required; unique
+    protected String matrikel;
+    protected String semester;
     protected String phoneNumber;
     protected String website;
     protected Address address = new Address();
@@ -77,8 +79,35 @@
     public String getPassword() {
         return password;
     }
+    /**
+     * @return the matrikel
+     */
+    public String getMatrikel() {
+      return matrikel;
+    }
 
     /**
+     * @param matrikel the matrikel to set
+     */
+    public void setMatrikel(String matrikel) {
+      this.matrikel = matrikel;
+    }
+
+    /**
+     * @return the semester
+     */
+    public String getSemester() {
+      return semester;
+    }
+
+    /**
+     * @param semester the semester to set
+     */
+    public void setSemester(String semester) {
+      this.semester = semester;
+    }
+
+    /**
      * @struts.validator type="required"
      */
     public String getConfirmPassword() {

Modified: trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/action/StudentMainAction.java
===================================================================
--- trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/action/StudentMainAction.java	2010-03-09 15:58:08 UTC (rev 1220)
+++ trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/action/StudentMainAction.java	2010-03-09 16:12:24 UTC (rev 1221)
@@ -80,7 +80,7 @@
 			UserManager userManager = (UserManager)getBean( "userManager" );
 			User user = userManager.getUserByUsername( request.getUserPrincipal().getName() );
 			request.setAttribute( "askForSemester", Boolean.TRUE );
-			request.setAttribute( "semester", user.getPhoneNumber() );
+			request.setAttribute( "semester", user.getSemester() );
 		}
 		return mapping.findForward( "success" );
 	}

Modified: trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/action/StudentsInfoSubmitAction.java
===================================================================
--- trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/action/StudentsInfoSubmitAction.java	2010-03-09 15:58:08 UTC (rev 1220)
+++ trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/action/StudentsInfoSubmitAction.java	2010-03-09 16:12:24 UTC (rev 1221)
@@ -50,7 +50,7 @@
 		UserManager userManager = (UserManager)getBean( "userManager" );
 		User user = userManager.getUserByUsername( request.getUserPrincipal().getName() );
 		if( request.getParameter( "semester" ) != null ){
-			user.setPhoneNumber( request.getParameter( "semester" ) );
+			user.setSemester( request.getParameter( "semester" ) );
 			userManager.saveUser( user );
 			messages.add(ActionMessages.GLOBAL_MESSAGE,	new ActionMessage( "studentsInfo.semester.saved" ) );
 		}

Modified: trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/form/UserForm.java
===================================================================
--- trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/form/UserForm.java	2010-03-09 15:58:08 UTC (rev 1220)
+++ trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/form/UserForm.java	2010-03-09 16:12:24 UTC (rev 1221)
@@ -32,6 +32,10 @@
     protected String email;
 
     protected String phoneNumber;
+    
+    protected String matrikel;
+    
+    protected String semester;
 
     protected String website;
 
@@ -379,6 +383,34 @@
     public void setUserRoles(String[] roles) {}
 
     /**
+     * @return the matrikel
+     */
+    public String getMatrikel() {
+      return matrikel;
+    }
+
+    /**
+     * @param matrikel the matrikel to set
+     */
+    public void setMatrikel(String matrikel) {
+      this.matrikel = matrikel;
+    }
+
+    /**
+     * @return the semester
+     */
+    public String getSemester() {
+      return semester;
+    }
+
+    /**
+     * @param semester the semester to set
+     */
+    public void setSemester(String semester) {
+      this.semester = semester;
+    }
+
+    /**
      * @see org.apache.struts.action.ActionForm#reset(org.apache.struts.action.ActionMapping,
      *                                                javax.servlet.http.HttpServletRequest)
      */

Modified: trunk/examServer/src/main/jaxb/users.xsd
===================================================================
--- trunk/examServer/src/main/jaxb/users.xsd	2010-03-09 15:58:08 UTC (rev 1220)
+++ trunk/examServer/src/main/jaxb/users.xsd	2010-03-09 16:12:24 UTC (rev 1221)
@@ -24,6 +24,8 @@
 						<xs:attribute name="first_name" type="xs:string" use="optional"/>
 						<xs:attribute name="last_name" type="xs:string" use="optional"/>
 						<xs:attribute name="email" type="xs:string" use="optional"/>
+						<xs:attribute name="semester" type="xs:string" use="optional"/>
+						<xs:attribute name="matrikel" type="xs:string" use="optional"/>
 						<xs:attribute name="phone_number" type="xs:string" use="optional"/>
 						<xs:attribute name="website" type="xs:string" use="optional"/>
 						<xs:attribute name="address" type="xs:string" use="optional"/>

Modified: trunk/examServer/src/main/resources/ApplicationResources_de.properties
===================================================================
--- trunk/examServer/src/main/resources/ApplicationResources_de.properties	2010-03-09 15:58:08 UTC (rev 1220)
+++ trunk/examServer/src/main/resources/ApplicationResources_de.properties	2010-03-09 16:12:24 UTC (rev 1221)
@@ -140,6 +140,8 @@
 userForm.password=Passwort
 userForm.confirmPassword=Passwort best&auml;tigen
 userForm.phoneNumber=Telefon
+userForm.matrikel=Matrikelnr.
+userForm.semester=Fachsemester
 userForm.addressForm.postalCode=Postleitzahl
 userForm.addressForm.province=Bundesland
 userForm.roles=Derzeitige Benutzerrollen

Modified: trunk/examServer/src/main/resources/ApplicationResources_en.properties
===================================================================
--- trunk/examServer/src/main/resources/ApplicationResources_en.properties	2010-03-09 15:58:08 UTC (rev 1220)
+++ trunk/examServer/src/main/resources/ApplicationResources_en.properties	2010-03-09 16:12:24 UTC (rev 1221)
@@ -10,4 +10,7 @@
 # -- taskConfig
 taskConfig.title = Task Configuration
 taskConfig.heading = Task Configuration
-taskConfig.saved = Settings were saved successfully.
\ No newline at end of file
+taskConfig.saved = Settings were saved successfully.
+
+userForm.matrikel=Matrikelnr.
+userForm.semester=Semester
\ No newline at end of file

Modified: trunk/examServer/src/main/webapp/WEB-INF/pages/userForm.jsp
===================================================================
--- trunk/examServer/src/main/webapp/WEB-INF/pages/userForm.jsp	2010-03-09 15:58:08 UTC (rev 1220)
+++ trunk/examServer/src/main/webapp/WEB-INF/pages/userForm.jsp	2010-03-09 16:12:24 UTC (rev 1221)
@@ -55,6 +55,20 @@
         <html:errors property="username"/>
         <html:text styleClass="text large" property="username" styleId="username"/>
     </li>
+    <li>
+        <div>
+            <div class="left">
+                <examServer:label styleClass="desc" key="userForm.firstName"/>
+                <html:errors property="firstName"/>
+                <html:text styleClass="text medium" property="firstName" styleId="firstName" maxlength="50"/>
+            </div>
+            <div>
+                <examServer:label styleClass="desc" key="userForm.lastName"/>
+                <html:errors property="lastName"/>
+                <html:text styleClass="text medium" property="lastName" styleId="lastName" maxlength="50"/>
+            </div>
+        </div>
+    </li>
     <c:if test="${cookieLogin != 'true'}">
     <li>
         <div>
@@ -72,45 +86,34 @@
         </div>
     </li>
     </c:if>
+    <!-- 
     <li>
         <examServer:label styleClass="desc" key="userForm.passwordHint"/>
         <html:errors property="passwordHint"/>
         <html:text styleClass="text large" property="passwordHint" styleId="passwordHint"/>
     </li>
+     -->
     <li>
         <div>
             <div class="left">
-                <examServer:label styleClass="desc" key="userForm.firstName"/>
-                <html:errors property="firstName"/>
-                <html:text styleClass="text medium" property="firstName" styleId="firstName" maxlength="50"/>
+                <examServer:label styleClass="desc" key="userForm.matrikel"/>
+                <html:errors property="matrikel"/>
+                <html:text styleClass="text medium" property="matrikel" styleId="matrikel"/>
             </div>
             <div>
-                <examServer:label styleClass="desc" key="userForm.lastName"/>
-                <html:errors property="lastName"/>
-                <html:text styleClass="text medium" property="lastName" styleId="lastName" maxlength="50"/>
+                <examServer:label styleClass="desc" key="userForm.semester"/>
+                <html:errors property="semester"/>
+                <html:text styleClass="text medium" property="semester" styleId="semester"/>
             </div>
         </div>
     </li>
     <li>
-        <div>
-            <div class="left">
                 <examServer:label styleClass="desc" key="userForm.email"/>
                 <html:errors property="email"/>
-                <html:text styleClass="text medium" property="email" styleId="email"/>
-            </div>
-            <div>
-                <examServer:label styleClass="desc" key="userForm.phoneNumber"/>
-                <html:errors property="phoneNumber"/>
-                <html:text styleClass="text medium" property="phoneNumber" styleId="phoneNumber"/>
-            </div>
-        </div>
+                <html:text styleClass="text large" property="email" styleId="email"/>
     </li>
+    <!-- 
     <li>
-        <examServer:label styleClass="desc" key="userForm.website"/>
-        <html:errors property="website"/>
-        <html:text styleClass="text large" property="website" styleId="website"/>
-    </li>
-    <li>
         <label class="desc"><fmt:message key="userForm.addressForm.address"/></label>
         <div class="group">
             <div>
@@ -149,6 +152,7 @@
             </div>
         </div>
     </li>
+     -->
 <c:choose>
     <c:when test="${param.from == 'list' or param.method == 'Add'}">
     <li>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Elateportal-devel] SF.net SVN: elateportal:[1227] trunk/examServer/src/main

From: <sdienst@us...> - 2010-03-29 12:14

Revision: 1227
          http://elateportal.svn.sourceforge.net/elateportal/?rev=1227&view=rev
Author:   sdienst
Date:     2010-03-29 12:14:34 +0000 (Mon, 29 Mar 2010)

Log Message:
-----------
[feature] Allow admin to toggle whether students should be asked to complete their personal details (name, semester, matrikel) or not. Default: Do not ask.

Modified Paths:
--------------
    trunk/examServer/src/main/java/de/thorstenberger/examServer/service/ConfigManager.java
    trunk/examServer/src/main/java/de/thorstenberger/examServer/service/impl/ConfigManagerImpl.java
    trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/action/StudentMainAction.java
    trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/action/SystemConfigAction.java
    trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/action/SystemConfigSubmitAction.java
    trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/form/SystemConfigForm.java
    trunk/examServer/src/main/webapp/WEB-INF/pages/systemConfig.jsp

Modified: trunk/examServer/src/main/java/de/thorstenberger/examServer/service/ConfigManager.java
===================================================================
--- trunk/examServer/src/main/java/de/thorstenberger/examServer/service/ConfigManager.java	2010-03-25 14:54:14 UTC (rev 1226)
+++ trunk/examServer/src/main/java/de/thorstenberger/examServer/service/ConfigManager.java	2010-03-29 12:14:34 UTC (rev 1227)
@@ -53,4 +53,6 @@
 
     public void setTitle(String title);
 
+    public void toggleFlag(String flagName, boolean state);
+
 }

Modified: trunk/examServer/src/main/java/de/thorstenberger/examServer/service/impl/ConfigManagerImpl.java
===================================================================
--- trunk/examServer/src/main/java/de/thorstenberger/examServer/service/impl/ConfigManagerImpl.java	2010-03-25 14:54:14 UTC (rev 1226)
+++ trunk/examServer/src/main/java/de/thorstenberger/examServer/service/impl/ConfigManagerImpl.java	2010-03-29 12:14:34 UTC (rev 1227)
@@ -17,7 +17,7 @@
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 /**
- * 
+ *
  */
 package de.thorstenberger.examServer.service.impl;
 
@@ -28,6 +28,7 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Properties;
 
 import javax.xml.bind.JAXBContext;
@@ -46,7 +47,7 @@
 
 /**
  * @author Thorsten Berger
- * 
+ *
  */
 public class ConfigManagerImpl implements ConfigManager {
 
@@ -58,7 +59,7 @@
     private final Log log = LogFactory.getLog(ConfigManagerImpl.class);
 
     /**
-	 * 
+	 *
 	 */
     public ConfigManagerImpl(final ExamServerManager examServerManager) {
 
@@ -102,7 +103,7 @@
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see de.thorstenberger.examServer.service.ConfigManager#getHTTPAuthMail()
      */
     public String getHTTPAuthMail() {
@@ -111,7 +112,7 @@
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see de.thorstenberger.examServer.service.ConfigManager#getHTTPAuthURL()
      */
     public String getHTTPAuthURL() {
@@ -120,7 +121,7 @@
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see de.thorstenberger.examServer.service.ConfigManager#getRemoteUserMangerURL()
      */
     public String getRemoteUserManagerURL() {
@@ -129,7 +130,7 @@
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see de.thorstenberger.examServer.service.ConfigManager#getTitle()
      */
     public String getTitle() {
@@ -138,7 +139,7 @@
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see de.thorstenberger.examServer.service.ConfigManager#isLoadJVMOnStartup()
      */
     public boolean isLoadJVMOnStartup() {
@@ -147,7 +148,7 @@
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see de.thorstenberger.examServer.service.ConfigManager#isSetFlag(java.lang.String)
      */
     public boolean isSetFlag(final String flag) {
@@ -163,7 +164,7 @@
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see de.thorstenberger.examServer.service.ConfigManager#isStudentsLoginEnabled()
      */
     public boolean isStudentsLoginEnabled() {
@@ -192,7 +193,7 @@
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see de.thorstenberger.examServer.service.ConfigManager#setHTTPAuthMail()
      */
     public void setHTTPAuthMail(final String address) {
@@ -202,7 +203,7 @@
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see de.thorstenberger.examServer.service.ConfigManager#setHTTPAuthURL()
      */
     public void setHTTPAuthURL(final String url) {
@@ -212,7 +213,7 @@
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see de.thorstenberger.examServer.service.ConfigManager#setLoadJVMOnStartup(boolean)
      */
     public void setLoadJVMOnStartup(final boolean value) {
@@ -222,7 +223,7 @@
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see de.thorstenberger.examServer.service.ConfigManager#setRemoteUserManagerURL()
      */
     public void setRemoteUserManagerURL(final String url) {
@@ -232,7 +233,7 @@
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see de.thorstenberger.examServer.service.ConfigManager#setStudentsLoginEnabled(boolean)
      */
     public void setStudentsLoginEnabled(final boolean value) {
@@ -242,7 +243,7 @@
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see de.thorstenberger.examServer.service.ConfigManager#setTitle(java.lang.String)
      */
     public void setTitle(final String title) {
@@ -250,4 +251,17 @@
         save();
     }
 
+    /*
+     * (non-Javadoc)
+     *
+     * @see de.thorstenberger.examServer.service.ConfigManager#toggleFlag(java.lang.String, boolean)
+     */
+    public void toggleFlag(final String flagName, final boolean state) {
+      final List<String> flags = config.getFlag();
+      flags.remove(flagName);
+      if (state) {
+        flags.add(flagName);
+      }
+    }
+
 }

Modified: trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/action/StudentMainAction.java
===================================================================
--- trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/action/StudentMainAction.java	2010-03-25 14:54:14 UTC (rev 1226)
+++ trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/action/StudentMainAction.java	2010-03-29 12:14:34 UTC (rev 1227)
@@ -35,6 +35,7 @@
 import org.apache.struts.action.ActionMapping;
 
 import de.thorstenberger.examServer.model.User;
+import de.thorstenberger.examServer.service.ConfigManager;
 import de.thorstenberger.examServer.service.UserManager;
 import de.thorstenberger.examServer.webapp.vo.TaskDefVO;
 import de.thorstenberger.taskmodel.TaskDef;
@@ -81,16 +82,21 @@
 
     request.setAttribute("TaskDefs", tdvos);
 
+
     // redirect if needed (incomplete student details)
-    final UserManager userManager = (UserManager) getBean("userManager");
-    final User user = userManager.getUserByUsername(request.getUserPrincipal().getName());
+    final ConfigManager config = (ConfigManager) getBean("configManager");
+    if (config.isSetFlag("askForSemester")) {
+      final UserManager userManager = (UserManager) getBean("userManager");
+      final User user = userManager.getUserByUsername(request.getUserPrincipal().getName());
 
-    final boolean noFirstname = isEmpty(user.getFirstName());
-    final boolean noLastname = isEmpty(user.getLastName());
-    final boolean noSemester = isEmpty(user.getSemester()) || !isNumeric(user.getSemester());
-    final boolean noMatrikel = isEmpty(user.getMatrikel()) || !isNumeric(user.getMatrikel());
-    if (noFirstname || noLastname || noSemester || noMatrikel) {
-      return mapping.findForward("askForSemester");
+      final boolean noFirstname = isEmpty(user.getFirstName());
+      final boolean noLastname = isEmpty(user.getLastName());
+      final boolean noSemester = isEmpty(user.getSemester()) || !isNumeric(user.getSemester());
+      final boolean noMatrikel = isEmpty(user.getMatrikel()) || !isNumeric(user.getMatrikel());
+
+      if (noFirstname || noLastname || noSemester || noMatrikel) {
+        return mapping.findForward("askForSemester");
+      }
     }
     return mapping.findForward("success");
   }

Modified: trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/action/SystemConfigAction.java
===================================================================
--- trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/action/SystemConfigAction.java	2010-03-25 14:54:14 UTC (rev 1226)
+++ trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/action/SystemConfigAction.java	2010-03-29 12:14:34 UTC (rev 1227)
@@ -51,7 +51,7 @@
 		scf.setTitle( configManager.getTitle() );
 		scf.setHttpAuthURL( configManager.getHTTPAuthURL() );
 		scf.setHttpAuthMail( configManager.getHTTPAuthMail() );
-		
+		scf.setAskForStudentDetails( configManager.isSetFlag("askForSemester") );
 		return mapping.findForward( "systemConfig" );
 	}
 

Modified: trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/action/SystemConfigSubmitAction.java
===================================================================
--- trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/action/SystemConfigSubmitAction.java	2010-03-25 14:54:14 UTC (rev 1226)
+++ trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/action/SystemConfigSubmitAction.java	2010-03-29 12:14:34 UTC (rev 1227)
@@ -56,6 +56,7 @@
 		configManager.setHTTPAuthURL( scf.getHttpAuthURL() );
 		configManager.setHTTPAuthMail( scf.getHttpAuthMail() );
 		
+		configManager.toggleFlag( "askForSemester", scf.isAskForStudentDetails() );
 		messages.add(ActionMessages.GLOBAL_MESSAGE,	new ActionMessage( "systemConfig.saved" ) );
 		saveMessages( request, messages );			
 		

Modified: trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/form/SystemConfigForm.java
===================================================================
--- trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/form/SystemConfigForm.java	2010-03-25 14:54:14 UTC (rev 1226)
+++ trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/form/SystemConfigForm.java	2010-03-29 12:14:34 UTC (rev 1227)
@@ -30,6 +30,7 @@
 	private String title;
 	private String remoteUserManagerURL;
 	private boolean loadJVMOnStartup;
+	private boolean askForStudentDetails;
 	private String httpAuthURL;
 	private String httpAuthMail;
 	
@@ -93,6 +94,18 @@
 	public void setHttpAuthMail(String httpAuthMail) {
 		this.httpAuthMail = httpAuthMail;
 	}
+  /**
+   * @param askForStudentDetails the askForStudentDetails to set
+   */
+  public void setAskForStudentDetails(boolean askForStudentDetails) {
+    this.askForStudentDetails = askForStudentDetails;
+  }
+  /**
+   * @return the askForStudentDetails
+   */
+  public boolean isAskForStudentDetails() {
+    return askForStudentDetails;
+  }
 	
 	
 

Modified: trunk/examServer/src/main/webapp/WEB-INF/pages/systemConfig.jsp
===================================================================
--- trunk/examServer/src/main/webapp/WEB-INF/pages/systemConfig.jsp	2010-03-25 14:54:14 UTC (rev 1226)
+++ trunk/examServer/src/main/webapp/WEB-INF/pages/systemConfig.jsp	2010-03-29 12:14:34 UTC (rev 1227)
@@ -31,6 +31,9 @@
 <tr>
 <td>HTTP-Authentication-Mail-Suffix: </td><td><html:text property="httpAuthMail" size="60"/></td>
 </tr>
+<tr>
+<td>Studentendaten abfragen </td><td><html:checkbox property="askForStudentDetails"/>&nbsp;&nbsp;Fragt nach Namen, Matrikelnummer und Fachsemester, falls diese Daten unvollst&auml;ndig sind</td>
+</tr>
 </table>
 <br/><br/>
 <html:submit>Speichern</html:submit>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Elateportal-devel] SF.net SVN: elateportal:[1233] trunk/examServer/src/main

From: <sdienst@us...> - 2010-04-01 10:55

Revision: 1233
          http://elateportal.svn.sourceforge.net/elateportal/?rev=1233&view=rev
Author:   sdienst
Date:     2010-04-01 10:55:39 +0000 (Thu, 01 Apr 2010)

Log Message:
-----------
[feature] Added configuration settings for radius server
[feature] show configured mailsuffix next to the username input field on the login page
[feature] Use username as email when using radius authentication

Modified Paths:
--------------
    trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/action/SystemConfigAction.java
    trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/action/SystemConfigSubmitAction.java
    trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/form/SystemConfigForm.java
    trunk/examServer/src/main/java/de/thorstenberger/examServer/ws/remoteusermanager/RadiusAuthenticationProvider.java
    trunk/examServer/src/main/webapp/WEB-INF/pages/loginForm.jsp
    trunk/examServer/src/main/webapp/WEB-INF/pages/systemConfig.jsp
    trunk/examServer/src/main/webapp/login.jsp
    trunk/examServer/src/main/webapp/styles/forms.css

Modified: trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/action/SystemConfigAction.java
===================================================================
--- trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/action/SystemConfigAction.java	2010-03-31 15:07:54 UTC (rev 1232)
+++ trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/action/SystemConfigAction.java	2010-04-01 10:55:39 UTC (rev 1233)
@@ -17,7 +17,7 @@
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 /**
- * 
+ *
  */
 package de.thorstenberger.examServer.webapp.action;
 
@@ -41,20 +41,22 @@
 	 * @see de.thorstenberger.examServer.webapp.action.BaseAction#execute(org.apache.struts.action.ActionMapping, org.apache.struts.action.ActionForm, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
 	 */
 	@Override
-	public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		
+	public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, final HttpServletResponse response) throws Exception {
+
 		SystemConfigForm scf = (SystemConfigForm)form;
 		ConfigManager configManager = (ConfigManager)getBean( "configManager" );
-		
+
 		scf.setLoadJVMOnStartup( configManager.isLoadJVMOnStartup() );
 		scf.setRemoteUserManagerURL( configManager.getRemoteUserManagerURL() );
 		scf.setTitle( configManager.getTitle() );
 		scf.setHttpAuthURL( configManager.getHTTPAuthURL() );
 		scf.setHttpAuthMail( configManager.getHTTPAuthMail() );
 		scf.setAskForStudentDetails( configManager.isSetFlag("askForSemester") );
+    scf.setRadiusHost(configManager.getRadiusHost());
+    scf.setRadiusSharedSecret(configManager.getRadiusSharedSecret());
 		return mapping.findForward( "systemConfig" );
 	}
 
-	
 
+
 }

Modified: trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/action/SystemConfigSubmitAction.java
===================================================================
--- trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/action/SystemConfigSubmitAction.java	2010-03-31 15:07:54 UTC (rev 1232)
+++ trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/action/SystemConfigSubmitAction.java	2010-04-01 10:55:39 UTC (rev 1233)
@@ -55,6 +55,8 @@
 		configManager.setLoadJVMOnStartup( scf.isLoadJVMOnStartup() );
 		configManager.setHTTPAuthURL( scf.getHttpAuthURL() );
 		configManager.setHTTPAuthMail( scf.getHttpAuthMail() );
+		configManager.setRadiusHost( scf.getRadiusHost() );
+		configManager.setRadiusSharedSecret( scf.getRadiusSharedSecret() );
 		
 		configManager.toggleFlag( "askForSemester", scf.isAskForStudentDetails() );
 		messages.add(ActionMessages.GLOBAL_MESSAGE,	new ActionMessage( "systemConfig.saved" ) );

Modified: trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/form/SystemConfigForm.java
===================================================================
--- trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/form/SystemConfigForm.java	2010-03-31 15:07:54 UTC (rev 1232)
+++ trunk/examServer/src/main/java/de/thorstenberger/examServer/webapp/form/SystemConfigForm.java	2010-04-01 10:55:39 UTC (rev 1233)
@@ -33,8 +33,33 @@
 	private boolean askForStudentDetails;
 	private String httpAuthURL;
 	private String httpAuthMail;
-	
+	private String radiusHost;
+	private String radiusSharedSecret;
 	/**
+   * @return the radiusHost
+   */
+  public String getRadiusHost() {
+    return radiusHost;
+  }
+  /**
+   * @param radiusHost the radiusHost to set
+   */
+  public void setRadiusHost(String radiusHost) {
+    this.radiusHost = radiusHost;
+  }
+  /**
+   * @return the radiusSharedSecret
+   */
+  public String getRadiusSharedSecret() {
+    return radiusSharedSecret;
+  }
+  /**
+   * @param radiusSharedSecret the radiusSharedSecret to set
+   */
+  public void setRadiusSharedSecret(String radiusSharedSecret) {
+    this.radiusSharedSecret = radiusSharedSecret;
+  }
+  /**
 	 * @return Returns the loadJVMOnStartup.
 	 */
 	public boolean isLoadJVMOnStartup() {

Modified: trunk/examServer/src/main/java/de/thorstenberger/examServer/ws/remoteusermanager/RadiusAuthenticationProvider.java
===================================================================
--- trunk/examServer/src/main/java/de/thorstenberger/examServer/ws/remoteusermanager/RadiusAuthenticationProvider.java	2010-03-31 15:07:54 UTC (rev 1232)
+++ trunk/examServer/src/main/java/de/thorstenberger/examServer/ws/remoteusermanager/RadiusAuthenticationProvider.java	2010-04-01 10:55:39 UTC (rev 1233)
@@ -152,17 +152,38 @@
     final boolean auth = authenticateUser(login, pwd);
     if (auth) {
       // now we know that at least login and password are correct, so we create the user bean
-      final UserBean bean = new UserBean(login, login, null, pwd, "student", null);
+      String email = login;
+      if (!login.contains("@")) {
+        email = login+"@"+configManager.getHTTPAuthMail();
+      }
+      final UserBean bean = new UserBean(email, login, null, pwd, "student", null);
       return bean;
     } else {
+      log.warn("Wrong radius authentication for " + login);
       throw new AuthenticationServiceException("Invalid username/password!");
     }
   }
 
+  /**
+   * Send authentication request to the radius server. Concatenates <code>login</code> with <code>@mailsuffix</code> if
+   * such a suffix is configured at {@link ConfigManager#getHTTPAuthMail()}.
+   *
+   * @param login
+   * @param pwd
+   * @return
+   */
   private boolean authenticateUser(final String login, final String pwd) {
+    // if there is a configured mail suffix, construct the username
+    // to send to the radius server: login@...
+    String username = login;
+    final String mailSuffix = configManager.getHTTPAuthMail();
+    if (!StringUtils.isEmpty(mailSuffix) && !login.contains("@")) {
+      username = login + "@" + mailSuffix;
+    }
+    log.debug(String.format("Trying to authenticate user '%s' against radius server at %s", username, configManager.getRadiusHost()));
     final RadiusClient radiusClient = new RadiusClient(configManager.getRadiusHost(), configManager.getRadiusSharedSecret());
     try {
-      return radiusClient.authenticate(login, pwd);
+      return radiusClient.authenticate(username, pwd);
     } catch (final IOException e) {
       throw new AuthenticationServiceException("Could not authenticate user!", e);
     } catch (final RadiusException e) {

Modified: trunk/examServer/src/main/webapp/WEB-INF/pages/loginForm.jsp
===================================================================
--- trunk/examServer/src/main/webapp/WEB-INF/pages/loginForm.jsp	2010-03-31 15:07:54 UTC (rev 1232)
+++ trunk/examServer/src/main/webapp/WEB-INF/pages/loginForm.jsp	2010-04-01 10:55:39 UTC (rev 1233)
@@ -1,5 +1,10 @@
 <%@ include file="/common/taglibs.jsp"%>
-
+<%
+  org.springframework.context.ApplicationContext ctx = 
+    org.springframework.web.context.support.WebApplicationContextUtils.getRequiredWebApplicationContext( application );
+  de.thorstenberger.examServer.service.ConfigManager configManager = (de.thorstenberger.examServer.service.ConfigManager) ctx.getBean( "configManager" );
+  pageContext.setAttribute( "usernamePostfix", "@"+configManager.getHTTPAuthMail() );
+%>
 <form method="post" id="loginForm" action="<c:url value="/j_security_check"/>"
     onsubmit="saveUsername(this);return validateForm(this)">
 <fieldset>
@@ -17,6 +22,7 @@
             <fmt:message key="label.username"/> <span class="req">*</span>
         </label>
         <input type="text" class="text medium" name="j_username" id="j_username" tabindex="1" />
+        <b style="white-space: nowrap;"><c:out value="${usernamePostfix}"></c:out></b>
     </li>
 
     <li>

Modified: trunk/examServer/src/main/webapp/WEB-INF/pages/systemConfig.jsp
===================================================================
--- trunk/examServer/src/main/webapp/WEB-INF/pages/systemConfig.jsp	2010-03-31 15:07:54 UTC (rev 1232)
+++ trunk/examServer/src/main/webapp/WEB-INF/pages/systemConfig.jsp	2010-04-01 10:55:39 UTC (rev 1233)
@@ -32,6 +32,12 @@
 <td>HTTP-Authentication-Mail-Suffix: </td><td><html:text property="httpAuthMail" size="60"/></td>
 </tr>
 <tr>
+<td>Radius-Authentication-Host: </td><td><html:text property="radiusHost" size="60"/></td>
+</tr>
+<tr>
+<td>Radius-Shared-Secret: </td><td><html:password property="radiusSharedSecret" size="60"/></td>
+</tr>
+<tr>
 <td>Studentendaten abfragen </td><td><html:checkbox property="askForStudentDetails"/>&nbsp;&nbsp;Fragt nach Namen, Matrikelnummer und Fachsemester, falls diese Daten unvollst&auml;ndig sind</td>
 </tr>
 </table>

Modified: trunk/examServer/src/main/webapp/login.jsp
===================================================================
--- trunk/examServer/src/main/webapp/login.jsp	2010-03-31 15:07:54 UTC (rev 1232)
+++ trunk/examServer/src/main/webapp/login.jsp	2010-04-01 10:55:39 UTC (rev 1233)
@@ -20,7 +20,6 @@
 <br/><br/>
 <%-- Include the login form --%>
 <jsp:include page="/WEB-INF/pages/loginForm.jsp"/>
-
 <br/><br/><br/>
 
 

Modified: trunk/examServer/src/main/webapp/styles/forms.css
===================================================================
--- trunk/examServer/src/main/webapp/styles/forms.css	2010-03-31 15:07:54 UTC (rev 1232)
+++ trunk/examServer/src/main/webapp/styles/forms.css	2010-04-01 10:55:39 UTC (rev 1233)
@@ -419,7 +419,7 @@
 /* Specific forms */
 
 #loginForm fieldset {
-    width: 300px;
+    width: 340px;
     padding: 10px 30px;
     margin: 0px auto;
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.