ucb_deployer 0.2.0 → 0.2.1

data/Rakefile

@@ -4,7 +4,7 @@ require 'echoe'
 require 'spec/rake/spectask'
 
 
-Echoe.new('ucb_deployer', '0.2.0') do |p|
+Echoe.new('ucb_deployer', '0.2.1') do |p|
   p.description    = "Tool for deploying Confluence/JIRA war files to tomcat"
   p.url            = "http://ucbrb.rubyforge.org"
   p.author         = "Steven Hansen"

data/lib/ucb_deployer/jira_deployer.rb

@@ -79,11 +79,11 @@ module UcbDeployer
     end
     
     def web_xml_token()
-      "<!-- filters -->"
+      "appropriate error message for any requests. Basically it locks JIRA. -->"
     end
     
     def seraph_config_xml_auth_class_token()
-      "com.atlassian.seraph.auth.DefaultAuthenticator"
+      "com.atlassian.jira.security.login.JiraOsUserAuthenticator"
     end
     
     def entityengine_xml_db_token()
@@ -128,7 +128,7 @@ module UcbDeployer
       web_xml = web_xml.map do |line|
         if line =~ /#{web_xml_token}/
           template = File.open("#{DEPLOYER_HOME}/resources/jira_cas_web.xml") { |f| f.read }
-          ERB.new(template).result(self.send(:binding))
+          line + ERB.new(template).result(self.send(:binding))
         else
           line
         end

data/spec/fixtures/jira/seraph-config.xml

@@ -41,18 +41,12 @@
         </init-param>
         <init-param>
             <param-name>login.cookie.key</param-name>
-            <param-value>seraph.os.cookie</param-value>
+            <param-value>seraph.rememberme.cookie</param-value>
         </init-param>
-        <!-- This property controls how your cookie is encrypted.  If you truly want to secure your cookies, you need
-            to change this to a secure password -->
-        <init-param>
-            <param-name>cookie.encoding</param-name>
-            <param-value>jiracookie</param-value>
-        </init-param>
-        <!-- This property sets the default cookie timeout in seconds.  It is currently set to 1 year -->
+        <!-- This property sets the default remember me cookie max age in seconds.  It is currently set to 2 weeks -->
         <init-param>
             <param-name>autologin.cookie.age</param-name>
-            <param-value>31536000</param-value>
+            <param-value>1209600</param-value>
         </init-param>
         <!-- Basic Authentication can be enabled by passing the authentication type as a configurable url parameter.
         With this example, you will need to pass http://mycompany.com/anypage?os_authType=basic in the url to enable Basic Authentication -->
@@ -67,18 +61,24 @@
             <param-name>insecure.cookie</param-name>
             <param-value>true</param-value>
         </init-param> -->
+        <init-param>
+            <param-name>invalidate.session.on.login</param-name>
+            <param-value>true</param-value>
+        </init-param>
+        <init-param>
+            <param-name>invalidate.session.exclude.list</param-name>
+            <param-value>ASESSIONID</param-value>
+        </init-param>
     </parameters>
 
-    <rolemapper class="com.atlassian.jira.security.JiraRoleMapper"/>
-
     <!-- CROWD:START - If enabling Crowd SSO integration uncomment the following JIRAAuthenticator and comment out the DefaultAuthenticator below -->
     <!--
-    <authenticator class="com.atlassian.crowd.integration.seraph.JIRAAuthenticator"/>
+    <authenticator class="com.atlassian.crowd.integration.seraph.v22.JIRAAuthenticator"/>
     -->
     <!-- CROWD:END -->
 
     <!-- CROWD:START - The authenticator below here will need to be commented out for Crowd SSO integration -->
-    <authenticator class="com.atlassian.seraph.auth.DefaultAuthenticator"/>
+    <authenticator class="com.atlassian.jira.security.login.JiraOsUserAuthenticator"/>
     <!-- CROWD:END -->
 
     <!-- NB: the URL to redirect to is now specified by login.url above -->
@@ -86,7 +86,7 @@
         <service class="com.atlassian.seraph.service.PathService">
             <init-param>
                 <param-name>config.file</param-name>
-                <param-value>/seraph-paths.xml</param-value>
+                <param-value>seraph-paths.xml</param-value>
             </init-param>
         </service>
 
@@ -97,7 +97,11 @@
             </init-param>
         </service>
     </services>
+    
+    <rolemapper class="com.atlassian.jira.security.JiraRoleMapper"/>
 
+    <elevatedsecurityguard class="com.atlassian.jira.security.login.JiraElevatedSecurityGuard"/>
+    
     <interceptors>
         <interceptor class="com.atlassian.jira.portal.PortalPageInterceptor"/>
         <interceptor class="com.atlassian.jira.user.preferences.UserPreferencesResetInterceptor"/>

data/spec/fixtures/jira/web.xml

@@ -1,17 +1,29 @@
 <?xml version="1.0"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+          version="2.4">
     <!-- General -->
     <display-name>Atlassian JIRA Web Application</display-name>
     <description>The Atlassian JIRA web application - see http://www.atlassian.com/software/jira for more information
     </description>
 
