webroar 0.2.2 → 0.2.3

data/src/admin_panel/app/helpers/graph_helper.rb

@@ -1,6 +1,6 @@
 #--
 # WebROaR - Ruby Application Server - http://webroar.in/
-# Copyright (C) 2009  WebROaR
+# Copyright (C) 2009  Goonj LLC
 #
 # This file is part of WebROaR.
 #

data/src/admin_panel/app/models/app.rb

@@ -1,6 +1,6 @@
 #--
 # WebROaR - Ruby Application Server - http://webroar.in/
-# Copyright (C) 2009  WebROaR
+# Copyright (C) 2009  Goonj LLC
 #
 # This file is part of WebROaR.
 #
@@ -29,6 +29,42 @@ class App < ActiveRecord::Base
       return app
     end
   end
-      
+  
+    # Start the application
+  def self.start(app_name)
+    ctl = Control.new(app_name)
+    reply = nil
+    err_obj = nil
+    begin
+      reply = ctl.add    
+    rescue Exception => e
+      err_obj = e      
+      reply = "An error occurred while sending 'start' request for application '#{app_name}'. Please refer the '/var/log/webroar/Admin_panel.production.log' file for details."
+    end
+    return reply, e
+  end
+  
+  # Stop the application
+  def self.stop(app_name)
+    ctl = Control.new(app_name)
+    reply = nil
+    begin
+      reply = ctl.delete      
+    rescue Exception => e
+      reply = "An error occurred while sending 'stop' request for application '#{app_name}'. Please refer the '/var/log/webroar/Admin_panel.production.log' file for details."
+    end
+    return reply
+  end
+  
+  # Restart the application
+  def self.restart(app_name)
+    ctl = Control.new(app_name)
+    reply = nil
+    begin
+      reply = ctl.restart
+    rescue Exception => e
+      reply = "An error occurred while sending 'stop' request for application '#{app_name}'. Please refer the '/var/log/webroar/Admin_panel.production.log' file for details."
+    end
+    return reply
+  end    
 end
-

data/src/admin_panel/app/models/app_exception.rb

@@ -1,6 +1,6 @@
 #--
 # WebROaR - Ruby Application Server - http://webroar.in/
-# Copyright (C) 2009  WebROaR
+# Copyright (C) 2009  Goonj LLC
 #
 # This file is part of WebROaR.
 #

data/src/admin_panel/app/models/app_time_sample.rb

@@ -1,6 +1,6 @@
 #--
 # WebROaR - Ruby Application Server - http://webroar.in/
-# Copyright (C) 2009  WebROaR
+# Copyright (C) 2009  Goonj LLC
 #
 # This file is part of WebROaR.
 #
@@ -61,7 +61,7 @@ class AppTimeSample < ActiveRecord::Base
           end
       end
       max,slab = get_max_and_slab(max)
-      step = interval / 20
+      step = (interval + 1) / 20
       return wall_time, final_data, max, slab, step
     end
     

data/src/admin_panel/app/models/application_specification.rb

@@ -1,6 +1,6 @@
 #--
 # WebROaR - Ruby Application Server - http://webroar.in/
-# Copyright (C) 2009  WebROaR
+# Copyright (C) 2009  Goonj LLC
 #
 # This file is part of WebROaR.
 #
@@ -32,12 +32,13 @@ class ApplicationSpecification < PseudoModel
   column :min_worker, :number
   column :max_worker, :number
   validates_presence_of :name, :resolver, :path, :run_as_user, :type1, :environment
-  validates_numericality_of :min_worker, :max_worker
+  validates_numericality_of :min_worker, :max_worker, :greater_than_or_equal_to => 1, :less_than_or_equal_to => 20
   validates_format_of :name, :with => /^[A-Za-z0-9_\-]*$/i, :message => " must consist of A-Z, a-z, 0-9 , _ , -  and /."
-  validates_format_of :path, :with => /^\/.*$/i, :message => "entered is not the complete path for your web application root directory."
+#  validates_format_of :path, :with => /^\/.*$/i, :message => "entered is not the complete path for your web application root directory."
   validates_length_of :name, :maximum => 30
   #validates_length_of :path, :maximum => 256
   validates_length_of :run_as_user, :maximum => 30  
