diff --git a/.gitignore b/.gitignore
index 48e27ce6d..d076bc7d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,10 +27,3 @@ test-out/
/bin
open-refine.log
.vscode
-
-main/target/
-main/webapp/WEB-INF/lib/
-server/target/
-extensions/*/target/
-extensions/*/module/MOD-INF/classes/
-extensions/*/module/MOD-INF/lib/
diff --git a/.travis.yml b/.travis.yml
index 19bce56fa..240f4a426 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,19 +18,15 @@ before_install:
- wget -O ~/codacy-coverage-reporter-assembly-latest.jar https://github.com/codacy/codacy-coverage-reporter/releases/download/2.0.0/codacy-coverage-reporter-2.0.0-assembly.jar
# create test database for mysql, mariadb and postgresql
- mysql -u root -e 'CREATE DATABASE test_db;'
- - mysql -u root test_db < extensions/database/tests/conf/travis-mysql.sql
+ - mysql -u root test_db < extensions/database/test/conf/travis-mysql.sql
- psql -c 'CREATE DATABASE test_db;' -U postgres
- - psql -U postgres test_db < extensions/database/tests/conf/travis-pgsql.sql
- - cp extensions/database/tests/conf/travis_tests.xml extensions/database/tests/conf/tests.xml
- - mvn process-resources
+ - psql -U postgres test_db < extensions/database/test/conf/travis-pgsql.sql
+ - cp extensions/database/test/conf/travis_tests.xml extensions/database/test/conf/tests.xml
script:
- - ./refine test
+ - ./refine server_test
+ - ./refine extensions_test
after_success:
- java -cp ~/codacy-coverage-reporter-assembly-latest.jar com.codacy.CodacyCoverageReporter -l Java -r build/report/jacoco.xml
-cache:
- directories:
- - $HOME/.m2
-
diff --git a/appveyor.yml b/appveyor.yml
index 2520e3f41..a062a2da5 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -11,12 +11,18 @@ clone_depth: 5
skip_branch_with_pr: true
environment:
+ ANT_HOME: C:\apache-ant-1.10.5
JAVA_HOME: C:\Program Files (x86)\Java\jdk1.8.0
- MAVEN_HOME: C:\Program Files (x86)\Apache\Maven
matrix:
fast_finish: true
+install:
+- cmd: if not exist %ANT_HOME% pushd . && cd \ && appveyor DownloadFile http://www.mirrorservice.org/sites/ftp.apache.org//ant/binaries/apache-ant-1.10.5-bin.zip && 7z x apache-ant-1.10.5-bin.zip && popd
+
+cache:
+- C:\apache-ant-1.10.5
+- apache-ant-1.10.5-bin.zip
build: off
# scripts to run before test
@@ -26,7 +32,7 @@ before_test:
PATH=C:\Program Files\PostgreSQL\9.6\bin\;C:\Program Files\MySQL\MySQL Server 5.7\bin\;%PATH%
SET MYSQL_PWD=Password12!
mysql -u root --password=Password12! -e "create database test_db;"
- mysql -u root test_db --password=Password12! < extensions\database\tests\conf\travis-mysql.sql
+ mysql -u root test_db --password=Password12! < extensions\database\test\conf\travis-mysql.sql
echo "localhost:*:test_db:postgres:Password12!" > C:\Program Files\PostgreSQL\9.6\pgpass.conf
echo "localhost:*:test_db:postgres:Password12!" > pgpass.conf
echo "localhost:*:test_db:postgres:Password12!" > %userprofile%\pgpass.conf
@@ -34,12 +40,9 @@ before_test:
SET PGPASSWORD=Password12!
SET PGUSER=postgres
createdb test_db
- psql -U postgres test_db < extensions\database\tests\conf\travis-pgsql.sql
+ psql -U postgres test_db < extensions\database\test\conf\travis-pgsql.sql
- copy extensions\database\tests\conf\appveyor_tests.xml extensions\database\tests\conf\tests.xml
-- cmd: |-
- mvn process-resources
- mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V
+ copy extensions\database\test\conf\appveyor_tests.xml extensions\database\test\conf\tests.xml
test_script:
- cmd: echo Running test_script...
@@ -48,8 +51,6 @@ test_script:
path
- refine test
-
-cache:
- - C:\Users\appveyor\.m2
-
+ refine server_test
+
+ refine extensions_test
diff --git a/build.xml b/build.xml
new file mode 100644
index 000000000..1135d638b
--- /dev/null
+++ b/build.xml
@@ -0,0 +1,605 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ server/lib/*.jar
+
+
+ -Djava.library.path=server/lib/native/windows
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/extensions/build.xml b/extensions/build.xml
new file mode 100644
index 000000000..b229e6093
--- /dev/null
+++ b/extensions/build.xml
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/extensions/database/build.xml b/extensions/database/build.xml
new file mode 100644
index 000000000..b6ee98f30
--- /dev/null
+++ b/extensions/database/build.xml
@@ -0,0 +1,165 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/extensions/database/module/MOD-INF/lib/commons-collections-3.2.1.jar b/extensions/database/module/MOD-INF/lib/commons-collections-3.2.1.jar
new file mode 100644
index 000000000..c35fa1fee
Binary files /dev/null and b/extensions/database/module/MOD-INF/lib/commons-collections-3.2.1.jar differ
diff --git a/extensions/database/module/MOD-INF/lib/commons-io-1.4.jar b/extensions/database/module/MOD-INF/lib/commons-io-1.4.jar
new file mode 100644
index 000000000..133dc6cb3
Binary files /dev/null and b/extensions/database/module/MOD-INF/lib/commons-io-1.4.jar differ
diff --git a/extensions/database/module/MOD-INF/lib/google-http-client-1.20.0.jar b/extensions/database/module/MOD-INF/lib/google-http-client-1.20.0.jar
new file mode 100644
index 000000000..82887fb3e
Binary files /dev/null and b/extensions/database/module/MOD-INF/lib/google-http-client-1.20.0.jar differ
diff --git a/extensions/database/module/MOD-INF/lib/google-http-client-jackson2-1.20.0.jar b/extensions/database/module/MOD-INF/lib/google-http-client-jackson2-1.20.0.jar
new file mode 100644
index 000000000..674aea920
Binary files /dev/null and b/extensions/database/module/MOD-INF/lib/google-http-client-jackson2-1.20.0.jar differ
diff --git a/extensions/database/module/MOD-INF/lib/httpclient-4.0.1.jar b/extensions/database/module/MOD-INF/lib/httpclient-4.0.1.jar
new file mode 100644
index 000000000..ad32285ab
Binary files /dev/null and b/extensions/database/module/MOD-INF/lib/httpclient-4.0.1.jar differ
diff --git a/extensions/database/module/MOD-INF/lib/httpcore-4.0.1.jar b/extensions/database/module/MOD-INF/lib/httpcore-4.0.1.jar
new file mode 100644
index 000000000..4aef35e2f
Binary files /dev/null and b/extensions/database/module/MOD-INF/lib/httpcore-4.0.1.jar differ
diff --git a/extensions/database/module/MOD-INF/lib/jackson-core-asl-1.9.13.jar b/extensions/database/module/MOD-INF/lib/jackson-core-asl-1.9.13.jar
new file mode 100644
index 000000000..bb4fe1da1
Binary files /dev/null and b/extensions/database/module/MOD-INF/lib/jackson-core-asl-1.9.13.jar differ
diff --git a/extensions/database/module/MOD-INF/lib/jackson-mapper-asl-1.9.13.jar b/extensions/database/module/MOD-INF/lib/jackson-mapper-asl-1.9.13.jar
new file mode 100644
index 000000000..0f2073fc7
Binary files /dev/null and b/extensions/database/module/MOD-INF/lib/jackson-mapper-asl-1.9.13.jar differ
diff --git a/extensions/database/module/MOD-INF/lib/jasypt-1.9.2.jar b/extensions/database/module/MOD-INF/lib/jasypt-1.9.2.jar
new file mode 100644
index 000000000..c22a7e6d5
Binary files /dev/null and b/extensions/database/module/MOD-INF/lib/jasypt-1.9.2.jar differ
diff --git a/extensions/database/module/MOD-INF/lib/json-simple-1.1.1.jar b/extensions/database/module/MOD-INF/lib/json-simple-1.1.1.jar
new file mode 100644
index 000000000..dfd5856d0
Binary files /dev/null and b/extensions/database/module/MOD-INF/lib/json-simple-1.1.1.jar differ
diff --git a/extensions/database/module/MOD-INF/lib/mariadb-java-client-2.2.0.jar b/extensions/database/module/MOD-INF/lib/mariadb-java-client-2.2.0.jar
new file mode 100644
index 000000000..7575fec64
Binary files /dev/null and b/extensions/database/module/MOD-INF/lib/mariadb-java-client-2.2.0.jar differ
diff --git a/extensions/database/module/MOD-INF/lib/mysql-connector-java-5.1.44-bin.jar b/extensions/database/module/MOD-INF/lib/mysql-connector-java-5.1.44-bin.jar
new file mode 100644
index 000000000..2f2e32d51
Binary files /dev/null and b/extensions/database/module/MOD-INF/lib/mysql-connector-java-5.1.44-bin.jar differ
diff --git a/extensions/database/module/MOD-INF/lib/postgresql-42.1.4.jar b/extensions/database/module/MOD-INF/lib/postgresql-42.1.4.jar
new file mode 100644
index 000000000..08a54b105
Binary files /dev/null and b/extensions/database/module/MOD-INF/lib/postgresql-42.1.4.jar differ
diff --git a/extensions/database/pom.xml b/extensions/database/pom.xml
deleted file mode 100644
index 76e2a8965..000000000
--- a/extensions/database/pom.xml
+++ /dev/null
@@ -1,189 +0,0 @@
-
- 4.0.0
-
- org.openrefine
- database
- jar
- 3.0-SNAPSHOT
-
- OpenRefine - Database extension
- Connections to SQL databases for import and export
- http://openrefine.org/
-
- org.openrefine
- extensions
- 3.0-SNAPSHOT
-
-
-
- openrefine-database
-
-
- src
-
-
- tests/src
- module/MOD-INF/classes
-
-
- org.codehaus.mojo
- build-helper-maven-plugin
- 1.8
-
-
- generate-sources
-
- add-source
-
-
-
- src
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
- 3.1
-
- 1.8
- 1.8
- UTF-8
- false
-
-
-
- org.apache.maven.plugins
- maven-resources-plugin
- 2.6
-
- UTF-8
-
-
-
- org.apache.maven.plugins
- maven-surefire-plugin
- 2.22.0
-
-
- tests/conf/tests.xml
-
-
-
-
- org.apache.maven.plugins
- maven-clean-plugin
- 3.1.0
-
-
-
- module/MOD-INF/lib
-
-
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-dependency-plugin
- 3.1.1
-
-
- compile
-
- copy-dependencies
-
-
- module/MOD-INF/lib
- runtime
-
-
-
-
-
-
-
-
-
-
- ${project.groupId}
- main
- ${project.version}
- provided
-
-
- javax.servlet
- servlet-api
- 2.5
- provided
-
-
- org.postgresql
- postgresql
- 42.1.4
-
-
- org.apache.httpcomponents
- httpclient
- 4.5.6
-
-
- com.google.http-client
- google-http-client-jackson2
- 1.24.1
-
-
- mysql
- mysql-connector-java
- 5.1.46
-
-
- org.jasypt
- jasypt
- 1.9.2
-
-
- org.mariadb.jdbc
- mariadb-java-client
- 2.2.6
-
-
- com.fasterxml.jackson.core
- jackson-databind
- 2.9.1
-
-
- com.fasterxml.jackson.core
- jackson-annotations
- 2.9.1
-
-
- org.apache.commons
- commons-lang3
- 3.6
-
-
-
-
- org.testng
- testng
- 6.9.10
- test
-
-
- org.mockito
- mockito-core
- 2.8.9
- test
-
-
-
-
-
-
-
diff --git a/extensions/database/src/com/google/refine/extension/database/DatabaseUtils.java b/extensions/database/src/com/google/refine/extension/database/DatabaseUtils.java
index d9ab268bb..db6960581 100644
--- a/extensions/database/src/com/google/refine/extension/database/DatabaseUtils.java
+++ b/extensions/database/src/com/google/refine/extension/database/DatabaseUtils.java
@@ -34,10 +34,10 @@ import java.util.ArrayList;
import java.util.List;
import java.util.ListIterator;
-import com.fasterxml.jackson.core.JsonGenerationException;
-import com.fasterxml.jackson.core.JsonParseException;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import org.codehaus.jackson.JsonGenerationException;
+import org.codehaus.jackson.JsonParseException;
+import org.codehaus.jackson.map.JsonMappingException;
+import org.codehaus.jackson.map.ObjectMapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/extensions/database/src/com/google/refine/extension/database/cmd/ConnectCommand.java b/extensions/database/src/com/google/refine/extension/database/cmd/ConnectCommand.java
index 3d1b6d753..014b30930 100644
--- a/extensions/database/src/com/google/refine/extension/database/cmd/ConnectCommand.java
+++ b/extensions/database/src/com/google/refine/extension/database/cmd/ConnectCommand.java
@@ -36,7 +36,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.http.HttpStatus;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import org.codehaus.jackson.map.ObjectMapper;
import org.json.JSONWriter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/extensions/database/src/com/google/refine/extension/database/cmd/ExecuteQueryCommand.java b/extensions/database/src/com/google/refine/extension/database/cmd/ExecuteQueryCommand.java
index b22fad3ff..90a0dd387 100644
--- a/extensions/database/src/com/google/refine/extension/database/cmd/ExecuteQueryCommand.java
+++ b/extensions/database/src/com/google/refine/extension/database/cmd/ExecuteQueryCommand.java
@@ -36,7 +36,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.http.HttpStatus;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import org.codehaus.jackson.map.ObjectMapper;
import org.json.JSONWriter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/extensions/database/src/com/google/refine/extension/database/cmd/TestQueryCommand.java b/extensions/database/src/com/google/refine/extension/database/cmd/TestQueryCommand.java
index 2a7916adb..a728fc1bd 100644
--- a/extensions/database/src/com/google/refine/extension/database/cmd/TestQueryCommand.java
+++ b/extensions/database/src/com/google/refine/extension/database/cmd/TestQueryCommand.java
@@ -36,7 +36,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.http.HttpStatus;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import org.codehaus.jackson.map.ObjectMapper;
import org.json.JSONWriter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/extensions/database/tests/src/com/google/refine/extension/database/DBExtensionTestUtils.java b/extensions/database/test/com/google/refine/extension/database/DBExtensionTestUtils.java
similarity index 99%
rename from extensions/database/tests/src/com/google/refine/extension/database/DBExtensionTestUtils.java
rename to extensions/database/test/com/google/refine/extension/database/DBExtensionTestUtils.java
index a0d50fa06..c8df3d8b3 100644
--- a/extensions/database/tests/src/com/google/refine/extension/database/DBExtensionTestUtils.java
+++ b/extensions/database/test/com/google/refine/extension/database/DBExtensionTestUtils.java
@@ -13,7 +13,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Random;
-import org.apache.commons.lang3.text.StrSubstitutor;
+import org.apache.commons.lang.text.StrSubstitutor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/extensions/database/tests/src/com/google/refine/extension/database/DBExtensionTests.java b/extensions/database/test/com/google/refine/extension/database/DBExtensionTests.java
similarity index 100%
rename from extensions/database/tests/src/com/google/refine/extension/database/DBExtensionTests.java
rename to extensions/database/test/com/google/refine/extension/database/DBExtensionTests.java
diff --git a/extensions/database/tests/src/com/google/refine/extension/database/DatabaseImportControllerTest.java b/extensions/database/test/com/google/refine/extension/database/DatabaseImportControllerTest.java
similarity index 100%
rename from extensions/database/tests/src/com/google/refine/extension/database/DatabaseImportControllerTest.java
rename to extensions/database/test/com/google/refine/extension/database/DatabaseImportControllerTest.java
diff --git a/extensions/database/tests/src/com/google/refine/extension/database/DatabaseServiceTest.java b/extensions/database/test/com/google/refine/extension/database/DatabaseServiceTest.java
similarity index 100%
rename from extensions/database/tests/src/com/google/refine/extension/database/DatabaseServiceTest.java
rename to extensions/database/test/com/google/refine/extension/database/DatabaseServiceTest.java
diff --git a/extensions/database/tests/src/com/google/refine/extension/database/DatabaseTestConfig.java b/extensions/database/test/com/google/refine/extension/database/DatabaseTestConfig.java
similarity index 100%
rename from extensions/database/tests/src/com/google/refine/extension/database/DatabaseTestConfig.java
rename to extensions/database/test/com/google/refine/extension/database/DatabaseTestConfig.java
diff --git a/extensions/database/tests/src/com/google/refine/extension/database/SimpleTextEncryptorTest.java b/extensions/database/test/com/google/refine/extension/database/SimpleTextEncryptorTest.java
similarity index 100%
rename from extensions/database/tests/src/com/google/refine/extension/database/SimpleTextEncryptorTest.java
rename to extensions/database/test/com/google/refine/extension/database/SimpleTextEncryptorTest.java
diff --git a/extensions/database/tests/src/com/google/refine/extension/database/cmd/ConnectCommandTest.java b/extensions/database/test/com/google/refine/extension/database/cmd/ConnectCommandTest.java
similarity index 100%
rename from extensions/database/tests/src/com/google/refine/extension/database/cmd/ConnectCommandTest.java
rename to extensions/database/test/com/google/refine/extension/database/cmd/ConnectCommandTest.java
diff --git a/extensions/database/tests/src/com/google/refine/extension/database/cmd/ExecuteQueryCommandTest.java b/extensions/database/test/com/google/refine/extension/database/cmd/ExecuteQueryCommandTest.java
similarity index 100%
rename from extensions/database/tests/src/com/google/refine/extension/database/cmd/ExecuteQueryCommandTest.java
rename to extensions/database/test/com/google/refine/extension/database/cmd/ExecuteQueryCommandTest.java
diff --git a/extensions/database/tests/src/com/google/refine/extension/database/cmd/SavedConnectionCommandTest.java b/extensions/database/test/com/google/refine/extension/database/cmd/SavedConnectionCommandTest.java
similarity index 100%
rename from extensions/database/tests/src/com/google/refine/extension/database/cmd/SavedConnectionCommandTest.java
rename to extensions/database/test/com/google/refine/extension/database/cmd/SavedConnectionCommandTest.java
diff --git a/extensions/database/tests/src/com/google/refine/extension/database/cmd/TestConnectCommandTest.java b/extensions/database/test/com/google/refine/extension/database/cmd/TestConnectCommandTest.java
similarity index 100%
rename from extensions/database/tests/src/com/google/refine/extension/database/cmd/TestConnectCommandTest.java
rename to extensions/database/test/com/google/refine/extension/database/cmd/TestConnectCommandTest.java
diff --git a/extensions/database/tests/src/com/google/refine/extension/database/cmd/TestQueryCommandTest.java b/extensions/database/test/com/google/refine/extension/database/cmd/TestQueryCommandTest.java
similarity index 100%
rename from extensions/database/tests/src/com/google/refine/extension/database/cmd/TestQueryCommandTest.java
rename to extensions/database/test/com/google/refine/extension/database/cmd/TestQueryCommandTest.java
diff --git a/extensions/database/tests/src/com/google/refine/extension/database/mariadb/MariaDBConnectionManagerTest.java b/extensions/database/test/com/google/refine/extension/database/mariadb/MariaDBConnectionManagerTest.java
similarity index 100%
rename from extensions/database/tests/src/com/google/refine/extension/database/mariadb/MariaDBConnectionManagerTest.java
rename to extensions/database/test/com/google/refine/extension/database/mariadb/MariaDBConnectionManagerTest.java
diff --git a/extensions/database/tests/src/com/google/refine/extension/database/mariadb/MariaDBDatabaseServiceTest.java b/extensions/database/test/com/google/refine/extension/database/mariadb/MariaDBDatabaseServiceTest.java
similarity index 100%
rename from extensions/database/tests/src/com/google/refine/extension/database/mariadb/MariaDBDatabaseServiceTest.java
rename to extensions/database/test/com/google/refine/extension/database/mariadb/MariaDBDatabaseServiceTest.java
diff --git a/extensions/database/tests/src/com/google/refine/extension/database/mysql/MySQLConnectionManagerTest.java b/extensions/database/test/com/google/refine/extension/database/mysql/MySQLConnectionManagerTest.java
similarity index 100%
rename from extensions/database/tests/src/com/google/refine/extension/database/mysql/MySQLConnectionManagerTest.java
rename to extensions/database/test/com/google/refine/extension/database/mysql/MySQLConnectionManagerTest.java
diff --git a/extensions/database/tests/src/com/google/refine/extension/database/mysql/MySQLDatabaseServiceTest.java b/extensions/database/test/com/google/refine/extension/database/mysql/MySQLDatabaseServiceTest.java
similarity index 100%
rename from extensions/database/tests/src/com/google/refine/extension/database/mysql/MySQLDatabaseServiceTest.java
rename to extensions/database/test/com/google/refine/extension/database/mysql/MySQLDatabaseServiceTest.java
diff --git a/extensions/database/tests/src/com/google/refine/extension/database/pgsql/PgSQLConnectionManagerTest.java b/extensions/database/test/com/google/refine/extension/database/pgsql/PgSQLConnectionManagerTest.java
similarity index 100%
rename from extensions/database/tests/src/com/google/refine/extension/database/pgsql/PgSQLConnectionManagerTest.java
rename to extensions/database/test/com/google/refine/extension/database/pgsql/PgSQLConnectionManagerTest.java
diff --git a/extensions/database/tests/src/com/google/refine/extension/database/pgsql/PgSQLDatabaseServiceTest.java b/extensions/database/test/com/google/refine/extension/database/pgsql/PgSQLDatabaseServiceTest.java
similarity index 100%
rename from extensions/database/tests/src/com/google/refine/extension/database/pgsql/PgSQLDatabaseServiceTest.java
rename to extensions/database/test/com/google/refine/extension/database/pgsql/PgSQLDatabaseServiceTest.java
diff --git a/extensions/database/tests/src/com/google/refine/extension/database/stub/RefineDbServletStub.java b/extensions/database/test/com/google/refine/extension/database/stub/RefineDbServletStub.java
similarity index 100%
rename from extensions/database/tests/src/com/google/refine/extension/database/stub/RefineDbServletStub.java
rename to extensions/database/test/com/google/refine/extension/database/stub/RefineDbServletStub.java
diff --git a/extensions/database/tests/conf/appveyor_tests.xml b/extensions/database/test/conf/appveyor_tests.xml
similarity index 100%
rename from extensions/database/tests/conf/appveyor_tests.xml
rename to extensions/database/test/conf/appveyor_tests.xml
diff --git a/extensions/database/tests/conf/tests.xml b/extensions/database/test/conf/tests.xml
similarity index 95%
rename from extensions/database/tests/conf/tests.xml
rename to extensions/database/test/conf/tests.xml
index 27a73a24a..f14cc34ad 100644
--- a/extensions/database/tests/conf/tests.xml
+++ b/extensions/database/test/conf/tests.xml
@@ -35,7 +35,7 @@
-
-
-
-
-
+
diff --git a/extensions/database/tests/conf/travis-mariadb.sql b/extensions/database/test/conf/travis-mariadb.sql
similarity index 100%
rename from extensions/database/tests/conf/travis-mariadb.sql
rename to extensions/database/test/conf/travis-mariadb.sql
diff --git a/extensions/database/tests/conf/travis-mysql.sql b/extensions/database/test/conf/travis-mysql.sql
similarity index 100%
rename from extensions/database/tests/conf/travis-mysql.sql
rename to extensions/database/test/conf/travis-mysql.sql
diff --git a/extensions/database/tests/conf/travis-pgsql.sql b/extensions/database/test/conf/travis-pgsql.sql
similarity index 100%
rename from extensions/database/tests/conf/travis-pgsql.sql
rename to extensions/database/test/conf/travis-pgsql.sql
diff --git a/extensions/database/tests/conf/travis_tests.xml b/extensions/database/test/conf/travis_tests.xml
similarity index 100%
rename from extensions/database/tests/conf/travis_tests.xml
rename to extensions/database/test/conf/travis_tests.xml
diff --git a/extensions/database/tests/log4j-test.properties b/extensions/database/test/log4j-test.properties
similarity index 100%
rename from extensions/database/tests/log4j-test.properties
rename to extensions/database/test/log4j-test.properties
diff --git a/extensions/gdata/build.xml b/extensions/gdata/build.xml
new file mode 100644
index 000000000..5f52bda74
--- /dev/null
+++ b/extensions/gdata/build.xml
@@ -0,0 +1,96 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/extensions/gdata/module/MOD-INF/lib/commons-logging-1.1.1.jar b/extensions/gdata/module/MOD-INF/lib/commons-logging-1.1.1.jar
new file mode 100644
index 000000000..1deef144c
Binary files /dev/null and b/extensions/gdata/module/MOD-INF/lib/commons-logging-1.1.1.jar differ
diff --git a/extensions/gdata/module/MOD-INF/lib/google-api-client-1.23.0.jar b/extensions/gdata/module/MOD-INF/lib/google-api-client-1.23.0.jar
new file mode 100644
index 000000000..3df306b2c
Binary files /dev/null and b/extensions/gdata/module/MOD-INF/lib/google-api-client-1.23.0.jar differ
diff --git a/extensions/gdata/module/MOD-INF/lib/google-api-client-servlet-1.23.0.jar b/extensions/gdata/module/MOD-INF/lib/google-api-client-servlet-1.23.0.jar
new file mode 100644
index 000000000..95bd0431c
Binary files /dev/null and b/extensions/gdata/module/MOD-INF/lib/google-api-client-servlet-1.23.0.jar differ
diff --git a/extensions/gdata/module/MOD-INF/lib/google-api-services-drive-v3-rev101-1.23.0.jar b/extensions/gdata/module/MOD-INF/lib/google-api-services-drive-v3-rev101-1.23.0.jar
new file mode 100644
index 000000000..a20f60fd0
Binary files /dev/null and b/extensions/gdata/module/MOD-INF/lib/google-api-services-drive-v3-rev101-1.23.0.jar differ
diff --git a/extensions/gdata/module/MOD-INF/lib/google-api-services-fusiontables-v2-rev21-1.23.0.jar b/extensions/gdata/module/MOD-INF/lib/google-api-services-fusiontables-v2-rev21-1.23.0.jar
new file mode 100644
index 000000000..c215965ff
Binary files /dev/null and b/extensions/gdata/module/MOD-INF/lib/google-api-services-fusiontables-v2-rev21-1.23.0.jar differ
diff --git a/extensions/gdata/module/MOD-INF/lib/google-api-services-sheets-v4-rev502-1.23.0.jar b/extensions/gdata/module/MOD-INF/lib/google-api-services-sheets-v4-rev502-1.23.0.jar
new file mode 100644
index 000000000..87b3b0f43
Binary files /dev/null and b/extensions/gdata/module/MOD-INF/lib/google-api-services-sheets-v4-rev502-1.23.0.jar differ
diff --git a/extensions/gdata/module/MOD-INF/lib/google-auth-library-oauth2-http-0.9.0.jar b/extensions/gdata/module/MOD-INF/lib/google-auth-library-oauth2-http-0.9.0.jar
new file mode 100644
index 000000000..b14bd5f10
Binary files /dev/null and b/extensions/gdata/module/MOD-INF/lib/google-auth-library-oauth2-http-0.9.0.jar differ
diff --git a/extensions/gdata/module/MOD-INF/lib/google-http-client-1.23.0.jar b/extensions/gdata/module/MOD-INF/lib/google-http-client-1.23.0.jar
new file mode 100644
index 000000000..3e6667d29
Binary files /dev/null and b/extensions/gdata/module/MOD-INF/lib/google-http-client-1.23.0.jar differ
diff --git a/extensions/gdata/module/MOD-INF/lib/google-http-client-jackson-1.23.0.jar b/extensions/gdata/module/MOD-INF/lib/google-http-client-jackson-1.23.0.jar
new file mode 100644
index 000000000..61d1a3a75
Binary files /dev/null and b/extensions/gdata/module/MOD-INF/lib/google-http-client-jackson-1.23.0.jar differ
diff --git a/extensions/gdata/module/MOD-INF/lib/google-oauth-client-1.23.0.jar b/extensions/gdata/module/MOD-INF/lib/google-oauth-client-1.23.0.jar
new file mode 100644
index 000000000..be88de28a
Binary files /dev/null and b/extensions/gdata/module/MOD-INF/lib/google-oauth-client-1.23.0.jar differ
diff --git a/extensions/gdata/module/MOD-INF/lib/google-oauth-client-jetty-1.23.0.jar b/extensions/gdata/module/MOD-INF/lib/google-oauth-client-jetty-1.23.0.jar
new file mode 100644
index 000000000..f0d2ee31c
Binary files /dev/null and b/extensions/gdata/module/MOD-INF/lib/google-oauth-client-jetty-1.23.0.jar differ
diff --git a/extensions/gdata/module/MOD-INF/lib/google-oauth-client-servlet-1.23.0.jar b/extensions/gdata/module/MOD-INF/lib/google-oauth-client-servlet-1.23.0.jar
new file mode 100644
index 000000000..487e3c62d
Binary files /dev/null and b/extensions/gdata/module/MOD-INF/lib/google-oauth-client-servlet-1.23.0.jar differ
diff --git a/extensions/gdata/module/MOD-INF/lib/httpclient-4.0.1.jar b/extensions/gdata/module/MOD-INF/lib/httpclient-4.0.1.jar
new file mode 100644
index 000000000..ad32285ab
Binary files /dev/null and b/extensions/gdata/module/MOD-INF/lib/httpclient-4.0.1.jar differ
diff --git a/extensions/gdata/module/MOD-INF/lib/httpcore-4.0.1.jar b/extensions/gdata/module/MOD-INF/lib/httpcore-4.0.1.jar
new file mode 100644
index 000000000..4aef35e2f
Binary files /dev/null and b/extensions/gdata/module/MOD-INF/lib/httpcore-4.0.1.jar differ
diff --git a/extensions/gdata/module/MOD-INF/lib/jsr305-1.3.9.jar b/extensions/gdata/module/MOD-INF/lib/jsr305-1.3.9.jar
new file mode 100644
index 000000000..a9afc6619
Binary files /dev/null and b/extensions/gdata/module/MOD-INF/lib/jsr305-1.3.9.jar differ
diff --git a/extensions/gdata/module/MOD-INF/lib/mail.jar b/extensions/gdata/module/MOD-INF/lib/mail.jar
new file mode 100644
index 000000000..9d60d13b8
Binary files /dev/null and b/extensions/gdata/module/MOD-INF/lib/mail.jar differ
diff --git a/extensions/gdata/module/MOD-INF/lib/transaction-api-1.1.jar b/extensions/gdata/module/MOD-INF/lib/transaction-api-1.1.jar
new file mode 100644
index 000000000..7736ec9f0
Binary files /dev/null and b/extensions/gdata/module/MOD-INF/lib/transaction-api-1.1.jar differ
diff --git a/extensions/gdata/pom.xml b/extensions/gdata/pom.xml
deleted file mode 100644
index 178632b3f..000000000
--- a/extensions/gdata/pom.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-
- 4.0.0
-
- org.openrefine
- gdata
- jar
- 3.0-SNAPSHOT
-
- OpenRefine - Gdata extension
- Connects with Google services for data import and export
- http://openrefine.org/
-
- org.openrefine
- extensions
- 3.0-SNAPSHOT
-
-
-
- openrefine-gdata
-
-
- src
-
-
- tests/src
- module/MOD-INF/classes
-
-
- org.codehaus.mojo
- build-helper-maven-plugin
- 1.8
-
-
- generate-sources
-
- add-source
-
-
-
- src
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
- 3.1
-
- 1.8
- 1.8
- UTF-8
- false
-
-
-
- org.apache.maven.plugins
- maven-resources-plugin
- 2.6
-
- UTF-8
-
-
-
- org.apache.maven.plugins
- maven-surefire-plugin
- 2.22.0
-
- true
-
-
-
- org.apache.maven.plugins
- maven-clean-plugin
- 3.1.0
-
-
-
- module/MOD-INF/lib
-
-
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-dependency-plugin
- 3.1.1
-
-
- compile
-
- copy-dependencies
-
-
- module/MOD-INF/lib
- runtime
- org.mortbay.jetty
-
-
-
-
-
-
-
-
-
-
- ${project.groupId}
- main
- ${project.version}
- provided
-
-
- javax.servlet
- servlet-api
- 2.5
- provided
-
-
- org.apache.httpcomponents
- httpclient
- 4.5.6
-
-
- com.google.http-client
- google-http-client-jackson2
- 1.24.1
-
-
- com.google.oauth-client
- google-oauth-client-jetty
- 1.24.1
-
-
- com.google.apis
- google-api-services-fusiontables
- v2-rev27-1.24.1
-
-
- com.google.apis
- google-api-services-drive
- v3-rev126-1.24.1
-
-
- com.google.apis
- google-api-services-sheets
- v4-rev536-1.24.1
-
-
- com.google.api.client
- google-api-client
- 1.4.1-beta
-
-
-
- org.testng
- testng
- 6.9.10
- test
-
-
-
-
-
-
diff --git a/extensions/jython/build.xml b/extensions/jython/build.xml
new file mode 100644
index 000000000..3c609f15e
--- /dev/null
+++ b/extensions/jython/build.xml
@@ -0,0 +1,131 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/extensions/jython/module/MOD-INF/lib/jython-standalone-2.7.1.jar b/extensions/jython/module/MOD-INF/lib/jython-standalone-2.7.1.jar
new file mode 100644
index 000000000..d351edd45
Binary files /dev/null and b/extensions/jython/module/MOD-INF/lib/jython-standalone-2.7.1.jar differ
diff --git a/extensions/jython/pom.xml b/extensions/jython/pom.xml
deleted file mode 100644
index fad16bc26..000000000
--- a/extensions/jython/pom.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-
- 4.0.0
-
- org.openrefine
- jython
- jar
- 3.0-SNAPSHOT
-
- OpenRefine - Jython extension
- OpenRefine integration of Python as an expression language
- http://openrefine.org/
-
- org.openrefine
- extensions
- 3.0-SNAPSHOT
-
-
-
- openrefine-jython
-
-
- src
-
-
- tests/src
- module/MOD-INF/classes
-
-
- org.codehaus.mojo
- build-helper-maven-plugin
- 1.8
-
-
- generate-sources
-
- add-source
-
-
-
- src
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
- 3.1
-
- 1.8
- 1.8
- UTF-8
- false
-
-
-
- org.apache.maven.plugins
- maven-resources-plugin
- 2.6
-
- UTF-8
-
-
-
- org.apache.maven.plugins
- maven-surefire-plugin
- 2.22.0
-
-
- tests/conf/tests.xml
-
-
-
-
- org.apache.maven.plugins
- maven-dependency-plugin
- 3.1.1
-
-
- compile
-
- copy-dependencies
-
-
- module/MOD-INF/lib
- runtime
-
-
-
-
-
- org.apache.maven.plugins
- maven-clean-plugin
- 3.1.0
-
-
-
- module/MOD-INF/lib
-
-
-
-
-
-
-
-
-
- ${project.groupId}
- main
- ${project.version}
- provided
-
-
- javax.servlet
- servlet-api
- 2.5
- provided
-
-
- org.python
- jython-standalone
- 2.7.1
-
-
-
- org.testng
- testng
- 6.9.10
- test
-
-
-
-
-
-
diff --git a/extensions/pc-axis/build.xml b/extensions/pc-axis/build.xml
new file mode 100644
index 000000000..3682348d7
--- /dev/null
+++ b/extensions/pc-axis/build.xml
@@ -0,0 +1,97 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/extensions/pc-axis/pom.xml b/extensions/pc-axis/pom.xml
deleted file mode 100644
index ff93e3a08..000000000
--- a/extensions/pc-axis/pom.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-
- 4.0.0
-
- org.openrefine
- pc-axis
- jar
- 3.0-SNAPSHOT
-
- OpenRefine - PC-axis extension
- OpenRefine integration of PC-axis
- http://openrefine.org/
-
- org.openrefine
- extensions
- 3.0-SNAPSHOT
-
-
-
- openrefine-pcaxis
-
-
- src
-
-
- tests/src
- module/MOD-INF/classes
-
-
- org.codehaus.mojo
- build-helper-maven-plugin
- 1.8
-
-
- generate-sources
-
- add-source
-
-
-
- src
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
- 3.1
-
- 1.8
- 1.8
- UTF-8
- false
-
-
-
- org.apache.maven.plugins
- maven-resources-plugin
- 2.6
-
- UTF-8
-
-
-
- org.apache.maven.plugins
- maven-surefire-plugin
- 2.22.0
-
- true
-
-
-
- org.apache.maven.plugins
- maven-dependency-plugin
- 3.1.1
-
-
- compile
-
- copy-dependencies
-
-
- module/MOD-INF/lib
- runtime
-
-
-
-
-
- org.apache.maven.plugins
- maven-clean-plugin
- 3.1.0
-
-
-
- module/MOD-INF/lib
-
-
-
-
-
-
-
-
-
- ${project.groupId}
- main
- ${project.version}
- provided
-
-
- javax.servlet
- servlet-api
- 2.5
- provided
-
-
-
- org.testng
- testng
- 6.9.10
- test
-
-
-
-
-
-
diff --git a/extensions/pom.xml b/extensions/pom.xml
deleted file mode 100644
index 6280bd461..000000000
--- a/extensions/pom.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
- 4.0.0
-
- org.openrefine
- extensions
- pom
- 3.0-SNAPSHOT
-
- OpenRefine - extensions
- Extensions add importers, exporters and other sorts of features to OpenRefine
- http://openrefine.org/
-
-
- org.openrefine
- openrefine
- 3.0-SNAPSHOT
-
-
-
- jython
- wikidata
- database
- gdata
- pc-axis
-
-
-
-
diff --git a/extensions/sample/build.xml b/extensions/sample/build.xml
new file mode 100644
index 000000000..42e918946
--- /dev/null
+++ b/extensions/sample/build.xml
@@ -0,0 +1,71 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/extensions/sample/pom.xml b/extensions/sample/pom.xml
deleted file mode 100644
index 1b2dd8145..000000000
--- a/extensions/sample/pom.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-
- 4.0.0
-
- org.openrefine
- sample
- jar
- 3.0-SNAPSHOT
-
- OpenRefine - Sample extension
- Example extension provided for demonstration purposes
- http://openrefine.org/
-
- org.openrefine
- extensions
- 3.0-SNAPSHOT
-
-
-
- openrefine-sample
-
-
- src
-
-
- module/MOD-INF/classes
-
-
- org.codehaus.mojo
- build-helper-maven-plugin
- 1.8
-
-
- generate-sources
-
- add-source
-
-
-
- src
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
- 3.1
-
- 1.8
- 1.8
- UTF-8
- false
-
-
-
- org.apache.maven.plugins
- maven-resources-plugin
- 2.6
-
- UTF-8
-
-
-
- org.apache.maven.plugins
- maven-dependency-plugin
- 3.1.1
-
-
- compile
-
- copy-dependencies
-
-
- module/MOD-INF/lib
- runtime
-
-
-
-
-
- org.apache.maven.plugins
- maven-clean-plugin
- 3.1.0
-
-
-
- module/MOD-INF/lib
-
-
-
-
-
-
-
-
-
- ${project.groupId}
- main
- ${project.version}
- provided
-
-
- javax.servlet
- servlet-api
- 2.5
- provided
-
-
-
-
-
- org.testng
- testng
- 6.9.10
- test
-
-
-
-
-
diff --git a/extensions/wikidata/build.xml b/extensions/wikidata/build.xml
new file mode 100644
index 000000000..f3e01d188
--- /dev/null
+++ b/extensions/wikidata/build.xml
@@ -0,0 +1,133 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/extensions/wikidata/lib-src/wdtk-datamodel-0.9.0-SNAPSHOT-sources.jar b/extensions/wikidata/module/MOD-INF/lib-src/wdtk-datamodel-0.9.0-SNAPSHOT-sources.jar
similarity index 100%
rename from extensions/wikidata/lib-src/wdtk-datamodel-0.9.0-SNAPSHOT-sources.jar
rename to extensions/wikidata/module/MOD-INF/lib-src/wdtk-datamodel-0.9.0-SNAPSHOT-sources.jar
diff --git a/extensions/wikidata/lib-src/wdtk-wikibaseapi-0.9.0-SNAPSHOT-sources.jar b/extensions/wikidata/module/MOD-INF/lib-src/wdtk-wikibaseapi-0.9.0-SNAPSHOT-sources.jar
similarity index 100%
rename from extensions/wikidata/lib-src/wdtk-wikibaseapi-0.9.0-SNAPSHOT-sources.jar
rename to extensions/wikidata/module/MOD-INF/lib-src/wdtk-wikibaseapi-0.9.0-SNAPSHOT-sources.jar
diff --git a/extensions/wikidata/lib/wdtk-datamodel-0.9.0-SNAPSHOT-jar-with-dependencies.jar b/extensions/wikidata/module/MOD-INF/lib/wdtk-datamodel-0.9.0-SNAPSHOT-jar-with-dependencies.jar
similarity index 100%
rename from extensions/wikidata/lib/wdtk-datamodel-0.9.0-SNAPSHOT-jar-with-dependencies.jar
rename to extensions/wikidata/module/MOD-INF/lib/wdtk-datamodel-0.9.0-SNAPSHOT-jar-with-dependencies.jar
diff --git a/extensions/wikidata/lib/wdtk-wikibaseapi-0.9.0-SNAPSHOT.jar b/extensions/wikidata/module/MOD-INF/lib/wdtk-wikibaseapi-0.9.0-SNAPSHOT.jar
similarity index 100%
rename from extensions/wikidata/lib/wdtk-wikibaseapi-0.9.0-SNAPSHOT.jar
rename to extensions/wikidata/module/MOD-INF/lib/wdtk-wikibaseapi-0.9.0-SNAPSHOT.jar
diff --git a/extensions/wikidata/pom.xml b/extensions/wikidata/pom.xml
deleted file mode 100644
index b6850ede0..000000000
--- a/extensions/wikidata/pom.xml
+++ /dev/null
@@ -1,209 +0,0 @@
-
- 4.0.0
-
- org.openrefine
- wikidata
- jar
- 3.0-SNAPSHOT
-
- OpenRefine - Wikidata extension
- Schema alignment and data upload for Wikidata
- https://www.wikidata.org/wiki/Wikidata:Tools/OpenRefine
-
- org.openrefine
- extensions
- 3.0-SNAPSHOT
-
-
-
- openrefine-wikidata
-
-
- src
-
-
- tests/src
-
-
- tests/data
-
-
- module/MOD-INF/classes
-
-
- org.codehaus.mojo
- build-helper-maven-plugin
- 1.8
-
-
- generate-sources
-
- add-source
-
-
-
- src
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
- 3.1
-
- 1.8
- 1.8
- UTF-8
- false
-
-
-
- org.apache.maven.plugins
- maven-resources-plugin
- 2.6
-
- UTF-8
-
-
-
- org.apache.maven.plugins
- maven-surefire-plugin
- 2.22.0
-
-
- tests/conf/tests.xml
-
-
-
-
- org.apache.maven.plugins
- maven-dependency-plugin
- 3.1.1
-
-
- compile
-
- copy-dependencies
-
-
- module/MOD-INF/lib
- runtime
-
-
-
-
-
- org.apache.maven.plugins
- maven-install-plugin
- 2.5.2
-
-
- install-wdtk-datamodel
- process-resources
-
- ${basedir}/lib/wdtk-datamodel-0.9.0-SNAPSHOT-jar-with-dependencies.jar
- default
- org.wikidata.wdtk
- wdtk-datamodel
- 0.9.0-SNAPSHOT
- jar
- true
-
-
- install-file
-
-
-
- install-wdtk-wikibaseapi
- process-resources
-
- ${basedir}/lib/wdtk-wikibaseapi-0.9.0-SNAPSHOT.jar
- default
- org.wikidata.wdtk
- wdtk-wikibaseapi
- 0.9.0-SNAPSHOT
- jar
- true
-
-
- install-file
-
-
-
-
-
- org.apache.maven.plugins
- maven-clean-plugin
- 3.1.0
-
-
-
- module/MOD-INF/lib
-
-
-
-
-
-
-
-
-
- ${project.groupId}
- main
- ${project.version}
- provided
-
-
- javax.servlet
- servlet-api
- 2.5
- provided
-
-
- org.wikidata.wdtk
- wdtk-wikibaseapi
- 0.9.0-SNAPSHOT
-
-
- org.wikidata.wdtk
- wdtk-datamodel
- 0.9.0-SNAPSHOT
-
-
-
-
-
- ${project.groupId}
- main
- ${project.version}
- tests
- test-jar
- test
-
-
- org.testng
- testng
- 6.9.10
- test
-
-
- junit
- junit
- 4.12
- test
-
-
- org.mockito
- mockito-core
- 2.8.9
- test
-
-
-
-
-
-
-
diff --git a/extensions/wikidata/tests/src/org/openrefine/wikidata/commands/PreviewWikibaseSchemaCommandTest.java b/extensions/wikidata/tests/src/org/openrefine/wikidata/commands/PreviewWikibaseSchemaCommandTest.java
index 81596105e..d1026a28c 100644
--- a/extensions/wikidata/tests/src/org/openrefine/wikidata/commands/PreviewWikibaseSchemaCommandTest.java
+++ b/extensions/wikidata/tests/src/org/openrefine/wikidata/commands/PreviewWikibaseSchemaCommandTest.java
@@ -52,7 +52,7 @@ public class PreviewWikibaseSchemaCommandTest extends SchemaCommandTest {
@Test
public void testValidSchema()
throws JSONException, IOException, ServletException {
- String schemaJson = jsonFromFile("schema/inception.json").toString();
+ String schemaJson = jsonFromFile("data/schema/inception.json").toString();
when(request.getParameter("schema")).thenReturn(schemaJson);
command.doPost(request, response);
diff --git a/extensions/wikidata/tests/src/org/openrefine/wikidata/commands/SaveWikibaseSchemaCommandTest.java b/extensions/wikidata/tests/src/org/openrefine/wikidata/commands/SaveWikibaseSchemaCommandTest.java
index 365bb1796..081e44e85 100644
--- a/extensions/wikidata/tests/src/org/openrefine/wikidata/commands/SaveWikibaseSchemaCommandTest.java
+++ b/extensions/wikidata/tests/src/org/openrefine/wikidata/commands/SaveWikibaseSchemaCommandTest.java
@@ -44,7 +44,7 @@ public class SaveWikibaseSchemaCommandTest extends SchemaCommandTest {
@Test
public void testValidSchema()
throws ServletException, IOException {
- String schemaJson = jsonFromFile("schema/inception.json").toString();
+ String schemaJson = jsonFromFile("data/schema/inception.json").toString();
when(request.getParameter("schema")).thenReturn(schemaJson);
command.doPost(request, response);
diff --git a/extensions/wikidata/tests/src/org/openrefine/wikidata/exporters/QuickStatementsExporterTest.java b/extensions/wikidata/tests/src/org/openrefine/wikidata/exporters/QuickStatementsExporterTest.java
index b5d56fbbd..dfc15bc9d 100644
--- a/extensions/wikidata/tests/src/org/openrefine/wikidata/exporters/QuickStatementsExporterTest.java
+++ b/extensions/wikidata/tests/src/org/openrefine/wikidata/exporters/QuickStatementsExporterTest.java
@@ -70,7 +70,7 @@ public class QuickStatementsExporterTest extends RefineTest {
throws JSONException, IOException {
Project project = this.createCSVProject(TestingData.inceptionWithNewCsv);
TestingData.reconcileInceptionCells(project);
- JSONObject serialized = TestingData.jsonFromFile("schema/inception.json");
+ JSONObject serialized = TestingData.jsonFromFile("data/schema/inception.json");
WikibaseSchema schema = WikibaseSchema.reconstruct(serialized);
project.overlayModels.put("wikibaseSchema", schema);
Engine engine = new Engine(project);
diff --git a/extensions/wikidata/tests/src/org/openrefine/wikidata/operations/PerformWikibaseEditsOperationTest.java b/extensions/wikidata/tests/src/org/openrefine/wikidata/operations/PerformWikibaseEditsOperationTest.java
index a0a91b4c7..348941cd2 100644
--- a/extensions/wikidata/tests/src/org/openrefine/wikidata/operations/PerformWikibaseEditsOperationTest.java
+++ b/extensions/wikidata/tests/src/org/openrefine/wikidata/operations/PerformWikibaseEditsOperationTest.java
@@ -53,7 +53,7 @@ public class PerformWikibaseEditsOperationTest extends OperationTest {
@Override
public JSONObject getJson()
throws Exception {
- return TestingData.jsonFromFile("operations/perform-edits.json");
+ return TestingData.jsonFromFile("data/operations/perform-edits.json");
}
@Test(expectedExceptions=IllegalArgumentException.class)
diff --git a/extensions/wikidata/tests/src/org/openrefine/wikidata/operations/SaveWikibaseSchemaOperationTest.java b/extensions/wikidata/tests/src/org/openrefine/wikidata/operations/SaveWikibaseSchemaOperationTest.java
index 6c5e5db5a..a587de25c 100644
--- a/extensions/wikidata/tests/src/org/openrefine/wikidata/operations/SaveWikibaseSchemaOperationTest.java
+++ b/extensions/wikidata/tests/src/org/openrefine/wikidata/operations/SaveWikibaseSchemaOperationTest.java
@@ -53,13 +53,13 @@ public class SaveWikibaseSchemaOperationTest extends OperationTest {
@Override
public JSONObject getJson()
throws Exception {
- return TestingData.jsonFromFile("operations/save-schema.json");
+ return TestingData.jsonFromFile("data/operations/save-schema.json");
}
@Test
public void testLoadChange()
throws Exception {
- JSONObject schemaJson = TestingData.jsonFromFile("schema/inception.json");
+ JSONObject schemaJson = TestingData.jsonFromFile("data/schema/inception.json");
String changeString = "newSchema=" + schemaJson.toString() + "\n" + "oldSchema=\n" + "/ec/";
WikibaseSchema schema = WikibaseSchema.reconstruct(schemaJson);
diff --git a/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WikibaseSchemaTest.java b/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WikibaseSchemaTest.java
index 15078ff52..2a4c2c9c1 100644
--- a/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WikibaseSchemaTest.java
+++ b/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WikibaseSchemaTest.java
@@ -100,7 +100,7 @@ public class WikibaseSchemaTest extends RefineTest {
@Test
public void testSerialize()
throws JSONException, IOException {
- JSONObject serialized = TestingData.jsonFromFile("schema/history_of_medicine.json");
+ JSONObject serialized = TestingData.jsonFromFile("data/schema/history_of_medicine.json");
WikibaseSchema parsed = WikibaseSchema.reconstruct(serialized);
StringWriter writer = new StringWriter();
JSONWriter jsonWriter = new JSONWriter(writer);
@@ -108,7 +108,7 @@ public class WikibaseSchemaTest extends RefineTest {
writer.close();
JSONObject newSerialized = ParsingUtilities.evaluateJsonStringToObject(writer.toString());
// toString because it looks like JSONObject equality isn't great…
- assertEquals(TestingData.jsonFromFile("schema/history_of_medicine_normalized.json").toString(),
+ assertEquals(TestingData.jsonFromFile("data/schema/history_of_medicine_normalized.json").toString(),
newSerialized.toString());
}
@@ -117,14 +117,14 @@ public class WikibaseSchemaTest extends RefineTest {
throws JSONException, IOException {
// this json file was generated by an earlier version of the software
// it contains extra "type" fields that are now ignored.
- JSONObject serialized = TestingData.jsonFromFile("schema/roarmap.json");
+ JSONObject serialized = TestingData.jsonFromFile("data/schema/roarmap.json");
WikibaseSchema.reconstruct(serialized);
}
@Test
public void testEvaluate()
throws JSONException, IOException {
- JSONObject serialized = TestingData.jsonFromFile("schema/inception.json");
+ JSONObject serialized = TestingData.jsonFromFile("data/schema/inception.json");
WikibaseSchema schema = WikibaseSchema.reconstruct(serialized);
Engine engine = new Engine(project);
List updates = schema.evaluate(project, engine);
@@ -146,7 +146,7 @@ public class WikibaseSchemaTest extends RefineTest {
@Test
public void testEvaluateRespectsFacets()
throws JSONException, IOException {
- JSONObject serialized = TestingData.jsonFromFile("schema/inception.json");
+ JSONObject serialized = TestingData.jsonFromFile("data/schema/inception.json");
WikibaseSchema schema = WikibaseSchema.reconstruct(serialized);
Engine engine = new Engine(project);
JSONObject engineConfig = new JSONObject("{\n" + " \"mode\": \"row-based\",\n" + " \"facets\": [\n"
diff --git a/extensions/wikidata/tests/src/org/openrefine/wikidata/testing/TestingData.java b/extensions/wikidata/tests/src/org/openrefine/wikidata/testing/TestingData.java
index efa25756f..3542824d2 100644
--- a/extensions/wikidata/tests/src/org/openrefine/wikidata/testing/TestingData.java
+++ b/extensions/wikidata/tests/src/org/openrefine/wikidata/testing/TestingData.java
@@ -24,12 +24,10 @@
package org.openrefine.wikidata.testing;
import java.io.IOException;
-import java.io.InputStream;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.Collections;
-import org.apache.commons.io.IOUtils;
import org.json.JSONException;
import org.json.JSONObject;
import org.openrefine.wikidata.schema.WbLanguageConstant;
@@ -135,8 +133,8 @@ public class TestingData {
public static JSONObject jsonFromFile(String filename)
throws IOException, JSONException {
- InputStream f = TestingData.class.getClassLoader().getResourceAsStream(filename);
- String decoded = IOUtils.toString(f);
+ byte[] contents = Files.readAllBytes(Paths.get(filename));
+ String decoded = new String(contents, "utf-8");
return ParsingUtilities.evaluateJsonStringToObject(decoded);
}
diff --git a/main/pom.xml b/main/pom.xml
deleted file mode 100644
index 48a68c1c4..000000000
--- a/main/pom.xml
+++ /dev/null
@@ -1,456 +0,0 @@
-
- 4.0.0
-
- org.openrefine
- main
- jar
- 3.0-SNAPSHOT
-
- OpenRefine - main
- OpenRefine is a free, open source power tool for working with messy data and improving it
- http://openrefine.org/
-
- org.openrefine
- openrefine
- 3.0-SNAPSHOT
-
-
-
- /
- 3333
- /tmp/refine
-
-
-
- scm:git:http://github.com/OpenRefine/OpenRefine
- http://github.com/OpenRefine/OpenRefine
-
-
-
- openrefine-main
-
-
- src
-
-
- tests/server/src
-
-
- tests/data
-
-
- webapp/WEB-INF/classes
-
-
- org.codehaus.mojo
- build-helper-maven-plugin
- 1.8
-
-
- generate-sources
-
- add-source
-
-
-
- src
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
- 3.1
-
- 1.8
- 1.8
- UTF-8
- false
-
-
-
- org.apache.maven.plugins
- maven-resources-plugin
- 2.6
-
- UTF-8
-
-
-
- org.apache.maven.plugins
- maven-surefire-plugin
- 2.22.0
-
-
- tests/server/conf/tests.xml
-
-
-
-
- org.apache.maven.plugins
- maven-dependency-plugin
- 3.1.1
-
-
- compile
-
- copy-dependencies
-
-
- webapp/WEB-INF/lib
-
-
-
-
-
- org.apache.maven.plugins
- maven-jar-plugin
- 3.1.0
-
-
-
- test-jar
-
-
-
-
-
- org.apache.maven.plugins
- maven-install-plugin
- 2.5.2
-
-
- install-marc4j
- process-resources
-
- ${basedir}/lib/marc4j-2.4.jar
- default
- marc4j
- marc4j
- 2.4
- jar
- true
-
-
- install-file
-
-
-
- install-tableschema
- process-resources
-
- ${basedir}/lib/tableschema-java-1.0-SNAPSHOT.jar
- default
- io.frictionlessdata
- tableschema-java
- 1.0-SNAPSHOT
- jar
- true
-
-
- install-file
-
-
-
- install-datapackage
- process-resources
-
- ${basedir}/lib/datapackage-java-1.0-SNAPSHOT.jar
- default
- io.frictionlessdata
- datapackage-java
- 1.0-SNAPSHOT
- jar
- true
-
-
- install-file
-
-
-
- install-opencsv
- process-resources
-
- ${basedir}/lib/opencsv-2.4-SNAPSHOT.jar
- default
- net.sf.opencsv
- opencsv
- 2.4-SNAPSHOT
- jar
- true
-
-
- install-file
-
-
-
- install-butterfly
- process-resources
-
- ${basedir}/lib/butterfly-1.0.1.jar
- default
- edu.mit.simile
- butterfly
- 1.0.1
- jar
- true
-
-
- install-file
-
-
-
- install-vicino
- process-resources
-
- ${basedir}/lib/vicino-1.1.jar
- default
- edu.mit.simile
- vicino
- 1.1
- jar
- true
-
-
- install-file
-
-
-
-
-
- org.apache.maven.plugins
- maven-clean-plugin
- 3.1.0
-
-
-
- webapp/WEB-INF/lib
-
-
-
-
-
-
-
-
-
- javax.servlet
- servlet-api
- 2.5
- provided
-
-
- edu.mit.simile
- butterfly
- 1.0.1
-
-
- org.mozilla
- rhino
- 1.7.10
-
-
- org.json
- json
- 20160810
-
-
- com.fasterxml.jackson.core
- jackson-databind
- 2.9.1
-
-
- com.fasterxml.jackson.core
- jackson-annotations
- 2.9.1
-
-
- org.slf4j
- slf4j-log4j12
- 1.7.18
-
-
- org.slf4j
- slf4j-api
- 1.7.18
-
-
- org.apache.commons
- commons-lang3
- 3.6
-
-
- commons-digester
- commons-digester
- 1.8.1
-
-
- commons-fileupload
- commons-fileupload
- 1.2.1
-
-
- commons-collections
- commons-collections
- 3.2.2
-
-
- velocity
- velocity
- 1.5
-
-
- marc4j
- marc4j
- 2.4
-
-
- org.apache.ant
- ant
- 1.8.0
-
-
- org.jsoup
- jsoup
- 1.4.1
-
-
- net.sf.opencsv
- opencsv
- 2.4-SNAPSHOT
-
-
- org.apache.poi
- poi
- 3.8
-
-
- org.apache.poi
- poi-ooxml
- 3.8
-
-
- org.apache.odftoolkit
- odfdom-java
- 0.8.8-incubating
-
-
- edu.mit.simile
- vicino
- 1.1
-
-
- oauth.signpost
- signpost-core
- 1.2.1.2
-
-
- oauth.signpost
- signpost-commonshttp4
- 1.2.1.2
-
-
- org.clojure
- clojure
- 1.5.1
-
-
- org.apache.httpcomponents
- httpclient
- 4.5.5
-
-
- org.apache.httpcomponents
- httpcore
- 4.4.9
-
-
- org.sweble.wikitext
- swc-parser-lazy
- 3.1.7
-
-
- org.everit.json
- org.everit.json.schema
- 1.5.1
-
-
- io.frictionlessdata
- datapackage-java
- 1.0-SNAPSHOT
-
-
- io.frictionlessdata
- tableschema-java
- 1.0-SNAPSHOT
-
-
- joda-time
- joda-time
- 2.9.9
-
-
- org.apache.jena
- jena-arq
- 3.6.0
-
-
- org.apache.jena
- jena-base
- 3.6.0
-
-
- org.apache.jena
- jena-cmds
- 3.6.0
-
-
- org.apache.jena
- jena-core
- 3.6.0
-
-
- com.metaweb
- lessen
- 1.0
-
-
-
-
-
- org.testng
- testng
- 6.9.10
- test
-
-
- org.mockito
- mockito-core
- 2.8.9
- test
-
-
- junit
- junit
- 4.12
- test
-
-
- org.powermock
- powermock-module-junit4
- 1.7.1
- test
-
-
- org.powermock
- powermock-api-mockito2
- 1.7.1
- test
-
-
-
-
-
diff --git a/main/tests/server/lib-src/mockito-all-1.9.5-sources.jar b/main/tests/server/lib-src/mockito-all-1.9.5-sources.jar
new file mode 100644
index 000000000..743e36bf4
Binary files /dev/null and b/main/tests/server/lib-src/mockito-all-1.9.5-sources.jar differ
diff --git a/main/tests/server/lib-src/testng-6.8-sources.jar b/main/tests/server/lib-src/testng-6.8-sources.jar
new file mode 100644
index 000000000..160f529a7
Binary files /dev/null and b/main/tests/server/lib-src/testng-6.8-sources.jar differ
diff --git a/main/tests/server/lib/jacocoant.jar b/main/tests/server/lib/jacocoant.jar
new file mode 100644
index 000000000..e6c0d7861
Binary files /dev/null and b/main/tests/server/lib/jacocoant.jar differ
diff --git a/main/tests/server/lib/mockito-all-1.9.5.jar b/main/tests/server/lib/mockito-all-1.9.5.jar
new file mode 100644
index 000000000..00416eb38
Binary files /dev/null and b/main/tests/server/lib/mockito-all-1.9.5.jar differ
diff --git a/main/tests/server/lib/testng-6.8.jar b/main/tests/server/lib/testng-6.8.jar
new file mode 100644
index 000000000..dd6c8bbf3
Binary files /dev/null and b/main/tests/server/lib/testng-6.8.jar differ
diff --git a/main/webapp/WEB-INF/lib-src/ant-tools-1.8.0-sources.jar b/main/webapp/WEB-INF/lib-src/ant-tools-1.8.0-sources.jar
new file mode 100644
index 000000000..bc3be38e3
Binary files /dev/null and b/main/webapp/WEB-INF/lib-src/ant-tools-1.8.0-sources.jar differ
diff --git a/main/webapp/WEB-INF/lib-src/arithcode-1.1-sources.jar b/main/webapp/WEB-INF/lib-src/arithcode-1.1-sources.jar
new file mode 100644
index 000000000..c4569b6e9
Binary files /dev/null and b/main/webapp/WEB-INF/lib-src/arithcode-1.1-sources.jar differ
diff --git a/main/lib-src/butterfly-1.0.1-sources.jar b/main/webapp/WEB-INF/lib-src/butterfly-1.0.1-sources.jar
similarity index 100%
rename from main/lib-src/butterfly-1.0.1-sources.jar
rename to main/webapp/WEB-INF/lib-src/butterfly-1.0.1-sources.jar
diff --git a/main/webapp/WEB-INF/lib-src/commons-codec-1.6-sources.jar b/main/webapp/WEB-INF/lib-src/commons-codec-1.6-sources.jar
new file mode 100644
index 000000000..cc6abff9e
Binary files /dev/null and b/main/webapp/WEB-INF/lib-src/commons-codec-1.6-sources.jar differ
diff --git a/main/webapp/WEB-INF/lib-src/commons-fileupload-1.2.1-sources.jar b/main/webapp/WEB-INF/lib-src/commons-fileupload-1.2.1-sources.jar
new file mode 100644
index 000000000..0ab679b42
Binary files /dev/null and b/main/webapp/WEB-INF/lib-src/commons-fileupload-1.2.1-sources.jar differ
diff --git a/main/webapp/WEB-INF/lib-src/commons-lang-2.5-sources.jar b/main/webapp/WEB-INF/lib-src/commons-lang-2.5-sources.jar
new file mode 100644
index 000000000..34ca68d9f
Binary files /dev/null and b/main/webapp/WEB-INF/lib-src/commons-lang-2.5-sources.jar differ
diff --git a/main/lib-src/datapackage-java-1.0-SNAPSHOT-sources.jar b/main/webapp/WEB-INF/lib-src/datapackage-java-1.0-SNAPSHOT-sources.jar
similarity index 100%
rename from main/lib-src/datapackage-java-1.0-SNAPSHOT-sources.jar
rename to main/webapp/WEB-INF/lib-src/datapackage-java-1.0-SNAPSHOT-sources.jar
diff --git a/main/webapp/WEB-INF/lib-src/httpclient-4.5.5-sources.jar b/main/webapp/WEB-INF/lib-src/httpclient-4.5.5-sources.jar
new file mode 100644
index 000000000..318b1d38e
Binary files /dev/null and b/main/webapp/WEB-INF/lib-src/httpclient-4.5.5-sources.jar differ
diff --git a/main/webapp/WEB-INF/lib-src/httpcore-4.4.9-sources.jar b/main/webapp/WEB-INF/lib-src/httpcore-4.4.9-sources.jar
new file mode 100644
index 000000000..05e51d51c
Binary files /dev/null and b/main/webapp/WEB-INF/lib-src/httpcore-4.4.9-sources.jar differ
diff --git a/main/webapp/WEB-INF/lib-src/icu4j-4.2.1-sources.jar b/main/webapp/WEB-INF/lib-src/icu4j-4.2.1-sources.jar
new file mode 100644
index 000000000..97c17e63c
Binary files /dev/null and b/main/webapp/WEB-INF/lib-src/icu4j-4.2.1-sources.jar differ
diff --git a/main/webapp/WEB-INF/lib-src/jackson-src-1.9.9.zip b/main/webapp/WEB-INF/lib-src/jackson-src-1.9.9.zip
new file mode 100644
index 000000000..2203d5e19
Binary files /dev/null and b/main/webapp/WEB-INF/lib-src/jackson-src-1.9.9.zip differ
diff --git a/main/webapp/WEB-INF/lib-src/jcl-over-slf4j-1.5.6-sources.jar b/main/webapp/WEB-INF/lib-src/jcl-over-slf4j-1.5.6-sources.jar
new file mode 100644
index 000000000..5d8177629
Binary files /dev/null and b/main/webapp/WEB-INF/lib-src/jcl-over-slf4j-1.5.6-sources.jar differ
diff --git a/main/webapp/WEB-INF/lib-src/jrdf-0.5.6-sources.jar b/main/webapp/WEB-INF/lib-src/jrdf-0.5.6-sources.jar
new file mode 100644
index 000000000..943450ee0
Binary files /dev/null and b/main/webapp/WEB-INF/lib-src/jrdf-0.5.6-sources.jar differ
diff --git a/main/webapp/WEB-INF/lib-src/json-20100208-sources.jar b/main/webapp/WEB-INF/lib-src/json-20100208-sources.jar
new file mode 100644
index 000000000..f1c67ac8b
Binary files /dev/null and b/main/webapp/WEB-INF/lib-src/json-20100208-sources.jar differ
diff --git a/main/webapp/WEB-INF/lib-src/jsoup-1.4.1-sources.jar b/main/webapp/WEB-INF/lib-src/jsoup-1.4.1-sources.jar
new file mode 100644
index 000000000..018d5e46a
Binary files /dev/null and b/main/webapp/WEB-INF/lib-src/jsoup-1.4.1-sources.jar differ
diff --git a/main/webapp/WEB-INF/lib-src/log4j-1.2.15-sources.jar b/main/webapp/WEB-INF/lib-src/log4j-1.2.15-sources.jar
new file mode 100644
index 000000000..a2a4e3810
Binary files /dev/null and b/main/webapp/WEB-INF/lib-src/log4j-1.2.15-sources.jar differ
diff --git a/main/webapp/WEB-INF/lib-src/odfdom-java-0.8.7-sources.jar b/main/webapp/WEB-INF/lib-src/odfdom-java-0.8.7-sources.jar
new file mode 100644
index 000000000..785925d3f
Binary files /dev/null and b/main/webapp/WEB-INF/lib-src/odfdom-java-0.8.7-sources.jar differ
diff --git a/main/lib-src/opencsv-2.4-SNAPSHOT-sources.jar b/main/webapp/WEB-INF/lib-src/opencsv-2.4-SNAPSHOT-sources.jar
similarity index 100%
rename from main/lib-src/opencsv-2.4-SNAPSHOT-sources.jar
rename to main/webapp/WEB-INF/lib-src/opencsv-2.4-SNAPSHOT-sources.jar
diff --git a/main/lib-src/patches/json-20100208.patch b/main/webapp/WEB-INF/lib-src/patches/json-20100208.patch
similarity index 100%
rename from main/lib-src/patches/json-20100208.patch
rename to main/webapp/WEB-INF/lib-src/patches/json-20100208.patch
diff --git a/main/webapp/WEB-INF/lib-src/secondstring-20100303-sources.jar b/main/webapp/WEB-INF/lib-src/secondstring-20100303-sources.jar
new file mode 100644
index 000000000..0fa453d45
Binary files /dev/null and b/main/webapp/WEB-INF/lib-src/secondstring-20100303-sources.jar differ
diff --git a/main/webapp/WEB-INF/lib-src/signpost-commonshttp4-1.2.1.2-sources.jar b/main/webapp/WEB-INF/lib-src/signpost-commonshttp4-1.2.1.2-sources.jar
new file mode 100644
index 000000000..aeada7f87
Binary files /dev/null and b/main/webapp/WEB-INF/lib-src/signpost-commonshttp4-1.2.1.2-sources.jar differ
diff --git a/main/webapp/WEB-INF/lib-src/signpost-core-1.2.1.2-sources.jar b/main/webapp/WEB-INF/lib-src/signpost-core-1.2.1.2-sources.jar
new file mode 100644
index 000000000..28ca96bf9
Binary files /dev/null and b/main/webapp/WEB-INF/lib-src/signpost-core-1.2.1.2-sources.jar differ
diff --git a/main/webapp/WEB-INF/lib-src/slf4j-api-1.5.6-sources.jar b/main/webapp/WEB-INF/lib-src/slf4j-api-1.5.6-sources.jar
new file mode 100644
index 000000000..681cbb143
Binary files /dev/null and b/main/webapp/WEB-INF/lib-src/slf4j-api-1.5.6-sources.jar differ
diff --git a/main/webapp/WEB-INF/lib-src/slf4j-log4j12-1.5.6-sources.jar b/main/webapp/WEB-INF/lib-src/slf4j-log4j12-1.5.6-sources.jar
new file mode 100644
index 000000000..e16742629
Binary files /dev/null and b/main/webapp/WEB-INF/lib-src/slf4j-log4j12-1.5.6-sources.jar differ
diff --git a/main/webapp/WEB-INF/lib-src/swc-parser-lazy-3.1.5-sources.jar b/main/webapp/WEB-INF/lib-src/swc-parser-lazy-3.1.5-sources.jar
new file mode 100644
index 000000000..971620abe
Binary files /dev/null and b/main/webapp/WEB-INF/lib-src/swc-parser-lazy-3.1.5-sources.jar differ
diff --git a/main/lib-src/tableschema-java-1.0-SNAPSHOT-sources.jar b/main/webapp/WEB-INF/lib-src/tableschema-java-1.0-SNAPSHOT-sources.jar
similarity index 100%
rename from main/lib-src/tableschema-java-1.0-SNAPSHOT-sources.jar
rename to main/webapp/WEB-INF/lib-src/tableschema-java-1.0-SNAPSHOT-sources.jar
diff --git a/main/lib-src/vicino-1.1-sources.jar b/main/webapp/WEB-INF/lib-src/vicino-1.1-sources.jar
similarity index 100%
rename from main/lib-src/vicino-1.1-sources.jar
rename to main/webapp/WEB-INF/lib-src/vicino-1.1-sources.jar
diff --git a/main/webapp/WEB-INF/lib/ant-tools-1.8.0.jar b/main/webapp/WEB-INF/lib/ant-tools-1.8.0.jar
new file mode 100644
index 000000000..4006b6682
Binary files /dev/null and b/main/webapp/WEB-INF/lib/ant-tools-1.8.0.jar differ
diff --git a/main/webapp/WEB-INF/lib/arithcode-1.1.jar b/main/webapp/WEB-INF/lib/arithcode-1.1.jar
new file mode 100644
index 000000000..8ab9142db
Binary files /dev/null and b/main/webapp/WEB-INF/lib/arithcode-1.1.jar differ
diff --git a/main/webapp/WEB-INF/lib/bsh-2.0b4.jar b/main/webapp/WEB-INF/lib/bsh-2.0b4.jar
new file mode 100644
index 000000000..36fe03d71
Binary files /dev/null and b/main/webapp/WEB-INF/lib/bsh-2.0b4.jar differ
diff --git a/main/lib/butterfly-1.0.1.jar b/main/webapp/WEB-INF/lib/butterfly-1.0.1.jar
similarity index 100%
rename from main/lib/butterfly-1.0.1.jar
rename to main/webapp/WEB-INF/lib/butterfly-1.0.1.jar
diff --git a/main/webapp/WEB-INF/lib/byte-buddy-1.6.14.jar b/main/webapp/WEB-INF/lib/byte-buddy-1.6.14.jar
new file mode 100644
index 000000000..04c0f8478
Binary files /dev/null and b/main/webapp/WEB-INF/lib/byte-buddy-1.6.14.jar differ
diff --git a/main/webapp/WEB-INF/lib/byte-buddy-agent-1.6.14.jar b/main/webapp/WEB-INF/lib/byte-buddy-agent-1.6.14.jar
new file mode 100644
index 000000000..350e6cc98
Binary files /dev/null and b/main/webapp/WEB-INF/lib/byte-buddy-agent-1.6.14.jar differ
diff --git a/main/webapp/WEB-INF/lib/cglib-nodep-2.2.2.jar b/main/webapp/WEB-INF/lib/cglib-nodep-2.2.2.jar
new file mode 100644
index 000000000..02d81e880
Binary files /dev/null and b/main/webapp/WEB-INF/lib/cglib-nodep-2.2.2.jar differ
diff --git a/main/webapp/WEB-INF/lib/clojure-1.5.1-slim.jar b/main/webapp/WEB-INF/lib/clojure-1.5.1-slim.jar
new file mode 100644
index 000000000..8a3cbafbc
Binary files /dev/null and b/main/webapp/WEB-INF/lib/clojure-1.5.1-slim.jar differ
diff --git a/main/webapp/WEB-INF/lib/commons-beanutils-1.9.3.jar b/main/webapp/WEB-INF/lib/commons-beanutils-1.9.3.jar
new file mode 100644
index 000000000..6728154e5
Binary files /dev/null and b/main/webapp/WEB-INF/lib/commons-beanutils-1.9.3.jar differ
diff --git a/main/webapp/WEB-INF/lib/commons-collections-3.2.2.jar b/main/webapp/WEB-INF/lib/commons-collections-3.2.2.jar
new file mode 100644
index 000000000..fa5df82a6
Binary files /dev/null and b/main/webapp/WEB-INF/lib/commons-collections-3.2.2.jar differ
diff --git a/main/webapp/WEB-INF/lib/commons-csv-1.5.jar b/main/webapp/WEB-INF/lib/commons-csv-1.5.jar
new file mode 100644
index 000000000..eb4775e30
Binary files /dev/null and b/main/webapp/WEB-INF/lib/commons-csv-1.5.jar differ
diff --git a/main/webapp/WEB-INF/lib/commons-digester-1.8.1.jar b/main/webapp/WEB-INF/lib/commons-digester-1.8.1.jar
new file mode 100644
index 000000000..7abda9696
Binary files /dev/null and b/main/webapp/WEB-INF/lib/commons-digester-1.8.1.jar differ
diff --git a/main/webapp/WEB-INF/lib/commons-fileupload-1.2.1.jar b/main/webapp/WEB-INF/lib/commons-fileupload-1.2.1.jar
new file mode 100644
index 000000000..aa209b388
Binary files /dev/null and b/main/webapp/WEB-INF/lib/commons-fileupload-1.2.1.jar differ
diff --git a/main/webapp/WEB-INF/lib/commons-lang-2.5.jar b/main/webapp/WEB-INF/lib/commons-lang-2.5.jar
new file mode 100644
index 000000000..ae491da8c
Binary files /dev/null and b/main/webapp/WEB-INF/lib/commons-lang-2.5.jar differ
diff --git a/main/webapp/WEB-INF/lib/commons-lang3-3.6.jar b/main/webapp/WEB-INF/lib/commons-lang3-3.6.jar
new file mode 100644
index 000000000..c25fd4d32
Binary files /dev/null and b/main/webapp/WEB-INF/lib/commons-lang3-3.6.jar differ
diff --git a/main/webapp/WEB-INF/lib/commons-logging-1.2.jar b/main/webapp/WEB-INF/lib/commons-logging-1.2.jar
new file mode 100644
index 000000000..93a3b9f6d
Binary files /dev/null and b/main/webapp/WEB-INF/lib/commons-logging-1.2.jar differ
diff --git a/main/webapp/WEB-INF/lib/commons-text-1.1.jar b/main/webapp/WEB-INF/lib/commons-text-1.1.jar
new file mode 100644
index 000000000..73fb4ae72
Binary files /dev/null and b/main/webapp/WEB-INF/lib/commons-text-1.1.jar differ
diff --git a/main/webapp/WEB-INF/lib/commons-validator-1.5.1.jar b/main/webapp/WEB-INF/lib/commons-validator-1.5.1.jar
new file mode 100644
index 000000000..f90c6958c
Binary files /dev/null and b/main/webapp/WEB-INF/lib/commons-validator-1.5.1.jar differ
diff --git a/main/lib/datapackage-java-1.0-SNAPSHOT.jar b/main/webapp/WEB-INF/lib/datapackage-java-1.0-SNAPSHOT.jar
similarity index 100%
rename from main/lib/datapackage-java-1.0-SNAPSHOT.jar
rename to main/webapp/WEB-INF/lib/datapackage-java-1.0-SNAPSHOT.jar
diff --git a/main/webapp/WEB-INF/lib/dom4j-1.6.1.jar b/main/webapp/WEB-INF/lib/dom4j-1.6.1.jar
new file mode 100644
index 000000000..c8c4dbb92
Binary files /dev/null and b/main/webapp/WEB-INF/lib/dom4j-1.6.1.jar differ
diff --git a/main/webapp/WEB-INF/lib/fluent-hc-4.5.5.jar b/main/webapp/WEB-INF/lib/fluent-hc-4.5.5.jar
new file mode 100644
index 000000000..f1495c768
Binary files /dev/null and b/main/webapp/WEB-INF/lib/fluent-hc-4.5.5.jar differ
diff --git a/main/webapp/WEB-INF/lib/guava-13.0.jar b/main/webapp/WEB-INF/lib/guava-13.0.jar
new file mode 100644
index 000000000..67c2b4dbc
Binary files /dev/null and b/main/webapp/WEB-INF/lib/guava-13.0.jar differ
diff --git a/main/webapp/WEB-INF/lib/hamcrest-all-1.3.jar b/main/webapp/WEB-INF/lib/hamcrest-all-1.3.jar
new file mode 100644
index 000000000..6f62ba00c
Binary files /dev/null and b/main/webapp/WEB-INF/lib/hamcrest-all-1.3.jar differ
diff --git a/main/webapp/WEB-INF/lib/hamcrest-core-1.3.jar b/main/webapp/WEB-INF/lib/hamcrest-core-1.3.jar
new file mode 100644
index 000000000..9d5fe16e3
Binary files /dev/null and b/main/webapp/WEB-INF/lib/hamcrest-core-1.3.jar differ
diff --git a/main/webapp/WEB-INF/lib/httpclient-4.5.5.jar b/main/webapp/WEB-INF/lib/httpclient-4.5.5.jar
new file mode 100644
index 000000000..7796b0e74
Binary files /dev/null and b/main/webapp/WEB-INF/lib/httpclient-4.5.5.jar differ
diff --git a/main/webapp/WEB-INF/lib/httpcore-4.4.9.jar b/main/webapp/WEB-INF/lib/httpcore-4.4.9.jar
new file mode 100644
index 000000000..cddba28f9
Binary files /dev/null and b/main/webapp/WEB-INF/lib/httpcore-4.4.9.jar differ
diff --git a/main/webapp/WEB-INF/lib/httpmime-4.5.5.jar b/main/webapp/WEB-INF/lib/httpmime-4.5.5.jar
new file mode 100644
index 000000000..4d3ee66f7
Binary files /dev/null and b/main/webapp/WEB-INF/lib/httpmime-4.5.5.jar differ
diff --git a/main/webapp/WEB-INF/lib/icu4j-4.2.1.jar b/main/webapp/WEB-INF/lib/icu4j-4.2.1.jar
new file mode 100644
index 000000000..bf0d532cb
Binary files /dev/null and b/main/webapp/WEB-INF/lib/icu4j-4.2.1.jar differ
diff --git a/main/webapp/WEB-INF/lib/jackson-annotations-2.9.1.jar b/main/webapp/WEB-INF/lib/jackson-annotations-2.9.1.jar
new file mode 100644
index 000000000..c04f3649f
Binary files /dev/null and b/main/webapp/WEB-INF/lib/jackson-annotations-2.9.1.jar differ
diff --git a/main/webapp/WEB-INF/lib/jackson-core-2.9.1.jar b/main/webapp/WEB-INF/lib/jackson-core-2.9.1.jar
new file mode 100644
index 000000000..36742d055
Binary files /dev/null and b/main/webapp/WEB-INF/lib/jackson-core-2.9.1.jar differ
diff --git a/main/webapp/WEB-INF/lib/jackson-databind-2.9.1.jar b/main/webapp/WEB-INF/lib/jackson-databind-2.9.1.jar
new file mode 100644
index 000000000..fb279129c
Binary files /dev/null and b/main/webapp/WEB-INF/lib/jackson-databind-2.9.1.jar differ
diff --git a/main/webapp/WEB-INF/lib/javassist-3.21.0-GA.jar b/main/webapp/WEB-INF/lib/javassist-3.21.0-GA.jar
new file mode 100644
index 000000000..64549c4ad
Binary files /dev/null and b/main/webapp/WEB-INF/lib/javassist-3.21.0-GA.jar differ
diff --git a/main/webapp/WEB-INF/lib/jcl-over-slf4j-1.5.6.jar b/main/webapp/WEB-INF/lib/jcl-over-slf4j-1.5.6.jar
new file mode 100644
index 000000000..e552ad8d7
Binary files /dev/null and b/main/webapp/WEB-INF/lib/jcl-over-slf4j-1.5.6.jar differ
diff --git a/main/webapp/WEB-INF/lib/jcommander-1.48.jar b/main/webapp/WEB-INF/lib/jcommander-1.48.jar
new file mode 100644
index 000000000..ad0a12c95
Binary files /dev/null and b/main/webapp/WEB-INF/lib/jcommander-1.48.jar differ
diff --git a/main/webapp/WEB-INF/lib/jena-arq-3.6.0.jar b/main/webapp/WEB-INF/lib/jena-arq-3.6.0.jar
new file mode 100644
index 000000000..cb7ed3ebf
Binary files /dev/null and b/main/webapp/WEB-INF/lib/jena-arq-3.6.0.jar differ
diff --git a/main/webapp/WEB-INF/lib/jena-base-3.6.0.jar b/main/webapp/WEB-INF/lib/jena-base-3.6.0.jar
new file mode 100644
index 000000000..0f4771682
Binary files /dev/null and b/main/webapp/WEB-INF/lib/jena-base-3.6.0.jar differ
diff --git a/main/webapp/WEB-INF/lib/jena-cmds-3.6.0.jar b/main/webapp/WEB-INF/lib/jena-cmds-3.6.0.jar
new file mode 100644
index 000000000..71302bcd7
Binary files /dev/null and b/main/webapp/WEB-INF/lib/jena-cmds-3.6.0.jar differ
diff --git a/main/webapp/WEB-INF/lib/jena-core-3.6.0.jar b/main/webapp/WEB-INF/lib/jena-core-3.6.0.jar
new file mode 100644
index 000000000..05a9e24df
Binary files /dev/null and b/main/webapp/WEB-INF/lib/jena-core-3.6.0.jar differ
diff --git a/main/webapp/WEB-INF/lib/jena-dboe-base-3.6.0.jar b/main/webapp/WEB-INF/lib/jena-dboe-base-3.6.0.jar
new file mode 100644
index 000000000..f21d809aa
Binary files /dev/null and b/main/webapp/WEB-INF/lib/jena-dboe-base-3.6.0.jar differ
diff --git a/main/webapp/WEB-INF/lib/jena-dboe-index-3.6.0.jar b/main/webapp/WEB-INF/lib/jena-dboe-index-3.6.0.jar
new file mode 100644
index 000000000..10b18f626
Binary files /dev/null and b/main/webapp/WEB-INF/lib/jena-dboe-index-3.6.0.jar differ
diff --git a/main/webapp/WEB-INF/lib/jena-dboe-trans-data-3.6.0.jar b/main/webapp/WEB-INF/lib/jena-dboe-trans-data-3.6.0.jar
new file mode 100644
index 000000000..d2a88dbc3
Binary files /dev/null and b/main/webapp/WEB-INF/lib/jena-dboe-trans-data-3.6.0.jar differ
diff --git a/main/webapp/WEB-INF/lib/jena-dboe-transaction-3.6.0.jar b/main/webapp/WEB-INF/lib/jena-dboe-transaction-3.6.0.jar
new file mode 100644
index 000000000..6d6dc7d45
Binary files /dev/null and b/main/webapp/WEB-INF/lib/jena-dboe-transaction-3.6.0.jar differ
diff --git a/main/webapp/WEB-INF/lib/jena-iri-3.6.0.jar b/main/webapp/WEB-INF/lib/jena-iri-3.6.0.jar
new file mode 100644
index 000000000..5ad1885ea
Binary files /dev/null and b/main/webapp/WEB-INF/lib/jena-iri-3.6.0.jar differ
diff --git a/main/webapp/WEB-INF/lib/jena-rdfconnection-3.6.0.jar b/main/webapp/WEB-INF/lib/jena-rdfconnection-3.6.0.jar
new file mode 100644
index 000000000..c119366f3
Binary files /dev/null and b/main/webapp/WEB-INF/lib/jena-rdfconnection-3.6.0.jar differ
diff --git a/main/webapp/WEB-INF/lib/jena-shaded-guava-3.6.0.jar b/main/webapp/WEB-INF/lib/jena-shaded-guava-3.6.0.jar
new file mode 100644
index 000000000..9b183879d
Binary files /dev/null and b/main/webapp/WEB-INF/lib/jena-shaded-guava-3.6.0.jar differ
diff --git a/main/webapp/WEB-INF/lib/jena-tdb-3.6.0.jar b/main/webapp/WEB-INF/lib/jena-tdb-3.6.0.jar
new file mode 100644
index 000000000..2eea0435b
Binary files /dev/null and b/main/webapp/WEB-INF/lib/jena-tdb-3.6.0.jar differ
diff --git a/main/webapp/WEB-INF/lib/jena-tdb2-3.6.0.jar b/main/webapp/WEB-INF/lib/jena-tdb2-3.6.0.jar
new file mode 100644
index 000000000..5f7c1b76f
Binary files /dev/null and b/main/webapp/WEB-INF/lib/jena-tdb2-3.6.0.jar differ
diff --git a/main/webapp/WEB-INF/lib/joda-time-2.9.9.jar b/main/webapp/WEB-INF/lib/joda-time-2.9.9.jar
new file mode 100644
index 000000000..b3080c435
Binary files /dev/null and b/main/webapp/WEB-INF/lib/joda-time-2.9.9.jar differ
diff --git a/main/webapp/WEB-INF/lib/json-20160810.jar b/main/webapp/WEB-INF/lib/json-20160810.jar
new file mode 100644
index 000000000..a90e44852
Binary files /dev/null and b/main/webapp/WEB-INF/lib/json-20160810.jar differ
diff --git a/main/webapp/WEB-INF/lib/jsonld-java-0.11.1.jar b/main/webapp/WEB-INF/lib/jsonld-java-0.11.1.jar
new file mode 100644
index 000000000..7530d7a2a
Binary files /dev/null and b/main/webapp/WEB-INF/lib/jsonld-java-0.11.1.jar differ
diff --git a/main/webapp/WEB-INF/lib/jsoup-1.4.1.jar b/main/webapp/WEB-INF/lib/jsoup-1.4.1.jar
new file mode 100644
index 000000000..e5effe5e5
Binary files /dev/null and b/main/webapp/WEB-INF/lib/jsoup-1.4.1.jar differ
diff --git a/main/webapp/WEB-INF/lib/junit-4.12.jar b/main/webapp/WEB-INF/lib/junit-4.12.jar
new file mode 100644
index 000000000..3a7fc266c
Binary files /dev/null and b/main/webapp/WEB-INF/lib/junit-4.12.jar differ
diff --git a/main/webapp/WEB-INF/lib/lessen-trunk-r8.jar b/main/webapp/WEB-INF/lib/lessen-trunk-r8.jar
new file mode 100644
index 000000000..c28f821cd
Binary files /dev/null and b/main/webapp/WEB-INF/lib/lessen-trunk-r8.jar differ
diff --git a/main/webapp/WEB-INF/lib/libthrift-0.10.0.jar b/main/webapp/WEB-INF/lib/libthrift-0.10.0.jar
new file mode 100644
index 000000000..dae69e6f7
Binary files /dev/null and b/main/webapp/WEB-INF/lib/libthrift-0.10.0.jar differ
diff --git a/main/webapp/WEB-INF/lib/log4j-1.2.15.jar b/main/webapp/WEB-INF/lib/log4j-1.2.15.jar
new file mode 100644
index 000000000..c930a6ab4
Binary files /dev/null and b/main/webapp/WEB-INF/lib/log4j-1.2.15.jar differ
diff --git a/main/lib/marc4j-2.4.jar b/main/webapp/WEB-INF/lib/marc4j-2.4.jar
similarity index 100%
rename from main/lib/marc4j-2.4.jar
rename to main/webapp/WEB-INF/lib/marc4j-2.4.jar
diff --git a/main/webapp/WEB-INF/lib/mockito-core-2.8.9.jar b/main/webapp/WEB-INF/lib/mockito-core-2.8.9.jar
new file mode 100644
index 000000000..a6a361223
Binary files /dev/null and b/main/webapp/WEB-INF/lib/mockito-core-2.8.9.jar differ
diff --git a/main/webapp/WEB-INF/lib/objenesis-2.5.jar b/main/webapp/WEB-INF/lib/objenesis-2.5.jar
new file mode 100644
index 000000000..7b60a8b43
Binary files /dev/null and b/main/webapp/WEB-INF/lib/objenesis-2.5.jar differ
diff --git a/main/webapp/WEB-INF/lib/odfdom-java-0.8.7.jar b/main/webapp/WEB-INF/lib/odfdom-java-0.8.7.jar
new file mode 100644
index 000000000..60c770796
Binary files /dev/null and b/main/webapp/WEB-INF/lib/odfdom-java-0.8.7.jar differ
diff --git a/main/lib/opencsv-2.4-SNAPSHOT.jar b/main/webapp/WEB-INF/lib/opencsv-2.4-SNAPSHOT.jar
similarity index 100%
rename from main/lib/opencsv-2.4-SNAPSHOT.jar
rename to main/webapp/WEB-INF/lib/opencsv-2.4-SNAPSHOT.jar
diff --git a/main/webapp/WEB-INF/lib/opencsv-4.0.jar b/main/webapp/WEB-INF/lib/opencsv-4.0.jar
new file mode 100644
index 000000000..13ce91af2
Binary files /dev/null and b/main/webapp/WEB-INF/lib/opencsv-4.0.jar differ
diff --git a/main/webapp/WEB-INF/lib/org.everit.json.schema-1.5.1.jar b/main/webapp/WEB-INF/lib/org.everit.json.schema-1.5.1.jar
new file mode 100644
index 000000000..89d7f7f5f
Binary files /dev/null and b/main/webapp/WEB-INF/lib/org.everit.json.schema-1.5.1.jar differ
diff --git a/main/webapp/WEB-INF/lib/poi-3.13-20150929.jar b/main/webapp/WEB-INF/lib/poi-3.13-20150929.jar
new file mode 100644
index 000000000..a9e380085
Binary files /dev/null and b/main/webapp/WEB-INF/lib/poi-3.13-20150929.jar differ
diff --git a/main/webapp/WEB-INF/lib/poi-ooxml-3.13-20150929.jar b/main/webapp/WEB-INF/lib/poi-ooxml-3.13-20150929.jar
new file mode 100644
index 000000000..726768cfd
Binary files /dev/null and b/main/webapp/WEB-INF/lib/poi-ooxml-3.13-20150929.jar differ
diff --git a/main/webapp/WEB-INF/lib/poi-ooxml-schemas-3.13-20150929.jar b/main/webapp/WEB-INF/lib/poi-ooxml-schemas-3.13-20150929.jar
new file mode 100644
index 000000000..bd883978b
Binary files /dev/null and b/main/webapp/WEB-INF/lib/poi-ooxml-schemas-3.13-20150929.jar differ
diff --git a/main/webapp/WEB-INF/lib/powermock-mockito2-1.7.1-full.jar b/main/webapp/WEB-INF/lib/powermock-mockito2-1.7.1-full.jar
new file mode 100644
index 000000000..bfed6fada
Binary files /dev/null and b/main/webapp/WEB-INF/lib/powermock-mockito2-1.7.1-full.jar differ
diff --git a/main/webapp/WEB-INF/lib/resolver.jar b/main/webapp/WEB-INF/lib/resolver.jar
new file mode 100644
index 000000000..e535bdc07
Binary files /dev/null and b/main/webapp/WEB-INF/lib/resolver.jar differ
diff --git a/main/webapp/WEB-INF/lib/rhino-1.7R2.jar b/main/webapp/WEB-INF/lib/rhino-1.7R2.jar
new file mode 100644
index 000000000..cf09ab774
Binary files /dev/null and b/main/webapp/WEB-INF/lib/rhino-1.7R2.jar differ
diff --git a/main/webapp/WEB-INF/lib/secondstring-20100303.jar b/main/webapp/WEB-INF/lib/secondstring-20100303.jar
new file mode 100644
index 000000000..427fcbbcc
Binary files /dev/null and b/main/webapp/WEB-INF/lib/secondstring-20100303.jar differ
diff --git a/main/webapp/WEB-INF/lib/serializer.jar b/main/webapp/WEB-INF/lib/serializer.jar
new file mode 100644
index 000000000..de9b007b4
Binary files /dev/null and b/main/webapp/WEB-INF/lib/serializer.jar differ
diff --git a/main/webapp/WEB-INF/lib/signpost-commonshttp4-1.2.1.2.jar b/main/webapp/WEB-INF/lib/signpost-commonshttp4-1.2.1.2.jar
new file mode 100644
index 000000000..fd37cfafe
Binary files /dev/null and b/main/webapp/WEB-INF/lib/signpost-commonshttp4-1.2.1.2.jar differ
diff --git a/main/webapp/WEB-INF/lib/signpost-core-1.2.1.2.jar b/main/webapp/WEB-INF/lib/signpost-core-1.2.1.2.jar
new file mode 100644
index 000000000..887173022
Binary files /dev/null and b/main/webapp/WEB-INF/lib/signpost-core-1.2.1.2.jar differ
diff --git a/main/webapp/WEB-INF/lib/slf4j-api-1.5.6.jar b/main/webapp/WEB-INF/lib/slf4j-api-1.5.6.jar
new file mode 100644
index 000000000..d79425233
Binary files /dev/null and b/main/webapp/WEB-INF/lib/slf4j-api-1.5.6.jar differ
diff --git a/main/webapp/WEB-INF/lib/slf4j-log4j12-1.5.6.jar b/main/webapp/WEB-INF/lib/slf4j-log4j12-1.5.6.jar
new file mode 100644
index 000000000..97241bb14
Binary files /dev/null and b/main/webapp/WEB-INF/lib/slf4j-log4j12-1.5.6.jar differ
diff --git a/main/webapp/WEB-INF/lib/swc-parser-lazy-3.1.5-jar-with-dependencies.jar b/main/webapp/WEB-INF/lib/swc-parser-lazy-3.1.5-jar-with-dependencies.jar
new file mode 100644
index 000000000..f396dde3d
Binary files /dev/null and b/main/webapp/WEB-INF/lib/swc-parser-lazy-3.1.5-jar-with-dependencies.jar differ
diff --git a/main/lib/tableschema-java-1.0-SNAPSHOT.jar b/main/webapp/WEB-INF/lib/tableschema-java-1.0-SNAPSHOT.jar
similarity index 100%
rename from main/lib/tableschema-java-1.0-SNAPSHOT.jar
rename to main/webapp/WEB-INF/lib/tableschema-java-1.0-SNAPSHOT.jar
diff --git a/main/webapp/WEB-INF/lib/testng-6.9.10.jar b/main/webapp/WEB-INF/lib/testng-6.9.10.jar
new file mode 100644
index 000000000..a9e0f76d4
Binary files /dev/null and b/main/webapp/WEB-INF/lib/testng-6.9.10.jar differ
diff --git a/main/webapp/WEB-INF/lib/velocity-1.5.jar b/main/webapp/WEB-INF/lib/velocity-1.5.jar
new file mode 100644
index 000000000..7c7f2c43b
Binary files /dev/null and b/main/webapp/WEB-INF/lib/velocity-1.5.jar differ
diff --git a/main/lib/vicino-1.1.jar b/main/webapp/WEB-INF/lib/vicino-1.1.jar
similarity index 100%
rename from main/lib/vicino-1.1.jar
rename to main/webapp/WEB-INF/lib/vicino-1.1.jar
diff --git a/main/webapp/WEB-INF/lib/xercesImpl-2.11.jar b/main/webapp/WEB-INF/lib/xercesImpl-2.11.jar
new file mode 100644
index 000000000..0aaa990f3
Binary files /dev/null and b/main/webapp/WEB-INF/lib/xercesImpl-2.11.jar differ
diff --git a/main/webapp/WEB-INF/lib/xml-apis.jar b/main/webapp/WEB-INF/lib/xml-apis.jar
new file mode 100644
index 000000000..46733464f
Binary files /dev/null and b/main/webapp/WEB-INF/lib/xml-apis.jar differ
diff --git a/main/webapp/WEB-INF/lib/xmlbeans-2.3.0.jar b/main/webapp/WEB-INF/lib/xmlbeans-2.3.0.jar
new file mode 100644
index 000000000..ccd816342
Binary files /dev/null and b/main/webapp/WEB-INF/lib/xmlbeans-2.3.0.jar differ
diff --git a/pom.xml b/pom.xml
deleted file mode 100644
index 7b4ec9f5d..000000000
--- a/pom.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-
- 4.0.0
-
- org.openrefine
- openrefine
- pom
- 3.0-SNAPSHOT
-
- OpenRefine
- OpenRefine is a free, open source power tool for working with messy data and improving it
- http://openrefine.org/
-
-
- main
- server
- extensions
-
-
-
- /
- 3333
- /tmp/refine
-
-
-
- scm:git:http://github.com/OpenRefine/OpenRefine
- http://github.com/OpenRefine/OpenRefine
-
-
-
- openrefine
-
-
-
-
- org.codehaus.mojo
- build-helper-maven-plugin
- 1.8
-
-
- generate-sources
-
- add-source
-
-
-
- server/src
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
- 3.1
-
- 1.8
- 1.8
- UTF-8
- false
-
-
-
- org.apache.maven.plugins
- maven-resources-plugin
- 2.6
-
- UTF-8
-
-
-
- org.codehaus.mojo
- exec-maven-plugin
- 1.3
-
- true
- none
-
-
-
- org.apache.maven.plugins
- maven-dependency-plugin
- 3.1.1
-
-
- org.apache.maven.plugins
- maven-surefire-plugin
- 2.22.0
-
-
- main/tests/server/conf/tests.xml
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/refine b/refine
index bf1731180..623f2b107 100755
--- a/refine
+++ b/refine
@@ -297,33 +297,32 @@ tools_prepare() {
mkdir $REFINE_TOOLS_DIR || error "Error while making directory $REFINE_TOOLS_DIR"
fi
}
-
-mvn_prepare() {
+
+ant_prepare() {
tools_prepare
- MVN_VERSION="3.2.2"
- MVN_URL="https://archive.apache.org/dist/maven/binaries/apache-maven-${MVN_VERSION}-bin.tar.gz"
- MVN_FILE=`echo $MVN_URL | sed 's|.*/||'`
- MVN_DIR="apache-maven-${MVN_VERSION}"
-
- MVN="`which mvn 2> /dev/null`"
-
- if [ -z "$MVN" ] ; then
- if [ -z "$MVN_HOME" ] ; then
+ ANT_VERSION="1.9.0"
+ ANT_URL="http://archive.apache.org/dist/ant/binaries/apache-ant-${ANT_VERSION}-bin.tar.gz"
+ ANT_FILE=`echo $ANT_URL | sed 's|.*/||'`
+ ANT_DIR="apache-ant-${ANT_VERSION}"
+
+ ANT="`which ant 2> /dev/null`"
+ if [ -z "$ANT" ] ; then
+ if [ -z "$ANT_HOME" ] ; then
cd $REFINE_TOOLS_DIR
- if [ ! -f "$MVN_FILE" ] ; then
- download $MVN_URL $MVN_FILE
+ if [ ! -f "$ANT_FILE" ] ; then
+ download $ANT_URL $ANT_FILE
fi
- if [ ! -d "$MVN_DIR" ] ; then
- tar xzf $MVN_FILE -C . || error "Error while expanding $MVN_FILE"
+ if [ ! -d "$ANT_DIR" ] ; then
+ tar xzf $ANT_FILE -C . || error "Error while expanding $ANT_FILE"
fi
- export MVN_HOME="`pwd`/$MVN_DIR"
+ export ANT_HOME="`pwd`/$ANT_DIR"
if [ "$OS" = "windows" ] ; then
- export MVN_HOME=`cygpath --unix "$MVN_HOME"`
+ export ANT_HOME=`cygpath --unix "$ANT_HOME"`
fi
cd ..
fi
- MVN="$MVN_HOME/bin/mvn"
+ ANT="$ANT_HOME/bin/ant"
fi
}
@@ -451,10 +450,12 @@ jslint_prepare() {
# ----------------------------------------------------------------------------------------------
-mvn() {
- mvn_prepare
+ant() {
+ ant_prepare
- "$MVN" $MVN_PARAMS -Dversion="$VERSION" -Dfull_version="$FULL_VERSION" $1 || error "Error while running maven task '$1'"
+ #export ANT_OPTS="-Xmx1024M"
+
+ "$ANT" -f build.xml $ANT_PARAMS -Dversion="$VERSION" -Dfull_version="$FULL_VERSION" $1 || error "Error while running ant task '$1'"
}
# ----------------------------------------------------------------------------------------------
@@ -488,9 +489,8 @@ windows_dist() {
launch4j_prepare
- MVN_PARAMS="-Dlaunch4j.dir=${REFINE_TOOLS_DIR}/${LAUNCH4J_DIR}"
- # TODO update this for Maven
- $MVN windows
+ ANT_PARAMS="-Dlaunch4j.dir=${REFINE_TOOLS_DIR}/${LAUNCH4J_DIR}"
+ ant windows
}
linux_dist() {
@@ -498,12 +498,10 @@ linux_dist() {
get_version $1
get_revision
- # TODO update this for Maven
- $MVN linux
+ ant linux
}
mac_dist() {
- # TODO update this for Maven, maybe with https://github.com/federkasten/appbundle-maven-plugin ?
check_macosx
dist_prepare
get_version $1
@@ -574,8 +572,9 @@ mac_dist() {
}
test() {
- mvn_prepare
- $MVN test
+ server_test $1
+ ui_test $1
+ extensions_test $1
}
ui_test() {
@@ -617,13 +616,11 @@ ui_test() {
}
server_test() {
- mvn_prepare
- $MVN test -f main
+ ant server_test
}
extensions_test() {
- mvn_prepare
- $MVN test -f extensions
+ ant extensions_test
}
run() {
@@ -638,13 +635,11 @@ run() {
if [ ! -d $REFINE_CLASSES_DIR ] ; then
IS_JAR=`ls $REFINE_LIB_DIR | grep openrefine`
if [ -z "$IS_JAR" ] ; then
- mvn_prepare
- $MVN process-resources
- $MVN compile test-compile
+ ant build
echo ""
fi
fi
-
+
if [ -d $REFINE_CLASSES_DIR ] ; then
add_option "-Drefine.autoreload=true -Dbutterfly.autoreload=true"
fi
@@ -681,7 +676,7 @@ run() {
RUN_CMD="$JAVA -cp $CLASSPATH $OPTS com.google.refine.Refine"
- echo "$RUN_CMD"
+ #echo "$RUN_CMD"
#echo ""
echo "Starting OpenRefine at 'http://${REFINE_HOST}:${REFINE_PORT}/'"
@@ -698,8 +693,7 @@ run() {
broker_build() {
build_prepare
get_revision
- # TODO migrate to Maven
- $MVN prepare_broker
+ ant prepare_broker
}
broker_run() {
@@ -721,8 +715,7 @@ broker_run() {
add_option "-Drefine.port=$REFINE_PORT"
add_option "-Drefine.host=0.0.0.0"
- LIB_PATHS=`cat server/classpath.txt`
- CLASSPATH="$REFINE_CLASSES_DIR${SEP}$LIB_PATHS"
+ CLASSPATH="$REFINE_CLASSES_DIR${SEP}$REFINE_LIB_DIR/*"
RUN_CMD="$JAVA -cp $CLASSPATH $OPTS com.google.refine.Refine"
@@ -745,18 +738,17 @@ broker_appengine_build() {
appengine_prepare
get_revision
- MVN_PARAMS="-Dappengine.sdk.dir=${APPENGINE_HOME}"
+ ANT_PARAMS="-Dappengine.sdk.dir=${APPENGINE_HOME}"
if [ "$1" ] ; then
- MVN_PARAMS="$MVN_PARAMS -Dappengine.app_id=$1"
+ ANT_PARAMS="$ANT_PARAMS -Dappengine.app_id=$1"
fi
if [ "$2" ] ; then
- MVN_PARAMS="$MVN_PARAMS -Dappengine.version=$2"
+ ANT_PARAMS="$ANT_PARAMS -Dappengine.version=$2"
fi
- # TODO migrate this to Maven
- $MVN prepare_broker_appengine
+ ant prepare_broker_appengine
}
broker_appengine_upload() {
@@ -772,7 +764,7 @@ broker_appengine_run() {
findbugs() {
findbugs_prepare
- MVN_PARAMS="-Dfindbugs.dir=${REFINE_TOOLS_DIR}/${FINDBUGS_DIR}"
+ ANT_PARAMS="-Dfindbugs.dir=${REFINE_TOOLS_DIR}/${FINDBUGS_DIR}"
ant findbugs
display "$REFINE_BUILD_DIR/reports/findbugs.html"
@@ -970,7 +962,7 @@ if [ -z "$REFINE_CLASSES_DIR" ] ; then
fi
if [ -z "$REFINE_LIB_DIR" ] ; then
- REFINE_LIB_DIR="server/target/lib"
+ REFINE_LIB_DIR="server/lib"
fi
if [ -z "$REFINE_BUILD_DIR" ] ; then
@@ -1005,10 +997,10 @@ add_option "-Dpython.cachedir=$HOME/.local/share/google/refine/cachedir"
# ----- Respond to the action given --------------------------------------------
case "$ACTION" in
- build) build_prepare; mvn process-resources; mvn compile test-compile;;
- clean) mvn clean;;
+ build) build_prepare; ant build;;
+ clean) ant clean;;
whitespace) whitespace $1;;
- distclean) mvn distclean;;
+ distclean) ant distclean;;
test) test $1;;
tests) test $1;;
ui_test) ui_test $1;;
diff --git a/refine.bat b/refine.bat
index cda4707eb..f283fd082 100644
--- a/refine.bat
+++ b/refine.bat
@@ -3,8 +3,8 @@ rem @echo off
rem
rem Configuration variables
rem
-rem MAVEN_HOME
-rem Home of Maven installation; copy is in the source as tools\apache-ant-*
+rem ANT_HOME
+rem Home of Ant installation; copy is in the source as tools\apache-ant-*
rem
rem JAVA_HOME
rem Home of Java installation.
@@ -47,7 +47,6 @@ echo.
echo build ..................... Build OpenRefine
echo run ....................... Run OpenRefine
echo.
-echo test ...................... Run all the tests
echo server_test ............... Run the server tests
echo extensions_test ........... Run the extensions tests
echo.
@@ -178,19 +177,19 @@ set REFINE_CLASSES_DIR=server\classes
:gotClassesDir
if not "%REFINE_LIB_DIR%" == "" goto gotLibDir
-set REFINE_LIB_DIR=server\target\lib
+set REFINE_LIB_DIR=server\lib
:gotLibDir
rem ----- Respond to the action ----------------------------------------------------------
set ACTION=%1
-if ""%ACTION%"" == ""build"" goto doMvn
-if ""%ACTION%"" == ""server_test"" goto doMvn
-if ""%ACTION%"" == ""extensions_test"" goto doMvn
-if ""%ACTION%"" == ""test"" goto doMvn
-if ""%ACTION%"" == ""clean"" goto doMvn
-if ""%ACTION%"" == ""distclean"" goto doMvn
+if ""%ACTION%"" == ""build"" goto doAnt
+if ""%ACTION%"" == ""server_test_debug"" goto doAntDebug
+if ""%ACTION%"" == ""server_test"" goto doAnt
+if ""%ACTION%"" == ""extensions_test"" goto doAnt
+if ""%ACTION%"" == ""clean"" goto doAnt
+if ""%ACTION%"" == ""distclean"" goto doAnt
if ""%ACTION%"" == ""run"" goto doRun
:doRun
@@ -216,30 +215,24 @@ set CLASSPATH="%REFINE_CLASSES_DIR%;%REFINE_LIB_DIR%\*"
"%JAVA_HOME%\bin\java.exe" -cp %CLASSPATH% %OPTS% -Djava.library.path=%REFINE_LIB_DIR%/native/windows com.google.refine.Refine
goto end
-:doMvn
-if not "%MAVEN_HOME%" == "" goto gotMvnHome
-echo You must have Apache Maven installed and the MAVEN_HOME environment variable to point to it.
+:doAnt
+if not "%ANT_HOME%" == "" goto gotAntHome
+echo You must have Apache Ant installed and the ANT_HOME environment variable to point to it
echo.
echo You can download it from
echo.
-echo https://maven.apache.org/
-echo
-echo The environment variable MAVEN_HOME should not include the final "bin" directory, such as:
-echo
-echo C:\Program Files (x86)\Apache\Maven
+echo http://ant.apache.org/
echo.
echo If you don't know how to set environment variables, follow the instructions at
echo.
echo http://bit.ly/1c2gkR
echo.
-:gotMvnHome
-set MVN_ACTION=""%ACTION%""
-if ""%ACTION%"" == ""build"" set MVN_ACTION=compile test-compile dependency:build-classpath
-if ""%ACTION%"" == ""test"" set MVN_ACTION=test dependency:build-classpath
-if ""%ACTION%"" == ""server_test"" set MVN_ACTION=test -f main
-if ""%ACTION%"" == ""extensions_test"" set MVN_ACTION=test -f extensions
-call "%MAVEN_HOME%\bin\mvn.cmd" process-resources
-call "%MAVEN_HOME%\bin\mvn.cmd" %MVN_ACTION%
+:gotAntHome
+"%ANT_HOME%\bin\ant.bat" -f build.xml %ACTION%
+goto end
+
+:doAntDebug
+"%ANT_HOME%\bin\ant.bat" -f -v -diagnostics build.xml %ACTION%
goto end
:end
diff --git a/server/lib-src/jetty-6.1.22-sources.jar b/server/lib-src/jetty-6.1.22-sources.jar
new file mode 100644
index 000000000..014f8602b
Binary files /dev/null and b/server/lib-src/jetty-6.1.22-sources.jar differ
diff --git a/server/lib-src/jetty-util-6.1.22-sources.jar b/server/lib-src/jetty-util-6.1.22-sources.jar
new file mode 100644
index 000000000..bb295e5f7
Binary files /dev/null and b/server/lib-src/jetty-util-6.1.22-sources.jar differ
diff --git a/server/lib-src/servlet-api-2.5-sources.jar b/server/lib-src/servlet-api-2.5-sources.jar
new file mode 100644
index 000000000..8cfd81c0d
Binary files /dev/null and b/server/lib-src/servlet-api-2.5-sources.jar differ
diff --git a/server/lib/jetty-6.1.22.jar b/server/lib/jetty-6.1.22.jar
new file mode 100644
index 000000000..442861c1a
Binary files /dev/null and b/server/lib/jetty-6.1.22.jar differ
diff --git a/server/lib/jetty-util-6.1.22.jar b/server/lib/jetty-util-6.1.22.jar
new file mode 100644
index 000000000..7c2aef266
Binary files /dev/null and b/server/lib/jetty-util-6.1.22.jar differ
diff --git a/server/lib/log4j-1.2.15.jar b/server/lib/log4j-1.2.15.jar
new file mode 100644
index 000000000..c930a6ab4
Binary files /dev/null and b/server/lib/log4j-1.2.15.jar differ
diff --git a/server/lib/servlet-api-2.5.jar b/server/lib/servlet-api-2.5.jar
new file mode 100644
index 000000000..221d34a7c
Binary files /dev/null and b/server/lib/servlet-api-2.5.jar differ
diff --git a/server/lib/slf4j-api-1.5.6.jar b/server/lib/slf4j-api-1.5.6.jar
new file mode 100644
index 000000000..d79425233
Binary files /dev/null and b/server/lib/slf4j-api-1.5.6.jar differ
diff --git a/server/lib/slf4j-log4j12-1.5.6.jar b/server/lib/slf4j-log4j12-1.5.6.jar
new file mode 100644
index 000000000..97241bb14
Binary files /dev/null and b/server/lib/slf4j-log4j12-1.5.6.jar differ
diff --git a/server/pom.xml b/server/pom.xml
deleted file mode 100644
index a1676b359..000000000
--- a/server/pom.xml
+++ /dev/null
@@ -1,183 +0,0 @@
-
- 4.0.0
-
- org.openrefine
- server
- jar
- 3.0-SNAPSHOT
-
- OpenRefine - server
- OpenRefine is a free, open source power tool for working with messy data and improving it
- http://openrefine.org/
-
- org.openrefine
- openrefine
- 3.0-SNAPSHOT
-
-
-
- /
- 3333
- /tmp/refine
-
-
-
- scm:git:http://github.com/OpenRefine/OpenRefine
- http://github.com/OpenRefine/OpenRefine
-
-
-
- openrefine-server
-
-
- src
-
-
- classes
-
-
- org.codehaus.mojo
- build-helper-maven-plugin
- 1.8
-
-
- generate-sources
-
- add-source
-
-
-
- src
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
- 3.1
-
- 1.8
- 1.8
- UTF-8
- false
-
-
-
- org.apache.maven.plugins
- maven-resources-plugin
- 2.6
-
- UTF-8
-
-
-
- org.apache.maven.plugins
- maven-surefire-plugin
- 2.22.0
-
- true
-
-
-
- org.apache.maven.plugins
- maven-install-plugin
- 2.5.2
-
-
- install-jdapath
- process-resources
-
- ${basedir}/lib/jdatapath-alpha2.jar
- default
- com.codeberry.jdatapath
- jdatapath
- alpha2
- jar
- true
-
-
- install-file
-
-
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-dependency-plugin
- 3.1.1
-
- runtime
-
-
-
- compile
-
- copy-dependencies
-
-
- target/lib
-
-
-
-
-
-
-
-
-
-
- ${project.groupId}
- main
- ${project.version}
- pom
- provided
-
-
- javax.servlet
- servlet-api
- 2.5
-
-
- org.mortbay.jetty
- jetty
- 6.1.22
-
-
- org.mortbay.jetty
- jetty-util
- 6.1.22
-
-
- com.codeberry.jdatapath
- jdatapath
- alpha2
-
-
- edu.mit.simile
- butterfly
- 1.0.1
-
-
- org.mozilla
- rhino
- 1.7.10
-
-
- org.slf4j
- slf4j-log4j12
- 1.7.18
-
-
- org.slf4j
- slf4j-api
- 1.7.18
-
-
-
-