Index: /CKEditor.Java/ckeditor-java/trunk/pom.xml
===================================================================
--- /CKEditor.Java/ckeditor-java/trunk/pom.xml	(revision 6789)
+++ /CKEditor.Java/ckeditor-java/trunk/pom.xml	(revision 6790)
@@ -76,4 +76,21 @@
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-war-plugin</artifactId>
+				<version>2.1.1</version>
+				<configuration>
+					<archive>
+						<addMavenDescriptor>false</addMavenDescriptor>
+						<manifestEntries>
+							<Implementation-Title>CKEditor for Java</Implementation-Title>
+							<Implementation-Version>2.0</Implementation-Version>
+							<Implementation-Vendor-Id>com.ckeditor</Implementation-Vendor-Id>
+							<Implementation-URL>http://ckeditor.com</Implementation-URL>
+							<Built-By>CKSource - Frederico Knabben</Built-By>
+						</manifestEntries>
+					</archive>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
@@ -84,4 +101,10 @@
 			<version>3.5.3-SNAPSHOT</version>
 		</dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>servlet-api</artifactId>
+			<version>2.5</version>
+			<scope>provided</scope>
+		</dependency>
 	</dependencies>
 </project>
Index: /CKEditor.Java/ckeditor-java/trunk/src/main/java/com/ckeditor/SamplePostData.java
===================================================================
--- /CKEditor.Java/ckeditor-java/trunk/src/main/java/com/ckeditor/SamplePostData.java	(revision 6790)
+++ /CKEditor.Java/ckeditor-java/trunk/src/main/java/com/ckeditor/SamplePostData.java	(revision 6790)
@@ -0,0 +1,52 @@
+package com.ckeditor;
+
+import java.io.IOException;
+import java.util.Enumeration;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+public class SamplePostData {
+
+	private static final String[] CHARS_FROM  = {"&", "\"", "<", ">"};
+	private static final String[] CHARS_TO = {"&amp;", "&quot;", "&lt;", "&gt;"};
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -8568318698824941902L;
+	private HttpServletRequest request;
+	
+	public SamplePostData(HttpServletRequest request) {
+		this.request = request;
+	}
+	
+	public String getAllFormFieldsAndValues() {
+		StringBuffer sb = new StringBuffer();
+
+		Enumeration e = request.getParameterNames();
+		while (e.hasMoreElements()) {
+			String field = (String) e.nextElement();
+			String fieldValue = request.getParameter(field);
+			sb.append("<tr>");	
+			sb.append("<th style=\"vertical-align: top\">");
+			sb.append(field);
+			sb.append("</th>");
+			sb.append("<td><pre class=\"samples\">");
+			sb.append(parse(fieldValue));
+			sb.append("</pre><//td>");
+			sb.append("</tr>");
+		}
+		return sb.toString();
+	}
+
+	private Object parse(String fieldValue) {
+		String fv = fieldValue;
+		for (int i = 0; i < CHARS_FROM.length; i++) {
+			fv = fv.replaceAll(CHARS_FROM[i], CHARS_TO[i]);
+		}
+		return fv;
+	}
+
+}
Index: /CKEditor.Java/ckeditor-java/trunk/src/main/webapp/WEB-INF/web.xml
===================================================================
--- /CKEditor.Java/ckeditor-java/trunk/src/main/webapp/WEB-INF/web.xml	(revision 6789)
+++ /CKEditor.Java/ckeditor-java/trunk/src/main/webapp/WEB-INF/web.xml	(revision 6790)
@@ -7,10 +7,4 @@
 		<session-timeout>10</session-timeout>
 	</session-config>
-	
-	<jsp-config>
-		<taglib>
-			<taglib-uri>/WEB-INF/ckeditor</taglib-uri>
-			<taglib-location>/WEB-INF/ckeditor.tld</taglib-location>
-		</taglib>
-	</jsp-config>
+
 </web-app>
Index: /CKEditor.Java/ckeditor-java/trunk/src/main/webapp/_samples/advanced.jsp
===================================================================
--- /CKEditor.Java/ckeditor-java/trunk/src/main/webapp/_samples/advanced.jsp	(revision 6789)
+++ /CKEditor.Java/ckeditor-java/trunk/src/main/webapp/_samples/advanced.jsp	(revision 6790)
@@ -33,5 +33,5 @@
 	</div>
 	<!-- This <fieldset> holds the HTML code that you will usually find in your pages. -->
