[portal-commits] JBoss Portal SVN: r7052 - in trunk/core/src/main/org/jboss/portal/core: controller and 6 other directories.

Author: julien(a)jboss.com Date: 2007-04-25 15:19:43 -0400 (Wed, 25 Apr 2007) New Revision: 7052 Added: trunk/core/src/main/org/jboss/portal/core/model/portal/navstate/ Removed: trunk/core/src/main/org/jboss/portal/core/model/portal/ns/ Modified: trunk/core/src/main/org/jboss/portal/core/aspects/controller/NavigationalStateInterceptor.java trunk/core/src/main/org/jboss/portal/core/controller/ControllerContext.java trunk/core/src/main/org/jboss/portal/core/controller/ajax/AjaxInterceptor.java trunk/core/src/main/org/jboss/portal/core/controller/ajax/AjaxResponseHandler.java trunk/core/src/main/org/jboss/portal/core/impl/api/CoreNavigationalStateContext.java trunk/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java trunk/core/src/main/org/jboss/portal/core/model/portal/PortalObjectCommandFactory.java trunk/core/src/main/org/jboss/portal/core/model/portal/command/action/InvokePortletWindowRenderCommand.java trunk/core/src/main/org/jboss/portal/core/model/portal/navstate/PortalObjectNavigationalStateContext.java trunk/core/src/main/org/jboss/portal/core/model/portal/navstate/WindowNavigationalState.java Log: renamed package ns to navstate Modified: trunk/core/src/main/org/jboss/portal/core/aspects/controller/NavigationalStateInterceptor.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/aspects/controller/NavigationalStateInterceptor.java 2007-04-25 17:13:56 UTC (rev 7051) +++ trunk/core/src/main/org/jboss/portal/core/aspects/controller/NavigationalStateInterceptor.java 2007-04-25 19:19:43 UTC (rev 7052) @@ -26,7 +26,7 @@ import org.jboss.portal.core.controller.ControllerCommand; import org.jboss.portal.core.controller.ControllerContext; import org.jboss.portal.core.controller.ControllerResponse; -import org.jboss.portal.core.model.portal.ns.PortalObjectNavigationalStateContext; +import org.jboss.portal.core.model.portal.navstate.PortalObjectNavigationalStateContext; import org.jboss.portal.common.invocation.InvocationException; /** Modified: trunk/core/src/main/org/jboss/portal/core/controller/ControllerContext.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/controller/ControllerContext.java 2007-04-25 17:13:56 UTC (rev 7051) +++ trunk/core/src/main/org/jboss/portal/core/controller/ControllerContext.java 2007-04-25 19:19:43 UTC (rev 7052) @@ -31,7 +31,7 @@ import org.jboss.portal.server.request.URLFormat; import org.jboss.portal.identity.User; import org.jboss.portal.core.aspects.server.UserInterceptor; -import org.jboss.portal.core.model.portal.ns.PortalObjectNavigationalStateContext; +import org.jboss.portal.core.model.portal.navstate.PortalObjectNavigationalStateContext; import javax.servlet.http.HttpServletRequest; import java.util.Map; Modified: trunk/core/src/main/org/jboss/portal/core/controller/ajax/AjaxInterceptor.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/controller/ajax/AjaxInterceptor.java 2007-04-25 17:13:56 UTC (rev 7051) +++ trunk/core/src/main/org/jboss/portal/core/controller/ajax/AjaxInterceptor.java 2007-04-25 19:19:43 UTC (rev 7052) @@ -28,7 +28,7 @@ import org.jboss.portal.core.controller.ControllerContext; import org.jboss.portal.core.controller.ControllerResponse; import org.jboss.portal.core.model.portal.command.render.RenderPageCommand; -import org.jboss.portal.core.model.portal.ns.PortalObjectNavigationalStateContext; +import org.jboss.portal.core.model.portal.navstate.PortalObjectNavigationalStateContext; import org.jboss.portal.core.theme.PageRendition; import org.jboss.portal.theme.impl.render.dynamic.DynaConstants; import org.jboss.portal.theme.impl.render.dynamic.DynaRenderOptions; Modified: trunk/core/src/main/org/jboss/portal/core/controller/ajax/AjaxResponseHandler.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/controller/ajax/AjaxResponseHandler.java 2007-04-25 17:13:56 UTC (rev 7051) +++ trunk/core/src/main/org/jboss/portal/core/controller/ajax/AjaxResponseHandler.java 2007-04-25 19:19:43 UTC (rev 7052) @@ -43,8 +43,8 @@ import org.jboss.portal.core.model.portal.PortalObject; import org.jboss.portal.core.model.portal.PortalObjectId; import org.jboss.portal.core.model.portal.PortalObjectContainer; -import org.jboss.portal.core.model.portal.ns.PortalObjectNavigationalStateContext; -import org.jboss.portal.core.model.portal.ns.WindowNavigationalState; +import org.jboss.portal.core.model.portal.navstate.PortalObjectNavigationalStateContext; +import org.jboss.portal.core.model.portal.navstate.WindowNavigationalState; import org.jboss.portal.core.navstate.NavigationalStateChange; import org.jboss.portal.core.navstate.NavigationalStateObjectChange; import org.jboss.portal.core.navstate.NavigationalStateKey; Modified: trunk/core/src/main/org/jboss/portal/core/impl/api/CoreNavigationalStateContext.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/impl/api/CoreNavigationalStateContext.java 2007-04-25 17:13:56 UTC (rev 7051) +++ trunk/core/src/main/org/jboss/portal/core/impl/api/CoreNavigationalStateContext.java 2007-04-25 19:19:43 UTC (rev 7052) @@ -24,7 +24,7 @@ import org.jboss.portal.api.navstate.NavigationalStateContext; import org.jboss.portal.core.navstate.NavigationalStateKey; -import org.jboss.portal.core.model.portal.ns.WindowNavigationalState; +import org.jboss.portal.core.model.portal.navstate.WindowNavigationalState; import org.jboss.portal.api.node.PortalNode; import org.jboss.portal.Mode; import org.jboss.portal.WindowState; Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java 2007-04-25 17:13:56 UTC (rev 7051) +++ trunk/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java 2007-04-25 19:19:43 UTC (rev 7052) @@ -32,7 +32,7 @@ import org.jboss.portal.core.model.portal.Window; import org.jboss.portal.core.model.portal.Portal; import org.jboss.portal.core.model.portal.PortalObjectId; -import org.jboss.portal.core.model.portal.ns.WindowNavigationalState; +import org.jboss.portal.core.model.portal.navstate.WindowNavigationalState; import org.jboss.portal.core.model.portal.content.ContentRenderer; import org.jboss.portal.core.controller.ControllerContext; import org.jboss.portal.core.controller.ResourceNotFoundException; Modified: trunk/core/src/main/org/jboss/portal/core/model/portal/PortalObjectCommandFactory.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/model/portal/PortalObjectCommandFactory.java 2007-04-25 17:13:56 UTC (rev 7051) +++ trunk/core/src/main/org/jboss/portal/core/model/portal/PortalObjectCommandFactory.java 2007-04-25 19:19:43 UTC (rev 7052) @@ -31,7 +31,7 @@ import org.jboss.portal.core.model.portal.command.action.InvokePortletWindowRenderCommand; import org.jboss.portal.core.model.portal.command.action.ImportPageToDashboardCommand; import org.jboss.portal.core.model.portal.command.view.ViewPageCommand; -import org.jboss.portal.core.model.portal.ns.WindowNavigationalState; +import org.jboss.portal.core.model.portal.navstate.WindowNavigationalState; import org.jboss.portal.core.controller.command.mapper.AbstractCommandFactory; import org.jboss.portal.core.navstate.NavigationalStateKey; import org.jboss.portal.portlet.impl.PortletRequestDecoder; Modified: trunk/core/src/main/org/jboss/portal/core/model/portal/command/action/InvokePortletWindowRenderCommand.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/model/portal/command/action/InvokePortletWindowRenderCommand.java 2007-04-25 17:13:56 UTC (rev 7051) +++ trunk/core/src/main/org/jboss/portal/core/model/portal/command/action/InvokePortletWindowRenderCommand.java 2007-04-25 19:19:43 UTC (rev 7052) @@ -32,7 +32,7 @@ import org.jboss.portal.core.model.portal.command.response.UpdateWindowResponse; import org.jboss.portal.core.model.portal.command.action.InvokeWindowCommand; import org.jboss.portal.core.model.portal.PortalObjectId; -import org.jboss.portal.core.model.portal.ns.WindowNavigationalState; +import org.jboss.portal.core.model.portal.navstate.WindowNavigationalState; import org.jboss.portal.core.navstate.NavigationalStateKey; import org.jboss.portal.portlet.StateString; Copied: trunk/core/src/main/org/jboss/portal/core/model/portal/navstate (from rev 7048, trunk/core/src/main/org/jboss/portal/core/model/portal/ns) Modified: trunk/core/src/main/org/jboss/portal/core/model/portal/navstate/PortalObjectNavigationalStateContext.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/model/portal/ns/PortalObjectNavigationalStateContext.java 2007-04-25 15:57:31 UTC (rev 7048) +++ trunk/core/src/main/org/jboss/portal/core/model/portal/navstate/PortalObjectNavigationalStateContext.java 2007-04-25 19:19:43 UTC (rev 7052) @@ -20,7 +20,7 @@ * 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.core.model.portal.ns; +package org.jboss.portal.core.model.portal.navstate; import org.jboss.portal.core.navstate.NavigationalStateContext; import org.jboss.portal.core.navstate.NavigationalStateKey; Modified: trunk/core/src/main/org/jboss/portal/core/model/portal/navstate/WindowNavigationalState.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/model/portal/ns/WindowNavigationalState.java 2007-04-25 15:57:31 UTC (rev 7048) +++ trunk/core/src/main/org/jboss/portal/core/model/portal/navstate/WindowNavigationalState.java 2007-04-25 19:19:43 UTC (rev 7052) @@ -20,7 +20,7 @@ * 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.core.model.portal.ns; +package org.jboss.portal.core.model.portal.navstate; import org.jboss.portal.WindowState; import org.jboss.portal.Mode;