Index: trunk/.classpath
===================================================================
--- trunk/.classpath	(revision 1572)
+++ 	(revision )
@@ -1,23 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry excluding="org/expeditee/gui/FrameKeyboardActions.java|org/expeditee/gui/FrameMouseActions.java|org/expeditee/gui/BrowserApplet.java|org/expeditee/io/flowlayout/AreaPolygon.java|org/expeditee/importer/FrameDNDTransferHandler.java|org/expeditee/gui/indirect/keyboard/|org/expeditee/gui/indirect/mouse/|org/expeditee/items/widgets/WebBrowser.java|org/apollo/util/PopupReaper.java|org/apollo/AudioFrameKeyboardActions.java|org/apollo/AudioFrameMouseActions.java" kind="src" path="src"/>
-	<classpathentry exported="true" kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3.8.1"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="releases/jars/iText-2.1.3.jar"/>
-	<classpathentry kind="lib" path="releases/jars/jcommon-1.0.13.jar"/>
-	<classpathentry kind="lib" path="releases/jars/JEP.jar"/>
-	<classpathentry kind="lib" path="releases/jars/JFreeCharts.jar"/>
-	<classpathentry kind="lib" path="releases/jars/js.jar"/>
-	<classpathentry kind="lib" path="releases/jars/lobo.jar"/>
-	<classpathentry kind="lib" path="releases/jars/xercesImpl.jar"/>
-	<classpathentry kind="lib" path="releases/jars/jazzy-core.jar"/>
-	<classpathentry kind="lib" path="releases/jars/PDFRenderer-0.9.1.jar"/>
-	<classpathentry kind="lib" path="releases/jars/jgraphx.jar"/>
-	<classpathentry kind="lib" path="releases/jars/commons-cli-1.2.jar"/>
-	<classpathentry kind="lib" path="releases/jars/json-simple-1.1.1.jar"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="lib" path="releases/jars/svgSalamander.jar"/>
-	<classpathentry kind="lib" path="releases/jars/javax.mail.jar"/>
-	<classpathentry kind="lib" path="releases/jars/Shamir.jar"/>
-	<classpathentry kind="output" path="bin/src"/>
-</classpath>
Index: trunk/.project
===================================================================
--- trunk/.project	(revision 1572)
+++ 	(revision )
@@ -1,28 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>Expeditee</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
Index: trunk/Expeditee2 build.xml.launch
===================================================================
--- trunk/Expeditee2 build.xml.launch	(revision 1572)
+++ 	(revision )
@@ -1,25 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType">
-<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.ui.antsupport.InternalAntRunner"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.6.0_07"/>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.ui.externaltools.launchGroup"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="org.eclipse.ant.ui.ATTR_BUILD_SCOPE" value="${project}"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_INSTALL_TYPE_ID" value="org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="Expeditee2"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_INSTALL_NAME" value="jdk1.6.0_07"/>
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${project}"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/Expeditee2/build.xml"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/Expeditee2/build.xml}"/>
-</launchConfiguration>
Index: trunk/Frameshare-SSH-tunnelling.txt
===================================================================
--- trunk/Frameshare-SSH-tunnelling.txt	(revision 1572)
+++ 	(revision )
@@ -1,12 +1,0 @@
-If you're not at the uni and you want to connect to a server running on a uni machine, most likely you'll need to SSH tunnel to access it.
-This doesn't work for UDP connections (such as FrameShare).
-You could use netcat (or bash and the virtual files in /dev/tcp and /dev/udp) to pipe data from a UDP to TCP, then back to UDP again on the other end of the SSH tunnel, but I couldn't get that working (and good luck trying to do it on Windows).
-
-So, I wrote a little java program to deal with it:
-https://github.com/jtsymon/UDP-SSH-Tunnel
-
-Scripts for Expeditee are in dev/bin/script
-
-Edit "Frameshare-SSH-Tunnel-CONFIG.sh" to set the server port, SSH username and host
-Run "Frameshare-SSH-Tunnel-Client.sh" on the machine that you're running the Expeditee window on
-Run "Frameshare-SSH-Tunnel-Server.sh" on the machine that the Expeditee frameserver is running on (only needs to be run once and it should support all users)
Index: trunk/LICENSE.txt
===================================================================
--- trunk/LICENSE.txt	(revision 1572)
+++ 	(revision )
@@ -1,653 +1,0 @@
-        Copyright (c) 2015 New Zealand Digital Library Project, 
-                      University of Waikato
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-and distribute copies of the Software, and to permit persons to whom
-the Software is furnished to do so, subject to the GPL and the
-following conditions (where not in conflict with the GPL):
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software, as
-will all other notices contained in the copyrights directory.
-
-THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE COPYRIGHT HOLDER (Greenstone
-Digital Libraries, University of Waikato), OR THEIR STAFF BE LIABLE
-FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
-CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of New Zealand Digital
-Library Project, University of Waikato shall not be used in
-advertising or otherwise to promote the sale, use or other dealings in
-this Software without prior written authorization from the New Zealand
-Digital Library Project, University of Waikato. Distributed under GPL,
-as follows:
-
-
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, 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
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If 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 convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU 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
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "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 PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM 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 PROGRAM (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 PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
Index: trunk/README-Eclipse-Plugin.txt
===================================================================
--- trunk/README-Eclipse-Plugin.txt	(revision 1572)
+++ 	(revision )
@@ -1,39 +1,0 @@
-Importing Expeditee into Eclipse
----------------------------------
-New -> Other -> Java Project from Existing Ant Buildfile
-Set the build file as Expeditees build.xml
-Change the project name as required
-Done
-
-
-For newer version of Java used by Eclipse you need to include the 
-JavaFX jar files as library files to the project, as these are no longer 
-included as part of the JDK.  You might also need to control the Java modules
-in play.  A good guide to this can be found at:
-
-  https://gist.github.com/stevenliebregt/bc62a382fc43064136b662ee62172ab3
-
-Convert to Eclipse Plugin
---------------------------
-Plugins cannot have dependant projects that are not plugins themselves.  Therefore if you writing a eclipse plugin or RCP application that involes Expeditee you will need to convert Expeditee to a plugin project.
-
-Right click on your Expeditee project in the package explorer.
-Configure Menu -> Convert to Plug-in Projects..
-Open up your MANIFEST.MF file in eclipse (Inside META-INF folder)
-Goto the 'Runtime' tab.
-In the 'Classpath' area remove all entries except the expeditee jar file
-Open up your buildpath for the project.
-Right Click project -> Build Path -> Configure build path
-Remove all .jar entries from the libraries tab.
-Go back to the class path area of the runtime tab in MANIFEST.MF
-Select 'Add...' and proceed to add all the jars listed in releases\jars and releases\jars\ext
-
-You should now be able to run your eclipse plugin/rcp that depends on Expeditee
-
-A note on new jar files
------------------------
-If a new jar file is added to expeditees libraries then you are going to have to tell the MANIFEST.MF file about it (as well as your project classpath).  
-Failure to do this will cause a runtime exception when the jar file is asscessed; because the plugin doesn't think you should have access.
-
-To add the new jar file: open MANIFEST.MF
-Go to the 'Runtime' tab and add it as a required jar on the classpath area. 
Index: trunk/README.txt
===================================================================
--- trunk/README.txt	(revision 1572)
+++ 	(revision )
@@ -1,18 +1,0 @@
-
-
-To compile the Expeditee source code, make sure you a version of the Java
-Development Kit (JDK) installed.  A minimum of Java 1.7 is required, and we
-recommend Java 1.8 to utilize the JFX features Expeditee includes.
-
-For Unix users you might, for example, do something like the following:
-
-  # Put javac on your PATH
-  export JAVA_HOME=/opt/java/jdk1.8.0
-  export PATH=$JAVA_HOME/bin:$PATH
-
-  # Compile up the code
-  ant build
-
-  # Then run it
-  ant run
-
Index: trunk/build.properties
===================================================================
--- trunk/build.properties	(revision 1572)
+++ 	(revision )
@@ -1,24 +1,0 @@
-source.Expeditee.jar = src/,\
-                       tests/
-bin.includes = META-INF/,\
-               releases/jars/activation.jar,\
-               releases/jars/cobra.jar,\
-               releases/jars/iText-2.1.3.jar,\
-               releases/jars/jcommon-1.0.13.jar,\
-               releases/jars/JEP.jar,\
-               releases/jars/JFreeCharts.jar,\
-               releases/jars/js.jar,\
-               releases/jars/lobo.jar,\
-               releases/jars/lobo-pub.jar,\
-               releases/jars/mail.jar,\
-               releases/jars/xercesImpl.jar,\
-               releases/jars/jazzy-core.jar,\
-               releases/jars/PDFRenderer-0.9.1.jar,\
-               releases/jars/jgraphx.jar,\
-               releases/jars/commons-cli-1.2.jar,\
-               releases/jars/json-simple-1.1.1.jar,\
-               Expeditee.jar,\
-               bin/,\
-               expeditee/,\
-               build.xml,\
-               releases/jars/svgSalamander.jar
Index: trunk/build.xml
===================================================================
--- trunk/build.xml	(revision 1572)
+++ 	(revision )
@@ -1,273 +1,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project basedir="." default="build" name="Expeditee">
-
-	<tstamp>
-		<format property="TODAY_EXP" pattern="yy.MM.dd"/>
-	</tstamp>
-
-	<property environment="env"/>
-
-	<property name="dist.dir.exp" location="releases" />
-	<!--
-		<property name="dist.filename.exp" value="Exp.${TODAY_EXP}.jar" />
-	-->
-	<property name="dist.filename.exp"   value="Expeditee.jar" />
-	<property name="build.dir.exp"   location="bin" />
-	<property name="manifest.path.exp"  value="makeFiles/Manifest.txt" />
-	<property name="lib.dir.exp"  location="releases/jars" />
-	<property name="inst.dir.exp" location="inst" />
-
-	<!--
-	     If changing this value, make sure you run `ant clean`
-	-->
-	<property name="javac.source" value="1.8" />
-	<property name="javac.target" value="${javac.source}" />
-	
-        <property name="expeditee.server.port" value="3000"/>
-
-	<!--
-	    The following approach turned out to be terribly slow as the number of
-	    jar files included increase.  This is because the 'zipfileset' task functions
-	    by using a separate file IO pass for each file extraced.  For more details
-	    see:
-	    
-	      https://bz.apache.org/bugzilla/show_bug.cgi?id=43144
-	    
-	    which also highlights how the unzip task can be used to write a faster alternative,
-	    which (imprinted to the same 'excludes' pattern specified here) is used in
-	    the 'mergejars' target below
-	-->
-	
-	<union id="reallyslowIO.portable.includes.exp">
-		<zipfileset excludes="META-INF/*.SF" src="releases/jars/junit.jar"/>
-		<zipfileset excludes="META-INF/*.SF" src="releases/jars/activation.jar"/>
-		<zipfileset excludes="META-INF/*.SF" src="releases/jars/cobra.jar"/>
-		<zipfileset excludes="META-INF/*.SF" src="releases/jars/iText-2.1.3.jar"/>
-		<zipfileset excludes="META-INF/*.SF" src="releases/jars/jcommon-1.0.13.jar"/>
-		<zipfileset excludes="META-INF/*.SF" src="releases/jars/JEP.jar"/>
-		<zipfileset excludes="META-INF/*.SF" src="releases/jars/JFreeCharts.jar"/>
-		<zipfileset excludes="META-INF/*.SF" src="releases/jars/js.jar"/>
-		<zipfileset excludes="META-INF/*.SF" src="releases/jars/jython-standalone-2.7.0.jar"/>
-		<zipfileset excludes="META-INF/*.SF" src="releases/jars/lobo.jar"/>
-		<zipfileset excludes="META-INF/*.SF" src="releases/jars/lobo-pub.jar"/>
-		<zipfileset excludes="META-INF/*.SF" src="releases/jars/mail.jar"/>
-		<zipfileset excludes="META-INF/*.SF" src="releases/jars/xercesImpl.jar"/>
-		<zipfileset excludes="META-INF/*.SF" src="releases/jars/jazzy-core.jar"/>
-		<zipfileset excludes="META-INF/*.SF" src="releases/jars/PDFRenderer-0.9.1.jar"/>
-		<zipfileset excludes="META-INF/*.SF" src="releases/jars/json-simple-1.1.1.jar"/>
-		<zipfileset excludes="META-INF/*.SF" src="releases/jars/commons-cli-1.2.jar"/>
-		<zipfileset excludes="META-INF/*.SF" src="releases/jars/jgraphx.jar"/>
-		<zipfileset excludes="META-INF/*.SF" src="releases/jars/svgSalamander.jar"/>
-		<zipfileset excludes="META-INF/*.SF" src="releases/jars/jl1.0.1.jar"/>
-		<zipfileset excludes="META-INF/*.SF" src="releases/jars/tritonus_share.jar"/>
-		<zipfileset excludes="META-INF/*.SF" src="releases/jars/mp3spi1.9.5.jar"/>
-	</union>
-
-	<path id="classpath.exp">
-		<fileset dir="${lib.dir.exp}">
-			<include name="*.jar" />
-			<include name="ext/*.jar" />
-		</fileset>
-	</path>
-
-	<path id="classpath.jfx">
-	  <!-- Check this points to an existing file, if you can't find the jar just compile with build-nojfx -->
-	  <pathelement location="${java.home}/lib/jfxrt.jar"/>
-	</path>
-
-
-	<path id="portable.includes.exp">
-	  <fileset dir="${dist.dir.exp}/unjarred">
-	  </fileset>
-	</path>
-
-	<target name="clean">
-		<!-- delete only the class files built by expeditee -->
-		<delete dir="${build.dir.exp}/org"/>
-		<delete dir="${inst.dir.exp}" />
-	</target>
-	<target depends="clean" name="cleanall"/>
-
-	<target name="init">
-		<echo message="${ant.project.name}: ${ant.file}"/>
-		<mkdir dir="${build.dir.exp}"/>
-		<copy includeemptydirs="false" todir="${build.dir.exp}">
-			<fileset dir="src">
-				<exclude name="**/*.java"/>
-			</fileset>
-		</copy>
-		<copy includeemptydirs="false" todir="${build.dir.exp}">
-			<fileset dir="tests">
-				<exclude name="**/*.java"/>
-			</fileset>
-		</copy>
-	</target>
-	
-	<target depends="init" name="build">
-		<javac encoding="UTF-8" 
-		       source="${javac.source}" target="${javac.target}" debug="true" 
-                       destdir="${build.dir.exp}" includeantruntime="false">                       
-			
-			<src path="src"/>
-			<src path="tests"/>
-			
-			<exclude name="org/expeditee/items/widgets/WebBrowser.java"/>
-
-			<!-- After refactoring for JavaFX, the following files no longer compile -->
-			<!-- Check with Corey, and if no longer needed, they should be removed -->
-			<exclude name="org/expeditee/gui/FrameKeyboardActions.java" />
-			<exclude name="org/expeditee/gui/FrameMouseActions.java" />
-			<exclude name="org/apollo/AudioFrameKeyboardActions.java" />
-			<exclude name="org/apollo/AudioFrameMouseActions.java" />
-			<exclude name="org/expeditee/importer/FrameDNDTransferHandler.java" />
-			<exclude name="org/apollo/util/PopupReaper.java" />
-
-			<!-- After refactoring for JavaFX, the following test files no longer compile -->
-			<exclude name="org/expeditee/gui/FrameKeyboardsActionsTest.java" />
-			<exclude name="org/expeditee/gui/FrameMouseActionsTest.java" />
-			<exclude name="org/expeditee/gui/FrameTest.java" />
-			<exclude name="org/expeditee/gui/DisplayIOTest.java" />
-			<exclude name="org/expeditee/gui/FreeItemsTest.java" />
-			<exclude name="org/expeditee/io/ConversionTest.java" />
-			<exclude name="org/expeditee/items/LineTest.java" />
-			<exclude name="org/expeditee/items/widgets/InteractiveWidgetTest.java" />
-
-			<classpath>
-				<path refid="classpath.exp"/>
-				
-				<!-- jfxrt.jar path -->
-				<path refid="classpath.jfx"/>
-			</classpath>
-		</javac>
-	</target>
-
-	<target depends="init" name="build-nojfx">
-		<javac encoding="UTF-8" 
-		       source="${javac.source}" target="${javac.target}" debug="false" 
-                       destdir="${build.dir.exp}" includeantruntime="false">                       
-			
-			<src path="tests"/>
-			<src path="src"/>
-			<exclude name="org/expeditee/items/widgets/WebBrowser.java"/>
-			
-			<!-- Files that rely on JavaFX. Use build to build with them included -->
-			<exclude name="org/expeditee/items/widgets/JfxBrowser.java"/>
-			<exclude name="org/expeditee/io/WebParser.java"/>
-			<exclude name="org/expeditee/items/widgets/JfxMedia.java"/>
-			<exclude name="org/expeditee/actions/JfxBrowserActions.java"/>	
-			
-			<classpath refid="classpath.exp"/>
-		</javac>
-	</target>
-	
-
-	
-	<target depends="build" name="jar-cwd"> <!-- version to run if current working directory (cwd) same as jar -->
-		<jar destfile="${dist.dir.exp}/${dist.filename.exp}" manifest="${manifest.path.exp}">
-			<manifest>
-				<attribute name="Main-Class" value="org.apollo.ApolloSystem"/>
-				<attribute name="Class-Path" value="."/>
-			</manifest>
-			<fileset dir="${build.dir.exp}">
-				<exclude name="src/**"/>
-			</fileset>
-		</jar>
-	</target>
-	<target depends="build" name="reallyslowIO.jar"> <!-- self-contained, portable jar -->
-		<jar destfile="${dist.dir.exp}/${dist.filename.exp}" filesetmanifest="mergewithoutmain">
-			<manifest>
-				<attribute name="Main-Class" value="org.apollo.ApolloSystem"/>
-				<attribute name="Class-Path" value="."/>
-			</manifest>
-			<fileset dir="${build.dir.exp}">
-				<exclude name="src/**"/>
-			</fileset>
-			<resources refid="reallyslowIO.portable.includes.exp" />   
-		</jar>
-	</target>
-
-	
-	<target name="mergejars">
-	  <unzip dest="${dist.dir.exp}/unjarred">
-	    <patternset>
-	      <exclude name="META-INF/*.SF"/>
-	    </patternset>
-	    <!-- fileset to include ... -->
-	    <path refid="classpath.exp"/>
-	  </unzip>
-	</target>
-
-
-	<target depends="build,mergejars" name="jar"> <!-- self-contained, portable jar -->
-		<jar destfile="${dist.dir.exp}/${dist.filename.exp}" filesetmanifest="mergewithoutmain">
-			<manifest>
-				<attribute name="Main-Class" value="org.apollo.ApolloSystem"/>
-				<attribute name="Class-Path" value="."/>
-			</manifest>
-			<fileset dir="${build.dir.exp}">
-				<exclude name="src/**"/>
-			</fileset>
-			<resources refid="portable.includes.exp" />
-		</jar>
-		<delete dir="${dist.dir.exp}/unjarred" quiet="true"/>
-	</target>
-
-
-	<target depends="jar" name="inst">
-		<mkdir dir="${inst.dir.exp}" />
-		<mkdir dir="${inst.dir.exp}/jars" />
-		<copy file="${dist.dir.exp}/${dist.filename.exp}" tofile="${inst.dir.exp}/${dist.filename.exp}" />
-		<copy todir="${inst.dir.exp}/jars">
-			<path refid="classpath.exp" />
-		</copy>
-	</target>
-
-	<target name="run">
-		<java classname="org.apollo.ApolloSystem" failonerror="true" fork="yes">
-			<classpath>
-				<path refid="classpath.exp"/>
-				
-				<!-- jfxrt.jar path -->
-				<path refid="classpath.jfx"/>
-
-				<pathelement location="${build.dir.exp}"/>
-			</classpath>
-		</java>
-	</target>
-
-	<target name="run-fresh">
-		<java classname="org.apollo.ApolloSystem" failonerror="true" fork="yes">
-			<classpath refid="classpath.exp"/>
-			<classpath>
-				<pathelement location="${build.dir.exp}"/>
-			</classpath>
-                        <jvmarg value="-Dexpeditee.home=${user.dir}/expeditee-fresh"/>
-		</java>
-	</target>
-
-	<target name="run-fresh-login">
-	  <java classname="org.apollo.ApolloSystem" failonerror="true" fork="yes">
-	    <classpath refid="classpath.exp"/>
-	    <classpath>
-	      <pathelement location="${build.dir.exp}"/>
-	    </classpath>
-            <jvmarg value="-Dexpeditee.home=${user.dir}/expeditee-fresh"/>
-	    <jvmarg value="-Dauth=true"/>
-	  </java>
-	</target>
-
-
-
-
-	<target name="run-server">
-                <echo>Launching Command-line Expeditee Server on port ${expeditee.server.port}</echo>
-		<java classname="org.expeditee.network.FrameShare" failonerror="true" fork="yes">
-			<classpath refid="classpath.exp"/>
-			<classpath>
-				<pathelement location="${build.dir.exp}"/>
-			</classpath>
-                        <jvmarg value="-Dexpeditee.home=${user.dir}/expeditee-home"/>
-                        <arg value="${expeditee.server.port}"/>
-		</java>
-	</target>
-</project>
Index: trunk/build_old.xml
===================================================================
--- trunk/build_old.xml	(revision 1572)
+++ 	(revision )
@@ -1,159 +1,0 @@
-<!--
-
-ANT build script for both the Apollo and Expeditee project.
-
-Originally created for the apollo project - but can be used for
-creating expeditee distributions.
-
-This does not include the lib jars within the distributed jar -
-such resources would have to be handled specially in code
-(i.e. jar loaders...).
-
--->
-<project name="Expeditee" default="fresh_dist_exp">
-	
-	<tstamp>
-	    <format property="TODAY" pattern="d-MMMM-yyyy"/>
-		<format property="TODAY_EXP" pattern="ddMMMyyyy"/>
-	 </tstamp>
-	
-	<!-- Expeditee must be compatible run on Java 1.6" -->
-	<property name="sourcelevel" value="1.6" />
-	<property name="targetlevel" value="1.6" />
-	
-	<property name="resources.dir.apollo" location="resources_apollo" /> <!-- resources files for apollo -->
-
-	<property name="src.dir.exp" location="src" /> <!-- source files for expeditee -->
-	<property name="src.dir.apollo" location="src_apollo" /> <!-- source files for apollo -->
-	
-	<property name="build.dir" location="bin" /> <!-- compiled class files directory -->
-	
-	<property name="lib.dir.exp" location="releases/jars" /> <!-- external dependencies -->
-	<property name="lib.dir.apollo" location="jars_apollo" /> <!-- external dependencies -->
-	
-	<property name="dist.dir.exp" location="releases" /> <!-- Put the output jar file into the same directory as the others. The manifest file needs to be edited with relative dependencies if another directory structure is desired. -->
-	<property name="dist.dir.apollo" location="releases/apollo" /> <!-- Put the output jar file into the same directory as the others. The manifest file needs to be edited with relative dependencies if another directory structure is desired. -->
-	
-	<property name="dist.filename.exp" value="Exp${TODAY_EXP}A.jar" /> 
-	<property name="dist.filename.apollo" value="Apollo_jvm${targetlevel}-${TODAY}.jar" />
-	
-	<property name="manifest.path.exp"  value="makeFiles/Manifest.txt" />
-	<property name="manifest.path.apollo" value="makeFiles/apollo_manifest.mf" />
-	<property name="manifest.path.apollo-applet" value="makeFiles/apollo_applet_manifest.mf" />
-	
-	<path id="classpath.exp">
-		<!-- link with all jar files we can find in our defined lib directory -->
-		<fileset dir="${lib.dir.exp}">
-			<include name="*.jar" />
-		</fileset>
-	</path>
-	
-	<path id="classpath.apollo">
-		<!-- link with all jar files we can find in our defined lib directory -->
-		<fileset dir="${lib.dir.exp}">
-			<include name="*.jar" />
-			<exclude name="jnmp2p.jar"/> <!-- This is a zero-sized file! Its totally invalid and will fail any builds - omitting !-->
-			<exclude name="jxta.jar"/> <!-- Ditto !-->
-		</fileset>
-		<fileset dir="${lib.dir.apollo}">
-			<include name="*.jar" />
-		</fileset>
-	</path>
-	
-
-	<!-- TARGETS -->
-	<target name="clean" description="Deletes contents of build directory.">
-		<delete dir="${build.dir}" />
-		<mkdir dir="${build.dir}" />
-	</target>
-	
-	
-	<!-- Set up directories that are needed for building." -->
-	<target name="init_expeditee">
-		<mkdir dir="${build.dir}" />
-		<mkdir dir="${lib.dir.exp}" />
-	</target>
-	
-	<target name="init_apollo" depends="init_expeditee">
-		<mkdir dir="${lib.dir.apollo}" />
-	</target>
-		
-	
-	<!-- Do the actual compilation." -->
-	<target name="compile_exp" depends="init_expeditee">
-		<javac 	srcdir="${src.dir.exp}" 
-				destdir="${build.dir}" 
-				debug="true" 
-				optimize="on" 
-				source="${sourcelevel}" 
-				target="${targetlevel}" 
-				compiler="modern" 
-	
-				listfiles="true">
-			<classpath refid="classpath.exp" />
-			<compilerarg value="-Xlint:unchecked"/>
-		</javac>
-	</target>
-			
-	<target name="compile_apollo" depends="init_apollo, compile_exp">
-	<javac 	srcdir="${src.dir.apollo}" 
-			destdir="${build.dir}" 
-			debug="true" 
-			optimize="on" 
-			source="${sourcelevel}" 
-			target="${targetlevel}" 
-			compiler="modern" 
-			listfiles="true">
-			<classpath refid="classpath.apollo" />
-			<compilerarg value="-Xlint:unchecked"/>
-		</javac>
-	</target>
-	
-	
-	<!-- Jaring up the projects." -->
-	<target name="lazy_dist_exp" depends="compile_exp" description="Warning: Does not clean before compile.">
-	  <jar destfile="${dist.dir.exp}/${dist.filename.exp}" manifest="${manifest.path.exp}">
-            <fileset dir="${build.dir}"/>	    
-	  </jar>  
-
-	  <!-- Now, with the most generic name possible, make a jar that is always the latest -->
-	  <copy file="${dist.dir.exp}/${dist.filename.exp}" toFile="${dist.dir.exp}/Expeditee.jar"/>
-	</target>
-	
-	<target name="fresh_dist_exp" depends="clean, lazy_dist_exp"/>
-	
-	<target name="lazy_dist_apollo" depends="compile_apollo" description="Warning: Does not clean before compile.">
-
-	  <!-- Now, with the most generic name possible, make a jar that is always the latest -->
-	  <jar destfile="${dist.dir.apollo}/${dist.filename.apollo}" manifest="${manifest.path.apollo}">
-	    <fileset dir="${build.dir}"/>
-	    <fileset dir="${resources.dir.apollo}"/>
-	    <fileset dir="releases" includes="jars/*,jars/*/*"/>
-	    <fileset dir="." includes="jars_apollo/*"/>
-	  </jar>  
-	  
-	  <!-- Now, with the most generic name possible, make a jar that is always the latest -->
-	  <copy file="${dist.dir.apollo}/${dist.filename.apollo}" toFile="${dist.dir.apollo}/Apollo.jar"/>
-	  	</target>
-
-	<target name="lazy_dist_apollo_applet" depends="compile_apollo">
-	  
-	  <jar destfile="${dist.dir.apollo}/ApolloApplet.jar" manifest="${manifest.path.apollo-applet}">
-	    <fileset dir="${build.dir}"/>
-	    <fileset dir="${resources.dir.apollo}"/>
-	    <fileset dir="unjarred-for-expeditee-applet" includes="*/"/>
-	    <fileset dir="unjarred-for-apollo-applet" includes="*/"/>
-	  </jar>
-	  
-	  <exec executable="./MAKE-APOLLO-SIGNED-JAR.sh" osfamily="unix" />
-	  <exec executable="MAKE-APOLLO-SIGNED-JAR.bat"  osfamily="windows"/>
-	</target>
-
-	<target name="sign-test">
-		<exec executable="dev/bin/script/MAKE-APOLLO-SIGNED-JAR.sh" osfamily="unix" />
-		<exec executable="dev/bin/script/MAKE-APOLLO-SIGNED-JAR.bat"  osfamily="windows"/>
-	</target>
-
-	<target name="fresh_dist_apollo" depends="clean, lazy_dist_apollo, lazy_dist_apollo_applet"/>
-
-</project>
Index: trunk/expeditee-devel.bash
===================================================================
--- trunk/expeditee-devel.bash	(revision 1572)
+++ 	(revision )
@@ -1,49 +1,0 @@
-
-. expeditee-setup.bash
-
-
-#which javac  >/dev/null 2>&1
-
-#if [ $? != 0 ] ; then
-#  export JAVA_HOME="/cygdrive/c/Program Files/Java/jdk1.7.0_45"
-#  export PATH=$JAVA_HOME/bin/:$PATH
-
-#  echo "+ Set JAVA_HOME to $JAVA_HOME and updated path"
-
-#  cygpath 2>/dev/null
-#  if [ $? != 0 ] ; then
-#    echo "Detected runing in Cygwin environment => Changing JAVA_HOME to Windows native format"
-#    export JAVA_HOME=`cygpath -w "$JAVA_HOME"`
-#  fi
-#
-#fi
-
-
-expeditee_home=`pwd`;
-export ANT_HOME="$expeditee_home/dev/packages/apache-ant-1.9.2"
-export PATH="$ANT_HOME/bin/:$PATH"
-
-echo "+ Set ANT_HOME to"
-echo "+   $ANT_HOME"
-echo "+ and updated path"
-
-# Update path to include 'dev/bin/script'
-export PATH="$expeditee_home/dev/bin/script:$PATH"
-
-if test -e local-devel.bash ; then
-    echo "+ Sourcing local-devel.bash"
-    . ./local-devel.bash
-fi
-
-
-echo "-----"
-echo "To compile Expeditee, type:"
-echo ""
-echo "  ant build"
-echo ""
-echo "To run the compiled version, type:"
-echo ""
-echo "  ant run"
-echo "-----"
-
-
Index: trunk/expeditee-devel.bash.in
===================================================================
--- trunk/expeditee-devel.bash.in	(revision 1572)
+++ 	(revision )
@@ -1,33 +1,0 @@
-
-
-which javac >/dev/null 2>&1 
-
-if [ $? != 0 ] ; then
-  export JAVA_HOME="**Replace with your value for JAVA home**"
-  export PATH=$JAVA_HOME/bin/:$PATH
-
-  echo "+ Set JAVA_HOME to $JAVA_HOME and updated path"
-
-  cygpath 2>/dev/null
-  if [ $? != 0 ] ; then
-    echo "Detected runing in Cygwin environment => Changing JAVA_HOME to Windows native format"
-    export JAVA_HOME=`cygpath -w "$JAVA_HOME"`
-  fi
-fi
-
-
-source ./expeditee-setup.sh
-
-export ANT_HOME="$expeditee_home/dev/packages/apache-ant-1.9.2"
-export PATH="$ANT_HOME/bin/:$PATH"
-
-echo "+ Set ANT_HOME to $ANT_HOME and updated path"
-
-
-echo "-----"
-echo "To create an Expeditee distribution, type:"
-echo ""
-echo "  ant build"
-
-echo ""
-
Index: trunk/expeditee-setup.bash
===================================================================
--- trunk/expeditee-setup.bash	(revision 1572)
+++ 	(revision )
@@ -1,263 +1,0 @@
-
-# Script written to be compatible with a variety of 'sh' derived shells: 
-#   ash, bash, dash ...
-
-explang=""
-# encoding inputs and outputs
-exptoenc=""
-expfromenc=""
-
-# see if the shell has any language environment variables set
-# see locale(7) manpage for this ordering.
-if test ! -z "$LC_ALL" ; then
-  explang="$LC_ALL"
-elif test ! -z "$LANG"; then
-  explang="$LANG"
-fi
-
-
-# note... all our output strings have the charset hard-coded, but
-# people may be using a different encoding in their terminal. LANG
-# strings look like "en_NZ.UTF-8".
-
-# Determine the requested output encoding
-case $explang in
-  *.*)
-    exptoenc=`echo $explang | sed 's/.*\.//'`
-    ;;
-esac
-
-# Our French and Spanish strings are in 'iso-8859-1' (Latin 1) encoding; 
-# Russian is the Cyrillic alphabet encoding, 'KOI8-R'
-case $explang in
-  fr*|FR*)
-    explang=fr
-    expfromenc="iso-8859-1"
-  ;;
-  es*|ES*)
-    explang=es
-    expfromenc="iso-8859-1"
-  ;;
-  ru*|RU*)
-    explang=ru
-    expfromenc="koi8r"
-  ;;
-  *) # default
-    explang=en
-    expfromenc="iso-8859-1"
-  ;;
-esac  
-
-# "iconv" is the program for converting text between encodings.
-expiconv=`which iconv 2>/dev/null`
-if test $? -ne 0 || test ! -x "$expiconv" || test -z "$expfromenc" || test -z "$exptoenc"; then
-# we can't convert encodings from some reason
-  expiconv="cat"
-else
-# add the encodings
-  expiconv="$expiconv -f $expfromenc -t $exptoenc"
-fi
-
-
-# ASCII art generated at:
-#   http://patorjk.com/software/taag/
-# Font = Epic
-#
-echo " ______           ______  ______  ______  __________________ ______  ______ "
-echo "(  ___ \|\     /|(  ___ )(  ___ \(  __  \ \__   __/\__   __/(  ___ \(  ___ \\"
-echo "| (   \/( \   / )| (   )|| (   \/| (  \  )   ) (      ) (   | (   \/| (   \/"
-echo "| (_     \ (_) / | (___)|| (_    | |   ) |   | |      | |   | (_    | (_    "
-echo "|  __)    ) _ (  |  ____)|  __)  | |   | |   | |      | |   |  __)  |  __)  "
-echo "| (      / ( ) \ | (     | (     | |   ) |   | |      | |   | (     | (     "
-echo "| (___/\( /   \ )| )     | (___/\| (__/  )___) (___   | |   | (___/\| (___/\\"
-echo "(______/|/     \||/      (______/(______/ \_______/   )_(   (______/(______/"
-echo
-echo "(C) 2013, University of Waikato, New Zealand"
-echo
-echo
-echo
-
-# make sure we are sourced, and not run
-
-if test "$0" != "`echo $0 | sed s/expeditee-setup\.bash//`" ; then
-# if $0 contains "expeditee-setup.bash" we've been run... $0 is shellname if sourced.
-# One exception is zsh has an option to set it temporarily to the script name
-  if test -z "$ZSH_NAME" ; then
-  # we aren't using zsh
-  expeditee_not_sourced=true
-  fi
-fi
-
-if test -n "$expeditee_not_sourced" ; then
-  case "$explang" in
- "es")
-eval $expiconv <<EOF
-      Error: Asegúrese de compilar este guión, no de ejecutarlo. P. ej.:
-         $ source expeditee-setup.bash
-      o
-         $ . ./expeditee-setup.bash
-      no
-         $ ./expeditee-setup.bash
-EOF
-  ;;
-  "fr")
-eval $expiconv <<EOF
-      Erreur: Assurez-vous de "sourcer" le script, plutôt que de l'exécuter. Ex:
-         $ source expeditee-setup.bash
-      ou
-         $ . ./expeditee-setup.bash
-      pas
-         $ ./expeditee-setup.bash
-EOF
-  ;;
-  "ru")
-eval $expiconv <<EOF
-      ïÛÉÂËÁ: õÄÏÓÔÏ×ÅÒØÔÅÓØ × ÉÓÔÏÞÎÉËÅ ÜÔÏÇÏ ÓËÒÉÐÔÁ. îÅ ÉÓÐÏÌÎÑÊÔÅ ÅÇÏ.
-      îÁÐÒÉÍÅÒ:
-         $ source expeditee-setup.bash
-      ÉÌÉ
-         $ . ./expeditee-setup.bash
-      ÎÅÔ
-         $ ./expeditee-setup.bash
-EOF
-  ;;
-  *)
-eval $expiconv <<EOF
-	Error: Make sure you source this script, not execute it. Eg:
-		$ source expeditee-setup.bash
-	or
-		$ . ./expeditee-setup.bash
-	not
-		$ ./expeditee-setup.bash
-EOF
-  ;;
-  esac
-elif test -n "$EXPEDITEE_HOME" ; then
-  case "$explang" in
-  "es")
-    echo '¡Su ambiente ya está listo para Expeditee!' | eval $expiconv
-  ;;
-  "fr")
-    echo 'Votre environnement est déjà préparé pour Expeditee!' | eval $expiconv
- ;;
-  "ru")
-    echo '÷ÁÛÅ ÏËÒÕÖÅÎÉÅ ÕÖÅ ÎÁÓÔÒÏÅÎÏ ÄÌÑ Expeditee!' | eval $expiconv
-  ;;
-  *)
-    echo 'Your environment is already set up for Expeditee!'
-  ;;
-  esac
-elif test ! -f expeditee-setup.bash ; then
-  case "$explang" in
-    "es")
-      echo 'Usted debe compilar el guión desde el interior del directorio de inicio' | eval $expiconv
-  ;;
-    "fr")
-      echo 'Vous devez trouver la source du script dans le répertoire de base de Expeditee' | eval $expiconv
-  ;;
-    "ru")
-      echo '÷ÁÍ ÎÅÏÂÈÏÄÉÍ ÉÓÔÏÞÎÉË ÓËÒÉÐÔÁ ÉÚ ÂÁÚÏ×ÏÊ ÄÉÒÅËÔÏÒÉÉ Expeditee' | eval $expiconv
-  ;;
-   *)
-      echo 'You must source the script from within the Expeditee home directory'
-  ;;
-  esac
-else
-  EXPEDITEE_HOME=`pwd`
-  export EXPEDITEE_HOME
-
-  if test "x$EXPOS" = "x" ; then
-    EXPOS=`uname -s | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-    # check for running sh/bash under cygwin
-    if test "`echo $EXPOS | sed 's/cygwin//'`" != "$EXPOS" ;
-    then
-      EXPOS=windows
-    fi
-  fi
-  export EXPOS
-
-  # check for running sh/bash under mingw
-  if test "`echo $EXPOS | sed 's/mingw//'`" != "$EXPOS" ;
-  then
-    EXPOS=windows
-  fi
-  export EXPOS
-
-  # Establish cpu architecture
-  # 32-bit or 64-bit?
-  UNAME_HW_MACH=`uname -m`
-
-  # Following test came from VirtualBox's Guest Additions autostart.bash
-  # (adapted for use in Expeditee)
-  case "$UNAME_HW_MACH" in
-    i[3456789]86|x86|i86pc)
-      EXPARCH='32bit'
-      ;;
-    x86_64|amd64|AMD64)
-      EXPARCH='64bit'
-      ;;
-    *)
-      echo "Unknown architecture: $UNAME_HW_MACH"
-      ;;
-  esac
-
-  # Only want non-trival EXPARCH value set if there is evidence of
-  # the installed bin (lib, ...) directories using linux32, linux64
-  # (otherwise probably looking at an SVN compiled up version for single OS)
-  if test ! -d "$EXPEDITEE_HOME/$EXPOS/$EXPARCH" ;
-  then 
-    EXPARCH=""
-  fi
-
-  export EXPARCH
-
-  PATH=$EXPEDITEE_HOME/script:$EXPEDITEE_HOME/$EXPOS/$EXPARCH:$PATH
-  export PATH
-  
-#  if test "$EXPOS" = "linux" ; then
-#      LD_LIBRARY_PATH="$EXPEDITEE_HOME/lib/$EXPOS$EXPARCH:$LD_LIBRARY_PATH"
-#	  export LD_LIBRARY_PATH
-#  elif test "$EXPOS" = "darwin" ; then
-#      DYLD_LIBRARY_PATH="$EXPEDITEE_HOME/lib/$EXPOS$EXPARCH:$DYLD_LIBRARY_PATH"
-#      export DYLD_LIBRARY_PATH
-#  fi
- 
-#  MANPATH=$MANPATH:$EXPEDITEE_HOME/man
-#  export MANPATH
-
-  case "$explang" in
-    "es")
-      echo 'Su ambiente ha sido configurado para correr los programas Expeditee.' | eval $expiconv
-    ;;
-    "fr")
-      echo 'Votre environnement a été configuére avec succès pour exécuter Expeditee' | eval $expiconv
-    ;;
-    "ru")
-      echo '÷ÁÛÅ ÏËÒÕÖÅÎÉÅ ÂÙÌÏ ÕÓÐÅÛÎÏ ÎÁÓÔÒÏÅÎÏ, ÞÔÏÂÙ ÕÓÔÁÎÏ×ÉÔØ Expeditee' | eval $expiconv
-    ;;
-    *)
-      echo 'Your environment has successfully been set up to run Expeditee'
-    ;;
-  esac
-fi
-unset expeditee_not_sourced
-unset expiconv
-unset expfromenc
-unset exptoenc
-
-if test -f local-setup.bash ; then
-    echo "+ Sourcing local-setup.bash"
-    . ./local-setup.bash 
-fi
-
-#which java >/dev/null 2>&1 
-#
-#if [ $? != 0 ] ; then
-#  echo "Unable to find a Java runtime" >2
-#else 
-#  echo "-----"
-#  echo "To run the Expeditee Browser, type:"
-#  echo "  expeditee"
-#  echo ""
-#fi
-
Index: trunk/expeditee-setup.bat
===================================================================
--- trunk/expeditee-setup.bat	(revision 1572)
+++ 	(revision )
@@ -1,128 +1,0 @@
-@echo off
-
-setlocal enabledelayedexpansion
-
-pushd "%CD%"
-CD /D "%~dp0"
-set EXPLANG=en
-
-:: ASCII art generated at:
-::   http://patorjk.com/software/taag/
-:: Font = Epic
-::
-echo  ______           ______  ______  ______  __________________ ______  ______
-echo (  ___ \^|\     /^|(  ___ )(  ___ \(  __  \ \__   __/\__   __/(  ___ \(  ___ \
-echo ^| (   \/( \   / )^| (   )^|^| (   \/^| (  \  )   ) (      ) (   ^| (   \/^| (   \/
-echo ^| (__    \ (_) / ^| (___)^|^| (_    ^| ^|   ) ^|   ^| ^|      ^| ^|   ^| (__   ^| (__   
-echo ^|  __)    ) _ (  ^|  ____)^|  __)  ^| ^|   ^| ^|   ^| ^|      ^| ^|   ^|  __)  ^|  __)  
-echo ^| (      / ( ) \ ^| (     ^| (     ^| ^|   ) ^|   ^| ^|      ^| ^|   ^| (     ^| (     
-echo ^| (___/\( /   \ )^| )     ^| (___/\^| (__/  )___) (___   ^| ^|   ^| (___/\^| (___/\
-echo (______/^|/     \^|^|/      (______/(______/ \_______/   )_(   (______/(______/
-echo.
-echo (C) 2013, University of Waikato, New Zealand
-echo.
-echo.
-echo.
-
-if "!EXPEDITEE_HOME!" == "" goto start
-if "!EXPEDITEE_HOME!" == "!CD!" if not "!EXPOS!" == "" (
-	echo Your environment is already set up for Expeditee
-	goto done
-)
-
-:start
-if "!OS!" == "Windows_NT" goto WinNT
-if "!OS!" == "" goto Win95
-if "!EXPLANG!" == "en" echo Setup failed - your PATH has not been set
-if "!EXPLANG!" == "es" echo No se pudo realizar la configuraci¢n - no se ha establecido la RUTA.
-if "!EXPLANG!" == "fr" echo Echc de l'installation - votre variable PATH n'a pas t ajuste
-if "!EXPLANG!" == "ru" echo áâ ­®¢ª  ­¥ ã¤ « áì -  ­¥ ¡ë« ãáâ ­®¢«¥­
-goto End
-
-:WinNT
-set EXPEDITEE_HOME=%CD%
-set EXPOS=windows
-
-set PATH=!EXPEDITEE_HOME!\windows;!EXPEDITEE_HOME!\script;!PATH!
-
-set EXP_CP_SET=yes
-goto Success
-
-:Win95
-if "%1" == "SetEnv" goto Win95Env
-REM We'll invoke a second copy of the command processor to make
-REM sure there's enough environment space
-COMMAND /E:2048 /K %0 SetEnv
-goto End
-
-:Win95Env
-set EXPEDITEE_HOME=%CD%
-set EXPOS=windows
-
-set PATH=!EXPEDITEE_HOME!\windows;!EXPEDITEE_HOME!\script;!PATH!
-
-set EXP_CP_SET=yes
-goto Success
-
-
-:Success
-if "!EXPLANG!" == "en" echo.
-if "!EXPLANG!" == "en" echo Your environment has successfully been set up to run Expeditee.
-if "!EXPLANG!" == "en" echo Note that these settings will only have effect within this MS-DOS
-if "!EXPLANG!" == "en" echo session. You will therefore need to rerun expeditee-setup.bat if you want
-if "!EXPLANG!" == "en" echo to run Expeditee programs from a different MS-DOS session.
-if "!EXPLANG!" == "en" echo.
-
-if "!EXPLANG!" == "es" echo.
-if "!EXPLANG!" == "es" echo Su ambiente ha sido configurado para correr los programas Expeditee.
-if "!EXPLANG!" == "es" echo Recuerde que estos ajustes £nicamente tendr n efecto dentro de esta sesi¢n
-if "!EXPLANG!" == "es" echo MS-DOS. Por lo tanto deber  ejecutar nuevamente expeditee-setup.bat si desea
-if "!EXPLANG!" == "es" echo correr los programas de Expeditee desde una sesi¢n MS-DOS diferente.
-if "!EXPLANG!" == "es" echo.
-
-if "!EXPLANG!" == "fr" echo.
-if "!EXPLANG!" == "fr" echo Votre environnement a t configure avec succs pour excuter Expeditee
-if "!EXPLANG!" == "fr" echo Notez que ces paramtrages n'auront d'effet que dans cette session MS-DOS.
-if "!EXPLANG!" == "fr" echo Vous devrez par consquent rexcuter expeditee-setup.bat si vous voulez faire
-if "!EXPLANG!" == "fr" echo lancer des programmes Expeditee dans une autre session MS-DOS.
-if "!EXPLANG!" == "fr" echo.
-
-if "!EXPLANG!" == "ru" echo.
-if "!EXPLANG!" == "ru" echo  è¥ ®ªàã¦¥­¨¥ ¡ë«® ãá¯¥è­® ­ áâà®¥­®, çâ®¡ë ãáâ ­®¢¨âì Expeditee ¡à â¨â¥
-if "!EXPLANG!" == "ru" echo ¢­¨¬ ­¨¥, çâ® íâ¨ ­ §­ ç¥­¨ï ¡ã¤ãâ â®«ìª® ¨¬¥âì íää¥ªâ ¢ ¯à¥¤¥« å íâ®£® MS DOS
-if "!EXPLANG!" == "ru" echo á¥áá¨ï. ë ¡ã¤¥â¥ ¯®íâ®¬ã ¤®«¦­ë ¯®¢â®à­® ã¯à ¢«ïâì expeditee-setup.bat, ¥á«¨ ë å®â¨â¥
-if "!EXPLANG!" == "ru" echo ã¯à ¢«ïâì ¯à®£à ¬¬ ¬¨ ¥«ñ­ëå ¨§¢¥à¦¥­­ëå ¯®à®¤ ®â à §«¨ç­®© á¥áá¨¨ MS DOS.
-if "!EXPLANG!" == "ru" echo.
-
-:End
-endlocal & set PATH=%PATH%& set EXPEDITEE_HOME=%EXPEDITEE_HOME%& set EXPOS=%EXPOS%
-
-setlocal enabledelayedexpansion
-
-if exist "%EXPEDITEE_HOME%\local" (
-  if exist "!EXPEDITEE_HOME!\local\setup.bat" (
-    echo.
-    echo Running !EXPEDITEE_HOME!\local\setup.bat
-    cd "!EXPEDITEE_HOME!\local"
-    call setup.bat 
-    cd "!EXPEDITEE_HOME!"
-  )
-)
-
-:: Consider the equivlent converted to DOS syntax??
-:: which >/dev/null java 2>&1 
-
-
-
-:done
-popd
-endlocal & set PATH=%PATH%& set EXPEDITEE_HOME=%EXPEDITEE_HOME%& set EXPOS=%EXPOS%
-
-:: if [ $? != 0 ] ; then
-::   echo "Unable to find a Java runtime" >2
-:: else 
-::  echo "-----"
-::  echo "To run the Expeditee Browser, type:"
-::  echo "  expeditee"
-::  echo ""
-::fi
Index: trunk/local-devel.bash.in
===================================================================
--- trunk/local-devel.bash.in	(revision 1572)
+++ 	(revision )
@@ -1,18 +1,0 @@
-
-
-which javac >/dev/null 2>&1 
-
-if [ $? != 0 ] ; then
-  export JAVA_HOME="**Replace with your value for JAVA home**"
-  export PATH=$JAVA_HOME/bin/:$PATH
-
-  echo "+ Set JAVA_HOME to $JAVA_HOME and updated path"
-
-  cygpath 2>/dev/null
-  if [ $? != 0 ] ; then
-    echo "Detected runing in Cygwin environment => Changing JAVA_HOME to Windows native format"
-    export JAVA_HOME=`cygpath -w "$JAVA_HOME"`
-  fi
-fi
-
-
