JBoss Portal SVN: r6455 - trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-02-28 08:28:17 -0500 (Wed, 28 Feb 2007)
New Revision: 6455
Modified:
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/instances.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portlets.xhtml
Log:
highlight selected portlet or instance in the list
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/instances.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/instances.xhtml 2007-02-28 13:19:23 UTC (rev 6454)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/instances.xhtml 2007-02-28 13:28:17 UTC (rev 6455)
@@ -21,7 +21,7 @@
</thead>
<tbody>
<c:forEach items="#{instancemgr.instances}" var="instance" varStatus="status">
- <tr class="#{status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}">
+ <tr class="#{instance.id == instancemgr.selectedId ? 'portlet-section-selected' : (status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate')}">
<td>
<h:commandLink action="#{instancemgr.selectInstance}">
<h:outputText value="#{instance.id}"/>
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portlets.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portlets.xhtml 2007-02-28 13:19:23 UTC (rev 6454)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portlets.xhtml 2007-02-28 13:28:17 UTC (rev 6455)
@@ -34,7 +34,7 @@
</thead>
<tbody>
<c:forEach items="#{portletmgr.portlets}" var="portlet" varStatus="status">
- <tr class="#{status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}">
+ <tr class="#{portlet.context.id == portletmgr.selectedPortlet.context.id ? 'portlet-section-selected' : (status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate')}">
<td>
<h:commandLink
action="#{portletmgr.selectPortlet}">
19 years, 1 month
- 1
- 0
JBoss Portal SVN: r6454 - in trunk/core-admin/src: resources/portal-admin-war/WEB-INF/jsp/management and 1 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-02-28 08:19:23 -0500 (Wed, 28 Feb 2007)
New Revision: 6454
Modified:
trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/actions/AssignWindowsAction.java
trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/actions/CreateInstanceAction.java
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/portlet/manager.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portlets.xhtml
Log:
started to work on the portlet manager
Modified: trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/actions/AssignWindowsAction.java
===================================================================
--- trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/actions/AssignWindowsAction.java 2007-02-28 12:09:49 UTC (rev 6453)
+++ trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/actions/AssignWindowsAction.java 2007-02-28 13:19:23 UTC (rev 6454)
@@ -208,7 +208,7 @@
if (windowName == null)
{
FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_ERROR, "No window name!", null);
- faces.addMessage("windowName", message);
+ faces.addMessage("layoutForm:windowName", message);
}
else
{
Modified: trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/actions/CreateInstanceAction.java
===================================================================
--- trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/actions/CreateInstanceAction.java 2007-02-28 12:09:49 UTC (rev 6453)
+++ trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/actions/CreateInstanceAction.java 2007-02-28 13:19:23 UTC (rev 6454)
@@ -24,9 +24,11 @@
import org.jboss.portal.core.model.instance.Instance;
import org.jboss.portal.core.model.instance.InstanceContainer;
+import org.jboss.portal.core.model.instance.DuplicateInstanceException;
import org.jboss.portal.core.portlet.management.InstanceManagerBean;
import org.jboss.portal.core.portlet.management.PortletManagerBean;
import org.jboss.portal.portlet.Portlet;
+import org.jboss.portal.portlet.PortletInvokerException;
import org.jboss.portal.security.RoleSecurityBinding;
import org.jboss.portal.security.SecurityConstants;
import org.jboss.portal.security.spi.provider.DomainConfigurator;
@@ -84,10 +86,49 @@
public String execute()
{
+ FacesContext faces = FacesContext.getCurrentInstance();
+
+ // Validate instance id
+ if (instanceId == null)
+ {
+ FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_ERROR, "No instance id!", null);
+ faces.addMessage("add_instance_form:instanceId", message);
+ }
+ else
+ {
+ // Trim name
+ instanceId = instanceId.trim();
+
+ // Check for empty string
+ if (instanceId.length() == 0)
+ {
+ FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_ERROR, "Instance id cannot be blank!", null);
+ faces.addMessage("add_instance_form:instanceId", message);
+ }
+ else
+ {
+ // Check for duplicate instance
+ Instance instance = instanceMgr.getInstanceContainer().getDefinition(instanceId);
+ if (instance != null)
+ {
+ FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_ERROR, "An instance with the id " + instanceId + " already exist!", null);
+ faces.addMessage("add_instance_form:instanceId", message);
+ }
+ }
+ }
+
+ //
+ if (faces.getMessages().hasNext())
+ {
+ return null;
+ }
+
+ //
Portlet portlet = portletMgr.getSelectedPortlet();
if (portlet == null)
{
- // Todo validate here
+ FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_ERROR, "No portlet was selected!", null);
+ faces.addMessage("add_instance_form:instanceId", message);
return null;
}
else
@@ -103,17 +144,19 @@
Set constraints = Collections.singleton(new RoleSecurityBinding("view", SecurityConstants.UNCHECKED_ROLE_NAME));
configurator.setSecurityBindings(instance.getId(), constraints);
+ // Configure the instance manager with the instance already looked up
+ instanceMgr.setSelectedId(instanceId);
+ instanceMgr.setSelectedPlugin("info");
+
//
return "instances";
}
catch (Exception e)
{
- FacesContext ctx = FacesContext.getCurrentInstance();
- FacesMessage msg = new FacesMessage("An instance with this name already exist");
- ctx.addMessage(null, msg);
+ FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_ERROR, "An unexpected error happened!", null);
+ faces.addMessage("add_instance_form:instanceId", message);
return null;
}
}
}
-
}
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/portlet/manager.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/portlet/manager.xhtml 2007-02-28 12:09:49 UTC (rev 6453)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/portlet/manager.xhtml 2007-02-28 13:19:23 UTC (rev 6454)
@@ -4,19 +4,24 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core">
<br/>
+
<h:panelGrid
rendered="#{portletmgr.selectedPortlet != null}">
<h:outputText value="Name: #{portletmgr.selectedPortlet.name}"/>
<h:outputText value="Description: #{portletmgr.selectedPortlet.description}"/>
<br/>
- <h:form>
- <h:inputText value="#{createInstanceAction.instanceId}" class="portlet-form-input-field"/>
- <br/>
- <h:commandButton
- action="#{createInstanceAction.execute}"
- value="Create instance"
- class="portlet-form-button">
- </h:commandButton>
- </h:form>
+
+
</h:panelGrid>
+
+ <!-- Instance creation -->
+
+ <hr class="admin-ui"/>
+ <h:form id="add_instance_form">
+ <h:inputText id="instanceId" value="#{createInstanceAction.instanceId}" styleClass="portlet-form-input-field" required="true"/>
+ <h:commandButton action="#{createInstanceAction.execute}" value="Create instance" styleClass="portlet-form-button">
+ </h:commandButton>
+ <h:message for="instanceId" errorClass="portlet-msg-error"/>
+ </h:form>
+
</div>
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portlets.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portlets.xhtml 2007-02-28 12:09:49 UTC (rev 6453)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portlets.xhtml 2007-02-28 13:19:23 UTC (rev 6454)
@@ -20,65 +20,65 @@
</h:form>
</h:panelGrid>
- <h:form>
+ <h:form>
- <table width="100%" border="0" cellspacing="0" class="portlet-table-body">
- <thead class="portlet-section-header" style="text-align:left;">
- <tr>
- <th>Id</th>
- <th>Name</th>
- <th>Remote</th>
- <th>Remotable</th>
- <th>Actions</th>
- </tr>
- </thead>
- <tbody>
- <c:forEach items="#{portletmgr.portlets}" var="portlet" varStatus="status">
- <tr class="#{status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}">
- <td>
- <h:commandLink
- action="#{portletmgr.selectPortlet}">
- <f:param name="id" value="#{portlet.context.id}"/>
- <f:param name="plugin" value="manager"/>
- #{portlet.context.id}
- </h:commandLink>
- </td>
- <td>#{portlet.name}</td>
- <td><h:selectBooleanCheckbox disabled="true" value="#{portlet.remote}"/></td>
- <td><h:selectBooleanCheckbox disabled="true" value="#{portlet.remotable}"/></td>
- <td>
- <h:commandLink action="#{portletmgr.selectPortlet}">
- <f:param name="id" value="#{portlet.context.id}"/>
- <f:param name="plugin" value="manager"/>
- Info
- </h:commandLink> | <h:commandLink action="#{portletmgr.selectPortlet}">
- <f:param name="id" value="#{portlet.context.id}"/>
- <f:param name="plugin" value="preferences"/>
- Preferences
- </h:commandLink>
- </td>
+ <table width="100%" border="0" cellspacing="0" class="portlet-table-body">
+ <thead class="portlet-section-header" style="text-align:left;">
+ <tr>
+ <th>Id</th>
+ <th>Name</th>
+ <th>Remote</th>
+ <th>Remotable</th>
+ <th>Actions</th>
</tr>
- </c:forEach>
- </tbody>
- </table>
+ </thead>
+ <tbody>
+ <c:forEach items="#{portletmgr.portlets}" var="portlet" varStatus="status">
+ <tr class="#{status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}">
+ <td>
+ <h:commandLink
+ action="#{portletmgr.selectPortlet}">
+ <f:param name="id" value="#{portlet.context.id}"/>
+ <f:param name="plugin" value="manager"/>
+ #{portlet.context.id}
+ </h:commandLink>
+ </td>
+ <td>#{portlet.name}</td>
+ <td><h:selectBooleanCheckbox disabled="true" value="#{portlet.remote}"/></td>
+ <td><h:selectBooleanCheckbox disabled="true" value="#{portlet.remotable}"/></td>
+ <td>
+ <h:commandLink action="#{portletmgr.selectPortlet}">
+ <f:param name="id" value="#{portlet.context.id}"/>
+ <f:param name="plugin" value="manager"/>
+ Info
+ </h:commandLink> | <h:commandLink action="#{portletmgr.selectPortlet}">
+ <f:param name="id" value="#{portlet.context.id}"/>
+ <f:param name="plugin" value="preferences"/>
+ Preferences
+ </h:commandLink>
+ </td>
+ </tr>
+ </c:forEach>
+ </tbody>
+ </table>
- </h:form>
+ </h:form>
- <h:panelGroup
- id="pg4"
- rendered="#{portletmgr.selectedPortlet != null}">
- <h:panelGroup
- rendered="#{portletmgr.selectedPlugin == 'manager'}">
- <ui:include src="/WEB-INF/jsp/management/plugins/portlet/manager.xhtml"/>
- </h:panelGroup>
- <h:panelGroup
- rendered="#{portletmgr.selectedPlugin == 'preferences'}">
- <ui:include src="/WEB-INF/jsp/management/common/editPreferences.xhtml">
- <ui:param name="preferences" value="#{portletmgr.selectedPreferences}"/>
- </ui:include>
- </h:panelGroup>
- </h:panelGroup>
+ <c:if test="#{portletmgr.selectedPortlet != null}">
+ <c:if test="#{portletmgr.selectedPlugin == 'manager'}">
+ <hr class="admin-ui"/>
+ <h3>Portlet details</h3>
+ <ui:include src="/WEB-INF/jsp/management/plugins/portlet/manager.xhtml"/>
+ </c:if>
+ <c:if test="#{portletmgr.selectedPlugin == 'preferences'}">
+ <hr class="admin-ui"/>
+ <h3>Portlet preferences</h3>
+ <ui:include src="/WEB-INF/jsp/management/common/editPreferences.xhtml">
+ <ui:param name="preferences" value="#{portletmgr.selectedPreferences}"/>
+ </ui:include>
+ </c:if>
+ </c:if>
-</ui:define>
+ </ui:define>
</ui:composition>
</div>
19 years, 1 month
- 1
- 0
JBoss Portal SVN: r6453 - in trunk/core-admin/src: resources/portal-admin-war/WEB-INF/jsp/management and 1 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-02-28 07:09:49 -0500 (Wed, 28 Feb 2007)
New Revision: 6453
Modified:
trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/PortletManagerBean.java
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/common/editPreferences.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portlets.xhtml
Log:
started to work on the portlet manager
Modified: trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/PortletManagerBean.java
===================================================================
--- trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/PortletManagerBean.java 2007-02-28 05:24:40 UTC (rev 6452)
+++ trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/PortletManagerBean.java 2007-02-28 12:09:49 UTC (rev 6453)
@@ -93,6 +93,7 @@
/** . */
private FederatingPortletInvoker federatingPortletInvoker;
+ /** . */
private String sortColumn;
private boolean sortAscending;
@@ -265,17 +266,10 @@
{
FacesContext ctx = FacesContext.getCurrentInstance();
selectedPortletId = (String)ctx.getExternalContext().getRequestParameterMap().get("id");
- selectedPlugin = "manager";
+ selectedPlugin = (String)ctx.getExternalContext().getRequestParameterMap().get("plugin");
return "portlets";
}
- public void selectPlugin()
- {
- // Get id
- Map pmap = FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap();
- selectedPlugin = (String)pmap.get("plugin");
- }
-
public PreferencesBean getSelectedPreferences()
{
return selectedPreferences;
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/common/editPreferences.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/common/editPreferences.xhtml 2007-02-28 05:24:40 UTC (rev 6452)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/common/editPreferences.xhtml 2007-02-28 12:09:49 UTC (rev 6453)
@@ -12,7 +12,9 @@
<th>Key</th>
<th>Name</th>
<th>ReadOnly</th>
- <th>Actions</th>
+ <c:if test="#{action != null}">
+ <th>Actions</th>
+ </c:if>
<th>Value</th>
</tr>
</thead>
@@ -28,15 +30,17 @@
<td>
<h:outputText value="#{row.readOnly}"/>
</td>
+ <c:if test="#{action != null}">
+ <td>
+ <h:commandLink
+ rendered="#{row.cell.value != null and preferences.model.mutable}"
+ action="#{action.selectRow}"><f:param name="row" value="#{status.index}"/>Edit</h:commandLink> |
+ <h:commandLink
+ rendered="#{row.cell.value != null and preferences.model.mutable}"
+ action="#{action.deleteCell}"><f:param name="row" value="#{status.index}"/>Reset</h:commandLink>
+ </td>
+ </c:if>
<td>
- <h:commandLink
- rendered="#{row.cell.value != null and preferences.model.mutable}"
- action="#{action.selectRow}"><f:param name="row" value="#{status.index}"/>Edit</h:commandLink> |
- <h:commandLink
- rendered="#{row.cell.value != null and preferences.model.mutable}"
- action="#{action.deleteCell}"><f:param name="row" value="#{status.index}"/>Reset</h:commandLink>
- </td>
- <td>
<h:outputText value="#{row.cell.description}"/>
</td>
</tr>
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portlets.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portlets.xhtml 2007-02-28 05:24:40 UTC (rev 6452)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portlets.xhtml 2007-02-28 12:09:49 UTC (rev 6453)
@@ -3,121 +3,82 @@
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:jbp="http://www.jboss.com/portal">
+ xmlns:jbp="http://www.jboss.com/portal"
+ xmlns:c="http://java.sun.com/jstl/core"
+ xmlns:pfc="http://www.jboss.com/portal/facelet/common">
<ui:composition template="/WEB-INF/jsp/management/definitionsTemplate.xhtml">
<ui:define name="content">
-<h:panelGrid
- id="federateddropdown">
+ <h:panelGrid id="federateddropdown">
<h:form>
- <h:selectOneMenu
- id="menu"
- value="#{portletmgr.selectedFederatedId}">
+ <h:selectOneMenu id="menu" value="#{portletmgr.selectedFederatedId}">
<f:selectItems value="#{portletmgr.federatedIds}"/>
</h:selectOneMenu>
<h:commandButton value="Change portlet provider"/>
</h:form>
-</h:panelGrid>
-<h:panelGrid
- id="thepanel"
- columns="3"
- rowClasses="vertTop"
- columnClasses="menu,,content">
-<h:panelGroup
- id="panel1">
-<h:form>
- <h:dataTable
- id="portletsTable"
- var="portlet"
- value="#{portletmgr.portlets}"
- rows="10">
- <h:column>
- <f:facet name="header">
- <h:outputText value="Id"/>
- </f:facet>
- <h:commandLink
- action="#{portletmgr.selectPortlet}">
- <f:param
- name="id"
- value="#{portlet.context.id}"/>
- <h:outputText value="#{portlet.context.id}"/>
- </h:commandLink>
- </h:column>
- <h:column>
- <f:facet name="header">
- <h:outputText value="Name"/>
- </f:facet>
- <h:outputText value="#{portlet.name}"/>
- </h:column>
- <h:column>
- <f:facet name="header">
- <h:outputText value="Remote"/>
- </f:facet>
- <h:selectBooleanCheckbox disabled="true" value="#{portlet.remote}"/>
- </h:column>
- <h:column>
- <f:facet name="header">
- <h:outputText value="Remotable"/>
- </f:facet>
- <h:selectBooleanCheckbox disabled="true" value="#{portlet.remotable}"/>
- </h:column>
- <h:column>
- <f:facet name="header">
- <h:outputText value="Description"/>
- </f:facet>
- <h:outputText value="#{portlet.description}"/>
- </h:column>
- </h:dataTable>
-
- <jbp:scroller for="portletsTable" styleClass="portlet-form-button"/>
-
-</h:form>
-</h:panelGroup>
-<h:panelGroup id="splitter">
- <h:graphicImage value="/images/management/line-trunk.gif" height="100%" width="3"/>
-</h:panelGroup>
-<h:panelGroup id="pg2">
- <div align="center">
- <h:form id="plugin_nav">
- <h:panelGrid id="pg3" columns="3" border="0" cellspacing="0" cellpadding="0" rowClasses="vertTop">
- <h:commandLink
- action="#{portletmgr.selectPlugin}"
- style="#{portletmgr.selectedPlugin == 'manager' ? 'font-weight:bold' : ''}">
- <h:graphicImage value="/images/management/manage.png" style="vertical-align:middle;border-width:1"/>
- <h:outputText> </h:outputText>
- <h:outputText value="Manager"/>
- <f:param name="plugin" value="manager"/>
- </h:commandLink>
- <h:outputText>   </h:outputText>
- <h:commandLink
- action="#{portletmgr.selectPlugin}"
- style="#{portletmgr.selectedPlugin == 'preferences' ? 'font-weight:bold' : ''}">
- <h:graphicImage value="/images/management/preferences.png" style="vertical-align:middle"/>
- <h:outputText> </h:outputText>
- <h:outputText value="Preferences"/>
- <f:param name="plugin" value="preferences"/>
- </h:commandLink>
- </h:panelGrid>
- </h:form>
- </div>
- <h:panelGroup
- id="pg4"
- rendered="#{portletmgr.selectedPortlet != null}">
- <h:panelGroup
- rendered="#{portletmgr.selectedPlugin == 'manager'}">
- <ui:include src="/WEB-INF/jsp/management/plugins/portlet/manager.xhtml"/>
- </h:panelGroup>
- <h:panelGroup
- rendered="#{portletmgr.selectedPlugin == 'preferences'}">
- <ui:include src="/WEB-INF/jsp/management/plugins/preferences.xhtml">
- <ui:param name="preferences" value="#{portletmgr.selectedPreferences}"/>
- </ui:include>
- </h:panelGroup>
- </h:panelGroup>
-</h:panelGroup>
-</h:panelGrid>
+ </h:panelGrid>
+
+ <h:form>
+
+ <table width="100%" border="0" cellspacing="0" class="portlet-table-body">
+ <thead class="portlet-section-header" style="text-align:left;">
+ <tr>
+ <th>Id</th>
+ <th>Name</th>
+ <th>Remote</th>
+ <th>Remotable</th>
+ <th>Actions</th>
+ </tr>
+ </thead>
+ <tbody>
+ <c:forEach items="#{portletmgr.portlets}" var="portlet" varStatus="status">
+ <tr class="#{status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}">
+ <td>
+ <h:commandLink
+ action="#{portletmgr.selectPortlet}">
+ <f:param name="id" value="#{portlet.context.id}"/>
+ <f:param name="plugin" value="manager"/>
+ #{portlet.context.id}
+ </h:commandLink>
+ </td>
+ <td>#{portlet.name}</td>
+ <td><h:selectBooleanCheckbox disabled="true" value="#{portlet.remote}"/></td>
+ <td><h:selectBooleanCheckbox disabled="true" value="#{portlet.remotable}"/></td>
+ <td>
+ <h:commandLink action="#{portletmgr.selectPortlet}">
+ <f:param name="id" value="#{portlet.context.id}"/>
+ <f:param name="plugin" value="manager"/>
+ Info
+ </h:commandLink> | <h:commandLink action="#{portletmgr.selectPortlet}">
+ <f:param name="id" value="#{portlet.context.id}"/>
+ <f:param name="plugin" value="preferences"/>
+ Preferences
+ </h:commandLink>
+ </td>
+ </tr>
+ </c:forEach>
+ </tbody>
+ </table>
+
+ </h:form>
+
+ <h:panelGroup
+ id="pg4"
+ rendered="#{portletmgr.selectedPortlet != null}">
+ <h:panelGroup
+ rendered="#{portletmgr.selectedPlugin == 'manager'}">
+ <ui:include src="/WEB-INF/jsp/management/plugins/portlet/manager.xhtml"/>
+ </h:panelGroup>
+ <h:panelGroup
+ rendered="#{portletmgr.selectedPlugin == 'preferences'}">
+ <ui:include src="/WEB-INF/jsp/management/common/editPreferences.xhtml">
+ <ui:param name="preferences" value="#{portletmgr.selectedPreferences}"/>
+ </ui:include>
+ </h:panelGroup>
+ </h:panelGroup>
+
</ui:define>
</ui:composition>
</div>
19 years, 1 month
- 1
- 0
JBoss Portal SVN: r6452 - in trunk/wsrp/src: main/org/jboss/portal/wsrp/consumer and 5 other directories.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-02-28 00:24:40 -0500 (Wed, 28 Feb 2007)
New Revision: 6452
Modified:
trunk/wsrp/src/main/org/jboss/portal/test/wsrp/deployment/DeploymentTestCase.java
trunk/wsrp/src/main/org/jboss/portal/test/wsrp/deployment/MockConsumerRegistry.java
trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/ConsumerRegistry.java
trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/ConsumerRegistryService.java
trunk/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeployer.java
trunk/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeploymentFactory.java
trunk/wsrp/src/main/org/jboss/portal/wsrp/services/AbstractJNDIServiceFactory.java
trunk/wsrp/src/main/org/jboss/portal/wsrp/services/RemoteSOAPInvokerServiceFactory.java
trunk/wsrp/src/resources/portal-wsrp-sar/conf/consumer/hibernate/domain.hbm.xml
trunk/wsrp/src/resources/portal-wsrp-sar/wsrp-aop.xml
trunk/wsrp/src/resources/tests/test-deployment-lib-jar/test-wsrp.xml
Log:
- WSRPDeploymentFactory creates EndpoingConfigurationInfos instead of ServiceFactories for better lazy loading.
- Added explicit activation method for Consumers on ConsumerRegistry and separated it from Consumer creation.
- Moved default JNDI mapping information to AbstractJNDIServiceFactory.
- Added timeout in RemoteSOAPInvokerServiceFactory, better error reporting and better isAvailable implementation.
- Only persist the consumer if the associated ServiceFactory is available since it means that there might be a problem
with the configuration if the service factory is not available.
- Eager loading in Hibernate configuration: no need for lazy loading and makes for easier code.
- activateConsumerWith is AOP-enhanced for transactional support.
- Updated test cases to test for unvailable URLs handling.
Modified: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/deployment/DeploymentTestCase.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/test/wsrp/deployment/DeploymentTestCase.java 2007-02-28 02:44:26 UTC (rev 6451)
+++ trunk/wsrp/src/main/org/jboss/portal/test/wsrp/deployment/DeploymentTestCase.java 2007-02-28 05:24:40 UTC (rev 6452)
@@ -41,6 +41,7 @@
import org.jboss.xb.binding.UnmarshallerFactory;
import java.net.URL;
+import java.util.Collection;
import java.util.List;
/**
@@ -55,16 +56,28 @@
URL wsrpXMLLocation = Thread.currentThread().getContextClassLoader().getResource("test-wsrp.xml");
assertNotNull(wsrpXMLLocation);
Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller();
- ObjectModelFactory factory = new WSRPDeploymentFactory(new MockConsumerRegistry());
+ MockConsumerRegistry registry = new MockConsumerRegistry();
+ ObjectModelFactory factory = new WSRPDeploymentFactory(registry);
Object o = unmarshaller.unmarshal(wsrpXMLLocation.openStream(), factory, null);
assertNotNull(o);
assertTrue(o instanceof WSRPDeployment);
- //
+ Collection consumers = registry.getConfiguredConsumers();
+ assertNotNull(consumers);
+ assertEquals(7, consumers.size());
+ assertNotNull(registry.getConsumer("endpoint1"));
+ assertNotNull(registry.getConsumer("endpoint2"));
+ assertNotNull(registry.getConsumer("producer1"));
+ assertNotNull(registry.getConsumer("producer2"));
+ assertNotNull(registry.getConsumer("inDB"));
+ assertNotNull(registry.getConsumer("inDB2"));
+ assertNotNull(registry.getConsumer("unavailable"));
+
+ // deployment should only contain
WSRPDeployment deployment = (WSRPDeployment)o;
List services = deployment.getServices();
assertNotNull(services);
- assertEquals(4, services.size());
+ assertEquals(5, services.size());
//
Object service = services.get(0);
@@ -103,7 +116,21 @@
assertEquals("registration-2", serviceFactory2.getRegistrationURL());
assertEquals("portlet-management-2", serviceFactory2.getPortletManagementURL());
+ // inDB2 is active and configured from the DB (configured in MockConsumerRegistry)
service = services.get(2);
+ consumer2 = ((WSRPConsumerService)service).getConsumer();
+ assertEquals("inDB2", consumer2.getProducerId());
+ assertNull(consumer2.getProducerInfo().getExpirationCacheSeconds());
+ assertNotNull(consumer2.getServiceFactory());
+ assertTrue(consumer2.getServiceFactory() instanceof PerEndpointSOAPInvokerServiceFactory);
+ serviceFactory2 = (PerEndpointSOAPInvokerServiceFactory)consumer2.getServiceFactory();
+ assertEquals("service-description-2", serviceFactory2.getServiceDescriptionURL());
+ assertEquals("markup-2", serviceFactory2.getMarkupURL());
+ assertEquals("registration-2", serviceFactory2.getRegistrationURL());
+ assertEquals("portlet-management-2", serviceFactory2.getPortletManagementURL());
+
+ //
+ service = services.get(3);
assertTrue(service instanceof WSRPConsumerService);
WSRPConsumerService service3 = (WSRPConsumerService)service;
assertEquals("producer1", service3.getId());
@@ -135,7 +162,7 @@
assertEquals("en-US", property.getLang());
assertEquals("value", property.getStringValue());
- service = services.get(3);
+ service = services.get(4);
service3 = (WSRPConsumerService)service;
assertEquals("producer2", service3.getId());
consumer3 = service3.getConsumer();
Modified: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/deployment/MockConsumerRegistry.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/test/wsrp/deployment/MockConsumerRegistry.java 2007-02-28 02:44:26 UTC (rev 6451)
+++ trunk/wsrp/src/main/org/jboss/portal/test/wsrp/deployment/MockConsumerRegistry.java 2007-02-28 05:24:40 UTC (rev 6452)
@@ -27,6 +27,7 @@
import org.jboss.portal.portlet.federation.FederatingPortletInvoker;
import org.jboss.portal.test.wsrp.framework.support.MockWSRPConsumer;
import org.jboss.portal.wsrp.WSRPConsumer;
+import org.jboss.portal.wsrp.consumer.ConsumerException;
import org.jboss.portal.wsrp.consumer.ConsumerRegistry;
import java.util.Collection;
@@ -46,7 +47,9 @@
public MockConsumerRegistry()
{
consumers.put("inDB", new MockWSRPConsumer("inDB"));
- consumers.put("inDB2", new MockWSRPConsumer("inDB2"));
+ MockWSRPConsumer consumer = new MockWSRPConsumer("inDB2");
+ consumer.getProducerInfo().setActive(true);
+ consumers.put("inDB2", consumer);
}
public Collection getConfiguredConsumers()
@@ -75,4 +78,8 @@
consumers.put(consumer.getProducerId(), consumer);
}
+ public void activateConsumerWith(String id) throws ConsumerException
+ {
+ // do nothing
+ }
}
Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/ConsumerRegistry.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/ConsumerRegistry.java 2007-02-28 02:44:26 UTC (rev 6451)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/ConsumerRegistry.java 2007-02-28 05:24:40 UTC (rev 6452)
@@ -43,4 +43,6 @@
WSRPConsumer createConsumer(String id);
void persistConsumer(WSRPConsumer consumer);
+
+ void activateConsumerWith(String id) throws ConsumerException;
}
\ No newline at end of file
Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/ConsumerRegistryService.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/ConsumerRegistryService.java 2007-02-28 02:44:26 UTC (rev 6451)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/ConsumerRegistryService.java 2007-02-28 05:24:40 UTC (rev 6452)
@@ -29,6 +29,7 @@
import org.jboss.portal.jems.as.system.AbstractJBossService;
import org.jboss.portal.portlet.federation.FederatingPortletInvoker;
import org.jboss.portal.wsrp.WSRPConsumer;
+import org.jboss.portal.wsrp.deployment.WSRPConsumerService;
import javax.naming.InitialContext;
import java.util.Collection;
@@ -49,6 +50,8 @@
private SortedMap consumers;
+// private Set startedConsumerIds = new HashSet();
+
private SessionFactory sessionFactory;
private String sessionFactoryJNDIName;
@@ -74,7 +77,7 @@
session.persist(info);
- return createAndActivateConsumerIfNeeded(info);
+ return createConsumerFrom(info);
}
public void persistConsumer(WSRPConsumer consumer)
@@ -86,7 +89,7 @@
session.persist(info);
- createAndActivateConsumerIfNeeded(info);
+ createConsumerFrom(info);
}
public void setFederatingPortletInvoker(FederatingPortletInvoker federatingPortletInvoker)
@@ -116,31 +119,60 @@
while (producerInfos.hasNext())
{
producerInfo = (ProducerInfo)producerInfos.next();
- createAndActivateConsumerIfNeeded(producerInfo);
+ createConsumerFrom(producerInfo);
+ activateConsumerWith(producerInfo.getId());
}
}
- private WSRPConsumer createAndActivateConsumerIfNeeded(ProducerInfo producerInfo)
+ private WSRPConsumer createConsumerFrom(ProducerInfo producerInfo)
{
WSRPConsumer consumer = new WSRPConsumerImpl();
consumer.setProducerInfo(producerInfo);
consumers.put(producerInfo.getId(), consumer);
- /*if (producerInfo.isActive())
+
+ return consumer;
+ }
+
+ public void activateConsumerWith(String id) throws ConsumerException
+ {
+ ParameterValidation.throwIllegalArgExceptionIfNullOrEmpty(id, "Consumer identifier", "activateConsumerWith");
+
+ // if the consumer associated with the given id is already registered, don't do anything
+ if (federatingPortletInvoker.getFederatedInvoker(id) == null)
{
+ WSRPConsumer consumer = getConsumer(id);
+
+ if (consumer == null)
+ {
+ throw new ConsumerException("Consumer with id '" + id + "' doesn't exist!");
+ }
+
WSRPConsumerService service = new WSRPConsumerService();
service.setConsumer(consumer);
service.setFederatingPortletInvoker(federatingPortletInvoker);
+
try
{
service.start();
}
catch (Exception e)
{
- throw new ConsumerException("Couldn't start Consumer service '" + producerInfo.getId() + "'", e);
+ throw new ConsumerException("Couldn't start Consumer service '" + id + "'", e);
}
- }*/
- return consumer;
+ // mark the consumer as active
+ ProducerInfo info = consumer.getProducerInfo();
+ info.setActive(true);
+
+ // update ProducerInfo
+ Session session = sessionFactory.getCurrentSession();
+ session.beginTransaction();
+
+ session.update(info);
+
+ session.getTransaction().commit();
+ }
+
}
protected void stopService() throws Exception
Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeployer.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeployer.java 2007-02-28 02:44:26 UTC (rev 6451)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeployer.java 2007-02-28 05:24:40 UTC (rev 6452)
@@ -123,16 +123,8 @@
WSRPDeployment deployment = (WSRPDeployment)di.metaData;
for (Iterator i = deployment.getServices().iterator(); i.hasNext();)
{
- try
- {
- WSRPConsumerService service = (WSRPConsumerService)i.next();
- service.setFederatingPortletInvoker(consumerRegistry.getFederatingPortletInvoker());
- service.start();
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
+ WSRPConsumerService service = (WSRPConsumerService)i.next();
+ consumerRegistry.activateConsumerWith(service.getId());
}
}
Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeploymentFactory.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeploymentFactory.java 2007-02-28 02:44:26 UTC (rev 6451)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeploymentFactory.java 2007-02-28 05:24:40 UTC (rev 6452)
@@ -30,16 +30,11 @@
import org.jboss.portal.wsrp.consumer.ProducerInfo;
import org.jboss.portal.wsrp.consumer.RegistrationInfo;
import org.jboss.portal.wsrp.consumer.WSRPConsumerImpl;
-import org.jboss.portal.wsrp.services.AbstractJNDIServiceFactory;
-import org.jboss.portal.wsrp.services.PerEndpointSOAPInvokerServiceFactory;
-import org.jboss.portal.wsrp.services.RemoteSOAPInvokerServiceFactory;
import org.jboss.util.StringPropertyReplacer;
import org.jboss.xb.binding.ObjectModelFactory;
import org.jboss.xb.binding.UnmarshallingContext;
import org.xml.sax.Attributes;
-import java.util.Properties;
-
/**
* Wire the mbeans to install
*
@@ -57,9 +52,6 @@
/** . */
private static final String WSRP_PRODUCER = "wsrp-producer";
- /** . */
- private static Properties serviceFactoryMapping;
-
public static class Property
{
String name;
@@ -67,26 +59,6 @@
String lang;
}
-
- static
- {
- // fix-me: this is hardcoded from values from portal-wsrp-client.jar/META-INF/jboss-client.xml... NOT GOOD!
- serviceFactoryMapping = new Properties();
- serviceFactoryMapping.setProperty(
- "org.jboss.portal.wsrp.core.WSRP_v1_ServiceDescription_PortType",
- "wsrp-client/service/ServiceDescriptionService");
- serviceFactoryMapping.setProperty(
- "org.jboss.portal.wsrp.core.WSRP_v1_Markup_PortType",
- "wsrp-client/service/MarkupService");
- serviceFactoryMapping.setProperty(
- "org.jboss.portal.wsrp.core.WSRP_v1_Registration_PortType",
- "wsrp-client/service/RegistrationService");
- serviceFactoryMapping.setProperty(
- "org.jboss.portal.wsrp.core.WSRP_v1_PortletManagement_PortType",
- "wsrp-client/service/PortletManagementService");
- }
-
-
public WSRPDeploymentFactory(ConsumerRegistry consumerRegistry)
{
this.consumerRegistry = consumerRegistry;
@@ -175,31 +147,15 @@
ProducerInfo prodInfo = service.getConsumer().getProducerInfo();
- AbstractJNDIServiceFactory serviceFactory = null;
RegistrationInfo regInfo = null;
- if ("endpoint-config".equals(localName))
+ if ("endpoint-config".equals(localName) || "endpoint-wsdl-url".equals(localName))
{
- serviceFactory = new PerEndpointSOAPInvokerServiceFactory();
+ return new EndpointConfigurationInfo(prodInfo);
}
- else if ("endpoint-wsdl-url".equals(localName))
- {
- serviceFactory = new RemoteSOAPInvokerServiceFactory();
- }
else if ("registration-data".equals(localName))
{
- regInfo = new RegistrationInfo(prodInfo);
+ return new RegistrationInfo(prodInfo);
}
-
- if (serviceFactory != null)
- {
- serviceFactory.setPortJNDIMapping(serviceFactoryMapping);
- new EndpointConfigurationInfo(prodInfo, serviceFactory);
- return serviceFactory;
- }
- else if (regInfo != null)
- {
- return regInfo;
- }
else
{
return null;
@@ -221,46 +177,42 @@
return null;
}
- public void setValue(PerEndpointSOAPInvokerServiceFactory serviceFactory, UnmarshallingContext nav, String nsURI,
+ public void setValue(EndpointConfigurationInfo endpointInfo, UnmarshallingContext nav, String nsURI,
String localName, String value)
{
if (DEBUG)
{
- System.out.println("setvalue servicefactory " + localName);
+ System.out.println("setvalue endpointInfo " + localName);
}
if ("service-description-url".equals(localName))
{
// Resolve value that may contain properties for that one
value = StringPropertyReplacer.replaceProperties(value);
- serviceFactory.setServiceDescriptionURL(value);
+ endpointInfo.setServiceDescriptionURL(value);
}
else if ("markup-url".equals(localName))
{
// Resolve value that may contain properties for that one
value = StringPropertyReplacer.replaceProperties(value);
- serviceFactory.setMarkupURL(value);
+ endpointInfo.setMarkupURL(value);
}
else if ("registration-url".equals(localName))
{
// Resolve value that may contain properties for that one
value = StringPropertyReplacer.replaceProperties(value);
- serviceFactory.setRegistrationURL(value);
+ endpointInfo.setRegistrationURL(value);
}
else if ("portlet-management-url".equals(localName))
{
// Resolve value that may contain properties for that one
value = StringPropertyReplacer.replaceProperties(value);
- serviceFactory.setPortletManagementURL(value);
+ endpointInfo.setPortletManagementURL(value);
}
else if ("endpoint-wsdl-url".equals(localName))
{
- if (serviceFactory instanceof RemoteSOAPInvokerServiceFactory)
- {
- RemoteSOAPInvokerServiceFactory remoteSOAPInvokerServiceFactory = (RemoteSOAPInvokerServiceFactory)serviceFactory;
- value = StringPropertyReplacer.replaceProperties(value);
- remoteSOAPInvokerServiceFactory.setWsdlDefinitionURL(value);
- }
+ value = StringPropertyReplacer.replaceProperties(value);
+ endpointInfo.setWsdlDefinitionURL(value);
}
}
@@ -327,8 +279,10 @@
if (service.getConsumer().getServiceFactory().isAvailable())
{
message = "Added consumer for producer '" + service.getId() + "' from xml configuration.";
- service.getConsumer().getProducerInfo().setActive(true);
deployment.getServices().add(service);
+
+ // only persist the consumer if the service factory is available
+ consumerRegistry.persistConsumer(service.getConsumer());
}
else
{
@@ -336,9 +290,6 @@
+ service.getId() + "'. The consumer will NOT be available.";
}
- // persist consumer to the database now that it's complete
- consumerRegistry.persistConsumer(service.getConsumer());
-
log.info(message);
}
}
Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/services/AbstractJNDIServiceFactory.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/wsrp/services/AbstractJNDIServiceFactory.java 2007-02-28 02:44:26 UTC (rev 6451)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/services/AbstractJNDIServiceFactory.java 2007-02-28 05:24:40 UTC (rev 6452)
@@ -49,8 +49,29 @@
/** The JNDI configuration. */
private Properties env;
+ /** Default mapping between WSRP port type class and associated JNDI name */
+ private static Properties DEFAULT_FACTORY_MAPPING;
+
+ static
+ {
+ // fix-me: this is hardcoded from values from portal-wsrp-client.jar/META-INF/jboss-client.xml... NOT GOOD!
+ DEFAULT_FACTORY_MAPPING = new Properties();
+ DEFAULT_FACTORY_MAPPING.setProperty(
+ "org.jboss.portal.wsrp.core.WSRP_v1_ServiceDescription_PortType",
+ "wsrp-client/service/ServiceDescriptionService");
+ DEFAULT_FACTORY_MAPPING.setProperty(
+ "org.jboss.portal.wsrp.core.WSRP_v1_Markup_PortType",
+ "wsrp-client/service/MarkupService");
+ DEFAULT_FACTORY_MAPPING.setProperty(
+ "org.jboss.portal.wsrp.core.WSRP_v1_Registration_PortType",
+ "wsrp-client/service/RegistrationService");
+ DEFAULT_FACTORY_MAPPING.setProperty(
+ "org.jboss.portal.wsrp.core.WSRP_v1_PortletManagement_PortType",
+ "wsrp-client/service/PortletManagementService");
+ }
+
/** A Map recording the mapping between WSRP port type class name and JDNI name of the implementing service. */
- protected Properties portJNDIMapping;
+ protected Properties portJNDIMapping = DEFAULT_FACTORY_MAPPING;
protected void createService() throws Exception
{
Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/services/RemoteSOAPInvokerServiceFactory.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/wsrp/services/RemoteSOAPInvokerServiceFactory.java 2007-02-28 02:44:26 UTC (rev 6451)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/services/RemoteSOAPInvokerServiceFactory.java 2007-02-28 05:24:40 UTC (rev 6452)
@@ -38,6 +38,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.net.MalformedURLException;
+import java.net.Socket;
import java.net.URL;
import java.util.Collection;
import java.util.Iterator;
@@ -53,6 +54,8 @@
private String wsdlDefinitionURL;
+ private boolean available;
+
private static final String WSRP_URN = "urn:oasis:names:tc:wsrp:v1:wsdl";
private static final String DEFAULT_SERVICE_NAME = "WSRPService";
@@ -77,11 +80,32 @@
"services definition");
}
this.wsdlDefinitionURL = wsdlDefinitionURL;
- initServices();
+ try
+ {
+ initServices();
+ available = true;
+ }
+ catch (MalformedURLException e)
+ {
+ IllegalArgumentException iae = new IllegalArgumentException("Require a well-formed URL specifying where to " +
+ "find the WSRP services definition");
+ iae.initCause(e);
+ throw iae;
+ }
+ catch (Exception e)
+ {
+ available = false;
+ }
}
- private void initServices()
+
+ public boolean isAvailable()
{
+ return available && super.isAvailable();
+ }
+
+ private void initServices() throws MalformedURLException
+ {
try
{
URL wsdlURL = new URL(wsdlDefinitionURL);
@@ -95,17 +119,10 @@
initServiceURL(port.getName(), getLocation(port));
}
}
- catch (MalformedURLException e)
+ catch (WSDLException e)
{
- IllegalArgumentException iae = new IllegalArgumentException("Require a well-formed URL specifying where to " +
- "find the WSRP services definition");
- iae.initCause(e);
- throw iae;
+ throw new RuntimeException("Couldn't initialize services for WSDL at '" + wsdlDefinitionURL + "'", e);
}
- catch (Exception e)
- {
- log.info("Couldn't initialize services for WSDL at '" + wsdlDefinitionURL + "'", e);
- }
}
/**
@@ -154,6 +171,7 @@
//Requires wsdl4j
private Definition getWSDLDefinition(URL url) throws WSDLException
{
+ log.info("Retrieving WSDL from " + url);
WSDLFactory wsdlFactory = WSDLFactory.newInstance();
javax.wsdl.xml.WSDLReader wsdlReader = wsdlFactory.newWSDLReader();
return wsdlReader.readWSDL(new WSDLLocatorImpl(url));
@@ -178,20 +196,28 @@
public InputSource getBaseInputSource()
{
- log.trace("getBaseInputSource [wsdlUrl=" + wsdlURL + "]");
+ log.info("getBaseInputSource [wsdlUrl=" + wsdlURL + "]");
try
{
- InputStream is = Tools.safeBufferedWrapper(wsdlURL.openStream());
+ Socket socket = new Socket(wsdlURL.getHost(), wsdlURL.getPort());
+ socket.setSoTimeout(10000);
+
+// url.setReadTimeout(10000); // would be nice but 1.5 only! :(
+ InputStream is = Tools.safeBufferedWrapper(socket.getInputStream());
if (is == null)
{
- throw new IllegalArgumentException("Cannot obtain wsdl from [" + wsdlURL + "]");
+ String message = "Cannot retrieve WSDL: '" + wsdlURL + "' is not a valid URL.";
+ log.info(message);
+ throw new IllegalArgumentException(message);
}
return new InputSource(is);
}
catch (IOException e)
{
- throw new RuntimeException("Cannot access wsdl from [" + wsdlURL + "], " + e.getMessage());
+ String message = "Cannot access wsdl from [" + wsdlURL + "], " + e.getMessage();
+ log.info(message);
+ throw new RuntimeException(message);
}
}
@@ -202,7 +228,7 @@
public InputSource getImportInputSource(String parent, String resource)
{
- log.trace("getImportInputSource [parent=" + parent + ",resource=" + resource + "]");
+ log.info("getImportInputSource [parent=" + parent + ",resource=" + resource + "]");
URL parentURL;
try
@@ -254,7 +280,7 @@
try
{
- log.trace("Resolved to: " + wsdlImport);
+ log.info("Resolved to: " + wsdlImport);
InputStream is = Tools.safeBufferedWrapper(new URL(wsdlImport).openStream());
if (is == null)
{
Modified: trunk/wsrp/src/resources/portal-wsrp-sar/conf/consumer/hibernate/domain.hbm.xml
===================================================================
--- trunk/wsrp/src/resources/portal-wsrp-sar/conf/consumer/hibernate/domain.hbm.xml 2007-02-28 02:44:26 UTC (rev 6451)
+++ trunk/wsrp/src/resources/portal-wsrp-sar/conf/consumer/hibernate/domain.hbm.xml 2007-02-28 05:24:40 UTC (rev 6452)
@@ -39,13 +39,15 @@
class="org.jboss.portal.wsrp.consumer.EndpointConfigurationInfo"
unique="true"
not-null="true"
- cascade="all"/>
+ cascade="all"
+ lazy="false"/>
<many-to-one name="registrationInfo"
column="REGISTRATION_ID"
class="org.jboss.portal.wsrp.consumer.RegistrationInfo"
unique="true"
not-null="false"
- cascade="all"/>
+ cascade="all"
+ lazy="false"/>
<property name="expirationCacheSeconds" column="EXPIRATION_CACHE_SECONDS"/>
<property name="active" not-null="true"/>
<property name="id" not-null="true" unique="true"/>
@@ -75,7 +77,7 @@
<property name="consumerName" column="CONSUMER_NAME" type="java.lang.String" not-null="true"/>
<property name="registrationHandle" column="HANDLE" type="java.lang.String"/>
<property name="registrationState" column="STATE" type="binary"/>
- <map name="registrationProperties" cascade="all">
+ <map name="registrationProperties" cascade="all" lazy="false">
<cache usage="@portal.hibernate.cache.usage@"/>
<key column="REG_PROP_PK"/>
<map-key type="string" column="NAME"/>
@@ -99,7 +101,8 @@
column="DESC_PK"
class="org.jboss.portal.wsrp.registration.RegistrationPropertyDescription"
unique="true"
- cascade="all"/>
+ cascade="all"
+ lazy="false"/>
</class>
<class name="org.jboss.portal.wsrp.registration.RegistrationPropertyDescription" table="JBP_REG_PROP_DESC">
<cache usage="@portal.hibernate.cache.usage@"/>
Modified: trunk/wsrp/src/resources/portal-wsrp-sar/wsrp-aop.xml
===================================================================
--- trunk/wsrp/src/resources/portal-wsrp-sar/wsrp-aop.xml 2007-02-28 02:44:26 UTC (rev 6451)
+++ trunk/wsrp/src/resources/portal-wsrp-sar/wsrp-aop.xml 2007-02-28 05:24:40 UTC (rev 6452)
@@ -29,6 +29,9 @@
<method name="persistConsumer">
<trans-attribute>Required</trans-attribute>
</method>
+ <method name="activateConsumerWith">
+ <trans-attribute>Required</trans-attribute>
+ </method>
</metadata>
<!-- TRANSACTIONS -->
Modified: trunk/wsrp/src/resources/tests/test-deployment-lib-jar/test-wsrp.xml
===================================================================
--- trunk/wsrp/src/resources/tests/test-deployment-lib-jar/test-wsrp.xml 2007-02-28 02:44:26 UTC (rev 6451)
+++ trunk/wsrp/src/resources/tests/test-deployment-lib-jar/test-wsrp.xml 2007-02-28 05:24:40 UTC (rev 6452)
@@ -91,4 +91,9 @@
<registration-data/>
</wsrp-producer>
</deployment>
+ <deployment>
+ <wsrp-producer id="unavailable">
+ <endpoint-wsdl-url>http://localhost</endpoint-wsdl-url>
+ </wsrp-producer>
+ </deployment>
</deployments>
\ No newline at end of file
19 years, 1 month
- 1
- 0
JBoss Portal SVN: r6451 - trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-02-27 21:44:26 -0500 (Tue, 27 Feb 2007)
New Revision: 6451
Modified:
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/nodeNavigation.xhtml
Log:
minor tweaks
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/nodeNavigation.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/nodeNavigation.xhtml 2007-02-28 02:40:22 UTC (rev 6450)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/nodeNavigation.xhtml 2007-02-28 02:44:26 UTC (rev 6451)
@@ -88,7 +88,7 @@
<table width="100%" border="0" cellspacing="0" class="portlet-table-body">
<thead class="portlet-section-header" style="text-align:left;">
<tr>
- <th>Page</th>
+ <th>Window</th>
<th>Actions</th>
</tr>
</thead>
19 years, 1 month
- 1
- 0
JBoss Portal SVN: r6450 - in trunk: core-admin/src/main/org/jboss/portal/core/portlet/management/actions and 3 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-02-27 21:40:22 -0500 (Tue, 27 Feb 2007)
New Revision: 6450
Modified:
trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java
trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/actions/PreferenceAction.java
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/common/editPreferences.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/instances.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/nodeNavigation.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pageNavigation.xhtml
trunk/faces/src/main/org/jboss/portal/faces/matrix/AbstractCellAction.java
Log:
visual tweaks + done most of the portlet instances stuff with correct design
Modified: trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java
===================================================================
--- trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java 2007-02-28 00:59:30 UTC (rev 6449)
+++ trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java 2007-02-28 02:40:22 UTC (rev 6450)
@@ -888,40 +888,40 @@
public String getPreviewURL()
{
- try
- {
- //set up the root node
- PortalNode root = Navigation.getCurrentNode();
- for (; root.getParent() != null;)
- {
- root = root.getParent();
- }
-
- //obtain the path to our node
- PortalObjectImpl object = (PortalObjectImpl)getSelectedObject();
- String path = object.getObjectNode().getPath();
-
- //iterate to our point
- String[] nodes = path.split("\\.");
- PortalNode dest = root;
-
- for (int i = 0; i < nodes.length; i++)
- {
- String s = nodes[i];
- dest = dest.getChild(s);
- }
-
- //generate url
- JBossRenderResponse response = (JBossRenderResponse)FacesContext.getCurrentInstance().getExternalContext().getResponse();
- String url = response.createRenderURL(dest).toString();
- return url;
- }
- catch (Exception e)
- {
- log.info("Failed to generate object preview link");
- e.printStackTrace();
- }
- //in case it fails let's point to some nice page ;)
+// try
+// {
+// //set up the root node
+// PortalNode root = Navigation.getCurrentNode();
+// for (; root.getParent() != null;)
+// {
+// root = root.getParent();
+// }
+//
+// //obtain the path to our node
+// PortalObjectImpl object = (PortalObjectImpl)getSelectedObject();
+// String path = object.getObjectNode().getPath();
+//
+// //iterate to our point
+// String[] nodes = path.split("\\.");
+// PortalNode dest = root;
+//
+// for (int i = 0; i < nodes.length; i++)
+// {
+// String s = nodes[i];
+// dest = dest.getChild(s);
+// }
+//
+// //generate url
+// JBossRenderResponse response = (JBossRenderResponse)FacesContext.getCurrentInstance().getExternalContext().getResponse();
+// String url = response.createRenderURL(dest).toString();
+// return url;
+// }
+// catch (Exception e)
+// {
+// log.info("Failed to generate object preview link");
+// e.printStackTrace();
+// }
+// //in case it fails let's point to some nice page ;)
return "http://www.jboss.org";
}
}
Modified: trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/actions/PreferenceAction.java
===================================================================
--- trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/actions/PreferenceAction.java 2007-02-28 00:59:30 UTC (rev 6449)
+++ trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/actions/PreferenceAction.java 2007-02-28 02:40:22 UTC (rev 6450)
@@ -149,7 +149,7 @@
manager.setSelectedRow(new Integer(rowIndex));
}
- public void deleteRow(Row row)
+ public void deleteRow(int rowIndex)
{
try
{
@@ -157,6 +157,9 @@
Instance instance = manager.getSelectedInstance();
//
+ Row row = manager.getSelectedPreferences().getModel().getRow(rowIndex);
+
+ //
String key = row.getHandback();
//
@@ -173,7 +176,6 @@
{
int selectedRow = manager.getSelectedRow().intValue();
RowSetModel model = manager.getSelectedPreferences().getModel();
- Row row = model.getRow(selectedRow);
- return row;
+ return model.getRow(selectedRow);
}
}
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/common/editPreferences.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/common/editPreferences.xhtml 2007-02-28 00:59:30 UTC (rev 6449)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/common/editPreferences.xhtml 2007-02-28 02:40:22 UTC (rev 6450)
@@ -5,68 +5,68 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:c="http://java.sun.com/jstl/core">
-<h:form>
- <h:dataTable value="#{preferences.model}" var="row" styleClass="tableList">
- <h:column>
- <f:facet name="header">
- <h:outputText value="Key"/>
- </f:facet>
- <h:outputText value="#{row.key}"/>
- </h:column>
- <h:column>
- <f:facet name="header">
- <h:outputText value="Name"/>
- </f:facet>
- <h:outputText value="#{row.name}"/>
- </h:column>
- <h:column>
- <f:facet name="header">
- <h:outputText value="ReadOnly"/>
- </f:facet>
- <h:outputText value="#{row.readOnly}"/>
- </h:column>
- <h:column>
- <f:facet name="header">
- <h:outputText value="Actions"/>
- </f:facet>
- <h:commandLink
- rendered="#{row.cell.value != null and preferences.model.mutable}"
- action="#{action.selectRow}">Edit</h:commandLink> |
- <h:commandLink
- rendered="#{row.cell.value != null and preferences.model.mutable}"
- action="#{action.deleteCell}">Reset</h:commandLink>
- </h:column>
- <h:column>
- <f:facet name="header">
- <h:outputText value="Value"/>
- </f:facet>
- <h:outputText value="#{row.cell.description}"/>
- </h:column>
- </h:dataTable>
-</h:form>
-
-<c:if test="#{preferences.selectedPreference != null}">
<h:form>
- <h:dataTable
- id="string_values"
- var="row"
- value="#{preferences.selectedPreference.valueIndices}">
- <h:column>
- <h:outputLabel for="value_#{row}">
- <h:outputText value="Value #{row}: " styleClass="portlet-form-field-label"/>
- </h:outputLabel>
- <h:inputText value="#{preferences.selectedPreference.value[row]}" styleClass="portlet-form-input-field"/>
- <h:commandButton id="value_#{row}" action="#{action.deleteLine}" value="Delete" styleClass="portlet-form-button"/>
- </h:column>
- </h:dataTable>
- <h:commandButton action="#{action.updateCell}" value="Update" styleClass="portlet-form-button"/>
+ <table width="100%" border="0" cellspacing="0" class="portlet-table-body">
+ <thead class="portlet-section-header" style="text-align:left;">
+ <tr>
+ <th>Key</th>
+ <th>Name</th>
+ <th>ReadOnly</th>
+ <th>Actions</th>
+ <th>Value</th>
+ </tr>
+ </thead>
+ <tbody>
+ <c:forEach items="#{preferences.model.wrappedData}" var="row" varStatus="status">
+ <tr class="#{status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}">
+ <td>
+ <h:outputText value="#{row.key}"/>
+ </td>
+ <td>
+ <h:outputText value="#{row.name}"/>
+ </td>
+ <td>
+ <h:outputText value="#{row.readOnly}"/>
+ </td>
+ <td>
+ <h:commandLink
+ rendered="#{row.cell.value != null and preferences.model.mutable}"
+ action="#{action.selectRow}"><f:param name="row" value="#{status.index}"/>Edit</h:commandLink> |
+ <h:commandLink
+ rendered="#{row.cell.value != null and preferences.model.mutable}"
+ action="#{action.deleteCell}"><f:param name="row" value="#{status.index}"/>Reset</h:commandLink>
+ </td>
+ <td>
+ <h:outputText value="#{row.cell.description}"/>
+ </td>
+ </tr>
+ </c:forEach>
+ </tbody>
+ </table>
</h:form>
- <h:form>
- <h:outputLabel for="new_value">
- <h:outputText value="New value: " styleClass="portlet-form-field-label"/>
- </h:outputLabel>
- <h:inputText id="new_value" value="#{action.appendedValue}" styleClass="portlet-form-input-field"/>
- <h:commandButton action="#{action.appendLine}" value="Append" styleClass="portlet-form-button"/>
- </h:form>
-</c:if>
+
+ <c:if test="#{preferences.selectedPreference != null}">
+ <h:form>
+ <h:dataTable
+ id="string_values"
+ var="row"
+ value="#{preferences.selectedPreference.valueIndices}">
+ <h:column>
+ <h:outputLabel for="value_#{row}">
+ <h:outputText value="Value #{row}: " styleClass="portlet-form-field-label"/>
+ </h:outputLabel>
+ <h:inputText value="#{preferences.selectedPreference.value[row]}" styleClass="portlet-form-input-field"/>
+ <h:commandButton id="value_#{row}" action="#{action.deleteLine}" value="Delete" styleClass="portlet-form-button"/>
+ </h:column>
+ </h:dataTable>
+ <h:commandButton action="#{action.updateCell}" value="Update" styleClass="portlet-form-button"/>
+ </h:form>
+ <h:form>
+ <h:outputLabel for="new_value">
+ <h:outputText value="New value: " styleClass="portlet-form-field-label"/>
+ </h:outputLabel>
+ <h:inputText id="new_value" value="#{action.appendedValue}" styleClass="portlet-form-input-field"/>
+ <h:commandButton action="#{action.appendLine}" value="Append" styleClass="portlet-form-button"/>
+ </h:form>
+ </c:if>
</div>
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/instances.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/instances.xhtml 2007-02-28 00:59:30 UTC (rev 6449)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/instances.xhtml 2007-02-28 02:40:22 UTC (rev 6450)
@@ -11,34 +11,43 @@
<ui:define name="content">
<h:form>
- <h:dataTable id="instancesTable2" value="#{instancemgr.instances}" var="instance" styleClass="tableList" rows="15" rendered="#{not empty instancemgr.instances}">
- <h:column>
- <f:facet name="header">Id</f:facet>
- <h:commandLink action="#{instancemgr.selectInstance}">
- <h:outputText value="#{instance.id}"/>
- <f:param name="id" value="#{instance.id}"/>
- <f:param name="plugin" value="info"/>
- </h:commandLink>
- </h:column>
- <h:column>
- <f:facet name="header">Actions</f:facet>
- <h:commandLink action="#{instancemgr.selectInstance}">
- <h:outputText value="Preferences"/>
- <f:param name="id" value="#{instance.id}"/>
- <f:param name="plugin" value="preferences"/>
- </h:commandLink> |
- <h:commandLink action="#{instancemgr.selectInstance}">
- <h:outputText value="Security"/>
- <f:param name="id" value="#{instance.id}"/>
- <f:param name="plugin" value="security"/>
- </h:commandLink> |
- <h:commandLink action="#{instancemgr.deleteInstance}">
- <h:outputText value="Destroy"/>
- <f:param name="id" value="#{instance.id}"/>
- </h:commandLink>
- </h:column>
- </h:dataTable>
- <jbp:scroller for="instancesTable2" styleClass="portlet-form-button"/>
+
+ <table id="instancesTable2" width="100%" border="0" cellspacing="0" class="portlet-table-body">
+ <thead class="portlet-section-header" style="text-align:left;">
+ <tr>
+ <th>Id</th>
+ <th>Actions</th>
+ </tr>
+ </thead>
+ <tbody>
+ <c:forEach items="#{instancemgr.instances}" var="instance" varStatus="status">
+ <tr class="#{status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}">
+ <td>
+ <h:commandLink action="#{instancemgr.selectInstance}">
+ <h:outputText value="#{instance.id}"/>
+ <f:param name="id" value="#{instance.id}"/>
+ <f:param name="plugin" value="info"/>
+ </h:commandLink>
+ </td>
+ <td>
+ <h:commandLink action="#{instancemgr.selectInstance}">
+ <h:outputText value="Preferences"/>
+ <f:param name="id" value="#{instance.id}"/>
+ <f:param name="plugin" value="preferences"/>
+ </h:commandLink> | <h:commandLink action="#{instancemgr.selectInstance}">
+ <h:outputText value="Security"/>
+ <f:param name="id" value="#{instance.id}"/>
+ <f:param name="plugin" value="security"/>
+ </h:commandLink> | <h:commandLink action="#{instancemgr.deleteInstance}">
+ <h:outputText value="Destroy"/>
+ <f:param name="id" value="#{instance.id}"/>
+ </h:commandLink>
+ </td>
+ </tr>
+ </c:forEach>
+ </tbody>
+ </table>
+
</h:form>
<c:if test="#{instancemgr.selectedPlugin != null}">
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/nodeNavigation.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/nodeNavigation.xhtml 2007-02-28 00:59:30 UTC (rev 6449)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/nodeNavigation.xhtml 2007-02-28 02:40:22 UTC (rev 6450)
@@ -1,82 +1,124 @@
<div
- 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="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:pfc="http://www.jboss.com/portal/facelet/common"
+ xmlns:c="http://java.sun.com/jstl/core">
<h:form>
- <h:dataTable value="#{portalobjectmgr.portalNodes}" var="portal" styleClass="tableList" rendered="#{not empty portalobjectmgr.portalNodes}">
- <h:column>
- <f:facet name="header"><h:outputText value="Portal"/></f:facet>
- <h:commandLink action="#{portalobjectmgr.selectObject}">
- <h:outputText value="#{portal.name}"/>
- <f:param name="id" value="#{portal.id}"/>
- </h:commandLink>
- </h:column>
- <h:column>
- <f:facet name="header"><h:outputText value="Actions"/></f:facet>
- <h:commandLink action="editPortalPreferences" actionListener="#{portalobjectmgr.selectObject}">
- <h:outputText value="Edit"/>
- <f:param name="id" value="#{portal.id}"/>
- </h:commandLink> | <h:commandLink action="editPortalSecurity" actionListener="#{portalobjectmgr.selectObject}">
- <h:outputText value="Security"/>
- <f:param name="id" value="#{portal.id}"/>
- </h:commandLink> | <h:commandLink action="editPortalTheme" actionListener="#{portalobjectmgr.selectObject}">
- <h:outputText value="Theme"/>
- <f:param name="id" value="#{portal.id}"/>
- </h:commandLink> | <h:commandLink action="portals" actionListener="#{portalobjectmgr.destroyObject}">
- <h:outputText value="Destroy"/>
- <f:param name="id" value="#{portal.id}"/>
- </h:commandLink>
- </h:column>
- </h:dataTable>
- <h:dataTable value="#{portalobjectmgr.pageNodes}" var="page" styleClass="tableList" rendered="#{not empty portalobjectmgr.pageNodes}">
- <h:column>
- <f:facet name="header"><h:outputText value="Page"/></f:facet>
- <h:commandLink action="#{portalobjectmgr.selectObject}">
- <h:outputText value="#{page.name}"/>
- <f:param name="id" value="#{page.id}"/>
- </h:commandLink>
- </h:column>
- <h:column>
- <f:facet name="header"><h:outputText value="Actions"/></f:facet>
- <h:commandLink action="editPageLayout" actionListener="#{portalobjectmgr.selectObject}">
- <h:outputText value="Layout"/>
- <f:param name="id" value="#{page.id}"/>
- </h:commandLink> | <h:commandLink action="editPageSecurity" actionListener="#{portalobjectmgr.selectObject}">
- <h:outputText value="Security"/>
- <f:param name="id" value="#{page.id}"/>
- </h:commandLink> | <h:commandLink action="editPageTheme" actionListener="#{portalobjectmgr.selectObject}">
- <h:outputText value="Theme"/>
- <f:param name="id" value="#{page.id}"/>
- </h:commandLink> | <h:commandLink action="pages" actionListener="#{portalobjectmgr.destroyObject}">
- <h:outputText value="Destroy"/>
- <f:param name="id" value="#{page.id}"/>
- </h:commandLink>
- </h:column>
- </h:dataTable>
+ <c:if test="#{not empty portalobjectmgr.portalNodes}">
+ <table width="100%" border="0" cellspacing="0" class="portlet-table-body">
+ <thead class="portlet-section-header" style="text-align:left;">
+ <tr>
+ <th>Portal</th>
+ <th>Actions</th>
+ </tr>
+ </thead>
+ <tbody>
+ <c:forEach items="#{portalobjectmgr.portalNodes}" var="object" varStatus="status">
+ <tr class="#{status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}">
+ <td>
+ <h:commandLink action="#{portalobjectmgr.selectObject}">
+ <h:outputText value="#{object.name}"/>
+ <f:param name="id" value="#{object.id}"/>
+ </h:commandLink>
+ </td>
+ <td>
+ <h:commandLink action="editPortalPreferences" actionListener="#{portalobjectmgr.selectObject}">
+ <h:outputText value="Edit"/>
+ <f:param name="id" value="#{object.id}"/>
+ </h:commandLink> | <h:commandLink action="editPortalSecurity" actionListener="#{portalobjectmgr.selectObject}">
+ <h:outputText value="Security"/>
+ <f:param name="id" value="#{object.id}"/>
+ </h:commandLink> | <h:commandLink action="editPortalTheme" actionListener="#{portalobjectmgr.selectObject}">
+ <h:outputText value="Theme"/>
+ <f:param name="id" value="#{object.id}"/>
+ </h:commandLink> | <h:commandLink action="portals" actionListener="#{portalobjectmgr.destroyObject}">
+ <h:outputText value="Destroy"/>
+ <f:param name="id" value="#{object.id}"/>
+ </h:commandLink>
+ </td>
+ </tr>
+ </c:forEach>
+ </tbody>
+ </table>
+ </c:if>
- <h:dataTable value="#{portalobjectmgr.windowNodes}" var="window" styleClass="tableList" rendered="#{not empty portalobjectmgr.windowNodes}">
- <h:column>
- <f:facet name="header"><h:outputText value="Window"/></f:facet>
- <h:outputText value="#{window.name}"/>
- </h:column>
- <h:column>
- <f:facet name="header"><h:outputText value="Actions"/></f:facet>
- <h:commandLink action="editWindowPreferences" actionListener="#{portalobjectmgr.selectObject}">
- <h:outputText value="Edit"/>
- <f:param name="id" value="#{window.id}"/>
- </h:commandLink> | <h:commandLink action="editWindowTheme" actionListener="#{portalobjectmgr.selectObject}">
- <h:outputText value="Theme"/>
- <f:param name="id" value="#{window.id}"/>
- </h:commandLink> | <h:commandLink action="windows" actionListener="#{portalobjectmgr.destroyObject}">
- <h:outputText value="Destroy"/>
- <f:param name="id" value="#{window.id}"/>
- </h:commandLink>
- </h:column>
- </h:dataTable>
+ <c:if test="#{not empty portalobjectmgr.pageNodes}">
+ <table width="100%" border="0" cellspacing="0" class="portlet-table-body">
+ <thead class="portlet-section-header" style="text-align:left;">
+ <tr>
+ <th>Page</th>
+ <th>Actions</th>
+ </tr>
+ </thead>
+ <tbody>
+ <c:forEach items="#{portalobjectmgr.pageNodes}" var="object" varStatus="status">
+ <tr class="#{status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}">
+ <td>
+ <h:commandLink action="#{portalobjectmgr.selectObject}">
+ <h:outputText value="#{object.name}"/>
+ <f:param name="id" value="#{object.id}"/>
+ </h:commandLink>
+ </td>
+ <td>
+ <h:commandLink action="editPageLayout" actionListener="#{portalobjectmgr.selectObject}">
+ <h:outputText value="Layout"/>
+ <f:param name="id" value="#{object.id}"/>
+ </h:commandLink> | <h:commandLink action="editPageSecurity" actionListener="#{portalobjectmgr.selectObject}">
+ <h:outputText value="Security"/>
+ <f:param name="id" value="#{object.id}"/>
+ </h:commandLink> | <h:commandLink action="editPageTheme" actionListener="#{portalobjectmgr.selectObject}">
+ <h:outputText value="Theme"/>
+ <f:param name="id" value="#{object.id}"/>
+ </h:commandLink> | <h:commandLink action="pages" actionListener="#{portalobjectmgr.destroyObject}">
+ <h:outputText value="Destroy"/>
+ <f:param name="id" value="#{object.id}"/>
+ </h:commandLink>
+ </td>
+ </tr>
+ </c:forEach>
+ </tbody>
+ </table>
+ </c:if>
+ <c:if test="#{not empty portalobjectmgr.windowNodes}">
+ <table width="100%" border="0" cellspacing="0" class="portlet-table-body">
+ <thead class="portlet-section-header" style="text-align:left;">
+ <tr>
+ <th>Page</th>
+ <th>Actions</th>
+ </tr>
+ </thead>
+ <tbody>
+ <c:forEach items="#{portalobjectmgr.windowNodes}" var="object" varStatus="status">
+ <tr class="#{status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}">
+ <td>
+ <h:commandLink action="#{portalobjectmgr.selectObject}">
+ <h:outputText value="#{object.name}"/>
+ <f:param name="id" value="#{object.id}"/>
+ </h:commandLink>
+ </td>
+ <td>
+ <h:commandLink action="editWindowPreferences" actionListener="#{portalobjectmgr.selectObject}">
+ <h:outputText value="Edit"/>
+ <f:param name="id" value="#{object.id}"/>
+ </h:commandLink> | <h:commandLink action="editWindowTheme" actionListener="#{portalobjectmgr.selectObject}">
+ <h:outputText value="Theme"/>
+ <f:param name="id" value="#{object.id}"/>
+ </h:commandLink> | <h:commandLink action="windows" actionListener="#{portalobjectmgr.destroyObject}">
+ <h:outputText value="Destroy"/>
+ <f:param name="id" value="#{object.id}"/>
+ </h:commandLink>
+ </td>
+ </tr>
+ </c:forEach>
+ </tbody>
+ </table>
+ </c:if>
+
</h:form>
</div>
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pageNavigation.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pageNavigation.xhtml 2007-02-28 00:59:30 UTC (rev 6449)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pageNavigation.xhtml 2007-02-28 02:40:22 UTC (rev 6450)
@@ -13,10 +13,8 @@
<h:inputText id="name" value="#{addPageAction.pageName}"
validator="#{addPageAction.validatePageName}"
required="true"/>
- <h:commandButton action="#{addPageAction.execute}" value="Add portal page" styleClass="portlet-form-button"/>
+ <h:commandButton action="#{addPageAction.execute}" value="Add page" styleClass="portlet-form-button"/>
<h:message for="name" style="color: red"/>
</h:form>
- <h:outputLink value="#{portalobjectmgr.previewURL}" title="Preview link" target="_blank">Preview link</h:outputLink>
-
</div>
Modified: trunk/faces/src/main/org/jboss/portal/faces/matrix/AbstractCellAction.java
===================================================================
--- trunk/faces/src/main/org/jboss/portal/faces/matrix/AbstractCellAction.java 2007-02-28 00:59:30 UTC (rev 6449)
+++ trunk/faces/src/main/org/jboss/portal/faces/matrix/AbstractCellAction.java 2007-02-28 02:40:22 UTC (rev 6450)
@@ -24,6 +24,7 @@
import javax.faces.context.FacesContext;
import javax.faces.el.ValueBinding;
+import java.util.Map;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
@@ -72,21 +73,22 @@
public void selectRow()
{
FacesContext ctx = FacesContext.getCurrentInstance();
- ValueBinding vb1 = ctx.getApplication().createValueBinding("#{row}");
- Row row = (Row)vb1.getValue(ctx);
- int rowIndex = row.getIndex();
+ Map params = ctx.getExternalContext().getRequestParameterMap();
+ String rowString = (String)params.get("row");
+ int rowIndex = Integer.parseInt(rowString);
selectRow(rowIndex);
}
public void deleteCell()
{
FacesContext ctx = FacesContext.getCurrentInstance();
- ValueBinding vb1 = ctx.getApplication().createValueBinding("#{row}");
- Row row = (Row)vb1.getValue(ctx);
- deleteRow(row);
+ Map params = ctx.getExternalContext().getRequestParameterMap();
+ String rowString = (String)params.get("row");
+ int rowIndex = Integer.parseInt(rowString);
+ deleteRow(rowIndex);
}
- public abstract void deleteRow(Row row);
+ public abstract void deleteRow(int rowIndex);
public abstract void selectRow(int rowIndex);
19 years, 1 month
- 1
- 0
JBoss Portal SVN: r6449 - in trunk/core-admin/src: resources/portal-admin-war/WEB-INF/jsp/management and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-02-27 19:59:30 -0500 (Tue, 27 Feb 2007)
New Revision: 6449
Modified:
trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/definitionsTemplate.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/instancesTemplate.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/objectTemplate.xhtml
Log:
Go back to root, when clicking on tab
Modified: trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java
===================================================================
--- trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java 2007-02-28 00:58:21 UTC (rev 6448)
+++ trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java 2007-02-28 00:59:30 UTC (rev 6449)
@@ -371,7 +371,12 @@
{
setSelectedObject(getSelectedObject().getParent());
}
-
+
+ public void selectRootObject(ActionEvent ae)
+ {
+ setSelectedObject(portalObjectContainer.getRootObject());
+ }
+
public void udpateContentType()
{
// Do nothing
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/definitionsTemplate.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/definitionsTemplate.xhtml 2007-02-28 00:58:21 UTC (rev 6448)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/definitionsTemplate.xhtml 2007-02-28 00:59:30 UTC (rev 6449)
@@ -4,7 +4,7 @@
xmlns:ui="http://java.sun.com/jsf/facelets">
<h:form>
- <h:commandLink value="Portal Objects" action="portals"/> | <h:commandLink value="Porlet Instances" action="instances"/> | <b><h:commandLink value="Portlet Definitions" action="portlets"/></b>
+ <h:commandLink value="Portal Objects" action="portals" actionListener="#{portalobjectmgr.selectRootObject}"/> | <h:commandLink value="Porlet Instances" action="instances"/> | <b><h:commandLink value="Portlet Definitions" action="portlets"/></b>
</h:form>
<hr class="admin-ui"/>
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/instancesTemplate.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/instancesTemplate.xhtml 2007-02-28 00:58:21 UTC (rev 6448)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/instancesTemplate.xhtml 2007-02-28 00:59:30 UTC (rev 6449)
@@ -4,7 +4,7 @@
xmlns:ui="http://java.sun.com/jsf/facelets">
<h:form>
- <h:commandLink value="Portal Objects" action="portals"/> | <b><h:commandLink value="Porlet Instances" action="instances"/></b> | <h:commandLink value="Portlet Definitions" action="portlets"/>
+ <h:commandLink value="Portal Objects" action="portals" actionListener="#{portalobjectmgr.selectRootObject}"/> | <b><h:commandLink value="Porlet Instances" action="instances"/></b> | <h:commandLink value="Portlet Definitions" action="portlets"/>
</h:form>
<hr class="admin-ui"/>
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/objectTemplate.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/objectTemplate.xhtml 2007-02-28 00:58:21 UTC (rev 6448)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/objectTemplate.xhtml 2007-02-28 00:59:30 UTC (rev 6449)
@@ -6,7 +6,7 @@
xmlns:c="http://java.sun.com/jstl/core">
<h:form>
- <b><h:commandLink value="Portal Objects" action="portals"/></b> | <h:commandLink value="Porlet Instances" action="instances"/> | <h:commandLink value="Portlet Definitions" action="portlets"/>
+ <b><h:commandLink value="Portal Objects" action="portals" actionListener="#{portalobjectmgr.selectRootObject}"/></b> | <h:commandLink value="Porlet Instances" action="instances"/> | <h:commandLink value="Portlet Definitions" action="portlets"/>
</h:form>
<hr class="admin-ui"/>
19 years, 1 month
- 1
- 0
JBoss Portal SVN: r6448 - trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-02-27 19:58:21 -0500 (Tue, 27 Feb 2007)
New Revision: 6448
Modified:
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPageLayout.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPageSecurity.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPortalSecurity.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pageNavigation.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pages.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portalNavigation.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portals.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/windowNavigation.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/windows.xhtml
Log:
- more visual tweaks (too many horizontal lines)
- improve markup formatting a bit
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPageLayout.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPageLayout.xhtml 2007-02-28 00:48:44 UTC (rev 6447)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPageLayout.xhtml 2007-02-28 00:58:21 UTC (rev 6448)
@@ -10,7 +10,6 @@
<ui:define name="content">
- <hr class="admin-ui"/>
<h3>You are editing the page layout</h3>
<h:form id="layoutForm">
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPageSecurity.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPageSecurity.xhtml 2007-02-28 00:48:44 UTC (rev 6447)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPageSecurity.xhtml 2007-02-28 00:58:21 UTC (rev 6448)
@@ -2,20 +2,12 @@
xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:h="http://java.sun.com/jsf/html">
-
-<ui:composition template="/WEB-INF/jsp/management/objectTemplate.xhtml">
-
- <ui:define name="content">
-
- <hr class="admin-ui"/>
- <h3>Please set the page permissions</h3>
-
- <ui:include src="/WEB-INF/jsp/management/common/editSecurity.xhtml">
- <ui:param name="auth" value="#{portalobjectmgr.auth}"/>
- </ui:include>
-
- </ui:define>
-
-</ui:composition>
-
+ <ui:composition template="/WEB-INF/jsp/management/objectTemplate.xhtml">
+ <ui:define name="content">
+ <h3>Please set the page permissions</h3>
+ <ui:include src="/WEB-INF/jsp/management/common/editSecurity.xhtml">
+ <ui:param name="auth" value="#{portalobjectmgr.auth}"/>
+ </ui:include>
+ </ui:define>
+ </ui:composition>
</div>
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPortalSecurity.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPortalSecurity.xhtml 2007-02-28 00:48:44 UTC (rev 6447)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPortalSecurity.xhtml 2007-02-28 00:58:21 UTC (rev 6448)
@@ -7,7 +7,6 @@
<ui:define name="content">
- <hr class="admin-ui"/>
<h3>Please set the portal permissions</h3>
<ui:include src="/WEB-INF/jsp/management/common/editSecurity.xhtml">
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pageNavigation.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pageNavigation.xhtml 2007-02-28 00:48:44 UTC (rev 6447)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pageNavigation.xhtml 2007-02-28 00:58:21 UTC (rev 6448)
@@ -9,14 +9,13 @@
<!-- Sub page addition -->
<hr class="admin-ui"/>
-
- <h:form id="portal_form">
- <h:inputText id="name" value="#{addPageAction.pageName}"
+ <h:form id="portal_form">
+ <h:inputText id="name" value="#{addPageAction.pageName}"
validator="#{addPageAction.validatePageName}"
required="true"/>
- <h:commandButton action="#{addPageAction.execute}" value="Add portal page" styleClass="portlet-form-button"/>
- <h:message for="name" style="color: red"/>
- </h:form>
+ <h:commandButton action="#{addPageAction.execute}" value="Add portal page" styleClass="portlet-form-button"/>
+ <h:message for="name" style="color: red"/>
+ </h:form>
<h:outputLink value="#{portalobjectmgr.previewURL}" title="Preview link" target="_blank">Preview link</h:outputLink>
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pages.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pages.xhtml 2007-02-28 00:48:44 UTC (rev 6447)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pages.xhtml 2007-02-28 00:58:21 UTC (rev 6448)
@@ -2,21 +2,13 @@
xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:h="http://java.sun.com/jsf/html">
-
-<ui:composition template="/WEB-INF/jsp/management/objectTemplate.xhtml">
-
- <ui:define name="content">
-
- <h3>You are editing the pages of: <h:outputText value="#{portalobjectmgr.selectedObject.name}"/></h3>
-
- <h:message id="status" for="status"/>
-
- <ui:include src="/WEB-INF/jsp/management/pageNavigation.xhtml"/>
-
- </ui:define>
-
-</ui:composition>
-
+ <ui:composition template="/WEB-INF/jsp/management/objectTemplate.xhtml">
+ <ui:define name="content">
+ <h3>You are editing the pages of: <h:outputText value="#{portalobjectmgr.selectedObject.name}"/></h3>
+ <h:message id="status" for="status"/>
+ <ui:include src="/WEB-INF/jsp/management/pageNavigation.xhtml"/>
+ </ui:define>
+ </ui:composition>
</div>
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portalNavigation.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portalNavigation.xhtml 2007-02-28 00:48:44 UTC (rev 6447)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portalNavigation.xhtml 2007-02-28 00:58:21 UTC (rev 6448)
@@ -5,12 +5,13 @@
<ui:include src="nodeNavigation.xhtml"/>
- <h:form id="portal_form">
- <h:inputText id="name" value="#{portalAction.portalName}"
+ <hr class="admin-ui"/>
+ <h:form id="portal_form">
+ <h:inputText id="name" value="#{portalAction.portalName}"
validator="#{portalAction.validatePortalName}"
required="true"/>
- <h:commandButton action="#{portalAction.addPortal}" value="Add portal" styleClass="portlet-form-button"/>
- <h:message for="name" style="color: red"/>
- </h:form>
+ <h:commandButton action="#{portalAction.addPortal}" value="Add portal" styleClass="portlet-form-button"/>
+ <h:message for="name" style="color: red"/>
+ </h:form>
</div>
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portals.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portals.xhtml 2007-02-28 00:48:44 UTC (rev 6447)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portals.xhtml 2007-02-28 00:58:21 UTC (rev 6448)
@@ -2,19 +2,12 @@
xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:h="http://java.sun.com/jsf/html">
-
-<ui:composition template="/WEB-INF/jsp/management/objectTemplate.xhtml">
-
- <ui:define name="content">
-
- <h:message id="status" for="status"/>
-
- <ui:include src="/WEB-INF/jsp/management/portalNavigation.xhtml"/>
-
- </ui:define>
-
-</ui:composition>
-
+ <ui:composition template="/WEB-INF/jsp/management/objectTemplate.xhtml">
+ <ui:define name="content">
+ <h:message id="status" for="status"/>
+ <ui:include src="/WEB-INF/jsp/management/portalNavigation.xhtml"/>
+ </ui:define>
+ </ui:composition>
</div>
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/windowNavigation.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/windowNavigation.xhtml 2007-02-28 00:48:44 UTC (rev 6447)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/windowNavigation.xhtml 2007-02-28 00:58:21 UTC (rev 6448)
@@ -1,7 +1,5 @@
<div
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://java.sun.com/jsf/facelets">
-
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets">
<ui:include src="/WEB-INF/jsp/management/nodeNavigation.xhtml"/>
-
</div>
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/windows.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/windows.xhtml 2007-02-28 00:48:44 UTC (rev 6447)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/windows.xhtml 2007-02-28 00:58:21 UTC (rev 6448)
@@ -2,26 +2,15 @@
xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:h="http://java.sun.com/jsf/html">
-
-
<ui:composition template="/WEB-INF/jsp/management/objectTemplate.xhtml">
-
<ui:define name="content">
-
<h3>You are editing the windows of: <h:outputText value="#{portalobjectmgr.selectedObject.name}"/></h3>
-
<h:message id="status" for="status"/>
-
<ui:include src="/WEB-INF/jsp/management/windowNavigation.xhtml"/>
-
<hr class="admin-ui"/>
-
<ui:include src="/WEB-INF/jsp/management/plugins/manager.xhtml"/>
-
</ui:define>
-
</ui:composition>
-
</div>
19 years, 1 month
- 1
- 0
JBoss Portal SVN: r6447 - in trunk/core-admin/src: resources/portal-admin-war/WEB-INF/jsp/management and 1 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-02-27 19:48:44 -0500 (Tue, 27 Feb 2007)
New Revision: 6447
Removed:
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editWindowTheme.xhtml
Modified:
trunk/core-admin/src/bin/portal-admin-war/images/management/management.css
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/common/editSecurity.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/definitionsTemplate.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPageLayout.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPageSecurity.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPortalSecurity.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/instances.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/instancesTemplate.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/nodeNavigation.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/objectTemplate.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pageNavigation.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/windows.xhtml
Log:
visual tweaks
Modified: trunk/core-admin/src/bin/portal-admin-war/images/management/management.css
===================================================================
--- trunk/core-admin/src/bin/portal-admin-war/images/management/management.css 2007-02-28 00:18:59 UTC (rev 6446)
+++ trunk/core-admin/src/bin/portal-admin-war/images/management/management.css 2007-02-28 00:48:44 UTC (rev 6447)
@@ -36,4 +36,8 @@
img.scroller {
border:thin solid black;
+}
+
+hr.admin-ui {
+ border-top-style: solid;
}
\ No newline at end of file
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/common/editSecurity.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/common/editSecurity.xhtml 2007-02-28 00:18:59 UTC (rev 6446)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/common/editSecurity.xhtml 2007-02-28 00:48:44 UTC (rev 6447)
@@ -1,26 +1,24 @@
<div
- 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">
- <h:panelGroup>
- <h:form>
- <h:dataTable
- var="role"
- value="#{auth.roles}">
- <h:column>
- <b><h:outputText value="#{role == '__unchecked__' ? 'Unchecked' : (auth.roleDisplayNameMap[role] != null ? auth.roleDisplayNameMap[role] : role)}"/></b>
- </h:column>
- <h:column>
- <h:selectManyCheckbox id="cars"
- value="#{auth.forRole[role]}">
- <f:selectItems value="#{auth.availableActions}"/>
- </h:selectManyCheckbox>
- </h:column>
- </h:dataTable>
+ 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">
- <h:commandButton action="#{auth.execute}" value="Update" styleClass="portlet-form-button"/>
+ <h:form>
+ <h:dataTable
+ var="role"
+ value="#{auth.roles}">
+ <h:column>
+ <b><h:outputText value="#{role == '__unchecked__' ? 'Unchecked' : (auth.roleDisplayNameMap[role] != null ? auth.roleDisplayNameMap[role] : role)}"/></b>
+ </h:column>
+ <h:column>
+ <h:selectManyCheckbox id="cars"
+ value="#{auth.forRole[role]}">
+ <f:selectItems value="#{auth.availableActions}"/>
+ </h:selectManyCheckbox>
+ </h:column>
+ </h:dataTable>
+ <h:commandButton action="#{auth.execute}" value="Update" styleClass="portlet-form-button"/>
+ </h:form>
- </h:form>
- </h:panelGroup>
</div>
\ No newline at end of file
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/definitionsTemplate.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/definitionsTemplate.xhtml 2007-02-28 00:18:59 UTC (rev 6446)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/definitionsTemplate.xhtml 2007-02-28 00:48:44 UTC (rev 6447)
@@ -1,29 +1,14 @@
-<div xmlns="http://www.w3.org/1999/xhtml"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:ui="http://java.sun.com/jsf/facelets">
-
-<!-- h:form>
-<div id="navigation">
- <ul id="tabsHeader">
- <li id="current" onmouseover="this.className='hoverOn'" onmouseout="this.className='hoverOff'">
- <h:commandLink value="Portal Objects" action="portals"/>
- </li>
- <li onmouseover="this.className='hoverOn'" onmouseout="this.className='hoverOff'">
- <h:commandLink value="Porlet Instances" action="instances"/>
- </li>
- <li onmouseover="this.className='hoverOn'" onmouseout="this.className='hoverOff'">
- <h:commandLink value="Portlet Definitions" action="portlets"/>
- </li>
- </ul>
-</div>
-</h:form-->
-<div>
-<h:form>
-<h:commandLink value="Portal Objects" action="portals"/> | <h:commandLink value="Porlet Instances" action="instances"/> | <b><h:commandLink value="Portlet Definitions" action="portlets"/></b>
-</h:form>
-</div>
+<div
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:ui="http://java.sun.com/jsf/facelets">
-<br/>
-<ui:insert name="content">Content</ui:insert>
+ <h:form>
+ <h:commandLink value="Portal Objects" action="portals"/> | <h:commandLink value="Porlet Instances" action="instances"/> | <b><h:commandLink value="Portlet Definitions" action="portlets"/></b>
+ </h:form>
+
+ <hr class="admin-ui"/>
+
+ <ui:insert name="content">Content</ui:insert>
</div>
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPageLayout.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPageLayout.xhtml 2007-02-28 00:18:59 UTC (rev 6446)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPageLayout.xhtml 2007-02-28 00:48:44 UTC (rev 6447)
@@ -10,12 +10,9 @@
<ui:define name="content">
- <h3>You are editing the layout of the page #{portalobjectmgr.selectedObject.name}</h3>
+ <hr class="admin-ui"/>
+ <h3>You are editing the page layout</h3>
- <!-- -->
-
- <hr />
-
<h:form id="layoutForm">
<h:panelGroup>
<table>
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPageSecurity.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPageSecurity.xhtml 2007-02-28 00:18:59 UTC (rev 6446)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPageSecurity.xhtml 2007-02-28 00:48:44 UTC (rev 6447)
@@ -7,9 +7,12 @@
<ui:define name="content">
- <h3>Please set the permissions for the page: <h:outputText value="#{portalobjectmgr.selectedObject.name}"/></h3>
+ <hr class="admin-ui"/>
+ <h3>Please set the page permissions</h3>
- <ui:include src="/WEB-INF/jsp/management/common/editSecurity.xhtml"/>
+ <ui:include src="/WEB-INF/jsp/management/common/editSecurity.xhtml">
+ <ui:param name="auth" value="#{portalobjectmgr.auth}"/>
+ </ui:include>
</ui:define>
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPortalSecurity.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPortalSecurity.xhtml 2007-02-28 00:18:59 UTC (rev 6446)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPortalSecurity.xhtml 2007-02-28 00:48:44 UTC (rev 6447)
@@ -7,7 +7,8 @@
<ui:define name="content">
- <h3>Please set the permissions for the portal: <h:outputText value="#{portalobjectmgr.selectedObject.name}"/></h3>
+ <hr class="admin-ui"/>
+ <h3>Please set the portal permissions</h3>
<ui:include src="/WEB-INF/jsp/management/common/editSecurity.xhtml">
<ui:param name="auth" value="#{portalobjectmgr.auth}"/>
Deleted: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editWindowTheme.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editWindowTheme.xhtml 2007-02-28 00:18:59 UTC (rev 6446)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editWindowTheme.xhtml 2007-02-28 00:48:44 UTC (rev 6447)
@@ -1,19 +0,0 @@
-<div
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:h="http://java.sun.com/jsf/html">
-
-<ui:composition template="/WEB-INF/jsp/management/objectTemplate.xhtml">
-
- <ui:define name="content">
-
- <h3>Please set the display options for the window: <h:outputText value="#{portalobjectmgr.selectedObject.name}"/></h3>
- <br/>
- <ui:include src="/WEB-INF/jsp/management/common/editTheme.xhtml"/>
-
- </ui:define>
-
-</ui:composition>
-
-</div>
-
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/instances.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/instances.xhtml 2007-02-28 00:18:59 UTC (rev 6446)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/instances.xhtml 2007-02-28 00:48:44 UTC (rev 6447)
@@ -1,10 +1,10 @@
<div
- 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:jbp="http://www.jboss.com/portal"
- xmlns:c="http://java.sun.com/jstl/core">
+ 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:jbp="http://www.jboss.com/portal"
+ xmlns:c="http://java.sun.com/jstl/core">
<ui:composition template="/WEB-INF/jsp/management/instancesTemplate.xhtml">
@@ -43,7 +43,7 @@
<c:if test="#{instancemgr.selectedPlugin != null}">
- <hr/>
+ <hr class="admin-ui"/>
<c:if test="#{instancemgr.selectedPlugin == 'info'}">
Info
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/instancesTemplate.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/instancesTemplate.xhtml 2007-02-28 00:18:59 UTC (rev 6446)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/instancesTemplate.xhtml 2007-02-28 00:48:44 UTC (rev 6447)
@@ -1,30 +1,14 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<div xmlns="http://www.w3.org/1999/xhtml"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:ui="http://java.sun.com/jsf/facelets">
+<div
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:ui="http://java.sun.com/jsf/facelets">
-<!-- h:form>
-<div id="navigation">
- <ul id="tabsHeader">
- <li id="current" onmouseover="this.className='hoverOn'" onmouseout="this.className='hoverOff'">
- <h:commandLink value="Portal Objects" action="portals"/>
- </li>
- <li onmouseover="this.className='hoverOn'" onmouseout="this.className='hoverOff'">
- <h:commandLink value="Porlet Instances" action="instances"/>
- </li>
- <li onmouseover="this.className='hoverOn'" onmouseout="this.className='hoverOff'">
- <h:commandLink value="Portlet Definitions" action="portlets"/>
- </li>
- </ul>
-</div>
-</h:form-->
-<div>
-<h:form>
-<h:commandLink value="Portal Objects" action="portals"/> | <b><h:commandLink value="Porlet Instances" action="instances"/></b> | <h:commandLink value="Portlet Definitions" action="portlets"/>
-</h:form>
-</div>
+ <h:form>
+ <h:commandLink value="Portal Objects" action="portals"/> | <b><h:commandLink value="Porlet Instances" action="instances"/></b> | <h:commandLink value="Portlet Definitions" action="portlets"/>
+ </h:form>
-<br/>
-<ui:insert name="content">Content</ui:insert>
+ <hr class="admin-ui"/>
+
+ <ui:insert name="content">Content</ui:insert>
</div>
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/nodeNavigation.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/nodeNavigation.xhtml 2007-02-28 00:18:59 UTC (rev 6446)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/nodeNavigation.xhtml 2007-02-28 00:48:44 UTC (rev 6447)
@@ -67,9 +67,6 @@
<h:commandLink action="editWindowPreferences" actionListener="#{portalobjectmgr.selectObject}">
<h:outputText value="Edit"/>
<f:param name="id" value="#{window.id}"/>
- </h:commandLink> | <h:commandLink action="editWindowSecurity" actionListener="#{portalobjectmgr.selectObject}">
- <h:outputText value="Security"/>
- <f:param name="id" value="#{window.id}"/>
</h:commandLink> | <h:commandLink action="editWindowTheme" actionListener="#{portalobjectmgr.selectObject}">
<h:outputText value="Theme"/>
<f:param name="id" value="#{window.id}"/>
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/objectTemplate.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/objectTemplate.xhtml 2007-02-28 00:18:59 UTC (rev 6446)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/objectTemplate.xhtml 2007-02-28 00:48:44 UTC (rev 6447)
@@ -1,31 +1,16 @@
-<div xmlns="http://www.w3.org/1999/xhtml"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:c="http://java.sun.com/jstl/core">
-
-<!-- h:form>
-<div id="navigation">
- <ul id="tabsHeader">
- <li id="current" onmouseover="this.className='hoverOn'" onmouseout="this.className='hoverOff'">
- <h:commandLink value="Portal Objects" action="portals"/>
- </li>
- <li onmouseover="this.className='hoverOn'" onmouseout="this.className='hoverOff'">
- <h:commandLink value="Porlet Instances" action="instances"/>
- </li>
- <li onmouseover="this.className='hoverOn'" onmouseout="this.className='hoverOff'">
- <h:commandLink value="Portlet Definitions" action="portlets"/>
- </li>
- </ul>
-</div>
-</h:form-->
-<div>
-<h:form>
-<b><h:commandLink value="Portal Objects" action="portals"/></b> | <h:commandLink value="Porlet Instances" action="instances"/> | <h:commandLink value="Portlet Definitions" action="portlets"/>
-</h:form>
-</div>
-<hr />
+<div
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:c="http://java.sun.com/jstl/core">
+ <h:form>
+ <b><h:commandLink value="Portal Objects" action="portals"/></b> | <h:commandLink value="Porlet Instances" action="instances"/> | <h:commandLink value="Portlet Definitions" action="portlets"/>
+ </h:form>
+
+ <hr class="admin-ui"/>
+
<!-- Path nav -->
<h:form>
<c:forEach items="#{portalobjectmgr.selectedObjectPath}" var="node">
@@ -43,7 +28,6 @@
</c:forEach>
</h:form>
-<br/>
-<ui:insert name="content">Content</ui:insert>
+ <ui:insert name="content">Content</ui:insert>
</div>
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pageNavigation.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pageNavigation.xhtml 2007-02-28 00:18:59 UTC (rev 6446)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pageNavigation.xhtml 2007-02-28 00:48:44 UTC (rev 6447)
@@ -8,7 +8,7 @@
<!-- Sub page addition -->
- <hr />
+ <hr class="admin-ui"/>
<h:form id="portal_form">
<h:inputText id="name" value="#{addPageAction.pageName}"
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/windows.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/windows.xhtml 2007-02-28 00:18:59 UTC (rev 6446)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/windows.xhtml 2007-02-28 00:48:44 UTC (rev 6447)
@@ -4,24 +4,24 @@
xmlns:h="http://java.sun.com/jsf/html">
-<ui:composition template="/WEB-INF/jsp/management/objectTemplate.xhtml">
+ <ui:composition template="/WEB-INF/jsp/management/objectTemplate.xhtml">
- <ui:define name="content">
+ <ui:define name="content">
- <h3>You are editing the windows of: <h:outputText value="#{portalobjectmgr.selectedObject.name}"/></h3>
+ <h3>You are editing the windows of: <h:outputText value="#{portalobjectmgr.selectedObject.name}"/></h3>
- <h:message id="status" for="status"/>
+ <h:message id="status" for="status"/>
- <ui:include src="/WEB-INF/jsp/management/windowNavigation.xhtml"/>
-
- <hr />
-
- <ui:include src="/WEB-INF/jsp/management/plugins/manager.xhtml"/>
-
- </ui:define>
+ <ui:include src="/WEB-INF/jsp/management/windowNavigation.xhtml"/>
-</ui:composition>
+ <hr class="admin-ui"/>
+ <ui:include src="/WEB-INF/jsp/management/plugins/manager.xhtml"/>
+
+ </ui:define>
+
+ </ui:composition>
+
</div>
19 years, 1 month
- 1
- 0
JBoss Portal SVN: r6446 - trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-02-27 19:18:59 -0500 (Tue, 27 Feb 2007)
New Revision: 6446
Modified:
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/objectTemplate.xhtml
Log:
No link on Windows
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/objectTemplate.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/objectTemplate.xhtml 2007-02-28 00:18:31 UTC (rev 6445)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/objectTemplate.xhtml 2007-02-28 00:18:59 UTC (rev 6446)
@@ -30,11 +30,16 @@
<h:form>
<c:forEach items="#{portalobjectmgr.selectedObjectPath}" var="node">
>
+ <c:if test="#{node.type != '3'}">
<h:commandLink action="#{portalobjectmgr.selectObject}">
<f:param name="id" value="#{node.id}"/>
<c:if test="#{node.name == ''}">root</c:if>
<c:if test="#{node.name != ''}">#{node.name}</c:if>
</h:commandLink>
+ </c:if>
+ <c:if test="#{node.type == '3'}">
+ #{node.name}
+ </c:if>
</c:forEach>
</h:form>
19 years, 1 month
- 1
- 0