diff --git a/.classpath b/.classpath
index 8d033f143..466e51aa1 100644
--- a/.classpath
+++ b/.classpath
@@ -18,7 +18,6 @@
-
diff --git a/LICENSE.txt b/LICENSE.txt
index a32456386..f27ae6c57 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -38,10 +38,8 @@ ordered here by license:
licenses/apache2.0.LICENSE.txt
calendar-parser (package com.metaweb.gridworks.expr.util)
ant-tools
- bzip2
commons-lang
commons-codec
- commons-math
jackson
jdatapath
jetty
@@ -52,7 +50,7 @@ licenses/apache2.0.LICENSE.txt
poi-ooxml-schemas
servlet-api
xmlbeans
-
+
licenses/secondstring.LICENSE.txt (BSD family)
secondstring
@@ -64,15 +62,30 @@ licenses/simile.LICENSE.txt (BSD family)
licenses/arithcode.LICENSE.txt (BSD family)
arithcode
+
+licenses/freebase_suggest.LICENSE.txt (BSD family)
+ freebase_suggest
+
+licenses/jquery.LICENSE.txt (MIT)
+ jquery
+
+licenses/jquery_ui.LICENSE.txt (MIT)
+ jquery_ui
+
+licenses/datejs.LICENSE.txt (MIT)
+ datejs
+
+licenses/imgareaselect.LICENSE.txt (MIT)
+ imgareaselect
+
+licenses/slf4j.LICENSE.txt (MIT)
+ slf4j-api
+ slf4j-log4j12
+ jcl-over-slf4j
licenses/icu4j.LICENSE.txt (MIT family)
icu4j
-licenses/slf4j.LICENSE.txt (MIT family)
- slf4j-api
- slf4j-log4j12
- jcl-over-slf4j
-
licenses/json.LICENSE.txt (MIT family)
json
diff --git a/lib-src/commons-math-2.1-sources.jar b/lib-src/commons-math-2.1-sources.jar
deleted file mode 100644
index 8d61e3e07..000000000
Binary files a/lib-src/commons-math-2.1-sources.jar and /dev/null differ
diff --git a/lib/commons-math-2.1.jar b/lib/commons-math-2.1.jar
deleted file mode 100644
index 43b4b369f..000000000
Binary files a/lib/commons-math-2.1.jar and /dev/null differ
diff --git a/licenses/datejs.LICENSE.txt b/licenses/datejs.LICENSE.txt
new file mode 100644
index 000000000..650d8c8a9
--- /dev/null
+++ b/licenses/datejs.LICENSE.txt
@@ -0,0 +1,26 @@
+The MIT License (http://www.opensource.org/licenses/mit-license.php)
+
+Copyright (c) 2006-2008, Coolite Inc. (http://www.coolite.com/). 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, 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 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.
+
+See also:
+ http://www.datejs.com/license/
+ http://www.datejs.com/
+ http://www.coolite.com/
diff --git a/licenses/freebase_suggest.LICENSE.txt b/licenses/freebase_suggest.LICENSE.txt
new file mode 100644
index 000000000..5a039ee6d
--- /dev/null
+++ b/licenses/freebase_suggest.LICENSE.txt
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2010 Metaweb Technologies, Inc. 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY METAWEB TECHNOLOGIES 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 METAWEB
+ * TECHNOLOGIES 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.
+ *
+ */
\ No newline at end of file
diff --git a/licenses/imgareaselect.LICENSE.txt b/licenses/imgareaselect.LICENSE.txt
new file mode 100644
index 000000000..3c7c0b3d5
--- /dev/null
+++ b/licenses/imgareaselect.LICENSE.txt
@@ -0,0 +1,20 @@
+Copyright (c) 2010 Michal Wojciechowski, http://odyniec.net/
+
+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 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 a/licenses/jquery.LICENSE.txt b/licenses/jquery.LICENSE.txt
new file mode 100644
index 000000000..ea336914d
--- /dev/null
+++ b/licenses/jquery.LICENSE.txt
@@ -0,0 +1,20 @@
+Copyright (c) 2010 John Resig, http://jquery.com/
+
+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 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 a/licenses/jquery_ui.LICENSE.txt b/licenses/jquery_ui.LICENSE.txt
new file mode 100644
index 000000000..2585de262
--- /dev/null
+++ b/licenses/jquery_ui.LICENSE.txt
@@ -0,0 +1,25 @@
+Copyright (c) 2010 Paul Bakaus, http://jqueryui.com/
+
+This software consists of voluntary contributions made by many
+individuals (AUTHORS.txt, http://jqueryui.com/about) For exact
+contribution history, see the revision history and logs, available
+at http://jquery-ui.googlecode.com/svn/
+
+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 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 a/src/main/webapp/about.html b/src/main/webapp/about.html
index 0fded60ee..22a96e4a2 100644
--- a/src/main/webapp/about.html
+++ b/src/main/webapp/about.html
@@ -1 +1 @@
-
Freebase Gridworks is a power tool that allows you to load data,
understand it, clean it up, reconcile it internally, and augment it
with data coming from Freebase. All with the comfort and privacy of
your own computer.
/*
* Copyright (c) 2010, Metaweb Technologies, Inc. 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.
*
* THIS SOFTWARE IS PROVIDED BY METAWEB TECHNOLOGIES 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 METAWEB
* TECHNOLOGIES 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.
*
*/
Freebase Gridworks is a power tool that allows you to load data,
understand it, clean it up, reconcile it internally, and augment it
with data coming from Freebase. All with the comfort and privacy of
your own computer.
/*
* Copyright (c) 2010, Metaweb Technologies, Inc. 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.
*
* THIS SOFTWARE IS PROVIDED BY METAWEB TECHNOLOGIES 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 METAWEB
* TECHNOLOGIES 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.
*
*/
\ No newline at end of file
diff --git a/src/main/webapp/error.html b/src/main/webapp/error.html
index fc7e039c8..5ac404616 100644
--- a/src/main/webapp/error.html
+++ b/src/main/webapp/error.html
@@ -7,7 +7,7 @@
-
+