ucb_deployer 0.0.10 → 0.1.0

data/Rakefile

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

data/lib/ucb_deployer/confluence_deployer.rb

@@ -35,10 +35,16 @@ module UcbDeployer
 
     def deploy
       display_maintenance_file if maintenance_file_dir
-      FileUtils.rm_rf(Dir["#{deploy_dir}/#{war_name}*"])
-      FileUtils.mkdir("#{deploy_dir}/#{war_name}")    
-      FileUtils.cp(Dir["#{build_dir}/src/dist/*.war"], "#{deploy_dir}/#{war_name}")
-      `jar -xvf #{deploy_dir}/#{war_name}/#{war_name}.war`
+
+      if File.exists?("#{deploy_dir}/#{war_name}")
+        FileUtils.rm_rf(Dir["#{deploy_dir}/#{war_name}"])
+      end
+
+      FileUtils.mkdir("#{deploy_dir}/#{war_name}")
+      FileUtils.mv("#{build_dir}/src/dist/confluence-#{version}.war",
+                   "#{deploy_dir}/#{war_name}/#{war_name}.war")
+
+      `cd #{deploy_dir}/#{war_name}/ && jar -xvf #{war_name}.war`
       FileUtils.rm("#{deploy_dir}/#{war_name}/#{war_name}.war")
     end
 
@@ -142,10 +148,6 @@ module UcbDeployer
       # Remove the postgres jar since we have it installed at the container level
       FileUtils.rm_rf(Dir["#{build_dir}/src/confluence/WEB-INF/lib/postgresql-*"])
     end
-    
-    def debug(str)
-      UcbDeployer.debug(str)
-    end
   end
 end
 

data/lib/ucb_deployer/deployer.rb

@@ -58,7 +58,9 @@ module UcbDeployer
     # +data_dir+  
     #
     def load_config(config_file)
-      hash = YAML.load_file(config_file)
+      if !(hash = YAML.load_file(config_file))
+        raise(ConfigError, "Config file [#{config_file}] contains no options.")
+      end
       
       debug("Config options:")
       debug("")      
@@ -72,6 +74,10 @@ module UcbDeployer
       end
     end
     
+    def debug(str)
+      UcbDeployer.debug(str)
+    end
+    
     def display_maintenance_file()
       maint_start = Time.now.strftime("%m-%d-%Y %H:%M:%S")
       template = ERB.new(maintenance_template)
@@ -116,6 +122,6 @@ module UcbDeployer
 </html>
 }
     end
-
+    
   end
 end

data/lib/ucb_deployer/jira_deployer.rb

@@ -3,73 +3,141 @@ module UcbDeployer
   class JiraDeployer < Deployer
     
     def initialize(config_file = "#{ENV['HOME']}/config/jira/deploy.yml")
-      FileUtils.touch(config_file) if !File.exists?(config_file)
+      debug("Using config file: #{config_file}")
+      debug("")
       load_config(config_file)
     end
     
     def export()
+      UcbDeployer.debug("Exporting from: #{svn_project_url}/jira-#{version}")
+      pwd = Dir.getwd
+      Dir.chdir("#{build_dir}")
+      FileUtils.rm_rf("#{build_dir}/src")
+      `svn export svn+ssh://#{svn_username}@#{svn_project_url}/jira-#{version}`
+      FileUtils.mv("jira-#{version}", "src")
+      Dir.chdir(pwd)
+      $stdout.puts("Export Completed")
     end
     
-    def configure
+    def configure()
+      config_web_xml
+      config_seraph_config_xml
+      reshuffle_jars
     end
 
-    def build
+    def build()
+      pwd = Dir.getwd
+      Dir.chdir("#{build_dir}/src")
+      `sh #{build_dir}/src/build.sh`
+      Dir.chdir(pwd)    
     end
 
-    def deploy
+    def deploy()
+      display_maintenance_file if maintenance_file_dir
+
+      if File.exists?("#{deploy_dir}/#{war_name}")
+        FileUtils.rm_rf(Dir["#{deploy_dir}/#{war_name}"])
+      end
+
+      FileUtils.mkdir("#{deploy_dir}/#{war_name}")
+      FileUtils.mv("#{build_dir}/src/dist/jira-#{version}.war",
+                   "#{deploy_dir}/#{war_name}/#{war_name}.war")
+
+      `cd #{deploy_dir}/#{war_name}/ && jar -xvf #{war_name}.war`
+      FileUtils.rm("#{deploy_dir}/#{war_name}/#{war_name}.war")
     end
 
