Rename Version constant to VERSION. Closes #2802.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3065 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

22 files changed, 32 insertions, 18 deletions

diff --git a/actionmailer/CHANGELOG b/actionmailer/CHANGELOG
index 45283d11a9..bec81dfa1d 100644
--- a/actionmailer/CHANGELOG
+++ b/actionmailer/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Rename Version constant to VERSION. #2802 [Marcel Molina Jr.]
+
 * Stricter matching for implicitly multipart filenames excludes files ending in unsupported extensions (such as foo.rhtml.bak) and without a two-part content type (such as foo.text.rhtml or foo.text.really.plain.rhtml).  #2398 [Dave Burt <dave@burt.id.au>, Jeremy Kemper]
 
 
diff --git a/actionmailer/Rakefile b/actionmailer/Rakefile
index d8cbc20a96..51ec9ed6b9 100755
--- a/actionmailer/Rakefile
+++ b/actionmailer/Rakefile
@@ -9,7 +9,7 @@ require File.join(File.dirname(__FILE__), 'lib', 'action_mailer', 'version')
 
 PKG_BUILD     = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
 PKG_NAME      = 'actionmailer'
-PKG_VERSION   = ActionMailer::Version::STRING + PKG_BUILD
+PKG_VERSION   = ActionMailer::VERSION::STRING + PKG_BUILD
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 
 RELEASE_NAME  = "REL #{PKG_VERSION}"
diff --git a/actionmailer/lib/action_mailer/version.rb b/actionmailer/lib/action_mailer/version.rb
index 49e55ccf97..97e97feb60 100644
--- a/actionmailer/lib/action_mailer/version.rb
+++ b/actionmailer/lib/action_mailer/version.rb
@@ -1,5 +1,5 @@
 module ActionMailer
-  module Version #:nodoc:
+  module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 1
     TINY  = 3
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 2e8a0420f9..5587b4116b 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Rename Version constant to VERSION. #2802 [Marcel Molina Jr.]
+
 * Correct time_zone_options_for_select docs.  #2892 [pudeyo@rpi.com]
 
 * Remove the unused, slow response_dump and session_dump variables from error pages.  #1222 [lmarlow@yahoo.com]
diff --git a/actionpack/Rakefile b/actionpack/Rakefile
index 15b85042d4..441d852bb4 100755
--- a/actionpack/Rakefile
+++ b/actionpack/Rakefile
@@ -9,7 +9,7 @@ require File.join(File.dirname(__FILE__), 'lib', 'action_pack', 'version')
 
 PKG_BUILD     = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
 PKG_NAME      = 'actionpack'
-PKG_VERSION   = ActionPack::Version::STRING + PKG_BUILD
+PKG_VERSION   = ActionPack::VERSION::STRING + PKG_BUILD
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 
 RELEASE_NAME  = "REL #{PKG_VERSION}"
diff --git a/actionpack/lib/action_pack/version.rb b/actionpack/lib/action_pack/version.rb
index 311fdc0809..8e1bc2d0de 100644
--- a/actionpack/lib/action_pack/version.rb
+++ b/actionpack/lib/action_pack/version.rb
@@ -1,5 +1,5 @@
 module ActionPack
-  module Version #:nodoc:
+  module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 11
     TINY  = 0
