From 80b1cb7df4f9f6b2dda99ea3e9f246fb2ffa94f9 Mon Sep 17 00:00:00 2001 From: Richard Millet Date: Tue, 22 Jan 2013 12:06:58 -0800 Subject: [PATCH] NOJIRA: Removing dead class from source tree. --- .../services/common/ServiceMain.java | 16 --- .../common/article/ArticleResource.java | 1 - .../servlet/PublishedResourcesServlet.java | 108 ------------------ .../nuxeo/ReportDocumentModelHandler.java | 13 ++- 4 files changed, 9 insertions(+), 129 deletions(-) delete mode 100644 services/common/src/main/java/org/collectionspace/services/common/servlet/PublishedResourcesServlet.java diff --git a/services/common/src/main/java/org/collectionspace/services/common/ServiceMain.java b/services/common/src/main/java/org/collectionspace/services/common/ServiceMain.java index df589de7a..def363563 100644 --- a/services/common/src/main/java/org/collectionspace/services/common/ServiceMain.java +++ b/services/common/src/main/java/org/collectionspace/services/common/ServiceMain.java @@ -668,22 +668,6 @@ public class ServiceMain { serverRootDir + "\" instead."); } - - if (logger.isErrorEnabled() == true) { - System.out.println("+++ server root directory is: " + serverRootDir); - try { - FileOutputStream appLayerRootHello = new FileOutputStream(serverRootDir + "webapps\\collectionspace\\hello"); - try { - appLayerRootHello.write("Hello?".getBytes()); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } catch (FileNotFoundException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } } diff --git a/services/common/src/main/java/org/collectionspace/services/common/article/ArticleResource.java b/services/common/src/main/java/org/collectionspace/services/common/article/ArticleResource.java index 836e8d09d..c83812ccb 100644 --- a/services/common/src/main/java/org/collectionspace/services/common/article/ArticleResource.java +++ b/services/common/src/main/java/org/collectionspace/services/common/article/ArticleResource.java @@ -27,7 +27,6 @@ import java.io.InputStream; import org.collectionspace.services.article.ArticlesCommon; import org.collectionspace.services.client.ArticleClient; -import org.collectionspace.services.client.PayloadOutputPart; import org.collectionspace.services.client.PoxPayloadIn; import org.collectionspace.services.client.PoxPayloadOut; import org.collectionspace.services.common.ResourceBase; diff --git a/services/common/src/main/java/org/collectionspace/services/common/servlet/PublishedResourcesServlet.java b/services/common/src/main/java/org/collectionspace/services/common/servlet/PublishedResourcesServlet.java deleted file mode 100644 index d272bc9ef..000000000 --- a/services/common/src/main/java/org/collectionspace/services/common/servlet/PublishedResourcesServlet.java +++ /dev/null @@ -1,108 +0,0 @@ -package org.collectionspace.services.common.servlet; - -import java.io.IOException; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -/** - * Servlet implementation class HelloServlet - */ -public class PublishedResourcesServlet extends HttpServlet { - private static final long serialVersionUID = 1L; - - /** - * @see HttpServlet#HttpServlet() - */ - public PublishedResourcesServlet() { - super(); - } - - /** - * @see Servlet#init(ServletConfig) - */ - public void init(ServletConfig config) throws ServletException { - super.init(config); - } - - /** - * @see Servlet#destroy() - */ - public void destroy() { - super.destroy(); - } - - /** - * @see Servlet#getServletConfig() - */ - public ServletConfig getServletConfig() { - return super.getServletConfig(); - } - - /** - * @see Servlet#getServletInfo() - */ - public String getServletInfo() { - return super.getServletInfo(); - } - - /** - * @see HttpServlet#service(HttpServletRequest request, HttpServletResponse response) - */ - protected void service(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - super.service(request, response); - } - - /** - * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response) - */ - protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - //super.doGet(request, response); - response.setStatus(200); - } - - /** - * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response) - */ - protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - super.doPost(request, response); - } - - /** - * @see HttpServlet#doPut(HttpServletRequest, HttpServletResponse) - */ - protected void doPut(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - super.doPut(request, response); - } - - /** - * @see HttpServlet#doDelete(HttpServletRequest, HttpServletResponse) - */ - protected void doDelete(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - super.doDelete(request, response); - } - - /** - * @see HttpServlet#doHead(HttpServletRequest, HttpServletResponse) - */ - protected void doHead(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - super.doHead(request, response); - } - - /** - * @see HttpServlet#doOptions(HttpServletRequest, HttpServletResponse) - */ - protected void doOptions(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - super.doOptions(request, response); - } - - /** - * @see HttpServlet#doTrace(HttpServletRequest, HttpServletResponse) - */ - protected void doTrace(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - super.doTrace(request, response); - } - -} diff --git a/services/report/service/src/main/java/org/collectionspace/services/report/nuxeo/ReportDocumentModelHandler.java b/services/report/service/src/main/java/org/collectionspace/services/report/nuxeo/ReportDocumentModelHandler.java index 41d71ea3c..b1db3f8e0 100644 --- a/services/report/service/src/main/java/org/collectionspace/services/report/nuxeo/ReportDocumentModelHandler.java +++ b/services/report/service/src/main/java/org/collectionspace/services/report/nuxeo/ReportDocumentModelHandler.java @@ -82,7 +82,8 @@ public class ReportDocumentModelHandler extends DocHandlerBase { public Response invokeReport( ServiceContext ctx, String csid, - InvocationContext invContext) throws Exception { + InvocationContext invContext, + boolean isPublishing) throws Exception { RepositoryInstance repoSession = null; boolean releaseRepoSession = false; @@ -175,11 +176,11 @@ public class ReportDocumentModelHandler extends DocHandlerBase { repoClient.releaseRepositorySession(ctx, repoSession); } } - return buildReportResponse(csid, params, reportFileName); + return buildReportResponse(csid, params, reportFileName, isPublishing); } - private Response buildReportResponse(String reportCSID, HashMap params, String reportFileName) + private Response buildReportResponse(String reportCSID, HashMap params, String reportFileName, boolean isPublishing) throws Exception { Connection conn = null; Response response = null; @@ -202,8 +203,12 @@ public class ReportDocumentModelHandler extends DocHandlerBase { // export report to pdf and build a response with the bytes byte[] pdfasbytes = JasperExportManager.exportReportToPdf(jasperprint); + if (isPublishing == tru) { + + } else { // Need to set response type for what is requested... - response = Response.ok(pdfasbytes, "application/pdf").build(); + response = Response.ok(pdfasbytes, "application/pdf").build(); + } return response; } catch (SQLException sqle) { -- 2.47.3