Skip to content
This repository was archived by the owner on Feb 8, 2023. It is now read-only.

Commit dedc357

Browse files
Add support for the oldest possible servlet version
1 parent a5c7667 commit dedc357

File tree

8 files changed

+29
-77
lines changed

8 files changed

+29
-77
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
A simple Java API for handling cookies
44

5-
* Supports Java 6+
5+
* Supports Java 6+, Servlet 2.2+
66
* [Unobtrusive](#json-data-binding) JSON Data Binding support
77
* [RFC 6265](http://www.rfc-editor.org/rfc/rfc6265.txt) compliant
88
* Enable [custom decoding](#converter)

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,8 @@
139139
<dependencies>
140140
<dependency>
141141
<groupId>javax.servlet</groupId>
142-
<artifactId>javax.servlet-api</artifactId>
143-
<version>3.0.1</version>
142+
<artifactId>servlet-api</artifactId>
143+
<version>2.2</version>
144144
<scope>provided</scope>
145145
</dependency>
146146
<dependency>

src/main/java/org/jscookie/Cookies.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -248,9 +248,6 @@ private Attributes extend( AttributesDefinition... mergeables ) {
248248
}
249249

250250
private void setCookie( String cookieValue, HttpServletResponse response ) {
251-
if ( response.getHeaders( "Set-Cookie" ).contains( cookieValue ) ) {
252-
return;
253-
}
254251
response.addHeader( "Set-Cookie", cookieValue );
255252
}
256253

src/test/java/org/jscookie/test/integration/encoding/CookiesEncodingIT.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.jscookie.test.integration.encoding;
22

3+
import java.io.File;
34
import java.net.URL;
45
import java.util.concurrent.TimeUnit;
56

@@ -36,7 +37,11 @@ public static Archive<?> createDeployment() {
3637
.as( GenericArchive.class );
3738

3839
WebArchive war = IntegrationUtils.createCommonDeployment()
39-
.merge( qunitFiles, "/", Filters.includeAll() );
40+
.merge( qunitFiles, "/", Filters.includeAll() )
41+
.addAsWebInfResource(
42+
new File( "src/test/resources/web.xml" ),
43+
"web.xml"
44+
);
4045

4146
System.out.println( " ----- LOGGING THE FILES ADDED TO JBOSS" );
4247
System.out.println( war.toString( true ) );

src/test/java/org/jscookie/test/integration/encoding/EncodingServlet.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import java.net.URLDecoder;
66

77
import javax.servlet.ServletException;
8-
import javax.servlet.annotation.WebServlet;
98
import javax.servlet.http.HttpServlet;
109
import javax.servlet.http.HttpServletRequest;
1110
import javax.servlet.http.HttpServletResponse;
@@ -14,7 +13,6 @@
1413

1514
import com.fasterxml.jackson.databind.ObjectMapper;
1615

17-
@WebServlet( "/encoding" )
1816
public class EncodingServlet extends HttpServlet {
1917
private static final long serialVersionUID = 1;
2018
@Override

src/test/java/org/jscookie/test/integration/write/MultipleSetCookieServlet.java

Lines changed: 0 additions & 19 deletions
This file was deleted.

src/test/java/org/jscookie/test/integration/write/SetCookieIT.java

Lines changed: 0 additions & 49 deletions
This file was deleted.

src/test/resources/web.xml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
3+
<web-app>
4+
<servlet>
5+
<servlet-name>encoding</servlet-name>
6+
<servlet-class>org.jscookie.test.integration.encoding.EncodingServlet</servlet-class>
7+
</servlet>
8+
<servlet-mapping>
9+
<servlet-name>encoding</servlet-name>
10+
<url-pattern>/encoding</url-pattern>
11+
</servlet-mapping>
12+
<servlet>
13+
<servlet-name>multiple-set-cookie</servlet-name>
14+
<servlet-class>org.jscookie.test.integration.write.MultipleSetCookieServlet</servlet-class>
15+
</servlet>
16+
<servlet-mapping>
17+
<servlet-name>multiple-set-cookie</servlet-name>
18+
<url-pattern>/multiple-set-cookie</url-pattern>
19+
</servlet-mapping>
20+
</web-app>

0 commit comments

Comments
 (0)