-    <!-- filters -->
+    <!-- Filters -->
+
+    <!-- =====================================================
+         THIS MUST BE THE FIRST FILTER IN THE DEFINED CHAIN
+         ===================================================== -->
     <filter>
-        <filter-name>DatabaseCompatibilityEnforcer</filter-name>
-        <filter-class>com.atlassian.jira.appconsistency.db.DatabaseCompatibilityEnforcerFilter</filter-class>
+        <filter-name>JiraFirstFilter</filter-name>
+        <filter-class>com.atlassian.jira.web.filters.JiraFirstFilter</filter-class>
+    </filter>
+    
+    <!-- If serious problems were encountered on Startup, this filter will display an
+            appropriate error message for any requests. Basically it locks JIRA. -->
+    <filter>
+        <filter-name>JiraStartupChecklist</filter-name>
+        <filter-class>com.atlassian.jira.startup.JiraStartupChecklistFilter</filter-class>
     </filter>
-
 
     <filter>
         <filter-name>headersanitising</filter-name>
@@ -66,16 +78,77 @@
         <filter-class>com.atlassian.jira.web.filters.RequestCleanupFilter</filter-class>
     </filter>
 
-    <!-- this filter sets an attribute in the request to stop JiraServletDispatcher from popping all actions off the stack.
+    <!-- this filter sets an attribute in the request to stop JiraWebworkActionDispatcher from popping all actions off the stack.
     It will clear the action stack AFTER the sitemesh decorator has rendered the page.-->
     <filter>
         <filter-name>action-cleanup-delay</filter-name>
         <filter-class>com.atlassian.jira.web.filters.ActionCleanupDelayFilter</filter-class>
     </filter>
 
+    <filter>
+        <filter-name>filter-plugin-dispatcher-before-decoration-request</filter-name>
+        <filter-class>com.atlassian.plugin.servlet.filter.ServletFilterModuleContainerFilter</filter-class>
+        <init-param>
+            <param-name>location</param-name>
+            <param-value>before-decoration</param-value>
+        </init-param>
+        <init-param>
+            <param-name>dispatcher</param-name>
+            <param-value>REQUEST</param-value>
+        </init-param>
+    </filter>
+    <filter>
+        <filter-name>filter-plugin-dispatcher-before-decoration-forward</filter-name>
+        <filter-class>com.atlassian.plugin.servlet.filter.ServletFilterModuleContainerFilter</filter-class>
+        <init-param>
+            <param-name>location</param-name>
+            <param-value>before-decoration</param-value>
+        </init-param>
+        <init-param>
+            <param-name>dispatcher</param-name>
+            <param-value>FORWARD</param-value>
+        </init-param>
+    </filter>
+    <filter>
+        <filter-name>filter-plugin-dispatcher-before-decoration-include</filter-name>
+        <filter-class>com.atlassian.plugin.servlet.filter.ServletFilterModuleContainerFilter</filter-class>
+        <init-param>
+            <param-name>location</param-name>
+            <param-value>before-decoration</param-value>
+        </init-param>
+        <init-param>
+            <param-name>dispatcher</param-name>
+            <param-value>INCLUDE</param-value>
+        </init-param>
+    </filter>
+    <filter>
+        <filter-name>filter-plugin-dispatcher-before-decoration-error</filter-name>
+        <filter-class>com.atlassian.plugin.servlet.filter.ServletFilterModuleContainerFilter</filter-class>
+        <init-param>
+            <param-name>location</param-name>
+            <param-value>before-decoration</param-value>
+        </init-param>
+        <init-param>
+            <param-name>dispatcher</param-name>
+            <param-value>ERROR</param-value>
+        </init-param>
+    </filter>
+
     <filter>
         <filter-name>sitemesh-exclude</filter-name>
-        <filter-class>com.atlassian.jira.web.filters.SitemeshExcludePathFilter</filter-class>
+        <filter-class>com.atlassian.jira.web.filters.PathExclusionFilter</filter-class>
+        <init-param>
+            <param-name>path.exclusion.filter.className</param-name>
+            <param-value>com.opensymphony.module.sitemesh.filter.PageFilter</param-value>
+        </init-param>
+        <init-param>
+            <param-name>path.exclusion.filter.paths</param-name>
+            <param-value>
+                /secure/attachment,
+                /secure/thumbnail,
+                /secure/applet*
+            </param-value>
+        </init-param>
     </filter>
 
     <filter>
@@ -85,12 +158,120 @@
 
     <filter>
         <filter-name>encoding</filter-name>
