Fix regnum

.gitignore

@@ -1,50 +1,16 @@
 travis/travis-ci-key
-bin
-drupal/.drush-lock-update
-drupal/.gitignore
-drupal/.htaccess
-drupal/CHANGELOG.txt
-drupal/COPYRIGHT.txt
-drupal/INSTALL.mysql.txt
-drupal/INSTALL.pgsql.txt
-drupal/INSTALL.sqlite.txt
-drupal/INSTALL.txt
-drupal/LICENSE.txt
-drupal/MAINTAINERS.txt
-drupal/README.txt
-drupal/UPGRADE.txt
-drupal/authorize.php
-drupal/cron.php
-drupal/includes/
-drupal/index.php
-drupal/install.php
-drupal/misc/
-drupal/modules/
-drupal/profiles/
-drupal/robots.txt
-drupal/scripts/
-drupal/sites/README.txt
-drupal/sites/all/README.txt
-drupal/sites/all/libraries/
-drupal/sites/all/modules/README.txt
-drupal/sites/all/modules/contrib/
-drupal/sites/all/themes/contrib/
-drupal/sites/all/vendor/
-drupal/sites/default/default.settings.php
-drupal/sites/example.sites.php
-drupal/sites/sites/
-drupal/themes/
-drupal/update.php
-drupal/web.config
-drupal/xmlrpc.php
-drupal/temp
+web/sites/default/settings.local.php
+web/sites/sites/
+web/temp
 .vagrant
 **/.DS_Store
 **/pkg/
 **/.*.sw?
 **/spec/fixtures
 **/Gemfile.lock
 **/.rspec_system
+*.sql
+*.patch
 
 # Ignore the devel mail log on dev / staging systems
 devel-mail-log
@@ -53,18 +19,15 @@ devel-mail-log
 .idea
 
 # Ignore the error log
