Merged V4.0-BUG-FIX to HEAD

33858: Fix for ALF-12674 CMIS LOWER fails with SOLR
   - also fixed ranges 
   - UPPER/LOWER only matches upper/lower case - they were doing a generic match
   33859: GERMAN: L10N updates based on EN rev 33523. Fixes:
      - ALF-12510, ALF-12498, ALF-12496
      - ALF-12495, ALF-12483, ALF-12477 
      - ALF-12472, ALF-12471, ALF-12470
   33860: FRENCH: L10N updates based on EN rev 33523. Fixes:
      - ALF-12510, ALF-12498, ALF-12496
      - ALF-12495, ALF-12483, ALF-12477 
      - ALF-12472, ALF-12471, ALF-12470
   33861: JAPANESE: L10N updates based on EN rev 33523. Fixes:
      - ALF-12510, ALF-12498, ALF-12496
      - ALF-12495, ALF-12483, ALF-12477 
      - ALF-12472, ALF-12471, ALF-12470
   33862: DUTCH: L10N updates based on EN rev 33523. Fixes:
      - ALF-12510, ALF-12498, ALF-12496
      - ALF-12495, ALF-12483, ALF-12477 
      - ALF-12472, ALF-12471, ALF-12470
   33892: ALF-11746 Tweak mimetype description sorting to be explicitly by description, case insensitive
   33897: Fix for ALF-12789 XAM clean JOB fails with SOLR search
   - HTTPClient as used by SOLR now includes connection stale check
   33902: Changed FileInfo to use flags value for pseudo file and delete on close, so values are copied by copyFrom().
   33904: Fixes: ALF-12794; Unescaped content error in delete event dialogue.
   33910: ALF-12701: Ensure that all action labels are encoded to prevent XSS attacks
   33913: Strip oplock request bits for pseudo files in the NTCreateAndX CIFS processing, so oplocks never granted to pseudo files.
   33920: A better fix for ALF-12794.
   33929: Merged V3.4-BUG-FIX to V4.0-BUG-FIX
      33871: ALF-12557: WCM - Webform file picker path doesn't take account of the current Webapp
      - Fix by Pavel
      33901: ALF-12815: Not possible to set versionType property when adding the aspect through nodeService.addAspect
      33909: Fix for NFS 'node does not exist' error when editing using vi. ALF-12712.
      33911: Merged V3.4 to V3.4-BUG-FIX
         33867: ALF-9899: Site creation time was still increasing linearly due to avm_child_entries queries not being able to use an index
         - Added new lc_name column - lower case version of the name which can be included in the primary key and queries
         - Added DB upgrade scripts
         33870: ALF-9899: Fixed indexing performance regression (e.g. during creation of 60,000 sites)
         - Apply more scoped cache invalidation for properties and aspects of a node in the current transaction, in line with parent associations
         - E.g. if I am querying aspects on a node already given a new parent association in the current transaction, there is no need to invalidate the parent assocs again when I find the aspects out of date!
         - This plus previous checkin means create site through Share UI back to 1 second (rather than 1 minute) with 30,000 sites
      33914: Merged V3.4 to V3.4-BUG-FIX
         33872: Merged V3.4-BUG-FIX to V3.4
            33843: Fix for ALF-12775
         33895: ALF-12816: Merged V4.0-BUG-FIX to 3.4
            33357: When installing a module the tool reads the war's version.properties file and will not install if the war version is outside the repoVersionMin or repoVersionMax
         33900: MMT fix: When the war has no version.properties file  (e.g. share) it does not error.
            Added a test case and empty.war
      33915: Merged V3.4 to V3.4-BUG-FIX (RECORD ONLY)
         33462: Merged V3.4-BUG-FIX to V3.4 (3.4.8)
         33896: ALF-9899: Reversed revisions 33867 and 33870 and rescheduled for 3.4 HF


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

config/alfresco/bootstrap-context.xml

@@ -156,6 +156,7 @@
              <ref bean="patch.db-V3.4-JBPM-FK-indexes" />
              <ref bean="patch.db-V3.4-Upgrade-JBPM" />
              <ref bean="patch.db-V3.4-alter-jBPM331-CLOB-columns-to-nvarchar" />
+             <ref bean="patch.db-V3.4-AVM-index-child-entries-lower" />
              <ref bean="patch.db-V4.0-AclChangeSet" />
              <ref bean="patch.db-V4.0-NodeAssoc-Ordering" />
              <ref bean="patch.db-V4.0-Node-Locale" />

config/alfresco/dbscripts/create/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoCreate-AvmTables.sql

