Fixed some bugs. Updated webgen website to latest webgen.

README.markdown

@@ -380,7 +380,15 @@ If you prefer to build the gem locally, check out source from GitHub
 
 (or fork it)
 
-WARNING: The older RubyForge SVN repository (`svn://rubyforge.org/var/svn/aquarium/trunk`) is now obsolete!!    
+WARNING: The older RubyForge SVN repository (`svn://rubyforge.org/var/svn/aquarium/trunk`) is now obsolete!!
+
+As of version 0.5.0, the following Ruby versions are supported:
+
+* Ruby 1.8.7: tested on patch version p358.
+* Ruby 1.9.3: tested on patch version p125
+* JRuby 1.6.7: tested on patch version p357
+
+Newer patch releases should also be fine...
 
 Use the following commands to build everything:
 
@@ -415,7 +423,7 @@ or
 
 Note that Aquarium itself, once built, doesn't have any dependencies outside the Ruby core and stdlib.
 
-If you want to run the tests for the JRuby support, you must also have JRuby 1.1 or later installed. To run the specs for JRuby, use the command
+If you want to run the tests for the JRuby support, you must also have JRuby 1.6.7 or later installed. To run the specs for JRuby, use the command
 
     rake verify_jruby
 
@@ -484,6 +492,6 @@ My colleagues in the AOSD community, in particular those who developed *AspectJ*
 
 The *RSpec* team, in particular David Chelimsky, have really inspired my thinking about what's possible in Ruby, especially in the realm of DSLs. I also cribbed parts of the RSpec Rake process ;)
 
