Skip to content

Commit b1f6bda

Browse files
author
Roger G. Coram
committed
Merge pull request #144 from kris-sigur/conf-fix
Verified locally; merging.
2 parents 6d64391 + 38a6a05 commit b1f6bda

File tree

3 files changed

+32
-28
lines changed

3 files changed

+32
-28
lines changed

‎wayback-webapp/src/main/webapp/WEB-INF/BDBCollection.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@
4141
<list>
4242
<bean class="org.archive.wayback.resourcestore.resourcefile.DirectoryResourceFileSource">
4343
<property name="name" value="files1" />
44-
<property name="prefix" value="${wayback.basedir}/files1/" />
44+
<property name="prefix" value="${wayback.archivedir.1}" />
4545
<property name="recurse" value="false" />
4646
</bean>
4747
<bean class="org.archive.wayback.resourcestore.resourcefile.DirectoryResourceFileSource">
4848
<property name="name" value="files2" />
49-
<property name="prefix" value="${wayback.basedir}/files2/" />
49+
<property name="prefix" value="${wayback.archivedir.2}" />
5050
<property name="recurse" value="false" />
5151
</bean>
5252
</list>

‎wayback-webapp/src/main/webapp/WEB-INF/CDXCollection.xml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,7 @@
3030

3131
<property name="resourceStore">
3232
<bean class="org.archive.wayback.resourcestore.LocationDBResourceStore">
33-
<property name="db">
34-
<bean class="org.archive.wayback.resourcestore.locationdb.FlatFileResourceFileLocationDB">
35-
<property name="path" value="${wayback.basedir}/path-index.txt" />
36-
</bean>
37-
</property>
33+
<property name="db" ref="resourcefilelocationdb" />
3834
</bean>
3935
</property>
4036

‎wayback-webapp/src/main/webapp/WEB-INF/wayback.xml‎

Lines changed: 29 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,15 @@
1414
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
1515
<property name="properties">
1616
<value>
17-
wayback.basedir=/tmp/wayback
18-
wayback.urlprefix=http://localhost:8080/wayback/
17+
wayback.basedir=/tmp/openwayback
18+
19+
wayback.archivedir.1=${wayback.basedir}/files1/
20+
wayback.archivedir.2=${wayback.basedir}/files2/
21+
22+
wayback.url.scheme=http
23+
wayback.url.host=localhost
24+
wayback.url.port=8080
25+
wayback.url.prefix=${wayback.url.scheme}://${wayback.url.host}:${wayback.url.port}
1926
</value>
2027
</property>
2128
</bean>
@@ -150,8 +157,8 @@
150157
</bean>
151158

152159
<bean name="standardaccesspoint" class="org.archive.wayback.webapp.AccessPoint">
153-
<property name="accessPointPath" value="http://localhost:8080/wayback/"/>
154-
<property name="internalPort" value="8080"/>
160+
<property name="accessPointPath" value="${wayback.url.prefix}/wayback/"/>
161+
<property name="internalPort" value="${wayback.url.port}"/>
155162
<property name="serveStatic" value="true" />
156163
<property name="bounceToReplayPrefix" value="false" />
157164
<property name="bounceToQueryPrefix" value="false" />
@@ -161,9 +168,9 @@
161168
requests by different URL prefixes
162169
-->
163170

164-
<property name="replayPrefix" value="${wayback.urlprefix}" />
165-
<property name="queryPrefix" value="${wayback.urlprefix}" />
166-
<property name="staticPrefix" value="${wayback.urlprefix}" />
171+
<property name="replayPrefix" value="${wayback.url.prefix}/wayback/" />
172+
<property name="queryPrefix" value="${wayback.url.prefix}/wayback/" />
173+
<property name="staticPrefix" value="${wayback.url.prefix}/wayback/" />
167174

168175
<!--
169176
The following property will cause only results matching the exact host
@@ -193,7 +200,7 @@
193200

194201
<property name="uriConverter">
195202
<bean class="org.archive.wayback.archivalurl.ArchivalUrlResultURIConverter">
196-
<property name="replayURIPrefix" value="${wayback.urlprefix}"/>
203+
<property name="replayURIPrefix" value="${wayback.url.prefix}/wayback/"/>
197204
</bean>
198205
</property>
199206

@@ -229,10 +236,10 @@
229236
<!--
230237
<import resource="MementoReplay.xml"/>
231238
<bean name="mementoaccesspoint" parent="standardaccesspoint">
232-
<property name="accessPointPath" value="http://localhost:8080/memento/"/>
233-
<property name="internalPort" value="8080"/>
234-
<property name="replayPrefix" value="http://localhost:8080/memento/" />
235-
<property name="queryPrefix" value="http://localhost:8080/list/" />
239+
<property name="accessPointPath" value="${wayback.url.prefix}/memento/"/>
240+
<property name="internalPort" value="${wayback.url.host}"/>
241+
<property name="replayPrefix" value="$${wayback.url.prefix}/memento/" />
242+
<property name="queryPrefix" value="${wayback.url.prefix}/list/" />
236243
<property name="configs">
237244
<props>
238245
<prop key="aggregationPrefix">http://localhost:8080/list/</prop>
@@ -248,7 +255,7 @@
248255
249256
<property name="uriConverter">
250257
<bean class="org.archive.wayback.archivalurl.ArchivalUrlResultURIConverter">
251-
<property name="replayURIPrefix" value="http://localhost:8080/memento/"/>
258+
<property name="replayURIPrefix" value="${wayback.url.prefix}/memento/"/>
252259
</bean>
253260
</property>
254261
<property name="parser">
@@ -265,13 +272,14 @@
265272
</bean>
266273
267274
268-
<bean name="8080:list" parent="mementoaccesspoint">
269-
<property name="replayPrefix" value="http://localhost:8080/memento/" />
270-
<property name="queryPrefix" value="http://localhost:8080/list/" />
271-
<property name="staticPrefix" value="http://localhost:8080/list/" />
275+
<bean name="list" parent="mementoaccesspoint">
276+
<property name="replayPrefix" value="${wayback.url.prefix}/memento/" />
277+
<property name="queryPrefix" value="${wayback.url.prefix}/list/" />
278+
<property name="staticPrefix" value="${wayback.url.prefix}/list/" />
279+
<property name="internalPort" value="${wayback.url.host}"/>
272280
<property name="configs">
273281
<props>
274-
<prop key="Prefix">http://localhost:8080/memento/</prop>
282+
<prop key="Prefix">${wayback.url.scheme}://${wayback.url.host}:${wayback.url.port}/memento/</prop>
275283
</props>
276284
</property>
277285
@@ -300,9 +308,9 @@
300308
-->
301309
<!--
302310
<bean name="opensearchaccesspoint" parent="standardaccesspoint">
303-
<property name="accessPointPath" value="http://localhost:8080/opensearch/"/>
304-
<property name="internalPort" value="8080"/>
305-
<property name="queryPrefix" value="http://localhost:8080/opensearch/" />
311+
<property name="accessPointPath" value="${wayback.url.prefix}/opensearch/"/>
312+
<property name="internalPort" value="${wayback.url.port}"/>
313+
<property name="queryPrefix" value="${wayback.url.prefix}/opensearch/" />
306314
<property name="query">
307315
<bean class="org.archive.wayback.query.Renderer">
308316
<property name="captureJsp" value="/WEB-INF/query/OpenSearchCaptureResults.jsp" />

0 commit comments

Comments
 (0)