Author: cziegeler
Date: Mon Aug 1 13:31:10 2016
New Revision: 1754748
URL: http://svn.apache.org/viewvc?rev=1754748&view=rev
Log:
Update to parent pom 27
Modified:
sling/trunk/bundles/engine/pom.xml
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/helper/ExternalServletContextWrapper.java
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/helper/SlingServletContext.java
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/log/RequestLoggerResponse.java
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/parameters/SlingPart.java
sling/trunk/bundles/engine/src/test/java/org/apache/sling/engine/impl/log/ClientAbortExceptionTest.java
sling/trunk/bundles/engine/src/test/java/org/apache/sling/engine/impl/request/InitResourceTest.java
sling/trunk/bundles/engine/src/test/java/org/apache/sling/engine/impl/request/RequestDataTest.java
Modified: sling/trunk/bundles/engine/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/engine/pom.xml?rev=1754748&r1=1754747&r2=1754748&view=diff
==============================================================================
--- sling/trunk/bundles/engine/pom.xml (original)
+++ sling/trunk/bundles/engine/pom.xml Mon Aug 1 13:31:10 2016
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>26</version>
+ <version>27</version>
<relativePath />
</parent>
@@ -84,7 +84,29 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
- <version>3.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.http.whiteboard</artifactId>
+ <version>1.0.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.http</artifactId>
+ <version>1.2.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.useradmin</artifactId>
+ <version>1.1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component</artifactId>
+ <version>1.3.0</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -125,11 +147,7 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>osgi.core</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -163,7 +181,7 @@
<dependency>
<groupId>org.jmock</groupId>
<artifactId>jmock-legacy</artifactId>
- <version>2.5.1</version>
+ <version>2.8.2</version>
<scope>test</scope>
</dependency>
<dependency>
Modified:
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/helper/ExternalServletContextWrapper.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/helper/ExternalServletContextWrapper.java?rev=1754748&r1=1754747&r2=1754748&view=diff
==============================================================================
---
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/helper/ExternalServletContextWrapper.java
(original)
+++
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/helper/ExternalServletContextWrapper.java
Mon Aug 1 13:31:10 2016
@@ -241,107 +241,138 @@ class ExternalServletContextWrapper impl
}
+ @Override
public int getEffectiveMajorVersion() {
return getServletContext().getEffectiveMajorVersion();
}
+ @Override
public int getEffectiveMinorVersion() {
return getServletContext().getEffectiveMinorVersion();
}
+ @Override
public boolean setInitParameter(String name, String value) {
return getServletContext().setInitParameter(name, value);
}
+ @Override
public Dynamic addServlet(String servletName, String className) {
return getServletContext().addServlet(servletName, className);
}
+ @Override
public Dynamic addServlet(String servletName, Servlet servlet) {
return getServletContext().addServlet(servletName, servlet);
}
+ @Override
public Dynamic addServlet(String servletName, Class<? extends Servlet>
servletClass) {
return getServletContext().addServlet(servletName, servletClass);
}
+ @Override
public <T extends Servlet> T createServlet(Class<T> clazz) throws
ServletException {
return getServletContext().createServlet(clazz);
}
+ @Override
public ServletRegistration getServletRegistration(String servletName) {
return getServletContext().getServletRegistration(servletName);
}
+ @Override
public Map<String, ? extends ServletRegistration>
getServletRegistrations() {
return getServletContext().getServletRegistrations();
}
+ @Override
public javax.servlet.FilterRegistration.Dynamic addFilter(String
filterName, String className) {
return getServletContext().addFilter(filterName, className);
}
+ @Override
public javax.servlet.FilterRegistration.Dynamic addFilter(String
filterName, Filter filter) {
return getServletContext().addFilter(filterName, filter);
}
+ @Override
public javax.servlet.FilterRegistration.Dynamic addFilter(String
filterName, Class<? extends Filter> filterClass) {
return getServletContext().addFilter(filterName, filterClass);
}
+ @Override
public <T extends Filter> T createFilter(Class<T> clazz) throws
ServletException {
return getServletContext().createFilter(clazz);
}
+ @Override
public FilterRegistration getFilterRegistration(String filterName) {
return getServletContext().getFilterRegistration(filterName);
}
+ @Override
public Map<String, ? extends FilterRegistration> getFilterRegistrations() {
return getServletContext().getFilterRegistrations();
}
+ @Override
public SessionCookieConfig getSessionCookieConfig() {
return getServletContext().getSessionCookieConfig();
}
+ @Override
public void setSessionTrackingModes(Set<SessionTrackingMode>
sessionTrackingModes) {
getServletContext().setSessionTrackingModes(sessionTrackingModes);
}
+ @Override
public Set<SessionTrackingMode> getDefaultSessionTrackingModes() {
return getServletContext().getDefaultSessionTrackingModes();
}
+ @Override
public Set<SessionTrackingMode> getEffectiveSessionTrackingModes() {
return getServletContext().getEffectiveSessionTrackingModes();
}
+ @Override
public void addListener(String className) {
getServletContext().addListener(className);
}
+ @Override
public <T extends EventListener> void addListener(T t) {
getServletContext().addListener(t);
}
+ @Override
public void addListener(Class<? extends EventListener> listenerClass) {
getServletContext().addListener(listenerClass);
}
+ @Override
public <T extends EventListener> T createListener(Class<T> clazz) throws
ServletException {
return getServletContext().createListener(clazz);
}
+ @Override
public JspConfigDescriptor getJspConfigDescriptor() {
return getServletContext().getJspConfigDescriptor();
}
+ @Override
public ClassLoader getClassLoader() {
return getServletContext().getClassLoader();
}
+ @Override
public void declareRoles(String... roleNames) {
getServletContext().declareRoles(roleNames);
}
+
+ @Override
+ public String getVirtualServerName() {
+ return getServletContext().getVirtualServerName();
+ }
}
Modified:
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/helper/SlingServletContext.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/helper/SlingServletContext.java?rev=1754748&r1=1754747&r2=1754748&view=diff
==============================================================================
---
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/helper/SlingServletContext.java
(original)
+++
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/helper/SlingServletContext.java
Mon Aug 1 13:31:10 2016
@@ -664,4 +664,9 @@ public class SlingServletContext impleme
protected ServletContext wrapServletContext(ServletContext context) {
return new ExternalServletContextWrapper(context);
}
+
+ @Override
+ public String getVirtualServerName() {
+ return getServletContext().getVirtualServerName();
+ }
}
Modified:
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/log/RequestLoggerResponse.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/log/RequestLoggerResponse.java?rev=1754748&r1=1754747&r2=1754748&view=diff
==============================================================================
---
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/log/RequestLoggerResponse.java
(original)
+++
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/log/RequestLoggerResponse.java
Mon Aug 1 13:31:10 2016
@@ -31,6 +31,7 @@ import java.util.Map;
import java.util.concurrent.atomic.AtomicLong;
import javax.servlet.ServletOutputStream;
+import javax.servlet.WriteListener;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpServletResponseWrapper;
@@ -254,6 +255,7 @@ class RequestLoggerResponse extends Http
return this.requestEnd - this.requestStart;
}
+ @Override
public int getStatus() {
return this.status;
}
@@ -417,6 +419,16 @@ class RequestLoggerResponse extends Http
throw new ClientAbortException(ioe);
}
}
+
+ @Override
+ public boolean isReady() {
+ return this.delegatee.isReady();
+ }
+
+ @Override
+ public void setWriteListener(final WriteListener writeListener) {
+ this.delegatee.setWriteListener(writeListener);
+ }
}
// character transfer counting PrintWriter
Modified:
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/parameters/SlingPart.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/parameters/SlingPart.java?rev=1754748&r1=1754747&r2=1754748&view=diff
==============================================================================
---
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/parameters/SlingPart.java
(original)
+++
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/parameters/SlingPart.java
Mon Aug 1 13:31:10 2016
@@ -34,34 +34,42 @@ public class SlingPart implements Part {
this.param = param;
}
+ @Override
public InputStream getInputStream() throws IOException {
return this.param.getInputStream();
}
+ @Override
public String getContentType() {
return this.param.getContentType();
}
+ @Override
public String getName() {
return this.param.getFileItem().getFieldName();
}
+ @Override
public long getSize() {
return this.param.getSize();
}
+ @Override
public void write(String fileName) throws IOException {
throw new IOException("Unsupported yet");
}
+ @Override
public void delete() {
this.param.getFileItem().delete();
}
+ @Override
public String getHeader(String name) {
return this.param.getFileItem().getHeaders().getHeader(name);
}
+ @Override
public Collection<String> getHeaders(String name) {
final ArrayList<String> headers = new ArrayList<String>();
final Iterator<String> itemHeaders =
this.param.getFileItem().getHeaders().getHeaders(name);
@@ -71,6 +79,7 @@ public class SlingPart implements Part {
return headers;
}
+ @Override
public Collection<String> getHeaderNames() {
final ArrayList<String> headers = new ArrayList<String>();
final Iterator<String> itemHeaders =
this.param.getFileItem().getHeaders().getHeaderNames();
@@ -79,4 +88,9 @@ public class SlingPart implements Part {
}
return headers;
}
+
+ @Override
+ public String getSubmittedFileName() {
+ return this.param.getFileName();
+ }
}
Modified:
sling/trunk/bundles/engine/src/test/java/org/apache/sling/engine/impl/log/ClientAbortExceptionTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/engine/src/test/java/org/apache/sling/engine/impl/log/ClientAbortExceptionTest.java?rev=1754748&r1=1754747&r2=1754748&view=diff
==============================================================================
---
sling/trunk/bundles/engine/src/test/java/org/apache/sling/engine/impl/log/ClientAbortExceptionTest.java
(original)
+++
sling/trunk/bundles/engine/src/test/java/org/apache/sling/engine/impl/log/ClientAbortExceptionTest.java
Mon Aug 1 13:31:10 2016
@@ -19,31 +19,25 @@ package org.apache.sling.engine.impl.log
import java.io.IOException;
import javax.servlet.ServletOutputStream;
+import javax.servlet.WriteListener;
import javax.servlet.http.HttpServletResponse;
import org.apache.sling.engine.impl.helper.ClientAbortException;
import org.jmock.Expectations;
import org.jmock.Mockery;
-import org.jmock.integration.junit4.JMock;
-import org.jmock.integration.junit4.JUnit4Mockery;
-import org.jmock.lib.legacy.ClassImposteriser;
import org.junit.Before;
import org.junit.Test;
-import org.junit.runner.RunWith;
/** Verify that RequestLoggerResponse wraps IOException in
ClientAbortException */
-@RunWith(JMock.class)
public class ClientAbortExceptionTest {
private Mockery context;
private RequestLoggerResponse r;
-
+
@Before
public void setup() throws IOException {
- context = new JUnit4Mockery() {{
- setImposteriser(ClassImposteriser.INSTANCE);
- }};
-
+ context = new Mockery();
+
final ServletOutputStream sos = new ServletOutputStream() {
@Override
public void write(int b) throws IOException {
@@ -59,37 +53,46 @@ public class ClientAbortExceptionTest {
public void close() throws IOException {
throw new IOException("Always fails, on purpose");
}
+
+ @Override
+ public boolean isReady() {
+ return true;
+ }
+
+ @Override
+ public void setWriteListener(WriteListener writeListener) {
+ }
};
final HttpServletResponse raw =
context.mock(HttpServletResponse.class);
context.checking(new Expectations() {{
allowing(raw).getOutputStream();
will(returnValue(sos));
}});
-
+
r = new RequestLoggerResponse(raw);
}
-
+
@Test(expected=ClientAbortException.class)
public void writeInt() throws IOException {
r.getOutputStream().write(42);
}
-
+
@Test(expected=ClientAbortException.class)
public void writeSimpleByteArray() throws IOException {
r.getOutputStream().write("foo".getBytes());
}
-
+
@Test(expected=ClientAbortException.class)
public void writeByteArray() throws IOException {
final byte [] data = "bar".getBytes();
r.getOutputStream().write(data, 0, data.length);
}
-
+
@Test(expected=ClientAbortException.class)
public void flush() throws IOException {
r.getOutputStream().flush();
}
-
+
@Test(expected=ClientAbortException.class)
public void close() throws IOException {
r.getOutputStream().close();
Modified:
sling/trunk/bundles/engine/src/test/java/org/apache/sling/engine/impl/request/InitResourceTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/engine/src/test/java/org/apache/sling/engine/impl/request/InitResourceTest.java?rev=1754748&r1=1754747&r2=1754748&view=diff
==============================================================================
---
sling/trunk/bundles/engine/src/test/java/org/apache/sling/engine/impl/request/InitResourceTest.java
(original)
+++
sling/trunk/bundles/engine/src/test/java/org/apache/sling/engine/impl/request/InitResourceTest.java
Mon Aug 1 13:31:10 2016
@@ -26,8 +26,6 @@ import org.apache.sling.api.request.Requ
import org.apache.sling.api.resource.ResourceResolver;
import org.jmock.Expectations;
import org.jmock.Mockery;
-import org.jmock.integration.junit4.JUnit4Mockery;
-import org.jmock.lib.legacy.ClassImposteriser;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -42,14 +40,14 @@ public class InitResourceTest {
private HttpServletRequest req;
private HttpServletResponse resp;
private ResourceResolver resourceResolver;
-
+
private final String requestURL;
private final String pathInfo;
private final String expectedResolvePath;
-
+
@Parameters(name="URL={0} path={1}")
public static Collection<Object[]> data() {
- return Arrays.asList(new Object[][] {
+ return Arrays.asList(new Object[][] {
{ "/one;v=1.1", "one;v=1.1", "/one;v=1.1" },
{ "/two;v=1.1", "two", "/two;v=1.1" },
{ "/three", "three", "/three" },
@@ -59,52 +57,50 @@ public class InitResourceTest {
{ "/seven", "seven;v=1.1", "/seven;v=1.1" },
});
}
-
+
public InitResourceTest(String requestURL, String pathInfo, String
expectedResolvePath) {
this.requestURL = requestURL;
this.pathInfo = pathInfo;
this.expectedResolvePath = expectedResolvePath;
}
-
+
@Before
public void setup() throws Exception {
- context = new JUnit4Mockery() {{
- setImposteriser(ClassImposteriser.INSTANCE);
- }};
-
+ context = new Mockery();
+
req = context.mock(HttpServletRequest.class);
resp = context.mock(HttpServletResponse.class);
resourceResolver = context.mock(ResourceResolver.class);
-
+
context.checking(new Expectations() {{
allowing(req).getRequestURL();
will(returnValue(new StringBuffer(requestURL)));
-
+
allowing(req).getRequestURI();
-
+
allowing(req).getPathInfo();
will(returnValue(pathInfo));
-
+
allowing(req).getServletPath();
will(returnValue("/"));
-
+
allowing(req).getMethod();
will(returnValue("GET"));
-
+
allowing(req).getAttribute(RequestData.REQUEST_RESOURCE_PATH_ATTR);
will(returnValue(null));
allowing(req).setAttribute(with(equal(RequestData.REQUEST_RESOURCE_PATH_ATTR)),
with(any(Object.class)));
-
+
allowing(req).getAttribute(RequestProgressTracker.class.getName());
will(returnValue(null));
-
+
// Verify that the ResourceResolver is called with the expected
path
allowing(resourceResolver).resolve(with(any(HttpServletRequest.class)),with(equal(expectedResolvePath)));
}});
-
+
requestData = new RequestData(null, req, resp);
}
-
+
@Test
public void resolverPathMatches() {
requestData.initResource(resourceResolver);
Modified:
sling/trunk/bundles/engine/src/test/java/org/apache/sling/engine/impl/request/RequestDataTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/engine/src/test/java/org/apache/sling/engine/impl/request/RequestDataTest.java?rev=1754748&r1=1754747&r2=1754748&view=diff
==============================================================================
---
sling/trunk/bundles/engine/src/test/java/org/apache/sling/engine/impl/request/RequestDataTest.java
(original)
+++
sling/trunk/bundles/engine/src/test/java/org/apache/sling/engine/impl/request/RequestDataTest.java
Mon Aug 1 13:31:10 2016
@@ -16,6 +16,8 @@
*/
package org.apache.sling.engine.impl.request;
+import static org.junit.Assert.fail;
+
import javax.servlet.Servlet;
import javax.servlet.ServletConfig;
import javax.servlet.ServletRequest;
@@ -31,16 +33,10 @@ import org.apache.sling.engine.impl.Slin
import org.apache.sling.engine.impl.SlingHttpServletResponseImpl;
import org.jmock.Expectations;
import org.jmock.Mockery;
-import org.jmock.integration.junit4.JMock;
-import org.jmock.integration.junit4.JUnit4Mockery;
import org.jmock.lib.legacy.ClassImposteriser;
import org.junit.Before;
import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.fail;
-@RunWith(JMock.class)
public class RequestDataTest {
private Mockery context;
@@ -49,60 +45,61 @@ public class RequestDataTest {
private HttpServletResponse resp;
private SlingHttpServletRequest slingRequest;
private SlingHttpServletResponse slingResponse;
-
+
@Before
public void setup() throws Exception {
- context = new JUnit4Mockery() {{
+ context = new Mockery() {{
setImposteriser(ClassImposteriser.INSTANCE);
}};
-
+
req = context.mock(HttpServletRequest.class);
resp = context.mock(HttpServletResponse.class);
-
+
final ContentData contentData = context.mock(ContentData.class);
final Servlet servlet = context.mock(Servlet.class);
final ServletConfig servletConfig = context.mock(ServletConfig.class);
-
+
context.checking(new Expectations() {{
allowing(req).getServletPath();
will(returnValue("/"));
-
+
allowing(req).getPathInfo();
will(returnValue(""));
-
+
allowing(req).getMethod();
will(returnValue("GET"));
-
+
allowing(req).setAttribute(with(any(String.class)),
with(any(Object.class)));
-
+ allowing(req).setAttribute(with(any(String.class)),
with(aNull(Object.class)));
+
allowing(contentData).getServlet();
will(returnValue(servlet));
-
+
allowing(servlet).getServletConfig();
will(returnValue(servletConfig));
-
+
allowing(servlet).service(with(any(ServletRequest.class)),
with(any(ServletResponse.class)));
-
+
allowing(servletConfig).getServletName();
will(returnValue("SERVLET_NAME"));
-
+
allowing(req).getAttribute(RequestProgressTracker.class.getName());
will(returnValue(null));
}});
-
+
requestData = new RequestData(null, req, resp) {
@Override
public ContentData getContentData() {
return contentData;
}
};
-
+
slingRequest = new SlingHttpServletRequestImpl(requestData, req);
slingResponse = new SlingHttpServletResponseImpl(requestData, resp);
-
+
RequestData.setMaxCallCounter(2);
}
-
+
private void assertTooManyCallsException(int failAtCall) throws Exception {
for(int i=0; i < failAtCall - 1; i++) {
RequestData.service(slingRequest, slingResponse);
@@ -114,7 +111,7 @@ public class RequestDataTest {
// as expected
}
}
-
+
@Test
public void testTooManyCallsDefault() throws Exception {
context.checking(new Expectations() {{
@@ -123,7 +120,7 @@ public class RequestDataTest {
}});
assertTooManyCallsException(3);
}
-
+
@Test
public void testTooManyCallsOverride() throws Exception {
context.checking(new Expectations() {{
