From 97b1b1eeacd72845cc7065c86d68444881370275 Mon Sep 17 00:00:00 2001
From: Trygve Laugstøl <trygvis@inamo.no>
Date: Wed, 26 Dec 2012 00:56:23 +0100
Subject: o Adding urlrewrite filter to get some prettier URLs.

---
 README.md                              |  4 ++++
 etc/config.properties.template         |  1 -
 pom.xml                                | 19 +++++-----------
 src/main/webapp/WEB-INF/urlrewrite.xml | 18 +++++++++++++++
 src/main/webapp/WEB-INF/web.xml        | 40 ++++++++++++++++++++++++++++------
 5 files changed, 60 insertions(+), 22 deletions(-)
 create mode 100644 src/main/webapp/WEB-INF/urlrewrite.xml

diff --git a/README.md b/README.md
index 584d730..3d9acb1 100644
--- a/README.md
+++ b/README.md
@@ -31,6 +31,10 @@ Level 1: 3 programmers
 Level 2: 4 programmers
 Level 3: 5 programmers
 
+## Aggressive
+
+N commits per day/week
+
 # BF3 Nomenclature
 
 Two types of "awards": "ribbons" and "medals". A medal is given for repeatedly awarded a ribbon.
diff --git a/etc/config.properties.template b/etc/config.properties.template
index a8c4b97..485dcf4 100644
--- a/etc/config.properties.template
+++ b/etc/config.properties.template
@@ -7,7 +7,6 @@ nexus.updateInterval=3600
 
 jenkins.updateInterval=3600
 
-database.driver=
 database.url=jdbc:h2:tcp://127.0.0.1/esper;DB_CLOSE_DELAY=-1
 database.username=
 database.password=
diff --git a/pom.xml b/pom.xml
index e578079..a13be9b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,20 +24,6 @@
       <artifactId>jersey-json</artifactId>
       <version>1.16</version>
     </dependency>
-
-    <!--
-    <dependency>
-      <groupId>org.glassfish.jersey.containers</groupId>
-      <artifactId>jersey-container-servlet</artifactId>
-      <version>2.0-m10</version>
-    </dependency>
-    <dependency>
-      <groupId>com.sun.jersey</groupId>
-      <artifactId>jersey-json</artifactId>
-      <version>1.16</version>
-    </dependency>
-    -->
-
     <dependency>
       <groupId>com.espertech</groupId>
       <artifactId>esper</artifactId>
@@ -129,6 +115,11 @@
       <artifactId>shiro-web</artifactId>
       <version>1.2.1</version>
     </dependency>
+    <dependency>
+      <groupId>org.tuckey</groupId>
+      <artifactId>urlrewritefilter</artifactId>
+      <version>4.0.3</version>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
diff --git a/src/main/webapp/WEB-INF/urlrewrite.xml b/src/main/webapp/WEB-INF/urlrewrite.xml
new file mode 100644
index 0000000..ff4bf10
--- /dev/null
+++ b/src/main/webapp/WEB-INF/urlrewrite.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE urlrewrite PUBLIC "-//tuckey.org//DTD UrlRewrite 4.0//EN"
+        "http://www.tuckey.org/res/dtds/urlrewrite4.0.dtd">
+
+<!--
+
+  See http://urlrewritefilter.googlecode.com/svn/trunk/src/doc/manual/4.0/index.html
+
+-->
+
+<urlrewrite>
+
+  <rule match-type="wildcard">
+    <from>/</from>
+    <to type="forward">/index.jspx</to>
+  </rule>
+
+</urlrewrite>
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 0a48260..ed33a8f 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -11,16 +11,31 @@
     <filter-class>org.apache.shiro.web.servlet.ShiroFilter</filter-class>
   </filter>
 
-  <filter-mapping>
-    <filter-name>ShiroFilter</filter-name>
-    <url-pattern>/*</url-pattern>
-  </filter-mapping>
+  <filter>
+    <filter-name>Url Rewrite Filter</filter-name>
+    <filter-class>org.tuckey.web.filters.urlrewrite.UrlRewriteFilter</filter-class>
+
+    <!-- set the amount of seconds the conf file will be checked for reload
+    can be a valid integer (0 denotes check every time,
+    -1 denotes no reload check, default -1) -->
+    <init-param>
+      <param-name>confReloadCheckInterval</param-name>
+      <param-value>60</param-value>
+    </init-param>
+
+    <!-- sets up log level (will be logged to context log)
+    can be: slf4j, TRACE, DEBUG, INFO (default), WARN, ERROR, FATAL,
+    sysout:{level} (ie, sysout:DEBUG)
+    if you are having trouble using normal levels use sysout:DEBUG
+    (default WARN) -->
+    <init-param>
+        <param-name>logLevel</param-name>
+        <param-value>slf4j</param-value>
+    </init-param>
+  </filter>
 
   <filter>
     <filter-name>Jersey</filter-name>
-    <!--
-    <filter-class>org.glassfish.jersey.servlet.ServletContainer</filter-class>
-    -->
     <filter-class>com.sun.jersey.spi.container.servlet.ServletContainer</filter-class>
     <init-param>
       <param-name>javax.ws.rs.Application</param-name>
@@ -39,6 +54,17 @@
       <param-value>true</param-value>
     </init-param>
   </filter>
+
+  <filter-mapping>
+    <filter-name>ShiroFilter</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
+
+  <filter-mapping>
+    <filter-name>Url Rewrite Filter</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
+
   <filter-mapping>
     <filter-name>Jersey</filter-name>
     <url-pattern>/*</url-pattern>
-- 
cgit v1.2.3