Author: aparfonov Date: 2009-11-13 04:16:23 -0500 (Fri, 13 Nov 2009) New Revision: 623 Modified: ws/trunk/exo.ws.frameworks.servlet/pom.xml ws/trunk/exo.ws.testframework/pom.xml ws/trunk/exo.ws.testframework/src/main/java/org/exoplatform/services/test/mock/MockHttpServletResponse.java ws/trunk/pom.xml Log: EXOJCR-239 : Modified: ws/trunk/exo.ws.frameworks.servlet/pom.xml =================================================================== --- ws/trunk/exo.ws.frameworks.servlet/pom.xml 2009-11-13 02:39:29 UTC (rev 622) +++ ws/trunk/exo.ws.frameworks.servlet/pom.xml 2009-11-13 09:16:23 UTC (rev 623) @@ -34,6 +34,10 @@ <dependencies> <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </dependency> + <dependency> <groupId>org.exoplatform.kernel</groupId> <artifactId>exo.kernel.component.common</artifactId> </dependency> Modified: ws/trunk/exo.ws.testframework/pom.xml =================================================================== --- ws/trunk/exo.ws.testframework/pom.xml 2009-11-13 02:39:29 UTC (rev 622) +++ ws/trunk/exo.ws.testframework/pom.xml 2009-11-13 09:16:23 UTC (rev 623) @@ -36,8 +36,6 @@ <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> - <version>2.3</version> - <scope>compile</scope> </dependency> </dependencies> </project> \ No newline at end of file Modified: ws/trunk/exo.ws.testframework/src/main/java/org/exoplatform/services/test/mock/MockHttpServletResponse.java =================================================================== --- ws/trunk/exo.ws.testframework/src/main/java/org/exoplatform/services/test/mock/MockHttpServletResponse.java 2009-11-13 02:39:29 UTC (rev 622) +++ ws/trunk/exo.ws.testframework/src/main/java/org/exoplatform/services/test/mock/MockHttpServletResponse.java 2009-11-13 09:16:23 UTC (rev 623) @@ -81,7 +81,7 @@ protected int contentLength = -1; /** The encoding. */ - protected String encoding = null; + protected String charset = null; /** The date format we will use for creating date headers. */ protected static final SimpleDateFormat format = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss zzz", Locale.US); @@ -364,15 +364,23 @@ */ public String getCharacterEncoding() { - if (encoding == null) + if (charset == null) return ("UTF-8"); else - return (encoding); + return (charset); } /** * {@inheritDoc} */ + public String getContentType() + { + return contentType; + } + + /** + * {@inheritDoc} + */ public Locale getLocale() { return locale; @@ -391,6 +399,14 @@ /** * {@inheritDoc} */ + public void setCharacterEncoding(String charset) + { + this.charset = charset; + } + + /** + * {@inheritDoc} + */ public void setContentLength(int length) { this.contentLength = length; Modified: ws/trunk/pom.xml =================================================================== --- ws/trunk/pom.xml 2009-11-13 02:39:29 UTC (rev 622) +++ ws/trunk/pom.xml 2009-11-13 09:16:23 UTC (rev 623) @@ -140,6 +140,11 @@ <artifactId>jsr250-api</artifactId> <version>1.0</version> </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.4</version> + </dependency> </dependencies> </dependencyManagement> </project>