BXC-3284 move to web services app

UNC-Libraries · Nov 7, 2023 · bf366cf · bf366cf
1 parent 4f4215c
commit bf366cf
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/web-access-app/src/main/webapp/WEB-INF/service-context.xml b/web-access-app/src/main/webapp/WEB-INF/service-context.xml
@@ -66,12 +66,6 @@
         <property name="basePath" value="${access.base.url}"/>
         <property name="httpClientConnectionManager" ref="httpClientConnectionManager" />
     </bean>
-
-    <bean id="imageServerProxyService" class="edu.unc.lib.boxc.web.common.services.ImageServerProxyService">
-        <property name="imageServerProxyPath" value="${imageServerProxy.base.url}"/>
-        <property name="basePath" value="${access.base.url}"/>
-        <property name="httpClientConnectionManager" ref="httpClientConnectionManager" />
-    </bean>
 
     <bean id="findingAidUrlService" class="edu.unc.lib.boxc.web.common.services.FindingAidUrlService"
             init-method="init">

diff --git a/...mon/services/ImageServerProxyService.java → ...s/processing/ImageServerProxyService.java b/...mon/services/ImageServerProxyService.java → ...s/processing/ImageServerProxyService.java
@@ -1,4 +1,4 @@
-package edu.unc.lib.boxc.web.common.services;
+package edu.unc.lib.boxc.web.services.processing;
 
 import static edu.unc.lib.boxc.model.fcrepo.ids.RepositoryPaths.idToPath;
 

diff --git a/...ntrollers/ImageServerProxyController.java → ...ices/rest/ImageServerProxyController.java b/...ntrollers/ImageServerProxyController.java → ...ices/rest/ImageServerProxyController.java
@@ -1,4 +1,4 @@
-package edu.unc.lib.boxc.web.common.controllers;
+package edu.unc.lib.boxc.web.services.rest;
 
 import edu.unc.lib.boxc.auth.api.Permission;
 import edu.unc.lib.boxc.auth.api.models.AgentPrincipals;
@@ -8,7 +8,8 @@
 import edu.unc.lib.boxc.auth.fcrepo.services.GroupsThreadStore;
 import edu.unc.lib.boxc.model.api.ids.PID;
 import edu.unc.lib.boxc.model.fcrepo.ids.PIDs;
-import edu.unc.lib.boxc.web.common.services.ImageServerProxyService;
+import edu.unc.lib.boxc.web.common.controllers.AbstractSolrSearchController;
+import edu.unc.lib.boxc.web.services.processing.ImageServerProxyService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

diff --git a/web-services-app/src/main/webapp/WEB-INF/service-context.xml b/web-services-app/src/main/webapp/WEB-INF/service-context.xml
@@ -444,6 +444,12 @@
         <property name="accessControlService" ref="aclService"/>
         <property name="accessCopiesService" ref="accessCopiesService"/>
     </bean>
+
+    <bean id="imageServerProxyService" class="edu.unc.lib.boxc.web.services.processing.ImageServerProxyService">
+        <property name="imageServerProxyPath" value="${imageServerProxy.base.url}"/>
+        <property name="basePath" value="${access.base.url}"/>
+        <property name="httpClientConnectionManager" ref="httpClientConnectionManager" />
+    </bean>
 
     <bean class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
         <property name="staticMethod" value="edu.unc.lib.boxc.web.common.utils.SerializationUtil.injectSettings"/>