From f5392323ff37a7b83b515b380138ac4f865ed5e1 Mon Sep 17 00:00:00 2001
From: yurem <Yuriy.Movchan@gmail.com>
Date: Wed, 21 Jun 2017 10:06:53 +0300
Subject: [PATCH] Remove deprecated parameters

---
 .../main/webapp/WEB-INF/incl/asimba/idpForm.xhtml    |  3 ---
 .../webapp/WEB-INF/incl/asimba/selectorForm.xhtml    |  3 ---
 .../main/webapp/WEB-INF/incl/asimba/spPoolForm.xhtml |  3 ---
 .../webapp/WEB-INF/incl/asimba/spRequestorForm.xhtml |  3 ---
 .../WEB-INF/incl/attribute/attributeForm.xhtml       |  2 --
 .../WEB-INF/incl/federation/joinFederationForm.xhtml |  2 --
 .../webapp/WEB-INF/incl/layout/newtemplate.xhtml     | 12 ------------
 .../main/webapp/WEB-INF/incl/layout/template.xhtml   | 12 ------------
 .../WEB-INF/incl/organization/organizationForm.xhtml |  3 ---
 .../incl/organization/organizationFormOld.xhtml      |  3 ---
 .../trustmanager/configureMetadataFiltersPanel.xhtml |  3 ---
 .../trustmanager/configureRelyingPartyPanel.xhtml    |  3 ---
 .../WEB-INF/incl/trustmanager/entityIdSelector.xhtml |  6 ------
 .../incl/trustmanager/federationDeconstruction.xhtml |  6 ------
 .../incl/trustmanager/trustRelationshipForm.xhtml    |  3 ---
 .../main/webapp/logviewer/configureLogViewer.xhtml   |  4 ----
 .../webapp/resources/ox/changePasswordDialog.xhtml   |  1 -
 .../webapp/resources/ox/createSPMetadataDialog.xhtml |  2 --
 18 files changed, 74 deletions(-)

diff --git a/server/src/main/webapp/WEB-INF/incl/asimba/idpForm.xhtml b/server/src/main/webapp/WEB-INF/incl/asimba/idpForm.xhtml
index cab897e6e..dfad8ee8f 100644
--- a/server/src/main/webapp/WEB-INF/incl/asimba/idpForm.xhtml
+++ b/server/src/main/webapp/WEB-INF/incl/asimba/idpForm.xhtml
@@ -63,9 +63,6 @@
         </h:form>
 
 	<h:form id="editIDPForm">
-            <!-- Workaround. TODO: Remove after upgrade to SEAM 2.3.1 -->
-            <input type='hidden' name='cid' value='#{conversation.id}' />
-            
             <div class="row">
                 <div class="col-xs-12">
             
diff --git a/server/src/main/webapp/WEB-INF/incl/asimba/selectorForm.xhtml b/server/src/main/webapp/WEB-INF/incl/asimba/selectorForm.xhtml
index 06182851b..4ddeaac5b 100644
--- a/server/src/main/webapp/WEB-INF/incl/asimba/selectorForm.xhtml
+++ b/server/src/main/webapp/WEB-INF/incl/asimba/selectorForm.xhtml
@@ -62,9 +62,6 @@
     
 
 	<h:form id="editSelectorForm">
-            <!-- Workaround. TODO: Remove after upgrade to SEAM 2.3.1 -->
-            <input type='hidden' name='cid' value='#{conversation.id}' />
-            
             <div class="row">
                 <div class="col-xs-12">
                     
diff --git a/server/src/main/webapp/WEB-INF/incl/asimba/spPoolForm.xhtml b/server/src/main/webapp/WEB-INF/incl/asimba/spPoolForm.xhtml
index aeaafdb69..381f83026 100644
--- a/server/src/main/webapp/WEB-INF/incl/asimba/spPoolForm.xhtml
+++ b/server/src/main/webapp/WEB-INF/incl/asimba/spPoolForm.xhtml
@@ -61,9 +61,6 @@
     </h:outputStylesheet>
 
 	<h:form id="editSPPoolForm">
-            <!-- Workaround. TODO: Remove after upgrade to SEAM 2.3.1 -->
-            <input type='hidden' name='cid' value='#{conversation.id}' />
-            
             <div class="row">
                 <div class="col-xs-12">
             
