Menu
▾
▴
archive-access-cvs — CVS commits
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
(10) |
Sep
(36) |
Oct
(339) |
Nov
(103) |
Dec
(152) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(141) |
Feb
(102) |
Mar
(125) |
Apr
(203) |
May
(57) |
Jun
(30) |
Jul
(139) |
Aug
(46) |
Sep
(64) |
Oct
(105) |
Nov
(34) |
Dec
(162) |
| 2007 |
Jan
(81) |
Feb
(57) |
Mar
(141) |
Apr
(72) |
May
(9) |
Jun
(1) |
Jul
(144) |
Aug
(88) |
Sep
(40) |
Oct
(43) |
Nov
(34) |
Dec
(20) |
| 2008 |
Jan
(44) |
Feb
(45) |
Mar
(16) |
Apr
(36) |
May
(8) |
Jun
(77) |
Jul
(177) |
Aug
(66) |
Sep
(8) |
Oct
(33) |
Nov
(13) |
Dec
(37) |
| 2009 |
Jan
(2) |
Feb
(5) |
Mar
(8) |
Apr
|
May
(36) |
Jun
(19) |
Jul
(46) |
Aug
(8) |
Sep
(1) |
Oct
(66) |
Nov
(61) |
Dec
(10) |
| 2010 |
Jan
(13) |
Feb
(16) |
Mar
(38) |
Apr
(76) |
May
(47) |
Jun
(32) |
Jul
(35) |
Aug
(45) |
Sep
(20) |
Oct
(61) |
Nov
(24) |
Dec
(16) |
| 2011 |
Jan
(22) |
Feb
(34) |
Mar
(11) |
Apr
(8) |
May
(24) |
Jun
(23) |
Jul
(11) |
Aug
(42) |
Sep
(81) |
Oct
(48) |
Nov
(21) |
Dec
(20) |
| 2012 |
Jan
(30) |
Feb
(25) |
Mar
(4) |
Apr
(6) |
May
(1) |
Jun
(5) |
Jul
(5) |
Aug
(8) |
Sep
(6) |
Oct
(6) |
Nov
|
Dec
|
|
From: <bra...@us...> - 2011-01-04 00:00:44
|
Revision: 3380
http://archive-access.svn.sourceforge.net/archive-access/?rev=3380&view=rev
Author: bradtofel
Date: 2011-01-04 00:00:37 +0000 (Tue, 04 Jan 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/archive-access/projects/wayback/.settings/org.eclipse.jdt.core.prefs
trunk/archive-access/projects/wayback/.settings/org.eclipse.wst.common.project.facet.core.xml
trunk/archive-access/projects/wayback/.settings/org.maven.ide.eclipse.prefs
Modified: trunk/archive-access/projects/wayback/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/archive-access/projects/wayback/.settings/org.eclipse.jdt.core.prefs 2011-01-04 00:00:08 UTC (rev 3379)
+++ trunk/archive-access/projects/wayback/.settings/org.eclipse.jdt.core.prefs 2011-01-04 00:00:37 UTC (rev 3380)
@@ -1,4 +1,4 @@
-#Fri Jul 25 18:19:09 PDT 2008
+#Sat Nov 07 16:49:52 PST 2009
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
@@ -7,6 +7,81 @@
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocComments=warning
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags
+org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
org.eclipse.jdt.core.compiler.source=1.5
Modified: trunk/archive-access/projects/wayback/.settings/org.eclipse.wst.common.project.facet.core.xml
===================================================================
--- trunk/archive-access/projects/wayback/.settings/org.eclipse.wst.common.project.facet.core.xml 2011-01-04 00:00:08 UTC (rev 3379)
+++ trunk/archive-access/projects/wayback/.settings/org.eclipse.wst.common.project.facet.core.xml 2011-01-04 00:00:37 UTC (rev 3380)
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
+ <runtime name="Apache Tomcat v5.5"/>
<installed facet="jst.java" version="5.0"/>
<installed facet="jst.web" version="2.4"/>
</faceted-project>
Modified: trunk/archive-access/projects/wayback/.settings/org.maven.ide.eclipse.prefs
===================================================================
--- trunk/archive-access/projects/wayback/.settings/org.maven.ide.eclipse.prefs 2011-01-04 00:00:08 UTC (rev 3379)
+++ trunk/archive-access/projects/wayback/.settings/org.maven.ide.eclipse.prefs 2011-01-04 00:00:37 UTC (rev 3380)
@@ -1,4 +1,4 @@
-#Wed Nov 03 14:03:43 GMT+07:00 2010
+#Tue May 19 17:04:36 PDT 2009
activeProfiles=
eclipse.preferences.version=1
fullBuildGoals=process-test-resources
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2011-01-04 00:00:14
|
Revision: 3379
http://archive-access.svn.sourceforge.net/archive-access/?rev=3379&view=rev
Author: bradtofel
Date: 2011-01-04 00:00:08 +0000 (Tue, 04 Jan 2011)
Log Message:
-----------
Added Paths:
-----------
trunk/archive-access/projects/wayback/wayback-core/.classpath
trunk/archive-access/projects/wayback/wayback-core/.project
Added: trunk/archive-access/projects/wayback/wayback-core/.classpath
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/.classpath (rev 0)
+++ trunk/archive-access/projects/wayback/wayback-core/.classpath 2011-01-04 00:00:08 UTC (rev 3379)
@@ -0,0 +1,45 @@
+<classpath>
+ <classpathentry kind="src" path="src/test/java" output="target/test-classes" including="**/*.java"/>
+ <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
+ <classpathentry kind="output" path="target/classes"/>
+ <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/archive/access-control/access-control/0.0.1-SNAPSHOT/access-control-0.0.1-SNAPSHOT.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/archive/overlays/archive-overlay-commons-httpclient/3.1/archive-overlay-commons-httpclient-3.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/archive/overlays/archive-overlay-commons-pool/1.3/archive-overlay-commons-pool-1.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/beanshell/bsh/2.0b4/bsh-2.0b4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/archive/heritrix/commons/2.0.3-SNAPSHOT/commons-2.0.3-SNAPSHOT.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-cli/commons-cli/1.1/commons-cli-1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.3/commons-codec-1.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-dbcp/commons-dbcp/1.2.2/commons-dbcp-1.2.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.3.1/commons-io-1.3.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.3/commons-lang-2.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-net/commons-net/1.4.1/commons-net-1.4.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-pool/commons-pool/1.3/commons-pool-1.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/dnsjava/dnsjava/2.0.3/dnsjava-2.0.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/fastutil/fastutil/5.0.7/fastutil-5.0.7.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/htmlparser/htmlparser/1.6/htmlparser-1.6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/com/lowagie/itext/1.3/itext-1.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/com/anotherbigidea/javaswf/CVS-SNAPSHOT-1/javaswf-CVS-SNAPSHOT-1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/com/sleepycat/je/3.3.82/je-3.3.82.jar"/>
+ <classpathentry kind="var" path="M2_REPO/net/htmlparser/jericho/jericho-html/2.6.1/jericho-html-2.6.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/net/java/dev/jets3t/jets3t/0.5.0/jets3t-0.5.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/codehaus/jettison/jettison/1.0-beta-1/jettison-1.0-beta-1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/joda-time/joda-time/1.6/joda-time-1.6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/mozilla/juniversalchardet/1.0.3/juniversalchardet-1.0.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/gnu/inet/libidn/0.6.5/libidn-0.6.5.jar"/>
+ <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar"/>
+ <classpathentry kind="var" path="M2_REPO/it/unimi/dsi/mg4j/1.0.1/mg4j-1.0.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/oro/oro/2.0.8/oro-2.0.8.jar"/>
+ <classpathentry kind="var" path="M2_REPO/poi/poi/2.5.1-final-20040804/poi-2.5.1-final-20040804.jar"/>
+ <classpathentry kind="var" path="M2_REPO/poi/poi-scratchpad/2.5.1-final-20040804/poi-scratchpad-2.5.1-final-20040804.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/springframework/spring-beans/2.5.1/spring-beans-2.5.1.jar" sourcepath="M2_REPO/org/springframework/spring-beans/2.5.1/spring-beans-2.5.1-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/springframework/spring-core/2.5.1/spring-core-2.5.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0.1/stax-api-1.0.1.jar"/>
+ <classpathentry kind="lib" path="/usr/lib/jvm/java-6-sun-1.6.0.14/lib/tools.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xpp3/xpp3_min/1.1.3.4.O/xpp3_min-1.1.3.4.O.jar"/>
+ <classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/xstream/1.2.2/xstream-1.2.2.jar"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+</classpath>
\ No newline at end of file
Added: trunk/archive-access/projects/wayback/wayback-core/.project
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/.project (rev 0)
+++ trunk/archive-access/projects/wayback/wayback-core/.project 2011-01-04 00:00:08 UTC (rev 3379)
@@ -0,0 +1,14 @@
+<projectDescription>
+ <name>wayback-core</name>
+ <comment>The wayback project is an open source implementation of the
+ Internet Archive's Wayback Machine.</comment>
+ <projects/>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2011-01-03 23:59:57
|
Revision: 3378
http://archive-access.svn.sourceforge.net/archive-access/?rev=3378&view=rev
Author: bradtofel
Date: 2011-01-03 23:59:51 +0000 (Mon, 03 Jan 2011)
Log Message:
-----------
Added Paths:
-----------
trunk/archive-access/projects/wayback/wayback-hadoop/.classpath
trunk/archive-access/projects/wayback/wayback-hadoop/.project
Added: trunk/archive-access/projects/wayback/wayback-hadoop/.classpath
===================================================================
--- trunk/archive-access/projects/wayback/wayback-hadoop/.classpath (rev 0)
+++ trunk/archive-access/projects/wayback/wayback-hadoop/.classpath 2011-01-03 23:59:51 UTC (rev 3378)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" output="target/classes" path="src/main/java"/>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Added: trunk/archive-access/projects/wayback/wayback-hadoop/.project
===================================================================
--- trunk/archive-access/projects/wayback/wayback-hadoop/.project (rev 0)
+++ trunk/archive-access/projects/wayback/wayback-hadoop/.project 2011-01-03 23:59:51 UTC (rev 3378)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>wayback-hadoop-jar</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ </natures>
+</projectDescription>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2011-01-03 23:59:41
|
Revision: 3377
http://archive-access.svn.sourceforge.net/archive-access/?rev=3377&view=rev
Author: bradtofel
Date: 2011-01-03 23:59:35 +0000 (Mon, 03 Jan 2011)
Log Message:
-----------
Added Paths:
-----------
trunk/archive-access/projects/wayback/wayback-hadoop-java/.project
Added: trunk/archive-access/projects/wayback/wayback-hadoop-java/.project
===================================================================
--- trunk/archive-access/projects/wayback/wayback-hadoop-java/.project (rev 0)
+++ trunk/archive-access/projects/wayback/wayback-hadoop-java/.project 2011-01-03 23:59:35 UTC (rev 3377)
@@ -0,0 +1,16 @@
+<projectDescription>
+ <name>wayback-hadoop-java</name>
+ <comment>The wayback project is an open source implementation of the
+ Internet Archive's Wayback Machine.</comment>
+ <projects>
+ <project>wayback-core</project>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2011-01-03 23:59:08
|
Revision: 3376
http://archive-access.svn.sourceforge.net/archive-access/?rev=3376&view=rev
Author: bradtofel
Date: 2011-01-03 23:59:02 +0000 (Mon, 03 Jan 2011)
Log Message:
-----------
Added Paths:
-----------
trunk/archive-access/projects/wayback/wayback-hadoop-java/.classpath
Added: trunk/archive-access/projects/wayback/wayback-hadoop-java/.classpath
===================================================================
--- trunk/archive-access/projects/wayback/wayback-hadoop-java/.classpath (rev 0)
+++ trunk/archive-access/projects/wayback/wayback-hadoop-java/.classpath 2011-01-03 23:59:02 UTC (rev 3376)
@@ -0,0 +1,46 @@
+<classpath>
+ <classpathentry kind="src" path="src/test/java" output="target/test-classes" including="**/*.java"/>
+ <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
+ <classpathentry kind="output" path="target/classes"/>
+ <classpathentry kind="var" path="M2_REPO/org/archive/access-control/access-control/0.0.1-SNAPSHOT/access-control-0.0.1-SNAPSHOT.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/archive/overlays/archive-overlay-commons-httpclient/3.1/archive-overlay-commons-httpclient-3.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/archive/overlays/archive-overlay-commons-pool/1.3/archive-overlay-commons-pool-1.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/beanshell/bsh/2.0b4/bsh-2.0b4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/archive/heritrix/commons/2.0.3-SNAPSHOT/commons-2.0.3-SNAPSHOT.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-cli/commons-cli/1.1/commons-cli-1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.3/commons-codec-1.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-dbcp/commons-dbcp/1.2.2/commons-dbcp-1.2.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.3.1/commons-io-1.3.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.3/commons-lang-2.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-net/commons-net/1.4.1/commons-net-1.4.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-pool/commons-pool/1.3/commons-pool-1.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/dnsjava/dnsjava/2.0.3/dnsjava-2.0.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/fastutil/fastutil/5.0.7/fastutil-5.0.7.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/mahout/hadoop/hadoop-core/0.19.1/hadoop-core-0.19.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/htmlparser/htmlparser/1.6/htmlparser-1.6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/com/lowagie/itext/1.3/itext-1.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/com/anotherbigidea/javaswf/CVS-SNAPSHOT-1/javaswf-CVS-SNAPSHOT-1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/com/sleepycat/je/3.3.82/je-3.3.82.jar"/>
+ <classpathentry kind="var" path="M2_REPO/net/htmlparser/jericho/jericho-html/2.6.1/jericho-html-2.6.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/net/java/dev/jets3t/jets3t/0.5.0/jets3t-0.5.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/codehaus/jettison/jettison/1.0-beta-1/jettison-1.0-beta-1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/joda-time/joda-time/1.6/joda-time-1.6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/mozilla/juniversalchardet/1.0.3/juniversalchardet-1.0.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/gnu/inet/libidn/0.6.5/libidn-0.6.5.jar"/>
+ <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar"/>
+ <classpathentry kind="var" path="M2_REPO/it/unimi/dsi/mg4j/1.0.1/mg4j-1.0.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/oro/oro/2.0.8/oro-2.0.8.jar"/>
+ <classpathentry kind="var" path="M2_REPO/poi/poi/2.5.1-final-20040804/poi-2.5.1-final-20040804.jar"/>
+ <classpathentry kind="var" path="M2_REPO/poi/poi-scratchpad/2.5.1-final-20040804/poi-scratchpad-2.5.1-final-20040804.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/springframework/spring-beans/2.5.1/spring-beans-2.5.1.jar" sourcepath="M2_REPO/org/springframework/spring-beans/2.5.1/spring-beans-2.5.1-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/springframework/spring-core/2.5.1/spring-core-2.5.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0.1/stax-api-1.0.1.jar"/>
+ <classpathentry kind="lib" path="/usr/lib/jvm/java-6-sun-1.6.0.14/lib/tools.jar"/>
+ <classpathentry kind="src" path="/wayback-core"/>
+ <classpathentry kind="var" path="M2_REPO/xpp3/xpp3_min/1.1.3.4.O/xpp3_min-1.1.3.4.O.jar"/>
+ <classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/xstream/1.2.2/xstream-1.2.2.jar"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+</classpath>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2011-01-03 23:58:42
|
Revision: 3375
http://archive-access.svn.sourceforge.net/archive-access/?rev=3375&view=rev
Author: bradtofel
Date: 2011-01-03 23:58:35 +0000 (Mon, 03 Jan 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/archive-access/projects/wayback/wayback-webapp/.classpath
trunk/archive-access/projects/wayback/wayback-webapp/.project
Modified: trunk/archive-access/projects/wayback/wayback-webapp/.classpath
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/.classpath 2011-01-03 23:33:57 UTC (rev 3374)
+++ trunk/archive-access/projects/wayback/wayback-webapp/.classpath 2011-01-03 23:58:35 UTC (rev 3375)
@@ -1,12 +1,47 @@
-<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry exported="true" kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER">
- <attributes>
- <attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="src" path="wayback-core-src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3.8.1"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
+ <classpathentry kind="src" path="src/test/java" output="target/test-classes" including="**/*.java"/>
+ <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
+ <classpathentry kind="output" path="target/classes"/>
+ <classpathentry kind="var" path="M2_REPO/javax/servlet/jstl/1.0/jstl-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/archive/access-control/access-control/0.0.1-SNAPSHOT/access-control-0.0.1-SNAPSHOT.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/archive/overlays/archive-overlay-commons-httpclient/3.1/archive-overlay-commons-httpclient-3.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/archive/overlays/archive-overlay-commons-pool/1.3/archive-overlay-commons-pool-1.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/beanshell/bsh/2.0b4/bsh-2.0b4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/archive/heritrix/commons/2.0.3-SNAPSHOT/commons-2.0.3-SNAPSHOT.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-cli/commons-cli/1.1/commons-cli-1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.3/commons-codec-1.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-dbcp/commons-dbcp/1.2.2/commons-dbcp-1.2.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.3.1/commons-io-1.3.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.3/commons-lang-2.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-net/commons-net/1.4.1/commons-net-1.4.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-pool/commons-pool/1.3/commons-pool-1.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/dnsjava/dnsjava/2.0.3/dnsjava-2.0.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/fastutil/fastutil/5.0.7/fastutil-5.0.7.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/htmlparser/htmlparser/1.6/htmlparser-1.6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/com/lowagie/itext/1.3/itext-1.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/com/anotherbigidea/javaswf/CVS-SNAPSHOT-1/javaswf-CVS-SNAPSHOT-1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/com/sleepycat/je/3.3.82/je-3.3.82.jar"/>
+ <classpathentry kind="var" path="M2_REPO/net/htmlparser/jericho/jericho-html/2.6.1/jericho-html-2.6.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/net/java/dev/jets3t/jets3t/0.5.0/jets3t-0.5.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/codehaus/jettison/jettison/1.0-beta-1/jettison-1.0-beta-1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/joda-time/joda-time/1.6/joda-time-1.6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.2/junit-3.8.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/mozilla/juniversalchardet/1.0.3/juniversalchardet-1.0.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/gnu/inet/libidn/0.6.5/libidn-0.6.5.jar"/>
+ <classpathentry kind="var" path="M2_REPO/it/unimi/dsi/mg4j/1.0.1/mg4j-1.0.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/oro/oro/2.0.8/oro-2.0.8.jar"/>
+ <classpathentry kind="var" path="M2_REPO/poi/poi/2.5.1-final-20040804/poi-2.5.1-final-20040804.jar"/>
+ <classpathentry kind="var" path="M2_REPO/poi/poi-scratchpad/2.5.1-final-20040804/poi-scratchpad-2.5.1-final-20040804.jar"/>
+ <classpathentry kind="var" path="M2_REPO/tomcat/servlet-api/5.5.15/servlet-api-5.5.15.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/springframework/spring-beans/2.5.1/spring-beans-2.5.1.jar" sourcepath="M2_REPO/org/springframework/spring-beans/2.5.1/spring-beans-2.5.1-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/springframework/spring-core/2.5.1/spring-core-2.5.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/taglibs/standard/1.1.2/standard-1.1.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0.1/stax-api-1.0.1.jar"/>
+ <classpathentry kind="lib" path="/usr/lib/jvm/java-6-sun-1.6.0.14/lib/tools.jar"/>
+ <classpathentry kind="src" path="/wayback-core"/>
+ <classpathentry kind="var" path="M2_REPO/xpp3/xpp3_min/1.1.3.4.O/xpp3_min-1.1.3.4.O.jar"/>
+ <classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/xstream/1.2.2/xstream-1.2.2.jar"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+</classpath>
\ No newline at end of file
Modified: trunk/archive-access/projects/wayback/wayback-webapp/.project
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/.project 2011-01-03 23:33:57 UTC (rev 3374)
+++ trunk/archive-access/projects/wayback/wayback-webapp/.project 2011-01-03 23:58:35 UTC (rev 3375)
@@ -1,45 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>wayback-webapp</name>
- <comment>The wayback project is an open source implementation of the
- Internet Archive's Wayback Machine.</comment>
- <projects>
- <project>wayback-core</project>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.common.project.facet.core.builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.validation.validationbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.maven.ide.eclipse.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.maven.ide.eclipse.maven2Nature</nature>
- <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
- <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
- <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
- </natures>
- <linkedResources>
- <link>
- <name>wayback-core-src</name>
- <type>2</type>
- <locationURI>WORKSPACE_ROOT/wayback/wayback-core/src/main/java</locationURI>
- </link>
- </linkedResources>
-</projectDescription>
+ <name>wayback-webapp</name>
+ <comment>The wayback project is an open source implementation of the
+ Internet Archive's Wayback Machine.</comment>
+ <projects>
+ <project>wayback-core</project>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2011-01-03 23:34:04
|
Revision: 3374
http://archive-access.svn.sourceforge.net/archive-access/?rev=3374&view=rev
Author: bradtofel
Date: 2011-01-03 23:33:57 +0000 (Mon, 03 Jan 2011)
Log Message:
-----------
POST-RELEASE: bumped all versions to 1.7.0
Modified Paths:
--------------
trunk/archive-access/projects/wayback/dist/pom.xml
trunk/archive-access/projects/wayback/pom.xml
trunk/archive-access/projects/wayback/wayback-core/pom.xml
trunk/archive-access/projects/wayback/wayback-hadoop/pom.xml
trunk/archive-access/projects/wayback/wayback-hadoop-java/pom.xml
trunk/archive-access/projects/wayback/wayback-webapp/pom.xml
Modified: trunk/archive-access/projects/wayback/dist/pom.xml
===================================================================
--- trunk/archive-access/projects/wayback/dist/pom.xml 2011-01-03 23:29:06 UTC (rev 3373)
+++ trunk/archive-access/projects/wayback/dist/pom.xml 2011-01-03 23:33:57 UTC (rev 3374)
@@ -7,7 +7,7 @@
<parent>
<artifactId>wayback</artifactId>
<groupId>org.archive.wayback</groupId>
- <version>1.6.0</version>
+ <version>1.7.0</version>
</parent>
<artifactId>dist</artifactId>
Modified: trunk/archive-access/projects/wayback/pom.xml
===================================================================
--- trunk/archive-access/projects/wayback/pom.xml 2011-01-03 23:29:06 UTC (rev 3373)
+++ trunk/archive-access/projects/wayback/pom.xml 2011-01-03 23:33:57 UTC (rev 3374)
@@ -7,7 +7,7 @@
<groupId>org.archive.wayback</groupId>
<artifactId>wayback</artifactId>
<packaging>pom</packaging>
- <version>1.6.0</version>
+ <version>1.7.0</version>
<name>Wayback</name>
<modules>
Modified: trunk/archive-access/projects/wayback/wayback-core/pom.xml
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/pom.xml 2011-01-03 23:29:06 UTC (rev 3373)
+++ trunk/archive-access/projects/wayback/wayback-core/pom.xml 2011-01-03 23:33:57 UTC (rev 3374)
@@ -8,7 +8,7 @@
<parent>
<artifactId>wayback</artifactId>
<groupId>org.archive.wayback</groupId>
- <version>1.6.0</version>
+ <version>1.7.0</version>
</parent>
<artifactId>wayback-core</artifactId>
Modified: trunk/archive-access/projects/wayback/wayback-hadoop/pom.xml
===================================================================
--- trunk/archive-access/projects/wayback/wayback-hadoop/pom.xml 2011-01-03 23:29:06 UTC (rev 3373)
+++ trunk/archive-access/projects/wayback/wayback-hadoop/pom.xml 2011-01-03 23:33:57 UTC (rev 3374)
@@ -8,7 +8,7 @@
<parent>
<artifactId>wayback</artifactId>
<groupId>org.archive.wayback</groupId>
- <version>1.6.0</version>
+ <version>1.7.0</version>
</parent>
<artifactId>wayback-hadoop</artifactId>
Modified: trunk/archive-access/projects/wayback/wayback-hadoop-java/pom.xml
===================================================================
--- trunk/archive-access/projects/wayback/wayback-hadoop-java/pom.xml 2011-01-03 23:29:06 UTC (rev 3373)
+++ trunk/archive-access/projects/wayback/wayback-hadoop-java/pom.xml 2011-01-03 23:33:57 UTC (rev 3374)
@@ -8,7 +8,7 @@
<parent>
<artifactId>wayback</artifactId>
<groupId>org.archive.wayback</groupId>
- <version>1.6.0</version>
+ <version>1.7.0</version>
</parent>
<artifactId>wayback-hadoop-java</artifactId>
Modified: trunk/archive-access/projects/wayback/wayback-webapp/pom.xml
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/pom.xml 2011-01-03 23:29:06 UTC (rev 3373)
+++ trunk/archive-access/projects/wayback/wayback-webapp/pom.xml 2011-01-03 23:33:57 UTC (rev 3374)
@@ -7,7 +7,7 @@
<parent>
<artifactId>wayback</artifactId>
<groupId>org.archive.wayback</groupId>
- <version>1.6.0</version>
+ <version>1.7.0</version>
</parent>
<artifactId>wayback-webapp</artifactId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2011-01-03 23:29:12
|
Revision: 3373
http://archive-access.svn.sourceforge.net/archive-access/?rev=3373&view=rev
Author: bradtofel
Date: 2011-01-03 23:29:06 +0000 (Mon, 03 Jan 2011)
Log Message:
-----------
RELEASE: 1.6.0
Added Paths:
-----------
branches/wayback-1_6_0/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2011-01-03 23:28:27
|
Revision: 3372
http://archive-access.svn.sourceforge.net/archive-access/?rev=3372&view=rev
Author: bradtofel
Date: 2011-01-03 23:28:21 +0000 (Mon, 03 Jan 2011)
Log Message:
-----------
Removed Paths:
-------------
branches/wayback-1_6_0/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2011-01-03 23:26:08
|
Revision: 3371
http://archive-access.svn.sourceforge.net/archive-access/?rev=3371&view=rev
Author: bradtofel
Date: 2011-01-03 23:26:02 +0000 (Mon, 03 Jan 2011)
Log Message:
-----------
RELEASE 1.6.0
Added Paths:
-----------
branches/wayback-1_6_0/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2011-01-03 22:14:05
|
Revision: 3370
http://archive-access.svn.sourceforge.net/archive-access/?rev=3370&view=rev
Author: bradtofel
Date: 2011-01-03 22:13:59 +0000 (Mon, 03 Jan 2011)
Log Message:
-----------
updated dates for release.
Modified Paths:
--------------
trunk/archive-access/projects/wayback/src/site/xdoc/index.xml
Modified: trunk/archive-access/projects/wayback/src/site/xdoc/index.xml
===================================================================
--- trunk/archive-access/projects/wayback/src/site/xdoc/index.xml 2011-01-03 22:06:09 UTC (rev 3369)
+++ trunk/archive-access/projects/wayback/src/site/xdoc/index.xml 2011-01-03 22:13:59 UTC (rev 3370)
@@ -74,9 +74,9 @@
</p>
</section>
<section name="News">
- <subsection name="New Release - 1.6.0, 10/21/2010">
+ <subsection name="New Release - 1.6.0, 1/3/2011">
<p>
- The long awaited 1.6.0 release is now available, with improved
+ The 1.6.0 release is now available, with improved
server-side rewriting of HTML, CSS, Javascript, and SWF content.
This version includes other new features and bug fixes, which are
detailed on the <a href="release_notes.html">release notes</a> page.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2011-01-03 22:06:16
|
Revision: 3369
http://archive-access.svn.sourceforge.net/archive-access/?rev=3369&view=rev
Author: bradtofel
Date: 2011-01-03 22:06:09 +0000 (Mon, 03 Jan 2011)
Log Message:
-----------
DELETED: out-dated LICENSE.txt...
Removed Paths:
-------------
trunk/archive-access/projects/wayback/LICENSE.txt
Deleted: trunk/archive-access/projects/wayback/LICENSE.txt
===================================================================
--- trunk/archive-access/projects/wayback/LICENSE.txt 2011-01-03 22:03:58 UTC (rev 3368)
+++ trunk/archive-access/projects/wayback/LICENSE.txt 2011-01-03 22:06:09 UTC (rev 3369)
@@ -1,511 +0,0 @@
-The Wayback Machine is free software; you can redistribute it and/or modify it
-under the terms of the GNU Lesser Public license (LGPL) reproduced below.
-
-The Wayback Machine includes the libraries it depends upon. The libraries used
-can be found under the 'lib' directory and are listed here,
-http://archive-access.sourceforge.net/projects/wayback/dependencies.html. The
-accompanying project.xml dependencies section points to each libraries'
-license and notes copyright where pertinent.
-
- GNU LESSER GENERAL PUBLIC LICENSE
- Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL. It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
- This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it. You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
- When we speak of free software, we are referring to freedom of use,
-not price. Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
- To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights. These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
- For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you. You must make sure that they, too, receive or can get the source
-code. If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it. And you must show them these terms so they know their rights.
-
- We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
- To protect each distributor, we want to make it very clear that
-there is no warranty for the free library. Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
- Finally, software patents pose a constant threat to the existence of
-any free program. We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder. Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
- Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License. This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License. We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
- When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library. The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom. The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
- We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License. It also provides other free software developers Less
-of an advantage over competing non-free programs. These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries. However, the Lesser license provides advantages in certain
-special circumstances.
-
- For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard. To achieve this, non-free programs must be
-allowed to use the library. A more frequent case is that a free
-library does the same job as widely used non-free libraries. In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
- In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software. For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
- Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
- The precise terms and conditions for copying, distribution and
-modification follow. Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library". The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
- GNU LESSER GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
- A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
- The "Library", below, refers to any such software library or work
-which has been distributed under these terms. A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language. (Hereinafter, translation is
-included without limitation in the term "modification".)
-
- "Source code" for a work means the preferred form of the work for
-making modifications to it. For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
- Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it). Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
- 1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
- You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
- 2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) The modified work must itself be a software library.
-
- b) You must cause the files modified to carry prominent notices
- stating that you changed the files and the date of any change.
-
- c) You must cause the whole of the work to be licensed at no
- charge to all third parties under the terms of this License.
-
- d) If a facility in the modified Library refers to a function or a
- table of data to be supplied by an application program that uses
- the facility, other than as an argument passed when the facility
- is invoked, then you must make a good faith effort to ensure that,
- in the event an application does not supply such function or
- table, the facility still operates, and performs whatever part of
- its purpose remains meaningful.
-
- (For example, a function in a library to compute square roots has
- a purpose that is entirely well-defined independent of the
- application. Therefore, Subsection 2d requires that any
- application-supplied function or table used by this function must
- be optional: if the application does not supply it, the square
- root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library. To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License. (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.) Do not make any other change in
-these notices.
-
- Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
- This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
- 4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
- If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library". Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
- However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library". The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
- When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library. The
-threshold for this to be true is not precisely defined by law.
-
- If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work. (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
- Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
- 6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
- You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License. You must supply a copy of this License. If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License. Also, you must do one
-of these things:
-
- a) Accompany the work with the complete corresponding
- machine-readable source code for the Library including whatever
- changes were used in the work (which must be distributed under
- Sections 1 and 2 above); and, if the work is an executable linked
- with the Library, with the complete machine-readable "work that
- uses the Library", as object code and/or source code, so that the
- user can modify the Library and then relink to produce a modified
- executable containing the modified Library. (It is understood
- that the user who changes the contents of definitions files in the
- Library will not necessarily be able to recompile the application
- to use the modified definitions.)
-
- b) Use a suitable shared library mechanism for linking with the
- Library. A suitable mechanism is one that (1) uses at run time a
- copy of the library already present on the user's computer system,
- rather than copying library functions into the executable, and (2)
- will operate properly with a modified version of the library, if
- the user installs one, as long as the modified version is
- interface-compatible with the version that the work was made with.
-
- c) Accompany the work with a written offer, valid for at
- least three years, to give the same user the materials
- specified in Subsection 6a, above, for a charge no more
- than the cost of performing this distribution.
-
- d) If distribution of the work is made by offering access to copy
- from a designated place, offer equivalent access to copy the above
- specified materials from the same place.
-
- e) Verify that the user has already received a copy of these
- materials or that you have already sent this user a copy.
-
- For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it. However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
- It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system. Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
- 7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
- a) Accompany the combined library with a copy of the same work
- based on the Library, uncombined with any other library
- facilities. This must be distributed under the terms of the
- Sections above.
-
- b) Give prominent notice with the combined library of the fact
- that part of it is a work based on the Library, and explaining
- where to find the accompanying uncombined form of the same work.
-
- 8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License. Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License. However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
- 9. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Library or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
- 10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
- 11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all. For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded. In such case, this License incorporates the limitation as if
-written in the body of this License.
-
- 13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation. If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
- 14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission. For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this. Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
- NO WARRANTY
-
- 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
- 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Libraries
-
- If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change. You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
- To apply these terms, attach the following notices to the library. It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
- <one line to give the library's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the
- library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
- <signature of Ty Coon>, 1 April 1990
- Ty Coon, President of Vice
-
-That's all there is to it!
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2011-01-03 22:04:04
|
Revision: 3368
http://archive-access.svn.sourceforge.net/archive-access/?rev=3368&view=rev
Author: bradtofel
Date: 2011-01-03 22:03:58 +0000 (Mon, 03 Jan 2011)
Log Message:
-----------
CONFIG: updated old urlRoot and queryRoot configs to queryPrefix, etc..
Modified Paths:
--------------
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/wayback.xml
Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/wayback.xml
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/wayback.xml 2011-01-03 22:02:47 UTC (rev 3367)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/wayback.xml 2011-01-03 22:03:58 UTC (rev 3368)
@@ -296,7 +296,7 @@
-->
<!--
<bean name="8080:opensearch" parent="8080:wayback">
- <property name="urlRoot" value="http://localhost.archive.org:8080/wayback/" />
+ <property name="queryPrefix" value="http://localhost.archive.org:8080/opensearch/" />
<property name="query">
<bean class="org.archive.wayback.query.Renderer">
<property name="captureJsp" value="/WEB-INF/query/OpenSearchCaptureResults.jsp" />
@@ -327,7 +327,9 @@
<!--
<import resource="DomainPrefixReplay.xml"/>
<bean name="8081" parent="8080:wayback">
- <property name="queryRoot" value="http://localhost.archive.org:8081/" />
+ <property name="queryPrefix" value="http://localhost.archive.org:8081/" />
+ <property name="replayPrefix" value="http://localhost.archive.org:8081/" />
+ <property name="staticPrefix" value="http://localhost.archive.org:8081/" />
<property name="replay" ref="domainprefixreplay" />
<property name="uriConverter">
<bean class="org.archive.wayback.domainprefix.DomainPrefixResultURIConverter">
@@ -342,7 +344,6 @@
</property>
</bean>
-->
-
<!--
The following AccessPoint inherits all configuration from the 8080:wayback
AccessPoint, but provides a Proxy Replay UI to the same collection. These
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2011-01-03 22:02:53
|
Revision: 3367
http://archive-access.svn.sourceforge.net/archive-access/?rev=3367&view=rev
Author: bradtofel
Date: 2011-01-03 22:02:47 +0000 (Mon, 03 Jan 2011)
Log Message:
-----------
BUGFIX (unreported): bugfix for NPE when user does form search from root page of memento AccessPoint.
Modified Paths:
--------------
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/ORE.jsp
Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/ORE.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/ORE.jsp 2011-01-03 21:42:08 UTC (rev 3366)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/ORE.jsp 2011-01-03 22:02:47 UTC (rev 3367)
@@ -43,6 +43,9 @@
String u = wbRequest.getRequestUrl();
String agguri = replayPrefix + "timebundle/" + u;
String format = wbRequest.get("format");
+ if(format == null) {
+ format = "rdf";
+ }
Aggregation agg = OREFactory.createAggregation(new URI(agguri));
ResourceMap rem = agg.createResourceMap(new URI(queryPrefix
+ "timemap/" + format + "/" + u));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2011-01-03 21:42:14
|
Revision: 3366
http://archive-access.svn.sourceforge.net/archive-access/?rev=3366&view=rev
Author: bradtofel
Date: 2011-01-03 21:42:08 +0000 (Mon, 03 Jan 2011)
Log Message:
-----------
config: fixed proxy mode default config options.. was broken pretty badly before
Modified Paths:
--------------
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/wayback.xml
Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/wayback.xml
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/wayback.xml 2011-01-03 21:40:21 UTC (rev 3365)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/wayback.xml 2011-01-03 21:42:08 UTC (rev 3366)
@@ -352,15 +352,17 @@
Note: using this AccessPoint requires adding a "Connector" on port 8090
in your Tomcat's server.xml file.
-->
- <!--
+<!--
<import resource="ProxyReplay.xml"/>
- <bean name="8090" parent="replay.wayback.localhost.archive.org:8080">
- <property name="serveStatic" value="false" />
+ <bean name="8090" parent="8080:wayback">
+ <property name="serveStatic" value="true" />
<property name="bounceToReplayPrefix" value="false" />
<property name="bounceToQueryPrefix" value="false" />
<property name="refererAuth" value="" />
- <property name="queryRoot" value="http://localhost.archive.org:8090/" />
+ <property name="staticPrefix" value="http://localhost.archive.org:8090/" />
+ <property name="replayPrefix" value="http://localhost.archive.org:8090/" />
+ <property name="queryPrefix" value="http://localhost.archive.org:8090/" />
<property name="replay" ref="proxyreplay" />
<property name="uriConverter">
<bean class="org.archive.wayback.proxy.RedirectResultURIConverter">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 3365
http://archive-access.svn.sourceforge.net/archive-access/?rev=3365&view=rev
Author: bradtofel
Date: 2011-01-03 21:40:21 +0000 (Mon, 03 Jan 2011)
Log Message:
-----------
BUGFIX (unreported) fixed redirect loop bug when trying to replay pages
Modified Paths:
--------------
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/proxy/ProxyArchivalRequestParser.java
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/proxy/ProxyArchivalRequestParser.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/proxy/ProxyArchivalRequestParser.java 2010-12-31 01:51:51 UTC (rev 3364)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/proxy/ProxyArchivalRequestParser.java 2011-01-03 21:40:21 UTC (rev 3365)
@@ -87,8 +87,9 @@
if(replayTimestamp != null) {
BDBMap.addTimestampForId(httpRequest.getContextPath(),
id, replayTimestamp);
+ throw new BetterRequestException(wbRequest.getRequestUrl());
}
- throw new BetterRequestException(wbRequest.getRequestUrl());
+
}
// Then get the timestamp (or rather datestr) matching this id.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2010-12-31 01:51:57
|
Revision: 3364
http://archive-access.svn.sourceforge.net/archive-access/?rev=3364&view=rev
Author: bradtofel
Date: 2010-12-31 01:51:51 +0000 (Fri, 31 Dec 2010)
Log Message:
-----------
Added template header and footer back..
Modified Paths:
--------------
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/HTMLUrlResults.jsp
Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/HTMLUrlResults.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/HTMLUrlResults.jsp 2010-12-31 01:46:59 UTC (rev 3363)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/HTMLUrlResults.jsp 2010-12-31 01:51:51 UTC (rev 3364)
@@ -9,7 +9,8 @@
%><%@ page import="org.archive.wayback.core.UrlSearchResults"
%><%@ page import="org.archive.wayback.core.WaybackRequest"
%><%@ page import="org.archive.wayback.util.StringFormatter"
-%><%
+%><jsp:include page="/WEB-INF/template/UI-header.jsp" flush="true" />
+<%
UIResults results = UIResults.extractUrlQuery(request);
WaybackRequest wbRequest = results.getWbRequest();
UrlSearchResults uResults = results.getUrlResults();
@@ -110,4 +111,4 @@
}
}
}
-%>
\ No newline at end of file
+%><jsp:include page="/WEB-INF/template/UI-footer.jsp" flush="true" />
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2010-12-31 01:47:05
|
Revision: 3363
http://archive-access.svn.sourceforge.net/archive-access/?rev=3363&view=rev
Author: bradtofel
Date: 2010-12-31 01:46:59 +0000 (Fri, 31 Dec 2010)
Log Message:
-----------
reverting back to quite older version.. which isn't broken..
Modified Paths:
--------------
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/HTMLUrlResults.jsp
Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/HTMLUrlResults.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/HTMLUrlResults.jsp 2010-12-31 01:13:18 UTC (rev 3362)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/HTMLUrlResults.jsp 2010-12-31 01:46:59 UTC (rev 3363)
@@ -9,9 +9,7 @@
%><%@ page import="org.archive.wayback.core.UrlSearchResults"
%><%@ page import="org.archive.wayback.core.WaybackRequest"
%><%@ page import="org.archive.wayback.util.StringFormatter"
-%>
-<jsp:include page="/WEB-INF/template/UI-header.jsp" flush="true" />
-<%
+%><%
UIResults results = UIResults.extractUrlQuery(request);
WaybackRequest wbRequest = results.getWbRequest();
UrlSearchResults uResults = results.getUrlResults();
@@ -19,10 +17,10 @@
StringFormatter fmt = wbRequest.getFormatter();
String searchString = wbRequest.getRequestUrl();
-String staticPrefix = results.getStaticPrefix();
-String queryPrefix = results.getQueryPrefix();
-String replayPrefix = results.getReplayPrefix();
+
+
+
Date searchStartDate = wbRequest.getStartDate();
Date searchEndDate = wbRequest.getEndDate();
@@ -32,89 +30,11 @@
long totalCaptures = uResults.getMatchingCount();
%>
-<script type="text/javascript" src="<%= staticPrefix %>js/jquery-1.4.2.min.js"></script>
-<script type="text/javascript" src="<%= staticPrefix %>js/jquery.dataTables.min.js" charset="utf-8"></script>
-<script type="text/javascript">
-$().ready(function(){
- $('#resultsUrl th.url span').html(' ↑');
- $('#resultsUrl th').mouseup(function(){
- \$('#resultsUrl th span').html('');
- \$(this).find('span').html(' ↑');
- if (\$(this).hasClass('sorting_asc')) {
- \$(this).find('span').html(' ↓');
- } else if (\$(this).hasClass('sorting_desc')) {
- \$(this).find('span').html(' ↑');
- };
- });
- var rowCount = \$('#resultsUrl tbody tr').length;
- if (rowCount < 50) {
- \$('#resultsUrl').dataTable({
- "bProcessing": true,
- "aoColumns": [{"sType":"html"},{"sType":"date"},{"sType":"date"},null,null,null],
- "aaSorting": [ [0,'asc'] ],
- "bPaginate": false,
- "bInfo": false,
- "bFilter": true,
- "bStateSave": true,
- "bAutoWidth": false,
- "oLanguage": {
- "sSearch": "Filter results (i.e. '.txt'):"
- }
- });
- } else {
- \$('#resultsUrl').dataTable({
- "bProcessing": true,
- "aoColumns": [{"sType":"html"},{"sType":"date"},{"sType":"date"},null,null,null],
- "aaSorting": [ [0,'asc'] ],
- "bPaginate": true,
- "bInfo": true,
- "sPaginationType": "full_numbers",
- "bFilter": true,
- "bStateSave": true,
- "bAutoWidth": false,
- "oLanguage": {
- "sSearch": "Filter results (i.e. '.txt'):"
- },
- "iDisplayLength": 50
- });
- }
- });
-</script>
- <div id="positionHome">
- <section>
- <div id="logoHome">
- <a href="/index.jsp"><h1><span>Internet Archive's Wayback Machine</span></h1></a>
- </div>
- </section>
- <section>
- <div id="searchHome">
- <form name="form1" method="get" action="<%= queryPrefix %>query">
- <input type="hidden" name="<%= WaybackRequest.REQUEST_TYPE %>" value="<%= WaybackRequest.REQUEST_CAPTURE_QUERY %>">
- <input type="text" name="<%= WaybackRequest.REQUEST_URL %>" value="http://" size="40">
- <button type="submit" name="Submit">Go Wayback!</button>
- </form>
- <div id="searchAdvHome">
- <a href="[ADVANCED SEARCH]">Advanced Search</a>
- </div>
- </div>
- </section>
- </div>
- <div id="positionTable">
+<%= fmt.format("PathPrefixQuery.showingResults",firstResult + 1,lastResult,
+ totalCaptures,searchString) %>
+<br/>
- <h2 class="green"><%= fmt.format("PathPrefixQuery.showingResults",totalCaptures) %></h2>
-
- <table id="resultsUrl">
- <thead>
- <tr>
- <th class="url">URL<span></span></th>
- <th>From<span></span></th>
- <th>To<span></span></th>
- <th>Captures<span></span></th>
- <th>Duplicates<span></span></th>
- <th>Uniques<span></span></th>
- </tr>
- </thead>
- <tbody>
+<hr></hr>
<%
Iterator<UrlSearchResult> itr = uResults.iterator();
while(itr.hasNext()) {
@@ -126,26 +46,17 @@
String lastDateTSss = result.getLastCaptureTimestamp();
long numCaptures = result.getNumCaptures();
long numVersions = result.getNumVersions();
- long numDupes = result.getNumCaptures() - result.getNumVersions();
Date firstDate = result.getFirstCaptureDate();
Date lastDate = result.getLastCaptureDate();
if(numCaptures == 1) {
- String ts = result.getFirstCaptureTimestamp();
- String anchor = uriConverter.makeReplayURI(ts,originalUrl);
+ String ts = result.getFirstCaptureTimestamp();
+ String anchor = uriConverter.makeReplayURI(ts,originalUrl);
%>
- <tr>
- <td class="url">
- <a onclick="SetAnchorDate('<%= ts %>');" href="<%= anchor %>"><%= urlKey %></a>
- </td>
- <td class="dateFrom"><%= fmt.format("PathPrefixQuery.captureDate",firstDate) %></td>
- <td class="dateTo"><%= fmt.format("PathPrefixQuery.captureDate",lastDate) %></td>
- <td class="captures"><%= numCaptures %></td>
- <td class="dupes"><%= numDupes %></td>
- <td class="uniques"><%= numVersions %></td>
- </tr>
- <!--
+ <a onclick="SetAnchorDate('<%= ts %>');" href="<%= anchor %>">
+ <%= urlKey %>
+ </a>
<span class="mainSearchText">
<%= fmt.format("PathPrefixQuery.versionCount",numVersions) %>
</span>
@@ -153,23 +64,11 @@
<span class="mainSearchText">
<%= fmt.format("PathPrefixQuery.singleCaptureDate",firstDate) %>
</span>
- -->
<%
} else {
String anchor = results.makeCaptureQueryUrl(originalUrl);
%>
- <tr>
- <td class="url">
- <a href="<%= anchor %>"><%= urlKey %></a>
- </td>
- <td class="dateFrom"><%= fmt.format("PathPrefixQuery.captureDate",firstDate) %></td>
- <td class="dateTo"><%= fmt.format("PathPrefixQuery.captureDate",lastDate) %></td>
- <td class="captures"><%= numCaptures %></td>
- <td class="dupes"><%= numDupes %></td>
- <td class="uniques"><%= numVersions %></td>
- </tr>
- <!--
<a href="<%= anchor %>">
<%= urlKey %>
</a>
@@ -180,10 +79,11 @@
<span class="mainSearchText">
<%= fmt.format("PathPrefixQuery.multiCaptureDate",numCaptures,firstDate,lastDate) %>
</span>
- -->
<%
}
%>
+ <br/>
+ <br/>
<%
}
@@ -191,11 +91,12 @@
int curPage = uResults.getCurPageNum();
if(curPage > uResults.getNumPages()) {
%>
+ <hr></hr>
<a href="<%= results.urlForPage(1) %>">First results</a>
<%
} else if(uResults.getNumPages() > 1) {
%>
-
+ <hr></hr>
<%
for(int i = 1; i <= uResults.getNumPages(); i++) {
if(i == curPage) {
@@ -209,9 +110,4 @@
}
}
}
-%>
- </tbody>
- </table>
-
-
-<jsp:include page="/WEB-INF/template/UI-footer.jsp" flush="true" />
\ No newline at end of file
+%>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2010-12-31 01:13:24
|
Revision: 3362
http://archive-access.svn.sourceforge.net/archive-access/?rev=3362&view=rev
Author: bradtofel
Date: 2010-12-31 01:13:18 +0000 (Fri, 31 Dec 2010)
Log Message:
-----------
MOVED: dist/src/site/ to src/site/.
POM: updated arctifactId of parent pom to make urls and names come out right again
Removed Paths:
-------------
trunk/archive-access/projects/wayback/dist/src/site/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2010-12-31 01:09:43
|
Revision: 3361
http://archive-access.svn.sourceforge.net/archive-access/?rev=3361&view=rev
Author: bradtofel
Date: 2010-12-31 01:09:37 +0000 (Fri, 31 Dec 2010)
Log Message:
-----------
removed reference to desktop-brad.sf.archive.org..
Modified Paths:
--------------
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/LiveWeb.xml
Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/LiveWeb.xml
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/LiveWeb.xml 2010-12-31 01:05:43 UTC (rev 3360)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/LiveWeb.xml 2010-12-31 01:09:37 UTC (rev 3361)
@@ -25,7 +25,7 @@
</property>
</bean>
<bean name="8098" class="org.archive.wayback.liveweb.ARCUnwrappingProxy">
- <property name="proxyHostPort" value="desktop-brad.sf.archive.org:3128" />
+ <property name="proxyHostPort" value="localhost:3128" />
</bean>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2010-12-31 01:05:51
|
Revision: 3360
http://archive-access.svn.sourceforge.net/archive-access/?rev=3360&view=rev
Author: bradtofel
Date: 2010-12-31 01:05:43 +0000 (Fri, 31 Dec 2010)
Log Message:
-----------
MOVED: dist/src/site/ to src/site/.
POM: updated arctifactId of parent pom to make urls and names come out right again
Modified Paths:
--------------
trunk/archive-access/projects/wayback/dist/pom.xml
trunk/archive-access/projects/wayback/pom.xml
trunk/archive-access/projects/wayback/wayback-core/pom.xml
trunk/archive-access/projects/wayback/wayback-hadoop/pom.xml
trunk/archive-access/projects/wayback/wayback-hadoop-java/pom.xml
trunk/archive-access/projects/wayback/wayback-webapp/pom.xml
Added Paths:
-----------
trunk/archive-access/projects/wayback/src/site/
trunk/archive-access/projects/wayback/src/site/site.xml
trunk/archive-access/projects/wayback/src/site/xdoc/administrator_manual.xml
trunk/archive-access/projects/wayback/src/site/xdoc/downloads.xml
trunk/archive-access/projects/wayback/src/site/xdoc/hadoop.xml
trunk/archive-access/projects/wayback/src/site/xdoc/index.xml
trunk/archive-access/projects/wayback/src/site/xdoc/release_notes.xml
Removed Paths:
-------------
trunk/archive-access/projects/wayback/dist/src/site/apt/
trunk/archive-access/projects/wayback/dist/src/site/articles/
trunk/archive-access/projects/wayback/dist/src/site/fml/
trunk/archive-access/projects/wayback/dist/src/site/resources/
trunk/archive-access/projects/wayback/dist/src/site/site.xml
trunk/archive-access/projects/wayback/dist/src/site/xdoc/access_point_naming.xml
trunk/archive-access/projects/wayback/dist/src/site/xdoc/administrator_manual.xml
trunk/archive-access/projects/wayback/dist/src/site/xdoc/downloads.xml
trunk/archive-access/projects/wayback/dist/src/site/xdoc/hadoop.xml
trunk/archive-access/projects/wayback/dist/src/site/xdoc/index.xml
trunk/archive-access/projects/wayback/dist/src/site/xdoc/release_notes.xml
trunk/archive-access/projects/wayback/dist/src/site/xdoc/requirements.xml
trunk/archive-access/projects/wayback/dist/src/site/xdoc/resource_index.xml
trunk/archive-access/projects/wayback/dist/src/site/xdoc/resource_store.xml
trunk/archive-access/projects/wayback/dist/src/site/xdoc/user_manual.xml
trunk/archive-access/projects/wayback/src/site/site.xml
trunk/archive-access/projects/wayback/src/site/xdoc/administrator_manual.xml
trunk/archive-access/projects/wayback/src/site/xdoc/downloads.xml
trunk/archive-access/projects/wayback/src/site/xdoc/hadoop.xml
trunk/archive-access/projects/wayback/src/site/xdoc/index.xml
trunk/archive-access/projects/wayback/src/site/xdoc/navigation.xml
trunk/archive-access/projects/wayback/src/site/xdoc/release_notes.xml
Modified: trunk/archive-access/projects/wayback/dist/pom.xml
===================================================================
--- trunk/archive-access/projects/wayback/dist/pom.xml 2010-12-31 00:22:07 UTC (rev 3359)
+++ trunk/archive-access/projects/wayback/dist/pom.xml 2010-12-31 01:05:43 UTC (rev 3360)
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>parent</artifactId>
+ <artifactId>wayback</artifactId>
<groupId>org.archive.wayback</groupId>
<version>1.6.0</version>
</parent>
@@ -33,7 +33,7 @@
<descriptors>
<descriptor>src/main/assembly/distribution.xml</descriptor>
</descriptors>
- <finalName>wayback-${project.version}</finalName>
+ <finalName>wayback</finalName>
</configuration>
<executions>
<execution>
@@ -45,15 +45,6 @@
</executions>
</plugin>
- <plugin>
- <artifactId>maven-site-plugin</artifactId>
- <version>2.1</version>
- <configuration>
- <inputencoding>utf-8</inputencoding>
- <outputencoding>utf-8</outputencoding>
- </configuration>
- </plugin>
-
</plugins>
</build>
Deleted: trunk/archive-access/projects/wayback/dist/src/site/site.xml
===================================================================
--- trunk/archive-access/projects/wayback/dist/src/site/site.xml 2010-12-31 00:22:07 UTC (rev 3359)
+++ trunk/archive-access/projects/wayback/dist/src/site/site.xml 2010-12-31 01:05:43 UTC (rev 3360)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="Wayback">
- <bannerLeft>
- <name>Wayback</name>
- <src>images/ia_logo.gif</src>
- <href>http://archive-access.sourceforge.net/projects/wayback/</href>
- </bannerLeft>
- <bannerRight>
- <name>Wayback</name>
- </bannerRight>
- <body>
-
- <links>
- <item name="Sourceforge" href="http://www.sourceforge.net"/>
- <item name="Heritrix" href="http://crawler.archive.org"/>
- <item name="NutchWAX" href="http://archive-access.sourceforge.net/projects/nutchwax/"/>
- <item name="Archive Access" href="http://archive-access.sourceforge.net"/>
- <item name="Internet Archive" href="http://www.archive.org"/>
- <item name="Home" href="index.html"/>
- </links>
-
- <menu name="Overview">
- <item name="Requirements" href="requirements.html"/>
- <item name="Downloads" href="downloads.html"/>
- <item name="Administrator Manual" href="administrator_manual.html"/>
- <item name="Hadoop CDX Generation" href="hadoop.html"/>
- <item name="Release Notes" href="release_notes.html"/>
- <item name="FAQ" href="/faq.html"/>
- <item name="API" href="./apidocs"/>
- <item name="Browse/Submit a Bug"
- href="https://webarchive.jira.com/browse/ACC/component/10031"/>
- </menu>
-
- <menu ref="reports"/>
-
- </body>
-</project>
Deleted: trunk/archive-access/projects/wayback/dist/src/site/xdoc/access_point_naming.xml
===================================================================
--- trunk/archive-access/projects/wayback/dist/src/site/xdoc/access_point_naming.xml 2010-12-31 00:22:07 UTC (rev 3359)
+++ trunk/archive-access/projects/wayback/dist/src/site/xdoc/access_point_naming.xml 2010-12-31 01:05:43 UTC (rev 3360)
@@ -1,287 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<document>
- <properties>
- <title>Access Point Naming</title>
- <author email="brad at archive dot org">Brad Tofel</author>
- <revision>$$Id$$</revision>
- </properties>
-
- <body>
-
-
-
- <section name="Overview">
- <p>
- Tomcat (or other servlet containers) are configured to listen on one or
- more ports, so each request received on one of those ports is targeted
- to a particular webapp based on the name of the .war file deployed under
- the <b>webapps/</b> directory. The targeted webapp is determined based on
- the first directory in incoming requests.
- </p>
- <p>
- If there are two webapps deployed under the <b>webapps/</b> directory,
- called <b>webappA.war</b> and <b>webappB.war</b>, then an incoming
- request <b>/webappA/file1</b> will be received by the webapp inside
- <b>webappA.war</b> as the request <b>/file1</b>. An incoming request
- for <b>webappB/images/foo.gif</b> will be received by the webapp inside
- <b>webappB.war</b> as <b>/images/foo.gif</b>.
- </p>
- <p>
- Tomcat (and other servlet containers) allow a special .war file to be
- deployed under the <b>webapps/</b> directory called <b>ROOT.war</b>
- which will receive requests not matching another webapp. If the above
- example also included a webapp deployed under the <b>webapps/</b>
- directory named <b>ROOT.war</b>, then requests starting with <b>webappA/</b>
- will be received by <b>webappA.war</b>, requests starting with <b>webappB/</b>
- will be received by <b>webappB.war</b>, and all other requests will be
- receieved by the <b>ROOT.war</b> webapp.
- </p>
- <p>
- If possible, deploying your webapp as <b>ROOT.war</b> will result in
- somewhat cleaner public URLs, but this is not a requirement. The
- examples below all include alternate URL configuration prefixes depending
- on whether you deploy the Wayback .war file as either <b>ROOT.war</b> or
- <b>wayback.war</b>.
- </p>
- <subsection name="AccessPoint Names">
- <p>
- Each AccessPoint Spring XML bean definition must include a <b>name</b>
- property:
- <br></br>
- <code>
-
-<bean name="8080:wayback" class="org.archive.wayback.webapp.AccessPoint">
- ...
-</bean>
-
- </code>
- <br></br>
- The <b>name</b> property indicates how requests <b>that are received
- by the Wayback webapp</b> are routed to the appropriate AccessPoint.
- Wayback allows targeting AccessPoints based on:
- <ul>
- <li>hostname</li>
- <li>port</li>
- <li>first path <b>after</b> the optional webapp deployment name
- (which is empty if you deploy your Wayback webapp as
- <b>ROOT.war</b>)</li>
- </ul>
- using the AccessPoint bean <b>name</b> field composed of <b>hostname</b>:<b>port</b>:<b>first_path</b>.
- </p>
- <p>
- If you have configured DNS to resolve multiple hostnames to the same
- computer, you can use the <b>hostname:</b> to control AccessPoint
- resolving based on virtual hosts.
- </p>
- <p>
- Port is the only required configuration component within the
- AccessPoint <b>name</b> configuration. If you have multiple Tomcat
- <b>Connector</b>s you can alter this AccessPoint name configuration to
- target specific AccessPoints, otherwise, all your AccessPoint names
- will have the same port, likely one of 8080, or 80.
- </p>
- <p>
- A more commonly useful AccessPoint name resolving component is the
- <b>first-path</b>, which allows you to easily expose multiple
- collections within a single Wayback webapp deployment, without varying
- hostnames, or ports (which often require network or system
- administrator assistance).
- </p>
- </subsection>
- <subsection name="Example AccessPoint names and URLs">
- <p>
- The following table shows how urls will map to particular AccessPoints
- assuming you have deployed the Wayback webapp as <b>ROOT.war</b>, on
- a host with the name "access.example.org", using port 8080.
- <table>
- <tr>
- <th>Access Point bean name</th>
- <th>Archival URL prefix</th>
- <th>Archival URL query example for <b>http://archive.org</b></th>
- </tr>
- <tr>
- <td>8080:collectionA</td>
- <td>http://access.example.org:8080/collectionA/</td>
- <td>http://access.example.org:8080/collectionA/*/http://archive.org/</td>
- </tr>
- <tr>
- <td>8080:collectionB</td>
- <td>http://access.example.org:8080/collectionB/</td>
- <td>http://access.example.org:8080/collectionB/*/http://archive.org/</td>
- </tr>
- </table>
- </p>
- <p>
- If you deployed your Wayback webapp with the name <b>wayback.war</b>
- the following table shows how urls will map to particular
- AccessPoints, on a host with the name "access.example.org", using port
- 8080.
- <table>
- <tr>
- <th>Access Point bean name</th>
- <th>Archival URL prefix</th>
- <th>Archival URL query example for <b>http://archive.org</b></th>
- </tr>
- <tr>
- <td>8080:collectionA</td>
- <td>http://access.example.org:8080/wayback/collectionA/</td>
- <td>http://access.example.org:8080/wayback/collectionA/*/http://archive.org/</td>
- </tr>
- <tr>
- <td>8080:collectionB</td>
- <td>http://access.example.org:8080/wayback/collectionB/</td>
- <td>http://access.example.org:8080/wayback/collectionB/*/http://archive.org/</td>
- </tr>
- </table>
- </p>
- <p>
- If you have configured multiple <b>Connector</b>s for your Tomcat
- server, listening on both port <b>80</b>, and port <b>8080</b>, and
- you deploy <b>ROOT.war</b> you can target different AccessPoints by
- port, as shown below. These examples assume your servers hostname is
- still "access.example.org".
- <table>
- <tr>
- <th>Access Point bean name</th>
- <th>Archival URL prefix</th>
- <th>Archival URL query example for <b>http://archive.org</b></th>
- </tr>
- <tr>
- <td>80:collectionA</td>
- <td>http://access.example.org/collectionA/</td>
- <td>http://access.example.org/collectionA/*/http://archive.org/</td>
- </tr>
- <tr>
- <td>8080:collectionB</td>
- <td>http://access.example.org:8080/collectionB/</td>
- <td>http://access.example.org:8080/collectionB/*/http://archive.org/</td>
- </tr>
- <tr>
- <td>80:collectionC</td>
- <td>http://access.example.org/collectionC/</td>
- <td>http://access.example.org/collectionC/*/http://archive.org/</td>
- </tr>
- </table>
- </p>
- <p>
- If you have a very limited number of AccessPoints to expose, you can
- do away with the <b>first-path</b> component, to achieve potentially
- very uncluttered Archival URLs. Assuming multiple <b>Connector</b>s
- for your Tomcat server, listening on both port <b>80</b>, and port
- <b>8080</b>, and you deploy <b>ROOT.war</b> you can target different
- AccessPoints by port alone, as shown below. These examples still
- assume your servers hostname is "access.example.org".
- <table>
- <tr>
- <th>Access Point bean name</th>
- <th>Archival URL prefix</th>
- <th>Archival URL query example for <b>http://archive.org</b></th>
- </tr>
- <tr>
- <td>80</td>
- <td>http://access.example.org/</td>
- <td>http://access.example.org/*/http://archive.org/</td>
- </tr>
- <tr>
- <td>8080</td>
- <td>http://access.example.org:8080/</td>
- <td>http://access.example.org:8080/*/http://archive.org/</td>
- </tr>
- </table>
- </p>
- <p>
- Getting somewhat fancy, you can use virtual hosts, doing away with
- non-standard ports, and use hostnames alone to specify AccessPoints.
- This means getting your Tomcat to listen on port <b>80</b>, and
- deploying the webapp as <b>ROOT.war</b>. You'd have to configure your
- DNS so both "collection1.example.org" and "collection2.example.org"
- point to the host running Wayback:
- <table>
- <tr>
- <th>Access Point bean name</th>
- <th>Archival URL prefix</th>
- <th>Archival URL query example for <b>http://archive.org</b></th>
- </tr>
- <tr>
- <td>collection1.example.org:80</td>
- <td>http://collection1.example.org/</td>
- <td>http://collection1.example.org/*/http://archive.org/</td>
- </tr>
- <tr>
- <td>collection2.example.org:80</td>
- <td>http://collection2.example.org/</td>
- <td>http://collection2.example.org/*/http://archive.org/</td>
- </tr>
- </table>
- </p>
- </subsection>
- <subsection name="Getting really fancy">
-
- <p>
- Assuming you've deployed your webapp as <b>ROOT.war</b> and have Tomcat
- listening on both port 80 and 8080, with the hostnames
- "collection1.example.org" and "collection2.example.org" both
- pointing to the host running wayback:
- <table>
- <tr>
- <th>Access Point bean name</th>
- <th>Archival URL prefix</th>
- <th>Archival URL query example for <b>http://archive.org</b></th>
- </tr>
- <tr>
- <td>collection1.example.org:80</td>
- <td>http://collection1.example.org/</td>
- <td>http://collection1.example.org/*/http://archive.org/</td>
- </tr>
- <tr>
- <td>collection1.example.org:8080:subset1</td>
- <td>http://collection1.example.org:8080/subset1/</td>
- <td>http://collection1.example.org:8080/subset1/*/http://archive.org/</td>
- </tr>
- <tr>
- <td>collection1.example.org:8080:subset2</td>
- <td>http://collection1.example.org:8080/subset2/</td>
- <td>http://collection1.example.org:8080/subset2/*/http://archive.org/</td>
- </tr>
- <tr>
- <td>collection2.example.org:8080</td>
- <td>http://collection1.example.org:8080/</td>
- <td>http://collection1.example.org:8080/*/http://archive.org/</td>
- </tr>
- <tr>
- <td>collection2.example.org:80:internal</td>
- <td>http://collection2.example.org/internal/</td>
- <td>http://collection2.example.org/internal/*/http://archive.org/</td>
- </tr>
- <tr>
- <td>collection2.example.org:80:public</td>
- <td>http://collection2.example.org/public/</td>
- <td>http://collection2.example.org/public/*/http://archive.org/</td>
- </tr>
- </table>
- </p>
- </subsection>
-<!--
- <subsection name="ArchivalURL Server-Relative URL rewriting">
- <p>
- As hard as we've tried to make Server-side rewrite "do the right
- thing" in ArchivalURL Replay mode, sometimes things don't work out
- right. For example, if a page, <b>http://example.net/news/a.html</b>
- contains some Javascript, that generates the following HTML with a
- <b>document.write()</b> call:
- <br></br>
- <code>
-
-<img src="/foo.gif"></img>
- </code>
- <br></br>
- And you were running an AccessPoint at <b>http://archive.org/web/</b>,
- the then page would be expecting that URL to resolve as
- <b>http://example.net/foo.gif</b>, but in fact, the page being
- displayed as
- </p>
- <subsection>
--->
- </section>
- </body>
-</document>
\ No newline at end of file
Deleted: trunk/archive-access/projects/wayback/dist/src/site/xdoc/administrator_manual.xml
===================================================================
--- trunk/archive-access/projects/wayback/dist/src/site/xdoc/administrator_manual.xml 2010-12-31 00:22:07 UTC (rev 3359)
+++ trunk/archive-access/projects/wayback/dist/src/site/xdoc/administrator_manual.xml 2010-12-31 01:05:43 UTC (rev 3360)
@@ -1,1243 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<document>
- <properties>
- <title>Administrators Manual</title>
- <author email="brad at archive dot org">Brad Tofel</author>
- <revision>$$Id$$</revision>
- </properties>
-
- <body>
-
-
-
- <section name="Requirements">
-
- <subsection name="Third Party Packages">
- <p>
- Please see the
- <a href="requirements.html">
- System Requirements
- </a>
- .
- </p>
- </subsection>
-
-
- <subsection name="Wayback Software">
- <p>
- Please see the
- <a href="downloads.html">
- Software Downloads page
- </a>
- .
- </p>
- </subsection>
-
-
- </section>
-
-
-
- <section name="Installing">
-
-
- <subsection name="Installing Tomcat">
- <p>
- Please refer to the README file included with your Tomcat distribution.
- </p>
- </subsection>
-
-
- <subsection name="Installing Wayback">
- <p>
- Once you have downloaded the .tar.gz file from
- sourceforge, you will need to unpack the file to access the
- webapp file, <b>wayback-webapp-1.6.0.war</b>.
- </p>
- <p>
- Installation and configuration of this software involves the
- following steps:
- <ol>
- <li>
- Placing .war file in appropriate location.
- </li>
- <li>
- Waiting for Tomcat to unpack the .war file.
- </li>
- <li>
- Customizing base wayback.xml and possibly other XML configuration files.
- </li>
- <li>
- Restarting tomcat.
- </li>
- </ol>
- </p>
- </subsection>
- </section>
-
-
-
- <section name="Wayback Configuration Overview">
- <p>
- The wayback software provides Query and Replay access to archived
- documents. Query access allows users to locate particular documents
- within the collection by URL and date. Replay access allows users to
- view archived pages within their web browsers. Some Replay modes
- require altering the original pages and resources, so embedded and
- referenced content is also loaded from the Wayback service, and not
- from the live web.
- </p>
- <p>
- A WaybackCollection defines a set of archived documents and an index
- which allows documents to be quickly located within the collection. A
- WaybackCollection may be exposed to end users through one or more
- AccessPoints, which define:
- <ul>
- <li>the WaybackCollection itself</li>
- <li>the URL where users can access the collection</li>
- <li>how query results are presented to users (the Query UI)</li>
- <li>how documents are returned to users so they appear correctly in
- their web browsers (the Replay UI)</li>
- <li>the look and feel of the wayback user interface</li>
- <li>who can access the documents in the collection</li>
- <li>which documents from the collection are available</li>
- </ul>
- </p>
- <p>
- Wayback is configured using
- <a href="http://static.springsource.org/spring/docs/2.5.x/reference/beans.html#beans-basics">Spring IOC</a>,
- to specify and configure concrete implementations of several basic
- modules. Please see the
- <a href="http://static.springsource.org/spring/docs/2.5.x/reference/beans.html#beans-basics">Spring website</a> for more information on
- configuring beans using Spring XML.
- </p>
- <subsection name="AccessPoint configuration options">
- <p>
- An AccessPoint's configuration must specify the following
- implementations:
- <ul>
- <li><a href="WaybackCollection_Configuration"><b>collection</b></a>
- the specific WaybackCollection being exposed via this
- AccessPoint.
- </li>
- <li><a href="Query_UI"><b>query</b></a> responsible for generating
- user visible content(HTML, XML, etc) in response to user
- Queries.</li>
- <li><a href="Replay_Modes"><b>replay</b></a> responsible for
- determining the appropriate ReplayRenderer implementation based
- on the users request and the particular document to be
- Replayed.</li>
- <li><b>uriConverter</b> responsible for constructing Replay URLs
- from records matching users queries. See Replay Modes below.
- </li>
- <li><b>parser</b> - responsible for translating incoming requests
- into WaybackRequests. See Replay Modes below.</li>
- </ul>
- </p>
- <p>
- An AccessPoint's configuration may optionally specify the following,
- but must specify at least one of replayPrefix, queryPrefix, or
- staticPrefix:
- <ul>
- <li><a href="Exception_Rendering"><b>exception</b></a> - an
- implementation responsible for generating error pages to users
- </li>
- <li>
- <a href="Adding_Additional_Configurations_to_an_AccessPoint">
- <b>configs</b>
- </a> - a Properties associating arbitrary key-value pairs which
- are accessible to .jsp files responsible for generating the UI
- </li>
- <li>
- <a href="Excluding_Documents_within_an_AccessPoint">
- <b>exclusionFactory</b>
- </a> - an implementation specifying what documents should be
- accessible within this AccessPoint
- </li>
- <li>
- <a href="Restricting_who_can_interact_with_an_AccessPoint">
- <b>authentication</b>
- </a> - an implementation specifying who is allowed to connect to
- this AccessPoint
- </li>
- <li>
- <b>replayPrefix</b> - a String URL prefix indicating the host,
- port, and path to the correct Replay AccessPoint. If unspecified,
- defaults to queryPrefix, then staticPrefix.
- </li>
- <li>
- <b>queryPrefix</b> - a String URL prefix indicating the host,
- port, and path to the correct Query AccessPoint. If unspecified,
- defaults to staticPrefix, then replayPrefix.
- </li>
- <li>
- <b>staticPrefix</b> - a String URL prefix indicating the host,
- port, and path to static content used within the UI. If
- unspecified, defaults to queryPrefix, then replayPrefix.
- </li>
- <li>
- <b>livewebPrefix</b> - a String URL prefix indicating the host,
- port, and path to an AccessPoint configured with Live Web fetching.
- </li>
- <li><b>locale</b> - A specific Locale to use for all requests
- within this AccessPoint, overriding the users preferred Locale
- as specified by their web browser.
- </li>
- <li>
- <b>exactHostMatch</b> - true or false, if true, only returns
- results exactly matching a given request hostname (case insensitive).
- Default is false.
- </li>
- <li>
- <b>exactSchemeMatch</b> - true of false, if true, only returns
- results exactly matching a given request scheme. Default is true.
- </li>
- </ul>
- </p>
- <p>
- AccessPoints can be used to provide different levels and types of
- access to the same collection for different users. For example, you
- can provide both Proxy and Archival URL mode access to a single
- collection by defining 2 AccessPoints with different Replay User
- Interfaces but the same WaybackCollection. Using AccessPoints, you can
- also provide different levels of access to a collection. For example,
- users within a particular subnet may be able to access all documents
- within a collection via one AccessPoint, but users outside that subnet
- may be restricted to viewing documents allowed by a web sites current
- robots.txt file.
- </p>
- <p>
- Please refer to
- <a href="https://archive-access.svn.sourceforge.net/svnroot/archive-access/trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/wayback.xml">wayback.xml</a>
- within the wayback .war file for detailed example AccessPoint
- configurations.
- </p>
- </subsection>
- <subsection name="WaybackCollection Configuration">
- <p>
- A WaybackCollection's configuration must specify the following
- implementations:
- <ul>
- <li><a href="resource_store.html">resourceStore</a> the specific
- implementation used to specific set of documents within this
- collection, and how to access them for Replay requests.</li>
- <li><a href="resource_index.html">resourceIndex</a> the specific
- implementation responsible for locating documents within the
- collection.</li>
- </ul>
- </p>
- <p>
- A WaybackCollection's configuration may optionally specify the
- following:
- <ul>
- <li>shutdownables - an List of one or more beans implementing
- org.archive.wayback.Shutdownable needed to maintain this
- WaybackCollection, typically Daemon Threads which perform
- automatic indexing operations on the resourceStore and the
- resourceIndex.</li>
- </ul>
- </p>
- <p>
- For more information on WaybackCollection configuration options and
- automatic indexing, please refer to the following documentation pages
- and to the example Spring .xml configuration files within the wayback
- .war:
- <ul>
- <li><a href="resource_store.html">ResourceStore configuration and
- automatic indexing</a></li>
- <li><a href="resource_index.html">ResourceIndex configuration</a></li>
- <li><a href="https://archive-access.svn.sourceforge.net/svnroot/archive-access/trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/BDBCollection.xml">BDBCollection.xml</a></li>
- <li><a href="https://archive-access.svn.sourceforge.net/svnroot/archive-access/trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/CDXCollection.xml">CDXCollection.xml</a></li>
- <li><a href="https://archive-access.svn.sourceforge.net/svnroot/archive-access/trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/RemoteCollection.xml">RemoteCollection.xml</a></li>
-<!--
- <li><a href="https://archive-access.svn.sourceforge.net/svnroot/archive-access/trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/NutchCollection.xml">NutchCollection.xml</a></li>
--->
- </ul>
- </p>
- </subsection>
- </section>
-
- <section name="Replay Modes">
- <p>
- There are presently 3 Replay modes supported by the Wayback software,
- Archival URL mode, Proxy mode, and an experimental DomainPrefix mode.
- </p>
- <subsection name="Archival URL Replay Mode">
- <p>
- Archival URL Replay mode uses a modified URL to designate
- documents stored in ARC/WARC files. The general form of an
- Archival URL is:
- <br></br>
- <div>
- <code>
- http://HOSTNAME:PORT/CONTEXT/TIMESTAMP/URL
- </code>
- </div>
- <br></br>
- where
- <ul>
- <li>
- <b>HOSTNAME</b> is the host where the Wayback software is
- running.
- </li>
- <li>
- <b>PORT</b> is the port where Tomcat is listening for
- incoming HTTP requests, which also refers to part of the name of
- the Access Point. See below for example CONTEXT mappings.
- </li>
- <li>
- <b>CONTEXT</b> is an optional context where the Wayback webapp
- has been deployed, plus an optional name of the Access Point
- within the webapp. See below for example CONTEXT mappings.
- </li>
- <li>
- <b>TIMESTAMP</b> is 0 to 14 digits of a date, possibly
- followed by an asterisk ('*'), or one or more tags providing
- further specifics for the request. The format of a
- TIMESTAMP is:
- <div>
- <code>
- YYYYMMDDHHmmss
- </code>
- </div>
- where
- <ul>
- <li>
- <b>YYYY</b> represents a 4-digit year
- </li>
- <li>
- <b>MM</b> represents a 2-digit, 1-based month
- (Jan = 1 - Dec = 12)
- </li>
- <li>
- <b>DD</b> represents a 2-digit day of the month
- (01-31)
- </li>
- <li>
- <b>HH</b> represents a 2-digit hour (01-24)
- </li>
- <li>
- <b>mm</b> represents a 2-digit minute (00-59)
- </li>
- <li>
- <b>ss</b> represents a 2-digit second (00-59)
- </li>
- </ul>
- The following are example dates expressed as
- 14-digit Timestamps:
- <br></br>
- <div>
- Jan 13, 1999 03:34:35 (am UTC) - 19990113033435
- </div>
- <br></br>
- <div>
- Dec 31, 2004 23:01:00 (pm UTC) - 20041231230100
- </div>
- <br></br>
- <p>
- Following the date portion of a timestamp, the following flags
- can be appended:
- <ul>
- <li>
- <b>id_</b> Identity - perform no alterations of the original
- resource, return it as it was archived.
- </li>
- <li>
- <b>js_</b> Javascript - return document marked up as javascript.
- </li>
- <li>
- <b>cs_</b> CSS - return document marked up as CSS.
- </li>
- <li>
- <b>im_</b> Image - return document as an image.
- </li>
- </ul>
- </p>
- </li>
- <li>
- <b>URL</b> represents the actual URL that should be
- replayed.
- </li>
- </ul>
- <br></br>
- <div>
- For some simple and more elaborate examples of how AccessPoint bean
- names interact with Archival URLs, please refer to
- <a href="access_point_naming.html">Access Point Naming</a>.
- </div>
- <br></br>
- <div>
- Archival URL mode allows replay of all versions captured
- of a particular URL, by modifying the Timestamp. When an
- Archival URL Replay request is received for a URL, the
- Wayback Machine will replay the closest version in time
- to the Timestamp requested of the particular URL.
- </div>
- <br></br>
- <div>
- HTML documents returned in Archival URL Replay mode are
- modified from the original version to provide a replay
- experience more consistent to viewing the original
- content. This is accomplished by one of two methods. The first
- includes modification of a subset of the HTML tags on the server,
- combined with the insertion of JavaScript into the HTML page. This
- JavaScript executes in the client browser after the page has loaded,
- and modifies the remaining URLs within the HTML page, both
- Anchors (links) as well as embedded content (images, applets, etc)
- so that they become appropriate Archival URL requests back to the
- Wayback application. The second method involves rewriting all HTML
- tags within the page on the server, to make embedded URLs point back
- into the Wayback application.
- </div>
- <br></br>
- <div>
- Currently, we are recommending the entirely server-side rewriting
- method, and are deprecating the original server-side plus Javascript
- method, but this functionality is still available in Wayback.
- Neither method is perfect, not all URLs are rewritten correctly,
- particularly URLs that are created by JavaScript in the original
- pages, and specialized file types containing links like Flash
- and PDF documents.
- </div>
- <br></br>
- </p>
- <p>
- The properties <b>parser</b> and <b>uriConverter</b>
- for Archival URL Access Points must be set to the following
- implementations:
- <pre>
-
- <property name="parser">
- <bean class="org.archive.wayback.archivalurl.ArchivalUrlRequestParser"
- init-method="init">
- <property name="maxRecords" value="1000" />
- <property name="earliestTimestamp" value="1996" />
- </bean>
- </property>
-
- <property name="uriConverter">
- <bean class="org.archive.wayback.archivalurl.ArchivalUrlResultURIConverter">
- <property name="replayURIPrefix" value="http://wayback.example.org:8080/collection/" />
- </bean>
- </property>
-
- </pre>
- </p>
- <table>
- <tr>
- <th>
- configuration
- </th>
- <th>
- optional/required
- </th>
- <th>
- description
- </th>
- </tr>
- <tr>
- <td>
- maxRecords
- </td>
- <td>
- optional
- </td>
- <td>
- Sets the default maximum requested records for Archival URL query
- requests.
- </td>
- </tr>
- <tr>
- <td>
- earliestTimestamp
- </td>
- <td>
- optional
- </td>
- <td>
- Set the default start date for requested records for Archival
- URL query requests.
- </td>
- </tr>
- <tr>
- <td>
- replayURIPrefix
- </td>
- <td>
- required
- </td>
- <td>
- Points to the Archival URL prefix of the Access Point as
- illustrated in <a href="access_point_naming.html">Access Point Naming</a> document.
- </td>
- </tr>
- </table>
- <p>
- For additional configuration examples and information about
- ArchivalUrl Replay mode, please see the file
- <a href="https://archive-access.svn.sourceforge.net/svnroot/archive-access/trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/ArchivalUrlReplay.xml">ArchivalUrlReplay.xml</a>
- </p>
- </subsection>
-
- <subsection name="Proxy Replay Mode">
- <p>
- Wayback can be configured to act as an HTTP proxy server. To utilize
- this mode, the wayback webapp <b>must</b> be deployed as the ROOT
- context, no other AccessPoints can use the port dedicated to the
- Proxy AccessPoint, and client browsers must be configured to proxy
- all HTTP requests through the Wayback Machine application. Instead of
- retrieving documents from the live web, the Wayback Machine will
- retrieve documents from the configured WaybackCollection.
- </p>
- <p>
- Proxy Replay mode does not suffer from the shortcomings of
- the inserted Javascript that the Archival URL mode uses, all URLs
- function as they did originally, but there can be another drawback
- to using this feature: no date information is sent with each request.
- Wayback attempts to address this problem by associating the date
- clicked on query pages when a Replay session is begun, with the
- users IP address. This can fail to work properly in situations where
- multiple users are behind a NAT system which causes them to appear to
- have the same IP address.
- </p>
- <p>
- Additionally, there is an experimental Firefox-specific plugin
- developed by Oskar Grenholm, which provides a novel interface
- to navigate between different captured versions of a page within
- Proxy mode, and also sends a special HTTP header which allows Wayback
- to uniquely associate the correct date with browsers, even those
- behind a NAT system. You can find out more about
- this plugin and download it
- <a href="http://archive-access.sourceforge.net/projects/waxtoolbar/">
- here
- </a>.
- </p>
- <p>
- Thanks Oskar!
- </p>
- <p>
- The following is an example Proxy Replay Access Point definition. It
- assumes to be running on a host <b>wayback.somehost.org</b>, that a
- Tomcat Connector has been added for port <b>8090</b>,
- that the Wayback webapp has been deployed at the ROOT context, and
- that another Archival URL Access Point named "8080:wayback" has been
- configured.
- <pre>
-
-<bean name="8090" parent="8080:wayback">
- <property name="queryPrefix" value="http://wayback.somehost.org/" />
- <property name="replay"> ref="proxyreplay" />
- <property name="uriconverter">
- <bean class="org.archive.wayback.proxy.RedirectResultURIConverter">
- <property name="redirectURI" value="http://wayback.somehost.org/jsp/Redirect.jsp" />
- </bean>
- </property>
- <property name="parser">
- <bean class="org.archive.wayback.proxy.ProxyRequestParser" >
- <property name="localhostNames">
- <list>
- <value>wayback.somehost.org</value>
- </list>
- </property>
- <property name="maxRecords" value="1000" />
- </bean>
- </property>
-</bean>
-
- </pre>
- </p>
- <p>
- <b>redirectURI</b> is required, and must be set to the name of the
- host where the Wayback application is running. If this is not the
- primary name of the machine running the Wayback application, then you
- may need to also specify the hostname used for the Wayback application
- in the <b>localhostNames</b> configuration list.
- </p>
- <p>
- For additional configuration examples and information about
- Proxy Replay mode, please see the file
- <a href="https://archive-access.svn.sourceforge.net/svnroot/archive-access/trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/ProxyReplay.xml">ProxyReplay.xml</a>
- </p>
- </subsection>
-
- <subsection name="DomainPrefix Replay Mode">
- <p>
- Wayback includes an additional, experimental Replay mode which is
- similar to Archival URL mode, in that any document can be refernced
- as a global URL, without any browser configuration requirements. This
- mode requires deploying the Wayback webapp in ROOT context, and a
- special DNS wildcard aliasing, so that all hostnames with a common
- suffix will be directed to your host running Wayback.
- </p>
- <p>
- The general form of a DomainPrefix URL is:
- <br></br>
- <div>
- <code>
- http://TIMESTAMP.ARCHIVE-HOSTNAME.WAYBACK-HOSTNAME:PORT/ARCHIVE-PATH
- </code>
- </div>
- </p>
- <p>
- Here is an example DomainPrefix URL, on an assumed host
- <b>wayback.somehost.org</b>, with a wayback webapp deployed as
- <b>ROOT</b>, via the Access Point named <b>8081</b> (which indicates the
- port Wayback requests will be recieved on) for the
- page <b>http://www.yahoo.com/foo.gif</b> on Dec 31, 1999 at 12:00:00 UTC.
- <br></br>
- <div>
- <code>
- http://19991231120000.www.yahoo.com.wayback.somehost.org:8081/foo.gif
- </code>
- </div>
- </p>
- <p>
- This mode performs all URL rewriting on the server side, so needs no
- client-side Javascript to execute, and also does not suffer from some
- of the request leakage problems present in Archival URL mode. It
- presently is somewhat naive about rewriting links within returned
- documents, and will also rewrite URLs in the text of pages
- (not desired), as well as URLs referenced within the page (desired).
- </p>
- <p>
- For additional configuration examples and information about
- Domain Prefix Replay mode, please see the files
- <a href="https://archive-access.svn.sourceforge.net/svnroot/archive-access/trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/wayback.xml">wayback.xml</a>
- and
- <a href="https://archive-access.svn.sourceforge.net/svnroot/archive-access/trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/DomainPrefixReplay.xml">DomainPrefixReplay.xml</a>
- .
- </p>
- </subsection>
- </section>
-
-
- <section name="Wayback UI customization options">
- <p>
- Wayback provides several opportunities for customizing the user
- interface presented to users, which can be grouped into 4 categories:
- <ul>
- <li>Query UI rendering .jsp files.</li>
- <li>Replay insert .jsp files.</li>
- <li>Exception rendering .jsp files.</li>
- <li>Localization .properties files.</li>
- </ul>
- </p>
- <subsection name="Query UI">
- <p>
- All content returned by Wayback in response to Query requests is
- generated by .jsp files, which are executed and provided access to
- the results found within the ResourceIndex. Wayback is distributed
- with several sample implementations.
- </p>
- <p>
- To alter the default behavior, you may either provide your own .jsp
- files, and configure the Renderer to use them instead of the
- default .jsp files, or the default .jsp files may be modified
- directly.
- <ul>
- <li>
- <b>captureJsp</b> - used when the request indicates that
- a listing of all dates available for a single URL should be
- returned. Default is
- <a href="https://archive-access.svn.sourceforge.net/svnroot/archive-access/trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/HTMLCaptureResults.jsp">/WEB-INF/query/HTMLCaptureResults.jsp</a>.
- An alternate implementation, /WEB-INF/query/CalendarResults.jsp
- will generate HTML output similar to the global Wayback Machine
- service.
- </li>
- <li>
- <b>urlJsp</b> - used when the request indicates that a summary
- of captures available for a number of URLs should be returned.
- Default is
- <a href="https://archive-access.svn.sourceforge.net/svnroot/archive-access/trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/HTMLUrlResults.jsp">/WEB-INF/query/HTMLUrlResults.jsp</a>
- </li>
- <li>
- <b>xmlCaptureJsp</b> - used when the request indicates that
- a listing of all dates available for a single URL should be
- returned in XML format. Default is
- <a href="https://archive-access.svn.sourceforge.net/svnroot/archive-access/trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/XMLCaptureResults.jsp">/WEB-INF/query/XMLCaptureResults.jsp</a>.
- </li>
- <li>
- <b>xmlUrlJsp</b> - used when the request indicates that a
- summary of captures available for a number of URLs should be
- returned in XML format.
- Default is
- <a href="https://archive-access.svn.sourceforge.net/svnroot/archive-access/trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/XMLUrlResults.jsp">/WEB-INF/query/XMLUrlResults.jsp</a>
- </li>
- </ul>
- </p>
- </subsection>
- <subsection name="Replay Inserts">
- <p>
- Wayback allows for embedding additional content within replayed HTML
- pages in all Replay modes. This is accomplished by executing one or
- more .jsp files with access to context information about the request,
- the results, and the actual Resource being returned. The output of
- each .jsp file is included within the returned page.
- </p>
- <p>
- Wayback is distributed with several example .jsp insert files that
- can be used as is, modified to suit installation requirements, or
- used as examples for more elaborate customizations:
- <ul>
- <li>
- <a href="https://archive-access.svn.sourceforge.net/svnroot/archive-access/trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/ArchiveComment.jsp">/WEB-INF/replay/ArchiveComment.jsp</a>
- inserts an HTML comment indicating when the document was
- captured and retrieved.
- </li>
- <li>
- <a href="https://archive-access.svn.sourceforge.net/svnroot/archive-access/trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/ClientSideJSInsert.jsp">/WEB-INF/replay/ClientSideJSInsert.jsp</a>
- inserts some Javascript into the returned HTML page that updates
- links, images, and other embedded content, attempting to make
- all URL references within the page point back into the Wayback
- service.
- </li>
- <li>
- <a href="https://archive-access.svn.sourceforge.net/svnroot/archive-access/trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/DebugBanner.jsp">/WEB-INF/replay/DebugBanner.jsp</a>
- Not intended for production use, but a slightly more complex
- jsp insert example that demonstrates how to access various
- request context data, and is sometimes useful for debugging.
- </li>
- <li>
- <a href="https://archive-access.svn.sourceforge.net/svnroot/archive-access/trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/Disclaimer.jsp">/WEB-INF/replay/Disclaimer.jsp</a>
- Inserts a small banner at the top of replayed HTML pages,
- alerting users that they are viewing an archived page, and
- providing some information about the particular capture.
- </li>
- <li>
- <a href="https://archive-access.svn.sourceforge.net/svnroot/archive-access/trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/JSLessTimeline.jsp">/WEB-INF/replay/JSLessTimeline.jsp</a>
- Inserts a banner in the top of replayed documents which allows
- users to navigate directly between other captures of the current
- page they are viewing. This version does not use Javascript to
- place the banner, so it will appear in all HTML pages within a
- frameset.
- </li>
- <li>
- <a href="https://archive-access.svn.sourceforge.net/svnroot/archive-access/trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/Timeline.jsp">/WEB-INF/replay/Timeline.jsp</a>
- Inserts a banner in the top of replayed documents which allows
- users to navigate directly between other captures of the current
- page they are viewing. This version uses Javascript to
- place the banner, attempting to only place the banner in the
- largest frame within a frameset.
- </li>
- <li>
- <a href="https://archive-access.svn.sourceforge.net/svnroot/archive-access/trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/Toolbar.jsp">/WEB-INF/replay/Toolbar.jsp</a>
- Inserts a fancier banner in the top of replayed documents which
- includes a graphic representaion of the number of captures over
- time and allows users to navigate directly between other captures
- of the current page they are viewing. This version uses Javascript
- to place the banner, attempting to only place the banner in the
- largest frame within a frameset.
- </li>
- </ul>
- </p>
- </subsection>
- <subsection name="Exception Rendering">
- <p>
- Wayback is distributed with a default ExceptionRenderer that allows
- customization of several types of anticipated exceptions that can
- occur through normal operations. The BaseExceptionRenderer allows
- installations to provide alternate .jsp files which are executed, and
- the output of these .jsp files are returned to end users. To alter
- the default behavior, you may either provide your own .jsp files, and
- configure the BaseExceptionRenderer to use them instead of the
- default .jsp files, or the default .jsp files may be modified
- directly.
- <ul>
- <li>
- <b>xmlErrorJsp</b> - used when the request indicates that XML
- data should be returned. Default is
- <a href="https://archive-access.svn.sourceforge.net/svnroot/archive-access/trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/exception/XMLError.jsp">/WEB-INF/exception/XMLError.jsp</a>
- </li>
- <li>
- <b>errorJsp</b> - used for HTML Replay exceptions, and for all
- Query exceptions. Default is
- <a href="https://archive-access.svn.sourceforge.net/svnroot/archive-access/trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/exception/HTMLError.jsp">/WEB-INF/exception/HTMLError.jsp</a>
- </li>
- <li>
- <b>imageErrorJsp</b> - used when the request appears to be an
- embedded Replay request that expects an image to be returned.
- Default is
- <a href="https://archive-access.svn.sourceforge.net/svnroot/archive-access/trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/exception/HTMLError.jsp">/WEB-INF/exception/HTMLError.jsp</a>
- which produced HTML output. This may be desirable over
- returning an actual image, since web browsers will usually show
- any HTML alternate text associated with the image in place of
- the image when image data is not returned. Wayback also
- includes a 1x1 pixel gif, error_image.gif, which can be used to
- display a gray box in place of images requests that result in
- an exception.
- </li>
- <li>
- <b>javascriptErrorJsp</b> - used when the request appears to be an
- embedded Replay request that expects Javascript content to be
- returned. Default is
- <a href="https://archive-access.svn.sourceforge.net/svnroot/archive-access/trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/exception/JavaScriptError.jsp">/WEB-INF/exception/JavaScriptError.jsp</a>
- </li>
- <li>
- <b>cssErrorJsp</b> - used when the request appears to be an
- embedded Replay request that expects CSS content to be returned.
- Default is
- <a href="https://archive-access.svn.sourceforge.net/svnroot/archive-access/trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/exception/CSSError.jsp">/WEB-INF/exception/CSSError.jsp</a>
- </li>
- </ul>
- </p>
- </subsection>
- <subsection name="Localization .properties files.">
- <p>
- Wayback is packaged with a set of reference implementation .jsp files
- for generating Query, Replay, and Exception user interface pages.
- References to actual user visible text is abstracted within these
- .jsp files so the specific text to display in various pages are read
- from a .properties file. Wayback will automatically search for a
- Locale-specific .properties file from which these text values should
- be loaded, allowing the language presented to users to be changed.
- </p>
- <p>
- By default, Wayback will use the language preference indicated by the
- users web browser to find an appropriate .properties files,
- defaulting to the standard English text if the users preferred
- language is not available. Particular AccessPoints can be forced to a
- particular Locale using the AccessPoint.locale property.
- </p>
- <p>
- Several language customization .property files have already been
- contributed by users in the community and are now included with the
- standard Wayback distribution. We plan for a completely new and
- improved UI implementation for version 1.6, and plan a more active
- outreach program to create customizations in as many languages as
- possible once this new UI is completed, and the required text
- elements are determined.
- </p>
- </subsection>
- </section>
-
-
- <section name="Excluding Documents within an AccessPoint">
- <subsection name="Excluding Documents with live Robots.txt">
- Documents may be excluded from access within an Access Point by
- retroactively enforcing the policies in a web sites live robots.txt
- documents by adding the following configuration in the Access Point.
- <pre>
-
-<property name="exclusionFactory" ref="excluder-factory-robot" />
-
- </pre>
-
- <br></br>
- Please see the default wayback.xml packaged with this software for an
- example bean definition for the referenced <b>excluder-factory-robot</b>
- bean.
- </subsection>
-
- <subsection name="Excluding Documents with an Administrative List">
- Documents may be excluded from access within an Access Point by
- using a plain text file listing URL prefixes which should be blocked.
- If this option is used with a non-zero value for <b>checkInterval</b>,
- the Wayback software will monitor the external file, and will
- automatically reload the file when it changes.
- <br></br>
- The following Spring configuration defines a static exclusion file that
- causes URLs listed in the file <b>/tmp/exclude.txt</b> to be blocked,
- with the file being checked for updates every 10 minutes.
- <pre>
-
-<bean id="static-exclusion" class="org.archive.wayback....
[truncated message content] |
|
From: <bra...@us...> - 2010-12-31 00:22:14
|
Revision: 3359
http://archive-access.svn.sourceforge.net/archive-access/?rev=3359&view=rev
Author: bradtofel
Date: 2010-12-31 00:22:07 +0000 (Fri, 31 Dec 2010)
Log Message:
-----------
removed old navigation.xml, updated site.xml
Modified Paths:
--------------
trunk/archive-access/projects/wayback/dist/src/site/site.xml
Removed Paths:
-------------
trunk/archive-access/projects/wayback/dist/src/site/xdoc/navigation.xml
Modified: trunk/archive-access/projects/wayback/dist/src/site/site.xml
===================================================================
--- trunk/archive-access/projects/wayback/dist/src/site/site.xml 2010-12-31 00:20:16 UTC (rev 3358)
+++ trunk/archive-access/projects/wayback/dist/src/site/site.xml 2010-12-31 00:22:07 UTC (rev 3359)
@@ -1,29 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
-<project name="wayback">
-
-<!--Have nothing showing on LHS-->
-<bannerLeft>
- <name>Internet Archive</name>
- <src>images/ia_logo.gif</src>
- <href >http://archive-access.sf.net/projects/wayback/</href>
-</bannerLeft>
-
-<bannerRight>
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="Wayback">
+ <bannerLeft>
<name>Wayback</name>
-</bannerRight>
+ <src>images/ia_logo.gif</src>
+ <href>http://archive-access.sourceforge.net/projects/wayback/</href>
+ </bannerLeft>
+ <bannerRight>
+ <name>Wayback</name>
+ </bannerRight>
+ <body>
-<publishDate format="dd MMM yyyy" />
-
-<body>
-
- <links>
- <item name="Sourceforge" href="http://archive-access.sf.net"/>
- <item name="Heritrix" href="http://crawler.archive.org"/>
- <item name="NutchWAX" href="http://archive-access.sf.net/projects/nutchwax/"/>
- <item name="Archive Access" href="http://archive-access.sf.net"/>
- <item name="Internet Archive" href="http://www.archive.org"/>
+ <links>
+ <item name="Sourceforge" href="http://www.sourceforge.net"/>
+ <item name="Heritrix" href="http://crawler.archive.org"/>
+ <item name="NutchWAX" href="http://archive-access.sourceforge.net/projects/nutchwax/"/>
+ <item name="Archive Access" href="http://archive-access.sourceforge.net"/>
+ <item name="Internet Archive" href="http://www.archive.org"/>
<item name="Home" href="index.html"/>
- </links>
+ </links>
<menu name="Overview">
<item name="Requirements" href="requirements.html"/>
@@ -34,17 +28,10 @@
<item name="FAQ" href="/faq.html"/>
<item name="API" href="./apidocs"/>
<item name="Browse/Submit a Bug"
- href="http://webteam.archive.org/jira/secure/IssueNavigator.jspa?component=10031"/>
+ href="https://webarchive.jira.com/browse/ACC/component/10031"/>
</menu>
- <!--Its not possible to change the labels used in reports, not yet anyways.
- Current ones don't jibe well. Reports are headed 'Project Documentation'
- but its only a subset of all documentation.
- -->
- ${reports}
+ <menu ref="reports"/>
- <!--I want to get the sourceforge image in here but not sure how.
- -->
-
-</body>
+ </body>
</project>
Deleted: trunk/archive-access/projects/wayback/dist/src/site/xdoc/navigation.xml
===================================================================
--- trunk/archive-access/projects/wayback/dist/src/site/xdoc/navigation.xml 2010-12-31 00:20:16 UTC (rev 3358)
+++ trunk/archive-access/projects/wayback/dist/src/site/xdoc/navigation.xml 2010-12-31 00:22:07 UTC (rev 3359)
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<project name="Heritrix">
-
- <properties>
- <title>Wayback</title>
- <author email="brad at archive dot org">Brad Tofel</author>
- <revision>$Id:navigation.xml 2009 2007-09-28 00:09:04Z bradtofel $</revision>
- </properties>
-
- <body>
- <menu name="Overview">
- <item name="License" href="/license.html"/>
- <item name="Requirements" href="requirements.html"/>
- <item name="Downloads" href="downloads.html"/>
- <item name="Administator Manual" href="administrator_manual.html"/>
- <item name="Release Notes" href="release_notes.html"/>
- <item name="Test" href="test.html"/>
- <item name="FAQ" href="/faq.html"/>
- <item name="API" href="./apidocs"/>
- <item name="Browse/Submit a Bug"
- href="http://sourceforge.net/tracker/?group_id=118427&atid=681137"/>
- </menu>
- <footer>
- <a href="http://sourceforge.net/projects/archive-access/">
- <img src="http://sourceforge.net/sflogo.php?group_id=archive-access&type=1" border="0" alt="sf logo"/></a>
- </footer>
- </body>
-</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2010-12-31 00:20:22
|
Revision: 3358
http://archive-access.svn.sourceforge.net/archive-access/?rev=3358&view=rev
Author: bradtofel
Date: 2010-12-31 00:20:16 +0000 (Fri, 31 Dec 2010)
Log Message:
-----------
checkpoint prior to site move
Modified Paths:
--------------
trunk/archive-access/projects/wayback/dist/pom.xml
trunk/archive-access/projects/wayback/pom.xml
trunk/archive-access/projects/wayback/wayback-core/pom.xml
trunk/archive-access/projects/wayback/wayback-hadoop/pom.xml
trunk/archive-access/projects/wayback/wayback-hadoop-java/pom.xml
trunk/archive-access/projects/wayback/wayback-webapp/pom.xml
Modified: trunk/archive-access/projects/wayback/dist/pom.xml
===================================================================
--- trunk/archive-access/projects/wayback/dist/pom.xml 2010-12-31 00:19:34 UTC (rev 3357)
+++ trunk/archive-access/projects/wayback/dist/pom.xml 2010-12-31 00:20:16 UTC (rev 3358)
@@ -33,7 +33,7 @@
<descriptors>
<descriptor>src/main/assembly/distribution.xml</descriptor>
</descriptors>
- <finalName>${project.artifactId}</finalName>
+ <finalName>wayback-${project.version}</finalName>
</configuration>
<executions>
<execution>
Modified: trunk/archive-access/projects/wayback/pom.xml
===================================================================
--- trunk/archive-access/projects/wayback/pom.xml 2010-12-31 00:19:34 UTC (rev 3357)
+++ trunk/archive-access/projects/wayback/pom.xml 2010-12-31 00:20:16 UTC (rev 3358)
@@ -171,7 +171,7 @@
<id>website</id>
<name>Website</name>
<!--Pass as command-line system property to maven-->
- <url>${website.url}/projects/${project.artifactId}</url>
+ <url>${website.url}/projects/wayback/</url>
</site>
</distributionManagement>
@@ -257,7 +257,7 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.5_spec</artifactId>
<version>1.2</version>
- <scope>provided</scope>
+
</dependency>
<dependency>
<groupId>org.archive.heritrix</groupId>
@@ -299,6 +299,34 @@
<artifactId>transform</artifactId>
<version>3.0.1-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+<!--
+ <scope>test</scope>
+-->
+ </dependency>
+ <dependency>
+ <artifactId>hadoop-core</artifactId>
+ <groupId>org.apache.hadoop</groupId>
+ <version>0.20.2</version>
+ </dependency>
+
+
+ <!--
+ org.dspace-foresite doesn't seem to be in any pulic repository,
+ so a custom built version is on builds.archive.org, with SNAPSHOT
+ version..
+ TODO: fix this..
+ -->
+ <dependency>
+ <groupId>org.dspace</groupId>
+ <artifactId>foresite</artifactId>
+ <version>SNAPSHOT</version>
+ </dependency>
+
+
</dependencies>
</dependencyManagement>
Modified: trunk/archive-access/projects/wayback/wayback-core/pom.xml
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/pom.xml 2010-12-31 00:19:34 UTC (rev 3357)
+++ trunk/archive-access/projects/wayback/wayback-core/pom.xml 2010-12-31 00:20:16 UTC (rev 3358)
@@ -15,40 +15,30 @@
<name>Wayback Core Java Classes</name>
<packaging>jar</packaging>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
<!--
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <mainClass>org.archive.wayback.Wayback</mainClass>
- <addClasspath>true</addClasspath>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <version>3.8.1</version>
-->
+ <scope>test</scope>
+ </dependency>
- <dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.5_spec</artifactId>
- <version>1.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.archive.heritrix</groupId>
<artifactId>heritrix-commons</artifactId>
- <version>3.1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.archive.access-control</groupId>
<artifactId>access-control</artifactId>
- <version>0.0.1-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>commons-pool</groupId>
@@ -63,32 +53,26 @@
<dependency>
<groupId>org.mozilla</groupId>
<artifactId>juniversalchardet</artifactId>
- <version>1.0.3</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>2.5.1</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
- <version>2.5.1</version>
</dependency>
<dependency>
<groupId>org.beanshell</groupId>
<artifactId>bsh</artifactId>
- <version>2.0b4</version>
</dependency>
<dependency>
<groupId>org.htmlparser</groupId>
<artifactId>htmlparser</artifactId>
- <version>1.6</version>
</dependency>
<dependency>
<groupId>com.flagstone</groupId>
<artifactId>transform</artifactId>
- <version>3.0.1-SNAPSHOT</version>
</dependency>
</dependencies>
Modified: trunk/archive-access/projects/wayback/wayback-hadoop/pom.xml
===================================================================
--- trunk/archive-access/projects/wayback/wayback-hadoop/pom.xml 2010-12-31 00:19:34 UTC (rev 3357)
+++ trunk/archive-access/projects/wayback/wayback-hadoop/pom.xml 2010-12-31 00:20:16 UTC (rev 3358)
@@ -17,16 +17,8 @@
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.archive.wayback</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>wayback-hadoop-java</artifactId>
- <version>1.6.0</version>
- <scope>compile</scope>
</dependency>
</dependencies>
Modified: trunk/archive-access/projects/wayback/wayback-hadoop-java/pom.xml
===================================================================
--- trunk/archive-access/projects/wayback/wayback-hadoop-java/pom.xml 2010-12-31 00:19:34 UTC (rev 3357)
+++ trunk/archive-access/projects/wayback/wayback-hadoop-java/pom.xml 2010-12-31 00:20:16 UTC (rev 3358)
@@ -19,15 +19,20 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
<scope>test</scope>
+<!--
+ <version>3.8.1</version>
+-->
</dependency>
<dependency>
- <artifactId>hadoop-core</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>wayback-core</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.hadoop</groupId>
- <version>0.20.2</version>
- <scope>compile</scope>
+ <artifactId>hadoop-core</artifactId>
<exclusions>
<exclusion>
<groupId>commons-httpclient</groupId>
@@ -35,25 +40,5 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.archive.wayback</groupId>
- <artifactId>wayback-core</artifactId>
- <scope>compile</scope>
- <version>1.6.0</version>
- </dependency>
</dependencies>
- <!--
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
- -->
</project>
\ No newline at end of file
Modified: trunk/archive-access/projects/wayback/wayback-webapp/pom.xml
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/pom.xml 2010-12-31 00:19:34 UTC (rev 3357)
+++ trunk/archive-access/projects/wayback/wayback-webapp/pom.xml 2010-12-31 00:20:16 UTC (rev 3358)
@@ -29,9 +29,6 @@
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
- <!--
- <version>6.1.22</version>
- -->
</plugin>
</plugins>
</build>
@@ -41,31 +38,17 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>wayback-core</artifactId>
- <scope>compile</scope>
</dependency>
<dependency>
- <groupId>tomcat</groupId>
- <artifactId>servlet-api</artifactId>
- <version>5.5.15</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
+<!--
<scope>provided</scope>
+-->
</dependency>
- <!--
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- <version>1.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>taglibs</groupId>
- <artifactId>standard</artifactId>
- <version>1.1.2</version>
- </dependency>
- -->
- <dependency>
<groupId>org.dspace</groupId>
<artifactId>foresite</artifactId>
- <version>SNAPSHOT</version>
</dependency>
</dependencies>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 3357
http://archive-access.svn.sourceforge.net/archive-access/?rev=3357&view=rev
Author: bradtofel
Date: 2010-12-31 00:19:34 +0000 (Fri, 31 Dec 2010)
Log Message:
-----------
Caught OOM and barrelling forward.
Modified Paths:
--------------
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/indexer/WARCRecordToSearchResultAdapter.java
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/indexer/WARCRecordToSearchResultAdapter.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/indexer/WARCRecordToSearchResultAdapter.java 2010-12-31 00:19:01 UTC (rev 3356)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/indexer/WARCRecordToSearchResultAdapter.java 2010-12-31 00:19:34 UTC (rev 3357)
@@ -75,6 +75,9 @@
} catch (IOException e) {
e.printStackTrace();
return null;
+ } catch (OutOfMemoryError e) {
+ e.printStackTrace();
+ return null;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2010-12-31 00:19:07
|
Revision: 3356
http://archive-access.svn.sourceforge.net/archive-access/?rev=3356&view=rev
Author: bradtofel
Date: 2010-12-31 00:19:01 +0000 (Fri, 31 Dec 2010)
Log Message:
-----------
MOVED tests (that don't work now..) to /src/main/test/
Added Paths:
-----------
trunk/archive-access/projects/wayback/wayback-core/src/test/java/org/archive/wayback/resourceindex/ziplines/
trunk/archive-access/projects/wayback/wayback-core/src/test/java/org/archive/wayback/resourceindex/ziplines/ZiplinedBlockStringSequenceTest.java
trunk/archive-access/projects/wayback/wayback-core/src/test/java/org/archive/wayback/resourceindex/ziplines/ZiplinesSearchResultSourceTest.java
Removed Paths:
-------------
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/ziplines/ZiplinedBlockStringSequenceTest.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/ziplines/ZiplinesSearchResultSourceTest.java
Deleted: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/ziplines/ZiplinedBlockStringSequenceTest.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/ziplines/ZiplinedBlockStringSequenceTest.java 2010-12-30 19:54:31 UTC (rev 3355)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/ziplines/ZiplinedBlockStringSequenceTest.java 2010-12-31 00:19:01 UTC (rev 3356)
@@ -1,79 +0,0 @@
-/*
- * This file is part of the Wayback archival access software
- * (http://archive-access.sourceforge.net/projects/wayback/).
- *
- * Licensed to the Internet Archive (IA) by one or more individual
- * contributors.
- *
- * The IA licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.archive.wayback.resourceindex.ziplines;
-
-import java.io.IOException;
-import java.util.HashMap;
-
-import org.archive.wayback.exception.ResourceIndexNotAvailableException;
-import org.archive.wayback.util.CloseableIterator;
-import org.archive.wayback.util.flatfile.FlatFile;
-
-import junit.framework.TestCase;
-
-/**
- * @author brad
- *
- */
-public class ZiplinedBlockStringSequenceTest extends TestCase {
- private String indexPath = "/home/brad/os-cdx/CDX-201002-clean/ALL.count.summary";
- private String mapPath = "/home/brad/os-cdx/CDX-201002-clean/ALL.loc-workstation";
-
- private ZiplinedBlockStringSequence getSequence() throws IOException {
- HashMap<String, String> chunkMap = new HashMap<String, String>();
- FlatFile ff = new FlatFile(mapPath);
- CloseableIterator<String> lines = ff.getSequentialIterator();
- while(lines.hasNext()) {
- String line = lines.next();
- String[] parts = line.split("\\s");
- if(parts.length != 2) {
- throw new IOException("Bad line(" + line +") in (" +
- mapPath + ")");
- }
- chunkMap.put(parts[0],parts[1]);
- }
- lines.close();
- FlatFile chunkIndex = new FlatFile(indexPath);
- return new ZiplinedBlockStringSequence(chunkIndex, chunkMap);
- }
- /**
- * Test method for {@link org.archive.wayback.resourceindex.ziplines.ZiplinedBlockStringSequence#getIterator(java.lang.String, long)}.
- * @throws IOException
- * @throws ResourceIndexNotAvailableException
- */
- public void testGetIteratorStringLong() throws IOException, ResourceIndexNotAvailableException {
- ZiplinedBlockStringSequence seq = getSequence();
- StringPrefixIterator itr = seq.getIterator("yahoo.com/", 1000000);
- System.out.format("Total Matches %d\n",itr.getTotalMatches());
- for(int i = 0; i < 10; i++) {
- if(itr.hasNext()) {
- System.out.format("Line(%d): %s\n",i,itr.next());
- }
- }
- }
-
- /**
- * Test method for {@link org.archive.wayback.resourceindex.ziplines.ZiplinedBlockStringSequence#getIterator(java.lang.String)}.
- */
- public void testGetIteratorString() {
-// fail("Not yet implemented");
- }
-
-}
Deleted: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/ziplines/ZiplinesSearchResultSourceTest.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/ziplines/ZiplinesSearchResultSourceTest.java 2010-12-30 19:54:31 UTC (rev 3355)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/ziplines/ZiplinesSearchResultSourceTest.java 2010-12-31 00:19:01 UTC (rev 3356)
@@ -1,58 +0,0 @@
-/*
- * This file is part of the Wayback archival access software
- * (http://archive-access.sourceforge.net/projects/wayback/).
- *
- * Licensed to the Internet Archive (IA) by one or more individual
- * contributors.
- *
- * The IA licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.archive.wayback.resourceindex.ziplines;
-
-import java.util.Iterator;
-
-import org.archive.wayback.resourceindex.cdx.format.CDXFormat;
-import org.archive.wayback.resourceindex.cdx.format.CDXFormatException;
-
-import junit.framework.TestCase;
-
-/**
- * @author brad
- *
- */
-public class ZiplinesSearchResultSourceTest extends TestCase {
-
- /**
- * Test method for {@link org.archive.wayback.resourceindex.ziplines.ZiplinesSearchResultSource#getPrefixIterator(java.lang.String)}.
- * @throws CDXFormatException
- */
- public void testGetPrefixIterator() throws Exception {
- CDXFormat format = new CDXFormat(" CDX N b a m s k r M V g");
- ZiplinesSearchResultSource zsrs = new ZiplinesSearchResultSource(format);
-// zsrs.setChunkIndexPath("/home/brad/zipline-test/part-00005-frag.cdx.zlm");
-// zsrs.setChunkMapPath("/home/brad/zipline-test/manifest.txt");
- zsrs.setChunkIndexPath("/home/brad/ALL.summary");
- zsrs.setChunkMapPath("/home/brad/ALL.loc");
- zsrs.init();
- Iterator<String> i = zsrs.getStringPrefixIterator("krunch.com/ ");
- int max = 100;
- int done = 0;
- while(i.hasNext()) {
- System.out.println(i.next());
- if(done++ > max) {
- break;
- }
- }
- }
-
-}
Copied: trunk/archive-access/projects/wayback/wayback-core/src/test/java/org/archive/wayback/resourceindex/ziplines/ZiplinedBlockStringSequenceTest.java (from rev 3324, trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/ziplines/ZiplinedBlockStringSequenceTest.java)
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/test/java/org/archive/wayback/resourceindex/ziplines/ZiplinedBlockStringSequenceTest.java (rev 0)
+++ trunk/archive-access/projects/wayback/wayback-core/src/test/java/org/archive/wayback/resourceindex/ziplines/ZiplinedBlockStringSequenceTest.java 2010-12-31 00:19:01 UTC (rev 3356)
@@ -0,0 +1,79 @@
+/*
+ * This file is part of the Wayback archival access software
+ * (http://archive-access.sourceforge.net/projects/wayback/).
+ *
+ * Licensed to the Internet Archive (IA) by one or more individual
+ * contributors.
+ *
+ * The IA licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.archive.wayback.resourceindex.ziplines;
+
+import java.io.IOException;
+import java.util.HashMap;
+
+import org.archive.wayback.exception.ResourceIndexNotAvailableException;
+import org.archive.wayback.util.CloseableIterator;
+import org.archive.wayback.util.flatfile.FlatFile;
+
+import junit.framework.TestCase;
+
+/**
+ * @author brad
+ *
+ */
+public class ZiplinedBlockStringSequenceTest extends TestCase {
+ private String indexPath = "/home/brad/os-cdx/CDX-201002-clean/ALL.count.summary";
+ private String mapPath = "/home/brad/os-cdx/CDX-201002-clean/ALL.loc-workstation";
+
+// private ZiplinedBlockStringSequence getSequence() throws IOException {
+// HashMap<String, String> chunkMap = new HashMap<String, String>();
+// FlatFile ff = new FlatFile(mapPath);
+// CloseableIterator<String> lines = ff.getSequentialIterator();
+// while(lines.hasNext()) {
+// String line = lines.next();
+// String[] parts = line.split("\\s");
+// if(parts.length != 2) {
+// throw new IOException("Bad line(" + line +") in (" +
+// mapPath + ")");
+// }
+// chunkMap.put(parts[0],parts[1]);
+// }
+// lines.close();
+// FlatFile chunkIndex = new FlatFile(indexPath);
+// return new ZiplinedBlockStringSequence(chunkIndex, chunkMap);
+// }
+ /**
+ * Test method for {@link org.archive.wayback.resourceindex.ziplines.ZiplinedBlockStringSequence#getIterator(java.lang.String, long)}.
+ * @throws IOException
+ * @throws ResourceIndexNotAvailableException
+ */
+ public void testGetIteratorStringLong() throws IOException, ResourceIndexNotAvailableException {
+// ZiplinedBlockStringSequence seq = getSequence();
+// StringPrefixIterator itr = seq.getIterator("yahoo.com/", 1000000);
+// System.out.format("Total Matches %d\n",itr.getTotalMatches());
+// for(int i = 0; i < 10; i++) {
+// if(itr.hasNext()) {
+// System.out.format("Line(%d): %s\n",i,itr.next());
+// }
+// }
+ }
+
+ /**
+ * Test method for {@link org.archive.wayback.resourceindex.ziplines.ZiplinedBlockStringSequence#getIterator(java.lang.String)}.
+ */
+ public void testGetIteratorString() {
+// fail("Not yet implemented");
+ }
+
+}
Copied: trunk/archive-access/projects/wayback/wayback-core/src/test/java/org/archive/wayback/resourceindex/ziplines/ZiplinesSearchResultSourceTest.java (from rev 3324, trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/ziplines/ZiplinesSearchResultSourceTest.java)
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/test/java/org/archive/wayback/resourceindex/ziplines/ZiplinesSearchResultSourceTest.java (rev 0)
+++ trunk/archive-access/projects/wayback/wayback-core/src/test/java/org/archive/wayback/resourceindex/ziplines/ZiplinesSearchResultSourceTest.java 2010-12-31 00:19:01 UTC (rev 3356)
@@ -0,0 +1,62 @@
+/*
+ * This file is part of the Wayback archival access software
+ * (http://archive-access.sourceforge.net/projects/wayback/).
+ *
+ * Licensed to the Internet Archive (IA) by one or more individual
+ * contributors.
+ *
+ * The IA licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.archive.wayback.resourceindex.ziplines;
+
+import java.util.Iterator;
+
+
+import org.archive.wayback.resourceindex.cdx.format.CDXFormat;
+import org.archive.wayback.resourceindex.cdx.format.CDXFormatException;
+
+import junit.framework.TestCase;
+
+/**
+ * @author brad
+ *
+ */
+public class ZiplinesSearchResultSourceTest extends TestCase {
+
+// /**
+// * Test method for {@link org.archive.wayback.resourceindex.ziplines.ZiplinesSearchResultSource#getPrefixIterator(java.lang.String)}.
+// * @throws CDXFormatException
+// */
+// public void testGetPrefixIterator() throws Exception {
+// CDXFormat format = new CDXFormat(" CDX N b a m s k r M V g");
+// ZiplinesSearchResultSource zsrs = new ZiplinesSearchResultSource(format);
+//// zsrs.setChunkIndexPath("/home/brad/zipline-test/part-00005-frag.cdx.zlm");
+//// zsrs.setChunkMapPath("/home/brad/zipline-test/manifest.txt");
+// zsrs.setChunkIndexPath("/home/brad/ALL.summary");
+// zsrs.setChunkMapPath("/home/brad/ALL.loc");
+// zsrs.init();
+// Iterator<String> i = zsrs.getStringPrefixIterator("krunch.com/ ");
+// int max = 100;
+// int done = 0;
+// while(i.hasNext()) {
+// System.out.println(i.next());
+// if(done++ > max) {
+// break;
+// }
+// }
+// }
+
+ public void testEmpty() throws Exception {
+
+ }
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
