From 651cad53fca40d2d0aa204636972ec2d5c93d6ed Mon Sep 17 00:00:00 2001
From: Derek Hulley <derek.hulley@alfresco.com>
Date: Tue, 10 Mar 2009 13:29:24 +0000
Subject: [PATCH] Merged V3.1 to HEAD    Merged DEV/LIVECYCLE-3.1 to V3.1      
 12665: Merged V2.1-A to DEV\LIVECYCLE-3.1          8615: Cluster startup and
 property setting enhancements          8657: Fixed shutdown procedure for
 JGroups          8676: Enable system property overriding of more JGroups TCP
 stack properties                -  ${alfresco.tcp.start_port:7800}           
     -  ${alfresco.tcp.port_range:3}          8678: More logging of cluster
 view changes and channel factory config during startup       12667: Merged
 V2.1-A to DEV/LIVECYCLE-3.1          9188: Index recovery job only calls
 through if property 'alfresco.cluster.name' has been set          9197: Fixed
 unit test after bean property name change       12793: Merged V2.1-A to
 DEV/LIVECYCLE-3.1          7765: Requested mimetypes          8526: Updated
 Mimetypes          8610: Mimetype changes          Many branding and other
 non-core changes were omitted       12848: Fixed JAWS-223: Adobe LC Hibernate
 Dialect Loading              - Hibernate dialect can be null or empty and
 will be autodetected from the database metadata              - Property
 'hibernate.dialect' is set on the System              - iBatis loading
 (activities) checks for 'hibernate.dialect'              - SchemaBootstrap
 checks for 'hibernate.dialect'       12854: Merged V2.1-A to
 DEV/LIVECYCLE-3.1          8681: Fixed mimetype 'application/photoshop'      
 12856: Merged V2.1-A to DEV/LIVECYCLE-3.1          9008: Fixed ADB-64: NPE
 when applying aspect cm:mlDocument       12857: Merged V2.1-A to
 DEV/LIVECYCLE-3.1          9032: ACT-2303: "Namespace is displayed in the
 Node browser is www.alfresco.org ...   
 ___________________________________________________________________   
 Modified: svn:mergeinfo       Merged
 /alfresco/BRANCHES/V2.1-A:r7765,8526,8610,8615,8657,8676,8678,9188,9197      
 Merged /alfresco/BRANCHES/V3.1:r12894       Merged
 /alfresco/BRANCHES/DEV/LIVECYCLE-3.1:r12665,12667,12793,12848,12854,12856-12857

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13518 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 source/web/jsp/admin/node-browser.jsp   | 10 +++++-----
 source/web/jsp/admin/search-results.jsp |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/source/web/jsp/admin/node-browser.jsp b/source/web/jsp/admin/node-browser.jsp
index 58c58226a5..2c2d6bb71e 100644
--- a/source/web/jsp/admin/node-browser.jsp
+++ b/source/web/jsp/admin/node-browser.jsp
@@ -222,7 +222,7 @@
               <f:facet name="header">
                   <h:outputText value="Child Name"/>
               </f:facet>
-              <h:outputText value="#{child.QName}"/>
+              <h:outputText value="#{child.QName.prefixString}"/>
           </h:column>
           <h:column>
               <f:facet name="header">
@@ -242,7 +242,7 @@
               <f:facet name="header">
                   <h:outputText value="Association Type"/>
               </f:facet>
-              <h:outputText value="#{child.typeQName}"/>
+              <h:outputText value="#{child.typeQName.prefixString}"/>
           </h:column>
           <h:column>
               <f:facet name="header">
@@ -269,7 +269,7 @@
               <f:facet name="header">
                   <h:outputText value="Association Type"/>
               </f:facet>
-              <h:outputText value="#{assoc.typeQName}"/>
+              <h:outputText value="#{assoc.typeQName.prefixString}"/>
           </h:column>
       </h:dataTable>
    
@@ -281,7 +281,7 @@
               <f:facet name="header">
                   <h:outputText value="Child Name"/>
               </f:facet>
-              <h:outputText value="#{parent.QName}"/>
+              <h:outputText value="#{parent.QName.prefixString}"/>
           </h:column>
           <h:column>
               <f:facet name="header">
@@ -301,7 +301,7 @@
               <f:facet name="header">
                   <h:outputText value="Association Type"/>
               </f:facet>
-              <h:outputText value="#{parent.typeQName}"/>
+              <h:outputText value="#{parent.typeQName.prefixString}"/>
           </h:column>
       </h:dataTable>
       
diff --git a/source/web/jsp/admin/search-results.jsp b/source/web/jsp/admin/search-results.jsp
index 1d31bbc86a..38ede512e6 100644
--- a/source/web/jsp/admin/search-results.jsp
+++ b/source/web/jsp/admin/search-results.jsp
@@ -71,7 +71,7 @@
                   <h:outputText value="Name"/>
               </f:facet>
               <h:commandLink action="#{AdminNodeBrowseBean.selectResultNode}">
-              	   <h:outputText value="#{row.QName}"/>
+              	   <h:outputText value="#{row.QName.prefixString}"/>
               </h:commandLink>
           </h:column>
           <h:column>