ucb_deployer 0.2.1 → 0.3.0

data/Manifest

@@ -8,8 +8,10 @@ lib/ucb_deployer/confluence_deployer.rb
 lib/ucb_deployer/deployer.rb
 lib/ucb_deployer/jira_deployer.rb
 resources/confluence_cas_web.xml
+resources/ist_banner.jpg
 resources/jira_cas_web.xml
-resources/soulwing-casclient-0.5.3.jar
+resources/soulwing-casclient-0.5.3-1.jar
+resources/xwork.xml
 spec/fixtures/confluence/bad_deploy.yml
 spec/fixtures/confluence/confluence-init.properties
 spec/fixtures/confluence/deploy.yml

data/Rakefile

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

data/TODO.md

@@ -4,4 +4,7 @@
   version has already been pulled down to the filesystem, reuse it.
 * For commands like display_maintenance_file and remove_maintenance_file, you should 
   not need to pass int the VERSION option
+* Currently we're bundling our own copy of xwork.xml for Confluence, modifiying it and
+then deploying.  A better long term strategy would be to unjar WEB-INF/lib/confluence-3.4.2.jar
+during the deployment process and modify its xwork.xml, then rejar it.
 

data/lib/ucb_deployer/confluence_deployer.rb

@@ -23,6 +23,7 @@ module UcbDeployer
       config_web_xml()
       config_seraph_config_xml()
       config_confluence_init_properties()
+      config_xwork_xml()
       reshuffle_jars()
     end
 
@@ -143,7 +144,24 @@ module UcbDeployer
     end
     
     ##
-    # Remove application jars that  have been installed at the container level.
+    # Shortcut to xwork.xml file
+    #
+    def xwork_xml()
+      "#{build_dir}/src/confluence/WEB-INF/classes/xwork.xml"
+    end
+    
+    ##
+    # Alter xwork.xml so soulwing authenticator works with CAS
+    #
+    def config_xwork_xml()
+      template = File.open("#{UcbDeployer::RESOURCES_DIR}/xwork.xml") { |f| f.read }
+      xml = ERB.new(template).result(self.send(:binding))
+      FileUtils.touch(xwork_xml())
+      File.open(xwork_xml(), "w") { |io| io.puts(xml) }
+    end
+      
+    ##
+    # Remove application jars that have been installed at the container level.
     #
     def reshuffle_jars()
       FileUtils.cp(Dir["#{UcbDeployer::RESOURCES_DIR}/soulwing-casclient-*"],

data/lib/ucb_deployer/jira_deployer.rb

@@ -24,6 +24,7 @@ module UcbDeployer
       config_seraph_config_xml()
       config_entityengine_xml()
       config_jira_application_properties()
+      config_ist_banner()      
       reshuffle_jars()
     end
 
@@ -50,6 +51,11 @@ module UcbDeployer
     def rollback()
     end
 
+    def cas_logout_url()
+      "/casLogout.action"
+    end
+    
+    
     ##
     # Shortcut to jira web.xml file
     #
@@ -57,33 +63,36 @@ module UcbDeployer
       "#{build_dir}/src/webapp/WEB-INF/web.xml"
     end
     
-    ##
-    # Shortcut to jira entityengine.xml file
-    #
-    def entityengine_xml()
-      "#{build_dir}/src/edit-webapp/WEB-INF/classes/entityengine.xml"
+    def web_xml_token()
+      "appropriate error message for any requests. Basically it locks JIRA. -->"
     end
     
     ##
-    # Shortcut to jira seraph-config.xml file
+    # Updates the jira web.xml file with the soulwing (CAS library)
+    # authentication configuration
     #
-    def seraph_config_xml()
-      "#{build_dir}/src/webapp/WEB-INF/classes/seraph-config.xml"
+    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 }
+          line + 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
     
     ##
-    # Shortcut to jira-application.properties file
+    # Shortcut to jira entityengine.xml file
     #
-    def jira_application_properties()
-      "#{build_dir}/src/edit-webapp/WEB-INF/classes/jira-application.properties"
-    end
-    
-    def web_xml_token()
-      "appropriate error message for any requests. Basically it locks JIRA. -->"
-    end
-    
-    def seraph_config_xml_auth_class_token()
-      "com.atlassian.jira.security.login.JiraOsUserAuthenticator"
+    def entityengine_xml()
+      "#{build_dir}/src/edit-webapp/WEB-INF/classes/entityengine.xml"
     end
     
     def entityengine_xml_db_token()
@@ -94,22 +103,6 @@ module UcbDeployer
       "schema-name=\"PUBLIC\""
     end
     
-    def jira_home_token()
-      "jira.home ="
-    end
-    
-    def seraph_config_xml_logout_url_token()
-      "/secure/Logout!default.jspa"
-    end
-    
-    def cas_authenticator_class()
-      "org.soulwing.cas.apps.atlassian.JiraCasAuthenticator"
-    end
-    
-    def cas_logout_url()
-      "/casLogout.action"
-    end
-
     def entityengine_db()
       "field-type-name=\"postgres72\""
     end
@@ -118,27 +111,6 @@ module UcbDeployer
       "schema-name=\"jira_app\""
     end
     
-    ##
-    # 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 }
-          line + 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 jira entityengine.xml file with the correct database configs
     #
@@ -166,6 +138,25 @@ module UcbDeployer
       end
     end
     
+    ##
+    # Shortcut to jira seraph-config.xml file
+    #
+    def seraph_config_xml()
+      "#{build_dir}/src/webapp/WEB-INF/classes/seraph-config.xml"
+    end
+    
+    def seraph_config_xml_auth_class_token()
+      "com.atlassian.jira.security.login.JiraOsUserAuthenticator"
+    end
+    
+    def seraph_config_xml_logout_url_token()
+      "/secure/Logout!default.jspa"
+    end
+    
+    def cas_authenticator_class()
+      "org.soulwing.cas.apps.atlassian.JiraCasAuthenticator"
+    end
+    
     ##
     # Updates the jira seraph_config.xml file with the soulwing
     # authenticator.
@@ -181,7 +172,7 @@ module UcbDeployer
           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}"
+          new_str = "#{m.pre_match}#{cas_server_url}/logout#{m.post_match}"
           debug(new_str)
           new_str
         else
@@ -194,6 +185,17 @@ module UcbDeployer
       end
     end
     
+    ##
+    # Shortcut to jira-application.properties file
+    #
+    def jira_application_properties()
+      "#{build_dir}/src/edit-webapp/WEB-INF/classes/jira-application.properties"
+    end
+    
+    def jira_home_token()
+      "jira.home ="
+    end
+    
     ##
     # Sets the jira.home property in the file: jira-application.properties.
     #
@@ -213,7 +215,19 @@ module UcbDeployer
         jira_props.each { |line| io.puts(line) }
       end
     end
+
+    ##
+    # Places IST banner jpg in imaages directory
+    #
+    def config_ist_banner()
+      FileUtils.cp("#{UcbDeployer::RESOURCES_DIR}/ist_banner.jpg",
+                   "#{build_dir}/src/webapp/images/")      
+    end
     
+    ##
+    # Remove jars from WEB-INF/lib that have been installed at the container
+    # level to avoid conflicts.
+    #
     def reshuffle_jars()
       FileUtils.mkdir_p("#{build_dir}/src/edit-webapp/WEB-INF/lib/")
       FileUtils.cp(Dir["#{UcbDeployer::RESOURCES_DIR}/soulwing-casclient-*"],

data/resources/jira_cas_web.xml

@@ -44,7 +44,7 @@
   <init-param> 
     <param-name>bypassPaths</param-name> 
     <param-value>
-      /rpc/*, /images/*, /styles/*, /secure/Logout!default.jspa
+      /rpc/*, /images/*, /styles/*, /rest/, /secure/Logout!default.jspa
     </param-value> 
   </init-param> 
 </filter>