Skip to content

Commit 2a59131

Browse files
mohan-13mohan-13
authored
BAH-3475 | Use custom web.xml for oviyam2 (#36)
1 parent 686b2c3 commit 2a59131

File tree

2 files changed

+292
-4
lines changed

2 files changed

+292
-4
lines changed

‎package/docker/dcm4chee/Dockerfile

+6-4
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,28 @@ ENV OVIYAM_VERSION=2.8.1
66

77
ENV DCM4CHEE_PATH=/var/lib/bahmni/dcm4chee
88
ENV JBOSS_PATH=/usr/share/jboss
9-
ENV OVIYAM2_PATH=${DCM4CHEE_PATH}/server/default/deploy/
9+
ENV OVIYAM2_PATH=${DCM4CHEE_PATH}/server/default/deploy/oviyam2.war
1010
ENV DOWNLOAD_PATH=/tmp/artifacts
1111

1212
RUN mkdir -p ${DCM4CHEE_PATH}
1313
RUN mkdir -p ${JBOSS_PATH}
1414
RUN mkdir -p ${DOWNLOAD_PATH}
15+
RUN mkdir -p ${OVIYAM2_PATH}
1516

1617
RUN yum install -y gettext postgresql unzip nc
1718

18-
RUN curl -L -o ${DOWNLOAD_PATH}/dcm4chee.zip "http://repo.mybahmni.org.s3.amazonaws.com/packages/build/${DCM4CHEE_VERSION}.zip"
19+
RUN curl -L -o ${DOWNLOAD_PATH}/dcm4chee.zip "https://repo.mybahmni.org/packages/build/${DCM4CHEE_VERSION}.zip"
1920
RUN unzip -d ${DOWNLOAD_PATH} ${DOWNLOAD_PATH}/dcm4chee.zip
2021
RUN cp -R ${DOWNLOAD_PATH}/${DCM4CHEE_VERSION}/. $DCM4CHEE_PATH
2122

22-
RUN curl -L -o ${DOWNLOAD_PATH}/jboss.zip "http://repo.mybahmni.org.s3.amazonaws.com/packages/servers/${JBOSS_VERSION}-jdk6.zip"
23+
RUN curl -L -o ${DOWNLOAD_PATH}/jboss.zip "https://repo.mybahmni.org/packages/servers/${JBOSS_VERSION}-jdk6.zip"
2324
RUN unzip -d ${DOWNLOAD_PATH} ${DOWNLOAD_PATH}/jboss.zip
2425
RUN cp -R ${DOWNLOAD_PATH}/${JBOSS_VERSION}/. ${JBOSS_PATH}
2526

2627
RUN curl -L -o ${DOWNLOAD_PATH}/Oviyam.zip "https://webwerks.dl.sourceforge.net/project/dcm4che/Oviyam/${OVIYAM_VERSION}/Oviyam-${OVIYAM_VERSION}-bin.zip"
2728
RUN unzip -d ${DOWNLOAD_PATH}/ ${DOWNLOAD_PATH}/Oviyam.zip
28-
RUN cp ${DOWNLOAD_PATH}/Oviyam-${OVIYAM_VERSION}-bin/Oviyam-${OVIYAM_VERSION}-bin/oviyam2.war ${OVIYAM2_PATH}
29+
RUN cd ${OVIYAM2_PATH} && jar -xvf ${DOWNLOAD_PATH}/Oviyam-${OVIYAM_VERSION}-bin/Oviyam-${OVIYAM_VERSION}-bin/oviyam2.war
30+
COPY package/resources/dcm4chee/oviyam2-web.xml ${OVIYAM2_PATH}/WEB-INF/web.xml
2931

3032
RUN curl -o wait-for.sh 'https://raw.githubusercontent.com/eficode/wait-for/v2.2.3/wait-for'
3133
RUN ${DCM4CHEE_PATH}/bin/install_jboss.sh /usr/share/jboss

‎package/resources/dcm4chee/oviyam2-web.xml

+286
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,286 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
3+
4+
<context-param>
5+
<param-name>imgLateralityDisplay</param-name>
6+
<param-value>Yes</param-value>
7+
</context-param>
8+
9+
<context-param>
10+
<param-name>imgLateralityModality</param-name>
11+
<param-value>ALL</param-value>
12+
</context-param>
13+
14+
<context-param>
15+
<param-name>imgLateralityModalityList</param-name>
16+
<param-value> </param-value>
17+
</context-param>
18+
19+
<servlet>
20+
<servlet-name>EchoServlet</servlet-name>
21+
<servlet-class>in.raster.oviyam.servlet.EchoServlet</servlet-class>
22+
</servlet>
23+
<servlet>
24+
<servlet-name>DicomNodes</servlet-name>
25+
<servlet-class>in.raster.oviyam.servlet.DicomNodes</servlet-class>
26+
</servlet>
27+
<servlet>
28+
<servlet-name>SeriesServlet</servlet-name>
29+
<servlet-class>in.raster.oviyam.servlet.SeriesServlet</servlet-class>
30+
</servlet>
31+
<servlet>
32+
<servlet-name>InstanceServlet</servlet-name>
33+
<servlet-class>in.raster.oviyam.servlet.InstanceServlet</servlet-class>
34+
</servlet>
35+
<servlet>
36+
<servlet-name>DcmImage</servlet-name>
37+
<servlet-class>in.raster.oviyam.servlet.DcmImage</servlet-class>
38+
</servlet>
39+
<servlet>
40+
<servlet-name>PixelData</servlet-name>
41+
<servlet-class>in.raster.oviyam.servlet.PixelDataServlet</servlet-class>
42+
</servlet>
43+
<servlet>
44+
<servlet-name>DicomRetrieve</servlet-name>
45+
<servlet-class>in.raster.oviyam.servlet.DicomRetrieve</servlet-class>
46+
</servlet>
47+
<servlet>
48+
<servlet-name>DownloadStudyServlet</servlet-name>
49+
<servlet-class>in.raster.oviyam.servlet.DownloadStudyServlet</servlet-class>
50+
</servlet>
51+
<servlet>
52+
<servlet-name>DownloadServlet</servlet-name>
53+
<servlet-class>in.raster.oviyam.servlet.DownloadServlet</servlet-class>
54+
</servlet>
55+
<servlet>
56+
<servlet-name>OverlayTextServlet</servlet-name>
57+
<servlet-class>in.raster.oviyam.servlet.OverlayConfigServlet</servlet-class>
58+
</servlet>
59+
<servlet>
60+
<servlet-name>ServerConfigServlet</servlet-name>
61+
<servlet-class>in.raster.oviyam.servlet.ServerConfigServlet</servlet-class>
62+
</servlet>
63+
<servlet>
64+
<servlet-name>QueryParams</servlet-name>
65+
<servlet-class>in.raster.oviyam.servlet.QueryParams</servlet-class>
66+
</servlet>
67+
<servlet>
68+
<servlet-name>UserConfiguration</servlet-name>
69+
<servlet-class>in.raster.oviyam.servlet.UserConfiguration</servlet-class>
70+
</servlet>
71+
<servlet>
72+
<servlet-name>StudyInfoServlet</servlet-name>
73+
<servlet-class>in.raster.oviyam.servlet.StudyInfoServlet</servlet-class>
74+
</servlet>
75+
<servlet>
76+
<servlet-name>AutoRefreshStudies</servlet-name>
77+
<servlet-class>in.raster.oviyam.servlet.AutoRefreshStudies</servlet-class>
78+
</servlet>
79+
<servlet>
80+
<servlet-name>WadoServlet</servlet-name>
81+
<servlet-class>in.raster.oviyam.servlet.WadoServlet</servlet-class>
82+
</servlet>
83+
<servlet>
84+
<servlet-name>Listener</servlet-name>
85+
<servlet-class>in.raster.oviyam.servlet.ListenerServlet</servlet-class>
86+
</servlet>
87+
<servlet>
88+
<servlet-name>DownloadConfiguration</servlet-name>
89+
<servlet-class>in.raster.oviyam.servlet.DownloadConfiguration</servlet-class>
90+
</servlet>
91+
<servlet>
92+
<servlet-name>LanguageServlet</servlet-name>
93+
<servlet-class>in.raster.oviyam.servlet.LanguageServlet</servlet-class>
94+
</servlet>
95+
<servlet>
96+
<servlet-name>CopyDicomFilesServlet</servlet-name>
97+
<servlet-class>in.raster.oviyam.threed.CopyDicomFiles</servlet-class>
98+
</servlet>
99+
<!--
100+
<servlet>
101+
<servlet-name>ThreeDServlet</servlet-name>
102+
<servlet-class>in.raster.oviyam.threed.surfaceJson</servlet-class>
103+
</servlet>
104+
-->
105+
<servlet>
106+
<servlet-name>IOviyamContext</servlet-name>
107+
<servlet-class>in.raster.oviyam.servlet.IOviyamContext</servlet-class>
108+
</servlet>
109+
<servlet>
110+
<servlet-name>DirectUrlLaunch</servlet-name>
111+
<servlet-class>in.raster.oviyam.servlet.DirectUrlLaunch</servlet-class>
112+
</servlet>
113+
<servlet>
114+
<servlet-name>OtherStudies</servlet-name>
115+
<servlet-class>in.raster.oviyam.servlet.OtherStudiesInfo</servlet-class>
116+
</servlet>
117+
<servlet>
118+
<servlet-name>NameDisplayConfig</servlet-name>
119+
<servlet-class>in.raster.oviyam.servlet.NameDisplayConfigSevlet</servlet-class>
120+
</servlet>
121+
122+
<servlet-mapping>
123+
<servlet-name>EchoServlet</servlet-name>
124+
<url-pattern>/Echo.do</url-pattern>
125+
</servlet-mapping>
126+
<servlet-mapping>
127+
<servlet-name>DicomNodes</servlet-name>
128+
<url-pattern>/DicomNodes.do</url-pattern>
129+
</servlet-mapping>
130+
<servlet-mapping>
131+
<servlet-name>SeriesServlet</servlet-name>
132+
<url-pattern>/Series.do</url-pattern>
133+
</servlet-mapping>
134+
<servlet-mapping>
135+
<servlet-name>InstanceServlet</servlet-name>
136+
<url-pattern>/Instance.do</url-pattern>
137+
</servlet-mapping>
138+
<servlet-mapping>
139+
<servlet-name>DownloadStudyServlet</servlet-name>
140+
<url-pattern>/downloadStudy.do</url-pattern>
141+
</servlet-mapping>
142+
<servlet-mapping>
143+
<servlet-name>DownloadServlet</servlet-name>
144+
<url-pattern>/download.do</url-pattern>
145+
</servlet-mapping>
146+
<servlet-mapping>
147+
<servlet-name>OverlayTextServlet</servlet-name>
148+
<url-pattern>/overlayText.do</url-pattern>
149+
</servlet-mapping>
150+
<servlet-mapping>
151+
<servlet-name>DcmImage</servlet-name>
152+
<url-pattern>/Image.do</url-pattern>
153+
</servlet-mapping>
154+
<servlet-mapping>
155+
<servlet-name>PixelData</servlet-name>
156+
<url-pattern>/pixel.do</url-pattern>
157+
</servlet-mapping>
158+
<servlet-mapping>
159+
<servlet-name>DicomRetrieve</servlet-name>
160+
<url-pattern>/DcmStream.do</url-pattern>
161+
</servlet-mapping>
162+
<servlet-mapping>
163+
<servlet-name>ServerConfigServlet</servlet-name>
164+
<url-pattern>/ServerConfig.do</url-pattern>
165+
</servlet-mapping>
166+
<servlet-mapping>
167+
<servlet-name>QueryParams</servlet-name>
168+
<url-pattern>/QueryParams.do</url-pattern>
169+
</servlet-mapping>
170+
<servlet-mapping>
171+
<servlet-name>UserConfiguration</servlet-name>
172+
<url-pattern>/UserConfig.do</url-pattern>
173+
</servlet-mapping>
174+
<servlet-mapping>
175+
<servlet-name>StudyInfoServlet</servlet-name>
176+
<url-pattern>/StudyInfo.do</url-pattern>
177+
</servlet-mapping>
178+
<servlet-mapping>
179+
<servlet-name>AutoRefreshStudies</servlet-name>
180+
<url-pattern>/RefreshStudies.do</url-pattern>
181+
</servlet-mapping>
182+
<servlet-mapping>
183+
<servlet-name>WadoServlet</servlet-name>
184+
<url-pattern>/Wado.do</url-pattern>
185+
</servlet-mapping>
186+
<servlet-mapping>
187+
<servlet-name>Listener</servlet-name>
188+
<url-pattern>/Listener.do</url-pattern>
189+
</servlet-mapping>
190+
<servlet-mapping>
191+
<servlet-name>LanguageServlet</servlet-name>
192+
<url-pattern>/Language.do</url-pattern>
193+
</servlet-mapping>
194+
<servlet-mapping>
195+
<servlet-name>DownloadConfiguration</servlet-name>
196+
<url-pattern>/DwnStudyConfig.do</url-pattern>
197+
</servlet-mapping>
198+
<servlet-mapping>
199+
<servlet-name>CopyDicomFilesServlet</servlet-name>
200+
<url-pattern>/CopyDicomFiles.do</url-pattern>
201+
</servlet-mapping>
202+
<!--
203+
<servlet-mapping>
204+
<servlet-name>ThreeDServlet</servlet-name>
205+
<url-pattern>/surfaceJson.do</url-pattern>
206+
</servlet-mapping>
207+
-->
208+
<servlet-mapping>
209+
<servlet-name>IOviyamContext</servlet-name>
210+
<url-pattern>/do/IOviyamContext</url-pattern>
211+
</servlet-mapping>
212+
<servlet-mapping>
213+
<servlet-name>DirectUrlLaunch</servlet-name>
214+
<url-pattern>/oviyam</url-pattern>
215+
</servlet-mapping>
216+
<servlet-mapping>
217+
<servlet-name>OtherStudies</servlet-name>
218+
<url-pattern>/otherStudies.do</url-pattern>
219+
</servlet-mapping>
220+
<servlet-mapping>
221+
<servlet-name>NameDisplayConfig</servlet-name>
222+
<url-pattern>/nameDisplayConfig.do</url-pattern>
223+
</servlet-mapping>
224+
225+
<filter>
226+
<filter-name>requestEncodeFilter</filter-name>
227+
<filter-class>in.raster.oviyam.util.RequestEncodeFilter</filter-class>
228+
<init-param>
229+
<param-name>excludedUrls</param-name>
230+
<param-value>/downloadStudy.do</param-value>
231+
</init-param>
232+
</filter>
233+
<filter-mapping>
234+
<filter-name>requestEncodeFilter</filter-name>
235+
<url-pattern>/*</url-pattern>
236+
</filter-mapping>
237+
238+
<session-config>
239+
<session-timeout>
240+
30
241+
</session-timeout>
242+
</session-config>
243+
<welcome-file-list>
244+
<welcome-file>default.jsp</welcome-file>
245+
</welcome-file-list>
246+
247+
<!-- A security constraint that restricts access to the
248+
Archive Web Administration pages to users with the role WebAdmin.
249+
-->
250+
<!-- <security-constraint>
251+
<web-resource-collection>
252+
<web-resource-name>dispatcher</web-resource-name>
253+
<description>Only allows users with the role WebAdmin to access the Archive Web Administration pages</description>
254+
<url-pattern>*.jsp</url-pattern>
255+
<url-pattern>*.html</url-pattern>
256+
<url-pattern>*.do</url-pattern>
257+
<url-pattern>/oviyam</url-pattern>
258+
<http-method>GET</http-method>
259+
<http-method>POST</http-method>
260+
</web-resource-collection>
261+
<auth-constraint>
262+
<role-name>*</role-name>
263+
</auth-constraint>
264+
265+
</security-constraint> -->
266+
267+
<login-config>
268+
<auth-method>FORM</auth-method>
269+
<realm-name>Archive Web Admin</realm-name>
270+
<form-login-config>
271+
<form-login-page>/login.jsp</form-login-page>
272+
<form-error-page>/error.jsp</form-error-page>
273+
</form-login-config>
274+
</login-config>
275+
<security-role>
276+
<role-name>*</role-name>
277+
</security-role>
278+
279+
<!-- <security-role>
280+
<role-name>WebUser</role-name>
281+
</security-role>
282+
<security-role>
283+
<role-name>WebAdmin</role-name>
284+
</security-role> -->
285+
286+
</web-app>

0 commit comments

Comments
 (0)