diff --git ant/build.xml ant/build.xml
index c4351d0..e23d6dd 100644
--- ant/build.xml
+++ ant/build.xml
@@ -27,12 +27,8 @@ to call at top-level: ant deploy-contrib compile-core-test
-
-
-
-
-
-
+
+
-
+
diff --git ant/ivy.xml ant/ivy.xml
index deb96f0..0fe0a23 100644
--- ant/ivy.xml
+++ ant/ivy.xml
@@ -15,12 +15,18 @@
limitations under the License.
-->
-
-
-
- The Apache Hive (TM) data warehouse software facilitates querying and managing large datasets residing in distributed storage.
- https://cwiki.apache.org/confluence/display/Hive/Home
-
-
-
+
+
+
+ The Apache Hive (TM) data warehouse software facilitates querying and managing large datasets residing in distributed storage.
+ https://cwiki.apache.org/confluence/display/Hive/Home
+
+
+
+
+
+
+
+
+
diff --git build-common.xml build-common.xml
index 37b32ec..f71bc67 100644
--- build-common.xml
+++ build-common.xml
@@ -72,24 +72,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -107,10 +90,7 @@
-
-
-
-
+
@@ -118,10 +98,12 @@
-
+
+ conf="default" log="${ivyresolvelog}"/>
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -213,7 +158,6 @@
-
@@ -234,6 +178,7 @@
+
@@ -263,7 +208,7 @@
-
+
+ deprecation="${javac.deprecation}"
+ includeantruntime="false">
@@ -281,7 +227,7 @@
-
+
@@ -309,7 +255,8 @@
optimize="${javac.optimize}"
target="${javac.version}"
source="${javac.version}"
- deprecation="${javac.deprecation}">
+ deprecation="${javac.deprecation}"
+ includeantruntime="false">
@@ -322,7 +269,8 @@
optimize="${javac.optimize}"
target="${javac.version}"
source="${javac.version}"
- deprecation="${javac.deprecation}">
+ deprecation="${javac.deprecation}"
+ includeantruntime="false">
@@ -339,7 +287,6 @@
-
@@ -405,7 +352,7 @@
errorProperty="tests.failed" failureProperty="tests.failed" filtertrace="off">
-
+
@@ -424,6 +371,8 @@
+
+
@@ -442,15 +391,6 @@
Tests failed!
-
-
-
-
-
-
-
-
-
@@ -476,9 +416,9 @@
-
+
-
+
@@ -487,7 +427,7 @@
-
+
<dependencies>
@@ -509,38 +449,4 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git build.properties build.properties
index fc80b03..2470b53 100644
--- build.properties
+++ build.properties
@@ -39,9 +39,28 @@ jsp.test.jar=${hadoop.root}/lib/jetty-ext/jsp-api.jar
common.jar=${hadoop.root}/lib/commons-httpclient-3.0.1.jar
#
-# Data nucleus repository - needed for jdo2-api-2.3-ec.jar download
+# Ivy Properties
#
-datanucleus.repo=http://www.datanucleus.org/downloads/maven2
+build.ivy.dir=${build.dir.hive}/ivy
+build.ivy.lib.dir=${build.ivy.dir}/lib
+build.ivy.report.dir=${build.ivy.dir}/report
+build.ivy.maven.dir=${build.ivy.dir}/maven
+ivy.conf.dir=${hive.root}/ivy
+ivy.version=2.2.0
+ivy.jar=${build.ivy.lib.dir}/ivy-${ivy.version}.jar
+ivysettings.xml=${ivy.conf.dir}/ivysettings.xml
+ivyresolvelog=download-only
+ivy.mvn.repo=http://repo2.maven.org/maven2
+ivy_repo_url=${ivy.mvn.repo}/org/apache/ivy/ivy/${ivy.version}/ivy-${ivy.version}.jar
+hive.ivy.org=org.apache.hive
+mvn.publish.repo=snapshots
+mvn.jar.dir=${build.dir.hive}/maven/jars
+mvn.pom.dir=${build.dir.hive}/maven/poms
+mvn.license.dir=${build.dir.hive}/maven/licenses
+#
+# Data nucleus repository - needed for jdo2-api-2.3-ec.jar download
+#
+datanucleus.repo=http://www.datanucleus.org/downloads/maven2
diff --git build.xml build.xml
index a3a95a5..2dd245d 100644
--- build.xml
+++ build.xml
@@ -18,12 +18,15 @@
-->
-
+
+
@@ -58,6 +61,17 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -152,7 +166,6 @@
-
@@ -170,8 +183,14 @@
-
-
+
+
+
+
+
+
@@ -192,7 +211,7 @@
-
+
@@ -727,9 +755,23 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -763,6 +805,15 @@
+
+
+
+
+
+
+
@@ -792,6 +843,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git cli/build.xml cli/build.xml
index 958cfe7..6e70d5f 100755
--- cli/build.xml
+++ cli/build.xml
@@ -35,7 +35,8 @@ to call at top-level: ant deploy-contrib compile-core-test
includes="**/*.java"
destdir="${build.classes}"
debug="${javac.debug}"
- deprecation="${javac.deprecation}">
+ deprecation="${javac.deprecation}"
+ includeantruntime="false">
diff --git cli/ivy.xml cli/ivy.xml
index 0595d94..326fe41 100644
--- cli/ivy.xml
+++ cli/ivy.xml
@@ -16,20 +16,46 @@
limitations under the License.
-->
-
-
-
- The Apache Hive (TM) data warehouse software facilitates querying and managing large datasets residing in distributed storage.
- https://cwiki.apache.org/confluence/display/Hive/Home
-
-
-
-
-
-
-
-
-
-
+
+
+
+ The Apache Hive (TM) data warehouse software facilitates querying and managing large datasets residing in distributed storage.
+ https://cwiki.apache.org/confluence/display/Hive/Home
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git cli/lib/README cli/lib/README
deleted file mode 100644
index 446b0e6..0000000
--- cli/lib/README
+++ /dev/null
@@ -1,5 +0,0 @@
-Folowing is the list of external jars contained in this directory and the sources from where they were obtained:
----------------------------------------------------------------------------------------------------------------
-
-* jline-0.9.94.jar - http://jline.sourceforge.net/
-
diff --git cli/lib/jline-0.9.94.LICENSE cli/lib/jline-0.9.94.LICENSE
deleted file mode 100644
index 246f54f..0000000
--- cli/lib/jline-0.9.94.LICENSE
+++ /dev/null
@@ -1,32 +0,0 @@
-Copyright (c) 2002-2006, Marc Prud'hommeaux
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or
-without modification, are permitted provided that the following
-conditions are met:
-
-Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with
-the distribution.
-
-Neither the name of JLine nor the names of its contributors
-may be used to endorse or promote products derived from this
-software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 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 OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git cli/lib/jline-0.9.94.jar cli/lib/jline-0.9.94.jar
deleted file mode 100644
index dafca7c..0000000
Binary files cli/lib/jline-0.9.94.jar and /dev/null differ
diff --git common/build.xml common/build.xml
index 66322dc..432eba5 100755
--- common/build.xml
+++ common/build.xml
@@ -35,7 +35,8 @@ to call at top-level: ant deploy-contrib compile-core-test
includes="**/*.java"
destdir="${build.classes}"
debug="${javac.debug}"
- deprecation="${javac.deprecation}">
+ deprecation="${javac.deprecation}"
+ includeantruntime="false">
diff --git common/ivy.xml common/ivy.xml
index 722249e..bfd0688 100644
--- common/ivy.xml
+++ common/ivy.xml
@@ -16,17 +16,29 @@
limitations under the License.
-->
-
-
-
- The Apache Hive (TM) data warehouse software facilitates querying and managing large datasets residing in distributed storage.
- https://cwiki.apache.org/confluence/display/Hive/Home
-
-
-
-
-
-
-
-
+
+
+
+ The Apache Hive (TM) data warehouse software facilitates querying and managing large datasets residing in distributed storage.
+ https://cwiki.apache.org/confluence/display/Hive/Home
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git contrib/build.xml contrib/build.xml
index 14e1e20..1c6908c 100644
--- contrib/build.xml
+++ contrib/build.xml
@@ -59,7 +59,7 @@
+ classpath="${build.dir.hive}/anttasks/hive-anttasks-${version}.jar:${build.ivy.lib.dir}/default/velocity-${velocity.version}.jar:${build.ivy.lib.dir}/default/commons-collections-${commons-collections.version}.jar:${build.ivy.lib.dir}/default/commons-lang-${commons-lang.version}.jar"/>
diff --git contrib/ivy.xml contrib/ivy.xml
index 100cc03..c1e1c9d 100644
--- contrib/ivy.xml
+++ contrib/ivy.xml
@@ -15,17 +15,35 @@
limitations under the License.
-->
-
-
-
- The Apache Hive (TM) data warehouse software facilitates querying and managing large datasets residing in distributed storage.
- https://cwiki.apache.org/confluence/display/Hive/Home
-
-
-
-
-
-
-
-
+
+
+
+ The Apache Hive (TM) data warehouse software facilitates querying and managing large datasets residing in distributed storage.
+ https://cwiki.apache.org/confluence/display/Hive/Home
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git contrib/src/test/queries/clientpositive/dboutput.q contrib/src/test/queries/clientpositive/dboutput.q
index dbbcfcb..c56ecd1 100644
--- contrib/src/test/queries/clientpositive/dboutput.q
+++ contrib/src/test/queries/clientpositive/dboutput.q
@@ -1,4 +1,4 @@
-add jar ${system:build.dir}/hive-contrib-${system:hive.version}.jar;
+ADD JAR ${system:build.dir}/hive-contrib-${system:hive.version}.jar;
CREATE TEMPORARY FUNCTION dboutput AS 'org.apache.hadoop.hive.contrib.genericudf.example.GenericUDFDBOutput';
@@ -7,7 +7,7 @@ set mapred.reduce.tasks.speculative.execution=false;
set mapred.map.tasks=1;
set mapred.reduce.tasks=1;
-ADD JAR ../lib/derby.jar ;
+ADD JAR ${system:build.ivy.lib.dir}/default/derby-${system:derby.version}.jar;
DESCRIBE FUNCTION dboutput;
diff --git eclipse-templates/.classpath eclipse-templates/.classpath
index 1b97ae9..69bee4b 100644
--- eclipse-templates/.classpath
+++ eclipse-templates/.classpath
@@ -7,22 +7,22 @@
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
-
-
+
+
+
@@ -35,7 +35,7 @@
-
+
diff --git hbase-handler/build.xml hbase-handler/build.xml
index f45dbfc..14b3bcb 100644
--- hbase-handler/build.xml
+++ hbase-handler/build.xml
@@ -63,7 +63,7 @@
+ classpath="${build.dir.hive}/anttasks/hive-anttasks-${version}.jar:${build.ivy.lib.dir}/default/velocity-${velocity.version}.jar:${build.ivy.lib.dir}/default/commons-collections-${commons-collections.version}.jar:${build.ivy.lib.dir}/default/commons-lang-${commons-lang.version}.jar"/>
diff --git hbase-handler/ivy.xml hbase-handler/ivy.xml
index 9b4b38f..f70a579 100644
--- hbase-handler/ivy.xml
+++ hbase-handler/ivy.xml
@@ -14,18 +14,42 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-
-
-
- The Apache Hive (TM) data warehouse software facilitates querying and managing large datasets residing in distributed storage.
- https://cwiki.apache.org/confluence/display/Hive/Home
-
-
-
-
-
-
-
-
+
+
+
+
+ The Apache Hive (TM) data warehouse software facilitates querying and managing large datasets residing in distributed storage.
+ https://cwiki.apache.org/confluence/display/Hive/Home
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git hwi/build.xml hwi/build.xml
index 4919570..e13517f 100644
--- hwi/build.xml
+++ hwi/build.xml
@@ -61,7 +61,7 @@
We include the war target as a dependency. In this way the war target
is called without changes to the upstream build infrastructure.
-->
-
+
-
-
-
- The Apache Hive (TM) data warehouse software facilitates querying and managing large datasets residing in distributed storage.
- https://cwiki.apache.org/confluence/display/Hive/Home
-
-
-
-
-
-
-
-
+
+
+
+ The Apache Hive (TM) data warehouse software facilitates querying and managing large datasets residing in distributed storage.
+ https://cwiki.apache.org/confluence/display/Hive/Home
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git ivy.xml ivy.xml
index 566bb40..9b97f7a 100644
--- ivy.xml
+++ ivy.xml
@@ -23,11 +23,7 @@
-
-
-
-
-
+
diff --git ivy/common-configurations.xml ivy/common-configurations.xml
new file mode 100644
index 0000000..79c7ddd
--- /dev/null
+++ ivy/common-configurations.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git ivy/ivysettings.xml ivy/ivysettings.xml
index a2587c7..1b986e7 100644
--- ivy/ivysettings.xml
+++ ivy/ivysettings.xml
@@ -61,11 +61,11 @@
-
-
+
+
diff --git ivy/libraries.properties ivy/libraries.properties
index 8d88562..69ada43 100644
--- ivy/libraries.properties
+++ ivy/libraries.properties
@@ -18,6 +18,7 @@
# These are the versions of our dependencies (in alphabetical order)
apacheant.version=1.7.1
+ant-contrib.version=1.0b3
ant-task.version=2.0.10
antlr.version=3.0.1
antlr-runtime.version=3.0.1
@@ -35,12 +36,15 @@ commons-lang.version=2.4
commons-logging.version=1.0.4
commons-logging-api.version=1.0.4
commons-pool.version=1.5.4
+derby.version=10.4.2.0
+guava.version=r06
hbase.version=0.89.0-SNAPSHOT
hbase-test.version=0.89.0-SNAPSHOT
-ivy.version=2.1.0
+javaewah.version=0.3
jdo-api.version=2.3-ec
jdom.version=1.1
jline.version=0.9.94
+json.version=20090211
junit.version=4.10
libfb303.version=0.7.0
libthrift.version=0.7.0
@@ -49,5 +53,6 @@ maven-ant-tasks.version=2.1.0
mockito-all.version=1.8.2
slf4j-api.version=1.6.1
slf4j-log4j12.version=1.6.1
+velocity.version=1.5
zookeeper.version=3.3.1
-guava.version=r06
+
diff --git jdbc/build.xml jdbc/build.xml
index 641938a..0ec18f0 100644
--- jdbc/build.xml
+++ jdbc/build.xml
@@ -40,23 +40,20 @@
-
+
+ encoding="${build.encoding}"
+ srcdir="${src.dir}/java"
+ includes="**/*.java"
+ destdir="${build.classes}"
+ debug="${javac.debug}"
+ deprecation="${javac.deprecation}"
+ includeantruntime="false"
+ >
-
-
-
-
diff --git jdbc/ivy.xml jdbc/ivy.xml
index bc9c69e..5c95c71 100644
--- jdbc/ivy.xml
+++ jdbc/ivy.xml
@@ -16,15 +16,28 @@
limitations under the License.
-->
-
-
-
- The Apache Hive (TM) data warehouse software facilitates querying and managing large datasets residing in distributed storage.
- https://cwiki.apache.org/confluence/display/Hive/Home
-
-
-
-
-
+
+
+
+ The Apache Hive (TM) data warehouse software facilitates querying and managing large datasets residing in distributed storage.
+ https://cwiki.apache.org/confluence/display/Hive/Home
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git lib/README lib/README
index 6e993ee..f10b1d1 100644
--- lib/README
+++ lib/README
@@ -1,14 +1,4 @@
Folowing is the list of external jars contained in this directory and the sources from where they were obtained:
---------------------------------------------------------------------------------------------------------------
-* jpox-core-1.2.2.jar - http://www.jpox.org/docs/download.html
-* derby.jar - http://db.apache.org/derby/derby_downloads.html
-* asm-3.1.jar - http://forge.objectweb.org/projects/asm/
-* jpox-enhancer-1.2.2.jar - http://www.jpox.org/docs/download.html
-* jdo2-api-2.1.jar - http://db.apache.org/jdo/downloads.html
-* jpox-rdbms-1.2.2.jar - http://www.jpox.org/docs/download.html
-* velocity-1.5.jar - http://velocity.apache.org/engine/releases/velocity-1.5/
-* commons-collections-3.2.1.jar - http://commons.apache.org/downloads/download_collections.cgi
-* commons-lang-2.4.jar - http://commons.apache.org/downloads/download_lang.cgi
-* json.jar - http://www.json.org/java/index.html
-* javaewah-0.2.jar - http://code.google.com/p/javaewah/downloads/
+* javaewah-0.3.jar - http://code.google.com/p/javaewah/downloads/
diff --git lib/asm-3.1.LICENSE lib/asm-3.1.LICENSE
deleted file mode 100644
index 75ad085..0000000
--- lib/asm-3.1.LICENSE
+++ /dev/null
@@ -1,29 +0,0 @@
-Copyright (c) 2000-2005 INRIA, France Telecom
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holders nor the names of its
- contributors may be used to endorse or promote products derived from
- this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) 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 OF THIS SOFTWARE, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGE.
diff --git lib/asm-3.1.jar lib/asm-3.1.jar
deleted file mode 100644
index b3baf3f..0000000
Binary files lib/asm-3.1.jar and /dev/null differ
diff --git lib/commons-collections-3.2.1.LICENSE lib/commons-collections-3.2.1.LICENSE
deleted file mode 100644
index 261eeb9..0000000
--- lib/commons-collections-3.2.1.LICENSE
+++ /dev/null
@@ -1,201 +0,0 @@
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) 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. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed 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.
diff --git lib/commons-collections-3.2.1.jar lib/commons-collections-3.2.1.jar
deleted file mode 100644
index c35fa1f..0000000
Binary files lib/commons-collections-3.2.1.jar and /dev/null differ
diff --git lib/commons-lang-2.4.LICENSE lib/commons-lang-2.4.LICENSE
deleted file mode 100644
index 261eeb9..0000000
--- lib/commons-lang-2.4.LICENSE
+++ /dev/null
@@ -1,201 +0,0 @@
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) 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. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed 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.
diff --git lib/commons-lang-2.4.jar lib/commons-lang-2.4.jar
deleted file mode 100644
index 532939e..0000000
Binary files lib/commons-lang-2.4.jar and /dev/null differ
diff --git lib/commons-logging-1.0.4.jar lib/commons-logging-1.0.4.jar
deleted file mode 100644
index b73a80f..0000000
Binary files lib/commons-logging-1.0.4.jar and /dev/null differ
diff --git lib/commons-logging-api-1.0.4.jar lib/commons-logging-api-1.0.4.jar
deleted file mode 100644
index ade9a13..0000000
Binary files lib/commons-logging-api-1.0.4.jar and /dev/null differ
diff --git lib/derby.LICENSE lib/derby.LICENSE
deleted file mode 100644
index 261eeb9..0000000
--- lib/derby.LICENSE
+++ /dev/null
@@ -1,201 +0,0 @@
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) 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. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed 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.
diff --git lib/derby.jar lib/derby.jar
deleted file mode 100644
index dbdc454..0000000
Binary files lib/derby.jar and /dev/null differ
diff --git lib/json-LICENSE.txt lib/json-LICENSE.txt
deleted file mode 100644
index a8c1705..0000000
--- lib/json-LICENSE.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-Copyright (c) 2002 JSON.org
-
-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, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git lib/json-README.txt lib/json-README.txt
deleted file mode 100644
index 67b8909..0000000
--- lib/json-README.txt
+++ /dev/null
@@ -1,563 +0,0 @@
-
-
-
-
-
-
-Network Working Group D. Crockford
-Request for Comments: 4627 JSON.org
-Category: Informational July 2006
-
-
- The application/json Media Type for JavaScript Object Notation (JSON)
-
-Status of This Memo
-
- This memo provides information for the Internet community. It does
- not specify an Internet standard of any kind. Distribution of this
- memo is unlimited.
-
-Copyright Notice
-
- Copyright (C) The Internet Society (2006).
-
-Abstract
-
- JavaScript Object Notation (JSON) is a lightweight, text-based,
- language-independent data interchange format. It was derived from
- the ECMAScript Programming Language Standard. JSON defines a small
- set of formatting rules for the portable representation of structured
- data.
-
-1. Introduction
-
- JavaScript Object Notation (JSON) is a text format for the
- serialization of structured data. It is derived from the object
- literals of JavaScript, as defined in the ECMAScript Programming
- Language Standard, Third Edition [ECMA].
-
- JSON can represent four primitive types (strings, numbers, booleans,
- and null) and two structured types (objects and arrays).
-
- A string is a sequence of zero or more Unicode characters [UNICODE].
-
- An object is an unordered collection of zero or more name/value
- pairs, where a name is a string and a value is a string, number,
- boolean, null, object, or array.
-
- An array is an ordered sequence of zero or more values.
-
- The terms "object" and "array" come from the conventions of
- JavaScript.
-
- JSON's design goals were for it to be minimal, portable, textual, and
- a subset of JavaScript.
-
-
-
-Crockford Informational [Page 1]
-
-RFC 4627 JSON July 2006
-
-
-1.1. Conventions Used in This Document
-
- The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT",
- "SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in this
- document are to be interpreted as described in [RFC2119].
-
- The grammatical rules in this document are to be interpreted as
- described in [RFC4234].
-
-2. JSON Grammar
-
- A JSON text is a sequence of tokens. The set of tokens includes six
- structural characters, strings, numbers, and three literal names.
-
- A JSON text is a serialized object or array.
-
- JSON-text = object / array
-
- These are the six structural characters:
-
- begin-array = ws %x5B ws ; [ left square bracket
-
- begin-object = ws %x7B ws ; { left curly bracket
-
- end-array = ws %x5D ws ; ] right square bracket
-
- end-object = ws %x7D ws ; } right curly bracket
-
- name-separator = ws %x3A ws ; : colon
-
- value-separator = ws %x2C ws ; , comma
-
- Insignificant whitespace is allowed before or after any of the six
- structural characters.
-
- ws = *(
- %x20 / ; Space
- %x09 / ; Horizontal tab
- %x0A / ; Line feed or New line
- %x0D ; Carriage return
- )
-
-2.1. Values
-
- A JSON value MUST be an object, array, number, or string, or one of
- the following three literal names:
-
- false null true
-
-
-
-Crockford Informational [Page 2]
-
-RFC 4627 JSON July 2006
-
-
- The literal names MUST be lowercase. No other literal names are
- allowed.
-
- value = false / null / true / object / array / number / string
-
- false = %x66.61.6c.73.65 ; false
-
- null = %x6e.75.6c.6c ; null
-
- true = %x74.72.75.65 ; true
-
-2.2. Objects
-
- An object structure is represented as a pair of curly brackets
- surrounding zero or more name/value pairs (or members). A name is a
- string. A single colon comes after each name, separating the name
- from the value. A single comma separates a value from a following
- name. The names within an object SHOULD be unique.
-
- object = begin-object [ member *( value-separator member ) ]
- end-object
-
- member = string name-separator value
-
-2.3. Arrays
-
- An array structure is represented as square brackets surrounding zero
- or more values (or elements). Elements are separated by commas.
-
- array = begin-array [ value *( value-separator value ) ] end-array
-
-2.4. Numbers
-
- The representation of numbers is similar to that used in most
- programming languages. A number contains an integer component that
- may be prefixed with an optional minus sign, which may be followed by
- a fraction part and/or an exponent part.
-
- Octal and hex forms are not allowed. Leading zeros are not allowed.
-
- A fraction part is a decimal point followed by one or more digits.
-
- An exponent part begins with the letter E in upper or lowercase,
- which may be followed by a plus or minus sign. The E and optional
- sign are followed by one or more digits.
-
- Numeric values that cannot be represented as sequences of digits
- (such as Infinity and NaN) are not permitted.
-
-
-
-Crockford Informational [Page 3]
-
-RFC 4627 JSON July 2006
-
-
- number = [ minus ] int [ frac ] [ exp ]
-
- decimal-point = %x2E ; .
-
- digit1-9 = %x31-39 ; 1-9
-
- e = %x65 / %x45 ; e E
-
- exp = e [ minus / plus ] 1*DIGIT
-
- frac = decimal-point 1*DIGIT
-
- int = zero / ( digit1-9 *DIGIT )
-
- minus = %x2D ; -
-
- plus = %x2B ; +
-
- zero = %x30 ; 0
-
-2.5. Strings
-
- The representation of strings is similar to conventions used in the C
- family of programming languages. A string begins and ends with
- quotation marks. All Unicode characters may be placed within the
- quotation marks except for the characters that must be escaped:
- quotation mark, reverse solidus, and the control characters (U+0000
- through U+001F).
-
- Any character may be escaped. If the character is in the Basic
- Multilingual Plane (U+0000 through U+FFFF), then it may be
- represented as a six-character sequence: a reverse solidus, followed
- by the lowercase letter u, followed by four hexadecimal digits that
- encode the character's code point. The hexadecimal letters A though
- F can be upper or lowercase. So, for example, a string containing
- only a single reverse solidus character may be represented as
- "\u005C".
-
- Alternatively, there are two-character sequence escape
- representations of some popular characters. So, for example, a
- string containing only a single reverse solidus character may be
- represented more compactly as "\\".
-
- To escape an extended character that is not in the Basic Multilingual
- Plane, the character is represented as a twelve-character sequence,
- encoding the UTF-16 surrogate pair. So, for example, a string
- containing only the G clef character (U+1D11E) may be represented as
- "\uD834\uDD1E".
-
-
-
-Crockford Informational [Page 4]
-
-RFC 4627 JSON July 2006
-
-
- string = quotation-mark *char quotation-mark
-
- char = unescaped /
- escape (
- %x22 / ; " quotation mark U+0022
- %x5C / ; \ reverse solidus U+005C
- %x2F / ; / solidus U+002F
- %x62 / ; b backspace U+0008
- %x66 / ; f form feed U+000C
- %x6E / ; n line feed U+000A
- %x72 / ; r carriage return U+000D
- %x74 / ; t tab U+0009
- %x75 4HEXDIG ) ; uXXXX U+XXXX
-
- escape = %x5C ; \
-
- quotation-mark = %x22 ; "
-
- unescaped = %x20-21 / %x23-5B / %x5D-10FFFF
-
-3. Encoding
-
- JSON text SHALL be encoded in Unicode. The default encoding is
- UTF-8.
-
- Since the first two characters of a JSON text will always be ASCII
- characters [RFC0020], it is possible to determine whether an octet
- stream is UTF-8, UTF-16 (BE or LE), or UTF-32 (BE or LE) by looking
- at the pattern of nulls in the first four octets.
-
- 00 00 00 xx UTF-32BE
- 00 xx 00 xx UTF-16BE
- xx 00 00 00 UTF-32LE
- xx 00 xx 00 UTF-16LE
- xx xx xx xx UTF-8
-
-4. Parsers
-
- A JSON parser transforms a JSON text into another representation. A
- JSON parser MUST accept all texts that conform to the JSON grammar.
- A JSON parser MAY accept non-JSON forms or extensions.
-
- An implementation may set limits on the size of texts that it
- accepts. An implementation may set limits on the maximum depth of
- nesting. An implementation may set limits on the range of numbers.
- An implementation may set limits on the length and character contents
- of strings.
-
-
-
-
-Crockford Informational [Page 5]
-
-RFC 4627 JSON July 2006
-
-
-5. Generators
-
- A JSON generator produces JSON text. The resulting text MUST
- strictly conform to the JSON grammar.
-
-6. IANA Considerations
-
- The MIME media type for JSON text is application/json.
-
- Type name: application
-
- Subtype name: json
-
- Required parameters: n/a
-
- Optional parameters: n/a
-
- Encoding considerations: 8bit if UTF-8; binary if UTF-16 or UTF-32
-
- JSON may be represented using UTF-8, UTF-16, or UTF-32. When JSON
- is written in UTF-8, JSON is 8bit compatible. When JSON is
- written in UTF-16 or UTF-32, the binary content-transfer-encoding
- must be used.
-
- Security considerations:
-
- Generally there are security issues with scripting languages. JSON
- is a subset of JavaScript, but it is a safe subset that excludes
- assignment and invocation.
-
- A JSON text can be safely passed into JavaScript's eval() function
- (which compiles and executes a string) if all the characters not
- enclosed in strings are in the set of characters that form JSON
- tokens. This can be quickly determined in JavaScript with two
- regular expressions and calls to the test and replace methods.
-
- var my_JSON_object = !(/[^,:{}\[\]0-9.\-+Eaeflnr-u \n\r\t]/.test(
- text.replace(/"(\\.|[^"\\])*"/g, ''))) &&
- eval('(' + text + ')');
-
- Interoperability considerations: n/a
-
- Published specification: RFC 4627
-
-
-
-
-
-
-
-
-Crockford Informational [Page 6]
-
-RFC 4627 JSON July 2006
-
-
- Applications that use this media type:
-
- JSON has been used to exchange data between applications written
- in all of these programming languages: ActionScript, C, C#,
- ColdFusion, Common Lisp, E, Erlang, Java, JavaScript, Lua,
- Objective CAML, Perl, PHP, Python, Rebol, Ruby, and Scheme.
-
- Additional information:
-
- Magic number(s): n/a
- File extension(s): .json
- Macintosh file type code(s): TEXT
-
- Person & email address to contact for further information:
- Douglas Crockford
- douglas@crockford.com
-
- Intended usage: COMMON
-
- Restrictions on usage: none
-
- Author:
- Douglas Crockford
- douglas@crockford.com
-
- Change controller:
- Douglas Crockford
- douglas@crockford.com
-
-7. Security Considerations
-
- See Security Considerations in Section 6.
-
-8. Examples
-
- This is a JSON object:
-
- {
- "Image": {
- "Width": 800,
- "Height": 600,
- "Title": "View from 15th Floor",
- "Thumbnail": {
- "Url": "http://www.example.com/image/481989943",
- "Height": 125,
- "Width": "100"
- },
- "IDs": [116, 943, 234, 38793]
-
-
-
-Crockford Informational [Page 7]
-
-RFC 4627 JSON July 2006
-
-
- }
- }
-
- Its Image member is an object whose Thumbnail member is an object
- and whose IDs member is an array of numbers.
-
- This is a JSON array containing two objects:
-
- [
- {
- "precision": "zip",
- "Latitude": 37.7668,
- "Longitude": -122.3959,
- "Address": "",
- "City": "SAN FRANCISCO",
- "State": "CA",
- "Zip": "94107",
- "Country": "US"
- },
- {
- "precision": "zip",
- "Latitude": 37.371991,
- "Longitude": -122.026020,
- "Address": "",
- "City": "SUNNYVALE",
- "State": "CA",
- "Zip": "94085",
- "Country": "US"
- }
- ]
-
-9. References
-
-9.1. Normative References
-
- [ECMA] European Computer Manufacturers Association, "ECMAScript
- Language Specification 3rd Edition", December 1999,
- .
-
- [RFC0020] Cerf, V., "ASCII format for network interchange", RFC 20,
- October 1969.
-
- [RFC2119] Bradner, S., "Key words for use in RFCs to Indicate
- Requirement Levels", BCP 14, RFC 2119, March 1997.
-
- [RFC4234] Crocker, D. and P. Overell, "Augmented BNF for Syntax
- Specifications: ABNF", RFC 4234, October 2005.
-
-
-
-Crockford Informational [Page 8]
-
-RFC 4627 JSON July 2006
-
-
- [UNICODE] The Unicode Consortium, "The Unicode Standard Version 4.0",
- 2003, .
-
-Author's Address
-
- Douglas Crockford
- JSON.org
- EMail: douglas@crockford.com
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Crockford Informational [Page 9]
-
-RFC 4627 JSON July 2006
-
-
-Full Copyright Statement
-
- Copyright (C) The Internet Society (2006).
-
- This document is subject to the rights, licenses and restrictions
- contained in BCP 78, and except as set forth therein, the authors
- retain all their rights.
-
- This document and the information contained herein are provided on an
- "AS IS" basis and THE CONTRIBUTOR, THE ORGANIZATION HE/SHE REPRESENTS
- OR IS SPONSORED BY (IF ANY), THE INTERNET SOCIETY AND THE INTERNET
- ENGINEERING TASK FORCE DISCLAIM ALL WARRANTIES, EXPRESS OR IMPLIED,
- INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE
- INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED
- WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
-
-Intellectual Property
-
- The IETF takes no position regarding the validity or scope of any
- Intellectual Property Rights or other rights that might be claimed to
- pertain to the implementation or use of the technology described in
- this document or the extent to which any license under such rights
- might or might not be available; nor does it represent that it has
- made any independent effort to identify any such rights. Information
- on the procedures with respect to rights in RFC documents can be
- found in BCP 78 and BCP 79.
-
- Copies of IPR disclosures made to the IETF Secretariat and any
- assurances of licenses to be made available, or the result of an
- attempt made to obtain a general license or permission for the use of
- such proprietary rights by implementers or users of this
- specification can be obtained from the IETF on-line IPR repository at
- http://www.ietf.org/ipr.
-
- The IETF invites any interested party to bring to its attention any
- copyrights, patents or patent applications, or other proprietary
- rights that may cover technology that may be required to implement
- this standard. Please address the information to the IETF at
- ietf-ipr@ietf.org.
-
-Acknowledgement
-
- Funding for the RFC Editor function is provided by the IETF
- Administrative Support Activity (IASA).
-
-
-
-
-
-
-
-Crockford Informational [Page 10]
-
diff --git lib/json.jar lib/json.jar
deleted file mode 100644
index 219760c..0000000
Binary files lib/json.jar and /dev/null differ
diff --git lib/log4j-1.2.15.jar lib/log4j-1.2.15.jar
deleted file mode 100644
index c930a6a..0000000
Binary files lib/log4j-1.2.15.jar and /dev/null differ
diff --git lib/velocity-1.5.jar lib/velocity-1.5.jar
deleted file mode 100644
index 7c7f2c4..0000000
Binary files lib/velocity-1.5.jar and /dev/null differ
diff --git lib/velocity.LICENSE lib/velocity.LICENSE
deleted file mode 100644
index 261eeb9..0000000
--- lib/velocity.LICENSE
+++ /dev/null
@@ -1,201 +0,0 @@
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) 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. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed 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.
diff --git metastore/build.xml metastore/build.xml
index af46bc9..2348dc2 100755
--- metastore/build.xml
+++ metastore/build.xml
@@ -36,10 +36,10 @@
-
+
Building Grammar ${src.dir}/java/org/apache/hadoop/hive/metastore/parser/Filter.g ....
-
+
@@ -60,7 +60,7 @@
destdir="${build.classes}"
debug="${javac.debug}"
deprecation="${javac.deprecation}"
- >
+ includeantruntime="false">
@@ -71,7 +71,11 @@
-
+
diff --git metastore/ivy.xml metastore/ivy.xml
index 7d90b25..3bbfb17 100644
--- metastore/ivy.xml
+++ metastore/ivy.xml
@@ -15,66 +15,57 @@
limitations under the License.
-->
-
-
-
- The Apache Hive (TM) data warehouse software facilitates querying and managing large datasets residing in distributed storage.
- https://cwiki.apache.org/confluence/display/Hive/Home
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ The Apache Hive (TM) data warehouse software facilitates querying and managing large datasets residing in distributed storage.
+ https://cwiki.apache.org/confluence/display/Hive/Home
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git odbc/ivy.xml odbc/ivy.xml
new file mode 100644
index 0000000..be556ab
--- /dev/null
+++ odbc/ivy.xml
@@ -0,0 +1,34 @@
+
+
+
+
+
+
+ The Apache Hive (TM) data warehouse software facilitates querying and managing large datasets residing in distributed storage.
+ https://cwiki.apache.org/confluence/display/Hive/Home
+
+
+
+
+
+
+
+
+
diff --git pdk/build.xml pdk/build.xml
index 374e5d1..abef0be 100644
--- pdk/build.xml
+++ pdk/build.xml
@@ -27,7 +27,7 @@
-
+
+ deprecation="${javac.deprecation}"
+ includeantruntime="false">
diff --git pdk/ivy.xml pdk/ivy.xml
index 411e126..9fc165f 100644
--- pdk/ivy.xml
+++ pdk/ivy.xml
@@ -16,13 +16,16 @@
limitations under the License.
-->
-
-
-
- The Apache Hive (TM) data warehouse software facilitates querying and managing large datasets residing in distributed storage.
- https://cwiki.apache.org/confluence/display/Hive/Home
-
-
-
-
+
+
+
+ The Apache Hive (TM) data warehouse software facilitates querying and managing large datasets residing in distributed storage.
+ https://cwiki.apache.org/confluence/display/Hive/Home
+
+
+
+
+
+
+
diff --git ql/build.xml ql/build.xml
index 8b22508..d8c5fbb 100644
--- ql/build.xml
+++ ql/build.xml
@@ -38,7 +38,6 @@
-
@@ -55,7 +54,7 @@
-
+
You must set the 'thrift.home' property!
Executing ${thrift.home}/bin/thrift on ${ant.project.name}/if/queryplan.thrift
@@ -64,9 +63,9 @@
-
+
+ classpath="${build.dir.hive}/anttasks/hive-anttasks-${version}.jar:${build.ivy.lib.dir}/default/velocity-${velocity.version}.jar:${build.ivy.lib.dir}/default/commons-collections-${commons-collections.version}.jar:${build.ivy.lib.dir}/default/commons-lang-${commons-lang.version}.jar:${build.ivy.lib.dir}/default/derby-${derby.version}.jar"/>
-
+
+ deprecation="${javac.deprecation}"
+ includeantruntime="false">
@@ -198,18 +198,24 @@
-
+
-
+
+
+
+
+
+
+
@@ -219,6 +225,7 @@
+
@@ -232,7 +239,7 @@
-
+
diff --git ql/ivy.xml ql/ivy.xml
index a09e970..541ae58 100644
--- ql/ivy.xml
+++ ql/ivy.xml
@@ -15,32 +15,50 @@
limitations under the License.
-->
-
-
-
- The Apache Hive (TM) data warehouse software facilitates querying and managing large datasets residing in distributed storage.
- https://cwiki.apache.org/confluence/display/Hive/Home
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ The Apache Hive (TM) data warehouse software facilitates querying and managing large datasets residing in distributed storage.
+ https://cwiki.apache.org/confluence/display/Hive/Home
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git ql/lib/README ql/lib/README
deleted file mode 100644
index d11400e..0000000
--- ql/lib/README
+++ /dev/null
@@ -1,7 +0,0 @@
-Folowing is the list of external jars contained in this directory and the sources from where they were obtained:
----------------------------------------------------------------------------------------------------------------
-
-* stringtemplate-3.1b1.jar - http://www.stringtemplate.org/download.html
-* antlr-2.7.7.jar - http://www.antlr.org/download.html
-* antlr-3.0.1.jar - http://www.antlr.org/download.html
-* antlr-runtime-3.0.1.jar - http://www.antlr.org/download.html
diff --git ql/lib/antlr-2.7.7.LICENSE ql/lib/antlr-2.7.7.LICENSE
deleted file mode 100644
index 1d1d5d6..0000000
--- ql/lib/antlr-2.7.7.LICENSE
+++ /dev/null
@@ -1,26 +0,0 @@
-[The "BSD licence"]
-Copyright (c) 2003-2006 Terence Parr
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- 3. The name of the author may not be used to endorse or promote products
- derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 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 OF
-THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git ql/lib/antlr-2.7.7.jar ql/lib/antlr-2.7.7.jar
deleted file mode 100644
index 5e5f14b..0000000
Binary files ql/lib/antlr-2.7.7.jar and /dev/null differ
diff --git ql/lib/antlr-3.0.1.LICENSE ql/lib/antlr-3.0.1.LICENSE
deleted file mode 100644
index 1d1d5d6..0000000
--- ql/lib/antlr-3.0.1.LICENSE
+++ /dev/null
@@ -1,26 +0,0 @@
-[The "BSD licence"]
-Copyright (c) 2003-2006 Terence Parr
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- 3. The name of the author may not be used to endorse or promote products
- derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 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 OF
-THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git ql/lib/antlr-3.0.1.jar ql/lib/antlr-3.0.1.jar
deleted file mode 100644
index 7d37952..0000000
Binary files ql/lib/antlr-3.0.1.jar and /dev/null differ
diff --git ql/lib/antlr-runtime-3.0.1.LICENSE ql/lib/antlr-runtime-3.0.1.LICENSE
deleted file mode 100644
index 1d1d5d6..0000000
--- ql/lib/antlr-runtime-3.0.1.LICENSE
+++ /dev/null
@@ -1,26 +0,0 @@
-[The "BSD licence"]
-Copyright (c) 2003-2006 Terence Parr
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- 3. The name of the author may not be used to endorse or promote products
- derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 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 OF
-THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git ql/lib/antlr-runtime-3.0.1.jar ql/lib/antlr-runtime-3.0.1.jar
deleted file mode 100644
index b2efb5b..0000000
Binary files ql/lib/antlr-runtime-3.0.1.jar and /dev/null differ
diff --git ql/lib/stringtemplate-3.1b1.LICENSE ql/lib/stringtemplate-3.1b1.LICENSE
deleted file mode 100644
index 1d1d5d6..0000000
--- ql/lib/stringtemplate-3.1b1.LICENSE
+++ /dev/null
@@ -1,26 +0,0 @@
-[The "BSD licence"]
-Copyright (c) 2003-2006 Terence Parr
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- 3. The name of the author may not be used to endorse or promote products
- derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 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 OF
-THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git ql/lib/stringtemplate-3.1b1.jar ql/lib/stringtemplate-3.1b1.jar
deleted file mode 100644
index 096f863..0000000
Binary files ql/lib/stringtemplate-3.1b1.jar and /dev/null differ
diff --git serde/build.xml serde/build.xml
index 471c43d..a4255d5 100644
--- serde/build.xml
+++ serde/build.xml
@@ -17,11 +17,6 @@
limitations under the License.
-->
-
-
@@ -42,14 +37,15 @@ to call at top-level: ant deploy-contrib compile-core-test
/>
-
+
+ deprecation="${javac.deprecation}"
+ includeantruntime="false">
diff --git serde/ivy.xml serde/ivy.xml
index 290cb6c..499b841 100644
--- serde/ivy.xml
+++ serde/ivy.xml
@@ -15,23 +15,38 @@
limitations under the License.
-->
-
-
-
- The Apache Hive (TM) data warehouse software facilitates querying and managing large datasets residing in distributed storage.
- https://cwiki.apache.org/confluence/display/Hive/Home
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ The Apache Hive (TM) data warehouse software facilitates querying and managing large datasets residing in distributed storage.
+ https://cwiki.apache.org/confluence/display/Hive/Home
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git service/build.xml service/build.xml
index 10e8cf1..9144b21 100644
--- service/build.xml
+++ service/build.xml
@@ -49,7 +49,7 @@
-
+
+ includeantruntime="false">
-
-
-
-
diff --git service/ivy.xml service/ivy.xml
index c37efdc..dd30158 100644
--- service/ivy.xml
+++ service/ivy.xml
@@ -16,17 +16,30 @@
limitations under the License.
-->
-
-
-
- The Apache Hive (TM) data warehouse software facilitates querying and managing large datasets residing in distributed storage.
- https://cwiki.apache.org/confluence/display/Hive/Home
-
-
-
-
-
-
+
+
+
+ The Apache Hive (TM) data warehouse software facilitates querying and managing large datasets residing in distributed storage.
+ https://cwiki.apache.org/confluence/display/Hive/Home
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git shims/build.xml shims/build.xml
index 3930ca2..2a02b68 100644
--- shims/build.xml
+++ shims/build.xml
@@ -51,7 +51,8 @@ to call at top-level: ant deploy-contrib compile-core-test
excludes="**/Proxy*.java"
destdir="${build.classes}"
debug="${javac.debug}"
- deprecation="${javac.deprecation}">
+ deprecation="${javac.deprecation}"
+ includeantruntime="false">
@@ -59,7 +60,7 @@ to call at top-level: ant deploy-contrib compile-core-test
-
+
@@ -74,7 +75,8 @@ to call at top-level: ant deploy-contrib compile-core-test
includes="**/Proxy*.java"
destdir="${build.classes}"
debug="${javac.debug}"
- deprecation="${javac.deprecation}">
+ deprecation="${javac.deprecation}"
+ includeantruntime="false">
@@ -96,7 +98,8 @@ to call at top-level: ant deploy-contrib compile-core-test
optimize="${javac.optimize}"
target="${javac.version}"
source="${javac.version}"
- deprecation="${javac.deprecation}">
+ deprecation="${javac.deprecation}"
+ includeantruntime="false">
@@ -109,7 +112,8 @@ to call at top-level: ant deploy-contrib compile-core-test
optimize="${javac.optimize}"
target="${javac.version}"
source="${javac.version}"
- deprecation="${javac.deprecation}">
+ deprecation="${javac.deprecation}"
+ includeantruntime="false">
diff --git shims/ivy.xml shims/ivy.xml
index c1785aa..4b789e6 100644
--- shims/ivy.xml
+++ shims/ivy.xml
@@ -16,22 +16,29 @@
limitations under the License.
-->
-
-
-
- The Apache Hive (TM) data warehouse software facilitates querying and managing large datasets residing in distributed storage.
- https://cwiki.apache.org/confluence/display/Hive/Home
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ The Apache Hive (TM) data warehouse software facilitates querying and managing large datasets residing in distributed storage.
+ https://cwiki.apache.org/confluence/display/Hive/Home
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+