-    def rollback
+    def rollback()
     end
 
     ##
-    # Shortcut to confluence web.xml file
+    # Shortcut to jira web.xml file
     #
     def web_xml()
+      "#{build_dir}/src/jira/WEB-INF/web.xml"
     end
     
     ##
-    # Shortcut to confluence seraph-config.xml file
+    # Shortcut to jira seraph-config.xml file
     #
     def seraph_config_xml()
+      "#{build_dir}/src/jira/WEB-INF/classes/seraph-config.xml"
     end
     
-    ##
-    # Shortcut to confluence confluence-init.properties file
-    #
-    def confluence_init_properties()
+    def web_xml_token()
+      "<!-- filters -->"
     end
     
-    def web_xml_token()
+    def seraph_config_xml_auth_class_token()
+      "com.atlassian.seraph.auth.DefaultAuthenticator"
     end
     
-    def seraph_config_xml_token()
+    def seraph_config_xml_logout_url_token()
+      "/secure/Logout!default.jspa"
     end
     
     def cas_authenticator_class()
+      "org.soulwing.cas.apps.atlassian.ConfluenceCasAuthenticator"
+    end
+    
+    def cas_logout_url()
+      "/casLogout.action"
     end
     
     ##
-    # Updates the confluence web.xml file with the soulwing (CAS library)
+    # Updates the jira web.xml file with the soulwing (CAS library)
     # authentication configuration
     #
     def config_web_xml()
+      web_xml = File.readlines(self.web_xml)
+      
+      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))
+        else
+          line
+        end
+      end
+      
+      File.open(self.web_xml, "w") do |io|
+        web_xml.each { |line| io.puts(line) }
+      end      
     end
 
     ##
-    # Updates the confluence seraph_config.xml file with the soulwing
+    # Updates the jira seraph_config.xml file with the soulwing
     # authenticator.
     #
     def config_seraph_config_xml()