-        <filter-class>com.atlassian.jira.web.filters.JIRAEncodingFilter</filter-class>
+        <filter-class>com.atlassian.jira.web.filters.PathMatchingEncodingFilter</filter-class>
+    </filter>
+
+    <filter>
+        <filter-name>filter-plugin-dispatcher-after-encoding-request</filter-name>
+        <filter-class>com.atlassian.plugin.servlet.filter.ServletFilterModuleContainerFilter</filter-class>
+        <init-param>
+            <param-name>location</param-name>
+            <param-value>after-encoding</param-value>
+        </init-param>
+        <init-param>
+            <param-name>dispatcher</param-name>
+            <param-value>REQUEST</param-value>
+        </init-param>
+    </filter>
+    <filter>
+        <filter-name>filter-plugin-dispatcher-after-encoding-forward</filter-name>
+        <filter-class>com.atlassian.plugin.servlet.filter.ServletFilterModuleContainerFilter</filter-class>
+        <init-param>
+            <param-name>location</param-name>
+            <param-value>after-encoding</param-value>
+        </init-param>
+        <init-param>
+            <param-name>dispatcher</param-name>
+            <param-value>FORWARD</param-value>
+        </init-param>
+    </filter>
+    <filter>
+        <filter-name>filter-plugin-dispatcher-after-encoding-include</filter-name>
+        <filter-class>com.atlassian.plugin.servlet.filter.ServletFilterModuleContainerFilter</filter-class>
+        <init-param>
+            <param-name>location</param-name>
+            <param-value>after-encoding</param-value>
+        </init-param>
+        <init-param>
+            <param-name>dispatcher</param-name>
+            <param-value>INCLUDE</param-value>
+        </init-param>
+    </filter>
+    <filter>
+        <filter-name>filter-plugin-dispatcher-after-encoding-error</filter-name>
+        <filter-class>com.atlassian.plugin.servlet.filter.ServletFilterModuleContainerFilter</filter-class>
+        <init-param>
+            <param-name>location</param-name>
+            <param-value>after-encoding</param-value>
+        </init-param>
+        <init-param>
+            <param-name>dispatcher</param-name>
+            <param-value>ERROR</param-value>
+        </init-param>
+    </filter>
+
+    <filter>
+        <filter-name>caching</filter-name>
+        <filter-class>com.atlassian.jira.web.filters.JiraCachingFilter</filter-class>
+    </filter>
+
+    <filter>
+        <filter-name>curlyquotes</filter-name>
+        <filter-class>com.atlassian.jira.web.filters.CurlyQuotesFilter</filter-class>
+    </filter>
+
+    <filter>
+        <filter-name>filter-plugin-dispatcher-before-login-request</filter-name>
+        <filter-class>com.atlassian.plugin.servlet.filter.ServletFilterModuleContainerFilter</filter-class>
+        <init-param>
+            <param-name>location</param-name>
+            <param-value>before-login</param-value>
+        </init-param>
+        <init-param>
+            <param-name>dispatcher</param-name>
+            <param-value>REQUEST</param-value>
+        </init-param>
+    </filter>
+    <filter>
+        <filter-name>filter-plugin-dispatcher-before-login-forward</filter-name>
+        <filter-class>com.atlassian.plugin.servlet.filter.ServletFilterModuleContainerFilter</filter-class>
+        <init-param>
+            <param-name>location</param-name>
+            <param-value>before-login</param-value>
+        </init-param>
+        <init-param>
+            <param-name>dispatcher</param-name>
+            <param-value>FORWARD</param-value>
+        </init-param>
+    </filter>
+    <filter>
+        <filter-name>filter-plugin-dispatcher-before-login-include</filter-name>
+        <filter-class>com.atlassian.plugin.servlet.filter.ServletFilterModuleContainerFilter</filter-class>
+        <init-param>
+            <param-name>location</param-name>
+            <param-value>before-login</param-value>
+        </init-param>
+        <init-param>
+            <param-name>dispatcher</param-name>
+            <param-value>INCLUDE</param-value>
+        </init-param>
+    </filter>
+    <filter>
+        <filter-name>filter-plugin-dispatcher-before-login-error</filter-name>
+        <filter-class>com.atlassian.plugin.servlet.filter.ServletFilterModuleContainerFilter</filter-class>
+        <init-param>
+            <param-name>location</param-name>
+            <param-value>before-login</param-value>
+        </init-param>
+        <init-param>
+            <param-name>dispatcher</param-name>
+            <param-value>ERROR</param-value>
+        </init-param>
     </filter>
 
     <filter>
         <filter-name>login</filter-name>
-        <filter-class>com.atlassian.seraph.filter.LoginFilter</filter-class>
+        <filter-class>com.atlassian.jira.web.filters.JiraLoginFilter</filter-class>
     </filter>
 
     <filter>
@@ -108,23 +289,133 @@
         <filter-class>com.atlassian.jira.web.filters.gzip.JiraGzipFilter</filter-class>
     </filter>
 
+    <filter>
+        <filter-name>xsrf-token-addition</filter-name>
+        <filter-class>com.atlassian.jira.security.xsrf.XsrfTokenAdditionRequestFilter</filter-class>
+    </filter>
+
     <filter>
         <filter-name>access</filter-name>
-        <filter-class>com.atlassian.jira.web.filters.AccessLogFilter</filter-class>
+        <filter-class>com.atlassian.jira.web.filters.accesslog.AccessLogFilter</filter-class>
     </filter>
 
