installer.rb in kpm-0.11.1

- old
+ new

@@ -85,13 +85,13 @@
                     else
                       nil
                     end
       bundles_dir ||= DEFAULT_BUNDLES_DIR
 
-      help = nil
       unless @config.nil?
-        help = install_tomcat if @config['webapp_path'].nil?
+        raise ArgumentError, "Aborting installation, no webapp_path specified in config: #{@config}" if @config['webapp_path'].nil?
+
         install_killbill_server(@config['group_id'], @config['artifact_id'], @config['packaging'], @config['classifier'], @config['version'], @config['webapp_path'], bundles_dir, force_download, verify_sha1)
         install_plugins(bundles_dir, @config['version'], force_download, verify_sha1)
         install_default_bundles(bundles_dir, @config['default_bundles_version'], @config['version'], force_download, verify_sha1) unless @config['default_bundles'] == false
         clean_up_descriptors(bundles_dir)
       end
@@ -103,28 +103,13 @@
         end
 
         install_kaui(@kaui_config['group_id'], @kaui_config['artifact_id'], @kaui_config['packaging'], @kaui_config['classifier'], @kaui_config['version'], @kaui_config['webapp_path'], bundles_dir, force_download, verify_sha1)
       end
 
-      @trace_logger.add('help', nil, help)
       @trace_logger.to_json
     end
 
     private
-
-    def install_tomcat(dir = Dir.pwd)
-      # Download and unpack Tomcat
-      manager = KPM::TomcatManager.new(dir, @logger)
-      manager.download
-
-      # Update main config
-      root_war_path = manager.setup
-      @config['webapp_path'] = root_war_path
-      @kaui_config['webapp_path'] = Pathname.new(File.dirname(root_war_path)).join('kaui.war').to_s unless @kaui_config.nil?
-
-      # Help message
-      manager.help
-    end
 
     def install_plugins(bundles_dir, raw_kb_version, force_download, verify_sha1)
       install_java_plugins(bundles_dir, raw_kb_version, force_download, verify_sha1)
     end
 