JBoss Portal SVN: r10577 - in branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core: impl/model/content and 1 other directory.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-04-14 08:18:16 -0400 (Mon, 14 Apr 2008)
New Revision: 10577
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/ControllerPageNavigationalState.java
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java
Log:
move the inital window state and mode in ControllerPageNavigationalState
Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/ControllerPageNavigationalState.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/ControllerPageNavigationalState.java 2008-04-14 12:13:34 UTC (rev 10576)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/ControllerPageNavigationalState.java 2008-04-14 12:18:16 UTC (rev 10577)
@@ -182,6 +182,10 @@
{
return new WindowNavigationalState(wns.getContentState(), wns.getMode(), wns.getWindowState());
}
+ else
+ {
+ return new WindowNavigationalState(null, window.getInitialMode(), window.getInitialWindowState());
+ }
}
//
Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java 2008-04-14 12:13:34 UTC (rev 10576)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java 2008-04-14 12:18:16 UTC (rev 10577)
@@ -177,12 +177,6 @@
WindowNavigationalState windowNS = rendererContext.getNavigationalState();
//
- if (windowNS == null)
- {
- windowNS = new WindowNavigationalState(null, window.getInitialMode(), window.getInitialWindowState());
- }
-
- //
Map<String, String> windowProps = new HashMap<String, String>(window.getProperties());
Mode mode = windowNS.getMode();
WindowState windowState = windowNS.getWindowState();
18 years
JBoss Portal SVN: r10576 - in modules/portlet/trunk/controller: src/test/java/org/jboss/portal/portlet/controller and 1 other directory.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-04-14 08:13:34 -0400 (Mon, 14 Apr 2008)
New Revision: 10576
Modified:
modules/portlet/trunk/controller/pom.xml
modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerRequestTestCase.java
Log:
added test case for JBPORTAL-1984 : NPE when a PortletResourceRequest.Scope is provided with a null navigational state (which is a possible use case)
Modified: modules/portlet/trunk/controller/pom.xml
===================================================================
--- modules/portlet/trunk/controller/pom.xml 2008-04-14 11:49:03 UTC (rev 10575)
+++ modules/portlet/trunk/controller/pom.xml 2008-04-14 12:13:34 UTC (rev 10576)
@@ -33,7 +33,6 @@
<artifactId>portlet-portlet</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
- <scope>test</scope>
</dependency>
<!--TEST SCOPE-->
Modified: modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerRequestTestCase.java
===================================================================
--- modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerRequestTestCase.java 2008-04-14 11:49:03 UTC (rev 10575)
+++ modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerRequestTestCase.java 2008-04-14 12:13:34 UTC (rev 10576)
@@ -39,7 +39,6 @@
import org.jboss.portal.portlet.controller.request.PortletRenderRequest;
import org.jboss.portal.portlet.controller.state.WindowNavigationalState;
import org.jboss.portal.portlet.controller.state.PageNavigationalState;
-import org.jboss.portal.portlet.controller.response.ControllerResponse;
import org.jboss.portal.common.util.ParameterMap;
import org.jboss.portal.Mode;
import org.jboss.portal.WindowState;
@@ -121,70 +120,141 @@
}
@Test
- public void testPortletControllerResourceRequest() throws PortletInvokerException
+ public void testPortletControllerResourceRequestFullScope() throws PortletInvokerException
{
PortletSupport fooPortlet = invoker.addPortlet("foo");
- fooPortlet.addHandler(new PortletSupport.ResourceHandler()
- {
- protected PortletInvocationResponse invoke(ResourceInvocation resServing) throws PortletInvokerException
- {
- assertNotNull(resServing);
- assertEquals("resourceid", resServing.getResourceId());
- assertEquals(rs, resServing.getResourceState());
- assertEquals(CacheLevel.FULL, resServing.getCacheLevel());
- assertEquals(null, resServing.getNavigationalState());
- assertEquals(Mode.VIEW, resServing.getMode());
- assertEquals(WindowState.NORMAL, resServing.getWindowState());
- assertEquals(body, resServing.getForm());
+ ResourceHandlerImpl resourceHandler = new ResourceHandlerImpl();
+ resourceHandler.expectedResourceId = "resourceid";
+ resourceHandler.expectedRS = rs;
+ resourceHandler.expectedCacheability = CacheLevel.FULL;
+ resourceHandler.expectedPortletNS = null;
+ resourceHandler.expectedBody = body;
+ resourceHandler.expectedMode = Mode.VIEW;
+ resourceHandler.expectedWindowState = WindowState.NORMAL;
+ resourceHandler.expectedPublicState = null;
+ fooPortlet.addHandler(resourceHandler);
+ PortletResourceRequest fullServing = new PortletResourceRequest("foo", "resourceid", rs, body, new PortletResourceRequest.FullScope());
+ controller.process(context, fullServing);
- //
- return new UpdateNavigationalStateResponse();
- }
- });
- fooPortlet.addHandler(new PortletSupport.ResourceHandler()
- {
- protected PortletInvocationResponse invoke(ResourceInvocation resServing) throws PortletInvokerException
- {
- assertNotNull(resServing);
- assertEquals("resourceid", resServing.getResourceId());
- assertEquals(rs, resServing.getResourceState());
- assertEquals(CacheLevel.PORTLET, resServing.getCacheLevel());
- assertEquals(portletNS, resServing.getNavigationalState());
- assertEquals(Mode.EDIT, resServing.getMode());
- assertEquals(WindowState.MAXIMIZED, resServing.getWindowState());
- assertEquals(body, resServing.getForm());
+ //
+ resourceHandler.expectedBody = null;
+ fooPortlet.addHandler(resourceHandler);
+ PortletResourceRequest fullServing2 = new PortletResourceRequest("foo", "resourceid", rs, null, new PortletResourceRequest.FullScope());
+ controller.process(context, fullServing2);
- //
- return new UpdateNavigationalStateResponse();
- }
- });
- fooPortlet.addHandler(new PortletSupport.ResourceHandler()
- {
- protected PortletInvocationResponse invoke(ResourceInvocation resServing) throws PortletInvokerException
- {
- assertNotNull(resServing);
- assertEquals("resourceid", resServing.getResourceId());
- assertEquals(rs, resServing.getResourceState());
- assertEquals(CacheLevel.PAGE, resServing.getCacheLevel());
- assertEquals(portletNS, resServing.getNavigationalState());
- assertEquals(Mode.EDIT, resServing.getMode());
- assertEquals(WindowState.MAXIMIZED, resServing.getWindowState());
- assertEquals(body, resServing.getForm());
+ //
+ resourceHandler.expectedResourceId = null;
+ fooPortlet.addHandler(resourceHandler);
+ PortletResourceRequest fullServing3 = new PortletResourceRequest("foo", null, rs, null, new PortletResourceRequest.FullScope());
+ controller.process(context, fullServing3);
+ }
- //
- return new UpdateNavigationalStateResponse();
- }
- });
+ @Test
+ public void testPortletControllerResourceRequestPortletScope() throws PortletInvokerException
+ {
+ PortletSupport fooPortlet = invoker.addPortlet("foo");
+ ResourceHandlerImpl resourceHandler = new ResourceHandlerImpl();
+ resourceHandler.expectedResourceId = "resourceid";
+ resourceHandler.expectedRS = rs;
+ resourceHandler.expectedBody = body;
+ resourceHandler.expectedCacheability = CacheLevel.PORTLET;
+ resourceHandler.expectedPortletNS = portletNS;
+ resourceHandler.expectedMode = Mode.EDIT;
+ resourceHandler.expectedWindowState = WindowState.MAXIMIZED;
+ resourceHandler.expectedPublicState = null;
+ fooPortlet.addHandler(resourceHandler);
+ PortletResourceRequest portletServing = new PortletResourceRequest("foo", "resourceid", rs, body, new PortletResourceRequest.PortletScope(windowNS));
+ controller.process(context, portletServing);
//
- PortletResourceRequest fullServing = new PortletResourceRequest("foo", "resourceid", rs, body, new PortletResourceRequest.FullScope());
- PortletResourceRequest portletServing = new PortletResourceRequest("foo", "resourceid", rs, body, new PortletResourceRequest.PortletScope(windowNS));
+ resourceHandler.expectedPortletNS = null;
+ resourceHandler.expectedMode = Mode.VIEW;
+ resourceHandler.expectedWindowState = WindowState.NORMAL;
+ fooPortlet.addHandler(resourceHandler);
+ PortletResourceRequest portletServing2 = new PortletResourceRequest("foo", "resourceid", rs, body, new PortletResourceRequest.PortletScope(null));
+ controller.process(context, portletServing2);
+
+ //
+ resourceHandler.expectedResourceId = null;
+ fooPortlet.addHandler(resourceHandler);
+ PortletResourceRequest portletServing3 = new PortletResourceRequest("foo", null, rs, body, new PortletResourceRequest.PortletScope(null));
+ controller.process(context, portletServing3);
+ }
+
+ @Test
+ public void testPortletControllerResourceRequestPageScope() throws PortletInvokerException
+ {
+ PortletSupport fooPortlet = invoker.addPortlet("foo");
+ ResourceHandlerImpl resourceHandler = new ResourceHandlerImpl();
+ resourceHandler.expectedResourceId = "resourceid";
+ resourceHandler.expectedRS = rs;
+ resourceHandler.expectedBody = body;
+ resourceHandler.expectedPortletNS = portletNS;
+ resourceHandler.expectedMode = Mode.EDIT;
+ resourceHandler.expectedWindowState = WindowState.MAXIMIZED;
+ resourceHandler.expectedCacheability = CacheLevel.PAGE;
+ resourceHandler.expectedPublicState = new ParameterMap();
+ fooPortlet.addHandler(resourceHandler);
PortletResourceRequest pageServing = new PortletResourceRequest("foo", "resourceid", rs, body, new PortletResourceRequest.PageScope(windowNS, pageNS));
+ controller.process(context, pageServing);
//
- controller.process(context, fullServing);
- controller.process(context, portletServing);
- controller.process(context, pageServing);
+ resourceHandler.expectedPortletNS = null;
+ resourceHandler.expectedMode = Mode.VIEW;
+ resourceHandler.expectedWindowState = WindowState.NORMAL;
+ fooPortlet.addHandler(resourceHandler);
+ PortletResourceRequest pageServing2 = new PortletResourceRequest("foo", "resourceid", rs, body, new PortletResourceRequest.PageScope(null, pageNS));
+ controller.process(context, pageServing2);
+
+ //
+ resourceHandler.expectedBody = null;
+ fooPortlet.addHandler(resourceHandler);
+ PortletResourceRequest pageServing3 = new PortletResourceRequest("foo", "resourceid", rs, null, new PortletResourceRequest.PageScope(null, pageNS));
+ controller.process(context, pageServing3);
+
+ //
+ resourceHandler.expectedPublicState = null;
+ fooPortlet.addHandler(resourceHandler);
+ PortletResourceRequest pageServing4 = new PortletResourceRequest("foo", "resourceid", rs, null, new PortletResourceRequest.PageScope(null, null));
+ controller.process(context, pageServing4);
+
+ //
+ resourceHandler.expectedResourceId = null;
+ fooPortlet.addHandler(resourceHandler);
+ PortletResourceRequest pageServing5 = new PortletResourceRequest("foo", null, rs, null, new PortletResourceRequest.PageScope(null, null));
+ controller.process(context, pageServing5);
}
+ private static class ResourceHandlerImpl extends PortletSupport.ResourceHandler
+ {
+
+ private String expectedResourceId;
+ private StateString expectedRS;
+ private StateString expectedPortletNS;
+ private ParameterMap expectedBody;
+ private CacheLevel expectedCacheability;
+ private Mode expectedMode;
+ private WindowState expectedWindowState;
+ private ParameterMap expectedPublicState;
+
+ protected PortletInvocationResponse invoke(ResourceInvocation resServing) throws PortletInvokerException
+ {
+ assertNotNull(resServing);
+ assertEquals(expectedResourceId, resServing.getResourceId());
+ assertEquals(expectedRS, resServing.getResourceState());
+ assertEquals(expectedCacheability, resServing.getCacheLevel());
+ assertEquals(expectedPortletNS, resServing.getNavigationalState());
+ assertEquals(expectedMode, resServing.getMode());
+ assertEquals(expectedWindowState, resServing.getWindowState());
+ assertEquals(expectedBody, resServing.getForm());
+ assertEquals(expectedPublicState, resServing.getPublicNavigationalState());
+
+ // add public NS checks
+
+ //
+ return new UpdateNavigationalStateResponse();
+ }
+
+ }
+
}
18 years
JBoss Portal SVN: r10575 - modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-04-14 07:49:03 -0400 (Mon, 14 Apr 2008)
New Revision: 10575
Modified:
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/NavigationInfoSupport.java
Log:
oups
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/NavigationInfoSupport.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/NavigationInfoSupport.java 2008-04-14 11:29:49 UTC (rev 10574)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/NavigationInfoSupport.java 2008-04-14 11:49:03 UTC (rev 10575)
@@ -24,12 +24,10 @@
import org.jboss.portal.portlet.info.NavigationInfo;
import org.jboss.portal.portlet.info.ParameterInfo;
-import org.jboss.portal.portlet.impl.info.ContainerParameterInfo;
import javax.xml.namespace.QName;
import java.util.Collection;
import java.util.Map;
-import java.util.LinkedHashMap;
import java.util.HashMap;
import java.util.Collections;
@@ -41,22 +39,22 @@
{
/** . */
- private final Map<String, ContainerParameterInfo> publicParametersById;
+ private final Map<String, ParameterInfo> publicParametersById;
/** . */
- private final Map<QName, ContainerParameterInfo> publicParametersByName;
+ private final Map<QName, ParameterInfo> publicParametersByName;
/** . */
- private final Collection<ContainerParameterInfo> publicParameters;
+ private final Collection<ParameterInfo> publicParameters;
public NavigationInfoSupport()
{
- this.publicParametersById = new HashMap<String, ContainerParameterInfo>();
- this.publicParametersByName = new HashMap<QName, ContainerParameterInfo>();
+ this.publicParametersById = new HashMap<String, ParameterInfo>();
+ this.publicParametersByName = new HashMap<QName, ParameterInfo>();
this.publicParameters = Collections.unmodifiableCollection(publicParametersById.values());
}
- public void addPublicParameter(ContainerParameterInfo publicParameter)
+ public void addPublicParameter(ParameterInfo publicParameter)
{
if (publicParameter == null)
{
@@ -87,7 +85,7 @@
return publicParametersByName.get(name);
}
- public ContainerParameterInfo getPublicParameter(String id)
+ public ParameterInfo getPublicParameter(String id)
{
if (id == null)
{
@@ -98,7 +96,7 @@
return publicParametersById.get(id);
}
- public Collection<ContainerParameterInfo> getPublicParameters()
+ public Collection<ParameterInfo> getPublicParameters()
{
return publicParameters;
}
18 years
JBoss Portal SVN: r10574 - modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/state.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-04-14 07:29:49 -0400 (Mon, 14 Apr 2008)
New Revision: 10574
Modified:
modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/state/StateControllerContext.java
Log:
javadoc update
Modified: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/state/StateControllerContext.java
===================================================================
--- modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/state/StateControllerContext.java 2008-04-14 10:38:05 UTC (rev 10573)
+++ modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/state/StateControllerContext.java 2008-04-14 11:29:49 UTC (rev 10574)
@@ -34,8 +34,9 @@
/**
* Clone an existing page state object.
*
- * @param pageNavigationalState
- *@param modifiable set the modifiable status @return the page state clone
+ * @param pageNavigationalState the page navigational state
+ * @param modifiable set the modifiable status @return the page state clone
+ * @return the cloned page navigational state
*/
PageNavigationalState clonePageNavigationalState(PageNavigationalState pageNavigationalState, boolean modifiable);
18 years
JBoss Portal SVN: r10573 - in modules/portlet/trunk/portlet/src: test/java/org/jboss/portal/portlet/support/info and 1 other directory.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-04-14 06:38:05 -0400 (Mon, 14 Apr 2008)
New Revision: 10573
Modified:
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerNavigationInfo.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/NavigationInfoSupport.java
Log:
add getPublicParameter(QName name) on NavigationInfo interface
Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerNavigationInfo.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerNavigationInfo.java 2008-04-14 10:36:42 UTC (rev 10572)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerNavigationInfo.java 2008-04-14 10:38:05 UTC (rev 10573)
@@ -66,7 +66,7 @@
}
if (publicParametersByName.containsKey(publicParameter.getName()))
{
- throw new IllegalArgumentException("duplicate public parameter id " + publicParameter.getName());
+ throw new IllegalArgumentException("duplicate public parameter name " + publicParameter.getName());
}
//
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/NavigationInfoSupport.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/NavigationInfoSupport.java 2008-04-14 10:36:42 UTC (rev 10572)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/NavigationInfoSupport.java 2008-04-14 10:38:05 UTC (rev 10573)
@@ -68,7 +68,7 @@
}
if (publicParametersByName.containsKey(publicParameter.getName()))
{
- throw new IllegalArgumentException("duplicate public parameter id " + publicParameter.getName());
+ throw new IllegalArgumentException("duplicate public parameter name " + publicParameter.getName());
}
//
18 years
JBoss Portal SVN: r10572 - 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-04-14 06:36:42 -0400 (Mon, 14 Apr 2008)
New Revision: 10572
Modified:
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerNavigationInfo.java
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/NavigationInfo.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/NavigationInfoSupport.java
Log:
add getPublicParameter(QName name) on NavigationInfo interface
Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerNavigationInfo.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerNavigationInfo.java 2008-04-14 10:27:36 UTC (rev 10571)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerNavigationInfo.java 2008-04-14 10:36:42 UTC (rev 10572)
@@ -23,10 +23,13 @@
package org.jboss.portal.portlet.impl.info;
import org.jboss.portal.portlet.info.NavigationInfo;
+import org.jboss.portal.portlet.info.ParameterInfo;
+import javax.xml.namespace.QName;
import java.util.Collection;
import java.util.Map;
import java.util.HashMap;
+import java.util.Collections;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
@@ -36,25 +39,65 @@
{
/** . */
- private Map<String, ContainerParameterInfo> publicParameters;
+ private final Map<String, ContainerParameterInfo> publicParametersById;
+ /** . */
+ private final Map<QName, ContainerParameterInfo> publicParametersByName;
+
+ /** . */
+ private final Collection<ContainerParameterInfo> publicParameters;
+
public ContainerNavigationInfo()
{
- this.publicParameters = new HashMap<String, ContainerParameterInfo>();
+ this.publicParametersById = new HashMap<String, ContainerParameterInfo>();
+ this.publicParametersByName = new HashMap<QName, ContainerParameterInfo>();
+ this.publicParameters = Collections.unmodifiableCollection(publicParametersById.values());
}
public void addPublicParameter(ContainerParameterInfo publicParameter)
{
- publicParameters.put(publicParameter.getId(), publicParameter);
+ if (publicParameter == null)
+ {
+ throw new IllegalArgumentException("no null public parameter accepted");
+ }
+ if (publicParametersById.containsKey(publicParameter.getId()))
+ {
+ throw new IllegalArgumentException("duplicate public parameter id " + publicParameter.getId());
+ }
+ if (publicParametersByName.containsKey(publicParameter.getName()))
+ {
+ throw new IllegalArgumentException("duplicate public parameter id " + publicParameter.getName());
+ }
+
+ //
+ publicParametersById.put(publicParameter.getId(), publicParameter);
+ publicParametersByName.put(publicParameter.getName(), publicParameter);
}
+ public ParameterInfo getPublicParameter(QName name)
+ {
+ if (name == null)
+ {
+ throw new IllegalArgumentException("No null name accepted");
+ }
+
+ //
+ return publicParametersByName.get(name);
+ }
+
public ContainerParameterInfo getPublicParameter(String id)
{
- return publicParameters.get(id);
+ if (id == null)
+ {
+ throw new IllegalArgumentException("No null id accepted");
+ }
+
+ //
+ return publicParametersById.get(id);
}
public Collection<ContainerParameterInfo> getPublicParameters()
{
- return publicParameters.values();
+ return publicParameters;
}
}
Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/NavigationInfo.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/NavigationInfo.java 2008-04-14 10:27:36 UTC (rev 10571)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/NavigationInfo.java 2008-04-14 10:36:42 UTC (rev 10572)
@@ -22,6 +22,7 @@
******************************************************************************/
package org.jboss.portal.portlet.info;
+import javax.xml.namespace.QName;
import java.util.Collection;
/**
@@ -31,8 +32,27 @@
public interface NavigationInfo
{
+ /**
+ * Returns a public parameter by using its id or null if it does not exist.
+ *
+ * @param id the parameter id
+ * @return the parameter info object
+ */
ParameterInfo getPublicParameter(String id);
+ /**
+ * Returns a public parameter by using its name or null if it does not exist.
+ *
+ * @param name the parameter name
+ * @return the parameter info object
+ */
+ ParameterInfo getPublicParameter(QName name);
+
+ /**
+ * Returns the collection of known public parameters.
+ *
+ * @return the public parameter collection
+ */
Collection<? extends ParameterInfo> getPublicParameters();
}
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/NavigationInfoSupport.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/NavigationInfoSupport.java 2008-04-14 10:27:36 UTC (rev 10571)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/NavigationInfoSupport.java 2008-04-14 10:36:42 UTC (rev 10572)
@@ -24,10 +24,14 @@
import org.jboss.portal.portlet.info.NavigationInfo;
import org.jboss.portal.portlet.info.ParameterInfo;
+import org.jboss.portal.portlet.impl.info.ContainerParameterInfo;
+import javax.xml.namespace.QName;
import java.util.Collection;
import java.util.Map;
import java.util.LinkedHashMap;
+import java.util.HashMap;
+import java.util.Collections;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
@@ -37,25 +41,65 @@
{
/** . */
- private final Map<String, ParameterInfoSupport> publicParameters;
+ private final Map<String, ContainerParameterInfo> publicParametersById;
+ /** . */
+ private final Map<QName, ContainerParameterInfo> publicParametersByName;
+
+ /** . */
+ private final Collection<ContainerParameterInfo> publicParameters;
+
public NavigationInfoSupport()
{
- publicParameters = new LinkedHashMap<String, ParameterInfoSupport>();
+ this.publicParametersById = new HashMap<String, ContainerParameterInfo>();
+ this.publicParametersByName = new HashMap<QName, ContainerParameterInfo>();
+ this.publicParameters = Collections.unmodifiableCollection(publicParametersById.values());
}
- public void addPublicParameter(ParameterInfoSupport parameter)
+ public void addPublicParameter(ContainerParameterInfo publicParameter)
{
- publicParameters.put(parameter.getId(), parameter);
+ if (publicParameter == null)
+ {
+ throw new IllegalArgumentException("no null public parameter accepted");
+ }
+ if (publicParametersById.containsKey(publicParameter.getId()))
+ {
+ throw new IllegalArgumentException("duplicate public parameter id " + publicParameter.getId());
+ }
+ if (publicParametersByName.containsKey(publicParameter.getName()))
+ {
+ throw new IllegalArgumentException("duplicate public parameter id " + publicParameter.getName());
+ }
+
+ //
+ publicParametersById.put(publicParameter.getId(), publicParameter);
+ publicParametersByName.put(publicParameter.getName(), publicParameter);
}
- public ParameterInfo getPublicParameter(String id)
+ public ParameterInfo getPublicParameter(QName name)
{
- return publicParameters.get(id);
+ if (name == null)
+ {
+ throw new IllegalArgumentException("No null name accepted");
+ }
+
+ //
+ return publicParametersByName.get(name);
}
- public Collection<? extends ParameterInfo> getPublicParameters()
+ public ContainerParameterInfo getPublicParameter(String id)
{
- return publicParameters.values();
+ if (id == null)
+ {
+ throw new IllegalArgumentException("No null id accepted");
+ }
+
+ //
+ return publicParametersById.get(id);
}
+
+ public Collection<ContainerParameterInfo> getPublicParameters()
+ {
+ return publicParameters;
+ }
}
18 years
JBoss Portal SVN: r10571 - in branches/JBoss_Portal_Branch_2_7/build: ide/intellij/idea70/modules/core and 3 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-04-14 06:27:36 -0400 (Mon, 14 Apr 2008)
New Revision: 10571
Modified:
branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml
branches/JBoss_Portal_Branch_2_7/build/ide/intellij/idea70/modules/core-cms/core-cms.iml
branches/JBoss_Portal_Branch_2_7/build/ide/intellij/idea70/modules/core-samples/core-samples.iml
branches/JBoss_Portal_Branch_2_7/build/ide/intellij/idea70/modules/core/core.iml
branches/JBoss_Portal_Branch_2_7/build/ide/intellij/idea70/modules/widget/widget.iml
Log:
missing thirdparty update :-)
Modified: branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml 2008-04-14 05:47:45 UTC (rev 10570)
+++ branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml 2008-04-14 10:27:36 UTC (rev 10571)
@@ -47,10 +47,10 @@
are pushed to the http://repository.jboss.com site.
-->
- <componentref name="jboss-portal/modules/common" version="trunk-SNAPSHOT"/>
- <componentref name="jboss-portal/modules/web" version="trunk-SNAPSHOT"/>
+ <componentref name="jboss-portal/modules/common" version="1.2.0.Beta3"/>
+ <componentref name="jboss-portal/modules/web" version="1.2.0.Beta3"/>
<componentref name="jboss-portal/modules/test" version="1.0.1"/>
- <componentref name="jboss-portal/modules/portlet" version="trunk-SNAPSHOT"/>
+ <componentref name="jboss-portal/modules/portlet" version="2.0.0.CR2"/>
<componentref name="jboss-portal/modules/identity" version="1.0.1"/>
<componentref name="antlr" version="2.7.6.ga"/>
<componentref name="apache-ant" version="1.6.5"/>
Modified: branches/JBoss_Portal_Branch_2_7/build/ide/intellij/idea70/modules/core/core.iml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/build/ide/intellij/idea70/modules/core/core.iml 2008-04-14 05:47:45 UTC (rev 10570)
+++ branches/JBoss_Portal_Branch_2_7/build/ide/intellij/idea70/modules/core/core.iml 2008-04-14 10:27:36 UTC (rev 10571)
@@ -376,7 +376,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-jsr168api-lib.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-lib.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -385,7 +385,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-lib.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-federation-lib.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -394,7 +394,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-federation-lib.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss-portal/modules/test/lib/portal-test-lib.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -403,31 +403,50 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss-portal/modules/test/lib/portal-test-lib.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss-portal/modules/web/lib/portal-web-lib.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="library" name="identity" level="project" />
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss-portal/modules/web/lib/portal-web-lib.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/microcontainer/lib/jboss-dependency.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="library" name="identity" level="project" />
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/microcontainer/lib/jboss-dependency.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-bridge-lib.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-management-lib.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-controller-lib.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="library" name="portlet api" level="project" />
<orderEntryProperties />
</component>
<component name="VcsManagerConfiguration">
Modified: branches/JBoss_Portal_Branch_2_7/build/ide/intellij/idea70/modules/core-cms/core-cms.iml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/build/ide/intellij/idea70/modules/core-cms/core-cms.iml 2008-04-14 05:47:45 UTC (rev 10570)
+++ branches/JBoss_Portal_Branch_2_7/build/ide/intellij/idea70/modules/core-cms/core-cms.iml 2008-04-14 10:27:36 UTC (rev 10571)
@@ -148,6 +148,7 @@
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="library" name="portlet api" level="project" />
<orderEntryProperties />
</component>
<component name="VcsManagerConfiguration">
Modified: branches/JBoss_Portal_Branch_2_7/build/ide/intellij/idea70/modules/core-samples/core-samples.iml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/build/ide/intellij/idea70/modules/core-samples/core-samples.iml 2008-04-14 05:47:45 UTC (rev 10570)
+++ branches/JBoss_Portal_Branch_2_7/build/ide/intellij/idea70/modules/core-samples/core-samples.iml 2008-04-14 10:27:36 UTC (rev 10571)
@@ -28,6 +28,141 @@
</packaging>
</configuration>
</facet>
+ <facet type="web" name="Web2" implicit="true">
+ <configuration>
+ <descriptors>
+ <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/../../../../../../core-samples/src/resources/portal-jsp-samples-war/WEB-INF/web.xml" optional="false" version="2.5" />
+ </descriptors>
+ <webroots>
+ <root url="file://$MODULE_DIR$/../../../../../../core-samples/src/resources/portal-jsp-samples-war" relative="/" />
+ </webroots>
+ <building>
+ <setting name="EXPLODED_URL" value="file://" />
+ <setting name="EXPLODED_ENABLED" value="false" />
+ <setting name="JAR_URL" value="file://" />
+ <setting name="JAR_ENABLED" value="false" />
+ <setting name="BUILD_MODULE_ON_FRAME_DEACTIVATION" value="false" />
+ <setting name="BUILD_EXTERNAL_DEPENDENCIES" value="false" />
+ <setting name="EXCLUDE_EXPLODED_DIRECTORY" value="true" />
+ <setting name="RUN_JASPER_VALIDATION" value="true" />
+ <setting name="BUILD_ONLY_WEB_RESOURCES" value="false" />
+ </building>
+ <packaging>
+ <containerElement type="module" name="core-samples">
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/classes" />
+ </containerElement>
+ </packaging>
+ </configuration>
+ </facet>
+ <facet type="web" name="Web3" implicit="true">
+ <configuration>
+ <descriptors>
+ <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/../../../../../../core-samples/src/resources/portal-news-samples-war/WEB-INF/web.xml" optional="false" version="2.5" />
+ </descriptors>
+ <webroots>
+ <root url="file://$MODULE_DIR$/../../../../../../core-samples/src/resources/portal-news-samples-war" relative="/" />
+ </webroots>
+ <building>
+ <setting name="EXPLODED_URL" value="file://" />
+ <setting name="EXPLODED_ENABLED" value="false" />
+ <setting name="JAR_URL" value="file://" />
+ <setting name="JAR_ENABLED" value="false" />
+ <setting name="BUILD_MODULE_ON_FRAME_DEACTIVATION" value="false" />
+ <setting name="BUILD_EXTERNAL_DEPENDENCIES" value="false" />
+ <setting name="EXCLUDE_EXPLODED_DIRECTORY" value="true" />
+ <setting name="RUN_JASPER_VALIDATION" value="true" />
+ <setting name="BUILD_ONLY_WEB_RESOURCES" value="false" />
+ </building>
+ <packaging>
+ <containerElement type="module" name="core-samples">
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/classes" />
+ </containerElement>
+ </packaging>
+ </configuration>
+ </facet>
+ <facet type="web" name="Web4" implicit="true">
+ <configuration>
+ <descriptors>
+ <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/../../../../../../core-samples/src/resources/portal-users-samples-war/WEB-INF/web.xml" optional="false" version="2.5" />
+ </descriptors>
+ <webroots>
+ <root url="file://$MODULE_DIR$/../../../../../../core-samples/src/resources/portal-users-samples-war" relative="/" />
+ </webroots>
+ <building>
+ <setting name="EXPLODED_URL" value="file://" />
+ <setting name="EXPLODED_ENABLED" value="false" />
+ <setting name="JAR_URL" value="file://" />
+ <setting name="JAR_ENABLED" value="false" />
+ <setting name="BUILD_MODULE_ON_FRAME_DEACTIVATION" value="false" />
+ <setting name="BUILD_EXTERNAL_DEPENDENCIES" value="false" />
+ <setting name="EXCLUDE_EXPLODED_DIRECTORY" value="true" />
+ <setting name="RUN_JASPER_VALIDATION" value="true" />
+ <setting name="BUILD_ONLY_WEB_RESOURCES" value="false" />
+ </building>
+ <packaging>
+ <containerElement type="module" name="core-samples">
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/classes" />
+ </containerElement>
+ </packaging>
+ </configuration>
+ </facet>
+ <facet type="web" name="Web5" implicit="true">
+ <configuration>
+ <descriptors>
+ <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/../../../../../../core-samples/src/resources/portal-weather-samples-war/WEB-INF/web.xml" optional="false" version="2.5" />
+ </descriptors>
+ <webroots>
+ <root url="file://$MODULE_DIR$/../../../../../../core-samples/src/resources/portal-weather-samples-war" relative="/" />
+ </webroots>
+ <building>
+ <setting name="EXPLODED_URL" value="file://" />
+ <setting name="EXPLODED_ENABLED" value="false" />
+ <setting name="JAR_URL" value="file://" />
+ <setting name="JAR_ENABLED" value="false" />
+ <setting name="BUILD_MODULE_ON_FRAME_DEACTIVATION" value="false" />
+ <setting name="BUILD_EXTERNAL_DEPENDENCIES" value="false" />
+ <setting name="EXCLUDE_EXPLODED_DIRECTORY" value="true" />
+ <setting name="RUN_JASPER_VALIDATION" value="true" />
+ <setting name="BUILD_ONLY_WEB_RESOURCES" value="false" />
+ </building>
+ <packaging>
+ <containerElement type="module" name="core-samples">
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/classes" />
+ </containerElement>
+ </packaging>
+ </configuration>
+ </facet>
+ <facet type="web" name="Web6" implicit="true">
+ <configuration>
+ <descriptors>
+ <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/../../../../../../core-samples/src/resources/portal-portlet-samples-war/WEB-INF/web.xml" optional="false" version="2.5" />
+ </descriptors>
+ <webroots>
+ <root url="file://$MODULE_DIR$/../../../../../../core-samples/src/resources/portal-portlet-samples-war" relative="/" />
+ </webroots>
+ <building>
+ <setting name="EXPLODED_URL" value="file://" />
+ <setting name="EXPLODED_ENABLED" value="false" />
+ <setting name="JAR_URL" value="file://" />
+ <setting name="JAR_ENABLED" value="false" />
+ <setting name="BUILD_MODULE_ON_FRAME_DEACTIVATION" value="false" />
+ <setting name="BUILD_EXTERNAL_DEPENDENCIES" value="false" />
+ <setting name="EXCLUDE_EXPLODED_DIRECTORY" value="true" />
+ <setting name="RUN_JASPER_VALIDATION" value="true" />
+ <setting name="BUILD_ONLY_WEB_RESOURCES" value="false" />
+ </building>
+ <packaging>
+ <containerElement type="module" name="core-samples">
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/classes" />
+ </containerElement>
+ </packaging>
+ </configuration>
+ </facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/../../../../../../core-samples/output/idea/classes" />
@@ -99,6 +234,16 @@
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$APPLICATION_HOME_DIR$/lib/javaee.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="library" name="portlet api" level="project" />
<orderEntryProperties />
</component>
<component name="VcsManagerConfiguration">
Modified: branches/JBoss_Portal_Branch_2_7/build/ide/intellij/idea70/modules/widget/widget.iml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/build/ide/intellij/idea70/modules/widget/widget.iml 2008-04-14 05:47:45 UTC (rev 10570)
+++ branches/JBoss_Portal_Branch_2_7/build/ide/intellij/idea70/modules/widget/widget.iml 2008-04-14 10:27:36 UTC (rev 10571)
@@ -28,6 +28,33 @@
</packaging>
</configuration>
</facet>
+ <facet type="web" name="Web" implicit="true">
+ <configuration>
+ <descriptors>
+ <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/../../../../../../widget/src/resources/portal-widget-netvibes-war/WEB-INF/web.xml" optional="false" version="2.5" />
+ </descriptors>
+ <webroots>
+ <root url="file://$MODULE_DIR$/../../../../../../widget/src/resources/portal-widget-netvibes-war" relative="/" />
+ </webroots>
+ <building>
+ <setting name="EXPLODED_URL" value="file://" />
+ <setting name="EXPLODED_ENABLED" value="false" />
+ <setting name="JAR_URL" value="file://" />
+ <setting name="JAR_ENABLED" value="false" />
+ <setting name="BUILD_MODULE_ON_FRAME_DEACTIVATION" value="false" />
+ <setting name="BUILD_EXTERNAL_DEPENDENCIES" value="false" />
+ <setting name="EXCLUDE_EXPLODED_DIRECTORY" value="true" />
+ <setting name="RUN_JASPER_VALIDATION" value="true" />
+ <setting name="BUILD_ONLY_WEB_RESOURCES" value="false" />
+ </building>
+ <packaging>
+ <containerElement type="module" name="widget">
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/classes" />
+ </containerElement>
+ </packaging>
+ </configuration>
+ </facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/../../../../../../widget/output/idea/classes" />
@@ -104,6 +131,15 @@
</library>
</orderEntry>
<orderEntry type="library" name="portlet api" level="project" />
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$APPLICATION_HOME_DIR$/lib/javaee.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntryProperties />
</component>
<component name="VcsManagerConfiguration">
18 years
JBoss Portal SVN: r10570 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
by portal-commits＠lists.jboss.org
Author: mmcallis
Date: 2008-04-14 01:47:45 -0400 (Mon, 14 Apr 2008)
New Revision: 10570
Modified:
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/migration.xml
Log:
4.1. Manual Upgrade
adding content as per wiki (JBPORTAL-1972)
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/migration.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/migration.xml 2008-04-14 05:12:34 UTC (rev 10569)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/migration.xml 2008-04-14 05:47:45 UTC (rev 10570)
@@ -25,6 +25,9 @@
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.
+ </para>
+ <para>
The upgrade procedure can be straightforward:
</para>
<para>
@@ -511,6 +514,9 @@
</itemizedlist>
</para>
<para>
+ For CMS migrations, back up the <computeroutput>jbp_cms_*</computeroutput> tables, and recreate them in the JBoss Portal 2.6 database. There were no schema changes for the CMS between JBoss Portal 2.4 and JBoss Portal 2.6.
+ </para>
+ <para>
<note>
<title>Portlet Content Type and Path to the CMS Resource</title>
<para>
18 years
JBoss Portal SVN: r10569 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
by portal-commits＠lists.jboss.org
Author: mmcallis
Date: 2008-04-14 01:12:34 -0400 (Mon, 14 Apr 2008)
New Revision: 10569
Modified:
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/migration.xml
Log:
4.1. Manual Upgrade
- minor revisions (JBPORTAL-1972)
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/migration.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/migration.xml 2008-04-14 04:30:01 UTC (rev 10568)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/migration.xml 2008-04-14 05:12:34 UTC (rev 10569)
@@ -462,7 +462,7 @@
<sect2>
<title>CMS</title>
<para>
- In JBoss Portal 2.6 versions, the way the CMS content is displayed changed significantly. For further information, please refer to <xref linkend="contentintegration"/> and <xref linkend="cmsPortlet"/>. Currently there is no need to have more than one instance of the <emphasis>CMSPortlet</emphasis>. The portlet window displays CMS content, not by referring to that portlet instance, but by having the proper <emphasis>content-type</emphasis> defined. The following configuration is in the <filename>jboss-portal.sar/conf/data/default-object.xml</filename> file:
+ In JBoss Portal 2.6 versions, the way the CMS content is displayed changed significantly. For further information, refer to <xref linkend="contentintegration"/> and <xref linkend="cmsPortlet"/>. Currently there is no need to have more than one instance of the <emphasis>CMSPortlet</emphasis>. The portlet window displays CMS content, not by referring to that portlet instance, but by having the proper <emphasis>content-type</emphasis> defined. The following configuration is in the <filename>jboss-portal.sar/conf/data/default-object.xml</filename> file:
</para>
<para>
<screen><![CDATA[
@@ -473,12 +473,12 @@
<content-uri>/default/index.html</content-uri>
</content>
<region>center</region>
- <height>0</height>
+ <height>1</height>
</window>]]>
</screen>
</para>
<para>
- The following example uses the MySQL Query Browser. Open the <emphasis role="bold">JBP_OBJECT_NODE</emphasis> table in your database schema. Look at the <emphasis role="bold">PATH</emphasis> column to identify any occurrences of CMS in your JBoss Portal deployment. Identify any row referring to <emphasis>CMSPortletWindow</emphasis>, and remember the number in <emphasis role="bold">PK</emphasis> column. The <emphasis role="bold">PK</emphasis> number is needed in the following steps:
+ The following example uses the MySQL Query Browser. Open the <emphasis role="bold">JBP_OBJECT_NODE</emphasis> table in your database schema. Look at the <emphasis role="bold">PATH</emphasis> column to identify any occurrences of <emphasis>>CMS</emphasis> in your JBoss Portal deployment. Identify any row referring to <emphasis>CMSPortletWindow</emphasis>, and remember the number in <emphasis role="bold">PK</emphasis> column. The <emphasis role="bold">PK</emphasis> number is needed in the following steps:
</para>
<para>
<mediaobject>
@@ -514,7 +514,7 @@
<note>
<title>Portlet Content Type and Path to the CMS Resource</title>
<para>
- You can change the portlet window content type and configure the path to the CMS resource
+ You can change the portlet window content-type, and configure the path to the CMS resource
using the <guiicon>Admin</guiicon> portlet.
</para>
</note>
18 years
JBoss Portal SVN: r10568 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
by portal-commits＠lists.jboss.org
Author: mmcallis
Date: 2008-04-14 00:30:01 -0400 (Mon, 14 Apr 2008)
New Revision: 10568
Modified:
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/migration.xml
Log:
period backup, minor corrections to 4.1. Manual Upgrade
(JBPORTAL-1972)
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/migration.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/migration.xml 2008-04-14 02:08:44 UTC (rev 10567)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/migration.xml 2008-04-14 04:30:01 UTC (rev 10568)
@@ -15,8 +15,7 @@
<para>
<warning>
<para>
- Before performing any instructions or operations in this chapter, back up your database content and
- the entire JBoss EAP or JBoss AS directory!
+ Before performing any instructions or operations in this chapter, back up your database and the entire JBoss EAP or JBoss AS directory!
</para>
</warning>
</para>
@@ -91,10 +90,10 @@
</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 MySQL database, 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. These can be done using the JBoss Portal 2.4 <guiicon>Admin</guiicon> portlet:
+ 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:
</para>
<para>
<itemizedlist>
@@ -161,7 +160,7 @@
</itemizedlist>
</para>
<para>
- The following instructions refer to a standard JBoss Portal 2.4 deployment. If you named core portlets, portlet instances, or portlet windows differently, you need to make the appropriate modifications. The following is an example of using the MySQL Query Browser:
+ The following instructions refer to a standard JBoss Portal 2.4 deployment. If core portlets, portlet instances, or portlet windows were renamed, make the appropriate modifications. The following is an example of the MySQL Query Browser:
</para>
<para>
<mediaobject>
@@ -172,9 +171,9 @@
</para>
<para>
<note>
- <title>Request Resource Error</title>
+ <title>Requested Resource Error</title>
<para>
- When running JBoss Portal 2.6 with a database created by JBoss Portal 2.4, a non-existing portlet will try to display, resulting in a <computeroutput>404</computeroutput>, <computeroutput>The requested resource() is not available</computeroutput>, error.
+ When running JBoss Portal 2.6 with a database created by JBoss Portal 2.4, a non-existing portlet will try to be displayed, resulting in a <computeroutput>404</computeroutput>, <computeroutput>The requested resource() is not available</computeroutput>, error.
</para>
</note>
</para>
@@ -182,13 +181,13 @@
<sect2>
<title>Portlet Names</title>
<para>
- Names of certain core bundled-portlets have changed. Destroy the following instances and use the <guiicon>Admin</guiicon> Portlet to recreate them, or, edit the <emphasis role="bold">JBP_INSTANCES</emphasis> table as follows:
+ Names of certain core bundled-portlets have changed. Destroy the following instances and use the <guiicon>Admin</guiicon> portlet to recreate them, or edit the <emphasis role="bold">JBP_INSTANCE</emphasis> table as follows:
</para>
<para>
<itemizedlist>
<listitem>
<para>
- Change <emphasis>local.samples.JSPPortlet'</emphasis> in the <emphasis>PORTLET_REF</emphasis> column to <emphasis>local./portal-jsp-samples.JSPPortlet</emphasis>.
+ Change <emphasis>local.samples.JSPPortlet</emphasis> in the <emphasis>PORTLET_REF</emphasis> column to <emphasis>local./portal-jsp-samples.JSPPortlet</emphasis>.
</para>
</listitem>
<listitem>
@@ -209,7 +208,7 @@
</itemizedlist>
</para>
<para>
- Some portlets are no longer present in JBoss Portal 2.6, and certain existing portlets are now packaged differently. Remove the following entires in the <emphasis role="bold">JBP_INSTANCE</emphasis> table, so that JBoss Portal 2.6 can recreate them:
+ Some portlets are no longer present in JBoss Portal 2.6, and certain existing portlets are now packaged differently. Remove the following entries in the <emphasis role="bold">JBP_INSTANCE</emphasis> table, so that JBoss Portal 2.6 can recreate them:
</para>
<para>
<itemizedlist>
@@ -296,7 +295,7 @@
</itemizedlist>
</para>
<para>
- Remove the following entires in the <emphasis role="bold">JBP_WINDOW</emphasis> table, so that JBoss Portal 2.6 can recreate them:
+ Remove the following entries in the <emphasis role="bold">JBP_WINDOW</emphasis> table, so that JBoss Portal 2.6 can recreate them:
</para>
<para>
<itemizedlist>
@@ -378,7 +377,7 @@
</itemizedlist>
</para>
<para>
- Remove the following entires in the <emphasis role="bold">JBP_OBJECT_NODE</emphasis> table, so that JBoss Portal 2.6 can recreate them:
+ Remove the following entries in the <emphasis role="bold">JBP_OBJECT_NODE</emphasis> table, so that JBoss Portal 2.6 can recreate them:
</para>
<para>
<itemizedlist>
@@ -516,7 +515,7 @@
<title>Portlet Content Type and Path to the CMS Resource</title>
<para>
You can change the portlet window content type and configure the path to the CMS resource
- using the <guiicon>Admin</guiicon> Portlet.
+ using the <guiicon>Admin</guiicon> portlet.
</para>
</note>
</para>
@@ -590,7 +589,7 @@
<sect2>
<title>Portlet Names</title>
<para>
- Names of certain core bundled portlets have changed. Destroy the following instances and use the AdminPortlet to recreate them, or, edit the <emphasis role="bold">JBP_INSTANCES</emphasis> table as follows:
+ Names of certain core bundled portlets have changed. Destroy the following instances and use the AdminPortlet to recreate them, or, edit the <emphasis role="bold">JBP_INSTANCE</emphasis> table as follows:
</para>
<para>
<orderedlist>
@@ -618,7 +617,7 @@
<orderedlist>
<listitem>
<para>
- In the <emphasis>JBP_INSTANCES</emphasis> table, rows containing <emphasis>local.portal.NavigationPortlet</emphasis> in the <emphasis>PORTLET_REF</emphasis> column.
+ In the <emphasis>JBP_INSTANCE</emphasis> table, rows containing <emphasis>local.portal.NavigationPortlet</emphasis> in the <emphasis>PORTLET_REF</emphasis> column.
</para>
</listitem>
<listitem>
18 years