Index: /trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/web/commands/CMDloadSessionsFromClickstream.java
===================================================================
--- /trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/web/commands/CMDloadSessionsFromClickstream.java	(revision 52)
+++ /trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/web/commands/CMDloadSessionsFromClickstream.java	(revision 53)
@@ -6,5 +6,4 @@
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.LinkedList;
@@ -12,5 +11,4 @@
 import java.util.Map;
 
-import de.ugoe.cs.eventbench.data.Event;
 import de.ugoe.cs.eventbench.web.data.WebEvent;
 import de.ugoe.cs.util.console.Command;
@@ -22,5 +20,5 @@
 	public void run(List<Object> parameters) {
 		// TODO Auto-generated method stub
-		if( parameters.size() < 2 ) {
+		if( parameters.size() < 1 ) {
 			throw new InvalidParameterException();
 		}
@@ -45,6 +43,6 @@
 			SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 			
-			for( int i=0; i<lines.length ; i++ ) {
-				String[] values = lines[i].split(" ");
+			for( String line : lines ) {
+				String[] values = line.trim().split(" ");
 				
 				// use cookie as session identifier
@@ -54,5 +52,15 @@
 				long timestamp = dateFormat.parse(dateString).getTime();
 				String uri = values[3];
+				String ref = values[4];
+				List<String> postedVars = new ArrayList<String>();
+				for( int i=5 ; i<values.length ; i++ ) {
+					postedVars.add(values[i]);
+				}
 				
+					
+				WebEvent event = new WebEvent(uri, timestamp, postedVars);
+				
+				
+				// find session and add event
 				List<Integer> sessionIds = cookieSessionMap.get(cookie);
 				if( sessionIds==null ) {
@@ -72,8 +80,8 @@
 					sessionIds.add(++lastId);
 					List<WebEvent> newSession = new LinkedList<WebEvent>();
-					newSession.add(new WebEvent(uri, timestamp));
+					newSession.add(event);
 					sessions.add(newSession);
 				} else {
-					lastSession.add(new WebEvent(uri, timestamp));
+					lastSession.add(event);
 				}
 			} 
@@ -84,5 +92,5 @@
 		
 	}
-
+	
 	@Override
 	public void help() {
Index: /trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/web/data/WebEvent.java
===================================================================
--- /trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/web/data/WebEvent.java	(revision 52)
+++ /trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/web/data/WebEvent.java	(revision 53)
@@ -1,13 +1,26 @@
 package de.ugoe.cs.eventbench.web.data;
 
-import de.ugoe.cs.eventbench.data.Event;
+import java.util.List;
 
-public class WebEvent extends Event<String> {
+import de.ugoe.cs.eventbench.data.ReplayableEvent;
+
+public class WebEvent extends ReplayableEvent<WebRequest> {
 
 	private final long timestamp;
+	private String uri;
 	
-	public WebEvent(String type, long timestamp) {
-		super(type);
+	private final static String makeType(String uri, List<String> postVars) {
+		String type = uri;
+		if( postVars!=null && !postVars.isEmpty() ) {
+			type += postVars.toString().replace(" ", "");
+		}
+		return type;
+	}
+	
+	public WebEvent(String uri, long timestamp, List<String> postVars) {
+		super(makeType(uri, postVars));
 		this.timestamp = timestamp;
+		this.uri = uri;
+		addReplayEvent(new WebRequest(uri, postVars));
 	}
 	
Index: /trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/web/data/WebRequest.java
===================================================================
--- /trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/web/data/WebRequest.java	(revision 53)
+++ /trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/web/data/WebRequest.java	(revision 53)
@@ -0,0 +1,31 @@
+package de.ugoe.cs.eventbench.web.data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import de.ugoe.cs.eventbench.data.IReplayable;
+
+public class WebRequest implements IReplayable {
+
+	List<String> postVars;
+	
+	String targetUri;
+	
+	public WebRequest(String uri, List<String> postVars) {
+		targetUri = uri;
+		this.postVars = new ArrayList<String>(postVars); // defensive copy
+	}
+	
+	@Override
+	public String getReplayXml() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public String getTarget() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+}