[tor-commits] [onionoo/master] Replace submodule with released descriptor.jar.

[karsten at torproject.org]

commit 48cf80e8db5832ba8cc79b04f38daee5092ecb7c
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date:   Sun Jun 5 10:41:25 2016 +0200

    Replace submodule with released descriptor.jar.
    
    Fixes #19253 and #19260.
---
 build.xml                                          | 19 ++++-----
 deps/metrics-lib                                   |  1 -
 .../onionoo/updater/DummyBridgeStatus.java         | 45 ++++++++++++++++++++++
 .../onionoo/updater/DummyStatusEntry.java          |  5 +++
 4 files changed, 58 insertions(+), 12 deletions(-)

diff --git a/build.xml b/build.xml
index 8de738a..c92fc3a 100644
--- a/build.xml
+++ b/build.xml
@@ -29,6 +29,7 @@
       <include name="commons-lang3-3.1.jar"/>
       <include name="gson-2.1.jar"/>
       <include name="junit4-4.10.jar"/>
+      <include name="hamcrest-all-1.3.jar"/>
       <include name="servlet-api-3.0.jar"/>
       <include name="logback-classic-1.0.4.jar"/>
       <include name="logback-core-1.0.4.jar"/>
@@ -44,8 +45,8 @@
       <include name="jetty8-continuation-8.1.3.v20120416.jar"/>
       <include name="jetty8-security-8.1.3.v20120416.jar"/>
     </fileset>
-    <fileset dir="deps/metrics-lib">
-      <include name="descriptor.jar"/>
+    <fileset dir="lib">
+      <include name="descriptor-1.2.0.jar"/>
     </fileset>
     <fileset dir="${config}">
       <include name="logback.xml,jetty.xml"/>
@@ -66,12 +67,8 @@
     </delete>
   </target>
 
-  <target name="metrics-lib">
-    <ant dir="deps/metrics-lib"/>
-  </target>
-
   <target name="compile"
-          depends="metrics-lib, init">
+          depends="init">
     <javac destdir="${classes}"
            srcdir="${javasources}"
            source="${source-and-target-java-version}"
@@ -112,8 +109,8 @@
     <war destfile="${warfile}"
          webxml="${webxmlfile}">
       <fileset dir="web"/>
-      <zipgroupfileset dir="deps/metrics-lib">
-        <include name="descriptor.jar"/>
+      <zipgroupfileset dir="lib">
+        <include name="descriptor-1.2.0.jar"/>
       </zipgroupfileset>
       <zipgroupfileset dir="/usr/share/java">
         <include name="commons-codec-1.6.jar"/>
@@ -172,8 +169,8 @@
         <include name="logback-core-1.0.4.jar"/>
         <include name="slf4j-api-1.6.5.jar"/>
       </zipgroupfileset>
-      <zipgroupfileset dir="deps/metrics-lib">
-        <include name="descriptor.jar"/>
+      <zipgroupfileset dir="lib">
+        <include name="descriptor-1.2.0.jar"/>
       </zipgroupfileset>
       <fileset dir="${classes}"
                excludes="org/torproject/onionoo/server/" />
diff --git a/deps/metrics-lib b/deps/metrics-lib
deleted file mode 160000
index bd18dd0..0000000
--- a/deps/metrics-lib
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit bd18dd0d2f788d1d4ee7acbac5032e97264bb855
diff --git a/src/test/java/org/torproject/onionoo/updater/DummyBridgeStatus.java b/src/test/java/org/torproject/onionoo/updater/DummyBridgeStatus.java
index f6a396c..ff6f104 100644
--- a/src/test/java/org/torproject/onionoo/updater/DummyBridgeStatus.java
+++ b/src/test/java/org/torproject/onionoo/updater/DummyBridgeStatus.java
@@ -39,5 +39,50 @@ public class DummyBridgeStatus implements BridgeNetworkStatus {
   public SortedMap<String, NetworkStatusEntry> getStatusEntries() {
     return this.statusEntries;
   }
+
+  @Override
+  public int getEnoughMtbfInfo() {
+    return 0;
+  }
+
+  @Override
+  public long getFastBandwidth() {
+    return 0;
+  }
+
+  @Override
+  public long getGuardBandwidthExcludingExits() {
+    return 0;
+  }
+
+  @Override
+  public long getGuardBandwidthIncludingExits() {
+    return 0;
+  }
+
+  @Override
+  public long getGuardTk() {
+    return 0;
+  }
+
+  @Override
+  public double getGuardWfu() {
+    return 0;
+  }
+
+  @Override
+  public int getIgnoringAdvertisedBws() {
+    return 0;
+  }
+
+  @Override
+  public long getStableMtbf() {
+    return 0;
+  }
+
+  @Override
+  public long getStableUptime() {
+    return 0;
+  }
 }
 
diff --git a/src/test/java/org/torproject/onionoo/updater/DummyStatusEntry.java b/src/test/java/org/torproject/onionoo/updater/DummyStatusEntry.java
index 64ef73f..b480c37 100644
--- a/src/test/java/org/torproject/onionoo/updater/DummyStatusEntry.java
+++ b/src/test/java/org/torproject/onionoo/updater/DummyStatusEntry.java
@@ -88,5 +88,10 @@ public class DummyStatusEntry implements NetworkStatusEntry {
   public String getPortList() {
     return null;
   }
+
+  @Override
+  public String getMasterKeyEd25519() {
+    return null;
+  }
 }