Merged V2.2 to HEAD (V2.1 sourced fixes)

7121: Merged V2.1 to V2.2
      7049: Fix for unreported duplicate component ID error (very rarely seen) in browse WCM sandbox JSP
      7058: Fixes failure to rollback correctly on failed alfresco->alfresco deployment.
      7074: Added filtering/access control checks to the AVM virtualization view.
      7083: Added transaction handling to calls involving preview store
      7084: xmlsec library update to 1.4.1
      7092: Missing config update from the AVM filtering checkin.
   7124: Merged V2.1 to V2.2
      7091: Fix to several issues found with Regenerate Renditions wizard and FormsService
   7125: Merged V2.1 to V2.2
      7093: Fixes to workaround some deployment issues being experienced by a customer.
      7094: Fix for previous build failure


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

config/alfresco/messages/patch-service.properties

@@ -182,3 +182,6 @@ patch.emailContributorGroup.description=Adds the 'GROUP_EMAIL_CONTRIBUTORS' grou
 
 patch.avmStoreAsIdentifier.description=Reindex wca:webfolder to make wca:avmstore an identifier
 patch.avmStoreAsIdentifier.result=Reindexed wca:webfolder to make wca:avmstore an identifier
+
+patch.avmFormPropertyIdentifier.description=Reindex wca:webform to make wca:formname an identifier
+patch.avmFormPropertyIdentifier.result=Reindexed wca:webform to make wca:formname an identifier

config/alfresco/model/wcmAppModel.xml

@@ -110,11 +110,11 @@
          <properties>
             <property name="wca:username">
                <type>d:text</type>
-               <mandatory>true</mandatory>
+               <mandatory enforced="true">true</mandatory>
             </property>
             <property name="wca:role">
                <type>d:text</type>
-               <mandatory>true</mandatory>
+               <mandatory enforced="true">true</mandatory>
             </property>
          </properties>
       </type>
@@ -125,7 +125,12 @@
          <properties>
             <property name="wca:formname">
                <type>d:text</type>
-               <mandatory>true</mandatory>
+               <mandatory enforced="true">true</mandatory>
+               <index enabled="true">
+                  <atomic>true</atomic>
+                  <stored>false</stored>
+                  <tokenised>false</tokenised>
+               </index>
             </property>
          </properties>
          <associations>
@@ -164,7 +169,7 @@
 			<properties>
             <property name="wca:baserenderingenginetemplatename">
                <type>d:text</type>
-               <mandatory>true</mandatory>
+               <mandatory enforced="true">true</mandatory>
             </property>
          </properties>
          <mandatory-aspects>
@@ -178,7 +183,7 @@
 			<properties>
             <property name="wca:workflowname">
                <type>d:text</type>
-               <mandatory>true</mandatory>
+               <mandatory enforced="true">true</mandatory>
             </property>
             <property name="wca:workflowdefaultproperties">
                <type>d:content</type>
@@ -203,7 +208,7 @@
             <property name="wca:mimetypeforrendition">
                <title>Mimetype for generated assets</title>
                <type>d:text</type>
-               <mandatory>true</mandatory>
+               <mandatory enforced="true">true</mandatory>
             </property>
          </properties>
          <mandatory-aspects>
@@ -223,22 +228,22 @@
             <property name="wca:deployserver">
                <title>Server Deployed To</title>
                <type>d:text</type>
-               <mandatory>true</mandatory>
+               <mandatory enforced="true">true</mandatory>
             </property>
             <property name="wca:deployversion">
                <title>Snapshot Version Deployed</title>
                <type>d:int</type>
-               <mandatory>true</mandatory>
+               <mandatory enforced="true">true</mandatory>
             </property>
             <property name="wca:deploystarttime">
                <title>Time Deploy Started</title>
                <type>d:datetime</type>
-               <mandatory>true</mandatory>
+               <mandatory enforced="true">true</mandatory>
             </property>
             <property name="wca:deployendtime">
                <title>Time Deploy Finished</title>
                <type>d:datetime</type>
-               <mandatory>true</mandatory>
+               <mandatory enforced="true">true</mandatory>
             </property>
             <property name="wca:deploysuccessful">
                <title>Deployment Successful</title>
