CSPACE-6520: Remove 'reporter' stubs for now.

diff --git a/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto-unified.xml b/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto-unified.xml
index 7c2babe7ea0f074b1bb885cc6f0b7ec424286e81..ec8ede2b8d8fc627a87292b3648eb7a0313812b1 100644 (file)
--- a/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto-unified.xml
+++ b/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto-unified.xml
@@ -360,12 +360,6 @@
                        <service:initHandler xmlns:service="http://collectionspace.org/services/config/service">
                                <service:classname>org.collectionspace.services.report.nuxeo.ReportPostInitHandler</service:classname>
                                <service:params>
-                                    <!-- The name of a database account (role) that will provide remote access for building and running reports  -->
-                                    <service:property>
-                                        <service:key>reporterRoleName</service:key>
-                                        <service:value>reporter</service:value>
-                                    </service:property>
-                                    <!-- Currently retained for backward compatibility -->
                                     <service:property>
                                             <service:key>readerRoleName</service:key>
                                             <service:value>reader</service:value>

diff --git a/services/report/service/src/main/java/org/collectionspace/services/report/nuxeo/ReportPostInitHandler.java b/services/report/service/src/main/java/org/collectionspace/services/report/nuxeo/ReportPostInitHandler.java
index 2ec79738271a679df78b8572e3bc131145cd46f0..2baf505b3efa9c2edea9c393c2714a39c2ce8749 100644 (file)
--- a/services/report/service/src/main/java/org/collectionspace/services/report/nuxeo/ReportPostInitHandler.java
+++ b/services/report/service/src/main/java/org/collectionspace/services/report/nuxeo/ReportPostInitHandler.java
@@ -50,11 +50,6 @@ public class ReportPostInitHandler extends InitHandler implements IInitHandler {
 \r
     final Logger logger = LoggerFactory.getLogger(ReportPostInitHandler.class);\r
    \r
-//    public static final String REPORTER_ROLE_NAME_KEY = "reporterRoleName";\r
-//    public static final String DEFAULT_REPORTER_ROLE_NAME = "reporter" + ServiceMain.getInstance().getCspaceInstanceId();\r
-//    private String reporterRoleName = DEFAULT_REPORTER_ROLE_NAME;\r
-    \r
-    // Currently retained for backward compatibility\r
     public static final String READER_ROLE_NAME_KEY = "readerRoleName";\r
     public static final String DEFAULT_READER_ROLE_NAME = "reader" + ServiceMain.getInstance().getCspaceInstanceId();\r
     private String readerRoleName = DEFAULT_READER_ROLE_NAME;\r
@@ -70,15 +65,6 @@ public class ReportPostInitHandler extends InitHandler implements IInitHandler {
                List<Property> propertyList) throws Exception {\r
         //Check for existing privileges, and if not there, grant them\r
        for(Property prop : propertyList) {\r
-//                if(REPORTER_ROLE_NAME_KEY.equals(prop.getKey())) {\r
-//                    String value = prop.getValue();\r
-//                    if(Tools.notEmpty(value) && !DEFAULT_REPORTER_ROLE_NAME.equals(value)){\r
-//                        reporterRoleName = value + ServiceMain.getInstance().getCspaceInstanceId();\r
-//                        logger.debug("ReportPostInitHandler: overriding reporterRoleName default value to use: "\r
-//                                + value);\r
-//                    }\r
-//                }\r
-                // FIXME: Currently retained for backward compatibility; remove this block when appropriate\r
                 if(READER_ROLE_NAME_KEY.equals(prop.getKey())) {\r
                     String value = prop.getValue();\r
                     if(Tools.notEmpty(value) && !DEFAULT_READER_ROLE_NAME.equals(value)){\r
@@ -89,8 +75,6 @@ public class ReportPostInitHandler extends InitHandler implements IInitHandler {
             }\r
         }\r
         String privilegeName = JDBCTools.DATABASE_SELECT_PRIVILEGE_NAME;\r
-//        JDBCTools.grantPrivilegeToDatabaseUser(dataSourceName, repositoryName, cspaceInstanceId, privilegeName, reporterRoleName);\r
-        // FIXME: Currently retained for backward compatibility; remove the following line when appropriate\r
         JDBCTools.grantPrivilegeToDatabaseUser(dataSourceName, repositoryName, cspaceInstanceId, privilegeName, readerRoleName);\r
     }\r
     \r