From 3512842b24ad923849968681c82b11f8351c1c41 Mon Sep 17 00:00:00 2001 From: Daniel DeLeo Date: Mon, 26 Apr 2010 00:51:16 -0700 Subject: [CHEF-1072] rm chef-server tree --- Rakefile | 68 ++++--- chef-server/LICENSE | 201 --------------------- chef-server/README.rdoc | 135 -------------- chef-server/Rakefile | 44 ----- chef-server/app/controllers/application.rb | 2 - chef-server/app/helpers/global_helpers.rb | 5 - .../app/views/exceptions/not_acceptable.html.erb | 63 ------- .../app/views/exceptions/not_found.html.erb | 47 ----- chef-server/app/views/layout/application.html.erb | 12 -- chef-server/bin/chef-server | 80 -------- chef-server/bin/chef-server-webui | 75 -------- chef-server/config/dependencies-webui.rb | 27 --- chef-server/config/dependencies.rb | 24 --- chef-server/config/environments/development.rb | 13 -- chef-server/config/environments/production.rb | 10 - chef-server/config/environments/rake.rb | 10 - chef-server/config/environments/staging.rb | 10 - chef-server/config/environments/test.rb | 13 -- chef-server/config/init-webui.rb | 34 ---- chef-server/config/init.rb | 30 --- chef-server/config/rack.rb | 21 --- chef-server/config/router.rb | 39 ---- chef-server/lib/tasks/install.rake | 7 - chef-server/lib/tasks/package.rake | 34 ---- chef-server/lib/tasks/uninstall.rake | 7 - .../lib/views/exceptions/bad_request.html.haml | 2 - chef-server/public/.htaccess | 17 -- chef-server/public/favicon.ico | Bin 1078 -> 0 bytes chef-server/public/images/merb.jpg | Bin 5815 -> 0 bytes chef-server/public/javascripts/application.js | 1 - chef-server/public/javascripts/jquery.js | 19 -- chef-server/public/merb.fcgi | 22 --- chef-server/public/robots.txt | 5 - chef-server/public/stylesheets/master.css | 119 ------------ chef-server/spec/spec.opts | 0 chef-server/spec/spec_helper.rb | 25 --- chef-server/tasks/doc.thor | 149 --------------- chef-server/tasks/merb.thor/app_script.rb | 31 ---- chef-server/tasks/merb.thor/common.rb | 68 ------- chef-server/tasks/merb.thor/gem_ext.rb | 125 ------------- chef-server/tasks/merb.thor/main.thor | 150 --------------- chef-server/tasks/merb.thor/ops.rb | 93 ---------- chef-server/tasks/merb.thor/utils.rb | 40 ---- 43 files changed, 43 insertions(+), 1834 deletions(-) delete mode 100644 chef-server/LICENSE delete mode 100644 chef-server/README.rdoc delete mode 100644 chef-server/Rakefile delete mode 100644 chef-server/app/controllers/application.rb delete mode 100644 chef-server/app/helpers/global_helpers.rb delete mode 100644 chef-server/app/views/exceptions/not_acceptable.html.erb delete mode 100644 chef-server/app/views/exceptions/not_found.html.erb delete mode 100644 chef-server/app/views/layout/application.html.erb delete mode 100755 chef-server/bin/chef-server delete mode 100755 chef-server/bin/chef-server-webui delete mode 100644 chef-server/config/dependencies-webui.rb delete mode 100644 chef-server/config/dependencies.rb delete mode 100644 chef-server/config/environments/development.rb delete mode 100644 chef-server/config/environments/production.rb delete mode 100644 chef-server/config/environments/rake.rb delete mode 100644 chef-server/config/environments/staging.rb delete mode 100644 chef-server/config/environments/test.rb delete mode 100644 chef-server/config/init-webui.rb delete mode 100644 chef-server/config/init.rb delete mode 100644 chef-server/config/rack.rb delete mode 100644 chef-server/config/router.rb delete mode 100644 chef-server/lib/tasks/install.rake delete mode 100644 chef-server/lib/tasks/package.rake delete mode 100644 chef-server/lib/tasks/uninstall.rake delete mode 100644 chef-server/lib/views/exceptions/bad_request.html.haml delete mode 100644 chef-server/public/.htaccess delete mode 100644 chef-server/public/favicon.ico delete mode 100644 chef-server/public/images/merb.jpg delete mode 100644 chef-server/public/javascripts/application.js delete mode 100644 chef-server/public/javascripts/jquery.js delete mode 100755 chef-server/public/merb.fcgi delete mode 100644 chef-server/public/robots.txt delete mode 100644 chef-server/public/stylesheets/master.css delete mode 100644 chef-server/spec/spec.opts delete mode 100644 chef-server/spec/spec_helper.rb delete mode 100644 chef-server/tasks/doc.thor delete mode 100644 chef-server/tasks/merb.thor/app_script.rb delete mode 100644 chef-server/tasks/merb.thor/common.rb delete mode 100644 chef-server/tasks/merb.thor/gem_ext.rb delete mode 100644 chef-server/tasks/merb.thor/main.thor delete mode 100644 chef-server/tasks/merb.thor/ops.rb delete mode 100644 chef-server/tasks/merb.thor/utils.rb diff --git a/Rakefile b/Rakefile index a27dc3026c..aa7c8f7e9a 100644 --- a/Rakefile +++ b/Rakefile @@ -1,6 +1,24 @@ -# lkjlk - -gems = %w[chef chef-server-api chef-server-webui chef-server chef-solr] +# +# Rakefile for Chef +# +# Author:: Adam Jacob () +# Copyright:: Copyright (c) 2008, 2010 Opscode, Inc. +# License:: Apache License, Version 2.0 +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +gems = %w[chef chef-server-api chef-server-webui chef-solr] require 'rubygems' require 'cucumber/rake/task' @@ -12,7 +30,7 @@ task :gem do Dir.chdir(dir) { sh build_commands[dir] } end end - + desc "Install the chef gems" task :install do gems.each do |dir| @@ -58,7 +76,7 @@ end def configure_rabbitmq(type="normal") # hack. wait for rabbit to come up. sleep 2 - + puts `rabbitmqctl add_vhost /chef` # create 'chef' user, give it the password 'testing' @@ -70,7 +88,7 @@ def configure_rabbitmq(type="normal") puts `rabbitmqctl list_users` puts `rabbitmqctl list_vhosts` puts `rabbitmqctl list_permissions -p /chef` - + end def start_chef_solr(type="normal") @@ -174,11 +192,11 @@ def stop_dev_environment end if @couchdb_server_pid puts "Stopping CouchDB" - Process.kill("KILL", @couchdb_server_pid) + Process.kill("KILL", @couchdb_server_pid) end if @rabbitmq_server_pid puts "Stopping RabbitMQ" - Process.kill("KILL", @rabbitmq_server_pid) + Process.kill("KILL", @rabbitmq_server_pid) end puts "Have a nice day!" end @@ -201,15 +219,15 @@ task :dev do wait_for_ctrlc end -namespace :dev do +namespace :dev do desc "Install a test instance of Chef for doing features against" task :features do start_dev_environment("features") wait_for_ctrlc end - + namespace :features do - + namespace :start do desc "Start CouchDB for testing" task :couchdb do @@ -223,7 +241,7 @@ namespace :dev do configure_rabbitmq("features") wait_for_ctrlc end - + desc "Start Chef Solr for testing" task :chef_solr do start_chef_solr("features") @@ -321,7 +339,7 @@ namespace :features do end end - namespace :cookbooks do + namespace :cookbooks do desc "Run cucumber tests for the cookbooks portion of the REST API" Cucumber::Rake::Task.new(:cookbooks) do |t| t.profile = "api_cookbooks" @@ -331,13 +349,13 @@ namespace :features do t.profile = "api_cookbooks_tarballs" end end - - namespace :data do + + namespace :data do desc "Run cucumber tests for the data portion of the REST API" Cucumber::Rake::Task.new(:data) do |t| t.profile = "api_data" end - + desc "Run cucumber tests for deleting data via the REST API" Cucumber::Rake::Task.new(:delete) do |t| t.profile = "api_data_delete" @@ -347,13 +365,13 @@ namespace :features do t.profile = "api_data_item" end end - + namespace :search do desc "Run cucumber tests for searching via the REST API" Cucumber::Rake::Task.new(:search) do |t| t.profile = "api_search" end - + desc "Run cucumber tests for listing search endpoints via the REST API" Cucumber::Rake::Task.new(:list) do |t| t.profile = "api_search_list" @@ -427,17 +445,17 @@ namespace :features do t.profile = "attribute_inclusion" end end - + Cucumber::Rake::Task.new(:lwrp) do |t| t.profile = "lwrp" end - desc "Run cucumber tests for providers" + desc "Run cucumber tests for providers" Cucumber::Rake::Task.new(:provider) do |t| t.profile = "provider" end - + namespace :provider do desc "Run cucumber tests for deploy resources" Cucumber::Rake::Task.new(:deploy) do |t| @@ -468,21 +486,21 @@ namespace :features do Cucumber::Rake::Task.new(:template) do |t| t.profile = "provider_template" end - + Cucumber::Rake::Task.new(:remote_directory) do |t| t.profile = "provider_remote_directory" end - + Cucumber::Rake::Task.new(:git) do |t| t.profile = "provider_git" end - + namespace :package do desc "Run cucumber tests for macports packages" Cucumber::Rake::Task.new(:macports) do |t| t.profile = "provider_package_macports" end - + Cucumber::Rake::Task.new(:gems) do |g| g.profile = "provider_package_rubygems" end diff --git a/chef-server/LICENSE b/chef-server/LICENSE deleted file mode 100644 index 11069edd79..0000000000 --- a/chef-server/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - -TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - -1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - -2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - -3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - -4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - -5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - -6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - -7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - -8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - -9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - -END OF TERMS AND CONDITIONS - -APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - -Copyright [yyyy] [name of copyright owner] - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. diff --git a/chef-server/README.rdoc b/chef-server/README.rdoc deleted file mode 100644 index 2c2eaa706b..0000000000 --- a/chef-server/README.rdoc +++ /dev/null @@ -1,135 +0,0 @@ -= Chef - -= DESCRIPTION: - -Chef is a configuration management tool designed to bring automation to your entire infrastructure. - -The Chef Wiki is the definitive source of user documentation. - -* http://wiki.opscode.com/display/chef/Home - -This README focuses on developers who want to modify Chef source code. For users who just want to run the latest and greatest Chef development version in their environment, see: - -* http://wiki.opscode.com/display/chef/Installing+Chef+from+HEAD - -= DEVELOPMENT: - -Before working on the code, if you plan to contribute your changes, you need to read the Opscode Contributing document. - -* http://wiki.opscode.com/display/opscode/Contributing - -You will also need to set up the repository with the appropriate branches. We document the process on the Chef Wiki. - -* http://wiki.opscode.com/display/opscode/Working+with+Git - -Once your repository is set up, you can start working on the code. We do use BDD/TDD with RSpec and Cucumber, so you'll need to get a development environment running. - -= ENVIRONMENT: - -In order to have a development environment where changes to the Chef code can be tested, we'll need to install a few things after setting up the Git repository. - -== Requirements: - -Install these via your platform's preferred method; for example apt, yum, ports, emerge, etc. - -* Git -* CouchDB -* libxml2 development package (for webrat) -* libxslt develoment package (for webrat) - -Install the following RubyGems. - -* ohai -* rake -* rspec -* cucumber -* webrat -* merb-core -* roman-merb_cucumber - -Ohai is also by Opscode and available on GitHub, http://github.com/opscode/ohai/tree/master. - -roman-merb_cucumber is available from GitHub: - - gem install --source http://gems.github.com/ roman-merb_cucumber - -== Starting the Environment: - -Once everything is installed, run the dev:features rake task. Since the features do integration testing, root access is required. - - sudo rake dev:features - -The dev:features task: - -* Installs chef, chef-server, chef-server-slice gems. It will fail if required gems above are missing. -* Starts chef-server on ports 4000 and 4001. -* Starts chef-indexer. -* Starts CouchDB on port 5984. -* Starts the stompserver on port 61613. - -You'll know its running when you see: - - ~ Activating slice 'ChefServerSlice' ... - merb : worker (port 4000) ~ Starting Mongrel at port 4000 - merb : worker (port 4000) ~ Successfully bound to port 4000 - merb : worker (port 4001) ~ Starting Mongrel at port 4001 - merb : worker (port 4001) ~ Successfully bound to port 4001 - -You'll want to leave this terminal running the dev environment. - -== Web Interface: - -With the dev environment running, you can now access the web interface via http://localhost:4000/. Supply an OpenID to log in. - -== Spec testing: - -We use RSpec for unit/spec tests. - - rake spec - -This doesn't actually use the development environment, because it does the testing on all the Chef internals. For integration/usage testing, we use Cucumber features. - -== Integration testing: - -We test integration with Cucumber. The available feature tests are rake tasks: - - rake features # Run Features with Cucumber - rake features:api # Run Features with Cucumber - rake features:client # Run Features with Cucumber - rake features:provider:package:macports # Run Features with Cucumber - rake features:provider:remote_file # Run Features with Cucumber - rake features:search # Run Features with Cucumber - -= LINKS: - -Source: - -* http://github.com/opscode/chef/tree/master - -Tickets/Issues: - -* http://tickets.opscode.com/ - -Documentation: - -* http://wiki.opscode.com/display/chef/Home/ - -= LICENSE: - -Chef - A configuration management system - -Author:: Adam Jacob () -Copyright:: Copyright (c) 2008, 2009 Opscode, Inc. -License:: Apache License, Version 2.0 - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. diff --git a/chef-server/Rakefile b/chef-server/Rakefile deleted file mode 100644 index b1f6e68d68..0000000000 --- a/chef-server/Rakefile +++ /dev/null @@ -1,44 +0,0 @@ - -require 'rubygems' -require 'rake/rdoctask' - -require 'merb-core' -require 'merb-core/tasks/merb' -require 'spec' -require 'spec/rake/spectask' - -# Load chef and chef-server slice from source rather than gem, if present -[ 'chef', 'chef-server-slice' ].each do |lib| - library = File.join(File.dirname(__FILE__), "..", lib, "lib", "#{lib}.rb") - require library if File.exists?(library) -end - -require 'chef' unless defined?(Chef) - -include FileUtils - -GEM = "chef-server" -CHEF_SERVER_VERSION = "0.8.12" -AUTHOR = "Opscode" -EMAIL = "chef@opscode.com" -HOMEPAGE = "http://wiki.opscode.com/display/chef" -SUMMARY = "A systems integration framework, built to bring the benefits of configuration management to your entire infrastructure." - -tasks_path = File.join(File.dirname(__FILE__), "lib", "tasks") -rake_files = Dir["#{tasks_path}/*.rake"] -rake_files.each{|rake_file| load rake_file } - -desc "Start runner environment" -task :merb_env do - Merb.start_environment(:environment => init_env, :adapter => 'runner') -end - -require 'spec/rake/spectask' -require 'merb-core/test/tasks/spectasks' -desc 'Default: run spec examples' -task :default => 'spec' - -############################################################################## -# ADD YOUR CUSTOM TASKS IN /lib/tasks -# NAME YOUR RAKE FILES file_name.rake -############################################################################## diff --git a/chef-server/app/controllers/application.rb b/chef-server/app/controllers/application.rb deleted file mode 100644 index 5ce39a0102..0000000000 --- a/chef-server/app/controllers/application.rb +++ /dev/null @@ -1,2 +0,0 @@ -class Application < Merb::Controller -end \ No newline at end of file diff --git a/chef-server/app/helpers/global_helpers.rb b/chef-server/app/helpers/global_helpers.rb deleted file mode 100644 index 9c9e5aa197..0000000000 --- a/chef-server/app/helpers/global_helpers.rb +++ /dev/null @@ -1,5 +0,0 @@ -module Merb - module GlobalHelpers - # helpers defined here available to all views. - end -end diff --git a/chef-server/app/views/exceptions/not_acceptable.html.erb b/chef-server/app/views/exceptions/not_acceptable.html.erb deleted file mode 100644 index a7b7752ab2..0000000000 --- a/chef-server/app/views/exceptions/not_acceptable.html.erb +++ /dev/null @@ -1,63 +0,0 @@ -
-
- - -

