NOJIRA: Removing dead class from source tree.

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 df589de7a20b2df43cd5efff8bb2475f32df38fd..def363563e0538a2e93a5969aa8469def4c0f5fc 100644 (file)
--- 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 +\r
                        "\" instead.");\r
         }\r
-        \r
-        if (logger.isErrorEnabled() == true) {\r
-               System.out.println("+++ server root directory is: " + serverRootDir);\r
-               try {\r
-                               FileOutputStream appLayerRootHello = new FileOutputStream(serverRootDir + "webapps\\collectionspace\\hello");\r
-                               try {\r
-                                       appLayerRootHello.write("Hello?".getBytes());\r
-                               } catch (IOException e) {\r
-                                       // TODO Auto-generated catch block\r
-                                       e.printStackTrace();\r
-                               }\r
-                       } catch (FileNotFoundException e) {\r
-                               // TODO Auto-generated catch block\r
-                               e.printStackTrace();\r
-                       }\r
-        }\r
     }\r
 \r
 \r

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 836e8d09dc1b1444686730cd1d1f695ef42efd75..c83812ccbde1261b1a85591aed807085a87b82e7 100644 (file)
--- 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 (file)
index d272bc9..0000000
--- 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 41d71ea3cdd9536a5e6bd93e88287d7cdc38e8f1..b1db3f8e09759135c414394ebd0cba9cfffa4aab 100644 (file)
--- 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<ReportsCommon> {
        public Response invokeReport(
                        ServiceContext<PoxPayloadIn, PoxPayloadOut> 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<ReportsCommon> {
                                repoClient.releaseRepositorySession(ctx, repoSession);
                        }
                }
-               return buildReportResponse(csid, params, reportFileName);
+               return buildReportResponse(csid, params, reportFileName, isPublishing);
        }
 
 
-    private Response buildReportResponse(String reportCSID, HashMap<String, Object> params, String reportFileName)
+    private Response buildReportResponse(String reportCSID, HashMap<String, Object> params, String reportFileName, boolean isPublishing)
                                throws Exception {
                Connection conn = null;
                Response response = null;
@@ -202,8 +203,12 @@ public class ReportDocumentModelHandler extends DocHandlerBase<ReportsCommon> {
                        // 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) {