Skip to content

Commit a6ce2d3

Browse files
committed
migrate to using a real applicationContext.xml file
1 parent 21bf365 commit a6ce2d3

3 files changed

Lines changed: 10 additions & 9 deletions

File tree

docker/geoserver/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ RUN cd /usr/local/tomcat/webapps \
2828
&& rm geoserver.war \
2929
&& mkdir -p $GEOSERVER_DATA_DIR
3030

31+
COPY applicationContext.xml /usr/local/tomcat/webapps/geoserver/WEB-INF/classes/applicationContext.xml
32+
3133
VOLUME $GEOSERVER_DATA_DIR
3234

3335
# copy the script and perform the run of scripts from entrypoint.sh
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
3+
4+
<beans>
5+
<bean id="SldXmlReaderExclusionFilter" class="org.geoserver.platform.ClassExclusionFilter">
6+
<property name="beanClass" value="org.geoserver.rest.catalog.AdminRequestCallback" />
7+
</bean>
8+
</beans>

docker/geoserver/entrypoint.sh

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -240,15 +240,6 @@ if [ "${GEOSERVER_CORS_ENABLED}" = "true" ] || [ "${GEOSERVER_CORS_ENABLED}" = "
240240
fi
241241
fi
242242

243-
echo '<?xml version="1.0" encoding="UTF-8"?>
244-
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
245-
<beans>
246-
<bean id="SldXmlReaderExclusionFilter" class="org.geoserver.platform.ClassExclusionFilter">
247-
<property name="beanClass" value="org.geoserver.rest.catalog.AdminRequestCallback" />
248-
</bean>
249-
</beans>' \
250-
> /usr/local/tomcat/webapps/geoserver/WEB-INF/classes/applicationContext.xml
251-
252243
if [ ${FORCE_REINIT} = "true" ] || [ ${FORCE_REINIT} = "True" ] || [ ! -e "${GEOSERVER_DATA_DIR}/geoserver_init.lock" ]; then
253244
# Run async configuration, it needs Geoserver to be up and running
254245
# executes step configure-geoserver from task.py file

0 commit comments

Comments
 (0)