-	<form action="#" method="post">
+	<form action="assets/sample_posteddata.jsp" method="post">
 		<p>
 			<label for="editor1">
@@ -51,6 +51,4 @@
 				 editor="editor1" value="<%= value %>"
 				 events="<%=eventHandler %>"/>
-			 
-			<input type="submit" value="Submit"/>
 		</p>
 		<p>
@@ -65,4 +63,5 @@
 		%>
 		<ckeditor:replace basePath="../ckeditor/" config="<%=config2 %>" replace="editor2" initialized="true"/>
+		<input type="submit" value="Submit"/>
 	</form>
 	<div id="footer">
Index: /CKEditor.Java/ckeditor-java/trunk/src/main/webapp/_samples/assets/sample_posteddata.jsp
===================================================================
--- /CKEditor.Java/ckeditor-java/trunk/src/main/webapp/_samples/assets/sample_posteddata.jsp	(revision 6790)
+++ /CKEditor.Java/ckeditor-java/trunk/src/main/webapp/_samples/assets/sample_posteddata.jsp	(revision 6790)
@@ -0,0 +1,43 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<%@page import="com.ckeditor.SamplePostData"%>
+<%@page import="java.util.Enumeration"%>
+<%
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+%>
+<%@page language="Java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>Sample &mdash; CKEditor</title>
+	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+	<link type="text/css" rel="stylesheet" href="../../ckeditor/_samples/sample.css" />
+</head>
+<body>
+	<h1 class="samples">
+		CKEditor &mdash; Posted Data
+	</h1>
+	<table border="1" cellspacing="0" id="outputSample">
+		<colgroup><col width="100" /></colgroup>
+		<thead>
+			<tr>
+				<th>Field&nbsp;Name</th>
+				<th>Value</th>
+			</tr>
+		</thead>
+	<%
+		out.write(new SamplePostData(request).getAllFormFieldsAndValues());
+	%>
+	</table>
+	<div id="footer">
+		<hr />
+		<p>
+			CKEditor - The text editor for the Internet - <a class="samples" href="http://ckeditor.com/">http://ckeditor.com</a>
+		</p>
+		<p id="copy">
+			Copyright &copy; 2003-2011, <a class="samples" href="http://cksource.com/">CKSource</a> - Frederico Knabben. All rights reserved.
+		</p>
+	</div>
+</body>
+</html>
Index: /CKEditor.Java/ckeditor-java/trunk/src/main/webapp/_samples/replace.jsp
===================================================================
--- /CKEditor.Java/ckeditor-java/trunk/src/main/webapp/_samples/replace.jsp	(revision 6789)
+++ /CKEditor.Java/ckeditor-java/trunk/src/main/webapp/_samples/replace.jsp	(revision 6790)
@@ -34,5 +34,5 @@
 		</noscript>
 	</div>
-	<form action="index.php" method="post">
+	<form action="assets/sample_posteddata.jsp" method="post">
 		<p>
 			<label for="editor1">
Index: /CKEditor.Java/ckeditor-java/trunk/src/main/webapp/_samples/replaceAll.jsp
===================================================================
--- /CKEditor.Java/ckeditor-java/trunk/src/main/webapp/_samples/replaceAll.jsp	(revision 6789)
+++ /CKEditor.Java/ckeditor-java/trunk/src/main/webapp/_samples/replaceAll.jsp	(revision 6790)
@@ -36,5 +36,5 @@
 		</noscript>
 	</div>
-	<form action="#" method="post">
+	<form action="assets/sample_posteddata.jsp" method="post">
 		<p>
 			<label for="editor1">
Index: /CKEditor.Java/ckeditor-java/trunk/src/main/webapp/_samples/standalone.jsp
===================================================================
--- /CKEditor.Java/ckeditor-java/trunk/src/main/webapp/_samples/standalone.jsp	(revision 6789)
+++ /CKEditor.Java/ckeditor-java/trunk/src/main/webapp/_samples/standalone.jsp	(revision 6790)
@@ -32,5 +32,5 @@
 	</div>
 	<!-- This <fieldset> holds the HTML code that you will usually find in your pages. -->
-	<form action="../sample_posteddata.php" method="post">
+	<form action="assets/sample_posteddata.jsp" method="post">
 		<p>
 			<label for="editor1">
