Index: branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/jsp/management/plugins/preferences.xhtml
===================================================================
diff -u -N -r5067 -r6548
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/jsp/management/plugins/preferences.xhtml	(.../JBoss_Portal_Branch_2_2/core/src/resources/portal-core-war/WEB-INF/jsp/management/plugins/preferences.xhtml)	(revision 5067)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/jsp/management/plugins/preferences.xhtml	(.../JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/jsp/management/plugins/preferences.xhtml)	(revision 6548)
@@ -7,13 +7,14 @@
 <br/>
 <h:panelGroup
       id="panel2"
-      rendered="#{instancemgr.selectedInstance != null}">
+      rendered="#{preferences != null}">
    <h:form>
       <t:dataTable
             id="data__"
             var="row"
-            value="#{instancemgr.selectedPreferences}"
-            rowClasses="portlet-section-body,portlet-section-alternate">
+            value="#{preferences.model}"
+            rowClasses="portlet-section-body,portlet-section-alternate"
+            preserveDataModel="true">
          <h:column>
             <f:facet name="header">
                <h:outputText value="Key"/>
@@ -22,9 +23,9 @@
          </h:column>
          <h:column>
             <f:facet name="header">
-               <h:outputText value="Description"/>
+               <h:outputText value="Name"/>
             </f:facet>
-            <h:outputText value="#{row.description}"/>
+            <h:outputText value="#{row.name}"/>
          </h:column>
          <h:column>
             <f:facet name="header">
@@ -36,61 +37,47 @@
             <f:facet name="header">
                <h:outputText value="Value"/>
             </f:facet>
+            <h:commandLink
+               rendered="#{row.cell.value != null and preferences.model.mutable}"
+               action="#{action.selectRow}">
+               <h:graphicImage
+                  value="/images/management/edit.png"
+                  border="0"
+                  alt="Edit"
+                  style="vertical-align:middle;"/>
+            </h:commandLink>
+            <h:commandLink
+               rendered="#{row.cell.value != null and preferences.model.mutable}"
+               action="#{action.deleteCell}">
+               <h:graphicImage
+                  value="/images/management/delete.png"
+                  border="0"
+                  alt="Delete"
+                  style="vertical-align:middle;"/>
+            </h:commandLink>
             <h:outputText value="#{row.value}"/>
          </h:column>
-         <t:columns value="#{instancemgr.selectedPreferences.colIndices}" var="index">
-            <f:facet name="header">
-               <h:outputText value="#{instancemgr.selectedPreferences.colDefs[index].label}"/>
-            </f:facet>
-            <h:panelGroup
-                  rendered="#{row.cells[index].mutable}">
-               <h:commandLink
-                     rendered="#{row.cells[index].value != null}"
-                     action="#{preferenceAction.selectCell}">
-                  <h:graphicImage value="/images/management/edit.png" border="0" alt="Edit"
-                                  style="vertical-align:middle;"/>
-                  <!--<h:outputText-->
-                  <!--value="#{row.cells[index].value}"/>-->
-               </h:commandLink>
-               <h:commandLink
-                     rendered="#{row.cells[index].value != null}"
-                     action="#{preferenceAction.deleteCell}">
-                  <h:graphicImage value="/images/management/delete.png" border="0" alt="Delete"
-                                  style="vertical-align:middle;"/>
-               </h:commandLink>
-               <h:commandLink
-                     rendered="#{row.cells[index].value == null}"
-                     action="#{preferenceAction.createCell}">
-                  <h:graphicImage value="/images/management/create.png" border="0" alt="Create"
-                                  style="vertical-align:middle;"/>
-               </h:commandLink>
-            </h:panelGroup>
-            <h:panelGroup
-                  rendered="#{!row.cells[index].mutable}">
-               <h:outputText value="#{row.cells[index].value}"/>
-            </h:panelGroup>
-         </t:columns>
       </t:dataTable>
    </h:form>
 </h:panelGroup>
 <h:panelGroup
