January 2017 - tor-commits - lists.torproject.org

[collector/master] Update to latest metrics-base.
by karsten＠torproject.org 05 Jan '17

05 Jan '17

commit cc058810a3764e51eb35f6171963bcb49de5c3e3 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Jan 5 15:38:47 2017 +0100 Update to latest metrics-base. --- src/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/build b/src/build index 7a01d68..bb0e1e5 160000 --- a/src/build +++ b/src/build @@ -1 +1 @@ -Subproject commit 7a01d68f813cb5ae2904e73dbc81999ce0622eca +Subproject commit bb0e1e50ba75dfa15add334706d8ce288fbf2b0b

1 0

[metrics-lib/master] Added development description.
by karsten＠torproject.org 05 Jan '17

05 Jan '17

commit 5b75c254ab32851c285710f5d4946c2e8ad12953 Author: iwakeh <iwakeh(a)torproject.org> Date: Mon Dec 26 13:17:36 2016 +0100 Added development description. --- CONTRIB.md | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/CONTRIB.md b/CONTRIB.md index 39f59a1..4a9d5b6 100644 --- a/CONTRIB.md +++ b/CONTRIB.md @@ -243,6 +243,28 @@ Upload the tarball and signature file and announce the new version. Edit `build.xml` again and raise `release.version` to the current release plus `-dev`, e.g., `1.0.0-dev`. +Development +----------- + +If you want to start working on metrics-lib, you can clone the repo: + +``` +git clone --recursive https://git.torproject.org/metrics-lib.git +``` + +In case you forgot to add '--recursive' +just run the bootstrap script for the submodule: + +``` +./src/main/resources/bootstrap-development.sh +``` + +or the contained git command: + +``` +git submodule update --init --remote +``` + Packages --------

1 0

[metrics-lib/master] Added changelog entry.
by karsten＠torproject.org 05 Jan '17

05 Jan '17

commit b7c236e0fbffc709ba381d660596c3015127be63 Author: iwakeh <iwakeh(a)torproject.org> Date: Thu Jan 5 12:26:09 2017 +0100 Added changelog entry. --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2a90b84..22586d2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,9 @@ - Add two methods for loading and saving a parse history file in the descriptor reader to avoid situations where applications fail after all descriptors are read but before they are all processed. + - Unify the build process by adding git-submodule metrics-base in + src/build and removing all centralized parts of the build + process. # Changes in version 1.5.0 - 2016-10-19

1 0

[metrics-lib/master] Implements task-20596: use metrics-base and reduced build.xml,
by karsten＠torproject.org 05 Jan '17

05 Jan '17