+    <filter>
+        <filter-name>filter-plugin-dispatcher-before-dispatch-request</filter-name>
+        <filter-class>com.atlassian.plugin.servlet.filter.ServletFilterModuleContainerFilter</filter-class>
+        <init-param>
+            <param-name>location</param-name>
+            <param-value>before-dispatch</param-value>
+        </init-param>
+        <init-param>
+            <param-name>dispatcher</param-name>
+            <param-value>REQUEST</param-value>
+        </init-param>
+    </filter>
+    <filter>
+        <filter-name>filter-plugin-dispatcher-before-dispatch-forward</filter-name>
+        <filter-class>com.atlassian.plugin.servlet.filter.ServletFilterModuleContainerFilter</filter-class>
+        <init-param>
+            <param-name>location</param-name>
+            <param-value>before-dispatch</param-value>
+        </init-param>
+        <init-param>
+            <param-name>dispatcher</param-name>
+            <param-value>FORWARD</param-value>
+        </init-param>
+    </filter>
+    <filter>
+        <filter-name>filter-plugin-dispatcher-before-dispatch-include</filter-name>
+        <filter-class>com.atlassian.plugin.servlet.filter.ServletFilterModuleContainerFilter</filter-class>
+        <init-param>
+            <param-name>location</param-name>
+            <param-value>before-dispatch</param-value>
+        </init-param>
+        <init-param>
+            <param-name>dispatcher</param-name>
+            <param-value>INCLUDE</param-value>
+        </init-param>
+    </filter>
+    <filter>
+        <filter-name>filter-plugin-dispatcher-before-dispatch-error</filter-name>
+        <filter-class>com.atlassian.plugin.servlet.filter.ServletFilterModuleContainerFilter</filter-class>
+        <init-param>
+            <param-name>location</param-name>
+            <param-value>before-dispatch</param-value>
+        </init-param>
+        <init-param>
+            <param-name>dispatcher</param-name>
+            <param-value>ERROR</param-value>
+        </init-param>
+    </filter>
+
+    <!-- =====================================================
+         THIS MUST BE THE LAST FILTER IN THE DEFINED CHAIN 
+         ===================================================== -->
+    <filter>
+        <filter-name>JiraLastFilter</filter-name>
+        <filter-class>com.atlassian.jira.web.filters.JiraLastFilter</filter-class>
+    </filter>
+
+    <!-- =====================================================
+         FILTER MAPPINGS FOLLOW : 
+         ===================================================== -->
 
-    <!-- THIS MUST REMAIN AS THE TOP FILTER SO THAT THE ENCODING CAN BE SET BEFORE ANYTHING ELSE TOUCHES IT -->
     <filter-mapping>
