Revision: 898
http://jwebunit.svn.sourceforge.net/jwebunit/?rev=898&view=rev
Author: henryju
Date: 2011-03-16 09:23:19 +0000 (Wed, 16 Mar 2011)
Log Message:
-----------
Updated some plugins. Migrated from Jetty 6 to Jetty 6.
Modified Paths:
--------------
trunk/jwebunit-commons-tests/pom.xml
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/WebCookieTest.java
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/util/CookiesServlet.java
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/util/JettySetup.java
trunk/jwebunit-commons-tests/src/main/resources/logback-test.xml
trunk/pom.xml
Added Paths:
-----------
trunk/jwebunit-commons-tests/src/main/resources/jetty-users.properties
Modified: trunk/jwebunit-commons-tests/pom.xml
===================================================================
--- trunk/jwebunit-commons-tests/pom.xml 2011-03-14 11:11:36 UTC (rev
897)
+++ trunk/jwebunit-commons-tests/pom.xml 2011-03-16 09:23:19 UTC (rev
898)
@@ -19,8 +19,8 @@
<artifactId>hamcrest-library</artifactId>
</dependency>
<dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-webapp</artifactId>
</dependency>
<dependency>
<groupId>net.sourceforge.jwebunit</groupId>
Modified:
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/WebCookieTest.java
===================================================================
---
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/WebCookieTest.java
2011-03-14 11:11:36 UTC (rev 897)
+++
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/WebCookieTest.java
2011-03-16 09:23:19 UTC (rev 898)
@@ -88,8 +88,8 @@
*/
@Test
public void testCookieMatchLastCookie() {
- beginAt("/cookies.jsp?threesamecookies=true&dont_set=1");
- assertCookieValueMatch("JSESSIONID", "(.)*worker3");
+ beginAt("/cookies.jsp?set_by_headers=true&dont_set=1");
+ assertCookieValueMatch("JSESSIONID", "(.)*worker2");
}
@@ -117,11 +117,10 @@
*/
@Test
public void testCookieSetInHeaders() {
- beginAt("/cookies.jsp?threesamecookies=true&dont_set=1");
+ beginAt("/cookies.jsp?set_by_headers=true&dont_set=1");
List<HttpHeader> headers = getResponseHeaders();
boolean foundCookie1 = false;
boolean foundCookie2 = false;
- boolean foundCookie3 = false;
for (HttpHeader h : headers) {
if (h.getName().equals("Set-Cookie")) {
if (h.getValue().contains(".worker1")) {
@@ -130,11 +129,8 @@
else if (h.getValue().contains(".worker2")) {
foundCookie2 = true;
}
- else if (h.getValue().contains(".worker3")) {
- foundCookie3 = true;
- }
}
}
- assertTrue("getResponseHeaders should return all headers even
duplicates", foundCookie1 && foundCookie2 && foundCookie3);
+ assertTrue("getResponseHeaders should return all headers even
duplicates", foundCookie1 && foundCookie2);
}
}
\ No newline at end of file
Modified:
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/util/CookiesServlet.java
===================================================================
---
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/util/CookiesServlet.java
2011-03-14 11:11:36 UTC (rev 897)
+++
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/util/CookiesServlet.java
2011-03-16 09:23:19 UTC (rev 898)
@@ -28,6 +28,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.eclipse.jetty.http.HttpHeaders;
+
public class CookiesServlet extends HttpServlet {
private static final long serialVersionUID = 1L;
@@ -74,7 +76,7 @@
}
/*
- * To test if serveral same cookies with same path, domain and
name
+ * To test if several same cookies with same path, domain and
name
* are passed through to the test API. This "should" not be
done by a
* server but there are use cases where it has to be done. One
example is
* the JSESSIONID cookie which is set by Tomcat but has to be
modified in a
@@ -85,7 +87,7 @@
*
* See
http://tools.ietf.org/html/draft-ietf-httpstate-cookie-21#section-5.3, 11
*/
- if(request.getParameter("threesamecookies") != null) {
+ if(request.getParameter("set_by_headers") != null) {
// 1
Cookie jsessionIDCookie = new Cookie("JSESSIONID",
"07D486AC962DE67F176F70B7C9816AAE.worker1");
jsessionIDCookie.setPath("/");
@@ -93,18 +95,13 @@
jsessionIDCookie.setMaxAge(-2);
jsessionIDCookie.setDomain("localhost");
response.addCookie(jsessionIDCookie);
- // 2
- jsessionIDCookie = new Cookie("JSESSIONID",
"07D486AC962DE67F176F70B7C9816AAE.worker2");
- jsessionIDCookie.setMaxAge(-2);
- jsessionIDCookie.setDomain("localhost");
- response.addCookie(jsessionIDCookie);
- // 3
- jsessionIDCookie = new Cookie("JSESSIONID",
"07D486AC962DE67F176F70B7C9816AAE.worker3");
- jsessionIDCookie.setMaxAge(-2);
- jsessionIDCookie.setDomain("localhost");
- jsessionIDCookie.setSecure(true);
- response.addCookie(jsessionIDCookie);
+ //With Jetty 6 we are now forced to access low level
API to be able to set 2 same named cookies in the same response
+ org.eclipse.jetty.server.Response responseJetty =
(org.eclipse.jetty.server.Response) response;
+ String cookie1 =
responseJetty.getHttpFields().getStringField(HttpHeaders.SET_COOKIE);
+ // 2
+ String cookie2 = cookie1.replace("worker1", "worker2");
+ response.addHeader(HttpHeaders.SET_COOKIE, cookie2);
}
}
Modified:
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/util/JettySetup.java
===================================================================
---
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/util/JettySetup.java
2011-03-14 11:11:36 UTC (rev 897)
+++
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/util/JettySetup.java
2011-03-16 09:23:19 UTC (rev 898)
@@ -19,25 +19,22 @@
package net.sourceforge.jwebunit.tests.util;
-import static org.junit.Assert.fail;
-
import java.net.URL;
-
import net.sourceforge.jwebunit.tests.JWebUnitAPITestCase;
-
+import org.eclipse.jetty.http.MimeTypes;
+import org.eclipse.jetty.security.HashLoginService;
+import org.eclipse.jetty.server.Connector;
+import org.eclipse.jetty.server.Handler;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.handler.DefaultHandler;
+import org.eclipse.jetty.server.handler.HandlerCollection;
+import org.eclipse.jetty.server.nio.SelectChannelConnector;
+import org.eclipse.jetty.webapp.WebAppContext;
import org.junit.AfterClass;
import org.junit.BeforeClass;
-import org.mortbay.jetty.Connector;
-import org.mortbay.jetty.Handler;
-import org.mortbay.jetty.MimeTypes;
-import org.mortbay.jetty.Server;
-import org.mortbay.jetty.handler.DefaultHandler;
-import org.mortbay.jetty.handler.HandlerCollection;
-import org.mortbay.jetty.nio.SelectChannelConnector;
-import org.mortbay.jetty.security.HashUserRealm;
-import org.mortbay.jetty.security.UserRealm;
-import org.mortbay.jetty.webapp.WebAppContext;
+import static org.junit.Assert.fail;
+
/**
* Sets up and tears down the Jetty servlet engine before and after the tests
in
* the <code>TestSuite</code> have run.
@@ -81,12 +78,10 @@
handlers.setHandlers(new Handler[]{wah, new
DefaultHandler()});
jettyServer.setHandler(wah);
- HashUserRealm myrealm = new HashUserRealm("MyRealm");
- myrealm.put("jetty", "jetty");
- myrealm.addUserToRole("jetty", "user");
- myrealm.put("admin", "admin");
- myrealm.addUserToRole("admin", "admin");
- jettyServer.setUserRealms(new UserRealm[]{myrealm});
+ HashLoginService myrealm = new
HashLoginService("MyRealm");
+ URL config =
JettySetup.class.getResource("/jetty-users.properties");
+ myrealm.setConfig(config.toString());
+ jettyServer.addBean(myrealm);
wah.setContextPath(JWebUnitAPITestCase.JETTY_URL);
Added: trunk/jwebunit-commons-tests/src/main/resources/jetty-users.properties
===================================================================
--- trunk/jwebunit-commons-tests/src/main/resources/jetty-users.properties
(rev 0)
+++ trunk/jwebunit-commons-tests/src/main/resources/jetty-users.properties
2011-03-16 09:23:19 UTC (rev 898)
@@ -0,0 +1,21 @@
+#
+# Copyright (c) 2010, JWebUnit team.
+#
+# This file is part of JWebUnit.
+#
+# JWebUnit is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# JWebUnit 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 Lesser General Public License
+# along with JWebUnit. If not, see <http://www.gnu.org/licenses/>.
+#
+
+jetty: jetty,user
+admin: admin,admin
Property changes on:
trunk/jwebunit-commons-tests/src/main/resources/jetty-users.properties
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/jwebunit-commons-tests/src/main/resources/logback-test.xml
===================================================================
--- trunk/jwebunit-commons-tests/src/main/resources/logback-test.xml
2011-03-14 11:11:36 UTC (rev 897)
+++ trunk/jwebunit-commons-tests/src/main/resources/logback-test.xml
2011-03-16 09:23:19 UTC (rev 898)
@@ -38,7 +38,7 @@
<logger name="org.apache.commons.httpclient" level="ERROR"/>
<logger name="org.apache.http" level="ERROR"/>
- <logger name="org.mortbay" level="ERROR"/>
+ <logger name="org.eclipse.jetty" level="ERROR"/>
<logger name="ch.qos.logback" level="ERROR"/>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2011-03-14 11:11:36 UTC (rev 897)
+++ trunk/pom.xml 2011-03-16 09:23:19 UTC (rev 898)
@@ -226,12 +226,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.7.2</version>
+ <version>2.8</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.4.3</version>
+ <version>2.5</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -348,7 +348,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changes-plugin</artifactId>
- <version>2.3</version>
+ <version>2.4</version>
<inherited>false</inherited>
<executions>
<execution>
@@ -382,9 +382,9 @@
<version>1.3.RC2</version>
</dependency>
<dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <version>6.1.26</version>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-webapp</artifactId>
+ <version>7.3.1.v20110307</version>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
@@ -541,7 +541,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.7.2</version>
+ <version>2.8</version>
<configuration>
<aggregate>true</aggregate>
</configuration>
@@ -554,7 +554,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changes-plugin</artifactId>
- <version>2.3</version>
+ <version>2.4</version>
<inherited>false</inherited>
<reportSets>
<reportSet>
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Colocation vs. Managed Hosting
A question and answer guide to determining the best fit
for your organization - today and in the future.
http://p.sf.net/sfu/internap-sfd2d
_______________________________________________
JWebUnit-development mailing list
JWebUnit-development@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jwebunit-development
