]> source.dussan.org Git - gitblit.git/commitdiff
fix filter and plugin class resolver
authorMartin Spielmann <martin.spielmann@pingunaut.com>
Sat, 30 Jul 2016 11:35:46 +0000 (13:35 +0200)
committerMartin Spielmann <martin.spielmann@pingunaut.com>
Sat, 30 Jul 2016 11:35:46 +0000 (13:35 +0200)
.classpath
src/main/java/com/gitblit/wicket/GitblitWicketFilter.java
src/main/java/com/gitblit/wicket/PluginClassResolver.java

index 8b8844362f9717eb58d690b4128822fcb3ccd8b6..d531303bd3e806ede95953d65a39fa46ccab1e68 100644 (file)
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-       <classpathentry kind="src" path="src/main/java" />
-       <classpathentry kind="src" path="src/main/bugtraq" />
-       <classpathentry kind="src" path="src/test/java" output="bin/test-classes" />
-       <classpathentry kind="src" path="src/test/bugtraq" output="bin/test-classes" />
-       <classpathentry kind="src" path="src/main/resources" />
-       <classpathentry kind="lib" path="ext/guice-4.0.jar" sourcepath="ext/src/guice-4.0.jar" />
-       <classpathentry kind="lib" path="ext/javax.inject-1.jar" sourcepath="ext/src/javax.inject-1.jar" />
-       <classpathentry kind="lib" path="ext/aopalliance-1.0.jar" sourcepath="ext/src/aopalliance-1.0.jar" />
-       <classpathentry kind="lib" path="ext/guava-18.0.jar" sourcepath="ext/src/guava-18.0.jar" />
-       <classpathentry kind="lib" path="ext/guice-servlet-4.0-gb2.jar" sourcepath="ext/src/guice-servlet-4.0-gb2.jar" />
-       <classpathentry kind="lib" path="ext/annotations-12.0.jar" sourcepath="ext/src/annotations-12.0.jar" />
-       <classpathentry kind="lib" path="ext/log4j-1.2.17.jar" sourcepath="ext/src/log4j-1.2.17.jar" />
-       <classpathentry kind="lib" path="ext/slf4j-api-1.7.12.jar" sourcepath="ext/src/slf4j-api-1.7.12.jar" />
-       <classpathentry kind="lib" path="ext/slf4j-log4j12-1.7.12.jar" sourcepath="ext/src/slf4j-log4j12-1.7.12.jar" />
-       <classpathentry kind="lib" path="ext/javax.mail-1.5.1.jar" sourcepath="ext/src/javax.mail-1.5.1.jar" />
-       <classpathentry kind="lib" path="ext/javax.servlet-api-3.1.0.jar" sourcepath="ext/src/javax.servlet-api-3.1.0.jar" />
-       <classpathentry kind="lib" path="ext/jetty-all-9.2.13.v20150730.jar" sourcepath="ext/src/jetty-all-9.2.13.v20150730.jar" />
-       <classpathentry kind="lib" path="ext/wicket-core-7.4.0.jar" sourcepath="ext/src/wicket-core-7.4.0.jar" />
-       <classpathentry kind="lib" path="ext/commons-collections4-4.1.jar" sourcepath="ext/src/commons-collections4-4.1.jar" />
-       <classpathentry kind="lib" path="ext/wicket-request-7.4.0.jar" sourcepath="ext/src/wicket-request-7.4.0.jar" />
-       <classpathentry kind="lib" path="ext/wicket-util-7.4.0.jar" sourcepath="ext/src/wicket-util-7.4.0.jar" />
-       <classpathentry kind="lib" path="ext/commons-fileupload-1.3.2.jar" sourcepath="ext/src/commons-fileupload-1.3.2.jar" />
-       <classpathentry kind="lib" path="ext/commons-io-2.2.jar" sourcepath="ext/src/commons-io-2.2.jar" />
-       <classpathentry kind="lib" path="ext/hamcrest-junit-2.0.0.0.jar" sourcepath="ext/src/hamcrest-junit-2.0.0.0.jar" />
-       <classpathentry kind="lib" path="ext/junit-4.11.jar" sourcepath="ext/src/junit-4.11.jar" />
-       <classpathentry kind="lib" path="ext/hamcrest-core-1.3.jar" sourcepath="ext/src/hamcrest-core-1.3.jar" />
-       <classpathentry kind="lib" path="ext/java-hamcrest-2.0.0.0.jar" sourcepath="ext/src/java-hamcrest-2.0.0.0.jar" />
-       <classpathentry kind="lib" path="ext/wicket-auth-roles-7.4.0.jar" sourcepath="ext/src/wicket-auth-roles-7.4.0.jar" />
-       <classpathentry kind="lib" path="ext/wicket-extensions-7.4.0.jar" sourcepath="ext/src/wicket-extensions-7.4.0.jar" />
-       <classpathentry kind="lib" path="ext/lucene-core-4.10.4.jar" sourcepath="ext/src/lucene-core-4.10.4.jar" />
-       <classpathentry kind="lib" path="ext/lucene-analyzers-common-4.10.4.jar" sourcepath="ext/src/lucene-analyzers-common-4.10.4.jar" />
-       <classpathentry kind="lib" path="ext/lucene-highlighter-4.10.4.jar" sourcepath="ext/src/lucene-highlighter-4.10.4.jar" />
-       <classpathentry kind="lib" path="ext/lucene-memory-4.10.4.jar" sourcepath="ext/src/lucene-memory-4.10.4.jar" />
-       <classpathentry kind="lib" path="ext/lucene-queries-4.10.4.jar" sourcepath="ext/src/lucene-queries-4.10.4.jar" />
-       <classpathentry kind="lib" path="ext/lucene-queryparser-4.10.4.jar" sourcepath="ext/src/lucene-queryparser-4.10.4.jar" />
-       <classpathentry kind="lib" path="ext/lucene-sandbox-4.10.4.jar" sourcepath="ext/src/lucene-sandbox-4.10.4.jar" />
-       <classpathentry kind="lib" path="ext/jakarta-regexp-1.4.jar" />
-       <classpathentry kind="lib" path="ext/pegdown-1.5.0.jar" sourcepath="ext/src/pegdown-1.5.0.jar" />
-       <classpathentry kind="lib" path="ext/parboiled-java-1.1.7.jar" sourcepath="ext/src/parboiled-java-1.1.7.jar" />
-       <classpathentry kind="lib" path="ext/parboiled-core-1.1.7.jar" sourcepath="ext/src/parboiled-core-1.1.7.jar" />
-       <classpathentry kind="lib" path="ext/asm-5.0.3.jar" sourcepath="ext/src/asm-5.0.3.jar" />
-       <classpathentry kind="lib" path="ext/asm-tree-5.0.3.jar" sourcepath="ext/src/asm-tree-5.0.3.jar" />
-       <classpathentry kind="lib" path="ext/asm-analysis-5.0.3.jar" sourcepath="ext/src/asm-analysis-5.0.3.jar" />
-       <classpathentry kind="lib" path="ext/asm-util-5.0.3.jar" sourcepath="ext/src/asm-util-5.0.3.jar" />
-       <classpathentry kind="lib" path="ext/wikitext-core-1.4.jar" sourcepath="ext/src/wikitext-core-1.4.jar" />
-       <classpathentry kind="lib" path="ext/twiki-core-1.4.jar" sourcepath="ext/src/twiki-core-1.4.jar" />
-       <classpathentry kind="lib" path="ext/textile-core-1.4.jar" sourcepath="ext/src/textile-core-1.4.jar" />
-       <classpathentry kind="lib" path="ext/tracwiki-core-1.4.jar" sourcepath="ext/src/tracwiki-core-1.4.jar" />
-       <classpathentry kind="lib" path="ext/mediawiki-core-1.4.jar" sourcepath="ext/src/mediawiki-core-1.4.jar" />
-       <classpathentry kind="lib" path="ext/confluence-core-1.4.jar" sourcepath="ext/src/confluence-core-1.4.jar" />
-       <classpathentry kind="lib" path="ext/org.eclipse.jgit-4.1.1.201511131810-r.jar" sourcepath="ext/src/org.eclipse.jgit-4.1.1.201511131810-r.jar" />
-       <classpathentry kind="lib" path="ext/jsch-0.1.53.jar" sourcepath="ext/src/jsch-0.1.53.jar" />
-       <classpathentry kind="lib" path="ext/JavaEWAH-0.7.9.jar" sourcepath="ext/src/JavaEWAH-0.7.9.jar" />
-       <classpathentry kind="lib" path="ext/httpclient-4.3.6.jar" sourcepath="ext/src/httpclient-4.3.6.jar" />
-       <classpathentry kind="lib" path="ext/httpcore-4.3.3.jar" sourcepath="ext/src/httpcore-4.3.3.jar" />
-       <classpathentry kind="lib" path="ext/commons-logging-1.1.3.jar" sourcepath="ext/src/commons-logging-1.1.3.jar" />
-       <classpathentry kind="lib" path="ext/commons-codec-1.7.jar" sourcepath="ext/src/commons-codec-1.7.jar" />
-       <classpathentry kind="lib" path="ext/org.eclipse.jdt.annotation-1.1.0.jar" sourcepath="ext/src/org.eclipse.jdt.annotation-1.1.0.jar" />
-       <classpathentry kind="lib" path="ext/org.eclipse.jgit.http.server-4.1.1.201511131810-r.jar" sourcepath="ext/src/org.eclipse.jgit.http.server-4.1.1.201511131810-r.jar" />
-       <classpathentry kind="lib" path="ext/bcprov-jdk15on-1.52.jar" sourcepath="ext/src/bcprov-jdk15on-1.52.jar" />
-       <classpathentry kind="lib" path="ext/bcmail-jdk15on-1.52.jar" sourcepath="ext/src/bcmail-jdk15on-1.52.jar" />
-       <classpathentry kind="lib" path="ext/bcpkix-jdk15on-1.52.jar" sourcepath="ext/src/bcpkix-jdk15on-1.52.jar" />
-       <classpathentry kind="lib" path="ext/sshd-core-1.0.0.jar" sourcepath="ext/src/sshd-core-1.0.0.jar" />
-       <classpathentry kind="lib" path="ext/mina-core-2.0.9.jar" sourcepath="ext/src/mina-core-2.0.9.jar" />
-       <classpathentry kind="lib" path="ext/rome-0.9.jar" sourcepath="ext/src/rome-0.9.jar" />
-       <classpathentry kind="lib" path="ext/jdom-1.0.jar" sourcepath="ext/src/jdom-1.0.jar" />
-       <classpathentry kind="lib" path="ext/gson-2.3.1.jar" sourcepath="ext/src/gson-2.3.1.jar" />
-       <classpathentry kind="lib" path="ext/groovy-all-2.4.4.jar" sourcepath="ext/src/groovy-all-2.4.4.jar" />
-       <classpathentry kind="lib" path="ext/unboundid-ldapsdk-2.3.8.jar" sourcepath="ext/src/unboundid-ldapsdk-2.3.8.jar" />
-       <classpathentry kind="lib" path="ext/ivy-2.2.0.jar" sourcepath="ext/src/ivy-2.2.0.jar" />
-       <classpathentry kind="lib" path="ext/jcalendar-1.3.2.jar" />
-       <classpathentry kind="lib" path="ext/commons-compress-1.4.1.jar" sourcepath="ext/src/commons-compress-1.4.1.jar" />
-       <classpathentry kind="lib" path="ext/xz-1.0.jar" sourcepath="ext/src/xz-1.0.jar" />
-       <classpathentry kind="lib" path="ext/force-partner-api-24.0.0.jar" sourcepath="ext/src/force-partner-api-24.0.0.jar" />
-       <classpathentry kind="lib" path="ext/force-wsc-24.0.0.jar" sourcepath="ext/src/force-wsc-24.0.0.jar" />
-       <classpathentry kind="lib" path="ext/js-1.7R2.jar" sourcepath="ext/src/js-1.7R2.jar" />
-       <classpathentry kind="lib" path="ext/freemarker-2.3.22.jar" sourcepath="ext/src/freemarker-2.3.22.jar" />
-       <classpathentry kind="lib" path="ext/waffle-jna-1.7.3.jar" sourcepath="ext/src/waffle-jna-1.7.3.jar" />
-       <classpathentry kind="lib" path="ext/jna-4.1.0.jar" sourcepath="ext/src/jna-4.1.0.jar" />
-       <classpathentry kind="lib" path="ext/jna-platform-4.1.0.jar" sourcepath="ext/src/jna-platform-4.1.0.jar" />
-       <classpathentry kind="lib" path="ext/libpam4j-1.8.jar" sourcepath="ext/src/libpam4j-1.8.jar" />
-       <classpathentry kind="lib" path="ext/args4j-2.0.29.jar" sourcepath="ext/src/args4j-2.0.29.jar" />
-       <classpathentry kind="lib" path="ext/jedis-2.6.2.jar" sourcepath="ext/src/jedis-2.6.2.jar" />
-       <classpathentry kind="lib" path="ext/commons-pool2-2.0.jar" sourcepath="ext/src/commons-pool2-2.0.jar" />
-       <classpathentry kind="lib" path="ext/pf4j-0.9.0.jar" sourcepath="ext/src/pf4j-0.9.0.jar" />
-       <classpathentry kind="lib" path="ext/tika-core-1.5.jar" sourcepath="ext/src/tika-core-1.5.jar" />
-       <classpathentry kind="lib" path="ext/jsoup-1.7.3.jar" sourcepath="ext/src/jsoup-1.7.3.jar" />
-       <classpathentry kind="lib" path="ext/selenium-java-2.28.0.jar" sourcepath="ext/src/selenium-java-2.28.0.jar" />
-       <classpathentry kind="lib" path="ext/selenium-support-2.28.0.jar" sourcepath="ext/src/selenium-support-2.28.0.jar" />
-       <classpathentry kind="lib" path="ext/selenium-firefox-driver-2.28.0.jar" sourcepath="ext/src/selenium-firefox-driver-2.28.0.jar" />
-       <classpathentry kind="lib" path="ext/selenium-remote-driver-2.28.0.jar" sourcepath="ext/src/selenium-remote-driver-2.28.0.jar" />
-       <classpathentry kind="lib" path="ext/cglib-nodep-2.1_3.jar" sourcepath="ext/src/cglib-nodep-2.1_3.jar" />
-       <classpathentry kind="lib" path="ext/json-20080701.jar" sourcepath="ext/src/json-20080701.jar" />
-       <classpathentry kind="lib" path="ext/selenium-api-2.28.0.jar" sourcepath="ext/src/selenium-api-2.28.0.jar" />
-       <classpathentry kind="lib" path="ext/commons-exec-1.1.jar" sourcepath="ext/src/commons-exec-1.1.jar" />
-       <classpathentry kind="lib" path="ext/platform-3.4.0.jar" sourcepath="ext/src/platform-3.4.0.jar" />
-       <classpathentry kind="lib" path="ext/mockito-core-1.10.19.jar" sourcepath="ext/src/mockito-core-1.10.19.jar" />
-       <classpathentry kind="lib" path="ext/objenesis-2.1.jar" sourcepath="ext/src/objenesis-2.1.jar" />
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER" />
-       <classpathentry kind="output" path="bin/classes" />
+       <classpathentry kind="src" output="target/classes" path="src/main/java">
+               <attributes>
+                       <attribute name="optional" value="true"/>
+                       <attribute name="maven.pomderived" value="true"/>
+               </attributes>
+       </classpathentry>
+       <classpathentry kind="src" path="src/main/bugtraq"/>
+       <classpathentry kind="src" output="target/test-classes" path="src/test/java">
+               <attributes>
+                       <attribute name="optional" value="true"/>
+                       <attribute name="maven.pomderived" value="true"/>
+               </attributes>
+       </classpathentry>
+       <classpathentry kind="src" output="bin/test-classes" path="src/test/bugtraq"/>
+       <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+               <attributes>
+                       <attribute name="maven.pomderived" value="true"/>
+               </attributes>
+       </classpathentry>
+       <classpathentry kind="lib" path="ext/guice-4.0.jar" sourcepath="ext/src/guice-4.0.jar"/>
+       <classpathentry kind="lib" path="ext/javax.inject-1.jar" sourcepath="ext/src/javax.inject-1.jar"/>
+       <classpathentry kind="lib" path="ext/aopalliance-1.0.jar" sourcepath="ext/src/aopalliance-1.0.jar"/>
+       <classpathentry kind="lib" path="ext/guava-18.0.jar" sourcepath="ext/src/guava-18.0.jar"/>
+       <classpathentry kind="lib" path="ext/guice-servlet-4.0-gb2.jar" sourcepath="ext/src/guice-servlet-4.0-gb2.jar"/>
+       <classpathentry kind="lib" path="ext/annotations-12.0.jar" sourcepath="ext/src/annotations-12.0.jar"/>
+       <classpathentry kind="lib" path="ext/log4j-1.2.17.jar" sourcepath="ext/src/log4j-1.2.17.jar"/>
+       <classpathentry kind="lib" path="ext/slf4j-api-1.7.12.jar" sourcepath="ext/src/slf4j-api-1.7.12.jar"/>
+       <classpathentry kind="lib" path="ext/slf4j-log4j12-1.7.12.jar" sourcepath="ext/src/slf4j-log4j12-1.7.12.jar"/>
+       <classpathentry kind="lib" path="ext/javax.mail-1.5.1.jar" sourcepath="ext/src/javax.mail-1.5.1.jar"/>
+       <classpathentry kind="lib" path="ext/javax.servlet-api-3.1.0.jar" sourcepath="ext/src/javax.servlet-api-3.1.0.jar"/>
+       <classpathentry kind="lib" path="ext/jetty-all-9.2.13.v20150730.jar" sourcepath="ext/src/jetty-all-9.2.13.v20150730.jar"/>
+       <classpathentry kind="lib" path="ext/wicket-core-7.4.0.jar" sourcepath="ext/src/wicket-core-7.4.0.jar"/>
+       <classpathentry kind="lib" path="ext/commons-collections4-4.1.jar" sourcepath="ext/src/commons-collections4-4.1.jar"/>
+       <classpathentry kind="lib" path="ext/wicket-request-7.4.0.jar" sourcepath="ext/src/wicket-request-7.4.0.jar"/>
+       <classpathentry kind="lib" path="ext/wicket-util-7.4.0.jar" sourcepath="ext/src/wicket-util-7.4.0.jar"/>
+       <classpathentry kind="lib" path="ext/commons-fileupload-1.3.2.jar" sourcepath="ext/src/commons-fileupload-1.3.2.jar"/>
+       <classpathentry kind="lib" path="ext/commons-io-2.2.jar" sourcepath="ext/src/commons-io-2.2.jar"/>
+       <classpathentry kind="lib" path="ext/hamcrest-junit-2.0.0.0.jar" sourcepath="ext/src/hamcrest-junit-2.0.0.0.jar"/>
+       <classpathentry kind="lib" path="ext/junit-4.11.jar" sourcepath="ext/src/junit-4.11.jar"/>
+       <classpathentry kind="lib" path="ext/hamcrest-core-1.3.jar" sourcepath="ext/src/hamcrest-core-1.3.jar"/>
+       <classpathentry kind="lib" path="ext/java-hamcrest-2.0.0.0.jar" sourcepath="ext/src/java-hamcrest-2.0.0.0.jar"/>
+       <classpathentry kind="lib" path="ext/wicket-auth-roles-7.4.0.jar" sourcepath="ext/src/wicket-auth-roles-7.4.0.jar"/>
+       <classpathentry kind="lib" path="ext/wicket-extensions-7.4.0.jar" sourcepath="ext/src/wicket-extensions-7.4.0.jar"/>
+       <classpathentry kind="lib" path="ext/lucene-core-4.10.4.jar" sourcepath="ext/src/lucene-core-4.10.4.jar"/>
+       <classpathentry kind="lib" path="ext/lucene-analyzers-common-4.10.4.jar" sourcepath="ext/src/lucene-analyzers-common-4.10.4.jar"/>
+       <classpathentry kind="lib" path="ext/lucene-highlighter-4.10.4.jar" sourcepath="ext/src/lucene-highlighter-4.10.4.jar"/>
+       <classpathentry kind="lib" path="ext/lucene-memory-4.10.4.jar" sourcepath="ext/src/lucene-memory-4.10.4.jar"/>
+       <classpathentry kind="lib" path="ext/lucene-queries-4.10.4.jar" sourcepath="ext/src/lucene-queries-4.10.4.jar"/>
+       <classpathentry kind="lib" path="ext/lucene-queryparser-4.10.4.jar" sourcepath="ext/src/lucene-queryparser-4.10.4.jar"/>
+       <classpathentry kind="lib" path="ext/lucene-sandbox-4.10.4.jar" sourcepath="ext/src/lucene-sandbox-4.10.4.jar"/>
+       <classpathentry kind="lib" path="ext/jakarta-regexp-1.4.jar"/>
+       <classpathentry kind="lib" path="ext/pegdown-1.5.0.jar" sourcepath="ext/src/pegdown-1.5.0.jar"/>
+       <classpathentry kind="lib" path="ext/parboiled-java-1.1.7.jar" sourcepath="ext/src/parboiled-java-1.1.7.jar"/>
+       <classpathentry kind="lib" path="ext/parboiled-core-1.1.7.jar" sourcepath="ext/src/parboiled-core-1.1.7.jar"/>
+       <classpathentry kind="lib" path="ext/asm-5.0.3.jar" sourcepath="ext/src/asm-5.0.3.jar"/>
+       <classpathentry kind="lib" path="ext/asm-tree-5.0.3.jar" sourcepath="ext/src/asm-tree-5.0.3.jar"/>
+       <classpathentry kind="lib" path="ext/asm-analysis-5.0.3.jar" sourcepath="ext/src/asm-analysis-5.0.3.jar"/>
+       <classpathentry kind="lib" path="ext/asm-util-5.0.3.jar" sourcepath="ext/src/asm-util-5.0.3.jar"/>
+       <classpathentry kind="lib" path="ext/wikitext-core-1.4.jar" sourcepath="ext/src/wikitext-core-1.4.jar"/>
+       <classpathentry kind="lib" path="ext/twiki-core-1.4.jar" sourcepath="ext/src/twiki-core-1.4.jar"/>
+       <classpathentry kind="lib" path="ext/textile-core-1.4.jar" sourcepath="ext/src/textile-core-1.4.jar"/>
+       <classpathentry kind="lib" path="ext/tracwiki-core-1.4.jar" sourcepath="ext/src/tracwiki-core-1.4.jar"/>
+       <classpathentry kind="lib" path="ext/mediawiki-core-1.4.jar" sourcepath="ext/src/mediawiki-core-1.4.jar"/>
+       <classpathentry kind="lib" path="ext/confluence-core-1.4.jar" sourcepath="ext/src/confluence-core-1.4.jar"/>
+       <classpathentry kind="lib" path="ext/org.eclipse.jgit-4.1.1.201511131810-r.jar" sourcepath="ext/src/org.eclipse.jgit-4.1.1.201511131810-r.jar"/>
+       <classpathentry kind="lib" path="ext/jsch-0.1.53.jar" sourcepath="ext/src/jsch-0.1.53.jar"/>
+       <classpathentry kind="lib" path="ext/JavaEWAH-0.7.9.jar" sourcepath="ext/src/JavaEWAH-0.7.9.jar"/>
+       <classpathentry kind="lib" path="ext/httpclient-4.3.6.jar" sourcepath="ext/src/httpclient-4.3.6.jar"/>
+       <classpathentry kind="lib" path="ext/httpcore-4.3.3.jar" sourcepath="ext/src/httpcore-4.3.3.jar"/>
+       <classpathentry kind="lib" path="ext/commons-logging-1.1.3.jar" sourcepath="ext/src/commons-logging-1.1.3.jar"/>
+       <classpathentry kind="lib" path="ext/commons-codec-1.7.jar" sourcepath="ext/src/commons-codec-1.7.jar"/>
+       <classpathentry kind="lib" path="ext/org.eclipse.jdt.annotation-1.1.0.jar" sourcepath="ext/src/org.eclipse.jdt.annotation-1.1.0.jar"/>
+       <classpathentry kind="lib" path="ext/org.eclipse.jgit.http.server-4.1.1.201511131810-r.jar" sourcepath="ext/src/org.eclipse.jgit.http.server-4.1.1.201511131810-r.jar"/>
+       <classpathentry kind="lib" path="ext/bcprov-jdk15on-1.52.jar" sourcepath="ext/src/bcprov-jdk15on-1.52.jar"/>
+       <classpathentry kind="lib" path="ext/bcmail-jdk15on-1.52.jar" sourcepath="ext/src/bcmail-jdk15on-1.52.jar"/>
+       <classpathentry kind="lib" path="ext/bcpkix-jdk15on-1.52.jar" sourcepath="ext/src/bcpkix-jdk15on-1.52.jar"/>
+       <classpathentry kind="lib" path="ext/sshd-core-1.0.0.jar" sourcepath="ext/src/sshd-core-1.0.0.jar"/>
+       <classpathentry kind="lib" path="ext/mina-core-2.0.9.jar" sourcepath="ext/src/mina-core-2.0.9.jar"/>
+       <classpathentry kind="lib" path="ext/rome-0.9.jar" sourcepath="ext/src/rome-0.9.jar"/>
+       <classpathentry kind="lib" path="ext/jdom-1.0.jar" sourcepath="ext/src/jdom-1.0.jar"/>
+       <classpathentry kind="lib" path="ext/gson-2.3.1.jar" sourcepath="ext/src/gson-2.3.1.jar"/>
+       <classpathentry kind="lib" path="ext/groovy-all-2.4.4.jar" sourcepath="ext/src/groovy-all-2.4.4.jar"/>
+       <classpathentry kind="lib" path="ext/unboundid-ldapsdk-2.3.8.jar" sourcepath="ext/src/unboundid-ldapsdk-2.3.8.jar"/>
+       <classpathentry kind="lib" path="ext/ivy-2.2.0.jar" sourcepath="ext/src/ivy-2.2.0.jar"/>
+       <classpathentry kind="lib" path="ext/jcalendar-1.3.2.jar"/>
+       <classpathentry kind="lib" path="ext/commons-compress-1.4.1.jar" sourcepath="ext/src/commons-compress-1.4.1.jar"/>
+       <classpathentry kind="lib" path="ext/xz-1.0.jar" sourcepath="ext/src/xz-1.0.jar"/>
+       <classpathentry kind="lib" path="ext/force-partner-api-24.0.0.jar" sourcepath="ext/src/force-partner-api-24.0.0.jar"/>
+       <classpathentry kind="lib" path="ext/force-wsc-24.0.0.jar" sourcepath="ext/src/force-wsc-24.0.0.jar"/>
+       <classpathentry kind="lib" path="ext/js-1.7R2.jar" sourcepath="ext/src/js-1.7R2.jar"/>
+       <classpathentry kind="lib" path="ext/freemarker-2.3.22.jar" sourcepath="ext/src/freemarker-2.3.22.jar"/>
+       <classpathentry kind="lib" path="ext/waffle-jna-1.7.3.jar" sourcepath="ext/src/waffle-jna-1.7.3.jar"/>
+       <classpathentry kind="lib" path="ext/jna-4.1.0.jar" sourcepath="ext/src/jna-4.1.0.jar"/>
+       <classpathentry kind="lib" path="ext/jna-platform-4.1.0.jar" sourcepath="ext/src/jna-platform-4.1.0.jar"/>
+       <classpathentry kind="lib" path="ext/libpam4j-1.8.jar" sourcepath="ext/src/libpam4j-1.8.jar"/>
+       <classpathentry kind="lib" path="ext/args4j-2.0.29.jar" sourcepath="ext/src/args4j-2.0.29.jar"/>
+       <classpathentry kind="lib" path="ext/jedis-2.6.2.jar" sourcepath="ext/src/jedis-2.6.2.jar"/>
+       <classpathentry kind="lib" path="ext/commons-pool2-2.0.jar" sourcepath="ext/src/commons-pool2-2.0.jar"/>
+       <classpathentry kind="lib" path="ext/pf4j-0.9.0.jar" sourcepath="ext/src/pf4j-0.9.0.jar"/>
+       <classpathentry kind="lib" path="ext/tika-core-1.5.jar" sourcepath="ext/src/tika-core-1.5.jar"/>
+       <classpathentry kind="lib" path="ext/jsoup-1.7.3.jar" sourcepath="ext/src/jsoup-1.7.3.jar"/>
+       <classpathentry kind="lib" path="ext/selenium-java-2.28.0.jar" sourcepath="ext/src/selenium-java-2.28.0.jar"/>
+       <classpathentry kind="lib" path="ext/selenium-support-2.28.0.jar" sourcepath="ext/src/selenium-support-2.28.0.jar"/>
+       <classpathentry kind="lib" path="ext/selenium-firefox-driver-2.28.0.jar" sourcepath="ext/src/selenium-firefox-driver-2.28.0.jar"/>
+       <classpathentry kind="lib" path="ext/selenium-remote-driver-2.28.0.jar" sourcepath="ext/src/selenium-remote-driver-2.28.0.jar"/>
+       <classpathentry kind="lib" path="ext/cglib-nodep-2.1_3.jar" sourcepath="ext/src/cglib-nodep-2.1_3.jar"/>
+       <classpathentry kind="lib" path="ext/json-20080701.jar" sourcepath="ext/src/json-20080701.jar"/>
+       <classpathentry kind="lib" path="ext/selenium-api-2.28.0.jar" sourcepath="ext/src/selenium-api-2.28.0.jar"/>
+       <classpathentry kind="lib" path="ext/commons-exec-1.1.jar" sourcepath="ext/src/commons-exec-1.1.jar"/>
+       <classpathentry kind="lib" path="ext/platform-3.4.0.jar" sourcepath="ext/src/platform-3.4.0.jar"/>
+       <classpathentry kind="lib" path="ext/mockito-core-1.10.19.jar" sourcepath="ext/src/mockito-core-1.10.19.jar"/>
+       <classpathentry kind="lib" path="ext/objenesis-2.1.jar" sourcepath="ext/src/objenesis-2.1.jar"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+               <attributes>
+                       <attribute name="maven.pomderived" value="true"/>
+               </attributes>
+       </classpathentry>
+       <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
+               <attributes>
+                       <attribute name="maven.pomderived" value="true"/>
+               </attributes>
+       </classpathentry>
+       <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+               <attributes>
+                       <attribute name="maven.pomderived" value="true"/>
+               </attributes>
+       </classpathentry>
+       <classpathentry kind="output" path="target/classes"/>
 </classpath>