+  validates_length_of :environment, :maximum => 30
   #  validates_format_of :baseuri, :with => /^\/[A-Za-z0-9_\-\/]*$/i, :message => "must start with '/' and contains characters A-Z, a-z, 0-9 , _ , -  and /."
 
   def write
@@ -74,17 +75,28 @@ class ApplicationSpecification < PseudoModel
   
   #this method is used to validate the various fields of the apps model.
   def validate     
-    errors.add_to_base MIN_WORKERS_VALIDATION if min_worker.to_i > 20
+#    errors.add_to_base MIN_WORKERS_VALIDATION if min_worker.to_i > 20
     if max_worker.to_i < min_worker.to_i
       errors.add_to_base MAX_WORKERS_VALIDATION_1
-    elsif max_worker.to_i > 20
-      errors.add_to_base MAX_WORKERS_VALIDATION_2
+#    elsif max_worker.to_i > 20
+#      errors.add_to_base MAX_WORKERS_VALIDATION_2
     end
-    errors.add_to_base APPLICATION_PATH_EXISTANCE_VALIDATION if !File.directory?(path)
+#    errors.add_to_base APPLICATION_PATH_EXISTANCE_VALIDATION if !File.directory?(path)
     errors.add_to_base ANALYTICS_VALIDATION if type1=="Rails" and !(analytics.downcase == "enabled" or analytics.downcase == "disabled")
-    errors.add_to_base ENVIRONMENT_VALIDATION if !(environment.downcase == "production" or environment.downcase == "development" or environment.downcase == "test")
-    errors.add_to_base TYPE_VALIDATION if !(type1.downcase == "rails" or type1.downcase == "rack")
-      
+    #errors.add_to_base ENVIRONMENT_VALIDATION if !(environment.downcase == "production" or environment.downcase == "development" or environment.downcase == "test")
+    errors.add_to_base TYPE_VALIDATION if !(type1.downcase == RAILS or type1.downcase == RACK)
+    if path and type1
+      if type1.downcase == RAILS
+        unless File.exists?(File.join(path, 'config', 'environment.rb'))
+          errors.add_to_base "The entered application path is not a valid Rails application path."
+        end
+      end
+      if type1.downcase == RACK
+        unless File.exists?(File.join(path, 'config.ru'))
+          errors.add_to_base "The entered application path is not a valid Rack application path."
+        end
+      end      
+    end  
     # Resolver take either baseuri or host_names, not both. 
     # baseuri starts with '/'      
     tokens = resolver.split(/ /)
@@ -311,5 +323,17 @@ class ApplicationSpecification < PseudoModel
 
       return app_hash  
     end
+
+    def get_application_id_from_name(application_name)
+        info = YAML::load_file(CONFIG_FILE_PATH) rescue nil
+        i = 0 
+        while info['Application Specification']
+          if info['Application Specification'][i]['name'] == application_name
+            break
+          end
+          i +=1
+        end  
+        return i
+    end  
   end
 end

data/src/admin_panel/app/models/mail_specification.rb

