[portal-commits] JBoss Portal SVN: r9238 - in branches/JBoss_Portal_Branch_2_6: core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF and 5 other directories.

Author: chris.laprun(a)jboss.com Date: 2007-11-30 17:36:48 -0500 (Fri, 30 Nov 2007) New Revision: 9238 Added: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/management/ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/management/management.xhtml branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/management/managementTemplate.xhtml Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerManagerBean.java branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/faces-config.xml branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumerTemplate.xhtml branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/producer/producerTemplate.xhtml branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/consumer/ProducerInfo.java branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/consumer/RefreshResult.java branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/consumer/RegistrationInfo.java Log: - JBPORTAL-1828: Improved status message. - JBPORTAL-1803: Added placeholders for management tab and renamed it to Producer Management. - Renamed index outcome to consumers as it makes more sense in faces-config.xml. Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerManagerBean.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerManagerBean.java 2007-11-30 21:54:15 UTC (rev 9237) +++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerManagerBean.java 2007-11-30 22:36:48 UTC (rev 9238) @@ -47,7 +47,7 @@ private static final String CONSUMER_ID = "consumerId"; static final String CONFIGURE_CONSUMER = "configureConsumer"; - static final String INDEX = "index"; + static final String CONSUMERS = "consumers"; static final String EXPECTED_REG_INFO_KEY = "expectedRegistrationInfo"; public ConsumerRegistry getRegistry() @@ -284,7 +284,7 @@ { setConsumerIdInSession(true); selectedId = null; - return INDEX; + return CONSUMERS; } public void selectConsumer(ActionEvent actionEvent) Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/faces-config.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/faces-config.xml 2007-11-30 21:54:15 UTC (rev 9237) +++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/faces-config.xml 2007-11-30 22:36:48 UTC (rev 9238) @@ -102,7 +102,7 @@ <navigation-rule> <navigation-case> - <from-outcome>index</from-outcome> + <from-outcome>consumers</from-outcome> <to-view-id>/WEB-INF/jsf/consumers/consumers.xhtml</to-view-id> </navigation-case> <navigation-case> @@ -125,5 +125,9 @@ <from-outcome>confirmDeleteConsumer</from-outcome> <to-view-id>/WEB-INF/jsf/consumers/confirmDeleteConsumer.xhtml</to-view-id> </navigation-case> + <navigation-case> + <from-outcome>management</from-outcome> + <to-view-id>/WEB-INF/jsf/management/management.xhtml</to-view-id> + </navigation-case> </navigation-rule> </faces-config> Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumerTemplate.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumerTemplate.xhtml 2007-11-30 21:54:15 UTC (rev 9237) +++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumerTemplate.xhtml 2007-11-30 22:36:48 UTC (rev 9238) @@ -9,7 +9,7 @@ <ul class="topnav"> <li id="currentTab">Consumers Configuration</li> <li><h:commandLink value="Producer Configuration" action="producer"/></li> - <li>Producer Data</li> + <li><h:commandLink value="Producer Management" action="management"/></li> </ul> </h:form> </ui:define> Added: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/management/management.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/management/management.xhtml (rev 0) +++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/management/management.xhtml 2007-11-30 22:36:48 UTC (rev 9238) @@ -0,0 +1,12 @@ +<ui:decorate template="managementTemplate.xhtml" 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"> + + <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> +</ui:decorate> \ No newline at end of file Added: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/management/managementTemplate.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/management/managementTemplate.xhtml (rev 0) +++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/management/managementTemplate.xhtml 2007-11-30 22:36:48 UTC (rev 9238) @@ -0,0 +1,18 @@ +<ui:decorate template="../common/template.xhtml" 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"> + + <ui:define name="topnav"> + <h:form> + <ul class="topnav"> + <li><h:commandLink action="consumers" value="Consumers Configuration"/></li> + <li><h:commandLink action="producer" value="Producer Configuration"/></li> + <li id="currentTab">Producer Management</li> + </ul> + </h:form> + </ui:define> + + <ui:define name="objectpath"/> +</ui:decorate> \ No newline at end of file Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/producer/producerTemplate.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/producer/producerTemplate.xhtml 2007-11-30 21:54:15 UTC (rev 9237) +++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/producer/producerTemplate.xhtml 2007-11-30 22:36:48 UTC (rev 9238) @@ -7,9 +7,9 @@ <ui:define name="topnav"> <h:form> <ul class="topnav"> - <li><h:commandLink action="#{consumersMgr.listConsumers}" value="Consumers Configuration"/></li> + <li><h:commandLink action="consumers" value="Consumers Configuration"/></li> <li id="currentTab">Producer Configuration</li> - <li>Producer Data</li> + <li><h:commandLink action="management" value="Producer Management"/></li> </ul> </h:form> </ui:define> Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/consumer/ProducerInfo.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/consumer/ProducerInfo.java 2007-11-30 21:54:15 UTC (rev 9237) +++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/consumer/ProducerInfo.java 2007-11-30 22:36:48 UTC (rev 9238) @@ -321,7 +321,7 @@ setActiveAndSave(false); } - result.appendToStatus(registrationResult.getStatus()); + result.appendToStatus(registrationResult.getStatus(), false); result.setHasIssues(registrationResult.hasIssues()); return result; } @@ -796,7 +796,7 @@ String msg = "Consumer with id '" + persistentId + "' successfully registered with handle: '" + registrationContext.getRegistrationHandle() + "'"; log.debug(msg); - result.appendToStatus("\n").append(msg); + result.appendToStatus(msg); return new RefreshResult(result, true, REGISTER_MEANING); } catch (Exception e) Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/consumer/RefreshResult.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/consumer/RefreshResult.java 2007-11-30 21:54:15 UTC (rev 9237) +++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/consumer/RefreshResult.java 2007-11-30 22:36:48 UTC (rev 9238) @@ -68,9 +68,18 @@ StringBuffer appendToStatus(String message) { + return appendToStatus(message, true); + } + + StringBuffer appendToStatus(String message, boolean appendColon) + { if (message != null && message.length() > 1) { - status.append(".\n").append(message); + status.append(message); + if (appendColon) + { + status.append(".\n"); + } } return status; } Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/consumer/RegistrationInfo.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/consumer/RegistrationInfo.java 2007-11-30 21:54:15 UTC (rev 9237) +++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/consumer/RegistrationInfo.java 2007-11-30 22:36:48 UTC (rev 9238) @@ -442,7 +442,7 @@ result.getRegistrationProperties().put(name, prop); } - result.appendToStatus("Missing value for property '").append(name).append("'\n"); + result.appendToStatus("Missing value for property '" + name + "'"); result.setHasIssues(true); } } @@ -475,7 +475,7 @@ // if issues have been detected, mark the registration as invalid (but do not reset the data) consistentWithProducerExpectations = Boolean.valueOf(!result.hasIssues()); - String msg = "Registration configuration is " + (result.hasIssues() ? "NOT" : "") + " valid"; + String msg = "Registration configuration is " + (result.hasIssues() ? "NOT " : "") + "valid"; result.appendToStatus(msg); log.debug(msg); return result; @@ -495,11 +495,9 @@ Map properties = getOrCreateRegistrationPropertiesMap(false); if (properties != null && !properties.isEmpty()) { - String msg = "Registration data is available for producer '" - + producerId + "' when none is expected by the producer"; if (forceCheckOfExtraProps || !hasRegisteredIfNeeded()) { - log.debug(msg); + log.debug("Registration data is available when none is expected by the producer"); checkForExtraProperties(producerId, result, Collections.EMPTY_SET, properties, keepExtra); } else @@ -529,12 +527,13 @@ unexpected.removeAll(expectedNames); if (!unexpected.isEmpty()) { - StringBuffer message = new StringBuffer("The registration for producer '" - + producerId + "' provided values for unexpected registration properties: "); + StringBuffer message = new StringBuffer("Unexpected registration properties:\n"); + int size = unexpected.size(); + int index = 0; for (Object anUnexpected : unexpected) { String name = (String)anUnexpected; - message.append("\t- ").append(name); + message.append("'").append(name).append("'"); if (keepExtra) { // mark the prop as invalid @@ -550,7 +549,11 @@ message.append(" (was removed)"); properties.remove(name); } - message.append("\n"); + + if (index++ != size - 1) + { + message.append(";"); + } } log.debug(message); result.appendToStatus(message.toString());