Updated for latest zf2 conventions

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "library/ZendFramework"]
-	path = library/ZendFramework
-	url = git://git.zendframework.com/zf.git
+[submodule "vendor/ZendFramework"]
+	path = vendor/ZendFramework
+	url = git://github.com/zendframework/zf2.git

etc/application.config.php

@@ -0,0 +1,15 @@
+<?php
+return array(
+    'module_paths' => array(
+        realpath(dirname(__DIR__) . '/module'),
+        realpath(dirname(__DIR__) . '/vendor'),
+    ),
+    'modules' => array(
+        'Application',
+    ),
+    'module_listener_options' => array( 
+        'config_cache_enabled'    => false,
+        'cache_dir'               => realpath(dirname(__DIR__) . '/data/cache'),
+        'application_environment' => getenv('APPLICATION_ENV'),
+    ),
+);

etc/conf.d/README.md

@@ -0,0 +1,8 @@
+About this directory:
+=====================
+
+By default, this application is configured to load all configs in
+`./config/autoload/*.config.php`. Doing this provides a location for a
+developer to drop in configuration override files provided by modules, as well
+as cleanly provide individual, application-wide config files for things like
+database connections, etc.

modules/Application/Module.php → module/Application/Module.php

@@ -2,26 +2,23 @@
 
 namespace Application;
 
-use Zend\Module\Manager,
-    Zend\Config\Config,
-    Zend\EventManager\StaticEventManager,
-    Zend\Loader\AutoloaderFactory;
+use Zend\EventManager\StaticEventManager,
+    Zend\Module\Consumer\AutoloaderProvider;
 
-class Module
+class Module implements AutoloaderProvider
 {
     protected $view;
     protected $viewListener;
 
-    public function init(Manager $moduleManager)
+    public function init()
     {
-        $this->initAutoloader($moduleManager->getOptions()->getApplicationEnv());
         $events = StaticEventManager::getInstance();
         $events->attach('bootstrap', 'bootstrap', array($this, 'initializeView'), 100);
     }
 
-    protected function initAutoloader($env = null)
+    public function getAutoloaderConfig()
     {
-        AutoloaderFactory::factory(array(
+        return array(
             'Zend\Loader\ClassMapAutoloader' => array(
                 __DIR__ . '/autoload_classmap.php',
             ),
@@ -30,19 +27,19 @@ protected function initAutoloader($env = null)
                     __NAMESPACE__ => __DIR__ . '/src/' . __NAMESPACE__,
                 ),
             ),
-        ));
+        );
     }
 
-    public function getConfig()
+    public function getConfig($env = null)
     {
-        return new Config(include __DIR__ . '/configs/module.config.php');
+        return include __DIR__ . '/config/module.config.php';
     }
 
     public function initializeView($e)
     {
         $app          = $e->getParam('application');
         $locator      = $app->getLocator();
-        $config       = $e->getParam('modules')->getMergedConfig();
+        $config       = $e->getParam('config');
         $view         = $this->getView($app);
         $viewListener = $this->getViewListener($view, $config);
         $app->events()->attachAggregate($viewListener);
@@ -76,7 +73,7 @@ protected function getView($app)
 
         $view->plugin('headTitle')->setSeparator(' - ')
                                   ->setAutoEscape(false)
-                                  ->append('modules.zendframework.com');
+                                  ->append('ZF2 Modules');
         $this->view = $view;
         return $view;
     }

public/image

@@ -1 +1 @@
-../modules/Application/public/images
+../module/Application/public/images

public/index.php

@@ -1,30 +1,20 @@
 <?php
-// Define application environment
-defined('APPLICATION_ENV')
-    || define('APPLICATION_ENV', (getenv('APPLICATION_ENV') ? getenv('APPLICATION_ENV') : 'production'));
-
-// Ensure ZF is on the include path
-set_include_path(implode(PATH_SEPARATOR, array(
-    realpath(__DIR__ . '/../library'),
-    realpath(__DIR__ . '/../library/ZendFramework/library'),
-    get_include_path(),
-)));
-
-require_once 'Zend/Loader/AutoloaderFactory.php';
+require_once dirname(__DIR__) . '/vendor/ZendFramework/library/Zend/Loader/AutoloaderFactory.php';
 Zend\Loader\AutoloaderFactory::factory(array('Zend\Loader\StandardAutoloader' => array()));
 
-$appConfig = new Zend\Config\Config(include __DIR__ . '/../configs/application.config.php');
+$appConfig = include dirname(__DIR__) . '/etc/application.config.php';
 
 $moduleLoader = new Zend\Loader\ModuleAutoloader($appConfig['module_paths']);
 $moduleLoader->register();
 
-$moduleManager = new Zend\Module\Manager(
-    $appConfig['modules'],
-    new Zend\Module\ManagerOptions($appConfig['module_manager_options'])
-);
+$moduleManager = new Zend\Module\Manager($appConfig['modules']);
+$listenerOptions = new Zend\Module\Listener\ListenerOptions($appConfig['module_listener_options']);
+$moduleManager->setDefaultListenerOptions($listenerOptions);
+$moduleManager->getConfigListener()->addConfigGlobPath(dirname(__DIR__) . '/etc/conf.d/*.config.php');
+$moduleManager->loadModules();
 
 // Create application, bootstrap, and run
-$bootstrap      = new Zend\Mvc\Bootstrap($moduleManager);
-$application    = new Zend\Mvc\Application;
+$bootstrap   = new Zend\Mvc\Bootstrap($moduleManager->getMergedConfig());
+$application = new Zend\Mvc\Application;
 $bootstrap->bootstrap($application);
 $application->run()->send();

public/style

@@ -1 +1 @@
-../modules/Application/public/css
+../module/Application/public/css