pocket rocket web framework

-
-
- -
-

Exception:

-

<%= request.exceptions.first.message %>

-
- -
-

Why am I seeing this page?

-

Merb couldn't find an appropriate content_type to return, - based on what you said was available via provides() and - what the client requested.

- -

How to add a mime-type

- 

-      Merb.add_mime_type :pdf, :to_pdf, %w[application/pdf], "Content-Encoding" => "gzip"
-
-

What this means is:

-
    -
  • Add a mime-type for :pdf
    • -
  • Register the method for converting objects to PDF as #to_pdf.
    • -
  • Register the incoming mime-type "Accept" header as application/pdf.
    • -
  • Specify a new header for PDF types so it will set Content-Encoding to gzip.
    • -
- -

You can then do:

- 

-      class Foo < Application
-        provides :pdf
-      end
-
- -

Where can I find help?

-

If you have any questions or if you can't figure something out, please take a - look at our project page, - feel free to come chat at irc.freenode.net, channel #merb, - or post to merb mailing list - on Google Groups.

- -

What if I've found a bug?

-

If you want to file a bug or make your own contribution to Merb, - feel free to register and create a ticket at our - project development page - on Lighthouse.

- -

How do I edit this page?

-

You can change what people see when this happens by editing app/views/exceptions/not_acceptable.html.erb.

- -
- - -
diff --git a/chef-server/app/views/exceptions/not_found.html.erb b/chef-server/app/views/exceptions/not_found.html.erb deleted file mode 100644 index 42b41a89dc..0000000000 --- a/chef-server/app/views/exceptions/not_found.html.erb +++ /dev/null @@ -1,47 +0,0 @@ -
-
- - -

pocket rocket web framework

-
-
- -
-

Exception:

-

<%= request.exceptions.first.message %>

-
- -
-

Welcome to Merb!

-

Merb is a light-weight MVC framework written in Ruby. We hope you enjoy it.

- -

Where can I find help?

-

If you have any questions or if you can't figure something out, please take a - look at our project page, - feel free to come chat at irc.freenode.net, channel #merb, - or post to merb mailing list - on Google Groups.

- -

What if I've found a bug?

-

If you want to file a bug or make your own contribution to Merb, - feel free to register and create a ticket at our - project development page - on Lighthouse.

- -

How do I edit this page?

-

You're seeing this page because you need to edit the following files: -

    -
  • config/router.rb (recommended)
    • -
  • app/views/exceptions/not_found.html.erb (recommended)
    • -
  • app/views/layout/application.html.erb (change this layout)
    • -
-

-
- - -
diff --git a/chef-server/app/views/layout/application.html.erb b/chef-server/app/views/layout/application.html.erb deleted file mode 100644 index 4637ef2ded..0000000000 --- a/chef-server/app/views/layout/application.html.erb +++ /dev/null @@ -1,12 +0,0 @@ - - - - Fresh Merb App - - - - - <%#= message[:notice] %> - <%= catch_content :for_layout %> - - \ No newline at end of file diff --git a/chef-server/bin/chef-server b/chef-server/bin/chef-server deleted file mode 100755 index b9a5e724dd..0000000000 --- a/chef-server/bin/chef-server +++ /dev/null @@ -1,80 +0,0 @@ -#!/usr/bin/env ruby -# -# ./chef-server - Serving up piping hot infrastructure! -# -# Author:: Adam Jacob () -# Copyright:: Copyright (c) 2008 Opscode, Inc. -# License:: Apache License, Version 2.0 -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# Based on the 'merb' command, by Ezra - -# Add chef and chef-server-slice lib dirs to the load path -# Load chef and chef-server slice from source rather than gem, if present - -puts "please use the chef-server command in the chef-server-api gem" -exit 1 - -require "rubygems" -require "merb-core" - -CHEF_SERVER_VERSION = "0.8.12" - -[ 'chef', 'chef-server-api' ].each do |lib| - $:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "lib"))) - library = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", lib, "lib", "#{lib}.rb")) - require library if File.exists?(library) -end - -# Ensure the chef gem we load is the same version as the chef server -unless defined?(Chef) - gem "chef", "=" + CHEF_SERVER_VERSION - require 'chef' -end - -Dir.chdir File.join(File.dirname(__FILE__),"..") -__DIR__ = Dir.getwd - -if ARGV[0] && ARGV[0] =~ /^[^-]/ - ARGV.push "-H" -end -unless %w[-a --adapter -i --irb-console -r --script-runner].any? { |o| ARGV.index(o) } - ARGV.push *%w[-a thin] -end -ARGV.push *[ "-I", File.join(__DIR__, "config", "init.rb") ] -ARGV.push *[ "-m", __DIR__] - -# attempt to find the user and group that this process will become. Fixes CHEF-1015 -if (index = ARGV.index("-u")) - Chef::Config[:signing_ca_user] = ARGV[index+1] -end -if (index = ARGV.index("-G")) - Chef::Config[:signing_ca_group] = ARGV[index+1] -end - -if index = ARGV.index("-C") - config = ARGV[index+1] - ARGV.delete("-C") - ARGV.delete(config) - Chef::Config.from_file(File.expand_path(config)) -else - Chef::Config.from_file( - File.join("/etc", "chef", "server.rb") - ) -end - -Chef::Log.init(Chef::Config[:log_location]) -Chef::Log.level = Chef::Config[:log_level] - -Merb.start diff --git a/chef-server/bin/chef-server-webui b/chef-server/bin/chef-server-webui deleted file mode 100755 index 51681a8658..0000000000 --- a/chef-server/bin/chef-server-webui +++ /dev/null @@ -1,75 +0,0 @@ -#!/usr/bin/env ruby -# -# ./chef-server - Serving up piping hot infrastructure! -# -# Author:: Adam Jacob () -# Copyright:: Copyright (c) 2008 Opscode, Inc. -# License:: Apache License, Version 2.0 -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# Based on the 'merb' command, by Ezra - -# Add chef and chef-server-slice lib dirs to the load path -# Load chef and chef-server slice from source rather than gem, if present - -puts "please use the chef-server-webui command in the chef-server-webui gem" -exit 1 - -require "rubygems" -require "merb-core" - -[ 'chef', 'chef-server-webui' ].each do |lib| - $:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "lib"))) - library = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", lib, "lib", "#{lib}.rb")) - require library if File.exists?(library) -end - -CHEF_SERVER_VERSION = "0.8.12" - -# Ensure the chef gem we load is the same version as the chef server -unless defined?(Chef) - gem "chef", "=" + CHEF_SERVER_VERSION - require 'chef' -end - -Dir.chdir File.join(File.dirname(__FILE__),"..") -__DIR__ = Dir.getwd - -if ARGV[0] && ARGV[0] =~ /^[^-]/ - ARGV.push "-H" -end -unless %w[-a --adapter -i --irb-console -r --script-runner].any? { |o| ARGV.index(o) } - ARGV.push *%w[-a thin] -end -unless %w[-p --port].any? { |o| ARGV.index(o) } - ARGV.push *%w[-p 4040] -end -ARGV.push *[ "-I", File.join(__DIR__, "config", "init-webui.rb") ] -ARGV.push *[ "-m", __DIR__] - -if index = ARGV.index("-C") - config = ARGV[index+1] - ARGV.delete("-C") - ARGV.delete(config) - Chef::Config.from_file(File.expand_path(config)) -else - Chef::Config.from_file( - File.join("/etc", "chef", "server.rb") - ) -end - -Chef::Log.init(Chef::Config[:log_location]) -Chef::Log.level = Chef::Config[:log_level] - -Merb.start diff --git a/chef-server/config/dependencies-webui.rb b/chef-server/config/dependencies-webui.rb deleted file mode 100644 index 392e1dbf86..0000000000 --- a/chef-server/config/dependencies-webui.rb +++ /dev/null @@ -1,27 +0,0 @@ -# dependencies are generated using a strict version, don't forget to edit the dependency versions when upgrading. -merb_gems_version = "> 1.0" - -%w{chef chef-server-webui}.each do |dep| - $:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "..", "..", dep, "lib"))) -end - -dependency "chef", :immediate=>true unless defined?(Chef) - -begin - require 'chef' - require 'chef-server-webui' -rescue LoadError -end - -# For more information about each component, please read http://wiki.merbivore.com/faqs/merb_components -dependency "merb-core", merb_gems_version -dependency "merb-slices", merb_gems_version -dependency "merb-haml", merb_gems_version -dependency "merb-assets", merb_gems_version -dependency "merb-helpers", merb_gems_version -if defined?(CHEF_SERVER_VERSION) - dependency "chef-server-webui", CHEF_SERVER_VERSION unless defined?(ChefServerWebui) -else - dependency "chef-server-webui" unless defined?(ChefServerWebui) -end - diff --git a/chef-server/config/dependencies.rb b/chef-server/config/dependencies.rb deleted file mode 100644 index cd22b55db2..0000000000 --- a/chef-server/config/dependencies.rb +++ /dev/null @@ -1,24 +0,0 @@ -# dependencies are generated using a strict version, don't forget to edit the dependency versions when upgrading. -merb_gems_version = "> 1.0" - -%w{chef chef-server-api chef-solr}.each do |dep| - $:.unshift(File.join(File.dirname(__FILE__), "..", "..", dep, "lib")) -end - -begin - require 'chef' - require 'chef-server-api' -rescue -end - -# For more information about each component, please read http://wiki.merbivore.com/faqs/merb_components -dependency "merb-core", merb_gems_version -dependency "merb-assets", merb_gems_version -dependency "merb-helpers", merb_gems_version -dependency "merb-slices", merb_gems_version -if defined?(CHEF_SERVER_VERSION) - dependency "chef-server-api", CHEF_SERVER_VERSION unless defined?(ChefServerApi) -else - dependency "chef-server-api" unless defined?(ChefServerApi) -end - diff --git a/chef-server/config/environments/development.rb b/chef-server/config/environments/development.rb deleted file mode 100644 index a3f091520b..0000000000 --- a/chef-server/config/environments/development.rb +++ /dev/null @@ -1,13 +0,0 @@ -Merb.logger.info("Loaded DEVELOPMENT Environment...") -Merb::Config.use { |c| - c[:exception_details] = true - c[:reload_templates] = true - c[:reload_classes] = true - c[:reload_time] = 0.5 - c[:log_auto_flush ] = true - c[:log_level] = :debug - c[:log_stream] = Chef::Config[:log_location] - c[:log_file] = nil - # Or redirect logging into a file: - # c[:log_file] = Merb.root / "log" / "development.log" -} diff --git a/chef-server/config/environments/production.rb b/chef-server/config/environments/production.rb deleted file mode 100644 index 73c3d55a0d..0000000000 --- a/chef-server/config/environments/production.rb +++ /dev/null @@ -1,10 +0,0 @@ -Merb.logger.info("Loaded PRODUCTION Environment...") -Merb::Config.use { |c| - c[:exception_details] = false - c[:reload_classes] = false - c[:log_auto_flush] = true - c[:log_level] = Chef::Config[:log_level] - c[:log_stream] = Chef::Config[:log_location] - # or redirect logger using IO handle - # c[:log_stream] = STDOUT -} diff --git a/chef-server/config/environments/rake.rb b/chef-server/config/environments/rake.rb deleted file mode 100644 index 6417884453..0000000000 --- a/chef-server/config/environments/rake.rb +++ /dev/null @@ -1,10 +0,0 @@ -Merb.logger.info("Loaded RAKE Environment...") -Merb::Config.use { |c| - c[:exception_details] = true - c[:reload_classes] = false - c[:log_auto_flush ] = true - c[:log_stream] = Chef::Config[:log_location] - c[:log_file] = nil - # Or redirect logging into a file: - # c[:log_file] = Merb.root / "log" / "development.log" -} diff --git a/chef-server/config/environments/staging.rb b/chef-server/config/environments/staging.rb deleted file mode 100644 index 0ac303dd44..0000000000 --- a/chef-server/config/environments/staging.rb +++ /dev/null @@ -1,10 +0,0 @@ -Merb.logger.info("Loaded STAGING Environment...") -Merb::Config.use { |c| - c[:exception_details] = false - c[:reload_classes] = false - c[:log_level] = :error - c[:log_stream] = Chef::Config[:log_location] - c[:log_file] = nil - # or redirect logger using IO handle - # c[:log_stream] = STDOUT -} diff --git a/chef-server/config/environments/test.rb b/chef-server/config/environments/test.rb deleted file mode 100644 index e180453873..0000000000 --- a/chef-server/config/environments/test.rb +++ /dev/null @@ -1,13 +0,0 @@ -Merb.logger.info("Loaded TEST Environment...") -Merb::Config.use { |c| - c[:testing] = true - c[:exception_details] = true - c[:log_auto_flush ] = true - - # log less in testing environment - c[:log_level] = :error - c[:log_stream] = Chef::Config[:log_location] - c[:log_file] = nil - #c[:log_file] = Merb.root / "log" / "test.log" - # or redirect logger using IO handle -} diff --git a/chef-server/config/init-webui.rb b/chef-server/config/init-webui.rb deleted file mode 100644 index 0de477a4e4..0000000000 --- a/chef-server/config/init-webui.rb +++ /dev/null @@ -1,34 +0,0 @@ -# Go to http://wiki.merbivore.com/pages/init-rb - -require 'config/dependencies-webui.rb' -unless defined?(Chef) - gem "chef", "=" + CHEF_SERVER_VERSION if CHEF_SERVER_VERSION - require 'chef' -end - -File.umask Chef::Config[:umask] - -use_test :rspec -use_template_engine :haml - -Merb::Config.use do |c| - c[:use_mutex] = false - c[:fork_for_class_load] = false - c[:session_id_key] = '_chef_server_session_id' - c[:session_secret_key] = Chef::Config.manage_secret_key - c[:session_store] = 'cookie' - c[:log_level] = Chef::Config[:log_level] - if Chef::Config[:log_location].kind_of?(String) - c[:log_file] = Chef::Config[:log_location] - end -end - -Merb::BootLoader.before_app_loads do - # This will get executed after dependencies have been loaded but before your app's classes have loaded. -end - -Merb::BootLoader.after_app_loads do - # This will get executed after your app's classes have been loaded. - OpenID::Util.logger = Merb.logger -end - diff --git a/chef-server/config/init.rb b/chef-server/config/init.rb deleted file mode 100644 index 6ed09b4eea..0000000000 --- a/chef-server/config/init.rb +++ /dev/null @@ -1,30 +0,0 @@ -# Go to http://wiki.merbivore.com/pages/init-rb - -require 'config/dependencies.rb' -unless defined?(Chef) - gem "chef", "=" + CHEF_SERVER_VERSION if CHEF_SERVER_VERSION - require 'chef' -end - -File.umask Chef::Config[:umask] - -use_test :rspec -use_template_engine :haml - -Merb::Config.use do |c| - c[:use_mutex] = false - c[:fork_for_class_load] = false - c[:log_level] = Chef::Config[:log_level] - if Chef::Config[:log_location].kind_of?(String) - c[:log_file] = Chef::Config[:log_location] - end -end - -Merb::BootLoader.before_app_loads do - # This will get executed after dependencies have been loaded but before your app's classes have loaded. -end - -Merb::BootLoader.after_app_loads do - # This will get executed after your app's classes have been loaded. OpenID::Util.logger = Merb.logger -end - diff --git a/chef-server/config/rack.rb b/chef-server/config/rack.rb deleted file mode 100644 index 4ed0f70b55..0000000000 --- a/chef-server/config/rack.rb +++ /dev/null @@ -1,21 +0,0 @@ -$: << File.join(File.dirname(__FILE__)) - -# use PathPrefix Middleware if :path_prefix is set in Merb::Config -if prefix = ::Merb::Config[:path_prefix] - use Merb::Rack::PathPrefix, prefix -end - -# comment this out if you are running merb behind a load balancer -# that serves static files -use Merb::Rack::Static, Merb.dir_for(:public) - -Merb::Slices.config.each do |slice_module, config| - slice_module = Object.full_const_get(slice_module.to_s.camel_case) if slice_module.class.in?(String, Symbol) - slice_module.send("public_components").each do |component| - slice_static_dir = slice_module.send("dir_for", :public) - use Merb::Rack::Static, slice_static_dir - end -end - -# this is our main merb application -run Merb::Rack::Application.new diff --git a/chef-server/config/router.rb b/chef-server/config/router.rb deleted file mode 100644 index f352c42f61..0000000000 --- a/chef-server/config/router.rb +++ /dev/null @@ -1,39 +0,0 @@ -# Merb::Router is the request routing mapper for the merb framework. -# -# You can route a specific URL to a controller / action pair: -# -# match("/contact"). -# to(:controller => "info", :action => "contact") -# -# You can define placeholder parts of the url with the :symbol notation. These -# placeholders will be available in the params hash of your controllers. For example: -# -# match("/books/:book_id/:action"). -# to(:controller => "books") -# -# Or, use placeholders in the "to" results for more complicated routing, e.g.: -# -# match("/admin/:module/:controller/:action/:id"). -# to(:controller => ":module/:controller") -# -# You can specify conditions on the placeholder by passing a hash as the second -# argument of "match" -# -# match("/registration/:course_name", :course_name => /^[a-z]{3,5}-\d{5}$/). -# to(:controller => "registration") -# -# You can also use regular expressions, deferred routes, and many other options. -# See merb/specs/merb/router.rb for a fairly complete usage sample. - -Merb.logger.info("Compiling routes...") -Merb::Router.prepare do - # RESTful routes - # resources :posts - - # Adds the required routes for merb-auth using the password slice - # slice(:merb_auth_slice_password, :name_prefix => nil, :path_prefix => "") - - slice(:chef_server_api, :path_prefix => "") if defined?(ChefServerApi) - slice(:chef_server_webui, :path_prefix => "") if defined?(ChefServerWebui) - -end diff --git a/chef-server/lib/tasks/install.rake b/chef-server/lib/tasks/install.rake deleted file mode 100644 index 7e8078792f..0000000000 --- a/chef-server/lib/tasks/install.rake +++ /dev/null @@ -1,7 +0,0 @@ -require 'rubygems' -require 'rake/gempackagetask' - -task :install => :package do - sh %{gem install pkg/#{GEM}-#{CHEF_SERVER_VERSION} --no-rdoc --no-ri} -end - diff --git a/chef-server/lib/tasks/package.rake b/chef-server/lib/tasks/package.rake deleted file mode 100644 index 6560481640..0000000000 --- a/chef-server/lib/tasks/package.rake +++ /dev/null @@ -1,34 +0,0 @@ -require 'rubygems' -require 'rake/gempackagetask' - -spec = Gem::Specification.new do |s| - s.name = GEM - s.version = CHEF_SERVER_VERSION - s.platform = Gem::Platform::RUBY - s.has_rdoc = true - s.extra_rdoc_files = ["README.rdoc", "LICENSE" ] - s.summary = SUMMARY - s.description = s.summary - s.author = AUTHOR - s.email = EMAIL - s.homepage = HOMEPAGE - s.add_dependency "merb-core", "~> 1.0.0" - s.add_dependency "merb-haml", "~> 1.0.0" - s.add_dependency "merb-assets", "~> 1.0.0" - s.add_dependency "merb-helpers", "~> 1.0.0" - s.add_dependency "json", "<= 1.4.2" - - %w{ thin haml - ruby-openid coderay}.each { |gem| s.add_dependency gem } - - s.bindir = "bin" - s.executables = %w( chef-server chef-server-webui ) - s.files = %w(LICENSE README.rdoc config.ru config-webui.ru) + Dir.glob("{app,bin,config,lib,public}/**/*") -end - -Rake::GemPackageTask.new(spec) do |pkg| - pkg.gem_spec = spec -end - - - diff --git a/chef-server/lib/tasks/uninstall.rake b/chef-server/lib/tasks/uninstall.rake deleted file mode 100644 index dd475e22f0..0000000000 --- a/chef-server/lib/tasks/uninstall.rake +++ /dev/null @@ -1,7 +0,0 @@ -require 'rubygems' -require 'rake/gempackagetask' - -task :uninstall do - sh %{gem uninstall #{GEM} -x -v #{CHEF_SERVER_VERSION}} -end - diff --git a/chef-server/lib/views/exceptions/bad_request.html.haml b/chef-server/lib/views/exceptions/bad_request.html.haml deleted file mode 100644 index c70c26a658..0000000000 --- a/chef-server/lib/views/exceptions/bad_request.html.haml +++ /dev/null @@ -1,2 +0,0 @@ -- request.exceptions.each do |exception| - = exception.message \ No newline at end of file diff --git a/chef-server/public/.htaccess b/chef-server/public/.htaccess deleted file mode 100644 index 455e706f96..0000000000 --- a/chef-server/public/.htaccess +++ /dev/null @@ -1,17 +0,0 @@ -# Sets the default handler for FastCGI scripts -AddHandler fastcgi-script .fcgi - -# If Apache2 is used together with mod_fcgid, -# uncomment the line below and comment in the line -# above to set the correct script handler -#AddHandler fcgid-script .fcgi - -RewriteEngine On - -RewriteRule ^$ index.html [QSA] -RewriteRule ^([^.]+)$ $1.html [QSA] -RewriteCond %{REQUEST_FILENAME} !-f -RewriteRule ^(.*)$ merb.fcgi [QSA,L] - - -ErrorDocument 500 "

