From 42667acb21cee0ce73c58aaf55aea8fee19620ff Mon Sep 17 00:00:00 2001
From: "Endi S. Dewata" <edewata@redhat.com>
Date: Tue, 24 Feb 2015 21:02:13 -0500
Subject: Added support for Tomcat 8.

The Dogtag code has been modified to support both Tomcat 7 and 8.
All files depending on a specific Tomcat version are now stored
in separate folders. The build scripts have been modified to use
the proper folder for the target platform. The tomcatjss
dependency has been updated as well.

The upgrade script will be added in a separate patch.

https://fedorahosted.org/pki/ticket/1264
---
 .../netscape/cms/servlet/common/CMSTemplate.java   | 25 ++--------------------
 1 file changed, 2 insertions(+), 23 deletions(-)

(limited to 'base/server/cms/src/com')

diff --git a/base/server/cms/src/com/netscape/cms/servlet/common/CMSTemplate.java b/base/server/cms/src/com/netscape/cms/servlet/common/CMSTemplate.java
index 336032dd3..dc8cef68f 100644
--- a/base/server/cms/src/com/netscape/cms/servlet/common/CMSTemplate.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/common/CMSTemplate.java
@@ -18,6 +18,7 @@
 package com.netscape.cms.servlet.common;
 
 import java.io.BufferedReader;
+import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -25,13 +26,10 @@ import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
-import java.io.StringWriter;
 import java.io.UnsupportedEncodingException;
 import java.math.BigInteger;
 import java.util.Enumeration;
 
-import javax.servlet.ServletOutputStream;
-
 import com.netscape.certsrv.apps.CMS;
 import com.netscape.certsrv.base.EBaseException;
 import com.netscape.certsrv.base.IArgBlock;
@@ -531,8 +529,7 @@ public class CMSTemplate extends CMSFile {
      */
     public String getOutput(CMSTemplateParams input)
             throws IOException {
-        debugOutputStream out = new debugOutputStream();
-
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
         renderOutput(out, input);
         return out.toString();
     }
@@ -572,22 +569,4 @@ public class CMSTemplate extends CMSFile {
         }
 
     }
-
-    private static class debugOutputStream extends ServletOutputStream {
-        private StringWriter mStringWriter = new StringWriter();
-
-        public debugOutputStream() {
-            super();
-        }
-
-        public void write(int b) throws IOException {
-            mStringWriter.write(b);
-        }
-
-        public String toString() {
-            return mStringWriter.toString();
-        }
-
-    }
-
 }
-- 
cgit