@@ -0,0 +1,139 @@
+#--
+# WebROaR - Ruby Application Server - http://webroar.in/
+# Copyright (C) 2009  Goonj LLC
+#
+# This file is part of WebROaR.
+#
+# WebROaR is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# WebROaR is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with WebROaR.  If not, see <http://www.gnu.org/licenses/>.
+#++
+
+class MailSpecification 
+  class << self
+  
+    def validate_sendmail_specification(sendmail)
+      str = ""
+      str = SENDMAIL_LOCATION_VALIDATION if sendmail[:location].strip.length < 1
+      if sendmail[:from].strip.length == 0
+        str += SENDMAIL_SENDER_EMAIL_VALIDATION1
+      elsif !/^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i.match(sendmail[:from].strip)
+        str += SENDMAIL_SENDER_EMAIL_VALIDATION      
+      end
+  
+      if sendmail[:recipients].length == 0
+        str += SENDMAIL_RECIPIENT_EMAIL_VALIDATION1
+      else
+        flag = 0  
+        str1 = "<ul>"
+        recipients = sendmail[:recipients].split(",")
+        recipients.each do |recipient|
+          if !/^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i.match(recipient.strip)
+            flag = 1
+            str1 += "<li>#{recipient.strip}</li>"
+          end
+        end
+        str1 += "</ul>"
+        str += "<li>#{SENDMAIL_RECIPIENT_EMAIL_VALIDATION}-#{str1}</li>" if flag == 1
+      end
+      return str
+    end
+    
+    def save_sendmail_specification(sendmail)
+      data = sendmail_specification_hash(sendmail) 
+      data = {'sendmail' => data}
+      YAMLWriter.write(data, MAIL_FILE_PATH, "sendmail")
+    end
+    
+    def sendmail_specification_hash(sendmail=nil)
+      if sendmail # create Hash from passed argument
+        Hash[
+            'location' => sendmail[:location],
+            'arguments' => "-f",
+            'from' => sendmail[:from],
+            'recipients' => sendmail[:recipients]
+            ]
+      else # render default values
+        Hash[
+            'location' => '',
+            'from' => '',
+            'recipients' => ''
+            ]
+      end
+    end
+    
+    def validate_smtp_specification(smtp)
+      str = ""
+      str += SMTP_ADDRESS_VALIDATION if smtp[:address].strip.length < 1
+      str += SMTP_PORT_VALIDATION if smtp[:port].strip.to_i < 1
+      str += SMTP_DOMAIN_VALIDATION if smtp[:domain].strip.length < 1
+      str += SMTP_AUTHENTICATION_VALIDATION if smtp[:authentication].strip.length < 1
+      str += SMTP_USER_NAME_VALIDATION if smtp[:user_name].strip.length < 1
+      str += SMTP_PASSWORD_VALIDATION if smtp[:password].length < 1
+  
+      if smtp[:from].strip.length == 0
+        str += SENDMAIL_SENDER_EMAIL_VALIDATION1
+      elsif !/^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i.match(smtp[:from].strip)
+        str += SENDMAIL_SENDER_EMAIL_VALIDATION
+      end
+    
+      if smtp[:recipients].strip.length == 0
+        str += SENDMAIL_RECIPIENT_EMAIL_VALIDATION1
+      else
+        flag = 0  
+        str1 = "<ul>"
+        recipients = smtp[:recipients].split(",")
+        recipients.each do |recipient|
+          if !/^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i.match(recipient.strip)
+            flag = 1
+            str1 += "<li>#{recipient.strip}</li>"
+          end
+        end
+        str1 += "</ul>"
+        str += "<li>#{SENDMAIL_RECIPIENT_EMAIL_VALIDATION}-#{str1}</li>" if flag == 1    
+      end
+      return str
+    end
+    
+    def save_smtp_specification(smtp)
+      data = smtp_specification_hash(smtp) 
+      data = {'smtp' => data}
+      YAMLWriter.write(data, MAIL_FILE_PATH, "smtp")
+    end
+    
+    def smtp_specification_hash(smtp=nil)
+      if smtp   # create Hash from passed argument  
+        Hash[
+            'address' => smtp[:address],
+            'port' => smtp[:port],
+            'domain' => smtp[:domain],
+            'authentication' => smtp[:authentication],
+            'user_name' => smtp[:user_name],
+            'password' => smtp[:password],
+            'from' => smtp[:from],
+            'recipients' => smtp[:recipients]
+            ]
+      else
+        Hash[
+            'address' => "",
+            'port' => '25',
+            'domain' => "",
+            'authentication' => "login",
+            'user_name' => "",
+            'password' => "",
+            'from' => "",
+            'recipients' => ""
+            ]
+      end
+    end 
+  end
+end

data/src/admin_panel/app/models/pseudo_model.rb

@@ -1,6 +1,6 @@
 #--
 # WebROaR - Ruby Application Server - http://webroar.in/
