From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Sat, 6 Dec 2014 00:47:35 +0000 (-0800)
Subject: CSPACE-6520: Remove 'reporter' stubs for now.
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=f9577fd5ffb8bf0eb13935aa454ca347c748a894;p=tmp%2Fjakarta-migration.git

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 7c2babe7e..ec8ede2b8 100644
--- 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 2ec797382..2baf505b3 100644
--- 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 {
 
     final Logger logger = LoggerFactory.getLogger(ReportPostInitHandler.class);
    
-//    public static final String REPORTER_ROLE_NAME_KEY = "reporterRoleName";
-//    public static final String DEFAULT_REPORTER_ROLE_NAME = "reporter" + ServiceMain.getInstance().getCspaceInstanceId();
-//    private String reporterRoleName = DEFAULT_REPORTER_ROLE_NAME;
-    
-    // Currently retained for backward compatibility
     public static final String READER_ROLE_NAME_KEY = "readerRoleName";
     public static final String DEFAULT_READER_ROLE_NAME = "reader" + ServiceMain.getInstance().getCspaceInstanceId();
     private String readerRoleName = DEFAULT_READER_ROLE_NAME;
@@ -70,15 +65,6 @@ public class ReportPostInitHandler extends InitHandler implements IInitHandler {
     		List<Property> propertyList) throws Exception {
         //Check for existing privileges, and if not there, grant them
     	for(Property prop : propertyList) {
-//                if(REPORTER_ROLE_NAME_KEY.equals(prop.getKey())) {
-//                    String value = prop.getValue();
-//                    if(Tools.notEmpty(value) && !DEFAULT_REPORTER_ROLE_NAME.equals(value)){
-//                        reporterRoleName = value + ServiceMain.getInstance().getCspaceInstanceId();
-//                        logger.debug("ReportPostInitHandler: overriding reporterRoleName default value to use: "
-//                                + value);
-//                    }
-//                }
-                // FIXME: Currently retained for backward compatibility; remove this block when appropriate
                 if(READER_ROLE_NAME_KEY.equals(prop.getKey())) {
                     String value = prop.getValue();
                     if(Tools.notEmpty(value) && !DEFAULT_READER_ROLE_NAME.equals(value)){
@@ -89,8 +75,6 @@ public class ReportPostInitHandler extends InitHandler implements IInitHandler {
             }
         }
         String privilegeName = JDBCTools.DATABASE_SELECT_PRIVILEGE_NAME;
-//        JDBCTools.grantPrivilegeToDatabaseUser(dataSourceName, repositoryName, cspaceInstanceId, privilegeName, reporterRoleName);
-        // FIXME: Currently retained for backward compatibility; remove the following line when appropriate
         JDBCTools.grantPrivilegeToDatabaseUser(dataSourceName, repositoryName, cspaceInstanceId, privilegeName, readerRoleName);
     }