commit e8df8cf6f24fb0c408510a18e0421f8ede4d9efd Author: iwakeh <iwakeh(a)torproject.org> Date: Mon Dec 26 13:16:00 2016 +0100 Implements task-20596: use metrics-base and reduced build.xml, added bootstrap script. Removed obsolete metrics_checks.xml and made bootstrap-development.sh executable. Only add metrics-lib class files to release jar. --- .gitmodules | 3 + build.xml | 302 +++------------------------- src/build | 1 + src/main/resources/bootstrap-development.sh | 10 + src/test/resources/metrics_checks.xml | 220 -------------------- 5 files changed, 42 insertions(+), 494 deletions(-) diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..e87aef6 --- /dev/null +++ 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 794188f..a870eca 100644 --- a/build.xml +++ b/build.xml @@ -1,29 +1,17 @@ -<project default="jar" name="descriptor" basedir="."> +<?xml version="1.0"?> + +<!DOCTYPE project [ + <!ENTITY base SYSTEM "src/build/java/base.xml"> +]> + +<project default="usage" name="descriptor" basedir="."> + <property name="release.version" value="1.5.0-dev" /> - <property name="allsources" value="src"/> - <property name="sources" value="src/main/java"/> - <property name="resources" value="src/main/resources"/> - <property name="generated" value="generated"/> - <property name="dist" value="${generated}/dist"/> - <property name="classes" value="${generated}/classes"/> - <property name="docs" value="${generated}/javadoc"/> - <property name="tests" value="src/test/java"/> - <property name="testresources" value="src/test/resources/"/> - <property name="testresult" value="${generated}/test-results"/> - <property name="coverageresult" value="${generated}/coverage-report/"/> - <property name="instrument" value="${generated}/instrument/"/> - <property name="testclasses" value="${generated}/testclasses/"/> - <property name="libs" value="lib"/> - <property name="cobertura.ser.file" value="${basedir}/cobertura.ser" /> - <property name="jarfile" value="${dist}/descriptor-${release.version}.jar" /> - <property name="jarsourcesfile" - value="${dist}/descriptor-${release.version}-sources.jar" /> - <property name="jardocsfile" - value="${dist}/descriptor-${release.version}-javadoc.jar" /> - <property name="source-and-target-java-version" value="1.7" /> - <property name="release.tarball" - value="${dist}/descriptor-${release.version}.tar.gz" /> - <property file="build.properties" /> + <property name="javadoc-title" value="DescripTor API Documentation"/> + <property name="javadoc-excludes" value="**/impl/**" /> + <property name="implementation-title" value="DescripTor" /> + <property name="name" value="descriptor" /> + <property name="jarpatternprop" value="empty" /> <patternset id="runtime" > <include name="commons-compress-1.9.jar"/> @@ -32,254 +20,8 @@ <include name="xz-1.5.jar"/> </patternset> - <path id="classpath"> - <pathelement path="${classes}"/> - <fileset dir="${libs}"> - <patternset refid="runtime" /> - </fileset> - </path> - - <path id="checkstyle.classpath" > - <fileset dir="${libs}"> - <include name="checkstyle-6.17-all.jar" /> - </fileset> - </path> - - <path id="test.classpath"> - <pathelement path="${classes}"/> - <pathelement path="${testclasses}"/> - <pathelement path="${testresources}"/> - <fileset dir="${libs}"> - <patternset refid="runtime" /> - </fileset> - <fileset dir="${libs}"> - <include name="junit4-4.11.jar"/> - <include name="hamcrest-core-1.3.jar"/> - <include name="logback-core-1.1.2.jar" /> - <include name="logback-classic-1.1.2.jar" /> - </fileset> - </path> - - <path id="cobertura.classpath"> - <fileset dir="${libs}"> - <include name="cobertura-2.1.1.jar" /> - <include name="slf4j-api-1.7.7.jar" /> - <include name="commons-lang3-3.3.2.jar" /> - <include name="asm4-5.0.3.jar" /> - <include name="asm4-util-5.0.3.jar" /> - <include name="asm4-tree-5.0.3.jar" /> - <include name="asm4-commons-5.0.3.jar" /> - <include name="asm4-analysis-5.0.3.jar" /> - <include name="oro-2.0.8.jar" /> - <include name="logback-core-1.1.2.jar" /> - <include name="logback-classic-1.1.2.jar" /> - </fileset> - </path> - - <path id="cobertura.test.classpath"> - <path location="${instrument}" /> - <path refid="test.classpath" /> - <path refid="cobertura.classpath" /> - </path> - - <target name="clean" > - <delete includeEmptyDirs="true" quiet="true"> - <fileset dir="${generated}" defaultexcludes="false" includes="**" /> - </delete> - <delete file="${cobertura.ser.file}" quiet="true" /> - </target> - - <target name="init"> - <mkdir dir="${classes}"/> - <mkdir dir="${testclasses}"/> - <mkdir dir="${docs}"/> - <mkdir dir="${testresult}"/> - <mkdir dir="${instrument}"/> - </target> - - <target name="compile" - depends="init"> - <javac destdir="${classes}" - srcdir="${sources}" - source="${source-and-target-java-version}" - target="${source-and-target-java-version}" - debug="true" - deprecation="true" - optimize="false" - failonerror="true" - includeantruntime="false"> - <classpath refid="classpath"/> - </javac> - </target> - - <target name="docs"> - <javadoc destdir="${docs}" - footer="&copy; 2016 The Tor Project" - doctitle="DescripTor API Documentation" - overview="${basedir}/${resources}/overview.html" - use="true" - windowtitle="DescripTor API Documentation"> - <classpath refid="classpath"/> - <fileset dir="${sources}"> - <exclude name="**/impl/**"/> - </fileset> - </javadoc> - </target> - - <target name="testcompile" depends="init"> - <javac destdir="${testclasses}" - srcdir="${tests}" - source="${source-and-target-java-version}" - target="${source-and-target-java-version}" - debug="true" - deprecation="true" - optimize="false" - failonerror="true" - includeantruntime="false"> - <classpath refid="test.classpath"/> - </javac> - </target> - - <target name="test" depends="compile,testcompile"> - <junit fork="true" haltonfailure="true" printsummary="off"> - <classpath refid="test.classpath"/> - <formatter type="plain" usefile="false"/> - <batchtest> - <fileset dir="${testclasses}" - includes="**/*Test.class"/> - </batchtest> - </junit> - </target> - - <target name="benchmark" depends="compile,testcompile"> - <java fork="true" - maxmemory="2048m" - classname="org.torproject.descriptor.benchmark.MeasurePerformance"> - <classpath refid="classpath"/> - </java> - </target> - - <taskdef resource="com/puppycrawl/tools/checkstyle/ant/checkstyle-ant-task.properties"> - <classpath refid="checkstyle.classpath" /> - </taskdef> - <target name="checks" depends="compile"> - <checkstyle config="${testresources}/metrics_checks.xml"> - <fileset dir="${sources}" - includes="**/*.java" /> - <classpath> - <path refid="classpath" /> - <path refid="checkstyle.classpath" /> - </classpath> - <formatter type="plain" - toFile="${generated}/checkstyle_report.txt"/> - </checkstyle> - <exec executable="cat" outputproperty="checkstyle.result"> - <arg value="${generated}/checkstyle_report.txt" /> - </exec> - <fail message="Checkstyle complaints: ${checkstyle.result}" > - <condition> - <not> - <length string="${checkstyle.result}" - length="29" /> - </not> - </condition> - </fail> - </target> - - <target name="jar" depends="compile,docs"> - <exec executable="git" outputproperty="git.revision"> - <arg value="rev-parse" /> - <arg value="--short" /> - <arg value="HEAD" /> - </exec> - <jar destfile="${jarfile}" - basedir="${classes}"> - <manifest> - <attribute name="Created-By" value="The Tor Project" /> - <attribute name="Implementation-Title" value="DescripTor"/> - <attribute name="Implementation-Version" - value="${release.version}-${git.revision}"/> - </manifest> - </jar> - <jar destfile="${jarsourcesfile}"> - <fileset dir="${sources}" /> - <fileset dir="${tests}"/> - <manifest> - <attribute name="Created-By" value="The Tor Project" /> - <attribute name="Implementation-Title" value="DescripTor"/> - <attribute name="Implementation-Version" - value="${release.version}-${git.revision}"/> - </manifest> - </jar> - <jar destfile="${jardocsfile}"> - <fileset dir="${docs}" /> - <manifest> - <attribute name="Created-By" value="The Tor Project" /> - <attribute name="Implementation-Title" value="DescripTor"/> - <attribute name="Implementation-Version" - value="${release.version}-${git.revision}"/> - </manifest> - </jar> - </target> - - <target name="signjar" depends="jar"> - <signjar alias="${jarsigner.alias}" - storepass="${jarsigner.storepass}" - sigalg="SHA256withRSA" - digestalg="SHA-256" - tsaurl="http://timestamp.digicert.com" - lazy="true"> - <path> - <fileset dir="${dist}" includes="descriptor-${release.version}*.jar" /> - </path> - </signjar> - </target> - - <target name="tar" depends="signjar"> - <tar destfile="${release.tarball}" compression="gzip"> - <tarfileset dir="." prefix="descriptor-${release.version}"> - <include name="${jarfile}" /> - <include name="${jarsourcesfile}" /> - <include name="${jardocsfile}" /> - <include name="build.xml" /> - <include name="LICENSE" /> - <include name="CERT" /> - <include name="*.md" /> - </tarfileset> - <tarfileset dir="${allsources}" - prefix="descriptor-${release.version}/${allsources}" /> - <tarfileset dir="${libs}" - prefix="descriptor-${release.version}/${libs}" /> - </tar> - </target> - - <taskdef classpathref="cobertura.classpath" resource="tasks.properties" /> - <target name="coverage" depends="compile,testcompile"> - <delete file="${cobertura.ser.file}" quiet="true" /> - <copy todir="${instrument}" > - <fileset dir="${classes}"/> - </copy> - <cobertura-instrument ignoreTrivial="true"> - <fileset dir="${instrument}"> - <include name="**/**/*.class" /> - </fileset> - </cobertura-instrument> - <junit fork="true" haltonfailure="false" printsummary="on"> - <sysproperty key="net.sourceforge.cobertura.datafile" - file="${cobertura.ser.file}" /> - <classpath refid="cobertura.test.classpath" /> - <formatter type="xml" /> - <batchtest toDir="${testresult}" > - <fileset dir="${testclasses}" - includes="**/*Test.class"/> - </batchtest> - </junit> - <cobertura-report format="html" destdir="${coverageresult}" > - <fileset dir="${sources}"> - <include name="**/*.java" /> - </fileset> - </cobertura-report> - <cobertura-check totallinerate="58" totalbranchrate="50" > + <target name="coverage-check"> + <cobertura-check totallinerate="58" totalbranchrate="50" > <regex pattern="org.torproject.descriptor.benchmark.*" linerate="0" branchrate="0"/> <regex pattern="org.torproject.descriptor.index" @@ -297,5 +39,17 @@ </cobertura-check> </target> -</project> + <target name="benchmark" depends="compile,testcompile"> + <java fork="true" + maxmemory="2048m" + classname="org.torproject.descriptor.benchmark.MeasurePerformance"> + <classpath refid="test.classpath"/> + </java> + </target> + +  + &base; +</project> 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/metrics_checks.xml b/src/test/resources/metrics_checks.xml deleted file mode 100644 index 60fffe2..0000000 --- a/src/test/resources/metrics_checks.xml +++ /dev/null @@ -1,220 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE module PUBLIC - "-//Puppy Crawl//DTD Check Configuration 1.3//EN" - "http://www.puppycrawl.com/dtds/configuration_1_3.dtd"> - - - -<module name = "Checker"> - <property name="charset" value="UTF-8"/> - - <property name="severity" value="warning"/> - - <property name="fileExtensions" value="java, properties, xml"/> -  -  - <module name="FileTabCharacter"> - <property name="eachLine" value="true"/> - </module> - - <module name="TreeWalker"> - <module name="OuterTypeFilename"/> - <module name="IllegalTokenText"> - <property name="tokens" value="STRING_LITERAL, CHAR_LITERAL"/> - <property name="format" value="\\u00(08|09|0(a|A)|0(c|C)|0(d|D)|22|27|5(C|c))|\\(0(10|11|12|14|15|42|47)|134)"/> - <property name="message" value="Avoid using corresponding octal or Unicode escape."/> - </module> - <module name="AvoidEscapedUnicodeCharacters"> - <property name="allowEscapesForControlCharacters" value="true"/> - <property name="allowByTailComment" value="true"/> - <property name="allowNonPrintableEscapes" value="true"/> - </module> - <module name="LineLength"> - <property name="max" value="100"/> - <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/> - </module> - <module name="AvoidStarImport"/> - <module name="OneTopLevelClass"/> - <module name="UnusedImports"/> - <module name="NoLineWrap"/> - <module name="EmptyBlock"> - <property name="option" value="TEXT"/> - <property name="tokens" value="LITERAL_TRY, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH"/> - </module> - <module name="NeedBraces"/> - <module name="LeftCurly"> - <property name="maxLineLength" value="100"/> - </module> - <module name="RightCurly"/> - <module name="RightCurly"> - <property name="option" value="alone"/> - <property name="tokens" value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, LITERAL_DO, STATIC_INIT, INSTANCE_INIT"/> - </module> - <module name="WhitespaceAround"> - <property name="allowEmptyConstructors" value="true"/> - <property name="allowEmptyMethods" value="true"/> - <property name="allowEmptyTypes" value="true"/> - <property name="allowEmptyLoops" value="true"/> - <message key="ws.notFollowed" - value="WhitespaceAround: ''{0}'' is not followed by whitespace. Empty blocks may only be represented as '{}' when not part of a multi-block statement (4.1.3)"/> - <message key="ws.notPreceded" - value="WhitespaceAround: ''{0}'' is not preceded with whitespace."/> - </module> - <module name="OneStatementPerLine"/> - <module name="MultipleVariableDeclarations"/> - <module name="ArrayTypeStyle"/> - <module name="MissingSwitchDefault"/> - <module name="FallThrough"/> - <module name="UpperEll"/> - <module name="ModifierOrder"/> - <module name="EmptyLineSeparator"> - <property name="allowNoEmptyLineBetweenFields" value="true"/> - </module> - <module name="SeparatorWrap"> - <property name="tokens" value="DOT"/> - <property name="option" value="nl"/> - </module> - <module name="SeparatorWrap"> - <property name="tokens" value="COMMA"/> - <property name="option" value="EOL"/> - </module> - <module name="PackageName"> - <property name="format" value="^[a-z]+(\.[a-z][a-z0-9]*)*$"/> - <message key="name.invalidPattern" - value="Package name ''{0}'' must match pattern ''{1}''."/> - </module> - <module name="TypeName"> - <message key="name.invalidPattern" - value="Type name ''{0}'' must match pattern ''{1}''."/> - </module> - <module name="MemberName"> - <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/> - <message key="name.invalidPattern" - value="Member name ''{0}'' must match pattern ''{1}''."/> - </module> - <module name="ParameterName"> - <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/> - <message key="name.invalidPattern" - value="Parameter name ''{0}'' must match pattern ''{1}''."/> - </module> - <module name="CatchParameterName"> - <property name="format" value="^[a-z][a-zA-Z0-9]*$"/> - <message key="name.invalidPattern" - value="Catch parameter name ''{0}'' must match pattern ''{1}''."/> - </module> - <module name="LocalVariableName"> - <property name="tokens" value="VARIABLE_DEF"/> - <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/> - <property name="allowOneCharVarInForLoop" value="true"/> - <message key="name.invalidPattern" - value="Local variable name ''{0}'' must match pattern ''{1}''."/> - </module> - <module name="ClassTypeParameterName"> - <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/> - <message key="name.invalidPattern" - value="Class type name ''{0}'' must match pattern ''{1}''."/> - </module> - <module name="MethodTypeParameterName"> - <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/> - <message key="name.invalidPattern" - value="Method type name ''{0}'' must match pattern ''{1}''."/> - </module> - <module name="InterfaceTypeParameterName"> - <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/> - <message key="name.invalidPattern" - value="Interface type name ''{0}'' must match pattern ''{1}''."/> - </module> - <module name="NoFinalizer"/> - <module name="GenericWhitespace"> - <message key="ws.followed" - value="GenericWhitespace ''{0}'' is followed by whitespace."/> - <message key="ws.preceded" - value="GenericWhitespace ''{0}'' is preceded with whitespace."/> - <message key="ws.illegalFollow" - value="GenericWhitespace ''{0}'' should followed by whitespace."/> - <message key="ws.notPreceded" - value="GenericWhitespace ''{0}'' is not preceded with whitespace."/> - </module> - <module name="Indentation"> - <property name="basicOffset" value="2"/> - <property name="braceAdjustment" value="0"/> - <property name="caseIndent" value="2"/> - <property name="throwsIndent" value="4"/> - <property name="lineWrappingIndentation" value="4"/> - <property name="arrayInitIndent" value="2"/> - </module> - <module name="AbbreviationAsWordInName"> - <property name="ignoreFinal" value="false"/> - <property name="allowedAbbreviationLength" value="1"/> - </module> - <module name="OverloadMethodsDeclarationOrder"/> - <module name="VariableDeclarationUsageDistance"/> - <module name="CustomImportOrder"> - <property name="specialImportsRegExp" value="org.torproject"/> - <property name="sortImportsInGroupAlphabetically" value="true"/> - <property name="customImportOrderRules" value="STATIC###SPECIAL_IMPORTS###THIRD_PARTY_PACKAGE###STANDARD_JAVA_PACKAGE"/> - </module> - <module name="MethodParamPad"/> - <module name="OperatorWrap"> - <property name="option" value="NL"/> - <property name="tokens" value="BAND, BOR, BSR, BXOR, DIV, EQUAL, GE, GT, LAND, LE, LITERAL_INSTANCEOF, LOR, LT, MINUS, MOD, NOT_EQUAL, PLUS, QUESTION, SL, SR, STAR "/> - </module> - <module name="AnnotationLocation"> - <property name="tokens" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF"/> - </module> - <module name="AnnotationLocation"> - <property name="tokens" value="VARIABLE_DEF"/> - <property name="allowSamelineMultipleAnnotations" value="true"/> - </module> - <module name="NonEmptyAtclauseDescription"/> - <module name="JavadocTagContinuationIndentation"/> - <module name="SummaryJavadoc"> - <property name="forbiddenSummaryFragments" value="^@return the *|^This method returns |^A [{]@code [a-zA-Z0-9]+[}]( is a )"/> - </module> - <module name="JavadocParagraph"/> - <module name="AtclauseOrder"> - <property name="tagOrder" value="@param, @return, @throws, @deprecated"/> - <property name="target" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/> - </module> - <module name="JavadocMethod"> - <property name="scope" value="public"/> - <property name="allowMissingParamTags" value="true"/> - <property name="allowMissingThrowsTags" value="true"/> - <property name="allowMissingReturnTag" value="true"/> - <property name="minLineCount" value="2"/> - <property name="allowedAnnotations" value="Override, Test"/> - <property name="allowThrowsTagsForSubclasses" value="true"/> - </module> - <module name="MethodName"> - <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9_]*$"/> - <message key="name.invalidPattern" - value="Method name ''{0}'' must match pattern ''{1}''."/> - </module> - <module name="SingleLineJavadoc"> - <property name="ignoreInlineTags" value="false"/> - </module> - <module name="EmptyCatchBlock"> - <property name="exceptionVariableName" value="expected"/> - </module> - <module name="CommentsIndentation"/> - </module> -</module>

