Skip to content

Default config cleanup #144

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 24, 2014
Merged

Default config cleanup #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions wayback-webapp/src/main/webapp/WEB-INF/BDBCollection.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,12 @@
<list>
<bean class="org.archive.wayback.resourcestore.resourcefile.DirectoryResourceFileSource">
<property name="name" value="files1" />
<property name="prefix" value="${wayback.basedir}/files1/" />
<property name="prefix" value="${wayback.archivedir.1}" />
<property name="recurse" value="false" />
</bean>
<bean class="org.archive.wayback.resourcestore.resourcefile.DirectoryResourceFileSource">
<property name="name" value="files2" />
<property name="prefix" value="${wayback.basedir}/files2/" />
<property name="prefix" value="${wayback.archivedir.2}" />
<property name="recurse" value="false" />
</bean>
</list>
Expand Down
6 changes: 1 addition & 5 deletions wayback-webapp/src/main/webapp/WEB-INF/CDXCollection.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,7 @@

<property name="resourceStore">
<bean class="org.archive.wayback.resourcestore.LocationDBResourceStore">
<property name="db">
<bean class="org.archive.wayback.resourcestore.locationdb.FlatFileResourceFileLocationDB">
<property name="path" value="${wayback.basedir}/path-index.txt" />
</bean>
</property>
<property name="db" ref="resourcefilelocationdb" />
</bean>
</property>

Expand Down
50 changes: 29 additions & 21 deletions wayback-webapp/src/main/webapp/WEB-INF/wayback.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,15 @@
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
<property name="properties">
<value>
wayback.basedir=/tmp/wayback
wayback.urlprefix=http://localhost:8080/wayback/
wayback.basedir=/tmp/openwayback

wayback.archivedir.1=${wayback.basedir}/files1/
wayback.archivedir.2=${wayback.basedir}/files2/

wayback.url.scheme=http
wayback.url.host=localhost
wayback.url.port=8080
wayback.url.prefix=${wayback.url.scheme}://${wayback.url.host}:${wayback.url.port}
</value>
</property>
</bean>
Expand Down Expand Up @@ -150,8 +157,8 @@
</bean>

<bean name="standardaccesspoint" class="org.archive.wayback.webapp.AccessPoint">
<property name="accessPointPath" value="http://localhost:8080/wayback/"/>
<property name="internalPort" value="8080"/>
<property name="accessPointPath" value="${wayback.url.prefix}/wayback/"/>
<property name="internalPort" value="${wayback.url.port}"/>
<property name="serveStatic" value="true" />
<property name="bounceToReplayPrefix" value="false" />
<property name="bounceToQueryPrefix" value="false" />
Expand All @@ -161,9 +168,9 @@
requests by different URL prefixes
-->

<property name="replayPrefix" value="${wayback.urlprefix}" />
<property name="queryPrefix" value="${wayback.urlprefix}" />
<property name="staticPrefix" value="${wayback.urlprefix}" />
<property name="replayPrefix" value="${wayback.url.prefix}/wayback/" />
<property name="queryPrefix" value="${wayback.url.prefix}/wayback/" />
<property name="staticPrefix" value="${wayback.url.prefix}/wayback/" />

<!--
The following property will cause only results matching the exact host
Expand Down Expand Up @@ -193,7 +200,7 @@

<property name="uriConverter">
<bean class="org.archive.wayback.archivalurl.ArchivalUrlResultURIConverter">
<property name="replayURIPrefix" value="${wayback.urlprefix}"/>
<property name="replayURIPrefix" value="${wayback.url.prefix}/wayback/"/>
</bean>
</property>

Expand Down Expand Up @@ -229,10 +236,10 @@
<!--
<import resource="MementoReplay.xml"/>
<bean name="mementoaccesspoint" parent="standardaccesspoint">
<property name="accessPointPath" value="http://localhost:8080/memento/"/>
<property name="internalPort" value="8080"/>
<property name="replayPrefix" value="http://localhost:8080/memento/" />
<property name="queryPrefix" value="http://localhost:8080/list/" />
<property name="accessPointPath" value="${wayback.url.prefix}/memento/"/>
<property name="internalPort" value="${wayback.url.host}"/>
<property name="replayPrefix" value="$${wayback.url.prefix}/memento/" />
<property name="queryPrefix" value="${wayback.url.prefix}/list/" />
<property name="configs">
<props>
<prop key="aggregationPrefix">http://localhost:8080/list/</prop>
Expand All @@ -248,7 +255,7 @@

<property name="uriConverter">
<bean class="org.archive.wayback.archivalurl.ArchivalUrlResultURIConverter">
<property name="replayURIPrefix" value="http://localhost:8080/memento/"/>
<property name="replayURIPrefix" value="${wayback.url.prefix}/memento/"/>
</bean>
</property>
<property name="parser">
Expand All @@ -265,13 +272,14 @@
</bean>


<bean name="8080:list" parent="mementoaccesspoint">
<property name="replayPrefix" value="http://localhost:8080/memento/" />
<property name="queryPrefix" value="http://localhost:8080/list/" />
<property name="staticPrefix" value="http://localhost:8080/list/" />
<bean name="list" parent="mementoaccesspoint">
<property name="replayPrefix" value="${wayback.url.prefix}/memento/" />
<property name="queryPrefix" value="${wayback.url.prefix}/list/" />
<property name="staticPrefix" value="${wayback.url.prefix}/list/" />
<property name="internalPort" value="${wayback.url.host}"/>
<property name="configs">
<props>
<prop key="Prefix">http://localhost:8080/memento/</prop>
<prop key="Prefix">${wayback.url.scheme}://${wayback.url.host}:${wayback.url.port}/memento/</prop>
</props>
</property>

Expand Down Expand Up @@ -300,9 +308,9 @@
-->
<!--
<bean name="opensearchaccesspoint" parent="standardaccesspoint">
<property name="accessPointPath" value="http://localhost:8080/opensearch/"/>
<property name="internalPort" value="8080"/>
<property name="queryPrefix" value="http://localhost:8080/opensearch/" />
<property name="accessPointPath" value="${wayback.url.prefix}/opensearch/"/>
<property name="internalPort" value="${wayback.url.port}"/>
<property name="queryPrefix" value="${wayback.url.prefix}/opensearch/" />
<property name="query">
<bean class="org.archive.wayback.query.Renderer">
<property name="captureJsp" value="/WEB-INF/query/OpenSearchCaptureResults.jsp" />
Expand Down