July 2016 - tor-commits - lists.torproject.org

[webwml/master] Add Jake to past contributors page
by sebastian＠torproject.org 07 Jul '16

07 Jul '16

commit 01f582bdb08f2b77cd845aaa0c4f152e25c2aece Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu Jul 7 12:29:34 2016 +0200 Add Jake to past contributors page --- about/en/contributors.wml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/about/en/contributors.wml b/about/en/contributors.wml index dadb568..31be450 100644 --- a/about/en/contributors.wml +++ b/about/en/contributors.wml @@ -25,6 +25,11 @@ all of tor's content; website, products, and materials.</dd> researcher. His other work can be found on his <a href="http://cryptocracy.net/">personal website</a>.</dd> +<dt>Jacob Appelbaum, Advocate, Developer</dt> +<dd>Represented Tor at conferences and trainings, and developed tools +for the Tor ecosystem. Used to run one of the Tor directory +authorities.</dd> + <dt>Katherine Bergeron</dt> <dd>Helped streamlining our operations, including fundraising, merchandise management, travel, and other projects.</dd>

1 0

[metrics-lib/master] All clean according to checkstyle.
by karsten＠torproject.org 07 Jul '16

07 Jul '16

commit ac5ff698c9585d4f5414e40cd6dd978692e8409a Author: iwakeh <iwakeh(a)torproject.org> Date: Thu Jul 7 10:02:29 2016 +0200 All clean according to checkstyle. --- .gitignore | 1 + .../java/org/torproject/descriptor/impl/BridgeNetworkStatusImpl.java | 2 ++ .../java/org/torproject/descriptor/impl/DownloadCoordinatorImpl.java | 3 +++ src/main/java/org/torproject/descriptor/impl/NetworkStatusImpl.java | 5 +++++ 4 files changed, 11 insertions(+) diff --git a/.gitignore b/.gitignore index bb59c26..f2c33a8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ classes/ +cobertura.ser generated/ lib/ descriptor-*.jar diff --git a/src/main/java/org/torproject/descriptor/impl/BridgeNetworkStatusImpl.java b/src/main/java/org/torproject/descriptor/impl/BridgeNetworkStatusImpl.java index 6a56d44..8e456db 100644 --- a/src/main/java/org/torproject/descriptor/impl/BridgeNetworkStatusImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/BridgeNetworkStatusImpl.java @@ -144,6 +144,8 @@ public class BridgeNetworkStatusImpl extends NetworkStatusImpl case "ignoring-advertised-bws": this.ignoringAdvertisedBws = Integer.parseInt(e.getValue()); break; + default: + /* nothing to be done */ } } } catch (NumberFormatException ex) { diff --git a/src/main/java/org/torproject/descriptor/impl/DownloadCoordinatorImpl.java b/src/main/java/org/torproject/descriptor/impl/DownloadCoordinatorImpl.java index 331e7d9..23826aa 100644 --- a/src/main/java/org/torproject/descriptor/impl/DownloadCoordinatorImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/DownloadCoordinatorImpl.java @@ -267,6 +267,9 @@ public class DownloadCoordinatorImpl implements DownloadCoordinator { if (response.getResponseCode() != 200) { this.missingVotes.add(requestedVote); } + break; + default: + /* nothing to be done */ } if (response.getRequestEnd() != 0L) { this.descriptorQueue.add(response); diff --git a/src/main/java/org/torproject/descriptor/impl/NetworkStatusImpl.java b/src/main/java/org/torproject/descriptor/impl/NetworkStatusImpl.java index b6c274d..061a171 100644 --- a/src/main/java/org/torproject/descriptor/impl/NetworkStatusImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/NetworkStatusImpl.java @@ -261,6 +261,11 @@ public abstract class NetworkStatusImpl extends DescriptorImpl { : new ArrayList<>(this.signatures); } + /** + * Implements method defined in + * {@link org.torproject.descriptor.RelayNetworkStatusConsensus} + * and {@link org.torproject.descriptor.RelayNetworkStatusVote}. + */ public SortedMap<String, DirectorySignature> getDirectorySignatures() { SortedMap<String, DirectorySignature> directorySignatures = null; if (this.signatures != null) {

1 0

[collector/master] Implement #19373 and add one word to comment in build.xml.
by karsten＠torproject.org 07 Jul '16

07 Jul '16

commit 0d9a197f1c512f318b225d07d8e764212954e10f Author: iwakeh <iwakeh(a)torproject.org> Date: Wed Jul 6 20:22:13 2016 +0200 Implement #19373 and add one word to comment in build.xml. --- build.xml | 2 +- .../java/org/torproject/collector/MainTest.java | 24 ++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/build.xml b/build.xml index ffb1fca..099eb8b 100644 --- a/build.xml +++ b/build.xml @@ -224,7 +224,7 @@ </target> <target name="test" depends="compile,compile-tests"> <junit fork="true" haltonfailure="true" printsummary="off"> -  +  <jvmarg value="-Djava.security.policy=${testresources}/junittest.policy"/> <jvmarg value="-Djava.security.manager"/> <jvmarg value="-DLOGBASE=${generated}/test-logs"/> diff --git a/src/test/java/org/torproject/collector/MainTest.java b/src/test/java/org/torproject/collector/MainTest.java index f83cab5..55b0569 100644 --- a/src/test/java/org/torproject/collector/MainTest.java +++ b/src/test/java/org/torproject/collector/MainTest.java @@ -7,6 +7,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.fail; import org.torproject.collector.conf.Key; import org.torproject.collector.conf.ConfigurationException; @@ -23,6 +24,7 @@ import java.security.AccessControlException; import java.security.Policy; import java.util.Arrays; import java.util.List; +import java.util.Properties; import java.util.Random; import org.junit.rules.TemporaryFolder; @@ -69,4 +71,26 @@ public class MainTest { bw.close(); } + /* Verifies the contents of the default collector.properties file. + * All properties specified have to be present but nothing else. */ + @Test() + public void testPropertiesFile() throws Exception { + Properties props = new Properties(); + props.load(getClass().getClassLoader().getResourceAsStream( + Main.CONF_FILE)); + for (Key key : Key.values()) { + assertNotNull("Property '" + key.name() + "' not specified in " + + Main.CONF_FILE + ".", + props.getProperty(key.name())); + } + for (String propName : props.stringPropertyNames()) { + try { + Key.valueOf(propName); + } catch (IllegalArgumentException ex) { + fail("Invalid property name '" + propName + "' found in " + + Main.CONF_FILE + "."); + } + } + } } +

1 0

[webwml/master] Update dgoulet's key info
by sebastian＠torproject.org 07 Jul '16

07 Jul '16

commit 15af147b33ae41106c2ab6d8de90bd36d166c05e Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu Jul 7 07:03:48 2016 +0200 Update dgoulet's key info --- docs/en/signing-keys.wml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/en/signing-keys.wml b/docs/en/signing-keys.wml index a708aa3..06ef0a4 100644 --- a/docs/en/signing-keys.wml +++ b/docs/en/signing-keys.wml @@ -122,10 +122,10 @@ sub 4096R/0x2E1AC68ED40814E0 2014-12-15 [expires: 2017-08-25] sub 4096R/0x7017ADCEF65C2036 2014-12-15 [expires: 2017-08-25] - pub 2048R/0x42E86A2A11F48D36 2011-05-11 [expires: 2016-05-09] + pub 2048R/0x42E86A2A11F48D36 2011-05-11 [expires: 2017-05-09] Key fingerprint = B744 17ED DF22 AC9F 9E90 F491 42E8 6A2A 11F4 8D36 uid David Goulet <dgoulet(a)torproject.org> - sub 4096g/FE9D6620 2011-05-11 [expires: 2016-05-09] + sub 4096g/FE9D6620 2011-05-11 [expires: 2017-05-09] sub 4096R/93CC198D 2013-09-10 [expires: 2016-09-10] pub 4096R/0xB01C8B006DA77FAA 2016-02-25 [expires: 2020-02-24]

1 0

[webwml/master] rpms.wml spelling
by sebastian＠torproject.org 06 Jul '16

06 Jul '16

commit eb2d38ed448b5891fbe9bd4263b89c120045f3d7 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu Jul 7 00:12:00 2016 +0200 rpms.wml spelling --- docs/en/rpms.wml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/rpms.wml b/docs/en/rpms.wml index 7d9c3f3..cf779c6 100644 --- a/docs/en/rpms.wml +++ b/docs/en/rpms.wml @@ -17,7 +17,7 @@ <h3>Fedora, RHEL, CentOS, Scientific Linux packages</h3> - <p>Use native Fedora packages for Fedora distribution or <a href="https://fedoraproject.org/wiki/EPEL">EPEL</a> + <p>Use native Fedora packages for the Fedora distribution or <a href="https://fedoraproject.org/wiki/EPEL">EPEL</a> packages for distribitons derived from RHEL. </p>

1 0

[webwml/master] Mike doesn't run a dirauth anymore
by sebastian＠torproject.org 06 Jul '16

06 Jul '16

commit bf4ebed0fa01b685b5402e016ac9e90c42bccfd0 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu Jul 7 00:10:23 2016 +0200 Mike doesn't run a dirauth anymore --- about/en/corepeople.wml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml index 015c23b..244b284 100644 --- a/about/en/corepeople.wml +++ b/about/en/corepeople.wml @@ -277,8 +277,7 @@ <dt>Mike Perry, Tor Browser and Tor Performance Developer</dt> <dd>Lead developer on Tor Browser, developer of <a href="<page docs/torbutton/index>">Torbutton</a>, author of <a - href="https://gitweb.torproject.org/torflow.git/tree/README">TorFlow</a>. - Runs one of the directory authorities.</dd> + href="https://gitweb.torproject.org/torflow.git/tree/README">TorFlow</a>.</dd> <dt>Fabio Pietrosanti, Advocate and Developer</dt> <dd>Originally involved with Tor2Web, and is now our connection

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 06 Jul '16

06 Jul '16

commit 5deef230c8c795c439e6ecc7472b5c98202eb5f2 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 6 21:15:02 2016 +0000 Update translations for bridgedb --- sk_SK/LC_MESSAGES/bridgedb.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sk_SK/LC_MESSAGES/bridgedb.po b/sk_SK/LC_MESSAGES/bridgedb.po index a70ac9b..47f9ea1 100644 --- a/sk_SK/LC_MESSAGES/bridgedb.po +++ b/sk_SK/LC_MESSAGES/bridgedb.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the BridgeDB project. # # Translators: +# Dasa M <littlearchr8(a)gmail.com>, 2016 # once, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2016-03-21 16:27+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2016-07-06 20:49+0000\n" +"Last-Translator: Dasa M <littlearchr8(a)gmail.com>\n" "Language-Team: Slovak (Slovakia) (http://www.transifex.com/otf/torproject/language/sk_SK/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -52,11 +53,11 @@ msgstr "Kontakt" #: bridgedb/https/templates/bridges.html:35 msgid "Select All" -msgstr "" +msgstr "Označiť všetko" #: bridgedb/https/templates/bridges.html:40 msgid "Show QRCode" -msgstr "" +msgstr "Zobraziť QR Kód" #: bridgedb/https/templates/bridges.html:52 msgid "QRCode for your bridge lines"

1 0

[translation/tails-onioncircuits] Update translations for tails-onioncircuits
by translation＠torproject.org 06 Jul '16

06 Jul '16

commit 48755ad88c5707c93ba173c8642e8dbd7bc47786 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 6 20:48:51 2016 +0000 Update translations for tails-onioncircuits --- sk_SK/onioncircuits.pot | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sk_SK/onioncircuits.pot b/sk_SK/onioncircuits.pot index 3b5a371..09e8ae1 100644 --- a/sk_SK/onioncircuits.pot +++ b/sk_SK/onioncircuits.pot @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-05-31 14:42+0200\n" -"PO-Revision-Date: 2016-06-01 09:23+0000\n" +"PO-Revision-Date: 2016-07-06 20:34+0000\n" "Last-Translator: carolyn <carolyn(a)anhalt.org>\n" "Language-Team: Slovak (Slovakia) (http://www.transifex.com/otf/torproject/language/sk_SK/)\n" "MIME-Version: 1.0\n" @@ -66,7 +66,7 @@ msgstr "" #: ../onioncircuits:592 ../onioncircuits:593 ../onioncircuits:594 msgid "Unknown" -msgstr "" +msgstr "Neznámy" #: ../onioncircuits:607 msgid "Fingerprint:"

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 06 Jul '16

06 Jul '16

commit 6f3dd12be3a27a489b406422817f0218a7293b35 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 6 20:45:59 2016 +0000 Update translations for mat-gui --- sk_SK.po | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/sk_SK.po b/sk_SK.po index 429dbc4..bf6704d 100644 --- a/sk_SK.po +++ b/sk_SK.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Dasa M <littlearchr8(a)gmail.com>, 2016 # Marián Mižik <marian(a)mizik.sk>, 2015 # once, 2014 msgid "" @@ -10,8 +11,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-10 23:06+0100\n" -"PO-Revision-Date: 2016-03-21 16:34+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2016-07-06 20:34+0000\n" +"Last-Translator: Dasa M <littlearchr8(a)gmail.com>\n" "Language-Team: Slovak (Slovakia) (http://www.transifex.com/otf/torproject/language/sk_SK/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -38,24 +39,24 @@ msgstr "Všetky súbory" #: mat-gui:167 mat-gui:366 mat-gui:417 mat-gui:441 mat-gui:443 #: data/mat.glade:200 msgid "Clean" -msgstr "" +msgstr "Vyčistiť" #: mat-gui:168 msgid "No metadata found" -msgstr "" +msgstr "Neboli nájdené žiadne metadáta" #: mat-gui:170 mat-gui:419 msgid "Dirty" -msgstr "" +msgstr "Infikovaný" #: mat-gui:176 #, python-format msgid "%s's metadata" -msgstr "" +msgstr "Metadáta %s's" #: mat-gui:187 msgid "Trash your meta, keep your data" -msgstr "" +msgstr "Vymazať metadáta, ponechať dáta" #: mat-gui:192 msgid "Website" @@ -75,19 +76,19 @@ msgstr "Znížiť veľkosť a kvalitu výsledného PDF" #: mat-gui:238 msgid "Remove unsupported file from archives" -msgstr "" +msgstr "Odstrániť nepodporovaný súbor z archívov" #: mat-gui:241 msgid "Remove non-supported (and so non-anonymised) file from output archive" -msgstr "" +msgstr "Orstrániť nepodporovaný (a teda neanonimizovaný) súbor z výsledného archívu" #: mat-gui:280 msgid "Unknown" -msgstr "" +msgstr "Neznámy" #: mat-gui:325 msgid "Not-supported" -msgstr "" +msgstr "Nepodporovaný" #: mat-gui:339 msgid "Harmless fileformat"

1 0

[exonerator/master] Update libraries and instructions to Debian jessie.
by karsten＠torproject.org 06 Jul '16

06 Jul '16

commit fb96be477e4d219a9d5994d8e2a20e7a0528fddc Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Jun 13 16:13:58 2016 +0200 Update libraries and instructions to Debian jessie. Implements #19404. --- README | 113 ++++++++++++++++++++++++++++++++++++-------------------------- build.xml | 26 ++++++--------- 2 files changed, 76 insertions(+), 63 deletions(-) diff --git a/README b/README index 8cee6bf..539e823 100644 --- a/README +++ b/README @@ -2,57 +2,74 @@ ExoneraTor ========== This README describes the steps for installing ExoneraTor on Debian -GNU/Linux Wheezy. Instructions for other operating systems may vary. +GNU/Linux Jessie. Instructions for other operating systems may vary. -In the following it is assumed that root privileges are available. -Commands requiring root privileges will be prefixed with # below. +In the following it is assumed that root privileges are available via +sudo. -Start by adding a metrics user that will be used to execute all commands -that do not require root privileges. These commands will be prefixed with -$ below. +Start by installing Git, Java, Ant, PostgreSQL, and a couple packages +containing .jar files: -# adduser metrics +$ sudo apt-get install openjdk-7-jdk ant postgresql \ + libcommons-codec-java libcommons-lang-java libpostgresql-jdbc-java \ + libservlet3.0-java + +Check the versions of the newly installed tools: + +$ java -version +java version "1.7.0_101" +OpenJDK Runtime Environment (IcedTea 2.6.6) (7u101-2.6.6-2~deb8u1) +OpenJDK 64-Bit Server VM (build 24.95-b01, mixed mode) + +$ ant -version +Apache Ant(TM) version 1.9.4 compiled on October 7 2014 + +$ psql --version +psql (PostgreSQL) 9.4.8 + +Add an exonerator user that will be used to import descriptors into the +database once per hour: + +$ sudo adduser exonerator The database importer and website sources will be installed in /srv/exonerator.torproject.org/ that is created as follows: -# mkdir /srv/exonerator.torproject.org/ -# chmod g+ws /srv/exonerator.torproject.org/ -# chown metrics:metrics /srv/exonerator.torproject.org/ +$ sudo mkdir /srv/exonerator.torproject.org/ +$ sudo chmod g+ws /srv/exonerator.torproject.org/ +$ sudo chown exonerator:exonerator /srv/exonerator.torproject.org/ Clone the exonerator Git repository: $ cd /srv/exonerator.torproject.org/ $ git clone https://git.torproject.org/exonerator.git -Install Java, Ant, PostgreSQL, and a couple packages containing .jar files -that are necessary for setting up the ExoneraTor database. +Create a libraries directory /srv/exonerator.torproject.org/lib/ and copy +all required .jar files from /usr/share/java/ there, including: -# apt-get install openjdk-6-jdk ant postgresql libcommons-codec-java \ - libpostgresql-jdbc-java + - /srv/exonerator.torproject.org/exonerator/lib/commons-codec-1.9.jar + - /srv/exonerator.torproject.org/exonerator/lib/commons-lang-2.6.jar + - /srv/exonerator.torproject.org/exonerator/lib/postgresql-jdbc3-9.2.jar + - /srv/exonerator.torproject.org/exonerator/lib/servlet-api-3.0.jar -Check the versions of the newly installed tools. +Obtain the DescripTor library from https://dist.torproject.org/descriptor/ +and also place it in the lib/ directory: -$ java -version -java version "1.6.0_27" -OpenJDK Runtime Environment (IcedTea6 1.12.6) (6b27-1.12.6-1~deb7u1) -OpenJDK 64-Bit Server VM (build 20.0-b12, mixed mode) + - /srv/exonerator.torproject.org/exonerator/lib/descriptor-1.2.0.jar -$ ant -version -Apache Ant(TM) version 1.8.2 compiled on September 22 2011 +Attempt to compile the sources to see if all requirements are provided: -$ psql --version -psql (PostgreSQL) 9.1.9 -contains support for command-line editing +$ ant compile -Create a new metrics database user. There is no need to give the metrics -user superuser privileges or allow it to create databases or new roles. +Create a new exonerator database user. There is no need to give the +exonerator user superuser privileges or allow it to create databases or +new roles. -# sudo -u postgres createuser -P metrics +$ sudo -u postgres createuser -P exonerator -Create a new database exonerator owned by user metrics. +Create a new database exonerator owned by user exonerator. -# sudo -u postgres createdb -O metrics exonerator +$ sudo -u postgres createdb -O exonerator exonerator Import the exonerator database schema. @@ -88,15 +105,15 @@ Apache Tomcat. Start by installing Apache: -# apt-get install apache2 +$ sudo apt-get install apache2 Disable Apache's default site. -# a2dissite default +$ sudo a2dissite default Enable mod_proxy to forward requests to Tomcat. -# a2enmod proxy_http +$ sudo a2enmod proxy_http Create a new virtual host configuration and store it in a new file /etc/apache2/sites-available/exonerator.torproject.org with the following @@ -121,19 +138,19 @@ content: Enable the new virtual host. -# a2ensite exonerator.torproject.org +$ sudo a2ensite exonerator.torproject.org Restart Apache just to be sure that all changes are effective. -# service apache2 restart +$ sudo service apache2 restart Apache Tomcat will process requests for dynamic resources. Install Tomcat: -# apt-get install tomcat6 +$ sudo apt-get install tomcat8 -Replace Tomcat's default configuration in /etc/tomcat6/server.xml with the +Replace Tomcat's default configuration in /etc/tomcat8/server.xml with the following configuration: <Server port="8005" shutdown="SHUTDOWN"> @@ -145,11 +162,12 @@ following configuration: compression="off" compressionMinSize="2048" noCompressionUserAgents="gozilla, traviata" compressableMimeType="text/html,text/xml,text/plain" /> - <Engine name="Catalina" defaultHost="yatei.torproject.org"> - <Host name="metrics.torproject.org" appBase="webapps" + <Engine name="Catalina" defaultHost="exonerator.torproject.org"> + <Host name="exonerator.torproject.org" appBase="webapps" unpackWARs="true" autoDeploy="true" - xmlValidation="false" xmlNamespaceAware="false"> - <Alias>yatei.torproject.org</Alias> + xmlValidation="false" xmlNamespaceAware="false" + copyXML="true"> + <Alias>exonerator.torproject.org</Alias> <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs" prefix="exonerator_access_log." suffix=".txt" pattern="%l %u %t %r %s %b" @@ -162,18 +180,19 @@ following configuration: Update the database password in /srv/exonerator.torproject.org/exonerator/etc/context.xml. -Note that this context.xml file might be ignored by Tomcat in some cases, -depending on its configuration. In that case, copy the file to the server -to /var/lib/tomcat6/conf/Catalina/metrics.torproject.org/exonerator.xml . - Now generate the web application. $ ant war +Add a symbolic link to the PostgreSQL JDBC library to Tomcat's lib/ +folder: + +$ sudo ln -s /usr/share/java/postgresql-jdbc4.jar /var/lib/tomcat8/lib/ + Create a symbolic link to the exonerator.war file: -# ln -s /srv/exonerator.torproject.org/exonerator/exonerator.war \ - /var/lib/tomcat6/webapps/ +$ sudo ln -s /srv/exonerator.torproject.org/exonerator/exonerator.war \ + /var/lib/tomcat8/webapps/ Tomcat will now attempt to deploy the web application automatically. @@ -182,7 +201,7 @@ Whenever the ExoneraTor website needs to be redeployed, generate a new Restart Tomcat to make all configuration changes effective: -# service tomcat6 restart +$ sudo service tomcat8 restart The ExoneraTor website should now work. diff --git a/build.xml b/build.xml index e8cbad4..0326520 100644 --- a/build.xml +++ b/build.xml @@ -4,6 +4,7 @@ <property name="sources" value="src"/> <property name="resources" value="res"/> <property name="classes" value="classes"/> + <property name="libs" value="lib"/> <property name="config" value="etc"/> <property name="webxmlfile" value="${config}/web.xml"/> <property name="contextxmltemplate" @@ -12,14 +13,12 @@ <property name="warfile" value="exonerator.war"/> <path id="classpath"> <pathelement path="${classes}"/> - <fileset dir="deps/metrics-lib"> - <include name="descriptor.jar"/> - </fileset> - <fileset dir="/usr/share/java"> - <include name="commons-codec.jar"/> - <include name="postgresql-jdbc3.jar"/> - <include name="servlet-api-2.5.jar"/> - <include name="commons-lang.jar"/> + <fileset dir="${libs}"> + <include name="descriptor-1.2.0.jar"/> + <include name="commons-codec-1.9.jar"/> + <include name="postgresql-jdbc4-9.2.jar"/> + <include name="servlet-api-3.0.jar"/> + <include name="commons-lang-2.6.jar"/> </fileset> </path> @@ -29,12 +28,8 @@ <mkdir dir="${classes}"/> </target> - <target name="metrics-lib"> - <ant dir="deps/metrics-lib"/> - </target> -  - <target name="compile" depends="metrics-lib, init"> + <target name="compile" depends="init"> <javac destdir="${classes}" srcdir="${sources}" source="1.5" @@ -64,9 +59,8 @@ webxml="${webxmlfile}"> <fileset dir="web"/> <lib dir="/usr/share/java"> - <include name="commons-codec.jar"/> - <include name="postgresql-jdbc3.jar"/> - <include name="commons-lang.jar"/> + <include name="commons-codec-1.9.jar"/> + <include name="commons-lang-2.6.jar"/> </lib> <classes dir="${classes}"/> <zipfileset dir="${resources}"

1 0