-      id="panel3"
-      rendered="#{instancemgr.selectedPreference != null}">
+   id="panel3"
+   rendered="#{preferences.selectedPreference != null}">
    <h:form>
       <t:dataTable
             id="string_values"
             var="row"
-            value="#{instancemgr.selectedPreference.valueIndices}">
+            value="#{preferences.selectedPreference.valueIndices}">
          <h:column>
-            <h:inputText value="#{instancemgr.selectedPreference.value[row]}"/>
-            <h:commandButton action="#{preferenceAction.deleteLine}" value="Delete"/>
+            <h:inputText value="#{preferences.selectedPreference.value[row]}"/>
+            <h:commandButton action="#{action.deleteLine}" value="Delete"/>
          </h:column>
       </t:dataTable>
-      <h:commandButton action="#{preferenceAction.updateCell}" value="Update"/>
+      <h:commandButton action="#{action.updateCell}" value="Update"/>
    </h:form>
    <h:form>
-      <h:inputText value="#{preferenceAction.appendedValue}"/>
-      <h:commandButton action="#{preferenceAction.appendLine}" value="Append"/>
+      <h:inputText value="#{action.appendedValue}"/>
+      <h:commandButton action="#{action.appendLine}" value="Append"/>
    </h:form>
 </h:panelGroup>
 </div>
Index: branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/jsp/management/plugins/properties.xhtml
===================================================================
diff -u -N -r5067 -r6548
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/jsp/management/plugins/properties.xhtml	(.../JBoss_Portal_Branch_2_2/core/src/resources/portal-core-war/WEB-INF/jsp/management/plugins/properties.xhtml)	(revision 5067)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/jsp/management/plugins/properties.xhtml	(.../JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/jsp/management/plugins/properties.xhtml)	(revision 6548)
@@ -1,55 +1,93 @@
 <div
-      xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:ui="http://java.sun.com/jsf/facelets"
-      xmlns:h="http://java.sun.com/jsf/html"
-      xmlns:f="http://java.sun.com/jsf/core"
-      xmlns:t="http://myfaces.apache.org/tomahawk">
+   xmlns="http://www.w3.org/1999/xhtml"
+   xmlns:ui="http://java.sun.com/jsf/facelets"
+   xmlns:h="http://java.sun.com/jsf/html"
+   xmlns:f="http://java.sun.com/jsf/core"
+   xmlns:t="http://myfaces.apache.org/tomahawk">
    <br/>
    <h:outputText style="font-weight:bold;" value="Name: "/>
    <h:outputText value="#{portalobjectmgr.selectedObject.name}"/>
    <f:verbatim><br/><br/></f:verbatim>
 
    <h:panelGroup
-         rendered="#{portalobjectmgr.selectedObject.type==0}">
+      rendered="#{portalobjectmgr.selectedObject.type==0}">
       <h:outputText style="font-weight:bold;" value="Type: "/>
       <f:verbatim>CONTEXT<br/></f:verbatim>
    </h:panelGroup>
    <h:panelGroup
-         rendered="#{portalobjectmgr.selectedObject.type==1}">
+      rendered="#{portalobjectmgr.selectedObject.type==1}">
       <h:outputText style="font-weight:bold;" value="Type: "/>
       <f:verbatim>PORTAL<br/></f:verbatim>
    </h:panelGroup>
    <h:panelGroup
-         rendered="#{portalobjectmgr.selectedObject.type==2}">
+      rendered="#{portalobjectmgr.selectedObject.type==2}">
       <h:outputText style="font-weight:bold;" value="Type: "/>
       <f:verbatim>PAGE<br/></f:verbatim>
    </h:panelGroup>
    <h:panelGroup
-         rendered="#{portalobjectmgr.selectedObject.type==3}">
+      rendered="#{portalobjectmgr.selectedObject.type==3}">
       <h:outputText style="font-weight:bold;" value="Type: "/>
       <f:verbatim>WINDOW<br/></f:verbatim>
    </h:panelGroup>
    <br/><br/>
 
    <h:panelGroup
-         id="prop_a">
-      <t:dataTable
+      id="prop_a">
+      <h:form id="properties_form">
+         <t:dataTable
             id="data"
             var="p"
             value="#{portalobjectmgr.selectedProperties}"
-            rowClasses="portlet-section-body,portlet-section-alternate">
-         <h:column>
-            <f:facet name="header">
-               <h:outputText value="Name"/>
-            </f:facet>
-            <h:outputText value="#{p[0]}"/>
-         </h:column>
-         <h:column>
-            <f:facet name="header">
-               <h:outputText value="Value"/>
-            </f:facet>
-            <h:outputText value="#{p[1]}"/>
-         </h:column>
-      </t:dataTable>
+            binding="#{propertyAction.propertyDataTable}"
+            rowClasses="portlet-section-body,portlet-section-alternate"
+            preserveDataModel="true">
+            <h:column>
+               <f:facet id="the_id_that_fixes_the_bug_1" name="header">
+                  <h:outputText id="the_id_that_fixes_the_bug_2" value="Operations"/>
+               </f:facet>
+               <h:commandLink
+                  id="properties_form_link1"
+                  action="#{propertyAction.selectProperty}">
+                  <h:graphicImage
+                     value="/images/management/edit.png"
+                     border="0"
+                     alt="Edit"
+                     style="vertical-align:middle;"/>
+               </h:commandLink>
+               <h:commandLink
+                  id="properties_form_link2"
+                  action="#{propertyAction.removeProperty}">
+                  <h:graphicImage
+                     value="/images/management/delete.png"
+                     border="0"
+                     alt="Delete"
+                     style="vertical-align:middle;"/>
+               </h:commandLink>
+               <h:outputText value="#{row.value}"/>
+            </h:column>
+            <h:column>
+               <f:facet id="the_id_that_fixes_the_bug_3" name="header">
+                  <h:outputText id="the_id_that_fixes_the_bug_4" value="Name"/>
+               </f:facet>
+               <h:outputText value="#{p[0]}"/>
+            </h:column>
+            <h:column>
+               <f:facet id="the_id_that_fixes_the_bug_5" name="header">
+                  <h:outputText id="the_id_that_fixes_the_bug_6" value="Value"/>
+               </f:facet>
+               <h:outputText value="#{p[1]}"/>
+            </h:column>
+         </t:dataTable>
+         <br/>
+         <h:messages style="color: red"/>
+         <h:outputText style="font-weight:bold;" value="Property Name: "/>
+         <h:inputText value="#{propertyAction.selectedProperty}"
+                       validator="#{propertyAction.validatePropertyName}" />
+         <br/>
+         <h:outputText style="font-weight:bold;" value="Property Value: "/>
+         <h:inputText value="#{propertyAction.propertyValue}"/>
+         <br/>
+         <h:commandButton action="#{propertyAction.updateProperty}" value="Update"/>
+      </h:form>
    </h:panelGroup>
 </div>
Index: branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/jsp/management/plugins/security.xhtml
===================================================================
diff -u -N -r5067 -r6548
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/jsp/management/plugins/security.xhtml	(.../JBoss_Portal_Branch_2_2/core/src/resources/portal-core-war/WEB-INF/jsp/management/plugins/security.xhtml)	(revision 5067)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/jsp/management/plugins/security.xhtml	(.../JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/jsp/management/plugins/security.xhtml)	(revision 6548)
@@ -12,7 +12,8 @@
          <t:dataTable
                id="dataconstraints"
                var="role"
-               value="#{auth.roles}">
+               value="#{auth.roles}"
+               preserveDataModel="true">
             <h:column
                   id="role_column">
                <f:facet name="header">