JBoss Portal SVN: r10975 - in branches/JBoss_Portal_Branch_2_7: core-samples/src/main/org/jboss/portal/core/samples/basic and 2 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-06-10 17:19:03 -0400 (Tue, 10 Jun 2008)
New Revision: 10975
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java
branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/basic/FSContentDrivenPortlet.java
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/portlet.xml
branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/component/portlet/JSFInvocation.java
branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/component/portlet/PortletHandler.java
branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/component/portlet/UIPortlet.java
Log:
- Fixing the CF/UIPortlet
- Still need to let pass parameters as Event payload
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java 2008-06-10 18:28:58 UTC (rev 10974)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java 2008-06-10 21:19:03 UTC (rev 10975)
@@ -399,7 +399,11 @@
Map renderParams = renderEvent.getParameterMap();
// Keep window name and region defined
- setWindowName(((String[])renderParams.get("windowName"))[0]);
+ String[] windowNames = ((String[])renderParams.get("windowName"));
+ if (windowNames != null && windowNames.length > 0)
+ {
+ setWindowName(windowNames[0]);
+ }
}
else if (event instanceof PortletEventEvent)
{
Modified: branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/basic/FSContentDrivenPortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/basic/FSContentDrivenPortlet.java 2008-06-10 18:28:58 UTC (rev 10974)
+++ branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/basic/FSContentDrivenPortlet.java 2008-06-10 21:19:03 UTC (rev 10975)
@@ -31,6 +31,8 @@
import javax.portlet.PortletURL;
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
+import javax.xml.namespace.QName;
+
import java.io.File;
import java.io.FileFilter;
import java.io.FileInputStream;
@@ -55,7 +57,10 @@
/** The edit_content mode. */
public static final PortletMode EDIT_CONTENT_MODE = new PortletMode("edit_content");
+
+ private static final QName CONTENT_SELECT = new QName("urn:jboss:portal:content", "select");
+
/** Additional dispatch that will call the <code>doEditContent(RenderRequest,RenderResponse)</code> method. */
protected void doDispatch(RenderRequest req, RenderResponse resp) throws PortletException, PortletSecurityException, IOException
{
@@ -72,6 +77,9 @@
/** Implements the edit content functionnality. */
protected void doEditContent(RenderRequest req, RenderResponse resp) throws PortletException, PortletSecurityException, IOException
{
+
+ System.out.println("Render: " + req.getParameter("current_dir"));
+
// Get the uri value optionally provided by the portal
String uri = req.getParameter("content.uri");
@@ -190,6 +198,9 @@
public void processAction(ActionRequest req, ActionResponse resp) throws PortletException, PortletSecurityException, IOException
{
+
+ System.out.println("Action: " + req.getParameter("content.uri"));
+
if (EDIT_CONTENT_MODE.equals(req.getPortletMode()))
{
String contentURI = req.getParameter("content.uri");
@@ -198,6 +209,7 @@
if (contentURI != null)
{
resp.setRenderParameter("content.uri", contentURI);
+ resp.setEvent(CONTENT_SELECT, contentURI);
}
}
}
Modified: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/portlet.xml 2008-06-10 18:28:58 UTC (rev 10974)
+++ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/portlet.xml 2008-06-10 21:19:03 UTC (rev 10975)
@@ -329,6 +329,7 @@
<keywords>sample,test</keywords>
</portlet-info>
<supported-public-render-parameter>uri</supported-public-render-parameter>
+ <supported-publishing-event xmlns:x="urn:jboss:portal:content">x:select</supported-publishing-event>
</portlet>
<portlet>
<description>File Upload Portlet</description>
@@ -437,6 +438,11 @@
<qname xmlns:c="urn:jboss:portal:content">c:uri</qname>
</public-render-parameter>
+ <event-definition>
+ <qname xmlns:x="urn:jboss:portal:content">x:select</qname>
+ <value-type>java.lang.String</value-type>
+ </event-definition>
+
<!--
<custom-portlet-mode>
<name>ADMIN</name>
Modified: branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/component/portlet/JSFInvocation.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/component/portlet/JSFInvocation.java 2008-06-10 18:28:58 UTC (rev 10974)
+++ branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/component/portlet/JSFInvocation.java 2008-06-10 21:19:03 UTC (rev 10975)
@@ -22,6 +22,14 @@
******************************************************************************/
package org.jboss.portal.faces.component.portlet;
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.faces.application.ViewHandler;
+import javax.faces.context.FacesContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
import org.jboss.portal.Mode;
import org.jboss.portal.WindowState;
import org.jboss.portal.common.invocation.resolver.MapAttributeResolver;
@@ -36,7 +44,7 @@
import org.jboss.portal.portlet.Portlet;
import org.jboss.portal.portlet.PortletInvoker;
import org.jboss.portal.portlet.PortletInvokerException;
-import org.jboss.portal.portlet.PortletURL;
+import org.jboss.portal.portlet.RenderURL;
import org.jboss.portal.portlet.StateString;
import org.jboss.portal.portlet.URLFormat;
import org.jboss.portal.portlet.bridge.JBossServletContextProvider;
@@ -55,12 +63,6 @@
import org.jboss.portal.portlet.spi.UserContext;
import org.jboss.portal.portlet.spi.WindowContext;
-import javax.faces.application.ViewHandler;
-import javax.faces.context.FacesContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.Map;
-
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision$
@@ -119,37 +121,48 @@
String renderURL(ContainerURL containerURL, Boolean wantSecure, Boolean wantAuthenticated, boolean relative)
{
+
ViewHandler vh = faces.getApplication().getViewHandler();
String viewId = faces.getViewRoot().getViewId();
String clientId = uiportlet.getClientId(faces);
+
String actionURL = vh.getActionURL(faces, viewId);
actionURL = faces.getExternalContext().encodeActionURL(actionURL);
StringBuffer url = new StringBuffer(actionURL);
+
//
url.append("&").append(clientId).append("=jbp");
- PortletURL portletURL = (PortletURL)containerURL;
+ PortletRequestEncoder encoder = new PortletRequestEncoder();
- if (portletURL instanceof ActionURL)
+ if (containerURL instanceof ActionURL)
{
- ActionURL actionPortletURL = (ActionURL)portletURL;
-
- //
- PortletRequestEncoder encoder = new PortletRequestEncoder();
- encoder.encodeRender(actionPortletURL.getInteractionState(), portletURL.getMode(), portletURL.getWindowState());
- for (Map.Entry entry : encoder.getQueryParameters().entrySet())
+ ActionURL actionURL2 = (ActionURL)containerURL;
+ encoder.encodeAction(null, actionURL2.getInteractionState(), actionURL2.getMode(), actionURL2.getWindowState());
+ }
+ else if (containerURL instanceof RenderURL)
+ {
+ RenderURL renderURL = (RenderURL)containerURL;
+ encoder.encodeRender(renderURL.getNavigationalState(), renderURL.getMode(), renderURL.getWindowState());
+ }
+
+ for (Iterator i = encoder.getQueryParameters().entrySet().iterator(); i.hasNext();)
+ {
+ Map.Entry entry = (Map.Entry)i.next();
+ String name = FastURLEncoder.getUTF8Instance().encode((String)entry.getKey());
+ String[] values = (String[])entry.getValue();
+ for (int j = 0; j < values.length; j++)
{
- String name = FastURLEncoder.getUTF8Instance().encode((String)entry.getKey());
- String[] values = (String[])entry.getValue();
- for (String value : values)
- {
- url.append("&").append(name).append('=');
- FastURLEncoder.getUTF8Instance().encode(value, url);
- }
+ String value = values[j];
+ url.append("&").append(name).append('=');
+ FastURLEncoder.getUTF8Instance().encode(value, url);
}
}
-
+
+ // Hack for JSF postBack :-/ Not sure why it's needed though
+ url.append("&").append("javax.faces.ViewState").append("=").append(faces.getExternalContext().getRequestParameterMap().get("javax.faces.ViewState"));
+
//
return url.toString();
}
Modified: branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/component/portlet/PortletHandler.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/component/portlet/PortletHandler.java 2008-06-10 18:28:58 UTC (rev 10974)
+++ branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/component/portlet/PortletHandler.java 2008-06-10 21:19:03 UTC (rev 10975)
@@ -95,6 +95,18 @@
};
}
}
+ if ("onClick".equals(name))
+ {
+ final String s = attribute.getValue();
+ return new Metadata()
+ {
+ public void applyMetadata(FaceletContext ctx, Object instance)
+ {
+ UIPortlet portlet = (UIPortlet)instance;
+ portlet.setOnClick(s);
+ }
+ };
+ }
return null;
}
});
Modified: branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/component/portlet/UIPortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/component/portlet/UIPortlet.java 2008-06-10 18:28:58 UTC (rev 10974)
+++ branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/component/portlet/UIPortlet.java 2008-06-10 21:19:03 UTC (rev 10975)
@@ -360,11 +360,13 @@
return null;
}
+ @Override
public String getFamily()
{
return "org.jboss.portal.core.Portlet";
}
+ @Override
public void broadcast(FacesEvent event) throws AbortProcessingException
{
if (event instanceof PortletEvent)
@@ -402,6 +404,7 @@
}
}
+ @Override
public Object saveState(FacesContext faces)
{
String opaqueValue = null;
@@ -426,6 +429,7 @@
return values;
}
+ @Override
public void restoreState(FacesContext faces, Object state)
{
Object values[] = (Object[])state;
@@ -445,6 +449,7 @@
onClick = (String)values[10];
}
+ @Override
public void decode(FacesContext faces)
{
String clientId = getClientId(faces);
@@ -471,25 +476,31 @@
}
}
+ faces.getExternalContext().getRequest();
+
// Decode the request
PortletRequestDecoder decoder = new PortletRequestDecoder();
+
decoder.decode(portletParams, null);
Mode mode = decoder.getMode();
WindowState windowState = decoder.getWindowState();
- Object request = externalContext.getRequest();
- if (request instanceof RenderRequest)
+ switch (decoder.getType())
{
- PortletRenderEvent prevent = new PortletRenderEvent(
+ case PortletRequestDecoder.RENDER_TYPE:
+
+ PortletRenderEvent prevent = new PortletRenderEvent(
this,
((ParametersStateString)decoder.getNavigationalState()).getParameters(),
mode,
windowState);
prevent.setPhaseId(PhaseId.INVOKE_APPLICATION);
queueEvent(prevent);
- }
- else if (request instanceof ActionRequest)
- {
+
+ break;
+ case PortletRequestDecoder.ACTION_TYPE:
+
+
if (mode == null)
{
mode = getInternalMode();
@@ -500,19 +511,17 @@
}
PortletActionEvent paevent = new PortletActionEvent(
this,
- ParameterMap.clone(((ActionRequest)request).getParameterMap()),
+ ((ParametersStateString)decoder.getInteractionState()).getParameters(),
mode,
windowState);
paevent.setPhaseId(PhaseId.INVOKE_APPLICATION);
queueEvent(paevent);
+ break;
}
- else if (request instanceof EventRequest)
- {
- throw new NotYetImplemented();
- }
}
}
+ @Override
public void encodeBegin(FacesContext faces) throws IOException
{
Portlet portlet = getPortlet();
@@ -642,14 +651,19 @@
}
}
+ @Override
public void encodeChildren(FacesContext facesContext) throws IOException
{
+ System.out.println("encodeChildren");
}
+ @Override
public void encodeEnd(FacesContext facesContext) throws IOException
{
+ System.out.println("encodeEnd");
}
+ @Override
public String getRendererType()
{
// Returns null as we handle rendering ourselves
17 years, 11 months
- 1
- 0
JBoss Portal SVN: r10974 - branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-06-10 14:28:58 -0400 (Tue, 10 Jun 2008)
New Revision: 10974
Modified:
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource.properties
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource_fr.properties
Log:
- Fixed typo.
Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource.properties 2008-06-10 18:05:17 UTC (rev 10973)
+++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource.properties 2008-06-10 18:28:58 UTC (rev 10974)
@@ -109,7 +109,7 @@
confirm_delete_reg_property_message = You are about to delete the ''{0}'' registration property description! \n\
This will trigger invalidation of consumer registrations which will have to modify their registration \n\
information.
-confirm_detete_reg_property_proceed = Are you sure you want to proceed?
+confirm_delete_reg_property_proceed = Are you sure you want to proceed?
confirm_delete_reg_property_submit = Delete property
confirm_delete_reg_property_cancel = Cancel
Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource_fr.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource_fr.properties 2008-06-10 18:05:17 UTC (rev 10973)
+++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource_fr.properties 2008-06-10 18:28:58 UTC (rev 10974)
@@ -109,7 +109,7 @@
leur information d'enregistrement.
confirm_delete_reg_property_submit=Effacer la propri\u00e9t\u00e9
confirm_delete_reg_property_title=Voulez-vous r\u00e9ellement effacer la description de la propri\u00e9t\u00e9 d'enregistrement ''{0}''?
-confirm_detete_reg_property_proceed=\u00cates-vous certains de vouloir proc\u00e9der?
+confirm_delete_reg_property_proceed=\u00cates-vous certains de vouloir proc\u00e9der?
producer_config_add_reg_prop=Ajouter une propri\u00e9t\u00e9
producer_config_cancel=Annuler
producer_config_no_reg_props=Aucune propri\u00e9t\u00e9 d'enregistrement sp\u00e9cifi\u00e9e.
17 years, 11 months
- 1
- 0
JBoss Portal SVN: r10973 - branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-06-10 14:05:17 -0400 (Tue, 10 Jun 2008)
New Revision: 10973
Modified:
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource.properties
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource_fr.properties
Log:
- Fixed typo.
Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource.properties 2008-06-10 15:50:48 UTC (rev 10972)
+++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource.properties 2008-06-10 18:05:17 UTC (rev 10973)
@@ -109,7 +109,7 @@
confirm_delete_reg_property_message = You are about to delete the ''{0}'' registration property description! \n\
This will trigger invalidation of consumer registrations which will have to modify their registration \n\
information.
-confirm_detete_reg_property_proceed = Are you sure you want to proceed?
+confirm_delete_reg_property_proceed = Are you sure you want to proceed?
confirm_delete_reg_property_submit = Delete property
confirm_delete_reg_property_cancel = Cancel
Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource_fr.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource_fr.properties 2008-06-10 15:50:48 UTC (rev 10972)
+++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource_fr.properties 2008-06-10 18:05:17 UTC (rev 10973)
@@ -109,7 +109,7 @@
leur information d'enregistrement.
confirm_delete_reg_property_submit=Effacer la propri\u00e9t\u00e9
confirm_delete_reg_property_title=Voulez-vous r\u00e9ellement effacer la description de la propri\u00e9t\u00e9 d'enregistrement ''{0}''?
-confirm_detete_reg_property_proceed=\u00cates-vous certains de vouloir proc\u00e9der?
+confirm_delete_reg_property_proceed=\u00cates-vous certains de vouloir proc\u00e9der?
producer_config_add_reg_prop=Ajouter une propri\u00e9t\u00e9
producer_config_cancel=Annuler
producer_config_no_reg_props=Aucune propri\u00e9t\u00e9 d'enregistrement sp\u00e9cifi\u00e9e.
17 years, 11 months
- 1
- 0
JBoss Portal SVN: r10972 - in branches/JBoss_Portal_Branch_2_7: core/src/bin/portal-core-war/themes and 11 other directories.
by portal-commits＠lists.jboss.org
Author: wesleyhales
Date: 2008-06-10 11:50:48 -0400 (Tue, 10 Jun 2008)
New Revision: 10972
Added:
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/
branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/renewal/
Removed:
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/
Modified:
branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml
branches/JBoss_Portal_Branch_2_7/core-identity/build.xml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jboss-portlet.xml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/web.xml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/assignRoles.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/editProfile.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/index.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles/createRole.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles/deleteRole.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles/editRole.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles/roleMembers.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles/roleTemplate.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/changePassword.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/confirmPendingAction.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/createUser.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/deleteUser.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/pendingUsers.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/registerConfirm.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/registerRoles.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/resetPassword.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/searchUsers.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/userTemplate.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/common/profile.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/common/register.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/index.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/lostPassword/lost.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/lostPassword/lostTemplate.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/lostPassword/status.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/profile/changeEmail.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/profile/changePassword.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/profile/editProfile.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/profile/editProfileRedirect.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/profile/editProfileTemplate.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/profile/status.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/profile/viewProfile.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/profile/viewProfileTemplate.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/register/confirm.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/register/overview.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/register/register.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/register/registerTemplate.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/register/success.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/startTemplate.xhtml
Log:
migrate core-identity to portletbridge, upgraded facelets which fixes ArrayIndexOutOfBoundsException
Modified: branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml 2008-06-10 13:49:38 UTC (rev 10971)
+++ branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml 2008-06-10 15:50:48 UTC (rev 10972)
@@ -76,7 +76,7 @@
<componentref name="dom4j" version="1.6.1jboss"/>
<componentref name="ehcache" version="1.2.2"/>
<componentref name="el" version="1.0"/>
- <componentref name="facelets" version="1.1.14"/>
+ <componentref name="facelets" version="1.1.15-B1"/>
<componentref name="richfaces" version="3.2.1.GA"/>
<componentref name="jboss/portlet-bridge" version="1.0.0.B2"/>
<componentref name="hibernate" version="3.2.0.CR2"/>
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/build.xml 2008-06-10 13:49:38 UTC (rev 10971)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/build.xml 2008-06-10 15:50:48 UTC (rev 10972)
@@ -100,16 +100,18 @@
<path refid="freemarker.freemarker.classpath"/>
<path refid="jbossas/core.libs.classpath"/>
<path refid="hibernate.hibernate.classpath"/>
- <path refid="apache.myfaces.classpath"/>
<path refid="apache.log4j.classpath"/>
<path refid="sun.servlet.classpath"/>
- <path refid="facelets.facelets.classpath"/>
<path refid="jcaptcha.jcaptcha.classpath"/>
+ <path refid="jakarta.cactus.classpath"/>
+ <path refid="junit.junit.classpath"/>
+ <path refid="jbpm.jaronly.classpath"/>
+ <path refid="sun.jsf.classpath"/>
<path refid="el.el.classpath"/>
- <path refid="jakarta.cactus.classpath"/>
- <path refid="junit.junit.classpath"/>
- <path refid="jbpm.jaronly.classpath"/>
- <path refid="portlet.portlet.classpath"/>
+ <path refid="richfaces.richfaces.classpath"/>
+ <path refid="facelets.facelets.classpath"/>
+ <path refid="portlet.portlet.classpath"/>
+ <path refid="jboss/portlet.bridge.classpath"/>
</path>
<!-- Configure modules -->
@@ -203,15 +205,17 @@
</jar>
<!-- portal-identity.war -->
- <copy todir="${build.resources}/portal-identity-war/WEB-INF/lib2">
- <fileset dir="${apache.myfaces.lib}" includes="myfaces-api.jar,myfaces-impl.jar,jstl.jar"/>
+ <copy todir="${build.resources}/portal-identity-war/WEB-INF/lib">
<fileset dir="${build.lib}" includes="portal-core-identity-ui-lib.jar"/>
- <fileset dir="${jboss.portal-faces.root}/lib" includes="portal-faces-lib.jar"/>
- <fileset dir="src/etc/sun-jsf" includes="jsf-example.jar"/>
- <fileset dir="${facelets.facelets.lib}" includes="jsf-facelets.jar"/>
- <fileset dir="${el.el.lib}" includes="el-api.jar,el-ri.jar"/>
- <fileset dir="${commons.el.lib}" includes="commons-el.jar"/>
- <fileset dir="${apache.beanutils.lib}" includes="commons-beanutils.jar"/>
+ <fileset dir="${apache.myfaces.lib}" includes="jstl.jar"/>
+ <fileset dir="${facelets.facelets.lib}" includes="jsf-facelets.jar"/>
+ <fileset dir="${jboss/portlet.bridge.lib}" includes="portletbridge-api.jar"/>
+ <fileset dir="${jboss/portlet.bridge.lib}" includes="portletbridge-impl.jar"/>
+ <fileset dir="${richfaces.richfaces.lib}" includes="richfaces-api.jar"/>
+ <fileset dir="${richfaces.richfaces.lib}" includes="richfaces-impl.jar"/>
+ <fileset dir="${richfaces.richfaces.lib}" includes="richfaces-ui.jar"/>
+ <fileset dir="${jboss.portal-faces.root}/lib" includes="portal-faces-lib.jar"/>
+ <fileset dir="${apache.beanutils.lib}" includes="commons-beanutils.jar"/>
<fileset dir="${apache.lang.lib}" includes="commons-lang.jar"/>
<fileset dir="${apache.digester.lib}" includes="commons-digester.jar"/>
</copy>
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml 2008-06-10 13:49:38 UTC (rev 10971)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml 2008-06-10 15:50:48 UTC (rev 10972)
@@ -27,12 +27,21 @@
"http://java.sun.com/dtd/web-facesconfig_1_0.dtd">
<faces-config>
- <application>
- <variable-resolver>org.jboss.portal.core.identity.ui.faces.PortletVariableResolver</variable-resolver>
+
+ <application>
+ <variable-resolver>org.jboss.portal.core.identity.ui.faces.PortletVariableResolver</variable-resolver>
<property-resolver>org.jboss.portal.core.identity.ui.faces.PortletDelegatingPropertyResolver</property-resolver>
- <view-handler>com.sun.facelets.FaceletPortletViewHandler</view-handler>
- </application>
+ <view-handler>
+ org.jboss.portletbridge.application.PortletViewHandler
+ </view-handler>
+ </application>
+ <factory>
+ <faces-context-factory>
+ org.jboss.portletbridge.context.FacesContextFactoryImpl
+ </faces-context-factory>
+ </factory>
+
<managed-bean>
<managed-bean-name>configurationbean</managed-bean-name>
<managed-bean-class>org.jboss.portal.core.identity.ui.common.ConfigurationBean</managed-bean-class>
@@ -215,271 +224,271 @@
<navigation-rule>
<navigation-case>
<from-outcome>start</from-outcome>
- <to-view-id>/WEB-INF/jsf/index.xhtml</to-view-id>
+ <to-view-id>/jsf/index.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
<navigation-case>
<from-outcome>lostPassword</from-outcome>
- <to-view-id>/WEB-INF/jsf/lostPassword/lost.xhtml</to-view-id>
+ <to-view-id>/jsf/lostPassword/lost.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
- <from-view-id>/WEB-INF/jsf/lostPassword/lost.xhtml</from-view-id>
+ <from-view-id>/jsf/lostPassword/lost.xhtml</from-view-id>
<navigation-case>
<from-outcome>status</from-outcome>
- <to-view-id>/WEB-INF/jsf/lostPassword/status.xhtml</to-view-id>
+ <to-view-id>/jsf/lostPassword/status.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
<navigation-case>
<from-outcome>register</from-outcome>
- <to-view-id>/WEB-INF/jsf/register/register.xhtml</to-view-id>
+ <to-view-id>/jsf/register/register.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
- <from-view-id>/WEB-INF/jsf/register/register.xhtml</from-view-id>
+ <from-view-id>/jsf/register/register.xhtml</from-view-id>
<navigation-case>
<from-outcome>register</from-outcome>
- <to-view-id>/WEB-INF/jsf/register/confirm.xhtml</to-view-id>
+ <to-view-id>/jsf/register/confirm.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
- <from-view-id>/WEB-INF/jsf/register/confirm.xhtml</from-view-id>
+ <from-view-id>/jsf/register/confirm.xhtml</from-view-id>
<navigation-case>
<from-outcome>revise</from-outcome>
- <to-view-id>/WEB-INF/jsf/register/register.xhtml</to-view-id>
+ <to-view-id>/jsf/register/register.xhtml</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>registered</from-outcome>
- <to-view-id>/WEB-INF/jsf/register/success.xhtml</to-view-id>
+ <to-view-id>/jsf/register/success.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
<navigation-case>
<from-outcome>changePassword</from-outcome>
- <to-view-id>/WEB-INF/jsf/profile/changePassword.xhtml</to-view-id>
+ <to-view-id>/jsf/profile/changePassword.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
- <from-view-id>/WEB-INF/jsf/profile/changePassword.xhtml</from-view-id>
+ <from-view-id>/jsf/profile/changePassword.xhtml</from-view-id>
<navigation-case>
<from-outcome>status</from-outcome>
- <to-view-id>/WEB-INF/jsf/profile/viewProfile.xhtml</to-view-id>
+ <to-view-id>/jsf/profile/viewProfile.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
<navigation-case>
<from-outcome>changeEmail</from-outcome>
- <to-view-id>/WEB-INF/jsf/profile/changeEmail.xhtml</to-view-id>
+ <to-view-id>/jsf/profile/changeEmail.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
- <from-view-id>/WEB-INF/jsf/profile/changeEmail.xhtml</from-view-id>
+ <from-view-id>/jsf/profile/changeEmail.xhtml</from-view-id>
<navigation-case>
<from-outcome>status</from-outcome>
- <to-view-id>/WEB-INF/jsf/profile/viewProfile.xhtml</to-view-id>
+ <to-view-id>/jsf/profile/viewProfile.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
- <from-view-id>/WEB-INF/jsf/index.xhtml</from-view-id>
+ <from-view-id>/jsf/index.xhtml</from-view-id>
<navigation-case>
<from-outcome>editProfile</from-outcome>
- <to-view-id>/WEB-INF/jsf/profile/editProfileRedirect.xhtml</to-view-id>
+ <to-view-id>/jsf/profile/editProfileRedirect.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
- <from-view-id>/WEB-INF/jsf/profile/*</from-view-id>
+ <from-view-id>/jsf/profile/*</from-view-id>
<navigation-case>
<from-outcome>editProfile</from-outcome>
- <to-view-id>/WEB-INF/jsf/profile/editProfileRedirect.xhtml</to-view-id>
+ <to-view-id>/jsf/profile/editProfileRedirect.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
- <from-view-id>/WEB-INF/jsf/admin/*</from-view-id>
+ <from-view-id>/jsf/admin/*</from-view-id>
<navigation-case>
<from-outcome>userAdmin</from-outcome>
- <to-view-id>/WEB-INF/jsf/admin/index.xhtml</to-view-id>
+ <to-view-id>/jsf/admin/index.xhtml</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>start</from-outcome>
- <to-view-id>/WEB-INF/jsf/admin/index.xhtml</to-view-id>
+ <to-view-id>/jsf/admin/index.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
- <from-view-id>/WEB-INF/jsf/admin/*</from-view-id>
+ <from-view-id>/jsf/admin/*</from-view-id>
<navigation-case>
<from-outcome>roleAdmin</from-outcome>
- <to-view-id>/WEB-INF/jsf/admin/roles.xhtml</to-view-id>
+ <to-view-id>/jsf/admin/roles.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
- <from-view-id>/WEB-INF/jsf/admin/index.xhtml</from-view-id>
+ <from-view-id>/jsf/admin/index.xhtml</from-view-id>
<navigation-case>
<from-outcome>createUser</from-outcome>
- <to-view-id>/WEB-INF/jsf/admin/user/createUser.xhtml</to-view-id>
+ <to-view-id>/jsf/admin/user/createUser.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
- <from-view-id>/WEB-INF/jsf/admin/*</from-view-id>
+ <from-view-id>/jsf/admin/*</from-view-id>
<navigation-case>
<from-outcome>searchUsers</from-outcome>
- <to-view-id>/WEB-INF/jsf/admin/user/searchUsers.xhtml</to-view-id>
+ <to-view-id>/jsf/admin/user/searchUsers.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
- <from-view-id>/WEB-INF/jsf/admin/index.xhtml</from-view-id>
+ <from-view-id>/jsf/admin/index.xhtml</from-view-id>
<navigation-case>
<from-outcome>showPendingUsers</from-outcome>
- <to-view-id>/WEB-INF/jsf/admin/user/pendingUsers.xhtml</to-view-id>
+ <to-view-id>/jsf/admin/user/pendingUsers.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
- <from-view-id>/WEB-INF/jsf/admin/user/pendingUsers.xhtml</from-view-id>
+ <from-view-id>/jsf/admin/user/pendingUsers.xhtml</from-view-id>
<navigation-case>
<from-outcome>confirmPendingAction</from-outcome>
- <to-view-id>/WEB-INF/jsf/admin/user/confirmPendingAction.xhtml</to-view-id>
+ <to-view-id>/jsf/admin/user/confirmPendingAction.xhtml</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>cancel</from-outcome>
- <to-view-id>/WEB-INF/jsf/admin/index.xthml</to-view-id>
+ <to-view-id>/jsf/admin/index.xthml</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
- <from-view-id>/WEB-INF/jsf/admin/user/confirmPendingAction.xhtml</from-view-id>
+ <from-view-id>/jsf/admin/user/confirmPendingAction.xhtml</from-view-id>
<navigation-case>
<from-outcome>revise</from-outcome>
- <to-view-id>/WEB-INF/jsf/admin/user/pendingUsers.xhtml</to-view-id>
+ <to-view-id>/jsf/admin/user/pendingUsers.xhtml</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>success</from-outcome>
- <to-view-id>/WEB-INF/jsf/admin/index.xthml</to-view-id>
+ <to-view-id>/jsf/admin/index.xthml</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
- <from-view-id>/WEB-INF/jsf/admin/user/searchUsers.xhtml</from-view-id>
+ <from-view-id>/jsf/admin/user/searchUsers.xhtml</from-view-id>
<navigation-case>
<from-outcome>deleteUser</from-outcome>
- <to-view-id>/WEB-INF/jsf/admin/user/deleteUser.xhtml</to-view-id>
+ <to-view-id>/jsf/admin/user/deleteUser.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
- <from-view-id>/WEB-INF/jsf/admin/editProfile.xhtml</from-view-id>
+ <from-view-id>/jsf/admin/editProfile.xhtml</from-view-id>
<navigation-case>
<from-outcome>adminChangePassword</from-outcome>
- <to-view-id>/WEB-INF/jsf/admin/user/changePassword.xhtml</to-view-id>
+ <to-view-id>/jsf/admin/user/changePassword.xhtml</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>start</from-outcome>
- <to-view-id>/WEB-INF/jsf/admin/user/searchUsers.xhtml</to-view-id>
+ <to-view-id>/jsf/admin/user/searchUsers.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
- <from-view-id>/WEB-INF/jsf/admin/*</from-view-id>
+ <from-view-id>/jsf/admin/*</from-view-id>
<navigation-case>
<from-outcome>start</from-outcome>
- <to-view-id>/WEB-INF/jsf/admin/user/searchUsers.xhtml</to-view-id>
+ <to-view-id>/jsf/admin/user/searchUsers.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
- <from-view-id>/WEB-INF/jsf/admin/*</from-view-id>
+ <from-view-id>/jsf/admin/*</from-view-id>
<navigation-case>
<from-action>#{editprofilemgr.adminEditProfile}</from-action>
<from-outcome>editProfile</from-outcome>
- <to-view-id>/WEB-INF/jsf/admin/editProfile.xhtml</to-view-id>
+ <to-view-id>/jsf/admin/editProfile.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
- <from-view-id>/WEB-INF/jsf/admin/*</from-view-id>
+ <from-view-id>/jsf/admin/*</from-view-id>
<navigation-case>
<from-action>#{assignrolemgr.assignRoles}</from-action>
<from-outcome>assignRoles</from-outcome>
- <to-view-id>/WEB-INF/jsf/admin/assignRoles.xhtml</to-view-id>
+ <to-view-id>/jsf/admin/assignRoles.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
- <from-view-id>/WEB-INF/jsf/admin/user/createUser.xhtml</from-view-id>
+ <from-view-id>/jsf/admin/user/createUser.xhtml</from-view-id>
<navigation-case>
<from-outcome>register</from-outcome>
- <to-view-id>/WEB-INF/jsf/admin/user/registerRoles.xhtml</to-view-id>
+ <to-view-id>/jsf/admin/user/registerRoles.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
- <from-view-id>/WEB-INF/jsf/admin/user/registerRoles.xhtml</from-view-id>
+ <from-view-id>/jsf/admin/user/registerRoles.xhtml</from-view-id>
<navigation-case>
<from-outcome>register</from-outcome>
- <to-view-id>/WEB-INF/jsf/admin/user/registerConfirm.xhtml</to-view-id>
+ <to-view-id>/jsf/admin/user/registerConfirm.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
- <from-view-id>/WEB-INF/jsf/admin/user/registerConfirm.xhtml</from-view-id>
+ <from-view-id>/jsf/admin/user/registerConfirm.xhtml</from-view-id>
<navigation-case>
<from-outcome>revise</from-outcome>
- <to-view-id>/WEB-INF/jsf/admin/user/createUser.xhtml</to-view-id>
+ <to-view-id>/jsf/admin/user/createUser.xhtml</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>registered</from-outcome>
- <to-view-id>/WEB-INF/jsf/admin/index.xhtml</to-view-id>
+ <to-view-id>/jsf/admin/index.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
- <from-view-id>/WEB-INF/jsf/admin/roles.xhtml</from-view-id>
+ <from-view-id>/jsf/admin/roles.xhtml</from-view-id>
<navigation-case>
<from-outcome>createRole</from-outcome>
- <to-view-id>/WEB-INF/jsf/admin/roles/createRole.xhtml</to-view-id>
+ <to-view-id>/jsf/admin/roles/createRole.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
- <from-view-id>/WEB-INF/jsf/admin/roles.xhtml</from-view-id>
+ <from-view-id>/jsf/admin/roles.xhtml</from-view-id>
<navigation-case>
<from-outcome>editRole</from-outcome>
- <to-view-id>/WEB-INF/jsf/admin/roles/editRole.xhtml</to-view-id>
+ <to-view-id>/jsf/admin/roles/editRole.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
- <from-view-id>/WEB-INF/jsf/admin/roles.xhtml</from-view-id>
+ <from-view-id>/jsf/admin/roles.xhtml</from-view-id>
<navigation-case>
<from-outcome>viewMembers</from-outcome>
- <to-view-id>/WEB-INF/jsf/admin/roles/roleMembers.xhtml</to-view-id>
+ <to-view-id>/jsf/admin/roles/roleMembers.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
- <from-view-id>/WEB-INF/jsf/admin/roles.xhtml</from-view-id>
+ <from-view-id>/jsf/admin/roles.xhtml</from-view-id>
<navigation-case>
<from-outcome>deleteRole</from-outcome>
- <to-view-id>/WEB-INF/jsf/admin/roles/deleteRole.xhtml</to-view-id>
+ <to-view-id>/jsf/admin/roles/deleteRole.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
- <from-view-id>/WEB-INF/jsf/admin/editProfile.xhtml</from-view-id>
+ <from-view-id>/jsf/admin/editProfile.xhtml</from-view-id>
<navigation-case>
<from-outcome>resetPassword</from-outcome>
- <to-view-id>/WEB-INF/jsf/admin/user/resetPassword.xhtml</to-view-id>
+ <to-view-id>/jsf/admin/user/resetPassword.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
- <from-view-id>/WEB-INF/jsf/admin/user/resetPassword.xhtml</from-view-id>
+ <from-view-id>/jsf/admin/user/resetPassword.xhtml</from-view-id>
<navigation-case>
<from-action>#{lostpasswordmgr.doomed}</from-action>
<from-outcome>status</from-outcome>
- <to-view-id>/WEB-INF/jsf/admin/user/searchUsers.xhtml</to-view-id>
+ <to-view-id>/jsf/admin/user/searchUsers.xhtml</to-view-id>
</navigation-case>
<navigation-case>
<from-action>#{lostpasswordmgr.doomed}</from-action>
<from-outcome>lostPassword</from-outcome>
- <to-view-id>/WEB-INF/jsf/admin/editProfile.xhtml</to-view-id>
+ <to-view-id>/jsf/admin/editProfile.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
- <from-view-id>/WEB-INF/jsf/admin/user/changePassword.xhtml</from-view-id>
+ <from-view-id>/jsf/admin/user/changePassword.xhtml</from-view-id>
<navigation-case>
<from-outcome>status</from-outcome>
- <to-view-id>/WEB-INF/jsf/admin/user/searchUsers.xhtml</to-view-id>
+ <to-view-id>/jsf/admin/user/searchUsers.xhtml</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>searchUsers</from-outcome>
- <to-view-id>/WEB-INF/jsf/admin/user/searchUsers.xhtml</to-view-id>
+ <to-view-id>/jsf/admin/user/searchUsers.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jboss-portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jboss-portlet.xml 2008-06-10 13:49:38 UTC (rev 10971)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jboss-portlet.xml 2008-06-10 15:50:48 UTC (rev 10972)
@@ -35,6 +35,9 @@
<trans-attribute>Required</trans-attribute>
</transaction>
<header-content>
+ <script src="/faces/rfRes/org/ajax4jsf/framework.pack.js" type="text/javascript"></script>
+ <script src="/faces/rfRes/org/richfaces/ui.pack.js" type="text/javascript"></script>
+ <link rel="stylesheet" type="text/css" href="/faces/rfRes/org/richfaces/skin.xcss"/>
<link rel="stylesheet" type="text/css" href="/style.css" media="screen"/>
</header-content>
<portlet-info>
@@ -53,6 +56,9 @@
<trans-attribute>Required</trans-attribute>
</transaction>
<header-content>
+ <script src="/faces/rfRes/org/ajax4jsf/framework.pack.js" type="text/javascript"></script>
+ <script src="/faces/rfRes/org/richfaces/ui.pack.js" type="text/javascript"></script>
+ <link rel="stylesheet" type="text/css" href="/faces/rfRes/org/richfaces/skin.xcss"/>
<link rel="stylesheet" type="text/css" href="/style.css" media="screen"/>
</header-content>
<portlet-info>
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml 2008-06-10 13:49:38 UTC (rev 10971)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml 2008-06-10 15:50:48 UTC (rev 10972)
@@ -46,11 +46,15 @@
<description>Identity user portlet</description>
<portlet-name>IdentityUserPortlet</portlet-name>
<display-name>Identity user portlet</display-name>
- <portlet-class>org.jboss.portal.faces.loader.FacesPortlet</portlet-class>
+ <portlet-class>javax.portlet.faces.GenericFacesPortlet</portlet-class>
<init-param>
- <name>default-view</name>
- <value>/WEB-INF/jsf/index.xhtml</value>
+ <name>javax.portlet.faces.defaultViewId.view</name>
+ <value>/jsf/index.xhtml</value>
</init-param>
+ <init-param>
+ <name>javax.portlet.faces.preserveActionParams</name>
+ <value>true</value>
+ </init-param>
<supports>
<mime-type>text/html</mime-type>
<portlet-mode>VIEW</portlet-mode>
@@ -81,11 +85,16 @@
<description>Identity admin portlet</description>
<portlet-name>IdentityAdminPortlet</portlet-name>
<display-name>Identity admin portlet</display-name>
- <portlet-class>org.jboss.portal.faces.loader.FacesPortlet</portlet-class>
+ <portlet-class>javax.portlet.faces.GenericFacesPortlet</portlet-class>
<init-param>
- <name>default-view</name>
- <value>/WEB-INF/jsf/admin/index.xhtml</value>
+ <name>javax.portlet.faces.defaultViewId.view</name>
+ <value>/jsf/admin/index.xhtml</value>
</init-param>
+ <init-param>
+ <name>javax.portlet.faces.preserveActionParams</name>
+ <value>true</value>
+ </init-param>
+
<supports>
<mime-type>text/html</mime-type>
<portlet-mode>VIEW</portlet-mode>
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/web.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/web.xml 2008-06-10 13:49:38 UTC (rev 10971)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/web.xml 2008-06-10 15:50:48 UTC (rev 10972)
@@ -28,32 +28,45 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
- <!-- MyFaces specific configuration -->
<context-param>
- <param-name>org.apache.myfaces.ALLOW_JAVASCRIPT</param-name>
+ <param-name>org.ajax4jsf.VIEW_HANDLERS</param-name>
+ <param-value>org.jboss.portletbridge.application.FaceletPortletViewHandler</param-value>
+ </context-param>
+
+ <context-param>
+ <param-name>javax.portlet.faces.renderPolicy</param-name>
+ <param-value>ALWAYS_DELEGATE</param-value>
+ </context-param>
+
+ <context-param>
+ <param-name>javax.portlet.faces.preserveActionParams</param-name>
<param-value>true</param-value>
</context-param>
+
<context-param>
- <param-name>org.apache.myfaces.DETECT_JAVASCRIPT</param-name>
- <param-value>false</param-value>
+ <param-name>org.ajax4jsf.RESOURCE_URI_PREFIX</param-name>
+ <param-value>rfRes</param-value>
</context-param>
+
<context-param>
- <param-name>org.apache.myfaces.AUTO_SCROLL</param-name>
- <param-value>false</param-value>
+ <param-name>org.richfaces.LoadStyleStrategy</param-name>
+ <param-value>NONE</param-value>
</context-param>
+
<context-param>
- <param-name>org.apache.myfaces.CHECK_EXTENSIONS_FILTER</param-name>
- <param-value>false</param-value>
+ <param-name>org.richfaces.LoadScriptStrategy</param-name>
+ <param-value>NONE</param-value>
</context-param>
+
<context-param>
- <param-name>org.apache.myfaces.PRETTY_HTML</param-name>
- <param-value>true</param-value>
+ <param-name>org.ajax4jsf.COMPRESS_SCRIPT</param-name>
+ <param-value>false</param-value>
</context-param>
<!-- Facelet configuration -->
<context-param>
<param-name>facelets.DEVELOPMENT</param-name>
- <param-value>false</param-value>
+ <param-value>true</param-value>
</context-param>
<context-param>
<param-name>facelets.SKIP_COMMENTS</param-name>
@@ -74,12 +87,29 @@
<param-value>server</param-value>
</context-param>
- <!-- The JSF servlet -->
+ <filter>
+ <display-name>Ajax4jsf Filter</display-name>
+ <filter-name>ajax4jsf</filter-name>
+ <filter-class>org.ajax4jsf.Filter</filter-class>
+ </filter>
+ <filter-mapping>
+ <filter-name>ajax4jsf</filter-name>
+ <servlet-name>Faces Servlet</servlet-name>
+ <dispatcher>FORWARD</dispatcher>
+ <dispatcher>REQUEST</dispatcher>
+ <dispatcher>INCLUDE</dispatcher>
+ </filter-mapping>
+
<servlet>
- <servlet-name>Faces Servlet</servlet-name>
- <servlet-class>org.jboss.portal.faces.loader.FacesLoaderServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
+ <servlet-name>Faces Servlet</servlet-name>
+ <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
</servlet>
+
+ <servlet-mapping>
+ <servlet-name>Faces Servlet</servlet-name>
+ <url-pattern>/faces/*</url-pattern>
+ </servlet-mapping>
<!-- Captcha Servlet and Mapping -->
<servlet>
Copied: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf (from rev 10961, branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf)
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/assignRoles.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/assignRoles.xhtml 2008-06-09 12:40:39 UTC (rev 10961)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/assignRoles.xhtml 2008-06-10 15:50:48 UTC (rev 10972)
@@ -6,7 +6,7 @@
xmlns:c="http://java.sun.com/jstl/core"
class="identity-ui">
-<ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml">
+<ui:composition template="/jsf/admin/user/userTemplate.xhtml">
<ui:define name="title">
<li class="pathItem">
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/editProfile.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/editProfile.xhtml 2008-06-09 12:40:39 UTC (rev 10961)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/editProfile.xhtml 2008-06-10 15:50:48 UTC (rev 10972)
@@ -6,7 +6,7 @@
xmlns:c="http://java.sun.com/jstl/core"
class="identity-ui">
-<ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml">
+<ui:composition template="/jsf/admin/user/userTemplate.xhtml">
<ui:define name="title">
<li class="pathItem">
@@ -23,7 +23,7 @@
</ui:define>
<ui:define name="content">
- <ui:decorate template="/WEB-INF/jsf/common/profile.xhtml">
+ <ui:decorate template="/jsf/common/profile.xhtml">
<ui:param name="manager" value="#{editprofilemgr}"/>
<ui:param name="adminMode" value="true"/>
</ui:decorate>
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/index.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/index.xhtml 2008-06-09 12:40:39 UTC (rev 10961)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/index.xhtml 2008-06-10 15:50:48 UTC (rev 10972)
@@ -6,7 +6,7 @@
xmlns:c="http://java.sun.com/jstl/core"
class="identity-ui">
-<ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml">
+<ui:composition template="/jsf/admin/user/userTemplate.xhtml">
<ui:define name="title">
<li class="selected">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles/createRole.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/createRole.xhtml 2008-06-09 12:40:39 UTC (rev 10961)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles/createRole.xhtml 2008-06-10 15:50:48 UTC (rev 10972)
@@ -6,7 +6,7 @@
xmlns:c="http://java.sun.com/jstl/core"
class="identity-ui">
-<ui:composition template="/WEB-INF/jsf/admin/roles/roleTemplate.xhtml">
+<ui:composition template="/jsf/admin/roles/roleTemplate.xhtml">
<ui:define name="title">
<li class="pathItem">
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles/deleteRole.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/deleteRole.xhtml 2008-06-09 12:40:39 UTC (rev 10961)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles/deleteRole.xhtml 2008-06-10 15:50:48 UTC (rev 10972)
@@ -6,7 +6,7 @@
xmlns:c="http://java.sun.com/jstl/core"
class="identity-ui">
-<ui:composition template="/WEB-INF/jsf/admin/roles/roleTemplate.xhtml">
+<ui:composition template="/jsf/admin/roles/roleTemplate.xhtml">
<ui:define name="title">
@@ -43,7 +43,7 @@
</h:form>
</div>
</div>
-
+
</ui:define>
</ui:composition>
</div>
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles/editRole.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/editRole.xhtml 2008-06-09 12:40:39 UTC (rev 10961)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles/editRole.xhtml 2008-06-10 15:50:48 UTC (rev 10972)
@@ -6,7 +6,7 @@
xmlns:c="http://java.sun.com/jstl/core"
class="identity-ui">
-<ui:composition template="/WEB-INF/jsf/admin/roles/roleTemplate.xhtml">
+<ui:composition template="/jsf/admin/roles/roleTemplate.xhtml">
<ui:define name="title">
<li class="pathItem">
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles/roleMembers.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml 2008-06-09 12:40:39 UTC (rev 10961)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles/roleMembers.xhtml 2008-06-10 15:50:48 UTC (rev 10972)
@@ -6,7 +6,7 @@
xmlns:c="http://java.sun.com/jstl/core"
class="identity-ui">
-<ui:composition template="/WEB-INF/jsf/admin/roles/roleTemplate.xhtml">
+<ui:composition template="/jsf/admin/roles/roleTemplate.xhtml">
<ui:define name="title">
<li class="pathItem">
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles/roleTemplate.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleTemplate.xhtml 2008-06-09 12:40:39 UTC (rev 10961)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles/roleTemplate.xhtml 2008-06-10 15:50:48 UTC (rev 10972)
@@ -18,7 +18,7 @@
</ul>
</h:form>
-<ui:decorate template="/WEB-INF/jsf/common/tabContainer.xhtml">
+<ui:decorate template="/jsf/common/tabContainer.xhtml">
<ui:define name="tab-object-path"><!-- Title -->
<h:form>
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles.xhtml 2008-06-09 12:40:39 UTC (rev 10961)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles.xhtml 2008-06-10 15:50:48 UTC (rev 10972)
@@ -6,7 +6,7 @@
xmlns:c="http://java.sun.com/jstl/core"
class="identity-ui">
-<ui:composition template="/WEB-INF/jsf/admin/roles/roleTemplate.xhtml">
+<ui:composition template="/jsf/admin/roles/roleTemplate.xhtml">
<ui:define name="title">
<li class="selected">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" />
@@ -20,7 +20,8 @@
<br/>
<h:form>
- <h:dataTable id="userlist" value="#{rolemanagementbean.roleList}" var="role" rowClasses="portlet-section-body,portlet-section-alternate" headerClass="portlet-section-header" styleClass="datatable" width="100%">
+
+ <h:dataTable id="userlist" value="#{rolemanagementbean.roleList}" var="role" rowClasses="portlet-section-body,portlet-section-alternate" headerClass="portlet-section-header" styleClass="datatable" width="100%">
<h:column>
<f:facet name="header">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE}" />
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/changePassword.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/changePassword.xhtml 2008-06-09 12:40:39 UTC (rev 10961)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/changePassword.xhtml 2008-06-10 15:50:48 UTC (rev 10972)
@@ -6,7 +6,7 @@
xmlns:c="http://java.sun.com/jstl/core"
class="identity-ui">
-<ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml">
+<ui:composition template="/jsf/admin/user/userTemplate.xhtml">
<ui:define name="title">
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/confirmPendingAction.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/confirmPendingAction.xhtml 2008-06-09 12:40:39 UTC (rev 10961)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/confirmPendingAction.xhtml 2008-06-10 15:50:48 UTC (rev 10972)
@@ -6,7 +6,7 @@
xmlns:c="http://java.sun.com/jstl/core"
class="identity-ui">
-<ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml">
+<ui:composition template="/jsf/admin/user/userTemplate.xhtml">
<ui:define name="title">
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/createUser.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/createUser.xhtml 2008-06-09 12:40:39 UTC (rev 10961)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/createUser.xhtml 2008-06-10 15:50:48 UTC (rev 10972)
@@ -6,13 +6,13 @@
xmlns:c="http://java.sun.com/jstl/core"
class="identity-ui">
-<ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml">
+<ui:composition template="/jsf/admin/user/userTemplate.xhtml">
<ui:define name="title">
<li class="pathItem">
<h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
</li>
- <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
+ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt="I"/></li>
<li class="selected">
<h:outputText value="#{bundle.IDENTITY_REGISTER_TITLE}" />
</li>
@@ -20,7 +20,7 @@
<ui:define name="content">
<h3><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_CREATE_USER}" /></h3>
- <ui:decorate template="/WEB-INF/jsf/common/register.xhtml">
+ <ui:decorate template="/jsf/common/register.xhtml">
<ui:param name="manager" value="#{userregistermgr}"/>
</ui:decorate>
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/deleteUser.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/deleteUser.xhtml 2008-06-09 12:40:39 UTC (rev 10961)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/deleteUser.xhtml 2008-06-10 15:50:48 UTC (rev 10972)
@@ -6,7 +6,7 @@
xmlns:c="http://java.sun.com/jstl/core"
class="identity-ui">
-<ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml">
+<ui:composition template="/jsf/admin/user/userTemplate.xhtml">
<ui:define name="title">
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/pendingUsers.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/pendingUsers.xhtml 2008-06-09 12:40:39 UTC (rev 10961)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/pendingUsers.xhtml 2008-06-10 15:50:48 UTC (rev 10972)
@@ -6,7 +6,7 @@
xmlns:c="http://java.sun.com/jstl/core"
class="identity-ui">
-<ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml">
+<ui:composition template="/jsf/admin/user/userTemplate.xhtml">
<ui:define name="title">
<li class="pathItem">
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/registerConfirm.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerConfirm.xhtml 2008-06-09 12:40:39 UTC (rev 10961)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/registerConfirm.xhtml 2008-06-10 15:50:48 UTC (rev 10972)
@@ -6,7 +6,7 @@
xmlns:c="http://java.sun.com/jstl/core"
class="identity-ui">
-<ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml">
+<ui:composition template="/jsf/admin/user/userTemplate.xhtml">
<ui:define name="title">
@@ -20,7 +20,7 @@
</ui:define>
<ui:define name="content">
<h3><h:outputText value="#{bundle.IDENTITY_REGISTER_TITLE_CONFIRM}" /></h3>
- <ui:decorate template="/WEB-INF/jsf/common/confirm.xhtml">
+ <ui:decorate template="/jsf/common/confirm.xhtml">
<ui:param name="manager" value="#{userregistermgr}"/>
<ui:param name="show_roles" value="true"/>
<ui:param name="subscriptionMode" value="admin" />
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/registerRoles.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerRoles.xhtml 2008-06-09 12:40:39 UTC (rev 10961)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/registerRoles.xhtml 2008-06-10 15:50:48 UTC (rev 10972)
@@ -6,7 +6,7 @@
xmlns:c="http://java.sun.com/jstl/core"
class="identity-ui">
-<ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml">
+<ui:composition template="/jsf/admin/user/userTemplate.xhtml">
<ui:define name="title">
<li class="pathItem">
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/resetPassword.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/resetPassword.xhtml 2008-06-09 12:40:39 UTC (rev 10961)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/resetPassword.xhtml 2008-06-10 15:50:48 UTC (rev 10972)
@@ -6,7 +6,7 @@
xmlns:c="http://java.sun.com/jstl/core"
class="identity-ui">
-<ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml">
+<ui:composition template="/jsf/admin/user/userTemplate.xhtml">
<ui:define name="title">
<li class="pathItem">
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/searchUsers.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/searchUsers.xhtml 2008-06-09 12:40:39 UTC (rev 10961)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/searchUsers.xhtml 2008-06-10 15:50:48 UTC (rev 10972)
@@ -6,7 +6,7 @@
xmlns:c="http://java.sun.com/jstl/core"
class="identity-ui">
-<ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml">
+<ui:composition template="/jsf/admin/user/userTemplate.xhtml">
<ui:define name="title">
<li class="pathItem">
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/userTemplate.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/userTemplate.xhtml 2008-06-09 12:40:39 UTC (rev 10961)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/userTemplate.xhtml 2008-06-10 15:50:48 UTC (rev 10972)
@@ -19,7 +19,7 @@
</h:form>
-<ui:decorate template="/WEB-INF/jsf/common/tabContainer.xhtml">
+<ui:decorate template="/jsf/common/tabContainer.xhtml">
<ui:define name="tab-object-path">
<!-- Title -->
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/common/profile.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/profile.xhtml 2008-06-09 12:40:39 UTC (rev 10961)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/common/profile.xhtml 2008-06-10 15:50:48 UTC (rev 10972)
@@ -8,7 +8,7 @@
<h:form>
- <ui:include src="/WEB-INF/jsf/common/userInfo.xhtml" />
+ <ui:include src="/jsf/common/userInfo.xhtml" />
<!-- User Profile -->
<h:panelGrid columns="2" cellpadding="3">
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/common/register.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/register.xhtml 2008-06-09 12:40:39 UTC (rev 10961)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/common/register.xhtml 2008-06-10 15:50:48 UTC (rev 10972)
@@ -42,7 +42,7 @@
</h:panelGrid>
<!-- include captcha -->
- <ui:include src="/WEB-INF/jsf/common/captcha.xhtml" />
+ <ui:include src="/jsf/common/captcha.xhtml" />
<hr/>
<p style="text-align: left;">
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/index.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/index.xhtml 2008-06-09 12:40:39 UTC (rev 10961)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/index.xhtml 2008-06-10 15:50:48 UTC (rev 10972)
@@ -7,15 +7,15 @@
<c:choose>
<c:when test="#{portletRenderParameter.operation != null}">
- <ui:include src="/WEB-INF/jsf/validationStatus/jbp_status.xhtml" />
+ <ui:include src="/jsf/validationStatus/jbp_status.xhtml" />
</c:when>
<c:otherwise>
<c:choose>
<c:when test="#{facesContext.externalContext.remoteUser != null}">
- <ui:include src="/WEB-INF/jsf/profile/viewProfile.xhtml"/>
+ <ui:include src="/jsf/profile/viewProfile.xhtml"/>
</c:when>
<c:otherwise>
- <ui:include src="/WEB-INF/jsf/register/overview.xhtml"/>
+ <ui:include src="/jsf/register/overview.xhtml"/>
</c:otherwise>
</c:choose>
</c:otherwise>
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/lostPassword/lost.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lost.xhtml 2008-06-09 12:40:39 UTC (rev 10961)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/lostPassword/lost.xhtml 2008-06-10 15:50:48 UTC (rev 10972)
@@ -6,7 +6,7 @@
xmlns:c="http://java.sun.com/jstl/core"
class="identity-ui">
-<ui:composition template="/WEB-INF/jsf/lostPassword/lostTemplate.xhtml">
+<ui:composition template="/jsf/lostPassword/lostTemplate.xhtml">
<ui:define name="title">
<h:outputText value="#{bundle.IDENTITY_LOST_PASSWORD_TITLE}" />
@@ -22,7 +22,7 @@
</h:panelGrid>
<!-- include captcha -->
- <ui:include src="/WEB-INF/jsf/common/captcha.xhtml" />
+ <ui:include src="/jsf/common/captcha.xhtml" />
<hr/>
<p style="text-align: right;">
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/lostPassword/lostTemplate.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lostTemplate.xhtml 2008-06-09 12:40:39 UTC (rev 10961)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/lostPassword/lostTemplate.xhtml 2008-06-10 15:50:48 UTC (rev 10972)
@@ -22,7 +22,7 @@
</li>
</ul>
</h:form>
- <ui:decorate template="/WEB-INF/jsf/common/noTabContainer.xhtml">
+ <ui:decorate template="/jsf/common/noTabContainer.xhtml">
<ui:define name="tab-object-path"><!-- Title -->
<ul class="objectpath">
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/lostPassword/status.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/status.xhtml 2008-06-09 12:40:39 UTC (rev 10961)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/lostPassword/status.xhtml 2008-06-10 15:50:48 UTC (rev 10972)
@@ -6,7 +6,7 @@
xmlns:c="http://java.sun.com/jstl/core"
class="identity-ui">
-<ui:composition template="/WEB-INF/jsf/lostPassword/lostTemplate.xhtml">
+<ui:composition template="/jsf/lostPassword/lostTemplate.xhtml">
<ui:define name="title">
<h:outputText value="#{bundle.IDENTITY_LOST_PASSWORD_STATUS_TITLE}" />
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/profile/changeEmail.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changeEmail.xhtml 2008-06-09 12:40:39 UTC (rev 10961)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/profile/changeEmail.xhtml 2008-06-10 15:50:48 UTC (rev 10972)
@@ -6,7 +6,7 @@
xmlns:c="http://java.sun.com/jstl/core"
class="identity-ui">
<f:loadBundle var="bundle" basename="conf.bundles.Identity" />
-<ui:composition template="/WEB-INF/jsf/profile/editProfileTemplate.xhtml">
+<ui:composition template="/jsf/profile/editProfileTemplate.xhtml">
<ui:define name="title">
<li class="pathItem">
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/profile/changePassword.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changePassword.xhtml 2008-06-09 12:40:39 UTC (rev 10961)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/profile/changePassword.xhtml 2008-06-10 15:50:48 UTC (rev 10972)
@@ -6,7 +6,7 @@
xmlns:c="http://java.sun.com/jstl/core"
class="identity-ui">
<f:loadBundle var="bundle" basename="conf.bundles.Identity" />
-<ui:composition template="/WEB-INF/jsf/profile/editProfileTemplate.xhtml">
+<ui:composition template="/jsf/profile/editProfileTemplate.xhtml">
<ui:define name="title">
<li class="pathItem">
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/profile/editProfile.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfile.xhtml 2008-06-09 12:40:39 UTC (rev 10961)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/profile/editProfile.xhtml 2008-06-10 15:50:48 UTC (rev 10972)
@@ -8,14 +8,14 @@
<f:loadBundle var="bundle" basename="conf.bundles.Identity" />
- <ui:composition template="/WEB-INF/jsf/profile/editProfileTemplate.xhtml">
+ <ui:composition template="/jsf/profile/editProfileTemplate.xhtml">
<ui:define name="title">
<li class="selected">
<h:outputText value="#{bundle.IDENTITY_EDIT_PROFILE_TITLE}" />
</li>
</ui:define>
<ui:define name="content">
- <ui:decorate template="/WEB-INF/jsf/common/profile.xhtml">
+ <ui:decorate template="/jsf/common/profile.xhtml">
<ui:param name="manager" value="#{editprofilemgr}"/>
<ui:param name="adminMode" value="false"/>
</ui:decorate>
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/profile/editProfileRedirect.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfileRedirect.xhtml 2008-06-09 12:40:39 UTC (rev 10961)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/profile/editProfileRedirect.xhtml 2008-06-10 15:50:48 UTC (rev 10972)
@@ -11,11 +11,11 @@
<c:choose>
<c:when test="#{editprofilemgr.currentWindowState == 'maximized'}">
<!-- Show edit profile page -->
- <ui:include src="/WEB-INF/jsf/profile/editProfile.xhtml" />
+ <ui:include src="/jsf/profile/editProfile.xhtml" />
</c:when>
<c:otherwise>
<!-- Show view profile page -->
- <ui:include src="/WEB-INF/jsf/profile/viewProfile.xhtml" />
+ <ui:include src="/jsf/profile/viewProfile.xhtml" />
</c:otherwise>
</c:choose>
</div>
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/profile/editProfileTemplate.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfileTemplate.xhtml 2008-06-09 12:40:39 UTC (rev 10961)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/profile/editProfileTemplate.xhtml 2008-06-10 15:50:48 UTC (rev 10972)
@@ -18,7 +18,7 @@
<li id="currentTab"><h:outputText value="#{bundle.IDENTITY_EDIT_PROFILE_TITLE}" /></li>
</ul>
</h:form>
- <ui:decorate template="/WEB-INF/jsf/common/noTabContainer.xhtml">
+ <ui:decorate template="/jsf/common/noTabContainer.xhtml">
<ui:define name="tab-object-path">
<!-- Title -->
<h:form>
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/profile/status.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/status.xhtml 2008-06-09 12:40:39 UTC (rev 10961)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/profile/status.xhtml 2008-06-10 15:50:48 UTC (rev 10972)
@@ -8,7 +8,7 @@
<f:loadBundle var="bundle" basename="conf.bundles.Identity" />
-<ui:composition template="/WEB-INF/jsf/profile/editProfileTemplate.xhtml">
+<ui:composition template="/jsf/profile/editProfileTemplate.xhtml">
<ui:define name="title">
<li class="selected">
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/profile/viewProfile.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfile.xhtml 2008-06-09 12:40:39 UTC (rev 10961)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/profile/viewProfile.xhtml 2008-06-10 15:50:48 UTC (rev 10972)
@@ -8,7 +8,7 @@
<f:loadBundle var="bundle" basename="conf.bundles.Identity" />
-<ui:composition template="/WEB-INF/jsf/profile/viewProfileTemplate.xhtml">
+<ui:composition template="/jsf/profile/viewProfileTemplate.xhtml">
<ui:define name="title">
<h:outputText value="#{bundle.IDENTITY_VIEW_PROFILE_TITLE}" />
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/profile/viewProfileTemplate.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfileTemplate.xhtml 2008-06-09 12:40:39 UTC (rev 10961)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/profile/viewProfileTemplate.xhtml 2008-06-10 15:50:48 UTC (rev 10972)
@@ -17,7 +17,7 @@
</li>
</ul>
</h:form>
- <ui:decorate template="/WEB-INF/jsf/common/noTabContainer.xhtml">
+ <ui:decorate template="/jsf/common/noTabContainer.xhtml">
<ui:define name="tab-object-path">
<!-- Title -->
<ul class="objectpath">
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/register/confirm.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/confirm.xhtml 2008-06-09 12:40:39 UTC (rev 10961)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/register/confirm.xhtml 2008-06-10 15:50:48 UTC (rev 10972)
@@ -6,13 +6,13 @@
xmlns:c="http://java.sun.com/jstl/core"
class="identity-ui">
-<ui:composition template="/WEB-INF/jsf/register/registerTemplate.xhtml">
+<ui:composition template="/jsf/register/registerTemplate.xhtml">
<ui:define name="title">
<h:outputText value="#{bundle.IDENTITY_REGISTER_TITLE_CONFIRM}" />
</ui:define>
<ui:define name="content">
- <ui:decorate template="/WEB-INF/jsf/common/confirm.xhtml">
+ <ui:decorate template="/jsf/common/confirm.xhtml">
<ui:param name="manager" value="#{userregistermgr}"/>
<ui:param name="subscriptionMode" value="user" />
</ui:decorate>
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/register/overview.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/overview.xhtml 2008-06-09 12:40:39 UTC (rev 10961)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/register/overview.xhtml 2008-06-10 15:50:48 UTC (rev 10972)
@@ -6,7 +6,7 @@
xmlns:c="http://java.sun.com/jstl/core"
class="identity-ui">
-<ui:composition template="/WEB-INF/jsf/startTemplate.xhtml">
+<ui:composition template="/jsf/startTemplate.xhtml">
<ui:define name="title">
<h:outputText value="#{bundle.IDENTITY_NOT_LOGGED_IN}" />
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/register/register.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/register.xhtml 2008-06-09 12:40:39 UTC (rev 10961)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/register/register.xhtml 2008-06-10 15:50:48 UTC (rev 10972)
@@ -6,7 +6,7 @@
xmlns:c="http://java.sun.com/jstl/core"
class="identity-ui">
-<ui:composition template="/WEB-INF/jsf/register/registerTemplate.xhtml">
+<ui:composition template="/jsf/register/registerTemplate.xhtml">
<ui:define name="title">
<h:outputText value="#{bundle.IDENTITY_REGISTER_TITLE}" />
@@ -14,7 +14,7 @@
<ui:define name="content">
- <ui:decorate template="/WEB-INF/jsf/common/register.xhtml">
+ <ui:decorate template="/jsf/common/register.xhtml">
<ui:param name="manager" value="#{userregistermgr}"/>
</ui:decorate>
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/register/registerTemplate.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/registerTemplate.xhtml 2008-06-09 12:40:39 UTC (rev 10961)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/register/registerTemplate.xhtml 2008-06-10 15:50:48 UTC (rev 10972)
@@ -26,7 +26,7 @@
</c:if>
</ul>
</h:form>
- <ui:decorate template="/WEB-INF/jsf/common/noTabContainer.xhtml">
+ <ui:decorate template="/jsf/common/noTabContainer.xhtml">
<ui:define name="tab-object-path">
<!-- Title -->
<ul class="objectpath">
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/register/success.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/success.xhtml 2008-06-09 12:40:39 UTC (rev 10961)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/register/success.xhtml 2008-06-10 15:50:48 UTC (rev 10972)
@@ -6,7 +6,7 @@
xmlns:c="http://java.sun.com/jstl/core"
class="identity-ui">
-<ui:composition template="/WEB-INF/jsf/register/registerTemplate.xhtml">
+<ui:composition template="/jsf/register/registerTemplate.xhtml">
<ui:define name="title">
<h:outputText value="#{bundle.IDENTITY_REGISTER_STATUS_TITLE}"/>
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/startTemplate.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/startTemplate.xhtml 2008-06-09 12:40:39 UTC (rev 10961)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/startTemplate.xhtml 2008-06-10 15:50:48 UTC (rev 10972)
@@ -26,7 +26,7 @@
</c:if>
</ul>
</h:form>
- <ui:decorate template="/WEB-INF/jsf/common/noTabContainer.xhtml">
+ <ui:decorate template="/jsf/common/noTabContainer.xhtml">
<ui:define name="tab-object-path">
<!-- Title -->
17 years, 11 months
- 1
- 0
JBoss Portal SVN: r10971 - in modules/presentation/trunk: classic/src/main/java/org/jboss/portal/presentation/classic and 10 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-06-10 09:49:38 -0400 (Tue, 10 Jun 2008)
New Revision: 10971
Added:
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/pull/
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/pull/DetachedUINode.java
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/pull/DetachedViewPortContext.java
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/pull/UINodeFactory.java
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/pull/UINodeImpl.java
Removed:
modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/servlet/StructuralStateContextImporter.java
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/UINodeFactory.java
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/UINodeImpl.java
Modified:
modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/ClassicPresentationClient.java
modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/model/ClassicUINode.java
modules/presentation/trunk/pom.xml
modules/presentation/trunk/portal/pom.xml
modules/presentation/trunk/portal/src/assemble/presentation-portal-war.xml
modules/presentation/trunk/portal/src/main/artifacts/presentation-portal-war/WEB-INF/web.xml
modules/presentation/trunk/portal/src/test/java/org/jboss/portal/presentation/portal/model/StructuralStateContextTestCase.java
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/UINode.java
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/view/DefaultPageViewPortScope.java
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/view/PageViewPortScope.java
Log:
improved
Modified: modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/ClassicPresentationClient.java
===================================================================
--- modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/ClassicPresentationClient.java 2008-06-10 05:35:22 UTC (rev 10970)
+++ modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/ClassicPresentationClient.java 2008-06-10 13:49:38 UTC (rev 10971)
@@ -38,6 +38,7 @@
import org.jboss.portal.presentation.model.ui.UIObject;
import org.jboss.portal.presentation.model.ViewPort;
import org.jboss.portal.presentation.model.ViewPortScope;
+import org.jboss.portal.presentation.model.UINode;
import org.jboss.portal.presentation.model.layout.LayoutFactory;
import org.jboss.portal.presentation.model.layout.Layout;
import org.jboss.portal.presentation.model.layout.SimpleLayout;
@@ -224,8 +225,15 @@
else
{
StructuralStateContext ssc = server.getStructuralStateContext();
- DefaultPageViewPortScope scope = new DefaultPageViewPortScope(ssc.getRootId());
- renderDocument(scope, ssc.getRootId());
+ ViewPortScope scope = new DefaultPageViewPortScope(ssc.getRootId());
+ ClassicViewPortContext context = new ClassicViewPortContext();
+ UIModel model = new UIModelImpl(null, ssc);
+ ViewPort viewPort = model.createViewPort(context, scope);
+ viewPort.refresh();
+ UINode root = context.getNode(ssc.getRootId());
+ UINode defaultPage = root.getChildren().iterator().next();
+ String defaultPageId = defaultPage.getObject().getId();
+ renderDocument(new PageViewPortScope(defaultPageId), defaultPageId);
}
}
@@ -259,7 +267,7 @@
writer.print("</body></html>");
}
- private void renderNode(ClassicUINode node, PrintWriter writer)
+ private void renderNode(UINode node, PrintWriter writer)
{
UIObject object = node.getObject();
@@ -315,7 +323,7 @@
writer.println("</div>");
}
- private void renderPane(ClassicUINode node, PrintWriter writer)
+ private void renderPane(UINode node, PrintWriter writer)
{
LayoutFactory layoutFactory = new LayoutFactory();
@@ -342,12 +350,12 @@
}
//
- Collection<ClassicUINode> children = node.getChildren();
+ Collection<? extends UINode> children = node.getChildren();
//
if (children != null)
{
- for (ClassicUINode child : children)
+ for (UINode child : children)
{
if (orientation == Orientation.HORIZONTAL)
{
@@ -379,14 +387,14 @@
}
}
- private void renderChildren(ClassicUINode node, PrintWriter writer)
+ private void renderChildren(UINode node, PrintWriter writer)
{
- Collection<ClassicUINode> children = node.getChildren();
+ Collection<? extends UINode> children = node.getChildren();
//
if (children != null)
{
- for (ClassicUINode child : children)
+ for (UINode child : children)
{
renderNode(child, writer);
}
Modified: modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/model/ClassicUINode.java
===================================================================
--- modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/model/ClassicUINode.java 2008-06-10 05:35:22 UTC (rev 10970)
+++ modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/model/ClassicUINode.java 2008-06-10 13:49:38 UTC (rev 10971)
@@ -69,7 +69,7 @@
return object;
}
- public Collection getChildren()
+ public Collection<? extends UINode> getChildren()
{
return children == null ? null : children.values();
}
Modified: modules/presentation/trunk/pom.xml
===================================================================
--- modules/presentation/trunk/pom.xml 2008-06-10 05:35:22 UTC (rev 10970)
+++ modules/presentation/trunk/pom.xml 2008-06-10 13:49:38 UTC (rev 10971)
@@ -30,7 +30,7 @@
<module>presentation</module>
<module>classic</module>
<module>portal</module>
- <!--<module>ajax2</module>-->
+ <module>ajax2</module>
<!--<module>ajax</module>-->
</modules>
</project>
Modified: modules/presentation/trunk/portal/pom.xml
===================================================================
--- modules/presentation/trunk/portal/pom.xml 2008-06-10 05:35:22 UTC (rev 10970)
+++ modules/presentation/trunk/portal/pom.xml 2008-06-10 13:49:38 UTC (rev 10971)
@@ -27,6 +27,19 @@
</dependency>
<dependency>
+ <groupId>org.jboss.portal.presentation</groupId>
+ <artifactId>presentation-ajax2</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.portal.presentation</groupId>
+ <artifactId>presentation-ajax2</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ </dependency>
+
+ <dependency>
<groupId>sun-servlet</groupId>
<artifactId>servlet-api</artifactId>
</dependency>
@@ -119,7 +132,30 @@
<argLine>-enableassertions</argLine>
</configuration>
</plugin>
+
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack-presesntation-ajax</id>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <phase>generate-resources</phase>
+ <configuration>
+ <outputDirectory>target/presentation-portal-war</outputDirectory>
+ <includeArtifacIds>presentation-ajax2</includeArtifacIds>
+ <includeGroupIds>org.jboss.portal.presentation</includeGroupIds>
+ <includeTypes>war</includeTypes>
+ <excludeTransitive>true</excludeTransitive>
+ <outputAbsoluteArtifactFilename>true</outputAbsoluteArtifactFilename>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<finalName>portal</finalName>
Modified: modules/presentation/trunk/portal/src/assemble/presentation-portal-war.xml
===================================================================
--- modules/presentation/trunk/portal/src/assemble/presentation-portal-war.xml 2008-06-10 05:35:22 UTC (rev 10970)
+++ modules/presentation/trunk/portal/src/assemble/presentation-portal-war.xml 2008-06-10 13:49:38 UTC (rev 10971)
@@ -13,6 +13,11 @@
</fileSet>
<fileSet>
+ <directory>target/presentation-portal-war</directory>
+ <outputDirectory></outputDirectory>
+ </fileSet>
+
+ <fileSet>
<directory>target/classes</directory>
<outputDirectory>WEB-INF/classes</outputDirectory>
</fileSet>
@@ -20,7 +25,18 @@
</fileSets>
<dependencySets>
+
+<!--
<dependencySet>
+ <unpack>true</unpack>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>org.jboss.portal.presentation:presentation-ajax2:war</include>
+ </includes>
+ </dependencySet>
+-->
+
+ <dependencySet>
<outputDirectory>WEB-INF/lib</outputDirectory>
<includes>
@@ -33,8 +49,12 @@
<include>org.jboss.portal.portlet:portlet-mc</include>
<include>org.jboss.portal.portlet:portlet-samples</include>
<include>org.jboss.portal.presentation:presentation-presentation</include>
+
<include>org.jboss.portal.presentation:presentation-classic</include>
+ <include>org.jboss.portal.presentation:presentation-ajax2</include>
+ <include>com.google.gwt:gwt-user</include>
+
<include>javax.ccpp:ccpp</include>
<include>javax.portlet:portlet-api</include>
Modified: modules/presentation/trunk/portal/src/main/artifacts/presentation-portal-war/WEB-INF/web.xml
===================================================================
--- modules/presentation/trunk/portal/src/main/artifacts/presentation-portal-war/WEB-INF/web.xml 2008-06-10 05:35:22 UTC (rev 10970)
+++ modules/presentation/trunk/portal/src/main/artifacts/presentation-portal-war/WEB-INF/web.xml 2008-06-10 13:49:38 UTC (rev 10971)
@@ -44,8 +44,18 @@
<servlet-mapping>
<servlet-name>ClassicPresentationServlet</servlet-name>
- <url-pattern>/*</url-pattern>
+ <url-pattern>/classic/*</url-pattern>
</servlet-mapping>
+ <servlet>
+ <servlet-name>AjaxPresentationServlet</servlet-name>
+ <servlet-class>org.jboss.portal.presentation.ajax2.server.PresentationClientServlet</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>AjaxPresentationServlet</servlet-name>
+ <url-pattern>/remote</url-pattern>
+ </servlet-mapping>
+
</web-app>
\ No newline at end of file
Deleted: modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/servlet/StructuralStateContextImporter.java
===================================================================
--- modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/servlet/StructuralStateContextImporter.java 2008-06-10 05:35:22 UTC (rev 10970)
+++ modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/servlet/StructuralStateContextImporter.java 2008-06-10 13:49:38 UTC (rev 10971)
@@ -1,95 +0,0 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2008, Red Hat Middleware, LLC, and individual *
- * contributors as indicated by the @authors tag. See the *
- * copyright.txt in the distribution for a full listing of *
- * individual contributors. *
- * *
- * This is free software; you can redistribute it and/or modify it *
- * under the terms of the GNU Lesser General Public License as *
- * published by the Free Software Foundation; either version 2.1 of *
- * the License, or (at your option) any later version. *
- * *
- * This software is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
- * Lesser General Public License for more details. *
- * *
- * You should have received a copy of the GNU Lesser General Public *
- * License along with this software; if not, write to the Free *
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
- ******************************************************************************/
-package org.jboss.portal.presentation.portal.servlet;
-
-import org.jboss.portal.presentation.portal.model.object.PortalNodeManager;
-import org.jboss.portal.presentation.portal.model.ModelImporter;
-import org.jboss.portal.presentation.portal.model.object.ContextNode;
-import org.jboss.portal.presentation.portal.model.layout.LayoutStore;
-import org.jboss.portal.common.io.IOTools;
-
-import javax.servlet.ServletContext;
-import java.io.InputStream;
-
-/**
- * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
- * @version $Revision: 630 $
- */
-public class StructuralStateContextImporter
-{
-
- /** . */
- private ServletContext servletContext;
-
- /** . */
- private PortalNodeManager portalNodeManager;
-
- /** . */
- private LayoutStore layoutStore;
-
- public ServletContext getServletContext()
- {
- return servletContext;
- }
-
- public void setServletContext(ServletContext servletContext)
- {
- this.servletContext = servletContext;
- }
-
- public PortalNodeManager getPortalNodeManager()
- {
- return portalNodeManager;
- }
-
- public void setPortalNodeManager(PortalNodeManager portalNodeManager)
- {
- this.portalNodeManager = portalNodeManager;
- }
-
- public LayoutStore getLayoutStore()
- {
- return layoutStore;
- }
-
- public void setLayoutStore(LayoutStore layoutStore)
- {
- this.layoutStore = layoutStore;
- }
-
- public void start() throws Exception
- {
- InputStream in = servletContext.getResourceAsStream("/WEB-INF/page-structure.xml");
-
- //
- try
- {
- ContextNode root = portalNodeManager.getRoot();
- new ModelImporter(root, layoutStore).importDocument(in);
- }
- finally
- {
- IOTools.safeClose(in);
- }
- }
-}
Modified: modules/presentation/trunk/portal/src/test/java/org/jboss/portal/presentation/portal/model/StructuralStateContextTestCase.java
===================================================================
--- modules/presentation/trunk/portal/src/test/java/org/jboss/portal/presentation/portal/model/StructuralStateContextTestCase.java 2008-06-10 05:35:22 UTC (rev 10970)
+++ modules/presentation/trunk/portal/src/test/java/org/jboss/portal/presentation/portal/model/StructuralStateContextTestCase.java 2008-06-10 13:49:38 UTC (rev 10971)
@@ -34,7 +34,6 @@
import org.jboss.portal.presentation.portal.model.object.ContextNode;
import org.jboss.portal.presentation.portal.model.object.PageNode;
import org.jboss.portal.presentation.portal.model.object.PortalNode;
-import org.jboss.portal.presentation.portal.model.ModelAdapter;
import org.jboss.portal.presentation.portal.model.object.PortalNodeManager;
import org.jboss.portal.presentation.portal.model.object.WindowNode;
Deleted: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/UINodeFactory.java
===================================================================
--- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/UINodeFactory.java 2008-06-10 05:35:22 UTC (rev 10970)
+++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/UINodeFactory.java 2008-06-10 13:49:38 UTC (rev 10971)
@@ -1,63 +0,0 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2008, Red Hat Middleware, LLC, and individual *
- * contributors as indicated by the @authors tag. See the *
- * copyright.txt in the distribution for a full listing of *
- * individual contributors. *
- * *
- * This is free software; you can redistribute it and/or modify it *
- * under the terms of the GNU Lesser General Public License as *
- * published by the Free Software Foundation; either version 2.1 of *
- * the License, or (at your option) any later version. *
- * *
- * This software is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
- * Lesser General Public License for more details. *
- * *
- * You should have received a copy of the GNU Lesser General Public *
- * License along with this software; if not, write to the Free *
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
- ******************************************************************************/
-package org.jboss.portal.presentation.impl.model;
-
-import org.jboss.portal.presentation.model.UINode;
-import org.jboss.portal.presentation.state.structural.StructuralStateContext;
-import org.jboss.portal.presentation.state.structural.StructuralObject;
-import org.jboss.portal.presentation.state.navigational.NavigationalStateContext;
-
-/**
- * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
- * @version $Revision: 630 $
- */
-public class UINodeFactory
-{
-
- /**
- * Creates a user interface node.
- *
- * @param navigationalStateContext the navigational state context
- * @param structuralStateContext the structural state context
- * @param objectId the object id
- * @return the corresponding node
- */
- public static UINode createNode(
- NavigationalStateContext navigationalStateContext,
- StructuralStateContext structuralStateContext,
- String objectId)
- {
- StructuralObject object = structuralStateContext.load(objectId);
-
- //
- if (object != null)
- {
- return new UINodeImpl(navigationalStateContext, structuralStateContext, object);
- }
- else
- {
- return null;
- }
- }
-
-}
Deleted: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/UINodeImpl.java
===================================================================
--- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/UINodeImpl.java 2008-06-10 05:35:22 UTC (rev 10970)
+++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/UINodeImpl.java 2008-06-10 13:49:38 UTC (rev 10971)
@@ -1,164 +0,0 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2008, Red Hat Middleware, LLC, and individual *
- * contributors as indicated by the @authors tag. See the *
- * copyright.txt in the distribution for a full listing of *
- * individual contributors. *
- * *
- * This is free software; you can redistribute it and/or modify it *
- * under the terms of the GNU Lesser General Public License as *
- * published by the Free Software Foundation; either version 2.1 of *
- * the License, or (at your option) any later version. *
- * *
- * This software is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
- * Lesser General Public License for more details. *
- * *
- * You should have received a copy of the GNU Lesser General Public *
- * License along with this software; if not, write to the Free *
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
- ******************************************************************************/
-package org.jboss.portal.presentation.impl.model;
-
-import org.jboss.portal.presentation.model.UINode;
-import org.jboss.portal.presentation.model.ui.UIObject;
-import org.jboss.portal.presentation.state.structural.StructuralObject;
-import org.jboss.portal.presentation.state.structural.StructuralStateContext;
-import org.jboss.portal.presentation.state.navigational.NavigationalStateContext;
-import org.jboss.portal.presentation.impl.model.ui.UIObjectContext;
-import org.jboss.portal.presentation.impl.model.ui.UIObjectImpl;
-
-import java.util.Collection;
-import java.util.ArrayList;
-
-/**
- * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
- * @version $Revision: 630 $
- */
-class UINodeImpl implements UINode, UIObjectContext
-{
-
- /** . */
- private final NavigationalStateContext navigationalStateContext;
-
- /** . */
- private final StructuralStateContext structuralStateContext;
-
- /** . */
- private final StructuralObject structuralObject;
-
- /** . */
- private Collection<UINode> children;
-
- /** . */
- private UINode parent;
-
- /** . */
- private boolean parentVisited;
-
- /** . */
- private UIObject object;
-
- UINodeImpl(NavigationalStateContext navigationalStateContext, StructuralStateContext structuralStateContext, StructuralObject structuralObject)
- {
- this.navigationalStateContext = navigationalStateContext;
- this.structuralStateContext = structuralStateContext;
- this.structuralObject = structuralObject;
- this.children = null;
- this.parentVisited = false;
- }
-
- private UINodeImpl(NavigationalStateContext navigationalStateContext, StructuralStateContext structuralStateContext, StructuralObject structuralObject, Collection<UINode> children)
- {
- this.navigationalStateContext = navigationalStateContext;
- this.structuralStateContext = structuralStateContext;
- this.structuralObject = structuralObject;
- this.children = children;
- this.parentVisited = true;
- }
-
- public UIObject getObject()
- {
- if (object == null)
- {
- object = UIObjectImpl.create(structuralObject, this);
- }
-
- //
- return object;
- }
-
- public UINode getParent()
- {
- if (!parentVisited)
- {
- StructuralObject parentObject = structuralStateContext.loadParent(structuralObject);
-
- //
- if (parentObject != null)
- {
- Collection<StructuralObject> siblingObjects = structuralStateContext.loadChildren(parentObject);
- ArrayList<UINode> siblings = new ArrayList<UINode>(siblingObjects.size());
- for (StructuralObject siblingObject : siblingObjects)
- {
- UINodeImpl sibling;
- if (siblingObject.getId().equals(structuralObject.getId()))
- {
- sibling = this;
- }
- else
- {
- sibling = new UINodeImpl(navigationalStateContext, structuralStateContext, siblingObject);
- sibling.parent = this;
- sibling.parentVisited = true;
- }
-
- //
- siblings.add(sibling);
- }
-
- //
- parent = new UINodeImpl(navigationalStateContext, structuralStateContext, parentObject, siblings);
- }
-
- //
- parentVisited = true;
- }
-
- //
- return parent;
- }
-
- public Collection<UINode> getChildren()
- {
- if (children == null)
- {
- Collection<StructuralObject> childrenObject = structuralStateContext.loadChildren(structuralObject);
- ArrayList<UINode> children = new ArrayList<UINode>(childrenObject.size());
- for (StructuralObject childObject : childrenObject)
- {
- UINodeImpl child = new UINodeImpl(navigationalStateContext, structuralStateContext, childObject);
- child.parent = this;
- child.parentVisited = true;
-
- //
- children.add(child);
- }
-
- //
- this.children = children;
- }
-
- //
- return children;
- }
-
- // UIObjectContext implementation ***********************************************************************************
-
- public NavigationalStateContext getNavigationalStateContext()
- {
- return navigationalStateContext;
- }
-}
Added: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/pull/DetachedUINode.java
===================================================================
--- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/pull/DetachedUINode.java (rev 0)
+++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/pull/DetachedUINode.java 2008-06-10 13:49:38 UTC (rev 10971)
@@ -0,0 +1,76 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2008, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.presentation.impl.model.pull;
+
+import org.jboss.portal.presentation.model.ui.UIObject;
+import org.jboss.portal.presentation.model.UINode;
+
+import java.util.Collection;
+import java.util.Map;
+
+/**
+ * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+public class DetachedUINode implements UINode
+{
+
+ /** . */
+ private final UIObject object;
+
+ /** . */
+ DetachedUINode parent;
+
+ /** . */
+ Map<String, DetachedUINode> children;
+
+ public DetachedUINode(UIObject object)
+ {
+ this.object = object;
+ }
+
+ public DetachedUINode getParent()
+ {
+ return parent;
+ }
+
+ public String getId()
+ {
+ return object.getId();
+ }
+
+ public String getName()
+ {
+ return object.getName();
+ }
+
+ public UIObject getObject()
+ {
+ return object;
+ }
+
+ public Collection<? extends UINode> getChildren()
+ {
+ return children == null ? null : children.values();
+ }
+}
\ No newline at end of file
Copied: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/pull/DetachedViewPortContext.java (from rev 10942, modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/model/ClassicViewPortContext.java)
===================================================================
--- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/pull/DetachedViewPortContext.java (rev 0)
+++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/pull/DetachedViewPortContext.java 2008-06-10 13:49:38 UTC (rev 10971)
@@ -0,0 +1,103 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2008, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.presentation.impl.model.pull;
+
+import org.jboss.portal.presentation.model.ui.UIObject;
+import org.jboss.portal.presentation.model.ViewPortContext;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+public class DetachedViewPortContext implements ViewPortContext
+{
+
+ /** . */
+ final Map<String, DetachedUINode> nodes = new HashMap<String, DetachedUINode>();
+
+ public DetachedUINode getNode(String nodeId)
+ {
+ return nodes.get(nodeId);
+ }
+
+ public UIObject getObject(String objectId)
+ {
+ DetachedUINode node = nodes.get(objectId);
+
+ //
+ if (node == null)
+ {
+ return null;
+ }
+ else
+ {
+ return node.getObject();
+ }
+ }
+
+ public void addObject(UIObject object)
+ {
+ DetachedUINode node = new DetachedUINode(object);
+
+ //
+ nodes.put(node.getId(), node);
+ }
+
+ public void updateObject(String objectId)
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public void removeObject(String objectId)
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public void createChildren(String parentId)
+ {
+ nodes.get(parentId).children = new HashMap<String, DetachedUINode>();
+ }
+
+ public void destroyChildren(String parentId)
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public void addChild(String parentId, String childId)
+ {
+ DetachedUINode parent = nodes.get(parentId);
+ DetachedUINode child = nodes.get(childId);
+
+ //
+ parent.children.put(child.getName(), child);
+ child.parent = parent;
+ }
+
+ public void removeChild(String parentId, String childId)
+ {
+ throw new UnsupportedOperationException();
+ }
+}
\ No newline at end of file
Copied: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/pull/UINodeFactory.java (from rev 10942, modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/UINodeFactory.java)
===================================================================
--- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/pull/UINodeFactory.java (rev 0)
+++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/pull/UINodeFactory.java 2008-06-10 13:49:38 UTC (rev 10971)
@@ -0,0 +1,62 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2008, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.presentation.impl.model.pull;
+
+import org.jboss.portal.presentation.model.UINode;
+import org.jboss.portal.presentation.state.structural.StructuralStateContext;
+import org.jboss.portal.presentation.state.structural.StructuralObject;
+import org.jboss.portal.presentation.state.navigational.NavigationalStateContext;
+
+/**
+ * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+public class UINodeFactory
+{
+
+ /**
+ * Creates a user interface node.
+ *
+ * @param navigationalStateContext the navigational state context
+ * @param structuralStateContext the structural state context
+ * @param objectId the object id
+ * @return the corresponding node
+ */
+ public static UINode createNode(
+ NavigationalStateContext navigationalStateContext,
+ StructuralStateContext structuralStateContext,
+ String objectId)
+ {
+ StructuralObject object = structuralStateContext.load(objectId);
+
+ //
+ if (object != null)
+ {
+ return new UINodeImpl(navigationalStateContext, structuralStateContext, object);
+ }
+ else
+ {
+ return null;
+ }
+ }
+}
Copied: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/pull/UINodeImpl.java (from rev 10942, modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/UINodeImpl.java)
===================================================================
--- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/pull/UINodeImpl.java (rev 0)
+++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/pull/UINodeImpl.java 2008-06-10 13:49:38 UTC (rev 10971)
@@ -0,0 +1,164 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2008, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.presentation.impl.model.pull;
+
+import org.jboss.portal.presentation.model.UINode;
+import org.jboss.portal.presentation.model.ui.UIObject;
+import org.jboss.portal.presentation.state.structural.StructuralObject;
+import org.jboss.portal.presentation.state.structural.StructuralStateContext;
+import org.jboss.portal.presentation.state.navigational.NavigationalStateContext;
+import org.jboss.portal.presentation.impl.model.ui.UIObjectContext;
+import org.jboss.portal.presentation.impl.model.ui.UIObjectImpl;
+
+import java.util.Collection;
+import java.util.ArrayList;
+
+/**
+ * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+class UINodeImpl implements UINode, UIObjectContext
+{
+
+ /** . */
+ private final NavigationalStateContext navigationalStateContext;
+
+ /** . */
+ private final StructuralStateContext structuralStateContext;
+
+ /** . */
+ private final StructuralObject structuralObject;
+
+ /** . */
+ private Collection<UINode> children;
+
+ /** . */
+ private UINode parent;
+
+ /** . */
+ private boolean parentVisited;
+
+ /** . */
+ private UIObject object;
+
+ UINodeImpl(NavigationalStateContext navigationalStateContext, StructuralStateContext structuralStateContext, StructuralObject structuralObject)
+ {
+ this.navigationalStateContext = navigationalStateContext;
+ this.structuralStateContext = structuralStateContext;
+ this.structuralObject = structuralObject;
+ this.children = null;
+ this.parentVisited = false;
+ }
+
+ private UINodeImpl(NavigationalStateContext navigationalStateContext, StructuralStateContext structuralStateContext, StructuralObject structuralObject, Collection<UINode> children)
+ {
+ this.navigationalStateContext = navigationalStateContext;
+ this.structuralStateContext = structuralStateContext;
+ this.structuralObject = structuralObject;
+ this.children = children;
+ this.parentVisited = true;
+ }
+
+ public UIObject getObject()
+ {
+ if (object == null)
+ {
+ object = UIObjectImpl.create(structuralObject, this);
+ }
+
+ //
+ return object;
+ }
+
+ public UINode getParent()
+ {
+ if (!parentVisited)
+ {
+ StructuralObject parentObject = structuralStateContext.loadParent(structuralObject);
+
+ //
+ if (parentObject != null)
+ {
+ Collection<StructuralObject> siblingObjects = structuralStateContext.loadChildren(parentObject);
+ ArrayList<UINode> siblings = new ArrayList<UINode>(siblingObjects.size());
+ for (StructuralObject siblingObject : siblingObjects)
+ {
+ UINodeImpl sibling;
+ if (siblingObject.getId().equals(structuralObject.getId()))
+ {
+ sibling = this;
+ }
+ else
+ {
+ sibling = new UINodeImpl(navigationalStateContext, structuralStateContext, siblingObject);
+ sibling.parent = this;
+ sibling.parentVisited = true;
+ }
+
+ //
+ siblings.add(sibling);
+ }
+
+ //
+ parent = new UINodeImpl(navigationalStateContext, structuralStateContext, parentObject, siblings);
+ }
+
+ //
+ parentVisited = true;
+ }
+
+ //
+ return parent;
+ }
+
+ public Collection<? extends UINode> getChildren()
+ {
+ if (children == null)
+ {
+ Collection<StructuralObject> childrenObject = structuralStateContext.loadChildren(structuralObject);
+ ArrayList<UINode> children = new ArrayList<UINode>(childrenObject.size());
+ for (StructuralObject childObject : childrenObject)
+ {
+ UINodeImpl child = new UINodeImpl(navigationalStateContext, structuralStateContext, childObject);
+ child.parent = this;
+ child.parentVisited = true;
+
+ //
+ children.add(child);
+ }
+
+ //
+ this.children = children;
+ }
+
+ //
+ return children;
+ }
+
+ // UIObjectContext implementation ***********************************************************************************
+
+ public NavigationalStateContext getNavigationalStateContext()
+ {
+ return navigationalStateContext;
+ }
+}
Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/UINode.java
===================================================================
--- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/UINode.java 2008-06-10 05:35:22 UTC (rev 10970)
+++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/UINode.java 2008-06-10 13:49:38 UTC (rev 10971)
@@ -55,6 +55,6 @@
*
* @return the children
*/
- Collection<UINode> getChildren();
+ Collection<? extends UINode> getChildren();
}
Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/view/DefaultPageViewPortScope.java
===================================================================
--- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/view/DefaultPageViewPortScope.java 2008-06-10 05:35:22 UTC (rev 10970)
+++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/view/DefaultPageViewPortScope.java 2008-06-10 13:49:38 UTC (rev 10971)
@@ -27,10 +27,10 @@
import org.jboss.portal.presentation.model.ViewPortScope;
import org.jboss.portal.presentation.model.ui.UIContext;
import org.jboss.portal.presentation.model.ui.UIPage;
-import org.jboss.portal.presentation.model.ui.UIWindow;
-import org.jboss.portal.presentation.model.ui.UIPane;
/**
+ * A scope implementation that retrieves the default page of the root context.
+ *
* @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
* @version $Revision: 630 $
*/
@@ -38,27 +38,11 @@
{
/** . */
- private static final int NO_PAGE = 0;
-
- /** . */
- private static final int DEFAULT_PAGE = 1;
-
- /** . */
- private static final int DEFAULT_PAGE_CHILD = 2;
-
- /** . */
- private static final int DEFAULT_PAGE_SIBLING = 3;
-
- /** . */
private final String rootId;
- /** . */
- private int pageStatus;
-
public DefaultPageViewPortScope(String rootId)
{
this.rootId = rootId;
- this.pageStatus = 0;
}
public String getRootId()
@@ -68,53 +52,21 @@
public ObjectTraversalType enterObject(UIObject object)
{
- if (object instanceof UIPane)
+ if (object instanceof UIContext)
{
- if (object instanceof UIPage)
+ return ObjectTraversalType.RECURSIVE;
+ }
+ if (object instanceof UIPage)
+ {
+ if ("default".equals(object.getName()))
{
- switch (pageStatus)
- {
- case NO_PAGE:
- if ("default".equals(object.getName()))
- {
- pageStatus = DEFAULT_PAGE;
-
- // We want to traverse the children of the default page
- return ObjectTraversalType.RECURSIVE;
- }
- else
- {
- pageStatus = DEFAULT_PAGE_SIBLING;
-
- // We want to see the sibbling pages of the default page
- return ObjectTraversalType.SINGLE;
- }
- case DEFAULT_PAGE:
- pageStatus = DEFAULT_PAGE_CHILD;
-
- // We want to see the children pages of the default page
- return ObjectTraversalType.SINGLE;
- case DEFAULT_PAGE_CHILD:
- case DEFAULT_PAGE_SIBLING:
- return ObjectTraversalType.SKIP;
- default:
- throw new AssertionError();
- }
+ return ObjectTraversalType.SINGLE;
}
else
{
- return ObjectTraversalType.RECURSIVE;
+ return ObjectTraversalType.SKIP;
}
}
- else if (object instanceof UIWindow)
- {
- // We don't traverse windows (for now as they are supposed to be leaves)
- return ObjectTraversalType.SINGLE;
- }
- else if (object instanceof UIContext)
- {
- return ObjectTraversalType.RECURSIVE;
- }
else
{
return ObjectTraversalType.SKIP;
@@ -123,22 +75,5 @@
public void leaveObject(UIObject object)
{
- if (object instanceof UIPage)
- {
- switch (pageStatus)
- {
- case NO_PAGE:
- throw new AssertionError();
- case DEFAULT_PAGE:
- pageStatus = NO_PAGE;
- break;
- case DEFAULT_PAGE_SIBLING:
- pageStatus = NO_PAGE;
- break;
- case DEFAULT_PAGE_CHILD:
- pageStatus = DEFAULT_PAGE;
- break;
- }
- }
}
}
Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/view/PageViewPortScope.java
===================================================================
--- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/view/PageViewPortScope.java 2008-06-10 05:35:22 UTC (rev 10970)
+++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/view/PageViewPortScope.java 2008-06-10 13:49:38 UTC (rev 10971)
@@ -31,6 +31,8 @@
import org.jboss.portal.presentation.model.ui.UIPane;
/**
+ * A view scope that retrieves a page and its visible content.
+ *
* @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
* @version $Revision: 630 $
*/
17 years, 11 months
- 1
- 0
JBoss Portal SVN: r10970 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
by portal-commits＠lists.jboss.org
Author: mmcallis
Date: 2008-06-10 01:35:22 -0400 (Tue, 10 Jun 2008)
New Revision: 10970
Modified:
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/ajax.xml
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/themeandlayouts.xml
Log:
this should finish trademark attribution for JSP
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/ajax.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/ajax.xml 2008-06-10 04:59:13 UTC (rev 10969)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/ajax.xml 2008-06-10 05:35:22 UTC (rev 10970)
@@ -20,7 +20,7 @@
<para>Part of the Ajax capabilities are implemented in the layout framework which provide the structure for
generating portal pages. The good news is that the existing layout only requires a few modifications in
order to be ajaxified.</para>
- <para>We will use as example an simplified version of the layout JSP provided in JBoss Portal 2.6 and outline
+ <para>We will use as example an simplified version of the layout <trademark trade="trade">JSP</trademark> provided in JBoss Portal 2.6 and outline
what are the required changes that makes it an ajaxified layout:
<programlisting><![CDATA[
<%@ taglib uri="/WEB-INF/theme/portal-layout.tld" prefix="p" %>
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/themeandlayouts.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/themeandlayouts.xml 2008-06-10 04:59:13 UTC (rev 10969)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/themeandlayouts.xml 2008-06-10 05:35:22 UTC (rev 10970)
@@ -31,9 +31,7 @@
responsible to render markup that will wrap the markup fragments produced by the individual
portlets. Themes, on the other hand, are responsible to style and enhance this markup.
</para>
- <para>In JBoss Portal, layouts are implemented as a JSP or a Servlet. Themes are implemented
- using CSS Style sheets, javascript and images. The binding element between layouts and
- themes are the class and id attributes of the rendered markup.
+ <para>In JBoss Portal, layouts are implemented as a <trademark class="trade">JSP</trademark> or a Servlet. Themes are implemented using CSS Style sheets, javascript and images. The binding element between layouts and themes are the class and id attributes of the rendered markup.
</para>
<para>JBoss Portal has the concept of regions on a page. When a page is defined, and portlet
windows are assigned to the page, the region, and order inside the region, has to be
@@ -49,7 +47,7 @@
own entity.
<itemizedlist>
<para>To implement this encapsulation there are several ways:</para>
- <listitem><trademark class="trade">JSP</trademark> pages that get included from the layout JSP for each region/portlet</listitem>
+ <listitem>JSP pages that get included from the layout JSP for each region/portlet</listitem>
<listitem>a taglib that allows to place region, window, and decoration tags into the
layout JSP
</listitem>
@@ -148,7 +146,7 @@
right of the default theme. The file <literal>tabs.jsp</literal> is used to display the pages tabs
appearing on the left.
</para>
- <para> Again, you have several choices, either to edit the included <trademark class="trade">JSP</trademark> files directly or create your own,
+ <para> Again, you have several choices, either to edit the included JSP files directly or create your own,
store them in a web application then edit the following file: <literal>jboss-portal.sar/META-INF/jboss-service.xml</literal>.
The interesting part in that file is the following:
<programlisting><![CDATA[<mbean
@@ -261,7 +259,7 @@
some ingredients from the portal itself, and at the end write the response back to the
requesting client.
</para>
- <para>Layouts can be either a JSP or a Servlet. The portal determines the layout to use
+ <para>Layouts can be either a <trademark class="trade">JSP</trademark> or a Servlet. The portal determines the layout to use
via the configured properties of the portal, or the requested page. Both, portal and
pages, can define the layout to use in order to render their content. In case both
define a layout, the layout defined for the page will overwrite the one defined for the
@@ -322,7 +320,7 @@
<para>As you can see, the portal or page property points to the layout to use via the
name of the layout. The name has been given to the layout in the layout descriptor.
It is in that layout descriptor where the name gets linked to the physical resource
- (the JSP or Servlet) that will actually render the layout.
+ (the <trademark class="trade">JSP</trademark> or Servlet) that will actually render the layout.
</para>
</sect3>
<sect3>
@@ -368,7 +366,7 @@
-->
<sect2>
<title>Layout <trademark class="trade">JSP</trademark> tags</title>
- <para>The portal comes with a set of JSP tags that allow the layout developer faster
+ <para>The portal comes with a set of <trademark class="trade">JSP</trademark> tags that allow the layout developer faster
development.
<itemizedlist>
<para>There are currently two taglibs, containing tags for different approaches to
@@ -889,7 +887,7 @@
<para>Again, analogous to the way it is done for layouts, themes are specified in the
portal descriptor as a portal or page property. The page property overwrites the portal
property. In addition to these two options, themes can also be specified as part of the
- theme JSP tag , that is placed on the layout JSP. Here is an example portal descriptor
+ theme <trademark class="trade">JSP</trademark> tag , that is placed on the layout JSP. Here is an example portal descriptor
that specifies the phalanx theme as the theme for the entire portal, and the industrial
theme for the theme test page:
<programlisting>
@@ -1007,7 +1005,7 @@
");]]>
</programlisting>
Note that in order for the header content injection to work, the layout needs to make
- use of the headerContent JSP tag, like:
+ use of the headerContent <trademark class="trade">JSP</trademark> tag, like:
<programlisting>
<![CDATA[<%@ taglib uri="/WEB-INF/theme/portal-layout.tld" prefix="p" %>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
@@ -1042,7 +1040,7 @@
</portlet-app>]]></programlisting>
</para>
<para>This functionality, just like the previously described header content injection,
- requires the layout JSP to add the "headerContent" JSP tag (see example above). One thing to note here is
+ requires the layout <trademark class="trade">JSP</trademark> to add the "headerContent" JSP tag (see example above). One thing to note here is
the order of the tags. If the headerContent tag is placed after the theme tag, it will allow portlet
injected
CSS files to overwrite the theme's behavior, making this feature even more powerful!
17 years, 11 months
- 1
- 0
JBoss Portal SVN: r10969 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
by portal-commits＠lists.jboss.org
Author: mmcallis
Date: 2008-06-10 00:59:13 -0400 (Tue, 10 Jun 2008)
New Revision: 10969
Modified:
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/themeandlayouts.xml
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml
Log:
fixing trademarks for JSP (still in progress)
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml 2008-06-10 04:04:49 UTC (rev 10968)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml 2008-06-10 04:59:13 UTC (rev 10969)
@@ -118,7 +118,7 @@
<sect2>
<title>Portal Policy</title>
<para>
- The portal error-policy controls the response sent to the Web browser when an error occurs. A default error policy exists, which can be configured per portal. If an error occurs, the policy can either handle a redirect to a JSP page, or ignore it. If the error is ignored, it is handled by the default policy, otherwise a JSP page is invoked with the appropriate request attributes, allowing page customization.
+ The portal error-policy controls the response sent to the Web browser when an error occurs. A default error policy exists, which can be configured per portal. If an error occurs, the policy can either handle a redirect to a <trademark class="trade">JSP</trademark> page, or ignore it. If the error is ignored, it is handled by the default policy, otherwise a JSP page is invoked with the appropriate request attributes, allowing page customization.
</para>
</sect2>
<sect2>
@@ -135,7 +135,7 @@
</listitem>
<listitem>
<para>
- replace the markup of the window using a redirection to a JSP page.
+ replace the markup of the window using a redirection to a <trademark class="trade">JSP</trademark> page.
</para>
</listitem>
</itemizedlist>
@@ -193,7 +193,7 @@
</row>
<row>
<entry align="center"><computeroutput>control.portal.resource_uri</computeroutput></entry>
- <entry align="center">the path of the JSP used for redirections</entry>
+ <entry align="center">the path of the <trademark class="trade">JSP</trademark> used for redirections</entry>
<entry align="center">a valid path to a JSP located in the <filename>portal-core.war/</filename> directory</entry>
</row>
</tbody>
@@ -286,7 +286,7 @@
</row>
<row>
<entry align="center"><computeroutput>control.page.resource_uri</computeroutput></entry>
- <entry align="center">the path of the JSP used for redirections</entry>
+ <entry align="center">the path of the <trademark class="trade">JSP</trademark> used for redirections</entry>
<entry align="center"><computeroutput>ignore</computeroutput>, <computeroutput>jsp</computeroutput> and <computeroutput>hide</computeroutput></entry>
</row>
</tbody>
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/themeandlayouts.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/themeandlayouts.xml 2008-06-10 04:04:49 UTC (rev 10968)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/themeandlayouts.xml 2008-06-10 04:59:13 UTC (rev 10969)
@@ -49,7 +49,7 @@
own entity.
<itemizedlist>
<para>To implement this encapsulation there are several ways:</para>
- <listitem>JSPs that get included from the layout JSP for each region/portlet</listitem>
+ <listitem><trademark class="trade">JSP</trademark> pages that get included from the layout JSP for each region/portlet</listitem>
<listitem>a taglib that allows to place region, window, and decoration tags into the
layout JSP
</listitem>
@@ -131,7 +131,7 @@
<listitem>The first option would simply require to modify
the theme CSS, by doing this you could change the fonts, the way tabs are rendered, colors and many
other things but not change the content.</listitem>
- <listitem>The second option is to modify the provided JSPs, <literal>header.jsp</literal> and
+ <listitem>The second option is to modify the provided <trademark class="trade">JSP</trademark> files, <literal>header.jsp</literal> and
<literal>tabs.jsp</literal>. It gives you more flexibility than the previous solution on modifying
the content. Links to legacy application could easily be added, URLs could be arranged differently, the CSS
approach could be replaced by good old HTML, CSS style names could be changed... The drawback of
@@ -141,14 +141,14 @@
</itemizedlist>
</para>
<sect3>
- <title>Writing his own JSPs</title>
- <para>The content of those two parts are displayed thanks to two different JSP pages. By default
+ <title>Writing his own <trademark class="trade">JSP</trademark> pages</title>
+ <para>The content of those two parts are displayed thanks to two different <trademark class="trade">JSP</trademark> pages. By default
you would find those pages in the directory <literal>portal-core.war/WEB-INF/jsp/header/</literal>.
The file <literal>header.jsp</literal> is used to display the links that are displayed on the upper
right of the default theme. The file <literal>tabs.jsp</literal> is used to display the pages tabs
appearing on the left.
</para>
- <para> Again, you have several choices, either to edit the included JSPs directly or create your own,
+ <para> Again, you have several choices, either to edit the included <trademark class="trade">JSP</trademark> files directly or create your own,
store them in a web application then edit the following file: <literal>jboss-portal.sar/META-INF/jboss-service.xml</literal>.
The interesting part in that file is the following:
<programlisting><![CDATA[<mbean
@@ -166,7 +166,7 @@
</mbean>]]></programlisting>
The three attributes are:
<itemizedlist>
- <listitem>TargetContextPath: Defines the web application context where the JSPs are located</listitem>
+ <listitem>TargetContextPath: Defines the web application context where the JSP files are located</listitem>
<listitem>HeaderPath: Defines the location (in the web application previously defined) of the JSP in charge of writing the header links</listitem>
<listitem>TabsPath: Defines the location (in the web application previously defined) of the JSP in charge of writing the pages links (note that it doesn't have to be renderer as tabs)</listitem>
</itemizedlist>
@@ -367,7 +367,7 @@
</sect2>
-->
<sect2>
- <title>Layout JSP-tags</title>
+ <title>Layout <trademark class="trade">JSP</trademark> tags</title>
<para>The portal comes with a set of JSP tags that allow the layout developer faster
development.
<itemizedlist>
@@ -803,7 +803,7 @@
swap, or change individual items of it. No compile or redeploy is necessary. Themes
can be added or removed while the portal is active. Themes can be deployed in separate
web applications furthering even more the flexibility of this approach. Web developers
- don't have to work with JSPs. They can stay in their favorite design tool and simple
+ don't have to work with <trademark class="trade">JSP</trademark> pages. They can stay in their favorite design tool and simple
work against the exploded war content that is deployed into the portal. The results can
be validated life in the portal.
</para>
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml 2008-06-10 04:04:49 UTC (rev 10968)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml 2008-06-10 04:59:13 UTC (rev 10969)
@@ -148,7 +148,7 @@
<sect3>
<title>Package Structure</title>
<para>
- Like other Java Platform, Enterprise Edition (Java EE) applications, portlets are packaged in WAR files. A typical portlet WAR file can include servlets, resource bundles, images, HTML, JSPs, and other static or dynamic files. The following is an example of the directory structure of the HelloWorldPortlet portlet:
+ Like other Java Platform, Enterprise Edition (Java EE) applications, portlets are packaged in WAR files. A typical portlet WAR file can include servlets, resource bundles, images, HTML, <trademark class="trade">JSP</trademark>, and other static or dynamic files. The following is an example of the directory structure of the HelloWorldPortlet portlet:
</para>
<para>
<mediaobject>
@@ -554,7 +554,7 @@
Note: the directory names will be different for your system.
</para>
<para>
- Expanding the <filename>helloworldportlet.war</filename> file allows you to deploy the portlet as an expanded directory, which makes development easier. As well, it gives you access to the application descriptors, resource files, JSF, and JSP pages. To expand the <filename>helloworldportlet.war</filename> file:
+ Expanding the <filename>helloworldportlet.war</filename> file allows you to deploy the portlet as an expanded directory, which makes development easier. As well, it gives you access to the application descriptors, resource files, JSF, and <trademark class="trade">JSP</trademark> pages. To expand the <filename>helloworldportlet.war</filename> file:
</para>
<para>
<orderedlist>
@@ -640,11 +640,11 @@
</sect3>
</sect2>
<sect2>
- <title>An example JSP Portlet</title>
+ <title>An example <trademark class="trade">JSP</trademark> portlet</title>
<sect3>
<title>Introduction</title>
<para>
- This section describes how to deploy a JSP portlet in JBoss Portal. Before proceeding, download the <ulink url="http://anonsvn.jboss.org/repos/portletswap/portlets/2_4/bundles/HelloWorl...">HelloWorldJSPPortlet</ulink> from <ulink url="http://labs.jboss.com/portletswap/">JBoss PortletSwap</ulink>. The HelloWorldJSPPortlet demonstrates how to use JSPs for view rendering, and the portlet tag library (taglib) for generating links.
+ This section describes how to deploy a <trademark class="trade">JSP</trademark> portlet in JBoss Portal. Before proceeding, download the <ulink url="http://anonsvn.jboss.org/repos/portletswap/portlets/2_4/bundles/HelloWorl...">HelloWorldJSPPortlet</ulink> from <ulink url="http://labs.jboss.com/portletswap/">JBoss PortletSwap</ulink>. The HelloWorldJSPPortlet demonstrates how to use JSP pages for view rendering, and the portlet tag library (taglib) for generating links.
</para>
</sect3>
<sect3>
@@ -786,7 +786,7 @@
</screen></term>
<listitem>
<para>
- The <literal>doView</literal> implementation is responsible for dispatching to the appropriate JSP, <filename>HelloWorldJSPPortlet/WEB-INF/jsp/view.jsp</filename> or <filename>HelloWorldJSPPortlet/WEB-INF/jsp/view2.jsp</filename>, depending on the existence of the <literal>yourname</literal> parameter passed in from <literal>processAction</literal>.
+ The <literal>doView</literal> implementation is responsible for dispatching to the appropriate <trademark class="trade">JSP</trademark>, <filename>HelloWorldJSPPortlet/WEB-INF/jsp/view.jsp</filename> or <filename>HelloWorldJSPPortlet/WEB-INF/jsp/view2.jsp</filename>, depending on the existence of the <literal>yourname</literal> parameter passed in from <literal>processAction</literal>.
</para>
</listitem>
</varlistentry>
@@ -794,9 +794,9 @@
</para>
</sect3>
<sect3>
- <title>JSP Files and the Portlet Tag Library</title>
+ <title><trademark class="trade">JSP</trademark> files and the Portlet Tag Library</title>
<para>
- The <filename>HelloWorldJSPPortlet/WEB-INF/jsp/view.jsp</filename> and <filename>HelloWorldJSPPortlet/WEB-INF/jsp/view2.jsp</filename> JSP files are included in the HelloWorldJSPPortlet portlet. The <filename>view.jsp</filename> file allows a user to input their name. This is then posted to the <computeroutput>processAction</computeroutput> method in the portlet class, which is set as a <computeroutput>aResponse.setRenderParameter</computeroutput>. The <computeroutput>doView</computeroutput> <literal>render</literal> method is invoked, which dispatches to the <filename>view2.jsp</filename> JSP:
+ The <filename>HelloWorldJSPPortlet/WEB-INF/jsp/view.jsp</filename> and <filename>HelloWorldJSPPortlet/WEB-INF/jsp/view2.jsp</filename> <trademark class="trade">JSP</trademark> files are included in the HelloWorldJSPPortlet portlet. The <filename>view.jsp</filename> file allows a user to input their name. This is then posted to the <computeroutput>processAction</computeroutput> method in the portlet class, which is set as a <computeroutput>aResponse.setRenderParameter</computeroutput>. The <computeroutput>doView</computeroutput> <literal>render</literal> method is invoked, which dispatches to the <filename>view2.jsp</filename> JSP:
</para>
<para>
<mediaobject>
@@ -876,7 +876,7 @@
</para>
</sect3>
<sect3>
- <title>Building your JSP Portlet</title>
+ <title>Building your <trademark class="trade">JSP</trademark> portlet</title>
<para>
The <filename>HelloWorldJSPPortlet.zip</filename> file contains a pre-compiled <filename>helloworldjspportlet.war</filename> file; however, to manually build the <filename>helloworldjspportlet.war</filename> file:
</para>
@@ -910,7 +910,7 @@
Note: the directory names will be different for your system.
</para>
<para>
- Expanding the <filename>helloworldjspportlet.war</filename> file allows you to deploy the portlet as an expanded directory, which makes development easier. As well, it gives you access to the application descriptors, resource files, JSF, and JSP pages. To expand the <filename>helloworldjspportlet.war</filename> file:
+ Expanding the <filename>helloworldjspportlet.war</filename> file allows you to deploy the portlet as an expanded directory, which makes development easier. As well, it gives you access to the application descriptors, resource files, JSF, and <trademark class="trade">JSP</trademark> pages. To expand the <filename>helloworldjspportlet.war</filename> file:
</para>
<para>
<orderedlist>
@@ -951,7 +951,7 @@
</para>
</sect3>
<sect3>
- <title>Deploying your JSP Portlet</title>
+ <title>Deploying your <trademark class="trade">JSP</trademark> portlet</title>
<para>
If you did not expand the <filename>helloworldjspportlet.war</filename> file, copy the <filename>HelloWorldJSPPortlet/helloworldjspportlet.war</filename> file into the correct JBoss AS or JBoss EAP <filename>deploy/</filename> directory. If you expanded the <filename>helloworldjspportlet.war</filename> file, copy the <filename>HelloWorldJSPPortlet/output/lib/exploded/helloworldjspportlet.war/</filename> directory into the correct JBoss AS or JBoss EAP <filename>deploy/</filename> directory. For example, if you are using the <computeroutput>default</computeroutput> JBoss AS profile, copy the WAR file or the expanded directory into the <filename>$JBOSS_HOME/server/default/deploy/</filename> directory.
</para>
@@ -1203,7 +1203,7 @@
Note: the directory names will be different for your system.
</para>
<para>
- Expanding the <filename>helloworldjsfsunriportlet.war</filename> file allows you to deploy the portlet as an expanded directory, which makes development easier. As well, it gives you access to the application descriptors, resource files, JSF, and JSP pages. To expand the <filename>helloworldjsfsunriportlet.war</filename> file:
+ Expanding the <filename>helloworldjsfsunriportlet.war</filename> file allows you to deploy the portlet as an expanded directory, which makes development easier. As well, it gives you access to the application descriptors, resource files, JSF, and <trademark class="trade">JSP</trademark> pages. To expand the <filename>helloworldjsfsunriportlet.war</filename> file:
</para>
<para>
<orderedlist>
@@ -1508,7 +1508,7 @@
Note: the directory names will be different for your system.
</para>
<para>
- Expanding the <filename>helloworldjsfmyfacesportlet.war</filename> file allows you to deploy the portlet as an expanded directory, which makes development easier. As well, it gives you access to the application descriptors, resource files, JSF, and JSP pages. To expand the <filename>helloworldjsfmyfacesportlet.war</filename> file:
+ Expanding the <filename>helloworldjsfmyfacesportlet.war</filename> file allows you to deploy the portlet as an expanded directory, which makes development easier. As well, it gives you access to the application descriptors, resource files, JSF, and <trademark class="trade">JSP</trademark> pages. To expand the <filename>helloworldjsfmyfacesportlet.war</filename> file:
</para>
<para>
<orderedlist>
17 years, 11 months
- 1
- 0
JBoss Portal SVN: r10968 - in docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en: modules and 1 other directory.
by portal-commits＠lists.jboss.org
Author: mmcallis
Date: 2008-06-10 00:04:49 -0400 (Tue, 10 Jun 2008)
New Revision: 10968
Modified:
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/master.xml
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/ajax.xml
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/identityportlets.xml
Log:
- fixing trademarks
- new master file to include trademark page
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/master.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/master.xml 2008-06-10 01:54:23 UTC (rev 10967)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/master.xml 2008-06-10 04:04:49 UTC (rev 10968)
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3CR3//EN"
"../../docbook-support/support/docbook-dtd/docbookx.dtd" [
+ <!ENTITY trademarks SYSTEM "modules/trademarks.xml">
<!ENTITY overview SYSTEM "../../common/en/modules/overview.xml">
<!ENTITY featurelist SYSTEM "../../common/en/modules/featurelist.xml">
<!ENTITY target SYSTEM "modules/target.xml">
@@ -68,6 +69,7 @@
</author>
</bookinfo>
<toc/>
+ <!-- Trademark - Trying to make all vendor legal teams happy --> &trademarks;
<!-- Portal overview - marketing stuff --> &overview;
<!-- Comprehensive list of included features --> &featurelist;
<!-- Target audience of this document --> ⌖
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/ajax.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/ajax.xml 2008-06-10 01:54:23 UTC (rev 10967)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/ajax.xml 2008-06-10 04:04:49 UTC (rev 10968)
@@ -209,7 +209,7 @@
<listitem>
<para>Form GET are not handled, however it should not be an issue as this situation is discouraged
by the Portlet specification. It however taken in account, just in case of. Here is an example
- of a JavaServer Page that would do one:</para>
+ of a <trademark class="trade">JavaServer</trademark> Page that would do one:</para>
<programlisting><![CDATA[
<form action="<%= renderResponse.createActionURL() %>" method="get">
...
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml 2008-06-10 01:54:23 UTC (rev 10967)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml 2008-06-10 04:04:49 UTC (rev 10968)
@@ -343,9 +343,9 @@
</sect2>
</sect1>
<sect1>
- <title>Handling Errors with JavaServer Pages (JSP)</title>
+ <title>Handling Errors with <trademark class="trade">JavaServer</trademark> Pages (<trademark class="trade">JSP</trademark>)</title>
<para>
- As described in previous sections, error handling can be redirected to a JSP. Two pages can be created to handle errors, one for the portal level, and the other for the page level. Portal level error-handling requires a page that produces a full page, and page-level handling requires a page that produces markup, but only for a window. When the page is invoked, a set of request attributes are passed. The following table represents possible request attributes:
+ As described in previous sections, error handling can be redirected to a <trademark class="trade">JSP</trademark>. Two pages can be created to handle errors, one for the portal level, and the other for the page level. Portal level error-handling requires a page that produces a full page, and page-level handling requires a page that produces markup, but only for a window. When the page is invoked, a set of request attributes are passed. The following table represents possible request attributes:
</para>
<para>
<table frame="all">
@@ -382,8 +382,8 @@
</para>
<para>
<note>
- <title>JSP Location</title>
- The JavaServer Pages must be located in the <filename>jboss-portal.sar/portal-core.war/</filename> web application.
+ <title><trademark class="trade">JSP</trademark> Location</title>
+ The <trademark class="trade">JavaServer</trademark> Pages must be located in the <filename>jboss-portal.sar/portal-core.war/</filename> web application.
</note>
</para>
</sect1>
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/identityportlets.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/identityportlets.xml 2008-06-10 01:54:23 UTC (rev 10967)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/identityportlets.xml 2008-06-10 04:04:49 UTC (rev 10968)
@@ -383,7 +383,7 @@
</itemizedlist>
</para>
<note>
- This is not a JavaServer Faces tutorial. Basic knowledge of
+ This is not a <trademark class="trade">JavaServer</trademark> Faces tutorial. Basic knowledge of
this technology is a precondition for customizing the User
Portlet Interface.
</note>
17 years, 11 months
- 1
- 0
JBoss Portal SVN: r10967 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
by portal-commits＠lists.jboss.org
Author: mmcallis
Date: 2008-06-09 21:54:23 -0400 (Mon, 09 Jun 2008)
New Revision: 10967
Modified:
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/security.xml
Log:
fixing Linux trademark attribution
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/security.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/security.xml 2008-06-10 01:41:31 UTC (rev 10966)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/security.xml 2008-06-10 01:54:23 UTC (rev 10967)
@@ -268,7 +268,7 @@
<title>CMS Super User</title>
<para>
A CMS Super User is a designated Portal User Account that has access to all resources/functions in the CMS. It is a concept similar to the
- super user concept in a Linux and <trademark class="registered">UNIX</trademark> security systems. This account should be carefully used and properly protected. By default, JBoss Portal designates the
+ super user concept in a <trademark class="registered">Linux</trademark> and <trademark class="registered">UNIX</trademark> security systems. This account should be carefully used and properly protected. By default, JBoss Portal designates the
built-in 'admin' user account as a CMS Super User. This can be changed by modifying the <emphasis>cmsRootUserName</emphasis> value in the
<literal>jboss-portal.sar/portal-cms.sar/META-INF/jboss-service.xml</literal> configuration.
<programlisting>
17 years, 11 months
- 1
- 0
JBoss Portal SVN: r10966 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
by portal-commits＠lists.jboss.org
Author: mmcallis
Date: 2008-06-09 21:41:31 -0400 (Mon, 09 Jun 2008)
New Revision: 10966
Modified:
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/configuration.xml
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/trademarks.xml
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml
Log:
Using registered symbol for all uses of Linux
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/configuration.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/configuration.xml 2008-06-10 01:29:50 UTC (rev 10965)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/configuration.xml 2008-06-10 01:41:31 UTC (rev 10966)
@@ -196,7 +196,7 @@
<sect1 id="emailConfiguration">
<title>Setting up the Email Service</title>
<para>
- If you have a standard setup and a mail server installed, the email service should work without any extra configuration. Most Linux distributions have a mail server installed by default. The email service, for example, can be used to verify a user's email address when a user subscribes, or for CMS workflow notifications.
+ If you have a standard setup and a mail server installed, the email service should work without any extra configuration. Most <trademark class="registered">Linux</trademark> distributions have a mail server installed by default. The email service, for example, can be used to verify a user's email address when a user subscribes, or for CMS workflow notifications.
</para>
<para>
The email service is configured using the <filename>$JBOSS_HOME/server/default/deploy/jboss-portal.sar/META-INF/jboss-service.xml</filename> file. The following is an example of the section which is used to configure the email service:
@@ -266,7 +266,7 @@
<para>JBoss Portal uses the JBoss Microkernel for the service infrastructure. The JBoss Microkernel provides injection of services into other services, otherwise known as wiring. Due to the Microkernel being JMX based, it is only possible to inject dynamic proxies that talk to the MBeanServer. The overhead at runtime is minimal since the Microkernel implementation is highly optimized; however, when it is used with Java 5, a noticeable bottleneck occurs due to the fact that the implementation of the JMX API classes, <emphasis>javax.management.*</emphasis>, provided by the Java Platform, perform synchronization. This does not occur under JDK 1.4, since those classes are implemented by JBoss MX.
</para>
<para>
- JBoss Portal services use a special kind of Model MBean called <emphasis>JBossServiceModelMBean</emphasis>, which allows the un-wrapping of injected dynamic proxies, and replaces them with Plain Old Java Object (POJO) services. This removes the bottleneck when using Java 5, and also provides a performance boost on JDK 1.4. By default this feature is enabled, but it is possible to disable. To do this on Linux systems, change into the <filename>$JBOSS_HOME/bin/</filename> directory and run the following command:
+ JBoss Portal services use a special kind of Model MBean called <emphasis>JBossServiceModelMBean</emphasis>, which allows the un-wrapping of injected dynamic proxies, and replaces them with Plain Old Java Object (POJO) services. This removes the bottleneck when using Java 5, and also provides a performance boost on JDK 1.4. By default this feature is enabled, but it is possible to disable. To do this on <trademark class="registered">Linux</trademark> systems, change into the <filename>$JBOSS_HOME/bin/</filename> directory and run the following command:
</para>
<para>
<screen>
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/trademarks.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/trademarks.xml 2008-06-10 01:29:50 UTC (rev 10965)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/trademarks.xml 2008-06-10 01:41:31 UTC (rev 10966)
@@ -13,6 +13,9 @@
Microsoft, Windows, and SQL Server are either registered trademarks or trademarks of Microsoft Corporation in the United States and/or other countries.
</para>
<para>
+ Linux® is the registered trademark of Linus Torvalds in the U.S. and other countries.
+ </para>
+ <para>
Other product and company names mentioned herein may be the trademarks of their respective owners.
</para>
</preface>
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml 2008-06-10 01:29:50 UTC (rev 10965)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml 2008-06-10 01:41:31 UTC (rev 10966)
@@ -619,7 +619,7 @@
</mediaobject>
</para>
<para>
- To re-deploy the portlet, for example, if you have made changes to any of the application descriptors, touch the <filename>$JBOSS_HOME/server/<replaceable>configuration</replaceable>/deploy/helloworldportlet.war/WEB-INF/web.xml</filename> file. This only works if you copied the <filename>HelloWorldPortlet/output/lib/exploded/helloworldportlet.war/</filename> directory into the JBoss AS or JBoss EAP <filename>deploy/</filename> directory. On Linux, run the following command to re-deploy the HelloWorldPortlet:
+ To re-deploy the portlet, for example, if you have made changes to any of the application descriptors, touch the <filename>$JBOSS_HOME/server/<replaceable>configuration</replaceable>/deploy/helloworldportlet.war/WEB-INF/web.xml</filename> file. This only works if you copied the <filename>HelloWorldPortlet/output/lib/exploded/helloworldportlet.war/</filename> directory into the JBoss AS or JBoss EAP <filename>deploy/</filename> directory. On <trademark class="registered">Linux</trademark>, run the following command to re-deploy the HelloWorldPortlet:
</para>
<para>
<screen>
@@ -894,7 +894,7 @@
</listitem>
<listitem>
<para>
- Change into <filename>HelloWorldJSPPortlet/</filename> directory, and run the <command>ant deploy</command> command. On Linux, the output will be similar to the following:
+ Change into <filename>HelloWorldJSPPortlet/</filename> directory, and run the <command>ant deploy</command> command. On <trademark class="registered">Linux</trademark>, the output will be similar to the following:
</para>
<para>
<mediaobject>
@@ -921,7 +921,7 @@
</listitem>
<listitem>
<para>
- To expand the WAR file, change into the <filename>HelloWorldJSPPortlet/</filename> directory, and run the <command>ant explode</command> command. On Linux, the output will be similar to the following:
+ To expand the WAR file, change into the <filename>HelloWorldJSPPortlet/</filename> directory, and run the <command>ant explode</command> command. On <trademark class="registered">Linux</trademark>, the output will be similar to the following:
</para>
<para>
<mediaobject>
@@ -975,7 +975,7 @@
</mediaobject>
</para>
<para>
- To re-deploy the portlet, for example, if you have made changes to any of the application descriptors, touch the <filename>$JBOSS_HOME/server/<replaceable>configuration</replaceable>/deploy/helloworldjspportlet.war/WEB-INF/web.xml</filename> file. This only works if you copied the <filename>HelloWorldJSPPortlet/output/lib/exploded/helloworldjspportlet.war/</filename> directory into the JBoss AS or JBoss EAP <filename>deploy/</filename> directory. On Linux, run the following command to re-deploy the HelloWorldJSPPortlet:
+ To re-deploy the portlet, for example, if you have made changes to any of the application descriptors, touch the <filename>$JBOSS_HOME/server/<replaceable>configuration</replaceable>/deploy/helloworldjspportlet.war/WEB-INF/web.xml</filename> file. This only works if you copied the <filename>HelloWorldJSPPortlet/output/lib/exploded/helloworldjspportlet.war/</filename> directory into the JBoss AS or JBoss EAP <filename>deploy/</filename> directory. On <trademark class="registered">Linux</trademark>, run the following command to re-deploy the HelloWorldJSPPortlet:
</para>
<para>
<screen>
@@ -1187,7 +1187,7 @@
</listitem>
<listitem>
<para>
- Change into <filename>HelloWorldJSFSunRIPortlet/</filename> directory, and run the <command>ant deploy</command> command. On Linux, the output will be similar to the following:
+ Change into <filename>HelloWorldJSFSunRIPortlet/</filename> directory, and run the <command>ant deploy</command> command. On <trademark class="registered">Linux</trademark>, the output will be similar to the following:
</para>
<para>
<mediaobject>
@@ -1214,7 +1214,7 @@
</listitem>
<listitem>
<para>
- To expand the WAR file, change into the <filename>HelloWorldJSFSunRIPortlet/</filename> directory, and run the <command>ant explode</command> command. On Linux, the output will be similar to the following:
+ To expand the WAR file, change into the <filename>HelloWorldJSFSunRIPortlet/</filename> directory, and run the <command>ant explode</command> command. On <trademark class="registered">Linux</trademark>, the output will be similar to the following:
</para>
<para>
<mediaobject>
@@ -1258,7 +1258,7 @@
</mediaobject>
</para>
<para>
- To re-deploy the portlet, for example, if you have made changes to any of the application descriptors, touch the <filename>$JBOSS_HOME/server/<replaceable>configuration</replaceable>/deploy/helloworldjsfsunriportlet.war/WEB-INF/web.xml</filename> file. This only works if you copied the <filename>HelloWorldJSFSunRIPortlet/output/lib/exploded/helloworldjsfsunriportlet.war/</filename> directory into the JBoss AS or JBoss EAP <filename>deploy/</filename> directory. On Linux, run the following command to re-deploy the HelloWorldJSFSunRIPortlet:
+ To re-deploy the portlet, for example, if you have made changes to any of the application descriptors, touch the <filename>$JBOSS_HOME/server/<replaceable>configuration</replaceable>/deploy/helloworldjsfsunriportlet.war/WEB-INF/web.xml</filename> file. This only works if you copied the <filename>HelloWorldJSFSunRIPortlet/output/lib/exploded/helloworldjsfsunriportlet.war/</filename> directory into the JBoss AS or JBoss EAP <filename>deploy/</filename> directory. On <trademark class="registered">Linux</trademark>, run the following command to re-deploy the HelloWorldJSFSunRIPortlet:
</para>
<para>
<screen>
@@ -1492,7 +1492,7 @@
</listitem>
<listitem>
<para>
- Change into <filename>HelloWorldJSFMyFaces42Portlet/</filename> directory, and run the <command>ant deploy</command> command. On Linux, the output will be similar to the following:
+ Change into <filename>HelloWorldJSFMyFaces42Portlet/</filename> directory, and run the <command>ant deploy</command> command. On <trademark class="registered">Linux</trademark>, the output will be similar to the following:
</para>
<para>
<mediaobject>
@@ -1519,7 +1519,7 @@
</listitem>
<listitem>
<para>
- To expand the WAR file, change into the <filename>HelloWorldJSFMyFaces42Portlet/</filename> directory, and run the <command>ant explode</command> command. On Linux, the output will be similar to the following:
+ To expand the WAR file, change into the <filename>HelloWorldJSFMyFaces42Portlet/</filename> directory, and run the <command>ant explode</command> command. On <trademark class="registered">Linux</trademark>, the output will be similar to the following:
</para>
<para>
<mediaobject>
@@ -1556,7 +1556,7 @@
</mediaobject>
</para>
<para>
- To re-deploy the portlet, for example, if you have made changes to any of the application descriptors, touch the <filename>$JBOSS_HOME/server/<replaceable>configuration</replaceable>/deploy/helloworldjsfmyfacesportlet.war/WEB-INF/web.xml</filename> file. This only works if you copied the <filename>HelloWorldJSFMyFaces42Portlet/output/lib/exploded/helloworldjsfmyfacesportlet.war/</filename> directory into the JBoss AS or JBoss EAP <filename>deploy/</filename> directory. On Linux, run the following command to re-deploy the HelloWorldJSFMyFaces42Portlet:
+ To re-deploy the portlet, for example, if you have made changes to any of the application descriptors, touch the <filename>$JBOSS_HOME/server/<replaceable>configuration</replaceable>/deploy/helloworldjsfmyfacesportlet.war/WEB-INF/web.xml</filename> file. This only works if you copied the <filename>HelloWorldJSFMyFaces42Portlet/output/lib/exploded/helloworldjsfmyfacesportlet.war/</filename> directory into the JBoss AS or JBoss EAP <filename>deploy/</filename> directory. On <trademark class="registered">Linux</trademark>, run the following command to re-deploy the HelloWorldJSFMyFaces42Portlet:
</para>
<para>
<screen>
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml 2008-06-10 01:29:50 UTC (rev 10965)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml 2008-06-10 01:41:31 UTC (rev 10966)
@@ -1585,7 +1585,7 @@
</listitem>
<listitem>
<para>
- Change into the <filename>JBOSS_PORTAL_SOURCE_DIRECTORY/build/</filename> directory. To build the JBoss Portal source code on Linux, run the <command>sh build.sh deploy</command> command, or, if you are running <trademark class="registered">Windows</trademark>, run the <command>build.bat deploy</command> command. If this is the first build, third-party libraries are obtained from an online repository, so you must be connected to the Internet. After building, if the <filename>JBOSS_PORTAL_SOURCE_DIRECTORY/thirdparty/</filename> directory does not exist, it is created, and populated with the files required for later steps. For further details, refer to <xref linkend="building_deploying_from_source" />.
+ Change into the <filename>JBOSS_PORTAL_SOURCE_DIRECTORY/build/</filename> directory. To build the JBoss Portal source code on <trademark class="registered">Linux</trademark>, run the <command>sh build.sh deploy</command> command, or, if you are running <trademark class="registered">Windows</trademark>, run the <command>build.bat deploy</command> command. If this is the first build, third-party libraries are obtained from an online repository, so you must be connected to the Internet. After building, if the <filename>JBOSS_PORTAL_SOURCE_DIRECTORY/thirdparty/</filename> directory does not exist, it is created, and populated with the files required for later steps. For further details, refer to <xref linkend="building_deploying_from_source" />.
</para>
</listitem>
<listitem>
17 years, 11 months
- 1
- 0