ext/phusion_passenger/extconf.rb ext/phusion_passenger/native_support.c lib/phusion_passenger/abstract_request_handler.rb lib/phusion_passenger/abstract_server.rb lib/phusion_passenger/abstract_server_collection.rb lib/phusion_passenger/admin_tools.rb lib/phusion_passenger/admin_tools/control_process.rb lib/phusion_passenger/application.rb lib/phusion_passenger/console_text_template.rb lib/phusion_passenger/constants.rb lib/phusion_passenger/dependencies.rb lib/phusion_passenger/exceptions.rb lib/phusion_passenger/html_template.rb lib/phusion_passenger/message_channel.rb lib/phusion_passenger/platform_info.rb lib/phusion_passenger/rack/application_spawner.rb lib/phusion_passenger/rack/request_handler.rb lib/phusion_passenger/railz/application_spawner.rb lib/phusion_passenger/railz/cgi_fixed.rb lib/phusion_passenger/railz/framework_spawner.rb lib/phusion_passenger/railz/request_handler.rb lib/phusion_passenger/simple_benchmarking.rb lib/phusion_passenger/spawn_manager.rb lib/phusion_passenger/templates/apache2_config_snippets.txt.erb lib/phusion_passenger/templates/apache_must_be_compiled_with_compatible_mpm.txt.erb lib/phusion_passenger/templates/app_exited_during_initialization.html.erb lib/phusion_passenger/templates/app_init_error.html.erb lib/phusion_passenger/templates/database_error.html.erb lib/phusion_passenger/templates/deployment_example.txt.erb lib/phusion_passenger/templates/error_layout.css lib/phusion_passenger/templates/error_layout.html.erb lib/phusion_passenger/templates/framework_init_error.html.erb lib/phusion_passenger/templates/general_error.html.erb lib/phusion_passenger/templates/invalid_app_root.html.erb lib/phusion_passenger/templates/load_error.html.erb lib/phusion_passenger/templates/no_write_permission_to_passenger_root.txt.erb lib/phusion_passenger/templates/possible_solutions_for_compilation_and_installation_problems.txt.erb lib/phusion_passenger/templates/run_installer_as_root.txt.erb lib/phusion_passenger/templates/version_not_found.html.erb lib/phusion_passenger/templates/welcome.txt.erb lib/phusion_passenger/utils.rb lib/phusion_passenger/wsgi/application_spawner.rb lib/phusion_passenger/wsgi/request_handler.py @@ -11,7 +11,7 @@ ext/apache2/*.lo ext/apache2/*.slo ext/apache2/.libs ext/apache2/ApplicationPoolServerExecutable -ext/passenger/Makefile +ext/phusion_passenger/Makefile ext/*.a doc/rdoc doc/cxxapi .gitignore @@ -27,9 +27,9 @@ Run the following command to compile everything: == Directory structure The most important directories are: -[ lib/passenger ] +[ lib/phusion_passenger ] The source code for the spawn server, which is written in Ruby. -[ ext/passenger ] +[ ext/phusion_passenger ] Native extensions for Ruby, used by the spawn server. [ ext/apache2 ] The Phusion Passenger Apache 2 module (mod_passenger). @@ -48,7 +48,13 @@ Less important directories: [ lib/rake ] Rake tasks. [ ext/boost ] - A vendor copy of the Boost C++ library (www.boost.org). + A stripped-down and customized version of the Boost C++ library + (www.boost.org). +[ ext/oxt ] + The "OS eXtensions for boosT" library, which provides various important + functionality necessary for writing robust server software. It provides + things like support for interruptable system calls and portable backtraces + for C++. Boost was modified to make use of the functionality provided by OXT. [ benchmark ] Benchmark tools. [ misc ] DEVELOPERS.TXT @@ -22,7 +22,7 @@ require 'rake/rdoctask' require 'rake/gempackagetask' require 'rake/extensions' require 'rake/cplusplus' -require 'passenger/platform_info' +require 'phusion_passenger/platform_info' verbose true @@ -70,7 +70,7 @@ task :clobber ##### Ruby C extension -subdir 'ext/passenger' do +subdir 'ext/phusion_passenger' do task :native_support => ["native_support.#{LIBEXT}"] file 'Makefile' => 'extconf.rb' do @@ -452,7 +452,10 @@ Rake::RDocTask.new(:clobber_rdoc => "rdoc:clobber", :rerdoc => "rdoc:force") do rd.main = "README" rd.rdoc_dir = "doc/rdoc" rd.rdoc_files.include("README", "DEVELOPERS.TXT", - "lib/passenger/*.rb", "lib/rake/extensions.rb", "ext/passenger/*.c") + "lib/phusion_passenger/*.rb", + "lib/phusion_passenger/*/*.rb", + "lib/rake/extensions.rb", + "ext/phusion_passenger/*.c") rd.template = "./doc/template/horo" rd.title = "Passenger Ruby API" rd.options << "-S" << "-N" << "-p" << "-H" @@ -471,10 +474,10 @@ spec = Gem::Specification.new do |s| s.author = "Phusion - http://www.phusion.nl/" s.email = "info@phusion.nl" s.requirements << "fastthread" << "Apache 2 with development headers" - s.require_path = ["lib", "ext"] + s.require_paths = ["lib", "ext"] s.add_dependency 'rake', '>= 0.8.1' s.add_dependency 'fastthread', '>= 1.0.1' - s.extensions << 'ext/passenger/extconf.rb' + s.extensions << 'ext/phusion_passenger/extconf.rb' s.files = FileList[ 'Rakefile', 'README', @@ -484,7 +487,7 @@ spec = Gem::Specification.new do |s| 'NEWS', 'lib/**/*.rb', 'lib/**/*.py', - 'lib/passenger/templates/*', + 'lib/phusion_passenger/templates/*', 'bin/*', 'doc/*', @@ -507,7 +510,7 @@ spec = Gem::Specification.new do |s| 'ext/oxt/*.hpp', 'ext/oxt/*.cpp', 'ext/oxt/detail/*.hpp', - 'ext/passenger/*.{c,rb}', + 'ext/phusion_passenger/*.{c,rb}', 'benchmark/*.{cpp,rb}', 'misc/*', 'vendor/**/*', @@ -570,20 +573,20 @@ task :fakeroot => [:apache2, :native_support, :doc] do libdir = "#{fakeroot}/usr/lib/ruby/#{CONFIG['ruby_version']}" extdir = "#{libdir}/#{CONFIG['arch']}" bindir = "#{fakeroot}/usr/bin" - docdir = "#{fakeroot}/usr/share/doc/passenger" - libexecdir = "#{fakeroot}/usr/lib/passenger" + docdir = "#{fakeroot}/usr/share/doc/phusion_passenger" + libexecdir = "#{fakeroot}/usr/lib/phusion_passenger" sh "rm -rf #{fakeroot}" sh "mkdir -p #{fakeroot}" sh "mkdir -p #{libdir}" - sh "cp -R lib/passenger #{libdir}/" + sh "cp -R lib/phusion_passenger #{libdir}/" sh "mkdir -p #{fakeroot}/etc" sh "echo -n '#{PACKAGE_VERSION}' > #{fakeroot}/etc/passenger_version.txt" - sh "mkdir -p #{extdir}/passenger" - sh "cp -R ext/passenger/*.#{LIBEXT} #{extdir}/passenger/" + sh "mkdir -p #{extdir}/phusion_passenger" + sh "cp -R ext/phusion_passenger/*.#{LIBEXT} #{extdir}/phusion_passenger/" sh "mkdir -p #{bindir}" sh "cp bin/* #{bindir}/" @@ -643,11 +646,11 @@ task :sloccount do end sh "sloccount", *Dir[ "#{tmpdir}/*", - "lib/passenger/*", + "lib/phusion_passenger/*", "lib/rake/{cplusplus,extensions}.rb", "ext/apache2", "ext/oxt", - "ext/passenger/*.c", + "ext/phusion_passenger/*.c", "test/*.{cpp,rb}", "test/support/*.rb", "test/stub/*.rb", Rakefile @@ -28,9 +28,9 @@ $LOAD_PATH.unshift("#{PASSENGER_ROOT}/ext") ENV["PATH"] += ":/usr/sbin:/sbin:/usr/local/sbin" require 'optparse' -require 'passenger/platform_info' -require 'passenger/dependencies' -require 'passenger/console_text_template' +require 'phusion_passenger/platform_info' +require 'phusion_passenger/dependencies' +require 'phusion_passenger/console_text_template' include PlatformInfo class Installer bin/passenger-install-apache2-module @@ -18,7 +18,7 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. $LOAD_PATH.unshift("#{File.dirname(__FILE__)}/../lib") -require 'passenger/platform_info' +require 'phusion_passenger/platform_info' # ANSI color codes RESET = "\e[0m" bin/passenger-memory-stats @@ -41,12 +41,12 @@ begin exit end - require 'passenger/spawn_manager' + require 'phusion_passenger/spawn_manager' spawn_manager = PhusionPassenger::SpawnManager.new spawn_manager.start_synchronously(input) spawn_manager.cleanup rescue => e - require 'passenger/utils' + require 'phusion_passenger/utils' include PhusionPassenger::Utils print_exception("spawn manager", e) exit 10 bin/passenger-spawn-server @@ -19,7 +19,7 @@ $LOAD_PATH << File.expand_path(File.dirname(__FILE__) + "/../lib") $LOAD_PATH << File.expand_path(File.dirname(__FILE__) + "/../ext") -require 'passenger/admin_tools/control_process' +require 'phusion_passenger/admin_tools/control_process' include PhusionPassenger::AdminTools bin/passenger-status @@ -23,9 +23,9 @@ require 'rubygems' require 'optparse' require 'socket' require 'thread' -require 'passenger/platform_info' -require 'passenger/message_channel' -require 'passenger/utils' +require 'phusion_passenger/platform_info' +require 'phusion_passenger/message_channel' +require 'phusion_passenger/utils' include PhusionPassenger include PhusionPassenger::Utils bin/passenger-stress-test @@ -8,7 +8,7 @@ require 'support/config' require 'support/test_helper' require 'support/multipart' require 'support/apache2_controller' -require 'passenger/platform_info' +require 'phusion_passenger/platform_info' include PlatformInfo test/integration_tests.rb @@ -1,6 +1,6 @@ require 'support/config' require 'support/test_helper' -require 'passenger/abstract_request_handler' +require 'phusion_passenger/abstract_request_handler' require 'fileutils' test/ruby/abstract_request_handler_spec.rb @@ -1,7 +1,7 @@ require 'support/config' require 'support/test_helper' -require 'passenger/abstract_server' -require 'passenger/abstract_server_collection' +require 'phusion_passenger/abstract_server' +require 'phusion_passenger/abstract_server_collection' include PhusionPassenger test/ruby/abstract_server_collection_spec.rb @@ -1,6 +1,6 @@ require 'support/config' require 'support/test_helper' -require 'passenger/application' +require 'phusion_passenger/application' include PhusionPassenger describe Application do test/ruby/application_spec.rb @@ -1,6 +1,6 @@ require 'socket' require 'support/config' -require 'passenger/message_channel' +require 'phusion_passenger/message_channel' include PhusionPassenger describe MessageChannel do test/ruby/message_channel_spec.rb @@ -1,6 +1,6 @@ require 'support/config' require 'support/test_helper' -require 'passenger/rack/application_spawner' +require 'phusion_passenger/rack/application_spawner' describe PhusionPassenger::Rack::ApplicationSpawner do include TestHelper test/ruby/rack/application_spawner_spec.rb @@ -1,6 +1,6 @@ require 'support/config' require 'support/test_helper' -require 'passenger/railz/application_spawner' +require 'phusion_passenger/railz/application_spawner' require 'ruby/rails/minimal_spawner_spec' require 'ruby/spawn_server_spec' test/ruby/rails/application_spawner_spec.rb @@ -1,6 +1,6 @@ require 'support/config' require 'support/test_helper' -require 'passenger/railz/framework_spawner' +require 'phusion_passenger/railz/framework_spawner' require 'ruby/rails/minimal_spawner_spec' require 'ruby/spawn_server_spec' test/ruby/rails/framework_spawner_spec.rb @@ -1,6 +1,6 @@ require 'support/config' require 'support/test_helper' -require 'passenger/spawn_manager' +require 'phusion_passenger/spawn_manager' require 'ruby/abstract_server_spec' require 'ruby/rails/minimal_spawner_spec' test/ruby/spawn_manager_spec.rb @@ -1,7 +1,7 @@ require 'support/config' require 'tempfile' -require 'passenger/utils' +require 'phusion_passenger/utils' include PhusionPassenger test/ruby/utils_spec.rb @@ -1,7 +1,7 @@ require 'support/config' require 'support/test_helper' -require 'passenger/wsgi/application_spawner' -require 'passenger/utils' +require 'phusion_passenger/wsgi/application_spawner' +require 'phusion_passenger/utils' require 'fileutils' require 'tempfile' test/ruby/wsgi/application_spawner_spec.rb @@ -1,6 +1,6 @@ #!/usr/bin/env ruby $LOAD_PATH << "#{File.dirname(__FILE__)}/../../lib" -require 'passenger/message_channel' +require 'phusion_passenger/message_channel' include PhusionPassenger reader = MessageChannel.new(STDIN) test/stub/message_channel.rb @@ -1,6 +1,6 @@ #!/usr/bin/env ruby $LOAD_PATH << "#{File.dirname(__FILE__)}/../../lib" -require 'passenger/message_channel' +require 'phusion_passenger/message_channel' include PhusionPassenger reader = MessageChannel.new(STDIN) test/stub/message_channel_2.rb @@ -1,8 +1,8 @@ #!/usr/bin/env ruby $LOAD_PATH << "#{File.dirname(__FILE__)}/../../lib" $LOAD_PATH << "#{File.dirname(__FILE__)}/../../ext" -require 'passenger/message_channel' -require 'passenger/utils' +require 'phusion_passenger/message_channel' +require 'phusion_passenger/utils' include PhusionPassenger channel = MessageChannel.new(IO.new(3)) test/stub/message_channel_3.rb @@ -1,7 +1,7 @@ #!/usr/bin/env ruby $LOAD_PATH << "#{File.dirname(__FILE__)}/../../lib" $LOAD_PATH << "#{File.dirname(__FILE__)}/../../ext" -require 'passenger/spawn_manager' +require 'phusion_passenger/spawn_manager' include PhusionPassenger class SpawnManager test/stub/spawn_server.rb @@ -1,6 +1,6 @@ require 'erb' require 'fileutils' -require 'passenger/platform_info' +require 'phusion_passenger/platform_info' # A class for starting, stopping and restarting Apache, and for manipulating # its configuration file. This is used by the integration tests. test/support/apache2_controller.rb ext/passenger/extconf.rb ext/passenger/native_support.c lib/passenger/abstract_request_handler.rb lib/passenger/abstract_server.rb lib/passenger/abstract_server_collection.rb lib/passenger/admin_tools.rb lib/passenger/admin_tools/control_process.rb lib/passenger/application.rb lib/passenger/console_text_template.rb lib/passenger/constants.rb lib/passenger/dependencies.rb lib/passenger/exceptions.rb lib/passenger/html_template.rb lib/passenger/message_channel.rb lib/passenger/platform_info.rb lib/passenger/rack/application_spawner.rb lib/passenger/rack/request_handler.rb lib/passenger/railz/application_spawner.rb lib/passenger/railz/cgi_fixed.rb lib/passenger/railz/framework_spawner.rb lib/passenger/railz/request_handler.rb lib/passenger/simple_benchmarking.rb lib/passenger/spawn_manager.rb lib/passenger/templates/apache2_config_snippets.txt.erb lib/passenger/templates/apache_must_be_compiled_with_compatible_mpm.txt.erb lib/passenger/templates/app_exited_during_initialization.html.erb lib/passenger/templates/app_init_error.html.erb lib/passenger/templates/database_error.html.erb lib/passenger/templates/deployment_example.txt.erb lib/passenger/templates/error_layout.css lib/passenger/templates/error_layout.html.erb lib/passenger/templates/framework_init_error.html.erb lib/passenger/templates/general_error.html.erb lib/passenger/templates/invalid_app_root.html.erb lib/passenger/templates/load_error.html.erb lib/passenger/templates/no_write_permission_to_passenger_root.txt.erb lib/passenger/templates/possible_solutions_for_compilation_and_installation_problems.txt.erb lib/passenger/templates/run_installer_as_root.txt.erb lib/passenger/templates/version_not_found.html.erb lib/passenger/templates/welcome.txt.erb lib/passenger/utils.rb lib/passenger/wsgi/application_spawner.rb lib/passenger/wsgi/request_handler.py a755dde89e1b1d2017eee4cb2aa142eea44e9432 Hongli Lai (Phusion) hongli@phusion.nl http://github.com/FooBarWidget/passenger/commit/71d15136c6d0c7db43a523dcb2dad6b8a9fbeaf0 71d15136c6d0c7db43a523dcb2dad6b8a9fbeaf0 2009-02-03T00:46:45-08:00 2009-02-03T00:46:45-08:00 Remove 'passenger' directory to 'phusion_passenger'. 6cfc6f5c70aee3c6d0827156fd49d729bf195afc Hongli Lai (Phusion) hongli@phusion.nl