Merge rails3anddb into development [1/29]



 bin/barclamp_lib.rb                                |   26 +-
 bin/dev_mode.sh                                    |   16 +-
 bin/validate_bags.rb                               |    2 +-
 bin/validate_data_bag.rb                           |    2 +-
 chef/cookbooks/crowbar/files/default/config.ru     |    6 +-
 chef/cookbooks/crowbar/files/default/crowbar       |    2 +-
 chef/cookbooks/crowbar/files/default/crowbar.suse  |   22 +-
 chef/cookbooks/crowbar/recipes/default.rb          |   77 +-
 .../crowbar/templates/default/puma.cfg.erb         |    7 +
 .../crowbar/templates/default/rainbows.cfg.erb     |   13 -
 crowbar.yml                                        |   60 +-
 crowbar_framework/BDD/README.txt                   |   17 -
 crowbar_framework/BDD/Win7.bat                     |   18 -
 crowbar_framework/BDD/barclamps.feature            |   37 -
 crowbar_framework/BDD/bdd.erl                      |  145 +-
 crowbar_framework/BDD/bdd_utils.erl                |  182 +-
 crowbar_framework/BDD/bdd_webrat.erl               |   64 +-
 crowbar_framework/BDD/bulk_edit.feature            |   30 -
 crowbar_framework/BDD/crowbar.config               |    4 +-
 crowbar_framework/BDD/crowbar.erl                  |   53 +-
 crowbar_framework/BDD/dashboard.erl                |   30 +
 crowbar_framework/BDD/dashboard.feature            |   63 -
 crowbar_framework/BDD/default.config               |   10 +
 crowbar_framework/BDD/default.erl                  |   23 +
 crowbar_framework/BDD/digest_auth.erl              |    5 +
 crowbar_framework/BDD/eurl.erl                     |  163 +
 .../BDD/features/barclamp_api.feature              |   63 +
 crowbar_framework/BDD/features/barclamps.feature   |   31 +
 crowbar_framework/BDD/features/bulk_edit.feature   |   30 +
 crowbar_framework/BDD/features/dashboard.feature   |   12 +
 .../BDD/features/documentation.feature             |   45 +
 crowbar_framework/BDD/features/groups.feature      |   21 +
 crowbar_framework/BDD/features/navigation.feature  |   78 +
 crowbar_framework/BDD/features/nodes.feature       |   62 +
 crowbar_framework/BDD/features/proposals.feature   |   20 +
 crowbar_framework/BDD/features/scaffolds.feature   |  196 +
 crowbar_framework/BDD/groups.erl                   |   37 +
 crowbar_framework/BDD/linux.sh                     |   19 +-
 crowbar_framework/BDD/linux_compile.sh             |   12 +
 crowbar_framework/BDD/linux_install.sh             |    5 +
 crowbar_framework/BDD/linux_run.sh                 |   12 +
 crowbar_framework/BDD/modules.feature              |   66 -
 crowbar_framework/BDD/navigation.feature           |   78 -
 crowbar_framework/BDD/nodes.erl                    |   39 +
 crowbar_framework/Gemfile                          |   82 +-
 crowbar_framework/Gemfile.lock                     |   99 -
 crowbar_framework/Rakefile                         |   10 +-
 .../app/assets/javascripts/application.js          |   13 +
 .../assets/javascripts/codemirror/codemirror.js    | 2137 ++++
 .../assets/javascripts/codemirror/javascript.js    |  348 +
 .../app/assets/javascripts/controls.js             |  963 ++
 .../app/assets/javascripts/crowbar.js              |  119 +
 .../app/assets/javascripts/drag_drop_helpers.js    |  310 +
 .../app/assets/javascripts/dragdrop.js             |  973 ++
 .../app/assets/javascripts/effects.js              | 1128 ++
 .../app/assets/javascripts/event_helpers.js        |  468 +
 crowbar_framework/app/assets/javascripts/html5.js  |    4 +
 .../app/assets/javascripts/jquery-ui.js            |11603 ++++++++++++++++++++
 .../app/assets/javascripts/jquery-ui.min.js        |  406 +
 .../app/assets/javascripts/jquery.colorbox.js      |    4 +
 .../app/assets/javascripts/jquery.dataTables.js    | 7440 +++++++++++++
 .../assets/javascripts/jquery.dataTables.min.js    |  151 +
 crowbar_framework/app/assets/javascripts/jquery.js | 9300 ++++++++++++++++
 .../app/assets/javascripts/jquery.min.js           |    4 +
 .../app/assets/javascripts/jquery.sparkline.min.js |   94 +
 .../assets/javascripts/jquery.spritely-0.6.1.js    |  539 +
 .../app/assets/javascripts/prototype.js            | 4874 ++++++++
 crowbar_framework/app/assets/javascripts/rails.js  |  315 +
 .../app/assets/stylesheets/_codemirror.sass        |   71 +
 .../app/assets/stylesheets/_common.sass            |  188 +
 .../app/assets/stylesheets/_default.sass           |   35 +
 .../app/assets/stylesheets/_errors.sass            |    7 +
 .../app/assets/stylesheets/_formtastic.sass        |  131 +
 .../app/assets/stylesheets/_jquery_ui.sass         |   45 +
 .../app/assets/stylesheets/_layout.sass            |   96 +
 .../app/assets/stylesheets/_mixins.sass            |  138 +
 .../app/assets/stylesheets/_tables.sass            |  114 +
 .../app/assets/stylesheets/_variables.sass         |   31 +
 .../app/assets/stylesheets/application.sass        |   19 +
 crowbar_framework/app/assets/stylesheets/ie.sass   |    4 +
 .../app/controllers/application_controller.rb      |    7 +-
 .../app/controllers/barclamp_controller.rb         |  268 +-
 .../app/controllers/crowbar_controller.rb          |    3 -
 .../app/controllers/docs_controller.rb             |  212 +-
 .../app/controllers/groups_controller.rb           |   42 +
 .../app/controllers/nodes_controller.rb            |   88 +-
 .../app/controllers/proposals_controller.rb        |   51 +
 .../controllers/scaffolds/barclamps_controller.rb  |   20 +
 .../scaffolds/cmdb_attributes_controller.rb        |   19 +
 .../app/controllers/scaffolds/docs_controller.rb   |   19 +
 .../app/controllers/scaffolds/groups_controller.rb |   19 +
 .../controllers/scaffolds/interfaces_controller.rb |   19 +
 .../scaffolds/ip_addresses_controller.rb           |   19 +
 .../app/controllers/scaffolds/navs_controller.rb   |   19 +
 .../controllers/scaffolds/networks_controller.rb   |   19 +
 .../controllers/scaffolds/node_roles_controller.rb |   19 +
 .../app/controllers/scaffolds/nodes_controller.rb  |   19 +
 .../app/controllers/scaffolds/os_controller.rb     |   19 +
 .../scaffolds/os_packages_controller.rb            |   19 +
 .../scaffolds/proposal_configs_controller.rb       |   19 +
 .../scaffolds/proposal_queue_items_controller.rb   |   19 +
 .../scaffolds/proposal_queues_controller.rb        |   19 +
 .../controllers/scaffolds/proposals_controller.rb  |   19 +
 .../scaffolds/role_element_orders_controller.rb    |   19 +
 .../app/controllers/scaffolds/roles_controller.rb  |   19 +
 .../app/controllers/support_controller.rb          |    8 +-
 .../app/controllers/users_controller.rb            |   12 +
 .../app/helpers/application_helper.rb              |   32 +-
 crowbar_framework/app/helpers/nodes_helper.rb      |    4 +-
 crowbar_framework/app/models/barclamp.rb           |  251 +
 .../app/models/barclamp_configuration.rb           |   91 +
 crowbar_framework/app/models/barclamp_instance.rb  |  233 +
 crowbar_framework/app/models/cmdb.rb               |   24 +
 crowbar_framework/app/models/cmdb_attribute.rb     |   23 +
 crowbar_framework/app/models/cmdb_event.rb         |   23 +
 crowbar_framework/app/models/cmdb_map.rb           |   23 +
 crowbar_framework/app/models/cmdb_run.rb           |   23 +
 crowbar_framework/app/models/crowbar_service.rb    |  263 +-
 crowbar_framework/app/models/doc.rb                |   27 +
 crowbar_framework/app/models/event_queue.rb        |   59 +
 crowbar_framework/app/models/events/base_event.rb  |   28 +
 crowbar_framework/app/models/events/job_event.rb   |   30 +
 crowbar_framework/app/models/events/web_event.rb   |   30 +
 crowbar_framework/app/models/group.rb              |   33 +
 crowbar_framework/app/models/jobs/base_job.rb      |   55 +
 crowbar_framework/app/models/jobs/test_job.rb      |   25 +
 crowbar_framework/app/models/nav.rb                |   26 +
 crowbar_framework/app/models/node.rb               |  210 +
 crowbar_framework/app/models/node_attribute.rb     |   26 +
 crowbar_framework/app/models/node_object.rb        |   14 +-
 crowbar_framework/app/models/node_role.rb          |   46 +
 crowbar_framework/app/models/os.rb                 |   27 +
 crowbar_framework/app/models/os_package.rb         |   23 +
 crowbar_framework/app/models/proposal.rb           |   93 +
 crowbar_framework/app/models/proposal_config.rb    |  234 +
 crowbar_framework/app/models/proposal_object.rb    |   20 +
 crowbar_framework/app/models/proposal_queue.rb     |  373 +
 .../app/models/proposal_queue_item.rb              |   22 +
 crowbar_framework/app/models/role.rb               |   25 +
 crowbar_framework/app/models/role_element_order.rb |   23 +
 crowbar_framework/app/models/role_object.rb        |   10 +
 crowbar_framework/app/models/service_object.rb     | 1051 +--
 crowbar_framework/app/models/user.rb               |   44 +
 .../app/views/barclamp/_index.html.haml            |   61 +-
 .../app/views/barclamp/_node_selector.html.haml    |   11 +-
 .../views/barclamp/_show_attributes_raw.html.haml  |   14 +-
 .../views/barclamp/_show_deployment_raw.html.haml  |    6 +-
 .../app/views/barclamp/index.html.haml             |   12 +-
 .../app/views/barclamp/overview.html.haml          |    2 +-
 .../app/views/barclamp/proposal_show.html.haml     |    3 +-
 .../app/views/devise/confirmations/new.html.haml   |    9 +
 .../mailer/confirmation_instructions.html.haml     |    4 +
 .../mailer/reset_password_instructions.html.haml   |    6 +
 .../devise/mailer/unlock_instructions.html.haml    |    5 +
 .../app/views/devise/passwords/edit.html.haml      |   14 +
 .../app/views/devise/passwords/new.html.haml       |    9 +
 .../app/views/devise/registrations/edit.html.haml  |   27 +
 .../app/views/devise/registrations/new.html.haml   |   17 +
 .../app/views/devise/sessions/new.html.haml        |   16 +
 .../app/views/devise/shared/_links.haml            |   19 +
 .../app/views/devise/unlocks/new.html.haml         |    9 +
 crowbar_framework/app/views/docs/_index.html.haml  |    8 -
 crowbar_framework/app/views/docs/index.html.haml   |   37 +-
 crowbar_framework/app/views/docs/topic.html.haml   |   41 +-
 .../app/views/layouts/application.html.haml        |    9 +-
 .../app/views/layouts/doc_export.html.haml         |    4 +
 crowbar_framework/app/views/nodes/_form.html.haml  |   11 +-
 crowbar_framework/app/views/nodes/_show.html.haml  |   66 +-
 .../app/views/nodes/actions.html.haml              |    4 +-
 crowbar_framework/app/views/nodes/index.html.haml  |   41 +-
 crowbar_framework/app/views/nodes/list.html.haml   |    4 +-
 .../app/views/proposals/_proposal.html.haml        |   26 +
 .../app/views/support/import.html.haml             |    4 +-
 .../app/views/support/index.html.haml              |    8 +-
 .../app/views/support/restart.html.haml            |    2 +-
 crowbar_framework/app/views/users/index.html.haml  |   23 +
 crowbar_framework/barclamp_model/crowbar.yml       |   16 +-
 .../app/controllers/==BC-MODEL==_controller.rb     |    3 -
 .../app/models/==BC-MODEL==_service.rb             |   29 +-
 .../config/locales/==BC-MODEL==/en.yml             |   28 +
 ...YYYMMDDHHMMSS00_barclamp_import_==BC-MODEL==.rb |   24 +
 .../crowbar_framework/doc/==BC-MODEL==.yml         |    3 +
 .../doc/default/==BC-MODEL==/index.md              |   17 -
 .../doc/default/==BC-MODEL==/license.md            |    5 +
 crowbar_framework/config.ru                        |    8 +-
 crowbar_framework/config/application.rb            |  102 +
 crowbar_framework/config/boot.rb                   |  127 +-
 crowbar_framework/config/environment.rb            |   65 +-
 .../config/environments/development.rb             |   14 +-
 .../config/environments/production.rb              |   16 +-
 crowbar_framework/config/environments/test.rb      |    7 +-
 .../config/initializers/api_helpers.rb             |    1 +
 .../config/initializers/crowbar_offline.rb         |    1 +
 crowbar_framework/config/initializers/devise.rb    |  244 +
 .../config/initializers/new_rails_defaults.rb      |   21 -
 .../config/initializers/secret_token.rb            |    7 +
 .../config/initializers/session_store.rb           |   15 -
 .../config/initializers/wrap_parameters.rb         |   14 +
 crowbar_framework/config/locales/crowbar/en.yml    |  458 +
 crowbar_framework/config/locales/en.yml            |  384 +-
 crowbar_framework/config/navigation.rb             |   58 +-
 crowbar_framework/config/routes.rb                 |  243 +-
 crowbar_framework/config/routes_r3.rb              |   86 -
 .../db/migrate/20120722130500_create_docs.rb       |   38 +
 .../db/migrate/20120723233100_create_navs.rb       |   67 +
 .../db/migrate/20120725023017_create_cmdb_maps.rb  |   30 +
 .../db/migrate/20120730225300_create_cmdbs.rb      |   26 +
 .../db/migrate/20120730230520_create_cmdb_runs.rb  |   27 +
 .../migrate/20120730230713_create_cmdb_events.rb   |   28 +
 .../db/migrate/20120731225405_create_barclamps.rb  |   40 +
 ...20120731225436_create_barclamps_dependencies.rb |   24 +
 .../20120731225446_create_barclamps_members.rb     |   24 +
 .../db/migrate/20120731225505_create_node_roles.rb |   26 +
 .../db/migrate/20120731225516_create_nodes.rb      |   31 +
 .../20120731225838_create_proposal_configs.rb      |   26 +
 .../db/migrate/20120731225914_create_proposals.rb  |   30 +
 .../db/migrate/20120731225923_create_roles.rb      |   24 +
 .../20120731225993_create_role_element_orders.rb   |   23 +
 .../20120731230001_barclamp_import_crowbar.rb      |   24 +
 .../migrate/20120801153900_devise_create_users.rb  |   52 +
 .../20120801172648_create_cmdb_attributes.rb       |   31 +
 .../db/migrate/20120801190200_scaffold_nav.rb      |   44 +
 .../db/migrate/20120805215400_create_groups.rb     |   27 +
 .../migrate/20120805215500_create_nodes_groups.rb  |   24 +
 .../db/migrate/20120808233000_create_os.rb         |   31 +
 .../migrate/20120808233500_create_os_packages.rb   |   26 +
 .../20120809081700_create_proposal_queues.rb       |   22 +
 .../20120809082000_create_proposal_queue_items.rb  |   25 +
 .../20120810233500_create_barclamp_packages.rb     |   24 +
 crowbar_framework/db/seeds.rb                      |    7 +
 crowbar_framework/doc/crowbar.yml                  |  114 +-
 .../doc/default/crowbar/barclamp-info-meta.md      |   13 +
 .../doc/default/crowbar/barclamp-info.md           |    4 +
 .../doc/default/crowbar/book-barclamps.md          |   14 +-
 .../doc/default/crowbar/book-deployguide.md        |  775 ++-
 .../doc/default/crowbar/book-developersguide.md    |   22 +
 .../doc/default/crowbar/book-documentation.md      |   11 -
 .../doc/default/crowbar/book-gettingstarted.md     |   23 +-
 .../doc/default/crowbar/book-licenses.md           |   11 +-
 .../default/crowbar/devguide/adding-navigation.md  |   35 +
 .../doc/default/crowbar/devguide/api.md            |   87 +
 .../doc/default/crowbar/devguide/api/barclamp.md   |   28 +
 .../doc/default/crowbar/devguide/api/group.md      |   87 +
 .../doc/default/crowbar/devguide/api/node.md       |   84 +
 .../doc/default/crowbar/devguide/api/proposal.md   |   29 +
 .../doc/default/crowbar/devguide/api/status.md     |   42 +
 .../default/crowbar/devguide/barclamp-metadata.md  |   26 +
 .../doc/default/crowbar/devguide/building.md       |    4 +
 .../doc/default/crowbar/devguide/create-stub.md    |   71 +
 .../doc/default/crowbar/devguide/documentation.md  |   59 +
 .../doc/default/crowbar/devguide/localization.md   |   21 +
 .../default/crowbar/devguide/makingbarclamps.md    |   95 +
 .../doc/default/crowbar/devguide/testing.md        |   15 +
 .../doc/default/crowbar/devguide/testing/bdd.md    |  184 +
 .../default/crowbar/devguide/testing/devtool.md    |   13 +
 .../doc/default/crowbar/devguide/testing/units.md  |   14 +
 .../doc/default/crowbar/licenses-crowbar-meta.md   |   14 +
 crowbar_framework/doc/default/crowbar/licenses.md  |   12 +
 .../doc/default/crowbar/ui-general.md              |    3 -
 crowbar_framework/doc/default/crowbar/ui-nodes.md  |    3 -
 .../doc/default/crowbar/ui-utilities.md            |    4 -
 .../doc/default/crowbar/userguide/ui-general.md    |    3 +
 .../doc/default/crowbar/userguide/ui-nodes.md      |    3 +
 .../doc/default/crowbar/userguide/ui-utilities.md  |    4 +
 .../doc/default/crowbar/userguide/utils-export.md  |    3 +
 .../doc/default/crowbar/utils-export.md            |    3 -
 crowbar_framework/lib/api_helper.rb                |   58 +
 crowbar_framework/lib/tasks/fixtures.rake          |   20 +
 crowbar_framework/public/404.html                  |    2 +-
 crowbar_framework/public/500.html                  |    2 +-
 .../public/javascripts/application.js              |  119 -
 .../public/javascripts/codemirror/codemirror.js    | 2137 ----
 .../public/javascripts/codemirror/javascript.js    |  348 -
 crowbar_framework/public/javascripts/controls.js   |  963 --
 .../public/javascripts/drag_drop_helpers.js        |  310 -
 crowbar_framework/public/javascripts/dragdrop.js   |  973 --
 crowbar_framework/public/javascripts/effects.js    | 1128 --
 .../public/javascripts/event_helpers.js            |  468 -
 crowbar_framework/public/javascripts/html5.js      |    4 -
 crowbar_framework/public/javascripts/jquery-ui.js  |11603 --------------------
 .../public/javascripts/jquery-ui.min.js            |  406 -
 .../public/javascripts/jquery.colorbox.js          |    4 -
 .../public/javascripts/jquery.dataTables.js        | 7440 -------------
 .../public/javascripts/jquery.dataTables.min.js    |  151 -
 crowbar_framework/public/javascripts/jquery.js     | 9300 ----------------
 crowbar_framework/public/javascripts/jquery.min.js |    4 -
 .../public/javascripts/jquery.sparkline.min.js     |   94 -
 .../public/javascripts/jquery.spritely-0.6.1.js    |  539 -
 crowbar_framework/public/javascripts/prototype.js  | 4874 --------
 crowbar_framework/public/javascripts/rails.js      |  315 -
 .../public/stylesheets/sass/_codemirror.sass       |   71 -
 .../public/stylesheets/sass/_common.sass           |  188 -
 .../public/stylesheets/sass/_default.sass          |   35 -
 .../public/stylesheets/sass/_errors.sass           |    7 -
 .../public/stylesheets/sass/_formtastic.sass       |  131 -
 .../public/stylesheets/sass/_jquery_ui.sass        |   45 -
 .../public/stylesheets/sass/_layout.sass           |   96 -
 .../public/stylesheets/sass/_mixins.sass           |  138 -
 .../public/stylesheets/sass/_tables.sass           |  114 -
 .../public/stylesheets/sass/_variables.sass        |   31 -
 .../public/stylesheets/sass/application.sass       |   15 -
 crowbar_framework/public/stylesheets/sass/ie.sass  |    5 -
 crowbar_framework/script/about                     |    4 -
 crowbar_framework/script/console                   |    3 -
 crowbar_framework/script/crowbar_requester.rb      |   43 +
 crowbar_framework/script/crowbar_runner.rb         |   77 +
 crowbar_framework/script/cucumber                  |   10 -
 crowbar_framework/script/dbconsole                 |    3 -
 crowbar_framework/script/destroy                   |    3 -
 crowbar_framework/script/event_client.rb           |   55 +
 crowbar_framework/script/generate                  |    3 -
 crowbar_framework/script/performance/benchmarker   |    3 -
 crowbar_framework/script/performance/profiler      |    3 -
 crowbar_framework/script/plugin                    |    3 -
 crowbar_framework/script/rails                     |    6 +
 crowbar_framework/script/runner                    |    3 -
 crowbar_framework/script/server                    |    3 -
 crowbar_framework/test/test_helper.rb              |   19 +-
 crowbar_framework/test/unit/barclamp_model_test.rb |  168 +
 crowbar_framework/test/unit/group_model_test.rb    |   53 +
 crowbar_framework/test/unit/node_model_test.rb     |   73 +
 crowbar_framework/test/unit/proposal_model_test.rb |   50 +
 322 files changed, 51496 insertions(+), 45233 deletions(-)