Merged V2.1 to HEAD

6609: Portlet UI (doclist, myspaces, mytasks) updates following design review
   6610: AR-1270
   6611: debugging WCM-778.
   6612: Improved API documentation.
   6613: Added store lookup cache to EHCache config for default and extended cluster sample
   6614: AWC-1531 and AWC-1146. Link objects that have targets which the user does not have access to are now filtered from the view.
   6615: AR-1664: Bootstraping from full export fails if file names differs only with a space: my file, my file
   6616: Fixed AR-1519: Possible duplicate entries when moving nodes between stores
   6617: Removed deprecated aspects; Added emailed aspect to messages; Added OOo command line options
   6618: Fix for AWC-1350
   6619: Fix for AWC-1509
   6620: AWC-1179: Searching for users in Invite User Wizard is slow with large number of users
   6621: Changed shutdown logic to avoid classloader cleanup race.
   6622: Fix for AWC-1533 (can't save office docs to Company Home)
   6623: Fix for AR-1705
   6624: Better fix for AWC-1256 (links generated by tinyMCE editor)
   6625: Fixed AR-1713: Transformers that do nothing don't break full text indexing
   6626: Fixed AWC-1438: Added explcit TXT to PDF converter that wraps the PDFBox TextToPDF class
   6627: Portlet templates now handle missing description property on web form
   6628: Fix WCM-788
   6635: Make workflow available for users who cannot see company home
         Resolved conflicted state of 'root\projects\repository\source\java\org\alfresco\repo\workflow\jbpm\JBPMEngine.java'


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

config/alfresco/cache-context.xml

@@ -277,7 +277,7 @@
            <value>org.alfresco.repo.avm.lookupTransactionalCache</value>
        </property>
        <property name="maxCacheSize">
-           <value>50</value>
+           <value>100</value>
        </property>
    </bean>
    
@@ -313,7 +313,7 @@
            <value>org.alfresco.repo.avm.storeLookupTransactionalCache</value>
        </property>
        <property name="maxCacheSize">
-           <value>100</value>
+           <value>200</value>
        </property>
    </bean>
    

config/alfresco/content-services-context.xml

@@ -190,6 +190,19 @@
       </property>
    </bean>
 
+   <bean id="transformer.PdfBox.TextToPdf"
+         class="org.alfresco.repo.content.transform.TextToPdfContentTransformer"
+         parent="baseContentTransformer" >
+      <property name="explicitTransformations">
+         <list>
+            <bean class="org.alfresco.repo.content.transform.ContentTransformerRegistry$TransformationKey" >
+                <constructor-arg><value>text/plain</value></constructor-arg>
+                <constructor-arg><value>application/pdf</value></constructor-arg>
+            </bean>
+         </list>
+      </property>
+   </bean>
+
    <bean id="transformer.Poi"
          class="org.alfresco.repo.content.transform.PoiHssfContentTransformer"
          parent="baseContentTransformer" />

config/alfresco/ehcache-default.xml

@@ -258,7 +258,13 @@
     <!-- Internally used caches -->
     <cache 
         name="org.alfresco.repo.avm.lookupSharedCache"
-        maxElementsInMemory="10000"
+        maxElementsInMemory="50"
+        eternal="true"
+        overflowToDisk="false"
+        />
+    <cache 
+        name="org.alfresco.repo.avm.storeLookupSharedCache"
+        maxElementsInMemory="100"
         eternal="true"
         overflowToDisk="false"
         />

config/alfresco/extension/ehcache-custom.xml.sample.cluster

@@ -376,7 +376,22 @@
     
     <cache 
         name="org.alfresco.repo.avm.lookupSharedCache"
-        maxElementsInMemory="10000"
+        maxElementsInMemory="50"
+        eternal="true"
+        overflowToDisk="false">
+
+            <cacheEventListenerFactory
+                    class="net.sf.ehcache.distribution.RMICacheReplicatorFactory"
+                    properties="replicatePuts = false,
+                                replicateUpdates = true,
+                                replicateRemovals = true,
+                                replicateUpdatesViaCopy = false,
+                                replicateAsynchronously = false"/>
+    </cache>
+
+    <cache 
+        name="org.alfresco.repo.avm.storeLookupSharedCache"
+        maxElementsInMemory="100"
         eternal="true"
         overflowToDisk="false">
 

config/alfresco/messages/content-model.properties

@@ -215,3 +215,16 @@ cm_contentmodel.property.cm_categories.description=Categories
 cm_contentmodel.aspect.cm_attachable.title=Attachable
 cm_contentmodel.aspect.cm_attachable.description=Allows other repository objects to be attached
 
+cm_contentmodel.aspect.cm_emailed.title=Emailed
+cm_contentmodel.aspect.cm_emailed.description=Emailed
+cm_contentmodel.property.cm_originator.title=Originator
+cm_contentmodel.property.cm_originator.description=Originator
+cm_contentmodel.property.cm_addressee.title=Addressee
+cm_contentmodel.property.cm_addressee.description=Addressee
+cm_contentmodel.property.cm_addressees.title=Addressees
+cm_contentmodel.property.cm_addressees.description=Addressees
+cm_contentmodel.property.cm_subjectline.title=Subject
+cm_contentmodel.property.cm_subjectline.description=Subject
+cm_contentmodel.property.cm_sentdate.title=Sent Date
+cm_contentmodel.property.cm_sentdate.description=Sent Date
+

config/alfresco/node-services-context.xml

@@ -36,7 +36,7 @@
       </property>
       <property name="interceptorNames">
          <list>
-			<value>nodeRefPropertyInterceptor</value>
+            <value>nodeRefPropertyInterceptor</value>
             <value>mlPropertyInterceptor</value>
          </list>
       </property>

config/alfresco/workflow-context.xml

@@ -100,6 +100,7 @@
       <property name="serviceRegistry" ref="ServiceRegistry"/>
       <property name="companyHomeStore"><value>${spaces.store}</value></property>
       <property name="companyHomePath"><value>/${spaces.company_home.childname}</value></property>
+	  <property name="unprotectedSearchService" ref="searchService"/>
    </bean>
 
    <!-- Workflow Patch Deployer -->