@@ -284,12 +289,12 @@
             <property name="wca:xmlschemarootelementname">
                <title>Schema Root Element Name</title>
                <type>d:text</type>
-               <mandatory>true</mandatory>
+               <mandatory enforced="true">true</mandatory>
             </property>
             <property name="wca:xmlschema">
                <title>Schema</title>
                <type>d:noderef</type>
-               <mandatory>true</mandatory>
+               <mandatory enforced="true">true</mandatory>
             </property>
          </properties>
          <associations>
@@ -325,15 +330,15 @@
       <aspect name="wca:renderingenginetemplate">
          <title>A Rendering Engine</title>
          <properties>
-            <property name="wca:parentrendereringenginename">
+            <property name="wca:parentrenderingenginename">
                <title>Type</title>
                <type>d:text</type>
-               <mandatory>true</mandatory>
+               <mandatory enforced="true">true</mandatory>
             </property>
             <property name="wca:formsource">
                <title>Form Source</title>
                <type>d:noderef</type>
-               <mandatory>true</mandatory>
+               <mandatory enforced="true">true</mandatory>
             </property>
          </properties>
          <associations>
@@ -359,7 +364,7 @@
             <property name="wca:parentformname">
                <title>Form that generated this asset</title>
                <type>d:text</type>
-               <mandatory>true</mandatory>
+               <mandatory enforced="true">true</mandatory>
             </property>
             <property name="wca:originalparentpath">
               <title>The original parent path when this form instance data was created - used for regenerating accurately.</title>
@@ -381,17 +386,17 @@
             <property name="wca:parentrenderingenginetemplate">
                <title>Form data renderer that generated this asset</title>
                <type>d:noderef</type>
-               <mandatory>true</mandatory>
+               <mandatory enforced="true">true</mandatory>
             </property>
             <property name="wca:parentrenditionproperties">
                <title>Rendition properties used for this rendition</title>
                <type>d:noderef</type>
-               <mandatory>true</mandatory>
+               <mandatory enforced="true">true</mandatory>
             </property>
             <property name="wca:primaryforminstancedata">
                <title>Primary XML Asset used to generate this asset</title>
                <type>d:text</type>
-               <mandatory>true</mandatory>
+               <mandatory enforced="true">true</mandatory>
             </property>
          </properties>
       </aspect>
@@ -402,7 +407,7 @@
             <property name="wca:expirationDate">
                <title>Expiration Date</title>
                <type>d:datetime</type>
-               <mandatory>true</mandatory>
+               <mandatory enforced="true">true</mandatory>
             </property>
          </properties>
       </aspect>

config/alfresco/network-protocol-context.xml

@@ -94,6 +94,7 @@
 	  <property name="mimetypeService"><ref bean="mimetypeService" /></property>
 	  <property name="serviceRegistry"><ref bean="ServiceRegistry"/></property>
       <property name="stateReaper"><ref bean="fileStateReaper"/></property>
+      <property name="nodeService"><ref bean="NodeService" /></property>
 	   
 	  <property name="createStoreListener"><ref bean="createStoreTxnListener"/></property>
 	  <property name="purgeStoreListener"><ref bean="purgeStoreTxnListener"/></property>

config/alfresco/patch/patch-services-context.xml

@@ -1109,5 +1109,19 @@
             </list>
         </property>
     </bean>
+    
+    <bean id="patch.avmFormPropertyIdentifier" class="org.alfresco.repo.admin.patch.impl.AVMFormsPropertyTokenisationPatch" parent="basePatch" >
+        <property name="id"><value>patch.avmFormPropertyIdentifier</value></property>
+        <property name="description"><value>patch.avmFormPropertyIdentifier.description</value></property>
+        <property name="fixesFromSchema"><value>0</value></property>
+        <property name="fixesToSchema"><value>111</value></property>
+        <property name="targetSchema"><value>112</value></property>
+        <property name="spacesImporterBootstrap">
+            <ref bean="spacesBootstrap" />
+        </property>
+        <property name="indexerAndSearcher">
+            <ref bean="indexerAndSearcherFactory" />
+        </property>
+    </bean>
 
 </beans>

config/alfresco/version.properties

@@ -19,4 +19,4 @@ version.build=@build-number@
 
 # Schema number
 
-version.schema=111
+version.schema=112