-My colleagues at [Object Mentor](http://objectmentor.com) are an endless source of insight and inspiration.
+Keita Yamaguchi contributed some key patches that enabled Ruby 1.9.3 and JRuby 1.6.7 support, in addition to the prior support for Ruby 1.8.7. These patches allowed me to final release version 0.5.0. Thank you!
 
 Finally, a number of users have contributed valuable feedback. In particular, thanks to Brendan L., Matthew F., and Mark V. 

aquarium/CHANGES

@@ -1,25 +1,38 @@
 == Version 0.5.0
 
-V0.5.0 adds support for Ruby 1.9.2, RSpec 2.5, Webgen (0.5.10 - for the build process), and partial support for JRuby 1.5.6.
+V0.5.0 adds support for Ruby 1.8.7, Ruby 1.9.3, JRuby 1.6.7,
+RSpec 2.9, and Webgen (0.5.14 - for the build process).
 
-WARNING: Ruby 1.9.1 is not supported. JRuby support is limited to "pure" Ruby code; the main RSpec specifications pass under JRuby, but not the JRuby-specific specifications in jruby/spec. Restoring full JRuby support is planned, but the timeframe is TBD.
+WARNING: Earlier versions of Ruby 1.8, 1.9 and JRuby 1.X are not 
+supported. JRuby support is limited to "pure" Ruby code; the main
+RSpec specifications pass under JRuby, but not the JRuby-specific 
+specifications in jruby/spec. Restoring full JRuby support is planned, 
+but the timeframe is TBD.
 
 It also has some minor API changes summarized below.
 
 Enhancements:
-22558	Support Ruby 1.9.1
-27235	Support RSpec 1.2.8 (latest) and and JRuby 1.3.1 (latest)
-27236	Upgrade website generation to webgen 0.5.X
+22558	Support Ruby 1.9.1 (actually 1.9.3)
+27235	Support RSpec 1.2.8 (actually 2.9) and and JRuby 1.3.1 (actually 1.6.7)
+27236	Upgrade website generation to webgen 0.5.X (X=14)
 
-The actual versions of these tools supported are more recent versions...
+The actual versions of these tools supported are more recent versions 
+shown in parentheses.
 
 There are no API changes in this release, with two exceptions. 
 
-First, Most of the code changes are minor fixes to RSpec files. The one exception is an apparent change in JRuby 1.3.1 w.r.t. the access restrictions on Java methods. It now appears that protected methods are public, that is they are in the method list returned by :public_methods, but not :protected_methods. Also, private methods are not returned by any of the :*_methods. 
+First, Most of the code changes are minor fixes to RSpec files. The one 
+exception is an apparent change that occurred in JRuby 1.3.X with respect 
+to the access restrictions on Java methods. It now appears that protected 
+methods are public, that is they are in the method list returned by 
+:public_methods, but not :protected_methods. Also, private methods are 
+not returned by any of the :*_methods. 
 
-Second, there was a deprecated option to the MethodFinder class, :options, that has been removed. Use :method_options instead.
+Second, there was a deprecated option to the MethodFinder class, 
+:options, that has been removed. Use :method_options instead.
 
-I used the upgrade to Webgen 0.5.X as an excuse to refresh the web site's appearance. The content is mostly the same as before.
+I used the upgrade to Webgen 0.5.X as an excuse to refresh the web site's 
+appearance. The content is mostly the same as before.
 
 
 == Version 0.4.3

aquarium/README

@@ -463,7 +463,10 @@ See http://aquarium.rubyforge.org for further documentation.
 === Acknowledgments
 
 My colleagues in the AOSD community, in particular those who developed AspectJ, have been a big inspiration.
+
 The RSpec team, in particular David Chelimsky, have really inspired my thinking about what's possible in Ruby, especially in the realm of DSLs. I also cribbed parts of the RSpec Rake process ;)
-My colleagues at Object Mentor are an endless source of insight and inspiration.
+
+Keita Yamaguchi contributed some key patches that enabled Ruby 1.9.3 and JRuby 1.6.7 support, in addition to the prior support for Ruby 1.8.7. These patches allowed me to final release version 0.5.0. Thank you!
+
 Finally, a number of users have contributed valuable feedback. In particular, thanks to Brendan L., Matthew F., and Mark V. 
 

aquarium/RELEASE-PLAN

@@ -62,6 +62,8 @@ aspects, for example.
 I'll maintain the current form for backwards compatibility and also because it is convenient for
 simpler aspects.
 
+Finally, this release will finally support Ruby 1.9.X and the latest JRuby at the time of the release.
+
 === Version 0.6+
 
 I have been thinking about higher-order abstractions that work above the "Pointcut + Advice

aquarium/Rakefile

@@ -4,14 +4,15 @@ require 'rake'
 require 'rake/gempackagetask'
 require 'rake/contrib/rubyforgepublisher'
 require 'rake/clean'
-require 'rake/rdoctask'
+require 'rdoc/task'
 require 'aquarium/version'
 
 # Use RSpec's files.
 require 'rspec/core/rake_task'
 
 # Some of the tasks are in separate files since they are also part of the website documentation
 #load File.dirname(__FILE__) + '/rake_tasks/examples.rake'
+# TODO: Replace rcov with simplecov and restore this feature.
 #load File.dirname(__FILE__) + '/rake_tasks/verify_rcov.rake'
 
 PKG_NAME = "aquarium"
@@ -26,23 +27,25 @@ PKG_FILES = FileList[
 ]
 FileUtils.touch(File.dirname(__FILE__) + '/previous_failures.txt')
 
+IS_WINDOWS = (RUBY_VERSION == "1.8.7" ? PLATFORM : RUBY_PLATFORM) =~ /mswin/
+
 task :default => :spec  
 
 desc "Run all specs"
 RSpec::Core::RakeTask.new do |t|
   t.rspec_opts = ['--color', '--format progress', '--profile']
 end
 
-desc "Run all specs and store html output in doc/aquarium/out/report.html"
-RSpec::Core::RakeTask.new('spec_html') do |t|
-  t.rspec_opts = ['--format html:../doc/aquarium/out/report.html','--backtrace']
-end
+# desc "Run all specs and store html output in doc/aquarium/out/report.html"
+# RSpec::Core::RakeTask.new('spec_html') do |t|
+#   t.rspec_opts = ['--format html:../doc/aquarium/out/report.html','--backtrace']
+# end
 
 desc 'Generate HTML documentation for website'
 task :webgen do
   Dir.chdir '../doc/aquarium' do
     output = nil
-    IO.popen('webgen 2>&1') do |io|
+    IO.popen('rake webgen 2>&1') do |io|
       output = io.read
     end
     raise "ERROR while running webgen: #{output}" if output =~ /ERROR/n || $? != 0
@@ -113,6 +116,7 @@ end
 
 task :clobber do
   rm_rf '../doc/aquarium/out'
+  rm_rf '../doc/aquarium/webgen.cache'
   rm_rf 'translated_specs'
 end
 
@@ -152,20 +156,20 @@ end
 # ]
 
 desc "Build the website, but do not publish it"
-task :website => [:clobber, :verify_rcov, :verify_jruby, :spec_html, :webgen, :rdoc]
+task :website => [:clobber, :rdoc, :webgen] # :spec_html, :verify_jruby, :verify_rcov,
 
 task :rdoc_rails do
   Dir.chdir '../aquarium_on_rails' do
-    rake = (PLATFORM == "i386-mswin32") ? "rake.cmd" : "rake"
+    rake = IS_WINDOWS ? "rake.cmd" : "rake"
     `#{rake} rdoc`
   end
 end
 
-desc "Verify that the Aquarium specs run under JRuby and that JRuby can advise Java types"
+desc "Verify that the Aquarium specs run under JRuby and that JRuby can advise Java types. If this task fails, try running 'jruby -S rake' separately."
 task :verify_jruby do
   puts "Verifying JRuby Support"
   Dir.chdir 'jruby' do
-    rake = (PLATFORM == "i386-mswin32") ? "rake.cmd" : "rake"
+    rake = IS_WINDOWS ? "rake.cmd" : "rake"
     sh "jruby -S #{rake}"
   end
 end

aquarium/UPGRADE

@@ -1,4 +1,10 @@
-== Updating to Aquarium-0.4.0
+== Updating to Aquarium-0.5.0
+
+This release introduces a few small API changes that are described in CHANGES. The primary goal of the release is to add full support for Ruby 1.9.3 and JRuby 1.6.7.
+
+It was not tested on early versions of Ruby 1.9 and JRuby 1.X, so users of earlier releases should use caution upgrading. Post any issues to the GitHub project.
+
+== Updating to Aquarium-0.4.X
 
 This release is fully backwards-compatible with previous releases. It expands
 the API slightly and adds internal improvements to better support JRuby. There