Application Error

Merb could not be reached" diff --git a/chef-server/public/favicon.ico b/chef-server/public/favicon.ico deleted file mode 100644 index c908d63b92..0000000000 Binary files a/chef-server/public/favicon.ico and /dev/null differ diff --git a/chef-server/public/images/merb.jpg b/chef-server/public/images/merb.jpg deleted file mode 100644 index a19dcf4048..0000000000 Binary files a/chef-server/public/images/merb.jpg and /dev/null differ diff --git a/chef-server/public/javascripts/application.js b/chef-server/public/javascripts/application.js deleted file mode 100644 index 246a8be4c1..0000000000 --- a/chef-server/public/javascripts/application.js +++ /dev/null @@ -1 +0,0 @@ -// Common JavaScript code across your application goes here. \ No newline at end of file diff --git a/chef-server/public/javascripts/jquery.js b/chef-server/public/javascripts/jquery.js deleted file mode 100644 index 396646c842..0000000000 --- a/chef-server/public/javascripts/jquery.js +++ /dev/null @@ -1,19 +0,0 @@ -/* - * jQuery JavaScript Library v1.3 - * http://jquery.com/ - * - * Copyright (c) 2009 John Resig - * Dual licensed under the MIT and GPL licenses. - * http://docs.jquery.com/License - * - * Date: 2009-01-13 12:50:31 -0500 (Tue, 13 Jan 2009) - * Revision: 6104 - */ -(function(){var l=this,g,x=l.jQuery,o=l.$,n=l.jQuery=l.$=function(D,E){return new n.fn.init(D,E)},C=/^[^<]*(<(.|\s)+>)[^>]*$|^#([\w-]+)$/,f=/^.[^:#\[\.,]*$/;n.fn=n.prototype={init:function(D,G){D=D||document;if(D.nodeType){this[0]=D;this.length=1;this.context=D;return this}if(typeof D==="string"){var F=C.exec(D);if(F&&(F[1]||!G)){if(F[1]){D=n.clean([F[1]],G)}else{var H=document.getElementById(F[3]);if(H){if(H.id!=F[3]){return n().find(D)}var E=n(H);E.context=document;E.selector=D;return E}D=[]}}else{return n(G).find(D)}}else{if(n.isFunction(D)){return n(document).ready(D)}}if(D.selector&&D.context){this.selector=D.selector;this.context=D.context}return this.setArray(n.makeArray(D))},selector:"",jquery:"1.3",size:function(){return this.length},get:function(D){return D===g?n.makeArray(this):this[D]},pushStack:function(E,G,D){var F=n(E);F.prevObject=this;F.context=this.context;if(G==="find"){F.selector=this.selector+(this.selector?" ":"")+D}else{if(G){F.selector=this.selector+"."+G+"("+D+")"}}return F},setArray:function(D){this.length=0;Array.prototype.push.apply(this,D);return this},each:function(E,D){return n.each(this,E,D)},index:function(D){return n.inArray(D&&D.jquery?D[0]:D,this)},attr:function(E,G,F){var D=E;if(typeof E==="string"){if(G===g){return this[0]&&n[F||"attr"](this[0],E)}else{D={};D[E]=G}}return this.each(function(H){for(E in D){n.attr(F?this.style:this,E,n.prop(this,D[E],F,H,E))}})},css:function(D,E){if((D=="width"||D=="height")&&parseFloat(E)<0){E=g}return this.attr(D,E,"curCSS")},text:function(E){if(typeof E!=="object"&&E!=null){return this.empty().append((this[0]&&this[0].ownerDocument||document).createTextNode(E))}var D="";n.each(E||this,function(){n.each(this.childNodes,function(){if(this.nodeType!=8){D+=this.nodeType!=1?this.nodeValue:n.fn.text([this])}})});return D},wrapAll:function(D){if(this[0]){var E=n(D,this[0].ownerDocument).clone();if(this[0].parentNode){E.insertBefore(this[0])}E.map(function(){var F=this;while(F.firstChild){F=F.firstChild}return F}).append(this)}return this},wrapInner:function(D){return this.each(function(){n(this).contents().wrapAll(D)})},wrap:function(D){return this.each(function(){n(this).wrapAll(D)})},append:function(){return this.domManip(arguments,true,function(D){if(this.nodeType==1){this.appendChild(D)}})},prepend:function(){return this.domManip(arguments,true,function(D){if(this.nodeType==1){this.insertBefore(D,this.firstChild)}})},before:function(){return this.domManip(arguments,false,function(D){this.parentNode.insertBefore(D,this)})},after:function(){return this.domManip(arguments,false,function(D){this.parentNode.insertBefore(D,this.nextSibling)})},end:function(){return this.prevObject||n([])},push:[].push,find:function(D){if(this.length===1&&!/,/.test(D)){var F=this.pushStack([],"find",D);F.length=0;n.find(D,this[0],F);return F}else{var E=n.map(this,function(G){return n.find(D,G)});return this.pushStack(/[^+>] [^+>]/.test(D)?n.unique(E):E,"find",D)}},clone:function(E){var D=this.map(function(){if(!n.support.noCloneEvent&&!n.isXMLDoc(this)){var H=this.cloneNode(true),G=document.createElement("div");G.appendChild(H);return n.clean([G.innerHTML])[0]}else{return this.cloneNode(true)}});var F=D.find("*").andSelf().each(function(){if(this[h]!==g){this[h]=null}});if(E===true){this.find("*").andSelf().each(function(H){if(this.nodeType==3){return}var G=n.data(this,"events");for(var J in G){for(var I in G[J]){n.event.add(F[H],J,G[J][I],G[J][I].data)}}})}return D},filter:function(D){return this.pushStack(n.isFunction(D)&&n.grep(this,function(F,E){return D.call(F,E)})||n.multiFilter(D,n.grep(this,function(E){return E.nodeType===1})),"filter",D)},closest:function(D){var E=n.expr.match.POS.test(D)?n(D):null;return this.map(function(){var F=this;while(F&&F.ownerDocument){if(E?E.index(F)>-1:n(F).is(D)){return F}F=F.parentNode}})},not:function(D){if(typeof D==="string"){if(f.test(D)){return this.pushStack(n.multiFilter(D,this,true),"not",D)}else{D=n.multiFilter(D,this)}}var E=D.length&&D[D.length-1]!==g&&!D.nodeType;return this.filter(function(){return E?n.inArray(this,D)<0:this!=D})},add:function(D){return this.pushStack(n.unique(n.merge(this.get(),typeof D==="string"?n(D):n.makeArray(D))))},is:function(D){return !!D&&n.multiFilter(D,this).length>0},hasClass:function(D){return !!D&&this.is("."+D)},val:function(J){if(J===g){var D=this[0];if(D){if(n.nodeName(D,"option")){return(D.attributes.value||{}).specified?D.value:D.text}if(n.nodeName(D,"select")){var H=D.selectedIndex,K=[],L=D.options,G=D.type=="select-one";if(H<0){return null}for(var E=G?H:0,I=G?H+1:L.length;E=0||n.inArray(this.name,J)>=0)}else{if(n.nodeName(this,"select")){var M=n.makeArray(J);n("option",this).each(function(){this.selected=(n.inArray(this.value,M)>=0||n.inArray(this.text,M)>=0)});if(!M.length){this.selectedIndex=-1}}else{this.value=J}}})},html:function(D){return D===g?(this[0]?this[0].innerHTML:null):this.empty().append(D)},replaceWith:function(D){return this.after(D).remove()},eq:function(D){return this.slice(D,+D+1)},slice:function(){return this.pushStack(Array.prototype.slice.apply(this,arguments),"slice",Array.prototype.slice.call(arguments).join(","))},map:function(D){return this.pushStack(n.map(this,function(F,E){return D.call(F,E,F)}))},andSelf:function(){return this.add(this.prevObject)},domManip:function(J,M,L){if(this[0]){var I=(this[0].ownerDocument||this[0]).createDocumentFragment(),F=n.clean(J,(this[0].ownerDocument||this[0]),I),H=I.firstChild,D=this.length>1?I.cloneNode(true):I;if(H){for(var G=0,E=this.length;G0?D.cloneNode(true):I)}}if(F){n.each(F,y)}}return this;function K(N,O){return M&&n.nodeName(N,"table")&&n.nodeName(O,"tr")?(N.getElementsByTagName("tbody")[0]||N.appendChild(N.ownerDocument.createElement("tbody"))):N}}};n.fn.init.prototype=n.fn;function y(D,E){if(E.src){n.ajax({url:E.src,async:false,dataType:"script"})}else{n.globalEval(E.text||E.textContent||E.innerHTML||"")}if(E.parentNode){E.parentNode.removeChild(E)}}function e(){return +new Date}n.extend=n.fn.extend=function(){var I=arguments[0]||{},G=1,H=arguments.length,D=false,F;if(typeof I==="boolean"){D=I;I=arguments[1]||{};G=2}if(typeof I!=="object"&&!n.isFunction(I)){I={}}if(H==G){I=this;--G}for(;G-1}},swap:function(G,F,H){var D={};for(var E in F){D[E]=G.style[E];G.style[E]=F[E]}H.call(G);for(var E in F){G.style[E]=D[E]}},css:function(F,D,H){if(D=="width"||D=="height"){var J,E={position:"absolute",visibility:"hidden",display:"block"},I=D=="width"?["Left","Right"]:["Top","Bottom"];function G(){J=D=="width"?F.offsetWidth:F.offsetHeight;var L=0,K=0;n.each(I,function(){L+=parseFloat(n.curCSS(F,"padding"+this,true))||0;K+=parseFloat(n.curCSS(F,"border"+this+"Width",true))||0});J-=Math.round(L+K)}if(n(F).is(":visible")){G()}else{n.swap(F,E,G)}return Math.max(0,J)}return n.curCSS(F,D,H)},curCSS:function(H,E,F){var K,D=H.style;if(E=="opacity"&&!n.support.opacity){K=n.attr(D,"opacity");return K==""?"1":K}if(E.match(/float/i)){E=v}if(!F&&D&&D[E]){K=D[E]}else{if(p.getComputedStyle){if(E.match(/float/i)){E="float"}E=E.replace(/([A-Z])/g,"-$1").toLowerCase();var L=p.getComputedStyle(H,null);if(L){K=L.getPropertyValue(E)}if(E=="opacity"&&K==""){K="1"}}else{if(H.currentStyle){var I=E.replace(/\-(\w)/g,function(M,N){return N.toUpperCase()});K=H.currentStyle[E]||H.currentStyle[I];if(!/^\d+(px)?$/i.test(K)&&/^\d/.test(K)){var G=D.left,J=H.runtimeStyle.left;H.runtimeStyle.left=H.currentStyle.left;D.left=K||0;K=D.pixelLeft+"px";D.left=G;H.runtimeStyle.left=J}}}}return K},clean:function(E,J,H){J=J||document;if(typeof J.createElement==="undefined"){J=J.ownerDocument||J[0]&&J[0].ownerDocument||document}if(!H&&E.length===1&&typeof E[0]==="string"){var G=/^<(\w+)\s*\/?>$/.exec(E[0]);if(G){return[J.createElement(G[1])]}}var F=[],D=[],K=J.createElement("div");n.each(E,function(O,Q){if(typeof Q==="number"){Q+=""}if(!Q){return}if(typeof Q==="string"){Q=Q.replace(/(<(\w+)[^>]*?)\/>/g,function(S,T,R){return R.match(/^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i)?S:T+">"});var N=n.trim(Q).toLowerCase();var P=!N.indexOf("",""]||!N.indexOf("",""]||N.match(/^<(thead|tbody|tfoot|colg|cap)/)&&[1,"","
"]||!N.indexOf("",""]||(!N.indexOf("",""]||!N.indexOf("",""]||!n.support.htmlSerialize&&[1,"div
","
"]||[0,"",""];K.innerHTML=P[1]+Q+P[2];while(P[0]--){K=K.lastChild}if(!n.support.tbody){var M=!N.indexOf(""&&N.indexOf("=0;--L){if(n.nodeName(M[L],"tbody")&&!M[L].childNodes.length){M[L].parentNode.removeChild(M[L])}}}if(!n.support.leadingWhitespace&&/^\s/.test(Q)){K.insertBefore(J.createTextNode(Q.match(/^\s*/)[0]),K.firstChild)}Q=n.makeArray(K.childNodes)}if(Q.nodeType){F.push(Q)}else{F=n.merge(F,Q)}});if(H){for(var I=0;F[I];I++){if(n.nodeName(F[I],"script")&&(!F[I].type||F[I].type.toLowerCase()==="text/javascript")){D.push(F[I].parentNode?F[I].parentNode.removeChild(F[I]):F[I])}else{if(F[I].nodeType===1){F.splice.apply(F,[I+1,0].concat(n.makeArray(F[I].getElementsByTagName("script"))))}H.appendChild(F[I])}}return D}return F},attr:function(I,F,J){if(!I||I.nodeType==3||I.nodeType==8){return g}var G=!n.isXMLDoc(I),K=J!==g;F=G&&n.props[F]||F;if(I.tagName){var E=/href|src|style/.test(F);if(F=="selected"&&I.parentNode){I.parentNode.selectedIndex}if(F in I&&G&&!E){if(K){if(F=="type"&&n.nodeName(I,"input")&&I.parentNode){throw"type property can't be changed"}I[F]=J}if(n.nodeName(I,"form")&&I.getAttributeNode(F)){return I.getAttributeNode(F).nodeValue}if(F=="tabIndex"){var H=I.getAttributeNode("tabIndex");return H&&H.specified?H.value:I.nodeName.match(/^(a|area|button|input|object|select|textarea)$/i)?0:g}return I[F]}if(!n.support.style&&G&&F=="style"){return n.attr(I.style,"cssText",J)}if(K){I.setAttribute(F,""+J)}var D=!n.support.hrefNormalized&&G&&E?I.getAttribute(F,2):I.getAttribute(F);return D===null?g:D}if(!n.support.opacity&&F=="opacity"){if(K){I.zoom=1;I.filter=(I.filter||"").replace(/alpha\([^)]*\)/,"")+(parseInt(J)+""=="NaN"?"":"alpha(opacity="+J*100+")")}return I.filter&&I.filter.indexOf("opacity=")>=0?(parseFloat(I.filter.match(/opacity=([^)]*)/)[1])/100)+"":""}F=F.replace(/-([a-z])/ig,function(L,M){return M.toUpperCase()});if(K){I[F]=J}return I[F]},trim:function(D){return(D||"").replace(/^\s+|\s+$/g,"")},makeArray:function(F){var D=[];if(F!=null){var E=F.length;if(E==null||typeof F==="string"||n.isFunction(F)||F.setInterval){D[0]=F}else{while(E){D[--E]=F[E]}}}return D},inArray:function(F,G){for(var D=0,E=G.length;D*",this).remove();while(this.firstChild){this.removeChild(this.firstChild)}}},function(D,E){n.fn[D]=function(){return this.each(E,arguments)}});function j(D,E){return D[0]&&parseInt(n.curCSS(D[0],E,true),10)||0}var h="jQuery"+e(),u=0,z={};n.extend({cache:{},data:function(E,D,F){E=E==l?z:E;var G=E[h];if(!G){G=E[h]=++u}if(D&&!n.cache[G]){n.cache[G]={}}if(F!==g){n.cache[G][D]=F}return D?n.cache[G][D]:G},removeData:function(E,D){E=E==l?z:E;var G=E[h];if(D){if(n.cache[G]){delete n.cache[G][D];D="";for(D in n.cache[G]){break}if(!D){n.removeData(E)}}}else{try{delete E[h]}catch(F){if(E.removeAttribute){E.removeAttribute(h)}}delete n.cache[G]}},queue:function(E,D,G){if(E){D=(D||"fx")+"queue";var F=n.data(E,D);if(!F||n.isArray(G)){F=n.data(E,D,n.makeArray(G))}else{if(G){F.push(G)}}}return F},dequeue:function(G,F){var D=n.queue(G,F),E=D.shift();if(!F||F==="fx"){E=D[0]}if(E!==g){E.call(G)}}});n.fn.extend({data:function(D,F){var G=D.split(".");G[1]=G[1]?"."+G[1]:"";if(F===g){var E=this.triggerHandler("getData"+G[1]+"!",[G[0]]);if(E===g&&this.length){E=n.data(this[0],D)}return E===g&&G[1]?this.data(G[0]):E}else{return this.trigger("setData"+G[1]+"!",[G[0],F]).each(function(){n.data(this,D,F)})}},removeData:function(D){return this.each(function(){n.removeData(this,D)})},queue:function(D,E){if(typeof D!=="string"){E=D;D="fx"}if(E===g){return n.queue(this[0],D)}return this.each(function(){var F=n.queue(this,D,E);if(D=="fx"&&F.length==1){F[0].call(this)}})},dequeue:function(D){return this.each(function(){n.dequeue(this,D)})}}); -/* - * Sizzle CSS Selector Engine - v0.9.1 - * Copyright 2009, The Dojo Foundation - * Released under the MIT, BSD, and GPL Licenses. - * More information: http://sizzlejs.com/ - */ -(function(){var N=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|[^[\]]+)+\]|\\.|[^ >+~,(\[]+)+|[>+~])(\s*,\s*)?/g,I=0,F=Object.prototype.toString;var E=function(ae,S,aa,V){aa=aa||[];S=S||document;if(S.nodeType!==1&&S.nodeType!==9){return[]}if(!ae||typeof ae!=="string"){return aa}var ab=[],ac,Y,ah,ag,Z,R,Q=true;N.lastIndex=0;while((ac=N.exec(ae))!==null){ab.push(ac[1]);if(ac[2]){R=RegExp.rightContext;break}}if(ab.length>1&&G.match.POS.exec(ae)){if(ab.length===2&&G.relative[ab[0]]){var U="",X;while((X=G.match.POS.exec(ae))){U+=X[0];ae=ae.replace(G.match.POS,"")}Y=E.filter(U,E(/\s$/.test(ae)?ae+"*":ae,S))}else{Y=G.relative[ab[0]]?[S]:E(ab.shift(),S);while(ab.length){var P=[];ae=ab.shift();if(G.relative[ae]){ae+=ab.shift()}for(var af=0,ad=Y.length;af0){ah=D(Y)}else{Q=false}while(ab.length){var T=ab.pop(),W=T;if(!G.relative[T]){T=""}else{W=ab.pop()}if(W==null){W=S}G.relative[T](ah,W,M(S))}}if(!ah){ah=Y}if(!ah){throw"Syntax error, unrecognized expression: "+(T||ae)}if(F.call(ah)==="[object Array]"){if(!Q){aa.push.apply(aa,ah)}else{if(S.nodeType===1){for(var af=0;ah[af]!=null;af++){if(ah[af]&&(ah[af]===true||ah[af].nodeType===1&&H(S,ah[af]))){aa.push(Y[af])}}}else{for(var af=0;ah[af]!=null;af++){if(ah[af]&&ah[af].nodeType===1){aa.push(Y[af])}}}}}else{D(ah,aa)}if(R){E(R,S,aa,V)}return aa};E.matches=function(P,Q){return E(P,null,null,Q)};E.find=function(V,S){var W,Q;if(!V){return[]}for(var R=0,P=G.order.length;R":function(U,Q,V){if(typeof Q==="string"&&!/\W/.test(Q)){Q=V?Q:Q.toUpperCase();for(var R=0,P=U.length;R=0){if(!R){P.push(Q[T])}}else{if(R){Q[T]=false}}}return false},ID:function(P){return P[1].replace(/\\/g,"")},TAG:function(Q,P){for(var R=0;!P[R];R++){}return M(P[R])?Q[1]:Q[1].toUpperCase()},CHILD:function(P){if(P[1]=="nth"){var Q=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(P[2]=="even"&&"2n"||P[2]=="odd"&&"2n+1"||!/\D/.test(P[2])&&"0n+"+P[2]||P[2]);P[2]=(Q[1]+(Q[2]||1))-0;P[3]=Q[3]-0}P[0]="done"+(I++);return P},ATTR:function(Q){var P=Q[1];if(G.attrMap[P]){Q[1]=G.attrMap[P]}if(Q[2]==="~="){Q[4]=" "+Q[4]+" "}return Q},PSEUDO:function(T,Q,R,P,U){if(T[1]==="not"){if(T[3].match(N).length>1){T[3]=E(T[3],null,null,Q)}else{var S=E.filter(T[3],Q,R,true^U);if(!R){P.push.apply(P,S)}return false}}else{if(G.match.POS.test(T[0])){return true}}return T},POS:function(P){P.unshift(true);return P}},filters:{enabled:function(P){return P.disabled===false&&P.type!=="hidden"},disabled:function(P){return P.disabled===true},checked:function(P){return P.checked===true},selected:function(P){P.parentNode.selectedIndex;return P.selected===true},parent:function(P){return !!P.firstChild},empty:function(P){return !P.firstChild},has:function(R,Q,P){return !!E(P[3],R).length},header:function(P){return/h\d/i.test(P.nodeName)},text:function(P){return"text"===P.type},radio:function(P){return"radio"===P.type},checkbox:function(P){return"checkbox"===P.type},file:function(P){return"file"===P.type},password:function(P){return"password"===P.type},submit:function(P){return"submit"===P.type},image:function(P){return"image"===P.type},reset:function(P){return"reset"===P.type},button:function(P){return"button"===P.type||P.nodeName.toUpperCase()==="BUTTON"},input:function(P){return/input|select|textarea|button/i.test(P.nodeName)}},setFilters:{first:function(Q,P){return P===0},last:function(R,Q,P,S){return Q===S.length-1},even:function(Q,P){return P%2===0},odd:function(Q,P){return P%2===1},lt:function(R,Q,P){return QP[3]-0},nth:function(R,Q,P){return P[3]-0==Q},eq:function(R,Q,P){return P[3]-0==Q}},filter:{CHILD:function(P,S){var V=S[1],W=P.parentNode;var U="child"+W.childNodes.length;if(W&&(!W[U]||!P.nodeIndex)){var T=1;for(var Q=W.firstChild;Q;Q=Q.nextSibling){if(Q.nodeType==1){Q.nodeIndex=T++}}W[U]=T-1}if(V=="first"){return P.nodeIndex==1}else{if(V=="last"){return P.nodeIndex==W[U]}else{if(V=="only"){return W[U]==1}else{if(V=="nth"){var Y=false,R=S[2],X=S[3];if(R==1&&X==0){return true}if(R==0){if(P.nodeIndex==X){Y=true}}else{if((P.nodeIndex-X)%R==0&&(P.nodeIndex-X)/R>=0){Y=true}}return Y}}}}},PSEUDO:function(V,R,S,W){var Q=R[1],T=G.filters[Q];if(T){return T(V,S,R,W)}else{if(Q==="contains"){return(V.textContent||V.innerText||"").indexOf(R[3])>=0}else{if(Q==="not"){var U=R[3];for(var S=0,P=U.length;S=0:S==="~="?(" "+U+" ").indexOf(Q)>=0:!R[4]?P:S==="!="?U!=Q:S==="^="?U.indexOf(Q)===0:S==="$="?U.substr(U.length-Q.length)===Q:S==="|="?U===Q||U.substr(0,Q.length+1)===Q+"-":false},POS:function(T,Q,R,U){var P=Q[2],S=G.setFilters[P];if(S){return S(T,R,Q,U)}}}};for(var K in G.match){G.match[K]=RegExp(G.match[K].source+/(?![^\[]*\])(?![^\(]*\))/.source)}var D=function(Q,P){Q=Array.prototype.slice.call(Q);if(P){P.push.apply(P,Q);return P}return Q};try{Array.prototype.slice.call(document.documentElement.childNodes)}catch(J){D=function(T,S){var Q=S||[];if(F.call(T)==="[object Array]"){Array.prototype.push.apply(Q,T)}else{if(typeof T.length==="number"){for(var R=0,P=T.length;R";var P=document.documentElement;P.insertBefore(Q,P.firstChild);if(!!document.getElementById(R)){G.find.ID=function(T,U){if(U.getElementById){var S=U.getElementById(T[1]);return S?S.id===T[1]||S.getAttributeNode&&S.getAttributeNode("id").nodeValue===T[1]?[S]:g:[]}};G.filter.ID=function(U,S){var T=U.getAttributeNode&&U.getAttributeNode("id");return U.nodeType===1&&T&&T.nodeValue===S}}P.removeChild(Q)})();(function(){var P=document.createElement("div");P.appendChild(document.createComment(""));if(P.getElementsByTagName("*").length>0){G.find.TAG=function(Q,U){var T=U.getElementsByTagName(Q[1]);if(Q[1]==="*"){var S=[];for(var R=0;T[R];R++){if(T[R].nodeType===1){S.push(T[R])}}T=S}return T}}P.innerHTML="";if(P.firstChild.getAttribute("href")!=="#"){G.attrHandle.href=function(Q){return Q.getAttribute("href",2)}}})();if(document.querySelectorAll){(function(){var P=E;E=function(T,S,Q,R){S=S||document;if(!R&&S.nodeType===9){try{return D(S.querySelectorAll(T),Q)}catch(U){}}return P(T,S,Q,R)};E.find=P.find;E.filter=P.filter;E.selectors=P.selectors;E.matches=P.matches})()}if(document.documentElement.getElementsByClassName){G.order.splice(1,0,"CLASS");G.find.CLASS=function(P,Q){return Q.getElementsByClassName(P[1])}}function L(Q,W,V,Z,X,Y){for(var T=0,R=Z.length;T0){T=P;break}}}P=P[Q]}Y[S]=T}}}var H=document.compareDocumentPosition?function(Q,P){return Q.compareDocumentPosition(P)&16}:function(Q,P){return Q!==P&&(Q.contains?Q.contains(P):true)};var M=function(P){return P.documentElement&&!P.body||P.tagName&&P.ownerDocument&&!P.ownerDocument.body};n.find=E;n.filter=E.filter;n.expr=E.selectors;n.expr[":"]=n.expr.filters;E.selectors.filters.hidden=function(P){return"hidden"===P.type||n.css(P,"display")==="none"||n.css(P,"visibility")==="hidden"};E.selectors.filters.visible=function(P){return"hidden"!==P.type&&n.css(P,"display")!=="none"&&n.css(P,"visibility")!=="hidden"};E.selectors.filters.animated=function(P){return n.grep(n.timers,function(Q){return P===Q.elem}).length};n.multiFilter=function(R,P,Q){if(Q){R=":not("+R+")"}return E.matches(R,P)};n.dir=function(R,Q){var P=[],S=R[Q];while(S&&S!=document){if(S.nodeType==1){P.push(S)}S=S[Q]}return P};n.nth=function(T,P,R,S){P=P||1;var Q=0;for(;T;T=T[R]){if(T.nodeType==1&&++Q==P){break}}return T};n.sibling=function(R,Q){var P=[];for(;R;R=R.nextSibling){if(R.nodeType==1&&R!=Q){P.push(R)}}return P};return;l.Sizzle=E})();n.event={add:function(H,E,G,J){if(H.nodeType==3||H.nodeType==8){return}if(H.setInterval&&H!=l){H=l}if(!G.guid){G.guid=this.guid++}if(J!==g){var F=G;G=this.proxy(F);G.data=J}var D=n.data(H,"events")||n.data(H,"events",{}),I=n.data(H,"handle")||n.data(H,"handle",function(){return typeof n!=="undefined"&&!n.event.triggered?n.event.handle.apply(arguments.callee.elem,arguments):g});I.elem=H;n.each(E.split(/\s+/),function(L,M){var N=M.split(".");M=N.shift();G.type=N.slice().sort().join(".");var K=D[M];if(n.event.specialAll[M]){n.event.specialAll[M].setup.call(H,J,N)}if(!K){K=D[M]={};if(!n.event.special[M]||n.event.special[M].setup.call(H,J,N)===false){if(H.addEventListener){H.addEventListener(M,I,false)}else{if(H.attachEvent){H.attachEvent("on"+M,I)}}}}K[G.guid]=G;n.event.global[M]=true});H=null},guid:1,global:{},remove:function(J,G,I){if(J.nodeType==3||J.nodeType==8){return}var F=n.data(J,"events"),E,D;if(F){if(G===g||(typeof G==="string"&&G.charAt(0)==".")){for(var H in F){this.remove(J,H+(G||""))}}else{if(G.type){I=G.handler;G=G.type}n.each(G.split(/\s+/),function(L,N){var P=N.split(".");N=P.shift();var M=RegExp("(^|\\.)"+P.slice().sort().join(".*\\.")+"(\\.|$)");if(F[N]){if(I){delete F[N][I.guid]}else{for(var O in F[N]){if(M.test(F[N][O].type)){delete F[N][O]}}}if(n.event.specialAll[N]){n.event.specialAll[N].teardown.call(J,P)}for(E in F[N]){break}if(!E){if(!n.event.special[N]||n.event.special[N].teardown.call(J,P)===false){if(J.removeEventListener){J.removeEventListener(N,n.data(J,"handle"),false)}else{if(J.detachEvent){J.detachEvent("on"+N,n.data(J,"handle"))}}}E=null;delete F[N]}}})}for(E in F){break}if(!E){var K=n.data(J,"handle");if(K){K.elem=null}n.removeData(J,"events");n.removeData(J,"handle")}}},trigger:function(H,J,G,D){var F=H.type||H;if(!D){H=typeof H==="object"?H[h]?H:n.extend(n.Event(F),H):n.Event(F);if(F.indexOf("!")>=0){H.type=F=F.slice(0,-1);H.exclusive=true}if(!G){H.stopPropagation();if(this.global[F]){n.each(n.cache,function(){if(this.events&&this.events[F]){n.event.trigger(H,J,this.handle.elem)}})}}if(!G||G.nodeType==3||G.nodeType==8){return g}H.result=g;H.target=G;J=n.makeArray(J);J.unshift(H)}H.currentTarget=G;var I=n.data(G,"handle");if(I){I.apply(G,J)}if((!G[F]||(n.nodeName(G,"a")&&F=="click"))&&G["on"+F]&&G["on"+F].apply(G,J)===false){H.result=false}if(!D&&G[F]&&!H.isDefaultPrevented()&&!(n.nodeName(G,"a")&&F=="click")){this.triggered=true;try{G[F]()}catch(K){}}this.triggered=false;if(!H.isPropagationStopped()){var E=G.parentNode||G.ownerDocument;if(E){n.event.trigger(H,J,E,true)}}},handle:function(J){var I,D;J=arguments[0]=n.event.fix(J||l.event);var K=J.type.split(".");J.type=K.shift();I=!K.length&&!J.exclusive;var H=RegExp("(^|\\.)"+K.slice().sort().join(".*\\.")+"(\\.|$)");D=(n.data(this,"events")||{})[J.type];for(var F in D){var G=D[F];if(I||H.test(G.type)){J.handler=G;J.data=G.data;var E=G.apply(this,arguments);if(E!==g){J.result=E;if(E===false){J.preventDefault();J.stopPropagation()}}if(J.isImmediatePropagationStopped()){break}}}},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),fix:function(G){if(G[h]){return G}var E=G;G=n.Event(E);for(var F=this.props.length,I;F;){I=this.props[--F];G[I]=E[I]}if(!G.target){G.target=G.srcElement||document}if(G.target.nodeType==3){G.target=G.target.parentNode}if(!G.relatedTarget&&G.fromElement){G.relatedTarget=G.fromElement==G.target?G.toElement:G.fromElement}if(G.pageX==null&&G.clientX!=null){var H=document.documentElement,D=document.body;G.pageX=G.clientX+(H&&H.scrollLeft||D&&D.scrollLeft||0)-(H.clientLeft||0);G.pageY=G.clientY+(H&&H.scrollTop||D&&D.scrollTop||0)-(H.clientTop||0)}if(!G.which&&((G.charCode||G.charCode===0)?G.charCode:G.keyCode)){G.which=G.charCode||G.keyCode}if(!G.metaKey&&G.ctrlKey){G.metaKey=G.ctrlKey}if(!G.which&&G.button){G.which=(G.button&1?1:(G.button&2?3:(G.button&4?2:0)))}return G},proxy:function(E,D){D=D||function(){return E.apply(this,arguments)};D.guid=E.guid=E.guid||D.guid||this.guid++;return D},special:{ready:{setup:A,teardown:function(){}}},specialAll:{live:{setup:function(D,E){n.event.add(this,E[0],c)},teardown:function(F){if(F.length){var D=0,E=RegExp("(^|\\.)"+F[0]+"(\\.|$)");n.each((n.data(this,"events").live||{}),function(){if(E.test(this.type)){D++}});if(D<1){n.event.remove(this,F[0],c)}}}}}};n.Event=function(D){if(!this.preventDefault){return new n.Event(D)}if(D&&D.type){this.originalEvent=D;this.type=D.type;this.timeStamp=D.timeStamp}else{this.type=D}if(!this.timeStamp){this.timeStamp=e()}this[h]=true};function k(){return false}function t(){return true}n.Event.prototype={preventDefault:function(){this.isDefaultPrevented=t;var D=this.originalEvent;if(!D){return}if(D.preventDefault){D.preventDefault()}D.returnValue=false},stopPropagation:function(){this.isPropagationStopped=t;var D=this.originalEvent;if(!D){return}if(D.stopPropagation){D.stopPropagation()}D.cancelBubble=true},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=t;this.stopPropagation()},isDefaultPrevented:k,isPropagationStopped:k,isImmediatePropagationStopped:k};var a=function(E){var D=E.relatedTarget;while(D&&D!=this){try{D=D.parentNode}catch(F){D=this}}if(D!=this){E.type=E.data;n.event.handle.apply(this,arguments)}};n.each({mouseover:"mouseenter",mouseout:"mouseleave"},function(E,D){n.event.special[D]={setup:function(){n.event.add(this,E,a,D)},teardown:function(){n.event.remove(this,E,a)}}});n.fn.extend({bind:function(E,F,D){return E=="unload"?this.one(E,F,D):this.each(function(){n.event.add(this,E,D||F,D&&F)})},one:function(F,G,E){var D=n.event.proxy(E||G,function(H){n(this).unbind(H,D);return(E||G).apply(this,arguments)});return this.each(function(){n.event.add(this,F,D,E&&G)})},unbind:function(E,D){return this.each(function(){n.event.remove(this,E,D)})},trigger:function(D,E){return this.each(function(){n.event.trigger(D,E,this)})},triggerHandler:function(D,F){if(this[0]){var E=n.Event(D);E.preventDefault();E.stopPropagation();n.event.trigger(E,F,this[0]);return E.result}},toggle:function(F){var D=arguments,E=1;while(E=0){var D=F.slice(H,F.length);F=F.slice(0,H)}var G="GET";if(I){if(n.isFunction(I)){J=I;I=null}else{if(typeof I==="object"){I=n.param(I);G="POST"}}}var E=this;n.ajax({url:F,type:G,dataType:"html",data:I,complete:function(L,K){if(K=="success"||K=="notmodified"){E.html(D?n("
").append(L.responseText.replace(//g,"")).find(D):L.responseText)}if(J){E.each(J,[L.responseText,K,L])}}});return this},serialize:function(){return n.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?n.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||/select|textarea/i.test(this.nodeName)||/text|hidden|password/i.test(this.type))}).map(function(D,E){var F=n(this).val();return F==null?null:n.isArray(F)?n.map(F,function(H,G){return{name:E.name,value:H}}):{name:E.name,value:F}}).get()}});n.each("ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".split(","),function(D,E){n.fn[E]=function(F){return this.bind(E,F)}});var q=e();n.extend({get:function(D,F,G,E){if(n.isFunction(F)){G=F;F=null}return n.ajax({type:"GET",url:D,data:F,success:G,dataType:E})},getScript:function(D,E){return n.get(D,null,E,"script")},getJSON:function(D,E,F){return n.get(D,E,F,"json")},post:function(D,F,G,E){if(n.isFunction(F)){G=F;F={}}return n.ajax({type:"POST",url:D,data:F,success:G,dataType:E})},ajaxSetup:function(D){n.extend(n.ajaxSettings,D)},ajaxSettings:{url:location.href,global:true,type:"GET",contentType:"application/x-www-form-urlencoded",processData:true,async:true,xhr:function(){return l.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):new XMLHttpRequest()},accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},ajax:function(L){L=n.extend(true,L,n.extend(true,{},n.ajaxSettings,L));var V,E=/=\?(&|$)/g,Q,U,F=L.type.toUpperCase();if(L.data&&L.processData&&typeof L.data!=="string"){L.data=n.param(L.data)}if(L.dataType=="jsonp"){if(F=="GET"){if(!L.url.match(E)){L.url+=(L.url.match(/\?/)?"&":"?")+(L.jsonp||"callback")+"=?"}}else{if(!L.data||!L.data.match(E)){L.data=(L.data?L.data+"&":"")+(L.jsonp||"callback")+"=?"}}L.dataType="json"}if(L.dataType=="json"&&(L.data&&L.data.match(E)||L.url.match(E))){V="jsonp"+q++;if(L.data){L.data=(L.data+"").replace(E,"="+V+"$1")}L.url=L.url.replace(E,"="+V+"$1");L.dataType="script";l[V]=function(W){U=W;H();K();l[V]=g;try{delete l[V]}catch(X){}if(G){G.removeChild(S)}}}if(L.dataType=="script"&&L.cache==null){L.cache=false}if(L.cache===false&&F=="GET"){var D=e();var T=L.url.replace(/(\?|&)_=.*?(&|$)/,"$1_="+D+"$2");L.url=T+((T==L.url)?(L.url.match(/\?/)?"&":"?")+"_="+D:"")}if(L.data&&F=="GET"){L.url+=(L.url.match(/\?/)?"&":"?")+L.data;L.data=null}if(L.global&&!n.active++){n.event.trigger("ajaxStart")}var P=/^(\w+:)?\/\/([^\/?#]+)/.exec(L.url);if(L.dataType=="script"&&F=="GET"&&P&&(P[1]&&P[1]!=location.protocol||P[2]!=location.host)){var G=document.getElementsByTagName("head")[0];var S=document.createElement("script");S.src=L.url;if(L.scriptCharset){S.charset=L.scriptCharset}if(!V){var N=false;S.onload=S.onreadystatechange=function(){if(!N&&(!this.readyState||this.readyState=="loaded"||this.readyState=="complete")){N=true;H();K();G.removeChild(S)}}}G.appendChild(S);return g}var J=false;var I=L.xhr();if(L.username){I.open(F,L.url,L.async,L.username,L.password)}else{I.open(F,L.url,L.async)}try{if(L.data){I.setRequestHeader("Content-Type",L.contentType)}if(L.ifModified){I.setRequestHeader("If-Modified-Since",n.lastModified[L.url]||"Thu, 01 Jan 1970 00:00:00 GMT")}I.setRequestHeader("X-Requested-With","XMLHttpRequest");I.setRequestHeader("Accept",L.dataType&&L.accepts[L.dataType]?L.accepts[L.dataType]+", */*":L.accepts._default)}catch(R){}if(L.beforeSend&&L.beforeSend(I,L)===false){if(L.global&&!--n.active){n.event.trigger("ajaxStop")}I.abort();return false}if(L.global){n.event.trigger("ajaxSend",[I,L])}var M=function(W){if(I.readyState==0){if(O){clearInterval(O);O=null;if(L.global&&!--n.active){n.event.trigger("ajaxStop")}}}else{if(!J&&I&&(I.readyState==4||W=="timeout")){J=true;if(O){clearInterval(O);O=null}Q=W=="timeout"?"timeout":!n.httpSuccess(I)?"error":L.ifModified&&n.httpNotModified(I,L.url)?"notmodified":"success";if(Q=="success"){try{U=n.httpData(I,L.dataType,L)}catch(Y){Q="parsererror"}}if(Q=="success"){var X;try{X=I.getResponseHeader("Last-Modified")}catch(Y){}if(L.ifModified&&X){n.lastModified[L.url]=X}if(!V){H()}}else{n.handleError(L,I,Q)}K();if(L.async){I=null}}}};if(L.async){var O=setInterval(M,13);if(L.timeout>0){setTimeout(function(){if(I){if(!J){M("timeout")}if(I){I.abort()}}},L.timeout)}}try{I.send(L.data)}catch(R){n.handleError(L,I,null,R)}if(!L.async){M()}function H(){if(L.success){L.success(U,Q)}if(L.global){n.event.trigger("ajaxSuccess",[I,L])}}function K(){if(L.complete){L.complete(I,Q)}if(L.global){n.event.trigger("ajaxComplete",[I,L])}if(L.global&&!--n.active){n.event.trigger("ajaxStop")}}return I},handleError:function(E,G,D,F){if(E.error){E.error(G,D,F)}if(E.global){n.event.trigger("ajaxError",[G,E,F])}},active:0,httpSuccess:function(E){try{return !E.status&&location.protocol=="file:"||(E.status>=200&&E.status<300)||E.status==304||E.status==1223}catch(D){}return false},httpNotModified:function(F,D){try{var G=F.getResponseHeader("Last-Modified");return F.status==304||G==n.lastModified[D]}catch(E){}return false},httpData:function(I,G,F){var E=I.getResponseHeader("content-type"),D=G=="xml"||!G&&E&&E.indexOf("xml")>=0,H=D?I.responseXML:I.responseText;if(D&&H.documentElement.tagName=="parsererror"){throw"parsererror"}if(F&&F.dataFilter){H=F.dataFilter(H,G)}if(typeof H==="string"){if(G=="script"){n.globalEval(H)}if(G=="json"){H=l["eval"]("("+H+")")}}return H},param:function(D){var F=[];function G(H,I){F[F.length]=encodeURIComponent(H)+"="+encodeURIComponent(I)}if(n.isArray(D)||D.jquery){n.each(D,function(){G(this.name,this.value)})}else{for(var E in D){if(n.isArray(D[E])){n.each(D[E],function(){G(E,this)})}else{G(E,n.isFunction(D[E])?D[E]():D[E])}}}return F.join("&").replace(/%20/g,"+")}});var m={},d=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];function s(E,D){var F={};n.each(d.concat.apply([],d.slice(0,D)),function(){F[this]=E});return F}n.fn.extend({show:function(I,K){if(I){return this.animate(s("show",3),I,K)}else{for(var G=0,E=this.length;G").appendTo("body");J=H.css("display");if(J==="none"){J="block"}H.remove();m[F]=J}this[G].style.display=n.data(this[G],"olddisplay",J)}}return this}},hide:function(G,H){if(G){return this.animate(s("hide",3),G,H)}else{for(var F=0,E=this.length;F=0;G--){if(F[G].elem==this){if(D){F[G](true)}F.splice(G,1)}}});if(!D){this.dequeue()}return this}});n.each({slideDown:s("show",1),slideUp:s("hide",1),slideToggle:s("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"}},function(D,E){n.fn[D]=function(F,G){return this.animate(E,F,G)}});n.extend({speed:function(F,G,E){var D=typeof F==="object"?F:{complete:E||!E&&G||n.isFunction(F)&&F,duration:F,easing:E&&G||G&&!n.isFunction(G)&&G};D.duration=n.fx.off?0:typeof D.duration==="number"?D.duration:n.fx.speeds[D.duration]||n.fx.speeds._default;D.old=D.complete;D.complete=function(){if(D.queue!==false){n(this).dequeue()}if(n.isFunction(D.old)){D.old.call(this)}};return D},easing:{linear:function(F,G,D,E){return D+E*F},swing:function(F,G,D,E){return((-Math.cos(F*Math.PI)/2)+0.5)*E+D}},timers:[],timerId:null,fx:function(E,D,F){this.options=D;this.elem=E;this.prop=F;if(!D.orig){D.orig={}}}});n.fx.prototype={update:function(){if(this.options.step){this.options.step.call(this.elem,this.now,this)}(n.fx.step[this.prop]||n.fx.step._default)(this);if((this.prop=="height"||this.prop=="width")&&this.elem.style){this.elem.style.display="block"}},cur:function(E){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null)){return this.elem[this.prop]}var D=parseFloat(n.css(this.elem,this.prop,E));return D&&D>-10000?D:parseFloat(n.curCSS(this.elem,this.prop))||0},custom:function(H,G,F){this.startTime=e();this.start=H;this.end=G;this.unit=F||this.unit||"px";this.now=this.start;this.pos=this.state=0;var D=this;function E(I){return D.step(I)}E.elem=this.elem;n.timers.push(E);if(E()&&n.timerId==null){n.timerId=setInterval(function(){var J=n.timers;for(var I=0;I=this.options.duration+this.startTime){this.now=this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;var D=true;for(var E in this.options.curAnim){if(this.options.curAnim[E]!==true){D=false}}if(D){if(this.options.display!=null){this.elem.style.overflow=this.options.overflow;this.elem.style.display=this.options.display;if(n.css(this.elem,"display")=="none"){this.elem.style.display="block"}}if(this.options.hide){n(this.elem).hide()}if(this.options.hide||this.options.show){for(var H in this.options.curAnim){n.attr(this.elem.style,H,this.options.orig[H])}}}if(D){this.options.complete.call(this.elem)}return false}else{var I=F-this.startTime;this.state=I/this.options.duration;this.pos=n.easing[this.options.easing||(n.easing.swing?"swing":"linear")](this.state,I,0,1,this.options.duration);this.now=this.start+((this.end-this.start)*this.pos);this.update()}return true}};n.extend(n.fx,{speeds:{slow:600,fast:200,_default:400},step:{opacity:function(D){n.attr(D.elem.style,"opacity",D.now)},_default:function(D){if(D.elem.style&&D.elem.style[D.prop]!=null){D.elem.style[D.prop]=D.now+D.unit}else{D.elem[D.prop]=D.now}}}});if(document.documentElement.getBoundingClientRect){n.fn.offset=function(){if(!this[0]){return{top:0,left:0}}if(this[0]===this[0].ownerDocument.body){return n.offset.bodyOffset(this[0])}var F=this[0].getBoundingClientRect(),I=this[0].ownerDocument,E=I.body,D=I.documentElement,K=D.clientTop||E.clientTop||0,J=D.clientLeft||E.clientLeft||0,H=F.top+(self.pageYOffset||n.boxModel&&D.scrollTop||E.scrollTop)-K,G=F.left+(self.pageXOffset||n.boxModel&&D.scrollLeft||E.scrollLeft)-J;return{top:H,left:G}}}else{n.fn.offset=function(){if(!this[0]){return{top:0,left:0}}if(this[0]===this[0].ownerDocument.body){return n.offset.bodyOffset(this[0])}n.offset.initialized||n.offset.initialize();var I=this[0],F=I.offsetParent,E=I,N=I.ownerDocument,L,G=N.documentElement,J=N.body,K=N.defaultView,D=K.getComputedStyle(I,null),M=I.offsetTop,H=I.offsetLeft;while((I=I.parentNode)&&I!==J&&I!==G){L=K.getComputedStyle(I,null);M-=I.scrollTop,H-=I.scrollLeft;if(I===F){M+=I.offsetTop,H+=I.offsetLeft;if(n.offset.doesNotAddBorder&&!(n.offset.doesAddBorderForTableAndCells&&/^t(able|d|h)$/i.test(I.tagName))){M+=parseInt(L.borderTopWidth,10)||0,H+=parseInt(L.borderLeftWidth,10)||0}E=F,F=I.offsetParent}if(n.offset.subtractsBorderForOverflowNotVisible&&L.overflow!=="visible"){M+=parseInt(L.borderTopWidth,10)||0,H+=parseInt(L.borderLeftWidth,10)||0}D=L}if(D.position==="relative"||D.position==="static"){M+=J.offsetTop,H+=J.offsetLeft}if(D.position==="fixed"){M+=Math.max(G.scrollTop,J.scrollTop),H+=Math.max(G.scrollLeft,J.scrollLeft)}return{top:M,left:H}}}n.offset={initialize:function(){if(this.initialized){return}var K=document.body,E=document.createElement("div"),G,F,M,H,L,D,I=K.style.marginTop,J='
';L={position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"};for(D in L){E.style[D]=L[D]}E.innerHTML=J;K.insertBefore(E,K.firstChild);G=E.firstChild,F=G.firstChild,H=G.nextSibling.firstChild.firstChild;this.doesNotAddBorder=(F.offsetTop!==5);this.doesAddBorderForTableAndCells=(H.offsetTop===5);G.style.overflow="hidden",G.style.position="relative";this.subtractsBorderForOverflowNotVisible=(F.offsetTop===-5);K.style.marginTop="1px";this.doesNotIncludeMarginInBodyOffset=(K.offsetTop===0);K.style.marginTop=I;K.removeChild(E);this.initialized=true},bodyOffset:function(D){n.offset.initialized||n.offset.initialize();var F=D.offsetTop,E=D.offsetLeft;if(n.offset.doesNotIncludeMarginInBodyOffset){F+=parseInt(n.curCSS(D,"marginTop",true),10)||0,E+=parseInt(n.curCSS(D,"marginLeft",true),10)||0}return{top:F,left:E}}};n.fn.extend({position:function(){var H=0,G=0,E;if(this[0]){var F=this.offsetParent(),I=this.offset(),D=/^body|html$/i.test(F[0].tagName)?{top:0,left:0}:F.offset();I.top-=j(this,"marginTop");I.left-=j(this,"marginLeft");D.top+=j(F,"borderTopWidth");D.left+=j(F,"borderLeftWidth");E={top:I.top-D.top,left:I.left-D.left}}return E},offsetParent:function(){var D=this[0].offsetParent||document.body;while(D&&(!/^body|html$/i.test(D.tagName)&&n.css(D,"position")=="static")){D=D.offsetParent}return n(D)}});n.each(["Left","Top"],function(E,D){var F="scroll"+D;n.fn[F]=function(G){if(!this[0]){return null}return G!==g?this.each(function(){this==l||this==document?l.scrollTo(!E?G:n(l).scrollLeft(),E?G:n(l).scrollTop()):this[F]=G}):this[0]==l||this[0]==document?self[E?"pageYOffset":"pageXOffset"]||n.boxModel&&document.documentElement[F]||document.body[F]:this[0][F]}});n.each(["Height","Width"],function(G,E){var D=G?"Left":"Top",F=G?"Right":"Bottom";n.fn["inner"+E]=function(){return this[E.toLowerCase()]()+j(this,"padding"+D)+j(this,"padding"+F)};n.fn["outer"+E]=function(I){return this["inner"+E]()+j(this,"border"+D+"Width")+j(this,"border"+F+"Width")+(I?j(this,"margin"+D)+j(this,"margin"+F):0)};var H=E.toLowerCase();n.fn[H]=function(I){return this[0]==l?document.compatMode=="CSS1Compat"&&document.documentElement["client"+E]||document.body["client"+E]:this[0]==document?Math.max(document.documentElement["client"+E],document.body["scroll"+E],document.documentElement["scroll"+E],document.body["offset"+E],document.documentElement["offset"+E]):I===g?(this.length?n.css(this[0],H):null):this.css(H,typeof I==="string"?I:I+"px")}})})(); \ No newline at end of file diff --git a/chef-server/public/merb.fcgi b/chef-server/public/merb.fcgi deleted file mode 100755 index 9804e0f36d..0000000000 --- a/chef-server/public/merb.fcgi +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env ruby - -require 'rubygems' -require 'merb-core' - -# this is Merb.root, change this if you have some funky setup. -merb_root = File.expand_path(File.dirname(__FILE__) / '../') - -# If the fcgi process runs as apache, make sure -# we have an inlinedir set for Rubyinline action-args to work -unless ENV["INLINEDIR"] || ENV["HOME"] - tmpdir = merb_root / "tmp" - unless File.directory?(tmpdir) - Dir.mkdir(tmpdir) - end - ENV["INLINEDIR"] = tmpdir -end - -# start merb with the fcgi adapter, add options or change the log dir here -Merb.start(:adapter => 'fcgi', - :merb_root => merb_root, - :log_file => merb_root /'log'/'merb.log') \ No newline at end of file diff --git a/chef-server/public/robots.txt b/chef-server/public/robots.txt deleted file mode 100644 index f85a11b3b8..0000000000 --- a/chef-server/public/robots.txt +++ /dev/null @@ -1,5 +0,0 @@ -# See http://www.robotstxt.org/wc/norobots.html for documentation on how to use the robots.txt file -# -# To ban all spiders from the entire site uncomment the next two lines: -# User-Agent: * -# Disallow: / \ No newline at end of file diff --git a/chef-server/public/stylesheets/master.css b/chef-server/public/stylesheets/master.css deleted file mode 100644 index c4fa676047..0000000000 --- a/chef-server/public/stylesheets/master.css +++ /dev/null @@ -1,119 +0,0 @@ -body { - font-family: Arial, Verdana, sans-serif; - font-size: 12px; - background-color: #fff; -} -* { - margin: 0px; - padding: 0px; - text-decoration: none; -} -html { - height: 100%; - margin-bottom: 1px; -} -#container { - width: 80%; - text-align: left; - background-color: #fff; - margin-right: auto; - margin-left: auto; -} -#header-container { - width: 100%; - padding-top: 15px; -} -#header-container h1, #header-container h2 { - margin-left: 6px; - margin-bottom: 6px; -} -.spacer { - width: 100%; - height: 15px; -} -hr { - border: 0px; - color: #ccc; - background-color: #cdcdcd; - height: 1px; - width: 100%; - text-align: left; -} -h1 { - font-size: 28px; - color: #c55; - background-color: #fff; - font-family: Arial, Verdana, sans-serif; - font-weight: 300; -} -h2 { - font-size: 15px; - color: #999; - font-family: Arial, Verdana, sans-serif; - font-weight: 300; - background-color: #fff; -} -h3 { - color: #4d9b12; - font-size: 15px; - text-align: left; - font-weight: 300; - padding: 5px; - margin-top: 5px; -} - -#left-container { - float: left; - width: 250px; - background-color: #FFFFFF; - color: black; -} - -#left-container h3 { - color: #c55; -} - -#main-container { - margin: 5px 5px 5px 260px; - padding: 15px; - border-left: 1px solid silver; - min-height: 400px; -} -p { - color: #000; - background-color: #fff; - line-height: 20px; - padding: 5px; -} -a { - color: #4d9b12; - background-color: #fff; - text-decoration: none; -} -a:hover { - color: #4d9b12; - background-color: #fff; - text-decoration: underline; -} -#footer-container { - clear: both; - font-size: 12px; - font-family: Verdana, Arial, sans-serif; -} -.right { - float: right; - font-size: 100%; - margin-top: 5px; - color: #999; - background-color: #fff; -} -.left { - float: left; - font-size: 100%; - margin-top: 5px; - color: #999; - background-color: #fff; -} -#main-container ul { - margin-left: 3.0em; -} \ No newline at end of file diff --git a/chef-server/spec/spec.opts b/chef-server/spec/spec.opts deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/chef-server/spec/spec_helper.rb b/chef-server/spec/spec_helper.rb deleted file mode 100644 index 36ebcd57e2..0000000000 --- a/chef-server/spec/spec_helper.rb +++ /dev/null @@ -1,25 +0,0 @@ -require "rubygems" - -# Add the local gems dir if found within the app root; any dependencies loaded -# hereafter will try to load from the local gems before loading system gems. -if (local_gem_dir = File.join(File.dirname(__FILE__), '..', 'gems')) && $BUNDLE.nil? - $BUNDLE = true; Gem.clear_paths; Gem.path.unshift(local_gem_dir) -end - -require "merb-core" -require "spec" # Satisfies Autotest and anyone else not using the Rake tasks - -# this loads all plugins required in your init file so don't add them -# here again, Merb will do it for you -Merb.start_environment(:testing => true, :adapter => 'runner', :environment => ENV['MERB_ENV'] || 'test') - -Spec::Runner.configure do |config| - config.include(Merb::Test::ViewHelper) - config.include(Merb::Test::RouteHelper) - config.include(Merb::Test::ControllerHelper) - - config.before(:all) do - DataMapper.auto_migrate! if Merb.orm == :datamapper - end - -end diff --git a/chef-server/tasks/doc.thor b/chef-server/tasks/doc.thor deleted file mode 100644 index 77e3222711..0000000000 --- a/chef-server/tasks/doc.thor +++ /dev/null @@ -1,149 +0,0 @@ -$: << File.join("doc") -require 'rubygems' -require 'rdoc/rdoc' -require 'fileutils' -require 'erb' - -module Merb - - class GemNotFoundException < Exception - end - - module DocMethods - def setup_gem_path - if File.directory?(gems_dir = File.join(File.dirname(__FILE__), 'gems')) - $BUNDLE = true; Gem.clear_paths; Gem.path.unshift(gems_dir) - end - end - - def get_more - libs = [] - more_library = find_library("merb-more") - File.open("#{more_library}/lib/merb-more.rb").read.each_line do |line| - if line['require'] - libs << line.gsub("require '", '').gsub("'\n", '') - end - end - return libs - end - - def generate_documentation(file_list, destination, arguments = []) - output_dir = File.join("/../doc", "rdoc", destination) - FileUtils.rm_rf(output_dir) - - arguments += [ - "--fmt", "merb", - "--op", output_dir - ] - RDoc::RDoc.new.document(arguments + file_list) - AdvancedDoc.new.index - end - - def find_library(directory_snippet) - gem_dir = nil - Gem.path.find do |path| - dir = Dir.glob("#{path}/gems/#{directory_snippet}*") - dir.empty? ? false : gem_dir = dir.last - end - raise GemNotFoundException if gem_dir.nil? - return gem_dir - end - - def get_file_list(directory_snippet) - gem_dir = find_library(directory_snippet) - files = Dir.glob("#{gem_dir}/**/lib/**/*.rb") - files += ["#{gem_dir}/README"] if File.exists?("#{gem_dir}/README") - return files - end - end - - class AdvancedDoc < Thor - - group 'core' - include DocMethods - - def initialize - super - setup_gem_path - end - - desc 'index', "Regenerate the index file for your framework documentation" - def index - @directories = Dir.entries(File.join(File.dirname(__FILE__) + "/../", "doc", "rdoc")) - @directories.delete(".") - @directories.delete("..") - @directories.delete("generators") - @directories.delete("index.html") - index_template = File.read(File.join("doc", "rdoc", "generators", "template", "merb", "index.html.erb")) - - File.open(File.join("doc", "rdoc", "index.html"), "w") do |file| - file.write(ERB.new(index_template).result(binding)) - end - end - - desc 'plugins', 'Generate the rdoc for each merb-plugins seperatly' - def plugins - libs = ["merb_activerecord", "merb_builder", "merb_jquery", "merb_laszlo", "merb_parts", "merb_screw_unit", "merb_sequel", "merb_stories", "merb_test_unit"] - - libs.each do |lib| - options[:gem] = lib - gem - end - end - - desc 'more', 'Generate the rdoc for each merb-more gem seperatly' - def more - libs = get_more - libs.each do |lib| - options[:gem] = lib - gem - end - end - - desc 'core', 'Generate the rdoc for merb-core' - def core - options[:gem] = "merb-core" - gem - end - - desc 'gem', 'Generate the rdoc for a specific gem' - method_options "--gem" => :required - def gem - file_list = get_file_list(options[:gem]) - readme = File.join(find_library("merb-core"), "README") - generate_documentation(file_list, options[:gem], ["-m", readme]) - rescue GemNotFoundException - puts "Can not find the gem in the gem path #{options[:gem]}" - end - - end - - class Doc < Thor - - include DocMethods - - def initialize - super - setup_gem_path - - end - - desc 'stack', 'Generate the rdoc for merb-core, merb-more merged together' - def stack - libs = ["merb"] - - file_list = [] - libs.each do |gem_name| - begin - file_list += get_file_list(gem_name) - rescue GemNotFoundException - puts "Could not find #{gem_name} in #{Gem.path}. Continuing with out it." - end - end - readme = File.join(find_library("merb"), "README") - generate_documentation(file_list, "stack", ["-m", readme]) - end - - end - -end \ No newline at end of file diff --git a/chef-server/tasks/merb.thor/app_script.rb b/chef-server/tasks/merb.thor/app_script.rb deleted file mode 100644 index fb0e1163f5..0000000000 --- a/chef-server/tasks/merb.thor/app_script.rb +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/env ruby - -# This was added by Merb's bundler - -require "rubygems" -require File.join(File.dirname(__FILE__), "common") - -gems_dir = File.join(File.dirname(__FILE__), '..', 'gems') - -if File.directory?(gems_dir) - $BUNDLE = true - Gem.clear_paths - Gem.path.replace([File.expand_path(gems_dir)]) - ENV["PATH"] = "#{File.dirname(__FILE__)}:#{ENV["PATH"]}" - - gem_file = File.join(gems_dir, "specifications", "<%= spec.name %>-*.gemspec") - - if local_gem = Dir[gem_file].last - version = File.basename(local_gem)[/-([\.\d]+)\.gemspec$/, 1] - end -end - -version ||= "<%= Gem::Requirement.default %>" - -if ARGV.first =~ /^_(.*)_$/ and Gem::Version.correct? $1 then - version = $1 - ARGV.shift -end - -gem '<%= @spec.name %>', version -load '<%= bin_file_name %>' \ No newline at end of file diff --git a/chef-server/tasks/merb.thor/common.rb b/chef-server/tasks/merb.thor/common.rb deleted file mode 100644 index 9b722a1943..0000000000 --- a/chef-server/tasks/merb.thor/common.rb +++ /dev/null @@ -1,68 +0,0 @@ -# This was added via Merb's bundler - -require "rubygems" -require "rubygems/source_index" - -module Gem - BUNDLED_SPECS = File.join(Dir.pwd, "gems", "specifications") - MAIN_INDEX = Gem::SourceIndex.from_gems_in(BUNDLED_SPECS) - FALLBACK_INDEX = Gem::SourceIndex.from_installed_gems - - def self.source_index - MultiSourceIndex.new - end - - def self.searcher - MultiPathSearcher.new - end - - class ArbitrarySearcher < GemPathSearcher - def initialize(source_index) - @source_index = source_index - super() - end - - def init_gemspecs - @source_index.map { |_, spec| spec }.sort { |a,b| - (a.name <=> b.name).nonzero? || (b.version <=> a.version) - } - end - end - - class MultiPathSearcher - def initialize - @main_searcher = ArbitrarySearcher.new(MAIN_INDEX) - @fallback_searcher = ArbitrarySearcher.new(FALLBACK_INDEX) - end - - def find(path) - try = @main_searcher.find(path) - return try if try - @fallback_searcher.find(path) - end - - def find_all(path) - try = @main_searcher.find_all(path) - return try unless try.empty? - @fallback_searcher.find_all(path) - end - end - - class MultiSourceIndex - # Used by merb.thor to confirm; not needed when MSI is in use - def load_gems_in(*args) - end - - def search(*args) - try = MAIN_INDEX.search(*args) - return try unless try.empty? - FALLBACK_INDEX.search(*args) - end - - def find_name(*args) - try = MAIN_INDEX.find_name(*args) - return try unless try.empty? - FALLBACK_INDEX.find_name(*args) - end - end -end \ No newline at end of file diff --git a/chef-server/tasks/merb.thor/gem_ext.rb b/chef-server/tasks/merb.thor/gem_ext.rb deleted file mode 100644 index 6b605d7c8c..0000000000 --- a/chef-server/tasks/merb.thor/gem_ext.rb +++ /dev/null @@ -1,125 +0,0 @@ -require "erb" - -Gem.pre_install_hooks.push(proc do |installer| - unless File.file?(installer.bin_dir / "common.rb") - FileUtils.mkdir_p(installer.bin_dir) - FileUtils.cp(File.dirname(__FILE__) / "common.rb", installer.bin_dir / "common.rb") - end - - include ColorfulMessages - name = installer.spec.name - if $GEMS && versions = ($GEMS.assoc(name) || [])[1] - dep = Gem::Dependency.new(name, versions) - unless dep.version_requirements.satisfied_by?(installer.spec.version) - error "Cannot install #{installer.spec.full_name} " \ - "for #{$INSTALLING}; " \ - "you required #{dep}" - ::Thor::Tasks::Merb::Gem.rollback_trans - exit! - end - end - success "Installing #{installer.spec.full_name}" -end) - -class ::Gem::Uninstaller - def self._with_silent_ui - - ui = Gem::DefaultUserInteraction.ui - def ui.say(str) - puts "- #{str}" - end - - yield - - class << Gem::DefaultUserInteraction.ui - remove_method :say - end - end - - def self._uninstall(source_index, name, op, version) - unless source_index.find_name(name, "#{op} #{version}").empty? - uninstaller = Gem::Uninstaller.new( - name, - :version => "#{op} #{version}", - :install_dir => Dir.pwd / "gems", - :all => true, - :ignore => true - ) - _with_silent_ui { uninstaller.uninstall } - end - end - - def self._uninstall_others(source_index, name, version) - _uninstall(source_index, name, "<", version) - _uninstall(source_index, name, ">", version) - end -end - -Gem.post_install_hooks.push(proc do |installer| - source_index = installer.instance_variable_get("@source_index") - ::Gem::Uninstaller._uninstall_others( - source_index, installer.spec.name, installer.spec.version - ) -end) - -class ::Gem::DependencyInstaller - alias old_fg find_gems_with_sources - - def find_gems_with_sources(dep) - if @source_index.any? { |_, installed_spec| - installed_spec.satisfies_requirement?(dep) - } - return [] - end - - old_fg(dep) - end -end - -class ::Gem::SpecFetcher - alias old_fetch fetch - def fetch(dependency, all = false, matching_platform = true) - idx = Gem::SourceIndex.from_installed_gems - - reqs = dependency.version_requirements.requirements - - if reqs.size == 1 && reqs[0][0] == "=" - dep = idx.search(dependency).sort.last - end - - if dep - file = dep.loaded_from.dup - file.gsub!(/specifications/, "cache") - file.gsub!(/gemspec$/, "gem") - spec = ::Gem::Format.from_file_by_path(file).spec - [[spec, file]] - else - old_fetch(dependency, all, matching_platform) - end - end -end - -class ::Gem::Installer - def app_script_text(bin_file_name) - template = File.read(File.dirname(__FILE__) / "app_script.rb") - erb = ERB.new(template) - erb.result(binding) - end -end - -class ::Gem::Specification - def recursive_dependencies(from, index = Gem.source_index) - specs = self.runtime_dependencies.map do |dep| - spec = index.search(dep).last - unless spec - from_name = from.is_a?(::Gem::Specification) ? from.full_name : from.to_s - wider_net = index.find_name(dep.name).last - ThorUI.error "Needed #{dep} for #{from_name}, but could not find it" - ThorUI.error "Found #{wider_net.full_name}" if wider_net - ::Thor::Tasks::Merb::Gem.rollback_trans - end - spec - end - specs + specs.map {|s| s.recursive_dependencies(self, index)}.flatten.uniq - end -end \ No newline at end of file diff --git a/chef-server/tasks/merb.thor/main.thor b/chef-server/tasks/merb.thor/main.thor deleted file mode 100644 index a4c5e10337..0000000000 --- a/chef-server/tasks/merb.thor/main.thor +++ /dev/null @@ -1,150 +0,0 @@ -require "rubygems" -require "rubygems/source_index" -require "rubygems/dependency_installer" -require "rubygems/uninstaller" -require "fileutils" -require File.join(File.dirname(__FILE__), "utils") -require File.join(File.dirname(__FILE__), "gem_ext") -require File.join(File.dirname(__FILE__), "ops") - -$INSTALLING = [] - -module Merb - - class Gem < Thor - extend ColorfulMessages - - def initialize - dirs = [Dir.pwd, File.dirname(__FILE__) / ".."] - root = dirs.find {|d| File.file?(d / "config" / "dependencies.rb")} - - if root - @depsrb = root / "config" / "dependencies.rb" - else - self.class.error "dependencies.rb was not found" - exit! - end - - FileUtils.mkdir_p(Dir.pwd / "gems") - - @list = Collector.collect(File.read(@depsrb)) - @idx = ::Gem::SourceIndex.new.load_gems_in("gems/specifications") - end - - def list - require "pp" - pp @list - end - - desc "redeploy", "Syncs up gems/cache with gems/gems. All gems in the cache " \ - "that are not already installed will be installed from the " \ - "cache. All installed gems that are not in the cache will " \ - "be uninstalled." - def redeploy - gem_dir = Dir.pwd / "gems" / "gems" - cache_dir = Dir.pwd / "gems" / "cache" - - gems = Dir[gem_dir / "*"].map! {|n| File.basename(n)} - cache = Dir[cache_dir / "*.gem"].map! {|n| File.basename(n, ".gem")} - new_gems = cache - gems - outdated = gems - cache - idx = ::Gem::SourceIndex.new - idx.load_gems_in(Dir.pwd / "gems" / "specifications") - - new_gems.each do |g| - installer = ::Gem::Installer.new(cache_dir / "#{g}.gem", - :bin_dir => Dir.pwd / "bin", - :install_dir => Dir.pwd / "gems", - :ignore_dependencies => true, - :user_install => false, - :wrappers => true, - :source_index => idx) - - installer.install - end - - outdated.each do |g| - /(.*)\-(.*)/ =~ g - name, version = $1, $2 - uninstaller = ::Gem::Uninstaller.new(name, - :version => version, - :bin_dir => Dir.pwd / "bin", - :install_dir => Dir.pwd / "gems", - :ignore => true, - :executables => true - ) - uninstaller.uninstall - end - end - - desc "confirm", "Confirm the current setup. merb:gem:install will " \ - "automatically run this task before committing the " \ - "changes it makes." - def confirm(gems = @list) - ::Gem.path.replace([Dir.pwd / "gems"]) - ::Gem.source_index.load_gems_in(Dir.pwd / "gems" / "specifications") - - self.class.info "Confirming configuration..." - - ::Gem.loaded_specs.clear - - begin - gems.each do |name, versions| - versions ||= [] - ::Gem.activate name, *versions - end - rescue ::Gem::LoadError => e - self.class.error "Configuration could not be confirmed: #{e.message}" - self.class.rollback_trans - end - self.class.info "Confirmed" - end - - desc 'install', 'Sync up your bundled gems with the list in config/dependencies.rb' - def install(*gems) - if gems.empty? - gems = @list - else - gems = gems.map {|desc| name, *versions = desc.split(" ") } - end - - $GEMS = gems - - self.class.begin_trans - - gems.each do |name, versions| - dep = ::Gem::Dependency.new(name, versions || []) - unless @idx.search(dep).empty? - next - end - - rescue_failures do - $INSTALLING = dep - _install(dep) - end - end - - gem_dir = Dir.pwd / "gems" / "gems" - installed_gems = Dir[gem_dir / "*"].map! {|n| File.basename(n)} - - list = full_list.map {|x| x.full_name}.compact - - (installed_gems - list).each do |g| - /^(.*)\-(.*)$/ =~ g - name, version = $1, $2 - uninstaller = ::Gem::Uninstaller.new(name, - :version => version, - :bin_dir => (Dir.pwd / "bin").to_s, - :install_dir => (Dir.pwd / "gems").to_s, - :ignore => true, - :executables => true - ) - uninstaller.uninstall - end - - confirm(gems) - - self.class.commit_trans - end - end -end \ No newline at end of file diff --git a/chef-server/tasks/merb.thor/ops.rb b/chef-server/tasks/merb.thor/ops.rb deleted file mode 100644 index c758af23af..0000000000 --- a/chef-server/tasks/merb.thor/ops.rb +++ /dev/null @@ -1,93 +0,0 @@ -module Thor::Tasks - module Merb - class Collector - attr_reader :dependencies - - def self.collect(str) - collector = new - collector.instance_eval(str) - collector.dependencies - end - - def initialize - @dependencies = [] - end - - def dependency(name, *versions) - versions.pop if versions.last.is_a?(Hash) - @dependencies << [name, versions] - end - end - - class Gem < Thor - def full_list - @idx.load_gems_in("gems/specifications") - - @list.map do |name, versions| - dep = ::Gem::Dependency.new(name, versions) - spec = @idx.search(dep).last - unless spec - self.class.error "A required dependency #{dep} was not found" - self.class.rollback_trans - end - deps = spec.recursive_dependencies(dep, @idx) - [spec] + deps - end.flatten.uniq - end - - def rescue_failures(error = StandardError, prc = nil) - begin - yield - rescue error => e - if prc - prc.call(e) - else - puts e.message - puts e.backtrace - end - self.class.rollback_trans - end - end - - def self.begin_trans - note "Beginning transaction" - FileUtils.cp_r(Dir.pwd / "gems", Dir.pwd / ".original_gems") - end - - def self.commit_trans - note "Committing transaction" - FileUtils.rm_rf(Dir.pwd / ".original_gems") - end - - def self.rollback_trans - if File.exist?(Dir.pwd / ".original_gems") - note "Rolling back transaction" - FileUtils.rm_rf(Dir.pwd / "gems") - FileUtils.mv(Dir.pwd / ".original_gems", Dir.pwd / "gems") - end - exit! - end - - private - def _install(dep) - @idx.load_gems_in("gems/specifications") - return if @idx.search(dep).last - - installer = ::Gem::DependencyInstaller.new( - :bin_dir => Dir.pwd / "bin", - :install_dir => Dir.pwd / "gems", - :user_install => false) - - begin - installer.install dep.name, dep.version_requirements - rescue ::Gem::GemNotFoundException => e - puts "Cannot find #{dep}" - rescue ::Gem::RemoteFetcher::FetchError => e - puts e.message - puts "Retrying..." - retry - end - end - end - end -end \ No newline at end of file diff --git a/chef-server/tasks/merb.thor/utils.rb b/chef-server/tasks/merb.thor/utils.rb deleted file mode 100644 index 1b1caa6978..0000000000 --- a/chef-server/tasks/merb.thor/utils.rb +++ /dev/null @@ -1,40 +0,0 @@ -class String - def /(other) - (Pathname.new(self) + other).to_s - end -end - -module ColorfulMessages - - # red - def error(*messages) - puts messages.map { |msg| "\033[1;31m#{msg}\033[0m" } - end - - # yellow - def warning(*messages) - puts messages.map { |msg| "\033[1;33m#{msg}\033[0m" } - end - - # green - def success(*messages) - puts messages.map { |msg| "\033[1;32m#{msg}\033[0m" } - end - - alias_method :message, :success - - # magenta - def note(*messages) - puts messages.map { |msg| "\033[1;35m#{msg}\033[0m" } - end - - # blue - def info(*messages) - puts messages.map { |msg| "\033[1;34m#{msg}\033[0m" } - end - -end - -module ThorUI - extend ColorfulMessages -end -- cgit v1.2.1