-# Copyright (C) 2009  WebROaR
+# Copyright (C) 2009  Goonj LLC
 #
 # This file is part of WebROaR.
 #

data/src/admin_panel/app/models/resource_usage.rb

@@ -1,6 +1,6 @@
 #--
 # WebROaR - Ruby Application Server - http://webroar.in/
-# Copyright (C) 2009  WebROaR
+# Copyright (C) 2009  Goonj LLC
 #
 # This file is part of WebROaR.
 #
@@ -90,7 +90,7 @@ class ResourceUsage < ActiveRecord::Base
       end
       max, slab = get_max_and_slab(max)
       fill_gaps!(final_data)
-      step = interval / 20
+      step = (interval + 1) / 20
       return wall_time, final_data, max, slab, step
     end
 
@@ -129,7 +129,7 @@ class ResourceUsage < ActiveRecord::Base
 
       max,slab = get_max_and_slab(max)
       fill_gaps!(final_data)
-      step = interval / 20
+      step = (interval + 1) / 20
       return wall_time, final_data, max, slab, step
     end
 

data/src/admin_panel/app/models/server_specification.rb

@@ -1,6 +1,6 @@
 #--
 # WebROaR - Ruby Application Server - http://webroar.in/
-# Copyright (C) 2009  WebROaR
+# Copyright (C) 2009  Goonj LLC
 #
 # This file is part of WebROaR.
 #
@@ -27,28 +27,28 @@ class ServerSpecification
       error_message = ''
       case field
       when 'port_div'
-        if data.to_i > 0 and data.to_i < 65535
+        if data =~ /^\d+$/ and data.to_i > 0 and data.to_i < 65535
           port = data.to_i
         else
           error_message = SERVER_PORT_VALIDATION
         end
         text = port
       when 'min_pro_div'
-        if data.to_i > 0 and data.to_i <= 20 and data.to_i <= info['Server Specification']['max_worker'].to_i
+        if data =~ /^\d+$/ and data.to_i > 0 and data.to_i <= 20 and data.to_i <= info['Server Specification']['max_worker'].to_i
           min_worker = data.to_i
         else
           error_message = MINIMUM_WORKERS_VALIDATION
         end
         text = min_worker
       when 'max_pro_div'
-        if data.to_i > 0 and data.to_i <= 20 and data.to_i >= info['Server Specification']['min_worker'].to_i
+        if data =~ /^\d+$/ and data.to_i > 0 and data.to_i <= 20 and data.to_i >= info['Server Specification']['min_worker'].to_i
           max_worker = data.to_i
         else
           error_message = MAXIMUM_WORKERS_VALIDATION
         end
         text = max_worker
       when 'ssl_port_div'
-        if data.to_i > 0 and data.to_i < 65535
+        if data =~ /^\d+$/ and data.to_i > 0 and data.to_i < 65535
           ssl_port = data.to_i
         else
           error_message = SSL_PORT_VALIDATION

data/src/admin_panel/app/models/url_breakup_time_sample.rb

@@ -1,6 +1,6 @@
 #--
 # WebROaR - Ruby Application Server - http://webroar.in/
-# Copyright (C) 2009  WebROaR
+# Copyright (C) 2009  Goonj LLC
 #
 # This file is part of WebROaR.
 #

data/src/admin_panel/app/models/url_time_sample.rb

@@ -1,6 +1,6 @@
 #--
 # WebROaR - Ruby Application Server - http://webroar.in/
-# Copyright (C) 2009  WebROaR
+# Copyright (C) 2009  Goonj LLC
 #
 # This file is part of WebROaR.
 #
@@ -56,17 +56,17 @@ class UrlTimeSample < ActiveRecord::Base
             max = data
           end
         end
-        if urls.size < 20
-          for i in 0..19 - urls.size
+        if urls.size < 15
+          for i in 0..14 - urls.size
             urls << ""
             final_data << 0
           end
         else
-          urls = urls[0..24]
-          final_data = final_data[0..24]
+          urls = urls[0..14]
+          final_data = final_data[0..14]
         end
       end
