Author: nomadium-guest
Date: 2011-08-04 00:22:11 +0000 (Thu, 04 Aug 2011)
New Revision: 13921
Added:
branches/libspring-java/3.1/debian/patches/0011_servlet_30.diff
Modified:
branches/libspring-java/3.1/debian/changelog
branches/libspring-java/3.1/debian/patches/series
Log:
* Add dependencies on libhttpcore-java and libhttpclient-java.
* Add 0010_httpclient_41.diff and 0011_servlet_30.diff patches.
* Update watch file.
Modified: branches/libspring-java/3.1/debian/changelog
===================================================================
--- branches/libspring-java/3.1/debian/changelog 2011-08-03 22:14:57 UTC
(rev 13920)
+++ branches/libspring-java/3.1/debian/changelog 2011-08-04 00:22:11 UTC
(rev 13921)
@@ -1,11 +1,13 @@
-libspring-java (3.1.0~M2-1) experimental; urgency=low
+libspring-java (3.1.0~M2-1) UNRELEASED; urgency=low
* New upstream release.
* Refresh patches.
* Bump Standards-Version to 3.9.2. No changes were required.
- * Add dependencies on libhttpcore-java.
+ * Add dependencies on libhttpcore-java and libhttpclient-java.
+ * Add 0010_httpclient_41.diff and 0011_servlet_30.diff patches.
+ * Update watch file.
- -- Miguel Landaeta <mig...@miguel.cc> Tue, 28 Jun 2011 19:58:45 -0430
+ -- Miguel Landaeta <mig...@miguel.cc> Wed, 03 Aug 2011 19:30:20 -0430
libspring-java (3.0.5.RELEASE-3) unstable; urgency=low
Added: branches/libspring-java/3.1/debian/patches/0011_servlet_30.diff
===================================================================
--- branches/libspring-java/3.1/debian/patches/0011_servlet_30.diff
(rev 0)
+++ branches/libspring-java/3.1/debian/patches/0011_servlet_30.diff
2011-08-04 00:22:11 UTC (rev 13921)
@@ -0,0 +1,251 @@
+Description: Dummy compatibility with Servlet 3.0 API
+Author: Miguel Landaeta <mig...@miguel.cc>
+Forwarded: no
+Last-Update: 2011-08-03
+
+---
libspring-java-3.1.0~M2.orig/projects/org.springframework.test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java
++++
libspring-java-3.1.0~M2/projects/org.springframework.test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java
+@@ -22,6 +22,7 @@ import java.io.InputStream;
+ import java.io.InputStreamReader;
+ import java.io.Reader;
+ import java.io.UnsupportedEncodingException;
++import java.io.IOException;
+ import java.security.Principal;
+ import java.util.Collection;
+ import java.util.Collections;
+@@ -41,7 +42,14 @@ import javax.servlet.ServletContext;
+ import javax.servlet.ServletInputStream;
+ import javax.servlet.http.Cookie;
+ import javax.servlet.http.HttpServletRequest;
++import javax.servlet.http.HttpServletResponse;
+ import javax.servlet.http.HttpSession;
++import javax.servlet.http.Part;
++import javax.servlet.AsyncContext;
++import javax.servlet.ServletRequest;
++import javax.servlet.ServletResponse;
++import javax.servlet.DispatcherType;
++import javax.servlet.ServletException;
+
+ import org.springframework.util.Assert;
+ import org.springframework.util.LinkedCaseInsensitiveMap;
+@@ -855,4 +863,48 @@ public class MockHttpServletRequest impl
+ return isRequestedSessionIdFromURL();
+ }
+
++ public boolean isAsyncSupported() {
++ throw new UnsupportedOperationException("isAsyncSupported");
++ }
++
++ public AsyncContext getAsyncContext() {
++ throw new UnsupportedOperationException("getAsyncContext");
++ }
++
++ public AsyncContext startAsync(ServletRequest servletRequest,
ServletResponse servletResponse) {
++ throw new UnsupportedOperationException("startAsync");
++ }
++
++ public AsyncContext startAsync() {
++ throw new UnsupportedOperationException("startAsync");
++ }
++
++ public boolean isAsyncStarted() {
++ throw new UnsupportedOperationException("isAsyncStarted");
++ }
++
++ public DispatcherType getDispatcherType() {
++ throw new UnsupportedOperationException("getDispatcherType");
++ }
++
++ public void logout() throws ServletException {
++ throw new UnsupportedOperationException("logout");
++ }
++
++ public void login(String username, String password) throws
ServletException {
++ throw new UnsupportedOperationException("login");
++ }
++
++ public Part getPart(String name) throws IOException,
IllegalStateException, ServletException {
++ throw new UnsupportedOperationException("getPart");
++ }
++
++ public Collection<Part> getParts() throws IOException,
IllegalStateException, ServletException {
++ throw new UnsupportedOperationException("getParts");
++ }
++
++ public boolean authenticate(HttpServletResponse response) throws
IOException, ServletException {
++ throw new UnsupportedOperationException("authenticate");
++ }
++
+ }
+---
libspring-java-3.1.0~M2.orig/projects/org.springframework.test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java
++++
libspring-java-3.1.0~M2/projects/org.springframework.test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java
+@@ -24,6 +24,7 @@ import java.io.PrintWriter;
+ import java.io.UnsupportedEncodingException;
+ import java.io.Writer;
+ import java.util.ArrayList;
++import java.util.Collection;
+ import java.util.Collections;
+ import java.util.List;
+ import java.util.Locale;
+@@ -292,9 +293,12 @@ public class MockHttpServletResponse imp
+ * @param name the name of the header
+ * @return the associated header value, or <code>null<code> if none
+ */
+- public Object getHeader(String name) {
++ public String getHeader(String name) {
++ throw new UnsupportedOperationException("getHeader");
++ /*
+ HeaderValueHolder header =
HeaderValueHolder.getByName(this.headers, name);
+ return (header != null ? header.getValue() : null);
++ */
+ }
+
+ /**
+@@ -302,9 +306,12 @@ public class MockHttpServletResponse imp
+ * @param name the name of the header
+ * @return the associated header values, or an empty List if none
+ */
+- public List<Object> getHeaders(String name) {
++ public Collection<String> getHeaders(String name) {
++ throw new UnsupportedOperationException("getHeader");
++ /*
+ HeaderValueHolder header =
HeaderValueHolder.getByName(this.headers, name);
+ return (header != null ? header.getValues() :
Collections.emptyList());
++ */
+ }
+
+ /**
+---
libspring-java-3.1.0~M2.orig/projects/org.springframework.test/src/main/java/org/springframework/mock/web/MockServletContext.java
++++
libspring-java-3.1.0~M2/projects/org.springframework.test/src/main/java/org/springframework/mock/web/MockServletContext.java
+@@ -23,6 +23,7 @@ import java.net.MalformedURLException;
+ import java.net.URL;
+ import java.util.Collections;
+ import java.util.Enumeration;
++import java.util.EventListener;
+ import java.util.HashMap;
+ import java.util.HashSet;
+ import java.util.LinkedHashMap;
+@@ -33,7 +34,14 @@ import java.util.Vector;
+ import javax.activation.FileTypeMap;
+ import javax.servlet.RequestDispatcher;
+ import javax.servlet.Servlet;
++import javax.servlet.Filter;
+ import javax.servlet.ServletContext;
++import javax.servlet.ServletException;
++import javax.servlet.SessionCookieConfig;
++import javax.servlet.SessionTrackingMode;
++import javax.servlet.ServletRegistration;
++import javax.servlet.FilterRegistration;
++import javax.servlet.descriptor.JspConfigDescriptor;
+
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+@@ -362,4 +370,108 @@ public class MockServletContext implemen
+ }
+ }
+
++ public SessionCookieConfig getSessionCookieConfig() {
++ throw new
UnsupportedOperationException("getSessionCookieConfig");
++ }
++
++ public Map<String,? extends FilterRegistration>
getFilterRegistrations() {
++ throw new
UnsupportedOperationException("getFilterRegistration");
++ }
++
++ public void setSessionTrackingModes(Set<SessionTrackingMode>
sessionTrackingModes) {
++ throw new
UnsupportedOperationException("setSessionTrackingModes");
++ }
++
++ public Set<SessionTrackingMode> getEffectiveSessionTrackingModes() {
++ throw new
UnsupportedOperationException("getEffectiveSessionTrackingModes");
++ }
++
++ public Set<SessionTrackingMode> getDefaultSessionTrackingModes() {
++ throw new
UnsupportedOperationException("getEffectiveDefaultTrackingModes");
++ }
++
++ public ServletRegistration getServletRegistration(String servletName) {
++ throw new
UnsupportedOperationException("getServletRegistration");
++ }
++
++ public FilterRegistration getFilterRegistration(String filterName) {
++ throw new
UnsupportedOperationException("getFilterRegistration");
++ }
++
++ public void addListener(Class<? extends EventListener> listenerClass) {
++ throw new UnsupportedOperationException("addListener");
++ }
++
++ public void addListener(String className) {
++ throw new UnsupportedOperationException("addListener");
++ }
++
++ public <T extends EventListener> void addListener(T t) {
++ throw new UnsupportedOperationException("addListener");
++ }
++
++ public <T extends EventListener> T createListener(Class<T> c) throws
ServletException {
++ throw new UnsupportedOperationException("createListener");
++ }
++
++ public ServletRegistration.Dynamic addServlet(String servletName,
String className) {
++ throw new UnsupportedOperationException("addServlet");
++ }
++
++ public ServletRegistration.Dynamic addServlet(String servletName,
Servlet servlet) {
++ throw new UnsupportedOperationException("addServlet");
++ }
++
++ public ServletRegistration.Dynamic addServlet(String servletName,
Class<? extends Servlet> servletClass) {
++ throw new UnsupportedOperationException("addServlet");
++ }
++
++ public int getEffectiveMinorVersion() {
++ throw new
UnsupportedOperationException("getEffectiveMinorVersion");
++ }
++
++ public ClassLoader getClassLoader() {
++ throw new UnsupportedOperationException("getClassLoader");
++ }
++
++ public FilterRegistration.Dynamic addFilter(String filterName, String
className) {
++ throw new UnsupportedOperationException("addFilter");
++ }
++
++ public FilterRegistration.Dynamic addFilter(String filterName, Filter
filter) {
++ throw new UnsupportedOperationException("addFilter");
++ }
++
++ public FilterRegistration.Dynamic addFilter(String filterName, Class<?
extends Filter> filterClass) {
++ throw new UnsupportedOperationException("addFilter");
++ }
++
++ public void declareRoles(java.lang.String... roleNames) {
++ throw new UnsupportedOperationException("declareRoles");
++ }
++
++ public JspConfigDescriptor getJspConfigDescriptor() {
++ throw new
UnsupportedOperationException("getJspConfigDescriptor");
++ }
++
++ public boolean setInitParameter(String name, String value) {
++ throw new UnsupportedOperationException("setInitParameter");
++ }
++
++ public <T extends Servlet> T createServlet(Class<T> c) throws
ServletException {
++ throw new UnsupportedOperationException("setInitParameter");
++ }
++
++ public int getEffectiveMajorVersion() {
++ throw new
UnsupportedOperationException("getEffectiveMajorVersion");
++ }
++
++ public <T extends Filter> T createFilter(Class<T> c) throws
ServletException {
++ throw new UnsupportedOperationException("createFilter");
++ }
++
++ public Map<String,? extends ServletRegistration>
getServletRegistrations() {
++ throw new
UnsupportedOperationException("getServletRegistrations");
++ }
++
+ }
Modified: branches/libspring-java/3.1/debian/patches/series
===================================================================
--- branches/libspring-java/3.1/debian/patches/series 2011-08-03 22:14:57 UTC
(rev 13920)
+++ branches/libspring-java/3.1/debian/patches/series 2011-08-04 00:22:11 UTC
(rev 13921)
@@ -8,3 +8,4 @@
0008_jpa_20_api.diff
0009_hibernate_validator_41.diff
0010_httpclient_41.diff
+0011_servlet_30.diff
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
