[tor-commits] [metrics-web/master] Remove obsolete build files.
karsten at torproject.org
karsten at torproject.org
Wed Dec 20 08:41:23 UTC 2017
commit 889083a1fb3edf9ea72ca67b7d9887f43fe402f9
Author: iwakeh <iwakeh at torproject.org>
Date: Mon Dec 4 11:14:34 2017 +0000
Remove obsolete build files.
---
shared/.gitignore | 4 -
shared/build-base.xml | 107 -----------------
shared/build.xml | 51 ---------
shared/resources/metrics_checks.xml | 221 ------------------------------------
4 files changed, 383 deletions(-)
diff --git a/shared/.gitignore b/shared/.gitignore
deleted file mode 100644
index c3e32d5..0000000
--- a/shared/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/generated/
-/lib/
-/stats/
-
diff --git a/shared/build-base.xml b/shared/build-base.xml
deleted file mode 100644
index d27757b..0000000
--- a/shared/build-base.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<project basedir=".">
-
- <property name="sources" value="src/main/java"/>
- <property name="resources" value="src/main/resources"/>
- <property name="testsources" value="src/test/java"/>
- <property name="libs" value="../../shared/lib"/>
- <property name="generated" value="generated"/>
- <property name="classes" value="${generated}/classes/"/>
- <property name="testclasses" value="${generated}/test-classes/"/>
- <property name="source-and-target-java-version" value="1.8" />
- <property name="metricslibversion" value="2.0.0" />
-
- <path id="base.classpath">
- <pathelement path="${classes}"/>
- <fileset dir="${libs}">
- <include name="commons-codec-1.10.jar"/>
- <include name="commons-compress-1.13.jar"/>
- <include name="commons-lang-2.6.jar"/>
- <include name="metrics-lib-${metricslibversion}.jar"/>
- <include name="slf4j-api-1.7.22.jar"/>
- <include name="logback-core-1.1.9.jar"/>
- <include name="logback-classic-1.1.9.jar"/>
- <include name="gson-2.4.jar"/>
- <include name="xz-1.6.jar"/>
- </fileset>
- </path>
-
- <path id="classpath">
- <pathelement path="${classes}"/>
- <path refid="base.classpath" />
- </path>
-
- <path id="base.testclasspath">
- <pathelement path="${base.testclasses}"/>
- <pathelement path="base.classpath"/>
- <fileset dir="${libs}">
- <include name="hamcrest-core-1.3.jar"/>
- <include name="junit4-4.12.jar"/>
- </fileset>
- </path>
-
- <path id="testclasspath">
- <pathelement path="${testclasses}"/>
- <path refid="base.testclasspath" />
- <path refid="base.classpath" />
- </path>
-
- <target name="clean">
- <delete includeEmptyDirs="true" quiet="true">
- <fileset dir="${generated}" defaultexcludes="false" includes="**" />
- </delete>
- </target>
-
- <target name="init">
- <mkdir dir="${classes}"/>
- <mkdir dir="${testclasses}"/>
- </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" debuglevel="lines,source"
- deprecation="true"
- optimize="false"
- failonerror="true"
- includeantruntime="false">
- <classpath refid="classpath"/>
- </javac>
- </target>
-
- <target name="testcompile" 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="testclasspath"/>
- </javac>
- </target>
-
- <target name="test" depends="testcompile">
- <junit fork="true" haltonfailure="true" printsummary="off">
- <classpath refid="testclasspath"/>
- <formatter type="plain" usefile="false"/>
- <batchtest>
- <fileset dir="${testclasses}"
- includes="**/*Test.class"/>
- </batchtest>
- </junit>
- </target>
-
- <target name="run" depends="init,compile">
- <java fork="true"
- maxmemory="2g"
- classname="${mainclass}">
- <classpath refid="classpath"/>
- </java>
- </target>
-
-</project>
-
diff --git a/shared/build.xml b/shared/build.xml
deleted file mode 100644
index 3b0a799..0000000
--- a/shared/build.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<project default="checks" name="metrics-web" basedir=".">
- <property name="libs" value="lib"/>
- <property name="checks" value="resources/metrics_checks.xml"/>
- <property name="generated" value="generated/"/>
- <property name="report" value="${generated}/checkstyle_report.txt"/>
- <path id="checkstyle.classpath" >
- <fileset dir="${libs}">
- <include name="checkstyle-6.17-all.jar" />
- </fileset>
- </path>
- <target name="init">
- <mkdir dir="${generated}"/>
- </target>
- <target name="clean">
- <delete includeEmptyDirs="true" quiet="true">
- <fileset dir="${generated}" defaultexcludes="false" includes="**" />
- </delete>
- </target>
- <taskdef resource="com/puppycrawl/tools/checkstyle/ant/checkstyle-ant-task.properties">
- <classpath refid="checkstyle.classpath" />
- </taskdef>
- <target name="checks" depends="init">
- <checkstyle config="${checks}">
- <fileset dir="../website/src" includes="**/*.java"/>
- <fileset dir="../modules/advbwdist/src" includes="**/*.java"/>
- <fileset dir="../modules/clients/src" includes="**/*.java"/>
- <fileset dir="../modules/collectdescs/src" includes="**/*.java"/>
- <fileset dir="../modules/connbidirect/src" includes="**/*.java"/>
- <fileset dir="../modules/hidserv/src" includes="**/*.java"/>
- <fileset dir="../modules/legacy/src" includes="**/*.java"/>
- <fileset dir="../modules/onionperf/src" includes="**/*.java"/>
- <fileset dir="../modules/webstats/src" includes="**/*.java"/>
- <classpath>
- <path refid="checkstyle.classpath" />
- </classpath>
- <formatter type="plain" toFile="${report}" />
- </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>
-</project>
-
diff --git a/shared/resources/metrics_checks.xml b/shared/resources/metrics_checks.xml
deleted file mode 100644
index 2df2f2a..0000000
--- a/shared/resources/metrics_checks.xml
+++ /dev/null
@@ -1,221 +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">
-
-<!--
- Checkstyle configuration that checks the Google coding conventions from Google Java Style
- that can be found at https://google.github.io/styleguide/javaguide.html with the following
- modifications:
-
- - Replaced com.google with org.torproject in import statement ordering
- [CustomImportOrder].
-
- - Relaxed requirement that catch parameters must be at least two
- characters long [CatchParameterName].
-
- - Enabled suppression of warnings using annotations.
-
- Checkstyle is very configurable. Be sure to read the documentation at
- http://checkstyle.sf.net (or in your downloaded distribution).
-
- To completely disable a check, just comment it out or delete it from the file.
-
- Authors: Max Vetrenko, Ruslan Diachenko, Roman Ivanov.
- -->
-
-<module name = "Checker">
- <property name="charset" value="UTF-8"/>
-
- <property name="severity" value="warning"/>
-
- <property name="fileExtensions" value="java, properties, xml"/>
- <!-- Checks for whitespace -->
- <!-- See http://checkstyle.sf.net/config_whitespace.html -->
- <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="100"/>
- <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>
More information about the tor-commits
mailing list