-      max, slab=get_max_and_slab(max)
+      max, slab = get_max_and_slab(max)
       return urls, final_data, max, slab
     end
     

data/src/admin_panel/app/models/user.rb

@@ -1,6 +1,6 @@
 #--
 # WebROaR - Ruby Application Server - http://webroar.in/
-# Copyright (C) 2009  WebROaR
+# Copyright (C) 2009  Goonj LLC
 #
 # This file is part of WebROaR.
 #

data/src/admin_panel/app/views/admin/_add_div.html.erb

@@ -1,6 +1,6 @@
 <!--
 WebROaR - Ruby Application Server - http://webroar.in/
-Copyright (C) 2009  WebROaR
+Copyright (C) 2009  Goonj LLC
 
 This file is part of WebROaR.
 

data/src/admin_panel/app/views/admin/_application_table.html.erb

@@ -1,6 +1,6 @@
 <!--
 WebROaR - Ruby Application Server - http://webroar.in/
-Copyright (C) 2009  WebROaR
+Copyright (C) 2009  Goonj LLC
 
 This file is part of WebROaR.
 

data/src/admin_panel/app/views/admin/change_password_form.html.erb

@@ -1,6 +1,6 @@
 <!--
 WebROaR - Ruby Application Server - http://webroar.in/
-Copyright (C) 2009  WebROaR
+Copyright (C) 2009  Goonj LLC
 
 This file is part of WebROaR.
 

data/src/admin_panel/app/views/admin/configuration.html.erb

@@ -1,6 +1,6 @@
 <!--
 WebROaR - Ruby Application Server - http://webroar.in/
-Copyright (C) 2009  WebROaR
+Copyright (C) 2009  Goonj LLC
 
 This file is part of WebROaR.
 
@@ -17,13 +17,6 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with WebROaR.  If not, see <http://www.gnu.org/licenses/>.
 -->
-<div id = "flash_message" style = "font-size:12px; background-color: #FFFFFF; text-align: center;"> 
-  <strong> <%= flash[:notice] %> </strong>
-  <strong> <%= flash[:error] %> </strong>
-</div>
-<script>
-Effect.toggle('flash_message', 'appear', { duration: 40.0 })
-</script>
 <div id = 'container_data'>
   <br/>
   <div id = "page_name"><%=image_tag("tit_configuration_ad.gif", :border => '0')%></div>

data/src/admin_panel/app/views/admin/home.html.erb

@@ -1,6 +1,6 @@
 <!--
 WebROaR - Ruby Application Server - http://webroar.in/
-Copyright (C) 2009  WebROaR
+Copyright (C) 2009  Goonj LLC
 
 This file is part of WebROaR.
 

data/src/admin_panel/app/views/admin/index.html.erb

@@ -1,6 +1,6 @@
 <!--
 WebROaR - Ruby Application Server - http://webroar.in/
-Copyright (C) 2009  WebROaR
+Copyright (C) 2009  Goonj LLC
 
 This file is part of WebROaR.
 

data/src/admin_panel/app/views/application_specification/{_application_form.html.erb → _application_specification_form.html.erb}

@@ -1,6 +1,6 @@
 <!--
 WebROaR - Ruby Application Server - http://webroar.in/
-Copyright (C) 2009  WebROaR
+Copyright (C) 2009  Goonj LLC
 
 This file is part of WebROaR.
 
@@ -23,101 +23,101 @@ along with WebROaR.  If not, see <http://www.gnu.org/licenses/>.
 <% else %>
   <% url = {:controller => 'application_specification', :action => 'add_application'} %>
 <% end %>
-<%form_remote_for :application, :url => url, :before => "show_busy_div()", :complete => "hide_busy_div(request)", :update => "application_form" do %>	
+<%form_remote_for :application_specification, :url => url, :before => "show_busy_div()", :complete => "hide_busy_div(request)", :update => "application_specification_form" do %>	
   <div class = "text_align_center">
     <table width = 60% cellpadding = '4'>
       <tr>