+      seraph_xml = File.readlines(self.seraph_config_xml)
+      
+      seraph_xml = seraph_xml.map do |line|
+        if m = /(#{Regexp.quote(seraph_config_xml_auth_class_token)})/.match(line)
+          debug(m[0])
+          new_str = "#{m.pre_match}#{cas_authenticator_class}#{m.post_match}"
+          debug(new_str)
+          new_str
+        elsif m = /(#{Regexp.quote(seraph_config_xml_logout_url_token)})/.match(line)
+          debug(m[0])
+          new_str = "#{m.pre_match}#{cas_logout_url}#{m.post_match}"
+          debug(new_str)
+          new_str
+        else
+          line
+        end
+      end
+      
+      File.open(self.seraph_config_xml, "w") do |io|
+        seraph_xml.each { |line| io.puts(line) }
+      end
     end
     
-    ##
-    # Sets the confluence.home property in the file: confluence-init.properties
-    #
-    def config_confluence_init_properties()
-    end
-
     def reshuffle_jars()
+      FileUtils.cp(Dir["#{UcbDeployer::RESOURCES_DIR}/lib/jotm-2.0.13/lib/*"],
+                   "#{build_dir}/src/jira/WEB-INF/lib/")
+      FileUtils.cp(Dir["#{UcbDeployer::RESOURCES_DIR}/soulwing-casclient-*"],
+                   "#{build_dir}/src/jira/WEB-INF/lib/")
     end
 
   end

data/resources/confluence_cas_web.xml

@@ -98,4 +98,6 @@
   <filter-name>CAS-Service-Validation</filter-name>
   <url-pattern>/*</url-pattern>
 </filter-mapping>
-<!-- end CAS Configuration --> 
+<!-- end CAS Configuration --> 
+
+

data/resources/jira_cas_web.xml

@@ -92,4 +92,7 @@
   <filter-name>CAS-Service-Validation</filter-name> 
   <url-pattern>/*</url-pattern> 
 </filter-mapping> 
-<!-- end CAS Configuration --> 
+<!-- end CAS Configuration --> 
+
+
+

data/spec/fixtures/jira/web.xml

@@ -0,0 +1,833 @@
+<?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>
+    <!-- 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 -->
+    <filter>
+        <filter-name>DatabaseCompatibilityEnforcer</filter-name>
+        <filter-class>com.atlassian.jira.appconsistency.db.DatabaseCompatibilityEnforcerFilter</filter-class>
+    </filter>
+
+
+    <filter>
+        <filter-name>headersanitising</filter-name>
+        <filter-class>com.atlassian.core.filters.HeaderSanitisingFilter</filter-class>
+    </filter>
+
+    <!--This filter is used to determine is there are any Application Errors before any pages are accessed    -->
+    <filter>
+        <filter-name>consistency</filter-name>
+        <filter-class>com.atlassian.johnson.filters.JohnsonFilter</filter-class>
+    </filter>
+
+    <filter>
+        <filter-name>consistency503</filter-name>
+        <filter-class>com.atlassian.johnson.filters.Johnson503Filter</filter-class>
+    </filter>
+
+    <filter>
+        <filter-name>consistencySoap</filter-name>
+        <filter-class>com.atlassian.johnson.filters.JohnsonSoapFilter</filter-class>
+    </filter>
+
+    <filter>
+        <filter-name>consistencyXmlRpc</filter-name>
+        <filter-class>com.atlassian.johnson.filters.JohnsonXmlRpcFilter</filter-class>
+    </filter>
+
+    <filter>
+        <filter-name>UrlRewriteFilter</filter-name>
+        <filter-class>org.tuckey.web.filters.urlrewrite.UrlRewriteFilter</filter-class>
+    </filter>
+
+    <filter>
+        <filter-name>profiling</filter-name>
+        <filter-class>com.atlassian.jira.web.filters.JIRAProfilingFilter</filter-class>
+        <init-param>
+            <!-- specify the which HTTP parameter to use to turn the filter on or off -->
+            <!-- if not specified - defaults to "profile.filter" -->
+            <param-name>activate.param</param-name>
+            <param-value>jira_profile</param-value>
+        </init-param>
+        <init-param>
+            <!-- specify the whether to start the filter automatically -->
+            <!-- if not specified - defaults to "true" -->
+            <param-name>autostart</param-name>
+            <param-value>false</param-value>
+        </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 JiraServletDispatcher 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>sitemesh-exclude</filter-name>
+        <filter-class>com.atlassian.jira.web.filters.SitemeshExcludePathFilter</filter-class>
+    </filter>
+
+    <filter>
+        <filter-name>sitemesh</filter-name>
+        <filter-class>com.opensymphony.module.sitemesh.filter.PageFilter</filter-class>
+    </filter>
+
+    <filter>
+        <filter-name>encoding</filter-name>
+        <filter-class>com.atlassian.jira.web.filters.JIRAEncodingFilter</filter-class>
+    </filter>
+
+    <filter>
+        <filter-name>login</filter-name>
+        <filter-class>com.atlassian.seraph.filter.LoginFilter</filter-class>
+    </filter>
+
+    <filter>
+        <filter-name>trustedapps</filter-name>
+        <filter-class>com.atlassian.jira.security.auth.trustedapps.TrustedApplicationFilter</filter-class>
+    </filter>
+
+    <filter>
+        <filter-name>security</filter-name>
+        <filter-class>com.atlassian.jira.security.JiraSecurityFilter</filter-class>
+    </filter>
+
+    <filter>
+        <filter-name>gzip</filter-name>
+        <filter-class>com.atlassian.jira.web.filters.gzip.JiraGzipFilter</filter-class>
+    </filter>
+
+    <filter>
+        <filter-name>access</filter-name>
+        <filter-class>com.atlassian.jira.web.filters.AccessLogFilter</filter-class>
+    </filter>
+
+
+    <!-- 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>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+
+    <filter-mapping>
+        <filter-name>encoding</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+
+    <!-- gzip *must* be before UrlRewriteFilter as the rewrite filter sends 'forwards' -->
+    <filter-mapping>
+        <filter-name>gzip</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+
+    <filter-mapping>
+        <filter-name>UrlRewriteFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+
+    <!-- These mapping are for URL's that can handle an HTML error message when JIRA is unavailable -->
+    <filter-mapping>
+        <filter-name>consistency</filter-name>
+        <url-pattern>*.jsp</url-pattern>
+    </filter-mapping>
+    <filter-mapping>
+        <filter-name>consistency</filter-name>
+        <url-pattern>*.jspa</url-pattern>
+    </filter-mapping>
+    <filter-mapping>
+        <filter-name>consistency</filter-name>
+        <url-pattern>/browse/*</url-pattern>
+    </filter-mapping>
+    <filter-mapping>
+        <filter-name>consistency</filter-name>
+        <url-pattern>/logout</url-pattern>
+    </filter-mapping>
+    <filter-mapping>
+        <filter-name>consistency</filter-name>
+        <url-pattern>*.vm</url-pattern>
+    </filter-mapping>
+    <filter-mapping>
+        <filter-name>consistency</filter-name>
+        <url-pattern>/lazyLoader</url-pattern>
+    </filter-mapping>
+
+    <!--
+        These mapping are for URL's that can NOT handle an HTML error message when JIRA is unavailable, these will
+        get a 503 Service Unavailable response instead.
+    -->
+    <filter-mapping>
+        <filter-name>consistency503</filter-name>
+        <url-pattern>/sr/*</url-pattern>
+    </filter-mapping>
+    <filter-mapping>
+        <filter-name>consistency503</filter-name>
+        <url-pattern>/si/*</url-pattern>
+    </filter-mapping>
+    <filter-mapping>
+        <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>
+    </filter-mapping>
+    <filter-mapping>
+        <filter-name>consistency503</filter-name>
+        <url-pattern>/secure/attachment/*</url-pattern>
+    </filter-mapping>
+    <filter-mapping>
+        <filter-name>consistency503</filter-name>
+        <url-pattern>/rpc/trackback/*</url-pattern>
+    </filter-mapping>
+    <filter-mapping>
+        <filter-name>consistency503</filter-name>
+        <url-pattern>/dwr/*</url-pattern>
+    </filter-mapping>
+
+    <!--
+        This mapping is for the Soap endpoint URL's that can NOT handle an HTML error message when JIRA is unavailable,
+        these will get a proper SoapFault packet instead.
+    -->
+    <filter-mapping>
+        <filter-name>consistencySoap</filter-name>
+        <url-pattern>/rpc/soap/*</url-pattern>
+    </filter-mapping>
+
+    <!--
+        This mapping is for the XML-RPC endpoint URL's that can NOT handle an HTML error message when JIRA is unavailable,
+        these will get a proper XML-RPC Fault packet instead.
+    -->
+    <filter-mapping>
+        <filter-name>consistencyXmlRpc</filter-name>
+        <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>
+    </filter-mapping>
+
+    <filter-mapping>
+        <filter-name>profiling</filter-name>
+        <url-pattern>*.jspa</url-pattern>
+    </filter-mapping>
+
+    <filter-mapping>
+        <filter-name>profiling</filter-name>
+        <url-pattern>/browse/*</url-pattern>
+    </filter-mapping>
+
+    <filter-mapping>
+        <filter-name>profiling</filter-name>
+        <url-pattern>/rpc/*</url-pattern>
+    </filter-mapping>
+
+    <!-- profiling filter should be mapped to search request &amp; single issue -->
+    <filter-mapping>
+        <filter-name>profiling</filter-name>
+        <url-pattern>/si/*</url-pattern>
+    </filter-mapping>
+
+    <filter-mapping>
+        <filter-name>profiling</filter-name>
+        <url-pattern>/sr/*</url-pattern>
+    </filter-mapping>
+
+    <filter-mapping>
+        <filter-name>profiling</filter-name>
+        <url-pattern>/plugins/servlet/*</url-pattern>
+    </filter-mapping>
+
+    <filter-mapping>
+        <filter-name>profiling</filter-name>
+        <url-pattern>/lazyLoader</url-pattern>
+    </filter-mapping>
+
+    <filter-mapping>
+        <filter-name>login</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+
+    <filter-mapping>
+        <filter-name>trustedapps</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+
+    <filter-mapping>
+        <filter-name>security</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+
+    <filter-mapping>
+        <filter-name>sitemesh</filter-name>
+        <url-pattern>*.jsp</url-pattern>
+    </filter-mapping>
+
+    <filter-mapping>
+        <filter-name>sitemesh</filter-name>
+        <url-pattern>/logout.jsp</url-pattern>
+    </filter-mapping>
+
+    <filter-mapping>
+        <filter-name>sitemesh</filter-name>
+        <url-pattern>/login.jsp</url-pattern>
+    </filter-mapping>
+
+    <filter-mapping>
+        <filter-name>sitemesh-exclude</filter-name>
+        <url-pattern>/secure/*</url-pattern>
+    </filter-mapping>
+
+    <filter-mapping>
+        <filter-name>sitemesh</filter-name>
+        <url-pattern>/view/*</url-pattern>
+    </filter-mapping>
+
+    <filter-mapping>
+        <filter-name>sitemesh</filter-name>
+        <url-pattern>/browse/*</url-pattern>
+    </filter-mapping>
+
+    <filter-mapping>
+        <filter-name>access</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+
+    <filter-mapping>
+        <filter-name>headersanitising</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+
+    <!-- listeners -->
+    <!--
+     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
+    -->
+
+    <listener>
+        <listener-class>com.atlassian.jira.web.ServletContextProviderListener</listener-class>
+    </listener>
+
+    <!--
+     This listener checks for database compatibility and creates a Johnson event
+     in the case when the database should not be used.
+    -->
+    <listener>
+        <listener-class>com.atlassian.jira.appconsistency.db.DatabaseCompatibilityEnforcer</listener-class>
+    </listener>
+
+    <!-- Check consistency of database etc -->
+    <listener>
+        <listener-class>com.atlassian.jira.upgrade.ConsistencyLauncher</listener-class>
+    </listener>
+
+    <!-- Check for upgrades, and automatically perform them if neccessary. -->
+    <listener>
+        <listener-class>com.atlassian.jira.upgrade.UpgradeLauncher</listener-class>
+    </listener>
+
+    <!-- Launch the scheduler, which loads all the jobs from scheduler-config.xml -->
+    <listener>
+        <listener-class>com.atlassian.jira.scheduler.JiraSchedulerLauncher</listener-class>
+    </listener>
+
+    <!-- XML-RPC / SOAP Listener -->
+    <listener>
+        <listener-class>com.atlassian.jira.soap.axis.JiraAxisHttpListener</listener-class>
+    </listener>
+
+
+    <!-- servlets -->
+    <servlet>
+        <servlet-name>action</servlet-name>
+        <servlet-class>com.atlassian.jira.web.dispatcher.JiraServletDispatcher</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
+    <servlet>
+        <servlet-name>viewattachment</servlet-name>
+        <servlet-class>com.atlassian.jira.web.servlet.ViewAttachmentServlet</servlet-class>
+    </servlet>
+
+    <servlet>
+        <servlet-name>viewthumbnail</servlet-name>
+        <servlet-class>com.atlassian.jira.web.servlet.ViewThumbnailServlet</servlet-class>
+    </servlet>
+
+    <servlet>
+        <servlet-name>quicklink</servlet-name>
+        <servlet-class>com.atlassian.jira.servlet.QuickLinkServlet</servlet-class>
+    </servlet>
+
+    <!-- Used for tricking WebSphere 6.1.0.5 to push requests through the filter chain. This servlet
+    should never receive the actual requests as the requests should be intercepted, by e.g. URLRewrite filter.
+    Fixes JRA-12039 -->
+    <servlet>
+        <servlet-name>noopservlet</servlet-name>
+        <servlet-class>com.atlassian.jira.servlet.NoOpServlet</servlet-class>
+    </servlet>
+
+    <servlet>
+        <servlet-name>trackback</servlet-name>
+        <servlet-class>com.atlassian.trackback.TrackbackListenerServlet</servlet-class>
+        <init-param>
+            <param-name>trackbackStore</param-name>
+            <param-value>com.atlassian.jira.trackback.OfbizTrackbackStore</param-value>
+        </init-param>
+    </servlet>
+
+    <servlet>
+        <servlet-name>xmlrpc</servlet-name>
+        <servlet-class>com.atlassian.jira.web.servlet.rpc.XmlRpcServlet</servlet-class>
+    </servlet>
+
+    <servlet>
+        <servlet-name>pluginvelocityservlet</servlet-name>
+        <servlet-class>com.atlassian.jira.plugin.webwork.JiraPluginWebworkVelocityServlet</servlet-class>
+    </servlet>
+
+    <servlet>
+        <servlet-name>servlet-module-container-servlet</servlet-name>
+        <servlet-class>com.atlassian.jira.plugin.servlet.ServletModuleContainerServlet</servlet-class>
+    </servlet>
+
+    <!--
+    <servlet>
+    <servlet-name>ChartServlet</servlet-name>
+    <servlet-class>com.atlassian.jira.chart.ChartServlet</servlet-class>
+    </servlet>
+    -->
+
+    <servlet>
+        <servlet-name>logout</servlet-name>
+        <servlet-class>com.atlassian.seraph.logout.LogoutServlet</servlet-class>
+    </servlet>
+
+    <!-- Axis SOAP Servlet -->
+    <servlet>
+        <servlet-name>axis-soap</servlet-name>
+        <servlet-class>com.atlassian.jira.web.servlet.rpc.LazyAxisDecoratorServlet</servlet-class>
+        <init-param>
+            <param-name>httpRegistryRoot</param-name>
+            <param-value>/</param-value>
+        </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>
+        <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>
+        <init-param>
+            <param-name>fork</param-name>
+            <param-value>false</param-value>
+        </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>
+        <load-on-startup>4</load-on-startup>
+    </servlet>
+
+    <servlet>
+        <servlet-name>issue-view</servlet-name>
+        <servlet-class>com.atlassian.jira.web.servlet.IssueViewServlet</servlet-class>
+        <load-on-startup>4</load-on-startup>
+    </servlet>
+
+    <servlet>
+        <servlet-name>searchrequest-view</servlet-name>
+        <servlet-class>com.atlassian.jira.web.servlet.SearchRequestViewServlet</servlet-class>
+        <load-on-startup>4</load-on-startup>
+    </servlet>
+
+    <!-- Servlet for displaying lazily loaded portlets -->
+    <servlet>
+        <servlet-name>lazy-portlet-loader</servlet-name>
+        <servlet-class>com.atlassian.jira.web.servlet.LazyLoadingPortletServlet</servlet-class>
+    </servlet>
+
+    <!-- Sitemesh velocity decorator -->
+    <servlet>
+        <servlet-name>velocity-decorator</servlet-name>
+        <servlet-class>com.atlassian.jira.web.servlet.VelocityDecoratorServlet</servlet-class>
+    </servlet>
+
+    <!-- JCAPTCHA -->
+    <servlet>
+        <servlet-name>captcha</servlet-name>
+        <servlet-class>com.atlassian.jira.servlet.CaptchaServlet</servlet-class>
+        <load-on-startup>0</load-on-startup>
+    </servlet>
+
+    <servlet-mapping>
+        <servlet-name>captcha</servlet-name>
+        <url-pattern>/captcha</url-pattern>
+    </servlet-mapping>
+
+    <!-- end:JCAPTCHA -->
+
+    <servlet-mapping>
+        <servlet-name>file-server</servlet-name>
+        <url-pattern>/download/*</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>calendar.css</servlet-name>
+        <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>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>
+    </servlet-mapping>
+
+    <!--
+    <servlet-mapping>
+    <servlet-name>ChartServlet</servlet-name>
+    <url-pattern>/servlet/chart/*</url-pattern>
+    </servlet-mapping>
+    -->
+
+    <servlet-mapping>
+        <servlet-name>axis-soap</servlet-name>
+        <url-pattern>/rpc/soap/*</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>action</servlet-name>
+        <url-pattern>*.jspa</url-pattern>
+    </servlet-mapping>
+
+    <!-- These are dummy servlet mappings to trick WebSphere 6.1.0.5 to push the request through the filter chain, such
+    that the URLRewrite filter can rewrite the URLs. Fixes JRA-12039 -->
+    <servlet-mapping>
+        <servlet-name>noopservlet</servlet-name>
+        <url-pattern>/s/*</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>noopservlet</servlet-name>
+        <url-pattern>/databaseLockedError</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>viewattachment</servlet-name>
+        <url-pattern>/secure/attachment/*</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>viewthumbnail</servlet-name>
+        <url-pattern>/secure/thumbnail/*</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>quicklink</servlet-name>
+        <url-pattern>/browse/*</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>trackback</servlet-name>
+        <url-pattern>/rpc/trackback/*</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>xmlrpc</servlet-name>
+        <url-pattern>/rpc/xmlrpc</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>logout</servlet-name>
+        <url-pattern>/logout</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>pluginvelocityservlet</servlet-name>
+        <url-pattern>*.vm</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>DisplayChart</servlet-name>
+        <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>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>searchrequest-view</servlet-name>
+        <url-pattern>/sr/*</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>lazy-portlet-loader</servlet-name>
+        <url-pattern>/lazyLoader</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>velocity-decorator</servlet-name>
+        <url-pattern>*.vmd</url-pattern>
+    </servlet-mapping>
+
+    <!-- session config -->
+    <session-config>
+        <session-timeout>60</session-timeout>
+    </session-config>
+
+    <!-- mime mapping -->
+    <!-- currently the W3C havent settled on a media type for WSDL;
+    http://www.w3.org/TR/2003/WD-wsdl12-20030303/#ietf-draft
+    for now we go with the basic 'it's XML' response -->
+    <mime-mapping>
+        <extension>wsdl</extension>
+        <mime-type>text/xml</mime-type>
+    </mime-mapping>
+
+    <mime-mapping>
+        <extension>xsd</extension>
+        <mime-type>text/xml</mime-type>
+    </mime-mapping>
+
+    <!-- welcome files -->
+    <welcome-file-list>
+        <welcome-file>default.jsp</welcome-file>
+        <welcome-file>index.html</welcome-file>
+    </welcome-file-list>
+
+    <!-- error pages -->
+    <!-- commented out error pages for development
+    <error-page>
+    <error-code>404</error-code>
+    <location>/404page.jsp</location>
+    </error-page>-->
+    <error-page>
+        <error-code>500</error-code>
+        <location>/500page.jsp</location>
+    </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>
+
+    <!-- resource environment references -->
+
+    <!-- resource references -->
+    <!-- Uncomment for WebSphere
+    <resource-ref>
+        <description>Database for JIRA</description>
+        <res-ref-name>jdbc/JiraDS</res-ref-name>
+        <res-type>javax.sql.DataSource</res-type>
+        <res-auth>SERVLET</res-auth>
+        <res-sharing-scope>Unshareable</res-sharing-scope>
+    </resource-ref>
+    Uncomment for WebSphere -->
+
+
+    <!-- security contraints -->
+
+    <!-- login config -->
+
+    <!-- security roles -->
+
+    <!-- environment entries -->
+
+    <!-- ejb references -->
+
+    <!-- ejb local references -->
+</web-app>

data/spec/spec_helper.rb

@@ -8,12 +8,14 @@ require 'ucb_deployer'
 
 
 TEST_BUILD_DIR = File.expand_path(File.dirname(__FILE__) + "/build") unless defined?(TEST_BUILD_DIR)
-  
+
+
 Spec::Runner.configure do |config|
   config.before(:all) do
     dir = TEST_BUILD_DIR
     pwd = File.expand_path(File.dirname(__FILE__))
     
+    # setup confluence build dir
     FileUtils.mkdir_p("#{dir}/confluence/src/confluence/WEB-INF/classes")
     FileUtils.mkdir_p("#{dir}/confluence/src/confluence/WEB-INF/lib")
     
@@ -23,6 +25,15 @@ Spec::Runner.configure do |config|
                  "#{dir}/confluence/src/confluence/WEB-INF/classes")
     FileUtils.cp("#{pwd}/fixtures/confluence/confluence-init.properties",
                  "#{dir}/confluence/src/confluence/WEB-INF/classes")
+
+    # setup jira build dir
+    FileUtils.mkdir_p("#{dir}/jira/src/jira/WEB-INF/classes")
+    FileUtils.mkdir_p("#{dir}/jira/src/jira/WEB-INF/lib")
+    
+    FileUtils.cp("#{pwd}/fixtures/jira/web.xml",
+                 "#{dir}/jira/src/jira/WEB-INF")
+    FileUtils.cp("#{pwd}/fixtures/jira/seraph-config.xml",
+                 "#{dir}/jira/src/jira/WEB-INF/classes")
   end
   
   config.after(:all) do

data/spec/ucb_deployer/confluence_deployer_spec.rb

@@ -87,7 +87,7 @@ describe UcbDeployer::ConfluenceDeployer do
   describe "#build" do
     it "should work" do
       @cdep.build_dir = test_build_dir
-      @cdep.should_receive(:exec).with("sh #{@cdep.build_dir}/src/build.sh")
+      @cdep.should_receive("`").with("sh #{@cdep.build_dir}/src/build.sh")
       @cdep.build
     end
   end

data/spec/ucb_deployer/jira_deployer_spec.rb

@@ -0,0 +1,95 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe UcbDeployer::JiraDeployer do
+  
+  before(:each) do
+    @deploy_file = File.expand_path(File.dirname(__FILE__) + '/../fixtures/jira/deploy.yml')
+    @bad_deploy_file = File.expand_path(File.dirname(__FILE__) + '/../fixtures/jira/bad_deploy.yml')    
+    @cdep = UcbDeployer::JiraDeployer.new(@deploy_file)
+  end
+  
+  def test_build_dir
+    "#{TEST_BUILD_DIR}/jira"
+  end
+  
+  describe "#load_config" do
+    it "should load configuration options" do
+      @cdep.build_dir.should == "/path/to/build_dir/jira"
+      @cdep.deploy_dir.should == "/path/to/deploy_dir"
+      @cdep.war_name.should == "war_name"
+      @cdep.svn_project_url.should == "svn.berkeley.edu/svn/ist-svn/berkeley/projects/ist/as/webapps/jira_archives/tags"
+    end
+
+    it "should raise error for invalid config options" do
+      lambda { @cdep.load_config(@bad_deploy_file) }.should raise_error(UcbDeployer::ConfigError)
+    end
+  end
+  
+  describe "#config_web_xml" do
+    it "should configure souldwing (CAS auth) in web.xml" do
+      @cdep.build_dir = test_build_dir
+      # just checking if spec_helper did the right
+      File.exists?(@cdep.web_xml).should be_true
+
+      @cdep.config_web_xml
+      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 =~ /#{@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            
+    end
+  end
+  
+  
+  describe "#config_seraph_config_xml" do
+    it "should configure the soulwing (CAS) authenticator in seraph_config.xml" do
+      @cdep.build_dir = test_build_dir
+      # just checking if spec_helper did the right
+      File.exists?(@cdep.seraph_config_xml).should be_true
+
+      @cdep.config_seraph_config_xml
+      File.exists?(@cdep.seraph_config_xml).should be_true
+      lines = File.readlines(@cdep.seraph_config_xml)
+      lines.any? { |l| l =~ /<security-config>/ }.should be_true
+      lines.any? { |l| l =~ /#{Regexp.quote(@cdep.cas_authenticator_class)}/ }.should be_true
+      lines.any? { |l| l =~ /#{Regexp.quote(@cdep.cas_logout_url)}/ }.should be_true      
+      lines.any? { |l| l =~ /<\/security-config>/ }.should be_true            
+    end
+  end
+  
+  
+  describe "#reshuffle_jars" do
+    it "should work" do
+      @cdep.build_dir = test_build_dir
+      @cdep.reshuffle_jars
+      Dir["#{@cdep.build_dir}/src/jira/WEB-INF/lib/soulwing-casclient-*"].should_not be_empty
+      Dir["#{@cdep.build_dir}/src/jira/WEB-INF/lib/jotm*"].should_not be_empty
+      Dir["#{@cdep.build_dir}/src/jira/WEB-INF/lib/carol*"].should_not be_empty      
+    end
+  end
+
+  
+  describe "#build" do
+    it "should work" do
+      @cdep.build_dir = test_build_dir
+      @cdep.should_receive("`").with("sh #{@cdep.build_dir}/src/build.sh")
+      @cdep.build
+    end
+  end
+  
+
+  describe "#export" do
+    it "should work" do
+      cdep = UcbDeployer::JiraDeployer.new(@deploy_file)
+      cdep.build_dir = test_build_dir
+      cdep.version = "3.2.1_01"
+      arg = "svn export svn+ssh://#{cdep.svn_username}@#{cdep.svn_project_url}/jira-#{cdep.version}"
+      cdep.should_receive("`").with(arg).and_return(nil)
+      FileUtils.should_receive("mv")
+      cdep.export()
+    end
+  end
+  
+end

data/ucb_deployer.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ucb_deployer}
-  s.version = "0.0.10"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steven Hansen"]
-  s.date = %q{2010-10-22}
+  s.date = %q{2010-10-25}
   s.default_executable = %q{ucb_deploy}
   s.description = %q{Tool for deploying (Java/JRuby) 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: 11
+  hash: 27
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 10
-  version: 0.0.10
+  version: 0.1.0
 platform: ruby
 authors: 
 - Steven Hansen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-22 00:00:00 -07:00
+date: 2010-10-25 00:00:00 -07:00
 default_executable: 
 dependencies: []