ucb_deployer 1.0.1 → 1.1.0

data/spec/fixtures/jira/web.xml

@@ -13,11 +13,23 @@
     <!-- =====================================================
          THIS MUST BE THE FIRST FILTER IN THE DEFINED CHAIN
          ===================================================== -->
+    <!-- This *has* to come first to ensure no other filter runs before this trying to access the ComponentManager
+         since that can cause deadlocks during a data import -->
+    <filter>
+        <filter-name>JiraImportProgressFilter</filter-name>
+        <filter-class>com.atlassian.jira.web.filters.JiraImportProgressFilter</filter-class>
+    </filter>
+
     <filter>
         <filter-name>JiraFirstFilter</filter-name>
         <filter-class>com.atlassian.jira.web.filters.JiraFirstFilter</filter-class>
     </filter>
-    
+
+    <filter>
+        <filter-name>MultiTenantFilter</filter-name>
+        <filter-class>com.atlassian.multitenant.servlet.MultiTenantServletFilter</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>
@@ -25,6 +37,35 @@
         <filter-class>com.atlassian.jira.startup.JiraStartupChecklistFilter</filter-class>
     </filter>
 
+    <filter>
+        <filter-name>active-requests-filter</filter-name>
+        <filter-class>com.atlassian.jira.web.monitor.ActiveRequestsFilter</filter-class>
+
+        <!-- register in JMX using this object name -->
+        <init-param>
+            <param-name>jmx.name</param-name>
+            <param-value>com.atlassian.jira:name=Requests</param-value>
+        </init-param>
+
+        <!-- create a log entry if a request takes more than this number of ms (default: 5s. 0 to disable) -->
+        <init-param>
+            <param-name>request.log.threshold</param-name>
+            <param-value>15000</param-value>
+        </init-param>
+
+        <!-- create a thread dump if a request takes more than this number of ms (default: 30s. 0 to disable) -->
+        <init-param>
+            <param-name>request.dumpthreads.threshold</param-name>
+            <param-value>0</param-value>
+        </init-param>
+
+        <!-- save the thread dump in the logs directory -->
+        <init-param>
+            <param-name>request.dumpthreads.dir</param-name>
+            <param-value>${catalina.base}/logs</param-value>
+        </init-param>
+    </filter>
+
     <filter>
         <filter-name>headersanitising</filter-name>
         <filter-class>com.atlassian.core.filters.HeaderSanitisingFilter</filter-class>
@@ -73,17 +114,6 @@
         </init-param>
     </filter>
 
-    <filter>
-        <filter-name>request-cleanup</filter-name>
-        <filter-class>com.atlassian.jira.web.filters.RequestCleanupFilter</filter-class>
-    </filter>
-
-    <!-- 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>
@@ -161,6 +191,11 @@
         <filter-class>com.atlassian.jira.web.filters.PathMatchingEncodingFilter</filter-class>
     </filter>
 
+    <filter>
+        <filter-name>postencoding</filter-name>
+        <filter-class>com.atlassian.jira.web.filters.JiraPostEncodingFilter</filter-class>
+    </filter>
+
     <filter>
         <filter-name>filter-plugin-dispatcher-after-encoding-request</filter-name>
         <filter-class>com.atlassian.plugin.servlet.filter.ServletFilterModuleContainerFilter</filter-class>
@@ -349,7 +384,7 @@
     </filter>
 
     <!-- =====================================================
-         THIS MUST BE THE LAST FILTER IN THE DEFINED CHAIN 
+         THIS MUST BE THE LAST FILTER IN THE DEFINED CHAIN
          ===================================================== -->
     <filter>
         <filter-name>JiraLastFilter</filter-name>
@@ -357,14 +392,27 @@
     </filter>
 
     <!-- =====================================================
-         FILTER MAPPINGS FOLLOW : 
+         FILTER MAPPINGS FOLLOW :
          ===================================================== -->
 