index 8286acfce80d583364aef695d9050b540e7e4ebf..2214cbc3773c428acb66eb2e7a2c7c9ffa049065 100644 (file)
@@ -89,108 +89,110 @@ public class GitblitWicketFilter extends WicketFilter {
                        }\r
                };\r
        }\r
-\r
+       \r
        /**\r
         * Determines the last-modified date of the requested resource.\r
+        * \r
+        * TODO: check where to reimplement\r
         *\r
         * @param servletRequest\r
         * @return The last modified time stamp\r
         */\r
-       @Override\r
-       protected long getLastModified(final HttpServletRequest servletRequest) {\r
-               final String pathInfo = getRelativePath(servletRequest);\r
-               if (Strings.isEmpty(pathInfo)) {\r
-                       return -1;\r
-               }\r
-               long lastModified = super.getLastModified(servletRequest);\r
-               if (lastModified > -1) {\r
-                       return lastModified;\r
-               }\r
-\r
-               // try to match request against registered CacheControl pages\r
-               String [] paths = pathInfo.split("/");\r
-\r
-               String page = paths[0];\r
-               String repo = "";\r
-               String commitId = "";\r
-               if (paths.length >= 2) {\r
-                       repo = paths[1];\r
-               }\r
-               if (paths.length >= 3) {\r
-                       commitId = paths[2];\r
-               }\r
-\r
-               if (!StringUtils.isEmpty(servletRequest.getParameter("r"))) {\r
-                       repo = servletRequest.getParameter("r");\r
-               }\r
-               if (!StringUtils.isEmpty(servletRequest.getParameter("h"))) {\r
-                       commitId = servletRequest.getParameter("h");\r
-               }\r
-\r
-               repo = repo.replace("%2f", "/").replace("%2F", "/").replace(settings.getChar(Keys.web.forwardSlashCharacter, '/'), '/');\r
-\r
-               GitBlitWebApp app = (GitBlitWebApp) getApplication();\r
-               int expires = settings.getInteger(Keys.web.pageCacheExpires, 0);\r
-               if (!StringUtils.isEmpty(page) && app.isCacheablePage(page) && expires > 0) {\r
-                       // page can be cached by the browser\r
-                       CacheControl cacheControl = app.getCacheControl(page);\r
-                       Date bootDate = runtimeManager.getBootDate();\r
-                       switch (cacheControl.value()) {\r
-                       case ACTIVITY:\r
-                               // returns the last activity date of the server\r
-                               Date activityDate = repositoryManager.getLastActivityDate();\r
-                               if (activityDate != null) {\r
-                                       return activityDate.after(bootDate) ? activityDate.getTime() : bootDate.getTime();\r
-                               }\r
-                               return bootDate.getTime();\r
-                       case BOOT:\r
-                               // return the boot date of the server\r
-                               return bootDate.getTime();\r
-                       case PROJECT:\r
-                               // return the latest change date for the project OR the boot date\r
-                               ProjectModel project = projectManager.getProjectModel(StringUtils.getRootPath(repo));\r
-                               if (project != null) {\r
-                                       return project.lastChange.after(bootDate) ? project.lastChange.getTime() : bootDate.getTime();\r
-                               }\r
-                               break;\r
-                       case REPOSITORY:\r
-                               // return the lastest change date for the repository OR the boot\r
-                               // date, whichever is latest\r
-                               RepositoryModel repository = repositoryManager.getRepositoryModel(repo);\r
-                               if (repository != null && repository.lastChange != null) {\r
-                                       return repository.lastChange.after(bootDate) ? repository.lastChange.getTime() : bootDate.getTime();\r
-                               }\r
-                               break;\r
-                       case COMMIT:\r
-                               // get the date of the specified commit\r
-                               if (StringUtils.isEmpty(commitId)) {\r
-                                       // no commit id, use boot date\r
-                                       return bootDate.getTime();\r
-                               } else {\r
-                                       // last modified date is the commit date\r
-                                       Repository r = null;\r
-                                       try {\r
-                                               // return the timestamp of the associated commit\r
-                                               r = repositoryManager.getRepository(repo);\r
-                                               if (r != null) {\r
-                                                       RevCommit commit = JGitUtils.getCommit(r, commitId);\r
-                                                       if (commit != null) {\r
-                                                               Date date = JGitUtils.getCommitDate(commit);\r
-                                                               return date.after(bootDate) ? date.getTime() : bootDate.getTime();\r
-                                                       }\r
-                                               }\r
-                                       } finally {\r
-                                               if (r != null) {\r
-                                                       r.close();\r
-                                               }\r
-                                       }\r
-                               }\r
-                               break;\r
-                       default:\r
-                               break;\r
-                       }\r
-               }\r
-\r
-               return -1;\r
-       }\r
+//     @Override\r
+//     protected long getLastModified(final HttpServletRequest servletRequest) {\r
+//             final String pathInfo = getRelativePath(servletRequest);\r
+//             if (Strings.isEmpty(pathInfo)) {\r
+//                     return -1;\r
+//             }\r
+//             long lastModified = super.getLastModified(servletRequest);\r
+//             if (lastModified > -1) {\r
+//                     return lastModified;\r
+//             }\r
+//\r
+//             // try to match request against registered CacheControl pages\r
+//             String [] paths = pathInfo.split("/");\r
+//\r
+//             String page = paths[0];\r
+//             String repo = "";\r
+//             String commitId = "";\r
+//             if (paths.length >= 2) {\r
+//                     repo = paths[1];\r
+//             }\r
+//             if (paths.length >= 3) {\r
+//                     commitId = paths[2];\r
+//             }\r
+//\r
+//             if (!StringUtils.isEmpty(servletRequest.getParameter("r"))) {\r
+//                     repo = servletRequest.getParameter("r");\r
+//             }\r
+//             if (!StringUtils.isEmpty(servletRequest.getParameter("h"))) {\r
+//                     commitId = servletRequest.getParameter("h");\r
+//             }\r
+//\r
+//             repo = repo.replace("%2f", "/").replace("%2F", "/").replace(settings.getChar(Keys.web.forwardSlashCharacter, '/'), '/');\r
+//\r
+//             GitBlitWebApp app = (GitBlitWebApp) getApplication();\r
+//             int expires = settings.getInteger(Keys.web.pageCacheExpires, 0);\r
+//             if (!StringUtils.isEmpty(page) && app.isCacheablePage(page) && expires > 0) {\r
+//                     // page can be cached by the browser\r
+//                     CacheControl cacheControl = app.getCacheControl(page);\r
+//                     Date bootDate = runtimeManager.getBootDate();\r
+//                     switch (cacheControl.value()) {\r
+//                     case ACTIVITY:\r
+//                             // returns the last activity date of the server\r
+//                             Date activityDate = repositoryManager.getLastActivityDate();\r
+//                             if (activityDate != null) {\r
+//                                     return activityDate.after(bootDate) ? activityDate.getTime() : bootDate.getTime();\r
+//                             }\r
+//                             return bootDate.getTime();\r
+//                     case BOOT:\r
+//                             // return the boot date of the server\r
+//                             return bootDate.getTime();\r
+//                     case PROJECT:\r
+//                             // return the latest change date for the project OR the boot date\r
+//                             ProjectModel project = projectManager.getProjectModel(StringUtils.getRootPath(repo));\r
+//                             if (project != null) {\r
+//                                     return project.lastChange.after(bootDate) ? project.lastChange.getTime() : bootDate.getTime();\r
+//                             }\r
+//                             break;\r
+//                     case REPOSITORY:\r
+//                             // return the lastest change date for the repository OR the boot\r
+//                             // date, whichever is latest\r
+//                             RepositoryModel repository = repositoryManager.getRepositoryModel(repo);\r
+//                             if (repository != null && repository.lastChange != null) {\r
+//                                     return repository.lastChange.after(bootDate) ? repository.lastChange.getTime() : bootDate.getTime();\r
+//                             }\r
+//                             break;\r
+//                     case COMMIT:\r
+//                             // get the date of the specified commit\r
+//                             if (StringUtils.isEmpty(commitId)) {\r
+//                                     // no commit id, use boot date\r
+//                                     return bootDate.getTime();\r
+//                             } else {\r
+//                                     // last modified date is the commit date\r
+//                                     Repository r = null;\r
+//                                     try {\r
+//                                             // return the timestamp of the associated commit\r
+//                                             r = repositoryManager.getRepository(repo);\r
+//                                             if (r != null) {\r
+//                                                     RevCommit commit = JGitUtils.getCommit(r, commitId);\r
+//                                                     if (commit != null) {\r
+//                                                             Date date = JGitUtils.getCommitDate(commit);\r
+//                                                             return date.after(bootDate) ? date.getTime() : bootDate.getTime();\r
+//                                                     }\r
+//                                             }\r
+//                                     } finally {\r
+//                                             if (r != null) {\r
+//                                                     r.close();\r
+//                                             }\r
+//                                     }\r
+//                             }\r
+//                             break;\r
+//                     default:\r
+//                             break;\r
+//                     }\r
+//             }\r
+//\r
+//             return -1;\r
+//     }\r
 }\r
index 476f9611817d09f4b1691ca15fea30796bd6e588..0693891c6c90787a969cc8d3b789fc7d0c7289eb 100644 (file)
@@ -117,4 +117,8 @@ public class PluginClassResolver implements IClassResolver {
                        }
                }
        }
+
+       @Override
+       public ClassLoader getClassLoader() {
+               return getClass().getClassLoader();     }
 }
\ No newline at end of file