JBoss Portal SVN: r9118 - branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-11-26 20:26:52 -0500 (Mon, 26 Nov 2007)
New Revision: 9118
Modified:
branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model/ModelTestCase.java
Log:
improve test case a bit
Modified: branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model/ModelTestCase.java
===================================================================
--- branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model/ModelTestCase.java 2007-11-26 23:18:17 UTC (rev 9117)
+++ branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model/ModelTestCase.java 2007-11-27 01:26:52 UTC (rev 9118)
@@ -30,6 +30,7 @@
import org.jboss.portal.presentation.model.UIPage;
import org.jboss.portal.presentation.model.UIPortal;
+import java.util.Collections;
import java.util.List;
/**
@@ -135,7 +136,7 @@
assertTrue(pageChildren == null || pageChildren.size() == 0);
}*/
- public void testChildrenLoading() throws Exception
+ public void testLoadChildren() throws Exception
{
MockObject mockDefaultPortal = model.getContext().addChild("defaultPortal", MockObject.Type.PORTAL);
MockObject mockSomeOtherPortal = model.getContext().addChild("someOtherPortal", MockObject.Type.PORTAL);
@@ -149,16 +150,23 @@
//
UIPortal defaultPortal = (UIPortal)children.get(0);
assertNotNull(defaultPortal);
+ assertSame(defaultPortal, context.getObject(defaultPortal.getId()));
assertEquals("defaultPortal", defaultPortal.getName());
assertEquals(mockDefaultPortal.getId(), defaultPortal.getId());
+ assertSame(context, defaultPortal.getParent());
+ assertEquals(Collections.EMPTY_LIST, defaultPortal.getChildren());
//
UIPortal someOtherPortal = (UIPortal)children.get(1);
+ assertNotNull(someOtherPortal);
+ assertSame(someOtherPortal, context.getObject(someOtherPortal.getId()));
assertEquals("someOtherPortal", someOtherPortal.getName());
assertEquals(mockSomeOtherPortal.getId(), someOtherPortal.getId());
+ assertSame(context, someOtherPortal.getParent());
+ assertEquals(Collections.EMPTY_LIST, defaultPortal.getChildren());
}
- public void testParentLoading() throws Exception
+ public void testLoadParent() throws Exception
{
MockObject mockDefaultPortal = model.getContext().addChild("defaultPortal", MockObject.Type.PORTAL);
MockObject mockDefaultPage = mockDefaultPortal.addChild("defaultPage", MockObject.Type.PAGE);
16 years, 7 months
- 1
- 0
JBoss Portal SVN: r9117 - in branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF: jsf and 3 other directories.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-11-26 18:18:17 -0500 (Mon, 26 Nov 2007)
New Revision: 9117
Added:
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/common/template.xhtml
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/producer/
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/producer/producer.xhtml
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/producer/producerTemplate.xhtml
Removed:
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/common/tabContainer.xhtml
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/jsf/consumers/consumerTemplate.xhtml
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumers.xhtml
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/editConsumer.xhtml
Log:
- JBPORTAL-1714:
+ Improved templates.
+ Moved producer-related pages to producer directory.
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-26 23:01:42 UTC (rev 9116)
+++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/faces-config.xml 2007-11-26 23:18:17 UTC (rev 9117)
@@ -111,7 +111,7 @@
</navigation-case>
<navigation-case>
<from-outcome>producer</from-outcome>
- <to-view-id>/WEB-INF/jsf/producer.xhtml</to-view-id>
+ <to-view-id>/WEB-INF/jsf/producer/producer.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
</faces-config>
Deleted: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/common/tabContainer.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/common/tabContainer.xhtml 2007-11-26 23:01:42 UTC (rev 9116)
+++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/common/tabContainer.xhtml 2007-11-26 23:18:17 UTC (rev 9117)
@@ -1,10 +0,0 @@
-<ui:composition
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:ui="http://java.sun.com/jsf/facelets">
-
- <div class="tab-container">
- <ui:insert name="tab-container-content"/>
- </div>
-
-</ui:composition>
\ No newline at end of file
Added: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/common/template.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/common/template.xhtml (rev 0)
+++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/common/template.xhtml 2007-11-26 23:18:17 UTC (rev 9117)
@@ -0,0 +1,21 @@
+<ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:c="http://java.sun.com/jstl/core">
+ <div class="wsrp-consumers-ui">
+ <ui:insert name="topnav">Top navigation</ui:insert>
+
+ <div class="tab-container">
+ <ui:insert name="objectpath">Object path if needed</ui:insert>
+
+ <c:if test="#{!empty title}">
+ <h3 class="sectionTitle">${title}</h3>
+ </c:if>
+
+ <!-- Status message -->
+ <h:message id="status" for="status" infoClass="portlet-msg-success" errorClass="portlet-msg-error"
+ fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/>
+
+ <!-- Content -->
+ <ui:insert name="content">Content</ui:insert>
+ </div>
+ </div>
+</ui:composition>
\ No newline at end of file
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-26 23:01:42 UTC (rev 9116)
+++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumerTemplate.xhtml 2007-11-26 23:18:17 UTC (rev 9117)
@@ -1,49 +1,34 @@
-<div class="wsrp-consumers-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">
+<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">
- <h:form>
- <ul class="topnav">
- <li id="currentTab">Consumers Configuration</li>
- <li><h:commandLink value="Producer Configuration" action="producer"/></li>
- <li>Producer Data</li>
- </ul>
- </h:form>
+ <ui:define name="topnav">
+ <h:form>
+ <ul class="topnav">
+ <li id="currentTab">Consumers Configuration</li>
+ <li><h:commandLink value="Producer Configuration" action="producer"/></li>
+ <li>Producer Data</li>
+ </ul>
+ </h:form>
+ </ui:define>
-
- <ui:decorate template="../common/tabContainer.xhtml">
- <ui:define name="tab-container-content">
-
- <h:form>
- <ul class="objectpath">
- <li class="#{!empty title ? 'selected' : 'pathItem'}">
- <h:commandLink action="#{consumersMgr.listConsumers}" value="Consumers"/>
+ <ui:define name="objectpath">
+ <h:form>
+ <ul class="objectpath">
+ <li class="#{!empty title ? 'selected' : 'pathItem'}">
+ <h:commandLink action="#{consumersMgr.listConsumers}" value="Consumers"/>
+ </li>
+ <c:if test="#{empty title}">
+ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
+ <li
+ class="#{consumer.active ? 'active' : 'inactive'} #{consumer.refreshNeeded ? 'needsRefresh' : ''}">
+ Consumer '#{consumer.id}' configuration (#{consumer.active ? 'active' : 'inactive'})
+ #{consumer.refreshNeeded ? '(refresh needed)' : ''}
</li>
- <c:if test="#{empty title}">
- <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
- <li
- class="#{consumer.active ? 'active' : 'inactive'} #{consumer.refreshNeeded ? 'needsRefresh' : ''}">
- Consumer '#{consumer.id}' configuration (#{consumer.active ? 'active' : 'inactive'})
- #{consumer.refreshNeeded ? '(refresh needed)' : ''}
- </li>
- </c:if>
- </ul>
- </h:form>
-
- <c:if test="#{!empty title}">
- <h3 class="sectionTitle">${title}</h3>
- </c:if>
-
- <!-- Status message -->
- <h:message id="status" for="status" infoClass="portlet-msg-success" errorClass="portlet-msg-error"
- fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/>
-
- <!-- Content -->
- <ui:insert name="content">Content</ui:insert>
-
- </ui:define>
- </ui:decorate>
-</div>
\ No newline at end of file
+ </c:if>
+ </ul>
+ </h:form>
+ </ui:define>
+</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/consumers/consumers.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumers.xhtml 2007-11-26 23:01:42 UTC (rev 9116)
+++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumers.xhtml 2007-11-26 23:18:17 UTC (rev 9117)
@@ -1,81 +1,77 @@
-<div
- 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">
+<ui:decorate template="consumerTemplate.xhtml" 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">
- <ui:composition template="consumerTemplate.xhtml">
+ <ui:param name="title" value="Manage Consumers"/>
- <ui:param name="title" value="Manage Consumers"/>
+ <ui:define name="content">
- <ui:define name="content">
+ <!-- Consumer creation -->
+ <h:form styleClass="createObjectForm">
+ <span class="portlet-font">Create a consumer named: </span>
+ <h:inputText value="#{consumersMgr.selectedId}" id="consumerName" styleClass="portlet-form-input-field"
+ required="true"/>
+ <h:commandButton action="#{consumersMgr.createConsumer}" value="Create Consumer"
+ styleClass="portlet-form-button"/>
+ <h:message for="consumerName" errorClass="portlet-msg-error"/>
+ </h:form>
- <!-- Consumer creation -->
- <h:form styleClass="createObjectForm">
- <span class="portlet-font">Create a consumer named: </span>
- <h:inputText value="#{consumersMgr.selectedId}" id="consumerName" styleClass="portlet-form-input-field"
- required="true"/>
- <h:commandButton action="#{consumersMgr.createConsumer}" value="Create Consumer"
- styleClass="portlet-form-button"/>
- <h:message for="consumerName" errorClass="portlet-msg-error"/>
- </h:form>
+ <!-- Separation -->
+ <hr/>
- <!-- Separation -->
- <hr/>
-
- <table width="100%" class="portlet-table-body" style="margin-bottom: 1em;">
- <thead class="portlet-section-header">
- <tr>
- <th>Consumer
- <div style="font-size: 90%; display:inline; font-weight: normal;">
- [status: <span class="active">active</span>, <span class="inactive">inactive</span>,
- <span class="needsRefresh">needs refresh</span>]
- </div>
- </th>
- <th>Actions</th>
- </tr>
- </thead>
- <tbody>
- <h:form>
- <c:forEach items="#{consumersMgr.consumers}" var="consumer" varStatus="status">
- <tr>
- <td
- class="#{consumer.active ? 'active' : 'inactive'} #{consumer.refreshNeeded ? 'needsRefresh' : ''}">
- <h:outputText value="#{consumer.producerId} (#{consumer.active ? 'active' : 'inactive'})
+ <table width="100%" class="portlet-table-body" style="margin-bottom: 1em;">
+ <thead class="portlet-section-header">
+ <tr>
+ <th>Consumer
+ <div style="font-size: 90%; display:inline; font-weight: normal;">
+ [status: <span class="active">active</span>, <span class="inactive">inactive</span>,
+ <span class="needsRefresh">needs refresh</span>]
+ </div>
+ </th>
+ <th>Actions</th>
+ </tr>
+ </thead>
+ <tbody>
+ <h:form>
+ <c:forEach items="#{consumersMgr.consumers}" var="consumer" varStatus="status">
+ <tr>
+ <td
+ class="#{consumer.active ? 'active' : 'inactive'} #{consumer.refreshNeeded ? 'needsRefresh' : ''}">
+ <h:outputText value="#{consumer.producerId} (#{consumer.active ? 'active' : 'inactive'})
#{consumer.refreshNeeded ? '(refresh needed)' : ''}"/>
- </td>
- <td class="#{status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}">
- <h:commandLink action="#{consumersMgr.configureConsumer}" styleClass="actionConfigure">
- <f:param name="id" value="#{consumer.producerId}"/>
- <h:outputText value="Configure"/>
- </h:commandLink> | <h:commandLink action="#{consumersMgr.refreshConsumer}"
- styleClass="actionRefresh">
+ </td>
+ <td class="#{status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}">
+ <h:commandLink action="#{consumersMgr.configureConsumer}" styleClass="actionConfigure">
<f:param name="id" value="#{consumer.producerId}"/>
- <h:outputText value="Refresh"/>
- </h:commandLink> | <h:commandLink action="#{consumersMgr.activateConsumer}"
- styleClass="#{consumer.active ? 'actionDeactivate' : 'actionActivate'}">
+ <h:outputText value="Configure"/>
+ </h:commandLink> | <h:commandLink action="#{consumersMgr.refreshConsumer}"
+ styleClass="actionRefresh">
+ <f:param name="id" value="#{consumer.producerId}"/>
+ <h:outputText value="Refresh"/>
+ </h:commandLink> | <h:commandLink action="#{consumersMgr.activateConsumer}"
+ styleClass="#{consumer.active ? 'actionDeactivate' : 'actionActivate'}">
+ <f:param name="id" value="#{consumer.producerId}"/>
+ <f:param name="activate" value="#{!consumer.active}"/>
+ <h:outputText value="#{consumer.active ? 'Deactivate' : 'Activate'}"/>
+ </h:commandLink>
+ <c:if
+ test="#{!consumer.refreshNeeded and consumer.active and consumer.producerInfo.registrationRequired}">
+ | <h:commandLink action="#{consumersMgr.registerConsumer}">
<f:param name="id" value="#{consumer.producerId}"/>
- <f:param name="activate" value="#{!consumer.active}"/>
- <h:outputText value="#{consumer.active ? 'Deactivate' : 'Activate'}"/>
+ <f:param name="register" value="#{!consumer.producerInfo.registered}"/>
+ <h:outputText value="#{consumer.producerInfo.registered ? 'Deregister' : 'Register'}"/>
</h:commandLink>
- <c:if
- test="#{!consumer.refreshNeeded and consumer.active and consumer.producerInfo.registrationRequired}">
- | <h:commandLink action="#{consumersMgr.registerConsumer}">
- <f:param name="id" value="#{consumer.producerId}"/>
- <f:param name="register" value="#{!consumer.producerInfo.registered}"/>
- <h:outputText value="#{consumer.producerInfo.registered ? 'Deregister' : 'Register'}"/>
- </h:commandLink>
- </c:if> | <h:commandLink action="#{consumersMgr.destroyConsumer}" styleClass="actionDelete">
- <f:param name="id" value="#{consumer.producerId}"/>
- <h:outputText value="Delete"/>
- </h:commandLink>
- </td>
- </tr>
- </c:forEach>
- </h:form>
- </tbody>
- </table>
- </ui:define>
- </ui:composition>
-</div>
\ No newline at end of file
+ </c:if> | <h:commandLink action="#{consumersMgr.destroyConsumer}" styleClass="actionDelete">
+ <f:param name="id" value="#{consumer.producerId}"/>
+ <h:outputText value="Delete"/>
+ </h:commandLink>
+ </td>
+ </tr>
+ </c:forEach>
+ </h:form>
+ </tbody>
+ </table>
+ </ui:define>
+</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/consumers/editConsumer.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/editConsumer.xhtml 2007-11-26 23:01:42 UTC (rev 9116)
+++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/editConsumer.xhtml 2007-11-26 23:18:17 UTC (rev 9117)
@@ -1,12 +1,8 @@
-<div
- 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">
-
-<ui:composition template="consumerTemplate.xhtml">
-
+<ui:decorate template="consumerTemplate.xhtml" 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">
<ui:param name="title" value=""/>
<ui:define name="content">
@@ -150,5 +146,4 @@
</table>
</h:form>
</ui:define>
-</ui:composition>
-</div>
\ No newline at end of file
+</ui:decorate>
\ No newline at end of file
Copied: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/producer/producer.xhtml (from rev 9094, branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/producer.xhtml)
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/producer/producer.xhtml (rev 0)
+++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/producer/producer.xhtml 2007-11-26 23:18:17 UTC (rev 9117)
@@ -0,0 +1,77 @@
+<ui:decorate template="producerTemplate.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 configuration"/>
+
+ <ui:define name="content">
+ <h:form>
+ <h:panelGrid columns="2" width="100%">
+ <h:selectBooleanCheckbox value="#{producer.registrationRequiredForFullDescription}"/>
+ <h:outputText value="Access to full service description requires consumers to be registered."/>
+
+ <h:selectBooleanCheckbox value="#{producer.registrationRequired}"/>
+ <h:outputText value="Requires registration."/>
+
+ <h:outputText value=" " rendered="#{producer.registrationRequired}"/>
+ <h:panelGroup>
+ <h:panelGrid columns="2" rendered="#{producer.registrationRequired}" width="100%">
+ <h:outputLabel value="Registration policy class name:" for="registrationPolicy"/>
+ <h:inputText id="registrationPolicy" value="#{producer.registrationPolicyClassName}" size="80"/>
+
+ <h:outputLabel value="Registration property validator class name:" for="validator"
+ rendered="#{producer.defaultRegistrationPolicy}"/>
+ <h:inputText id="validator" value="#{producer.validatorClassName}" size="80"
+ rendered="#{producer.defaultRegistrationPolicy}"/>
+
+ </h:panelGrid>
+ </h:panelGroup>
+
+ <h:outputText value=" " rendered="#{producer.registrationRequired}"/>
+ <h:panelGroup rendered="#{producer.registrationRequired}">
+ <h:outputText styleClass="portlet-area-header" value="Registration properties"/>
+ <h:panelGroup styleClass="portlet-area-body">
+ <c:choose>
+ <c:when test="#{!empty producer.registrationProperties}">
+ <h:dataTable var="property" id="registrationProperties" width="100%"
+ value="#{producer.registrationProperties}"
+ rendered="#{producer.registrationRequired}"
+ headerClass="portlet-section-header">
+ <h:column>
+ <f:facet name="header">Name</f:facet>
+ <h:inputText value="#{property.nameAsString}" size="30"/>
+ </h:column>
+ <h:column>
+ <f:facet name="header">Type</f:facet>
+ <h:selectOneListbox disabled="true">
+ <f:selectItems value="#{producer.supportedPropertyTypes}"/>
+ </h:selectOneListbox>
+ </h:column>
+ <h:column>
+ <f:facet name="header">Label</f:facet>
+ <h:inputText value="#{property.label}" size="50"/>
+ </h:column>
+ <h:column>
+ <f:facet name="header">Hint</f:facet>
+ <h:inputText value="#{property.hint}" size="50"/>
+ </h:column>
+ </h:dataTable>
+ </c:when>
+ <c:otherwise>
+ <h:outputText value="No specified required registration properties."/>
+ </c:otherwise>
+ </c:choose>
+ <h:commandLink action="#{producer.addRegistrationProperty}" value="Add property"
+ styleClass="portlet-form-button"/>
+ </h:panelGroup>
+ </h:panelGroup>
+
+ <h:outputText value=" "/>
+ <h:commandButton action="#{producer.save}" value="Save" styleClass="portlet-form-button"/>
+ </h:panelGrid>
+ </h:form>
+
+ </ui:define>
+</ui:decorate>
\ No newline at end of file
Property changes on: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/producer/producer.xhtml
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedBy LastChangedRevision Id
Added: 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 (rev 0)
+++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/producer/producerTemplate.xhtml 2007-11-26 23:18:17 UTC (rev 9117)
@@ -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="#{consumersMgr.listConsumers}" value="Consumers Configuration"/></li>
+ <li id="currentTab">Producer Configuration</li>
+ <li>Producer Data</li>
+ </ul>
+ </h:form>
+ </ui:define>
+
+ <ui:define name="objectpath"/>
+</ui:decorate>
\ No newline at end of file
16 years, 7 months
- 1
- 0
JBoss Portal SVN: r9116 - branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-11-26 18:01:42 -0500 (Mon, 26 Nov 2007)
New Revision: 9116
Modified:
branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model/ModelTestCase.java
Log:
improve test case a bit
Modified: branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model/ModelTestCase.java
===================================================================
--- branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model/ModelTestCase.java 2007-11-26 22:43:17 UTC (rev 9115)
+++ branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model/ModelTestCase.java 2007-11-26 23:01:42 UTC (rev 9116)
@@ -27,8 +27,11 @@
import org.jboss.portal.presentation.impl.model.UIContextImpl;
import org.jboss.portal.presentation.model.UIContext;
import org.jboss.portal.presentation.model.UIObject;
+import org.jboss.portal.presentation.model.UIPage;
import org.jboss.portal.presentation.model.UIPortal;
+import java.util.List;
+
/**
* @author <a href="mailto:sshah@redhat.com">Sohil Shah</a>
*
@@ -132,34 +135,45 @@
assertTrue(pageChildren == null || pageChildren.size() == 0);
}*/
- public void testModelLoading() throws Exception
+ public void testChildrenLoading() throws Exception
{
MockObject mockDefaultPortal = model.getContext().addChild("defaultPortal", MockObject.Type.PORTAL);
MockObject mockSomeOtherPortal = model.getContext().addChild("someOtherPortal", MockObject.Type.PORTAL);
+ UIContext context = new UIContextImpl(model);
- UIContext context = new UIContextImpl(model);
-
- UIPortal defaultPortal = (UIPortal)context.getChildren().get(0);
- UIPortal someOtherPortal = (UIPortal)context.getChildren().get(1);
-
- assertEquals(defaultPortal.getName(), "defaultPortal");
- assertEquals(defaultPortal.getId(), mockDefaultPortal.getId());
- assertEquals(someOtherPortal.getName(), "someOtherPortal");
- assertEquals(someOtherPortal.getId(), mockSomeOtherPortal.getId());
+ //
+ List<UIObject> children = context.getChildren();
+ assertNotNull(children);
+ assertEquals(2, children.size());
+
+ //
+ UIPortal defaultPortal = (UIPortal)children.get(0);
+ assertNotNull(defaultPortal);
+ assertEquals("defaultPortal", defaultPortal.getName());
+ assertEquals(mockDefaultPortal.getId(), defaultPortal.getId());
+
+ //
+ UIPortal someOtherPortal = (UIPortal)children.get(1);
+ assertEquals("someOtherPortal", someOtherPortal.getName());
+ assertEquals(mockSomeOtherPortal.getId(), someOtherPortal.getId());
}
public void testParentLoading() throws Exception
{
- //Setup rootChildrenInfo
MockObject mockDefaultPortal = model.getContext().addChild("defaultPortal", MockObject.Type.PORTAL);
- MockObject mockDefaultPage = mockDefaultPortal.addChild("defaultPage", MockObject.Type.PORTAL);
-
+ MockObject mockDefaultPage = mockDefaultPortal.addChild("defaultPage", MockObject.Type.PAGE);
UIContext context = new UIContextImpl(model);
- UIPortal portal = (UIPortal)context.getObject(mockDefaultPage.getId());
- UIObject parent = portal.getParent();
-
- assertEquals(parent.getName(), "defaultPortal");
- assertEquals(parent.getId(), mockDefaultPortal.getId());
+ //
+ UIPage defaultPage = (UIPage)context.getObject(mockDefaultPage.getId());
+ assertNotNull(defaultPage);
+ assertEquals("defaultPage", defaultPage.getName());
+ assertEquals(mockDefaultPage.getId(), defaultPage.getId());
+
+ //
+ UIPortal defaultPortal = (UIPortal)defaultPage.getParent();
+ assertNotNull(defaultPortal);
+ assertEquals(defaultPortal.getName(), "defaultPortal");
+ assertEquals(mockDefaultPortal.getId(), defaultPortal.getId());
}
}
16 years, 7 months
- 1
- 0
JBoss Portal SVN: r9115 - in branches/presentation/presentation: src/main/org/jboss/portal/presentation/impl/model and 2 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-11-26 17:43:17 -0500 (Mon, 26 Nov 2007)
New Revision: 9115
Added:
branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model/MockModel.java
branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model/MockObject.java
branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model/ModelTestCase.java
Removed:
branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model/MockModelLoaderImpl.java
Modified:
branches/presentation/presentation/build.xml
branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model/UIObjectImpl.java
branches/presentation/presentation/src/main/org/jboss/portal/presentation/model/UIObject.java
Log:
started to rewrite UIObject model test case
Modified: branches/presentation/presentation/build.xml
===================================================================
--- branches/presentation/presentation/build.xml 2007-11-26 19:44:19 UTC (rev 9114)
+++ branches/presentation/presentation/build.xml 2007-11-26 22:43:17 UTC (rev 9115)
@@ -205,10 +205,18 @@
<!-- portal-presentation-lib.jar -->
<jar jarfile="${build.lib}/portal-presentation-lib.jar">
- <fileset dir="${build.classes}">
+ <fileset dir="${build.classes}">
+ <exclude name="org/jboss/portal/presentation/test/**"/>
</fileset>
</jar>
+ <!-- portal-presentation-test-lib.jar -->
+ <jar jarfile="${build.lib}/portal-presentation-test-lib.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/portal/presentation/test/**"/>
+ </fileset>
+ </jar>
+
<!-- presentation.war -->
<!-- compile the GWT Java code into JavaScript/Web resources -->
<!--
@@ -292,4 +300,30 @@
<!-- ================================================================== -->
<!-- Deployment -->
<!-- ================================================================== -->
+
+ <target name="test" depends="init">
+ <property name="build.testlog" value="${module.output}/log"/>
+ <execute-tests>
+ <x-sysproperty>
+ <sysproperty key="test.root" value="${build.lib}"/>
+ <!--
+ <jvmarg value="-Xdebug"/>
+ <jvmarg value="-Xrunjdwp:transport=dt_socket,address=7878,server=y,suspend=y"/>
+ -->
+ </x-sysproperty>
+ <x-test>
+ <test todir="${test.reports}" name="org.jboss.portal.presentation.test.model.ModelTestCase"/>
+ </x-test>
+ <x-classpath>
+ <path refid="jboss.portal/modules/common.classpath"/>
+ <path refid="apache.log4j.classpath"/>
+ <path refid="junit.junit.classpath"/>
+ <path refid="jboss.portal-server.classpath"/>
+ <path refid="jboss.portal-jems.classpath"/>
+ <path location="${build.lib}/portal-presentation-lib.jar"/>
+ <path location="${build.lib}/portal-presentation-test-lib.jar"/>
+ </x-classpath>
+ </execute-tests>
+ </target>
+
</project>
Modified: branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model/UIObjectImpl.java
===================================================================
--- branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model/UIObjectImpl.java 2007-11-26 19:44:19 UTC (rev 9114)
+++ branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model/UIObjectImpl.java 2007-11-26 22:43:17 UTC (rev 9115)
@@ -212,8 +212,8 @@
/**
*
*/
- public <T extends UIObject> List<T> getChildren(Class<T> type)
- {
+// public <T extends UIObject> List<T> getChildren(Class<T> type)
+// {
// try
// {
// List<T> filteredList = new ArrayList<T>();
@@ -239,8 +239,8 @@
// {
// throw new RuntimeException(e);
// }
- throw new UnsupportedOperationException("todo");
- }
+// throw new UnsupportedOperationException("todo");
+// }
protected abstract <T extends UIObject> boolean isAllowedAsChild(Class<T> type);
Modified: branches/presentation/presentation/src/main/org/jboss/portal/presentation/model/UIObject.java
===================================================================
--- branches/presentation/presentation/src/main/org/jboss/portal/presentation/model/UIObject.java 2007-11-26 19:44:19 UTC (rev 9114)
+++ branches/presentation/presentation/src/main/org/jboss/portal/presentation/model/UIObject.java 2007-11-26 22:43:17 UTC (rev 9115)
@@ -82,5 +82,5 @@
* @param type
* @return
*/
- <T extends UIObject> List<T> getChildren(Class<T> type);
+// <T extends UIObject> List<T> getChildren(Class<T> type);
}
Added: branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model/MockModel.java
===================================================================
--- branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model/MockModel.java (rev 0)
+++ branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model/MockModel.java 2007-11-26 22:43:17 UTC (rev 9115)
@@ -0,0 +1,180 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2006, 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. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * 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 *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.presentation.test.model;
+
+import org.jboss.portal.presentation.model.state.ModelLoader;
+import org.jboss.portal.presentation.model.state.ObjectState;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+public class MockModel implements ModelLoader
+{
+
+ /** . */
+ private int generator = 0;
+
+ /** . */
+ private final Map<String, MockObjectImpl> universe = new HashMap<String, MockObjectImpl>();
+
+ /** . */
+ private final MockObjectImpl context = new MockObjectImpl();
+
+ public MockObject getContext()
+ {
+ return context;
+ }
+
+ public ObjectState loadState(String objectId) throws IllegalArgumentException
+ {
+ if (objectId == null)
+ {
+ throw new IllegalArgumentException();
+ }
+ MockObjectImpl object = universe.get(objectId);
+ return object != null ? object.takeSnapshot() : null;
+ }
+
+ public String getRootId()
+ {
+ return context.id;
+ }
+
+ private class MockObjectImpl implements MockObject
+ {
+
+ /** . */
+ private final MockObject.Type type;
+
+ /** . */
+ private final String name;
+
+ /** . */
+ private final String id = "" + generator++;
+
+ /** . */
+ private final Map<String, String> properties;
+
+ /** . */
+ private final Map<String, MockObjectImpl> children;
+
+ /** . */
+ private MockObjectImpl parent;
+
+ private MockObjectImpl()
+ {
+ this.parent = null;
+ this.name = "";
+ this.type = MockObject.Type.CONTEXT;
+ this.children = new LinkedHashMap<String, MockObjectImpl>();
+ this.properties = new HashMap<String, String>();
+
+ //
+ universe.put(id, this);
+ }
+
+ private MockObjectImpl(MockObjectImpl parent, String name, MockObject.Type type)
+ {
+ if (parent.children.containsKey(name))
+ {
+ throw new IllegalArgumentException();
+ }
+
+ //
+ this.name = name;
+ this.type = type;
+ this.children = new LinkedHashMap<String, MockObjectImpl>();
+ this.properties = new HashMap<String, String>();
+
+ //
+ this.parent = parent;
+ parent.children.put(id, this);
+
+ //
+ universe.put(id, this);
+ }
+
+ public MockObject.Type getType()
+ {
+ return type;
+ }
+
+ public String getName()
+ {
+ return name;
+ }
+
+ public String getId()
+ {
+ return id;
+ }
+
+ public ObjectState takeSnapshot()
+ {
+ ArrayList<String> childrenIds = new ArrayList<String>();
+ for (MockObjectImpl child : children.values())
+ {
+ childrenIds.add(child.id);
+ }
+ return new ObjectState(type.clazz, name, new HashMap<String, String>(properties), parent != null ? parent.id : null, childrenIds);
+ }
+
+ public String getProperty(String name)
+ {
+ return properties.get(name);
+ }
+
+ public MockObject addChild(String name, MockObject.Type type)
+ {
+ if (name == null)
+ {
+ throw new IllegalArgumentException();
+ }
+
+ //
+ return new MockObjectImpl(this, name, type);
+ }
+
+ public void setProperty(String name, String value)
+ {
+ if (name == null)
+ {
+ throw new IllegalArgumentException();
+ }
+ if (value != null)
+ {
+ properties.remove(name);
+ }
+ else
+ {
+ properties.put(name, value);
+ }
+ }
+ }
+}
Deleted: branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model/MockModelLoaderImpl.java
===================================================================
--- branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model/MockModelLoaderImpl.java 2007-11-26 19:44:19 UTC (rev 9114)
+++ branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model/MockModelLoaderImpl.java 2007-11-26 22:43:17 UTC (rev 9115)
@@ -1,77 +0,0 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2006, 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. *
- * *
- * This is free software; you can redistribute it and/or modify it *
- * 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 *
- * Lesser General Public License for more details. *
- * *
- * You should have received a copy of the GNU Lesser General Public *
- * License along with this software; if not, write to the Free *
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
- ******************************************************************************/
-package org.jboss.portal.presentation.test.model;
-
-import java.util.List;
-import java.util.ArrayList;
-
-import org.jboss.portal.presentation.model.UIPortal;
-import org.jboss.portal.presentation.model.state.ModelLoader;
-import org.jboss.portal.presentation.model.state.ObjectState;
-
-/**
- * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a>
- *
- */
-public class MockModelLoaderImpl implements ModelLoader
-{
- /**
- *
- */
- public ObjectState loadState(String objectId) throws IllegalArgumentException
- {
- ObjectState state = null;
-
- int lastIndex = objectId.lastIndexOf('/');
- String name = objectId.substring(lastIndex+1);
- String parentId = objectId.substring(0, lastIndex);
-
- //Just stub children
- List<String> childrenIds = null;
- if(name.contains("testingLazyLoading"))
- {
- childrenIds = new ArrayList<String>();
- childrenIds.add(objectId+"/child1");
- childrenIds.add(objectId+"/child2");
- childrenIds.add(objectId+"/child3");
- }
-
-
- state = new ObjectState(UIPortal.class,
- name,
- null, //properties
- parentId,
- childrenIds //childrenIds
- );
-
- return state;
- }
-
- /**
- *
- */
- public String getRootId()
- {
- return null;
- }
-}
Added: branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model/MockObject.java
===================================================================
--- branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model/MockObject.java (rev 0)
+++ branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model/MockObject.java 2007-11-26 22:43:17 UTC (rev 9115)
@@ -0,0 +1,74 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2006, 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. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * 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 *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.presentation.test.model;
+
+import org.jboss.portal.presentation.model.UIContext;
+import org.jboss.portal.presentation.model.UIObject;
+import org.jboss.portal.presentation.model.UIPage;
+import org.jboss.portal.presentation.model.UIPortal;
+import org.jboss.portal.presentation.model.UIWindow;
+import org.jboss.portal.presentation.model.state.ObjectState;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+public interface MockObject
+{
+
+ /**
+ *
+ */
+ public enum Type
+ {
+
+ PORTAL(UIPortal.class), PAGE(UIPage.class), WINDOW(UIWindow.class), CONTEXT(UIContext.class);
+
+ /** . */
+ final Class<? extends UIObject> clazz;
+
+ Type(Class<? extends UIObject> clazz)
+ {
+ this.clazz = clazz;
+ }
+ }
+
+ Type getType();
+
+ String getName();
+
+ String getId();
+
+ String getProperty(String name);
+
+ void setProperty(String name, String value);
+
+ MockObject addChild(String name, Type type);
+
+ /**
+ * Creates and returns a snapshot of the state.
+ *
+ * @return the state snapshot
+ */
+ ObjectState takeSnapshot();
+}
Copied: branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model/ModelTestCase.java (from rev 9052, branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model/UIModelTester.java)
===================================================================
--- branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model/ModelTestCase.java (rev 0)
+++ branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model/ModelTestCase.java 2007-11-26 22:43:17 UTC (rev 9115)
@@ -0,0 +1,165 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2006, 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. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * 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 *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.presentation.test.model;
+
+import junit.framework.TestCase;
+import org.apache.log4j.Logger;
+import org.jboss.portal.presentation.impl.model.UIContextImpl;
+import org.jboss.portal.presentation.model.UIContext;
+import org.jboss.portal.presentation.model.UIObject;
+import org.jboss.portal.presentation.model.UIPortal;
+
+/**
+ * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a>
+ *
+ */
+public class ModelTestCase extends TestCase
+{
+
+ /** . */
+ private Logger logger = Logger.getLogger(this.getClass());
+
+ /** . */
+ private MockModel model;
+
+ public ModelTestCase()
+ {
+ }
+
+ public ModelTestCase(String testName)
+ {
+ super(testName);
+ }
+
+ /**
+ *
+ */
+ protected void setUp() throws Exception
+ {
+ this.model = new MockModel();
+ }
+
+ /**
+ *
+ */
+ protected void tearDown() throws Exception
+ {
+ this.model = null;
+ }
+
+ /**
+ *
+ * @throws Exception
+ */
+ /*public void testCreateChild() throws Exception
+ {
+ //Adding a UIContext...this should result in an IllegalArgumentException
+ try
+ {
+ this.uiContext.createChild("duplicateRoot", UIContext.class);
+ }
+ catch(Exception e)
+ {
+ this.assertEquals(e.getClass(), IllegalArgumentException.class);
+ }
+
+ //Assert the state of UIPortal added to the UIObject tree
+ UIPortal portal = this.uiContext.createChild("defaultPortal", UIPortal.class);
+ assertEquals(portal.getName(), "defaultPortal");
+ assertEquals(portal.getId(), "/defaultPortal");
+ assertTrue(portal.getParent() instanceof UIContext);
+
+ //Add a UIPage to the UIPortal
+ UIPage page = portal.createChild("defaultPage", UIPage.class);
+ assertEquals(page.getName(), "defaultPage");
+ assertEquals(page.getId(), "/defaultPortal/defaultPage");
+ assertTrue(page.getParent() instanceof UIPortal);
+
+ //Add a UIPage to the UIContainer
+ UIContainer container = page.createChild("defaultContainer", UIContainer.class);
+ assertEquals(container.getName(), "defaultContainer");
+ assertEquals(container.getId(), "/defaultPortal/defaultPage/defaultContainer");
+ assertTrue(container.getParent() instanceof UIPage);
+
+ //Add a UIWindow to UIPage
+ UIWindow window = container.createChild("defaultWindow", UIWindow.class);
+ assertEquals(window.getName(), "defaultWindow");
+ assertEquals(window.getId(), "/defaultPortal/defaultPage/defaultContainer/defaultWindow");
+ assertTrue(window.getParent() instanceof UIContainer);
+ }*/
+
+ /**
+ *
+ * @throws Exception
+ */
+ /*public void testDestroyChild() throws Exception
+ {
+ //Assert the state of UIPortal added to the UIObject tree
+ UIPortal portal = this.uiContext.createChild("defaultPortal", UIPortal.class);
+
+ //Add a UIPage to the UIPortal
+ UIPage page = portal.createChild("defaultPage", UIPage.class);
+
+ //Add a UIPage to the UIContainer
+ UIContainer container = page.createChild("defaultContainer", UIContainer.class);
+
+ //Add a UIWindow to UIPage
+ UIWindow window = container.createChild("defaultWindow", UIWindow.class);
+
+ //Destroy the container. When this is done, both container and window must be destroyed from the UIObject tree
+ page.destroyChild(container.getName());
+ List<UIObject> pageChildren = page.getChildren();
+ assertTrue(pageChildren == null || pageChildren.size() == 0);
+ }*/
+
+ public void testModelLoading() throws Exception
+ {
+ MockObject mockDefaultPortal = model.getContext().addChild("defaultPortal", MockObject.Type.PORTAL);
+ MockObject mockSomeOtherPortal = model.getContext().addChild("someOtherPortal", MockObject.Type.PORTAL);
+
+ UIContext context = new UIContextImpl(model);
+
+ UIPortal defaultPortal = (UIPortal)context.getChildren().get(0);
+ UIPortal someOtherPortal = (UIPortal)context.getChildren().get(1);
+
+ assertEquals(defaultPortal.getName(), "defaultPortal");
+ assertEquals(defaultPortal.getId(), mockDefaultPortal.getId());
+ assertEquals(someOtherPortal.getName(), "someOtherPortal");
+ assertEquals(someOtherPortal.getId(), mockSomeOtherPortal.getId());
+ }
+
+ public void testParentLoading() throws Exception
+ {
+ //Setup rootChildrenInfo
+ MockObject mockDefaultPortal = model.getContext().addChild("defaultPortal", MockObject.Type.PORTAL);
+ MockObject mockDefaultPage = mockDefaultPortal.addChild("defaultPage", MockObject.Type.PORTAL);
+
+ UIContext context = new UIContextImpl(model);
+
+ UIPortal portal = (UIPortal)context.getObject(mockDefaultPage.getId());
+ UIObject parent = portal.getParent();
+
+ assertEquals(parent.getName(), "defaultPortal");
+ assertEquals(parent.getId(), mockDefaultPortal.getId());
+ }
+}
16 years, 7 months
- 1
- 0
JBoss Portal SVN: r9114 - in branches/JBoss_Portal_Branch_2_6/core/src: bin/portal-core-war/layouts/1column and 4 other directories.
by portal-commits＠lists.jboss.org
Author: wesleyhales
Date: 2007-11-26 14:44:19 -0500 (Mon, 26 Nov 2007)
New Revision: 9114
Modified:
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/js/modal.js
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/1column/index.jsp
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/3columns/index.jsp
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/common/modal.jsp
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/generic/index.jsp
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/generic/maximized.jsp
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp
Log:
JBPORTAL-1789 :Improve login page of jboss-portal to match JBP LnF
Modified: branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/js/modal.js
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/js/modal.js 2007-11-26 16:27:40 UTC (rev 9113)
+++ branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/js/modal.js 2007-11-26 19:44:19 UTC (rev 9114)
@@ -2,7 +2,7 @@
var loadingImage = 'loading.gif';
var closeButton = 'close.gif';
-
+var isModalLoaded = false
//
// getPageScroll()
// Returns array with x,y page scroll values.
Modified: branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/1column/index.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/1column/index.jsp 2007-11-26 16:27:40 UTC (rev 9113)
+++ branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/1column/index.jsp 2007-11-26 19:44:19 UTC (rev 9114)
@@ -16,7 +16,7 @@
<body id="body">
<p:region regionName='AJAXScripts' regionID='AJAXScripts'/>
-<%@ include file="../common/modal.jsp" %>
+<%@include file="/layouts/common/modal.jsp"%>
<div id="portal-container">
<div id="sizer">
<div id="expander">
Modified: branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/3columns/index.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/3columns/index.jsp 2007-11-26 16:27:40 UTC (rev 9113)
+++ branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/3columns/index.jsp 2007-11-26 19:44:19 UTC (rev 9114)
@@ -16,7 +16,7 @@
<body id="body">
<p:region regionName='AJAXScripts' regionID='AJAXScripts'/>
-<%@ include file="../common/modal.jsp" %>
+<%@include file="/layouts/common/modal.jsp"%>
<div id="portal-container">
<div id="sizer">
<div id="expander">
Modified: branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/common/modal.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/common/modal.jsp 2007-11-26 16:27:40 UTC (rev 9113)
+++ branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/common/modal.jsp 2007-11-26 19:44:19 UTC (rev 9114)
@@ -1,5 +1,5 @@
-<script src="/portal-core/js/modal.js" type="text/javascript"></script>
-<link rel="stylesheet" href="/portal-core/css/modal.css" type="text/css" />
+<script src="<%=request.getContextPath()%>/js/modal.js" type="text/javascript"></script>
+<link rel="stylesheet" href="<%=request.getContextPath()%>/css/modal.css" type="text/css" />
<div id="login-modal" style="display:none">
<div id="login-modal-msg" style="display:none;width:257px;height:157px">
<% String loginHeight = "100%"; %>
Modified: branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/generic/index.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/generic/index.jsp 2007-11-26 16:27:40 UTC (rev 9113)
+++ branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/generic/index.jsp 2007-11-26 19:44:19 UTC (rev 9114)
@@ -16,7 +16,7 @@
<body id="body">
<p:region regionName='AJAXScripts' regionID='AJAXScripts'/>
-<%@ include file="../common/modal.jsp" %>
+<%@include file="/layouts/common/modal.jsp"%>
<div id="portal-container">
<div id="sizer">
<div id="expander">
Modified: branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/generic/maximized.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/generic/maximized.jsp 2007-11-26 16:27:40 UTC (rev 9113)
+++ branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/generic/maximized.jsp 2007-11-26 19:44:19 UTC (rev 9114)
@@ -16,7 +16,7 @@
<body id="body">
<p:region regionName='AJAXScripts' regionID='AJAXScripts'/>
-<%@ include file="../common/modal.jsp" %>
+<%@include file="/layouts/common/modal.jsp"%>
<div id="portal-container">
<div id="sizer">
<div id="expander">
Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp 2007-11-26 16:27:40 UTC (rev 9113)
+++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp 2007-11-26 19:44:19 UTC (rev 9114)
@@ -16,15 +16,20 @@
if (user == null)
{
%>
+<script type="text/javascript">
+ if (typeof isModalLoaded != 'undefined'){
+ document.write('<a href=\"#\" onclick=\"alertModal(\'login-modal\',\'login-modal-msg\');return false;\">Login</a>');
+ }else{
+ document.write('<a href=\"<%= loginURL %>\">Login</a>');
+ }
- <script type="text/javascript">
- document.write('<a href=\"#\" onclick=\"alertModal(\'login-modal\',\'login-modal-msg\');return false;\">Login</a>');
- </script>
+</script>
<noscript>
<a href="<%= loginURL %>">Login</a>
</noscript>
+
<%
}
else
@@ -60,4 +65,4 @@
%> <a href="<%= signOutURL %>">Logout</a>
<%
}
-%>
\ No newline at end of file
+%>
16 years, 7 months
- 1
- 0
JBoss Portal SVN: r9113 - branches/JBoss_Portal_Branch_2_6/build.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-11-26 11:27:40 -0500 (Mon, 26 Nov 2007)
New Revision: 9113
Modified:
branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml
Log:
JBPORTAL-1815: Oups
Modified: branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml 2007-11-26 15:54:01 UTC (rev 9112)
+++ branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml 2007-11-26 16:27:40 UTC (rev 9113)
@@ -51,7 +51,7 @@
<componentref name="jboss-portal/modules/web" version="trunk-SNAPSHOT"/>
<componentref name="jboss-portal/modules/test" version="1.0-SNAPSHOT"/>
<componentref name="jboss-portal/modules/portlet" version="1.0-SNAPSHOT"/>
- <componentref name="jboss-portal/modules/identity" version="1.0.1-SNAPSHOT"/>
+ <componentref name="jboss-portal/modules/identity" version="1.0-SNAPSHOT"/>
<componentref name="antlr" version="2.7.6.ga"/>
<componentref name="apache-ant" version="1.6.5"/>
<componentref name="jackrabbit" version="1.1.1"/>
16 years, 7 months
- 1
- 0
JBoss Portal SVN: r9112 - in branches/JBoss_Portal_Branch_2_6/core/src: bin/portal-core-war/js and 1 other directories.
by portal-commits＠lists.jboss.org
Author: wesleyhales
Date: 2007-11-26 10:54:01 -0500 (Mon, 26 Nov 2007)
New Revision: 9112
Modified:
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/css/login.css
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/js/modal.js
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-server-war/login.jsp
Log:
JBPORTAL-1789 :Improve login page of jboss-portal to match JBP LnF
Modified: branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/css/login.css
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/css/login.css 2007-11-26 15:49:35 UTC (rev 9111)
+++ branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/css/login.css 2007-11-26 15:54:01 UTC (rev 9112)
@@ -2,13 +2,13 @@
font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
font-size: 11px;
width: 255px;
- height: 155px;
border: 1px solid #436999;
position: relative;
margin: 0 auto 0 auto;
background-color:white;
}
+input.cancel-button,
input.login-button {
background-color: #5078AA;
border-color: #97B7C6 rgb( 37, 72, 105 ) rgb( 37, 72, 105 ) rgb( 151, 183, 198 );
@@ -18,7 +18,16 @@
font-size: 10px;
font-weight: bold;
position: absolute;
+}
+
+input.login-button {
bottom: 20px;
+ width: 60px;
+ right: 90px
+}
+
+input.cancel-button {
+ bottom: 20px;
right: 10px;
width: 70px;
}
@@ -46,7 +55,6 @@
background-position: top left;
background-repeat: repeat-x;
width: 255px;
- height: 116px;
font-weight: bold;
padding: 10px 0 0 0;
text-align: right;
@@ -60,7 +68,13 @@
div.error-message {
color: red;
margin: 0 auto 0 auto;
- width: 300px;
font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
font-size: 11px;
+ padding: 5px;
+ font-weight:normal;
+ text-align:left;
+}
+
+div.bottom-field{
+ padding-bottom: 68px;
}
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/js/modal.js
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/js/modal.js 2007-11-26 15:49:35 UTC (rev 9111)
+++ branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/js/modal.js 2007-11-26 15:54:01 UTC (rev 9112)
@@ -266,7 +266,7 @@
objOverlay.style.position = 'absolute';
objOverlay.style.top = '0';
objOverlay.style.left = '0';
- objOverlay.style.zIndex = '90';
+ objOverlay.style.zIndex = '101';
objOverlay.style.width = '100%';
objBody.insertBefore(objOverlay, objBody.firstChild);
var arrayPageSize = getPageSize();
@@ -303,7 +303,7 @@
objModal.className = 'modal';
objModal.style.display = 'none';
objModal.style.position = 'absolute';
- objModal.style.zIndex = '100';
+ objModal.style.zIndex = '102';
objBody.insertBefore(objModal, objOverlay.nextSibling);
// create link
@@ -503,7 +503,7 @@
objOverlay.style.position = 'absolute';
objOverlay.style.top = '0';
objOverlay.style.left = '0';
- objOverlay.style.zIndex = '90';
+ objOverlay.style.zIndex = '101';
objOverlay.style.width = '100%';
objOverlay.onclick = function (){hideContentModal(modalId); return false};
@@ -518,7 +518,7 @@
objModal.className = 'modal';
objModal.style.display = 'none';
objModal.style.position = 'absolute';
- objModal.style.zIndex = '100';
+ objModal.style.zIndex = '102';
objModal.style.width = contentWidth + 'px';
objModal.style.height = contentHeight + 'px';
objModal.innerHTML = contentBody.innerHTML;
Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-server-war/login.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-server-war/login.jsp 2007-11-26 15:49:35 UTC (rev 9111)
+++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-server-war/login.jsp 2007-11-26 15:54:01 UTC (rev 9112)
@@ -36,16 +36,16 @@
<link rel="stylesheet" href="/portal-core/css/login.css" type="text/css" />
</head>
<body OnLoad="document.loginform.j_username.focus();">
-<div class="error-message"
- style="display:<%=(request.getAttribute("org.jboss.portal.loginError") != null ? "" : "none")%>;"><%=request.getAttribute("org.jboss.portal.loginError") %>
-</div>
+
<div class="login-container">
<div class="login-header">
<h2>JBoss Portal Login</h2>
</div>
<div class="login-content">
-
+ <div class="error-message"
+ style="display:<%=(request.getAttribute("org.jboss.portal.loginError") != null ? "" : "none")%>;"><%=request.getAttribute("org.jboss.portal.loginError") %>
+ </div>
<form method="POST" action="<%= response.encodeURL("j_security_check") %>" name="loginform" id="loginForm"
target="_parent">
<label for="j_username">
@@ -53,11 +53,11 @@
<input type="text" name="j_username" id="j_username" value=""/></div>
</label>
<label for="j_password">
- <div class="form-field">Password:
+ <div class="form-field bottom-field">Password:
<input type="password" name="j_password" id="j_password" value=""/></div>
</label>
-
- <input type="submit" name="login" value="Login" class="login-button"/>
+ <input style="display:<%=(request.getParameter("loginheight") != null ? "" : "none")%>;" type="button" name="cancel" value="Cancel" class="cancel-button" onclick="window.parent.hideContentModal('login-modal');"/>
+ <input style="<%=(request.getParameter("loginheight") != null ? "" : "right:10px")%>;" type="submit" name="login" value="Login" class="login-button"/>
</form>
</div>
16 years, 7 months
- 1
- 0
JBoss Portal SVN: r9111 - in docs/branches/JBoss_Portal_Branch_2_6: referenceGuide/en and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-11-26 10:49:35 -0500 (Mon, 26 Nov 2007)
New Revision: 9111
Modified:
docs/branches/JBoss_Portal_Branch_2_6/common/en/modules/acknowledgements.xml
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/master.xml
Log:
minor
Modified: docs/branches/JBoss_Portal_Branch_2_6/common/en/modules/acknowledgements.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/common/en/modules/acknowledgements.xml 2007-11-26 15:17:45 UTC (rev 9110)
+++ docs/branches/JBoss_Portal_Branch_2_6/common/en/modules/acknowledgements.xml 2007-11-26 15:49:35 UTC (rev 9111)
@@ -5,6 +5,9 @@
<para>
<itemizedlist>
<listitem>
+ Luca Stancapiano and Luc Boudreau for their localization contributions.
+ </listitem>
+ <listitem>
Antoine Herzog for his feedback, for writing Wikis and helping in the forums.
</listitem>
<listitem>
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/master.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/master.xml 2007-11-26 15:17:45 UTC (rev 9110)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/master.xml 2007-11-26 15:49:35 UTC (rev 9111)
@@ -30,6 +30,9 @@
<!ENTITY portalapi SYSTEM "modules/portalapi.xml">
<!ENTITY errorhandling SYSTEM "modules/errorhandling.xml">
<!ENTITY portletmodes SYSTEM "modules/portletmodes.xml">
+ <!ENTITY portalObjectsDTD SYSTEM "modules/portalObjectsDTD.xml">
+ <!ENTITY portletInstancesDTD SYSTEM "modules/portletInstancesDTD.xml">
+ <!ENTITY jbossPortletDTD SYSTEM "modules/jbossPortletDTD.xml">
]>
<book lang="en">
<bookinfo>
@@ -93,5 +96,8 @@
<!-- Theme/layout api --> &themeandlayouts;
<!-- Ajax --> &ajax;
<!-- Troubleshooting FAQ--> &troubleshooting;
+ &portalObjectsDTD;
+ &portletInstancesDTD;
+ &jbossPortletDTD;
</book>
16 years, 7 months
- 1
- 0
JBoss Portal SVN: r9110 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-11-26 10:17:45 -0500 (Mon, 26 Nov 2007)
New Revision: 9110
Modified:
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/dtd/jboss-portlet_2_6.dtd
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/dtd/portal-object_2_6.dtd
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/dtd/portlet-instances_2_6.dtd
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/navtabs.xml
Log:
- Fix page width for DTDs
- Update documentation about Tab localization
Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/dtd/jboss-portlet_2_6.dtd
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/dtd/jboss-portlet_2_6.dtd 2007-11-26 14:52:55 UTC (rev 9109)
+++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/dtd/jboss-portlet_2_6.dtd 2007-11-26 15:17:45 UTC (rev 9110)
@@ -68,7 +68,8 @@
</portlet>
-->
-<!ELEMENT portlet (portlet-name,remotable?,ajax?,session-config?,transaction?,header-content?,portlet-info?)>
+<!ELEMENT portlet (portlet-name,remotable?,ajax?,session-config?,transaction?,
+ header-content?,portlet-info?)>
<!--
The portlet name.
Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/dtd/portal-object_2_6.dtd
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/dtd/portal-object_2_6.dtd 2007-11-26 14:52:55 UTC (rev 9109)
+++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/dtd/portal-object_2_6.dtd 2007-11-26 15:17:45 UTC (rev 9110)
@@ -93,7 +93,8 @@
does not have a visual representation. It can exist only under the root. A context can
only have children with the portal type.
-->
-<!ELEMENT context (context-name,properties?,listener?,security-constraint?,portal*, (display-name* | (resource-bundle, supported-locale+)))>
+<!ELEMENT context (context-name,properties?,listener?,security-constraint?,portal*,
+ (display-name* | (resource-bundle, supported-locale+)))>
<!--
The context name value.
@@ -108,7 +109,8 @@
(view,edit,help) and (normal,minimized,maximized).
-->
<!ELEMENT portal (portal-name,supported-modes,supported-window-states?,properties?,
- listener?,security-constraint?,page*, (display-name* | (resource-bundle, supported-locale+)))>
+ listener?,security-constraint?,page*,
+ (display-name* | (resource-bundle, supported-locale+)))>
<!--
The portal name value.
@@ -158,7 +160,8 @@
type page and window. The children windows are the windows of the page and the children
pages are the subpages of this page.
-->
-<!ELEMENT page (page-name,properties?,listener?,security-constraint?,(page|window)*, (display-name* | (resource-bundle, supported-locale+)))>
+<!ELEMENT page (page-name,properties?,listener?,security-constraint?,(page|window)*,
+ (display-name* | (resource-bundle, supported-locale+)))>
<!ELEMENT display-name (#PCDATA)>
<!ATTLIST display-name
@@ -185,7 +188,9 @@
The region and height defines how the window is placed in the page.
-->
-<!ELEMENT window (window-name,(instance-ref|content),region,height,initial-window-state?,initial-mode?,properties?,listener?, (display-name* | (resource-bundle, supported-locale+)))>
+<!ELEMENT window (window-name,(instance-ref|content),region,height,
+ initial-window-state?,initial-mode?,properties?,listener?,
+ (display-name* | (resource-bundle, supported-locale+)))>
<!--
The window name value.
Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/dtd/portlet-instances_2_6.dtd
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/dtd/portlet-instances_2_6.dtd 2007-11-26 14:52:55 UTC (rev 9109)
+++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/dtd/portlet-instances_2_6.dtd 2007-11-26 15:17:45 UTC (rev 9110)
@@ -74,7 +74,8 @@
</instance>
-->
-<!ELEMENT instance (instance-id,portlet-ref,display-name*,preferences?,security-constraint?, (display-name* | (resource-bundle, supported-locale+)))>
+<!ELEMENT instance (instance-id,portlet-ref,display-name*,preferences?,
+ security-constraint?, (display-name* | (resource-bundle, supported-locale+)))>
<!ELEMENT display-name (#PCDATA)>
<!ATTLIST display-name
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/navtabs.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/navtabs.xml 2007-11-26 14:52:55 UTC (rev 9109)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/navtabs.xml 2007-11-26 15:17:45 UTC (rev 9110)
@@ -4,8 +4,12 @@
<author>
<firstname>Roy</firstname>
<surname>Russo</surname>
- <email>roy at jboss dot org</email>
</author>
+ <author>
+ <firstname>Thomas</firstname>
+ <surname>Heute</surname>
+ <email>theute(a)jboss.org</email>
+ </author>
</chapterinfo>
<title>Navigation Tabs</title>
<para>The navigation tabs allow users to navigate the portal pages. This section describes some of the functionality
@@ -39,25 +43,49 @@
</para>
</sect1>
<sect1>
- <title>Internationalizing tab labels</title>
- <para>JBoss Portal uses Resource bundles to localize the tab naming for international users. The resource files
- can be found in
- <emphasis>jboss-portal.sar/conf/bundles</emphasis>
- and have the names
- <emphasis>Resource_*.properties</emphasis>
- </para>
- <para>The resource files provide a mapping between the name of the page, as defined in the *-object.xml, and a
- localized value to display in the tab. For example, our standard bundled pages: Home, Admin, Test, News, are
- mapped as such in the
- <emphasis>Resource_fr.properties</emphasis>
- file, for French users:
-<programlisting><![CDATA[
-PAGENAME_default=Accueil
-PAGENAME_Admin=Admin
-PAGENAME_Test=Test
-PAGENAME_News=Actualités]]></programlisting>
- So the mapping pattern is
- <emphasis>PAGENAME_[Name in *-object.xml]=[translated value]</emphasis>
- </para>
+ <title>Translating tab labels</title>
+ <para>Labels on tabs can be defined in multiple languages. Two different ways can be used, the first one consist at
+ defining several display name for page objects, the second one consists of defining a resource bundle where to find
+ the localized display-name. Both methods have advantages and drawbacks.</para>
+ <sect2>
+ <title>Method one: Multiple <literal>display-name</literal></title>
+ <para>In the <filename>*-object.xml</filename> descriptor under the <literal>page</literal> element, it is possible
+ to define a display-name per locale. Here is an example:
+ <programlisting><![CDATA[
+<page>
+ <page-name>News</page-name>
+ <display-name xml:lang="en">News</display-name>
+ <display-name xml:lang="it">Novita'</display-name>
+ <display-name xml:lang="es">Noticias</display-name>
+ <display-name xml:lang="fr">Actualités</display-name>
+ ...
+</page>
+ ]]></programlisting>
+ Here we defined a display name for four different languages. The advantage of this method is that it is simple and the
+ display name is kept along the metadata. The drawback of this method is that if you may end up with different places
+ to keep your localized data. If you are using resource bundles for other elements, the second method might be simpler
+ when you add new supported languages.
+ </para>
+ </sect2>
+ <sect2>
+ <title>Defining a resource bundle and supported locales</title>
+ <para>If you are already using resource bundles for localization you may prefer to point to those files. To do so you
+ can define the name of your ressource bundle. The files should be in the classloader of the war containing the <filename>*-object.xml</filename>
+ where you define them, meaning in the same war file.</para>
+ <para>Here is an example:
+ <programlisting><![CDATA[
+<page>
+ <page-name>Weather</page-name>
+ <supported-locale>fr</supported-locale>
+ <supported-locale>en</supported-locale>
+ ...
+</page>
+ ]]></programlisting>
+ With one or the other method, accessing the portal will now display the tab names with the preferred locale if a localized
+ value exists.
+ </para>
+ <warning><para>If you change the values in the descriptor (method 1) or in the resource bundles (method 2) you need to use
+ the <literal><if-exists>overwrite</if-exists></literal> so that the values are updated</para></warning>
+ </sect2>
</sect1>
</chapter>
\ No newline at end of file
16 years, 7 months
- 1
- 0
JBoss Portal SVN: r9109 - in docs/branches/JBoss_Portal_Branch_2_6/referenceGuide: en/modules and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-11-26 09:52:55 -0500 (Mon, 26 Nov 2007)
New Revision: 9109
Added:
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/jbossPortletDTD.xml
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/portalObjectsDTD.xml
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/portletInstancesDTD.xml
Modified:
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/build.xml
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/configuration.xml
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/contentintegration.xml
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/installation.xml
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/portalapi.xml
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/supported.xml
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml
Log:
- Created a simple task to convert DTDs to docbook
- Added full DTDs as appendix
- Minor updates for 2.6.3
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/build.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/build.xml 2007-11-26 14:29:16 UTC (rev 9108)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/build.xml 2007-11-26 14:52:55 UTC (rev 9109)
@@ -12,6 +12,59 @@
</antcall>
</target>
+ <target name="portalObjectsDTD">
+ <antcall target="createDocbookFromDTD">
+ <param name="dest" value="portalObjectsDTD.xml"/>
+ <param name="dtdFileName" value="portal-object_2_6.dtd"/>
+ <param name="title" value="*-object.xml DTD"/>
+ <param name="id" value="portalObjectsDTD"/>
+ </antcall>
+ </target>
+
+ <target name="portletInstancesDTD">
+ <antcall target="createDocbookFromDTD">
+ <param name="dest" value="portletInstancesDTD.xml"/>
+ <param name="dtdFileName" value="portlet-instances_2_6.dtd"/>
+ <param name="title" value="portlet-instances.xml DTD"/>
+ <param name="id" value="portletInstancesDTD"/>
+ </antcall>
+ </target>
+
+ <target name="jbossPortletDTD">
+ <antcall target="createDocbookFromDTD">
+ <param name="dest" value="jbossPortletDTD.xml"/>
+ <param name="dtdFileName" value="jboss-portlet_2_6.dtd"/>
+ <param name="title" value="jboss-portlet.xml DTD"/>
+ <param name="id" value="jbossPortletDTD"/>
+ </antcall>
+ </target>
+
+ <target name="createDocbookFromDTD">
+ <concat destfile="${basedir}/en/modules/${dest}"
+ force="no">
+ <![CDATA[
+<!-- DO NOT EDIT ME DIRECTLY, I AM GENERATED FROM THE DTD USING THE dtd2docbook ANT TASK -->
+<appendix id="${id}">
+ <title>]]>${title}<![CDATA[</title>
+ <para>
+<programlisting><![CDATA[
+]]>
+ </concat>
+ <concat destfile="${basedir}/en/modules/${dest}"
+ append="true">
+ <filelist dir="../../core/src/resources/portal-core-sar/dtd/" files="${dtdFileName}"/>
+ </concat>
+ <concat destfile="${basedir}/en/modules/${dest}"
+ append="true">
+
+]]><![CDATA[</programlisting>
+ </para>
+</appendix>
+]]> </concat>
+ </target>
+
+ <target name="dtd2docbook" depends="portalObjectsDTD, portletInstancesDTD, jbossPortletDTD"/>
+
<target name="all.doc" depends="clean">
<antcall target="lang.all"><param name="lang" value="en"/></antcall>
</target>
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/configuration.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/configuration.xml 2007-11-26 14:29:16 UTC (rev 9108)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/configuration.xml 2007-11-26 14:52:55 UTC (rev 9109)
@@ -29,7 +29,6 @@
number manually.
</para>
<para>To change it, you need to edit the file <literal>$JBOSS_HOME/server/default/deploy/jboss-web.deployer/server.xml</literal>
- (<literal>$JBOSS_HOME/server/default/deploy/jbossweb-tomcat55.sar/server.xml</literal> on JBoss AS 4.0.x)
and change the port value of the HTTP Connector.
</para>
<para>
@@ -61,7 +60,6 @@
<note>
By default, Tomcat holds on to the root context '/'. You may need to either remove
<literal>$JBOSS_HOME/server/default/deploy/jboss-web.deployer/ROOT.war</literal>
- (<literal>$JBOSS_HOME/server/default/deploy/jbossweb-tomcat55.sar/ROOT.war</literal> on JBoss AS 4.0.x)
or add a <literal>jboss-web.xml</literal> file (declaring another context-root other than '/') under
<literal>ROOT.war/WEB-INF</literal> directory for the below changes to take effect on restart.
<programlisting><![CDATA[
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/contentintegration.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/contentintegration.xml 2007-11-26 14:29:16 UTC (rev 9108)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/contentintegration.xml 2007-11-26 14:52:55 UTC (rev 9109)
@@ -141,7 +141,8 @@
protected void doDispatch(RenderRequest req, RenderResponse resp)
throws PortletException, PortletSecurityException, IOException
{
- if (EDIT_CONTENT_MODE.equals(req.getPortletMode()) || SELECT_CONTENT_MODE.equals(req.getPortletMode()))
+ if (EDIT_CONTENT_MODE.equals(req.getPortletMode()) ||
+ SELECT_CONTENT_MODE.equals(req.getPortletMode()))
{
doEditContent(req, resp);
}
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/installation.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/installation.xml 2007-11-26 14:29:16 UTC (rev 9108)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/installation.xml 2007-11-26 14:52:55 UTC (rev 9109)
@@ -4,26 +4,16 @@
<para>Depending on your needs, there are several different methods to get JBoss Portal up and running.
<note>Pre-configured clustered versions are available
from the
- <ulink url="http://labs.jboss.com/portal/jbossportal/download/index.html">download page</ulink>
- , in the same 3 flavors as the non-clustered version. The installation differences, being that they must be
- deployed in the
- <emphasis>all</emphasis>
+ <ulink url="http://labs.jboss.com/portal/jbossportal/download/index.html">download page</ulink>.
+ The installation differences, being that they must be deployed in the <emphasis>all</emphasis>
configuration in JBoss AS and all your instances must reference the same datasource. Read
- <xref linkend="clustering"/>
- for more details on how to customize your clustered install, once deployed.
+ <xref linkend="clustering"/> for more details on how to customize your clustered install, once deployed.
</note>
- <note>
- <title>Installation of JBoss Portal on former version of JBoss AS</title>
- <para>If you need to install JBoss Portal on JBoss AS 4.0.x, please refer to the dedicated
- <ulink url="http://wiki.jboss.org/wiki/Wiki.jsp?page=Portal26_AS40">wiki page</ulink>.</para>
- </note>
-
</para>
<sect1 id="install_bundle">
<title>Installing from Bundled Download</title>
<para>This is the easiest and fastest way to get JBoss Portal installed and running. The reason is that the
- download bundle contains JBoss Application Server, and JBoss Portal uses the embedded Hypersonic
- Database.
+ download bundle contains JBoss Application Server, and JBoss Portal uses the embedded Hypersonic Database.
</para>
<sect2>
<title>Installing the Bundle</title>
@@ -63,8 +53,7 @@
, and you should see the Portal HomePage. You can now login using one of the two default accounts:
<emphasis>user/user</emphasis>
or
- <emphasis>admin/admin</emphasis>
- .
+ <emphasis>admin/admin</emphasis>.
</para>
</sect2>
</sect1>
@@ -100,7 +89,7 @@
<sect3>
<title>Application Server Setup</title>
<para>Of course you will need to install JBoss Application Server prior to installing JBoss
- portal, if you didn't do so yet, please install JBoss EAP 4.2 or JBoss AS 4.2.1. If you have a
+ portal, if you didn't do so yet, please install JBoss EAP 4.2 or JBoss AS 4.2.2. If you have a
subscription contract with Red Hat, can have access to the EAP
version from the <ulink url="http://network.jboss.com/">support portal</ulink>.
For the other versions you can get them
@@ -261,7 +250,7 @@
<sect3>
<title>Application Server Setup</title>
<para>Of course you will need to install JBoss Application Server prior to installing JBoss
- portal, if you didn't do so yet, please install JBoss EAP 4.2 or JBoss AS 4.2.1. If you have a
+ portal, if you didn't do so yet, please install JBoss EAP 4.2 or JBoss AS 4.2.2. If you have a
subscription contract with Red Hat, can have access to the EAP
version from the <ulink url="http://network.jboss.com/">support portal</ulink>.
For the other versions you can get them
Added: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/jbossPortletDTD.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/jbossPortletDTD.xml (rev 0)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/jbossPortletDTD.xml 2007-11-26 14:52:55 UTC (rev 9109)
@@ -0,0 +1,299 @@
+
+
+<!-- DO NOT EDIT ME DIRECTLY, I AM GENERATED FROM THE DTD USING THE dtd2docbook ANT TASK -->
+<appendix id="jbossPortletDTD">
+ <title>jboss-portlet.xml DTD</title>
+ <para>
+<programlisting><![CDATA[
+
+ <?xml version="1.0" encoding="UTF-8" ?>
+
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2006, 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. ~
+ ~ ~
+ ~ This is free software; you can redistribute it and/or modify it ~
+ ~ 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 ~
+ ~ Lesser General Public License for more details. ~
+ ~ ~
+ ~ You should have received a copy of the GNU Lesser General Public ~
+ ~ License along with this software; if not, write to the Free ~
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<!-- The additional configuration elements of the JBoss portlet container.
+
+<!DOCTYPE portlet-app PUBLIC
+ "-//JBoss Portal//DTD JBoss Portlet 2.6//EN"
+ "http://www.jboss.org/portal/dtd/jboss-portlet_2_6.dtd">
+-->
+
+<!--
+The remotable element is used to configure the default behavior of the portlets with
+respect to WSRP exposure.
+
+For each portlet defined in portlet.xml, it is possible to configure specific
+settings of the portlet container.
+
+It is also possible to inject services in the portlet context of the application
+using the service elements.
+-->
+<!ELEMENT portlet-app (remotable?,portlet*,service*)>
+
+<!--
+Additional configuration for a portlet.
+
+The portlet-name defines the name of the portlet. It must match a portlet defined already
+in portlet.xml of the same web application.
+
+The remotable element configures the portlet exposure to WSRP. If no value is present
+then the value considered is either the value defined globally at the portlet
+application level or false.
+
+The trans-attribute value specifies the behavior of the portlet when it is invoked at
+runtime with respect to the transactionnal context. According to how the portlet is
+invoked a transaction may exist or not before the portlet is invoked. Usually in the
+local context the portal transaction could be present. By default the value considered is
+ NotSupported which means that the portal transaction will be suspended for the duration
+ of the portlet invocation.
+
+Example:
+
+<portlet>
+ <portlet-name>MyPortlet</portlet-name>
+ <remotable>true</remotable>
+ <trans-attribute>Required</trans-attribute>
+</portlet>
+
+-->
+<!ELEMENT portlet (portlet-name,remotable?,ajax?,session-config?,transaction?,
+ header-content?,portlet-info?)>
+
+<!--
+The portlet name.
+-->
+<!ELEMENT portlet-name (#PCDATA)>
+
+<!--
+The remotable value is used for WSRP exposure. The accepted values are the
+litterals true of false.
+-->
+<!ELEMENT remotable (#PCDATA)>
+
+<!--
+The ajax tag allows to configure the ajax capabilities of the portlet. If
+the portlet is tagged as partial-refresh then the portal may use partial page
+refreshing and render only that portlet. If the portlet partial-refresh value
+is false, then the portal will perform a full page refresh when the portlet is refreshed.
+-->
+<!ELEMENT ajax (partial-refresh)>
+
+<!--
+The authorized values for the partial-refresh element are true or false.
+-->
+<!ELEMENT partial-refresh (#PCDATA)>
+
+<!--
+Additional portlet information
+-->
+<!ELEMENT portlet-info (icon?)>
+
+<!--
+Defines icons for the portlet, they can be used by the administration portlet
+to represent a particular portlet.
+-->
+<!ELEMENT icon (small-icon?, large-icon?)>
+
+<!--
+A small icon image, usually 16x16, gif, jpg and png are usually supported.
+An absolute URL or a URL starting with a '/' in the context of the webapp are accepted:
+eg. http://www.example.com/images/smallIcon.png
+eg. /images/smallIcon.png
+-->
+<!ELEMENT small-icon (#PCDATA)>
+
+<!--
+A large icon image, usually 32x32, gif, jpg and png are usually supported.
+An absolute URL or a URL starting with a '/' in the context of the webapp are accepted:
+eg. http://www.example.com/images/smallIcon.png
+eg. /images/smallIcon.png
+-->
+<!ELEMENT large-icon (#PCDATA)>
+
+<!--
+This element configure the portlet session of the portlet.
+
+The distributed element instructs the container to distribute the session attributes
+using the portal session replication. It applies only to local portlets are not to
+remote portlets. The default value is false.
+
+Example:
+
+<session-config>
+ <distributed>true</distributed>
+</session-config>
+
+-->
+<!ELEMENT session-config (distributed)>
+
+<!--
+The authorized values for the distributed element are true or false.
+-->
+<!ELEMENT distributed (#PCDATA)>
+
+<!--
+Defines how the portlet behaves with the transactionnal context. The default value
+is Never.
+
+Example:
+
+<transaction>
+ <trans-attribute>Required</transaction>
+<transaction>
+-->
+<!ELEMENT transaction (trans-attribute)>
+
+<!--
+The trans-attribute value defines the transactionnal behavior. The accepted values
+are Required, Mandatory, Never, Supports, NotSupported and RequiresNew.
+-->
+<!ELEMENT trans-attribute (#PCDATA)>
+
+<!--
+Specify content which should be included in the portal aggregated page when the portlet
+is present on that page. This setting only applies when the portlet is used in the local mode.
+-->
+<!ELEMENT header-content (link|script|meta)*>
+
+<!--
+Creates a header markup element for linked resources,
+see http://www.w3.org/TR/html401/struct/links.html#h-12.3
+
+At runtime the href attribute value will be prefixed with the context path
+of the web application.
+
+Example:
+
+<link rel="stylesheet" type="text/css" href="/style.css" media="screen"/>
+
+will produce at runtime the following markup
+
+<link rel="stylesheet" type="text/css" href="/my-web-application/style.css" media="screen"/>
+-->
+<!ATTLIST link
+ href CDATA #IMPLIED
+ rel CDATA #IMPLIED
+ type CDATA #IMPLIED
+ media CDATA #IMPLIED
+ title CDATA #IMPLIED>
+
+<!--
+No content is allowed inside an link element.
+-->
+<!ELEMENT link EMPTY>
+
+<!--
+Creates a header markup for scripting,
+see http://www.w3.org/TR/html401/interact/scripts.html
+
+At runtime the src attribute value will be prefixed with the context path
+of the web application.
+
+Example 1:
+
+<script type="text/javascript" src="/myscript.js"></script>
+
+will produce at runtime the following markup
+
+<script type="text/javascript" src="/my-web-application/myscript.js"></script>
+
+Example 2:
+
+<script type="text/javascript">
+ function hello() {
+ alert('Hello');
+ }
+</script>
+-->
+<!ATTLIST script
+ src CDATA #IMPLIED
+ type CDATA #IMPLIED
+ language CDATA #IMPLIED>
+
+<!--
+The script header element can contain inline script definitions.
+-->
+<!ELEMENT script (#PCDATA)>
+
+<!--
+Creates a header markup for adding meta data to a page,
+see http://www.w3.org/TR/html401/struct/global.html#h-7.4.4
+
+Example:
+
+<meta name="keywords" content="jboss, portal, redhat"/>
+-->
+<!ATTLIST meta
+ name CDATA #REQUIRED
+ content CDATA #REQUIRED>
+
+<!--
+No content is allowed for meta element.
+-->
+<!ELEMENT meta EMPTY>
+
+<!--
+Declare a service that will be injected by the portlet container as an
+attribute of the portlet context.
+
+Example:
+
+<service>
+ <service-name>UserModule</service-name>
+ <service-class>org.jboss.portal.identity.UserModule</service-class>
+ <service-ref>:service=Module,type=User</service-ref>
+</service>
+
+In the portlet it is then possible to use it by doing a lookup on the service
+name, for example in the init() lifecycle method :
+
+public void init()
+{
+ UserModule userModule = (UserModule)getPortletContext().getAttribute("UserModule");
+}
+
+-->
+<!ELEMENT service (service-name,service-class,service-ref)>
+
+<!--
+The service name that will be used to bind the service as a portlet context attribute.
+-->
+<!ELEMENT service-name (#PCDATA)>
+
+<!--
+The full qualified name of the interface that the service implements.
+-->
+<!ELEMENT service-class (#PCDATA)>
+
+<!--
+The reference to the service. In the JMX Microkernel environment it consist of the JMX
+name of the service MBean. For an MBean reference if the domain is left out, then the
+current domain of the portal will be used.
+-->
+<!ELEMENT service-ref (#PCDATA)>
+
+
+]]></programlisting>
+ </para>
+</appendix>
+
\ No newline at end of file
Added: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/portalObjectsDTD.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/portalObjectsDTD.xml (rev 0)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/portalObjectsDTD.xml 2007-11-26 14:52:55 UTC (rev 9109)
@@ -0,0 +1,344 @@
+
+
+<!-- DO NOT EDIT ME DIRECTLY, I AM GENERATED FROM THE DTD USING THE dtd2docbook ANT TASK -->
+<appendix id="portalObjectsDTD">
+ <title>*-object.xml DTD</title>
+ <para>
+<programlisting><![CDATA[
+
+ <?xml version="1.0" encoding="UTF-8" ?>
+
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2006, 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. ~
+ ~ ~
+ ~ This is free software; you can redistribute it and/or modify it ~
+ ~ 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 ~
+ ~ Lesser General Public License for more details. ~
+ ~ ~
+ ~ You should have received a copy of the GNU Lesser General Public ~
+ ~ License along with this software; if not, write to the Free ~
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<!--
+<!DOCTYPE deployments PUBLIC
+ "-//JBoss Portal//DTD Portal Object 2.6//EN"
+ "http://www.jboss.org/portal/dtd/portal-object_2_6.dtd">
+-->
+
+<!--
+The deployements element is a generic container for deployment elements.
+-->
+<!ELEMENT deployments (deployment*)>
+
+<!--
+The deployment is a generic container for portal object elements. The parent-ref
+child gives the name of the parent object that the current object will use as parent.
+The optional if-exists element define the behavior when a portal object which
+an identical name is already child of the parent element. The default behavior of
+the if-exist tag is to keep the existing object and not create a new object. The
+last element is the portal object itself.
+
+Example:
+
+<deployment>
+ <parent-ref>default</parent-ref>
+ <page>
+ ...
+ </page>
+</deployment>
+
+All portal objects have a common configuration which can be :
+
+1/ a listener : specifies the id of a listener is the listener registry. A listener
+object is able to listen portal events which apply to the portal node hierarchy.
+
+2/ properties : a set of generic properties owned by the portal object. Some
+properties can drive the behavior of the object.
+
+3/ security-constraint : defines security configuration of the portal object.
+
+-->
+<!ELEMENT deployment (parent-ref?,if-exists?,(context|portal|page|window))>
+
+<!--
+Contains a reference to the parent object. The naming convention for naming object
+is to concatenate the names of the path to the object and separate the names by a dot.
+If the path is empty then the empty string must be used.
+
+Example:
+
+<parent-ref/> the root having an empty path
+
+<parent-ref>default</parent-ref> the object with the name default under the root
+having the path (default)
+
+<parent-ref>default.default</parent-ref> the object with the path (default,default)
+
+-->
+<!ELEMENT parent-ref (#PCDATA)>
+
+<!--
+The authorized values are overwrite and keep. Overwrite means that the existing
+object will be destroyed and the current declaration will be used. Keep means that
+the existing object will not be destroyed and no creation hence will be done.
+-->
+<!ELEMENT if-exists (#PCDATA)>
+
+<!--
+A portal object of type context. A context type represent a node in the tree which
+does not have a visual representation. It can exist only under the root. A context can
+only have children with the portal type.
+-->
+<!ELEMENT context (context-name,properties?,listener?,security-constraint?,portal*,
+ (display-name* | (resource-bundle, supported-locale+)))>
+
+<!--
+The context name value.
+-->
+<!ELEMENT context-name (#PCDATA)>
+
+<!--
+A portal object of type portal. A portal type represents a virtual portal and can
+have children of type page. In addition of the common portal object elements it support
+also the declaration of the modes and the window states it supports. If no declaration
+of modes or window states is done then the default value will be respectively
+(view,edit,help) and (normal,minimized,maximized).
+-->
+<!ELEMENT portal (portal-name,supported-modes,supported-window-states?,properties?,
+ listener?,security-constraint?,page*,
+ (display-name* | (resource-bundle, supported-locale+)))>
+
+<!--
+The portal name value.
+-->
+<!ELEMENT portal-name (#PCDATA)>
+
+
+<!--
+The supported modes of a portal.
+
+Example:
+
+<supported-mode>
+ <mode>view</mode>
+ <mode>edit</mode>
+ <mode>help</mode>
+</supported-mode>
+-->
+<!ELEMENT supported-modes (mode*)>
+
+<!--
+A portlet mode value.
+-->
+<!ELEMENT mode (#PCDATA)>
+
+<!--
+The supported window states of a portal.
+
+Example:
+
+<supported-window-states>
+ <window-state>normal</window-state>
+ <window-state>minimized</window-state>
+ <window-state>maximized</window-state>
+</supported-window-states>
+
+-->
+<!ELEMENT supported-window-states (window-state*)>
+
+<!--
+A window state value.
+-->
+<!ELEMENT window-state (#PCDATA)>
+
+<!--
+A portal object of type page. A page type represents a page which can have children of
+type page and window. The children windows are the windows of the page and the children
+pages are the subpages of this page.
+-->
+<!ELEMENT page (page-name,properties?,listener?,security-constraint?,(page|window)*,
+ (display-name* | (resource-bundle, supported-locale+)))>
+
+<!ELEMENT display-name (#PCDATA)>
+<!ATTLIST display-name
+ xml:lang NMTOKEN #IMPLIED
+>
+
+<!ELEMENT resource-bundle (#PCDATA)>
+
+<!ELEMENT supported-locale (#PCDATA)>
+
+<!--
+The page name value.
+-->
+<!ELEMENT page-name (#PCDATA)>
+
+<!--
+A portal object of type window. A window type represents a window. Beside the common
+properties a window has a content and belong to a region on the page.
+
+The instance-ref or content tags are used to define the content of the window. The
+usage of the content tag is generic and can be used to describe any kind of content.
+The instance-ref is a shortcut to define a content type of portlet which points to a
+portlet instance.
+
+The region and height defines how the window is placed in the page.
+-->
+<!ELEMENT window (window-name,(instance-ref|content),region,height,
+ initial-window-state?,initial-mode?,properties?,listener?,
+ (display-name* | (resource-bundle, supported-locale+)))>
+
+<!--
+The window name value.
+-->
+<!ELEMENT window-name (#PCDATA)>
+
+<!--
+Define the content of the window as a reference to a portlet instance. The value
+is the id of the instance.
+
+Example:
+
+<instance-ref>MyPortletInstance</instance-ref>
+
+-->
+<!ELEMENT instance-ref (#PCDATA)>
+
+<!--
+Define the content of the window in a generic manner. The content is define by
+the type of the content and an URI which acts as an identificator for the content.
+
+Example:
+
+<content>
+ <content-type>portlet</content-type>
+ <content-uri>MyPortletInstance</content-uri>
+</content>
+
+<content>
+ <content-type>cms</content-type>
+ <content-uri>/default/index.html</content-uri>
+</content>
+
+-->
+<!ELEMENT content (content-type,content-uri)>
+
+<!--
+The content type of the window.
+-->
+<!ELEMENT content-type (#PCDATA)>
+
+<!--
+The content URI of the window.
+-->
+<!ELEMENT content-uri (#PCDATA)>
+
+<!--
+The region the window belongs to.
+-->
+<!ELEMENT region (#PCDATA)>
+
+<!--
+The window state to use when the window is first accessed
+-->
+<!ELEMENT initial-window-state (#PCDATA)>
+
+<!--
+The mode to use when the window is first accessed
+-->
+<!ELEMENT initial-mode (#PCDATA)>
+
+<!--
+The height of the window in the particular region.
+-->
+<!ELEMENT height (#PCDATA)>
+
+<!--
+Define a listener for a portal object. The value is the id of the listener.
+-->
+<!ELEMENT listener (#PCDATA)>
+
+<!--
+A set of generic properties for the portal object.
+-->
+<!ELEMENT properties (property*)>
+
+<!--
+A generic string property.
+-->
+<!ELEMENT property (name,value)>
+
+<!--
+A name value.
+-->
+<!ELEMENT name (#PCDATA)>
+
+<!--
+A value.
+-->
+<!ELEMENT value (#PCDATA)>
+
+<!--
+The security-constraint element is a container for policy-permission elements
+
+Examples:
+
+<security-constraint>
+ <policy-permission>
+ <role-name>User</role-name>
+ <action-name>view</action-name>
+ </policy-permission>
+</security-constraint>
+
+<security-constraint>
+ <policy-permission>
+ <unchecked/>
+ <action-name>view</action-name>
+ </policy-permission>
+</security-constraint>
+-->
+<!ELEMENT security-constraint (policy-permission*)>
+
+<!--
+The policy-permission element is used to secure a specific portal page based on a
+user's role.
+-->
+<!ELEMENT policy-permission (action-name*,unchecked?,role-name*)>
+
+<!--
+The role-name element is used to define a role that this security constraint will apply to
+
+ * <role-name>SOMEROLE</role-name> Access to this portal page is limited to the defined role.
+-->
+<!ELEMENT action-name (#PCDATA)>
+
+<!--
+The unchecked element is used to define (if present) that anyone can view this portal page
+-->
+<!ELEMENT unchecked EMPTY>
+
+<!--
+The action-name element is used to define the access rights given to the role defined.
+Possible values are:
+
+ * view - Users can view the page.
+-->
+<!ELEMENT role-name (#PCDATA)>
+
+
+]]></programlisting>
+ </para>
+</appendix>
+
\ No newline at end of file
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/portalapi.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/portalapi.xml 2007-11-26 14:29:16 UTC (rev 9108)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/portalapi.xml 2007-11-26 14:52:55 UTC (rev 9109)
@@ -587,7 +587,9 @@
optional-attribute-name="Registry"
proxy-type="attribute">portal:service=ListenerRegistry</depends>
<attribute name="RegistryId">test_listener</attribute>
- <attribute name="ListenerClassName">org.jboss.portal.core.samples.basic.event.PortletB$Listener</attribute>
+ <attribute name="ListenerClassName">
+ org.jboss.portal.core.samples.basic.event.PortletB$Listener
+ </attribute>
</mbean>]]></programlisting>
For node events, we also need to declare on which node we want to listen, this is done by modifying
the <literal>*-object.xml</literal> that defines your portal nodes. In this example we want to trigger
Added: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/portletInstancesDTD.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/portletInstancesDTD.xml (rev 0)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/portletInstancesDTD.xml 2007-11-26 14:52:55 UTC (rev 9109)
@@ -0,0 +1,191 @@
+
+
+<!-- DO NOT EDIT ME DIRECTLY, I AM GENERATED FROM THE DTD USING THE dtd2docbook ANT TASK -->
+<appendix id="portletInstancesDTD">
+ <title>portlet-instances.xml DTD</title>
+ <para>
+<programlisting><![CDATA[
+
+ <?xml version="1.0" encoding="UTF-8" ?>
+
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2006, 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. ~
+ ~ ~
+ ~ This is free software; you can redistribute it and/or modify it ~
+ ~ 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 ~
+ ~ Lesser General Public License for more details. ~
+ ~ ~
+ ~ You should have received a copy of the GNU Lesser General Public ~
+ ~ License along with this software; if not, write to the Free ~
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<!--
+<!DOCTYPE deployments PUBLIC
+ "-//JBoss Portal//DTD Portlet Instances 2.6//EN"
+ "http://www.jboss.org/portal/dtd/portlet-instances_2_6.dtd">
+-->
+
+<!--
+The deployements element is a container for deployment elements.
+-->
+<!ELEMENT deployments (deployment*)>
+
+<!--
+The deployment is a container for an instance element.
+-->
+<!ELEMENT deployment (if-exists?,instance)>
+
+<!--
+The if-exists element is used to define action to take if instance with such name is
+already present. Possible values are overwrite or keep . Overwrite will destroy the
+existing object in the database and create a new one, based on the content of the
+deployment. Keep will maintain the existing object deployment or create a new one if
+it does not yet exist.
+-->
+<!ELEMENT if-exists (#PCDATA)>
+
+<!--
+The instance element is used to create an instance of a portlet from the portlet
+application of the same war file containing the portlet-instances.xml file. The portlet
+will be created and configured only if the portlet is present and an instance with
+such a name does not already exist.
+
+Example :
+
+<instance>
+ <instance-id>MyPortletInstance</instance-id>
+ <portlet-ref>MyPortlet</portlet-ref>
+ <preferences>
+ <preference>
+ <name>abc</name>
+ <value>def</value>
+ </preference>
+ </preferences>
+ <security-constraint>
+ <policy-permission>
+ <role-name>User</role-name>
+ <action-name>view</action-name>
+ </policy-permission>
+ </security-constraint>
+</instance>
+
+-->
+<!ELEMENT instance (instance-id,portlet-ref,display-name*,preferences?,
+ security-constraint?, (display-name* | (resource-bundle, supported-locale+)))>
+
+<!ELEMENT display-name (#PCDATA)>
+<!ATTLIST display-name
+ xml:lang NMTOKEN #IMPLIED
+>
+
+<!ELEMENT resource-bundle (#PCDATA)>
+
+<!ELEMENT supported-locale (#PCDATA)>
+
+
+<!--
+The identifier of the instance.
+-->
+<!ELEMENT instance-id (#PCDATA)>
+
+<!--
+The reference to the portlet which is its portlet name.
+-->
+<!ELEMENT portlet-ref (#PCDATA)>
+
+<!--
+Display name is the string used to represent this instance
+-->
+<!ELEMENT display-name (#PCDATA)>
+<!ATTLIST display-name
+ xml:lang NMTOKEN #IMPLIED
+>
+
+<!--
+The preferences element configures the instance with a specific set of preferences.
+-->
+<!ELEMENT preferences (preference+)>
+
+<!--
+The preference configure one preference of a set of preferences.
+-->
+<!ELEMENT preference (name,value)>
+
+<!--
+A name.
+-->
+<!ELEMENT name (#PCDATA)>
+
+<!--
+A string value.
+-->
+<!ELEMENT value (#PCDATA)>
+
+<!--
+The security-constraint element is a container for policy-permission elements
+
+Examples:
+
+<security-constraint>
+ <policy-permission>
+ <role-name>User</role-name>
+ <action-name>view</action-name>
+ </policy-permission>
+</security-constraint>
+
+<security-constraint>
+ <policy-permission>
+ <unchecked/>
+ <action-name>view</action-name>
+ </policy-permission>
+</security-constraint>
+-->
+<!ELEMENT security-constraint (policy-permission*)>
+
+<!--
+The policy-permission element is used to secure a specific portlet instance based on a
+user's role.
+-->
+<!ELEMENT policy-permission (action-name*,unchecked?,role-name*)>
+
+<!--
+The action-name element is used to define the access rights given to the role defined.
+Possible values are:
+
+ * view - Users can view the page.
+ * viewrecursive - Users can view the page and child pages.
+ * personalize - Users are able to view AND personalize the page.
+ * personalizerecursive - Users are able to view AND personalize the page AND its child
+ pages.
+-->
+<!ELEMENT action-name (#PCDATA)>
+
+<!--
+The unchecked element is used to define (if present) that anyone can view this instance
+-->
+<!ELEMENT unchecked EMPTY>
+
+<!--
+The role-name element is used to define a role that this security constraint will apply to
+
+ * <role-name>SOMEROLE</role-name> Access to this instance is limited to the defined role.
+-->
+<!ELEMENT role-name (#PCDATA)>
+
+
+]]></programlisting>
+ </para>
+</appendix>
+
\ No newline at end of file
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/supported.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/supported.xml 2007-11-26 14:29:16 UTC (rev 9108)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/supported.xml 2007-11-26 14:52:55 UTC (rev 9109)
@@ -20,15 +20,12 @@
<title>Minimum System Requirements</title>
<para>
<itemizedlist>
- <listitem>JDK 1.4 or JDK 5 (JDK 6 is not part of the test platform)</listitem>
+ <listitem>JDK 5 (JDK 6 is not part of the test platform)</listitem>
<listitem>512 MB RAM</listitem>
<listitem>100 MB hard disk space</listitem>
<listitem>400 MHz CPU</listitem>
</itemizedlist>
</para>
- <warning>
- <para>JBoss Portal 2.6.2 is the last release to support JDK 1.4.</para>
- </warning>
</sect1>
<sect1>
<title>Supported Operating Systems</title>
@@ -38,13 +35,11 @@
</sect1>
<sect1>
<title>JBoss Application Server</title>
- <para>JBoss Portal 2.6.2 is tested with JBoss AS 4.0.5, JBoss AS 4.2.1 and JBoss EAP 4.2. It is
- highly recommended to use JBoss Portal 2.6.2 with JBoss Enterprise Application Platform 4.2 for
- customers who have access to it through the support portal and JBoss AS 4.2.1 for everybody else.</para>
+ <para>JBoss Portal 2.6.3 is tested with JBoss AS 4.2.1, JBoss AS 4.2.2 and JBoss EAP 4.2. It is
+ highly recommended to use JBoss Portal 2.6.3 with JBoss Enterprise Application Platform 4.2 for
+ customers who have access to it through the support portal and JBoss AS 4.2.2 for everybody else.</para>
<warning>
- <para> Versions before 4.0.4 of JBoss Application Server are not supported with this version of JBoss Portal.
- And JBoss AS 4.0.5 will not be supported in newer release of JBoss Portal.
- </para>
+ <para>4.0.x versions are not supported</para>
</warning>
</sect1>
<sect1 id="supportedversions-db">
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml 2007-11-26 14:29:16 UTC (rev 9108)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml 2007-11-26 14:52:55 UTC (rev 9109)
@@ -479,7 +479,7 @@
Deploying a portlet is as simple as copying/moving <literal>helloworldportlet.war</literal>
to your server <literal>deploy</literal> directory. Doing this on a running instance of JBoss Portal and
application server, will trigger a <emphasis>hot-deploy</emphasis> of your portlet:
- <programlisting><![CDATA[18:25:56,366 INFO [Server] JBoss (MX MicroKernel) [4.0.5.GA (build:
+ <programlisting><![CDATA[18:25:56,366 INFO [Server] JBoss (MX MicroKernel) [4.2.2.GA (build:
CVSTag=JBoss_4_0_5_GA date=2006000000)] Started in 1m:3s:688ms
18:26:21,147 INFO [TomcatDeployer] deploy, ctxPath=/helloworldportlet,
warUrl=.../tmp/deploy/tmp35219helloworldportlet-exp.war/]]></programlisting>
@@ -1149,7 +1149,7 @@
</mediaobject>
</para>
</sect2>
- <sect2 id="richfaces">
+ <!-- sect2 id="richfaces">
<title>Portal and RichFaces: A basic demonstration using Ajax4JSF and RichFaces components</title>
<sect3>
<para>
@@ -1160,9 +1160,9 @@
<title>Downloading The Binaries or Project Source</title>
<para>
You have 2 options for getting started.
- <!--<para>
+ <-<para>
For instructions on setting up Subversion and/or Maven 2 see <xref linkend="build_instructions"/>
- </para>-->
+ </para>->
<itemizedlist>
<listitem>
<para>
@@ -1283,6 +1283,6 @@
</itemizedlist>
</para>
</sect3>
- </sect2>
+ </sect2-->
</sect1>
</chapter>
\ No newline at end of file
16 years, 7 months
- 1
- 0