Skip to content

Commit

Permalink
initial commit
Browse files Browse the repository at this point in the history
  • Loading branch information
Lyudmila Balakireva committed Jul 26, 2012
1 parent 4a34ebe commit 875b495
Show file tree
Hide file tree
Showing 42 changed files with 260 additions and 194 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
@@ -1,3 +1,3 @@
For install, system requirements and user manual, please see documentation
at http://luda171.github.com/twa/index.html
at http://mementoweb.github.com/twa/index.html
===
10 changes: 5 additions & 5 deletions pom.xml
View file
Expand Up @@ -47,9 +47,9 @@
</developers>

<scm>
<connection>scm:git:https:@github.com:Luda171/twa.git</connection>
<url>https://github.com/Luda171/twa</url>
<developerConnection>scm:git:https@github.com:Luda171/twa.git</developerConnection>
<connection>scm:git:https:@github.com:mementoweb/twa.git</connection>
<url>https://github.com/mementoweb/twa</url>
<developerConnection>scm:git:https@github.com:mementoweb/twa.git</developerConnection>
</scm>

<reporting>
Expand All @@ -69,11 +69,11 @@
<reportSets>
<reportSet>
<reports>
<report>dependencies</report>
<!--<report>dependencies</report>-->
<report>project-team</report>
<report>mailing-list</report>
<!--<report>cim</report>-->
<report>issue-tracking</report>
<!--<report>issue-tracking</report>-->
<report>license</report>
<!--<report>scm</report>-->
</reports>
Expand Down
3 changes: 1 addition & 2 deletions src/site/docbook/getStarted.xml
View file
Expand Up @@ -6,11 +6,10 @@
<articleinfo>
<legalnotice>
<para>Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an "AS IS"
software distributed under the BSD 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.</para>

</legalnotice>

<abstract>
Expand Down
2 changes: 1 addition & 1 deletion src/site/docbook/getStarted.xml~
View file
Expand Up @@ -59,7 +59,7 @@ For more information about this option see <ulink url="http://www.theresourcede
<title>Download</title>
<para>To get the lasted version of the ResourceDepot software, download the stable release
<ulink url="http://luda171.github.com/twa/repository/gov/lanl/archive/twa/1.0/">
here</ulink>. For the mod_ta.c see <ulink url="https://github.com/Luda171/twa">source repository</ulink></para>
here</ulink>. For the mod_ta.c see <ulink url="http://github.com/Luda171/twa">source repository</ulink></para>
</section>

