From 803321fd1cf64890b151b1b09d336076d53ab420 Mon Sep 17 00:00:00 2001
From: Gavin Cornwell <gavin.cornwell@alfresco.com>
Date: Mon, 17 Jan 2011 15:04:37 +0000
Subject: [PATCH] =?UTF-8?q?Merged=20BRANCHES/V3.4=20to=20HEAD:=20=20=20=20?=
 =?UTF-8?q?24065:=20Fix=20for=20ALF-5064:=20Overriding=20the=20config=20fo?=
 =?UTF-8?q?r=20a=20form=20with=20an=20edit-form=20defined=20appears=20to?=
 =?UTF-8?q?=20lose=20knowledge=20of=20the=20custom=20form=20=20=20=2024471?=
 =?UTF-8?q?:=20Merged=20BRANCHES/DEV/BELARUS/V3.4-2010=5F11=5F29=20to=20BR?=
 =?UTF-8?q?ANCHES/V3.4:=20=20=20=20=20=20=20=20=2024361:=20ALF-6033:=20Sha?=
 =?UTF-8?q?repoint=20broken=20on=20Vista.=20=20=20=2024548:=20Fix=20for=20?=
 =?UTF-8?q?ALF-6110:Checking=20out=20do=D1=81ument's=20via=20MS=20Office?=
 =?UTF-8?q?=20leads=20to=20incorrect=20displaying=20of=20document's=20meta?=
 =?UTF-8?q?data=20and=20for=20ALF-6113:=20MP3=20files=20cause=20an=20error?=
 =?UTF-8?q?=20when=20viewing=20the=20Document=20Details=20page=20=20=20=20?=
 =?UTF-8?q?24601:=20Fix=20for=20ALF-6032:=20It's=20impossible=20to=20creat?=
 =?UTF-8?q?e=20meeting=20items?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@24879 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 config/alfresco/model/calendarModel.xml           |  8 ++++++++
 .../org/alfresco/repo/jscript/ScriptNode.java     | 15 +++++++++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/config/alfresco/model/calendarModel.xml b/config/alfresco/model/calendarModel.xml
index efbdaba6de..405609cfe6 100644
--- a/config/alfresco/model/calendarModel.xml
+++ b/config/alfresco/model/calendarModel.xml
@@ -71,6 +71,14 @@
             <property name="ia:isOutlook">
                <type>d:boolean</type>
             </property>
+            <property name="ia:outlookUID">
+               <title>Outlook UID</title>
+               <type>d:text</type>               
+               <mandatory>false</mandatory>               
+               <index enabled="true">
+                  <tokenised>false</tokenised>
+               </index>			               
+            </property>
          </properties>
          <associations>
             <child-association name="ia:ignoreEventList">
diff --git a/source/java/org/alfresco/repo/jscript/ScriptNode.java b/source/java/org/alfresco/repo/jscript/ScriptNode.java
index 9940dbd69d..0db313cb7b 100644
--- a/source/java/org/alfresco/repo/jscript/ScriptNode.java
+++ b/source/java/org/alfresco/repo/jscript/ScriptNode.java
@@ -82,6 +82,7 @@ import org.alfresco.service.cmr.version.VersionHistory;
 import org.alfresco.service.cmr.version.VersionType;
 import org.alfresco.service.cmr.workflow.WorkflowInstance;
 import org.alfresco.service.cmr.workflow.WorkflowService;
+import org.alfresco.service.namespace.NamespaceException;
 import org.alfresco.service.namespace.NamespacePrefixResolver;
 import org.alfresco.service.namespace.NamespacePrefixResolverProvider;
 import org.alfresco.service.namespace.NamespaceService;
@@ -2809,8 +2810,18 @@ public class ScriptNode implements Serializable, Scopeable, NamespacePrefixResol
                                = new LinkedHashMap<String, Serializable>(nodeProperties.size());
                        for (QName nextLongQName : nodeProperties.keySet())
                        {
-                           String nextShortQName = getShortQName(nextLongQName);
-                           nodePropertiesShortQNames.put(nextShortQName, nodeProperties.get(nextLongQName));
+                           try
+                           {
+                               String nextShortQName = getShortQName(nextLongQName);
+                               nodePropertiesShortQNames.put(nextShortQName, nodeProperties.get(nextLongQName));
+                           }
+                           catch (NamespaceException ne)
+                           {
+                               // ignore properties that do not have a registered namespace
+                               
+                               if (logger.isDebugEnabled())
+                                   logger.debug("Ignoring property '" + nextLongQName + "' as it's namespace is not registered");
+                           }
                        }
                        json.put("properties", nodePropertiesShortQNames);
                    }