inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-24 17:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V2.1 to HEAD

Browse Source 
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
This commit is contained in:
Derek Hulley
2007-09-10 22:41:44 +00:00
parent 28d4278290
commit 1f3aabc6a0
17 changed files with 265 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/alfresco/extension/synchronous-avm-indexing-context.xml.sample → config/alfresco/extension/asynchronous-avm-indexing-context.xml.sample
View File

@@ -24,7 +24,7 @@
<!-- Entries are of the form [SYNCHRONOUS | ASYNCHRONOUS |UNINDEXED]:[TYPE | NAME]:regexp -->
<property name="indexingDefinitions">
<list>
<value>SYNCHRONOUS:TYPE:STAGING</value>
<value>ASYNCHRONOUS:TYPE:STAGING</value>
<value>UNINDEXED:TYPE:STAGING_PREVIEW</value>
<value>UNINDEXED:TYPE:AUTHOR</value>
<value>UNINDEXED:TYPE:AUTHOR_PREVIEW</value>

9
config/alfresco/mimetype/mimetype-map.xml
View File

@@ -306,6 +306,15 @@
<mimetype mimetype="message/rfc822" display="EMail">
<extension>msg</extension>
</mimetype>
<mimetype mimetype="application/vnd.openxmlformats-officedocument.wordprocessingml.document" display="Microsoft Word 2007">
<extension>docx</extension>
</mimetype>
<mimetype mimetype="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" display="Microsoft Excel 2007">
<extension>xlsx</extension>
</mimetype>
<mimetype mimetype="application/vnd.openxmlformats-officedocument.presentationml.presentation" display="Microsoft PowerPoint 2007">
<extension>pptx</extension>
</mimetype>
</mimetypes>
</config>

4
config/alfresco/public-services-context.xml
View File

@@ -572,7 +572,7 @@
<value>org.alfresco.service.cmr.security.AuthenticationService</value>
</property>
<property name="target">
<ref bean="authenticationServiceImpl"/>
<ref bean="authenticationService"/>
</property>
<property name="interceptorNames">
<list>
@@ -938,7 +938,7 @@
</property>
<property name="indexingDefinitions">
<list>
<value>ASYNCHRONOUS:TYPE:STAGING</value>
<value>SYNCHRONOUS:TYPE:STAGING</value>
<value>UNINDEXED:TYPE:STAGING_PREVIEW</value>
<value>UNINDEXED:TYPE:AUTHOR</value>
<value>UNINDEXED:TYPE:AUTHOR_PREVIEW</value>

2
config/alfresco/workflow/review_processdefinition.xml
View File

@@ -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">

4
config/alfresco/workflow/submit_processdefinition.xml
View File

@@ -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">