Merged revisions 539476-539480,539482-539483,539485-539500,539502-539593,539595-539782,539784-539787,539789-540106,540108-540168,540170-540510,540512-541246,541248-541919,541921-542483,542485-542788,542790-543495,543497-544108,544110-544421,544423-544507,544509-546095,546097-546189,546191-546440,546442-546457,546459-547177,547179-547626,547628-548381 via svnmerge from

https://svn.apache.org/repos/asf/incubator/qpid/branches/M2 ........ r539476 | ritchiem | 2007-05-18 15:12:28 +0100 (Fri, 18 May 2007) | 1 line QPID-401 Update to pom to correctly set the broker.dir ........ r544866 | rupertlssmith | 2007-06-06 16:25:02 +0100 (Wed, 06 Jun 2007) | 1 line Updated examples to build source jar. Also put the java14 retrotranslated module back in now that the strange repeating build problem is solved. ........ r545146 | ritchiem | 2007-06-07 12:30:01 +0100 (Thu, 07 Jun 2007) | 1 line POM update renumbering tests now we have trimmed down the tests being run. ........ r548276 | ritchiem | 2007-06-18 10:59:32 +0100 (Mon, 18 Jun 2007) | 1 line Various License header updates. ........ r548279 | ritchiem | 2007-06-18 11:17:20 +0100 (Mon, 18 Jun 2007) | 1 line Various License header updates. ........ r548302 | ritchiem | 2007-06-18 11:49:50 +0100 (Mon, 18 Jun 2007) | 2 lines Various License header updates. Update to PrincipalDatabase's to ensure they work correctly with # comments. ........ r548308 | ritchiem | 2007-06-18 11:58:38 +0100 (Mon, 18 Jun 2007) | 1 line Various License header updates, missed this file. Though the first update of it via the JMX console will remove the license. ........ r548312 | rupertlssmith | 2007-06-18 12:03:09 +0100 (Mon, 18 Jun 2007) | 1 line Added SLF4J to Log4J binding. ........ r548315 | ritchiem | 2007-06-18 12:07:45 +0100 (Mon, 18 Jun 2007) | 1 line Old lib dir from M1 ........ r548317 | ritchiem | 2007-06-18 12:13:57 +0100 (Mon, 18 Jun 2007) | 1 line Old lib dirs from M1 ........ r548319 | ritchiem | 2007-06-18 12:16:25 +0100 (Mon, 18 Jun 2007) | 1 line Mistakenly checked in Intelij file ........ r548381 | ritchiem | 2007-06-18 16:37:41 +0100 (Mon, 18 Jun 2007) | 1 line QPID-525 Memory leak in DestWildExchange. Used routing key in remove rather than empty queue ........ git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@548400 13f79535-47bb-0310-9956-ffa450edef68
author: Martin Ritchie <ritchiem@apache.org> 2007-06-18 16:29:49 +0000
committer: Martin Ritchie <ritchiem@apache.org> 2007-06-18 16:29:49 +0000
commit: d43e1a5351598e558d01de9493c21870b3b0bcbb (patch)
tree: 4450cc8c14572b1f06a975970a052bffbc2acf74 /java/common
parent: 45b526ce09daee869ec1313808583f7e05bff7bb (diff)
download: qpid-python-d43e1a5351598e558d01de9493c21870b3b0bcbb.tar.gz
32 files changed, 211 insertions, 1250 deletions
diff --git a/java/common/lib/backport-util-concurrent/LEGAL b/java/common/lib/backport-util-concurrent/LEGAL
deleted file mode 100644
index 340d1022b0..0000000000
--- a/java/common/lib/backport-util-concurrent/LEGAL
+++ /dev/null
@@ -1,8 +0,0 @@
-The backport-util-concurrent software has been released to the public domain, 
-as explained at: http://creativecommons.org/licenses/publicdomain.
-
-Acknowledgements: backport-util-concurrent is based in large part on the public 
-domain sources from: 
-1) JSR166, 
-2) package dl.util.concurrent,
-3) Doug Lea's "collections" package.
diff --git a/java/common/lib/backport-util-concurrent/README.html b/java/common/lib/backport-util-concurrent/README.html
deleted file mode 100644
index 7e4ab10e14..0000000000
--- a/java/common/lib/backport-util-concurrent/README.html
+++ /dev/null
@@ -1,614 +0,0 @@
-<html>
-  <head>
-    <title>backport-util-concurrent - Distributed Computing Laboratory</title>
-    <meta content="java.util.concurrent backport">
-  </head>
-  <body>
-
-<h1>backport-util-concurrent</h1>
-<p>Backport ot JSR 166 (java.util.concurrent) to Java 1.4</p>
-<p><a href="http://dcl.mathcs.emory.edu/util/backport-util-concurrent/">http://dcl.mathcs.emory.edu/util/backport-util-concurrent/</a></p>
-<hr class="hide">
-
-<h2>Overview</h2>
-
-<p>
-This package is the backport of 
-<a href="http://gee.cs.oswego.edu/dl/concurrency-interest/">java.util.concurrent</a> API, 
-introduced in 
-<a href="http://java.sun.com/j2se/1.5.0/docs/guide/concurrency/overview.html">Java 5.0</a>,
-to Java 1.4. The backport is based on public-domain sources from the
-<a href="http://gee.cs.oswego.edu/cgi-bin/viewcvs.cgi/jsr166/src/main/java/">
-JSR 166 CVS repository</a>, the
-<a href="http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/intro.html">
-dl.util.concurrent</a> package, and the Doug Lea's
-<a href="http://gee.oswego.edu/dl/classes/collections/">
-collections</a> package.
-
-The backport is close to complete; unsupported functionality is 
-limited to: 1) classes that rely on explicit 
-JVM support and cannot be emulated at a satisfactory
-performance level, 2) some of the functions 
-described in the original javadoc as "designed primarily for use in 
-monitoring in system state, not for synchronization control", or 3) 
-functionality 
-that would require development of substantial amount of new code.
-</p>
-<p>
-The purpose of this library is to enable gradual migration from Java 1.4 
-to 5.0: the library allows to develop concurrent applications for Java 1.4 
-that should work with Java 5.0 simply by changing package names.
-</p>
-
-<h3>License</h3>
-
-<p>
-This software is released to the 
-<a href="http://creativecommons.org/licenses/publicdomain">public domain</a>,
-in the spirit of the original code written by Doug Lea.
-The code can be used for any purpose, modified, and redistributed 
-without acknowledgment. No warranty is provided, either express or implied.
-</p>
-<p>
-<em>Note:</em> versions prior to 2.1 had dependencies on proprietary code.
-	Versions 2.1 and newer do not have such dependencies anymore.
-</p>
-
-<h3>Features</h3>
-
-<p>
-The following functionality of java.util.concurrent is supported in the backport:
-<ul>
-<li>All JSR 166 executors, utilities, and everything related (thread pools, 
-FutureTask, scheduled tasks and executors, etc.)</li>
-<li>Locks: ReentrantLock, Semaphore, ReentrantReadWriteLock, Conditions</li>
-<li>Queues: synchronous, array, linked, delay, and priority queues</li>
-<li>Deques: array, and linked deques</li>
-<li>Atomics: everything except reflection-based updaters</li>
-<li>Other concurrency utils: CountDownLatch, CyclicBarrier, Exchanger</li>
-<li>Concurrent collections: ConcurrentHashMap, CopyOnWriteArrayList, CopyOnWriteArraySet,
-    ConcurrentLinkedQueue, 
-    ConcurrentSkipList[Map,Set]</li>
-<li>Retrofitted standard collections</li>
-</ul>
-</p>
-
-<h2>Compatibility</h2>
-
-JSR 166 functionality is tied closely to the Java 5.0 Virtual Machine, and some aspects of it 
-cannot be fully
-backported to Java 1.4. This section discusses these differences between the backport and
-JSR 166.
-
-<h3>Package Names</h3>
-
-<p>Since user libraries cannot define classes in
-java.* packages, all the original package names have been prefixed with
-<code>edu.emory.mathcs.backport</code>. For instance, <code>java.util.concurrent.Future</code> becomes <code>edu.emory.mathcs.backport.java.util.concurrent.Future</code>.
-</p>
-
-<h3>Differences between versions</h3>
-
-<p>
-The backport, version 1.1 and above, includes
-functionality of JSR 166 that has been added in Java 6.0. 
-Pay attention to the "since" javadoc tags if conformance with specific 
-Java platform versions is desired. Examples of "since 1.6" functionality include:
-deques, navigable maps and sets (including ConcurrentSkipList[Map,Set]),
-"newTaskFor" in AbstractExecutorService,
-"lazySet" in atomics, RunnableFuture and RunnableScheduledFuture, 
-"allowCoreThreadTimeout" in ThreadPoolExecutor, 
-"decorateTask" in ScheduledThreadPoolExecutor, MINUTES, HOURS, and DAYS in TimeUnit,
-and appropriate retrofits in collection classes. As of backport version 2.2, these
-features are based on beta versions of Java 6.0 APIs, which may still change in the future.
-</p>
-<p>Backport is developed carefully to retain link-time compatibility, i.e. it is generally 
-   safe to replace an old library JAR with a new one (with a possible exception of APIs
-   based on beta releases, e.g. current "since 1.6" classes and methods). Serial compatibility 
-   (i.e. ability of
-   one version to deserialize objects that has been serialized using a different version)
-   is maintained on a  best-effort basis, and not always guaranteed.
-   Please see details below. (Note that concurrency tools are usually not intended for
-   persistent storage anyway). Compile-time compatibility: applications using
-   wildcard imports (e.g. java.util.* and edu.emory.mathcs.backport.java.util.*) may
-   cease to compile with updated backport versions (containing new classes) 
-   due to import ambiguities. In such cases, you must dis-ambiguate
-   imports (i.e. use explicit imports as appropriate) and recompile.
-</p>
-<p>Notes for version 2.2:
-   Link-time and serial compatibility is fully preserved for "since 1.5" APIs. For
-   "since 1.6" APIs, link-time and serial compatibility is preserved except for
-   navigable maps and sets, which API has recently changed slightly in 
-   Java 6.0 beta.
-</p>
-<p>Notes for version 2.1: 
-   Link-time compatibility is preserved fully. 
-   Serial compatibility is preserved except for the class ReentrantReadWriteLock.
-</p>
-<p>Notes for version 2.0:
-<ul>
-<li>the "concurrent.Concurrent" class has been removed as of backport 2.0.</li>
-<li>Serialized representations
-    of several lock classes have changed between versions 1.1_01 and 2.0,
-    as a result of certain bug fixes and performance improvements (see changelog).
-    This means that locks and collections serialized with 1.1_01 will not be
-    deserialized properly by 2.0.
-</li>
-</ul>
-</p>
-
-<h3>Unsupported functionality</h3>
-
-<p>
-Detailed listing of functionality that has not been backported
-is presented below.
-</p>
-
-<h4>Java 5.0 Syntax</h4>
-<p>
-Package java.util.concurrent exploits new language features
-introduced in Java 5.0. In particular, most API classes are
-<a href="http://java.sun.com/j2se/1.5.0/docs/guide/language/generics.html">generic types</a>.
-In the backport, they have been flattened to standard, non-generic 
-classes. Still, programs linked against the backport should compile 
-with Java 5.0 (after changing package names). Nevertheless, you may 
-want to consider gradually switching to using generics once you make 
-the transition to Java 5.0, since it gives better compile-time 
-type checking.
-</p>
-
-<h4>In Condition</h4>
-<p>
-Method long awaitNanos(long nanosTimeout) is not supported, since the
-emulation cannot reliably report remaining times with nanosecond 
-precision. Thus, it probably would be too dangerous to leave the
-emulated method in the Condition interface. However, the method is
-still available, for those who know what they are doing,
-in the <a href="doc/api/edu/emory/mathcs/backport/java/util/concurrent/helpers/Utils.html">util.concurrent.helpers.Utils</a> class.
-</p>
-
-<h4>In ReentrantLock</h4>
-<p>
-the following monitoring methods are supported only for fair locks: 
-boolean hasQueuedThreads(), int getQueueLength(), Collection 
-getQueuedThreads(), boolean isQueued(), boolean hasWaiters(Condition),
-int getWaitQueueLength(Condition), 
-Collection getWaitingThreads(Condition).
-</p>
-
-<h4>In ReentrantReadWriteLock</h4>
-<p>
-The current backport implementation is based on dl.util.concurrent class
-ReentrantWriterPreferenceReadWriteLock, and thus slightly departs
-from java.util.concurrent that does not specify acquisition order but 
-allows to enable/disable fairness. The backport implementation does not 
-have a single-parameter constructor allowing to specify fairness policy; 
-it always behaves like writer-preference lock with no fairness guarantees.
-Because of these characteristics, this class is compliant with JSR 166 
-specification of non-fair reentrant read-write locks, while the exact 
-semantics of fair locks are not supported (and the appropriate 
-constructor is thus not provided).
-</p>
-<p>
-Also, the following instrumentation and status methods are not 
-supported: Collection getQueuedWriterThreads(), Collection 
-getQueuedReaderThreads(), boolean hasQueuedThreads(), boolean 
-hasQueuedThread(Thread), Collection getQueuedThreads(), boolean 
-hasWaiters(Condition), int getWaitQueueLength(Condition), Collection 
-getWaitingThreads(Condition).
-</p>
-
-<h4>In Semaphore</h4>
-<p>
-Blocking atomic multi-acquires: acquire(int permits)
-and
-tryAcquire(int permits, long timeout, TimeUnit unit) 
-are supported only for FAIR semaphores.
-</p>
-
-<h4>Platform-level functionality</h4>
-<p>
-To emulate System.nanoTime(), the method 
-<a href="doc/api/edu/emory/mathcs/backport/java/util/concurrent/helpers/Utils.html#nanoTime()">nanoTime()</a> 
-is provided in the class 
-dl.util.concurrent.helpers.Utils. On Java 1.4.2, it attempts to use
-high-precision timer via sun.misc.Perf (thanks to Craig Mattocks
-for suggesting this). On older Java platforms, or when sun.misc.Perf
-is not supported, it falls back to System.currentTimeMillis().
-</p>
-<p>
-Class <a href="doc/api/edu/emory/mathcs/backport/java/util/concurrent/helpers/ThreadHelpers.html">ThreadHelpers</a>
-(added in 1.0_01) is provided to emulate certain aspects of Thread.UncaughtExceptionHandler.
-</p>
-
-<h4>Note on nanosecond precision timing</h4>
-<p>
-The backport strives to honor nanosecond timeouts, if such are requested, 
-by using two-parameter variant of Object.wait(). Note, however, that most 
-Java platforms before 5.0 will round up the timeout to full milliseconds 
-anyway.
-</p>
-
-<h4>Low-level concurrency classes</h4>
-<p>
-The following classes are not supported: 
-LockSupport, AbstractQueuedSynchronizer, AbstractQueuedLongSynchronizer. 
-</p><p><i>Rationale: </i> on Java 5.0, these classes depend on explicit
-JVM support, delegating to low-level OS concurrency primitives. There seems
-to be no simple way of emulating them without introducing prohibitive 
-performance overhead. (If you think they should be present in the backport
-anyway, let me know).
-</p>
-
-<h4>Atomic utilities</h4>
-<p>
-The following "atomic" utilities are not supported: 
-Atomic[Integer,Long,Reference]FieldUpdater.
-
-</p>
-
-<h2>Robustness</h2>
-
-<p>
-Backport-util-concurrent is based in large part on source code from JSR 166 
-and dl.util.concurrent, both very 
-well tested. Whenever possible, the JSR 166 code was used. In cases when 
-it was infeasible (e.g. for performance reasons), 
-the dl.util.concurrent code was adapted. The new 
-code was introduced only when absolutely necessary, e.g. to make 
-dl.util.concurrent code conforming to JSR 166 interfaces and semantics. This
-partially explains why so few bugs have been reported again the backport,
-despite over 10,000 downloads and many deployments in commercial and 
-open-source projects.
-</p>
-
-<h3>Unit tests</h3>
-<p>
-Version 2.1 of the library passes all the relevant 1859 unit tests from 
-<a href="http://gee.cs.oswego.edu/cgi-bin/viewcvs.cgi/jsr166/src/test/tck/">TCK test package</a>
-designed for java.util.concurrent (the tests of unsupported functionality 
-were skipped).
-</p>
-<p>
-The following unit tests have been completed (listed in the alphabetical order):
-AbstractExecutorServiceTest,
-AbstractQueueTest,
-ArrayBlockingQueueTest,
-ArrayDequeTest,
-AtomicBooleanTest,
-AtomicIntegerArrayTest,
-AtomicIntegerTest,
-AtomicLongArrayTest,
-AtomicLongTest,
-AtomicMarkableReferenceTest,
-AtomicReferenceArrayTest,
-AtomicReferenceTest,
-AtomicStampedReferenceTest,
-ConcurrentHashMapTest,
-ConcurrentLinkedQueueTest,
-ConcurrentSkipListMapTest,
-ConcurrentSkipListSubMapTest,
-ConcurrentSkipListSetTest,
-ConcurrentSkipListSubSetTest,
-CopyOnWriteArrayListTest,
-CopyOnWriteArraySetTest,
-CountDownLatchTest,
-CyclicBarrierTest,
-DelayQueueTest,
-EntryTest,
-ExchangerTest,
-ExecutorsTest,
-ExecutorCompletionServiceTest,
-FutureTaskTest,
-LinkedBlockingDequeTest,
-LinkedBlockingQueueTest,
-LinkedListTest,
-PriorityBlockingQueueTest,
-PriorityQueueTest,
-ReentrantLockTest,
-ReentrantReadWriteLockTest,
-ScheduledExecutorTest,
-ScheduledExecutorSubclassTest,
-SemaphoreTest,
-SynchronousQueueTest,
-SystemTest (testing Utils.nanoTime()),
-ThreadLocalTest,
-ThreadPoolExecutorTest,
-ThreadPoolExecutorSubclassTest,
-TimeUnitTest,
-TreeMapTest,
-TreeSubMapTest,
-TreeSetTest,
-TreeSubSetTest.
-</p>
-
-<h3>Stress tests</h3>
-<p>
-Starting from version 1.1_01, the 
-backport is being stress-tested using the "loops" tests from JSR 166 
-(courtesy of Doug Lea and the JSR 166 Expert Group). The tests, included 
-in the development source 
-bundle, thoroughly evaluate behavior and performance of various types 
-of locks, queues, maps, futures, and other API classes, under various 
-conditions (contention etc.) and circumstances, including cancellation.
-</p>
-
-<p>
-Despite exhaustive testing, as any software, this library may still contain 
-bugs. If you find one, please report it, or better yet, contribute a fix. 
-</p>
-
-<h3>Known problems</h3>
-
-<p>
-<strong>Note: </strong>A bug has been reported against Sun 1.4.2_04 JVMs, and fixed in
-1.4.2_06 (see ID 4917709) that makes those JVMs to occassionally crash with SIGSEGV 
-during backport stress tests, 
-particularly MapLoops and MapChecks. It is therefore recommended to use JVM versions 
-1.4.2_06 or newer when using the backport (although the crashes seem to not happen also
-on 1.4.2_03, and perhaps on earlier JVMs). Detected in version: 2.0.
-</p>
-<p>
-<strong>Note: </strong>due to what is apparently a bug in SUN JVM implementations
-for Solaris, observed on 1.4.2_03 and 1.4.2_06,
-the 'ExecutorsTest.testPrivilegedThreadFactory()'
-unit test fails with ClassNotFoundException when launched from a class path
-that has backport classes stored as individual files in the "classes" directory. The 
-problem disappears when the classes are put in a JAR file. The bug is most likely
-related to handling context class loaders. It is therefore advised to use JAR
-files instead of class files when running code that explicitly or implicitly
-modifies context class loaders, as does privileged thread factory.
-Detected in version: 2.0.
-</p>
-<p>
-<strong>Note: </strong>missed signals have been observed on Linux 2.6.3-7 kernel
-for SMP w/64GB support under contention and in the presence of frequent timeouts.
-(The bug was captured during TimeoutProducerConsumerLoops on SynchronousQueue).
-Apparently, this is caused by a kernel bug. The problem have been observed on 
-several different JVMs. It does not occur on newer kernels.
-Detected in version: 2.0.
-</p>
-<p>
-As evident from the above, IT IS CRUCIAL THAT YOU RUN THE STRESS TESTS on the 
-target configuration before using the backport in a production environment.
-Concurrency issues are tricky, and possible bugs in JVMs, operating systems, 
-and this software, usually won't show up until under heavy loads. Stress tests
-included with this distribution test this software under extreme conditions,
-so if they are consistently passing, there's a very good chance that everything
-works fine.
-</p>
-
-<h2>Changelog</h2>
-
-<p>
-
-Version 2.2 (Jun 4, 2006) [<a href="http://www.mathcs.emory.edu/dcl/util/backport-util-concurrent/dist/backport-util-concurrent-2.2/backport-util-concurrent-2.2-changelog.html">CVS log</a>]
-
-<ul>
-<li>New features</li>
-  <ul>
-    <li>The backport now compiles under Java 5.0.</li>
-    <li>Enhancements in the Navigable[Map,Set] interfaces.</li>
-    <li>Blocking atomic multi-acquires in fair semaphores.</li>
-    <li>Javadoc enhancements (reconciled with recent java.util.concurrent).</li>
-    <li>Shutdown upon finalization for factory-created executors.</li>
-  </ul>
-<li>Bug fixes</li>
-  <ul>
-    <li>broken type-checked map in Collections. Thanks for Taras Puchko for finding this bug
-        and submitting the fix.</li>
-    <li>Collections.reverseComparator(Comparator) not working properly when null passed as
-        the argument.</li>
-  </ul>
-<li>Tests</li>
-  <ul>
-    <li>Updated and reconciled with java.util.concurrent tests.</li>
-  </ul>
-</ul>
-
-
-Version 2.1 (Jan 28, 2006) [<a href="http://www.mathcs.emory.edu/dcl/util/backport-util-concurrent/dist/backport-util-concurrent-2.1/backport-util-concurrent-2.1-changelog.html">CVS log</a>]
-<ul>
-<li>New features</li>
-  <ul>
-  <li>Descending iterators in deques</li>
-  <li>Use newTaskFor() in ExecutionCompletionService.submit()</li>
-  <li>toArray(Object[]) appends null at the end in LinkedBlockingQueue</li>
-  <li>Overflow detection in ReentrantLock</li>
-  <li>ReentrantReadWriteLock: better conformance with JSR 166 by adding public inner classes for ReadLock and WriteLock</li>
-  <li>CopyOnWriteArraySet.equals() optimized towards small sets</li>
-  <li>Snapshot iterators in queues</li>
-  <li>Improved performance of toArray() in several collection classes</li>
-  <li>More collection stuff ported, including new things in Arrays, and base collection classes with toArray() supporting
-      concurrent collections</li>
-  <li>Improved comparison of ScheduledFutureTasks in the ScheduledThreadPoolExecutor</li>
-  </ul>
-<li>Licensing</li>
-<ul>
-  <li>New, public domain implementations for CopyOnWriteArrayList, TreeMap, TreeSet, LinkedList, Collections, Arrays</li>
-</ul>
-<li>Bug fixes</li>
-  <ul>
-  <li>Methods equals() and hashCode() were broken in PriorityQueue. The fix allows PriorityQueues to be used as hash keys.</li>
-  <li>ReentrantReadWriteLock.getWriteHoldCount could return a posititive value even if the write lock was not owned by the  inquiring thread</li>
-  <li>Condition variables were not working properly with reentrant locks when the hold count was greater than 1. Await methods were releasing only a single hold, not all of them, as they should</li>
-  <li>Handling of non-comparable entries (which is an erroneous condition) by priority queues has been made more
-      deterministic. (This issue/fix does not affect correctly written programs)</li>
-  <li>Fix of CR 6312056 (ConcurrentHashMap.entrySet().iterator() can return entry with never-existent value)</li>
-  <li>Livelock in Exchanger if used by more than two threads</li>
-  <li>Erroneous behavior of interrupted CyclicBarrier and locks on some (buggy) JVMs (thanks to Yew-Yap Goh for 
-      reporting this)</li>
-  </ul>
-<li>Tests</li>
-  <ul>
-  <li>New and improved "loops" tests, including CollectionLoops, IteratorLoops, StringMapLoops, 
-      TSPExchangerTest, TimeoutExchangerLoops, UnboundedQueueFillEmptyLoops, EntryTest</li>
-  <li>New "serial compatibility" test</li>
-  </ul>
-</ul>
-
-Version 2.0_01 (Aug 3, 2005) [<a href="http://www.mathcs.emory.edu/dcl/util/backport-util-concurrent/dist/backport-util-concurrent-2.0_01/backport-util-concurrent-2.0_01-changelog.html">CVS log</a>]
-<ul>
-<li>Compatibility fix: ConcurrentHashMap was no longer inheriting from java.util.AbstractMap, although it was in version 1.1_01. Now it does again.</li>
-<li>Licensing: new, public-domain implementation of PriorityQueue, and refactoring of backported AbstractMap so that it also contains only the public domain code.</li>
-</ul>
-Version 2.0 (Jul 6, 2005) [<a href="http://www.mathcs.emory.edu/dcl/util/backport-util-concurrent/dist/backport-util-concurrent-2.0/backport-util-concurrent-2.0-changelog.html">CVS log</a>]
-<ul>
-<li>New features</li>
-<ul>
-<li>Features and fixes resulting from reconcillation with JSR 166 as of Jul 4, 
-    such as:
-    lazySet in atomics, 
-    <a href="doc/api/edu/emory/mathcs/backport/java/util/concurrent/AbstractExecutorService.html#newTaskFor(java.lang.Runnable, java.lang.Object)">AbstractExecutorService.newTaskFor()</a>, 
-    <a href="doc/api/edu/emory/mathcs/backport/java/util/concurrent/RunnableFuture.html">RunnableFuture</a>,
-    <a href="doc/api/edu/emory/mathcs/backport/java/util/concurrent/RunnableScheduledFuture.html">RunnableScheduledFuture</a>, 
-    <a href="doc/api/edu/emory/mathcs/backport/java/util/concurrent/ScheduledThreadPoolExecutor.html#decorateTask(java.lang.Runnable, edu.emory.mathcs.backport.java.util.concurrent.RunnableScheduledFuture)">ScheduledThreadPoolExecutor.decorateTask()</a>,
-    better interrupt detection in ThreadPoolExecutor, avoiding garbage retention
-    with timeouts in SynchronousQueue, fixed reset in CyclicBarrier, 
-    remove(x,null) -> false in ConcurrentHashMap, changes in navigable maps,
-    addAll fixed in CopyOnWriteArrayList, etc.
-    
-</li>
-<li>New backported classes: 
-    <a href="doc/api/edu/emory/mathcs/backport/java/util/concurrent/ConcurrentLinkedQueue.html">ConcurrentLinkedQueue</a>, 
-    ConcurrentSkipList[<a href="doc/api/edu/emory/mathcs/backport/java/util/concurrent/ConcurrentSkipListMap.html">Map</a>,<a href="doc/api/edu/emory/mathcs/backport/java/util/concurrent/ConcurrentSkipListSet.html">Set</a>]</li>
-<li>Optimizations (replacement of ReentrantLock by synchronized) in:
-    CyclicBarrier, DelayQueue, Exchanger, ThreadPoolExecutor</li>
-<li>Optimizations of atomic variables (simple reads are now volatile rather than
-    synchronized)</li>
-<li>New backported methods in the fair implementation of the ReentrantLock:
-    <a href="doc/api/edu/emory/mathcs/backport/java/util/concurrent/locks/ReentrantLock.html#hasWaiters(edu.emory.mathcs.backport.java.util.concurrent.locks.Condition)">hasWaiters(Condition)</a>, 
-    <a href="doc/api/edu/emory/mathcs/backport/java/util/concurrent/locks/ReentrantLock.html#getWaitQueueLength(edu.emory.mathcs.backport.java.util.concurrent.locks.Condition)">getWaitQueueLength(Condition)</a>, 
-    <a href="doc/api/edu/emory/mathcs/backport/java/util/concurrent/locks/ReentrantLock.html#getWaitingThreads(edu.emory.mathcs.backport.java.util.concurrent.locks.Condition)">getWaitingThreads(Condition)</a></li>
-<li>Retrofitted collection classes: 
-    <a href="doc/api/edu/emory/mathcs/backport/java/util/AbstractMap.html">AbstractMap</a>,
-    <a href="doc/api/edu/emory/mathcs/backport/java/util/Collections.html">Collections</a>,
-    <a href="doc/api/edu/emory/mathcs/backport/java/util/LinkedList.html">LinkedList</a>,
-    Tree[<a href="doc/api/edu/emory/mathcs/backport/java/util/TreeMap.html">Map</a>,<a href="doc/api/edu/emory/mathcs/backport/java/util/TreeSet.html">Set</a>]</li>
-<li>Numerous javadoc clarifications and fixes</li>
-</ul>
-<li>Bug fixes</li>
-<ul>
-<li>Upon deserialization, ReentrantLock, ReentrantReadWriteLock, and Semaphore 
-    were potentially in a locked (or even illegal) state, contrary to the javadoc</li>
-<li>In the fair implementation of ReentrantLock, wait queues of <em>condition variables</em>
-    were not actually fair - they are now</li>
-<li>LinkedBlockingQueue had potential deadlocks in remove() and toArray(). It has
-    now been replaced by a completely new implementation, based on java.u.c (rather
-    than dl.u.c)</li>
-<li>Race condition in Condition.awaitUninterruptibly() could cause signals to be
-    missed if they were coinciding with interrupt attempts</li>
-</ul>
-
-<li>Tests</li>
-<ul>
-<li>Updated unit tests for atomics, AbstractQueuedSynchonizer, ConcurrentHashMap, 
-    CyclicBarrier, ExecutorCompletionService, LinkedBlockingQueue, ReentrantLock,
-    ReentrantReadWriteLock, ScheduledExecutor, ThreadPoolExecutor</li>
-<li>New unit tests for ConcurrentLinkedQueue, ConcurrentSkipList[Map,Set],
-    Utils.nanoTime(), LinkedList, Tree[Map,Set]</li>
-<li>Updated numerous stress tests, and new ones added: CachedThreadPoolLoops,
-    [Collection,Map]WordLoops, CASLoops, and more</li>
-</ul>
-</ul>
-Version 1.1_01 (Feb 7, 2005) [<a href="http://www.mathcs.emory.edu/dcl/util/backport-util-concurrent/dist/backport-util-concurrent-1.1_01/backport-util-concurrent-1.1_01-changelog.html">CVS log</a>]
-<ul>
-<li>Bugfix: race condition in the fair implementation of ReentrantLock 
-caused it to occassionally cause IllegalMonitorState exceptions. Non-fair
-implementation was not affected, however, classes that depend on fair reentrant locks,
-namely: fair ArrayBlockingQueue, fair SynchronousQueue, and PriorityQueue, were
-affected.
-Thanks to Ramesh Nethi for reporting this bug and helping to track it down.</li>
-
-<li>Testing: backport has been stress-tested using the "loops" tests
-(courtesy of Doug Lea and the JSR 166 Expert Group). The tests
-are included in the development source bundle.</li>
-</ul>
-
-Version 1.1 (Jan 21, 2005) [<a href="http://www.mathcs.emory.edu/dcl/util/backport-util-concurrent/dist/backport-util-concurrent-1.1/backport-util-concurrent-1.1-changelog.html">CVS log</a>]
-<ul>
-<li>Bugfix: on Windows platforms with Java 1.4.2, the library
-were sometimes behaving as if timeouts were ignored or misinterpreted,
-typically resulting in indefinite waits. This resulted from an internal
-timer overflow that occurred every several hours, and was also manifested
-as a discontinuity in System.nanoTime() values. The problem would happen
-if the overflow occurred during blocked timed wait, if additionally
-a spurious wakeup occurred after the overflow but before timeout
-in the underlying Object.wait().
-This has now been fixed; 1.0_01 users are urged to upgrade to version 1.1.
-Thanks to Ramesh Nethi for reporting this bug and greatly contributing
-to tracking it down.</li>
-
-<li>Feature: backport has been reconciled with JSR 166 CVS repository
-    on Jan 14, 2005. This results in a handful of new things:
-    <ul>
-    <li>New 
-        <a href="doc/api/edu/emory/mathcs/backport/java/util/concurrent/TimeUnit.html">time units</a>: 
-        MINUTES, HOURS, and DAYS.</li>
-    <li><a href="doc/api/edu/emory/mathcs/backport/java/util/concurrent/ThreadPoolExecutor.html#allowCoreThreadTimeOut(boolean)">allowCoreThreadTimeOut</a>
-        in ThreadPoolExecutor, which enables <em>bounded</em>
-        pools that kills threads if they are idle for too long.</li>
-    <li>ThreadPoolExecutor now handles excessive interruption requests more gracefully 
-        (previously, it was reported to be able to crash older JVMs).</li>
-    <li><a href="doc/api/edu/emory/mathcs/backport/java/util/Deque.html">Deques</a>.</li>
-    <li>Javadoc improvements.</li>
-    </ul>
-</li>
-</ul>
-
-Version 1.0_01 (Dec 28, 2004) [<a href="http://www.mathcs.emory.edu/dcl/util/backport-util-concurrent/dist/backport-util-concurrent-1.0_01/backport-util-concurrent-1.0_01-changelog.html">CVS log</a>]
-<ul>
-<li>Feature: development source bundle with ant scripts allowing to build and
-    test the distribution is now available for download.</li>
-
-<li>Feature: emulation of UncaughtExceptionHandler, in class
-    <a href="doc/api/edu/emory/mathcs/backport/java/util/concurrent/helpers/ThreadHelpers.html">ThreadHelpers</a>.</li>
-
-<li>Documentation: improved, more consistent and accurate javadoc.</li>
-
-<li>Bugfix: NoClassDefFoundError when using nanoTime() on Java prior to 1.4.2.
-    Thanks to Gabriel Wolosin for reporting this bug.</li>
-
-<li>Bugfix: deadlocks in ConcurrentLinkedQueue when drainTo() or clear() was
-    invoked when there was blocked put(). Thanks to Jean Morissette for
-    reporting this bug.</li>
-
-<li>Bugfix: minor glitch in Utils.nanoTime() would cause timer to lose
-    accuracy, about 1ns every 11 days, if JVM was running continuously.
-    (Note: as it turned out, the fix itself had a bug; see the log for 
-    version 1.1)</li>
-</ul>
-    
-Version 1.0 (Dec 1, 2004)
-<ul>
-<li>Initial revision</li>
-</ul>
-
-<h2>Documentation and Support</h2>
-
-<p>
-For more information:
-<ul>
-<LI><a href="doc/api/">Browse Javadoc</a></LI>
-<LI>Consult the original 
-    <a href="http://gee.cs.oswego.edu/dl/concurrency-interest/">
-    java.util.concurrent</a> documentation and Java 5.0 
-    <a href="http://java.sun.com/j2se/1.5.0/docs/guide/concurrency/overview.html">Concurrency Utilities Overview</a></LI>
-
-<li>Check the <a href="http://dcl.mathcs.emory.edu/util/backport-util-concurrent/">project Web page</a> for updates.</li>
-
-<li>For questions, comments, and discussion, use the
-<a href="http://altair.cs.oswego.edu/mailman/listinfo/concurrency-interest">Concurrency-Interest 
-mailing list</a> (courtesy of Doug Lea and the JSR 166 Expert Group). Please clearly indicate
-that your message regards the backport rather than the original JSR 166 API, by prefixing
-the subject line with "backport: " and including appropriate annotation in the message body.
-You may also send 
-e-mail directly to <a href="mailto:dawidk@mathcs.emory.edu">Dawid Kurzyniec</a>.</li>
-</ul>
-</p>
-
-<hr>
-Copyright (C) 2004-2006 <a href="http://dcl.mathcs.emory.edu/">Distributed Computing Laboratory</a>, Emory University<br>
-
-</body>
-</html>
diff --git a/java/common/lib/backport-util-concurrent/backport-util-concurrent-2.2.jar b/java/common/lib/backport-util-concurrent/backport-util-concurrent-2.2.jar
deleted file mode 100644
index 20a16877bd..0000000000
--- a/java/common/lib/backport-util-concurrent/backport-util-concurrent-2.2.jar
+++ /dev/null
diff --git a/java/common/lib/backport-util-concurrent/license.backport-util-concurrent.html b/java/common/lib/backport-util-concurrent/license.backport-util-concurrent.html
deleted file mode 100644
index e9b095683b..0000000000
--- a/java/common/lib/backport-util-concurrent/license.backport-util-concurrent.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "DTD/xhtml1-transitional.dtd">
-<html><head><title>Creative Commons Public Domain</title>
-
-<body>
-
-<p align="center"><em>Copyright-Only Dedication (based on United States law) or Public Domain Certification</em></p>
-
-        <p>The
-person or persons who have associated work with this document (the
-"Dedicator" or "Certifier") hereby either (a) certifies that, to the
-best of his knowledge, the work of authorship identified is in the
-public domain of the country from which the work is published, or (b)
-hereby dedicates whatever copyright the dedicators holds in the work of
-authorship identified below (the "Work") to the public domain. A
-certifier, morever, dedicates any copyright interest he may have in the
-associated work, and for these purposes, is described as a "dedicator"
-below.</p>
-
-        <p>A certifier has taken reasonable steps to verify
-the copyright status of this work. Certifier recognizes that his good
-faith efforts may not shield him from liability if in fact the work
-certified is not in the public domain.</p>
-
-        <p>Dedicator makes
-this dedication for the benefit of the public at large and to the
-detriment of the Dedicator's heirs and successors. Dedicator intends
-this dedication to be an overt act of relinquishment in perpetuity of
-all present and future rights under copyright law, whether vested or
-contingent, in the Work. Dedicator understands that such relinquishment
-of all rights includes the relinquishment of all rights to enforce (by
-lawsuit or otherwise) those copyrights in the Work.</p>
-
-        <p>Dedicator
-recognizes that, once placed in the public domain, the Work may be
-freely reproduced, distributed, transmitted, used, modified, built
-upon, or otherwise exploited by anyone for any purpose, commercial or
-non-commercial, and in any way, including by methods that have not yet
-been invented or conceived.</p>
-	</div>
-</div>
-</body></html>
-\ No newline at end of file
diff --git a/java/common/lib/commons-cli/commons-cli-1.0.jar b/java/common/lib/commons-cli/commons-cli-1.0.jar
deleted file mode 100644
index 22a004e14e..0000000000
--- a/java/common/lib/commons-cli/commons-cli-1.0.jar
+++ /dev/null
diff --git a/java/common/lib/commons-collections/commons-collections-3.1.jar b/java/common/lib/commons-collections/commons-collections-3.1.jar
deleted file mode 100644
index 41e230feea..0000000000
--- a/java/common/lib/commons-collections/commons-collections-3.1.jar
+++ /dev/null
diff --git a/java/common/lib/commons-configuration/commons-configuration-1.2.jar b/java/common/lib/commons-configuration/commons-configuration-1.2.jar
deleted file mode 100644
index 574d0ac789..0000000000
--- a/java/common/lib/commons-configuration/commons-configuration-1.2.jar
+++ /dev/null
diff --git a/java/common/lib/commons-lang/commons-lang-2.1.jar b/java/common/lib/commons-lang/commons-lang-2.1.jar
deleted file mode 100644
index 87b80ab5db..0000000000
--- a/java/common/lib/commons-lang/commons-lang-2.1.jar
+++ /dev/null
diff --git a/java/common/lib/commons-logging/commons-logging-api.jar b/java/common/lib/commons-logging/commons-logging-api.jar
deleted file mode 100644
index ade9a13c78..0000000000
--- a/java/common/lib/commons-logging/commons-logging-api.jar
+++ /dev/null
diff --git a/java/common/lib/commons-logging/commons-logging.jar b/java/common/lib/commons-logging/commons-logging.jar
deleted file mode 100644
index b73a80fab6..0000000000
--- a/java/common/lib/commons-logging/commons-logging.jar
+++ /dev/null
diff --git a/java/common/lib/junit/junit-4.0.jar b/java/common/lib/junit/junit-4.0.jar
deleted file mode 100644
index b20406924a..0000000000
--- a/java/common/lib/junit/junit-4.0.jar
+++ /dev/null
diff --git a/java/common/lib/junit/junit.jar b/java/common/lib/junit/junit.jar
deleted file mode 100644
index 674d71e89e..0000000000
--- a/java/common/lib/junit/junit.jar
+++ /dev/null
diff --git a/java/common/lib/junit/license.junit.txt b/java/common/lib/junit/license.junit.txt
deleted file mode 100644
index 1c13794c93..0000000000
--- a/java/common/lib/junit/license.junit.txt
+++ /dev/null
@@ -1,86 +0,0 @@
-Common Public License Version 1.0
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. 
-
-1. DEFINITIONS 
-
-"Contribution" means:
-
-a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and 
-
-b) in the case of each subsequent Contributor:
-
-i) changes to the Program, and
-
-ii) additions to the Program;
-
-where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
-
-"Contributor" means any person or entity that distributes the Program. 
-
-"Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this Agreement. 
-
-"Recipient" means anyone who receives the Program under this Agreement, including all Contributors. 
-
-2. GRANT OF RIGHTS
-
-a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
-
-b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
-
-c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
-
-d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
-
-3. REQUIREMENTS 
-
-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that: 
-
-a) it complies with the terms and conditions of this Agreement; and
-
-b) its license agreement:
-
-i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose; 
-
-ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits; 
-
-iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and 
-
-iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange. 
-
-When the Program is made available in source code form:
-
-a) it must be made available under this Agreement; and
-
-b) a copy of this Agreement must be included with each copy of the Program. 
-
-Contributors may not remove or alter any copyright notices contained within the Program.
-
-Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution. 
-
-4. COMMERCIAL DISTRIBUTION 
-
-Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense. 
-
-For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages. 
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement, including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations. 
-
-6. DISCLAIMER OF LIABILITY 
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. 
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable. 
-
-If Recipient institutes patent litigation against a Contributor with respect to a patent applicable to software (including a cross-claim or counterclaim in a lawsuit), then any patent licenses granted by that Contributor to such Recipient under this Agreement shall terminate as of the date such litigation is filed. In addition, if Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive. 
-
-Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. IBM is the initial Agreement Steward. IBM may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved. 
-
-This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
diff --git a/java/common/lib/logging-log4j/log4j-1.2.13.jar b/java/common/lib/logging-log4j/log4j-1.2.13.jar
deleted file mode 100644
index dde9972109..0000000000
--- a/java/common/lib/logging-log4j/log4j-1.2.13.jar
+++ /dev/null
diff --git a/java/common/lib/mina/mina-core-1.1.0-SNAPSHOT.jar b/java/common/lib/mina/mina-core-1.1.0-SNAPSHOT.jar
deleted file mode 100644
index 473aa85e48..0000000000
--- a/java/common/lib/mina/mina-core-1.1.0-SNAPSHOT.jar
+++ /dev/null
diff --git a/java/common/lib/mina/mina-filter-ssl-1.1.0-SNAPSHOT.jar b/java/common/lib/mina/mina-filter-ssl-1.1.0-SNAPSHOT.jar
deleted file mode 100644
index 18d00bbb1c..0000000000
--- a/java/common/lib/mina/mina-filter-ssl-1.1.0-SNAPSHOT.jar
+++ /dev/null
diff --git a/java/common/lib/mina/mina-java5-1.1.0-SNAPSHOT.jar b/java/common/lib/mina/mina-java5-1.1.0-SNAPSHOT.jar
deleted file mode 100644
index 36cb66066c..0000000000
--- a/java/common/lib/mina/mina-java5-1.1.0-SNAPSHOT.jar
+++ /dev/null
diff --git a/java/common/lib/saxon/license.saxon.txt b/java/common/lib/saxon/license.saxon.txt
deleted file mode 100644
index 1bf2b1279d..0000000000
--- a/java/common/lib/saxon/license.saxon.txt
+++ /dev/null
@@ -1,471 +0,0 @@
-                          MOZILLA PUBLIC LICENSE
-                                Version 1.1
-
-                              ---------------
-
-1. Definitions.
-
-     1.0.1. "Commercial Use" means distribution or otherwise making the
-     Covered Code available to a third party.
-
-     1.1. "Contributor" means each entity that creates or contributes to
-     the creation of Modifications.
-
-     1.2. "Contributor Version" means the combination of the Original
-     Code, prior Modifications used by a Contributor, and the Modifications
-     made by that particular Contributor.
-
-     1.3. "Covered Code" means the Original Code or Modifications or the
-     combination of the Original Code and Modifications, in each case
-     including portions thereof.
-
-     1.4. "Electronic Distribution Mechanism" means a mechanism generally
-     accepted in the software development community for the electronic
-     transfer of data.
-
-     1.5. "Executable" means Covered Code in any form other than Source
-     Code.
-
-     1.6. "Initial Developer" means the individual or entity identified
-     as the Initial Developer in the Source Code notice required by Exhibit
-     A.
-
-     1.7. "Larger Work" means a work which combines Covered Code or
-     portions thereof with code not governed by the terms of this License.
-
-     1.8. "License" means this document.
-
-     1.8.1. "Licensable" means having the right to grant, to the maximum
-     extent possible, whether at the time of the initial grant or
-     subsequently acquired, any and all of the rights conveyed herein.
-
-     1.9. "Modifications" means any addition to or deletion from the
-     substance or structure of either the Original Code or any previous
-     Modifications. When Covered Code is released as a series of files, a
-     Modification is:
-          A. Any addition to or deletion from the contents of a file
-          containing Original Code or previous Modifications.
-
-          B. Any new file that contains any part of the Original Code or
-          previous Modifications.
-
-     1.10. "Original Code" means Source Code of computer software code
-     which is described in the Source Code notice required by Exhibit A as
-     Original Code, and which, at the time of its release under this
-     License is not already Covered Code governed by this License.
-
-     1.10.1. "Patent Claims" means any patent claim(s), now owned or
-     hereafter acquired, including without limitation,  method, process,
-     and apparatus claims, in any patent Licensable by grantor.
-
-     1.11. "Source Code" means the preferred form of the Covered Code for
-     making modifications to it, including all modules it contains, plus
-     any associated interface definition files, scripts used to control
-     compilation and installation of an Executable, or source code
-     differential comparisons against either the Original Code or another
-     well known, available Covered Code of the Contributor's choice. The
-     Source Code can be in a compressed or archival form, provided the
-     appropriate decompression or de-archiving software is widely available
-     for no charge.
-
-     1.12. "You" (or "Your")  means an individual or a legal entity
-     exercising rights under, and complying with all of the terms of, this
-     License or a future version of this License issued under Section 6.1.
-     For legal entities, "You" includes any entity which controls, is
-     controlled by, or is under common control with You. For purposes of
-     this definition, "control" means (a) the power, direct or indirect,
-     to cause the direction or management of such entity, whether by
-     contract or otherwise, or (b) ownership of more than fifty percent
-     (50%) of the outstanding shares or beneficial ownership of such
-     entity.
-
-2. Source Code License.
-
-     2.1. The Initial Developer Grant.
-     The Initial Developer hereby grants You a world-wide, royalty-free,
-     non-exclusive license, subject to third party intellectual property
-     claims:
-          (a)  under intellectual property rights (other than patent or
-          trademark) Licensable by Initial Developer to use, reproduce,
-          modify, display, perform, sublicense and distribute the Original
-          Code (or portions thereof) with or without Modifications, and/or
-          as part of a Larger Work; and
-
-          (b) under Patents Claims infringed by the making, using or
-          selling of Original Code, to make, have made, use, practice,
-          sell, and offer for sale, and/or otherwise dispose of the
-          Original Code (or portions thereof).
-
-          (c) the licenses granted in this Section 2.1(a) and (b) are
-          effective on the date Initial Developer first distributes
-          Original Code under the terms of this License.
-
-          (d) Notwithstanding Section 2.1(b) above, no patent license is
-          granted: 1) for code that You delete from the Original Code; 2)
-          separate from the Original Code;  or 3) for infringements caused
-          by: i) the modification of the Original Code or ii) the
-          combination of the Original Code with other software or devices.
-
-     2.2. Contributor Grant.
-     Subject to third party intellectual property claims, each Contributor
-     hereby grants You a world-wide, royalty-free, non-exclusive license
-
-          (a)  under intellectual property rights (other than patent or
-          trademark) Licensable by Contributor, to use, reproduce, modify,
-          display, perform, sublicense and distribute the Modifications
-          created by such Contributor (or portions thereof) either on an
-          unmodified basis, with other Modifications, as Covered Code
-          and/or as part of a Larger Work; and
-
-          (b) under Patent Claims infringed by the making, using, or
-          selling of  Modifications made by that Contributor either alone
-          and/or in combination with its Contributor Version (or portions
-          of such combination), to make, use, sell, offer for sale, have
-          made, and/or otherwise dispose of: 1) Modifications made by that
-          Contributor (or portions thereof); and 2) the combination of
-          Modifications made by that Contributor with its Contributor
-          Version (or portions of such combination).
-
-          (c) the licenses granted in Sections 2.2(a) and 2.2(b) are
-          effective on the date Contributor first makes Commercial Use of
-          the Covered Code.
-
-          (d)    Notwithstanding Section 2.2(b) above, no patent license is
-          granted: 1) for any code that Contributor has deleted from the
-          Contributor Version; 2)  separate from the Contributor Version;
-          3)  for infringements caused by: i) third party modifications of
-          Contributor Version or ii)  the combination of Modifications made
-          by that Contributor with other software  (except as part of the
-          Contributor Version) or other devices; or 4) under Patent Claims
-          infringed by Covered Code in the absence of Modifications made by
-          that Contributor.
-
-3. Distribution Obligations.
-
-     3.1. Application of License.
-     The Modifications which You create or to which You contribute are
-     governed by the terms of this License, including without limitation
-     Section 2.2. The Source Code version of Covered Code may be
-     distributed only under the terms of this License or a future version
-     of this License released under Section 6.1, and You must include a
-     copy of this License with every copy of the Source Code You
-     distribute. You may not offer or impose any terms on any Source Code
-     version that alters or restricts the applicable version of this
-     License or the recipients' rights hereunder. However, You may include
-     an additional document offering the additional rights described in
-     Section 3.5.
-
-     3.2. Availability of Source Code.
-     Any Modification which You create or to which You contribute must be
-     made available in Source Code form under the terms of this License
-     either on the same media as an Executable version or via an accepted
-     Electronic Distribution Mechanism to anyone to whom you made an
-     Executable version available; and if made available via Electronic
-     Distribution Mechanism, must remain available for at least twelve (12)
-     months after the date it initially became available, or at least six
-     (6) months after a subsequent version of that particular Modification
-     has been made available to such recipients. You are responsible for
-     ensuring that the Source Code version remains available even if the
-     Electronic Distribution Mechanism is maintained by a third party.
-
-     3.3. Description of Modifications.
-     You must cause all Covered Code to which You contribute to contain a
-     file documenting the changes You made to create that Covered Code and
-     the date of any change. You must include a prominent statement that
-     the Modification is derived, directly or indirectly, from Original
-     Code provided by the Initial Developer and including the name of the
-     Initial Developer in (a) the Source Code, and (b) in any notice in an
-     Executable version or related documentation in which You describe the
-     origin or ownership of the Covered Code.
-
-     3.4. Intellectual Property Matters
-          (a) Third Party Claims.
-          If Contributor has knowledge that a license under a third party's
-          intellectual property rights is required to exercise the rights
-          granted by such Contributor under Sections 2.1 or 2.2,
-          Contributor must include a text file with the Source Code
-          distribution titled "LEGAL" which describes the claim and the
-          party making the claim in sufficient detail that a recipient will
-          know whom to contact. If Contributor obtains such knowledge after
-          the Modification is made available as described in Section 3.2,
-          Contributor shall promptly modify the LEGAL file in all copies
-          Contributor makes available thereafter and shall take other steps
-          (such as notifying appropriate mailing lists or newsgroups)
-          reasonably calculated to inform those who received the Covered
-          Code that new knowledge has been obtained.
-
-          (b) Contributor APIs.
-          If Contributor's Modifications include an application programming
-          interface and Contributor has knowledge of patent licenses which
-          are reasonably necessary to implement that API, Contributor must
-          also include this information in the LEGAL file.
-
-               (c)    Representations.
-          Contributor represents that, except as disclosed pursuant to
-          Section 3.4(a) above, Contributor believes that Contributor's
-          Modifications are Contributor's original creation(s) and/or
-          Contributor has sufficient rights to grant the rights conveyed by
-          this License.
-
-     3.5. Required Notices.
-     You must duplicate the notice in Exhibit A in each file of the Source
-     Code.  If it is not possible to put such notice in a particular Source
-     Code file due to its structure, then You must include such notice in a
-     location (such as a relevant directory) where a user would be likely
-     to look for such a notice.  If You created one or more Modification(s)
-     You may add your name as a Contributor to the notice described in
-     Exhibit A.  You must also duplicate this License in any documentation
-     for the Source Code where You describe recipients' rights or ownership
-     rights relating to Covered Code.  You may choose to offer, and to
-     charge a fee for, warranty, support, indemnity or liability
-     obligations to one or more recipients of Covered Code. However, You
-     may do so only on Your own behalf, and not on behalf of the Initial
-     Developer or any Contributor. You must make it absolutely clear than
-     any such warranty, support, indemnity or liability obligation is
-     offered by You alone, and You hereby agree to indemnify the Initial
-     Developer and every Contributor for any liability incurred by the
-     Initial Developer or such Contributor as a result of warranty,
-     support, indemnity or liability terms You offer.
-
-     3.6. Distribution of Executable Versions.
-     You may distribute Covered Code in Executable form only if the
-     requirements of Section 3.1-3.5 have been met for that Covered Code,
-     and if You include a notice stating that the Source Code version of
-     the Covered Code is available under the terms of this License,
-     including a description of how and where You have fulfilled the
-     obligations of Section 3.2. The notice must be conspicuously included
-     in any notice in an Executable version, related documentation or
-     collateral in which You describe recipients' rights relating to the
-     Covered Code. You may distribute the Executable version of Covered
-     Code or ownership rights under a license of Your choice, which may
-     contain terms different from this License, provided that You are in
-     compliance with the terms of this License and that the license for the
-     Executable version does not attempt to limit or alter the recipient's
-     rights in the Source Code version from the rights set forth in this
-     License. If You distribute the Executable version under a different
-     license You must make it absolutely clear that any terms which differ
-     from this License are offered by You alone, not by the Initial
-     Developer or any Contributor. You hereby agree to indemnify the
-     Initial Developer and every Contributor for any liability incurred by
-     the Initial Developer or such Contributor as a result of any such
-     terms You offer.
-
-     3.7. Larger Works.
-     You may create a Larger Work by combining Covered Code with other code
-     not governed by the terms of this License and distribute the Larger
-     Work as a single product. In such a case, You must make sure the
-     requirements of this License are fulfilled for the Covered Code.
-
-4. Inability to Comply Due to Statute or Regulation.
-
-     If it is impossible for You to comply with any of the terms of this
-     License with respect to some or all of the Covered Code due to
-     statute, judicial order, or regulation then You must: (a) comply with
-     the terms of this License to the maximum extent possible; and (b)
-     describe the limitations and the code they affect. Such description
-     must be included in the LEGAL file described in Section 3.4 and must
-     be included with all distributions of the Source Code. Except to the
-     extent prohibited by statute or regulation, such description must be
-     sufficiently detailed for a recipient of ordinary skill to be able to
-     understand it.
-
-5. Application of this License.
-
-     This License applies to code to which the Initial Developer has
-     attached the notice in Exhibit A and to related Covered Code.
-
-6. Versions of the License.
-
-     6.1. New Versions.
-     Netscape Communications Corporation ("Netscape") may publish revised
-     and/or new versions of the License from time to time. Each version
-     will be given a distinguishing version number.
-
-     6.2. Effect of New Versions.
-     Once Covered Code has been published under a particular version of the
-     License, You may always continue to use it under the terms of that
-     version. You may also choose to use such Covered Code under the terms
-     of any subsequent version of the License published by Netscape. No one
-     other than Netscape has the right to modify the terms applicable to
-     Covered Code created under this License.
-
-     6.3. Derivative Works.
-     If You create or use a modified version of this License (which you may
-     only do in order to apply it to code which is not already Covered Code
-     governed by this License), You must (a) rename Your license so that
-     the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
-     "MPL", "NPL" or any confusingly similar phrase do not appear in your
-     license (except to note that your license differs from this License)
-     and (b) otherwise make it clear that Your version of the license
-     contains terms which differ from the Mozilla Public License and
-     Netscape Public License. (Filling in the name of the Initial
-     Developer, Original Code or Contributor in the notice described in
-     Exhibit A shall not of themselves be deemed to be modifications of
-     this License.)
-
-7. DISCLAIMER OF WARRANTY.
-
-     COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
-     WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-     WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
-     DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
-     THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE
-     IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT,
-     YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE
-     COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
-     OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
-     ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-
-8. TERMINATION.
-
-     8.1.  This License and the rights granted hereunder will terminate
-     automatically if You fail to comply with terms herein and fail to cure
-     such breach within 30 days of becoming aware of the breach. All
-     sublicenses to the Covered Code which are properly granted shall
-     survive any termination of this License. Provisions which, by their
-     nature, must remain in effect beyond the termination of this License
-     shall survive.
-
-     8.2.  If You initiate litigation by asserting a patent infringement
-     claim (excluding declatory judgment actions) against Initial Developer
-     or a Contributor (the Initial Developer or Contributor against whom
-     You file such action is referred to as "Participant")  alleging that:
-
-     (a)  such Participant's Contributor Version directly or indirectly
-     infringes any patent, then any and all rights granted by such
-     Participant to You under Sections 2.1 and/or 2.2 of this License
-     shall, upon 60 days notice from Participant terminate prospectively,
-     unless if within 60 days after receipt of notice You either: (i)
-     agree in writing to pay Participant a mutually agreeable reasonable
-     royalty for Your past and future use of Modifications made by such
-     Participant, or (ii) withdraw Your litigation claim with respect to
-     the Contributor Version against such Participant.  If within 60 days
-     of notice, a reasonable royalty and payment arrangement are not
-     mutually agreed upon in writing by the parties or the litigation claim
-     is not withdrawn, the rights granted by Participant to You under
-     Sections 2.1 and/or 2.2 automatically terminate at the expiration of
-     the 60 day notice period specified above.
-
-     (b)  any software, hardware, or device, other than such Participant's
-     Contributor Version, directly or indirectly infringes any patent, then
-     any rights granted to You by such Participant under Sections 2.1(b)
-     and 2.2(b) are revoked effective as of the date You first made, used,
-     sold, distributed, or had made, Modifications made by that
-     Participant.
-
-     8.3.  If You assert a patent infringement claim against Participant
-     alleging that such Participant's Contributor Version directly or
-     indirectly infringes any patent where such claim is resolved (such as
-     by license or settlement) prior to the initiation of patent
-     infringement litigation, then the reasonable value of the licenses
-     granted by such Participant under Sections 2.1 or 2.2 shall be taken
-     into account in determining the amount or value of any payment or
-     license.
-
-     8.4.  In the event of termination under Sections 8.1 or 8.2 above,
-     all end user license agreements (excluding distributors and resellers)
-     which have been validly granted by You or any distributor hereunder
-     prior to termination shall survive termination.
-
-9. LIMITATION OF LIABILITY.
-
-     UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
-     (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
-     DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,
-     OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR
-     ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
-     CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL,
-     WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
-     COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
-     INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
-     LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
-     RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
-     PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
-     EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
-     THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
-
-10. U.S. GOVERNMENT END USERS.
-
-     The Covered Code is a "commercial item," as that term is defined in
-     48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
-     software" and "commercial computer software documentation," as such
-     terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
-     C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
-     all U.S. Government End Users acquire Covered Code with only those
-     rights set forth herein.
-
-11. MISCELLANEOUS.
-
-     This License represents the complete agreement concerning subject
-     matter hereof. If any provision of this License is held to be
-     unenforceable, such provision shall be reformed only to the extent
-     necessary to make it enforceable. This License shall be governed by
-     California law provisions (except to the extent applicable law, if
-     any, provides otherwise), excluding its conflict-of-law provisions.
-     With respect to disputes in which at least one party is a citizen of,
-     or an entity chartered or registered to do business in the United
-     States of America, any litigation relating to this License shall be
-     subject to the jurisdiction of the Federal Courts of the Northern
-     District of California, with venue lying in Santa Clara County,
-     California, with the losing party responsible for costs, including
-     without limitation, court costs and reasonable attorneys' fees and
-     expenses. The application of the United Nations Convention on
-     Contracts for the International Sale of Goods is expressly excluded.
-     Any law or regulation which provides that the language of a contract
-     shall be construed against the drafter shall not apply to this
-     License.
-
-12. RESPONSIBILITY FOR CLAIMS.
-
-     As between Initial Developer and the Contributors, each party is
-     responsible for claims and damages arising, directly or indirectly,
-     out of its utilization of rights under this License and You agree to
-     work with Initial Developer and Contributors to distribute such
-     responsibility on an equitable basis. Nothing herein is intended or
-     shall be deemed to constitute any admission of liability.
-
-13. MULTIPLE-LICENSED CODE.
-
-     Initial Developer may designate portions of the Covered Code as
-     "Multiple-Licensed".  "Multiple-Licensed" means that the Initial
-     Developer permits you to utilize portions of the Covered Code under
-     Your choice of the NPL or the alternative licenses, if any, specified
-     by the Initial Developer in the file described in Exhibit A.
-
-EXHIBIT A -Mozilla Public License.
-
-     ``The contents of this file are subject to the Mozilla Public License
-     Version 1.1 (the "License"); you may not use this file except in
-     compliance with the License. You may obtain a copy of the License at
-     http://www.mozilla.org/MPL/
-
-     Software distributed under the License is distributed on an "AS IS"
-     basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-     License for the specific language governing rights and limitations
-     under the License.
-
-     The Original Code is ______________________________________.
-
-     The Initial Developer of the Original Code is ________________________.
-     Portions created by ______________________ are Copyright (C) ______
-     _______________________. All Rights Reserved.
-
-     Contributor(s): ______________________________________.
-
-     Alternatively, the contents of this file may be used under the terms
-     of the _____ license (the  "[___] License"), in which case the
-     provisions of [______] License are applicable instead of those
-     above.  If you wish to allow use of your version of this file only
-     under the terms of the [____] License and not to allow others to use
-     your version of this file under the MPL, indicate your decision by
-     deleting  the provisions above and replace  them with the notice and
-     other provisions required by the [___] License.  If you do not delete
-     the provisions above, a recipient may use your version of this file
-     under either the MPL or the [___] License."
-
-     [NOTE: The text of this Exhibit A may differ slightly from the text of
-     the notices in the Source Code files of the Original Code. You should
-     use the text of this Exhibit A rather than the text found in the
-     Original Code Source Code for Your Modifications.]
-
-
diff --git a/java/common/lib/saxon/saxon8.jar b/java/common/lib/saxon/saxon8.jar
deleted file mode 100644
index 197ce75c5b..0000000000
--- a/java/common/lib/saxon/saxon8.jar
+++ /dev/null
diff --git a/java/common/lib/slf4j/license.slf4.txt b/java/common/lib/slf4j/license.slf4.txt
deleted file mode 100644
index a16a2ef243..0000000000
--- a/java/common/lib/slf4j/license.slf4.txt
+++ /dev/null
@@ -1,30 +0,0 @@
- Copyright (c) 2004-2005 SLF4J.ORG
- Copyright (c) 2004-2005 QOS.ch
- 
- All rights reserved.
-  
- 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,
- distribute, and/or sell copies of the Software, and to permit persons
- to whom the Software is furnished to do so, provided that the above
- copyright notice(s) and this permission notice appear in all copies
- of the Software and that both the above copyright notice(s) and this
- permission notice appear in supporting documentation.
-  
- 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
- OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
- HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY
- SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER
- RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
- CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-  
- Except as contained in this notice, the name of a copyright holder
- shall not be used in advertising or otherwise to promote the sale,
- use or other dealings in this Software without prior written
- authorization of the copyright holder.
- 
diff --git a/java/common/lib/slf4j/slf4j-simple.jar b/java/common/lib/slf4j/slf4j-simple.jar
deleted file mode 100644
index 5c6567d11c..0000000000
--- a/java/common/lib/slf4j/slf4j-simple.jar
+++ /dev/null
diff --git a/java/common/src/main/java/org/apache/qpid/AMQConnectionFailureException.java b/java/common/src/main/java/org/apache/qpid/AMQConnectionFailureException.java
index c043a00836..b60f130652 100644
--- a/java/common/src/main/java/org/apache/qpid/AMQConnectionFailureException.java
+++ b/java/common/src/main/java/org/apache/qpid/AMQConnectionFailureException.java
@@ -1,3 +1,24 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
 package org.apache.qpid;
 
 /**
diff --git a/java/common/src/main/java/org/apache/qpid/AMQUnknownExchangeType.java b/java/common/src/main/java/org/apache/qpid/AMQUnknownExchangeType.java
index f483b9947b..b31765ce66 100644
--- a/java/common/src/main/java/org/apache/qpid/AMQUnknownExchangeType.java
+++ b/java/common/src/main/java/org/apache/qpid/AMQUnknownExchangeType.java
@@ -1,3 +1,24 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
 package org.apache.qpid;
 
 /**
diff --git a/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyInstanceFactory.java b/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyInstanceFactory.java
index cfbc9d1828..359efe7eb7 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyInstanceFactory.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyInstanceFactory.java
@@ -1,3 +1,24 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
 package org.apache.qpid.framing;
 
 import org.apache.mina.common.ByteBuffer;
diff --git a/java/common/src/main/java/org/apache/qpid/framing/AMQShortString.java b/java/common/src/main/java/org/apache/qpid/framing/AMQShortString.java
index ee7abd55c0..05e9473463 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/AMQShortString.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/AMQShortString.java
@@ -1,3 +1,24 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
 package org.apache.qpid.framing;
 
 import org.apache.mina.common.ByteBuffer;
diff --git a/java/common/src/main/java/org/apache/qpid/framing/AMQTypedValue.java b/java/common/src/main/java/org/apache/qpid/framing/AMQTypedValue.java
index e7175e7973..7193580884 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/AMQTypedValue.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/AMQTypedValue.java
@@ -1,3 +1,24 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
 package org.apache.qpid.framing;
 
 import org.apache.mina.common.ByteBuffer;
diff --git a/java/common/src/main/java/org/apache/qpid/framing/CommonContentHeaderProperties.java b/java/common/src/main/java/org/apache/qpid/framing/CommonContentHeaderProperties.java
index 66c5e19633..6a608a8bff 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/CommonContentHeaderProperties.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/CommonContentHeaderProperties.java
@@ -1,3 +1,24 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
 package org.apache.qpid.framing;
 
 public interface CommonContentHeaderProperties extends ContentHeaderProperties
diff --git a/java/common/src/main/java/org/apache/qpid/framing/FieldTable.java b/java/common/src/main/java/org/apache/qpid/framing/FieldTable.java
index 2fe96b722b..3438770450 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/FieldTable.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/FieldTable.java
@@ -18,6 +18,7 @@
  * under the License.
  *
  */
+
 package org.apache.qpid.framing;
 
 import org.apache.mina.common.ByteBuffer;
diff --git a/java/common/src/main/java/org/apache/qpid/framing/MethodConverter_8_0.java b/java/common/src/main/java/org/apache/qpid/framing/MethodConverter_8_0.java
index dd93cc97fa..9a113f452b 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/MethodConverter_8_0.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/MethodConverter_8_0.java
@@ -1,3 +1,24 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
 package org.apache.qpid.framing;
 
 import org.apache.qpid.framing.abstraction.ProtocolVersionMethodConverter;
diff --git a/java/common/src/main/java/org/apache/qpid/framing/SmallCompositeAMQDataBlock.java b/java/common/src/main/java/org/apache/qpid/framing/SmallCompositeAMQDataBlock.java
index 174cb142e0..26c048e34a 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/SmallCompositeAMQDataBlock.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/SmallCompositeAMQDataBlock.java
@@ -1,3 +1,24 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
 package org.apache.qpid.framing;
 
 import org.apache.mina.common.ByteBuffer;
diff --git a/java/common/src/main/java/org/apache/qpid/framing/abstraction/AbstractMethodConverter.java b/java/common/src/main/java/org/apache/qpid/framing/abstraction/AbstractMethodConverter.java
index 5490d482a1..1c335f3036 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/abstraction/AbstractMethodConverter.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/abstraction/AbstractMethodConverter.java
@@ -1,3 +1,24 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
 package org.apache.qpid.framing.abstraction;
 
 public abstract class AbstractMethodConverter implements ProtocolVersionMethodConverter
diff --git a/java/common/src/test/java/org/apache/qpid/util/CommandLineParserTest.java b/java/common/src/test/java/org/apache/qpid/util/CommandLineParserTest.java
index 815b61d293..66fb3252df 100644
--- a/java/common/src/test/java/org/apache/qpid/util/CommandLineParserTest.java
+++ b/java/common/src/test/java/org/apache/qpid/util/CommandLineParserTest.java
@@ -1,3 +1,24 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
 package org.apache.qpid.util;
 
 import junit.framework.*;
author	Martin Ritchie <ritchiem@apache.org>	2007-06-18 16:29:49 +0000
committer	Martin Ritchie <ritchiem@apache.org>	2007-06-18 16:29:49 +0000
commit	d43e1a5351598e558d01de9493c21870b3b0bcbb (patch)
tree	4450cc8c14572b1f06a975970a052bffbc2acf74 /java/common
parent	45b526ce09daee869ec1313808583f7e05bff7bb (diff)
download	qpid-python-d43e1a5351598e558d01de9493c21870b3b0bcbb.tar.gz