JBoss Portal SVN: r11167 - branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/component/portlet.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-06-27 06:57:35 -0400 (Fri, 27 Jun 2008)
New Revision: 11167
Modified:
branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/component/portlet/JSFInvocation.java
Log:
Oups
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-27 10:42:24 UTC (rev 11166)
+++ branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/component/portlet/JSFInvocation.java 2008-06-27 10:57:35 UTC (rev 11167)
@@ -111,9 +111,9 @@
this.portalContext = new JSFPortalContext(faces, uiportlet);
this.requestContext = new AbstractRequestContext(clientRequest);
this.securityContext = new JSFSecurityContext(faces);
- this.userContext = new JSFUserContext(faces);
this.windowContext = new JSFWindowContext(faces);
this.serverContext = new JSFServerContext(this);
+ this.userContext = new JSFUserContext((JSFServerContext)serverContext, faces);
}
String renderURL(ContainerURL containerURL, Boolean wantSecure, Boolean wantAuthenticated, boolean relative)
17 years, 10 months
- 1
- 0
JBoss Portal SVN: r11166 - branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/component/portlet.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-06-27 06:42:24 -0400 (Fri, 27 Jun 2008)
New Revision: 11166
Modified:
branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/component/portlet/JSFUserContext.java
Log:
- Requires Principal scope attributes
Modified: branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/component/portlet/JSFUserContext.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/component/portlet/JSFUserContext.java 2008-06-27 00:39:53 UTC (rev 11165)
+++ branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/component/portlet/JSFUserContext.java 2008-06-27 10:42:24 UTC (rev 11166)
@@ -28,7 +28,8 @@
import javax.faces.context.FacesContext;
-import org.jboss.portal.common.NotYetImplemented;
+import org.jboss.portal.common.invocation.AttributeResolver;
+import org.jboss.portal.common.invocation.resolver.PrincipalAttributeResolver;
import org.jboss.portal.common.util.Tools;
import org.jboss.portal.portlet.spi.UserContext;
@@ -42,9 +43,12 @@
/** . */
private final FacesContext faces;
- public JSFUserContext(FacesContext faces)
+ private AttributeResolver principalAttributeResolver;
+
+ public JSFUserContext(JSFServerContext ctx, FacesContext faces)
{
this.faces = faces;
+ this.principalAttributeResolver = new PrincipalAttributeResolver(ctx.getClientRequest());
}
public String getId()
@@ -69,12 +73,12 @@
public Object getAttribute(String arg0)
{
- throw new NotYetImplemented();
+ return principalAttributeResolver.getAttribute(arg0);
}
public void setAttribute(String arg0, Object arg1)
{
- throw new NotYetImplemented();
+ principalAttributeResolver.setAttribute(arg0, arg1);
}
}
17 years, 10 months
- 1
- 0
JBoss Portal SVN: r11165 - modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-06-26 20:39:53 -0400 (Thu, 26 Jun 2008)
New Revision: 11165
Modified:
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerCapabilitiesInfo.java
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerInfoBuilder.java
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerModeInfo.java
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerWindowStateInfo.java
Log:
add support for custom window state runtime info
Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerCapabilitiesInfo.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerCapabilitiesInfo.java 2008-06-27 00:18:38 UTC (rev 11164)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerCapabilitiesInfo.java 2008-06-27 00:39:53 UTC (rev 11165)
@@ -96,9 +96,14 @@
public void add(String contentType, WindowState windowState)
{
+ add(contentType, new ContainerWindowStateInfo(windowState));
+ }
+
+ public void add(String contentType, ContainerWindowStateInfo windowState)
+ {
try
{
- supportedWindowStates.put(contentType, new ContainerWindowStateInfo(windowState));
+ supportedWindowStates.put(contentType, windowState);
}
catch (IllegalArgumentException e)
{
Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerInfoBuilder.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerInfoBuilder.java 2008-06-27 00:18:38 UTC (rev 11164)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerInfoBuilder.java 2008-06-27 00:39:53 UTC (rev 11165)
@@ -37,6 +37,7 @@
import org.jboss.portal.portlet.impl.metadata.PublicRenderParameterMetaData;
import org.jboss.portal.portlet.impl.metadata.UserAttributeMetaData;
import org.jboss.portal.portlet.impl.metadata.CustomPortletModeMetaData;
+import org.jboss.portal.portlet.impl.metadata.CustomWindowStateMetaData;
import org.jboss.portal.portlet.impl.metadata.common.ContainerRuntimeMetaData;
import org.jboss.portal.portlet.impl.metadata.common.InitParamMetaData;
import org.jboss.portal.portlet.impl.metadata.event.EventDefinitionMetaData;
@@ -140,6 +141,9 @@
private static final Map<String, CustomPortletModeMetaData> EMPTY_CUSTOM_PORTLET_MODES = Collections.emptyMap();
/** . */
+ private static final Map<String, CustomWindowStateMetaData> EMPTY_CUSTOM_WINDOW_STATES = Collections.emptyMap();
+
+ /** . */
private final PortletApplication10MetaData portletApplicationMD;
/** . */
@@ -167,6 +171,9 @@
private final Map<Mode, ContainerModeInfo> customModes;
/** . */
+ private final Map<WindowState, ContainerWindowStateInfo> customWindowStates;
+
+ /** . */
private final Logger log = Logger.getLogger(ContainerInfoBuilder.class);
public ContainerInfoBuilder(
@@ -182,6 +189,7 @@
this.portlets = new LinkedHashMap<String, ContainerPortletInfo>();
this.applicationOptions = new HashMap<String, ContainerOptionInfo>();
this.customModes = new HashMap<Mode, ContainerModeInfo>();
+ this.customWindowStates = new HashMap<WindowState, ContainerWindowStateInfo>();
}
public ContainerPortletApplicationInfo getApplication()
@@ -248,6 +256,10 @@
{
portletApplicationMD.setCustomPortletModes(EMPTY_CUSTOM_PORTLET_MODES);
}
+ if (portletApplicationMD.getCustomWindowStates() == null)
+ {
+ portletApplicationMD.setCustomWindowStates(EMPTY_CUSTOM_WINDOW_STATES);
+ }
}
private void fixMetaData(PortletMetaData portletMD)
@@ -423,63 +435,86 @@
ContainerFilterInfo filter = build(filterMD);
allFilters.put(filter.getName(), filter);
}
+ }
- // Build custom mode infos for reuse in portlet info
- for (CustomPortletModeMetaData customPortletModeMD : portletApplicationMD.getCustomPortletModes().values())
+ //
+ Map<String, UserAttributeMetaData> userAttributesMD = portletApplicationMD.getUserAttributes();
+ Set<String> supportedUserAttributes;
+ if (userAttributesMD != null)
+ {
+ supportedUserAttributes = Collections.unmodifiableSet(userAttributesMD.keySet());
+ }
+ else
+ {
+ supportedUserAttributes = Collections.emptySet();
+ }
+ ContainerUserInfo user = new ContainerUserInfo(supportedUserAttributes);
+
+ // Build custom mode infos for reuse in portlet info
+ for (CustomPortletModeMetaData customPortletModeMD : portletApplicationMD.getCustomPortletModes().values())
+ {
+ Mode mode = Mode.create(customPortletModeMD.getPortletMode());
+
+ //
+ LocalizedString description = customPortletModeMD.getDescription();
+
+ //
+ ContainerModeInfo modeInfo;
+ if (customPortletModeMD.isPortalManaged())
{
- Mode mode = Mode.create(customPortletModeMD.getPortletMode());
+ if (description != null)
+ {
+ modeInfo = new ContainerModeInfo(mode, description);
+ }
+ else
+ {
+ modeInfo = new ContainerModeInfo(mode);
+ }
+ }
+ else
+ {
+ ResourceBundleManager bundleMgr = context.getBundleManager();
//
- LocalizedString description = customPortletModeMD.getDescription();
+ LocalizedString displayName = bundleMgr.getLocalizedValue("javax.portlet.app.custom-portlet-mode." + mode + ".decoration-name", "" + mode);
//
- ContainerModeInfo modeInfo;
- if (customPortletModeMD.isPortalManaged())
+ if (description != null)
{
- if (description != null)
- {
- modeInfo = new ContainerModeInfo(mode, description);
- }
- else
- {
- modeInfo = new ContainerModeInfo(mode);
- }
+ modeInfo = new ContainerPortletManagedModeInfo(mode, description, displayName);
}
else
{
- ResourceBundleManager bundleMgr = context.getBundleManager();
+ modeInfo = new ContainerPortletManagedModeInfo(mode, displayName);
+ }
+ }
- //
- LocalizedString displayName = bundleMgr.getLocalizedValue("javax.portlet.app.custom-portlet-mode." + mode + ".decoration-name", "" + mode);
+ //
+ customModes.put(mode, modeInfo);
+ }
- //
- if (description != null)
- {
- modeInfo = new ContainerPortletManagedModeInfo(mode, description, displayName);
- }
- else
- {
- modeInfo = new ContainerPortletManagedModeInfo(mode, displayName);
- }
- }
+ // Build custom window state infos for reuse in portlet info
+ for (CustomWindowStateMetaData customPortletModeMD : portletApplicationMD.getCustomWindowStates().values())
+ {
+ WindowState windowState = WindowState.create(customPortletModeMD.getWindowState());
- //
- customModes.put(mode, modeInfo);
+ //
+ LocalizedString description = customPortletModeMD.getDescription();
+
+ //
+ ContainerWindowStateInfo windowStateInfo;
+ if (description != null)
+ {
+ windowStateInfo = new ContainerWindowStateInfo(windowState, description);
}
- }
+ else
+ {
+ windowStateInfo = new ContainerWindowStateInfo(windowState);
+ }
- //
- Map<String, UserAttributeMetaData> userAttributesMD = portletApplicationMD.getUserAttributes();
- Set<String> supportedUserAttributes;
- if (userAttributesMD != null)
- {
- supportedUserAttributes = Collections.unmodifiableSet(userAttributesMD.keySet());
+ //
+ customWindowStates.put(windowState, windowStateInfo);
}
- else
- {
- supportedUserAttributes = Collections.emptySet();
- }
- ContainerUserInfo user = new ContainerUserInfo(supportedUserAttributes);
//
return new ContainerPortletApplicationInfo(
@@ -860,16 +895,26 @@
}
}
- //
+ // then process window states
+ for (WindowStateMetaData windowStateMD : supportsMD.getWindowStates())
+ {
+ ContainerWindowStateInfo windowStateInfo = customWindowStates.get(windowStateMD.getWindowState());
+
+ //
+ if (windowStateInfo != null)
+ {
+ capabilities.add(mimeType, windowStateInfo);
+ }
+ else
+ {
+ capabilities.add(mimeType, windowStateMD.getWindowState());
+ }
+ }
+
+ // Override those as also now they must be supported
capabilities.add(mimeType, WindowState.NORMAL);
capabilities.add(mimeType, WindowState.MINIMIZED);
capabilities.add(mimeType, WindowState.MAXIMIZED);
-
- // Then process each window state
- for (WindowStateMetaData windowStateMD : supportsMD.getWindowStates())
- {
- capabilities.add(mimeType, windowStateMD.getWindowState());
- }
}
//
Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerModeInfo.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerModeInfo.java 2008-06-27 00:18:38 UTC (rev 11164)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerModeInfo.java 2008-06-27 00:39:53 UTC (rev 11165)
@@ -52,6 +52,10 @@
{
throw new IllegalArgumentException("Specified mode cannot be null!");
}
+ if (description == null)
+ {
+ throw new IllegalArgumentException("Specified description cannot be null!");
+ }
//
this.mode = mode;
Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerWindowStateInfo.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerWindowStateInfo.java 2008-06-27 00:18:38 UTC (rev 11164)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerWindowStateInfo.java 2008-06-27 00:39:53 UTC (rev 11165)
@@ -43,6 +43,30 @@
/** . */
private final WindowState windowState;
+ /** . */
+ private final LocalizedString description;
+
+ public ContainerWindowStateInfo(WindowState windowState, LocalizedString description)
+ {
+ if (windowState == null)
+ {
+ throw new IllegalArgumentException("Specified window state cannot be null!");
+ }
+ if (description == null)
+ {
+ throw new IllegalArgumentException("Specified description cannot be null!");
+ }
+
+ //
+ this.windowState = windowState;
+ this.description = description;
+ }
+
+ public ContainerWindowStateInfo(WindowState windowState)
+ {
+ this(windowState, DEFAULT_DESCRIPTION);
+ }
+
public boolean equals(Object o)
{
if (this == o)
@@ -65,18 +89,9 @@
return windowState.hashCode();
}
- public ContainerWindowStateInfo(WindowState windowState)
- {
- if (windowState == null)
- {
- throw new IllegalArgumentException("Specified window state cannot be null!");
- }
- this.windowState = windowState;
- }
-
public LocalizedString getDescription()
{
- return DEFAULT_DESCRIPTION; //fix-me
+ return description;
}
public WindowState getWindowState()
17 years, 10 months
- 1
- 0
JBoss Portal SVN: r11164 - in modules/portlet/trunk/portlet/src: main/java/org/jboss/portal/portlet/info and 1 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-06-26 20:18:38 -0400 (Thu, 26 Jun 2008)
New Revision: 11164
Modified:
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerCapabilitiesInfo.java
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/CapabilitiesInfo.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/CapabilitiesInfoSupport.java
Log:
add on capabilities info the way to obtain the description of a mode or a window state. this can be used to know for instance whether a portlet mode is managed by the portal or the portlet
Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerCapabilitiesInfo.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerCapabilitiesInfo.java 2008-06-27 00:12:01 UTC (rev 11163)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerCapabilitiesInfo.java 2008-06-27 00:18:38 UTC (rev 11164)
@@ -133,11 +133,39 @@
return supportedModes.getValues();
}
+ public ModeInfo getMode(Mode value)
+ {
+ for (ModeInfo mode : getAllModes())
+ {
+ if (mode.getMode().equals(value))
+ {
+ return mode;
+ }
+ }
+
+ //
+ return null;
+ }
+
public Set<WindowStateInfo> getAllWindowStates()
{
return supportedWindowStates.getValues();
}
+ public WindowStateInfo getWindowState(WindowState value)
+ {
+ for (WindowStateInfo windowState : getAllWindowStates())
+ {
+ if (windowState.getWindowState().equals(value))
+ {
+ return windowState;
+ }
+ }
+
+ //
+ return null;
+ }
+
public Set<Locale> getAllLocales()
{
return supportedLocales;
Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/CapabilitiesInfo.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/CapabilitiesInfo.java 2008-06-27 00:12:01 UTC (rev 11163)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/CapabilitiesInfo.java 2008-06-27 00:18:38 UTC (rev 11164)
@@ -61,6 +61,14 @@
Set<ModeInfo> getModes(MediaType mediaType);
/**
+ * Returns a mode info matching a specifed mode or null.
+ *
+ * @param mode the mode
+ * @return the mode info
+ */
+ ModeInfo getMode(Mode mode);
+
+ /**
* Retrieves all the window states supported by the associated Portlet.
*
* @return a Set of {@link WindowStateInfo} reprensenting the supported window states
@@ -76,6 +84,14 @@
Set<WindowStateInfo> getWindowStates(MediaType mimeType);
/**
+ * Returns a window state info matching a specifed window state or null.
+ *
+ * @param windowState the window state
+ * @return the window state info
+ */
+ WindowStateInfo getWindowState(WindowState windowState);
+
+ /**
* Retrieves all the locales supported by the associated Portlet.
*
* @return the Set of supported {@link java.util.Locale}s
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/CapabilitiesInfoSupport.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/CapabilitiesInfoSupport.java 2008-06-27 00:12:01 UTC (rev 11163)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/CapabilitiesInfoSupport.java 2008-06-27 00:18:38 UTC (rev 11164)
@@ -94,6 +94,20 @@
return Collections.emptySet();
}
+ public ModeInfo getMode(Mode value)
+ {
+ for (ModeInfo mode : getAllModes())
+ {
+ if (mode.getMode().equals(value))
+ {
+ return mode;
+ }
+ }
+
+ //
+ return null;
+ }
+
public Set<WindowStateInfo> getAllWindowStates()
{
return windowStates;
@@ -113,6 +127,20 @@
return locales;
}
+ public WindowStateInfo getWindowState(WindowState value)
+ {
+ for (WindowStateInfo windowState : getAllWindowStates())
+ {
+ if (windowState.getWindowState().equals(value))
+ {
+ return windowState;
+ }
+ }
+
+ //
+ return null;
+ }
+
public Set<Locale> getLocales(MediaType mimeType)
{
if (mediaTypes.contains(mimeType))
17 years, 10 months
- 1
- 0
JBoss Portal SVN: r11163 - modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-06-26 20:12:01 -0400 (Thu, 26 Jun 2008)
New Revision: 11163
Modified:
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/CapabilitiesInfo.java
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/ModeInfo.java
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/WindowStateInfo.java
Log:
- implement portlet managed mode in meta data
- implements custom portlet mode defined at the applciation level
Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/CapabilitiesInfo.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/CapabilitiesInfo.java 2008-06-26 23:53:59 UTC (rev 11162)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/CapabilitiesInfo.java 2008-06-27 00:12:01 UTC (rev 11163)
@@ -53,13 +53,6 @@
Set<ModeInfo> getAllModes();
/**
- *
- * @param mode
- * @return
- */
- // ModeInfo getMode(Mode mode);
-
- /**
* Retrieves the portlet modes supported by the associated Portlet for the specified Media type.
*
* @param mediaType the media type
@@ -83,13 +76,6 @@
Set<WindowStateInfo> getWindowStates(MediaType mimeType);
/**
- *
- * @param windowState
- * @return
- */
- // WindowStateInfo getWindowState(WindowState windowState);
-
- /**
* Retrieves all the locales supported by the associated Portlet.
*
* @return the Set of supported {@link java.util.Locale}s
Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/ModeInfo.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/ModeInfo.java 2008-06-26 23:53:59 UTC (rev 11162)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/ModeInfo.java 2008-06-27 00:12:01 UTC (rev 11163)
@@ -24,10 +24,7 @@
import org.jboss.portal.Mode;
import org.jboss.portal.common.i18n.LocalizedString;
-import org.jboss.portal.common.net.media.MediaType;
-import java.util.Set;
-
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 6818 $
@@ -55,7 +52,4 @@
* @return the associated Mode name.
*/
String getModeName();
-
-
- //Set<MediaType> getMediaTypes();
}
Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/WindowStateInfo.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/WindowStateInfo.java 2008-06-26 23:53:59 UTC (rev 11162)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/WindowStateInfo.java 2008-06-27 00:12:01 UTC (rev 11163)
@@ -24,10 +24,7 @@
import org.jboss.portal.WindowState;
import org.jboss.portal.common.i18n.LocalizedString;
-import org.jboss.portal.common.net.media.MediaType;
-import java.util.Set;
-
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 6818 $
@@ -55,10 +52,4 @@
* @return the associated window state name.
*/
String getWindowStateName();
-
- /**
- *
- * @return
- */
- // Set<MediaType> getMediaTypes();
}
17 years, 10 months
- 1
- 0
JBoss Portal SVN: r11162 - in modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet: info and 1 other directory.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-06-26 19:53:59 -0400 (Thu, 26 Jun 2008)
New Revision: 11162
Added:
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerPortletManagedModeInfo.java
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/PortletManagedModeInfo.java
Modified:
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerCapabilitiesInfo.java
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerInfoBuilder.java
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerModeInfo.java
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/CapabilitiesInfo.java
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/ModeInfo.java
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/WindowStateInfo.java
Log:
- implement portlet managed mode in meta data
- implements custom portlet mode defined at the applciation level
Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerCapabilitiesInfo.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerCapabilitiesInfo.java 2008-06-26 16:27:34 UTC (rev 11161)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerCapabilitiesInfo.java 2008-06-26 23:53:59 UTC (rev 11162)
@@ -79,9 +79,14 @@
public void add(String contentType, Mode mode)
{
+ add(contentType, new ContainerModeInfo(mode));
+ }
+
+ public void add(String contentType, ContainerModeInfo mode)
+ {
try
{
- supportedModes.put(contentType, new ContainerModeInfo(mode));
+ supportedModes.put(contentType, mode);
}
catch (IllegalArgumentException e)
{
Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerInfoBuilder.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerInfoBuilder.java 2008-06-26 16:27:34 UTC (rev 11161)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerInfoBuilder.java 2008-06-26 23:53:59 UTC (rev 11162)
@@ -36,6 +36,7 @@
import org.jboss.portal.portlet.impl.metadata.PortletApplication20MetaData;
import org.jboss.portal.portlet.impl.metadata.PublicRenderParameterMetaData;
import org.jboss.portal.portlet.impl.metadata.UserAttributeMetaData;
+import org.jboss.portal.portlet.impl.metadata.CustomPortletModeMetaData;
import org.jboss.portal.portlet.impl.metadata.common.ContainerRuntimeMetaData;
import org.jboss.portal.portlet.impl.metadata.common.InitParamMetaData;
import org.jboss.portal.portlet.impl.metadata.event.EventDefinitionMetaData;
@@ -136,6 +137,9 @@
private static final Map<String, ContainerRuntimeMetaData> EMPTY_CONTAINER_RUNTIME_OPTION_MAP = Collections.emptyMap();
/** . */
+ private static final Map<String, CustomPortletModeMetaData> EMPTY_CUSTOM_PORTLET_MODES = Collections.emptyMap();
+
+ /** . */
private final PortletApplication10MetaData portletApplicationMD;
/** . */
@@ -157,11 +161,14 @@
private final Map<String, ContainerPortletInfo> portlets;
/** . */
- private final Logger log = Logger.getLogger(ContainerInfoBuilder.class);
+ private final Map<String, ContainerOptionInfo> applicationOptions;
/** . */
- private Map<String, ContainerOptionInfo> applicationOptions;
+ private final Map<Mode, ContainerModeInfo> customModes;
+ /** . */
+ private final Logger log = Logger.getLogger(ContainerInfoBuilder.class);
+
public ContainerInfoBuilder(
String portletApplicationId,
PortletApplication10MetaData portletApplicationMD,
@@ -173,6 +180,8 @@
this.events = new LinkedHashMap<QName, ContainerEventInfo>();
this.publicParameters = new LinkedHashMap<String, ContainerParameterInfo>();
this.portlets = new LinkedHashMap<String, ContainerPortletInfo>();
+ this.applicationOptions = new HashMap<String, ContainerOptionInfo>();
+ this.customModes = new HashMap<Mode, ContainerModeInfo>();
}
public ContainerPortletApplicationInfo getApplication()
@@ -233,6 +242,12 @@
tmp.setContainerRuntimeOptions(EMPTY_CONTAINER_RUNTIME_OPTION_MAP);
}
}
+
+ //
+ if (portletApplicationMD.getCustomPortletModes() == null)
+ {
+ portletApplicationMD.setCustomPortletModes(EMPTY_CUSTOM_PORTLET_MODES);
+ }
}
private void fixMetaData(PortletMetaData portletMD)
@@ -387,15 +402,11 @@
}
//
- applicationOptions = build(tmp.getContainerRuntimeOptions().values());
+ Map<String, ContainerOptionInfo> applicationOptions = build(tmp.getContainerRuntimeOptions().values());
if (applicationOptions != null)
{
- applicationOptions = Collections.unmodifiableMap(applicationOptions);
+ this.applicationOptions.putAll(applicationOptions);
}
- else
- {
- applicationOptions = Collections.emptyMap();
- }
//
listeners = new ArrayList<ContainerListenerInfo>(tmp.getListeners().size());
@@ -412,6 +423,49 @@
ContainerFilterInfo filter = build(filterMD);
allFilters.put(filter.getName(), filter);
}
+
+ // Build custom mode infos for reuse in portlet info
+ for (CustomPortletModeMetaData customPortletModeMD : portletApplicationMD.getCustomPortletModes().values())
+ {
+ Mode mode = Mode.create(customPortletModeMD.getPortletMode());
+
+ //
+ LocalizedString description = customPortletModeMD.getDescription();
+
+ //
+ ContainerModeInfo modeInfo;
+ if (customPortletModeMD.isPortalManaged())
+ {
+ if (description != null)
+ {
+ modeInfo = new ContainerModeInfo(mode, description);
+ }
+ else
+ {
+ modeInfo = new ContainerModeInfo(mode);
+ }
+ }
+ else
+ {
+ ResourceBundleManager bundleMgr = context.getBundleManager();
+
+ //
+ LocalizedString displayName = bundleMgr.getLocalizedValue("javax.portlet.app.custom-portlet-mode." + mode + ".decoration-name", "" + mode);
+
+ //
+ if (description != null)
+ {
+ modeInfo = new ContainerPortletManagedModeInfo(mode, description, displayName);
+ }
+ else
+ {
+ modeInfo = new ContainerPortletManagedModeInfo(mode, displayName);
+ }
+ }
+
+ //
+ customModes.put(mode, modeInfo);
+ }
}
//
@@ -793,7 +847,17 @@
// Then process each mode
for (PortletModeMetaData modeMD : supportsMD.getPortletModes())
{
- capabilities.add(mimeType, modeMD.getPortletMode());
+ ContainerModeInfo mode = customModes.get(modeMD.getPortletMode());
+
+ //
+ if (mode != null)
+ {
+ capabilities.add(mimeType, mode);
+ }
+ else
+ {
+ capabilities.add(mimeType, modeMD.getPortletMode());
+ }
}
//
Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerModeInfo.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerModeInfo.java 2008-06-26 16:27:34 UTC (rev 11161)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerModeInfo.java 2008-06-26 23:53:59 UTC (rev 11162)
@@ -43,6 +43,26 @@
/** . */
private final Mode mode;
+ /** . */
+ private final LocalizedString description;
+
+ public ContainerModeInfo(Mode mode, LocalizedString description)
+ {
+ if (mode == null)
+ {
+ throw new IllegalArgumentException("Specified mode cannot be null!");
+ }
+
+ //
+ this.mode = mode;
+ this.description = description;
+ }
+
+ public ContainerModeInfo(Mode mode)
+ {
+ this(mode, DEFAULT_DESCRIPTION);
+ }
+
public boolean equals(Object o)
{
if (this == o)
@@ -64,15 +84,6 @@
return mode.hashCode();
}
- public ContainerModeInfo(Mode mode)
- {
- if (mode == null)
- {
- throw new IllegalArgumentException("Specified mode cannot be null!");
- }
- this.mode = mode;
- }
-
public LocalizedString getDescription()
{
return DEFAULT_DESCRIPTION; // fix-me
Added: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerPortletManagedModeInfo.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerPortletManagedModeInfo.java (rev 0)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerPortletManagedModeInfo.java 2008-06-26 23:53:59 UTC (rev 11162)
@@ -0,0 +1,59 @@
+/******************************************************************************
+ * 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.portlet.impl.info;
+
+import org.jboss.portal.Mode;
+import org.jboss.portal.common.i18n.LocalizedString;
+import org.jboss.portal.portlet.info.PortletManagedModeInfo;
+
+/**
+ * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+public class ContainerPortletManagedModeInfo extends ContainerModeInfo implements PortletManagedModeInfo
+{
+
+ /** . */
+ private LocalizedString displayName;
+
+ public ContainerPortletManagedModeInfo(Mode mode, LocalizedString description, LocalizedString displayName)
+ {
+ super(mode, description);
+
+ //
+ this.displayName = displayName;
+ }
+
+ public ContainerPortletManagedModeInfo(Mode mode, LocalizedString displayName)
+ {
+ super(mode);
+
+ //
+ this.displayName = displayName;
+ }
+
+ public LocalizedString getDisplayName()
+ {
+ return displayName;
+ }
+}
Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/CapabilitiesInfo.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/CapabilitiesInfo.java 2008-06-26 16:27:34 UTC (rev 11161)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/CapabilitiesInfo.java 2008-06-26 23:53:59 UTC (rev 11162)
@@ -23,6 +23,8 @@
package org.jboss.portal.portlet.info;
import org.jboss.portal.common.net.media.MediaType;
+import org.jboss.portal.Mode;
+import org.jboss.portal.WindowState;
import java.util.Set;
import java.util.Locale;
@@ -51,6 +53,13 @@
Set<ModeInfo> getAllModes();
/**
+ *
+ * @param mode
+ * @return
+ */
+ // ModeInfo getMode(Mode mode);
+
+ /**
* Retrieves the portlet modes supported by the associated Portlet for the specified Media type.
*
* @param mediaType the media type
@@ -74,6 +83,13 @@
Set<WindowStateInfo> getWindowStates(MediaType mimeType);
/**
+ *
+ * @param windowState
+ * @return
+ */
+ // WindowStateInfo getWindowState(WindowState windowState);
+
+ /**
* Retrieves all the locales supported by the associated Portlet.
*
* @return the Set of supported {@link java.util.Locale}s
Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/ModeInfo.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/ModeInfo.java 2008-06-26 16:27:34 UTC (rev 11161)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/ModeInfo.java 2008-06-26 23:53:59 UTC (rev 11162)
@@ -24,7 +24,10 @@
import org.jboss.portal.Mode;
import org.jboss.portal.common.i18n.LocalizedString;
+import org.jboss.portal.common.net.media.MediaType;
+import java.util.Set;
+
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 6818 $
@@ -52,4 +55,7 @@
* @return the associated Mode name.
*/
String getModeName();
+
+
+ //Set<MediaType> getMediaTypes();
}
Added: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/PortletManagedModeInfo.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/PortletManagedModeInfo.java (rev 0)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/PortletManagedModeInfo.java 2008-06-26 23:53:59 UTC (rev 11162)
@@ -0,0 +1,42 @@
+/******************************************************************************
+ * 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.portlet.info;
+
+import org.jboss.portal.common.i18n.LocalizedString;
+
+/**
+ * Extends the mode info interface to add the notion of portlet managed mode.
+ *
+ * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+public interface PortletManagedModeInfo extends ModeInfo
+{
+
+ /**
+ * Returns the display name of the mode.
+ *
+ * @return the display name
+ */
+ LocalizedString getDisplayName();
+}
Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/WindowStateInfo.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/WindowStateInfo.java 2008-06-26 16:27:34 UTC (rev 11161)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/WindowStateInfo.java 2008-06-26 23:53:59 UTC (rev 11162)
@@ -24,7 +24,10 @@
import org.jboss.portal.WindowState;
import org.jboss.portal.common.i18n.LocalizedString;
+import org.jboss.portal.common.net.media.MediaType;
+import java.util.Set;
+
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 6818 $
@@ -52,4 +55,10 @@
* @return the associated window state name.
*/
String getWindowStateName();
+
+ /**
+ *
+ * @return
+ */
+ // Set<MediaType> getMediaTypes();
}
17 years, 10 months
- 1
- 0
JBoss Portal SVN: r11161 - in modules/presentation/trunk: presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/adapter and 1 other directory.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-06-26 12:27:34 -0400 (Thu, 26 Jun 2008)
New Revision: 11161
Modified:
modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/ModelAdapter.java
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/adapter/StructuralAdapter.java
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/adapter/StructuralStateContextImpl.java
Log:
typo
Modified: modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/ModelAdapter.java
===================================================================
--- modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/ModelAdapter.java 2008-06-26 13:38:48 UTC (rev 11160)
+++ modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/ModelAdapter.java 2008-06-26 16:27:34 UTC (rev 11161)
@@ -115,7 +115,7 @@
}
}
- public Collection<?> getChilren(Object o)
+ public Collection<?> getChildren(Object o)
{
if (o instanceof PortalNode)
{
Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/adapter/StructuralAdapter.java
===================================================================
--- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/adapter/StructuralAdapter.java 2008-06-26 13:38:48 UTC (rev 11160)
+++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/adapter/StructuralAdapter.java 2008-06-26 16:27:34 UTC (rev 11161)
@@ -42,7 +42,7 @@
N getParent(N n);
- Collection<? extends N> getChilren(N n);
+ Collection<? extends N> getChildren(N n);
String getId(N n);
Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/adapter/StructuralStateContextImpl.java
===================================================================
--- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/adapter/StructuralStateContextImpl.java 2008-06-26 13:38:48 UTC (rev 11160)
+++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/adapter/StructuralStateContextImpl.java 2008-06-26 16:27:34 UTC (rev 11161)
@@ -79,7 +79,7 @@
//
Set<String> childrenIds = new HashSet<String>();
- for (N childNode : adapter.getChilren(node))
+ for (N childNode : adapter.getChildren(node))
{
childrenIds.add(adapter.getId(childNode));
}
@@ -124,7 +124,7 @@
//
Set<StructuralObject> structuralChildren = new HashSet<StructuralObject>();
- for (N childNode : adapter.getChilren(parentNode))
+ for (N childNode : adapter.getChildren(parentNode))
{
structuralChildren.add(takeSnapshot(childNode));
}
@@ -221,7 +221,7 @@
StructuralObjectImpl nodeSnapshot = takeSnapshot(node);
Map<String, N> childrenMap = new HashMap<String, N>();
- for (N childNode : adapter.getChilren(node))
+ for (N childNode : adapter.getChildren(node))
{
childrenMap.put(adapter.getId(childNode), childNode);
}
17 years, 10 months
- 1
- 0
JBoss Portal SVN: r11160 - in docs/branches/JBoss_Portal_Branch_2_7: common/en/modules and 5 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-06-26 09:38:48 -0400 (Thu, 26 Jun 2008)
New Revision: 11160
Modified:
docs/branches/JBoss_Portal_Branch_2_7/
docs/branches/JBoss_Portal_Branch_2_7/common/en/modules/acknowledgements.xml
docs/branches/JBoss_Portal_Branch_2_7/common/en/modules/featurelist.xml
docs/branches/JBoss_Portal_Branch_2_7/common/en/modules/overview.xml
docs/branches/JBoss_Portal_Branch_2_7/quickstartuser/
docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/
docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/images/errorhandling/errorHandling_management.png
docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/clustering.xml
docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/cmsPortlet.xml
docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/configuration.xml
docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/errorhandling.xml
docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/identity.xml
docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/identityportlets.xml
docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/migration.xml
docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/security.xml
docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/sso.xml
docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/supported.xml
docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/themeandlayouts.xml
docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/trademarks.xml
docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/tutorials.xml
docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/xmldescriptors.xml
docs/branches/JBoss_Portal_Branch_2_7/userGuide/
Log:
Align with 2.6 branch
Property changes on: docs/branches/JBoss_Portal_Branch_2_7
___________________________________________________________________
Name: svn:ignore
- *.classpath
*.project
+ *.classpath
*.project
svn-commit.tmp
Modified: docs/branches/JBoss_Portal_Branch_2_7/common/en/modules/acknowledgements.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_7/common/en/modules/acknowledgements.xml 2008-06-26 13:11:13 UTC (rev 11159)
+++ docs/branches/JBoss_Portal_Branch_2_7/common/en/modules/acknowledgements.xml 2008-06-26 13:38:48 UTC (rev 11160)
@@ -26,7 +26,7 @@
for existing struts applications to work with the Portal.
</listitem>
<listitem>
- A few Red Hat employees, Remy Maucherat for Tomcat configuration, Magesh Kumar Bojan and Martin Putz always there to help our customers,
+ A few Red Hat employees, Remy Maucherat for Apache Tomcat configuration, Magesh Kumar Bojan and Martin Putz always there to help our customers,
Prabhat Jha for making sure that JBoss Portal runs great everywhere. Noel Rocher for his early feedback on JBoss Portal 2.6
and contributions. James Cobb for the Renaissance theme.
</listitem>
Modified: docs/branches/JBoss_Portal_Branch_2_7/common/en/modules/featurelist.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_7/common/en/modules/featurelist.xml 2008-06-26 13:11:13 UTC (rev 11159)
+++ docs/branches/JBoss_Portal_Branch_2_7/common/en/modules/featurelist.xml 2008-06-26 13:38:48 UTC (rev 11160)
@@ -11,46 +11,46 @@
<itemizedlist>
<listitem>
<emphasis role="bold">JEMS:</emphasis>
- Leverages the power of JBoss Enterprise Middleware
- Services : JBoss Application Server, JBoss Cache, JGroups, and Hibernate.
+ leverages the power of JBoss Enterprise Middleware
+ Services: JBoss Application Server, JBoss Cache, JGroups, and Hibernate.
</listitem>
<listitem>
- <emphasis role="bold">DB Agnostic:</emphasis>
- Will work with any RDBMS supported by Hibernate
+ <emphasis role="bold">Database Agnostic:</emphasis>
+ works with any RDBMS supported by Hibernate.
</listitem>
<listitem>
<emphasis role="bold">JAAS Authentication:</emphasis>
- Custom authentication via JAAS login modules.
+ custom authentication via JAAS login modules.
</listitem>
<listitem>
- <emphasis role="bold">Cacheing:</emphasis>
- Utilizes render-view caching for improved performance.
+ <emphasis role="bold">Caching:</emphasis>
+ utilizes render-view caching for improved performance.
</listitem>
<listitem>
- <emphasis role="bold">Clusterable:</emphasis>
- Cluster support allows for portal state to be
+ <emphasis role="bold">Clustering:</emphasis>
+ cluster support allows the portal state to be
clustered for all portal instances.
</listitem>
<listitem>
<emphasis role="bold">Hot-Deployment:</emphasis>
- Leverages JBoss dynamic auto deployment
+ leverages JBoss dynamic auto-deployment
features.
</listitem>
<listitem>
<emphasis role="bold">SAR Installer:</emphasis>
- Browser-based installer makes installation
+ browser-based installer makes installation
and initial configuration a breeze.
</listitem>
</itemizedlist>
</para>
<para>
- <emphasis role="bold">Single Sign On</emphasis>
+ <emphasis role="bold">Single Sign-on</emphasis>
<itemizedlist>
<listitem>
- <emphasis role="bold">Leverages Tomcat and JBoss single sign on (SSO) solutions.</emphasis>
+ <emphasis role="bold">Leverages Apache Tomcat and JBoss Single sign-on (SSO) solutions.</emphasis>
</listitem>
<listitem>
- <emphasis role="bold">Integrates with JOSSO and CAS out of the box. (Experimental support for Open SSO)</emphasis>
+ <emphasis role="bold">Integrates with JOSSO and CAS out of the box (experimental support for Open SSO).</emphasis>
</listitem>
</itemizedlist>
</para>
@@ -58,10 +58,10 @@
<emphasis role="bold">LDAP</emphasis>
<itemizedlist>
<listitem>
- <emphasis role="bold">Connect to virtually any LDAP server</emphasis>
+ <emphasis role="bold">Connect to virtually any LDAP server.</emphasis>
</listitem>
<listitem>
- <emphasis role="bold">Integrates with Sun Active Directory and OpenLDAP out of the box. (Experimental support for Active Directory)</emphasis>
+ <emphasis role="bold">Integrates with <trademark class="trade">Sun</trademark> Active Directory and OpenLDAP out of the box (experimental support for <trademark class="registered">Microsoft</trademark> <trademark class="registered">Active Directory</trademark>).</emphasis>
</listitem>
</itemizedlist>
</para>
@@ -69,24 +69,24 @@
<emphasis role="bold">Supported Standards</emphasis>
<itemizedlist>
<listitem>
- <emphasis role="bold">Portlet Specification and API 1.0 (JSR-168)</emphasis>
+ <emphasis role="bold">Portlet Specification and API 1.0 (JSR-168).</emphasis>
</listitem>
<listitem>
- <emphasis role="bold">Content Repository for Java Technology API (JSR-170)</emphasis>
+ <emphasis role="bold">Content Repository for <trademark class="trade">Java</trademark> technology API (JSR-170).</emphasis>
</listitem>
<listitem>
- <emphasis role="bold">Java Server Faces 1.2 (JSR-252)</emphasis>
+ <emphasis role="bold"><trademark class="trade">JavaServer</trademark> Faces 1.2 (JSR-252).</emphasis>
</listitem>
<listitem>
- <emphasis role="bold">Java Management Extension (JMX) 1.2</emphasis>
+ <emphasis role="bold">Java Management Extension (<trademark class="trade">JMX</trademark>) 1.2.</emphasis>
</listitem>
<listitem>
- <emphasis role="bold">Web Services for Remote Portlets (WSRP) 1.0</emphasis>
- See <ulink url="http://docs.jboss.com/jbportal/v2.6/reference-guide/en/html/wsrp.html#wsr...">WSRP
- support in Portal</ulink> for more details.
+ <emphasis role="bold">Web Services for Remote Portlets (WSRP) 1.0:</emphasis>
+ refer to <ulink url="http://docs.jboss.com/jbportal/v2.6.5/referenceGuide/html/wsrp.html#wsrp_...">WSRP
+ support in JBoss Portal</ulink> for further details.
</listitem>
<listitem>
- <emphasis role="bold">Full J2EE 1.4 compliance when used with JBoss AS</emphasis>
+ <emphasis role="bold">Full <trademark class="trade">J2EE</trademark> 1.4 compliance when used with JBoss AS.</emphasis>
</listitem>
</itemizedlist>
</para>
@@ -96,38 +96,38 @@
<itemizedlist>
<listitem>
<emphasis role="bold">Multiple Portal Instances:</emphasis>
- Ability to have multiple Portal
- instances running inside of one Portal container.
+ the ability to have multiple portal
+ instances running inside one portal container.
</listitem>
<listitem>
- <emphasis role="bold">IPC</emphasis>
- Inter-Portlet Communication API enables portlets to create links to other
- objects such as a page, portal or window .
+ <emphasis role="bold">IPC:</emphasis>
+ the Inter-Portlet Communication API enables portlets to create links to other
+ objects, such as pages, portals, and windows.
</listitem>
<listitem>
- <emphasis role="bold">Dynamicity</emphasis>
- The ability for administrators and users to create and destroy objects such as
+ <emphasis role="bold">Dynamic:</emphasis>
+ the ability for administrators and users to create and destroy objects such as
portlets, pages, portals, themes, and layouts at runtime.
</listitem>
<listitem>
<emphasis role="bold">Internationalization:</emphasis>
- Ability to use internationalization
+ the ability to use internationalization
resource files for every portlet.
</listitem>
<listitem>
<emphasis role="bold">Pluggable services:</emphasis>
- Authentication performed by the
+ authentication performed by the
servlet container and JAAS make it possible to swap the authentication scheme.
</listitem>
<listitem>
<emphasis role="bold">Page-based Architecture:</emphasis>
- Allows for the grouping/division
+ allows the grouping and division
of portlets on a per-page basis.
</listitem>
<listitem>
- <emphasis role="bold">Existing Framework support:</emphasis>
- Portlets utilizing Struts,
- Spring MVC, Sun JSF-RI, AJAX, or MyFaces are supported.
+ <emphasis role="bold">Existing Framework Support:</emphasis>
+ portlets utilizing Apache Struts,
+ Spring Web MVC, Sun JSF-RI, AJAX, and Apache MyFaces are supported.
</listitem>
</itemizedlist>
<para>
@@ -135,18 +135,18 @@
</para>
<itemizedlist>
<listitem>
- <emphasis role="bold">Easily swappable themes/layouts:</emphasis>
- New themes and layouts
- containing images can be deployed in WAR archives.
+ <emphasis role="bold">Swappable themes and layouts:</emphasis>
+ new themes and layouts
+ containing images can easily be deployed in WAR archives.
</listitem>
<listitem>
<emphasis role="bold">Flexible API:</emphasis>
- Theme and Layout API are designed to
+ the Theme and Layout APIs are designed to
separate the business layer from the presentation layer.
</listitem>
<listitem>
<emphasis role="bold">Per-page layout strategy:</emphasis>
- Different layouts can be
+ different layouts can be
assigned to different pages.
</listitem>
</itemizedlist>
@@ -155,36 +155,36 @@
</para>
<itemizedlist>
<listitem>
- <emphasis role="bold">User registration/validation:</emphasis>
- Configurable registration
- parameters allow for user email validation before activation.
+ <emphasis role="bold">User Registration and Validation:</emphasis>
+ configurable registration
+ parameters allow user email validation before activation.
</listitem>
<listitem>
<emphasis role="bold">Workflow:</emphasis>
- Ability to define your own jBPM workflow on user registration.
+ ability to define your own jBPM workflow on user registration.
</listitem>
<listitem>
- <emphasis role="bold">User login:</emphasis>
- Makes use of servlet container authentication.
+ <emphasis role="bold">User Log In:</emphasis>
+ makes use of servlet container authentication.
</listitem>
<listitem>
- <emphasis role="bold">Create/Edit Users:</emphasis>
- Ability for administrators to
- create/edit user profiles.
+ <emphasis role="bold">Create and Edit Users:</emphasis>
+ ability for administrators to
+ create and edit user profiles.
</listitem>
<listitem>
- <emphasis role="bold">Create/Edit Roles:</emphasis>
- Ability for administrators create/edit
+ <emphasis role="bold">Create and Edit Roles:</emphasis>
+ Ability for administrators create and edit
roles.
</listitem>
<listitem>
<emphasis role="bold">Role Assignment:</emphasis>
- Ability for administrators to assign
+ ability for administrators to assign
users to roles.
</listitem>
<listitem>
- <emphasis role="bold">Captcha support:</emphasis>
- To distinct humans from machines when registering.
+ <emphasis role="bold">CAPTCHA Support:</emphasis>
+ to distinguish humans from machines when registering.
</listitem>
</itemizedlist>
<para>
@@ -193,12 +193,12 @@
<itemizedlist>
<listitem>
<emphasis role="bold">Extendable permissions API:</emphasis>
- Allows custom portlets
+ allows custom portlet
permissions based on role definition.
</listitem>
<listitem>
- <emphasis role="bold">Administrative interface:</emphasis>
- Allows for permissions
+ <emphasis role="bold">Administrative Interface:</emphasis>
+ allows permission
assignments to roles at any time for any deployed portlet, page, or portal instance.
</listitem>
</itemizedlist>
@@ -208,37 +208,37 @@
<itemizedlist>
<listitem>
<emphasis role="bold">JCR-compliant:</emphasis>
- The CMS is powered by Apache Jackrabbit, an open source implementation
- of the Java Content Repository API.
+ the CMS is powered by Apache Jackrabbit, an open source implementation
+ of the <trademark class="trade">Java</trademark> content repository API.
</listitem>
<listitem>
- <emphasis role="bold">DB or Filesystem store support:</emphasis>
- Configurable content store
- to either a filesystem or RDBMS.
+ <emphasis role="bold">Database and File System Store Support:</emphasis>
+ configure the content store
+ for either a file system or an RDBMS.
</listitem>
<listitem>
<emphasis role="bold">External Blob Support:</emphasis>
- Configurable content store allowing
- large blobs to reside on filesystem and content node references/properties to reside in
+ configurable content store, allowing
+ large blobs to reside on a file system, and content node references and properties to reside in an
RDBMS.
</listitem>
<listitem>
- <emphasis role="bold">Versioning support:</emphasis>
- All content edited/created is
- autoversioned with a history of edits that can be viewed at any time.
+ <emphasis role="bold">Version and History Support:</emphasis>
+ all content edited and created is
+ autoversioned with a history of edits, that can be viewed at any time.
</listitem>
<listitem>
<emphasis role="bold">Content Serving Search-engine-friendly URLS:</emphasis>
- http://yourdomain/portal/content/index.html (Does not apply to portlet actions.)
+ http://yourdomain/portal/content/index.html (does not apply to portlet actions).
</listitem>
<listitem>
- <emphasis role="bold">No long portal URLS:</emphasis>
- Serve binaries with simple urls.
- (http://domain/files/products.pdf)
+ <emphasis role="bold">No Long Portal URLS:</emphasis>
+ serve binaries with simple URLs
+ (http://domain/files/products.pdf).
</listitem>
<listitem>
- <emphasis role="bold">Multiple HTML Portlet instance support:</emphasis>
- Allows for extra
+ <emphasis role="bold">Multiple HTML Portlet Instance Support:</emphasis>
+ allows extra
instances of static content from the CMS to be served under separate windows.
</listitem>
<listitem>
@@ -252,36 +252,36 @@
files.
</listitem>
<listitem>
- <emphasis role="bold">Embedded directory-browser:</emphasis>
- When copying, moving,
+ <emphasis role="bold">Embedded Directory-browser:</emphasis>
+ when copying, moving,
deleting, or creating files, administrators can simply navigate the directory tree to find
the collection they want to perform the action on.
</listitem>
<listitem>
- <emphasis role="bold">Ease-of-use architecture:</emphasis>
- All actions to be performed on
+ <emphasis role="bold">Ease-of-use Architecture:</emphasis>
+ all actions to be performed on
files and folder are one mouse-click away.
</listitem>
<listitem>
- <emphasis role="bold">Full-featured HTML editor:</emphasis>
- HTML Editor contains WYSIWYG
+ <emphasis role="bold">Full-featured HTML Editor:</emphasis>
+ the HTML editor contains a WYSIWYG
mode, preview functionality, and HTML source editting mode. HTML commands support tables,
- fonts, zooming, image and url linking, flash movie support, bulleted and numbered list, and
+ fonts, zooming, image and URL linking, flash movie support, bulleted and numbered list, and
dozens more.
</listitem>
<listitem>
- <emphasis role="bold">Editor style-sheet support:</emphasis>
- WYSIWYG editor displays
- current Portal style-sheet, for easy choosing of classes.
+ <emphasis role="bold">Editor Style-sheet Support:</emphasis>
+ the WYSIWYG editor displays
+ the current portal style-sheet, for easy choosing of classes.
</listitem>
<listitem>
<emphasis role="bold">Internationalization Support:</emphasis>
- Content can be attributed to a specific locale and then served
- to the user based on his/her browser settings.
+ content can be attributed to a specific locale, and then served
+ to the user based on his or hers Web browser settings.
</listitem>
<listitem>
<emphasis role="bold">Workflow Support:</emphasis>
- Basic submit for review and approval process.
+ basic submit for review and approval process.
</listitem>
</itemizedlist>
</preface>
Modified: docs/branches/JBoss_Portal_Branch_2_7/common/en/modules/overview.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_7/common/en/modules/overview.xml 2008-06-26 13:11:13 UTC (rev 11159)
+++ docs/branches/JBoss_Portal_Branch_2_7/common/en/modules/overview.xml 2008-06-26 13:38:48 UTC (rev 11160)
@@ -1,4 +1,4 @@
-<preface id="overview">
+<preface id="overview">
<title>JBoss Portal - Overview</title>
<para>
<imageobject>
@@ -11,28 +11,28 @@
goal by deploying enterprise portals within their IT infrastructure. Enterprise portals
simplify access to information by providing a single source of interaction with corporate
information. Although today's packaged portal frameworks help enterprises launch portals more
- quickly, only JBoss Portal can deliver the benefits of a zero-cost open source license
+ quickly, only JBoss Portal can deliver the benefits of a zero-cost open source license,
combined with a flexible and scalable underlying platform.</para>
<para>JBoss Portal provides an open source and standards-based environment for hosting and
serving a portal's Web interface, publishing and managing its content, and customizing its
- experience. It is entirely standards-based and supports the JSR-168 portlet specification,
+ experience. It is entirely standards-based, and supports the JSR-168 portlet specification,
which allows you to easily plug-in standards-compliant portlets to meet your specific portal
needs. JBoss Portal is available through the business-friendly
<ulink
url="http://jboss.com/opensource/lgpl/faq">LGPL</ulink>
- open source license and is
+ open source license, and is
supported by
<ulink url="http://www.jboss.com/services/index">Red Hat Middleware, LLC Professional Support
and Consulting
</ulink>
. JBoss support services are available to assist you in designing,
developing, deploying, and ultimately managing your portal environment. JBoss Portal is
- currently developed by Red Hat Middleware, LLC developers and community contributors.
+ currently developed by Red Hat Middleware, LLC developers, and community contributors.
</para>
- <para>The JBoss Portal framework and architecture includes the portal container and supports a
- wide range of features including standard portlets, single sign-on, clustering and
+ <para>The JBoss Portal framework and architecture include the portal container, and support a
+ wide range of features, including standard portlets, single sign-on, clustering, and
internationalization. Portal themes and layouts are configurable. Fine-grained security
- administration down to portlet permissions rounds out the security model.</para>
+ administration -- down to portlet permissions -- rounds out the security model.</para>
<para>
<emphasis role="bold">JBoss Portal Resources:</emphasis>
<orderedlist>
Property changes on: docs/branches/JBoss_Portal_Branch_2_7/quickstartuser
___________________________________________________________________
Name: svn:ignore
- build
+ build
target
Property changes on: docs/branches/JBoss_Portal_Branch_2_7/referenceGuide
___________________________________________________________________
Name: svn:ignore
- build
+ build
target
Modified: docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/images/errorhandling/errorHandling_management.png
===================================================================
(Binary files differ)
Modified: docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/clustering.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/clustering.xml 2008-06-26 13:11:13 UTC (rev 11159)
+++ docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/clustering.xml 2008-06-26 13:38:48 UTC (rev 11160)
@@ -35,7 +35,7 @@
concurrency issues when
deploying the various *-object.xml files. Without that, each node would try to create the
same objects in the database when it deploys an archive containing such descriptors.</listitem>
- <listitem>Used with JCR. The Jackrabbit server is not able to run in a cluster
+ <listitem>Used with JCR. The Apache Jackrabbit server is not able to run in a cluster
by itself, therefore we make a singleton on the cluster. This provides HA-CMS, which is
similar to the current HA JBossMQ provided in JBoss AS.</listitem>
</orderedlist>
@@ -185,7 +185,7 @@
<sect2>
<title>CMS clustering</title>
<para>The CMS backend storage relies on the Apache Jackrabbit project. Jackrabbit does not support clustering out of the box.
- So the portal run the Jackrabbit servicey on one node of the cluster using the
+ So the portal run the Jackrabbit service on one node of the cluster using the
<ulink url="http://www.onjava.com/pub/a/onjava/2003/08/20/jboss_clustering.html">HA-Singleton</ulink> technology.
The file <emphasis>jboss-portal.sar/portal-cms.sar/META-INF/jboss-service.xml</emphasis> contains the configuration. We will
not reproduce it in this documentation as the changes are quite complex and numerous. Access from all nodes of the cluster
@@ -201,11 +201,11 @@
<sect1>
<title>Setup</title>
<para>We are going to outline how to setup a two node cluster on the same machine in order to test JBoss Portal HA. The only
- missing part from the full fledged setup is the addition of a load balancer in front of Tomcat. However a lot of documentation
+ missing part from the full fledged setup is the addition of a load balancer in front of Apache Tomcat. However a lot of documentation
exist on the subject. A detailed step by step setup of Apache and mod_jk is available from the
<ulink url="http://wiki.jboss.org/wiki/Wiki.jsp?page=UsingMod_jk1.2WithJBoss">JBoss Wiki</ulink>.</para>
<para>As we need two application servers running at the same time, we must avoid any conflict. For instance we will
- need Tomcat to bind its socket on two different ports otherwise a network conflict will occur. We will leverage
+ need Apache Tomcat to bind its socket on two different ports otherwise a network conflict will occur. We will leverage
the service binding manager <ulink url="http://docs.jboss.org/jbossas/jboss4guide/r3/html/ch10.html">this chapter</ulink> of
the JBoss AS documentation.</para>
<para>The first step is to copy the <emphasis>all</emphasis> configuration of JBoss into two separate
Modified: docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/cmsPortlet.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/cmsPortlet.xml 2008-06-26 13:11:13 UTC (rev 11159)
+++ docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/cmsPortlet.xml 2008-06-26 13:38:48 UTC (rev 11160)
@@ -97,7 +97,7 @@
<section>
<title>Service Configuration</title>
<section>
- <title>Tuning Jackrabbit</title>
+ <title>Tuning Apache Jackrabbit</title>
<para>JBoss Portal uses Apache Jackrabbit as its Java Content Repository implementation.
Configuration of the service descriptor, allows for changing many of the variables
associated with the service.</para>
Modified: docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/configuration.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/configuration.xml 2008-06-26 13:11:13 UTC (rev 11159)
+++ docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/configuration.xml 2008-06-26 13:38:48 UTC (rev 11160)
@@ -19,7 +19,7 @@
<sect1>
<title>Changing the Port</title>
<para>
- It is common for web services to run on port 80. By default, JBoss EAP and JBoss AS use port 8080. If you can not use <ulink url="http://wiki.jboss.org/wiki/Wiki.jsp?page=UsingPortForwardingWithJBoss">port forwarding</ulink>, it is recommended to change the port JBoss EAP or JBoss AS listens on. To change the default port, open the <filename>$JBOSS_HOME/server/default/deploy/jboss-web.deployer/server.xml</filename> file, and edit the <computeroutput>Connector port</computeroutput> value for the <computeroutput>jboss.web</computeroutput> service; however, this configuration only applies to Tomcat:
+ It is common for web services to run on port 80. By default, JBoss EAP and JBoss AS use port 8080. If you can not use <ulink url="http://wiki.jboss.org/wiki/Wiki.jsp?page=UsingPortForwardingWithJBoss">port forwarding</ulink>, it is recommended to change the port JBoss EAP or JBoss AS listens on. To change the default port, open the <filename>$JBOSS_HOME/server/default/deploy/jboss-web.deployer/server.xml</filename> file, and edit the <computeroutput>Connector port</computeroutput> value for the <computeroutput>jboss.web</computeroutput> service; however, this configuration only applies to Apache Tomcat:
</para>
<para>
<screen>
@@ -31,7 +31,7 @@
This example changes the default port to port 8088. The JBoss EAP or JBoss AS server must be restarted before the new port settings take affect.
</para>
<para>
- The default SSL port is 8843. To enable HTTPS support, refer to the <ulink url="http://docs.jboss.org/jbossas/jboss4guide/r4/html/ch9.chapt.html#d0e21962">JBoss AS Guide</ulink>. For further information, refer to <ulink url="http://tomcat.apache.org/tomcat-6.0-doc/ssl-howto.html">Tomcat's SSL configuration how-to</ulink>.
+ The default SSL port is 8843. To enable HTTPS support, refer to the <ulink url="http://docs.jboss.org/jbossas/jboss4guide/r4/html/ch9.chapt.html#d0e21962">JBoss AS Guide</ulink>. For further information, refer to the <ulink url="http://tomcat.apache.org/tomcat-6.0-doc/ssl-howto.html">Apache Tomcat SSL configuration how-to</ulink>.
</para>
<para>
Please refer to <xref linkend="wsrp-ports"/> to update the WSRP service after having changed the port.
@@ -40,7 +40,7 @@
<warning>
<title>Root User Privileges</title>
<para>
- <trademark class="registered">Linux</trademark> systems require root user privileges to run a service on a port less than 1024. Starting JBoss EAP or JBoss AS on port 80 as a non-privileged user will not work. Running JBoss EAP or JBoss AS as the root user could lead to security breaches.
+ Linux operating systems require root user privileges to run a service on a port less than 1024. Starting JBoss EAP or JBoss AS on port 80 as a non-privileged user will not work. Running JBoss EAP or JBoss AS as the root user could lead to security breaches.
</para>
</warning>
</para>
@@ -126,9 +126,9 @@
<note>
<title>Changing the context-root</title>
<para>
- By default, Tomcat holds on to the root context, <emphasis>/</emphasis>. You may need to remove the <filename>$JBOSS_HOME/server/default/deploy/jboss-web.deployer/ROOT.war/</filename> directory,
+ By default, Apache Tomcat holds on to the root context, <emphasis>/</emphasis>. You may need to remove the <filename>$JBOSS_HOME/server/default/deploy/jboss-web.deployer/ROOT.war/</filename> directory,
or add a <filename>jboss-web.xml</filename> file, which declares another
- context-root other than <emphasis>/</emphasis>, under the <filename>$JBOSS_HOME/server/default/deploy/jboss-web.deployer/ROOT.war/WEB-INF/</filename> directory, for the above changes to take affect. The following is an example <filename>jboss-web.xml</filename> file, which changes the Tomcat context path to <computeroutput>/tomcat-root</computeroutput>:
+ context-root other than <emphasis>/</emphasis>, under the <filename>$JBOSS_HOME/server/default/deploy/jboss-web.deployer/ROOT.war/WEB-INF/</filename> directory, for the above changes to take affect. The following is an example <filename>jboss-web.xml</filename> file, which changes the Apache Tomcat context path to <computeroutput>/tomcat-root</computeroutput>:
</para>
<para>
<screen><![CDATA[
@@ -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 <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.
+ 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.
</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:
@@ -252,21 +252,18 @@
</sect1>
<sect1>
<title>Configuring proxy settings</title>
- <para>There are a couple of scenarios where you need your proxy to be correctly defined at the JVM
- level so that you can access documents from Internet. It could be to get the thirdparty libraries if you
- decided to build JBoss Portal from the sources, to access RSS feeds or weather information in the samples
- portlet we provide or for your own needs.</para>
+ <para>There are a couple of scenarios where you need your proxy to be correctly defined at the <trademark class="trade">JVM</trademark> level so that you can access documents from Internet. It could be to get the thirdparty libraries if you decided to build JBoss Portal from the sources, to access RSS feeds or weather information in the samples portlet we provide or for your own needs.</para>
<para>To configure the proxy settings, you need to know the proxy host and the port to use. Then,
- add them when starting <trademark class="trade">Java</trademark>.</para>
+ add them when starting Java.</para>
<para>Usually setting up JAVA_OPTS environment variable to <literal>-Dhttp.proxyHost=YOUR_PROXY_HOST -Dhttp.proxyPort=YOUR_PROXY_PORT</literal>
is enough.</para>
</sect1>
<sect1>
<title>Disabling Dynamic Proxy Un-wrapping</title>
- <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 <trademark class="trade">Java</trademark> 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>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 <trademark class="trade">JMX</trademark> 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 <trademark class="trade">JDK</trademark> 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 <trademark class="registered">Linux</trademark> 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 Linux operating systems, change into the <filename>$JBOSS_HOME/bin/</filename> directory and run the following command:
</para>
<para>
<screen>
@@ -274,7 +271,7 @@
</screen>
</para>
<para>
- On <trademark class="registered">Windows</trademark>, run the following command:
+ On Windows, run the following command:
</para>
<para>
<screen>
Modified: docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/errorhandling.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/errorhandling.xml 2008-06-26 13:11:13 UTC (rev 11159)
+++ docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/errorhandling.xml 2008-06-26 13:38:48 UTC (rev 11160)
@@ -17,7 +17,7 @@
<itemizedlist>
<listitem>
<para>
- <emphasis>Access denied</emphasis>: the user does not have the security permissions to access the resource.
+ <emphasis>Access denied</emphasis>: the user does not have the required permissions to access the resource.
</para>
</listitem>
<listitem>
@@ -50,7 +50,7 @@
<sect2>
<title>Policy Delegation and Cascading</title>
<para>
- When a control policy is invoked, the response sent by the control flow can be changed. If the control policy ignores the error, the error is handled by the next policy. If the control policy provides a new response, the next policy is not invoked, since the new response will not be an error.
+ When a control policy is invoked, the response sent by the control flow can be changed. If the control policy ignores the error, the error is handled by the next policy. If the control policy provides a new response, the next policy is not invoked, since the new response is not an error.
</para>
<para>
If a portlet in a page produces an exception, the following reactions are possible:
@@ -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 redirect to a JSP page.
</para>
</listitem>
</itemizedlist>
@@ -176,32 +176,32 @@
<entry align="center">when a resource is unavailable</entry>
<entry align="center"><computeroutput>ignore</computeroutput> and <computeroutput>jsp</computeroutput></entry>
</row>
- <row>
- <entry align="center"><computeroutput>control.portal.error</computeroutput></entry>
- <entry align="center">when an expected error occurs</entry>
- <entry align="center"><computeroutput>ignore</computeroutput> and <computeroutput>jsp</computeroutput></entry>
+ <row>
+ <entry align="center"><computeroutput>control.portal.not_found</computeroutput></entry>
+ <entry align="center">when a resource is not found</entry>
+ <entry align="center"><computeroutput>ignore</computeroutput> and <computeroutput>jsp</computeroutput></entry>
</row>
- <row>
+ <row>
<entry align="center"><computeroutput>control.portal.internal_error</computeroutput></entry>
- <entry align="center">when an unexpected error occurs</entry>
- <entry align="center"><computeroutput>ignore</computeroutput> and <computeroutput>jsp</computeroutput></entry>
+ <entry align="center">when an unexpected error occurs</entry>
+ <entry align="center"><computeroutput>ignore</computeroutput> and <computeroutput>jsp</computeroutput></entry>
</row>
<row>
- <entry align="center"><computeroutput>control.portal.not_found</computeroutput></entry>
- <entry align="center">when a resource is not found</entry>
- <entry align="center"><computeroutput>ignore</computeroutput> and <computeroutput>jsp</computeroutput></entry>
+ <entry align="center"><computeroutput>control.portal.error</computeroutput></entry>
+ <entry align="center">when an expected error occurs</entry>
+ <entry align="center"><computeroutput>ignore</computeroutput> and <computeroutput>jsp</computeroutput></entry>
</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">a valid path to a JSP located in the <filename>portal-core.war/</filename> directory</entry>
+ <entry align="center">the path to the JSP 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>
</tgroup>
</table>
</para>
<para>
- The following portal configuration details the use of portal-policy properties:
+ The following portal configuration demonstrates the use of portal-policy properties:
</para>
<para>
<programlisting><![CDATA[
@@ -243,7 +243,7 @@
<sect2>
<title>Page Policy Properties</title>
<para>
- A set of properties configure the the behavior of the page policy. These properties are only taken into account for objects that use the <emphasis>portal</emphasis> type. The following table represents possible page-policy properties:
+ A set of properties configure the behavior of the page policy. These properties are only taken into account for objects that use the <emphasis>portal</emphasis> type. The following table represents possible page-policy properties:
</para>
<para>
<table frame="all">
@@ -269,24 +269,24 @@
<entry align="center">when a resource is unavailable</entry>
<entry align="center"><computeroutput>ignore</computeroutput>, <computeroutput>jsp</computeroutput> and <computeroutput>hide</computeroutput></entry>
</row>
- <row>
- <entry align="center"><computeroutput>control.page.error</computeroutput></entry>
- <entry align="center">when an expected error occurs</entry>
- <entry align="center"><computeroutput>ignore</computeroutput>, <computeroutput>jsp</computeroutput> and <computeroutput>hide</computeroutput></entry>
+ <row>
+ <entry align="center"><computeroutput>control.page.not_found</computeroutput></entry>
+ <entry align="center">when a resource is not found</entry>
+ <entry align="center"><computeroutput>ignore</computeroutput>, <computeroutput>jsp</computeroutput> and <computeroutput>hide</computeroutput></entry>
</row>
- <row>
+ <row>
<entry align="center"><computeroutput>control.page.internal_error</computeroutput></entry>
- <entry align="center">when an unexpected error occurs</entry>
- <entry align="center"><computeroutput>ignore</computeroutput>, <computeroutput>jsp</computeroutput> and <computeroutput>hide</computeroutput></entry>
+ <entry align="center">when an unexpected error occurs</entry>
+ <entry align="center"><computeroutput>ignore</computeroutput>, <computeroutput>jsp</computeroutput> and <computeroutput>hide</computeroutput></entry>
</row>
<row>
- <entry align="center"><computeroutput>control.page.not_found</computeroutput></entry>
- <entry align="center">when a resource is not found</entry>
- <entry align="center"><computeroutput>ignore</computeroutput>, <computeroutput>jsp</computeroutput> and <computeroutput>hide</computeroutput></entry>
+ <entry align="center"><computeroutput>control.page.error</computeroutput></entry>
+ <entry align="center">when an expected error occurs</entry>
+ <entry align="center"><computeroutput>ignore</computeroutput>, <computeroutput>jsp</computeroutput> and <computeroutput>hide</computeroutput></entry>
</row>
- <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 to the JSP used for redirections</entry>
<entry align="center"><computeroutput>ignore</computeroutput>, <computeroutput>jsp</computeroutput> and <computeroutput>hide</computeroutput></entry>
</row>
</tbody>
@@ -294,7 +294,7 @@
</table>
</para>
<para>
- The following page configuration details the use of page-policy properties:
+ The following page configuration demonstrates the use of page-policy properties:
</para>
<para>
<programlisting><![CDATA[
@@ -334,7 +334,7 @@
</para>
<para>
<note>
- <title>Page property inheritance for objects</title>
+ <title>Page Property Inheritance for Objects</title>
<para>
When page properties are configured for objects that use the <emphasis>portal</emphasis> type, the properties are inherited by pages in that portal.
</para>
@@ -343,9 +343,9 @@
</sect2>
</sect1>
<sect1>
- <title>Handling Errors with <trademark class="trade">JavaServer</trademark> Pages (<trademark class="trade">JSP</trademark>)</title>
+ <title>Using <trademark class="trade">JSP</trademark> to Handle Errors</title>
<para>
- 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:
+ As described in previous sections, error handling can be redirected to a <trademark class="trade">JSP</trademark> page. 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">
@@ -406,13 +406,18 @@
</listitem>
<listitem>
<para>
- Click the <guibutton>Admin</guibutton> button on the top right-hand of the welcome page. Four tabs will appear on the left-hand side of the page. Click on the <guibutton>Admin</guibutton> tab to open the portal management application.
+ Click the <guibutton>Admin</guibutton> tab on the top right-hand of the welcome page. Four tabs will appear on the left-hand side of the page.
</para>
</listitem>
+ <listitem>
+ <para>
+ Click the <guibutton>Admin</guibutton> tab to open the portal management application, and then click the <guibutton>Portal Objects</guibutton> tab to display available portals.
+ </para>
+ </listitem>
</orderedlist>
</para>
<para>
- The functionality is available as part of the properties for each configuration level. You can specify the default error handling policy (at the root of the portal object hierarchy) for each portal, or each page, by clicking on the <guibutton>Properties</guibutton> button for each page or portal:
+ Configuration options are available as part of the properties for each configuration level. You can specify the default error handling policy (at the root of the portal object hierarchy) for each portal, or each page, by clicking on the <guibutton>Properties</guibutton> button for each page or portal:
</para>
<para>
<mediaobject>
@@ -422,12 +427,15 @@
</mediaobject>
</para>
<para>
- As well, you can specify how dashboards should behave with respect to error handling, by clicking on the <guibutton>Dashboards</guibutton> tab of the portal management application:
+ As well, you can specify how dashboards should behave with respect to error handling, by clicking on the <guibutton>Dashboards</guibutton> tab in the portal management application:
</para>
<para>
<imageobject>
<imagedata fileref="images/errorhandling/errorHandlingUI.png" format="png" align="center"/>
</imageobject>
</para>
+ <para>
+ The page specified with <computeroutput>On error redirect to this resource</computeroutput> is used when the <option>Redirect to the specified resource</option> action is selected for an error type, such as <computeroutput>When access to the page is denied</computeroutput>. After making changes, click the <guibutton>Update</guibutton> button for settings to take effect.
+ </para>
</sect1>
</chapter>
\ No newline at end of file
Modified: docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/identity.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/identity.xml 2008-06-26 13:11:13 UTC (rev 11159)
+++ docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/identity.xml 2008-06-26 13:38:48 UTC (rev 11160)
@@ -386,7 +386,7 @@
<sect1>
<title>Identity configuration</title>
<para>In order to understand identity configuration you need to understand its architecture.
- Different identity services like UserModule, RoleModule and etc are just plain <trademark class="trade">Java</trademark> classes that are instantiated and exposed
+ Different identity services like UserModule, RoleModule and etc are just plain Java classes that are instantiated and exposed
by the portal. So an *example* of UserModule service could be a plain Java bean object that would be:
<itemizedlist>
<listitem><emphasis role="bold">Instantiated</emphasis> using reflection</listitem>
@@ -566,7 +566,7 @@
</listitem>
<listitem>
<para>
- <emphasis role="bold">class</emphasis> - <trademark class="trade">Java</trademark> class that will be use to instantiate the module.
+ <emphasis role="bold">class</emphasis> - Java class that will be use to instantiate the module.
</para>
</listitem>
<listitem>
@@ -754,7 +754,7 @@
<emphasis role="bold">name</emphasis> - property name. This value will be used to refer to the property in <emphasis>UserProfileModule</emphasis>
</listitem>
<listitem>
- <emphasis role="bold">type</emphasis> - <trademark class="trade">Java</trademark> type of property. This type will be checked when in <emphasis>UserProfileModule</emphasis>
+ <emphasis role="bold">type</emphasis> - Java type of property. This type will be checked when in <emphasis>UserProfileModule</emphasis>
methods invocation.
</listitem>
<listitem>
Modified: docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/identityportlets.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/identityportlets.xml 2008-06-26 13:11:13 UTC (rev 11159)
+++ docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/identityportlets.xml 2008-06-26 13:38:48 UTC (rev 11160)
@@ -71,7 +71,7 @@
</para>
<note><para>By default the captcha service needs a XServer to
generate the images. For using the captcha service
- without a XServer make sure you run the jvm with the
+ without a XServer make sure you run the JVM with the
following option:
<programlisting>-Djava.awt.headless=true</programlisting></para>
</note>
Modified: docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/migration.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/migration.xml 2008-06-26 13:11:13 UTC (rev 11159)
+++ docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/migration.xml 2008-06-26 13:38:48 UTC (rev 11160)
@@ -22,7 +22,7 @@
<sect1 id="manual_migration">
<title>Manual Upgrade</title>
<para>
- The database schema has not changed since JBoss Portal 2.4; however, there are several differences when using a database created by JBoss Portal 2.4, that prevent simply deploying the latest version of JBoss Portal. For example, some portlets are no longer present in JBoss Portal 2.6, and certain existing portlets are now packaged differently. This chapter describes updating a <trademark class="registered">MySQL</trademark> database created by JBoss Portal 2.4, for use with JBoss Portal 2.6.
+ The database schema has not changed since JBoss Portal 2.4; however, there are several differences when using a database created by JBoss Portal 2.4, that prevent simply deploying the latest version of JBoss Portal. For example, some portlets are no longer present in JBoss Portal 2.6, and certain existing portlets are now packaged differently. This chapter describes updating a MySQL database created by JBoss Portal 2.4, for use with JBoss Portal 2.6.
</para>
<para>
Users, roles, and pages created in JBoss Portal 2.4 should be accessible in JBoss Portal 2.6 deployments.
@@ -93,7 +93,7 @@
</itemizedlist>
</para>
<para>
- All procedures described in the following sections can performed using the JBoss Portal 2.4 <guiicon>Admin</guiicon> portlet. Treat these directions as guidelines when migrating a large JBoss Portal deployment. Database data can be updated manually using the correct tools for your RDBMS. For example, if you are using a <trademark class="registered">MySQL</trademark> database, you can use the <ulink url="http://www.mysql.com/products/tools/query-browser/">MySQL Query Browser</ulink>.
+ All procedures described in the following sections can performed using the JBoss Portal 2.4 <guiicon>Admin</guiicon> portlet. Treat these directions as guidelines when migrating a large JBoss Portal deployment. Database data can be updated manually using the correct tools for your RDBMS. For example, if you are using a MySQL database, you can use the <ulink url="http://www.mysql.com/products/tools/query-browser/">MySQL Query Browser</ulink>.
</para>
<para>
During the upgrade process, legacy references have to be cleaned up, to either remove them, or to allow JBoss Portal 2.6 to recreate them correctly. Remove all references (instances and windows) to the portlets listed below, as they are not present in JBoss Portal 2.6. This can be done using the JBoss Portal 2.4 <guiicon>Admin</guiicon> portlet:
Modified: docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/security.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/security.xml 2008-06-26 13:11:13 UTC (rev 11159)
+++ docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/security.xml 2008-06-26 13:38:48 UTC (rev 11160)
@@ -206,7 +206,7 @@
<xmbean/>
<!--
NOTE: cmsRootUserName denotes a single Portal user that has access to everything in the CMS. Denote this user
- carefully and should be synonymous to the 'root' user in UNIX® operating systems. By default: this value is the built-in
+ carefully and should be synonymous to the 'root' user in UNIX operating systems. By default: this value is the built-in
'admin' user account. This can be changed to any other user account registered in your Portal
-->
<attribute name="CmsRootUserName">admin</attribute>
@@ -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 <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
+ super user concept in a Linux and UNIX 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>
@@ -281,7 +281,7 @@
<xmbean/>
<!--
NOTE: cmsRootUserName denotes a single Portal user that has access to everything in the CMS. Denote this user
- carefully and should be synonymous to the 'root' user in UNIX® operating systems. By default: this value is the built-in
+ carefully and should be synonymous to the 'root' user in UNIX operating systems. By default: this value is the built-in
'admin' user account. This can be changed to any other user account registered in your Portal
-->
<attribute name="CmsRootUserName">admin</attribute>
@@ -359,7 +359,7 @@
<sect1 id="security_authorization">
<title>Authorization with JBoss Portal</title>
<para>JBoss Portal defines a framework for authorization. The default implementation of that framework is based on
- the Java Authorization Contract for Containers (JACC) which is implemented by J2EE 1.4 Application Servers. This section of
+ the Java Authorization Contract for Containers (JACC) which is implemented by <trademark class="trade">J2EE</trademark> 1.4 Application Servers. This section of
the documentation focuses on defining the framework and its usage and is not an attempt to define what authorization
is or is not because it is out of scope of this context. Instead we will try to straightforwardly describe the
framework and how it is used. No specific knowledge is expected about JACC although it is a recommended read.</para>
Modified: docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/sso.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/sso.xml 2008-06-26 13:11:13 UTC (rev 11159)
+++ docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/sso.xml 2008-06-26 13:38:48 UTC (rev 11160)
@@ -24,15 +24,15 @@
mechanisms.</para>
</sect1>
<sect1>
- <title>Using Tomcat Valve</title>
+ <title>Using an Apache Tomcat Valve</title>
<para>JBoss Application Server embeds Apache Tomcat as the default servlet container. Tomcat provides a builtin SSO support
using a valve. The Single Sign On Valve caches credentials on the server side, and then invisibly authenticate users when they
reach different web applications. Credentials are stored in a host-wide session which means that SSO will be effective throughout the session.
</para>
<sect2>
- <title>Enabling Tomcat SSO Valve</title>
+ <title>Enabling the Apache Tomcat SSO Valve</title>
<para>
- To enable SSO valve in Tomcat you should uncomment the following line
+ To enable SSO valve in Apache Tomcat you should uncomment the following line
<programlisting><![CDATA[<Valve className=’org.apache.catalina.authenticator.SingleSignOn’/>]]></programlisting>
in the <literal>$JBOSS_HOME/server/default/deploy/jboss-web.deployer/server.xml</literal> file.
More information can be found <ulink url="http://www.jboss.org/wiki/Wiki.jsp?page=SingleSignOn">here</ulink>.
@@ -168,7 +168,7 @@
<emphasis>$JBOSS_HOME/server/default/deploy/cas.war/WEB-INF/lib</emphasis>.
</listitem>
<listitem>
- Edit <emphasis>$JBOSS_HOME/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/context.xml</emphasis> file and enable proper tomcat valve
+ Edit <emphasis>$JBOSS_HOME/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/context.xml</emphasis> file and enable proper Apache Tomcat Valve
by uncommenting following lines:
<programlisting>
<![CDATA[
@@ -278,7 +278,7 @@
slightly different for other deployment scenarios. Both JBoss Portal and JOSSO will need to be configured to authenticate against
same database or LDAP server. Please see JOSSO documentation to learn how to setup it up against proper identity store.</note>
<note>Configuration below assumes that JOSSO is already installed and deployed in the JBoss Application Server. This involves adding proper jar files
- into the classpath and altering several configuration files (adding tomcat valves, security realm and specific JOSSO configuration files).
+ into the classpath and altering several configuration files (adding Apache Tomcat Valves, security realm and specific JOSSO configuration files).
For JBoss setup please refer to JOSSO <ulink url="http://www.josso.org/jboss4-howto.html">documentation</ulink></note>
<sect2>
<title>Integration steps</title>
@@ -291,7 +291,7 @@
<emphasis>$JBOSS_HOME/server/default/deploy/josso.ear/josso.war/WEB-INF/lib</emphasis>.
</listitem>
<listitem>
- Edit <emphasis>$JBOSS_HOME/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/context.xml</emphasis> file and enable proper tomcat valve
+ Edit <emphasis>$JBOSS_HOME/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/context.xml</emphasis> file and enable proper Apache Tomcat Valve
by uncommenting following lines:
<programlisting>
<![CDATA[
Modified: docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/supported.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/supported.xml 2008-06-26 13:11:13 UTC (rev 11159)
+++ docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/supported.xml 2008-06-26 13:38:48 UTC (rev 11160)
@@ -22,7 +22,7 @@
<title>Minimum System Requirements</title>
<para>
<itemizedlist>
- <listitem>JDK 5 (JDK 6 is not part of the test platform)</listitem>
+ <listitem><trademark trade="class">JDK</trademark> 5 (JDK 6 is not part of the test platform)</listitem>
<listitem>512 MB RAM</listitem>
<listitem>100 MB hard disk space</listitem>
<listitem>400 MHz CPU</listitem>
@@ -31,7 +31,7 @@
</sect1>
<sect1>
<title>Supported Operating Systems</title>
- <para>JBoss Portal is 100% pure <trademark class="trade">Java</trademark>, and therefore it is interoperable with most operating systems
+ <para>JBoss Portal is <trademark class="trade">100% Pure Java</trademark>, and therefore it is interoperable with most operating systems
capable of running a Java Virtual Machine (<trademark class="trade">JVM</trademark>), including <trademark class="registered">Linux</trademark>, <trademark class="registered">Windows</trademark>, <trademark class="registered">UNIX</trademark> operating systems, and Mac OS X.
</para>
</sect1>
@@ -47,7 +47,7 @@
<title>Databases</title>
<para>JBoss Portal is database-agnostic. The following list outlines known-to-be-working database vendor and version combinations:</para>
<itemizedlist>
- <listitem><trademark class="registered">MySQL</trademark> 4.<replaceable>x</replaceable>.<replaceable>x</replaceable> (use <ulink url="http://dev.mysql.com/downloads/connector/j/3.1.html">Connector/J 3.1</ulink>) and 5 (<ulink url="http://wiki.jboss.org/wiki/Wiki.jsp?page=AvoidMySQL5DataTruncationErrors">known issue</ulink>)</listitem>
+ <listitem><trademark class="registered">MySQL</trademark> 4 (use <ulink url="http://dev.mysql.com/downloads/connector/j/3.1.html">Connector/J 3.1</ulink>) and 5 (<ulink url="http://wiki.jboss.org/wiki/Wiki.jsp?page=AvoidMySQL5DataTruncationErrors">known issue</ulink>)</listitem>
<listitem>PostgreSQL 8.<replaceable>x</replaceable></listitem>
<listitem>Hypersonic SQL</listitem>
<listitem>Apache Derby</listitem>
@@ -56,11 +56,11 @@
<listitem>MaxDB</listitem>
</itemizedlist>
<note>
- <para>JBoss Portal employs Hibernate as an interface to a relational database management system (RDBMS). Most relational database management systems supported by Hibernate will work with JBoss Portal.</para>
+ <para>JBoss Portal employs Hibernate as an interface to a Relational Database Management System (RDBMS). Most Relational Database Management Systems supported by Hibernate will work with JBoss Portal.</para>
</note>
</sect1>
<sect1>
- <title>Source building</title>
- <para>The source building mechanism works on <trademark class="registered">Linux</trademark>, <trademark class="registered">Windows</trademark>, Mac OS X, and <trademark class="registered">UNIX</trademark> operating systems.</para>
+ <title>Source Building</title>
+ <para>The source building mechanism works on Linux, Windows, Mac OS X, and UNIX operating systems.</para>
</sect1>
</chapter>
Modified: docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/themeandlayouts.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/themeandlayouts.xml 2008-06-26 13:11:13 UTC (rev 11159)
+++ docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/themeandlayouts.xml 2008-06-26 13:38:48 UTC (rev 11160)
@@ -31,7 +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 JSP or a Servlet. Themes are implemented using CSS Style sheets, <trademark class="trade">JavaScript</trademark> 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
@@ -93,7 +93,7 @@
</para>
-->
<para>The last topic to introduce in this overview is the one of portal themes. A theme is a
- collection of web design artifacts. It defines a set of CSS, javascript and image files
+ collection of web design artifacts. It defines a set of CSS, JavaScript and image files
that together decide about the look and feel of the portal page. The theme can take a wide
spectrum of control over the look and feel. It can limit itself to decide fonts and colors,
or it can take over a lot more and decide the placement (location) of portlets and much
Modified: docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/trademarks.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/trademarks.xml 2008-06-26 13:11:13 UTC (rev 11159)
+++ docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/trademarks.xml 2008-06-26 13:38:48 UTC (rev 11160)
@@ -1,16 +1,19 @@
<preface id="trademarks">
<title>Please Read: Important Trademark Information</title>
<para>
- JavaServer, JSP, Java, JMX, JDK, Java runtime environment, JRE, J2EE, JVM, Javadoc, JavaScript, and J2SE are trademarks or registered trademarks of Sun Microsystems, Inc. in the United States and other countries.
+ Sun, JavaServer, JSP, Java, JMX, JDK, Java runtime environment, J2EE, JVM, Javadoc, 100% Pure Java, JDBC, and JavaScript are trademarks or registered trademarks of Sun Microsystems, Inc. in the United States and other countries.
</para>
<para>
JBoss is a registered trademark of Red Hat, Inc. in the U.S. and other countries.
</para>
<para>
+ Red Hat is a registered trademark of Red Hat, Inc. in the United States and other countries.
+ </para>
+ <para>
Oracle is a registered trademark of Oracle International Corporation.
</para>
<para>
- Microsoft, Windows, and SQL Server are either registered trademarks or trademarks of Microsoft Corporation in the United States and/or other countries.
+ Microsoft, Windows, Active Directory, 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.
Modified: docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/tutorials.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/tutorials.xml 2008-06-26 13:11:13 UTC (rev 11159)
+++ docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/tutorials.xml 2008-06-26 13:38:48 UTC (rev 11160)
@@ -161,7 +161,7 @@
<sect3>
<title>Portlet Classes</title>
<para>
- The following is the <filename>HelloWorldPortlet/src/main/org/jboss/portlet/hello/HelloWorldPortlet.java</filename> <trademark class="trade">Java</trademark> source file, which comes bundled with the <ulink
+ The following is the <filename>HelloWorldPortlet/src/main/org/jboss/portlet/hello/HelloWorldPortlet.java</filename> Java source file, which comes bundled with the <ulink
url="http://anonsvn.jboss.org/repos/portletswap/portlets/2_6/bundles/HelloWorl...">HelloWorldPortlet</ulink>:
</para>
<para>
@@ -538,7 +538,7 @@
</listitem>
<listitem>
<para>
- Change into <filename>HelloWorldPortlet/</filename> directory, and run the <command>ant deploy</command> command. On <trademark class="registered">Windows</trademark>, the output will be similar to the following:
+ Change into <filename>HelloWorldPortlet/</filename> directory, and run the <command>ant deploy</command> command. On Windows, the output will be similar to the following:
</para>
<para>
<mediaobject>
@@ -565,7 +565,7 @@
</listitem>
<listitem>
<para>
- To expand the WAR file, change into the <filename>HelloWorldPortlet/</filename> directory, and run the <command>ant explode</command> command. On <trademark class="registered">Windows</trademark>, the output will be similar to the following:
+ To expand the WAR file, change into the <filename>HelloWorldPortlet/</filename> directory, and run the <command>ant explode</command> command. On Windows, the output will be similar to the following:
</para>
<para>
<mediaobject>
@@ -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 <trademark class="registered">Linux</trademark>, 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 Linux, run the following command to re-deploy the HelloWorldPortlet:
</para>
<para>
<screen>
@@ -640,7 +640,7 @@
</sect3>
</sect2>
<sect2>
- <title>An example <trademark class="trade">JSP</trademark> portlet</title>
+ <title>An example <trademark class="trade">JavaServer</trademark> Pages (<trademark class="trade">JSP</trademark>) portlet</title>
<sect3>
<title>Introduction</title>
<para>
@@ -894,7 +894,7 @@
</listitem>
<listitem>
<para>
- 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:
+ Change into <filename>HelloWorldJSPPortlet/</filename> directory, and run the <command>ant deploy</command> command. On Linux, 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 <trademark class="registered">Linux</trademark>, 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 Linux, 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 <trademark class="registered">Linux</trademark>, 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 Linux, run the following command to re-deploy the HelloWorldJSPPortlet:
</para>
<para>
<screen>
@@ -996,7 +996,7 @@
</sect3>
</sect2>
<sect2 id="sunri_42x">
- <title>An example Sun JSF Reference Implementation (RI) Portlet</title>
+ <title>An example <trademark class="trade">Sun</trademark> JSF Reference Implementation (RI) portlet</title>
<sect3>
<title>Introduction</title>
<para>
@@ -1020,9 +1020,9 @@
</para>
<para>
<note>
- <title>Bundled Sun JSF RI</title>
+ <title>Bundled <trademark class="trade">Sun</trademark> JSF RI</title>
<para>
- JBoss AS version 4.2.<replaceable>x</replaceable> and JBoss EAP bundle Sun's JSF RI libraries in the
+ JBoss AS version 4.2.<replaceable>x</replaceable> and JBoss EAP bundle the <trademark class="trade">Sun</trademark> JSF RI libraries in the
<filename>$JBOSS_HOME/server/default/deploy/jboss-web.deployer/jsf-libs/</filename> directory. Therefore, you do not need to package the Sun JSF RI libraries with your portlet application.
</para>
</note>
@@ -1169,7 +1169,7 @@
</para>
</sect3>
<sect3>
- <title>Building your JSF Portlet</title>
+ <title>Building your JSF portlet</title>
<para>
The <filename>HelloWorldJSFSunRIPortlet.zip</filename> file contains a pre-compiled <filename>helloworldjsfsunriportlet.war</filename> file; however, to manually build the <filename>helloworldjsfsunriportlet.war</filename> file:
</para>
@@ -1187,7 +1187,7 @@
</listitem>
<listitem>
<para>
- 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:
+ Change into <filename>HelloWorldJSFSunRIPortlet/</filename> directory, and run the <command>ant deploy</command> command. On Linux, 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 <trademark class="registered">Linux</trademark>, 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 Linux, the output will be similar to the following:
</para>
<para>
<mediaobject>
@@ -1234,7 +1234,7 @@
</para>
</sect3>
<sect3>
- <title>Deploying your JSF Portlet</title>
+ <title>Deploying your JSF portlet</title>
<para>
If you did not expand the <filename>helloworldjsfsunriportlet.war</filename> file, copy the <filename>HelloWorldJSFSunRIPortlet/helloworldjsfsunriportlet.war</filename> file into the correct JBoss AS or JBoss EAP <filename>deploy/</filename> directory. If you expanded the <filename>helloworldjsfsunriportlet.war</filename> file, copy the <filename>HelloWorldJSFSunRIPortlet/output/lib/exploded/helloworldjsfsunriportlet.war/</filename> directory into the correct JBoss AS or JBoss EAP <filename>deploy/</filename> directory. For example, if you are using <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>
@@ -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 <trademark class="registered">Linux</trademark>, 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 Linux, run the following command to re-deploy the HelloWorldJSFSunRIPortlet:
</para>
<para>
<screen>
@@ -1324,7 +1324,7 @@
</sect3>
</sect2>-->
<sect2 id="myfaces_42x">
- <title>An example Apache MyFaces JSF Portlet</title>
+ <title>An example Apache MyFaces JSF portlet</title>
<sect3>
<title>Introduction</title>
<para>
@@ -1423,7 +1423,7 @@
</para>
<para>
<note>
- <title>Adding Functionality to an Apache MyFaces JSF Portlet</title>
+ <title>Adding Functionality to an Apache MyFaces JSF portlet</title>
<para>
To add functionality to an Apache MyFaces JSF portlet, sub-class it and create your own class.
</para>
@@ -1474,7 +1474,7 @@
</para>
</sect3>
<sect3>
- <title>Building your Apache MyFaces JSF Portlet</title>
+ <title>Building your Apache MyFaces JSF portlet</title>
<para>
The <filename>HelloWorldJSFMyFaces42Portlet.zip</filename> file contains a pre-compiled <filename>helloworldjsfmyfacesportlet.war</filename> file; however, to manually build the <filename>helloworldjsfmyfacesportlet.war</filename> file:
</para>
@@ -1492,7 +1492,7 @@
</listitem>
<listitem>
<para>
- 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:
+ Change into <filename>HelloWorldJSFMyFaces42Portlet/</filename> directory, and run the <command>ant deploy</command> command. On Linux, 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 <trademark class="registered">Linux</trademark>, 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 Linux, the output will be similar to the following:
</para>
<para>
<mediaobject>
@@ -1539,7 +1539,7 @@
</para>
</sect3>
<sect3>
- <title>Deploying your Apache MyFaces JSF Portlet</title>
+ <title>Deploying your Apache MyFaces JSF portlet</title>
<para>
If you did not expand the <filename>helloworldjsfmyfacesportlet.war</filename> file, copy the <filename>HelloWorldJSFMyFaces42Portlet/helloworldjsfmyfacesportlet.war</filename> file into the correct JBoss AS or JBoss EAP <filename>deploy/</filename> directory. If you expanded the <filename>helloworldjsfmyfacesportlet.war</filename> file, copy the <filename>HelloWorldJSFMyFaces42Portlet/output/lib/exploded/helloworldjsfmyfacesportlet.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>
@@ -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 <trademark class="registered">Linux</trademark>, 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 Linux, run the following command to re-deploy the HelloWorldJSFMyFaces42Portlet:
</para>
<para>
<screen>
Modified: docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/xmldescriptors.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/xmldescriptors.xml 2008-06-26 13:11:13 UTC (rev 11159)
+++ docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/xmldescriptors.xml 2008-06-26 13:38:48 UTC (rev 11160)
@@ -1319,7 +1319,7 @@
</para>
</sect3>
<sect3>
- <title>Injecting Services in the Portlet Context</title>
+ <title>Injecting Services in the portlet Context</title>
<para>
The following example injects the <computeroutput>UserModule</computeroutput> service as an attribute to the portlet context:
</para>
@@ -1350,7 +1350,7 @@
</para>
</sect3>
<sect3>
- <title>Defining Extra Portlet Information</title>
+ <title>Defining extra portlet Information</title>
<para>
As of JBoss Portal 2.6.3, icons can be defined for a portlet by using the <computeroutput><icon></computeroutput>, <computeroutput><small-icon></computeroutput>, and <computeroutput><large-icon></computeroutput> elements:
</para>
@@ -1556,7 +1556,7 @@
</mediaobject>
</para>
<para>
- The <filename>jboss-portal-<replaceable>version</replaceable>/setup/</filename> directory contains sample Datasource descriptors for the <trademark class="registered">MySQL</trademark>, <trademark class="registered">Microsoft</trademark> <trademark class="registered">SQL Server</trademark>, PostgreSQL, and <trademark class="registered">Oracle</trademark> databases, which can be customized for your own database:
+ The <filename>jboss-portal-<replaceable>version</replaceable>/setup/</filename> directory contains sample Datasource descriptors for the MySQL, Microsoft SQL Server, PostgreSQL, and Oracle databases, which can be customized for your own database:
</para>
<para>
<mediaobject>
@@ -1585,12 +1585,12 @@
</listitem>
<listitem>
<para>
- 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" />.
+ 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 Windows, 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>
<para>
- Change into the <filename>JBOSS_PORTAL_SOURCE_DIRECTORY/core/</filename> directory, and run the <command>sh build.sh datasource</command> command, or, if you are running <trademark class="registered">Windows</trademark>, run the <command>build.bat datasource</command> command:
+ Change into the <filename>JBOSS_PORTAL_SOURCE_DIRECTORY/core/</filename> directory, and run the <command>sh build.sh datasource</command> command, or, if you are running Windows, run the <command>build.bat datasource</command> command:
</para>
<para>
<mediaobject>
Property changes on: docs/branches/JBoss_Portal_Branch_2_7/userGuide
___________________________________________________________________
Name: svn:ignore
- build
+ build
target
17 years, 10 months
- 1
- 0
JBoss Portal SVN: r11159 - modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-06-26 09:11:13 -0400 (Thu, 26 Jun 2008)
New Revision: 11159
Modified:
modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxWindow.java
Log:
make ajax window have a title with the window ID, useful for understand what's going on
Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxWindow.java
===================================================================
--- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxWindow.java 2008-06-26 12:44:23 UTC (rev 11158)
+++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxWindow.java 2008-06-26 13:11:13 UTC (rev 11159)
@@ -25,6 +25,8 @@
import com.google.gwt.user.client.ui.Widget;
import com.google.gwt.user.client.ui.HTML;
import com.google.gwt.user.client.ui.ClickListener;
+import com.google.gwt.user.client.ui.Label;
+import com.google.gwt.user.client.ui.VerticalPanel;
import com.google.gwt.user.client.rpc.ServiceDefTarget;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.google.gwt.user.client.Window;
@@ -47,17 +49,32 @@
{
/** . */
- private HTML widget;
+ private Label title;
+ /** . */
+ private VerticalPanel widget;
+
+ /** . */
+ private HTML markup;
+
public AjaxWindow(String id)
{
super(id);
//
- this.widget = new HTML("Window " + id);
+ Label title = new Label("Window " + id);
+ HTML markup = new HTML();
+ VerticalPanel widget = new VerticalPanel();
+ widget.add(title);
+ widget.add(markup);
//
- this.widget.addClickListener(new ClickListener()
+ this.title = title;
+ this.markup = markup;
+ this.widget = widget;
+
+ //
+ this.markup.addClickListener(new ClickListener()
{
public void onClick(Widget widget)
{
@@ -168,7 +185,7 @@
String content = (String)o;
//
- widget.setHTML(content);
+ markup.setHTML(content);
}
};
17 years, 10 months
- 1
- 0
JBoss Portal SVN: r11158 - in modules/presentation/trunk/portal/src: main/java/org/jboss/portal/presentation/portal and 5 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-06-26 08:44:23 -0400 (Thu, 26 Jun 2008)
New Revision: 11158
Added:
modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/node/
modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/node/ContextNode.java
modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/node/PageNode.java
modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/node/PortalNode.java
modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/node/PortalNodeManager.java
modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/node/WindowNode.java
Removed:
modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/node/ContextNode.java
modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/node/PageNode.java
modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/node/PortalNode.java
modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/node/PortalNodeManager.java
modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/node/WindowNode.java
modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/object/
Modified:
modules/presentation/trunk/portal/src/main/artifacts/presentation-portal-war/WEB-INF/jboss-beans.xml
modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/PresentationServerImpl.java
modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/ModelAdapter.java
modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/ModelImporter.java
modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/content/PageContentContextImpl.java
modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/content/WindowContentContextImpl.java
modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/servlet/ModelImportTrigger.java
modules/presentation/trunk/portal/src/test/java/org/jboss/portal/presentation/portal/model/StructuralStateContextTestCase.java
Log:
rename object package to "node" package for better consistency
Modified: modules/presentation/trunk/portal/src/main/artifacts/presentation-portal-war/WEB-INF/jboss-beans.xml
===================================================================
--- modules/presentation/trunk/portal/src/main/artifacts/presentation-portal-war/WEB-INF/jboss-beans.xml 2008-06-26 10:29:40 UTC (rev 11157)
+++ modules/presentation/trunk/portal/src/main/artifacts/presentation-portal-war/WEB-INF/jboss-beans.xml 2008-06-26 12:44:23 UTC (rev 11158)
@@ -131,7 +131,7 @@
</constructor>
</bean>
- <bean name="PortalNodeManager" class="org.jboss.portal.presentation.portal.model.object.PortalNodeManager"/>
+ <bean name="PortalNodeManager" class="org.jboss.portal.presentation.portal.model.node.PortalNodeManager"/>
<bean name="LayoutStore" class="org.jboss.portal.presentation.portal.model.layout.LayoutStore"/>
Modified: modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/PresentationServerImpl.java
===================================================================
--- modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/PresentationServerImpl.java 2008-06-26 10:29:40 UTC (rev 11157)
+++ modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/PresentationServerImpl.java 2008-06-26 12:44:23 UTC (rev 11158)
@@ -23,10 +23,10 @@
package org.jboss.portal.presentation.portal;
import org.jboss.portal.presentation.client.PresentationClient;
-import org.jboss.portal.presentation.portal.model.object.PortalNode;
-import org.jboss.portal.presentation.portal.model.object.WindowNode;
-import org.jboss.portal.presentation.portal.model.object.PageNode;
-import org.jboss.portal.presentation.portal.model.object.PortalNodeManager;
+import org.jboss.portal.presentation.portal.model.node.PortalNode;
+import org.jboss.portal.presentation.portal.model.node.WindowNode;
+import org.jboss.portal.presentation.portal.model.node.PageNode;
+import org.jboss.portal.presentation.portal.model.node.PortalNodeManager;
import org.jboss.portal.presentation.portal.model.layout.SimpleElement;
import org.jboss.portal.presentation.portal.model.content.PageContentContextImpl;
import org.jboss.portal.presentation.impl.state.structural.adapter.StructuralAdapter;
Modified: modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/ModelAdapter.java
===================================================================
--- modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/ModelAdapter.java 2008-06-26 10:29:40 UTC (rev 11157)
+++ modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/ModelAdapter.java 2008-06-26 12:44:23 UTC (rev 11158)
@@ -31,10 +31,10 @@
import org.jboss.portal.presentation.portal.model.layout.LayoutStore;
import org.jboss.portal.presentation.portal.model.layout.LayoutItem;
import org.jboss.portal.presentation.portal.model.layout.SimpleElement;
-import org.jboss.portal.presentation.portal.model.object.PortalNodeManager;
-import org.jboss.portal.presentation.portal.model.object.PortalNode;
-import org.jboss.portal.presentation.portal.model.object.PageNode;
-import org.jboss.portal.presentation.portal.model.object.WindowNode;
+import org.jboss.portal.presentation.portal.model.node.PortalNodeManager;
+import org.jboss.portal.presentation.portal.model.node.PortalNode;
+import org.jboss.portal.presentation.portal.model.node.PageNode;
+import org.jboss.portal.presentation.portal.model.node.WindowNode;
import org.jboss.portal.presentation.model.ui.UIObject;
import org.jboss.portal.presentation.model.ui.UIPane;
import org.jboss.portal.presentation.model.ui.UIWindow;
Modified: modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/ModelImporter.java
===================================================================
--- modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/ModelImporter.java 2008-06-26 10:29:40 UTC (rev 11157)
+++ modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/ModelImporter.java 2008-06-26 12:44:23 UTC (rev 11158)
@@ -33,9 +33,9 @@
import org.jboss.portal.presentation.portal.model.layout.LayoutElement;
import org.jboss.portal.presentation.portal.model.layout.StructureElement;
import org.jboss.portal.presentation.portal.model.layout.LayoutStore;
-import org.jboss.portal.presentation.portal.model.object.PortalNode;
-import org.jboss.portal.presentation.portal.model.object.PageNode;
-import org.jboss.portal.presentation.portal.model.object.WindowNode;
+import org.jboss.portal.presentation.portal.model.node.PortalNode;
+import org.jboss.portal.presentation.portal.model.node.PageNode;
+import org.jboss.portal.presentation.portal.model.node.WindowNode;
import org.jboss.portal.presentation.model.layout.Constants;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
Modified: modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/content/PageContentContextImpl.java
===================================================================
--- modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/content/PageContentContextImpl.java 2008-06-26 10:29:40 UTC (rev 11157)
+++ modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/content/PageContentContextImpl.java 2008-06-26 12:44:23 UTC (rev 11158)
@@ -24,9 +24,9 @@
import org.jboss.portal.presentation.portal.content.PageContentContext;
import org.jboss.portal.presentation.portal.content.WindowContentContext;
-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.object.WindowNode;
+import org.jboss.portal.presentation.portal.model.node.PageNode;
+import org.jboss.portal.presentation.portal.model.node.PortalNode;
+import org.jboss.portal.presentation.portal.model.node.WindowNode;
import java.util.Collection;
import java.util.Map;
Modified: modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/content/WindowContentContextImpl.java
===================================================================
--- modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/content/WindowContentContextImpl.java 2008-06-26 10:29:40 UTC (rev 11157)
+++ modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/content/WindowContentContextImpl.java 2008-06-26 12:44:23 UTC (rev 11158)
@@ -25,7 +25,7 @@
import org.jboss.portal.presentation.portal.content.WindowContentContext;
import org.jboss.portal.presentation.portal.content.PageContentContext;
import org.jboss.portal.presentation.portal.content.Content;
-import org.jboss.portal.presentation.portal.model.object.WindowNode;
+import org.jboss.portal.presentation.portal.model.node.WindowNode;
/**
* @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
Copied: modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/node (from rev 11001, modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/object)
Deleted: modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/node/ContextNode.java
===================================================================
--- modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/object/ContextNode.java 2008-06-12 15:06:46 UTC (rev 11001)
+++ modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/node/ContextNode.java 2008-06-26 12:44:23 UTC (rev 11158)
@@ -1,43 +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.model.object;
-
-import org.jboss.portal.presentation.model.ui.UIObject;
-import org.jboss.portal.presentation.model.ui.UIContext;
-
-/**
- * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
- * @version $Revision: 630 $
- */
-public class ContextNode extends PortalNode
-{
- public ContextNode(String name, PortalNodeManager structuralStateContext)
- {
- super(name, structuralStateContext);
- }
-
- public Class<? extends UIObject> getType()
- {
- return UIContext.class;
- }
-}
Copied: modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/node/ContextNode.java (from rev 11157, modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/object/ContextNode.java)
===================================================================
--- modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/node/ContextNode.java (rev 0)
+++ modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/node/ContextNode.java 2008-06-26 12:44:23 UTC (rev 11158)
@@ -0,0 +1,43 @@
+/******************************************************************************
+ * 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.model.node;
+
+import org.jboss.portal.presentation.model.ui.UIObject;
+import org.jboss.portal.presentation.model.ui.UIContext;
+
+/**
+ * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+public class ContextNode extends PortalNode
+{
+ public ContextNode(String name, PortalNodeManager structuralStateContext)
+ {
+ super(name, structuralStateContext);
+ }
+
+ public Class<? extends UIObject> getType()
+ {
+ return UIContext.class;
+ }
+}
Deleted: modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/node/PageNode.java
===================================================================
--- modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/object/PageNode.java 2008-06-12 15:06:46 UTC (rev 11001)
+++ modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/node/PageNode.java 2008-06-26 12:44:23 UTC (rev 11158)
@@ -1,57 +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.model.object;
-
-import org.jboss.portal.presentation.model.ui.UIObject;
-import org.jboss.portal.presentation.model.ui.UIPage;
-
-/**
- * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
- * @version $Revision: 630 $
- */
-public class PageNode extends PortalNode
-{
-
- /** . */
- private String layoutStructureId;
-
- public PageNode(String name, PortalNodeManager structuralStateContext)
- {
- super(name, structuralStateContext);
- }
-
- public String getLayoutStructureId()
- {
- return layoutStructureId;
- }
-
- public void setLayoutStructureId(String layoutStructureId)
- {
- this.layoutStructureId = layoutStructureId;
- }
-
- public Class<? extends UIObject> getType()
- {
- return UIPage.class;
- }
-}
Copied: modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/node/PageNode.java (from rev 11157, modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/object/PageNode.java)
===================================================================
--- modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/node/PageNode.java (rev 0)
+++ modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/node/PageNode.java 2008-06-26 12:44:23 UTC (rev 11158)
@@ -0,0 +1,44 @@
+/******************************************************************************
+ * 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.model.node;
+
+import org.jboss.portal.presentation.model.ui.UIObject;
+import org.jboss.portal.presentation.model.ui.UIPage;
+
+/**
+ * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+public class PageNode extends PortalNode
+{
+
+ public PageNode(String name, PortalNodeManager structuralStateContext)
+ {
+ super(name, structuralStateContext);
+ }
+
+ public Class<? extends UIObject> getType()
+ {
+ return UIPage.class;
+ }
+}
Deleted: modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/node/PortalNode.java
===================================================================
--- modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/object/PortalNode.java 2008-06-12 15:06:46 UTC (rev 11001)
+++ modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/node/PortalNode.java 2008-06-26 12:44:23 UTC (rev 11158)
@@ -1,244 +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.model.object;
-
-import org.jboss.portal.presentation.model.ui.UIObject;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.io.Serializable;
-
-/**
- * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
- * @version $Revision: 630 $
- */
-public abstract class PortalNode
-{
-
- /** . */
- private PortalNode parent;
-
- /** . */
- final Map<String, PortalNode> children = new HashMap<String, PortalNode>();
-
- /** . */
- private final PortalNodeManager structuralStateContext;
-
- /** . */
- final String id;
-
- /** . */
- private boolean valid;
-
- /** . */
- final String name;
-
- /** . */
- final Map<String, Serializable> properties;
-
- /** . */
- final Map<String, Serializable> immutableProperties;
-
- protected PortalNode(String name, PortalNodeManager structuralStateContext)
- {
- this.name = name;
- this.id = structuralStateContext.nextId();
- this.structuralStateContext = structuralStateContext;
- this.properties = new HashMap<String, Serializable>();
- this.valid = true;
- this.immutableProperties = Collections.unmodifiableMap(properties);
- }
-
- public abstract Class<? extends UIObject> getType();
-
- public boolean isValid()
- {
- return valid;
- }
-
- public String getId()
- {
- return id;
- }
-
- public String getName()
- {
- return name;
- }
-
- public PortalNode getParent()
- {
- return parent;
- }
-
- public Map<String, Serializable> getProperties()
- {
- return immutableProperties;
- }
-
- public Serializable getProperty(String propertyName)
- {
- if (propertyName == null)
- {
- throw new IllegalArgumentException("No null property name");
- }
-
- //
- synchronized (this)
- {
- return properties.get(propertyName);
- }
- }
-
- public void setProperty(String propertyName, Serializable propertyValue)
- {
- if (propertyName == null)
- {
- throw new IllegalArgumentException("No null property name");
- }
-
- //
- synchronized (this)
- {
- if (propertyValue != null)
- {
- properties.put(propertyName, propertyValue);
- }
- else
- {
- properties.remove(propertyName);
- }
- }
- }
-
- public Collection<? extends PortalNode> getChildren()
- {
- return Collections.unmodifiableCollection(children.values());
- }
-
- public <T extends PortalNode> T addChild(String name, Class<T> type)
- {
- if (name == null)
- {
- throw new IllegalArgumentException();
- }
- if (type == null)
- {
- throw new IllegalArgumentException();
- }
-
- //
- T child;
- try
- {
- Constructor<T> ctor = type.getConstructor(String.class, PortalNodeManager.class);
- child = ctor.newInstance(name, structuralStateContext);
- }
- catch (InstantiationException e)
- {
- throw new AssertionError(e);
- }
- catch (IllegalAccessException e)
- {
- throw new AssertionError(e);
- }
- catch (NoSuchMethodException e)
- {
- throw new AssertionError(e);
- }
- catch (InvocationTargetException e)
- {
- throw new AssertionError(e);
- }
-
- //
- synchronized (this)
- {
- if (children.containsKey(name))
- {
- throw new IllegalArgumentException("Child already exist");
- }
- children.put(name, child);
- child.parent = this;
- }
-
- //
- structuralStateContext.nodes.put(child.id, child);
-
- //
- return child;
- }
-
- public void destroyChild(String name)
- {
- if (name == null)
- {
- throw new IllegalArgumentException();
- }
-
- //
- PortalNode child;
- synchronized (this)
- {
- if (!children.containsKey(name))
- {
- throw new IllegalArgumentException("No such child " + name);
- }
-
- child = children.get(name);
-
- //
- for (String blah : new ArrayList<String>(child.children.keySet()))
- {
- child.destroyChild(blah);
- }
-
- //
- children.remove(name);
- structuralStateContext.nodes.remove(child.id);
-
- //
- child.valid = false;
- child.parent = null;
- }
- }
-
- public PortalNode getChild(String name)
- {
- if (name == null)
- {
- throw new IllegalArgumentException();
- }
-
- //
- synchronized (this)
- {
- return children.get(name);
- }
- }
-}
Copied: modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/node/PortalNode.java (from rev 11157, modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/object/PortalNode.java)
===================================================================
--- modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/node/PortalNode.java (rev 0)
+++ modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/node/PortalNode.java 2008-06-26 12:44:23 UTC (rev 11158)
@@ -0,0 +1,244 @@
+/******************************************************************************
+ * 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.model.node;
+
+import org.jboss.portal.presentation.model.ui.UIObject;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.io.Serializable;
+
+/**
+ * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+public abstract class PortalNode
+{
+
+ /** . */
+ private PortalNode parent;
+
+ /** . */
+ final Map<String, PortalNode> children = new HashMap<String, PortalNode>();
+
+ /** . */
+ private final PortalNodeManager structuralStateContext;
+
+ /** . */
+ final String id;
+
+ /** . */
+ private boolean valid;
+
+ /** . */
+ final String name;
+
+ /** . */
+ final Map<String, Serializable> properties;
+
+ /** . */
+ final Map<String, Serializable> immutableProperties;
+
+ protected PortalNode(String name, PortalNodeManager structuralStateContext)
+ {
+ this.name = name;
+ this.id = structuralStateContext.nextId();
+ this.structuralStateContext = structuralStateContext;
+ this.properties = new HashMap<String, Serializable>();
+ this.valid = true;
+ this.immutableProperties = Collections.unmodifiableMap(properties);
+ }
+
+ public abstract Class<? extends UIObject> getType();
+
+ public boolean isValid()
+ {
+ return valid;
+ }
+
+ public String getId()
+ {
+ return id;
+ }
+
+ public String getName()
+ {
+ return name;
+ }
+
+ public PortalNode getParent()
+ {
+ return parent;
+ }
+
+ public Map<String, Serializable> getProperties()
+ {
+ return immutableProperties;
+ }
+
+ public Serializable getProperty(String propertyName)
+ {
+ if (propertyName == null)
+ {
+ throw new IllegalArgumentException("No null property name");
+ }
+
+ //
+ synchronized (this)
+ {
+ return properties.get(propertyName);
+ }
+ }
+
+ public void setProperty(String propertyName, Serializable propertyValue)
+ {
+ if (propertyName == null)
+ {
+ throw new IllegalArgumentException("No null property name");
+ }
+
+ //
+ synchronized (this)
+ {
+ if (propertyValue != null)
+ {
+ properties.put(propertyName, propertyValue);
+ }
+ else
+ {
+ properties.remove(propertyName);
+ }
+ }
+ }
+
+ public Collection<? extends PortalNode> getChildren()
+ {
+ return Collections.unmodifiableCollection(children.values());
+ }
+
+ public <T extends PortalNode> T addChild(String name, Class<T> type)
+ {
+ if (name == null)
+ {
+ throw new IllegalArgumentException();
+ }
+ if (type == null)
+ {
+ throw new IllegalArgumentException();
+ }
+
+ //
+ T child;
+ try
+ {
+ Constructor<T> ctor = type.getConstructor(String.class, PortalNodeManager.class);
+ child = ctor.newInstance(name, structuralStateContext);
+ }
+ catch (InstantiationException e)
+ {
+ throw new AssertionError(e);
+ }
+ catch (IllegalAccessException e)
+ {
+ throw new AssertionError(e);
+ }
+ catch (NoSuchMethodException e)
+ {
+ throw new AssertionError(e);
+ }
+ catch (InvocationTargetException e)
+ {
+ throw new AssertionError(e);
+ }
+
+ //
+ synchronized (this)
+ {
+ if (children.containsKey(name))
+ {
+ throw new IllegalArgumentException("Child already exist");
+ }
+ children.put(name, child);
+ child.parent = this;
+ }
+
+ //
+ structuralStateContext.nodes.put(child.id, child);
+
+ //
+ return child;
+ }
+
+ public void destroyChild(String name)
+ {
+ if (name == null)
+ {
+ throw new IllegalArgumentException();
+ }
+
+ //
+ PortalNode child;
+ synchronized (this)
+ {
+ if (!children.containsKey(name))
+ {
+ throw new IllegalArgumentException("No such child " + name);
+ }
+
+ child = children.get(name);
+
+ //
+ for (String blah : new ArrayList<String>(child.children.keySet()))
+ {
+ child.destroyChild(blah);
+ }
+
+ //
+ children.remove(name);
+ structuralStateContext.nodes.remove(child.id);
+
+ //
+ child.valid = false;
+ child.parent = null;
+ }
+ }
+
+ public PortalNode getChild(String name)
+ {
+ if (name == null)
+ {
+ throw new IllegalArgumentException();
+ }
+
+ //
+ synchronized (this)
+ {
+ return children.get(name);
+ }
+ }
+}
Deleted: modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/node/PortalNodeManager.java
===================================================================
--- modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/object/PortalNodeManager.java 2008-06-12 15:06:46 UTC (rev 11001)
+++ modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/node/PortalNodeManager.java 2008-06-26 12:44:23 UTC (rev 11158)
@@ -1,93 +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.model.object;
-
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.atomic.AtomicLong;
-
-/**
- * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
- * @version $Revision: 630 $
- */
-public class PortalNodeManager
-{
-
- /** . */
- private final AtomicLong sequence = new AtomicLong();
-
- /** . */
- final ConcurrentMap<String, PortalNode> nodes = new ConcurrentHashMap<String, PortalNode>();
-
- /** . */
- private final ContextNode root = new ContextNode("", this);
-
- public PortalNodeManager()
- {
- nodes.put(root.getId(), root);
- }
-
- String nextId()
- {
- return Long.toString(sequence.getAndIncrement());
- }
-
- public PortalNode getNode(String nodeId)
- {
- if (nodeId == null)
- {
- throw new IllegalArgumentException();
- }
-
- //
- return nodes.get(nodeId);
- }
-
- public ContextNode getRoot()
- {
- return root;
- }
-
- public void destroy(String objectId)
- {
- if (objectId == null)
- {
- throw new IllegalArgumentException();
- }
-
- //
- PortalNode node = nodes.get(objectId);
-
- //
- PortalNode parent = node.getParent();
-
- //
- if (parent == null)
- {
- throw new IllegalArgumentException("Cannot destroy root");
- }
-
- //
- parent.destroyChild(node.getName());
- }
-}
Copied: modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/node/PortalNodeManager.java (from rev 11157, modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/object/PortalNodeManager.java)
===================================================================
--- modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/node/PortalNodeManager.java (rev 0)
+++ modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/node/PortalNodeManager.java 2008-06-26 12:44:23 UTC (rev 11158)
@@ -0,0 +1,93 @@
+/******************************************************************************
+ * 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.model.node;
+
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.atomic.AtomicLong;
+
+/**
+ * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+public class PortalNodeManager
+{
+
+ /** . */
+ private final AtomicLong sequence = new AtomicLong();
+
+ /** . */
+ final ConcurrentMap<String, PortalNode> nodes = new ConcurrentHashMap<String, PortalNode>();
+
+ /** . */
+ private final ContextNode root = new ContextNode("", this);
+
+ public PortalNodeManager()
+ {
+ nodes.put(root.getId(), root);
+ }
+
+ String nextId()
+ {
+ return Long.toString(sequence.getAndIncrement());
+ }
+
+ public PortalNode getNode(String nodeId)
+ {
+ if (nodeId == null)
+ {
+ throw new IllegalArgumentException();
+ }
+
+ //
+ return nodes.get(nodeId);
+ }
+
+ public ContextNode getRoot()
+ {
+ return root;
+ }
+
+ public void destroy(String objectId)
+ {
+ if (objectId == null)
+ {
+ throw new IllegalArgumentException();
+ }
+
+ //
+ PortalNode node = nodes.get(objectId);
+
+ //
+ PortalNode parent = node.getParent();
+
+ //
+ if (parent == null)
+ {
+ throw new IllegalArgumentException("Cannot destroy root");
+ }
+
+ //
+ parent.destroyChild(node.getName());
+ }
+}
Deleted: modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/node/WindowNode.java
===================================================================
--- modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/object/WindowNode.java 2008-06-12 15:06:46 UTC (rev 11001)
+++ modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/node/WindowNode.java 2008-06-26 12:44:23 UTC (rev 11158)
@@ -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.portal.model.object;
-
-import org.jboss.portal.presentation.model.ui.UIObject;
-import org.jboss.portal.presentation.model.ui.UIWindow;
-import org.jboss.portal.presentation.portal.content.Content;
-
-/**
- * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
- * @version $Revision: 630 $
- */
-public class WindowNode extends PortalNode
-{
-
- /** . */
- private Content content;
-
- public WindowNode(String name, PortalNodeManager structuralStateContext)
- {
- super(name, structuralStateContext);
- }
-
- public Class<? extends UIObject> getType()
- {
- return UIWindow.class;
- }
-
- public void setContent(Content content)
- {
- this.content = content;
- }
-
- public Content getContent()
- {
- return content;
- }
-
- public static abstract class ContentImpl
- {
- public abstract String getType();
- }
-}
Copied: modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/node/WindowNode.java (from rev 11157, modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/object/WindowNode.java)
===================================================================
--- modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/node/WindowNode.java (rev 0)
+++ modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/node/WindowNode.java 2008-06-26 12:44:23 UTC (rev 11158)
@@ -0,0 +1,63 @@
+/******************************************************************************
+ * 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.model.node;
+
+import org.jboss.portal.presentation.model.ui.UIObject;
+import org.jboss.portal.presentation.model.ui.UIWindow;
+import org.jboss.portal.presentation.portal.content.Content;
+
+/**
+ * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+public class WindowNode extends PortalNode
+{
+
+ /** . */
+ private Content content;
+
+ public WindowNode(String name, PortalNodeManager structuralStateContext)
+ {
+ super(name, structuralStateContext);
+ }
+
+ public Class<? extends UIObject> getType()
+ {
+ return UIWindow.class;
+ }
+
+ public void setContent(Content content)
+ {
+ this.content = content;
+ }
+
+ public Content getContent()
+ {
+ return content;
+ }
+
+ public static abstract class ContentImpl
+ {
+ public abstract String getType();
+ }
+}
Modified: modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/servlet/ModelImportTrigger.java
===================================================================
--- modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/servlet/ModelImportTrigger.java 2008-06-26 10:29:40 UTC (rev 11157)
+++ modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/servlet/ModelImportTrigger.java 2008-06-26 12:44:23 UTC (rev 11158)
@@ -22,9 +22,9 @@
******************************************************************************/
package org.jboss.portal.presentation.portal.servlet;
-import org.jboss.portal.presentation.portal.model.object.PortalNodeManager;
+import org.jboss.portal.presentation.portal.model.node.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.node.ContextNode;
import org.jboss.portal.presentation.portal.model.layout.LayoutStore;
import org.jboss.portal.common.io.IOTools;
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-26 10:29:40 UTC (rev 11157)
+++ modules/presentation/trunk/portal/src/test/java/org/jboss/portal/presentation/portal/model/StructuralStateContextTestCase.java 2008-06-26 12:44:23 UTC (rev 11158)
@@ -31,11 +31,11 @@
import org.jboss.portal.presentation.impl.state.structural.adapter.StructuralStateContextImpl;
import org.jboss.portal.presentation.impl.state.structural.adapter.StructuralAdapter;
import org.jboss.portal.presentation.portal.model.layout.LayoutStore;
-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.object.PortalNodeManager;
-import org.jboss.portal.presentation.portal.model.object.WindowNode;
+import org.jboss.portal.presentation.portal.model.node.ContextNode;
+import org.jboss.portal.presentation.portal.model.node.PageNode;
+import org.jboss.portal.presentation.portal.model.node.PortalNode;
+import org.jboss.portal.presentation.portal.model.node.PortalNodeManager;
+import org.jboss.portal.presentation.portal.model.node.WindowNode;
import java.util.ArrayList;
import java.util.List;
17 years, 10 months
- 1
- 0