Fixes for the ML startup error (ORCID#7114)

Camelia-Orcid · web-flow · commit e3eddca0c99c · 2024-10-29T09:29:57.000-06:00
diff --git a/orcid-activemq/src/main/resources/message-listener.properties b/orcid-activemq/src/main/resources/message-listener.properties
@@ -70,4 +70,15 @@ org.orcid.message-listener.index.s3.search.max_elements=5
 org.orcid.message-listener.index.summaries.bucket_name=v2.0-summaries-dev
 org.orcid.message-listener.index.activities.bucket_name=v2.0-activities-dev
 org.orcid.message-listener.index.summaries.v3.bucket_name=v3.0-summaries-dev
-org.orcid.message-listener.index.activities.v3.bucket_name=v3.0-activities-dev
+org.orcid.message-listener.index.activities.v3.bucket_name=v3.0-activities-dev
+
+
+org.orcid.persistence.panoply.cleanup.production=false
+# Panoply redshift database 
+org.orcid.core.utils.panoply.driver=com.amazon.redshift.jdbc.Driver
+org.orcid.core.utils.panoply.maxPoolSize=20
+org.orcid.core.utils.panoply.password=xxx
+org.orcid.core.utils.panoply.idleConnectionTimeout=3600
+org.orcid.core.utils.panoply.connectionTimeout=36000
+org.orcid.core.utils.panoply.jdbcUrl=xxx
+org.orcid.core.utils.panoply.username=xxx
diff --git a/orcid-message-listener/src/main/resources/orcid-message-listener-web-context.xml b/orcid-message-listener/src/main/resources/orcid-message-listener-web-context.xml
@@ -158,4 +158,24 @@
 	</bean>	
 	
 	<bean id="ORCIDMarshaller" class="org.orcid.utils.jersey.marshaller.ORCIDMarshaller" />
+	
+	<!-- Panoply Redshift -->
+	<bean id="panoplyRedshiftDataSource" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
+		<property name="driverClassName" value="\${org.orcid.core.utils.panoply.driver:com.amazon.redshift.jdbc.Driver}" />
+        <property name="jdbcUrl" value="\${org.orcid.core.utils.panoply.jdbcUrl}" />
+        <property name="username" value="\${org.orcid.core.utils.panoply.username}" />
+        <property name="password" value="\${org.orcid.core.utils.panoply.password}" />
+        <property name="maximumPoolSize" value="\${org.orcid.core.utils.panoply.maxPoolSize:5}" />
+        <property name="idleTimeout" value="\${org.orcid.core.utils.panoply.idleConnectionTimeout:3600}" />
+        <property name="connectionTimeout" value="\${org.orcid.core.utils.panoply.connectionTimeout:3600}" />
+	</bean>
+	
+	<!-- Panoply JdbcTemplate Bean Definition -->
+    <bean id="panoplyJdbcTemplate" class="org.springframework.jdbc.core.JdbcTemplate">
+        <property name="dataSource" ref="panoplyRedshiftDataSource" />
+    </bean>
+    
+    <!-- Redshift panoply -->
+    <bean id="panoplyClient" class="org.orcid.utils.panoply.PanoplyRedshiftClient" />  
+    
 </beans>