diff --git a/server/src/main/webapp/WEB-INF/incl/asimba/spRequestorForm.xhtml b/server/src/main/webapp/WEB-INF/incl/asimba/spRequestorForm.xhtml
index e32c247a1..73e900d14 100644
--- a/server/src/main/webapp/WEB-INF/incl/asimba/spRequestorForm.xhtml
+++ b/server/src/main/webapp/WEB-INF/incl/asimba/spRequestorForm.xhtml
@@ -65,9 +65,6 @@
         </h:form>
     
 	<h:form id="editSPRequestorForm">
-            <!-- Workaround. TODO: Remove after upgrade to SEAM 2.3.1 -->
-            <input type='hidden' name='cid' value='#{conversation.id}' />
-            
             <div class="row">
                 <div class="col-xs-12">
                     
diff --git a/server/src/main/webapp/WEB-INF/incl/attribute/attributeForm.xhtml b/server/src/main/webapp/WEB-INF/incl/attribute/attributeForm.xhtml
index ed753a99d..5294e5db9 100644
--- a/server/src/main/webapp/WEB-INF/incl/attribute/attributeForm.xhtml
+++ b/server/src/main/webapp/WEB-INF/incl/attribute/attributeForm.xhtml
@@ -10,8 +10,6 @@
     xmlns:fn="http://xmlns.jcp.org/jsp/jstl/functions">
 
     <h:form>
-    
-        <input type='hidden' name='cid' value='#{conversation.id}'/> <!-- Workaround which required by manual tab panel. TODO: Remove after upgrade to SEAM 2.3.1 -->
 <div class="row">
 			<div class="col-xs-12">
 				<div class="box box-primary">
diff --git a/server/src/main/webapp/WEB-INF/incl/federation/joinFederationForm.xhtml b/server/src/main/webapp/WEB-INF/incl/federation/joinFederationForm.xhtml
index 887a21dab..b8506e04d 100644
--- a/server/src/main/webapp/WEB-INF/incl/federation/joinFederationForm.xhtml
+++ b/server/src/main/webapp/WEB-INF/incl/federation/joinFederationForm.xhtml
@@ -29,8 +29,6 @@
     <ox:acceptRemovalDialog id="deleteConfirmation" subject="federation" value="#{joinFederationAction.federationProposal.displayName}" deleteMethod="#{joinFederationAction.delete}" queue="federationQueue" />
 
     <h:form enctype="multipart/form-data" id="joinFederationForm" rendered="#{_isFederation or (not empty federationService.allFederations)}">
-        <!-- Workaround which required by manual tab panel. TODO: Remove after upgrade to SEAM 2.3.1 -->
-        <input type='hidden' name='cid' value='#{conversation.id}' />
         <!--a4j:queue onrequestqueue="changeButtonsAvailability('updateButtons',false);" 
             onrequestdequeue="changeButtonsAvailability('updateButtons',true);"/-->
         <h:panelGrid columns="3" width="100%" columnClasses="attributeColumn, , formColumn" border="0" cellpadding="0" cellspacing="0">
diff --git a/server/src/main/webapp/WEB-INF/incl/layout/newtemplate.xhtml b/server/src/main/webapp/WEB-INF/incl/layout/newtemplate.xhtml
index 3735410d0..69b2dc769 100644
--- a/server/src/main/webapp/WEB-INF/incl/layout/newtemplate.xhtml
+++ b/server/src/main/webapp/WEB-INF/incl/layout/newtemplate.xhtml
@@ -129,18 +129,6 @@
 		<rich:notifyMessages stayTime="5000" nonblocking="true" />
 
 	    <div class="footer">
-			<ui:fragment rendered="#{init.debug}">
-				<a:log hotkey="D"/>
-				<p style="margin-top: -0.5em;">
-				   Conversation: id = #{conversation.id}, #{conversation.longRunning ? 'long running' : 'temporary'}#{conversation.nested ? ', nested, parent id = '.concat(conversation.parentId) : ''}
-				   #{' - '}
-				   Ajax4jsf Log (Ctrl+Shift+D)
-				   #{' - '}
-				   <h:link includeViewParams="false" id="debugConsole" outcome="/debug" value="Debug console" target="debugConsole"/>
-				   #{' - '}
-				   <h:link includeViewParams="false" id="resetSession" outcome="/home" action="#{org.jboss.seam.web.session.invalidate()}" value="Terminate session"/>
-				</p>
-			</ui:fragment>
 	    </div>
 	</h:body>
 </f:view>
diff --git a/server/src/main/webapp/WEB-INF/incl/layout/template.xhtml b/server/src/main/webapp/WEB-INF/incl/layout/template.xhtml
index ecdaa4f6c..08d001946 100644
--- a/server/src/main/webapp/WEB-INF/incl/layout/template.xhtml
+++ b/server/src/main/webapp/WEB-INF/incl/layout/template.xhtml
@@ -71,18 +71,6 @@
         </ui:fragment>
 
       <div class="footer">
-         <ui:fragment rendered="#{init.debug}">
-         <a:log hotkey="D"/>
-         <p style="margin-top: -0.5em;">
-            Conversation: id = #{conversation.id}, #{conversation.longRunning ? 'long running' : 'temporary'}#{conversation.nested ? ', nested, parent id = '.concat(conversation.parentId) : ''}
-            #{' - '}
-            Ajax4jsf Log (Ctrl+Shift+D)
-            #{' - '}
-            <h:link includeViewParams="false" id="debugConsole" outcome="/debug" value="Debug console" target="debugConsole"/>
-            #{' - '}
-            <h:link includeViewParams="false" id="resetSession" outcome="/home" action="#{org.jboss.seam.web.session.invalidate()}" value="Terminate session"/>
-         </p>
-         </ui:fragment>
       </div>
     </h:body>
 </f:view>
diff --git a/server/src/main/webapp/WEB-INF/incl/organization/organizationForm.xhtml b/server/src/main/webapp/WEB-INF/incl/organization/organizationForm.xhtml
index ca6622774..099ec8d8c 100644
--- a/server/src/main/webapp/WEB-INF/incl/organization/organizationForm.xhtml
+++ b/server/src/main/webapp/WEB-INF/incl/organization/organizationForm.xhtml
@@ -79,9 +79,6 @@
     </h:outputScript>
 
 	<h:form id="organizationForm">
-		<!-- Workaround. TODO: Remove after upgrade to SEAM 2.3.1 -->
-		<input type='hidden' name='cid' value='#{conversation.id}' />
-
 		<div class="row">
 			<div class="col-xs-12">
 				<div class="nav-tabs-custom" style="margin-bottom: 0px;">
diff --git a/server/src/main/webapp/WEB-INF/incl/organization/organizationFormOld.xhtml b/server/src/main/webapp/WEB-INF/incl/organization/organizationFormOld.xhtml
index 56ff44dfc..a1c1db9f8 100644
--- a/server/src/main/webapp/WEB-INF/incl/organization/organizationFormOld.xhtml
+++ b/server/src/main/webapp/WEB-INF/incl/organization/organizationFormOld.xhtml
@@ -78,9 +78,6 @@
                              setPasswordMethod="#{appliancePasswordAction.update}"/>
 
     <h:form id="organizationForm">
-        <!-- Workaround. TODO: Remove after upgrade to SEAM 2.3.1 -->
-        <input type='hidden' name='cid' value='#{conversation.id}'/>
-
         <div class="row">
             <div class="col-xs-12">
                 <div class="nav-tabs-custom" style="margin-bottom: 0px;">
diff --git a/server/src/main/webapp/WEB-INF/incl/trustmanager/configureMetadataFiltersPanel.xhtml b/server/src/main/webapp/WEB-INF/incl/trustmanager/configureMetadataFiltersPanel.xhtml
index b25569623..bade955e6 100644
--- a/server/src/main/webapp/WEB-INF/incl/trustmanager/configureMetadataFiltersPanel.xhtml
+++ b/server/src/main/webapp/WEB-INF/incl/trustmanager/configureMetadataFiltersPanel.xhtml
@@ -19,9 +19,6 @@
         </f:facet>
 
         <h:form>
-            <!-- Workaround which required by manual tab panel. TODO: Remove after upgrade to SEAM 2.3.1 -->
-            <input type='hidden' name='cid' value='#{conversation.id}' />
-
             <h:panelGrid columns="1" id="MetadataFilterMenu">
                 <rich:pickList id="metadataFilterSelection" value="#{metadataFiltersAction.metadataFilters}"
                     listsHeight="150" listWidth="130" sourceCaption="#{msg['trustmanager.availableFilter']}" targetCaption="Selected Filters">
diff --git a/server/src/main/webapp/WEB-INF/incl/trustmanager/configureRelyingPartyPanel.xhtml b/server/src/main/webapp/WEB-INF/incl/trustmanager/configureRelyingPartyPanel.xhtml
index 04ea93223..f2f569792 100644
--- a/server/src/main/webapp/WEB-INF/incl/trustmanager/configureRelyingPartyPanel.xhtml
+++ b/server/src/main/webapp/WEB-INF/incl/trustmanager/configureRelyingPartyPanel.xhtml
@@ -76,9 +76,6 @@
         </f:facet>
 
         <h:form>
-            <!-- Workaround which required by manual tab panel. TODO: Remove after upgrade to SEAM 2.3.1 -->
-            <input type='hidden' name='cid' value='#{conversation.id}' />
-
             <h:panelGrid columns="1" id="RelyingPartyMenu" width="700"  style="margin: 0 auto; ">
                 <rich:pickList id="profileConfigurationSelection" value="#{relyingPartyAction.profileConfigurations}"
                     listsHeight="150" listWidth="230" sourceCaption="#{msg['trustmanager.availableProfileConfigurations']}" targetCaption="#{msg['trustmanager.selectedProfileConfigurations']}">
diff --git a/server/src/main/webapp/WEB-INF/incl/trustmanager/entityIdSelector.xhtml b/server/src/main/webapp/WEB-INF/incl/trustmanager/entityIdSelector.xhtml
index 615d7f404..9866b3e4b 100644
--- a/server/src/main/webapp/WEB-INF/incl/trustmanager/entityIdSelector.xhtml
+++ b/server/src/main/webapp/WEB-INF/incl/trustmanager/entityIdSelector.xhtml
@@ -28,9 +28,6 @@
 
         <h:panelGrid columns="1" id="entityIdSelectionMenu">
             <h:form>
-                <!-- Workaround which required by manual tab panel. TODO: Remove after upgrade to SEAM 2.3.1 -->
-                <input type='hidden' name='cid' value='#{conversation.id}' />
-
                 <h:panelGrid columns="3">
                     <h:outputText value="#{msg['trustmanager.filter']}: " />
                     <h:inputText value="#{_trustRelationshipAction.filterString}">
@@ -40,9 +37,6 @@
                 </h:panelGrid>
             </h:form>
             <h:form>
-                <!-- Workaround which required by manual tab panel. TODO: Remove after upgrade to SEAM 2.3.1 -->
-                <input type='hidden' name='cid' value='#{conversation.id}' />
-
                 <h:panelGroup id="EntityIds">
                     <h:selectManyListbox value="#{_trustRelationshipAction.selectedEntities}" styleClass="width: 450px;" size="10">
                         <f:selectItems value="#{_trustRelationshipAction.availableEntities}"/>
diff --git a/server/src/main/webapp/WEB-INF/incl/trustmanager/federationDeconstruction.xhtml b/server/src/main/webapp/WEB-INF/incl/trustmanager/federationDeconstruction.xhtml
index b22b0dba5..06ff380db 100644
--- a/server/src/main/webapp/WEB-INF/incl/trustmanager/federationDeconstruction.xhtml
+++ b/server/src/main/webapp/WEB-INF/incl/trustmanager/federationDeconstruction.xhtml
@@ -27,9 +27,6 @@
 
         <h:panelGrid columns="1" id="federationDeconstructionMenu">
             <h:form>
-                <!-- Workaround which required by manual tab panel. TODO: Remove after upgrade to SEAM 2.3.1 -->
-                <input type='hidden' name='cid' value='#{conversation.id}' />
-
                 <h:panelGrid columns="3">
                     <h:outputText value="Filter: " />
                     <h:inputText value="#{federationDeconstructionAction.filterString}">
@@ -41,9 +38,6 @@
             </h:form>
 
             <h:form>
-                <!-- Workaround which required by manual tab panel. TODO: Remove after upgrade to SEAM 2.3.1 -->
-                <input type='hidden' name='cid' value='#{conversation.id}' />
-
                 <rich:pickList id="federationDeconstructionSelection" value="#{federationDeconstructionAction.managedEntities}"
                     listsHeigh="150" listWidth="230" sourceCaption="#{msg['trustmanager.availableFederationMembers']}"
                     targetCaption="#{msg['trustmanager.membersSelectedForIndividualsConfiguration']}">
diff --git a/server/src/main/webapp/WEB-INF/incl/trustmanager/trustRelationshipForm.xhtml b/server/src/main/webapp/WEB-INF/incl/trustmanager/trustRelationshipForm.xhtml
index 4e35a2b43..0b11eecd1 100644
--- a/server/src/main/webapp/WEB-INF/incl/trustmanager/trustRelationshipForm.xhtml
+++ b/server/src/main/webapp/WEB-INF/incl/trustmanager/trustRelationshipForm.xhtml
@@ -116,9 +116,6 @@
 	<ui:include src="/WEB-INF/incl/trustmanager/entityIdSelector.xhtml" />
 
 	<h:form enctype="multipart/form-data" id="trustForm">
-		<!-- Workaround which required by manual tab panel. TODO: Remove after upgrade to SEAM 2.3.1 -->
-		<input type='hidden' name='cid' value='#{conversation.id}' />
-
 		<!--a4j:queue onrequestqueue="changeButtonsAvailability('updateButtons',false);" onrequestdequeue="changeButtonsAvailability('updateButtons',true);" /-->
 		<h:panelGrid columns="2" width="100%"
 			columnClasses="formColumn, formColumn" border="0"
diff --git a/server/src/main/webapp/logviewer/configureLogViewer.xhtml b/server/src/main/webapp/logviewer/configureLogViewer.xhtml
index c7c71c108..505a12c58 100644
--- a/server/src/main/webapp/logviewer/configureLogViewer.xhtml
+++ b/server/src/main/webapp/logviewer/configureLogViewer.xhtml
@@ -34,10 +34,6 @@
             <div id="formArea">
                 <h:form id="logViewerForm">
                     <f:validateBean>
-                    <!-- Workaround which required by manual tab panel. TODO: Remove after upgrade to SEAM 2.3.1 -->
-                    <input name="cid" type="hidden" value="#{conversation.id}"/>
-
-
                     <div class="row">
 
                         <div class="col-xs-12">
diff --git a/server/src/main/webapp/resources/ox/changePasswordDialog.xhtml b/server/src/main/webapp/resources/ox/changePasswordDialog.xhtml
index 1439c61ce..f4fe25086 100644
--- a/server/src/main/webapp/resources/ox/changePasswordDialog.xhtml
+++ b/server/src/main/webapp/resources/ox/changePasswordDialog.xhtml
@@ -39,7 +39,6 @@
         </h:outputStylesheet>
 
         <h:form id="changePasswordForm">
-            <input type='hidden' name='cid' value='#{conversation.id}'/> <!-- Workaround which required by manual tab panel. TODO: Remove after upgrade to SEAM 2.3.1 -->
             <rich:graphValidator value="#{passwordValidationAction}" id="gv" binding="#{cc.attrs.validatorBinding}">
                 <rich:messages for="gv" />
 
diff --git a/server/src/main/webapp/resources/ox/createSPMetadataDialog.xhtml b/server/src/main/webapp/resources/ox/createSPMetadataDialog.xhtml
index 99262b07e..72b92dcb1 100644
--- a/server/src/main/webapp/resources/ox/createSPMetadataDialog.xhtml
+++ b/server/src/main/webapp/resources/ox/createSPMetadataDialog.xhtml
@@ -37,8 +37,6 @@
         </h:outputStylesheet>
 
                 <h:form id="generateMetadata">
-            <input type='hidden' name='cid' value='#{conversation.id}'/> <!-- Workaround which required by manual tab panel. TODO: Remove after upgrade to SEAM 2.3.1 -->
-            
                 <rich:messages for="gv" />
 
                 <h:panelGrid id="metadataGroupId" columns="2">