-        <filter-name>DatabaseCompatibilityEnforcer</filter-name>
+        <filter-name>JiraFirstFilter</filter-name>
         <url-pattern>/*</url-pattern>
     </filter-mapping>
 
+    <!-- If serious problems were encountered on Startup, this filter will display an
+            appropriate error message for any requests. Basically it locks JIRA. -->
+    <filter-mapping>
+        <filter-name>JiraStartupChecklist</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+
+    <!-- THIS MUST REMAIN AS THE TOP FILTER SO THAT THE ENCODING CAN BE SET BEFORE ANYTHING ELSE TOUCHES IT -->
     <filter-mapping>
         <filter-name>encoding</filter-name>
         <url-pattern>/*</url-pattern>
     </filter-mapping>
 
+    <filter-mapping>
+        <filter-name>caching</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+
+<!--
+    NOTE: This filter was intended to handle once-common windows-specific characters (like curly quotes)
+          but it has been found to interfere with gadget authentication between JIRA and Confluence.
+          You can re-enable it by uncommenting it here. See JRA-19856
+    -->
+    <!--
+    <filter-mapping>
+        <filter-name>curlyquotes</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+    -->
+
+    <filter-mapping>
+        <filter-name>filter-plugin-dispatcher-after-encoding-request</filter-name>
+        <url-pattern>/*</url-pattern>
+        <dispatcher>REQUEST</dispatcher>
+    </filter-mapping>
+    <filter-mapping>
+        <filter-name>filter-plugin-dispatcher-after-encoding-forward</filter-name>
+        <url-pattern>/*</url-pattern>
+        <dispatcher>FORWARD</dispatcher>
+    </filter-mapping>
+    <filter-mapping>
+        <filter-name>filter-plugin-dispatcher-after-encoding-include</filter-name>
+        <url-pattern>/*</url-pattern>
+        <dispatcher>INCLUDE</dispatcher>
+    </filter-mapping>
+    <filter-mapping>
+        <filter-name>filter-plugin-dispatcher-after-encoding-error</filter-name>
+        <url-pattern>/*</url-pattern>
+        <dispatcher>ERROR</dispatcher>
+    </filter-mapping>
+
     <!-- gzip *must* be before UrlRewriteFilter as the rewrite filter sends 'forwards' -->
     <filter-mapping>
         <filter-name>gzip</filter-name>
@@ -178,10 +469,6 @@
         <filter-name>consistency503</filter-name>
         <url-pattern>/download/*</url-pattern>
     </filter-mapping>
-    <filter-mapping>
-        <filter-name>consistency503</filter-name>
-        <url-pattern>/includes/js/combined-javascript.js</url-pattern>
-    </filter-mapping>
     <filter-mapping>
         <filter-name>consistency503</filter-name>
         <url-pattern>/plugins/servlet/*</url-pattern>
@@ -196,7 +483,7 @@
     </filter-mapping>
     <filter-mapping>
         <filter-name>consistency503</filter-name>
-        <url-pattern>/dwr/*</url-pattern>
+        <url-pattern>/rest/*</url-pattern>
     </filter-mapping>
 
     <!--
@@ -269,6 +556,27 @@
         <url-pattern>/lazyLoader</url-pattern>
     </filter-mapping>
 
+    <filter-mapping>
+        <filter-name>filter-plugin-dispatcher-before-login-request</filter-name>
+        <url-pattern>/*</url-pattern>
+        <dispatcher>REQUEST</dispatcher>
+    </filter-mapping>
+    <filter-mapping>
+        <filter-name>filter-plugin-dispatcher-before-login-forward</filter-name>
+        <url-pattern>/*</url-pattern>
+        <dispatcher>FORWARD</dispatcher>
+    </filter-mapping>
+    <filter-mapping>
+        <filter-name>filter-plugin-dispatcher-before-login-include</filter-name>
+        <url-pattern>/*</url-pattern>
+        <dispatcher>INCLUDE</dispatcher>
+    </filter-mapping>
+    <filter-mapping>
+        <filter-name>filter-plugin-dispatcher-before-login-error</filter-name>
+        <url-pattern>/*</url-pattern>
+        <dispatcher>ERROR</dispatcher>
+    </filter-mapping>
+
     <filter-mapping>
         <filter-name>login</filter-name>
         <url-pattern>/*</url-pattern>
@@ -284,6 +592,27 @@
         <url-pattern>/*</url-pattern>
     </filter-mapping>
 
+    <filter-mapping>
+        <filter-name>filter-plugin-dispatcher-before-decoration-request</filter-name>
+        <url-pattern>/*</url-pattern>
+        <dispatcher>REQUEST</dispatcher>
+    </filter-mapping>
+    <filter-mapping>
+        <filter-name>filter-plugin-dispatcher-before-decoration-forward</filter-name>
+        <url-pattern>/*</url-pattern>
+        <dispatcher>FORWARD</dispatcher>
+    </filter-mapping>
+    <filter-mapping>
+        <filter-name>filter-plugin-dispatcher-before-decoration-include</filter-name>
+        <url-pattern>/*</url-pattern>
+        <dispatcher>INCLUDE</dispatcher>
+    </filter-mapping>
+    <filter-mapping>
+        <filter-name>filter-plugin-dispatcher-before-decoration-error</filter-name>
+        <url-pattern>/*</url-pattern>
+        <dispatcher>ERROR</dispatcher>
+    </filter-mapping>
+
     <filter-mapping>
         <filter-name>sitemesh</filter-name>
         <url-pattern>*.jsp</url-pattern>
@@ -314,17 +643,57 @@
         <url-pattern>/browse/*</url-pattern>
     </filter-mapping>
 
+    <filter-mapping>
+        <filter-name>sitemesh</filter-name>
+        <url-pattern>/plugins/servlet/*</url-pattern>
+    </filter-mapping>
+
+    <filter-mapping>
+        <filter-name>xsrf-token-addition</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+
     <filter-mapping>
         <filter-name>access</filter-name>
         <url-pattern>/*</url-pattern>
     </filter-mapping>
 
+    <filter-mapping>
+        <filter-name>filter-plugin-dispatcher-before-dispatch-request</filter-name>
+        <url-pattern>/*</url-pattern>
+        <dispatcher>REQUEST</dispatcher>
+    </filter-mapping>
+    <filter-mapping>
+        <filter-name>filter-plugin-dispatcher-before-dispatch-forward</filter-name>
+        <url-pattern>/*</url-pattern>
+        <dispatcher>FORWARD</dispatcher>
+    </filter-mapping>
+    <filter-mapping>
+        <filter-name>filter-plugin-dispatcher-before-dispatch-include</filter-name>
+        <url-pattern>/*</url-pattern>
+        <dispatcher>INCLUDE</dispatcher>
+    </filter-mapping>
+    <filter-mapping>
+        <filter-name>filter-plugin-dispatcher-before-dispatch-error</filter-name>
+        <url-pattern>/*</url-pattern>
+        <dispatcher>ERROR</dispatcher>
+    </filter-mapping>
+
     <filter-mapping>
         <filter-name>headersanitising</filter-name>
         <url-pattern>/*</url-pattern>
     </filter-mapping>
 
-    <!-- listeners -->
+    <filter-mapping>
+        <filter-name>JiraLastFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+    
+
+    <!-- =====================================================
+         LISTENERS FOLLOW : 
+         ===================================================== -->
+
     <!--
      This order is important for shutdown and startup, ie the ConsistencyLauncher will call "SHUTDOWN"
      on a HSQL DB database, and so must be called 'after' the com.atlassian.jira.scheduler.JiraSchedulerLauncher
@@ -335,11 +704,10 @@
     </listener>
 
     <!--
-     This listener checks for database compatibility and creates a Johnson event
-     in the case when the database should not be used.
+     This listener runs startup checks and locks JIRA if problems are encountered.
     -->
     <listener>
-        <listener-class>com.atlassian.jira.appconsistency.db.DatabaseCompatibilityEnforcer</listener-class>
+        <listener-class>com.atlassian.jira.startup.JiraStartupChecklistContextListener</listener-class>
     </listener>
 
     <!-- Check consistency of database etc -->
@@ -362,11 +730,15 @@
         <listener-class>com.atlassian.jira.soap.axis.JiraAxisHttpListener</listener-class>
     </listener>
 
+    <!-- The JIRA user session tracker support -->
+    <listener>
+        <listener-class>com.atlassian.jira.web.session.currentusers.JiraUserSessionDestroyListener</listener-class>
+    </listener>
 
     <!-- servlets -->
     <servlet>
         <servlet-name>action</servlet-name>
-        <servlet-class>com.atlassian.jira.web.dispatcher.JiraServletDispatcher</servlet-class>
+        <servlet-class>com.atlassian.jira.web.dispatcher.JiraWebworkActionDispatcher</servlet-class>
         <load-on-startup>1</load-on-startup>
     </servlet>
 
@@ -380,6 +752,21 @@
         <servlet-class>com.atlassian.jira.web.servlet.ViewThumbnailServlet</servlet-class>
     </servlet>
 
+    <servlet>
+        <servlet-name>viewprojectavatar</servlet-name>
+        <servlet-class>com.atlassian.jira.web.servlet.ViewProjectAvatarServlet</servlet-class>
+    </servlet>
+
+    <servlet>
+        <servlet-name>viewuseravatar</servlet-name>
+        <servlet-class>com.atlassian.jira.web.servlet.ViewUserAvatarServlet</servlet-class>
+    </servlet>
+
+    <servlet>
+        <servlet-name>viewtemporaryavatar</servlet-name>
+        <servlet-class>com.atlassian.jira.web.servlet.ViewTemporaryAvatarServlet</servlet-class>
+    </servlet>
+
     <servlet>
         <servlet-name>quicklink</servlet-name>
         <servlet-class>com.atlassian.jira.servlet.QuickLinkServlet</servlet-class>
@@ -426,7 +813,7 @@
 
     <servlet>
         <servlet-name>logout</servlet-name>
-        <servlet-class>com.atlassian.seraph.logout.LogoutServlet</servlet-class>
+        <servlet-class>com.atlassian.jira.security.login.JiraLogoutServlet</servlet-class>
     </servlet>
 
     <!-- Axis SOAP Servlet -->
@@ -439,40 +826,6 @@
         </init-param>
     </servlet>
 
-    <servlet>
-        <servlet-name>javascript</servlet-name>
-        <display-name>Combined Javascript Servlet</display-name>
-        <servlet-class>com.atlassian.cache.servlet.CombinedCachingServlet</servlet-class>
-        <init-param>
-            <param-name>content.type</param-name>
-            <param-value>text/javascript</param-value>
-        </init-param>
-        <init-param>
-            <param-name>content.resolver.resource</param-name>
-            <param-value>com.atlassian.cache.servlet.resolver.ResourceStreamResolver</param-value>
-        </init-param>
-        <init-param>
-            <param-name>resource1</param-name>
-            <param-value>/includes/js/x-jira-min.js</param-value>
-        </init-param>
-        <init-param>
-            <param-name>resource2</param-name>
-            <param-value>/includes/js/jira-global-min.js</param-value>
-        </init-param>
-        <init-param>
-            <param-name>resource3</param-name>
-            <param-value>/includes/js/quicksearch-min.js</param-value>
-        </init-param>
-        <init-param>
-            <param-name>content.resolver.plugins</param-name>
-            <param-value>com.atlassian.jira.servlet.PluginJavascriptContentResolver</param-value>
-        </init-param>
-        <init-param>
-            <param-name>plugins1</param-name>
-            <param-value>includes/js/global.js</param-value>
-        </init-param>
-    </servlet>
-
     <!-- IE6 expects CSS files to end with .css (JRA-3747) -->
     <servlet>
         <servlet-name>global.css</servlet-name>
@@ -492,92 +845,12 @@
         </init-param>
     </servlet>
 
-    <servlet>
-        <servlet-name>css</servlet-name>
-        <display-name>Combined CSS Servlet</display-name>
-        <servlet-class>com.atlassian.cache.servlet.CombinedCachingServlet</servlet-class>
-        <init-param>
-            <param-name>content.type</param-name>
-            <param-value>text/css</param-value>
-        </init-param>
-        <init-param>
-            <param-name>content.resolver.dynamicCss</param-name>
-            <param-value>com.atlassian.jira.servlet.DynamicCSSContentResolver</param-value>
-        </init-param>
-        <init-param>
-            <param-name>dynamicCss</param-name>
-            <param-value>/global.css</param-value>
-        </init-param>
-        <init-param>
-            <param-name>content.resolver.resource</param-name>
-            <param-value>com.atlassian.cache.servlet.resolver.ResourceStreamResolver</param-value>
-        </init-param>
-        <init-param>
-            <param-name>resource1</param-name>
-            <param-value>/styles/global-static-min.css</param-value>
-        </init-param>
-    </servlet>
-
-    <servlet>
-        <servlet-name>printable-css</servlet-name>
-        <display-name>Combined Printable CSS Servlet</display-name>
-        <servlet-class>com.atlassian.cache.servlet.CombinedCachingServlet</servlet-class>
-        <init-param>
-            <param-name>content.type</param-name>
-            <param-value>text/css</param-value>
-        </init-param>
-        <init-param>
-            <param-name>content.resolver.dynamicCss</param-name>
-            <param-value>com.atlassian.jira.servlet.PrintableDynamicCSSContentResolver</param-value>
-        </init-param>
-        <init-param>
-            <param-name>dynamicCss</param-name>
-            <param-value>/printable.css</param-value>
-        </init-param>
-    </servlet>
-
     <servlet>
         <servlet-name>DisplayChart</servlet-name>
         <servlet-class>org.jfree.chart.servlet.DisplayChart</servlet-class>
         <load-on-startup>1</load-on-startup>
     </servlet>
 
-    <servlet>
-        <servlet-name>dwr-invoker</servlet-name>
-        <display-name>DWR Servlet</display-name>
-        <servlet-class>org.directwebremoting.servlet.DwrServlet</servlet-class>
-        <init-param>
-            <param-name>debug</param-name>
-            <param-value>false</param-value>
-        </init-param>
-        <init-param>
-            <param-name>maxCallCount</param-name>
-            <param-value>1</param-value>
-        </init-param>
-        <init-param>
-            <param-name>allowGetForSafariButMakeForgeryEasier</param-name>
-            <param-value>true</param-value>
-        </init-param>
-        <!--
-          We need these parameters with DWR 2.0.x because it introduced a new
-          dynamically generated script/session concept that causes the
-          engine.js to be never cached on the client.  But we don't want this
-          behaviour.
-        -->
-        <init-param>
-            <param-name>crossDomainSessionSecurity</param-name>
-            <param-value>false</param-value>
-        </init-param>
-        <init-param>
-            <param-name>url:/engine.js</param-name>
-            <param-value>com.atlassian.jira.web.util.dwr.JiraDWREngineHandler</param-value>
-        </init-param>
-        <init-param>
-            <param-name>engineHandlerUrl</param-name>
-            <param-value>/engine.js</param-value>
-        </init-param>
-    </servlet>
-
     <servlet>
         <servlet-name>file-server</servlet-name>
         <servlet-class>com.atlassian.jira.web.servlet.FileServerServlet</servlet-class>
@@ -608,10 +881,16 @@
         <servlet-class>com.atlassian.jira.web.servlet.VelocityDecoratorServlet</servlet-class>
     </servlet>
 
+    <servlet>
+        <servlet-name>attachmentzip</servlet-name>
+        <servlet-class>com.atlassian.jira.web.servlet.AttachmentZipServlet</servlet-class>
+    </servlet>
+    
+
     <!-- JCAPTCHA -->
     <servlet>
         <servlet-name>captcha</servlet-name>
-        <servlet-class>com.atlassian.jira.servlet.CaptchaServlet</servlet-class>
+        <servlet-class>com.atlassian.jira.servlet.JiraCaptchaServlet</servlet-class>
         <load-on-startup>0</load-on-startup>
     </servlet>
 
@@ -622,6 +901,11 @@
 
     <!-- end:JCAPTCHA -->
 
+    <servlet-mapping>
+        <servlet-name>attachmentzip</servlet-name>
+        <url-pattern>/secure/attachmentzip/*</url-pattern>
+    </servlet-mapping>
+    
     <servlet-mapping>
         <servlet-name>file-server</servlet-name>
         <url-pattern>/download/*</url-pattern>
@@ -637,21 +921,6 @@
         <url-pattern>/styles/global.css</url-pattern>
     </servlet-mapping>
 
-    <servlet-mapping>
-        <servlet-name>javascript</servlet-name>
-        <url-pattern>/includes/js/combined-javascript.js</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-        <servlet-name>css</servlet-name>
-        <url-pattern>/styles/combined.css</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-        <servlet-name>printable-css</servlet-name>
-        <url-pattern>/styles/combined-printable.css</url-pattern>
-    </servlet-mapping>
-
     <servlet-mapping>
         <servlet-name>servlet-module-container-servlet</servlet-name>
         <url-pattern>/plugins/servlet/*</url-pattern>
@@ -686,6 +955,18 @@
         <url-pattern>/databaseLockedError</url-pattern>
     </servlet-mapping>
 
+    <servlet-mapping>
+        <servlet-name>noopservlet</servlet-name>
+        <url-pattern>/JiraLockedError</url-pattern>
+    </servlet-mapping>
+
+    <!-- This are dummy servlet mappings to trick WebSphere 6.1.0.5 to push the request through the filter chain, such
+    that the TrustedApplicationFilter filter can respond to the request. -->
+    <servlet-mapping>
+        <servlet-name>noopservlet</servlet-name>
+        <url-pattern>/admin/appTrustCertificate</url-pattern>
+    </servlet-mapping>
+
     <servlet-mapping>
         <servlet-name>viewattachment</servlet-name>
         <url-pattern>/secure/attachment/*</url-pattern>
@@ -696,6 +977,21 @@
         <url-pattern>/secure/thumbnail/*</url-pattern>
     </servlet-mapping>
 
+    <servlet-mapping>
+        <servlet-name>viewprojectavatar</servlet-name>
+        <url-pattern>/secure/projectavatar</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>viewuseravatar</servlet-name>
+        <url-pattern>/secure/useravatar</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>viewtemporaryavatar</servlet-name>
+        <url-pattern>/secure/temporaryavatar</url-pattern>
+    </servlet-mapping>
+
     <servlet-mapping>
         <servlet-name>quicklink</servlet-name>
         <url-pattern>/browse/*</url-pattern>
@@ -726,11 +1022,6 @@
         <url-pattern>/charts</url-pattern>
     </servlet-mapping>
 
-    <servlet-mapping>
-        <servlet-name>dwr-invoker</servlet-name>
-        <url-pattern>/dwr/*</url-pattern>
-    </servlet-mapping>
-
     <servlet-mapping>
         <servlet-name>issue-view</servlet-name>
         <url-pattern>/si/*</url-pattern>
@@ -788,22 +1079,24 @@
     </error-page>
 
     <!-- tag libraries -->
-    <taglib>
-        <taglib-uri>webwork</taglib-uri>
-        <taglib-location>/WEB-INF/tld/webwork.tld</taglib-location>
-    </taglib>
-    <taglib>
-        <taglib-uri>sitemesh-page</taglib-uri>
-        <taglib-location>/WEB-INF/tld/sitemesh-page.tld</taglib-location>
-    </taglib>
-    <taglib>
-        <taglib-uri>sitemesh-decorator</taglib-uri>
-        <taglib-location>/WEB-INF/tld/sitemesh-decorator.tld</taglib-location>
-    </taglib>
-    <taglib>
-        <taglib-uri>jiratags</taglib-uri>
-        <taglib-location>/WEB-INF/tld/atlassian-jira-tags.tld</taglib-location>
-    </taglib>
+    <jsp-config>
+        <taglib>
+            <taglib-uri>webwork</taglib-uri>
+            <taglib-location>/WEB-INF/tld/webwork.tld</taglib-location>
+        </taglib>
+        <taglib>
+            <taglib-uri>sitemesh-page</taglib-uri>
+            <taglib-location>/WEB-INF/tld/sitemesh-page.tld</taglib-location>
+        </taglib>
+        <taglib>
+            <taglib-uri>sitemesh-decorator</taglib-uri>
+            <taglib-location>/WEB-INF/tld/sitemesh-decorator.tld</taglib-location>
+        </taglib>
+        <taglib>
+            <taglib-uri>jiratags</taglib-uri>
+            <taglib-location>/WEB-INF/tld/atlassian-jira-tags.tld</taglib-location>
+        </taglib>
+    </jsp-config>
 
     <!-- resource environment references -->
 

data/spec/ucb_deployer/jira_deployer_spec.rb

@@ -37,7 +37,7 @@ describe UcbDeployer::JiraDeployer do
       File.exists?(@cdep.web_xml).should be_true
       lines = File.readlines(@cdep.web_xml)
       lines.any? { |l| l =~ /<\?xml version="1\.0"\?>/ }.should be_true
-      lines.any? { |l| l =~ /<web-app>/ }.should be_true
+      lines.any? { |l| l =~ /^<web-app / }.should be_true
       lines.any? { |l| l =~ /#{@cdep.cas_server_url}/ }.should be_true
       lines.any? { |l| l =~ /#{@cdep.cas_service_url}/ }.should be_true
       lines.any? { |l| l =~ /<\/web-app>/ }.should be_true            

data/ucb_deployer.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ucb_deployer}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steven Hansen"]
-  s.date = %q{2010-12-02}
+  s.date = %q{2010-12-06}
   s.default_executable = %q{ucb_deploy}
   s.description = %q{Tool for deploying Confluence/JIRA war files to tomcat}
   s.email = %q{runner@berkeley.edu}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ucb_deployer
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Steven Hansen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-02 00:00:00 -08:00
+date: 2010-12-06 00:00:00 -08:00
 default_executable: 
 dependencies: []