-        <th class = 'table_header' colspan = 2><%=type%> Application</th>
+        <th class = 'table_header' colspan = 2><%= type %> Application</th>
       </tr>
       <tr>
-        <th colspan = 2><div id = 'error_div'><%=error_messages_for 'application'%></div></th>
+        <th colspan = 2><div id = 'error_div'><%= error_messages_for 'application_specification' %></div></th>
       </tr>
       <tr>
         <td class = "BG_dark_gray"  style = "width:60%;">Application Name<span id = 'needed'>*</span></td>
-        <%if controller.action_name == "edit_application_form" or controller.action_name == "edit_application"%>
-          <td class = "BG_dark_gray"> <%=@application.name%><%=hidden_field :application, :name%></td>
-        <%else%>     
-          <td class = "BG_dark_gray"><%=text_field :application, :name, :size => 20, :tabindex => "1"%></td>
-        <%end%>
+        <% if controller.action_name == "edit_application_form" or controller.action_name == "edit_application" %>
+          <td class = "BG_dark_gray"> <%= @application_specification.name%><%=hidden_field :application_specification, :name %></td>
+        <% else %>     
+          <td class = "BG_dark_gray"><%= text_field :application_specification, :name, :size => 20, :tabindex => "1" %></td>
+        <% end %>
       </tr>
       <tr>
         <td class = 'BG_white' style = "height:30px;">Resolver<span id = 'needed'>*</span> &nbsp;&nbsp;&nbsp;
           <span class = 'help_link'>
-            <%=link_to_function "Help",:onclick => "addHelp('resolver')"%>
+            <%= link_to_function "Help",:onclick => "addHelp('resolver')" %>
           </span>
           <br/> <div id = 'resolver' class = 'font_size_12'></div>
         </td>
-        <td class = 'BG_white'><%=text_field :application, :resolver, :size => 20, :tabindex => "2"%></td>
+        <td class = 'BG_white'><%= text_field :application_specification, :resolver, :size => 20, :tabindex => "2" %></td>
       </tr>
       <tr>
         <td class = "BG_dark_gray" style = "height:30px;">Path<span id = 'needed'>*</span> &nbsp;&nbsp;&nbsp;
           <span class = 'help_link'>
-            <%=link_to_function "Help", :onclick=>"addHelp('path')"%>
+            <%= link_to_function "Help", :onclick=>"addHelp('path')" %>
           </span>
           <br/> <div id = 'path' class = 'font_size_12' ></div>
         </td>
-        <td class = "BG_dark_gray"><%=text_field :application, :path, :size => 20, :tabindex => "3"%></td>
+        <td class = "BG_dark_gray"><%= text_field :application_specification, :path, :size => 20, :tabindex => "3" %></td>
       </tr>
       <tr>
         <td class = 'BG_white' style = "height:30px;">RunAsUser<span id = 'needed'>*</span> &nbsp;&nbsp;&nbsp;
           <span class = 'help_link'>
-            <%=link_to_function "Help", :onclick => "addHelp('runasuser')"%>
+            <%= link_to_function "Help", :onclick => "addHelp('runasuser')" %>
           </span>
           <br/> <div id = 'runasuser' class = 'font_size_12'></div>
         </td>
-        <td class = 'BG_white'><%=text_field :application, :run_as_user, :size=>20, :tabindex => "4"%></td>
+        <td class = 'BG_white'><%= text_field :application_specification, :run_as_user, :size=>20, :tabindex => "4" %></td>
       </tr>
       <tr>
         <td class = "BG_dark_gray" style = "height:30px;">Type &nbsp;&nbsp;&nbsp;
           <span class = 'help_link'>
-            <%=link_to_function "Help", :onclick => "addHelp('type')"%>
+            <%= link_to_function "Help", :onclick => "addHelp('type')" %>
           </span>
           <br/> <div id = 'type' class = 'font_size_12'></div>
         </td>
