From aaecd8f2a36d2c0d780b42425aa57725fe708551 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 10 Apr 2014 18:58:08 -0400
Subject: [PATCH] Move cache to IKeyManager and implement isStale() in FileKeyManager
---
gitblit.iml | 188 +++++++++++++++++++++++++++++-----------------
1 files changed, 117 insertions(+), 71 deletions(-)
diff --git a/gitblit.iml b/gitblit.iml
index 8c95ac6..a48f12a 100644
--- a/gitblit.iml
+++ b/gitblit.iml
@@ -6,8 +6,10 @@
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/main/bugtraq" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/dagger" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/bugtraq" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
</content>
<orderEntry type="sourceFolder" forTests="false" />
@@ -56,13 +58,13 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="jcommander-1.17.jar">
+ <library name="annotations-12.0.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/jcommander-1.17.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/annotations-12.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/jcommander-1.17.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/annotations-12.0.jar!/" />
</SOURCES>
</library>
</orderEntry>
@@ -177,17 +179,6 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="googlecharts-1.4.21.jar">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/ext/googlecharts-1.4.21.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/googlecharts-1.4.21.jar!/" />
- </SOURCES>
- </library>
- </orderEntry>
- <orderEntry type="module-library">
<library name="lucene-core-4.6.0.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/ext/lucene-core-4.6.0.jar!/" />
@@ -274,35 +265,35 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="pegdown-1.4.1.jar">
+ <library name="pegdown-1.4.2.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/pegdown-1.4.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/pegdown-1.4.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/pegdown-1.4.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/pegdown-1.4.2.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="parboiled-java-1.1.5.jar">
+ <library name="parboiled-java-1.1.6.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/parboiled-java-1.1.5.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/parboiled-java-1.1.6.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/parboiled-java-1.1.5.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/parboiled-java-1.1.6.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="parboiled-core-1.1.5.jar">
+ <library name="parboiled-core-1.1.6.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/parboiled-core-1.1.5.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/parboiled-core-1.1.6.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/parboiled-core-1.1.5.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/parboiled-core-1.1.6.jar!/" />
</SOURCES>
</library>
</orderEntry>
@@ -417,46 +408,90 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="org.eclipse.jgit-3.1.0.201310021548-r.jar">
+ <library name="org.eclipse.jgit-3.3.1.201403241930-r.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit-3.1.0.201310021548-r.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit-3.3.1.201403241930-r.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/org.eclipse.jgit-3.1.0.201310021548-r.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/org.eclipse.jgit-3.3.1.201403241930-r.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="jsch-0.1.46.jar">
+ <library name="jsch-0.1.50.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/jsch-0.1.46.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/jsch-0.1.50.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/jsch-0.1.46.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/jsch-0.1.50.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="JavaEWAH-0.5.6.jar">
+ <library name="JavaEWAH-0.7.9.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/JavaEWAH-0.5.6.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/JavaEWAH-0.7.9.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/JavaEWAH-0.5.6.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/JavaEWAH-0.7.9.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="org.eclipse.jgit.http.server-3.1.0.201310021548-r.jar">
+ <library name="httpclient-4.1.3.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit.http.server-3.1.0.201310021548-r.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/httpclient-4.1.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/org.eclipse.jgit.http.server-3.1.0.201310021548-r.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/httpclient-4.1.3.jar!/" />
+ </SOURCES>
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="httpcore-4.1.4.jar">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/ext/httpcore-4.1.4.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/ext/src/httpcore-4.1.4.jar!/" />
+ </SOURCES>
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="commons-logging-1.1.1.jar">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/ext/commons-logging-1.1.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/ext/src/commons-logging-1.1.1.jar!/" />
+ </SOURCES>
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="commons-codec-1.7.jar">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/ext/commons-codec-1.7.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/ext/src/commons-codec-1.7.jar!/" />
+ </SOURCES>
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="org.eclipse.jgit.http.server-3.3.1.201403241930-r.jar">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit.http.server-3.3.1.201403241930-r.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/ext/src/org.eclipse.jgit.http.server-3.3.1.201403241930-r.jar!/" />
</SOURCES>
</library>
</orderEntry>
@@ -490,6 +525,28 @@
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/ext/src/bcpkix-jdk15on-1.49.jar!/" />
+ </SOURCES>
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="sshd-core-0.10.1.jar">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/ext/sshd-core-0.10.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/ext/src/sshd-core-0.10.1.jar!/" />
+ </SOURCES>
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="mina-core-2.0.7.jar">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/ext/mina-core-2.0.7.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/ext/src/mina-core-2.0.7.jar!/" />
</SOURCES>
</library>
</orderEntry>
@@ -701,13 +758,35 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="commons-codec-1.7.jar">
+ <library name="args4j-2.0.26.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/commons-codec-1.7.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/args4j-2.0.26.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/commons-codec-1.7.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/args4j-2.0.26.jar!/" />
+ </SOURCES>
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="jedis-2.3.1.jar">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/ext/jedis-2.3.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/ext/src/jedis-2.3.1.jar!/" />
+ </SOURCES>
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="commons-pool2-2.0.jar">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/ext/commons-pool2-2.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/ext/src/commons-pool2-2.0.jar!/" />
</SOURCES>
</library>
</orderEntry>
@@ -807,39 +886,6 @@
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/ext/src/selenium-api-2.28.0.jar!/" />
- </SOURCES>
- </library>
- </orderEntry>
- <orderEntry type="module-library" scope="TEST">
- <library name="httpclient-4.2.1.jar">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/ext/httpclient-4.2.1.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/httpclient-4.2.1.jar!/" />
- </SOURCES>
- </library>
- </orderEntry>
- <orderEntry type="module-library" scope="TEST">
- <library name="httpcore-4.2.1.jar">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/ext/httpcore-4.2.1.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/httpcore-4.2.1.jar!/" />
- </SOURCES>
- </library>
- </orderEntry>
- <orderEntry type="module-library" scope="TEST">
- <library name="commons-logging-1.1.1.jar">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/ext/commons-logging-1.1.1.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/commons-logging-1.1.1.jar!/" />
</SOURCES>
</library>
</orderEntry>
--
Gitblit v1.9.1