JBoss Portal SVN: r11197 - in modules/presentation/trunk: classic/src/main/java/org/jboss/portal/presentation/classic and 8 other directories.
10:13 a.m.
Author: julien(a)jboss.com
Date: 2008-06-29 11:13:14 -0400 (Sun, 29 Jun 2008)
New Revision: 11197
Added:
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/content/
Removed:
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/content/
Modified:
modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/server/PresentationClientServlet.java
modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/ClassicPresentationClient.java
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/content/ContentHandler.java
modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/content/markup/MarkupContentHandler.java
modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/content/portlet/PortletContentHandler.java
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/content/ContentFragment.java
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/server/PresentationServer.java
Log:
move content package to upper level
Modified:
modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/server/PresentationClientServlet.java
===================================================================
---
modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/server/PresentationClientServlet.java 2008-06-29
15:10:18 UTC (rev 11196)
+++
modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/server/PresentationClientServlet.java 2008-06-29
15:13:14 UTC (rev 11197)
@@ -39,7 +39,7 @@
import org.jboss.portal.presentation.model.ViewPort;
import org.jboss.portal.presentation.model.ViewPortScope;
import org.jboss.portal.presentation.model.UINode;
-import org.jboss.portal.presentation.model.content.ContentFragment;
+import org.jboss.portal.presentation.content.ContentFragment;
import org.jboss.portal.presentation.impl.model.UIModelImpl;
import org.jboss.portal.presentation.impl.model.pull.DetachedViewPortContext;
import
org.jboss.portal.presentation.impl.state.navigational.NavigationalStateContextImpl;
Modified:
modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/ClassicPresentationClient.java
===================================================================
---
modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/ClassicPresentationClient.java 2008-06-29
15:10:18 UTC (rev 11196)
+++
modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/ClassicPresentationClient.java 2008-06-29
15:13:14 UTC (rev 11197)
@@ -46,7 +46,7 @@
import org.jboss.portal.presentation.layout.SimpleLayout;
import org.jboss.portal.presentation.layout.Orientation;
import org.jboss.portal.presentation.layout.ModelLayoutAdapter;
-import org.jboss.portal.presentation.model.content.ContentFragment;
+import org.jboss.portal.presentation.content.ContentFragment;
import org.jboss.portal.presentation.model.ui.UIContext;
import org.jboss.portal.presentation.model.ui.UIPage;
import org.jboss.portal.presentation.model.ui.UIWindow;
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-29
15:10:18 UTC (rev 11196)
+++
modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/PresentationServerImpl.java 2008-06-29
15:13:14 UTC (rev 11197)
@@ -36,7 +36,7 @@
import org.jboss.portal.presentation.portal.content.WindowContentContext;
import org.jboss.portal.presentation.portal.content.Content;
import org.jboss.portal.presentation.portal.content.ContentResponse;
-import org.jboss.portal.presentation.model.content.ContentFragment;
+import org.jboss.portal.presentation.content.ContentFragment;
import org.jboss.portal.presentation.protocol.ErrorResponse;
import org.jboss.portal.presentation.protocol.ProtocolAction;
import org.jboss.portal.presentation.protocol.ShowUIObjectResponse;
Modified:
modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/content/ContentHandler.java
===================================================================
---
modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/content/ContentHandler.java 2008-06-29
15:10:18 UTC (rev 11196)
+++
modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/content/ContentHandler.java 2008-06-29
15:13:14 UTC (rev 11197)
@@ -22,11 +22,10 @@
******************************************************************************/
package org.jboss.portal.presentation.portal.content;
-import org.jboss.portal.presentation.model.content.ContentFragment;
+import org.jboss.portal.presentation.content.ContentFragment;
import org.jboss.portal.presentation.portal.content.protocol.ContentAction;
import org.jboss.portal.presentation.client.PresentationClient;
import org.jboss.portal.presentation.server.PresentationServerException;
-import org.jboss.portal.presentation.protocol.ProtocolResponse;
/**
* @author <a href="mailto:julien@jboss-portal.org">Julien
Viet</a>
Modified:
modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/content/markup/MarkupContentHandler.java
===================================================================
---
modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/content/markup/MarkupContentHandler.java 2008-06-29
15:10:18 UTC (rev 11196)
+++
modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/content/markup/MarkupContentHandler.java 2008-06-29
15:13:14 UTC (rev 11197)
@@ -26,7 +26,7 @@
import org.jboss.portal.presentation.portal.content.WindowContentContext;
import org.jboss.portal.presentation.portal.content.ContentResponse;
import org.jboss.portal.presentation.portal.content.protocol.ContentAction;
-import org.jboss.portal.presentation.model.content.ContentFragment;
+import org.jboss.portal.presentation.content.ContentFragment;
import org.jboss.portal.presentation.client.PresentationClient;
import org.jboss.portal.presentation.server.PresentationServerException;
Modified:
modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/content/portlet/PortletContentHandler.java
===================================================================
---
modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/content/portlet/PortletContentHandler.java 2008-06-29
15:10:18 UTC (rev 11196)
+++
modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/content/portlet/PortletContentHandler.java 2008-06-29
15:13:14 UTC (rev 11197)
@@ -30,10 +30,9 @@
import
org.jboss.portal.presentation.portal.content.portlet.controller.PresentationPortletPageNavigationalState;
import
org.jboss.portal.presentation.portal.content.portlet.controller.PresentationPageContext;
import
org.jboss.portal.presentation.portal.content.portlet.protocol.PortletContainerAction;
-import org.jboss.portal.presentation.model.content.ContentFragment;
+import org.jboss.portal.presentation.content.ContentFragment;
import org.jboss.portal.presentation.client.PresentationClient;
import org.jboss.portal.presentation.server.PresentationServerException;
-import org.jboss.portal.presentation.protocol.ProtocolResponse;
import
org.jboss.portal.presentation.impl.state.navigational.DelegatingNavigationalStateContext;
import org.jboss.portal.presentation.state.navigational.NavigationalStateContext;
import org.jboss.portal.portlet.controller.PortletController;
Copied:
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/content
(from rev 11193,
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/content)
Modified:
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/content/ContentFragment.java
===================================================================
---
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/content/ContentFragment.java 2008-06-29
14:32:23 UTC (rev 11193)
+++
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/content/ContentFragment.java 2008-06-29
15:13:14 UTC (rev 11197)
@@ -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.presentation.model.content;
+package org.jboss.portal.presentation.content;
/**
* The content of a window.
Modified:
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/server/PresentationServer.java
===================================================================
---
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/server/PresentationServer.java 2008-06-29
15:10:18 UTC (rev 11196)
+++
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/server/PresentationServer.java 2008-06-29
15:13:14 UTC (rev 11197)
@@ -23,7 +23,7 @@
package org.jboss.portal.presentation.server;
import org.jboss.portal.presentation.client.PresentationClient;
-import org.jboss.portal.presentation.model.content.ContentFragment;
+import org.jboss.portal.presentation.content.ContentFragment;
import org.jboss.portal.presentation.state.structural.StructuralStateContext;
/**
6514
days inactive
6514
days old
portal-commits@lists.jboss.org
0 comments
1 participants
participants (1)
-
portal-commits＠lists.jboss.org