Patch 1

.gitignore

@@ -1,2 +1,4 @@
 nbproject
-
+.buildpath
+.project
+.settings/

LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2005-2010, Zend Technologies USA, Inc.
+Copyright (c) 2005-2011, Zend Technologies USA, Inc.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

README-DEV.txt

@@ -14,7 +14,7 @@ read/subscribe to the following resources:
    http://framework.zend.com/wiki/display/ZFDEV/Contributing+to+Zend+Framework
 
  * ZF Contributor's mailing list:
-   Archives:  http://short.ie/tc64rv
+   Archives: http://zend-framework-community.634137.n4.nabble.com/ZF-Contributor-f680267.html
    Subscribe: [email protected]
 
  * ZF Contributor's IRC channel:

README-GIT.txt

@@ -56,7 +56,7 @@ github or other public site, or setup/use your own repository.
   Option 2: Personal Repository
   -----------------------------
 
-  We assume you will use gitosis (http://short.e/m6t2pn) or gitolite
+  We assume you will use gitosis (http://progit.org/book/ch4-7.html) or gitolite
   (http://progit.org/book/ch4-8.html) to host your own repository.  If
   you go this route, we will assume you have the knowledge to do so, or
   know where to obtain it. We will not assist you in setting up such a

README.txt

@@ -2,23 +2,19 @@ Welcome to the Zend Framework 2.0.0 Release!
 
 RELEASE INFORMATION
 ---------------
-Zend Framework 2.0.0dev2
+Zend Framework 2.0.0dev3
 
 THIS RELEASE IS A DEVELOPMENT RELEASE AND NOT INTENDED FOR PRODUCTION USE.
 PLEASE USE AT YOUR OWN RISK.
 
 NEW FEATURES
 ------------
 
-This release concludes two different milestones:
+This release contains the following:
 
- - Autoloading and Plugin Loading:
-   http://framework.zend.com/wiki/display/ZFDEV2/Zend+Framework+2.0+Milestones#ZendFramework2.0Milestones-Milestone%3AAutoloading%26PluginLoading
- - Exceptions
-   http://framework.zend.com/wiki/display/ZFDEV2/Zend+Framework+2.0+Milestones#ZendFramework2.0Milestones-Milestone%3AExceptions
-
-Several components are still in progress, or were skipped due to planned
-rewrites later.
+ - EventManager component (Zend\EventManager)
+ - Initial prototype/development of a comprehensive Dependency Injection
+   component (Zend\Di)
 
 SYSTEM REQUIREMENTS
 -------------------

bin/classmap_generator.php

@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Loader
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -114,8 +114,8 @@
     echo "Creating class file map for library in '$path'..." . PHP_EOL;
 }
 
-// Get the ClassFileLocater, and pass it the library path
-$l = new \Zend\File\ClassFileLocater($path);
+// Get the ClassFileLocator, and pass it the library path
+$l = new \Zend\File\ClassFileLocator($path);
 
 // Iterate over each element in the path, and create a map of 
 // classname => filename, where the filename is relative to the library path
@@ -126,6 +126,9 @@
     $namespace = empty($file->namespace) ? '' : $file->namespace . '\\';
     $filename  = str_replace($strip, '', $file->getRealpath());
 
+    // Replace directory separators with constant
+    $filename  = str_replace(array('/', '\\'), "' . DIRECTORY_SEPARATOR . '", $filename);
+
     $map->{$namespace . $file->classname} = $filename;
 
     return true;
@@ -139,6 +142,9 @@
 // Prefix with __DIR__; modify the generated content
 $content = preg_replace('#(=> )#', '$1__DIR__ . DIRECTORY_SEPARATOR . ', $content);
 
+// Fix \' strings from injected DIRECTORY_SEPARATOR usage in iterator_apply op
+$content = str_replace("\\'", "'", $content);
+
 // Write the contents to disk
 file_put_contents($output, $content);
 

bin/zf.bat

@@ -12,7 +12,7 @@ REM obtain it through the world-wide-web, please send an email
 REM to [email protected] so we can send you a copy immediately.
 REM
 REM Zend
-REM Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+REM Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
 REM http://framework.zend.com/license/new-bsd     New BSD License