1 0

[metrics-lib/master] Make tests pass again. Gson demands no-args constructors.
by karsten＠torproject.org 05 Jan '17

05 Jan '17

commit fa2d2275271decaf81196537ab4fe98ab1ce939e Author: iwakeh <iwakeh(a)torproject.org> Date: Mon Dec 26 13:11:34 2016 +0100 Make tests pass again. Gson demands no-args constructors. --- src/main/java/org/torproject/descriptor/index/DirectoryNode.java | 7 +++++++ src/main/java/org/torproject/descriptor/index/FileNode.java | 7 +++++++ src/main/java/org/torproject/descriptor/index/IndexNode.java | 8 ++++++++ 3 files changed, 22 insertions(+) diff --git a/src/main/java/org/torproject/descriptor/index/DirectoryNode.java b/src/main/java/org/torproject/descriptor/index/DirectoryNode.java index ad6dff8..562a6b4 100644 --- a/src/main/java/org/torproject/descriptor/index/DirectoryNode.java +++ b/src/main/java/org/torproject/descriptor/index/DirectoryNode.java @@ -26,6 +26,13 @@ public class DirectoryNode implements Comparable<DirectoryNode> { @Expose public final SortedSet<DirectoryNode> directories; + /* Added to satisfy Gson. */ + private DirectoryNode() { + path = null; + files = null; + directories = null; + } + /** A directory for the JSON structure. */ public DirectoryNode(String path, SortedSet<FileNode> files, SortedSet<DirectoryNode> directories) { diff --git a/src/main/java/org/torproject/descriptor/index/FileNode.java b/src/main/java/org/torproject/descriptor/index/FileNode.java index 6af5aa3..ccbd261 100644 --- a/src/main/java/org/torproject/descriptor/index/FileNode.java +++ b/src/main/java/org/torproject/descriptor/index/FileNode.java @@ -39,6 +39,13 @@ public class FileNode implements Comparable<FileNode> { private long lastModifiedMillis; + /* Added to satisfy Gson. */ + private FileNode() { + path = null; + size = 0; + lastModified = null; + } + /** * A FileNode needs a path, i.e. the file name, the file size, and * the last modified date-time string. diff --git a/src/main/java/org/torproject/descriptor/index/IndexNode.java b/src/main/java/org/torproject/descriptor/index/IndexNode.java index b20ea06..bb83fb4 100644 --- a/src/main/java/org/torproject/descriptor/index/IndexNode.java +++ b/src/main/java/org/torproject/descriptor/index/IndexNode.java @@ -56,6 +56,14 @@ public class IndexNode { @Expose public final SortedSet<FileNode> files; + /* Added to satisfy Gson. */ + private IndexNode() { + created = null; + path = null; + files = null; + directories = null; + } + /** An index node is the top-level node in the JSON structure. */ public IndexNode(String created, String path, SortedSet<FileNode> files,

1 0

[metrics-lib/master] Update to latest metrics-base.
by karsten＠torproject.org 05 Jan '17

05 Jan '17

commit 65b7327a82497dd78efb04bc16338796a4d578b0 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Jan 5 15:31:42 2017 +0100 Update to latest metrics-base. --- src/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/build b/src/build index 7a01d68..bb0e1e5 160000 --- a/src/build +++ b/src/build @@ -1 +1 @@ -Subproject commit 7a01d68f813cb5ae2904e73dbc81999ce0622eca +Subproject commit bb0e1e50ba75dfa15add334706d8ce288fbf2b0b

1 0

[onionoo/master] squash! Implements task-20596: use metrics-base and reduced build.xml,
by karsten＠torproject.org 05 Jan '17

05 Jan '17

commit 46d5c6489db728676b1993be3515763d1459e046 Author: iwakeh <iwakeh(a)torproject.org> Date: Tue Jan 3 17:35:28 2017 +0100 squash! Implements task-20596: use metrics-base and reduced build.xml, added executable bootstrap script. Removed obsolete DESIGN document and metrics_checks.xml. --- DESIGN | 157 -------------------- build.xml | 2 +- src/main/resources/bootstrap-development.sh | 0 src/test/resources/metrics_checks.xml | 219 ---------------------------- 4 files changed, 1 insertion(+), 377 deletions(-) diff --git a/DESIGN b/DESIGN deleted file mode 100644 index 6afbdb3..0000000 --- a/DESIGN +++ /dev/null @@ -1,157 +0,0 @@ -Onionoo design document -======================= - -This short document describes Onionoo's design in a mostly informal and -language-independent way. The goal is to be able to discuss design -decisions with non-Java programmers and to provide a blueprint for porting -Onionoo to other programming languages. This document cannot describe all -the details, but it can provide a rough overview. - -There are two main building blocks of Onionoo that are described here: - - 1) an hourly cronjob processing newly published Tor descriptors and - - 2) a web service component answering client requests. - -The interface between the two building blocks is a directory in the local -file system that can be read and written by component 1 and can be read by -component 2. In theory, the two components can be implemented in two -entirely different programming languages. In a possible port from Java to -another programming language, the two components can easily be ported -subsequently. - -The purpose of the hourly batch processor is to read updated Tor -descriptors from the metrics service and transform them to be read by the -web service component. Answering a client request in component 2 of -Onionoo needs to be highly efficient which is why any data aggregation -needs to happen beforehand. Parsing descriptors on-the-fly is not an -option. - -The hourly batch processor is run in a cron job at :15 every hour that -usually takes up to five minutes and that contains the following substeps: - - 1.1) Rsync new Tor descriptors from metrics. - - 1.2) Read previously stored status data about relays and bridges that - have been running in the last seven days to memory. These data - include for each relay or bridge: nickname, fingerprint, primary - OR address and port, additional OR addresses and ports, exit - addresses, network status publication time, directory port, relay - flags, consensus weight, country code, host name as obtained by - reverse domain name lookup, and timestamp of last reverse domain - name lookup. - - 1.3) Import any new relay network status consensuses that have been - published since the last run. - - 1.4) Set the running bit for all relays that are contained in the last - known relay network status consensus. - - 1.5) Look up all relay IP addresses in a local GeoIP database and in a - local AS number database. Extract country codes and names, city - names, geo coordinates, AS name and number, etc. - - 1.6) Import any new bridge network statuses that have been published - since the last run. - - 1.7) Start reverse domain name lookups for all relay IP addresses. Run - in background, only refresh lookups for previously looked up IP - address every 12 hours, run up to five lookups in parallel, and - set timeouts for single requests and for the general lookup - process. In theory, this step could happen a few steps before, - but not before step 1.3. - - 1.8) Import any new relay server descriptors that have been published - since the last run. - - 1.9) Import any new exit lists that have been published since the last - run. - - 1.10) Import any new bridge server descriptors that have been published - since the last run. - - 1.11) Import any new bridge pool assignments that have been published - since the last run. - - 1.12) Make sure that reverse domain name lookups are finished or the - timeout for running lookups has expired. This step cannot happen - at any time later than step 1.13 and shouldn't happen long before. - - 1.13) Rewrite all details files that have changed. Details files - combine information from all previously imported descriptory - types, database lookups, and performed reverse domain name - lookups. The web service component needs to be able to retrieve a - details file for a given relay or bridge without grabbing - information from different data sources. It's best to write the - details file part for a give relay or bridge to a single file in - the target JSON format, saved under the relay's or bridge's - fingerprint. If a database is used, the raw string should be - saved for faster processing. - - 1.14) Import relays' and bridges' bandwidth histories from extra-info - descriptors that have been published since the last run. There - must be internally stored bandwidth histories for each relay and - bridge, regardless of whether they have been running in the last - seven days. The original bandwidth histories, which are available - on 15-minute detail, can be aggregated to longer time periods the - farther the interval lies in the past. The interal bandwidth - histories are different from the bandwidth files described in 1.15 - which are written to be given out to clients. - - 1.15) Rewrite bandwidth files that have changed. Bandwidth files - aggregate bandwidth history information on varying levels of - detail, depending on how far observations lie in the past. It's - inevitable to write JSON-formatted bandwidth files for all relays - and bridges in the hourly cronjob. Any attempts to process years - of bandwidth data while answering a web request can only fail. - The previously aggregated bandwidth files are stored under the - relay's or bridge's fingerprint for quick lookup. - - 1.16) Update the summary file listing all relays and bridges that have - been running in the last seven days which was previously read in - step 1.2. This is the last step in the hourly process. The web - service component checks the modification time of this file to - decide whether it needs to reload its view on the network. If - this step was not the last step, the web service component might - list relays or bridges for which there are no details or bandwidth - files available yet. (With the approach taken here, it's - conveivable that a bandwidth file of a relay or bridge that hasn't - been running for a week has been deleted before step 1.16. This - case has been found acceptable, because it's highly unlikely. If - a database would have been used, steps 1.2 to 1.16 would have - happened in a single database transaction.) - -The web service component has the purpose of answering client requests. -It uses previously prepared data from the hourly cronjob to respond to -requests very quickly. - -During initialization, or whenever the hourly cronjob has finished, the -web service component does the following substeps: - - 2.1) Read the summary file that was produced by the hourly cronjob in - step 1.16. - - 2.2) Keep the list of relays and bridges in memory, including all - information that is used for filtering or sorting results. - - 2.3) Prepare summary lines for all relays and bridges. The summary - resource is a JSON file with a single line per relay or bridge. - This line contains only very few fields as compared to details - files that a client might use for further filtering results. - -When responding to a request, the web service component does the following -steps: - - 2.4) Parse request and its parameters. - - 2.5) Possibly filter relays and bridges. - - 2.6) Possibly re-order and limit results. - - 2.7) Write response or error code. - -Again, (and this can hardly be overstated!) steps 2.4 to 2.7 need to -happen *extremely* fast. Any steps that go beyond file system reads or -simple database lookups need to happen either in the hourly cronjob (1.1 -to 1.16) or in the web service component initialization (2.1 to 2.3). - diff --git a/build.xml b/build.xml index 5f1d798..26620d8 100644 --- a/build.xml +++ b/build.xml @@ -12,7 +12,7 @@ <property name="release.version" value="${onionoo.protocol.version}-1.0.1-dev"/> <property name="descriptorversion" value="1.5.0"/> - <property name="jetty.version" value="" /> + <property name="jetty.version" value="-8.1.16.v20140903" /> <property name="warfile" value="onionoo-${release.version}.war"/> diff --git a/src/main/resources/bootstrap-development.sh b/src/main/resources/bootstrap-development.sh old mode 100644 new mode 100755 diff --git a/src/test/resources/metrics_checks.xml b/src/test/resources/metrics_checks.xml deleted file mode 100644 index 6ba415a..0000000 --- a/src/test/resources/metrics_checks.xml +++ /dev/null @@ -1,219 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE module PUBLIC - "-//Puppy Crawl//DTD Check Configuration 1.3//EN" - "http://www.puppycrawl.com/dtds/configuration_1_3.dtd"> - - - -<module name = "Checker"> - <property name="charset" value="UTF-8"/> - - <property name="severity" value="warning"/> - - <property name="fileExtensions" value="java, properties, xml"/> -  -  - <module name="FileTabCharacter"> - <property name="eachLine" value="true"/> - </module> - - <module name="SuppressWarningsFilter" /> - <module name="TreeWalker"> - <module name="OuterTypeFilename"/> - <module name="IllegalTokenText"> - <property name="tokens" value="STRING_LITERAL, CHAR_LITERAL"/> - <property name="format" value="\\u00(08|09|0(a|A)|0(c|C)|0(d|D)|22|27|5(C|c))|\\(0(10|11|12|14|15|42|47)|134)"/> - <property name="message" value="Avoid using corresponding octal or Unicode escape."/> - </module> - <module name="AvoidEscapedUnicodeCharacters"> - <property name="allowEscapesForControlCharacters" value="true"/> - <property name="allowByTailComment" value="true"/> - <property name="allowNonPrintableEscapes" value="true"/> - </module> - <module name="LineLength"> - <property name="max" value="80"/> - <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/> - </module> - <module name="AvoidStarImport"/> - <module name="OneTopLevelClass"/> - <module name="NoLineWrap"/> - <module name="EmptyBlock"> - <property name="option" value="TEXT"/> - <property name="tokens" value="LITERAL_TRY, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH"/> - </module> - <module name="NeedBraces"/> - <module name="LeftCurly"> - <property name="maxLineLength" value="100"/> - </module> - <module name="RightCurly"/> - <module name="RightCurly"> - <property name="option" value="alone"/> - <property name="tokens" value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, LITERAL_DO, STATIC_INIT, INSTANCE_INIT"/> - </module> - <module name="WhitespaceAround"> - <property name="allowEmptyConstructors" value="true"/> - <property name="allowEmptyMethods" value="true"/> - <property name="allowEmptyTypes" value="true"/> - <property name="allowEmptyLoops" value="true"/> - <message key="ws.notFollowed" - value="WhitespaceAround: ''{0}'' is not followed by whitespace. Empty blocks may only be represented as '{}' when not part of a multi-block statement (4.1.3)"/> - <message key="ws.notPreceded" - value="WhitespaceAround: ''{0}'' is not preceded with whitespace."/> - </module> - <module name="OneStatementPerLine"/> - <module name="MultipleVariableDeclarations"/> - <module name="ArrayTypeStyle"/> - <module name="MissingSwitchDefault"/> - <module name="FallThrough"/> - <module name="UpperEll"/> - <module name="ModifierOrder"/> - <module name="EmptyLineSeparator"> - <property name="allowNoEmptyLineBetweenFields" value="true"/> - </module> - <module name="SeparatorWrap"> - <property name="tokens" value="DOT"/> - <property name="option" value="nl"/> - </module> - <module name="SeparatorWrap"> - <property name="tokens" value="COMMA"/> - <property name="option" value="EOL"/> - </module> - <module name="PackageName"> - <property name="format" value="^[a-z]+(\.[a-z][a-z0-9]*)*$"/> - <message key="name.invalidPattern" - value="Package name ''{0}'' must match pattern ''{1}''."/> - </module> - <module name="TypeName"> - <message key="name.invalidPattern" - value="Type name ''{0}'' must match pattern ''{1}''."/> - </module> - <module name="MemberName"> - <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/> - <message key="name.invalidPattern" - value="Member name ''{0}'' must match pattern ''{1}''."/> - </module> - <module name="ParameterName"> - <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/> - <message key="name.invalidPattern" - value="Parameter name ''{0}'' must match pattern ''{1}''."/> - </module> - <module name="CatchParameterName"> - <property name="format" value="^[a-z][a-zA-Z0-9]*$"/> - <message key="name.invalidPattern" - value="Catch parameter name ''{0}'' must match pattern ''{1}''."/> - </module> - <module name="LocalVariableName"> - <property name="tokens" value="VARIABLE_DEF"/> - <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/> - <property name="allowOneCharVarInForLoop" value="true"/> - <message key="name.invalidPattern" - value="Local variable name ''{0}'' must match pattern ''{1}''."/> - </module> - <module name="ClassTypeParameterName"> - <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/> - <message key="name.invalidPattern" - value="Class type name ''{0}'' must match pattern ''{1}''."/> - </module> - <module name="MethodTypeParameterName"> - <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/> - <message key="name.invalidPattern" - value="Method type name ''{0}'' must match pattern ''{1}''."/> - </module> - <module name="InterfaceTypeParameterName"> - <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/> - <message key="name.invalidPattern" - value="Interface type name ''{0}'' must match pattern ''{1}''."/> - </module> - <module name="NoFinalizer"/> - <module name="GenericWhitespace"> - <message key="ws.followed" - value="GenericWhitespace ''{0}'' is followed by whitespace."/> - <message key="ws.preceded" - value="GenericWhitespace ''{0}'' is preceded with whitespace."/> - <message key="ws.illegalFollow" - value="GenericWhitespace ''{0}'' should followed by whitespace."/> - <message key="ws.notPreceded" - value="GenericWhitespace ''{0}'' is not preceded with whitespace."/> - </module> - <module name="Indentation"> - <property name="basicOffset" value="2"/> - <property name="braceAdjustment" value="0"/> - <property name="caseIndent" value="2"/> - <property name="throwsIndent" value="4"/> - <property name="lineWrappingIndentation" value="4"/> - <property name="arrayInitIndent" value="2"/> - </module> - <module name="AbbreviationAsWordInName"> - <property name="ignoreFinal" value="false"/> - <property name="allowedAbbreviationLength" value="1"/> - </module> - <module name="OverloadMethodsDeclarationOrder"/> - <module name="VariableDeclarationUsageDistance"/> - <module name="CustomImportOrder"> - <property name="specialImportsRegExp" value="org.torproject"/> - <property name="sortImportsInGroupAlphabetically" value="true"/> - <property name="customImportOrderRules" value="STATIC###SPECIAL_IMPORTS###THIRD_PARTY_PACKAGE###STANDARD_JAVA_PACKAGE"/> - </module> - <module name="MethodParamPad"/> - <module name="OperatorWrap"> - <property name="option" value="NL"/> - <property name="tokens" value="BAND, BOR, BSR, BXOR, DIV, EQUAL, GE, GT, LAND, LE, LITERAL_INSTANCEOF, LOR, LT, MINUS, MOD, NOT_EQUAL, PLUS, QUESTION, SL, SR, STAR "/> - </module> - <module name="AnnotationLocation"> - <property name="tokens" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF"/> - </module> - <module name="AnnotationLocation"> - <property name="tokens" value="VARIABLE_DEF"/> - <property name="allowSamelineMultipleAnnotations" value="true"/> - </module> - <module name="NonEmptyAtclauseDescription"/> - <module name="JavadocTagContinuationIndentation"/> - <module name="SummaryJavadoc"> - <property name="forbiddenSummaryFragments" value="^@return the *|^This method returns |^A [{]@code [a-zA-Z0-9]+[}]( is a )"/> - </module> - <module name="JavadocParagraph"/> - <module name="AtclauseOrder"> - <property name="tagOrder" value="@param, @return, @throws, @deprecated"/> - <property name="target" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/> - </module> - <module name="JavadocMethod"> - <property name="scope" value="public"/> - <property name="allowMissingParamTags" value="true"/> - <property name="allowMissingThrowsTags" value="true"/> - <property name="allowMissingReturnTag" value="true"/> - <property name="minLineCount" value="2"/> - <property name="allowedAnnotations" value="Override, Test"/> - <property name="allowThrowsTagsForSubclasses" value="true"/> - </module> - <module name="MethodName"> - <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9_]*$"/> - <message key="name.invalidPattern" - value="Method name ''{0}'' must match pattern ''{1}''."/> - </module> - <module name="SingleLineJavadoc"> - <property name="ignoreInlineTags" value="false"/> - </module> - <module name="EmptyCatchBlock"> - <property name="exceptionVariableName" value="expected"/> - </module> - <module name="CommentsIndentation"/> - <module name="SuppressWarningsHolder" /> - </module> -</module>

1 0

[onionoo/master] Added changelog entry.
by karsten＠torproject.org 05 Jan '17

05 Jan '17

commit ab970261d94ab40b6f7260459d8e4258ca01bfa0 Author: iwakeh <iwakeh(a)torproject.org> Date: Thu Jan 5 14:48:05 2017 +0100 Added changelog entry. --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f607cf6..698eb89 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# Changes in version x.x.x - 2017-xx-xx + + * Medium changes + - Unified the build process by adding git-submodule metrics-base in + src/build and removed all centralized parts of the build process. + + # Changes in version 3.1-1.0.0 - 2016-11-23 * Major changes

1 0

[onionoo/master] Added Implemented-By attribute.
by karsten＠torproject.org 05 Jan '17

05 Jan '17

commit b1c29d47bbf0f5b8b09f4c07ad6098f0e98425f4 Author: iwakeh <iwakeh(a)torproject.org> Date: Thu Jan 5 14:46:38 2017 +0100 Added Implemented-By attribute. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 620fb3b..45fb954 100644 --- a/build.xml +++ b/build.xml @@ -101,7 +101,7 @@ <metainf dir="${resources}" includes="context.xml"/> <manifest> - <attribute name="Created-By" value="The Tor Project" /> + <attribute name="Implemented-By" value="The Tor Project" /> <attribute name="Implementation-Title" value="Onionoo Server"/> <attribute name="Implementation-Version" value="${release.version}-${git.revision}"/>

1 0

[onionoo/master] Implements task-20596: use metrics-base and reduced build.xml,
by karsten＠torproject.org 05 Jan '17

05 Jan '17

commit 0442032f24c8764d6c055ed3b9f4e047fbaa886e Author: iwakeh <iwakeh(a)torproject.org> Date: Mon Dec 26 13:27:48 2016 +0100 Implements task-20596: use metrics-base and reduced build.xml, added bootstrap script. --- .gitmodules | 3 + build.xml | 362 +++++----------------------- src/build | 1 + src/main/resources/bootstrap-development.sh | 10 + 4 files changed, 69 insertions(+), 307 deletions(-) diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..e87aef6 --- /dev/null +++ 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 bc68da9..5f1d798 100644 --- a/build.xml +++ b/build.xml @@ -1,35 +1,47 @@ -<project default="dist" name="onionoo" basedir="."> +<?xml version="1.0"?> +<!DOCTYPE project [ + <!ENTITY base SYSTEM "src/build/java/base.xml"> +]> + +<project default="usage" name="Onionoo" basedir="."> + + <property name="javadoc-title" value="Onionoo API Documentation"/> + <property name="implementation-title" value="Onionoo" /> <property name="onionoo.protocol.version" value="3.1"/> <property name="release.version" value="${onionoo.protocol.version}-1.0.1-dev"/> <property name="descriptorversion" value="1.5.0"/> - <property name="jetty.version" value="8.1.16.v20140903" /> - <property name="javasources" value="src/main/java"/> - <property name="testsources" value="src/test/java"/> - <property name="generated" value="generated"/> - <property name="classes" value="${generated}/classes"/> - <property name="testclasses" value="${generated}/testclasses/"/> - <property name="resources" value="src/main/resources/"/> - <property name="testresources" value="src/test/resources/"/> - <property name="testresult" value="${generated}/test-results"/> - <property name="coverageresult" value="${generated}/coverage-report/"/> - <property name="instrument" value="${generated}/instrument/"/> - <property name="cobertura.ser.file" value="${basedir}/cobertura.ser" /> - <property name="dist" value="${generated}/dist"/> - <property name="signed" value="${dist}/signed"/> - <property name="docs" value="${generated}/javadoc/"/> - <property name="libs" value="lib"/> + <property name="jetty.version" value="" /> <property name="warfile" value="onionoo-${release.version}.war"/> - <property name="onionoo.jarfile" - value="onionoo-${release.version}.jar"/> - <property name="source-and-target-java-version" value="1.7" /> - <property name="release.tarball" - value="${dist}/onionoo-${release.version}.tar.gz" /> - <property file="build.properties" /> - <patternset id="runtime" > +  + <property name="name" value="onionoo"/> + +  + <property name="project-main-class" + value="org.torproject.onionoo.cron.Main" /> + + <property name="jarincludes" value="logback.xml" /> + <property name="jarpatternprop" value="library" /> + <property name="additional2sign" value="${warfile}" /> + + <target name="coverage-check"> + <cobertura-check branchrate="0" linerate="0" + totallinerate="34" totalbranchrate="30" > + <regex pattern="org.torproject.onionoo.server" + branchrate="67" linerate="77"/> + <regex pattern="org.torproject.onionoo.docs" + branchrate="19" linerate="29"/> + <regex pattern="org.torproject.onionoo.updater" + branchrate="17" linerate="18"/> + <regex pattern="org.torproject.onionoo.writer" + branchrate="22" linerate="20"/> + </cobertura-check> + </target> + + <patternset id="library" > <include name="descriptor-${descriptorversion}.jar"/> <include name="commons-codec-1.9.jar"/> <include name="commons-compress-1.9.jar"/> @@ -41,180 +53,26 @@ </patternset> <patternset id="web" > - <include name="servlet-api-3.0.jar"/> - <include name="jetty8-server-${jetty.version}.jar"/> - <include name="jetty8-servlets-${jetty.version}.jar"/> - <include name="jetty8-servlet-${jetty.version}.jar"/> - <include name="jetty8-util-${jetty.version}.jar"/> - <include name="jetty8-http-${jetty.version}.jar"/> - <include name="jetty8-io-${jetty.version}.jar"/> - <include name="jetty8-xml-${jetty.version}.jar"/> - <include name="jetty8-webapp-${jetty.version}.jar"/> - <include name="jetty8-continuation-${jetty.version}.jar"/> - <include name="jetty8-security-${jetty.version}.jar"/> + <include name="servlet-api-3.0.jar"/> + <include name="jetty8-server${jetty.version}.jar"/> + <include name="jetty8-servlets${jetty.version}.jar"/> + <include name="jetty8-servlet${jetty.version}.jar"/> + <include name="jetty8-util${jetty.version}.jar"/> + <include name="jetty8-http${jetty.version}.jar"/> + <include name="jetty8-io${jetty.version}.jar"/> + <include name="jetty8-xml${jetty.version}.jar"/> + <include name="jetty8-webapp${jetty.version}.jar"/> + <include name="jetty8-continuation${jetty.version}.jar"/> + <include name="jetty8-security${jetty.version}.jar"/> </patternset> - <patternset id="test" > - <include name="junit4-4.11.jar"/> - <include name="hamcrest-core-1.3.jar"/> + <patternset id="runtime" > + <patternset refid="library" /> + <patternset refid="web" /> </patternset> - <path id="classpath"> - <pathelement path="${classes}"/> - <fileset dir="${libs}"> - <patternset refid="runtime" /> - <patternset refid="web" /> - </fileset> - <fileset dir="${resources}"> - <include name="logback.xml,jetty.xml"/> - </fileset> - </path> - - <path id="test.classpath"> - <path refid="classpath" /> - <pathelement path="${testclasses}"/> - <fileset dir="${libs}"> - <patternset refid="runtime" /> - <patternset refid="test" /> - <patternset refid="web" /> - </fileset> - </path> - - <path id="checkstyle.classpath" > - <fileset dir="${libs}"> - <include name="checkstyle-6.17-all.jar" /> - </fileset> - </path> - - <path id="cobertura.classpath"> - <fileset dir="${libs}"> - <include name="descriptor-${descriptorversion}.jar"/> - <include name="cobertura-2.1.1.jar" /> - <include name="slf4j-api-1.7.7.jar" /> - <include name="commons-lang3-3.3.2.jar" /> - <include name="asm4-5.0.3.jar" /> - <include name="asm4-util-5.0.3.jar" /> - <include name="asm4-tree-5.0.3.jar" /> - <include name="asm4-commons-5.0.3.jar" /> - <include name="asm4-analysis-5.0.3.jar" /> - <include name="oro-2.0.8.jar" /> - <include name="logback-core-1.1.2.jar" /> - <include name="logback-classic-1.1.2.jar" /> - </fileset> - </path> - - <path id="cobertura.test.classpath"> - <path location="${instrument}" /> - <path refid="test.classpath" /> - <path refid="cobertura.classpath" /> - </path> - - <target name="find-revision"> - <exec executable="git" outputproperty="git.revision"> - <arg value="rev-parse" /> - <arg value="--short" /> - <arg value="HEAD" /> - </exec> - </target> - - <target name="init"> - <mkdir dir="${classes}"/> - <mkdir dir="${testclasses}"/> - <mkdir dir="${testresult}"/> - <mkdir dir="${docs}"/> - <mkdir dir="${dist}"/> - <mkdir dir="${signed}"/> - </target> - - <target name="clean" > - <delete includeEmptyDirs="true" quiet="true" > - <fileset dir="${generated}" defaultexcludes="false" includes="**" /> - </delete> - <delete file="${cobertura.ser.file}" quiet="true"/> - </target> - - <target name="compile" - depends="init"> - <javac destdir="${classes}" - srcdir="${javasources}" - source="${source-and-target-java-version}" - target="${source-and-target-java-version}" - debug="true" - deprecation="true" - optimize="false" - failonerror="true" - includeantruntime="false"> - <classpath refid="classpath"/> - </javac> - </target> - - <target name="compile-tests" depends="compile"> - <javac destdir="${testclasses}" - srcdir="${testsources}" - source="${source-and-target-java-version}" - target="${source-and-target-java-version}" - debug="true" debuglevel="lines,source" - deprecation="true" - optimize="false" - failonerror="true" - includeantruntime="false"> - <classpath refid="test.classpath"/> - </javac> - </target> - - <target name="docs" depends="init"> - <javadoc destdir="${docs}" - footer="&copy; 2016 The Tor Project" - doctitle="Onionoo Documentation" - use="true" - windowtitle="Onionoo Documentation"> - <classpath refid="classpath"/> - <fileset dir="${javasources}/" includes="**/*.java" /> - </javadoc> - </target> - - <target name="test" depends="compile,compile-tests"> - <junit fork="true" haltonfailure="true" printsummary="on"> - <classpath refid="test.classpath" /> - <formatter type="plain" usefile="false"/> - <batchtest> - <fileset dir="${testclasses}" - includes="**/*Test.class"/> - </batchtest> - </junit> - </target> - - <taskdef resource="com/puppycrawl/tools/checkstyle/ant/checkstyle-ant-task.properties"> - <classpath refid="checkstyle.classpath" /> - </taskdef> - <target name="checks" depends="compile,compile-tests"> - <checkstyle config="${testresources}/metrics_checks.xml"> - <fileset dir="${javasources}" - includes="**/*.java" /> - <fileset dir="${testsources}" - includes="**/*.java" /> - <classpath> - <path refid="classpath" /> - <path refid="checkstyle.classpath" /> - </classpath> - <formatter type="plain" - toFile="${generated}/checkstyle_report.txt"/> - </checkstyle> - <exec executable="cat" outputproperty="checkstyle.result"> - <arg value="${generated}/checkstyle_report.txt" /> - </exec> - <fail message="Checkstyle complaints: ${checkstyle.result}" > - <condition> - <not> - <length string="${checkstyle.result}" - length="29" /> - </not> - </condition> - </fail> - </target> - <target name="war" - depends="compile,find-revision"> + depends="compile,gitrev"> <war destfile="${dist}/${warfile}" webxml="${resources}/web.xml" basedir="${classes}"> @@ -227,7 +85,6 @@ <zips> <fileset dir="${libs}"> <patternset refid="runtime" /> - <patternset refid="web" /> </fileset> </zips> </archives> @@ -247,125 +104,16 @@ <attribute name="Implementation-Title" value="Onionoo Server"/> <attribute name="Implementation-Version" value="${release.version}-${git.revision}"/> - <attribute name="Onionoo-Protocol-Version" - value="${onionoo.protocol.version}" /> <attribute name="Main-Class" value="org.torproject.onionoo.server.ServerMain" /> </manifest> </war> </target> - <target name="jar" depends="compile,find-revision"> - <jar destfile="${dist}/${onionoo.jarfile}" - basedir="${classes}"> - <restrict> - <not> - <name name="META-INF/*" /> - </not> - <archives> - <zips> - <fileset dir="${libs}"> - <patternset refid="runtime" /> - </fileset> - </zips> - </archives> - </restrict> - <fileset dir="${resources}" includes="logback.xml" /> - <exclude name="**/Test*.class"/> - <manifest> - <attribute name="Created-By" value="The Tor Project" /> - <attribute name="Implementation-Title" value="Onionoo Server"/> - <attribute name="Implementation-Version" - value="${release.version}-${git.revision}"/> - <attribute name="Onionoo-Protocol-Version" - value="${onionoo.protocol.version}" /> - <attribute name="Main-Class" - value="org.torproject.onionoo.cron.Main" /> - </manifest> - </jar> - </target> - - <target name="signjar" depends="jar,war"> - <signjar alias="${jarsigner.alias}" - storepass="${jarsigner.storepass}" - sigalg="SHA256withRSA" - destdir="${signed}" - digestalg="SHA-256" - tsaurl="http://timestamp.digicert.com"> - <path> - <fileset dir="${dist}" includes="${onionoo.jarfile} ${warfile}"/> - </path> - </signjar> - <fail message="Signing failed." > - <condition> - <not> - <and> - <issigned file="${signed}/${onionoo.jarfile}"/> - <issigned file="${signed}/${warfile}"/> - </and> - </not> - </condition> - </fail> - </target> - - <target name="tar" depends="signjar"> - <tar destfile="${release.tarball}" compression="gzip"> - <tarfileset dir="." prefix="onionoo-${release.version}"> - <include name="${signed}/${onionoo.jarfile}"/> - <include name="${signed}/${warfile}"/> - <include name="build.xml" /> - <include name="LICENSE" /> - <include name="INSTALL" /> - <include name="DESIGN" /> - <include name="CERT" /> - <include name="*.md" /> - </tarfileset> - <tarfileset dir="${javasources}" - prefix="onionoo-${release.version}/${javasources}" /> - <tarfileset dir="${resources}" - prefix="onionoo-${release.version}/${resources}" /> - <tarfileset dir="${testsources}" - prefix="onionoo-${release.version}/${testsources}" /> - <tarfileset dir="${testresources}" - prefix="onionoo-${release.version}/${testresources}" /> - <tarfileset dir="${libs}" - prefix="onionoo-${release.version}/${libs}" /> - </tar> - </target> - - <taskdef classpathref="cobertura.classpath" resource="tasks.properties" /> - <target name="coverage" depends="compile,compile-tests"> - <copy todir="${instrument}" > - <fileset dir="${classes}" > - <include name="**/*"/> - </fileset> - </copy> - <cobertura-instrument ignoreTrivial="true"> - <fileset dir="${instrument}"> - <include name="**/**/*.class" /> - </fileset> - </cobertura-instrument> - <junit fork="true" haltonfailure="false" printsummary="on"> - <sysproperty key="net.sourceforge.cobertura.datafile" - file="${cobertura.ser.file}" /> - <classpath refid="cobertura.test.classpath" /> - <formatter type="xml" /> - <batchtest toDir="${testresult}" > - <fileset dir="${testclasses}" includes="**/*Test.class" /> - </batchtest> - </junit> - <cobertura-report format="html" destdir="${coverageresult}" > - <fileset dir="${javasources}"> - <include name="**/*.java" /> - </fileset> - </cobertura-report> - <cobertura-check branchrate="0" linerate="0" totallinerate="34" totalbranchrate="30" > - <regex pattern="org.torproject.onionoo.server" branchrate="67" linerate="77"/> - <regex pattern="org.torproject.onionoo.docs" branchrate="19" linerate="29"/> - <regex pattern="org.torproject.onionoo.updater" branchrate="17" linerate="18"/> - <regex pattern="org.torproject.onionoo.writer" branchrate="22" linerate="20"/> - </cobertura-check> - </target> +  + &base; </project> 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 100644 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 +

1 0