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

Merged V3.1 to HEAD

Browse Source 
13857: Merged V2.2 to V3.1
      7028-13041: (Record only) New merge path
      13343: (Record onlY) Merged V3.1 to V2.2:
         13330: Fix ETHREEOH-1408: Incorrect button name at "Manage Task: Submitted" page
         13337: Fix for ETHREEOH-1409 and further fix for ETHREEOH-1408
      13363: Fix ETWOTWO-1022 (Virtual website not found - Bad host name)
      13386: Fix ETWOTWO-1145: WCM Form web script include is not handling ${} token format
      13387: (Record only) Removed dev from version label
      13621: (Record only) Merged V3.1 to V2.2
         13497: Fixed ETHREEOH-1431: Authentication case sensitivity switch doesn't work
                Fixes ETWOTWO-1012
      13828: ETWOTWO-1171 - checkpoint (alternative patch: resetWCMToGroupBasedPermissions)
      13845: ETWOTWO-1171 - alternative patch: resetWCMToGroupBasedPermissions (part 2 of 2 - set layered/shared acls)
      13855: Fixed line endings
      13856: ETWOTWO-1171 - minor fix: wcmPostPermissionSnapshot patch target schema should be 95
   ___________________________________________________________________
   Modified: svn:mergeinfo
      Merged /alfresco/BRANCHES/V2.2:r7028-12305,12307-12310,12312-12319,12321,...
      Merged /alfresco/BRANCHES/V3.1:r13857


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14765 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2009-06-17 12:44:32 +00:00
parent 3a5c120bbe
commit 0697be41a3
6 changed files with 1252 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/java/org/alfresco/repo/avm/AVMServiceTest.java
View File

@@ -5313,6 +5313,7 @@ public class AVMServiceTest extends AVMServiceTestBase
fService.setStoreProperty("main", QName.createQName("", ".other.property"), new PropertyValue(null, "other value"));
Map<QName, PropertyValue> result = fService.queryStorePropertyKey("main", QName.createQName("", ".dns.%"));
assertEquals(1, result.size());
fService.createStore("second");
fService.setStoreProperty("second", QName.createQName("", ".dns.alice"), new PropertyValue(null, "alice-space"));
Map<String, Map<QName, PropertyValue>> matches = fService.queryStoresPropertyKeys(QName.createQName("", ".dns.%"));
@@ -5320,15 +5321,22 @@ public class AVMServiceTest extends AVMServiceTestBase
assertEquals(1, matches.get("second").size());
assertEquals("alice-preview", matches.get("main").get(QName.createQName(null, ".dns.alice--preview")).getStringValue());
assertEquals("alice-space", matches.get("second").get(QName.createQName(null, ".dns.alice")).getStringValue());
fService.createStore("third");
fService.setStoreProperty("third", QName.createQName("", ".dns.someUPPERcase"), new PropertyValue(null, "someUPPERcase-space"));
matches = fService.queryStoresPropertyKeys(QName.createQName("", ".dns.someuppercase%"));
assertEquals(1, matches.get("third").size());
assertEquals("someUPPERcase-space", matches.get("third").get(QName.createQName(null, ".dns.someUPPERcase")).getStringValue());
}
catch (Exception e)
{
e.printStackTrace(System.err);
throw e;
}
finally
{
fService.purgeStore("second");
fService.purgeStore("third");
}
}

4
source/java/org/alfresco/repo/avm/hibernate/AVM.hbm.xml
View File

@@ -339,7 +339,7 @@
JOIN alf_namespace ns ON (ns.id = qn.ns_id)
WHERE
ns.uri LIKE :uri AND
qn.local_name LIKE :localName
upper(qn.local_name) LIKE upper(:localName)
</sql-query>
<sql-query name="avm.GetStorePropertiesByStoreAndKeyPattern">
@@ -353,7 +353,7 @@
WHERE
asp.avm_store_id = :storeId AND
ns.uri LIKE :uri AND
qn.local_name LIKE :localName
upper(qn.local_name) LIKE upper(:localName)
</sql-query>
<sql-query name="avm.DeleteStorePropertiesByType">