From cdf18f00b1b7e126d8c7fdda3ae09071373eba14 Mon Sep 17 00:00:00 2001
From: Thomas Andersen <botunge@botunge.dk>
Date: Mon, 5 Oct 2015 02:10:05 +0200
Subject: [PATCH] undo attempt to remove javax.servlet dependency

undo attempt to remove javax.servlet dependency
---
 hapi-fhir-android/pom.xml                     | 22 +++++++++----------
 .../java/javax/servlet/ServletRequest.java    |  5 -----
 .../java/javax/servlet/ServletResponse.java   |  5 -----
 .../servlet/http/HttpServletRequest.java      |  7 ------
 .../servlet/http/HttpServletResponse.java     |  7 ------
 5 files changed, 11 insertions(+), 35 deletions(-)
 delete mode 100644 hapi-fhir-android/src/main/java/javax/servlet/ServletRequest.java
 delete mode 100644 hapi-fhir-android/src/main/java/javax/servlet/ServletResponse.java
 delete mode 100644 hapi-fhir-android/src/main/java/javax/servlet/http/HttpServletRequest.java
 delete mode 100644 hapi-fhir-android/src/main/java/javax/servlet/http/HttpServletResponse.java

diff --git a/hapi-fhir-android/pom.xml b/hapi-fhir-android/pom.xml
index 7c04f199068..0f7f5a7c60e 100644
--- a/hapi-fhir-android/pom.xml
+++ b/hapi-fhir-android/pom.xml
@@ -85,11 +85,11 @@
 			We provide a dummy implementation of servlet api to reduce size 
 			and prevent from rewriting the BaseMethodBinding and friends.
 			-->
-		<!-- dependency>
+		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>javax.servlet-api</artifactId>
 			<scope>compile</scope>
-		</dependency-->
+		</dependency>
 
 	</dependencies>
 
@@ -147,8 +147,8 @@
 							<include>org.apache.commons:*</include>
 							<include>org.apache.httpcomponents:*</include>
 							<include>commons-codec:commons-codec</include>
-							<include>javax.servlet:javax.servlet-api</include>
 							-->
+							<include>javax.servlet:javax.servlet-api</include>
 						</includes>
 					</artifactSet>
 					<relocations>
@@ -176,7 +176,7 @@
 								<!-- Exclude test stuff which depends on httpservlet -->
 								<exclude>ca/uhn/fhir/util/ITestingUiClientFactory</exclude>
 								<!-- Exclude server side stuff. This could be made nicer if code was divided into shared, server and client -->
-								<exclude>ca/uhn/fhir/rest/server/Add*</exclude>
+								<!--exclude>ca/uhn/fhir/rest/server/Add*</exclude>
 								<exclude>ca/uhn/fhir/rest/server/Apache*</exclude>
 								<exclude>ca/uhn/fhir/rest/server/Bundle*</exclude>
 								<exclude>ca/uhn/fhir/rest/server/ETag*</exclude>
@@ -192,7 +192,7 @@
 								<exclude>ca/uhn/fhir/rest/server/Search*</exclude>
 								<exclude>ca/uhn/fhir/rest/server/Simple*</exclude>
 								<exclude>ca/uhn/fhir/rest/server/audit/**</exclude>
-								<exclude>ca/uhn/fhir/rest/server/interceptor/**</exclude>
+								<exclude>ca/uhn/fhir/rest/server/interceptor/**</exclude-->
 								<!-- Exclude Phloc validator to make android libs small -->
 								<exclude>ca/uhn/fhir/validation/schematron/SchematronBaseValidator*</exclude>
 								<!-- Exclude Thymeleaf to make android libs small -->
@@ -224,15 +224,15 @@
 									<include>ca.uhn.hapi.fhir:hapi-fhir-structures-dstu</include>
 								</includes>
 							</artifactSet>
-							<filters>
-								<!-- Exclude server side stuff, except exceptions which are used clientside -->
+							<!-- Exclude server side stuff, except exceptions which are used clientside -->
+							<!--filters>
 								<filter>
 									<artifact>ca.uhn.hapi.fhir:hapi-fhir-structures-dstu</artifact>
 									<excludes>
 										<exclude>ca/uhn/fhir/rest/server/**</exclude>
 									</excludes>
 								</filter>
-							</filters>
+							</filters-->
 						</configuration>
 					</execution>
 					<!-- dstu2 jar -->
@@ -249,15 +249,15 @@
 									<include>ca.uhn.hapi.fhir:hapi-fhir-structures-dstu2</include>
 								</includes>
 							</artifactSet>
-							<filters>
-								<!-- Exclude server side stuff, except exceptions which are used clientside -->
+							<!-- Exclude server side stuff, except exceptions which are used clientside -->
+							<!--filters>
 								<filter>
 									<artifact>ca.uhn.hapi.fhir:hapi-fhir-structures-dstu2</artifact>
 									<excludes>
 										<exclude>ca/uhn/fhir/rest/server/**</exclude>
 									</excludes>
 								</filter>
-							</filters>
+							</filters-->
 						</configuration>
 					</execution>
 				</executions>
diff --git a/hapi-fhir-android/src/main/java/javax/servlet/ServletRequest.java b/hapi-fhir-android/src/main/java/javax/servlet/ServletRequest.java
deleted file mode 100644
index 2292db91fac..00000000000
--- a/hapi-fhir-android/src/main/java/javax/servlet/ServletRequest.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package javax.servlet;
-
-public class ServletRequest {
-
-}
diff --git a/hapi-fhir-android/src/main/java/javax/servlet/ServletResponse.java b/hapi-fhir-android/src/main/java/javax/servlet/ServletResponse.java
deleted file mode 100644
index efa8a9baa43..00000000000
--- a/hapi-fhir-android/src/main/java/javax/servlet/ServletResponse.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package javax.servlet;
-
-public class ServletResponse {
-
-}
diff --git a/hapi-fhir-android/src/main/java/javax/servlet/http/HttpServletRequest.java b/hapi-fhir-android/src/main/java/javax/servlet/http/HttpServletRequest.java
deleted file mode 100644
index 37551bd241d..00000000000
--- a/hapi-fhir-android/src/main/java/javax/servlet/http/HttpServletRequest.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package javax.servlet.http;
-
-import javax.servlet.ServletRequest;
-
-public class HttpServletRequest extends ServletRequest {
-
-}
diff --git a/hapi-fhir-android/src/main/java/javax/servlet/http/HttpServletResponse.java b/hapi-fhir-android/src/main/java/javax/servlet/http/HttpServletResponse.java
deleted file mode 100644
index 230ab022b4d..00000000000
--- a/hapi-fhir-android/src/main/java/javax/servlet/http/HttpServletResponse.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package javax.servlet.http;
-
-import javax.servlet.ServletResponse;
-
-public class HttpServletResponse extends ServletResponse{
-
-}