Merged V2.1 to HEAD

6455: OpenOffice transformer and extractor register regardless of the initial connection state.
   6456: Fix for WCM-636 (Clicking OK twice while deleting web project results in exception)
   6457: Updated installers and associated config
   6458: AR-1669 Add getQnamePath to Javascript
   6459: Fix for AWC-1456 - Word and Excel documents were being stored as octet streams rather than their correct mimetype
   6460: Reverse order of reject & approve transitions, so that approve appears first in list of ui actions.
   6461: Removed Process.exe (often detected as a virus) and updated config wizard.
   6462: Switch to synchronous indexing for AVM by default
   6463: Better support to query the state of AVM indexes
   6464: Added Office 2007 document mimetypes and icons
   6465: Added Office 2007 icons without the typo this time


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6736 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

config/alfresco/workflow/review_processdefinition.xml

@@ -24,8 +24,8 @@
                 </script>
             </event>
         </task>
-        <transition name="reject" to="rejected" />
         <transition name="approve" to="approved" />
+        <transition name="reject" to="rejected" />
     </task-node>
 
     <task-node name="rejected">

config/alfresco/workflow/submit_processdefinition.xml

@@ -100,7 +100,6 @@
            </event>           
         </task>
 
-        <transition name="reject" to="endreview" />
         <transition name="approve" to="submitserialreview">
            <script>
               <variable name="wcmwf_approveCnt" access="read, write"/>
@@ -109,6 +108,7 @@
               </expression>
            </script>
         </transition>
+        <transition name="reject" to="endreview" />
     </task-node>
 
 
@@ -136,7 +136,6 @@
               </script>
            </event>           
         </task>
-        <transition name="reject" to="joinparallelreview" />
         <transition name="approve" to="joinparallelreview">
             <script>
                 <variable name="wcmwf_approveCnt" access="read,write" />
@@ -145,6 +144,7 @@
                 </expression>
             </script>
         </transition>
+        <transition name="reject" to="joinparallelreview" />
     </task-node>
 
     <join name="joinparallelreview">