@@ -15,9 +15,10 @@
 
     create table avm_child_entries (
         parent_id bigint not null,
+        lc_name varchar(160) not null,
         name varchar(160) not null,
         child_id bigint not null,
-        primary key (parent_id, name)
+        primary key (parent_id, lc_name)
     ) ENGINE=InnoDB;
 
     create table avm_history_links (
@@ -234,6 +235,7 @@ CREATE INDEX idx_avm_hl_revpk ON avm_history_links (descendent, ancestor);
 
 CREATE INDEX idx_avm_vr_revuq ON avm_version_roots (avm_store_id, version_id);
 
+CREATE INDEX idx_avm_ce_lc_name ON avm_child_entries (lc_name, parent_id);
 
 --
 -- Record script finish

config/alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect/AlfrescoCreate-AvmTables.sql

@@ -15,9 +15,10 @@
 
     create table avm_child_entries (
         parent_id INT8 not null,
+        lc_name varchar(160) not null,
         name varchar(160) not null,
         child_id INT8 not null,
-        primary key (parent_id, name)
+        primary key (parent_id, lc_name)
     );
 
     create table avm_history_links (
@@ -238,6 +239,7 @@ CREATE INDEX idx_avm_hl_revpk ON avm_history_links (descendent, ancestor);
 
 CREATE INDEX idx_avm_vr_revuq ON avm_version_roots (avm_store_id, version_id);
 
+CREATE INDEX idx_avm_ce_lc_name ON avm_child_entries (lc_name, parent_id);
 
 --
 -- Record script finish

config/alfresco/dbscripts/upgrade/3.4/org.hibernate.dialect.MySQLInnoDBDialect/AVM-index-child-entries-lower.sql

@@ -0,0 +1,50 @@
+--
+-- Title:      Upgrade to V3.4 - AVM rename duplicates (if any)
+-- Database:   MySQL
+-- Since:      V3.4 schema 4209
+-- Author:     dward
+--
+-- Please contact support@alfresco.com if you need assistance with the upgrade.
+--
+create table t_avm_child_entries (
+    parent_id bigint not null,
+    lc_name varchar(160) not null,
+    name varchar(160) not null,
+    child_id bigint not null,
+    primary key (parent_id, lc_name)
+) ENGINE=InnoDB;
+
+--FOREACH avm_child_entries.child_id system.upgrade.t_avm_child_entries.batchsize
+INSERT INTO t_avm_child_entries (parent_id, lc_name, name, child_id)
+SELECT parent_id, LOWER(name), name, child_id
+FROM avm_child_entries
+WHERE child_id >= ${LOWERBOUND} AND child_id <= ${UPPERBOUND};
+
+DROP TABLE avm_child_entries;
+ALTER TABLE t_avm_child_entries RENAME TO avm_child_entries;
+
+alter table avm_child_entries
+    add index fk_avm_ce_child (child_id),
+    add constraint fk_avm_ce_child
+    foreign key (child_id)
+    references avm_nodes (id);
+
+alter table avm_child_entries
+    add index fk_avm_ce_parent (parent_id),
+    add constraint fk_avm_ce_parent
+    foreign key (parent_id)
+    references avm_nodes (id);
+
+CREATE INDEX idx_avm_ce_lc_name ON avm_child_entries (lc_name, parent_id);
+
+--
+-- Record script finish
+--
+DELETE FROM alf_applied_patch WHERE id = 'patch.db-V3.4-AVM-index-child-entries-lower';
+INSERT INTO alf_applied_patch
+  (id, description, fixes_from_schema, fixes_to_schema, applied_to_schema, target_schema, applied_on_date, applied_to_server, was_executed, succeeded, report)
+  VALUES
+  (
+    'patch.db-V3.4-AVM-index-child-entries-lower', 'Manually executed script upgrade V3.4',
+     0, 6002, -1, 6003, null, 'UNKNOWN', ${TRUE}, ${TRUE}, 'Script completed'
+   );

config/alfresco/dbscripts/upgrade/3.4/org.hibernate.dialect.PostgreSQLDialect/AVM-index-child-entries-lower.sql

@@ -0,0 +1,51 @@
+--
+-- Title:      Upgrade to V3.4 - AVM rename duplicates (if any)
+-- Database:   PostgreSQL
+-- Since:      V3.4 schema 4209
+-- Author:     dward
+--
+-- Please contact support@alfresco.com if you need assistance with the upgrade.
+--
+
+create table t_avm_child_entries (
+    parent_id INT8 not null,
+    lc_name varchar(160) not null,
+    name varchar(160) not null,
+    child_id INT8 not null,
+    primary key (parent_id, lc_name)
+);
+
+--FOREACH avm_child_entries.child_id system.upgrade.t_avm_child_entries.batchsize
+INSERT INTO t_avm_child_entries (parent_id, lc_name, name, child_id)
+SELECT parent_id, LOWER(name), name, child_id
+FROM avm_child_entries
+WHERE child_id >= ${LOWERBOUND} AND child_id <= ${UPPERBOUND};
+
+DROP TABLE avm_child_entries;
+ALTER TABLE t_avm_child_entries RENAME TO avm_child_entries;
+
+alter table avm_child_entries        
+    add constraint fk_avm_ce_child
+    foreign key (child_id)
+    references avm_nodes (id);
+create index fk_avm_ce_child on avm_child_entries(child_id);
+
+alter table avm_child_entries        
+    add constraint fk_avm_ce_parent
+    foreign key (parent_id)
+    references avm_nodes (id);
+create index fk_avm_ce_parent on avm_child_entries(parent_id);
+
+CREATE INDEX idx_avm_ce_lc_name ON avm_child_entries (lc_name, parent_id);
+
+--
+-- Record script finish
+--
+DELETE FROM alf_applied_patch WHERE id = 'patch.db-V3.4-AVM-index-child-entries-lower';
+INSERT INTO alf_applied_patch
+  (id, description, fixes_from_schema, fixes_to_schema, applied_to_schema, target_schema, applied_on_date, applied_to_server, was_executed, succeeded, report)
+  VALUES
+  (
+    'patch.db-V3.4-AVM-index-child-entries-lower', 'Manually executed script upgrade V3.4',
+     0, 6002, -1, 6003, null, 'UNKNOWN', ${TRUE}, ${TRUE}, 'Script completed'
+   );

config/alfresco/ibatis/org.hibernate.dialect.Dialect/avm-common-SqlMap.xml

@@ -264,8 +264,8 @@
     </insert>
     
     <insert id="insert_AVMChildEntry">
-        insert into avm_child_entries (parent_id, name, child_id)
+        insert into avm_child_entries (parent_id, lc_name, name, child_id)
-        values (#{parentNodeId}, #{name}, #{childNodeId})
+        values (#{parentNodeId}, #{lowerName}, #{name}, #{childNodeId})
     </insert>
     
     <insert id="insert_AVMHistoryLink">
@@ -931,18 +931,7 @@
             avm_child_entries
         where
             parent_id = #{parentNodeId} and
-            name = #{name} and
+            lc_name = #{lowerName} and
-            child_id = #{childNodeId}
-    </select>
-    
-    <select id="select_AVMChildEntryL" parameterType="AVMChildEntry" resultMap="result_AVMChildEntry">
-        select
-            *
-        from
-            avm_child_entries
-        where
-            parent_id = #{parentNodeId} and
-            lower(name) = lower(#{name}) and
             child_id = #{childNodeId}
     </select>
     
@@ -964,19 +953,9 @@
             avm_child_entries
         where
             parent_id = ? and
-            name like ? <include refid="alfresco.util.escape"/>
+            lc_name like ? <include refid="alfresco.util.escape"/>
     </select>
-    
+        
-    <select id="select_AVMNodeChildEntriesByParentAndNamePatternL" parameterMap="parameter_IdPatternMap" resultMap="result_AVMChildEntry">
-        select
-            *
-        from
-            avm_child_entries
-        where
-            parent_id = ? and
-            lower(name) like lower(?) <include refid="alfresco.util.escape"/>
-    </select>
-    
     <!-- Get AVMNodeChildEntries by child node ID -->
     <select id="select_AVMNodeChildEntriesByChild" parameterMap="parameter_IdMap" resultMap="result_AVMChildEntry">
         select
@@ -995,17 +974,7 @@
             avm_child_entries
         where
             parent_id = #{parentNodeId} and
-            name = #{name}
+            lc_name = #{lowerName}
-    </select>
-    
-    <select id="select_AVMChildEntryByParentAndNameL" parameterType="AVMChildEntry" resultMap="result_AVMChildEntry">
-        select
-            *
-        from
-            avm_child_entries
-        where
-            parent_id = #{parentNodeId} and
-            lower(name) = lower(#{name})
     </select>
     
     <!-- Get AVMChildEntry by parent node ID and child node ID -->
@@ -1019,29 +988,6 @@
             child_id = #{childNodeId}
     </select>
     
-    <!-- Remove AVMChildEntry -->
-    <!-- unused
-    <delete id="delete_AVMChildEntry" parameterType="AVMChildEntry">
-        delete
-        from
-            avm_child_entries
-        where
-            parent_id = #{parentNodeId} and
-            name = #{name} and
-            child_id = #{childNodeId#
-    </delete>
-    
-    <delete id="delete_AVMChildEntryL" parameterType="AVMChildEntry">
-        delete
-        from
-            avm_child_entries
-        where
-            parent_id = #{parentNodeId} and
-            lower(name) = lower(#{name}) and
-            child_id = #{childNodeId#
-    </delete>
-    -->
-
     <!-- Update child entry name (currently used for specific rename 'case' only) -->
     <update id="update_AVMChildEntry" parameterType="AVMChildEntry">
         update
@@ -1060,16 +1006,7 @@
             avm_child_entries
         where
             parent_id = #{parentNodeId} and
-            name = #{name}
+            lc_name = #{lowerName}
-    </delete>
-    
-    <delete id="delete_AVMChildEntryByParentAndNameL" parameterType="AVMChildEntry">
-        delete
-        from
-            avm_child_entries
-        where
-            parent_id = #{parentNodeId} and
-            lower(name) = lower(#{name})
     </delete>
     
     <!-- Remove AVMChildEntry by parent node ID and child node ID -->

config/alfresco/messages/action-config_de.properties

@@ -176,6 +176,10 @@ start-workflow.workflowName.display-label=Name des Arbeitsablaufs
 start-workflow.endStartTask.display-label=Aufgabe
 start-workflow.startTaskTransition.display-label=\u00dcbergang
 
+cancel-workflow.title=Workflows abbrechen
+cancel-workflow.description=Bricht mehrere Workflows ab.
+cancel-workflow.workflow-id-list.display-label=Liste aller Workflow IDs
+
 #WCM Actions
 
 simple-avm-submit.title=Einfaches direktes Vorlegen

config/alfresco/messages/action-config_fr.properties

@@ -176,6 +176,10 @@ start-workflow.workflowName.display-label=Nom du workflow
 start-workflow.endStartTask.display-label=T\u00e2che
 start-workflow.startTaskTransition.display-label=Transition
 
+cancel-workflow.title=Annuler des workflows
+cancel-workflow.description=Annule une liste de workflows selon leur ID.
+cancel-workflow.workflow-id-list.display-label=Liste des IDs de workflow
+
 #WCM Actions
 
 simple-avm-submit.title=Publication directe simple

config/alfresco/messages/action-config_ja.properties

@@ -9,7 +9,7 @@ ac-compare-operations.less_than=\u3088\u308a\u5c0f\u3055\u3044
 ac-compare-operations.less_than_equal=\u4ee5\u4e0b
 
 ac-content-properties.mime_type=MIME\u30bf\u30a4\u30d7
-ac-content-properties.encoding=\u30b3\u30fc\u30c7\u30a3\u30f3\u30b0
+ac-content-properties.encoding=\u30a8\u30f3\u30b3\u30fc\u30c7\u30a3\u30f3\u30b0
 ac-content-properties.size=\u30b5\u30a4\u30ba
 
 # Action conditions
@@ -142,7 +142,7 @@ set-property-value.value.display-label=\u5024
 
 import.title=\u30a4\u30f3\u30dd\u30fc\u30c8
 import.description=Alfresco\u306e\u30b3\u30f3\u30c6\u30f3\u30c4\u30d1\u30c3\u30b1\u30fc\u30b8\u304c\u30ea\u30dd\u30b8\u30c8\u30ea\u306b\u30a4\u30f3\u30dd\u30fc\u30c8\u3055\u308c\u307e\u3059\u3002
-import.encoding.display-label=\u30b3\u30fc\u30c7\u30a3\u30f3\u30b0
+import.encoding.display-label=\u30a8\u30f3\u30b3\u30fc\u30c7\u30a3\u30f3\u30b0
 import.destination.display-label=\u5b9b\u5148
 
 extract-metadata.title=\u5171\u901a\u306e\u30e1\u30bf\u30c7\u30fc\u30bf\u30d5\u30a3\u30fc\u30eb\u30c9\u3092\u62bd\u51fa\u3059\u308b 
@@ -176,6 +176,10 @@ start-workflow.workflowName.display-label=\u30ef\u30fc\u30af\u30d5\u30ed\u30fc\u
 start-workflow.endStartTask.display-label=\u30bf\u30b9\u30af
 start-workflow.startTaskTransition.display-label=\u79fb\u884c
 
+cancel-workflow.title=\u30ef\u30fc\u30af\u30d5\u30ed\u30fc\u306e\u30ad\u30e3\u30f3\u30bb\u30eb
+cancel-workflow.description=\u30ef\u30fc\u30af\u30d5\u30ed\u30fcID\u30ea\u30b9\u30c8\u306b\u3042\u308b\u30ef\u30fc\u30af\u30d5\u30ed\u30fc\u3092\u30ad\u30e3\u30f3\u30bb\u30eb\u3057\u307e\u3059\u3002
+cancel-workflow.workflow-id-list.display-label=\u30ef\u30fc\u30af\u30d5\u30ed\u30fcID\u30ea\u30b9\u30c8
+
 # WCM Actions
 
 simple-avm-submit.title=\u7c21\u6613\u76f4\u63a5\u9001\u4fe1

config/alfresco/messages/action-config_nl.properties

@@ -176,6 +176,10 @@ start-workflow.workflowName.display-label=Naam van werkstroom
 start-workflow.endStartTask.display-label=Taak
 start-workflow.startTaskTransition.display-label=Overgang
 
+cancel-workflow.title=Werkstromen annuleren
+cancel-workflow.description=Hiermee wordt een lijst van werkstroom-id's geannuleerd.
+cancel-workflow.workflow-id-list.display-label=Lijst van werkstroom-id's
+
 # WCM Actions
 
 simple-avm-submit.title=Eenvoudig direct verzenden

config/alfresco/messages/bootstrap-spaces_fr.properties

@@ -159,8 +159,5 @@ spaces.inbound_transfer_records.description=Dossier contenant des enregistrement
 spaces.templates.email.workflowNotification.name=Notification de workflow
 spaces.templates.email.workflowNotification.description=Mod\u00e8les d'e-mail de notification de workflow
 
-spaces.templates.email.workflowNotification.name=Workflow Notification
-spaces.templates.email.workflowNotification.description=Workflow notification email templates
-
 spaces.nodeTemplatesSpace.name=Mod\u00e8les des noeuds
 spaces.nodeTemplatesSpace.description=Mod\u00e8les des noeuds pour Share - Cr\u00e9er un nouveau document

config/alfresco/messages/bpm-messages_de.properties

@@ -57,9 +57,8 @@ bpm_businessprocessmodel.aspect.bpm_workflowPackage.description=Inhalte, die dur
 bpm_businessprocessmodel.type.bpm_activitiStartTask.title=Startaufgabe des Workflows
 bpm_businessprocessmodel.type.bpm_activitiStartTask.description=Aufgabe, die alle Informationen abfragt, die f\u00fcr den Start des Worklfows notwendig sind
 
-#Workflow Start Task
 bpm_businessprocessmodel.type.bpm_startTask.title=Startaufgabe des Workflows
-bpm_businessprocessmodel.type.bpm_startTask.description=Aufgabe, die zur Sammlung der Informationen verwendet wird, die f\u00fcr die Initialisierung eines Workflows erforderlich sind
+bpm_businessprocessmodel.type.bpm_startTask.description=Aufgabe, die alle Informationen abfragt, die f\u00fcr den Start des Worklfows notwendig sind
 bpm_businessprocessmodel.property.bpm_workflowDescription.title=Beschreibung
 bpm_businessprocessmodel.property.bpm_workflowDescription.description=Beschreibung
 bpm_businessprocessmodel.property.bpm_workflowDueDate.title=F\u00e4lligkeitsdatum des Workflows

config/alfresco/messages/bpm-messages_ja.properties

@@ -57,7 +57,6 @@ bpm_businessprocessmodel.aspect.bpm_workflowPackage.description=\u30ef\u30fc\u30
 bpm_businessprocessmodel.type.bpm_activitiStartTask.title=\u30ef\u30fc\u30af\u30d5\u30ed\u30fc\u958b\u59cb\u30bf\u30b9\u30af
 bpm_businessprocessmodel.type.bpm_activitiStartTask.description=\u30ef\u30fc\u30af\u30d5\u30ed\u30fc\u306e\u958b\u59cb\u306b\u5fc5\u8981\u306a\u60c5\u5831\u3092\u53ce\u96c6\u3059\u308b\u30bf\u30b9\u30af
 
-# Workflow Start Task
 bpm_businessprocessmodel.type.bpm_startTask.title=\u30ef\u30fc\u30af\u30d5\u30ed\u30fc\u958b\u59cb\u30bf\u30b9\u30af
 bpm_businessprocessmodel.type.bpm_startTask.description=\u30ef\u30fc\u30af\u30d5\u30ed\u30fc\u306e\u958b\u59cb\u306b\u5fc5\u8981\u306a\u60c5\u5831\u3092\u53ce\u96c6\u3059\u308b\u30bf\u30b9\u30af
 bpm_businessprocessmodel.property.bpm_workflowDescription.title=\u8aac\u660e

config/alfresco/messages/categories_de.properties

@@ -0,0 +1,6 @@
+message.changeCategoryName.success=Kategoriename erfolgreich ge\u00e4ndert
+message.changeCategoryName.solr.success=Kategorieaktualisierung wurde zum \u00c4ndern erfolgreich in die SOLR-Warteschlange gestellt. Beachten Sie, dass die Aktualisierung einige Zeit in Anspruch nehmen kann. Sie m\u00fcssen aktualisieren, um die vorgenommene \u00c4nderung zu sehen.
+message.addCategory.success=Kategorie erfolgreich hinzugef\u00fcgt
+message.addCategory.solr.success=Neue Kategorie wurde zum Hinzuf\u00fcgen erfolgreich in die SOLR-Warteschlange gestellt. Beachten Sie, dass das Hinzuf\u00fcgen einige Zeit in Anspruch nehmen kann. Sie m\u00fcssen aktualisieren, um die vorgenommene \u00c4nderung zu sehen.
+message.removeCategory.success=Kategorie erfolgreich entfernt
+message.removeCategory.solr.success=Kategoriel\u00f6schung wurde zum Entfernen erfolgreich in die SOLR-Warteschlange gestellt. Beachten Sie, dass das L\u00f6schen einige Zeit in Anspruch nehmen kann. Sie m\u00fcssen aktualisieren, um die vorgenommene \u00c4nderung zu sehen.

config/alfresco/messages/categories_fr.properties

@@ -0,0 +1,6 @@
+message.changeCategoryName.success=Nom de la cat\u00e9gorie modifi\u00e9 avec succ\u00e8s
+message.changeCategoryName.solr.success=Mise \u00e0 jour de la cat\u00e9gorie mise dans la file d'attente SOLR pour modification. Veuillez noter que la mise \u00e0 jour peut prendre quelques minutes ; vous devrez rafra\u00eechir pour afficher la modification une fois actionn\u00e9e
+message.addCategory.success=Cat\u00e9gorie ajout\u00e9e avec succ\u00e8s
+message.addCategory.solr.success=Nouvelle cat\u00e9gorie mise dans la file d'attente SOLR pour ajout. Veuillez noter que l'ajout peut prendre quelques minutes ; vous devrez rafra\u00eechir pour afficher la modification une fois actionn\u00e9e
+message.removeCategory.success=Cat\u00e9gorie supprim\u00e9e avec succ\u00e8s
+message.removeCategory.solr.success=Suppression de la cat\u00e9gorie mise dans la file d'attente SOLR pour suppression. Veuillez noter que la suppression peut prendre quelques minutes ; vous devrez rafra\u00eechir pour afficher la modification une fois actionn\u00e9e

config/alfresco/messages/categories_ja.properties

@@ -0,0 +1,6 @@
+message.changeCategoryName.success=\u30ab\u30c6\u30b4\u30ea\u306e\u540d\u524d\u304c\u5909\u66f4\u3055\u308c\u307e\u3057\u305f\u3002
+message.changeCategoryName.solr.success=\u30ab\u30c6\u30b4\u30ea\u306e\u66f4\u65b0\u304cSOLR\u306e\u5909\u66f4\u30ad\u30e5\u30fc\u306b\u5165\u308c\u3089\u308c\u307e\u3057\u305f\u3002 \u66f4\u65b0\u3055\u308c\u308b\u307e\u3067\u3057\u3070\u3089\u304f\u6642\u9593\u304c\u304b\u304b\u308b\u5834\u5408\u304c\u3042\u308a\u307e\u3059\u3002\u5909\u66f4\u3092\u8868\u793a\u3059\u308b\u306b\u306f\u3001\u30da\u30fc\u30b8\u3092\u518d\u8aad\u307f\u8fbc\u307f\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
+message.addCategory.success=\u30ab\u30c6\u30b4\u30ea\u304c\u8ffd\u52a0\u3055\u308c\u307e\u3057\u305f\u3002
+message.addCategory.solr.success=\u65b0\u3057\u3044\u30ab\u30c6\u30b4\u30ea\u304cSOLR\u306e\u8ffd\u52a0\u30ad\u30e5\u30fc\u306b\u5165\u308c\u3089\u308c\u307e\u3057\u305f\u3002 \u8ffd\u52a0\u3055\u308c\u308b\u307e\u3067\u3057\u3070\u3089\u304f\u6642\u9593\u304c\u304b\u304b\u308b\u5834\u5408\u304c\u3042\u308a\u307e\u3059\u3002\u5909\u66f4\u3092\u8868\u793a\u3059\u308b\u306b\u306f\u3001\u30da\u30fc\u30b8\u3092\u518d\u8aad\u307f\u8fbc\u307f\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
+message.removeCategory.success=\u30ab\u30c6\u30b4\u30ea\u304c\u524a\u9664\u3055\u308c\u307e\u3057\u305f\u3002
+message.removeCategory.solr.success=\u30ab\u30c6\u30b4\u30ea\u306e\u524a\u9664\u304cSOLR\u306e\u524a\u9664\u30ad\u30e5\u30fc\u306b\u5165\u308c\u3089\u308c\u307e\u3057\u305f\u3002 \u524a\u9664\u3055\u308c\u308b\u307e\u3067\u3057\u3070\u3089\u304f\u6642\u9593\u304c\u304b\u304b\u308b\u5834\u5408\u304c\u3042\u308a\u307e\u3059\u3002\u5909\u66f4\u3092\u8868\u793a\u3059\u308b\u306b\u306f\u3001\u30da\u30fc\u30b8\u3092\u518d\u8aad\u307f\u8fbc\u307f\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002

config/alfresco/messages/categories_nl.properties

@@ -0,0 +1,6 @@
+message.changeCategoryName.success=Naam van categorie is gewijzigd
+message.changeCategoryName.solr.success=Bijwerken van categorie is in de SOLR-wachtrij geplaatst voor wijzigingen. Het bijwerken kan enkele ogenblikken duren; u moet de weergave vernieuwen voordat u de ge\u00efmplementeerde wijziging kunt zien
+message.addCategory.success=Categorie is toegevoegd
+message.addCategory.solr.success=Nieuwe categorie is in de SOLR-wachtrij geplaatst voor toevoeging. Het toevoegen kan enkele ogenblikken duren; u moet de weergave vernieuwen voordat u de ge\u00efmplementeerde wijziging kunt zien
+message.removeCategory.success=Categorie is verwijderd.
+message.removeCategory.solr.success=Verwijdering van de categorie is in de SOLR-wachtrij geplaatst voor verwijdering. Het verwijderen kan enkele ogenblikken duren; u moet de weergave vernieuwen voordat u de ge\u00efmplementeerde wijziging kunt zien

config/alfresco/messages/initiate-inplace_ja.properties

@@ -1 +1 @@
-bfsit.error.importAlreadyInProgress=\u65e2\u306b\u30d0\u30eb\u30af\u30a4\u30f3\u30dd\u30fc\u30c8\u306f\u51e6\u7406\u4e2d\u3067\u3059 \u5f8c\u3067\u3084\u308a\u76f4\u3057\u3066\u304f\u3060\u3055\u3044
+bfsit.error.importAlreadyInProgress=\u65e2\u306b\u30d0\u30eb\u30af\u30a4\u30f3\u30dd\u30fc\u30c8\u306f\u51e6\u7406\u4e2d\u3067\u3059\u3002\u5f8c\u3067\u3084\u308a\u76f4\u3057\u3066\u304f\u3060\u3055\u3044\u3002

config/alfresco/messages/lock-service_nl.properties

@@ -2,5 +2,5 @@
 
 lock_service.insufficent_privileges=U hebt onvoldoende rechten om de vergrendeling op de node (id: {0}) op te heffen. De node is vergrendeld door een andere gebruiker.
 lock_service.node_locked=Kan de node (id: {0}) niet vergrendelen omdat deze al is vergrendeld door een andere gebruiker.
-lock_service.no_op=Kan bewerking niet uitvoeren omdat de node (id:{0}) is vergrendeld.
+lock_service.no_op=Kan bewerking niet uitvoeren omdat de node (id: {0}) is vergrendeld.
-lock_service.no_op2=Kan bewerking {0} niet uitvoeren omdat de node (id:{1}) is vergrendeld.
+lock_service.no_op2=Kan bewerking {0} niet uitvoeren omdat de node (id: {1}) is vergrendeld.

config/alfresco/messages/patch-service.properties

@@ -457,5 +457,7 @@ patch.fixBpmPackages.emptyContainer={0} node has no children
 
 patch.alterJBPM331CLOBcolumnsToNvarchar.description=Altering CLOB columns in the jBPM 3.3.1 tables to introduce Unicode characters support for jBPM 3.3.1
 
+patch.avmIndexChildEntriesLower.description=Add an indexed column to avm_child_entries that allows case-insensitive querying of AVM files by name
+
 patch.imapUnsubscribedAspect.description=Patch to remove deprecated "imap:nonSubscribed" aspect from folders.
 patch.imapUnsubscribedAspect.result.removed="imap:nonSubscribed" aspect was successfully removed from unsubscribed folders.

config/alfresco/messages/patch-service_de.properties

@@ -453,3 +453,5 @@ patch.fixBpmPackages.description=Corrects workflow package types and association
 patch.fixBpmPackages.result=Patch successful. {0} packages converted.
 patch.fixBpmPackages.invalidBootsrapStore=Bootstrap store has not been set
 patch.fixBpmPackages.emptyContainer={0} node has no children
+
+patch.alterJBPM331CLOBcolumnsToNvarchar.description=Altering CLOB columns in the jBPM 3.3.1 tables to introduce Unicode characters support for jBPM 3.3.1

config/alfresco/messages/patch-service_fr.properties

@@ -453,3 +453,5 @@ patch.fixBpmPackages.description=Corrects workflow package types and association
 patch.fixBpmPackages.result=Patch successful. {0} packages converted.
 patch.fixBpmPackages.invalidBootsrapStore=Bootstrap store has not been set
 patch.fixBpmPackages.emptyContainer={0} node has no children
+
+patch.alterJBPM331CLOBcolumnsToNvarchar.description=Altering CLOB columns in the jBPM 3.3.1 tables to introduce Unicode characters support for jBPM 3.3.1

config/alfresco/messages/patch-service_ja.properties

@@ -453,3 +453,5 @@ patch.fixBpmPackages.description=Corrects workflow package types and association
 patch.fixBpmPackages.result=Patch successful. {0} packages converted.
 patch.fixBpmPackages.invalidBootsrapStore=Bootstrap store has not been set
 patch.fixBpmPackages.emptyContainer={0} node has no children
+
+patch.alterJBPM331CLOBcolumnsToNvarchar.description=Altering CLOB columns in the jBPM 3.3.1 tables to introduce Unicode characters support for jBPM 3.3.1

config/alfresco/messages/patch-service_nl.properties

@@ -453,3 +453,5 @@ patch.fixBpmPackages.description=Corrects workflow package types and association
 patch.fixBpmPackages.result=Patch successful. {0} packages converted.
 patch.fixBpmPackages.invalidBootsrapStore=Bootstrap store has not been set
 patch.fixBpmPackages.emptyContainer={0} node has no children
+
+patch.alterJBPM331CLOBcolumnsToNvarchar.description=Altering CLOB columns in the jBPM 3.3.1 tables to introduce Unicode characters support for jBPM 3.3.1

config/alfresco/messages/system-messages_de.properties

@@ -32,6 +32,7 @@ system.schema_comp.redundant_obj.many_matches={0} redundant items? reference: {1
 system.schema_comp.validation=Validation: {0} {1}="{2}" fails to match rule: {3}
 #   Specific validator (implementations) messages...
 system.schema_comp.name_validator=name must match pattern ''{0}''
+system.schema_comp.schema_version_validator=version must be at least ''{0}''
 
 # OpenOffice
 system.openoffice.info.connection_verified=The connection to OpenOffice has been established.

config/alfresco/messages/system-messages_fr.properties

@@ -32,6 +32,7 @@ system.schema_comp.redundant_obj.many_matches={0} redundant items? reference: {1
 system.schema_comp.validation=Validation: {0} {1}="{2}" fails to match rule: {3}
 #   Specific validator (implementations) messages...
 system.schema_comp.name_validator=name must match pattern ''{0}''
+system.schema_comp.schema_version_validator=version must be at least ''{0}''
 
 # OpenOffice
 system.openoffice.info.connection_verified=The connection to OpenOffice has been established.
@@ -68,9 +69,9 @@ system.usage.err.limit_license_expired=La licence Alfresco a expir\u00e9.
 # License
 system.license.msg.unknown=Inconnu
 system.license.msg.unlimited=Illimit\u00e9
-system.license.msg.does_not_expire=N’expire pas
+system.license.msg.does_not_expire=N'expire pas
 system.license.msg.reloaded=La licence Alfresco a \u00e9t\u00e9 recharg\u00e9e.
-system.license.err.reloadFailed=Echec du rechargement de la licence: {0}
+system.license.err.reloadFailed=Echec du rechargement de la licence : {0}
 # END TRANSLATION
 
 # Startup message

config/alfresco/messages/system-messages_ja.properties

@@ -32,6 +32,7 @@ system.schema_comp.redundant_obj.many_matches={0} redundant items? reference: {1
 system.schema_comp.validation=Validation: {0} {1}="{2}" fails to match rule: {3}
 #   Specific validator (implementations) messages...
 system.schema_comp.name_validator=name must match pattern ''{0}''
+system.schema_comp.schema_version_validator=version must be at least ''{0}''
 
 # OpenOffice
 system.openoffice.info.connection_verified=The connection to OpenOffice has been established.

config/alfresco/messages/system-messages_nl.properties

@@ -32,6 +32,7 @@ system.schema_comp.redundant_obj.many_matches={0} redundant items? reference: {1
 system.schema_comp.validation=Validation: {0} {1}="{2}" fails to match rule: {3}
 #   Specific validator (implementations) messages...
 system.schema_comp.name_validator=name must match pattern ''{0}''
+system.schema_comp.schema_version_validator=version must be at least ''{0}''
 
 # OpenOffice
 system.openoffice.info.connection_verified=The connection to OpenOffice has been established.

config/alfresco/messages/transfer-service_de.properties

@@ -26,7 +26,7 @@ transfer_service.receiver.record_folder_not_found=Angegebener Ordner f\u00fcr Pr
 transfer_service.receiver.not_lock_owner=Fehlgeschlagener Versuch, eine \u00dcbertragung auszuf\u00fchren. Sperre nicht von angegebener \u00dcbertragung gehalten: {0}
 transfer_service.receiver.error_ending_transfer=Anforderung zur Beendigung einer \u00dcbertragung ({0}) hat zu einem Fehler gef\u00fchrt.
 transfer_service.receiver.error_staging_snapshot=Beim Staging der Momentaufnahme einer Datei zur \u00dcbertragung {0} ist ein Fehler aufgetreten
-transfer_service.receiver.error_staging_content=Beim Staging der Content-Datei zur \u00dcbertragung {0} ist ein Fehler aufgetreten Feld-ID ist {1}
+transfer_service.receiver.error_staging_content=Beim Staging der Content-Datei zur \u00dcbertragung {0} ist ein Fehler aufgetreten. Datei-ID ist {1}
 transfer_service.receiver.no_snapshot_received=Eine Anfrage nach Ausf\u00fchrung einer \u00dcbertragung ({0}) ist eingegangen, es ist aber keine passende Momentaufnahmen-Datei eingegangen. 
 transfer_service.receiver.error_committing_transfer=Beim Versuch der Ausf\u00fchrung der \u00dcbertragung {0} ist ein Fehler aufgetreten
 transfer_service.receiver.transfer_not_found=Konnte kein Protokoll einer \u00dcbertragungsanfrage finden: {0}

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

@@ -3070,6 +3070,15 @@
         </property>
     </bean>
     
+    <bean id="patch.db-V3.4-AVM-index-child-entries-lower" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
+        <property name="id"><value>patch.db-V3.4-AVM-index-child-entries-lower</value></property>
+        <property name="description"><value>patch.avmIndexChildEntriesLower.description</value></property>
+        <property name="fixesFromSchema"><value>0</value></property>
+        <property name="fixesToSchema"><value>6002</value></property>
+        <property name="targetSchema"><value>6003</value></property>
+        <property name="scriptUrl">
+            <value>classpath:alfresco/dbscripts/upgrade/3.4/${db.script.dialect}/AVM-index-child-entries-lower.sql</value>
+        </property>
+    </bean>
 
-  
 </beans>

config/alfresco/version.properties

@@ -19,4 +19,4 @@ version.build=@build-number@
 
 # Schema number
 
-version.schema=6002
+version.schema=6003

source/java/org/alfresco/repo/domain/avm/AVMChildEntryEntity.java

@@ -30,6 +30,7 @@ public class AVMChildEntryEntity
 {
     private Long parentNodeId;
     private String name;
+    private String lowerName; // Derived from name for case insensitive lookups
     private Long childNodeId;
     
     public AVMChildEntryEntity()
@@ -41,6 +42,7 @@ public class AVMChildEntryEntity
     {
         this.parentNodeId = parentNodeId;
         this.name = name;
+        this.lowerName = name == null ? null : name.toLowerCase();
         this.childNodeId = childNodeId;
     }
     
@@ -48,6 +50,7 @@ public class AVMChildEntryEntity
     {
         this.parentNodeId = parentNodeId;
         this.name = name;
+        this.lowerName = name == null ? null : name.toLowerCase();
     }
     
     public AVMChildEntryEntity(long parentNodeId, long childNodeId)
@@ -74,8 +77,19 @@ public class AVMChildEntryEntity
     public void setName(String name)
     {
         this.name = name;
+        this.lowerName = name == null ? null : name.toLowerCase();
     }
     
+    public String getLowerName()
+    {
+        return lowerName;
+    }
+
+    public void setLowerName(String lowerName)
+    {
+        this.lowerName = lowerName;
+    }
+
     public Long getChildId()
     {
         return childNodeId;

source/java/org/alfresco/repo/domain/avm/ibatis/AVMNodeLinksDAOImpl.java

@@ -37,16 +37,13 @@ import org.mybatis.spring.SqlSessionTemplate;
 public class AVMNodeLinksDAOImpl extends AbstractAVMNodeLinksDAOImpl
 {
     private static final String SELECT_AVM_NODE_CHILD_ENTRY ="alfresco.avm.select_AVMChildEntry"; // parent + name + child
-    private static final String SELECT_AVM_NODE_CHILD_ENTRY_L ="alfresco.avm.select_AVMChildEntryL"; // parent + lower(name) + child
     
     private static final String SELECT_AVM_NODE_CHILD_ENTRY_BY_PARENT_AND_NAME ="alfresco.avm.select_AVMChildEntryByParentAndName"; // parent + name
-    private static final String SELECT_AVM_NODE_CHILD_ENTRY_BY_PARENT_AND_NAME_L ="alfresco.avm.select_AVMChildEntryByParentAndNameL"; // parent + lower(name)
     
     private static final String SELECT_AVM_NODE_CHILD_ENTRY_BY_PARENT_AND_CHILD ="alfresco.avm.select_AVMChildEntryByParentAndChild"; // parent + child
     private static final String SELECT_AVM_NODE_CHILD_ENTRIES_BY_PARENT ="alfresco.avm.select_AVMNodeChildEntriesByParent"; // parent
     
     private static final String SELECT_AVM_NODE_CHILD_ENTRIES_BY_PARENT_AND_NAME_PATTERN ="alfresco.avm.select_AVMNodeChildEntriesByParentAndNamePattern"; // parent + name pattern
-    private static final String SELECT_AVM_NODE_CHILD_ENTRIES_BY_PARENT_AND_NAME_PATTERN_L ="alfresco.avm.select_AVMNodeChildEntriesByParentAndNamePatternL"; // parent + lower(name pattern)
     
     private static final String SELECT_AVM_NODE_CHILD_ENTRIES_BY_CHILD ="alfresco.avm.select_AVMNodeChildEntriesByChild"; // child
     
@@ -55,7 +52,6 @@ public class AVMNodeLinksDAOImpl extends AbstractAVMNodeLinksDAOImpl
     private static final String UPDATE_AVM_NODE_CHILD_ENTRY ="alfresco.avm.update_AVMChildEntry"; // parent + child (update name)
     
     private static final String DELETE_AVM_NODE_CHILD_ENTRY_BY_PARENT_AND_NAME ="alfresco.avm.delete_AVMChildEntryByParentAndName"; // parent + name
-    private static final String DELETE_AVM_NODE_CHILD_ENTRY_BY_PARENT_AND_NAME_L ="alfresco.avm.delete_AVMChildEntryByParentAndNameL"; // parent + lower(name)
     
     private static final String DELETE_AVM_NODE_CHILD_ENTRY_BY_PARENT_AND_CHILD ="alfresco.avm.delete_AVMChildEntryByParentAndChild"; // parent + child
     private static final String DELETE_AVM_NODE_CHILD_ENTRIES_BY_PARENT ="alfresco.avm.delete_AVMNodeChildEntriesByParent"; // parent
@@ -75,29 +71,15 @@ public class AVMNodeLinksDAOImpl extends AbstractAVMNodeLinksDAOImpl
     
     
     private SqlSessionTemplate template;
-    
     public final void setSqlSessionTemplate(SqlSessionTemplate sqlSessionTemplate) 
     {
         this.template = sqlSessionTemplate;
     }
     
-    
+        
-    // Initial generic fix for ALF-1940 (pending SAIL-349)
-    // Note: in order to override to false DB must be setup to be case-insensitive (at least on column avm_child_entries.name)
-    private boolean toLower = true;
-    
-    public void setToLower(boolean toLower)
-    {
-        this.toLower = toLower;
-    }
-    
     @Override
     protected AVMChildEntryEntity getChildEntryEntity(AVMChildEntryEntity childEntryEntity)
     {
-        if (toLower)
-        {
-            return (AVMChildEntryEntity) template.selectOne(SELECT_AVM_NODE_CHILD_ENTRY_L, childEntryEntity);
-        }
         return (AVMChildEntryEntity) template.selectOne(SELECT_AVM_NODE_CHILD_ENTRY, childEntryEntity);
     }
     
@@ -106,10 +88,6 @@ public class AVMNodeLinksDAOImpl extends AbstractAVMNodeLinksDAOImpl
     {
         AVMChildEntryEntity childEntryEntity = new AVMChildEntryEntity(parentNodeId, name);
         
-        if (toLower)
-        {
-            return (AVMChildEntryEntity) template.selectOne(SELECT_AVM_NODE_CHILD_ENTRY_BY_PARENT_AND_NAME_L, childEntryEntity);
-        }
         return (AVMChildEntryEntity) template.selectOne(SELECT_AVM_NODE_CHILD_ENTRY_BY_PARENT_AND_NAME, childEntryEntity);
     }
     
@@ -135,12 +113,8 @@ public class AVMNodeLinksDAOImpl extends AbstractAVMNodeLinksDAOImpl
     {
         Map<String, Object> params = new HashMap<String, Object>(1);
         params.put("id", parentNodeId);
-        params.put("pattern", childNamePattern);
+        params.put("pattern", childNamePattern.toLowerCase());        
         
-        if (toLower)
-        {
-            return (List<AVMChildEntryEntity>) template.selectList(SELECT_AVM_NODE_CHILD_ENTRIES_BY_PARENT_AND_NAME_PATTERN_L, params);
-        }
         return (List<AVMChildEntryEntity>) template.selectList(SELECT_AVM_NODE_CHILD_ENTRIES_BY_PARENT_AND_NAME_PATTERN, params);
     }
     
@@ -172,11 +146,6 @@ public class AVMNodeLinksDAOImpl extends AbstractAVMNodeLinksDAOImpl
     protected int deleteChildEntryEntity(long parentNodeId, String name)
     {
         AVMChildEntryEntity childEntryEntity = new AVMChildEntryEntity(parentNodeId, name);
-        
-        if (toLower)
-        {
-            return template.delete(DELETE_AVM_NODE_CHILD_ENTRY_BY_PARENT_AND_NAME_L, childEntryEntity);
-        }
         return template.delete(DELETE_AVM_NODE_CHILD_ENTRY_BY_PARENT_AND_NAME, childEntryEntity);
     }
     

source/java/org/alfresco/repo/version/VersionServiceImplTest.java

@@ -1076,6 +1076,73 @@ public class VersionServiceImplTest extends BaseVersionStoreTest
        
     }
     
+    public void testAddVersionableAspectWithNoVersionType()
+    {
+        // No version-type specified when adding the aspect
+        NodeRef nodeRef = createNodeWithVersionType(null);
+        setComplete();
+        endTransaction();
+        assertCorrectVersionLabel(nodeRef, "0.1");
+    }
+
+    public void testAddVersionableAspectWithMinorVersionType()
+    {
+        // MINOR version-type specified when adding the aspect
+        NodeRef nodeRef = createNodeWithVersionType(VersionType.MINOR);
+        setComplete();
+        endTransaction();
+        assertCorrectVersionLabel(nodeRef, "0.1");
+    }
+    
+    public void testAddVersionableAspectWithMajorVersionType()
+    {
+        // MAJOR version-type specified when adding the aspect
+        NodeRef nodeRef = createNodeWithVersionType(VersionType.MAJOR);
+        setComplete();
+        endTransaction();
+        assertCorrectVersionLabel(nodeRef, "1.0");
+    }
+    
+    private void assertCorrectVersionLabel(final NodeRef nodeRef, final String versionLabel)
+    {
+        transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback<Object>()
+        {
+            public Object execute() throws Exception
+            {
+                // Check that the version history has been created
+                VersionHistory versionHistory = versionService.getVersionHistory(nodeRef);
+                assertNotNull(versionHistory);
+                assertEquals(1, versionHistory.getAllVersions().size());
+                Version version = versionService.getCurrentVersion(nodeRef);
+                assertEquals("Wrong version label", versionLabel, version.getVersionLabel());
+                
+                return null;
+            }
+        });
+    }
+    
+    private NodeRef createNodeWithVersionType(VersionType versionType)
+    {
+        HashMap<QName, Serializable> props = new HashMap<QName, Serializable>();
+        props.put(ContentModel.PROP_NAME, "test.txt");
+        
+        final NodeRef nodeRef = dbNodeService.createNode(
+                rootNodeRef, 
+                ContentModel.ASSOC_CHILDREN, 
+                QName.createQName("{test}MyVersionableNode"),
+                TEST_TYPE_QNAME,
+                props).getChildRef();
+        
+        HashMap<QName, Serializable> aspectProps = new HashMap<QName, Serializable>();
+        if (versionType != null)
+        {
+            aspectProps.put(ContentModel.PROP_VERSION_TYPE, versionType);
+        }
+        dbNodeService.addAspect(nodeRef, ContentModel.ASPECT_VERSIONABLE, aspectProps);
+        
+        return nodeRef;
+    }
+
     public void testAddRemoveVersionableAspect()
     {
     	HashMap<QName, Serializable> props2 = new HashMap<QName, Serializable>();

source/java/org/alfresco/repo/version/VersionableAspect.java

@@ -361,6 +361,14 @@ public class VersionableAspect implements ContentServicePolicies.OnContentUpdate
                 {
                     // Create the initial-version
                     Map<String, Serializable> versionProperties = new HashMap<String, Serializable>(1);
+                    
+                    // If a major version is requested, indicate it in the versionProperties map
+                    String versionType = (String) nodeService.getProperty(nodeRef, ContentModel.PROP_VERSION_TYPE);
+                    if (versionType != null && versionType.equals(VersionType.MAJOR.toString()))
+                    {
+                    	versionProperties.put(VersionModel.PROP_VERSION_TYPE, VersionType.MAJOR);
+                    }
+                    
                     versionProperties.put(Version.PROP_DESCRIPTION, I18NUtil.getMessage(MSG_INITIAL_VERSION));
                     
                     createVersionImpl(nodeRef, versionProperties);