diff --git a/actionwebservice/CHANGELOG b/actionwebservice/CHANGELOG
index 7c41b68492..814d823d7f 100644
--- a/actionwebservice/CHANGELOG
+++ b/actionwebservice/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Rename Version constant to VERSION. #2802 [Marcel Molina Jr.]
+
 * Fix that XML-RPC date/time values did not have well-defined behaviour (#2516, #2534). This fix has one caveat, in that we can't support pre-1970 dates from XML-RPC clients.
 
 *0.9.3* (November 7th, 2005)
diff --git a/actionwebservice/Rakefile b/actionwebservice/Rakefile
index 468b5fe78b..95a525586d 100644
--- a/actionwebservice/Rakefile
+++ b/actionwebservice/Rakefile
@@ -10,7 +10,7 @@ require File.join(File.dirname(__FILE__), 'lib', 'action_web_service', 'version'
 
 PKG_BUILD     = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
 PKG_NAME      = 'actionwebservice'
-PKG_VERSION   = ActionWebService::Version::STRING + PKG_BUILD
+PKG_VERSION   = ActionWebService::VERSION::STRING + PKG_BUILD
 PKG_FILE_NAME   = "#{PKG_NAME}-#{PKG_VERSION}"
 PKG_DESTINATION = ENV["RAILS_PKG_DESTINATION"] || "../#{PKG_NAME}"
 
diff --git a/actionwebservice/lib/action_web_service/version.rb b/actionwebservice/lib/action_web_service/version.rb
index 94f9251d79..8ff8441b13 100644
--- a/actionwebservice/lib/action_web_service/version.rb
+++ b/actionwebservice/lib/action_web_service/version.rb
@@ -1,5 +1,5 @@
 module ActionWebService
-  module Version
+  module VERSION
     MAJOR = 0
     MINOR = 9
     TINY  = 3
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
index 3ebe6b5e3e..d6464df95d 100644
--- a/activerecord/CHANGELOG
+++ b/activerecord/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Rename Version constant to VERSION. #2802 [Marcel Molina Jr.]
+
 * Introducing the Firebird adapter.  Quote columns and use attribute_condition more consistently.  Setup guide: http://wiki.rubyonrails.com/rails/pages/Firebird+Adapter  #1874 [Ken Kunz <kennethkunz@gmail.com>]
 
 * SQLServer: active? and reconnect! methods for handling stale connections.  #428 [kajism@yahoo.com, Tom Ward <tom@popdog.net>]
diff --git a/activerecord/Rakefile b/activerecord/Rakefile
index ac6bfb36c3..60d4580451 100755
--- a/activerecord/Rakefile
+++ b/activerecord/Rakefile
@@ -9,7 +9,7 @@ require File.join(File.dirname(__FILE__), 'lib', 'active_record', 'version')
 
 PKG_BUILD     = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
 PKG_NAME      = 'activerecord'
-PKG_VERSION   = ActiveRecord::Version::STRING + PKG_BUILD
+PKG_VERSION   = ActiveRecord::VERSION::STRING + PKG_BUILD
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 
 RELEASE_NAME  = "REL #{PKG_VERSION}"
diff --git a/activerecord/lib/active_record/version.rb b/activerecord/lib/active_record/version.rb
index f05ce6848c..8673f70327 100644
--- a/activerecord/lib/active_record/version.rb
+++ b/activerecord/lib/active_record/version.rb
@@ -1,5 +1,5 @@
 module ActiveRecord
-  module Version #:nodoc:
+  module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 13
     TINY  = 0
diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG
index d9a94b47d1..5aa7d23de3 100644
--- a/activesupport/CHANGELOG
+++ b/activesupport/CHANGELOG
@@ -1,3 +1,7 @@
+*SVN*
+
+* Rename Version constant to VERSION. #2802 [Marcel Molina Jr.]
+
 *1.2.3* (November 7th, 2005)
 
 * Change Inflector#constantize to use eval instead of const_get. [Nicholas Seckar]
diff --git a/activesupport/Rakefile b/activesupport/Rakefile
index af9ddee98c..0666f62c36 100644
--- a/activesupport/Rakefile
+++ b/activesupport/Rakefile
@@ -6,7 +6,7 @@ require File.join(File.dirname(__FILE__), 'lib', 'active_support', 'version')
 
 PKG_BUILD     = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
 PKG_NAME      = 'activesupport'
-PKG_VERSION   = ActiveSupport::Version::STRING + PKG_BUILD
+PKG_VERSION   = ActiveSupport::VERSION::STRING + PKG_BUILD
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 
 RELEASE_NAME  = "REL #{PKG_VERSION}"
diff --git a/activesupport/lib/active_support/version.rb b/activesupport/lib/active_support/version.rb
index 73e5693294..b9d751e744 100644
--- a/activesupport/lib/active_support/version.rb
+++ b/activesupport/lib/active_support/version.rb
@@ -1,5 +1,5 @@
 module ActiveSupport
-  module Version #:nodoc:
+  module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 2
     TINY  = 3
diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index b3e274505c..2144215884 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Rename Version constant to VERSION. #2802 [Marcel Molina Jr.]
+
 * Update to latest script.aculo.us version (as of [3031])
 
 * Eliminate Subversion dependencies in scripts/plugin.  Correct install options.  Introduce --force option to reinstall a plugin.  Remove useless --long option for list.  Use --quiet to quiet the download output and --revision to update to a specific svn revision.  #2842 [Chad Fowler, Rick Olson]
diff --git a/railties/Rakefile b/railties/Rakefile
index e425f9a4dd..6d9a7a61bb 100644
--- a/railties/Rakefile
+++ b/railties/Rakefile
@@ -11,7 +11,7 @@ require File.join(File.dirname(__FILE__), 'lib', 'rails_version')
 
 PKG_BUILD       = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
 PKG_NAME        = 'rails'
-PKG_VERSION     = Rails::Version::STRING + PKG_BUILD
+PKG_VERSION     = Rails::VERSION::STRING + PKG_BUILD
 PKG_FILE_NAME   = "#{PKG_NAME}-#{PKG_VERSION}"
 PKG_DESTINATION = ENV["RAILS_PKG_DESTINATION"] || "../#{PKG_NAME}"
 
diff --git a/railties/bin/rails b/railties/bin/rails
index fdbb4d93f3..54417750b3 100755
--- a/railties/bin/rails
+++ b/railties/bin/rails
@@ -12,7 +12,7 @@ end
 Signal.trap("INT") { puts; exit }
 
 require File.dirname(__FILE__) + '/../lib/rails_version'
-abort "Rails #{Rails::Version::STRING}" if %w(--version -v).include? ARGV.first
+abort "Rails #{Rails::VERSION::STRING}" if %w(--version -v).include? ARGV.first
 
 require File.dirname(__FILE__) + '/../lib/rails_generator'
 
diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb
index 69deedf179..81578e484e 100644
--- a/railties/lib/initializer.rb
+++ b/railties/lib/initializer.rb
@@ -123,7 +123,7 @@ module Rails
       configuration.frameworks.each { |framework| require(framework.to_s) }
     end
     
-    # Loads Rails::Version and Rails::Info.
+    # Loads Rails::VERSION and Rails::Info.
     # TODO: Make this work via dependencies.rb/const_missing instead.
     def load_framework_info
       require 'rails_info'
diff --git a/railties/lib/rails_info.rb b/railties/lib/rails_info.rb
index 5c71a289c2..eb60955db5 100644
--- a/railties/lib/rails_info.rb
+++ b/railties/lib/rails_info.rb
@@ -26,7 +26,7 @@ module Rails
       
       def component_version(component)
         require "#{component}/version"
-        "#{component.classify}::Version::STRING".constantize
+        "#{component.classify}::VERSION::STRING".constantize
       end
     
       def edge_rails_revision(info = svn_info)
@@ -70,7 +70,7 @@ module Rails
   
     # The Rails version.
     property 'Rails version' do
-      Rails::Version::STRING
+      Rails::VERSION::STRING
     end
   
     # Versions of each Rails component (Active Record, Action Pack, 
diff --git a/railties/lib/rails_version.rb b/railties/lib/rails_version.rb
index 27c50644d5..a36f45bd6f 100644
--- a/railties/lib/rails_version.rb
+++ b/railties/lib/rails_version.rb
@@ -1,5 +1,5 @@
 module Rails
-  module Version #:nodoc:
+  module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 14
     TINY  = 3
diff --git a/railties/test/rails_info_test.rb b/railties/test/rails_info_test.rb
index e3daf0bcd5..926f254c2e 100644
--- a/railties/test/rails_info_test.rb
+++ b/railties/test/rails_info_test.rb
@@ -62,7 +62,7 @@ EOS
   end
   
   def test_component_version
-    assert_property 'Active Support version', ActiveSupport::Version::STRING
+    assert_property 'Active Support version', ActiveSupport::VERSION::STRING
   end
 
 protected
@@ -89,4 +89,4 @@ protected
       property_defined? property_name
     assert_equal value, properties.value_for(property_name)
   end
-end
\ No newline at end of file
+end