From 796851cad047925b0bfe83430064fa82cf13f0ba Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Wed, 29 Feb 2012 12:54:51 +0100 Subject: [PATCH] MINOR File restructuring, grouping module-specific files and excluding them by default in order to make the module useful for testing basic core components --- _config.php | 7 ++++--- code/{control => }/CMSSubTreeAdmin.php | 0 code/{model => }/Client.php | 0 code/{model => }/Contact.php | 0 code/{model => }/Developer.php | 0 code/{model => }/FTPage.php | 0 code/{model => }/FTPageHolder.php | 0 code/{model => }/FileUploadRole.php | 0 code/{model => }/FrameworkTestRole.php | 0 code/{model => }/Organisation.php | 0 code/{model => }/Project.php | 0 code/{control => }/TestModelAdmin.php | 0 .../CMSWorkflowSiteConfigController.php | 0 .../CMSWorkflowSiteConfigDecorator.php | 0 .../CMSWorkflowSiteConfigDecoratorTest.php | 0 code/cmsworkflow/_manifest_exclude | 0 code/{ => multiform}/Page2MultiForm.php | 0 code/{ => multiform}/Page2MultiFormTestPage.php | 0 code/{ => multiform}/Page3MultiForm.php | 0 code/{ => multiform}/Page3MultiFormTestPage.php | 0 code/{ => multiform}/TestMultiForm.php | 0 code/{ => multiform}/TestMultiFormPage.php | 0 code/multiform/_manifest_exclude | 0 code/{ => recaptcha}/RecaptchaTestPage.php | 0 code/recaptcha/_manifest_exclude | 0 code/{ => tagfield}/TestTag.php | 0 code/{ => tagfield}/TestTagFieldPage.php | 0 code/tagfield/_manifest_exclude | 0 28 files changed, 4 insertions(+), 3 deletions(-) rename code/{control => }/CMSSubTreeAdmin.php (100%) rename code/{model => }/Client.php (100%) rename code/{model => }/Contact.php (100%) rename code/{model => }/Developer.php (100%) rename code/{model => }/FTPage.php (100%) rename code/{model => }/FTPageHolder.php (100%) rename code/{model => }/FileUploadRole.php (100%) rename code/{model => }/FrameworkTestRole.php (100%) rename code/{model => }/Organisation.php (100%) rename code/{model => }/Project.php (100%) rename code/{control => }/TestModelAdmin.php (100%) rename code/{control => cmsworkflow}/CMSWorkflowSiteConfigController.php (100%) rename code/{model => cmsworkflow}/CMSWorkflowSiteConfigDecorator.php (100%) rename code/{tests => cmsworkflow}/CMSWorkflowSiteConfigDecoratorTest.php (100%) create mode 100644 code/cmsworkflow/_manifest_exclude rename code/{ => multiform}/Page2MultiForm.php (100%) rename code/{ => multiform}/Page2MultiFormTestPage.php (100%) rename code/{ => multiform}/Page3MultiForm.php (100%) rename code/{ => multiform}/Page3MultiFormTestPage.php (100%) rename code/{ => multiform}/TestMultiForm.php (100%) rename code/{ => multiform}/TestMultiFormPage.php (100%) create mode 100644 code/multiform/_manifest_exclude rename code/{ => recaptcha}/RecaptchaTestPage.php (100%) create mode 100644 code/recaptcha/_manifest_exclude rename code/{ => tagfield}/TestTag.php (100%) rename code/{ => tagfield}/TestTagFieldPage.php (100%) create mode 100644 code/tagfield/_manifest_exclude diff --git a/_config.php b/_config.php index bc807e4..2f456b9 100644 --- a/_config.php +++ b/_config.php @@ -3,9 +3,10 @@ Object::add_extension('Member', 'FrameworkTestRole'); Object::add_extension('Member', 'FileUploadRole'); -Object::add_extension('SiteConfig', 'CMSWorkflowSiteConfigDecorator'); - -CMSWorkflowSiteConfigDecorator::apply_active_config(); +if(class_exists('SiteTreeCMSWorkflow')) { + Object::add_extension('SiteConfig', 'CMSWorkflowSiteConfigDecorator'); + CMSWorkflowSiteConfigDecorator::apply_active_config(); +} Director::addRules(100, array( 'dev/regress/$Action/$ID' => 'FrameworktestRegressSessionAdmin' diff --git a/code/control/CMSSubTreeAdmin.php b/code/CMSSubTreeAdmin.php similarity index 100% rename from code/control/CMSSubTreeAdmin.php rename to code/CMSSubTreeAdmin.php diff --git a/code/model/Client.php b/code/Client.php similarity index 100% rename from code/model/Client.php rename to code/Client.php diff --git a/code/model/Contact.php b/code/Contact.php similarity index 100% rename from code/model/Contact.php rename to code/Contact.php diff --git a/code/model/Developer.php b/code/Developer.php similarity index 100% rename from code/model/Developer.php rename to code/Developer.php diff --git a/code/model/FTPage.php b/code/FTPage.php similarity index 100% rename from code/model/FTPage.php rename to code/FTPage.php diff --git a/code/model/FTPageHolder.php b/code/FTPageHolder.php similarity index 100% rename from code/model/FTPageHolder.php rename to code/FTPageHolder.php diff --git a/code/model/FileUploadRole.php b/code/FileUploadRole.php similarity index 100% rename from code/model/FileUploadRole.php rename to code/FileUploadRole.php diff --git a/code/model/FrameworkTestRole.php b/code/FrameworkTestRole.php similarity index 100% rename from code/model/FrameworkTestRole.php rename to code/FrameworkTestRole.php diff --git a/code/model/Organisation.php b/code/Organisation.php similarity index 100% rename from code/model/Organisation.php rename to code/Organisation.php diff --git a/code/model/Project.php b/code/Project.php similarity index 100% rename from code/model/Project.php rename to code/Project.php diff --git a/code/control/TestModelAdmin.php b/code/TestModelAdmin.php similarity index 100% rename from code/control/TestModelAdmin.php rename to code/TestModelAdmin.php diff --git a/code/control/CMSWorkflowSiteConfigController.php b/code/cmsworkflow/CMSWorkflowSiteConfigController.php similarity index 100% rename from code/control/CMSWorkflowSiteConfigController.php rename to code/cmsworkflow/CMSWorkflowSiteConfigController.php diff --git a/code/model/CMSWorkflowSiteConfigDecorator.php b/code/cmsworkflow/CMSWorkflowSiteConfigDecorator.php similarity index 100% rename from code/model/CMSWorkflowSiteConfigDecorator.php rename to code/cmsworkflow/CMSWorkflowSiteConfigDecorator.php diff --git a/code/tests/CMSWorkflowSiteConfigDecoratorTest.php b/code/cmsworkflow/CMSWorkflowSiteConfigDecoratorTest.php similarity index 100% rename from code/tests/CMSWorkflowSiteConfigDecoratorTest.php rename to code/cmsworkflow/CMSWorkflowSiteConfigDecoratorTest.php diff --git a/code/cmsworkflow/_manifest_exclude b/code/cmsworkflow/_manifest_exclude new file mode 100644 index 0000000..e69de29 diff --git a/code/Page2MultiForm.php b/code/multiform/Page2MultiForm.php similarity index 100% rename from code/Page2MultiForm.php rename to code/multiform/Page2MultiForm.php diff --git a/code/Page2MultiFormTestPage.php b/code/multiform/Page2MultiFormTestPage.php similarity index 100% rename from code/Page2MultiFormTestPage.php rename to code/multiform/Page2MultiFormTestPage.php diff --git a/code/Page3MultiForm.php b/code/multiform/Page3MultiForm.php similarity index 100% rename from code/Page3MultiForm.php rename to code/multiform/Page3MultiForm.php diff --git a/code/Page3MultiFormTestPage.php b/code/multiform/Page3MultiFormTestPage.php similarity index 100% rename from code/Page3MultiFormTestPage.php rename to code/multiform/Page3MultiFormTestPage.php diff --git a/code/TestMultiForm.php b/code/multiform/TestMultiForm.php similarity index 100% rename from code/TestMultiForm.php rename to code/multiform/TestMultiForm.php diff --git a/code/TestMultiFormPage.php b/code/multiform/TestMultiFormPage.php similarity index 100% rename from code/TestMultiFormPage.php rename to code/multiform/TestMultiFormPage.php diff --git a/code/multiform/_manifest_exclude b/code/multiform/_manifest_exclude new file mode 100644 index 0000000..e69de29 diff --git a/code/RecaptchaTestPage.php b/code/recaptcha/RecaptchaTestPage.php similarity index 100% rename from code/RecaptchaTestPage.php rename to code/recaptcha/RecaptchaTestPage.php diff --git a/code/recaptcha/_manifest_exclude b/code/recaptcha/_manifest_exclude new file mode 100644 index 0000000..e69de29 diff --git a/code/TestTag.php b/code/tagfield/TestTag.php similarity index 100% rename from code/TestTag.php rename to code/tagfield/TestTag.php diff --git a/code/TestTagFieldPage.php b/code/tagfield/TestTagFieldPage.php similarity index 100% rename from code/TestTagFieldPage.php rename to code/tagfield/TestTagFieldPage.php diff --git a/code/tagfield/_manifest_exclude b/code/tagfield/_manifest_exclude new file mode 100644 index 0000000..e69de29