<section id="sc_InstallingMod_ta">
Expand Down
4 changes: 2 additions & 2 deletions src/site/site.xml
View file
Expand Up @@ -5,7 +5,7 @@
<bannerLeft>
<name>Transactional Web Archive </name>
<src>images/twa_logo2.png</src>
<href>https://github.com/Luda171/twa</href>
<href>http://mementoweb.github.com/twa/</href>
</bannerLeft>
<!--
<bannerRight>
Expand All @@ -27,7 +27,7 @@
<item name="Geting Started" href="getStarted.html"/>
<item name="API" href="apidocs/index.html"/>
<item name="Demo" href="demo.html"/>
<item name="Download" href="http://luda171.github.com/twa/repository/gov/lanl/archive/twa/1.0/"/>
<item name="Download" href="http://mementoweb.github.com/twa/repository/gov/lanl/archive/twa/1.0/"/>
<!--item name="Usage" href="usage.html"/>
<item name="FAQ" href="faq.html"/-->
</menu>
Expand Down
4 changes: 3 additions & 1 deletion src/site/site.xml~
View file
Expand Up @@ -5,13 +5,15 @@
<bannerLeft>
<name>Transactional Web Archive </name>
<src>images/twa_logo2.png</src>
<href>https://github.com/Luda171/twa</href>
<href>http://luda171.github.com/twa/</href>
</bannerLeft>
<!--
<bannerRight>
<name>The Prototyping Team of the Research Library of the Los Alamos National Laboratory</name>
<src>images/proto1.png</src>
<title>The Prototyping Team of the Research Library of the Los Alamos National Laboratory</title>
</bannerRight>
-->
<body>
<links>
<item name="Memento" href="http://www.mementoweb.org/" />
Expand Down
24 changes: 12 additions & 12 deletions src/site/xdoc/demo.xml
View file
Expand Up @@ -5,10 +5,10 @@
<body>
<section name="DANS Archive example">
<p>
We have several examples of Transactional Web Archives installed.
The DANS ( http://www.dans.knaw.nl/ ) has TWA archive distributed between TWA at
http://theresourcedepot.org/000010/timegate/{anyuri} and wayback installation (http://lanlproto.santafe.edu:8080/memento/timegate/{anyuri}) populated from data unloaded from TWA in WARC file format. The TimegateDirector installed at http://theresourcedepot.org/000010D/{anyuri}.
Let check that all components of Memento Framework in place: </p>
We have several instances of Transactional Web Archives installed.
The <a href="http://www.dans.knaw.nl/"> DANS institute </a> has its archive distributed between the TWA at
http://theresourcedepot.org/000010/timegate/{uri} and the Wayback installation (http://lanlproto.santafe.edu:8080/memento/timegate/{anyuri}) populated from data unloaded from TWA in WARC file format. The TimegateDirector is installed at http://theresourcedepot.org/000010D/{uri}.
Let us check that all components of the Memento Framework are in place: </p>
<ul>
<li> DANS Content server has Link header, which points to TimegateDirector. </li>
<source> <![CDATA[
Expand Down Expand Up @@ -41,7 +41,7 @@ Content-Type: text/plain; charset=UTF-8
Content-Language: nl
]]>
</source>
<p>Note discovery link to index timemap</p>
<p>Note the discovery link to the index timemap.</p>
<li>
Timegate redirects to appropriate Memento:
</li>
Expand All @@ -65,18 +65,18 @@ Content-Language: nl
</source>
</section>
<section name="LANL Archive example">
<p> We are archiving several web servers : http://mementoweb.org/ see
<a href="http://mementoweb.org/depot/native/mementoweb/"> for more detals</a>,
http://lanlsource.lanl.gov/hello <a href="http://www.mementoweb.org/demo/"> see more info here</a>,
and http://www.shared-canvas.org/ . All mentioned websites get archived to the Transactional Web Archive at
http://mementoarchive.lanl.gov. As described in <a href="http://www.mementoweb.org/guide/rfc/ID/#rfc.figure.28">Memento Framework Discovery Specifications</a> we have host-meta document at <a href="http://mementoarchive.lanl.gov/.well-known/host-meta">http://mementoarchive.lanl.gov/.well-known/host-meta</a> supporting TimeGate and TimeMap discovery.
<p> We are archiving several web servers : <ul><li>http://mementoweb.org/ see
<a href="http://mementoweb.org/depot/native/mementoweb/"> for more detals</a></li>
<li>http://lanlsource.lanl.gov/hello <a href="http://www.mementoweb.org/demo/"> see more info here</a></li>
<li>http://www.shared-canvas.org/</li></ul> All mentioned websites get archived to the Transactional Web Archive at
http://mementoarchive.lanl.gov. As described in the <a href="http://www.mementoweb.org/guide/rfc/ID/#rfc.figure.28">Memento Framework Discovery Specifications</a> we have a host-meta document at <a href="http://mementoarchive.lanl.gov/.well-known/host-meta">http://mementoarchive.lanl.gov/.well-known/host-meta</a> supporting TimeGate and TimeMap discovery.
</p>
</section>
<section name="End-User Interfaces to Archive">
<p>
To get smooth "Time Travel" experience download the MementoFox plugin.
To get a smooth "Time Travel" experience download the MementoFox plugin.
To install the plugin, drag and drop this XPI file over any open Firefox window, which will invoke the Add-on installation window.
After closing and restarting the FireFox go to Tools ->Add-ons->Extentions to check that you have MementoFox extension listed.
After closing and restarting FireFox go to Tools ->Add-ons->Extentions to check that you have the MementoFox extension listed.
</p>
</section>
</body>
Expand Down
26 changes: 13 additions & 13 deletions src/site/xdoc/demo.xml~
View file
Expand Up @@ -5,10 +5,10 @@
<body>
<section name="DANS Archive example">
<p>
We have several examples of Transactional Web Archives installed.
The DANS ( http://www.dans.knaw.nl/ ) has TWA archive distributed between TWA at
http://theresourcedepot.org/000010/timegate/{anyuri} and wayback installation (http://lanlproto.santafe.edu:8080/memento/timegate/{anyuri}) populated from data unloaded from TWA in WARC file format. The TimegateDirector installed at http://theresourcedepot.org/000010D/{anyuri}.
Let check that all components of Memento Framework in place: </p>
We have several instances of Transactional Web Archives installed.
The <a href="http://www.dans.knaw.nl/"> DANS institute </a> has its archive distributed between the TWA at
http://theresourcedepot.org/000010/timegate/{uri} and the Wayback installation (http://lanlproto.santafe.edu:8080/memento/timegate/{anyuri}) populated from data unloaded from TWA in WARC file format. The TimegateDirector is installed at http://theresourcedepot.org/000010D/{uri}.
Let us check that all components of the Memento Framework are in place: </p>
<ul>
<li> DANS Content server has Link header, which points to TimegateDirector. </li>
<source> <![CDATA[
Expand Down Expand Up @@ -41,7 +41,7 @@ Content-Type: text/plain; charset=UTF-8
Content-Language: nl
]]>
</source>
<p>Note discovery link to index timemap</p>
<p>Note the discovery link to the index timemap.</p>
<li>
Timegate redirects to appropriate Memento:
</li>
Expand All @@ -65,19 +65,19 @@ Content-Language: nl
</source>
</section>
<section name="LANL Archive example">
<p> We are archiving several web servers : http://mementoweb.org/ see
<a href="http://mementoweb.org/depot/native/mementoweb/"> for more detals</a>,
http://lanlsource.lanl.gov/hello <a href="http://www.mementoweb.org/demo/"> see more info here</a>,
and http://www.shared-canvas.org/ . All mentioned websites get archived to the Transactional Web Archive at
http://mementoarchive.lanl.gov. As described in <a href="http://www.mementoweb.org/guide/rfc/ID/#rfc.figure.28">Memento Framework Discovery Specifications</a> we have host-meta document at <a href="http://mementoarchive.lanl.gov/.well-known/host-meta">http://mementoarchive.lanl.gov/.well-known/host-meta</a> supporting TimeGate and TimeMap discovery.
<p> We are archiving several web servers : <ul><li>http://mementoweb.org/ see
<a href="http://mementoweb.org/depot/native/mementoweb/"> for more detals</a></li>
<li>http://lanlsource.lanl.gov/hello <a href="http://www.mementoweb.org/demo/"> see more info here</a></li>
<li>http://www.shared-canvas.org/</li></ul>. All mentioned websites get archived to the Transactional Web Archive at
http://mementoarchive.lanl.gov. As described in the <a href="http://www.mementoweb.org/guide/rfc/ID/#rfc.figure.28">Memento Framework Discovery Specifications</a> we have a host-meta document at <a href="http://mementoarchive.lanl.gov/.well-known/host-meta">http://mementoarchive.lanl.gov/.well-known/host-meta</a> supporting TimeGate and TimeMap discovery.
</p>
</section>
<section name="End-User Interfaces to Archive">
<p>
To get smooth "Time Travel" experience download the MementoFox plugin.
To get a smooth "Time Travel" experience download the MementoFox plugin.
To install the plugin, drag and drop this XPI file over any open Firefox window, which will invoke the Add-on installation window.
After closing and restarting the FireFox go to Tools ->Add-ons->Extentions to check that you have MementoFox extension listed.
After closing and restarting FireFox go to Tools ->Add-ons->Extentions to check that you have the MementoFox extension listed.
</p>
</section>
</body>

</document>
4 changes: 2 additions & 2 deletions src/site/xdoc/index.xml
View file
Expand Up @@ -19,8 +19,8 @@
<p>The Transactional Web Archive provides the following opportunities:</p>
<ul>
<li>Dynamic Archiving of your Apache Web Content Server</li>
<li>Comforms to Memento Framework </li>
<li>Compatible with data offload to Wayback</li>
<li>Comforms to the Memento Framework </li>
<li>Compatible with data offload to the Internet Archive's Wayback software</li>
</ul>
</section>
<section name="Architecture Overview">
Expand Down
4 changes: 4 additions & 0 deletions src/site/xdoc/index.xml~
View file
Expand Up @@ -23,5 +23,9 @@
<li>Compatible with data offload to Wayback</li>
</ul>
</section>
<section name="Architecture Overview">
<p><img id="" class="figure" alt="Figure 1" src="images/twa_new.png" title="Overview"/>
</p>
</section>
</body>
</document>
Binary file removed ta-core/target/dep/wayback-core-1.6.0.jar
View file
Binary file not shown.
8 changes: 6 additions & 2 deletions ta-core/target/generated-resources/licenses.xml
View file
Expand Up @@ -69,7 +69,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>1.3.2</version>
<version>1.4</version>
<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
Expand Down Expand Up @@ -176,7 +176,11 @@
<artifactId>wayback-core</artifactId>
<version>1.7.0</version>
<licenses>
<!--No license information available. -->
<license>
<name>Apache License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
</licenses>
</dependency>
<dependency>
Expand Down
6 changes: 3 additions & 3 deletions ta-core/target/generated-resources/licenses/common public license version 1.0 - cpl1.0.txt
View file
Expand Up @@ -21,7 +21,7 @@
<script type="text/javascript" src="http://opensource.org/files/js/js_3jHghlMLrjr9xXAC0JufqSSch3oAbkZstSqYdc4uuck.js"></script>
<script type="text/javascript">
<!--//--><![CDATA[//><!--
jQuery.extend(Drupal.settings, {"basePath":"\/","pathPrefix":"","ajaxPageState":{"theme":"garland","theme_token":"p1geF6yiLYs5OKToi8x6V83lSMSnE6PSa7274GnlQ_Y","js":{"misc\/jquery.js":1,"misc\/jquery.once.js":1,"misc\/drupal.js":1},"css":{"modules\/system\/system.base.css":1,"modules\/system\/system.menus.css":1,"modules\/system\/system.messages.css":1,"modules\/system\/system.theme.css":1,"modules\/aggregator\/aggregator.css":1,"modules\/comment\/comment.css":1,"modules\/field\/theme\/field.css":1,"sites\/all\/modules\/mollom\/mollom.css":1,"modules\/node\/node.css":1,"modules\/search\/search.css":1,"modules\/user\/user.css":1,"themes\/garland\/style.css":1,"themes\/garland\/print.css":1,"themes\/garland\/fix-ie.css":1}}});
jQuery.extend(Drupal.settings, {"basePath":"\/","pathPrefix":"","ajaxPageState":{"theme":"garland","theme_token":"V5qsgDFTdw9rXgxI2K59cEf6enAS37h5F3IBcLoWcvk","js":{"misc\/jquery.js":1,"misc\/jquery.once.js":1,"misc\/drupal.js":1},"css":{"modules\/system\/system.base.css":1,"modules\/system\/system.menus.css":1,"modules\/system\/system.messages.css":1,"modules\/system\/system.theme.css":1,"modules\/aggregator\/aggregator.css":1,"modules\/comment\/comment.css":1,"modules\/field\/theme\/field.css":1,"sites\/all\/modules\/mollom\/mollom.css":1,"modules\/node\/node.css":1,"modules\/search\/search.css":1,"modules\/user\/user.css":1,"themes\/garland\/style.css":1,"themes\/garland\/print.css":1,"themes\/garland\/fix-ie.css":1}}});
//--><!]]>
</script>
</head>
Expand Down Expand Up @@ -54,7 +54,7 @@ jQuery.extend(Drupal.settings, {"basePath":"\/","pathPrefix":"","ajaxPageState":
<label class="element-invisible" for="edit-search-block-form--2">Search </label>
<input title="Enter the terms you wish to search for." type="text" id="edit-search-block-form--2" name="search_block_form" value="" size="15" maxlength="128" class="form-text" />
</div>
<div class="form-actions form-wrapper" id="edit-actions"><input type="submit" id="edit-submit" name="op" value="Search" class="form-submit" /></div><input type="hidden" name="form_build_id" value="form-iQh9OAWr9HLehgtfIWiUj5BGTLRj9eo4TRxkyM3JZ3o" />
<div class="form-actions form-wrapper" id="edit-actions"><input type="submit" id="edit-submit" name="op" value="Search" class="form-submit" /></div><input type="hidden" name="form_build_id" value="form-gqUt-IzHye6y-Wz5jCVw9TWNvX9pF1jpmgT9wKbMBGM" />
<input type="hidden" name="form_id" value="search_block_form" />
</div>
</div></form> </div>
Expand Down Expand Up @@ -329,6 +329,6 @@ urchinTracker();

</div> <!-- /#container -->
</div> <!-- /#wrapper -->
<script type="text/javascript">if(!NREUMQ.f){NREUMQ.f=function(){NREUMQ.push(["load",new Date().getTime()]);var e=document.createElement("script");e.type="text/javascript";e.async=true;e.src="https://d1ros97qkrwjf5.cloudfront.net/39/eum/rum.js";document.body.appendChild(e);if(NREUMQ.a)NREUMQ.a();};NREUMQ.a=window.onload;window.onload=NREUMQ.f;};NREUMQ.push(["nrf2","beacon-1.newrelic.com","53c69192ac",224050,"b1dRZkQCXEEHAEVRXFYdZkBfTFtcAgZJFkNQQg==",0,46,new Date().getTime()]);</script>
<script type="text/javascript">if(!NREUMQ.f){NREUMQ.f=function(){NREUMQ.push(["load",new Date().getTime()]);var e=document.createElement("script");e.type="text/javascript";e.async=true;e.src="https://d1ros97qkrwjf5.cloudfront.net/39/eum/rum.js";document.body.appendChild(e);if(NREUMQ.a)NREUMQ.a();};NREUMQ.a=window.onload;window.onload=NREUMQ.f;};NREUMQ.push(["nrf2","beacon-1.newrelic.com","53c69192ac",224050,"b1dRZkQCXEEHAEVRXFYdZkBfTFtcAgZJFkNQQg==",0,26,new Date().getTime()]);</script>
</body>
</html>
2 changes: 1 addition & 1 deletion ta-core/target/maven-archiver/pom.properties
View file
@@ -1,5 +1,5 @@
#Generated by Maven
#Wed Jul 25 11:00:52 MDT 2012
#Thu Jul 26 11:24:42 MDT 2012
version=1.0
groupId=gov.lanl.archive
artifactId=ta-core
Binary file modified ta-core/target/ta-core-1.0.jar
View file
Binary file not shown.
10 changes: 10 additions & 0 deletions ta-webapp/pom.xml
View file
Expand Up @@ -191,6 +191,16 @@
<url>http://download.java.net/maven/glassfish/</url>
<layout>default</layout>
</repository>
<repository>
<id>archive</id>
<name>archive.org</name>
<url>http://builds.archive.org:8080/maven2</url>
</repository>
<repository>
<id>thirdparty-uploads</id>
<name>JBoss Thirdparty Uploads</name>
<url>https://repository.jboss.org/nexus/content/repositories/thirdparty-uploads</url>
</repository>
<repository>
<id>maven2-repository.dev.java.net</id>
<name>Java.net Maven 2 Repository</name>
Expand Down
7 changes: 6 additions & 1 deletion ta-webapp/pom.xml~
View file
Expand Up @@ -7,7 +7,7 @@
<packaging>war</packaging>
<parent>
<groupId>gov.lanl.archive</groupId>
<artifactId>ta</artifactId>
<artifactId>ta-projects</artifactId>
<version>1.0</version>
</parent>
<!-- <profiles>
Expand Down Expand Up @@ -191,6 +191,11 @@
<url>http://download.java.net/maven/glassfish/</url>
<layout>default</layout>
</repository>
<repository>
<id>thirdparty-uploads</id>
<name>JBoss Thirdparty Uploads</name>
<url>https://repository.jboss.org/nexus/content/repositories/thirdparty-uploads</url>
</repository>
<repository>
<id>maven2-repository.dev.java.net</id>
<name>Java.net Maven 2 Repository</name>
Expand Down
5 changes: 3 additions & 2 deletions ta-webapp/src/main/java/gov/lanl/archive/resource/PutResource.java
View file
Expand Up @@ -495,7 +495,7 @@ public void setServerInfo(String headers, Memento m,Map map) {
}

public String cutHeaders (InputStream in) {
StringBuffer sb = new StringBuffer("");
StringBuffer sb = new StringBuffer();
try {
int _ch = -1;
boolean endofheaders =false;
Expand Down Expand Up @@ -527,7 +527,8 @@ public String cutHeaders (InputStream in) {
throw new RuntimeException(e);
}
// System.out.println("headers"+sb.toString());
return sb.toString();
return new String( sb.toString() );
//return sb.toString();
}


Expand Down

0 comments on commit 875b495

Please sign in to comment.