-        <td class = "BG_dark_gray"><%=select :application, :type1,%w{Rails Rack}, {}, {:onChange => 'disableAnalytics(this.value);', :tabindex => "5"}%></td>
+        <td class = "BG_dark_gray"><%= select :application_specification, :type1,%w{Rails Rack}, {}, {:onChange => 'disableAnalytics(this.value);', :tabindex => "5"} %></td>
       </tr>
       <tr>
         <td class = 'BG_white' style = "height:30px;">Analytics &nbsp;&nbsp;&nbsp;
           <span class = 'help_link'>
-            <%=link_to_function "Help", :onclick => "addHelp('analytics')"%>
+            <%= link_to_function "Help", :onclick => "addHelp('analytics')" %>
           </span>
           <br/> <div id = 'analytics' class = 'font_size_12'></div>
         </td>
-        <td class = 'BG_white'><%=select :application, :analytics, @analytics, {}, {:tabindex => "6"}%></td>
+        <td class = 'BG_white'><%= select :application_specification, :analytics, @analytics, {}, {:tabindex => "6"} %></td>
       </tr>
       <tr>
         <td class = "BG_dark_gray" style = "height:30px;">Environment</td>
-        <td class = "BG_dark_gray"><%=select :application, :environment, %w{Production Development Test}, {}, {:width => 20, :tabindex => "7"}%></td>
+        <td class = "BG_dark_gray"><%= text_field :application_specification, :environment, :size => 20, :tabindex => "7" %></td>
       </tr>
       <tr>
         <td class = 'BG_white' style = "height:30px;">Minimum number of workers &nbsp;&nbsp;&nbsp;			
           <span class = 'help_link'>
-            <%=link_to_function "Help", :onclick => "addHelp('app_minworker')"%>
+            <%= link_to_function "Help", :onclick => "addHelp('app_minworker')" %>
           </span>
           <br/> <div id = 'app_minworker' class = 'font_size_12'></div>
         </td>
-        <td class = 'BG_white'><%=text_field :application, :min_worker, :size=>20, :tabindex => "8"%></td>
+        <td class = 'BG_white'><%=text_field :application_specification, :min_worker, :size=>20, :tabindex => "8"%></td>
       </tr>
       <tr>
         <td class = "BG_dark_gray" style = "height:30px;">Maximum number of workers &nbsp;&nbsp;&nbsp;
           <span class = 'help_link'>
-            <%=link_to_function "Help", :onclick => "addHelp('app_maxworker')"%>
+            <%= link_to_function "Help", :onclick => "addHelp('app_maxworker')" %>
           </span>
           <br/> <div id = 'app_maxworker' class = 'font_size_12'></div>
         </td>
-        <td class = "BG_dark_gray"><%=text_field :application, :max_worker, :size => 20, :tabindex => "9"%></td>
+        <td class = "BG_dark_gray"><%=text_field :application_specification, :max_worker, :size => 20, :tabindex => "9"%></td>
       </tr>
       <tr>
         <%if type == "Edit"%>
-          <th class = 'BG_white' colspan = 2><%=hidden_field :application, :app_id, :size => 20%><br/>
-          <%=submit_tag 'Save and Restart', :tabindex => "10"%></th>
+          <th class = 'BG_white' colspan = 2><%= hidden_field :application_specification, :app_id, :size => 20 %><br/>
+          <%= submit_tag 'Save and Restart', :tabindex => "10" %></th>
         <%else%>			
-          <th class = 'BG_white' colspan = 2><%=hidden_field :application, :app_id, :size => 20%><br/>
-          <%=submit_tag 'Deploy', :tabindex => "10"%></th>
+          <th class = 'BG_white' colspan = 2><%=hidden_field :application_specification, :app_id, :size => 20%><br/>
+          <%= submit_tag 'Deploy', :tabindex => "10" %></th>
         <%end%>	
       </tr>	
       <tr>
-        <td colspan = 2 class = "BG_dark_gray"><%=link_to 'Back', configuration_path, :tabindex => "11"%></td>
+        <td colspan = 2 class = "BG_dark_gray"><%= link_to 'Back', configuration_path, :tabindex => "11" %></td>
       </tr>	
     </table>
   </div>