Revert "Merge branch 'livedocx-2.0' of http://github.com/jonathanmaro…

…n/zf2 into merges/jonathanmaron-livedocx"

This reverts commit 2396268, reversing
changes made to 3addea5.

.gitignore

@@ -1,3 +1,2 @@
 nbproject
-demos/Zend/Service/LiveDocx/DemoConfiguration.php
 

INSTALL.txt

@@ -1,68 +1,72 @@
 INSTALLATION
 ------------
 
-Zend Framework requires no special installation steps. Simply download the framework,
-extract it to the folder you would like to keep it in, and add the library directory
-to your PHP include_path. To use components in the extras library, add the extras/library
-directory to your PHP include_path, as well.
-If you would like to use Zend_Tool, simply add bin/zf.bat (for Windows) or
-bin/zf.sh (for anything else) to your system executable path.
+Zend Framework requires no special installation steps. Simply download
+the framework, extract it to the folder you would like to keep it in,
+and add the library directory to your PHP include_path. To use
+components in the extras library, add the extras/library directory to
+your PHP include_path as well.
+
+If you would like to use Zend_Tool, simply add "bin/zf.bat" (for Windows)
+or "bin/zf.sh" (for anything else) to your system executable path.
 
 SYSTEM REQUIREMENTS
 -------------------
 
-Zend Framework requires PHP 5.2.4 or later. Please see the system requirements
-appendix for more detailed information:
+Zend Framework 2 requires PHP 5.3.1 or later.
 
-http://framework.zend.com/manual/en/requirements.html
 
 DEVELOPMENT VERSIONS
 --------------------
 
-If you would like to preview enhancements or bug fixes that have not yet been
-released, you can obtain the current development version of Zend Framework using one
-of the following methods:
+If you would like to preview enhancements or bug fixes that have not yet
+been released, you can obtain the current development version of Zend
+Framework using one of the following methods:
 
-* Using a Git client. Zend Framework is open source software, and the Git
-  repository used for its development is publicly available. Consider using Git
-  to get Zend Framework if you already use Git for your application development,
-  want to contribute back to the framework, or need to upgrade your framework
-  version very often.
+* Using a Git client. Zend Framework is open source software, and the
+  Git repository used for its development is publicly available.
+  Consider using Git to get Zend Framework if you already use Git for
+  your application development, want to contribute back to the
+  framework, or need to upgrade your framework version very often.
 
-  Checking out a working copy is necessary if you would like to directly contribute
-  to Zend Framework; a working copy can be updated any time using git pull.
+  Checking out a working copy is necessary if you would like to directly
+  contribute to Zend Framework; a working copy can be updated any time
+  using git pull.
 
   To clone the git repository, use the following URL:
 
-  git://git.zendframework.com/zf.git
+    git://git.zendframework.com/zf.git
 
   For more information about Git, please see the official website:
 
-  http://www.git-scm.org
+    http://www.git-scm.org
 
 CONFIGURING THE INCLUDE PATH
 ----------------------------
 
-Once you have a copy of Zend Framework available, your application will need to
-access the framework classes. Though there are several ways to achieve this, your
-PHP include_path needs to contain the path to the Zend Framework classes under the
-/library directory in this distribution. You can find out more about the PHP
-include_path configuration directive here:
+Once you have a copy of Zend Framework available, your application will
+need to access the framework classes. Though there are several ways to
+achieve this, your PHP include_path needs to contain the path to the
+Zend Framework classes under the /library directory in this
+distribution. You can find out more about the PHP include_path
+configuration directive here:
 
-http://www.php.net/manual/en/ini.core.php#ini.include-path
+    http://www.php.net/manual/en/ini.core.php#ini.include-path
 
-Instructions on how to change PHP configuration directives can be found here:
+Instructions on how to change PHP configuration directives can be found
+here:
 
-http://www.php.net/manual/en/configuration.changes.php
+    http://www.php.net/manual/en/configuration.changes.php
 
 GETTING STARTED
 ---------------
 
-A great place to get up-to-speed quickly is the Zend Framework QuickStart:
+A great place to get up-to-speed quickly is the Zend Framework
+QuickStart:
 
-http://framework.zend.com/manual/en/learning.quickstart.html
+    http://framework.zend.com/manual/en/learning.quickstart.html
 
-The QuickStart covers some of the most commonly used components of ZF. Since
-Zend Framework is designed with a use-at-will architecture and components are
-loosely coupled, you can select and use only those components that are needed for
-your project.
+The QuickStart covers some of the most commonly used components of ZF.
+Since Zend Framework is designed with a use-at-will architecture and
+components are loosely coupled, you can select and use only those
+components that are needed for your project.

README-DEV.txt

@@ -55,6 +55,11 @@ To run tests:
 
    % phpunit --group Zend_Application
 
+   This will likely lead to errors, so it's usually best to specify a
+   specific component in which to run test:
+
+   % phpunit --group ZF-XYZ Zend/Application
+
 You can turn on conditional tests with the TestConfiguration.php file.
 To do so:
 

README.txt

@@ -30,6 +30,13 @@ INSTALLATION
 
 Please see INSTALL.txt.
 
+CONTRIBUTING
+------------
+
+If you wish to contribute to Zend Framework 2.0, please make sure you have
+signed a CLA (http://framework.zend.com/cla), and please read both the
+README-DEV.txt and README-GIT.txt file.
+
 QUESTIONS AND FEEDBACK
 ----------------------
 

demos/Zend/Service/LiveDocx/MailMerge/supported-formats/show-supported-formats-cached.php

@@ -47,7 +47,7 @@
 
     $formats->template = $mailMerge->getTemplateFormats();
     $formats->document = $mailMerge->getDocumentFormats();
-    $formats->image    = $mailMerge->getImageExportFormats();
+    $formats->image    = $mailMerge->getImageFormats();
 
     $cache->save($formats, $cacheId);
 

demos/Zend/Service/LiveDocx/MailMerge/supported-formats/show-supported-formats.php

@@ -26,7 +26,7 @@
     Helper::arrayDecorator($mailMerge->getDocumentFormats()), PHP_EOL);
 
 printf("Supported IMAGE file formats (output)    : %s%s",
-    Helper::arrayDecorator($mailMerge->getImageExportFormats()), PHP_EOL);
+    Helper::arrayDecorator($mailMerge->getImageFormats()), PHP_EOL);
 
 print PHP_EOL;
 

demos/Zend/Service/LiveDocx/check-environment.php

@@ -227,7 +227,7 @@
 
 try {
     $microtime = microtime(true);
-    $mailMerge = new MailMerge(
+    $mailMerge = new Zend_Service_LiveDocx_MailMerge(
         array (
             'username' => DEMOS_ZEND_SERVICE_LIVEDOCX_USERNAME,
             'password' => DEMOS_ZEND_SERVICE_LIVEDOCX_PASSWORD