-htdocs/error_log
-htdocs/moving.page
-htdocs/suspended.page
-
-# Ignore configuration files that may contain sensitive information.
-htdocs/sites/*/settings*.php
+web/error_log
+web/moving.page
+web/suspended.page
 
 # Ignore paths that contain user-generated content.
-htdocs/sites/*/files
-htdocs/sites/*/private
-htdocs/files
+web/sites/*/files
+web/sites/*/private
+web/files
 private-files
 
 # Ignore temp directories
-htdocs/temp
+web/temp

bin/behat

@@ -0,0 +1 @@
+../vendor/behat/behat/bin/behat

bin/disable-php-email

@@ -0,0 +1 @@
+../vendor/pantheon-systems/ci-scripts/scripts/disable-php-email

bin/drush

@@ -0,0 +1 @@
+../vendor/drush/drush/drush

bin/drush.complete.sh

@@ -0,0 +1 @@
+../vendor/drush/drush/drush.complete.sh

bin/drush.launcher

@@ -0,0 +1 @@
+../vendor/drush/drush/drush.launcher

bin/drush.php

@@ -0,0 +1 @@
+../vendor/drush/drush/drush.php

bin/init-new-project

@@ -0,0 +1 @@
+../vendor/pantheon-systems/ci-scripts/scripts/init-new-project

bin/install-drupal

@@ -0,0 +1 @@
+../vendor/pantheon-systems/ci-scripts/scripts/install-drupal

bin/local-test

@@ -0,0 +1 @@
+../vendor/pantheon-systems/ci-scripts/scripts/local-test

bin/pantheon-test

@@ -0,0 +1 @@
+../vendor/pantheon-systems/ci-scripts/scripts/pantheon-test

bin/php-parse

@@ -0,0 +1 @@
+../vendor/nikic/php-parser/bin/php-parse

bin/phpunit

@@ -0,0 +1 @@
+../vendor/phpunit/phpunit/phpunit

bin/prepare-to-install

@@ -0,0 +1 @@
+../vendor/pantheon-systems/ci-scripts/scripts/prepare-to-install

bin/psysh

@@ -0,0 +1 @@
+../vendor/psy/psysh/bin/psysh

bin/push-to-pantheon

@@ -0,0 +1 @@
+../vendor/pantheon-systems/ci-scripts/scripts/push-to-pantheon

bin/setup-before-tests

@@ -0,0 +1 @@
+../vendor/pantheon-systems/ci-scripts/scripts/setup-before-tests

bin/setup-environment

@@ -0,0 +1 @@
+../vendor/pantheon-systems/ci-scripts/scripts/setup-environment

bin/start-webserver

@@ -0,0 +1 @@
+../vendor/pantheon-systems/ci-scripts/scripts/start-webserver

bin/stop-webserver

@@ -0,0 +1 @@
+../vendor/pantheon-systems/ci-scripts/scripts/stop-webserver

bin/wait-for-webserver

@@ -0,0 +1 @@
+../vendor/pantheon-systems/ci-scripts/scripts/wait-for-webserver

composer.json

@@ -8,9 +8,9 @@
         }
     ],
     "require": {
-        "composer/installers": "^1.0.21",
-        "cweagans/composer-patches": "~1.0",
-        "derhasi/composer-preserve-paths": "0.1.*",
+        "composer/installers": "^1.9",
+        "cweagans/composer-patches": "^1.7",
+        "drupal-composer/preserve-paths": "^0.1.6",
         "drupal/adaptive_image": "^1",
         "drupal/admin_menu": "^3",
         "drupal/admin_views": "^1",
@@ -23,10 +23,12 @@
         "drupal/cck": "^3",
         "drupal/ckeditor_link": "^2",
         "drupal/cnr": "^4",
+        "drupal/composer_autoloader": "^1",
         "drupal/composer_vendor": "^1",
         "drupal/context": "^3",
         "drupal/ctools": "^1",
         "drupal/date": "^2",
+        "drupal/date_ical": "^3.10",
         "drupal/delta": "^3",
         "drupal/devel": "^1",
         "drupal/diff": "^3",
@@ -35,8 +37,6 @@
         "drupal/domain_blocks": "^3",
         "drupal/domain_views": "^1",
         "drupal/domaincontext": "^1",
-        "drupal/drupal": "^7",
-        "drupal/drupal-driver": "dev-master",
         "drupal/elements": "^1",
         "drupal/email_confirm": "^1",
         "drupal/entity": "^1",
@@ -94,45 +94,44 @@
         "drupal/wysiwyg": "^2",
         "drupal/wysiwyg_filter": "^1",
         "drush/drush": "^8",
+        "pantheon-systems/drops-7-composer": "^7",
         "phpdocumentor/reflection-docblock": "^2",
         "westkingdom/hierarchical-group-email": "~1.0"
     },
     "require-dev": {
-        "pantheon-systems/ci-scripts": "1.*",
         "phpunit/phpunit": "^4.8"
     },
     "config": {
         "optimize-autoloader": true,
         "sort-packages": true,
         "platform": {
-            "php": "5.6.32"
+            "php": "5.5.38"
         },
-        "bin-dir": "bin/",
-        "vendor-dir": "drupal/sites/all/vendor"
+        "vendor-dir": "web/sites/all/vendor"
     },
     "extra": {
         "enable-patching": true,
         "patches-file": "composer-patches.json",
         "installer-paths": {
-            "drupal/sites/all/modules/contrib/{$name}/": ["type:drupal-module"],
-            "drupal/sites/all/themes/contrib/{$name}/": ["type:drupal-theme"],
-            "drupal/sites/all/drush/{$name}/": ["type:drupal-drush"],
-            "drupal/profiles/{$name}/": ["type:drupal-profile"],
-            "drupal/": ["drupal/drupal"]
+            "web/sites/all/modules/contrib/{$name}/": ["type:drupal-module"],
+            "web/sites/all/themes/contrib/{$name}/": ["type:drupal-theme"],
+            "web/sites/all/drush/{$name}/": ["type:drupal-drush"],
+            "web/profiles/{$name}/": ["type:drupal-profile"],
+            "web/": ["type:drupal-core"]
         },
         "preserve-paths": [
-            "drupal/sites/all/modules/contrib",
-            "drupal/sites/all/modules/custom",
-            "drupal/sites/all/modules/modified",
-            "drupal/sites/all/themes",
-            "drupal/sites/all/libraries",
-            "drupal/sites/all/drush",
-            "drupal/sites/all/vendor",
-            "drupal/sites/default/settings.php",
-            "drupal/sites/default/files",
-            "drupal/drush",
-            "drupal/files",
-            "drupal/temp"
+            "web/sites/all/modules/contrib",
+            "web/sites/all/modules/custom",
+            "web/sites/all/modules/modified",
+            "web/sites/all/themes",
+            "web/sites/all/libraries",
+            "web/sites/all/drush",
+            "web/sites/all/vendor",
+            "web/sites/default/settings.php",
+            "web/sites/default/files",
+            "web/drush",
+            "web/files",
+            "web/temp"
         ],
         "violinist": {
             "allow_updates_beyond_constraint": 1,