Author: chris.laprun(a)jboss.com
Date: 2010-02-11 05:50:37 -0500 (Thu, 11 Feb 2010)
New Revision: 1631
Modified:
components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerBean.java
components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ManagedBean.java
components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/classes/Resource.properties
components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/classes/Resource_fr.properties
components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/faces-config.xml
components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/xhtml/commandButton.xhtml
components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/xhtml/commandLink.xhtml
components/wsrp/trunk/admin-gui/src/main/webapp/jsf/common/template.xhtml
components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/confirmEraseRegistration.xhtml
components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumers.xhtml
components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/editConsumer.xhtml
components/wsrp/trunk/admin-gui/src/main/webapp/jsf/error.xhtml
components/wsrp/trunk/admin-gui/src/main/webapp/jsf/management/management.xhtml
components/wsrp/trunk/admin-gui/src/main/webapp/jsf/producer/confirmPropDeletion.xhtml
Log:
- Added support for WS timeout in Consumer configuration.
- Fixed webui:commandButton so that it properly honors rendered attribute and use it where
possible.
- Added ConsumerBean.confirmEraseRegistration() to be able to use webui:commandButton as
it doesn't seem possible to pass an outcome to commandLink in facelets components.
- Added support for specifying a default action (called cancel) on ManagedBeans to allow
abandonning current operation and redisplaying current page.
- Set cancelOutcome property in faces-config.xml for ManagedBeans.
- Use cancel action in confirmation dialogs.
- Removed unused title template param.
Modified:
components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerBean.java
===================================================================
---
components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerBean.java 2010-02-11
10:49:16 UTC (rev 1630)
+++
components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerBean.java 2010-02-11
10:50:37 UTC (rev 1631)
@@ -140,6 +140,16 @@
getProducerInfo().setExpirationCacheSeconds((Integer)modifyIfNeeded(getCache(),
cache, "cache", false));
}
+ public Integer getTimeout()
+ {
+ return getProducerInfo().getEndpointConfigurationInfo().getWSOperationTimeOut();
+ }
+
+ public void setTimeout(Integer timeout)
+ {
+
getProducerInfo().getEndpointConfigurationInfo().setWSOperationTimeOut((Integer)modifyIfNeeded(getTimeout(),
timeout, "timeout", false));
+ }
+
public String getWsdl()
{
return wsdl;
@@ -294,6 +304,11 @@
return internalUpdate(true);
}
+ public String confirmEraseRegistration()
+ {
+ return "confirmEraseRegistration";
+ }
+
private String internalUpdate(boolean showMessage)
{
if (consumer != null)
Modified:
components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ManagedBean.java
===================================================================
---
components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ManagedBean.java 2010-02-11
10:49:16 UTC (rev 1630)
+++
components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ManagedBean.java 2010-02-11
10:50:37 UTC (rev 1631)
@@ -1,6 +1,6 @@
/*
* JBoss, a division of Red Hat
- * Copyright 2009, Red Hat Middleware, LLC, and individual
+ * Copyright 2010, Red Hat Middleware, LLC, and individual
* contributors as indicated by the @authors tag. See the
* copyright.txt in the distribution for a full listing of
* individual contributors.
@@ -39,6 +39,9 @@
protected Logger log = Logger.getLogger(getClass());
protected BeanContext beanContext;
+
+ private String cancelOutcome;
+
public static final String INVALID_NAME = "INVALID_NAME_ERROR";
public static final String INVALID_PATH = "INVALID_PATH_ERROR";
public static final String DUPLICATE = "DUPLICATE_ERROR";
@@ -70,6 +73,11 @@
this.beanContext = beanContext;
}
+ public void setCancelOutcome(String cancelOutcome)
+ {
+ this.cancelOutcome = cancelOutcome;
+ }
+
public String checkNameValidity(String name, String targetForErrorMessage)
{
return checkNameValidity(name, targetForErrorMessage, validator);
@@ -237,4 +245,13 @@
return ParameterValidation.XSS_CHECK;
}
}
+
+ /**
+ * Default action: returns to outcome specified by {@link #setCancelOutcome(String)}
+ * @return
+ */
+ public String cancel()
+ {
+ return cancelOutcome;
+ }
}
Modified:
components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/classes/Resource.properties
===================================================================
---
components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/classes/Resource.properties 2010-02-11
10:49:16 UTC (rev 1630)
+++
components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/classes/Resource.properties 2010-02-11
10:50:37 UTC (rev 1631)
@@ -80,6 +80,8 @@
edit_consumer_producer = Producer id:
edit_consumer_cache = Cache expiration:
edit_consumer_cache_seconds = (seconds before expiration)
+edit_consumer_timeout = Timeout for WS operations:
+edit_consumer_timeout_milliseconds = (milliseconds before timeout)
edit_consumer_endpoint = Endpoint configuration:
edit_consumer_registration = Registration information:
edit_consumer_registration_current = Current registration information:
Modified:
components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/classes/Resource_fr.properties
===================================================================
---
components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/classes/Resource_fr.properties 2010-02-11
10:49:16 UTC (rev 1630)
+++
components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/classes/Resource_fr.properties 2010-02-11
10:50:37 UTC (rev 1631)
@@ -143,4 +143,6 @@
consumers_table_reload=Recharger consommateurs
CONSUMER_TYPE=Consommateur
DUPLICATE_ERROR=Un {1} nomm\u00e9 ''{0}'' existe d\u00e9j\u00e0!
-INVALID_NAME_ERROR=''{0}'' est un nom invalide pour un {1} : Ne peut pas
\u00eatre null, vide ou contenir '/', '.', '\\', '<',
'>', '(', ')', '=' ou '%5c'
\ No newline at end of file
+INVALID_NAME_ERROR=''{0}'' est un nom invalide pour un {1} : Ne peut pas
\u00eatre null, vide ou contenir '/', '.', '\\', '<',
'>', '(', ')', '=' ou '%5c'
+edit_consumer_timeout=Timeout des op�rations WS:
+edit_consumer_timeout_milliseconds=(millisecondes avant timeout)
\ No newline at end of file
Modified: components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/faces-config.xml 2010-02-11
10:49:16 UTC (rev 1630)
+++ components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/faces-config.xml 2010-02-11
10:50:37 UTC (rev 1631)
@@ -69,6 +69,10 @@
<property-class>org.gatein.wsrp.admin.ui.BeanContext</property-class>
<value>#{beanContext}</value>
</managed-property>
+ <managed-property>
+ <property-name>cancelOutcome</property-name>
+ <value>consumers</value>
+ </managed-property>
</managed-bean>
<managed-bean>
<managed-bean-name>consumer</managed-bean-name>
@@ -92,6 +96,10 @@
<property-name>manager</property-name>
<value>#{consumersMgr}</value>
</managed-property>
+ <managed-property>
+ <property-name>cancelOutcome</property-name>
+ <value>configureConsumer</value>
+ </managed-property>
</managed-bean>
<managed-bean>
<managed-bean-name>producer</managed-bean-name>
@@ -107,6 +115,10 @@
<property-class>org.gatein.wsrp.admin.ui.BeanContext</property-class>
<value>#{beanContext}</value>
</managed-property>
+ <managed-property>
+ <property-name>cancelOutcome</property-name>
+ <value>producer</value>
+ </managed-property>
</managed-bean>
<managed-bean>
<managed-bean-name>resource</managed-bean-name>
Modified:
components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/xhtml/commandButton.xhtml
===================================================================
---
components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/xhtml/commandButton.xhtml 2010-02-11
10:49:16 UTC (rev 1630)
+++
components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/xhtml/commandButton.xhtml 2010-02-11
10:50:37 UTC (rev 1631)
@@ -22,26 +22,38 @@
-->
<ui:composition
xmlns="http://www.w3.org/1999/xhtml"
-
xmlns:f="http://java.sun.com/jsf/core"
-
xmlns:ui="http://java.sun.com/jsf/facelets"
-
xmlns:h="http://java.sun.com/jsf/html"
-
xmlns:c="http://java.sun.com/jstl/core">
+
xmlns:f="http://java.sun.com/jsf/core"
+
xmlns:ui="http://java.sun.com/jsf/facelets"
+
xmlns:h="http://java.sun.com/jsf/html"
+
xmlns:c="http://java.sun.com/jstl/core">
-<table class="ActionContainer">
- <tr>
- <td>
+ <table class="ActionContainer">
+ <tr>
+ <td>
<div class="ButtonLeft">
- <div class="ButtonRight">
- <div class="ButtonMiddle">
- <h:commandLink id="#{id}"
action="#{backingBean[action]}"
- value="#{value}"
immediate="#{immediate}">
- <ui:insert/>
- </h:commandLink>
- </div>
- </div>
+ <div class="ButtonRight">
+ <div class="ButtonMiddle">
+ <c:choose>
+ <c:when test="#{!empty rendered}">
+ <!-- direct access to a bean's property via map is a
dirty, dirty hack :/ -->
+ <c:set var="renderedVar"
value="#{backingBean[rendered]}" scope="request"/>
+ <h:commandLink id="#{id}"
action="#{backingBean[action]}" value="#{value}"
+ rendered="#{empty renderedVar ? ''
: renderedVar}"
+ immediate="#{immediate}">
+ <ui:insert/>
+ </h:commandLink>
+ </c:when>
+ <c:otherwise>
+ <h:commandLink id="#{id}"
action="#{backingBean[action]}" value="#{value}"
+ immediate="#{immediate}">
+ <ui:insert/>
+ </h:commandLink>
+ </c:otherwise></c:choose>
+ </div>
+ </div>
</div>
- </td>
- </tr>
-</table>
+ </td>
+ </tr>
+ </table>
</ui:composition>
\ No newline at end of file
Modified:
components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/xhtml/commandLink.xhtml
===================================================================
---
components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/xhtml/commandLink.xhtml 2010-02-11
10:49:16 UTC (rev 1630)
+++
components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/xhtml/commandLink.xhtml 2010-02-11
10:50:37 UTC (rev 1631)
@@ -33,8 +33,7 @@
<div class="ButtonLeft">
<div class="ButtonRight">
<div class="ButtonMiddle">
- <h:commandLink id="#{id}"
action="#{actionString}"
- value="#{value}"
immediate="#{immediate}"/>
+ <h:commandLink id="#{id}"
action="#{actionString}" value="#{value}" title="#{title}"
immediate="#{immediate}"/>
</div>
</div>
</div>
Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/common/template.xhtml
===================================================================
--- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/common/template.xhtml 2010-02-11
10:49:16 UTC (rev 1630)
+++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/common/template.xhtml 2010-02-11
10:50:37 UTC (rev 1631)
@@ -49,13 +49,6 @@
<ui:insert name="objectpath"/>
<div class="wsrp-content-container">
- <ui:remove>
- <c:if test="#{!empty title}">
- <h3>${title}</h3>
- </c:if>
- </ui:remove>
-
-
<!-- Content -->
<ui:insert name="content">Content</ui:insert>
</div>
Modified:
components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/confirmEraseRegistration.xhtml
===================================================================
---
components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/confirmEraseRegistration.xhtml 2010-02-11
10:49:16 UTC (rev 1630)
+++
components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/confirmEraseRegistration.xhtml 2010-02-11
10:50:37 UTC (rev 1631)
@@ -1,6 +1,6 @@
<!--
~ JBoss, a division of Red Hat
- ~ Copyright 2009, Red Hat Middleware, LLC, and individual
+ ~ Copyright 2010, Red Hat Middleware, LLC, and individual
~ contributors as indicated by the @authors tag. See the
~ copyright.txt in the distribution for a full listing of
~ individual contributors.
@@ -54,24 +54,12 @@
<h:form id="confirm-erase-form">
<webui:commandButton id="submit"
value="#{i18n.confirm_delete_registration_submit}"
- action="eraseLocalRegistration"
- backingBean="#{consumer}"/>
+ action="eraseLocalRegistration"
+ backingBean="#{consumer}"/>
- <table class="ActionContainer">
- <tr>
- <td>
- <div class="ButtonLeft">
- <div class="ButtonRight">
- <div class="ButtonMiddle">
- <h:commandLink id="cancel"
action="configureConsumer"
-
value="#{i18n.confirm_delete_registration_cancel}"/>
- </div>
- </div>
- </div>
- </td>
- </tr>
- </table>
-
+ <webui:commandButton id="cancel"
value="#{i18n.confirm_delete_registration_cancel}"
+ backingBean="#{consumer}"
+ action="cancel"/>
</h:form>
</div>
</div>
Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumers.xhtml
===================================================================
---
components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumers.xhtml 2010-02-11
10:49:16 UTC (rev 1630)
+++
components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumers.xhtml 2010-02-11
10:50:37 UTC (rev 1631)
@@ -1,6 +1,6 @@
<!--
~ JBoss, a division of Red Hat
- ~ Copyright 2009, Red Hat Middleware, LLC, and individual
+ ~ Copyright 2010, Red Hat Middleware, LLC, and individual
~ contributors as indicated by the @authors tag. See the
~ copyright.txt in the distribution for a full listing of
~ individual contributors.
@@ -27,8 +27,6 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:c="http://java.sun.com/jstl/core"
xmlns:webui="http://jboss.org/gatein">
-
- <ui:param name="title" value="#{i18n.consumers_title}"/>
<ui:param name="showAddConsumer" value="true"/>
<ui:define name="content">
Modified:
components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/editConsumer.xhtml
===================================================================
---
components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/editConsumer.xhtml 2010-02-11
10:49:16 UTC (rev 1630)
+++
components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/editConsumer.xhtml 2010-02-11
10:50:37 UTC (rev 1631)
@@ -27,7 +27,6 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:c="http://java.sun.com/jstl/core"
xmlns:webui="http://jboss.org/gatein">
- <ui:param name="title" value=""/>
<ui:define name="content">
@@ -51,6 +50,14 @@
</td>
</tr>
<tr>
+ <th>#{i18n.edit_consumer_timeout}</th>
+ <td>
+ <h:inputText id="timeout"
value="#{consumer.timeout}"/>
+ #{i18n.edit_consumer_timeout_milliseconds}
+ <h:message styleClass="portlet-msg-error"
for="timeout"/>
+ </td>
+ </tr>
+ <tr>
<th>#{i18n.edit_consumer_endpoint}</th>
<td>
<h:inputText id="wsdl" size="70"
value="#{consumer.wsdl}"/>
@@ -95,23 +102,23 @@
</h:dataTable>
- <webui:commandButton action="update"
- backingBean="#{consumer}"
- id="cons-update-link"
-
value="#{i18n.edit_consumer_registration_update_props}"
- rendered="#{consumer.registered}"/>
+ <webui:commandButton action="update"
+
backingBean="#{consumer}"
+ id="cons-update-link"
+
value="#{i18n.edit_consumer_registration_update_props}"
+
rendered="registered"/>
</c:when>
<c:otherwise>
#{i18n.edit_consumer_registration_no_props}
</c:otherwise>
</c:choose>
- <webui:commandButton
action="modifyRegistration"
- backingBean="#{consumer}"
- id="modify-reg-link"
-
rendered="#{consumer.registrationLocallyModified}"
-
value="#{i18n.edit_consumer_registration_modify}"
-
title="#{i18n.edit_consumer_registration_modify_title}"/>
-
+ <webui:commandButton
action="modifyRegistration"
+ backingBean="#{consumer}"
+ id="modify-reg-link"
+
rendered="registrationLocallyModified"
+
value="#{i18n.edit_consumer_registration_modify}"
+
title="#{i18n.edit_consumer_registration_modify_title}"/>
+
<br style="clear:both;"/>
</h:panelGroup>
@@ -151,11 +158,11 @@
</c:otherwise>
</c:choose>
- <webui:commandButton
action="modifyRegistration"
- backingBean="#{consumer}"
- id="edit-reg-link"
-
value="#{i18n.edit_consumer_registration_modify}"
-
title="#{i18n.edit_consumer_registration_modify_title}"/>
+ <webui:commandButton
action="modifyRegistration"
+
backingBean="#{consumer}"
+ id="edit-reg-link"
+
value="#{i18n.edit_consumer_registration_modify}"
+
title="#{i18n.edit_consumer_registration_modify_title}"/>
<br style="clear:both;"/>
</h:panelGroup>
@@ -172,25 +179,12 @@
<th>#{i18n.edit_consumer_registration_context}</th>
<td id="handle">
#{i18n.edit_consumer_registration_context_handle}
- <h:outputText
-
value="#{consumer.producerInfo.registrationInfo.registrationHandle}"/>
+ <h:outputText
value="#{consumer.producerInfo.registrationInfo.registrationHandle}"/>
- <table class="ActionContainer">
- <tr>
- <td>
- <div class="ButtonLeft">
- <div class="ButtonRight">
- <div class="ButtonMiddle">
- <h:commandLink
action="confirmEraseRegistration"
-
id="erase-cons-link"
-
value="#{i18n.edit_consumer_registration_context_erase}"
-
title="#{i18n.edit_consumer_registration_context_erase_title}"/>
- </div>
- </div>
- </div>
- </td>
- </tr>
- </table>
+ <webui:commandButton id="erase-cons-link"
action="confirmEraseRegistration"
+ backingBean="#{consumer}"
+
value="#{i18n.edit_consumer_registration_context_erase}"
+
title="#{i18n.edit_consumer_registration_context_erase_title}"/>
</td>
</tr>
@@ -199,28 +193,14 @@
<tr>
<th/>
<td class="portlet-section-buttonrow">
- <webui:commandButton action="refreshConsumer"
- backingBean="#{consumer}"
- id="refresh-cons-link"
- value="#{i18n.edit_consumer_refresh}"
-
title="#{i18n.edit_consumer_refresh_title}"/>
+ <webui:commandButton action="refreshConsumer"
+ backingBean="#{consumer}"
+ id="refresh-cons-link"
+ value="#{i18n.edit_consumer_refresh}"
+
title="#{i18n.edit_consumer_refresh_title}"/>
- <table class="ActionContainer">
- <tr>
- <td>
- <div class="ButtonLeft">
- <div class="ButtonRight">
- <div class="ButtonMiddle">
- <h:commandLink
id="list-cons-link-two" action="#{consumersMgr.listConsumers}"
-
value="#{i18n.edit_consumer_cancel}">
- </h:commandLink>
- </div>
- </div>
- </div>
- </td>
- </tr>
- </table>
-
+ <webui:commandButton id="list-cons-link-two"
action="listConsumers" backingBean="#{consumersMgr}"
+
value="#{i18n.edit_consumer_cancel}"/>
</td>
</tr>
</table>
Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/error.xhtml
===================================================================
--- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/error.xhtml 2010-02-11 10:49:16
UTC (rev 1630)
+++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/error.xhtml 2010-02-11 10:50:37
UTC (rev 1631)
@@ -1,6 +1,6 @@
<!--
~ JBoss, a division of Red Hat
- ~ Copyright 2009, Red Hat Middleware, LLC, and individual
+ ~ Copyright 2010, Red Hat Middleware, LLC, and individual
~ contributors as indicated by the @authors tag. See the
~ copyright.txt in the distribution for a full listing of
~ individual contributors.
@@ -9,7 +9,7 @@
~ under the terms of the GNU Lesser General Public License as
~ published by the Free Software Foundation; either version 2.1 of
~ the License, or (at your option) any later version.
- ~
+ ~
~ This software is distributed in the hope that it will be useful,
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
@@ -27,9 +27,6 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:c="http://java.sun.com/jstl/core"
xmlns:webui="http://jboss.org/gatein">
-
- <ui:param name="title" value="Error"/>
-
<ui:define name="content">
An Error Has Occured.
</ui:define>
Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/management/management.xhtml
===================================================================
---
components/wsrp/trunk/admin-gui/src/main/webapp/jsf/management/management.xhtml 2010-02-11
10:49:16 UTC (rev 1630)
+++
components/wsrp/trunk/admin-gui/src/main/webapp/jsf/management/management.xhtml 2010-02-11
10:50:37 UTC (rev 1631)
@@ -1,6 +1,6 @@
<!--
~ JBoss, a division of Red Hat
- ~ Copyright 2009, Red Hat Middleware, LLC, and individual
+ ~ Copyright 2010, Red Hat Middleware, LLC, and individual
~ contributors as indicated by the @authors tag. See the
~ copyright.txt in the distribution for a full listing of
~ individual contributors.
@@ -27,8 +27,6 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:c="http://java.sun.com/jstl/core">
- <ui:param name="title" value="Producer Management"/>
-
<ui:define name="content">
<p>Feature not quite ready yet! Check again in future versions of
Portal.</p>
</ui:define>
Modified:
components/wsrp/trunk/admin-gui/src/main/webapp/jsf/producer/confirmPropDeletion.xhtml
===================================================================
---
components/wsrp/trunk/admin-gui/src/main/webapp/jsf/producer/confirmPropDeletion.xhtml 2010-02-11
10:49:16 UTC (rev 1630)
+++
components/wsrp/trunk/admin-gui/src/main/webapp/jsf/producer/confirmPropDeletion.xhtml 2010-02-11
10:50:37 UTC (rev 1631)
@@ -1,6 +1,6 @@
<!--
~ JBoss, a division of Red Hat
- ~ Copyright 2009, Red Hat Middleware, LLC, and individual
+ ~ Copyright 2010, Red Hat Middleware, LLC, and individual
~ contributors as indicated by the @authors tag. See the
~ copyright.txt in the distribution for a full listing of
~ individual contributors.
@@ -53,24 +53,12 @@
<h:form id="confirm-prop-del-form">
<webui:commandButton id="confirm-delete"
value="#{i18n.confirm_delete_reg_property_submit}"
- action="deleteRegistrationProperty"
- backingBean="#{producer}"/>
+ action="deleteRegistrationProperty"
+ backingBean="#{producer}"/>
- <table class="ActionContainer">
- <tr>
- <td>
- <div class="ButtonLeft">
- <div class="ButtonRight">
- <div class="ButtonMiddle">
- <h:commandLink id="cancel-delete"
value="#{i18n.confirm_delete_reg_property_cancel}"
- action="producer"/>
- </div>
- </div>
- </div>
- </td>
- </tr>
- </table>
-
+ <webui:commandButton id="cancel-delete"
value="#{i18n.confirm_delete_reg_property_cancel}"
+ backingBean="#{producer}"
+ action="cancel"/>
</h:form>
</div>
</div>