diff --git a/.gitmodules b/.gitmodules index e69de29..e87aef6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "src/build"] + path = src/build + url = https://git.torproject.org/metrics-base diff --git a/build.xml b/build.xml index 14e3e2c..2dc6c03 100644 --- a/build.xml +++ b/build.xml @@ -1,30 +1,19 @@ - + + + +]> + + + + + - + + - - - - - - - - - - - - - - - - - - - - - - + + @@ -35,264 +24,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -304,18 +37,11 @@ branchrate="100" linerate="91" /> - - - - - - - - - - - - - + + + &base; + diff --git a/src/build b/src/build new file mode 160000 index 0000000..7a01d68 --- /dev/null +++ b/src/build @@ -0,0 +1 @@ +Subproject commit 7a01d68f813cb5ae2904e73dbc81999ce0622eca diff --git a/src/main/resources/bootstrap-development.sh b/src/main/resources/bootstrap-development.sh new file mode 100755 index 0000000..33a1a50 --- /dev/null +++ b/src/main/resources/bootstrap-development.sh @@ -0,0 +1,10 @@ +#!/bin/sh +# +# Copyright 2016 The Tor Project +# See LICENSE for licensing information +# +# Use for submodule initialization and checkout. +# Only necessary after very first checkout without recursion. +# +git submodule update --init --remote + diff --git a/src/test/resources/junittest.policy b/src/test/resources/junittest.policy deleted file mode 100644 index e2f4a26..0000000 --- a/src/test/resources/junittest.policy +++ /dev/null @@ -1,17 +0,0 @@ -/* Prevent tests from bothering production servers. */ - -grant { - permission java.io.FilePermission "<>", "read, write, delete, execute"; - permission java.util.PropertyPermission "*", "read, write"; - permission java.lang.RuntimePermission "setIO"; - permission java.lang.RuntimePermission "accessClassInPackage.sun.nio.fs"; - permission java.lang.RuntimePermission "accessDeclaredMembers"; - permission java.lang.RuntimePermission "getFileStoreAttributes"; - permission java.lang.RuntimePermission "getStackTrace"; - permission java.lang.RuntimePermission "modifyThread"; - permission java.lang.reflect.ReflectPermission "suppressAccessChecks"; - permission java.lang.RuntimePermission "shutdownHooks"; - permission java.lang.RuntimePermission "accessClassInPackage.sun.reflect"; - permission java.lang.RuntimePermission "accessClassInPackage.sun.net.www.protocol.http"; - permission java.lang.RuntimePermission "accessClassInPackage.sun.net.www.http"; -}; diff --git a/src/test/resources/metrics_checks.xml b/src/test/resources/metrics_checks.xml deleted file mode 100644 index 918e6c5..0000000 --- a/src/test/resources/metrics_checks.xml +++ /dev/null @@ -1,224 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -