ucb_deployer 0.1.8 → 0.1.9

data/Manifest

@@ -8,21 +8,7 @@ lib/ucb_deployer/confluence_deployer.rb
 lib/ucb_deployer/deployer.rb
 lib/ucb_deployer/jira_deployer.rb
 resources/confluence_cas_web.xml
-resources/jdom.jar
 resources/jira_cas_web.xml
-resources/jotm-2.0.13/carol-2.0.5.jar
-resources/jotm-2.0.13/commons-cli-1.0.jar
-resources/jotm-2.0.13/commons-logging.jar
-resources/jotm-2.0.13/connector-1_5.jar
-resources/jotm-2.0.13/howl-0.1.11.jar
-resources/jotm-2.0.13/jotm.jar
-resources/jotm-2.0.13/jotm_iiop_stubs.jar
-resources/jotm-2.0.13/jotm_jrmp_stubs.jar
-resources/jotm-2.0.13/jta-spec1_0_1.jar
-resources/jotm-2.0.13/jts1_0.jar
-resources/jotm-2.0.13/log4j.jar
-resources/jotm-2.0.13/objectweb-datasource.jar
-resources/jotm-2.0.13/xapool-1.5.0.jar
 resources/soulwing-casclient-0.5.3.jar
 spec/fixtures/confluence/bad_deploy.yml
 spec/fixtures/confluence/confluence-init.properties

data/README.txt

@@ -14,7 +14,7 @@ UCB Deployer is gem to automate confluence and jira  deployments to Tomcat.
 
 ==== Tomcat Setup
 We assume __Jira__ and __Confluence__ both have their own instance of tomcat (their own
-$CATALINA_HOME). For more information on this type of setup see:
+$CATALINA_BASE). For more information on this type of setup see:
 
 http://wikihub.berkeley.edu/x/RQAnAg
 
@@ -27,7 +27,7 @@ Where $HOME is the home directory of the user that will be doing the deployments
 we are using a special user __app_relmgt__ for this purpose.
 
 ==== JIRA: Move Jars into common/lib
-Make sure the following jars are in $CATALINA_HOME/common/lib
+Make sure the following jars are in $CATALINA_BASE/lib
 * activation-1.0.2.jar
 * javamail-1.3.3.jar
 * postgresql-8.3-604.jdbc3.jar

data/Rakefile

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

data/TODO.txt

@@ -3,3 +3,5 @@
 * Don't needlessly download source from svn everytime.  If source for requested version has
 already been pulled down to the filesystem, reuse it.
 
+* Confluence should have mail.jar and activation.jar removed from webapps/ROOT/WEB-INF/lib
+

data/lib/ucb_deployer/confluence_deployer.rb

@@ -10,7 +10,7 @@ module UcbDeployer
     
     def export()
       UcbDeployer.debug("Exporting from: #{svn_project_url}/confluence-#{version}")
-      pwd = Dir.getwd
+      pwd = Dir.getwd()
       Dir.chdir("#{build_dir}")
       FileUtils.rm_rf("#{build_dir}/src")
       `svn export svn+ssh://#{svn_username}@#{svn_project_url}/confluence-#{version}`
@@ -19,21 +19,21 @@ module UcbDeployer
       $stdout.puts("Export Completed")
     end
     
-    def configure
-      config_web_xml
-      config_seraph_config_xml
-      config_confluence_init_properties
-      reshuffle_jars
+    def configure()
+      config_web_xml()
+      config_seraph_config_xml()
+      config_confluence_init_properties()
+      reshuffle_jars()
     end
 
-    def build
-      pwd = Dir.getwd
+    def build()
+      pwd = Dir.getwd()
       Dir.chdir("#{build_dir}/src")
       `sh #{build_dir}/src/build.sh`
       Dir.chdir(pwd)    
     end
 
-    def deploy
+    def deploy()
       if File.exists?("#{deploy_dir}/#{war_name}")
         FileUtils.rm_rf(Dir["#{deploy_dir}/#{war_name}"])
       end
@@ -46,14 +46,14 @@ module UcbDeployer
       FileUtils.rm("#{deploy_dir}/#{war_name}/#{war_name}.war")
     end
 
-    def rollback
+    def rollback()
     end
 
-    def svn_username
+    def svn_username()
       @svn_username || "app_relmgt"
     end
     
-    def svn_base_url
+    def svn_base_url()
       @svn_base_url || "svn.berkeley.edu/svn/ist-svn/berkeley/projects/ist/as/webapps/confluence_archives"
     end
     
@@ -134,17 +134,24 @@ module UcbDeployer
     end
     
     ##
-    # Sets the confluence.home property in the file: confluence-init.properties
+    # Sets the confluence.home property in the file: confluence-init.properties.
     #
     def config_confluence_init_properties()
-      File.open(self.confluence_init_properties, "w") { |io| io.puts("confluence.home=#{data_dir}") }
+      File.open(self.confluence_init_properties, "w") do |io|
+        io.puts("confluence.home=#{data_dir}")
+      end
     end
-
+    
+    ##
+    # Remove application jars that  have been installed at the container level.
+    #
     def reshuffle_jars()
       FileUtils.cp(Dir["#{UcbDeployer::RESOURCES_DIR}/soulwing-casclient-*"],
                    "#{build_dir}/src/confluence/WEB-INF/lib/")
-      # 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-*"])
+      # Remove the jars that are installed at the container level
+      ["postgresql", "activation", "mail"].each do |jar|
+        FileUtils.rm_rf(Dir["#{build_dir}/src/confluence/WEB-INF/lib/#{jar}-*"])
+      end
     end
   end
 end

data/lib/ucb_deployer/jira_deployer.rb

@@ -10,7 +10,7 @@ module UcbDeployer
     
     def export()
       UcbDeployer.debug("Exporting from: #{svn_project_url}/jira-#{version}")
-      pwd = Dir.getwd
+      pwd = Dir.getwd()
       Dir.chdir("#{build_dir}")
       FileUtils.rm_rf("#{build_dir}/src")
       `svn export svn+ssh://#{svn_username}@#{svn_project_url}/jira-#{version}`
@@ -20,14 +20,14 @@ module UcbDeployer
     end
     
     def configure()
-      config_web_xml
-      config_seraph_config_xml
-      config_entityengine_xml      
-      reshuffle_jars
+      config_web_xml()
+      config_seraph_config_xml()
+      config_entityengine_xml()   
+      reshuffle_jars()
     end
 
     def build()
-      pwd = Dir.getwd
+      pwd = Dir.getwd()
       Dir.chdir("#{build_dir}/src")
       `sh #{build_dir}/src/build.sh`
       Dir.chdir(pwd)    
@@ -184,13 +184,12 @@ module UcbDeployer
     
     def reshuffle_jars()
       FileUtils.mkdir_p("#{build_dir}/src/edit-webapp/WEB-INF/lib/")
-      FileUtils.cp(Dir["#{UcbDeployer::RESOURCES_DIR}/jotm-2.0.13/*"],
-                   "#{build_dir}/src/edit-webapp/WEB-INF/lib/")
       FileUtils.cp(Dir["#{UcbDeployer::RESOURCES_DIR}/soulwing-casclient-*"],
                    "#{build_dir}/src/edit-webapp/WEB-INF/lib/")
-      # These have been placed in $CATALINA_HOME/common/lib
-      FileUtils.rm("#{build_dir}/src/webapp/WEB-INF/lib/activation-1.0.2.jar")
-      FileUtils.rm("#{build_dir}/src/webapp/WEB-INF/lib/javamail-1.3.3.jar")      
+      # These have been placed in $CATALINA_HOME/lib
+      ["activation", "javamail", "commons-logging", "log4j"].each do |jar|
+        FileUtils.rm_rf(Dir["#{build_dir}/src/webapp/WEB-INF/lib/#{jar}-*"])
+      end
     end
 
   end

data/spec/spec_helper.rb

@@ -18,6 +18,9 @@ Spec::Runner.configure do |config|
     # setup confluence build dir
     FileUtils.mkdir_p("#{dir}/confluence/src/confluence/WEB-INF/classes")
     FileUtils.mkdir_p("#{dir}/confluence/src/confluence/WEB-INF/lib")
+    FileUtils.touch("#{dir}/confluence/src/confluence/WEB-INF/lib/postgresql-1.3.3.jar")
+    FileUtils.touch("#{dir}/confluence/src/confluence/WEB-INF/lib/mail-1.3.3.jar")
+    FileUtils.touch("#{dir}/confluence/src/confluence/WEB-INF/lib/activation-1.3.3.jar")    
     
     FileUtils.cp("#{pwd}/fixtures/confluence/web.xml",
                  "#{dir}/confluence/src/confluence/WEB-INF")
@@ -31,7 +34,9 @@ Spec::Runner.configure do |config|
     FileUtils.mkdir_p("#{dir}/jira/src/edit-webapp/WEB-INF/classes")    
     FileUtils.mkdir_p("#{dir}/jira/src/webapp/WEB-INF/lib")
     FileUtils.touch("#{dir}/jira/src/webapp/WEB-INF/lib/activation-1.0.2.jar")
-    FileUtils.touch("#{dir}/jira/src/webapp/WEB-INF/lib/javamail-1.3.3.jar")        
+    FileUtils.touch("#{dir}/jira/src/webapp/WEB-INF/lib/javamail-1.3.3.jar")
+    FileUtils.touch("#{dir}/jira/src/webapp/WEB-INF/lib/commons-logging-1.3.3.jar")
+    FileUtils.touch("#{dir}/jira/src/webapp/WEB-INF/lib/log4j-1.3.3.jar")
     
     FileUtils.cp("#{pwd}/fixtures/jira/web.xml",
                  "#{dir}/jira/src/webapp/WEB-INF")

data/spec/ucb_deployer/confluence_deployer_spec.rb

@@ -8,7 +8,7 @@ describe UcbDeployer::ConfluenceDeployer do
     @cdep = UcbDeployer::ConfluenceDeployer.new(@deploy_file)
   end
   
-  def test_build_dir
+  def test_build_dir()
     "#{TEST_BUILD_DIR}/confluence"
   end
   
@@ -76,10 +76,12 @@ describe UcbDeployer::ConfluenceDeployer do
   
   describe "#reshuffle_jars" do
     it "should work" do
-      @cdep.build_dir = test_build_dir
-      @cdep.reshuffle_jars
+      @cdep.build_dir = test_build_dir()
+      @cdep.reshuffle_jars()
       Dir["#{@cdep.build_dir}/src/confluence/WEB-INF/lib/soulwing-casclient-*"].should_not be_empty
-      Dir["#{@cdep.build_dir}/src/confluence/WEB-INF/lib/postgresql-*"].should be_empty      
+      ["postgresql", "activation", "mail"].each do |jar|
+        Dir["#{@cdep.build_dir}/src/confluence/WEB-INF/lib/#{jar}-*"].should be_empty
+      end
     end
   end
 

data/spec/ucb_deployer/jira_deployer_spec.rb

@@ -8,7 +8,7 @@ describe UcbDeployer::JiraDeployer do
     @cdep = UcbDeployer::JiraDeployer.new(@deploy_file)
   end
   
-  def test_build_dir
+  def test_build_dir()
     "#{TEST_BUILD_DIR}/jira"
   end
   
@@ -79,20 +79,21 @@ describe UcbDeployer::JiraDeployer do
   
   describe "#reshuffle_jars" do
     it "should work" do
-      @cdep.build_dir = test_build_dir
-      @cdep.reshuffle_jars
+      @cdep.build_dir = test_build_dir()
+      @cdep.reshuffle_jars()
       Dir["#{@cdep.build_dir}/src/edit-webapp/WEB-INF/lib/soulwing-casclient-*"].should_not be_empty
-      Dir["#{@cdep.build_dir}/src/edit-webapp/WEB-INF/lib/jotm*"].should_not be_empty
-      Dir["#{@cdep.build_dir}/src/edit-webapp/WEB-INF/lib/carol*"].should_not be_empty      
+      ["activation", "javamail", "commons-logging", "log4j"].each do |lib|
+        Dir["#{@cdep.build_dir}/src/edit-webapp/WEB-INF/lib/#{lib}-*"].should be_empty
+      end
     end
   end
 
   
   describe "#build" do
     it "should work" do
-      @cdep.build_dir = test_build_dir
+      @cdep.build_dir = test_build_dir()
       @cdep.should_receive("`").with("sh #{@cdep.build_dir}/src/build.sh")
-      @cdep.build
+      @cdep.build()
     end
   end
   
@@ -100,7 +101,7 @@ describe UcbDeployer::JiraDeployer do
   describe "#export" do
     it "should work" do
       cdep = UcbDeployer::JiraDeployer.new(@deploy_file)
-      cdep.build_dir = test_build_dir
+      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)

data/ucb_deployer.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ucb_deployer}
-  s.version = "0.1.8"
+  s.version = "0.1.9"
 
   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-26}
+  s.date = %q{2010-11-17}
   s.default_executable = %q{ucb_deploy}
   s.description = %q{Tool for deploying (Java/JRuby) war files to tomcat}
   s.email = %q{runner@berkeley.edu}
   s.executables = ["ucb_deploy"]
   s.extra_rdoc_files = ["README.txt", "lib/ucb_deployer.rb", "lib/ucb_deployer/confluence_deployer.rb", "lib/ucb_deployer/deployer.rb", "lib/ucb_deployer/jira_deployer.rb"]
-  s.files = ["Manifest", "README.txt", "Rakefile", "TODO.txt", "bin/ucb_deploy", "lib/ucb_deployer.rb", "lib/ucb_deployer/confluence_deployer.rb", "lib/ucb_deployer/deployer.rb", "lib/ucb_deployer/jira_deployer.rb", "resources/confluence_cas_web.xml", "resources/jdom.jar", "resources/jira_cas_web.xml", "resources/jotm-2.0.13/carol-2.0.5.jar", "resources/jotm-2.0.13/commons-cli-1.0.jar", "resources/jotm-2.0.13/commons-logging.jar", "resources/jotm-2.0.13/connector-1_5.jar", "resources/jotm-2.0.13/howl-0.1.11.jar", "resources/jotm-2.0.13/jotm.jar", "resources/jotm-2.0.13/jotm_iiop_stubs.jar", "resources/jotm-2.0.13/jotm_jrmp_stubs.jar", "resources/jotm-2.0.13/jta-spec1_0_1.jar", "resources/jotm-2.0.13/jts1_0.jar", "resources/jotm-2.0.13/log4j.jar", "resources/jotm-2.0.13/objectweb-datasource.jar", "resources/jotm-2.0.13/xapool-1.5.0.jar", "resources/soulwing-casclient-0.5.3.jar", "spec/fixtures/confluence/bad_deploy.yml", "spec/fixtures/confluence/confluence-init.properties", "spec/fixtures/confluence/deploy.yml", "spec/fixtures/confluence/seraph-config.xml", "spec/fixtures/confluence/web.xml", "spec/fixtures/jira/bad_deploy.yml", "spec/fixtures/jira/deploy.yml", "spec/fixtures/jira/entityengine.xml", "spec/fixtures/jira/seraph-config.xml", "spec/fixtures/jira/web.xml", "spec/spec_helper.rb", "spec/ucb_deployer/confluence_deployer_spec.rb", "spec/ucb_deployer/jira_deployer_spec.rb", "spec/ucb_deployer/ucb_deployer_spec.rb", "ucb_deployer.gemspec"]
+  s.files = ["Manifest", "README.txt", "Rakefile", "TODO.txt", "bin/ucb_deploy", "lib/ucb_deployer.rb", "lib/ucb_deployer/confluence_deployer.rb", "lib/ucb_deployer/deployer.rb", "lib/ucb_deployer/jira_deployer.rb", "resources/confluence_cas_web.xml", "resources/jira_cas_web.xml", "resources/soulwing-casclient-0.5.3.jar", "spec/fixtures/confluence/bad_deploy.yml", "spec/fixtures/confluence/confluence-init.properties", "spec/fixtures/confluence/deploy.yml", "spec/fixtures/confluence/seraph-config.xml", "spec/fixtures/confluence/web.xml", "spec/fixtures/jira/bad_deploy.yml", "spec/fixtures/jira/deploy.yml", "spec/fixtures/jira/entityengine.xml", "spec/fixtures/jira/seraph-config.xml", "spec/fixtures/jira/web.xml", "spec/spec_helper.rb", "spec/ucb_deployer/confluence_deployer_spec.rb", "spec/ucb_deployer/jira_deployer_spec.rb", "spec/ucb_deployer/ucb_deployer_spec.rb", "ucb_deployer.gemspec"]
   s.homepage = %q{http://ucbrb.rubyforge.org}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Ucb_deployer", "--main", "README.txt"]
   s.require_paths = ["lib"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ucb_deployer
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 1
-  - 8
-  version: 0.1.8
+  - 9
+  version: 0.1.9
 platform: ruby
 authors: 
 - Steven Hansen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-26 00:00:00 -07:00
+date: 2010-11-17 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -42,21 +42,7 @@ files:
 - lib/ucb_deployer/deployer.rb
 - lib/ucb_deployer/jira_deployer.rb
 - resources/confluence_cas_web.xml
-- resources/jdom.jar
 - resources/jira_cas_web.xml
-- resources/jotm-2.0.13/carol-2.0.5.jar
-- resources/jotm-2.0.13/commons-cli-1.0.jar
-- resources/jotm-2.0.13/commons-logging.jar
-- resources/jotm-2.0.13/connector-1_5.jar
-- resources/jotm-2.0.13/howl-0.1.11.jar
-- resources/jotm-2.0.13/jotm.jar
-- resources/jotm-2.0.13/jotm_iiop_stubs.jar
-- resources/jotm-2.0.13/jotm_jrmp_stubs.jar
-- resources/jotm-2.0.13/jta-spec1_0_1.jar
-- resources/jotm-2.0.13/jts1_0.jar
-- resources/jotm-2.0.13/log4j.jar
-- resources/jotm-2.0.13/objectweb-datasource.jar
-- resources/jotm-2.0.13/xapool-1.5.0.jar
 - resources/soulwing-casclient-0.5.3.jar
 - spec/fixtures/confluence/bad_deploy.yml
 - spec/fixtures/confluence/confluence-init.properties