LPS-33017

osgi/modules/http-service/src/com/liferay/httpservice/servlet/BundleServletConfig.java

@@ -0,0 +1,81 @@
+/**
+ * Copyright (c) 2000-2012 Liferay, Inc. All rights reserved.
+ *
+ * This library 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 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library 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 Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.httpservice.servlet;
+
+import java.util.Dictionary;
+import java.util.Enumeration;
+import java.util.Hashtable;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
+
+import org.osgi.service.http.HttpContext;
+
+/**
+ * @author Raymond Augé
+ * @author Miguel Pastor
+ */
+public class BundleServletConfig implements ServletConfig {
+
+	public BundleServletConfig(
+		ServletContext servletContext, String servletName,
+		Dictionary<String, String> initParameters, HttpContext httpContext) {
+
+		_servletContext = servletContext;
+		_servletName = servletName;
+		_initParameters = initParameters;
+
+		if (_initParameters == null) {
+			_initParameters = new Hashtable<String, String>();
+		}
+
+		_httpContext = httpContext;
+	}
+
+	public HttpContext getHttpContext() {
+		return _httpContext;
+	}
+
+	public String getInitParameter(String name) {
+		return _initParameters.get(name);
+	}
+
+	@SuppressWarnings("rawtypes")
+	public Enumeration getInitParameterNames() {
+		return _initParameters.keys();
+	}
+
+	public Dictionary<String, String> getInitParameters() {
+		return _initParameters;
+	}
+
+	public ServletContext getServletContext() {
+		return _servletContext;
+	}
+
+	public String getServletName() {
+		return _servletName;
+	}
+
+	public void setInitParameter(String name, String value) {
+		_initParameters.put(name, value);
+	}
+
+	private HttpContext _httpContext;
+	private Dictionary<String, String> _initParameters;
+	private ServletContext _servletContext;
+	private String _servletName;
+
+}

osgi/modules/http-service/src/com/liferay/httpservice/servlet/ResourceServlet.java

