JBoss Portal SVN: r8080 - branches/hudson/modules/identity/trunk.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2007-08-28 17:45:48 -0400 (Tue, 28 Aug 2007)
New Revision: 8080
Added:
branches/hudson/modules/identity/trunk/config/
Log:
config files for LDAP server matrix
Copied: branches/hudson/modules/identity/trunk/config (from rev 8079, modules/test/trunk/test/src/resources/config)
16 years, 9 months
JBoss Portal SVN: r8081 - branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-08-28 17:45:48 -0400 (Tue, 28 Aug 2007)
New Revision: 8081
Modified:
branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/AdminPropertyResolver.java
Log:
- Fixed incorrect given types in PropertyDecorator constructors.
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/AdminPropertyResolver.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/AdminPropertyResolver.java 2007-08-28 21:45:48 UTC (rev 8080)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/AdminPropertyResolver.java 2007-08-28 21:45:48 UTC (rev 8081)
@@ -163,7 +163,7 @@
return info.isRemotable();
}
});
- portletDecorator.setProperty("modes", new AbstractPropertyDecorator(String.class)
+ portletDecorator.setProperty("modes", new AbstractPropertyDecorator(Set.class)
{
public Object getValue(Object bean) throws IllegalArgumentException
{
@@ -171,7 +171,7 @@
return portlet.getInfo().getCapabilities().getModes("text/html");
}
});
- portletDecorator.setProperty("windowStates", new AbstractPropertyDecorator(String.class)
+ portletDecorator.setProperty("windowStates", new AbstractPropertyDecorator(Set.class)
{
public Object getValue(Object bean) throws IllegalArgumentException
{
@@ -179,7 +179,7 @@
return portlet.getInfo().getCapabilities().getWindowStates("text/html");
}
});
- portletDecorator.setProperty("locales", new AbstractPropertyDecorator(String.class)
+ portletDecorator.setProperty("locales", new AbstractPropertyDecorator(Set.class)
{
public Object getValue(Object bean) throws IllegalArgumentException
{
@@ -218,7 +218,7 @@
}
{
- setProperty("portals", new AbstractPropertyDecorator(PortalObject.class)
+ setProperty("portals", new AbstractPropertyDecorator(List.class)
{
public Object getValue(Object bean)
{
@@ -236,7 +236,7 @@
}
}
});
- setProperty("pages", new AbstractPropertyDecorator(PortalObject.class)
+ setProperty("pages", new AbstractPropertyDecorator(List.class)
{
public Object getValue(Object bean)
{
@@ -244,7 +244,7 @@
return getChildren(object, PortalObject.PAGE_MASK);
}
});
- setProperty("windows", new AbstractPropertyDecorator(PortalObject.class)
+ setProperty("windows", new AbstractPropertyDecorator(List.class)
{
public Object getValue(Object bean)
{
@@ -254,7 +254,7 @@
});
}
};
- portalObjectDecorator.setProperty("id", new AbstractPropertyDecorator(PortalObject.class)
+ portalObjectDecorator.setProperty("id", new AbstractPropertyDecorator(String.class)
{
public Object getValue(Object bean)
{
@@ -263,7 +263,7 @@
return id.toString(PortalObjectPath.LEGACY_BASE64_FORMAT);
}
});
- portalObjectDecorator.setProperty("default", new AbstractPropertyDecorator(PortalObject.class)
+ portalObjectDecorator.setProperty("default", new AbstractPropertyDecorator(Boolean.class)
{
public Object getValue(Object bean)
{
16 years, 9 months
JBoss Portal SVN: r8078 - branches/hudson/modules.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2007-08-28 17:44:02 -0400 (Tue, 28 Aug 2007)
New Revision: 8078
Added:
branches/hudson/modules/identity/
Log:
place to store config files for hudson testsuite matrix
16 years, 9 months
JBoss Portal SVN: r8077 - branches/hudson.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2007-08-28 17:43:49 -0400 (Tue, 28 Aug 2007)
New Revision: 8077
Added:
branches/hudson/modules/
Log:
place to store config files for hudson testsuite matrix
16 years, 9 months
JBoss Portal SVN: r8076 - in trunk/core-admin/src: resources/portal-admin-war/WEB-INF/jsf and 1 other directory.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-08-28 17:43:43 -0400 (Tue, 28 Aug 2007)
New Revision: 8076
Modified:
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml
Log:
- JBPORTAL-1644: Use dataTable instead of forEach to solve the randomness issue (thanks, Thomas!).
Modified: trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java
===================================================================
--- trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java 2007-08-28 21:43:35 UTC (rev 8075)
+++ trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java 2007-08-28 21:43:43 UTC (rev 8076)
@@ -416,11 +416,6 @@
throw new IllegalArgumentException("Invalid object type to set as default");
}
- // select the object for now as trying to re-display the page results in apparently random behavior
- // i.e. id parameter don't correspond to what they should be based on the clicked link
- // comment the next line to try it out for yourself...
- selectObject(poid);
-
PortalObject parent = object.getParent();
if (parent != null)
{
@@ -429,7 +424,7 @@
FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_INFO, "Success",
- "'" + name + "'" + typeName + " was successfully set as default " + typeName);
+ "'" + name + "' " + typeName + " was successfully set as default " + typeName);
FacesContext.getCurrentInstance().addMessage("status", message);
}
}
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml 2007-08-28 21:43:35 UTC (rev 8075)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml 2007-08-28 21:43:43 UTC (rev 8076)
@@ -8,143 +8,131 @@
<h:form>
-<table width="100%">
-
<c:if test="#{not empty portalobjectmgr.selectedObject.portals}">
- <thead class="portlet-section-header">
- <tr>
- <th>Portal</th>
- <th>Actions</th>
- </tr>
- </thead>
- <tbody>
- <c:forEach items="#{portalobjectmgr.selectedObject.portals}" 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="editPortalSecurity" actionListener="#{portalobjectmgr.selectObject}">
- <h:outputText value="Security"/>
- <f:param name="id" value="#{object.id}"/>
- </h:commandLink> | <h:commandLink action="editProperties"
- actionListener="#{portalobjectmgr.selectObject}">
- <h:outputText value="Properties"/>
- <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:panelGroup
- rendered="#{(object.name != 'admin') and (object.name != 'template') and (object.name != 'default')}">
- | <h:commandLink action="renameObject" actionListener="#{portalobjectmgr.selectObject}">
- <h:outputText value="Rename"/>
- <f:param name="id" value="#{object.id}"/>
- </h:commandLink>
- </h:panelGroup> | <h:commandLink action="confirm" actionListener="#{portalobjectmgr.selectObject}">
- <h:outputText value="Delete"/>
- <f:param name="id" value="#{object.id}"/>
- </h:commandLink>
- </td>
- </tr>
- </c:forEach>
- </tbody>
+ <h:dataTable var="object" value="#{portalobjectmgr.selectedObject.portals}"
+ rowClasses="portlet-section-body,portlet-section-alternate" headerClass="portlet-section-header">
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="Portal"/>
+ </f:facet>
+ <h:commandLink action="#{portalobjectmgr.selectObject}">
+ <h:outputText value="#{object.name}"/>
+ <f:param name="id" value="#{object.id}"/>
+ </h:commandLink>
+ </h:column>
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="Actions"/>
+ </f:facet>
+ <h:commandLink action="editPortalSecurity" actionListener="#{portalobjectmgr.selectObject}">
+ <h:outputText value="Security"/>
+ <f:param name="id" value="#{object.id}"/>
+ </h:commandLink> | <h:commandLink action="editProperties" actionListener="#{portalobjectmgr.selectObject}">
+ <h:outputText value="Properties"/>
+ <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:panelGroup
+ rendered="#{(object.name != 'admin') and (object.name != 'template') and (object.name != 'default')}">
+ | <h:commandLink action="renameObject" actionListener="#{portalobjectmgr.selectObject}">
+ <h:outputText value="Rename"/>
+ <f:param name="id" value="#{object.id}"/>
+ </h:commandLink>
+ </h:panelGroup> | <h:commandLink action="confirm" actionListener="#{portalobjectmgr.selectObject}">
+ <h:outputText value="Delete"/>
+ <f:param name="id" value="#{object.id}"/>
+ </h:commandLink>
+ <h:panelGroup rendered="#{not object.default}"> | <h:commandLink action="#{portalobjectmgr.makeObjectDefault}">
+ <h:outputText value="Make Default"/>
+ <f:param name="id" value="#{object.id}"/>
+ </h:commandLink>
+ </h:panelGroup>
+ <h:panelGroup rendered="#{object.default}"> | <h:outputText value="Default"/></h:panelGroup>
+ </h:column>
+ </h:dataTable>
</c:if>
<c:if test="#{not empty portalobjectmgr.selectedObject.pages}">
- <thead class="portlet-section-header">
- <tr>
- <th>Page</th>
- <th>Actions</th>
- </tr>
- </thead>
- <tbody>
- <c:forEach items="#{portalobjectmgr.selectedObject.pages}" 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="Page 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="editProperties" actionListener="#{portalobjectmgr.selectObject}">
- <h:outputText value="Properties"/>
- <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="renameObject" actionListener="#{portalobjectmgr.selectObject}">
- <h:outputText value="Rename"/>
- <f:param name="id" value="#{object.id}"/>
- </h:commandLink> | <h:commandLink action="confirm" actionListener="#{portalobjectmgr.selectObject}">
- <h:outputText value="Delete"/>
- <f:param name="id" value="#{object.id}"/>
- </h:commandLink>
- <c:choose>
- <c:when test="#{not object.default}"> | <h:commandLink action="#{portalobjectmgr.makeObjectDefault}">
- <h:outputText value="Make Default"/>
- <f:param name="id" value="#{object.id}"/>
- </h:commandLink>
- </c:when>
- <c:otherwise> | <h:outputText value="Default"/>
- </c:otherwise>
- </c:choose>
- </td>
- </tr>
- </c:forEach>
- </tbody>
+ <h:dataTable var="object" value="#{portalobjectmgr.selectedObject.pages}"
+ rowClasses="portlet-section-body,portlet-section-alternate" headerClass="portlet-section-header">
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="Page"/>
+ </f:facet>
+ <h:commandLink action="#{portalobjectmgr.selectObject}">
+ <h:outputText value="#{object.name}"/>
+ <f:param name="id" value="#{object.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="Page 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="editProperties" actionListener="#{portalobjectmgr.selectObject}">
+ <h:outputText value="Properties"/>
+ <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="renameObject" actionListener="#{portalobjectmgr.selectObject}">
+ <h:outputText value="Rename"/>
+ <f:param name="id" value="#{object.id}"/>
+ </h:commandLink> | <h:commandLink action="confirm" actionListener="#{portalobjectmgr.selectObject}">
+ <h:outputText value="Delete"/>
+ <f:param name="id" value="#{object.id}"/>
+ </h:commandLink>
+ <h:panelGroup rendered="#{not object.default}"> | <h:commandLink action="#{portalobjectmgr.makeObjectDefault}">
+ <h:outputText value="Make Default"/>
+ <f:param name="id" value="#{object.id}"/>
+ </h:commandLink>
+ </h:panelGroup>
+ <h:panelGroup rendered="#{object.default}"> | <h:outputText value="Default"/></h:panelGroup>
+ </h:column>
+ </h:dataTable>
</c:if>
<c:if test="#{not empty portalobjectmgr.selectedObject.windows}">
- <thead class="portlet-section-header">
- <tr>
- <th>Window</th>
- <th>Actions</th>
- </tr>
- </thead>
- <tbody>
- <c:forEach items="#{portalobjectmgr.selectedObject.windows}" 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="editWindowTheme" actionListener="#{portalobjectmgr.selectObject}">
- <h:outputText value="Theme"/>
- <f:param name="id" value="#{object.id}"/>
- </h:commandLink> | <h:commandLink action="editProperties"
- actionListener="#{portalobjectmgr.selectObject}">
- <h:outputText value="Properties"/>
- <f:param name="id" value="#{object.id}"/>
- </h:commandLink> | <h:commandLink action="renameObject" actionListener="#{portalobjectmgr.selectObject}">
- <h:outputText value="Rename"/>
- <f:param name="id" value="#{object.id}"/>
- </h:commandLink> | <h:commandLink action="confirm" actionListener="#{portalobjectmgr.selectObject}">
- <h:outputText value="Delete"/>
- <f:param name="id" value="#{object.id}"/>
- </h:commandLink>
- </td>
- </tr>
- </c:forEach>
- </tbody>
+ <h:dataTable var="object" value="#{portalobjectmgr.selectedObject.windows}"
+ rowClasses="portlet-section-body,portlet-section-alternate" headerClass="portlet-section-header">
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="Window"/>
+ </f:facet>
+ <h:commandLink action="#{portalobjectmgr.selectObject}">
+ <h:outputText value="#{object.name}"/>
+ <f:param name="id" value="#{object.id}"/>
+ </h:commandLink>
+ </h:column>
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="Actions"/>
+ </f:facet>
+ <h:commandLink action="editWindowTheme" actionListener="#{portalobjectmgr.selectObject}">
+ <h:outputText value="Theme"/>
+ <f:param name="id" value="#{object.id}"/>
+ </h:commandLink> | <h:commandLink action="editProperties"
+ actionListener="#{portalobjectmgr.selectObject}">
+ <h:outputText value="Properties"/>
+ <f:param name="id" value="#{object.id}"/>
+ </h:commandLink> | <h:commandLink action="renameObject" actionListener="#{portalobjectmgr.selectObject}">
+ <h:outputText value="Rename"/>
+ <f:param name="id" value="#{object.id}"/>
+ </h:commandLink> | <h:commandLink action="confirm" actionListener="#{portalobjectmgr.selectObject}">
+ <h:outputText value="Delete"/>
+ <f:param name="id" value="#{object.id}"/>
+ </h:commandLink>
+ </h:column>
+ </h:dataTable>
</c:if>
-
-</table>
-
</h:form>
</div>
16 years, 9 months
JBoss Portal SVN: r8075 - branches.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2007-08-28 17:43:35 -0400 (Tue, 28 Aug 2007)
New Revision: 8075
Added:
branches/hudson/
Log:
place to store config files for hudson testsuite matrix
16 years, 9 months
JBoss Portal SVN: r8074 - in branches/JBoss_Portal_Branch_2_6/core-admin/src: resources/portal-admin-war/WEB-INF/jsf and 1 other directory.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-08-28 17:30:18 -0400 (Tue, 28 Aug 2007)
New Revision: 8074
Modified:
branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml
Log:
- JBPORTAL-1644: Use dataTable instead of forEach to solve the randomness issue (thanks, Thomas!).
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java 2007-08-28 20:53:19 UTC (rev 8073)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java 2007-08-28 21:30:18 UTC (rev 8074)
@@ -416,11 +416,6 @@
throw new IllegalArgumentException("Invalid object type to set as default");
}
- // select the object for now as trying to re-display the page results in apparently random behavior
- // i.e. id parameter don't correspond to what they should be based on the clicked link
- // comment the next line to try it out for yourself...
- selectObject(poid);
-
PortalObject parent = object.getParent();
if (parent != null)
{
@@ -429,7 +424,7 @@
FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_INFO, "Success",
- "'" + name + "'" + typeName + " was successfully set as default " + typeName);
+ "'" + name + "' " + typeName + " was successfully set as default " + typeName);
FacesContext.getCurrentInstance().addMessage("status", message);
}
}
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml 2007-08-28 20:53:19 UTC (rev 8073)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml 2007-08-28 21:30:18 UTC (rev 8074)
@@ -8,152 +8,131 @@
<h:form>
-<table width="100%">
-
<c:if test="#{not empty portalobjectmgr.selectedObject.portals}">
- <thead class="portlet-section-header">
- <tr>
- <th>Portal</th>
- <th>Actions</th>
- </tr>
- </thead>
- <tbody>
- <c:forEach items="#{portalobjectmgr.selectedObject.portals}" 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="editPortalSecurity" actionListener="#{portalobjectmgr.selectObject}">
- <h:outputText value="Security"/>
- <f:param name="id" value="#{object.id}"/>
- </h:commandLink> | <h:commandLink action="editProperties"
- actionListener="#{portalobjectmgr.selectObject}">
- <h:outputText value="Properties"/>
- <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:panelGroup
- rendered="#{(object.name != 'admin') and (object.name != 'template') and (object.name != 'default')}">
- | <h:commandLink action="renameObject" actionListener="#{portalobjectmgr.selectObject}">
- <h:outputText value="Rename"/>
- <f:param name="id" value="#{object.id}"/>
- </h:commandLink>
- </h:panelGroup> | <h:commandLink action="confirm" actionListener="#{portalobjectmgr.selectObject}">
- <h:outputText value="Delete"/>
- <f:param name="id" value="#{object.id}"/>
- </h:commandLink>
- <c:choose>
- <c:when test="#{not object.default}"> | <h:commandLink action="#{portalobjectmgr.makeObjectDefault}">
- <h:outputText value="Make Default"/>
- <f:param name="id" value="#{object.id}"/>
- </h:commandLink>
- </c:when>
- <c:otherwise> | <h:outputText value="Default"/>
- </c:otherwise>
- </c:choose>
- </td>
- </tr>
- </c:forEach>
- </tbody>
+ <h:dataTable var="object" value="#{portalobjectmgr.selectedObject.portals}"
+ rowClasses="portlet-section-body,portlet-section-alternate" headerClass="portlet-section-header">
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="Portal"/>
+ </f:facet>
+ <h:commandLink action="#{portalobjectmgr.selectObject}">
+ <h:outputText value="#{object.name}"/>
+ <f:param name="id" value="#{object.id}"/>
+ </h:commandLink>
+ </h:column>
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="Actions"/>
+ </f:facet>
+ <h:commandLink action="editPortalSecurity" actionListener="#{portalobjectmgr.selectObject}">
+ <h:outputText value="Security"/>
+ <f:param name="id" value="#{object.id}"/>
+ </h:commandLink> | <h:commandLink action="editProperties" actionListener="#{portalobjectmgr.selectObject}">
+ <h:outputText value="Properties"/>
+ <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:panelGroup
+ rendered="#{(object.name != 'admin') and (object.name != 'template') and (object.name != 'default')}">
+ | <h:commandLink action="renameObject" actionListener="#{portalobjectmgr.selectObject}">
+ <h:outputText value="Rename"/>
+ <f:param name="id" value="#{object.id}"/>
+ </h:commandLink>
+ </h:panelGroup> | <h:commandLink action="confirm" actionListener="#{portalobjectmgr.selectObject}">
+ <h:outputText value="Delete"/>
+ <f:param name="id" value="#{object.id}"/>
+ </h:commandLink>
+ <h:panelGroup rendered="#{not object.default}"> | <h:commandLink action="#{portalobjectmgr.makeObjectDefault}">
+ <h:outputText value="Make Default"/>
+ <f:param name="id" value="#{object.id}"/>
+ </h:commandLink>
+ </h:panelGroup>
+ <h:panelGroup rendered="#{object.default}"> | <h:outputText value="Default"/></h:panelGroup>
+ </h:column>
+ </h:dataTable>
</c:if>
<c:if test="#{not empty portalobjectmgr.selectedObject.pages}">
- <thead class="portlet-section-header">
- <tr>
- <th>Page</th>
- <th>Actions</th>
- </tr>
- </thead>
- <tbody>
- <c:forEach items="#{portalobjectmgr.selectedObject.pages}" 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="Page 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="editProperties" actionListener="#{portalobjectmgr.selectObject}">
- <h:outputText value="Properties"/>
- <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="renameObject" actionListener="#{portalobjectmgr.selectObject}">
- <h:outputText value="Rename"/>
- <f:param name="id" value="#{object.id}"/>
- </h:commandLink> | <h:commandLink action="confirm" actionListener="#{portalobjectmgr.selectObject}">
- <h:outputText value="Delete"/>
- <f:param name="id" value="#{object.id}"/>
- </h:commandLink>
- <c:choose>
- <c:when test="#{not object.default}"> | <h:commandLink action="#{portalobjectmgr.makeObjectDefault}">
- <h:outputText value="Make Default"/>
- <f:param name="id" value="#{object.id}"/>
- </h:commandLink>
- </c:when>
- <c:otherwise> | <h:outputText value="Default"/>
- </c:otherwise>
- </c:choose>
- </td>
- </tr>
- </c:forEach>
- </tbody>
+ <h:dataTable var="object" value="#{portalobjectmgr.selectedObject.pages}"
+ rowClasses="portlet-section-body,portlet-section-alternate" headerClass="portlet-section-header">
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="Page"/>
+ </f:facet>
+ <h:commandLink action="#{portalobjectmgr.selectObject}">
+ <h:outputText value="#{object.name}"/>
+ <f:param name="id" value="#{object.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="Page 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="editProperties" actionListener="#{portalobjectmgr.selectObject}">
+ <h:outputText value="Properties"/>
+ <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="renameObject" actionListener="#{portalobjectmgr.selectObject}">
+ <h:outputText value="Rename"/>
+ <f:param name="id" value="#{object.id}"/>
+ </h:commandLink> | <h:commandLink action="confirm" actionListener="#{portalobjectmgr.selectObject}">
+ <h:outputText value="Delete"/>
+ <f:param name="id" value="#{object.id}"/>
+ </h:commandLink>
+ <h:panelGroup rendered="#{not object.default}"> | <h:commandLink action="#{portalobjectmgr.makeObjectDefault}">
+ <h:outputText value="Make Default"/>
+ <f:param name="id" value="#{object.id}"/>
+ </h:commandLink>
+ </h:panelGroup>
+ <h:panelGroup rendered="#{object.default}"> | <h:outputText value="Default"/></h:panelGroup>
+ </h:column>
+ </h:dataTable>
</c:if>
<c:if test="#{not empty portalobjectmgr.selectedObject.windows}">
- <thead class="portlet-section-header">
- <tr>
- <th>Window</th>
- <th>Actions</th>
- </tr>
- </thead>
- <tbody>
- <c:forEach items="#{portalobjectmgr.selectedObject.windows}" 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="editWindowTheme" actionListener="#{portalobjectmgr.selectObject}">
- <h:outputText value="Theme"/>
- <f:param name="id" value="#{object.id}"/>
- </h:commandLink> | <h:commandLink action="editProperties"
- actionListener="#{portalobjectmgr.selectObject}">
- <h:outputText value="Properties"/>
- <f:param name="id" value="#{object.id}"/>
- </h:commandLink> | <h:commandLink action="renameObject" actionListener="#{portalobjectmgr.selectObject}">
- <h:outputText value="Rename"/>
- <f:param name="id" value="#{object.id}"/>
- </h:commandLink> | <h:commandLink action="confirm" actionListener="#{portalobjectmgr.selectObject}">
- <h:outputText value="Delete"/>
- <f:param name="id" value="#{object.id}"/>
- </h:commandLink>
- </td>
- </tr>
- </c:forEach>
- </tbody>
+ <h:dataTable var="object" value="#{portalobjectmgr.selectedObject.windows}"
+ rowClasses="portlet-section-body,portlet-section-alternate" headerClass="portlet-section-header">
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="Window"/>
+ </f:facet>
+ <h:commandLink action="#{portalobjectmgr.selectObject}">
+ <h:outputText value="#{object.name}"/>
+ <f:param name="id" value="#{object.id}"/>
+ </h:commandLink>
+ </h:column>
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="Actions"/>
+ </f:facet>
+ <h:commandLink action="editWindowTheme" actionListener="#{portalobjectmgr.selectObject}">
+ <h:outputText value="Theme"/>
+ <f:param name="id" value="#{object.id}"/>
+ </h:commandLink> | <h:commandLink action="editProperties"
+ actionListener="#{portalobjectmgr.selectObject}">
+ <h:outputText value="Properties"/>
+ <f:param name="id" value="#{object.id}"/>
+ </h:commandLink> | <h:commandLink action="renameObject" actionListener="#{portalobjectmgr.selectObject}">
+ <h:outputText value="Rename"/>
+ <f:param name="id" value="#{object.id}"/>
+ </h:commandLink> | <h:commandLink action="confirm" actionListener="#{portalobjectmgr.selectObject}">
+ <h:outputText value="Delete"/>
+ <f:param name="id" value="#{object.id}"/>
+ </h:commandLink>
+ </h:column>
+ </h:dataTable>
</c:if>
-
-</table>
-
</h:form>
</div>
16 years, 9 months
JBoss Portal SVN: r8073 - trunk/testsuite.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2007-08-28 16:53:19 -0400 (Tue, 28 Aug 2007)
New Revision: 8073
Modified:
trunk/testsuite/build.xml
Log:
disable identity tests in trunk
Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml 2007-08-28 20:37:09 UTC (rev 8072)
+++ trunk/testsuite/build.xml 2007-08-28 20:53:19 UTC (rev 8073)
@@ -133,9 +133,9 @@
<antcall target="internal-test-module">
<param name="module" value="security"/>
</antcall>
- <antcall target="internal-test-module">
+ <!--<antcall target="internal-test-module">
<param name="module" value="identity"/>
- </antcall>
+ </antcall>-->
<antcall target="internal-test-module">
<param name="module" value="server"/>
</antcall>
@@ -231,4 +231,4 @@
e.g. ant -Dmodule=portlet test-module"/>
</target>
-</project>
\ No newline at end of file
+</project>
16 years, 9 months
JBoss Portal SVN: r8072 - modules/identity/trunk/build.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-08-28 16:37:09 -0400 (Tue, 28 Aug 2007)
New Revision: 8072
Removed:
modules/identity/trunk/build/local.properties
Log:
removing commited local.properties
Deleted: modules/identity/trunk/build/local.properties
===================================================================
--- modules/identity/trunk/build/local.properties 2007-08-28 17:50:11 UTC (rev 8071)
+++ modules/identity/trunk/build/local.properties 2007-08-28 20:37:09 UTC (rev 8072)
@@ -1,48 +0,0 @@
-### ====================================================================== ###
-## ##
-## Local project properties. ##
-## ##
-## Define properties that are local to your environment here. This ##
-## file (local.properties) should not be checked in. Modify the ##
-## example to affect all users. ##
-## ##
-### ====================================================================== ###
-
-### General compiler configuration ###
-
-#build.compiler=jikes
-#build.warnings=true
-#build.pedantic=true
-#javac.depend=on
-
-### Javac/Jikes compiler configuration ###
-
-javac.optimize=off
-javac.debug=on
-javac.deprecation=on
-
-### Enable verbose build output ###
-
-#init.verbose=true
-
-### JavaDoc ###
-#docs-javadocs.disable=true
-
-### Do we build xdoclet or get it from thirdparty ###
-### uncomment for thirdparty: comment to use xdoclet module.
-### To use xdoclet module also uncomment the xdoclet line in groups in build/build.xml
-#xdoclet.xdoclet.root=${project.root}/thirdparty/xdoclet
-
-# Portal database, for now : hsqldb, mysql, postgresql are the possible values
-portal.database=mysql
-# The datasource name used in the JNDI binding
-portal.datasource.name=PortalDS
-# Context root for the portal main servlet
-portal.web.context-root=/portal
-# JBoss server/<xxx> directory for JBoss Portal, ie: $JBOSS_HOME/server/default
-portal.deploy.dir=default/deploy
-portal-ha.deploy.dir=all/deploy
-# Show SQL or not
-portal.sql.show=false
-# Uncomment if you want to use a specific JBoss home path otherwise the build will use the JBOSS_HOME env variable
-#jboss.home=
16 years, 9 months