From: SVN c. m. f. t. SWORD-A. p. <swo...@li...> - 2009-06-11 14:22:53
|
Revision: 197 http://sword-app.svn.sourceforge.net/sword-app/?rev=197&view=rev Author: neiltaylor Date: 2009-06-11 13:32:09 +0000 (Thu, 11 Jun 2009) Log Message: ----------- Updated for release 1.1 Modified Paths: -------------- client/branches/RB-1.1/trunk/License/LICENSES.txt client/branches/RB-1.1/trunk/SwordClient.properties client/branches/RB-1.1/trunk/help/Resources/sword_client_post.jpg client/branches/RB-1.1/trunk/help/Resources/sword_client_post_with_destination.jpg client/branches/RB-1.1/trunk/help/about.html client/branches/RB-1.1/trunk/help/cmdClient.html client/branches/RB-1.1/trunk/help/guiClient.html client/branches/RB-1.1/trunk/help/index.html client/branches/RB-1.1/trunk/log4j.properties client/branches/RB-1.1/trunk/swordclient.sh Added Paths: ----------- client/branches/RB-1.1/trunk/libs/commons-codec-1.2.jar client/branches/RB-1.1/trunk/libs/commons-io-1.3.1.jar client/branches/RB-1.1/trunk/libs/commons-logging-1.0.3.jar client/branches/RB-1.1/trunk/sword-common-1.1.jar client/branches/RB-1.1/trunk/swordContentPackageTypes.properties Removed Paths: ------------- client/branches/RB-1.1/trunk/images/ client/branches/RB-1.1/trunk/libs/swordcommon.jar Modified: client/branches/RB-1.1/trunk/License/LICENSES.txt =================================================================== --- client/branches/RB-1.1/trunk/License/LICENSES.txt 2009-06-11 13:20:29 UTC (rev 196) +++ client/branches/RB-1.1/trunk/License/LICENSES.txt 2009-06-11 13:32:09 UTC (rev 197) @@ -16,6 +16,10 @@ Containing Project URL: http://commons.apache.org/fileupload/ License: Apache License (See ApacheSoftwareLicense2.txt) +commons-io-1.3.2.jar + Containing Project URL: http://commons.apache.org/io/ + License: Apache License (See ApacheSoftwareLicense2.txt) + commons-httpclient-3.0.1.jar Containing Project URL: http://jakarta.apache.org/httpcomponents/httpclient-3.x/ License: Apache License (See ApacheSoftwareLicense2.txt) Modified: client/branches/RB-1.1/trunk/SwordClient.properties =================================================================== --- client/branches/RB-1.1/trunk/SwordClient.properties 2009-06-11 13:20:29 UTC (rev 196) +++ client/branches/RB-1.1/trunk/SwordClient.properties 2009-06-11 13:32:09 UTC (rev 197) @@ -1,10 +1,10 @@ -#Fri Nov 23 05:28:27 GMT 2007 -files= -users=sword -fileTypes=application/zip,image/jpeg,image/gif -socketTimeout=10000 -formatNamespaceList= -onBehalfOf= -proxyHost= -serviceurls=http\://bagel.intrallect.com\:5555/intralibrary3p0/IntraLibrary-Deposit/service,http\://glen.dnsalias.org/sword/servicedocument,http\://sword.aber.ac.uk/dspace-sword/servicedocument,http\://cakeordeath.ecs.soton.ac.uk/cgi/servicedocument -depositurls= +#Thu Jun 11 13:05:41 BST 2009 +files= +users=sword +fileTypes=application/zip,image/jpeg,image/gif +socketTimeout=10000 +formatNamespaceList= +onBehalfOf= +proxyHost= +serviceurls=http\://client.swordapp.org/client/servicedocument,http\://dspace.swordapp.org/sword/servicedocument,http\://sword.eprints.org/sword-app/servicedocument,http\://sword.intralibrary.com/IntraLibrary-Deposit/service,http\://fedora.swordapp.org/sword-fedora/servicedocument +depositurls= Modified: client/branches/RB-1.1/trunk/help/Resources/sword_client_post.jpg =================================================================== (Binary files differ) Modified: client/branches/RB-1.1/trunk/help/Resources/sword_client_post_with_destination.jpg =================================================================== (Binary files differ) Modified: client/branches/RB-1.1/trunk/help/about.html =================================================================== --- client/branches/RB-1.1/trunk/help/about.html 2009-06-11 13:20:29 UTC (rev 196) +++ client/branches/RB-1.1/trunk/help/about.html 2009-06-11 13:32:09 UTC (rev 197) @@ -17,11 +17,11 @@ </li> <li value="4"><a href="http://www.aber.ac.uk/casis">CASIS</a> (Centre for Advanced Software and Intelligent Systems), Aberystwyth University</li> </ul> - <p>This demonstration client software was written by CASIS. </p> + <p>This demonstration client software was written by CASIS.</p> <h2>SWORD Protocol</h2> <p>Further details on the protocol can be found at the - <a href="http://www.ukoln.ac.uk/repositories/digirep/index/SWORD">SWORD website at UKOLN</a>.</p> + <a href="http://www.swordapp.org">SWORD website</a>.</p> <h2>License Details</h2> <p> @@ -73,13 +73,19 @@ </p> <ul> - <li><a href="http://jakarta.apache.org/httpcomponents/httpclient-3.x/">HTTP Client</a> - Apache License</li> - <li><a href="http://commons.apache.org/codec/">Commons-codec</a> - Apache License</li> + <li><a href="http://jakarta.apache.org/httpcomponents/httpclient-3.x/">HTTP Client</a> - Apache License</li> + <li><a href="http://commons.apache.org/codec/">Commons-codec</a> - Apache License</li> <li><a href="http://commons.apache.org/logging/">Commons Logging</a> - Apache License</li> + <li><a href="http://commons.apache.org/fileupload/">Commons Fileupload</a> - Apache License</li> + <li><a href="http://commons.apache.org/io/">Commons IO</a> - Apache License</li> <li><a href="http://www.xom.nu/">XOM</a> - Lesser General Public License (LGPL)</li> <li><a href="https://swingworker.dev.java.net/">Swing Worker</a> - Lesser General Public License (LGPL)</li> <li><a href="http://logging.apache.org/log4j/1.2/index.html">Log4J</a> - Apache License</li> </ul> - + + <p> + The Apache License and the LGPL licenses are distributed in + the Licenses directory of the SWORD client Download. + </p> </body> </html> \ No newline at end of file Modified: client/branches/RB-1.1/trunk/help/cmdClient.html =================================================================== --- client/branches/RB-1.1/trunk/help/cmdClient.html 2009-06-11 13:20:29 UTC (rev 196) +++ client/branches/RB-1.1/trunk/help/cmdClient.html 2009-06-11 13:32:09 UTC (rev 197) @@ -19,7 +19,9 @@ <tbody> <tr> <td>-gui</td> - <td>This starts the GUI version of the application. </td> + <td>This starts the GUI version of the application. This is the default + mode if neither -gui or -cmd is set. Double clicking on the jar file + will launch the client in gui mode.</td> </tr> <tr> <td>-cmd</td> @@ -98,10 +100,10 @@ </tbody> </table> <p>Example usage: </p> - <p><b>Request a service document using Basic Authentication</b> <![CDATA[ ]]></p><pre>java -jar swordclient.jar -cmd -t service -u sword -p sword -href http://sword.aber.ac.uk/sword-basic/app/servicedocument </pre> + <p><b>Request a service document using Basic Authentication</b> <![CDATA[ ]]></p><pre>java -jar sword-common-1.1.jar -cmd -t service -u sword -p sword -href http://sword.aber.ac.uk/sword-basic/app/servicedocument </pre> <p><b>Request a service document using Basic Authentication. Using a proxy. </b> - </p><pre>java -jar swordclient.jar -cmd -t service -u sword -p sword -href http://sword.aber.ac.uk/sword-basic/app/servicedocument -host www.mycache.com -port 8080</pre> - <p style="font-weight: bold;">Post a zip file using Basic Authentication </p><pre>java -jar swordclient.jar -cmd -t post -u sword -p sword -file BurningStubble.zip -filetype application/zip -href http://sword.aber.ac.uk/sword-basic/deposit</pre> - <p style="font-weight: normal;">Post a zip file using Basic Authentication </p><pre>java -jar swordclient.jar -cmd -t multipost -file BurningStubble.zip -filetype application/zip -dest sword:sword@http://sword.aber.ac.uk/sword-basic/deposit</pre> + </p><pre>java -jar sword-common-1.1.jar -cmd -t service -u sword -p sword -href http://sword.aber.ac.uk/sword-basic/app/servicedocument -host www.mycache.com -port 8080</pre> + <p style="font-weight: bold;">Post a zip file using Basic Authentication </p><pre>java -jar sword-common-1.1.jar -cmd -t post -u sword -p sword -file BurningStubble.zip -filetype application/zip -href http://sword.aber.ac.uk/sword-basic/deposit</pre> + <p style="font-weight: normal;">Post a zip file using Basic Authentication </p><pre>java -jar sword-common-1.1.jar -cmd -t multipost -file BurningStubble.zip -filetype application/zip -dest sword:sword@http://sword.aber.ac.uk/sword-basic/deposit</pre> </body> </html> \ No newline at end of file Modified: client/branches/RB-1.1/trunk/help/guiClient.html =================================================================== --- client/branches/RB-1.1/trunk/help/guiClient.html 2009-06-11 13:20:29 UTC (rev 196) +++ client/branches/RB-1.1/trunk/help/guiClient.html 2009-06-11 13:32:09 UTC (rev 197) @@ -10,7 +10,7 @@ <p>The GUI Client mode displays a graphical user interface for you to access service documents and post content to repositories. This page describes the main features for this mode. </p> <h2>Starting in GUI Mode</h2> <p>To run the tool in GUI mode, simply double click the JAR - file or run <i>java -jar swordclient.jar</i>. When the + file or run <i>java -jar sword-common-1.1.jar</i>. When the tool starts, the following screen is displayed. </p> <p> <img src="Resources/sword_client_open.jpg" /> @@ -40,20 +40,22 @@ <p> <img src="Resources/sword_client_post.jpg" /> </p> - <p>The Post operation can be post the same file to several different repositories. The Destinations list shows any destination repositories that have been specified. The list is empty by default. Press the Add button to display the Destination dialog; the screen is shown below. </p> + <p>The Post operation can post the same file to several different repositories. The Destinations list shows any destination repositories that have been specified. The list is empty by default. Press the Add button to display the Destination dialog; the screen is shown below. </p> <p> <img src="Resources/sword_client_post_destination.jpg" /> </p> <p>Enter the details for the repository location. Press OK to add the entry. The entry is shown on the main Post Document dialog. </p> <p> - <img src="Resources/sword_client_post_with_destination.jpg" /> + <img src="Resources/sword_client_post_with_destination.jpg" /> </p> - <p>You can add and edit multiple destinations. Add the other information and press Post File to start the post process. </p> + <p>You can add and edit multiple destinations. + Add the other information and press Post File + to start the post process.</p> <p>The entry is added into the tree. If the destination collection is already displayed in the tree (as a result of requesting a service document) the successful post response will be shown as a child of the collection. Otherwise, the post will be shown as child of the main Services & Posted Files node. An example file display is shown below. </p> <img src="Resources/sword_client_post_file.jpg" /> <h2>Property File</h2> <p>Certain values for the Service and Post dialogs can be - pre-configured in a properties file. The file is SwordClient.properties and is located in the same directory as the swordclient.jar file. The file contains labels for the areas that can be configured. The value on the right of the = character is a comma separated list. The values are added into the relevant combo boxes on the dialogs. The property file is only read as the tool starts. If you make any changes to the properties, restart the application. You can also edit the values from with the GUI client by selecting Options > Edit Properties. A dialog is displayed. Change the necessary values and press OK. The changes are saved to the properties file when the application closes. </p> + pre-configured in a properties file. The file is SwordClient.properties and is located in the same directory as the sword-common-1.1.jar file. The file contains labels for the areas that can be configured. The value on the right of the = character is a comma separated list. The values are added into the relevant combo boxes on the dialogs. The property file is only read as the tool starts. If you make any changes to the properties, restart the application. You can also edit the values from with the GUI client by selecting Options > Edit Properties. A dialog is displayed. Change the necessary values and press OK. The changes are saved to the properties file when the application closes. </p> <h2>Debug Output</h2> <p>By default, the tool will grab debug output. This can be viewed in the Debug panel - to show the panel Modified: client/branches/RB-1.1/trunk/help/index.html =================================================================== --- client/branches/RB-1.1/trunk/help/index.html 2009-06-11 13:20:29 UTC (rev 196) +++ client/branches/RB-1.1/trunk/help/index.html 2009-06-11 13:32:09 UTC (rev 197) @@ -11,14 +11,20 @@ <p>This application contains a demonstration client for the SWORD (Simple Web-service Offering Repository Deposit) project. The client is designed to test connections to digital - repositories that support the SWORD Protocol.</p> + repositories that support the SWORD Protocol 1.3. This client + does not provide backwards compatibility with the SWORD protocol + 1.2; download version 1.0 of the client if you need to test + the initial SWORD protocol. + </p> <p>The SWORD Protocol uses a subset of the Atom Publishing Protocol and the Atom Protocol to query a set of deposit services that are available from a repository and to - submit (post) files to the repository.</p> + submit (post) files to the repository. + </p> <h2>Requirements</h2> <p>The SWORD Client is a Java application. It requires Java 1.5. You can - download Java from the <a href="http://java.sun.com/">Java</a> website. </p> + download Java from the <a href="http://java.sun.com/">Java</a> website. + </p> <h2>Client Modes</h2> <p>The client supports two modes: </p> <ul> Added: client/branches/RB-1.1/trunk/libs/commons-codec-1.2.jar =================================================================== (Binary files differ) Property changes on: client/branches/RB-1.1/trunk/libs/commons-codec-1.2.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: client/branches/RB-1.1/trunk/libs/commons-io-1.3.1.jar =================================================================== (Binary files differ) Property changes on: client/branches/RB-1.1/trunk/libs/commons-io-1.3.1.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: client/branches/RB-1.1/trunk/libs/commons-logging-1.0.3.jar =================================================================== (Binary files differ) Property changes on: client/branches/RB-1.1/trunk/libs/commons-logging-1.0.3.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: client/branches/RB-1.1/trunk/libs/swordcommon.jar =================================================================== (Binary files differ) Modified: client/branches/RB-1.1/trunk/log4j.properties =================================================================== --- client/branches/RB-1.1/trunk/log4j.properties 2009-06-11 13:20:29 UTC (rev 196) +++ client/branches/RB-1.1/trunk/log4j.properties 2009-06-11 13:32:09 UTC (rev 197) @@ -1,8 +1,8 @@ -log4j.rootLogger=OFF, stdout +log4j.rootLogger=INFO, stdout log4j.appender.stdout=org.apache.log4j.ConsoleAppender log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.appender.stdout.layout.ConversionPattern=%5p [%c] %m%n log4j.logger.httpclient.wire.header=INFO -log4j.logger.org.apache.commons.httpclient=INFO \ No newline at end of file +log4j.logger.org.apache.commons.httpclient=INFO Added: client/branches/RB-1.1/trunk/sword-common-1.1.jar =================================================================== (Binary files differ) Property changes on: client/branches/RB-1.1/trunk/sword-common-1.1.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: client/branches/RB-1.1/trunk/swordContentPackageTypes.properties =================================================================== --- client/branches/RB-1.1/trunk/swordContentPackageTypes.properties (rev 0) +++ client/branches/RB-1.1/trunk/swordContentPackageTypes.properties 2009-06-11 13:32:09 UTC (rev 197) @@ -0,0 +1,8 @@ +<?xml version="1.0" ?> +<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> +<properties> + <entry key="http://www.imsglobal.org/xsd/imscp_v1p1">IMS Content Packaging 1.1.x</entry> + <entry key="http://www.imsglobal.org/xsd/imscp_v1p2">IMS Content Packaging 1.2</entry> + <entry key="TBC">IMS Common Cartridge</entry> + <entry key="http://www.loc.gov/METS/">METS</entry> +</properties> \ No newline at end of file Modified: client/branches/RB-1.1/trunk/swordclient.sh =================================================================== --- client/branches/RB-1.1/trunk/swordclient.sh 2009-06-11 13:20:29 UTC (rev 196) +++ client/branches/RB-1.1/trunk/swordclient.sh 2009-06-11 13:32:09 UTC (rev 197) @@ -1,2 +1,2 @@ #!/bin/sh -java -jar swordclient.jar $@ \ No newline at end of file +java -jar sword-common-1.1.jar $@ \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |