Author: chris.laprun(a)jboss.com
Date: 2007-03-14 19:21:37 -0400 (Wed, 14 Mar 2007)
New Revision: 6670
Added:
trunk/wsrp/src/resources/portal-wsrp-war/WEB-INF/jsf/consumers/editConsumer.xhtml
Modified:
trunk/wsrp/build.xml
trunk/wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerManagerBean.java
trunk/wsrp/src/resources/portal-wsrp-war/WEB-INF/faces-config.xml
trunk/wsrp/src/resources/portal-wsrp-war/WEB-INF/jsf/consumers/consumers.xhtml
trunk/wsrp/src/resources/portal-wsrp-war/style.css
Log:
- Beginning of consumer configuration.
Modified: trunk/wsrp/build.xml
===================================================================
--- trunk/wsrp/build.xml 2007-03-14 16:17:33 UTC (rev 6669)
+++ trunk/wsrp/build.xml 2007-03-14 23:21:37 UTC (rev 6670)
@@ -123,6 +123,10 @@
<path refid="apache.httpclient.classpath"/>
<path refid="apache.logging.classpath"/>
<path refid="hibernate.hibernate.classpath"/>
+ <path refid="apache.myfaces.classpath"/>
+ <path refid="facelets.facelets.classpath"/>
+ <path refid="el.el.classpath"/>
+ <pathelement location="${source.etc}/sun-jsf/jsf-example.jar"/>
</path>
Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerManagerBean.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerManagerBean.java 2007-03-14
16:17:33 UTC (rev 6669)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerManagerBean.java 2007-03-14
23:21:37 UTC (rev 6670)
@@ -22,10 +22,14 @@
package org.jboss.portal.wsrp.admin.ui;
+import org.jboss.portal.common.util.ParameterValidation;
+import org.jboss.portal.wsrp.WSRPConsumer;
import org.jboss.portal.wsrp.consumer.ConsumerRegistry;
+import javax.faces.context.FacesContext;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Map;
/**
* @author <a href="mailto:chris.laprun@jboss.com">Chris
Laprun</a>
@@ -35,6 +39,7 @@
public class ConsumerManagerBean
{
private ConsumerRegistry registry;
+ private String selectedId;
public ConsumerRegistry getRegistry()
{
@@ -46,28 +51,46 @@
this.registry = registry;
}
+ public WSRPConsumer getSelectedConsumer()
+ {
+ ParameterValidation.throwIllegalArgExceptionIfNullOrEmpty(selectedId,
"consumer id", null);
+ return registry.getConsumer(selectedId);
+ }
+
public Collection getConsumers()
{
return new ArrayList(registry.getConfiguredConsumers());
}
- public void activateConsumer()
+ public String activateConsumer()
{
+ return null;
+ }
+ public String registerConsumer()
+ {
+ return null;
}
- public void registerConsumer()
+ public String destroyConsumer()
{
-
+ return null;
}
- public void destroyConsumer()
+ public String configureConsumer()
{
-
+ if (getSelectedConsumerId() != null)
+ {
+ return "configureConsumer";
+ }
+ // todo: error message
+ return null;
}
- public void configureConsumer()
+ private String getSelectedConsumerId()
{
-
+ Map pmap =
FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap();
+ selectedId = (String)pmap.get("id");
+ return selectedId;
}
}
\ No newline at end of file
Modified: trunk/wsrp/src/resources/portal-wsrp-war/WEB-INF/faces-config.xml
===================================================================
--- trunk/wsrp/src/resources/portal-wsrp-war/WEB-INF/faces-config.xml 2007-03-14 16:17:33
UTC (rev 6669)
+++ trunk/wsrp/src/resources/portal-wsrp-war/WEB-INF/faces-config.xml 2007-03-14 23:21:37
UTC (rev 6670)
@@ -48,5 +48,9 @@
<from-outcome>index</from-outcome>
<to-view-id>/WEB-INF/jsf/consumers/consumers.xhtml</to-view-id>
</navigation-case>
+ <navigation-case>
+ <from-outcome>configureConsumer</from-outcome>
+ <to-view-id>/WEB-INF/jsf/consumers/editConsumer.xhtml</to-view-id>
+ </navigation-case>
</navigation-rule>
</faces-config>
Modified: trunk/wsrp/src/resources/portal-wsrp-war/WEB-INF/jsf/consumers/consumers.xhtml
===================================================================
---
trunk/wsrp/src/resources/portal-wsrp-war/WEB-INF/jsf/consumers/consumers.xhtml 2007-03-14
16:17:33 UTC (rev 6669)
+++
trunk/wsrp/src/resources/portal-wsrp-war/WEB-INF/jsf/consumers/consumers.xhtml 2007-03-14
23:21:37 UTC (rev 6670)
@@ -28,20 +28,25 @@
<tr class="status.index % 2 == 0 ? 'portlet-table-body' :
'portlet-table-alternate'">
<td>
<h:commandLink
action="#{consumersMgr.configureConsumer}">
+ <f:param name="id"
value="#{consumer.producerId}"/>
<h:outputText value="#{consumer.producerId}"/>
</h:commandLink>
</td>
<td>
<h:commandLink
action="#{consumersMgr.configureConsumer}">
+ <f:param name="id"
value="#{consumer.producerId}"/>
<h:outputText value="Configure"/>
</h:commandLink> | <h:commandLink
action="#{consumersMgr.activateConsumer}">
+ <f:param name="id"
value="#{consumer.producerId}"/>
<h:outputText value='#{consumer.producerInfo.active ?
"Deactivate" : "Activate"}'/>
</h:commandLink>
<c:if test="#{consumer.producerInfo.active}"> |
<h:commandLink
action="#{consumersMgr.registerConsumer}">
+ <f:param name="id"
value="#{consumer.producerId}"/>
<h:outputText value="#{consumer.producerInfo.registered ?
'Deregister' : 'Register'}"/>
</h:commandLink>
</c:if> | <h:commandLink
action="#{consumersMgr.destroyConsumer}">
+ <f:param name="id"
value="#{consumer.producerId}"/>
<h:outputText value="Destroy"/>
</h:commandLink>
</td>
Added: trunk/wsrp/src/resources/portal-wsrp-war/WEB-INF/jsf/consumers/editConsumer.xhtml
===================================================================
--- trunk/wsrp/src/resources/portal-wsrp-war/WEB-INF/jsf/consumers/editConsumer.xhtml
(rev 0)
+++
trunk/wsrp/src/resources/portal-wsrp-war/WEB-INF/jsf/consumers/editConsumer.xhtml 2007-03-14
23:21:37 UTC (rev 6670)
@@ -0,0 +1,103 @@
+<div class="wsrp-consumer-ui"
+
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:c="http://java.sun.com/jstl/core">
+
+ <h1 class="portlet">Consumer
'#{consumersMgr.selectedConsumer.producerId}' configuration</h1>
+
+ <hr/>
+
+ <h:form>
+ <table width="100%" class="portlet-table-body">
+ <tr>
+ <th>Producer id:</th>
+ <td><h:inputText
value="#{consumersMgr.selectedConsumer.producerId}"/></td>
+ </tr>
+ <tr>
+ <th>Cache expiration:</th>
+ <td><h:inputText
value="#{consumersMgr.selectedConsumer.producerInfo.expirationCacheSeconds}"/>
(seconds
+ before expiration)
+ </td>
+ </tr>
+ <tr>
+ <th>Endpoint configuration:</th>
+ <td>
+ <table border="0" class='portlet-table-body'>
+ <tr>
+ <th class="portlet-form-field-label">Service
Description URL:</th>
+ <td><h:inputText size="50"
+
value="#{consumersMgr.selectedConsumer.producerInfo.endpointConfigurationInfo.serviceDescriptionURL}"/>
+ </td>
+ </tr>
+ <tr>
+ <th class="portlet-form-field-label">Markup
URL:</th>
+ <td><h:inputText size="50"
+
value="#{consumersMgr.selectedConsumer.producerInfo.endpointConfigurationInfo.markupURL}"/>
+ </td>
+ </tr>
+ <tr>
+ <th class="portlet-form-field-label">Registration
URL:</th>
+ <td><h:inputText size="50"
+
value="#{consumersMgr.selectedConsumer.producerInfo.endpointConfigurationInfo.registrationURL}"/>
+ </td>
+ </tr>
+ <tr>
+ <th class="portlet-form-field-label">Portlet
Management URL:</th>
+ <td><h:inputText size="50"
+
value="#{consumersMgr.selectedConsumer.producerInfo.endpointConfigurationInfo.portletManagementURL}"/>
+ </td>
+ </tr>
+ <tr>
+ <th class="portlet-form-field-label">WSDL
URL:</th>
+ <td><h:inputText size="50"
+
value="#{consumersMgr.selectedConsumer.producerInfo.endpointConfigurationInfo.wsdlDefinitionURL}"/>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ <tr>
+ <th><h:selectBooleanCheckbox
+
value="#{consumersMgr.selectedConsumer.producerInfo.registrationInfo.requiresRegistration}"/>Requires
+ registration?
+ </th>
+ <td>
+ <c:choose>
+ <c:when
+ test="#{!empty
consumersMgr.selectedConsumer.producerInfo.registrationInfo.registrationPropertyNames}">
+ <table border='1' cellspacing='0'
class='portlet-table-body'>
+ <tr>
+ <th>Name</th>
+ <th>Value</th>
+ <th>Description</th>
+ </tr>
+ <c:forEach
+
items="#{consumersMgr.selectedConsumer.producerInfo.registrationInfo.registrationProperties}"
+ var="prop">
+ <tr>
+ <td><h:inputText
value="#{prop.name}"/></td>
+ <td><h:inputText
value="#{prop.value}"/></td>
+ <td><h:outputText
value="#{prop.description.label.value}"/></td>
+ </tr>
+ </c:forEach>
+ </table>
+ </c:when>
+ <c:otherwise>
+ No required registration properties.
+ </c:otherwise>
+ </c:choose>
+ </td>
+ </tr>
+ <c:if
test="#{consumersMgr.selectedConsumer.producerInfo.registrationInfo.registrationValid}">
+ <tr>
+ <th>Registration context:</th>
+ <td>Handle: <h:outputText
+
value="#{consumersMgr.selectedConsumer.producerInfo.registrationInfo.registrationContext.registrationHandle}"/>
+ </td>
+ </tr>
+ </c:if>
+ </table>
+ </h:form>
+</div>
\ No newline at end of file
Modified: trunk/wsrp/src/resources/portal-wsrp-war/style.css
===================================================================
--- trunk/wsrp/src/resources/portal-wsrp-war/style.css 2007-03-14 16:17:33 UTC (rev 6669)
+++ trunk/wsrp/src/resources/portal-wsrp-war/style.css 2007-03-14 23:21:37 UTC (rev 6670)
@@ -1,4 +1,4 @@
-.wsrp-consumers-ui table {
+.wsrp-consumers-ui table, .wsrp-consumer-ui table {
border: 0;
border-collapse: separate;
}
@@ -14,3 +14,16 @@
padding-bottom: 2px;
padding-top: 2px;
}
+
+.wsrp-consumer-ui th {
+ text-align: left;
+ border: 0;
+ border-right: 2px solid;
+ vertical-align: top;
+}
+
+.wsrp-consumer-ui td {
+ border: 0;
+ padding-bottom: 2px;
+ padding-top: 2px;
+}
\ No newline at end of file