@@ -0,0 +1,165 @@
+/**
+ * Copyright (c) 2000-2012 Liferay, Inc. All rights reserved.
+ *
+ * This library 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 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library 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 Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.httpservice.servlet;
+
+import com.liferay.portal.kernel.servlet.HttpHeaders;
+import com.liferay.portal.kernel.servlet.ServletResponseUtil;
+import com.liferay.portal.kernel.util.GetterUtil;
+import com.liferay.portal.kernel.util.StringPool;
+import com.liferay.portal.kernel.util.Validator;
+import com.liferay.portal.util.PortalUtil;
+import com.liferay.portal.webserver.WebServerServlet;
+
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+
+import java.net.URL;
+import java.net.URLConnection;
+import java.net.URLDecoder;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.osgi.service.http.HttpContext;
+
+/**
+ * @author Raymond Augé
+ * @author Miguel Pastor
+ */
+public class ResourceServlet extends WebServerServlet {
+
+	@Override
+	public void init(ServletConfig servletConfig) {
+		_bundleServletConfig = (BundleServletConfig)servletConfig;
+
+		_httpContext = _bundleServletConfig.getHttpContext();
+
+		_alias = GetterUtil.getString(
+			_bundleServletConfig.getInitParameter("alias"));
+		_name = GetterUtil.getString(
+			_bundleServletConfig.getInitParameter("name"));
+	}
+
+	@Override
+	public void service(
+			HttpServletRequest request, HttpServletResponse response)
+		throws IOException, ServletException {
+
+		try {
+			String requestURI = getRequestURI(request);
+
+			int aliasIndex = requestURI.indexOf(_alias);
+
+			if (aliasIndex == 0) {
+				requestURI = requestURI.substring(_alias.length());
+			}
+
+			if (Validator.isNotNull(_name)) {
+				requestURI = _name.concat(requestURI);
+			}
+
+			URL url = _httpContext.getResource(requestURI);
+
+			if (url == null) {
+				response.setStatus(HttpServletResponse.SC_NOT_FOUND);
+
+				return;
+			}
+
+			URLConnection urlConnection = url.openConnection();
+
+			long lastModified = urlConnection.getLastModified();
+
+			if (lastModified > 0) {
+				long ifModifiedSince = request.getDateHeader(
+					HttpHeaders.IF_MODIFIED_SINCE);
+
+				if ((ifModifiedSince > 0) &&
+					(ifModifiedSince == lastModified)) {
+
+					response.setContentLength(0);
+
+					response.setDateHeader(
+						HttpHeaders.LAST_MODIFIED, lastModified);
+
+					String ifNoneMatch = request.getHeader(
+						HttpHeaders.IF_NONE_MATCH);
+
+					if (Validator.isNotNull(ifNoneMatch) &&
+						!ifNoneMatch.equals('0')) {
+
+						response.setHeader(HttpHeaders.ETAG, ifNoneMatch);
+					}
+
+					response.setStatus(HttpServletResponse.SC_NOT_MODIFIED);
+
+					return;
+				}
+			}
+
+			if (lastModified > 0) {
+				response.setDateHeader(HttpHeaders.LAST_MODIFIED, lastModified);
+			}
+
+			String fileName = getRequestURI(request);
+
+			int slashIndex = fileName.lastIndexOf(StringPool.SLASH);
+
+			if (slashIndex != -1) {
+				fileName = fileName.substring(slashIndex + 1);
+			}
+
+			String contentType = _httpContext.getMimeType(fileName);
+
+			if (isSupportsRangeHeader(contentType)) {
+				sendFileWithRangeHeader(
+					request, response, fileName, urlConnection.getInputStream(),
+					urlConnection.getContentLength(), contentType);
+			}
+			else {
+				ServletResponseUtil.sendFile(
+					request, response, fileName, urlConnection.getInputStream(),
+					urlConnection.getContentLength(), contentType);
+			}
+		}
+		catch (Exception e) {
+			PortalUtil.sendError(
+				HttpServletResponse.SC_NOT_FOUND, e, request, response);
+		}
+	}
+
+	protected String getRequestURI(HttpServletRequest request)
+		throws UnsupportedEncodingException {
+
+		String requestURI = URLDecoder.decode(
+			request.getRequestURI(), StringPool.UTF8);
+
+		String contextPath = request.getContextPath();
+
+		if (!contextPath.equals(StringPool.SLASH)) {
+			requestURI = requestURI.substring(contextPath.length());
+		}
+
+		return requestURI;
+	}
+
+	private String _alias;
+	private BundleServletConfig _bundleServletConfig;
+	private HttpContext _httpContext;
+	private String _name;
+
+}

osgi/modules/http-service/src/com/liferay/httpservice/ws/axis/AxisConfigurationFactory.java

@@ -0,0 +1,42 @@
+/**
+ * Copyright (c) 2000-2012 Liferay, Inc. All rights reserved.
+ *
+ * This library 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 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library 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 Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.httpservice.ws.axis;
+
+import org.apache.axis.EngineConfiguration;
+import org.apache.axis.EngineConfigurationFactory;
+import org.apache.axis.configuration.EngineConfigurationFactoryDefault;
+
+/**
+ * @author Raymond Augé
+ * @author Miguel Pastor
+ */
+public class AxisConfigurationFactory implements EngineConfigurationFactory {
+
+	public AxisConfigurationFactory() {
+		_engineConfigurationFactory =
+			EngineConfigurationFactoryDefault.newFactory(null);
+	}
+
+	public EngineConfiguration getClientEngineConfig() {
+		return _engineConfigurationFactory.getClientEngineConfig();
+	}
+
+	public EngineConfiguration getServerEngineConfig() {
+		return _engineConfigurationFactory.getServerEngineConfig();
+	}
+
+	private EngineConfigurationFactory _engineConfigurationFactory;
+
+}