+    <!-- This *has* to come first to ensure no other filter runs before this trying to access the ComponentManager
+         since that can cause deadlocks during a data import -->
+    <filter-mapping>
+        <filter-name>JiraImportProgressFilter</filter-name>
+        <url-pattern>/importprogress</url-pattern>
+    </filter-mapping>
+
     <filter-mapping>
         <filter-name>JiraFirstFilter</filter-name>
         <url-pattern>/*</url-pattern>
     </filter-mapping>
 
+    <filter-mapping>
+        <filter-name>MultiTenantFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+        <dispatcher>REQUEST</dispatcher>
+        <dispatcher>ERROR</dispatcher>
+    </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>
@@ -372,6 +420,10 @@
         <url-pattern>/*</url-pattern>
     </filter-mapping>
 
+    <filter-mapping>
+        <filter-name>active-requests-filter</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>
@@ -396,6 +448,11 @@
     </filter-mapping>
     -->
 
+    <filter-mapping>
+        <filter-name>postencoding</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+
     <filter-mapping>
         <filter-name>filter-plugin-dispatcher-after-encoding-request</filter-name>
         <url-pattern>/*</url-pattern>
@@ -505,17 +562,6 @@
         <url-pattern>/rpc/xmlrpc</url-pattern>
     </filter-mapping>
 
-
-    <filter-mapping>
-        <filter-name>request-cleanup</filter-name>
-        <url-pattern>/*</url-pattern>
-    </filter-mapping>
-
-    <filter-mapping>
-        <filter-name>action-cleanup-delay</filter-name>
-        <url-pattern>/*</url-pattern>
-    </filter-mapping>
-
     <filter-mapping>
         <filter-name>profiling</filter-name>
         <url-pattern>*.jsp</url-pattern>
@@ -581,6 +627,8 @@
     <filter-mapping>
         <filter-name>login</filter-name>
         <url-pattern>/*</url-pattern>
+        <dispatcher>REQUEST</dispatcher>
+        <dispatcher>FORWARD</dispatcher> <!-- we want security/login to be applied after urlrewrites, for example -->
     </filter-mapping>
 
     <filter-mapping>
@@ -591,6 +639,8 @@
     <filter-mapping>
         <filter-name>security</filter-name>
         <url-pattern>/*</url-pattern>
+        <dispatcher>REQUEST</dispatcher>
+        <dispatcher>FORWARD</dispatcher> <!-- we want security to be applied after urlrewrites, for example -->
     </filter-mapping>
 
     <filter-mapping>
@@ -689,53 +739,51 @@
         <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
-    -->
+    <!-- SERVLET CONTEXT LISTENERS -->
 
+    <!-- This goes before the LauncherContextListener because parts of the LauncherContextListener expect
+         the ServletContextProvider to work. And this listener it was makes that work. -->
     <listener>
         <listener-class>com.atlassian.jira.web.ServletContextProviderListener</listener-class>
     </listener>
 
-    <!--
-     This listener runs startup checks and locks JIRA if problems are encountered.
-    -->
+    <!-- Start up JIRA. This listener actually delegates to a bunch of JiraLaunchers to ensure
+         that JIRA starts as intended. -->
     <listener>
-        <listener-class>com.atlassian.jira.startup.JiraStartupChecklistContextListener</listener-class>
+        <listener-class>com.atlassian.jira.startup.LauncherContextListener</listener-class>
     </listener>
 
-    <!-- Check consistency of database etc -->
-    <listener>
-        <listener-class>com.atlassian.jira.upgrade.ConsistencyLauncher</listener-class>
-    </listener>
+    <!-- ========================================
+         DO NOT ADD ANY SERVLET CONTEXT LISTENERS
 
-    <!-- Check for upgrades, and automatically perform them if neccessary. -->
-    <listener>
-        <listener-class>com.atlassian.jira.upgrade.UpgradeLauncher</listener-class>
-    </listener>
+         Unless you really know what you're doing. And if you think you do, you're probably wrong.
+         Because everything you thought you knew is wrong! Multitenancy is like (The Crying Game + The Usual Suspects) * 42.
 
-    <!-- Launch the scheduler, which loads all the jobs from scheduler-config.xml -->
-    <listener>
-        <listener-class>com.atlassian.jira.scheduler.JiraSchedulerLauncher</listener-class>
-    </listener>
+         The right place to add many context-listeners is now in the DefaultJiraLauncher which has to know when to do
+         what to make tenants happy.
+         ========================================
+    -->
+
+    <!-- SESSION LISTENERS
+         Session listeners are multi-tenant copacetic. -->
 
     <!-- XML-RPC / SOAP Listener -->
     <listener>
         <listener-class>com.atlassian.jira.soap.axis.JiraAxisHttpListener</listener-class>
     </listener>
 
-    <!-- The JIRA user session tracker support -->
+    <!-- The JIRA user session tracker support. -->
     <listener>
         <listener-class>com.atlassian.jira.web.session.currentusers.JiraUserSessionDestroyListener</listener-class>
     </listener>
 
+    <!-- Multi-Tenant session fixation prevention -->
+    <listener>
+        <listener-class>com.atlassian.multitenant.servlet.MultiTenantSessionListener</listener-class>
+    </listener>
+
     <!-- servlets -->
     <servlet>
         <servlet-name>action</servlet-name>
@@ -827,16 +875,6 @@
         </init-param>
     </servlet>
 
-    <!-- IE6 expects CSS files to end with .css (JRA-3747) -->
-    <servlet>
-        <servlet-name>global.css</servlet-name>
-        <jsp-file>/styles/global_css.jsp</jsp-file>
-        <init-param>
-            <param-name>fork</param-name>
-            <param-value>false</param-value>
-        </init-param>
-    </servlet>
-
     <servlet>
         <servlet-name>calendar.css</servlet-name>
         <jsp-file>/includes/js/calendar/skins/aqua/theme.jsp</jsp-file>
@@ -886,7 +924,12 @@
         <servlet-name>attachmentzip</servlet-name>
         <servlet-class>com.atlassian.jira.web.servlet.AttachmentZipServlet</servlet-class>
     </servlet>
-    
+
+    <!-- Multi-Tenant -->
+    <servlet>
+        <servlet-name>multitenant</servlet-name>
+        <servlet-class>com.atlassian.multitenant.servlet.MultiTenantServlet</servlet-class>
+    </servlet>
 
     <!-- JCAPTCHA -->
     <servlet>
@@ -906,7 +949,7 @@
         <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>
@@ -917,11 +960,6 @@
         <url-pattern>/styles/calendar.css</url-pattern>
     </servlet-mapping>
 
-    <servlet-mapping>
-        <servlet-name>global.css</servlet-name>
-        <url-pattern>/styles/global.css</url-pattern>
-    </servlet-mapping>
-
     <servlet-mapping>
         <servlet-name>servlet-module-container-servlet</servlet-name>
         <url-pattern>/plugins/servlet/*</url-pattern>
@@ -1043,9 +1081,14 @@
         <url-pattern>*.vmd</url-pattern>
     </servlet-mapping>
 
+    <servlet-mapping>
+        <servlet-name>multitenant</servlet-name>
+        <url-pattern>/multitenant/*</url-pattern>
+    </servlet-mapping>
+
     <!-- session config -->
     <session-config>
-        <session-timeout>60</session-timeout>
+        <session-timeout>300</session-timeout>
     </session-config>
 
     <!-- mime mapping -->
@@ -1084,6 +1127,7 @@
         <taglib>
             <taglib-uri>webwork</taglib-uri>
             <taglib-location>/WEB-INF/tld/webwork.tld</taglib-location>
+
         </taglib>
         <taglib>
             <taglib-uri>sitemesh-page</taglib-uri>

data/spec/ucb_deployer/jira_deployer_spec.rb

@@ -25,92 +25,11 @@ describe UcbDeployer::JiraDeployer do
       lambda { @jdep.load_config(@bad_deploy_file) }.should raise_error(UcbDeployer::ConfigError)
     end
 
-    it "should configure souldwing (CAS auth) in web.xml" do
-      @jdep.build_dir = test_build_dir
-      # just checking if spec_helper did the right
-      File.exists?(@jdep.web_xml).should be_true
-
-      @jdep.configure()
-      File.exists?(@jdep.web_xml).should be_true
-      lines = File.readlines(@jdep.web_xml)
-      lines.grep(/<\?xml version="1\.0"\?>/).should be_true
-      lines.grep(/^<web-app /).should be_true
-      lines.grep(/#{@jdep.cas_server_url}/).should have(1).record
-      lines.grep(/#{@jdep.cas_service_url}/).should have(1).record
-      lines.grep(/<\/web-app>/).should be_true
-    end
-
-    it "should configure the soulwing (CAS) authenticator in seraph_config.xml" do
-      @jdep.build_dir = test_build_dir
-      # just checking if spec_helper did the right
-      File.exists?(@jdep.seraph_config_xml).should be_true
-
-      @jdep.configure()
-      File.exists?(@jdep.seraph_config_xml).should be_true
-      lines = File.readlines(@jdep.seraph_config_xml)
-      lines.grep(/<security-config>/).should be_true
-      lines.grep(/#{Regexp.quote(@jdep.cas_authenticator_class)}/).should have(1).record
-      lines.grep(/#{Regexp.quote(@jdep.cas_server_url)}\/logout/).should have(1).record
-      lines.grep(/<\/security-config>/).should be_true
-    end
-
-    it "should configure the postgres72 db option in entityengine.xml" do
-      @jdep.build_dir = test_build_dir
-      # just checking if spec_helper did the right
-      File.exists?(@jdep.entityengine_xml).should be_true
-
-      @jdep.configure()
-      File.exists?(@jdep.entityengine_xml).should be_true
-      lines = File.readlines(@jdep.entityengine_xml)
-      lines.any? { |l| l =~ /<entity-config>/ }.should be_true
-      lines.any? { |l| l =~ /#{Regexp.quote(@jdep.entityengine_db)}/ }.should be_true
-      lines.any? { |l| l =~ /#{Regexp.quote(@jdep.entityengine_schema)}/ }.should be_true
-      lines.any? { |l| l =~ /<\/entity-config>/ }.should be_true
-    end
-
-    context "jira-application.properties file" do
-      it "should configure jira.home" do
-        @jdep.build_dir = test_build_dir()
-        # just checking if spec_helper did the right
-        File.exists?(@jdep.jira_application_properties).should be_true
-
-        @jdep.configure()
-        File.exists?(@jdep.jira_application_properties).should be_true
-        lines = File.readlines(@jdep.jira_application_properties)
-        lines.any? { |l| l =~ /# JIRA HOME/ }.should be_true
-        lines.any? { |l| l =~ /# JIRA SECURITY SETTINGS/ }.should be_true
-        lines.any? { |l| l =~ /#{Regexp.quote(@jdep.jira_home_token + ' ' + @jdep.data_dir)}/ }.should be_true
-        lines.any? { |l| l =~ /# NOTES FOR DEVELOPERS/ }.should be_true
-      end
-
-      it "should configure jira.projectkey.pattern" do
-        @jdep.build_dir = test_build_dir()
-        # just checking if spec_helper did the right
-        File.exists?(@jdep.jira_application_properties()).should be_true
-
-        @jdep.configure()
-        File.exists?(@jdep.jira_application_properties).should be_true
-        lines = File.readlines(@jdep.jira_application_properties)
-        lines.any? { |l| l =~ /# JIRA HOME/ }.should be_true
-        lines.any? { |l| l =~ /# JIRA SECURITY SETTINGS/ }.should be_true
-        lines.any? { |l| l =~ /#{Regexp.quote(@jdep.jira_projectkey_token() + ' ' + "([A-Z][A-Z0-9]+)")}/ }.should be_true
-        lines.any? { |l| l =~ /# NOTES FOR DEVELOPERS/ }.should be_true
-      end
-    end
-
-    it "should place ist_banner.jpg in webapps" do
-      @jdep.build_dir = test_build_dir()
+    it "should execute all the config tasks" do
+      task = mock("task", {:execute => true})
+      task.should_receive(:execute)
+      @jdep.stub!(:load_tasks).and_return([task])
       @jdep.configure()
-      File.exists?("#{@jdep.build_dir}/src/webapp/images/ist_banner.jpg").should be_true
-    end
-
-    it "should reshuffle jar files" do
-      @jdep.build_dir = test_build_dir()
-      @jdep.configure()
-      Dir["#{@jdep.build_dir}/src/edit-webapp/WEB-INF/lib/soulwing-casclient-*"].should_not be_empty
-      ["activation", "javamail", "commons-logging", "log4j"].each do |lib|
-        Dir["#{@jdep.build_dir}/src/edit-webapp/WEB-INF/lib/#{lib}-*"].should be_empty
-      end
     end
   end
 
@@ -134,3 +53,67 @@ describe UcbDeployer::JiraDeployer do
     end
   end
 end
+
+
+describe UcbDeployer::ConfigTasks::Jira do
+  before(:each) do
+    @config = mock("config", {
+        :resources_dir => UcbDeployer::RESOURCES_DIR,
+        :build_dir => "#{TEST_BUILD_DIR}/jira",
+        :cas_server_url => "THE CAS SERVER URL",
+        :cas_service_url => "THE CAS SERVICE URL",
+        :deployer_home => UcbDeployer::DEPLOYER_HOME,
+        :data_dir => "#{TEST_BUILD_DIR}/jira"
+    })
+  end
+
+  it "should configure cas authentication" do
+    task = UcbDeployer::ConfigTasks::Jira::ConfigCasAuth.new(@config)
+    task.execute()
+
+    lines = File.readlines(task.seraph_config_path())
+    lines.grep(/<security-config>/).should be_true
+    lines.grep(/#{Regexp.quote(task.cas_authenticator_class())}/).should have(1).record
+    lines.grep(/#{Regexp.quote(@config.cas_server_url())}\/logout/).should have(1).record
+    lines.grep(/<\/security-config>/).should be_true
+
+    lines = File.readlines(task.web_xml_path())
+    lines.grep(/#{Regexp.quote(@config.cas_server_url())}/).should have(1).record
+    lines.grep(/#{Regexp.quote(@config.cas_service_url())}/).should have(1).record
+  end
+
+  it "should remove conflicing jar file" do
+    task = UcbDeployer::ConfigTasks::Jira::RemoveConflictingJarFiles.new(@config)
+    task.execute()
+
+    Dir["#{@config.build_dir}/src/edit-webapp/WEB-INF/lib/soulwing-casclient-*"].should_not be_empty
+    ["activation", "javamail", "commons-logging", "log4j"].each do |lib|
+      Dir["#{@config.build_dir}/src/edit-webapp/WEB-INF/lib/#{lib}-*"].should be_empty
+    end
+  end
+
+  it "should configure the ist banner image" do
+    task = UcbDeployer::ConfigTasks::Jira::ConfigIstBanner.new(@config)
+    task.execute()
+
+    File.exists?("#{@config.build_dir()}/src/webapp/images/ist_banner.jpg").should be_true
+  end
+
+  it "should configure the jira-config.properties file" do
+    task = UcbDeployer::ConfigTasks::Jira::ConfigJiraConfigProperties.new(@config)
+    task.execute()
+
+    lines = File.readlines(task.jira_config_properties_path())
+    lines.any? { |l| l =~ /#{Regexp.quote(task.projectkey_config())}/ }.should be_true
+  end
+
+  it "should configure the jira-application.properties file" do
+    task = UcbDeployer::ConfigTasks::Jira::ConfigAppProperties.new(@config)
+    task.execute()
+
+    lines = File.readlines(task.jira_app_properties_path())
+    lines.any? { |line|
+      line =~ /#{Regexp.quote(task.jira_home_token() + ' ' + @config.data_dir)}/
+    }.should be_true
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ucb_deployer
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 1
-  - 0
   - 1
-  version: 1.0.1
+  - 0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Steven Hansen
@@ -15,10 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-19 00:00:00 Z
+date: 2011-12-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
+  name: rake
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -30,11 +31,11 @@ dependencies:
         - 8
         - 7
         version: 0.8.7
-  prerelease: false
-  name: rake
+  type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  type: :development
+  name: rspec
+  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -46,11 +47,11 @@ dependencies:
         - 3
         - 0
         version: 1.3.0
-  prerelease: false
-  name: rspec
+  type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  type: :development
+  name: rcov
+  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -62,11 +63,11 @@ dependencies:
         - 9
         - 9
         version: 0.9.9
-  prerelease: false
-  name: rcov
+  type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  type: :development
+  name: diff-lcs
+  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -78,11 +79,11 @@ dependencies:
         - 1
         - 2
         version: 1.1.2
-  prerelease: false
-  name: diff-lcs
+  type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  type: :development
+  name: ruby-debug
+  prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -94,8 +95,7 @@ dependencies:
         - 10
         - 4
         version: 0.10.4
-  prerelease: false
-  name: ruby-debug
+  type: :development
   version_requirements: *id005
 description: Tool for deploying Confluence and JIRA war files to tomcat
 email: 
@@ -115,6 +115,11 @@ files:
 - TODO.md
 - bin/ucb_deploy
 - lib/ucb_deployer.rb
+- lib/ucb_deployer/config_tasks/jira/config_app_properties.rb
+- lib/ucb_deployer/config_tasks/jira/config_cas_auth.rb
+- lib/ucb_deployer/config_tasks/jira/config_ist_banner.rb
+- lib/ucb_deployer/config_tasks/jira/config_jira_config_properties.rb
+- lib/ucb_deployer/config_tasks/jira/remove_conflicting_jar_files.rb
 - lib/ucb_deployer/confluence_deployer.rb
 - lib/ucb_deployer/deployer.rb
 - lib/ucb_deployer/jira_deployer.rb