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.2 to HEAD

Browse Source 
17332: ETHREEOH-2020: Original tag disappears after a new one has been added to a wiki page
   17711: Fix ETHREEOH-3720 - blocker (upgrade from 2.x)
   17712: Build/test fix (FeedCleanerTest.testConcurrentAccessAndRemoval)
   17726: DownloadContentServlet wraps call in read-only RetryingTransactionHelper
   17736: Fix ETHREEOH-2821 - deployment of layered file (fix for 3.2 deployment)
   17745: Fixed broken PostgreSQL (AVM, audit, etc) and Oracle (audit)
   17746: Merged V3.1 to V3.2
      17290: Merged V2.2 to V3.1
         17282: (record-only) Fix for ETWOTWO-1387: Node deletions transactions not properly detected ...
      17381: (record-only) Putting explicit version name on PDFRenderer.jar
      17413: (record-only) Removed dev from label
   17749: Type handler fixes for PostgreSQL: Use LONGVARBINARY
   17750: Fixed propval mappings for DB2
   17754: Fixed "invalid character" in Oracle port of propval
   17757: Re-added fix for ETHREEOH-2789 that got lost in a merge.
   17762: Fix FeedCleanerTest (for Oracle 10g) + exposed feed cleaner issue (maxSize)
   17765: Assorted minor build fixes for Oracle
   17767: Empty String property values are persisted as '.empty'
   17768: Merged DEV/BELARUS/V3.2-2009_11_24 to V3.2
      17758: ETHREEOH-3757: Oracle upgrade issue: failed "inviteEmailTemplate" patch
   17772: Fix build (JBPMEngineUnitTest) - fallout from r17765
   17774: Fix JSONtoFmModelTest
   17781: Build/test fix (AVMCrawlTestP)
   17791: Fix for ETHREEOH-3793: Oracle unit test failure for JobLockServiceTest - Missing unique indexes for all DB ports
   17795: ETHREEOH-3696: Attempt to navigate into any existent web-project or create new one after upgrade from Enterprise 2.1.7 ...
   17799: ETHREEOH-3796: org.alfresco.repo.importer.ImporterComponentTest fails
   17807: Fix ETHREEOH-3723 - MT blocker (can't restart)
   17816: Merged DEV/BELARUS/V3.2-2009_12_15 to V3.2
      17814: ETHREEOH-3808: Upgrade fails if content cm:name contains curly brackets ('{}')
   17822: Fix for ETHREEOH-3828: Mistake porting AlfrescoPostCreate-3.2-PropertyValueTables.sql script to mssql dialect
   17823: Fix for ETHREEOH-3829: SQLServer index limit reached for 'idx_alf_props_str'
   17831: Fix ETHREEOH-3818 - upgrade from Community 3.2r2 to Enterprise 3.2
   17862: Merged V3.1 to V3.2
      17722: Fix ETHREEOH-3643 - WCM layered folders (flatten) - also add unit test
      17835: ETHREEOH-3763 - fix for WCM layered folders - also add unit test
   17871: Merged V3.1 to V3.2
      17855: ACT 12915 - create web project performance (-> setPermission -> buildIndirections)
      17863: ETHREEOH-3852 - perf tweak (WCM layered files)
-------------------------------------
Modified: svn:mergeinfo
   Merged /alfresco/BRANCHES/DEV/BELARUS/V3.2-2009_11_24:r17758
   Merged /alfresco/BRANCHES/DEV/BELARUS/V3.2-2009_12_15:r17814
   Merged /alfresco/BRANCHES/V2.2:r17282
   Merged /alfresco/BRANCHES/V3.1:r17290,17381,17413,17722,17835,17855,17863
   Merged /alfresco/BRANCHES/V3.2:r17332,17711-17712,17726,17736,17745-17746,17749-17750,17754,17757,17762,17765,17767-17768,17772,17774,17781,17791,17795,17799,17807,17816,17822-17823,17831,17862,17871


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18169 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2010-01-20 12:30:14 +00:00
parent 5e86299377
commit add74c1a59
50 changed files with 1160 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
source/java/org/alfresco/util/JSONtoFmModelTest.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005-2008 Alfresco Software Limited.
* Copyright (C) 2005-2009 Alfresco Software Limited.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -76,12 +76,12 @@ public class JSONtoFmModelTest extends TestCase
String test3_expected_out =
"doc:class java.util.HashMap\n" +
"\tghi:123:class java.lang.Integer\n" +
"\tmno:true:class java.lang.Boolean\n" +
"\tqrs:Sat Nov 05 13:15:30 GMT 1994:class java.util.Date\n" +
"\tdef:world:class java.lang.String\n" +
"\tabc:hello:class java.lang.String\n" +
"\tjkl:123.456:class java.lang.Double\n";
"\tdef:world:class java.lang.String\n" +
"\tghi:123:class java.lang.Integer\n" +
"\tjkl:123.456:class java.lang.Double\n" +
"\tmno:true:class java.lang.Boolean\n" +
"\tqrs:Sat Nov 05 13:15:30 GMT 1994:class java.util.Date\n";
String test4_in =
"{" +
@@ -109,29 +109,29 @@ public class JSONtoFmModelTest extends TestCase
String test4_expected_out =
"glossary:class java.util.HashMap\n" +
"\ttitle:example glossary:class java.lang.String\n" +
"\tGlossDiv:class java.util.HashMap\n" +
"\t\ttitle:S:class java.lang.String\n" +
"\t\tGlossList:class java.util.HashMap\n" +
"\t\t\tGlossEntry:class java.util.HashMap\n" +
"\t\t\t\tGlossTerm:Standard Generalized Markup Language:class java.lang.String\n" +
"\t\t\t\tSortAs:SGML:class java.lang.String\n" +
"\t\t\t\tAbbrev:ISO 8879:1986:class java.lang.String\n" +
"\t\t\t\tAcronym:SGML:class java.lang.String\n" +
"\t\t\t\tGlossDef:class java.util.HashMap\n" +
"\t\t\t\t\tpara:A meta-markup language, used to create markup languages such as DocBook.:class java.lang.String\n" +
"\t\t\t\t\t[\n" +
"\t\t\t\t\tGML:class java.lang.String\n" +
"\t\t\t\t\tXML:class java.lang.String\n" +
"\t\t\t\t\tANO1:class java.lang.String\n" +
"\t\t\t\t\tANO2:class java.lang.String\n" +
"\t\t\t\t\t]\n" +
"\t\t\t\tAcronym:SGML:class java.lang.String\n" +
"\t\t\t\t\tpara:A meta-markup language, used to create markup languages such as DocBook.:class java.lang.String\n" +
"\t\t\t\tGlossSee:markup:class java.lang.String\n" +
"\t\t\t\tID:SGML:class java.lang.String\n";
"\t\t\t\tGlossTerm:Standard Generalized Markup Language:class java.lang.String\n" +
"\t\t\t\tID:SGML:class java.lang.String\n" +
"\t\t\t\tSortAs:SGML:class java.lang.String\n" +
"\t\ttitle:S:class java.lang.String\n" +
"\ttitle:example glossary:class java.lang.String\n";
try
{
Configuration cfg = new Configuration();
Configuration cfg = new Configuration();
cfg.setObjectWrapper(ObjectWrapper.DEFAULT_WRAPPER);
String userDir = System.getProperty("user.dir");
@@ -148,7 +148,7 @@ public class JSONtoFmModelTest extends TestCase
//System.out.println(JSONtoFmModel.toString(root));
assertEquals(test1_expected_out, JSONtoFmModel.toString(root));
Template temp = cfg.getTemplate("test1.ftl");
Template temp = cfg.getTemplate("test1.ftl");
Writer out = new OutputStreamWriter(System.out);
temp.process(root, out);
out.flush();
@@ -162,14 +162,14 @@ public class JSONtoFmModelTest extends TestCase
root = JSONtoFmModel.convertJSONObjectToMap(test2_in);
//System.out.println(JSONtoFmModel.toString(root));
assertEquals(test2_expected_out, JSONtoFmModel.toString(root));
temp = cfg.getTemplate("test2.ftl");
temp = cfg.getTemplate("test2.ftl");
out = new OutputStreamWriter(System.out);
temp.process(root, out);
out.flush();
System.out.println("\n\n\n");
// Test 3
System.out.println("TEST 3");
//System.out.println(test3_in);
@@ -178,10 +178,10 @@ public class JSONtoFmModelTest extends TestCase
//System.out.println(JSONtoFmModel.toString(root));
assertEquals(test3_expected_out, JSONtoFmModel.toString(root));
temp = cfg.getTemplate("test3.ftl");
temp = cfg.getTemplate("test3.ftl");
out = new OutputStreamWriter(System.out);
temp.process(root, out);
out.flush();
out.flush();
// Test 4
System.out.println("TEST 4");
@@ -191,10 +191,10 @@ public class JSONtoFmModelTest extends TestCase
//System.out.println(JSONtoFmModel.toString(root));
assertEquals(test4_expected_out, JSONtoFmModel.toString(root));
temp = cfg.getTemplate("test4.ftl");
temp = cfg.getTemplate("test4.ftl");
out = new OutputStreamWriter(System.out);
temp.process(root, out);
out.flush();
out.flush();
}
catch (Exception e)
{