import branch for 1.0.x from svn
diff --git a/pom.xml b/pom.xml
index 23ea199..579816c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,13 +23,13 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>30</version>
+ <version>26</version>
<relativePath />
</parent>
<artifactId>org.apache.sling.servlet-helpers</artifactId>
<packaging>bundle</packaging>
- <version>1.1.3-SNAPSHOT</version>
+ <version>1.0.3-SNAPSHOT</version>
<name>Apache Sling Servlet Helpers</name>
<description>Mock implementations of SlingHttpServletRequest, SlingHttpServletResponse and related classes.</description>
@@ -55,6 +55,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
+ <version>3.0.1</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/src/main/java/org/apache/sling/servlethelpers/MockHttpSession.java b/src/main/java/org/apache/sling/servlethelpers/MockHttpSession.java
index bcaae1e..31d672b 100644
--- a/src/main/java/org/apache/sling/servlethelpers/MockHttpSession.java
+++ b/src/main/java/org/apache/sling/servlethelpers/MockHttpSession.java
@@ -27,7 +27,8 @@
import javax.servlet.http.HttpSession;
import org.apache.commons.collections.IteratorUtils;
-import org.osgi.annotation.versioning.ConsumerType;
+
+import aQute.bnd.annotation.ConsumerType;
/**
* Mock {@link HttpSession} implementation.
diff --git a/src/main/java/org/apache/sling/servlethelpers/MockRequestDispatcherFactory.java b/src/main/java/org/apache/sling/servlethelpers/MockRequestDispatcherFactory.java
index d3dbe38..5664035 100644
--- a/src/main/java/org/apache/sling/servlethelpers/MockRequestDispatcherFactory.java
+++ b/src/main/java/org/apache/sling/servlethelpers/MockRequestDispatcherFactory.java
@@ -22,7 +22,8 @@
import org.apache.sling.api.request.RequestDispatcherOptions;
import org.apache.sling.api.resource.Resource;
-import org.osgi.annotation.versioning.ConsumerType;
+
+import aQute.bnd.annotation.ConsumerType;
/**
* Interface to create a mock {@link RequestDispatcher} when calling the getRequestDispatcher methods
diff --git a/src/main/java/org/apache/sling/servlethelpers/MockRequestPathInfo.java b/src/main/java/org/apache/sling/servlethelpers/MockRequestPathInfo.java
index d14034c..4c6439d 100644
--- a/src/main/java/org/apache/sling/servlethelpers/MockRequestPathInfo.java
+++ b/src/main/java/org/apache/sling/servlethelpers/MockRequestPathInfo.java
@@ -21,7 +21,8 @@
import org.apache.commons.lang3.StringUtils;
import org.apache.sling.api.request.RequestPathInfo;
import org.apache.sling.api.resource.Resource;
-import org.osgi.annotation.versioning.ConsumerType;
+
+import aQute.bnd.annotation.ConsumerType;
/**
* Mock {@link RequestPathInfo} implementation.
diff --git a/src/main/java/org/apache/sling/servlethelpers/MockServletContext.java b/src/main/java/org/apache/sling/servlethelpers/MockServletContext.java
index 108facb..4741738 100644
--- a/src/main/java/org/apache/sling/servlethelpers/MockServletContext.java
+++ b/src/main/java/org/apache/sling/servlethelpers/MockServletContext.java
@@ -37,7 +37,7 @@
import javax.servlet.SessionTrackingMode;
import javax.servlet.descriptor.JspConfigDescriptor;
-import org.osgi.annotation.versioning.ConsumerType;
+import aQute.bnd.annotation.ConsumerType;
/**
* Mock {@link ServletContext} implementation.
@@ -301,9 +301,4 @@
throw new UnsupportedOperationException();
}
- @Override
- public String getVirtualServerName() {
- throw new UnsupportedOperationException();
- }
-
}
diff --git a/src/main/java/org/apache/sling/servlethelpers/MockSlingHttpServletRequest.java b/src/main/java/org/apache/sling/servlethelpers/MockSlingHttpServletRequest.java
index ac64f9a..6646a62 100644
--- a/src/main/java/org/apache/sling/servlethelpers/MockSlingHttpServletRequest.java
+++ b/src/main/java/org/apache/sling/servlethelpers/MockSlingHttpServletRequest.java
@@ -24,11 +24,9 @@
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.io.StringReader;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.net.URLEncoder;
-import java.nio.charset.Charset;
import java.security.Principal;
import java.util.ArrayList;
import java.util.Arrays;
@@ -44,7 +42,6 @@
import javax.servlet.AsyncContext;
import javax.servlet.DispatcherType;
-import javax.servlet.ReadListener;
import javax.servlet.RequestDispatcher;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
@@ -54,7 +51,6 @@
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpUpgradeHandler;
import javax.servlet.http.Part;
import org.apache.commons.collections.IteratorUtils;
@@ -70,7 +66,8 @@
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.servlets.HttpConstants;
-import org.osgi.annotation.versioning.ConsumerType;
+
+import aQute.bnd.annotation.ConsumerType;
/**
* Mock {@link SlingHttpServletRequest} implementation.
@@ -103,8 +100,6 @@
private String remoteHost;
private int remotePort;
private Locale locale = Locale.US;
- private boolean getInputStreamCalled;
- private boolean getReaderCalled;
private MockRequestDispatcherFactory requestDispatcherFactory;
@@ -544,28 +539,15 @@
@Override
public ServletInputStream getInputStream() {
- if (getReaderCalled) {
- throw new IllegalStateException();
+ if (content == null) {
+ return null;
}
- getInputStreamCalled = true;
return new ServletInputStream() {
- private final InputStream is = content == null ? new ByteArrayInputStream(new byte[0]) : new ByteArrayInputStream(content);
+ private final InputStream is = new ByteArrayInputStream(content);
@Override
public int read() throws IOException {
return is.read();
}
- @Override
- public boolean isReady() {
- return true;
- }
- @Override
- public boolean isFinished() {
- throw new UnsupportedOperationException();
- }
- @Override
- public void setReadListener(ReadListener readListener) {
- throw new UnsupportedOperationException();
- }
};
}
@@ -828,26 +810,7 @@
@Override
public BufferedReader getReader() {
- if (getInputStreamCalled) {
- throw new IllegalStateException();
- }
- getReaderCalled = true;
- if (this.content == null) {
- return new BufferedReader(new StringReader(""));
- } else {
- String content;
- try {
- if (characterEncoding == null) {
- content = new String(this.content, Charset.defaultCharset());
- } else {
- content = new String(this.content, characterEncoding);
- }
- } catch (UnsupportedEncodingException e) {
- content = new String(this.content, Charset.defaultCharset());
- }
- return new BufferedReader(new StringReader(content));
- }
-
+ throw new UnsupportedOperationException();
}
@Override
@@ -915,19 +878,4 @@
throw new UnsupportedOperationException();
}
- @Override
- public String changeSessionId() {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public <T extends HttpUpgradeHandler> T upgrade(Class<T> handlerClass) throws IOException, ServletException {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public long getContentLengthLong() {
- throw new UnsupportedOperationException();
- }
-
}
diff --git a/src/main/java/org/apache/sling/servlethelpers/MockSlingHttpServletResponse.java b/src/main/java/org/apache/sling/servlethelpers/MockSlingHttpServletResponse.java
index 4ee8f48..7a3dc91 100644
--- a/src/main/java/org/apache/sling/servlethelpers/MockSlingHttpServletResponse.java
+++ b/src/main/java/org/apache/sling/servlethelpers/MockSlingHttpServletResponse.java
@@ -29,7 +29,8 @@
import org.apache.commons.lang3.StringUtils;
import org.apache.sling.api.SlingHttpServletResponse;
import org.apache.sling.api.adapter.SlingAdaptable;
-import org.osgi.annotation.versioning.ConsumerType;
+
+import aQute.bnd.annotation.ConsumerType;
/**
* Mock {@link SlingHttpServletResponse} implementation.
@@ -280,9 +281,4 @@
throw new UnsupportedOperationException();
}
- @Override
- public void setContentLengthLong(long len) {
- throw new UnsupportedOperationException();
- }
-
}
diff --git a/src/main/java/org/apache/sling/servlethelpers/ResponseBodySupport.java b/src/main/java/org/apache/sling/servlethelpers/ResponseBodySupport.java
index e40bdfe..b9d6f64 100644
--- a/src/main/java/org/apache/sling/servlethelpers/ResponseBodySupport.java
+++ b/src/main/java/org/apache/sling/servlethelpers/ResponseBodySupport.java
@@ -25,7 +25,6 @@
import java.io.UnsupportedEncodingException;
import javax.servlet.ServletOutputStream;
-import javax.servlet.WriteListener;
import org.apache.commons.lang3.CharEncoding;
import org.apache.commons.lang3.StringUtils;
@@ -56,14 +55,6 @@
public void write(int b) throws IOException {
outputStream.write(b);
}
- @Override
- public boolean isReady() {
- return true;
- }
- @Override
- public void setWriteListener(WriteListener writeListener) {
- throw new UnsupportedOperationException();
- }
};
}
return servletOutputStream;
diff --git a/src/main/java/org/apache/sling/servlethelpers/package-info.java b/src/main/java/org/apache/sling/servlethelpers/package-info.java
index e8477bd..0bfb804 100644
--- a/src/main/java/org/apache/sling/servlethelpers/package-info.java
+++ b/src/main/java/org/apache/sling/servlethelpers/package-info.java
@@ -19,5 +19,5 @@
/**
* Mock implementation of selected Servlet-related Sling APIs.
*/
-@org.osgi.annotation.versioning.Version("1.2")
+@aQute.bnd.annotation.Version("1.1")
package org.apache.sling.servlethelpers;
diff --git a/src/test/java/org/apache/sling/servlethelpers/MockHttpSessionTest.java b/src/test/java/org/apache/sling/servlethelpers/MockHttpSessionTest.java
index 1b0bd1e..980253c 100644
--- a/src/test/java/org/apache/sling/servlethelpers/MockHttpSessionTest.java
+++ b/src/test/java/org/apache/sling/servlethelpers/MockHttpSessionTest.java
@@ -23,6 +23,7 @@
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
+import org.apache.sling.servlethelpers.MockHttpSession;
import org.junit.Before;
import org.junit.Test;
diff --git a/src/test/java/org/apache/sling/servlethelpers/MockRequestPathInfoTest.java b/src/test/java/org/apache/sling/servlethelpers/MockRequestPathInfoTest.java
index 4a6b15b..f94c380 100644
--- a/src/test/java/org/apache/sling/servlethelpers/MockRequestPathInfoTest.java
+++ b/src/test/java/org/apache/sling/servlethelpers/MockRequestPathInfoTest.java
@@ -22,6 +22,7 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
+import org.apache.sling.servlethelpers.MockRequestPathInfo;
import org.junit.Before;
import org.junit.Test;
diff --git a/src/test/java/org/apache/sling/servlethelpers/MockServletContextTest.java b/src/test/java/org/apache/sling/servlethelpers/MockServletContextTest.java
index 03f1b1b..131b531 100644
--- a/src/test/java/org/apache/sling/servlethelpers/MockServletContextTest.java
+++ b/src/test/java/org/apache/sling/servlethelpers/MockServletContextTest.java
@@ -22,6 +22,7 @@
import javax.servlet.ServletContext;
+import org.apache.sling.servlethelpers.MockServletContext;
import org.junit.Before;
import org.junit.Test;
diff --git a/src/test/java/org/apache/sling/servlethelpers/MockSlingHttpServletRequestTest.java b/src/test/java/org/apache/sling/servlethelpers/MockSlingHttpServletRequestTest.java
index aa7e275..26e5f51 100644
--- a/src/test/java/org/apache/sling/servlethelpers/MockSlingHttpServletRequestTest.java
+++ b/src/test/java/org/apache/sling/servlethelpers/MockSlingHttpServletRequestTest.java
@@ -29,10 +29,8 @@
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import java.io.BufferedReader;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
-import java.nio.charset.Charset;
import java.util.Calendar;
import java.util.Enumeration;
import java.util.LinkedHashMap;
@@ -328,8 +326,7 @@
@Test
public void testContent() throws Exception {
assertEquals(0, request.getContentLength());
- assertNotNull(request.getInputStream());
- assertArrayEquals(new byte[0], IOUtils.toByteArray(request.getInputStream()));
+ assertNull(request.getInputStream());
byte[] data = new byte[] { 0x01,0x02,0x03 };
request.setContent(data);
@@ -339,41 +336,6 @@
}
@Test
- public void testContentFromReader() throws Exception {
- Charset utf8 = Charset.forName("UTF-8");
- request.setContent("hello".getBytes(utf8));
- assertEquals(5, request.getContentLength());
- BufferedReader reader = request.getReader();
- String content = IOUtils.toString(reader);
- assertEquals("hello", content);
- }
-
- @Test
- public void testGetReaderAfterGetInputStream() {
- boolean thrown = false;
- request.getInputStream();
- try {
- request.getReader();
- } catch (IllegalStateException e) {
- thrown = true;
- }
- assertTrue(thrown);
- }
-
- @Test
- public void testGetInputStreamAfterGetReader() {
- boolean thrown = false;
- request.getReader();
- try {
- request.getInputStream();
- } catch (IllegalStateException e) {
- thrown = true;
- }
- assertTrue(thrown);
- }
-
-
- @Test
public void testGetRequestDispatcher() {
MockRequestDispatcherFactory requestDispatcherFactory = mock(MockRequestDispatcherFactory.class);
RequestDispatcher requestDispatcher = mock(RequestDispatcher.class);
diff --git a/src/test/java/org/apache/sling/servlethelpers/MockSlingHttpServletResponseTest.java b/src/test/java/org/apache/sling/servlethelpers/MockSlingHttpServletResponseTest.java
index abbfa6a..e159b85 100644
--- a/src/test/java/org/apache/sling/servlethelpers/MockSlingHttpServletResponseTest.java
+++ b/src/test/java/org/apache/sling/servlethelpers/MockSlingHttpServletResponseTest.java
@@ -33,6 +33,7 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.CharEncoding;
+import org.apache.sling.servlethelpers.MockSlingHttpServletResponse;
import org.junit.Before;
import org.junit.Test;