You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by rw...@apache.org on 2009/11/18 19:24:53 UTC
svn commit: r881862 [12/16] - in /portals/jetspeed-2/portal/trunk: ./
applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/
applications/jetspeed/src/main/webapp/WEB-INF/templates/
applications/jetspeed/src/main/webapp/decorations/layout/greenearth/...
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/HeaderAggregatorImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/HeaderAggregatorImpl.java?rev=881862&r1=881861&r2=881862&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/HeaderAggregatorImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/HeaderAggregatorImpl.java Wed Nov 18 18:24:48 2009
@@ -966,7 +966,7 @@
throw new JetspeedException( "Failed to find PSML Pin ContentPageAggregator.build" );
}
- ContentFragment root = page.getRootContentFragment();
+ ContentFragment root = page.getRootFragment();
if ( root == null )
{
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/PageAggregatorImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/PageAggregatorImpl.java?rev=881862&r1=881861&r2=881862&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/PageAggregatorImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/PageAggregatorImpl.java Wed Nov 18 18:24:48 2009
@@ -57,7 +57,7 @@
throw new JetspeedException("Failed to find PSML Pin ContentPageAggregator.build");
}
- ContentFragment root = page.getRootContentFragment();
+ ContentFragment root = page.getRootFragment();
if (root == null)
{
@@ -92,7 +92,7 @@
@SuppressWarnings("unchecked")
protected void aggregateAndRender( ContentFragment f, RequestContext context, ContentPage page )
{
- List<ContentFragment> contentFragments = f.getContentFragments();
+ List<ContentFragment> contentFragments = f.getFragments();
if (contentFragments != null && !contentFragments.isEmpty())
{
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/PageHistoryValve.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/PageHistoryValve.java?rev=881862&r1=881861&r2=881862&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/PageHistoryValve.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/PageHistoryValve.java Wed Nov 18 18:24:48 2009
@@ -16,14 +16,14 @@
*/
package org.apache.jetspeed.container;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.apache.jetspeed.om.page.Page;
+import org.apache.jetspeed.om.page.ContentPage;
import org.apache.jetspeed.pipeline.PipelineException;
import org.apache.jetspeed.pipeline.valve.AbstractValve;
import org.apache.jetspeed.pipeline.valve.ValveContext;
import org.apache.jetspeed.request.RequestContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* <p>
@@ -63,7 +63,7 @@
// create a session if not already created, necessary for Tomcat 5
request.getRequest().getSession(true);
- Page page = request.getPage();
+ ContentPage page = request.getPage();
String curPageId = page.getId();
String prevPageId = (String) request.getSessionAttribute(SESSION_PREVIOUS_PAGEID_KEY);
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/state/impl/PortletWindowSessionNavigationalStates.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/state/impl/PortletWindowSessionNavigationalStates.java?rev=881862&r1=881861&r2=881862&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/state/impl/PortletWindowSessionNavigationalStates.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/state/impl/PortletWindowSessionNavigationalStates.java Wed Nov 18 18:24:48 2009
@@ -27,7 +27,7 @@
import org.apache.jetspeed.cache.ContentCacheKey;
import org.apache.jetspeed.cache.JetspeedContentCache;
-import org.apache.jetspeed.om.page.Page;
+import org.apache.jetspeed.om.page.ContentPage;
import org.apache.jetspeed.request.RequestContext;
import org.apache.jetspeed.container.PortletWindow;
@@ -57,7 +57,7 @@
* reset all portlets on page to mode VIEW and window state NORMAL in the case of page navigation.
* </p>
*/
- public void changeAllPortletsToViewModeAndNormalWindowState(RequestContext context, Page page, PortletWindowRequestNavigationalStates requestStates, JetspeedContentCache cache, JetspeedContentCache decorationCache)
+ public void changeAllPortletsToViewModeAndNormalWindowState(RequestContext context, ContentPage page, PortletWindowRequestNavigationalStates requestStates, JetspeedContentCache cache, JetspeedContentCache decorationCache)
{
final PortletMode viewMode = PortletMode.VIEW;
final WindowState normalWindowState = WindowState.NORMAL;
@@ -116,7 +116,7 @@
}
}
- public void sync(RequestContext context, Page page,
+ public void sync(RequestContext context, ContentPage page,
PortletWindowRequestNavigationalStates requestStates,
JetspeedContentCache cache, JetspeedContentCache decorationCache)
{
@@ -496,7 +496,7 @@
cache.invalidate(context);
}
- protected Map<String, PortletWindowBaseNavigationalState> getWindowStates(Page page)
+ protected Map<String, PortletWindowBaseNavigationalState> getWindowStates(ContentPage page)
{
PageState pageState = pageStates.get(page.getId());
return pageState != null ? pageState.windowStates : null;
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/state/impl/SessionNavigationalState.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/state/impl/SessionNavigationalState.java?rev=881862&r1=881861&r2=881862&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/state/impl/SessionNavigationalState.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/state/impl/SessionNavigationalState.java Wed Nov 18 18:24:48 2009
@@ -21,15 +21,15 @@
import javax.portlet.WindowState;
import javax.servlet.http.HttpSession;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.apache.jetspeed.JetspeedActions;
import org.apache.jetspeed.cache.JetspeedContentCache;
import org.apache.jetspeed.container.state.NavigationalState;
import org.apache.jetspeed.om.page.ContentPage;
-import org.apache.jetspeed.om.page.Page;
import org.apache.jetspeed.request.RequestContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* SessionNavigationalState, stores nav parameters in the session, not on URL
*
@@ -120,7 +120,7 @@
sessionStates = new PortletWindowSessionNavigationalStates(isRenderParameterStateFull());
session.setAttribute(NavigationalState.NAVSTATE_SESSION_KEY, sessionStates);
}
- Page page = context.getPage();
+ ContentPage page = context.getPage();
// JS2-806
if (isClearPortletsModeAndWindowStateEnabled())
{
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/DecorationFactoryImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/DecorationFactoryImpl.java?rev=881862&r1=881861&r2=881862&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/DecorationFactoryImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/DecorationFactoryImpl.java Wed Nov 18 18:24:48 2009
@@ -39,8 +39,8 @@
import org.apache.jetspeed.cache.JetspeedCache;
import org.apache.jetspeed.components.portletregistry.PortletRegistry;
import org.apache.jetspeed.decoration.caches.SessionPathResolverCache;
-import org.apache.jetspeed.om.page.Fragment;
-import org.apache.jetspeed.om.page.Page;
+import org.apache.jetspeed.om.page.ContentFragment;
+import org.apache.jetspeed.om.page.ContentPage;
import org.apache.jetspeed.om.portlet.PortletApplication;
import org.apache.jetspeed.om.portlet.PortletDefinition;
import org.apache.jetspeed.request.RequestContext;
@@ -112,9 +112,9 @@
{
this.registry = registry;
this.decorationsPath = new Path( decorationsPath );
- this.layoutDecorationsPath = getBasePath( Fragment.LAYOUT );
+ this.layoutDecorationsPath = getBasePath( ContentFragment.LAYOUT );
this.layoutDecorationsPathStr = this.layoutDecorationsPath.toString();
- this.portletDecorationsPath = getBasePath( Fragment.PORTLET );
+ this.portletDecorationsPath = getBasePath( ContentFragment.PORTLET );
this.portletDecorationsPathStr = this.portletDecorationsPath.toString();
this.validator = validator;
this.decorationConfigurationCache = decorationConfigurationCache;
@@ -132,19 +132,19 @@
return decorationConfigurationCache;
}
- public Theme getTheme( Page page, RequestContext requestContext )
+ public Theme getTheme( ContentPage page, RequestContext requestContext )
{
return new PageTheme(page, this, requestContext);
}
- public Decoration getDecoration( Page page, Fragment fragment, RequestContext requestContext )
+ public Decoration getDecoration( ContentPage page, ContentFragment fragment, RequestContext requestContext )
{
String decorationName = getDefaultDecorationName( fragment, page );
Decoration decoration;
// use layout decoration for top level layout root fragments
// and use portlet decoration for all other fragments
- boolean isLayout = fragment.getType().equals( Fragment.LAYOUT );
+ boolean isLayout = fragment.getType().equals( ContentFragment.LAYOUT );
if ( isLayout )
{
decoration = getLayoutDecoration( decorationName, requestContext );
@@ -186,8 +186,8 @@
public PortletDecoration getPortletDecoration( String name, RequestContext requestContext )
{
Path basePath = getPortletDecorationBasePath( name );
- Path baseClientPath = createClientPath( name, basePath, requestContext, Fragment.PORTLET );
- Properties configuration = getConfiguration( name, Fragment.PORTLET );
+ Path baseClientPath = createClientPath( name, basePath, requestContext, ContentFragment.PORTLET );
+ Properties configuration = getConfiguration( name, ContentFragment.PORTLET );
SessionPathResolverCache sessionPathResolver = new SessionPathResolverCache( requestContext.getRequest().getSession() );
return new PortletDecorationImpl( configuration, validator, basePath, baseClientPath, sessionPathResolver );
}
@@ -195,8 +195,8 @@
public LayoutDecoration getLayoutDecoration( String name, RequestContext requestContext )
{
Path basePath = getLayoutDecorationBasePath( name );
- Path baseClientPath = createClientPath( name, basePath, requestContext, Fragment.LAYOUT );
- Properties configuration = getConfiguration( name, Fragment.LAYOUT );
+ Path baseClientPath = createClientPath( name, basePath, requestContext, ContentFragment.LAYOUT );
+ Properties configuration = getConfiguration( name, ContentFragment.LAYOUT );
SessionPathResolverCache sessionPathResolver = new SessionPathResolverCache( requestContext.getRequest().getSession() );
return new LayoutDecorationImpl( configuration, validator, basePath, baseClientPath, sessionPathResolver );
}
@@ -217,7 +217,7 @@
{
if ( decorationConfigurationCache == null )
{
- if ( type.equals( Fragment.PORTLET ) )
+ if ( type.equals( ContentFragment.PORTLET ) )
{
return (Properties)this.portletDecoratorProperties.get( name );
}
@@ -235,7 +235,7 @@
{
if ( decorationConfigurationCache == null )
{
- if ( type.equals( Fragment.PORTLET ) )
+ if ( type.equals( ContentFragment.PORTLET ) )
{
this.portletDecoratorProperties.put( name, props );
}
@@ -426,18 +426,18 @@
* @see Page
* @see Fragment
*/
- protected String getDefaultDecorationName(Fragment fragment, Page page)
+ protected String getDefaultDecorationName(ContentFragment fragment, ContentPage page)
{
// get specified decorator
String decoration = fragment.getDecorator();
if (decoration == null)
{
- if (fragment.getType().equals(Fragment.LAYOUT))
+ if (fragment.getType().equals(ContentFragment.LAYOUT))
{
if (fragment.equals(page.getRootFragment()))
{
// use page specified layout decorator name
- decoration = page.getEffectiveDefaultDecorator(Fragment.LAYOUT);
+ decoration = page.getEffectiveDefaultDecorator(ContentFragment.LAYOUT);
if (decoration == null)
{
decoration = this.defaultLayoutDecoration;
@@ -452,7 +452,7 @@
else
{
// use page specified default portlet decorator name
- decoration = page.getEffectiveDefaultDecorator(Fragment.PORTLET);
+ decoration = page.getEffectiveDefaultDecorator(ContentFragment.PORTLET);
if (decoration == null)
{
decoration = this.defaultPortletDecoration;
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/DecorationValve.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/DecorationValve.java?rev=881862&r1=881861&r2=881862&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/DecorationValve.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/DecorationValve.java Wed Nov 18 18:24:48 2009
@@ -53,8 +53,8 @@
* Assigns decorations and page actions to all of the portlet Fragments within
* the current request.
*
- * @see org.apache.jetspeed.om.page.Fragment
- * @see org.apache.jetspeed.om.page.Page
+ * @see org.apache.jetspeed.om.page.ContentFragment
+ * @see org.apache.jetspeed.om.page.ContentPage
* @see org.apache.jetspeed.decoration.Decoration
* @see org.apache.jetspeed.decoration.LayoutDecoration
* @see org.apache.jetspeed.decoration.PortletDecoration
@@ -148,13 +148,13 @@
ContentPage page = requestContext.getPage();
- // Globaly override all psml themes if override session attribute has been set
+ // Globally override all psml themes if override session attribute has been set
if (requestContext
.getSessionAttribute(PortalReservedParameters.PAGE_THEME_OVERRIDE_ATTRIBUTE) != null)
{
String decoratorName = (String) requestContext
.getSessionAttribute(PortalReservedParameters.PAGE_THEME_OVERRIDE_ATTRIBUTE);
- page.setDefaultDecorator(decoratorName, Fragment.LAYOUT);
+ page.overrideDefaultDecorator(decoratorName, Fragment.LAYOUT);
}
PageActionAccess pageActionAccess = (PageActionAccess)requestContext.getAttribute(PortalReservedParameters.PAGE_EDIT_ACCESS_ATTRIBUTE);
@@ -191,7 +191,7 @@
requestContext.setAttribute(PortalReservedParameters.PAGE_THEME_ATTRIBUTE, theme);
boolean solo = isSoloMode(requestContext);
SessionPathResolverCache sessionPathResolver = new SessionPathResolverCache( requestContext.getRequest().getSession() );
- initDepthFragmentDecorations(requestContext, theme, page.getRootContentFragment(),
+ initDepthFragmentDecorations(requestContext, theme, page.getRootFragment(),
pageActionAccess, isAjaxRequest,
((DecorationFactoryImpl) decorationFactory).getResourceValidator(),
sessionPathResolver, (theme.isInvalidated() && !solo));
@@ -215,7 +215,7 @@
requestContext.setAttribute(PortalReservedParameters.PAGE_THEME_ATTRIBUTE, theme);
if ( fragments == null || fragments.size() == 0 )
{
- ContentFragment rootFragment = page.getRootContentFragment();
+ ContentFragment rootFragment = page.getRootFragment();
initDepthFragments(requestContext, theme, rootFragment, pageActionAccess, isAjaxRequest, fragments);
}
else
@@ -547,7 +547,7 @@
boolean isAjaxRequest,
List collectFragments )
{
- final List contentFragments = fragment.getContentFragments();
+ final List contentFragments = fragment.getFragments();
if(contentFragments != null && contentFragments.size() > 0)
{
@@ -609,7 +609,7 @@
PathResolverCache pathResolverCache,
boolean reloadActionList)
{
- final List contentFragments = fragment.getContentFragments();
+ final List contentFragments = fragment.getFragments();
if(contentFragments != null && contentFragments.size() > 0)
{
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/PageActionAccess.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/PageActionAccess.java?rev=881862&r1=881861&r2=881862&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/PageActionAccess.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/PageActionAccess.java Wed Nov 18 18:24:48 2009
@@ -22,10 +22,11 @@
import javax.portlet.PortletMode;
import javax.portlet.WindowState;
+import org.apache.jetspeed.JetspeedActions;
+import org.apache.jetspeed.om.page.ContentPage;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.jetspeed.JetspeedActions;
-import org.apache.jetspeed.om.page.Page;
/**
* PageActionAccess
@@ -48,14 +49,14 @@
private boolean editing;
private HashMap fragmentActionAccess;
- public PageActionAccess(boolean anonymous, Page page)
+ public PageActionAccess(boolean anonymous, ContentPage page)
{
this.anonymous = anonymous;
this.editAllowed = checkEditPage(page);
this.fragmentActionAccess = new HashMap();
}
- public void checkReset(boolean anonymous, Page page)
+ public void checkReset(boolean anonymous, ContentPage page)
{
if (this.anonymous != anonymous)
{
@@ -132,7 +133,7 @@
}
}
- protected boolean checkEditPage(Page page)
+ protected boolean checkEditPage(ContentPage page)
{
boolean allowed = false;
try
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/PageTheme.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/PageTheme.java?rev=881862&r1=881861&r2=881862&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/PageTheme.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/PageTheme.java Wed Nov 18 18:24:48 2009
@@ -28,8 +28,7 @@
import java.util.Set;
import org.apache.jetspeed.om.page.ContentPage;
-import org.apache.jetspeed.om.page.Fragment;
-import org.apache.jetspeed.om.page.Page;
+import org.apache.jetspeed.om.page.ContentFragment;
import org.apache.jetspeed.request.RequestContext;
/**
@@ -41,7 +40,7 @@
*/
public class PageTheme implements Theme, Serializable
{
- private transient Page page;
+ private transient ContentPage page;
private transient DecorationFactory decorationFactory;
private transient RequestContext requestContext;
private final Set styleSheets;
@@ -50,7 +49,7 @@
private final Collection portletDecorationNames;
private boolean invalidated = false;
- public PageTheme(Page page, DecorationFactory decorationFactory, RequestContext requestContext)
+ public PageTheme(ContentPage page, DecorationFactory decorationFactory, RequestContext requestContext)
{
this.page = page;
this.decorationFactory = decorationFactory;
@@ -92,13 +91,13 @@
* @param fragment page fragment
* @return fragment decoration
*/
- private Decoration setupFragmentDecorations( Fragment fragment, boolean isRootLayout, HashMap portletDecorationNames, boolean isDesktopEnabled )
+ private Decoration setupFragmentDecorations( ContentFragment fragment, boolean isRootLayout, HashMap portletDecorationNames, boolean isDesktopEnabled )
{
// setup fragment decorations
Decoration decoration = decorationFactory.getDecoration( page, fragment, requestContext );
fragmentDecorations.put( fragment.getId(), decoration );
- boolean isPortlet = ( ! isRootLayout && fragment.getType().equals( Fragment.PORTLET ) );
+ boolean isPortlet = ( ! isRootLayout && fragment.getType().equals( ContentFragment.PORTLET ) );
if ( isPortlet || isRootLayout )
{
@@ -137,7 +136,7 @@
Iterator fragmentsIter = fragments.iterator();
while ( fragmentsIter.hasNext() )
{
- setupFragmentDecorations( (Fragment)fragmentsIter.next(), false, portletDecorationNames, isDesktopEnabled );
+ setupFragmentDecorations( (ContentFragment)fragmentsIter.next(), false, portletDecorationNames, isDesktopEnabled );
}
}
@@ -150,7 +149,7 @@
return styleSheets;
}
- public Decoration getDecoration( Fragment fragment )
+ public Decoration getDecoration( ContentFragment fragment )
{
return (Decoration) fragmentDecorations.get( fragment.getId() );
}
@@ -165,21 +164,21 @@
return layoutDecoration;
}
- public void init(Page page, DecorationFactory decoration, RequestContext context)
+ public void init(ContentPage page, DecorationFactory decoration, RequestContext context)
{
this.page = page;
this.decorationFactory = decoration;
this.requestContext = context;
}
- public Page getPage()
+ public ContentPage getPage()
{
return page;
}
public ContentPage getContentPage()
{
- return (ContentPage)page;
+ return page;
}
public boolean isInvalidated()
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/desktop/impl/JetspeedDesktopImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/desktop/impl/JetspeedDesktopImpl.java?rev=881862&r1=881861&r2=881862&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/desktop/impl/JetspeedDesktopImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/desktop/impl/JetspeedDesktopImpl.java Wed Nov 18 18:24:48 2009
@@ -40,7 +40,7 @@
import org.apache.jetspeed.headerresource.HeaderResource;
import org.apache.jetspeed.headerresource.HeaderResourceFactory;
import org.apache.jetspeed.headerresource.HeaderResourceLib;
-import org.apache.jetspeed.om.page.Page;
+import org.apache.jetspeed.om.page.ContentPage;
import org.apache.jetspeed.request.RequestContext;
import org.springframework.web.context.ServletContextAware;
@@ -242,7 +242,7 @@
boolean layoutDecorationTemplatePathWasAssigned = false;
try
{
- Page page = request.getPage();
+ ContentPage page = request.getPage();
// enable desktop
request.setAttribute( JetspeedDesktop.DESKTOP_ENABLED_REQUEST_ATTRIBUTE, Boolean.TRUE );
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/events/EventCoordinationServiceImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/events/EventCoordinationServiceImpl.java?rev=881862&r1=881861&r2=881862&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/events/EventCoordinationServiceImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/events/EventCoordinationServiceImpl.java Wed Nov 18 18:24:48 2009
@@ -41,7 +41,7 @@
import org.apache.jetspeed.aggregator.PortletTrackingManager;
import org.apache.jetspeed.container.PortletWindow;
import org.apache.jetspeed.container.providers.EventProviderImpl;
-import org.apache.jetspeed.om.page.Fragment;
+import org.apache.jetspeed.om.page.ContentFragment;
import org.apache.jetspeed.om.portlet.PortletDefinition;
import org.apache.jetspeed.request.RequestContext;
import org.apache.jetspeed.security.SecurityAccessController;
@@ -206,17 +206,17 @@
private List<PortletWindow> getAllPortletsRegisteredForEvent(RequestContext rc, Event event)
{
- Fragment root = rc.getPage().getRootFragment();
+ ContentFragment root = rc.getPage().getRootFragment();
List<PortletWindow> eventTargets = new LinkedList<PortletWindow>();
return getPortletsRegisteredOnPage(rc, root, event, eventTargets);
}
- private List<PortletWindow> getPortletsRegisteredOnPage(RequestContext rc, Fragment fragment, Event event, List<PortletWindow> eventTargets)
+ private List<PortletWindow> getPortletsRegisteredOnPage(RequestContext rc, ContentFragment fragment, Event event, List<PortletWindow> eventTargets)
{
- List<Fragment> fragments = fragment.getFragments();
+ List<ContentFragment> fragments = fragment.getFragments();
if (fragments != null && fragments.size() > 0)
{
- for (Fragment child : fragments)
+ for (ContentFragment child : fragments)
{
getPortletsRegisteredOnPage(rc, child, event, eventTargets);
}
@@ -244,9 +244,9 @@
return eventTargets;
}
- protected boolean checkSecurityConstraint(PortletDefinition portlet, Fragment fragment)
+ protected boolean checkSecurityConstraint(PortletDefinition portlet, ContentFragment fragment)
{
- if (fragment.getType().equals(Fragment.PORTLET))
+ if (fragment.getType().equals(ContentFragment.PORTLET))
{
if (accessController != null) // TODO: MASK_EVENT
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/xmove.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/xmove.vm?rev=881862&r1=881861&r2=881862&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/xmove.vm (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/xmove.vm Wed Nov 18 18:24:48 2009
@@ -52,4 +52,7 @@
<height>$height</height>
#end
</new_position>
-</js>
\ No newline at end of file
+#if ($entity)
+ <entity>$entity</entity>
+#end
+</js>
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/AddPortletAction.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/AddPortletAction.java?rev=881862&r1=881861&r2=881862&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/AddPortletAction.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/AddPortletAction.java Wed Nov 18 18:24:48 2009
@@ -19,19 +19,19 @@
import java.util.List;
import java.util.Map;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.apache.jetspeed.JetspeedActions;
import org.apache.jetspeed.ajax.AJAXException;
import org.apache.jetspeed.ajax.AjaxAction;
import org.apache.jetspeed.ajax.AjaxBuilder;
import org.apache.jetspeed.components.portletregistry.PortletRegistry;
import org.apache.jetspeed.layout.PortletActionSecurityBehavior;
-import org.apache.jetspeed.om.page.Fragment;
-import org.apache.jetspeed.om.page.Page;
+import org.apache.jetspeed.om.page.ContentFragment;
+import org.apache.jetspeed.om.page.ContentPage;
import org.apache.jetspeed.page.PageManager;
import org.apache.jetspeed.request.RequestContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Add Portlet portlet placement action
@@ -118,8 +118,8 @@
NestedFragmentContext addToFragmentContext = null;
if ( layoutId != null && layoutId.length() > 0 )
{
- Page page = requestContext.getPage();
- Fragment fragment = page.getFragmentById( layoutId );
+ ContentPage page = requestContext.getPage();
+ ContentFragment fragment = page.getFragmentById( layoutId );
if ( fragment == null )
{
success = false;
@@ -150,10 +150,10 @@
if ( addToFragmentContext != null )
{
- Page newPage = requestContext.getPage();
+ ContentPage newPage = requestContext.getPage();
// using NestedFragmentContext, find portlet id for copy of target portlet in the new page
- Fragment newFragment = null;
+ ContentFragment newFragment = null;
try
{
newFragment = addToFragmentContext.getFragmentOnNewPage( newPage, getPortletRegistry() );
@@ -169,13 +169,8 @@
}
}
- Page page = requestContext.getPage();
-
- Fragment fragment = pageManager.newFragment();
- fragment.setType( Fragment.PORTLET );
- fragment.setName( portletId );
-
- Fragment placeInLayoutFragment = null;
+ ContentPage page = requestContext.getPage();
+ ContentFragment placeInLayoutFragment = null;
if ( layoutId != null && layoutId.length() > 0 )
{
placeInLayoutFragment = page.getFragmentById( layoutId );
@@ -188,7 +183,8 @@
{
placeInLayoutFragment = page.getRootFragment();
}
-
+
+ ContentFragment fragment = placeInLayoutFragment.addPortlet(ContentFragment.PORTLET, portletId);
success = placeFragment( requestContext,
batch,
resultMap,
@@ -237,7 +233,7 @@
throws AJAXException
{
// Look at each portlet currently on the page
- Page page = requestContext.getPage();
+ ContentPage page = requestContext.getPage();
boolean duplicateFound = isDuplicateFragment(page.getRootFragment(), portletId);
@@ -247,7 +243,7 @@
}
}
- protected boolean isDuplicateFragment(Fragment fragment, String portletId) {
+ protected boolean isDuplicateFragment(ContentFragment fragment, String portletId) {
if(fragment != null) {
// Get the name of this fragment
String fragmentName = fragment.getName();
@@ -260,7 +256,7 @@
if(childFragments != null) {
for(int i = 0; i < childFragments.size(); i++) {
// Recursively call this method again to process the child fragments
- if(isDuplicateFragment((Fragment)childFragments.get(i),portletId) == true) {
+ if(isDuplicateFragment((ContentFragment)childFragments.get(i),portletId) == true) {
// No need to continue to loop if a duplicate was found
return true;
}
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/BasePortletAction.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/BasePortletAction.java?rev=881862&r1=881861&r2=881862&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/BasePortletAction.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/BasePortletAction.java Wed Nov 18 18:24:48 2009
@@ -25,8 +25,8 @@
import org.apache.jetspeed.ajax.AjaxAction;
import org.apache.jetspeed.ajax.AjaxBuilder;
import org.apache.jetspeed.layout.PortletActionSecurityBehavior;
-import org.apache.jetspeed.om.page.Fragment;
-import org.apache.jetspeed.om.page.Page;
+import org.apache.jetspeed.om.page.ContentFragment;
+import org.apache.jetspeed.om.page.ContentPage;
import org.apache.jetspeed.page.PageManager;
import org.apache.jetspeed.request.RequestContext;
@@ -138,16 +138,16 @@
return securityBehavior.createNewPageOnEdit(context);
}
- public Fragment getFragmentIdFromLocation( int row, int column, Page page )
+ public ContentFragment getFragmentIdFromLocation( int row, int column, ContentPage page )
{
return getFragmentIdFromLocation( row, column, page.getRootFragment() );
}
- public Fragment getFragmentIdFromLocation( int row, int column, Fragment parentFragment )
+ public ContentFragment getFragmentIdFromLocation( int row, int column, ContentFragment parentFragment )
{
Iterator fragments = parentFragment.getFragments().iterator();
while ( fragments.hasNext() )
{
- Fragment fragment = (Fragment)fragments.next();
+ ContentFragment fragment = (ContentFragment)fragments.next();
if ( fragment.getLayoutColumn() == column && fragment.getLayoutRow() == row )
{
return fragment;
@@ -184,7 +184,7 @@
return result;
}
- public Fragment getParentFragmentById(String id, Fragment root)
+ public ContentFragment getParentFragmentById(String id, ContentFragment root)
{
return NestedFragmentContext.getParentFragmentById( id, root );
}
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/BaseUserAction.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/BaseUserAction.java?rev=881862&r1=881861&r2=881862&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/BaseUserAction.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/BaseUserAction.java Wed Nov 18 18:24:48 2009
@@ -25,8 +25,8 @@
import org.apache.jetspeed.ajax.AJAXException;
import org.apache.jetspeed.ajax.AjaxAction;
import org.apache.jetspeed.ajax.AjaxBuilder;
-import org.apache.jetspeed.om.page.Fragment;
-import org.apache.jetspeed.om.page.Page;
+import org.apache.jetspeed.om.page.ContentFragment;
+import org.apache.jetspeed.om.page.ContentPage;
import org.apache.jetspeed.request.RequestContext;
import org.apache.jetspeed.security.UserManager;
@@ -128,13 +128,13 @@
}
// TODO: support nested fragments
- public Fragment getFragmentIdFromLocation(int row, int column, Page page)
+ public ContentFragment getFragmentIdFromLocation(int row, int column, ContentPage page)
{
- Fragment root = page.getRootFragment();
+ ContentFragment root = page.getRootFragment();
Iterator fragments = root.getFragments().iterator();
while (fragments.hasNext())
{
- Fragment fragment = (Fragment)fragments.next();
+ ContentFragment fragment = (ContentFragment)fragments.next();
if (fragment.getLayoutColumn() == column &&
fragment.getLayoutRow() == row)
{
@@ -164,7 +164,7 @@
return parameter;
}
- public Fragment getParentFragmentById(String id, Fragment root)
+ public ContentFragment getParentFragmentById(String id, ContentFragment root)
{
if ( id == null )
{
@@ -173,17 +173,17 @@
return searchForParentFragmentById( id, root );
}
- protected Fragment searchForParentFragmentById( String id, Fragment parent )
+ protected ContentFragment searchForParentFragmentById( String id, ContentFragment parent )
{
// find fragment by id, tracking fragment parent
- Fragment matchedParent = null;
+ ContentFragment matchedParent = null;
if( parent != null )
{
// process the children
List children = parent.getFragments();
for( int i = 0, cSize = children.size() ; i < cSize ; i++)
{
- Fragment childFrag = (Fragment)children.get( i );
+ ContentFragment childFrag = (ContentFragment)children.get( i );
if ( childFrag != null )
{
if ( id.equals( childFrag.getId() ) )
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/ChangePortletAction.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/ChangePortletAction.java?rev=881862&r1=881861&r2=881862&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/ChangePortletAction.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/ChangePortletAction.java Wed Nov 18 18:24:48 2009
@@ -132,7 +132,7 @@
resultMap.put(FRAGMENTID, fragmentId);
ContentPage page = requestContext.getPage();
- ContentFragment fragment = page.getContentFragmentById(fragmentId);
+ ContentFragment fragment = page.getFragmentById(fragmentId);
if ( fragment == null )
{
@@ -242,19 +242,10 @@
}
navState.sync(requestContext);
}
-
if (checkAccess(requestContext, JetspeedActions.EDIT))
{
- if (requestedState != null)
- fragment.setState(requestedState);
- if (requestedMode != null)
- fragment.setMode(requestedMode);
-
- if (pageManager != null && !batch)
- {
- pageManager.updatePage(page);
- }
+ fragment.updateStateMode(requestedState, requestedMode);
}
//requestContext.getPortalURL().getNavigationalState().
@@ -290,7 +281,7 @@
// *if* a pa defines a custom mode/state with a different name but
// mapped onto a internal (portal) mode/state
// *then* first the real internal mode/state needs to be retrieved from the
- // targetted portlet its application:
+ // targeted portlet its application:
// o.a.j.om.common.portlet.PortletApplication.getMappedMode(customMode) and
// o.a.j.om.common.portlet.PortletApplication.getMappedState(customState)
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetPageAction.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetPageAction.java?rev=881862&r1=881861&r2=881862&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetPageAction.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetPageAction.java Wed Nov 18 18:24:48 2009
@@ -21,19 +21,17 @@
import java.util.List;
import java.util.Map;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.apache.jetspeed.JetspeedActions;
import org.apache.jetspeed.PortalReservedParameters;
import org.apache.jetspeed.ajax.AjaxAction;
import org.apache.jetspeed.ajax.AjaxBuilder;
+import org.apache.jetspeed.ajax.AJAXException;
import org.apache.jetspeed.components.portletregistry.PortletRegistry;
import org.apache.jetspeed.decoration.DecorationValve;
import org.apache.jetspeed.decoration.PageActionAccess;
import org.apache.jetspeed.decoration.Theme;
import org.apache.jetspeed.layout.PortletActionSecurityBehavior;
-import org.apache.jetspeed.om.page.ContentFragment;
-import org.apache.jetspeed.om.page.ContentPage;
+import org.apache.jetspeed.om.page.BaseFragmentElement;
import org.apache.jetspeed.om.page.Fragment;
import org.apache.jetspeed.om.page.Page;
import org.apache.jetspeed.page.PageManager;
@@ -45,6 +43,9 @@
import org.apache.jetspeed.om.portlet.InitParam;
import org.apache.jetspeed.om.portlet.PortletDefinition;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* Get Page retrieves a page from the Page Manager store and PSML format
*
@@ -92,12 +93,16 @@
// Run the Decoration valve to get actions
decorationValve.invoke( requestContext, null );
- Page page = requestContext.getPage();
+ Page page = requestContext.getPage().getPage();
String pageName = getActionParameter( requestContext, PAGE );
if ( pageName != null )
{
page = retrievePage( requestContext, pageName );
}
+ if (page == null)
+ {
+ throw new AJAXException("Missing current page or '" + PAGE + "' parameter");
+ }
// ** DST: DEMO: Hack
insertNavigator(page);
@@ -165,11 +170,12 @@
String singleLayoutId = getActionParameter( requestContext, LAYOUTID );
if ( singleLayoutId != null )
{ // build page representation with single layout
- Fragment currentLayoutFragment = page.getFragmentById( singleLayoutId );
- if ( currentLayoutFragment == null )
+ BaseFragmentElement singleLayoutFragment = page.getFragmentById( singleLayoutId );
+ if ( ! ( singleLayoutFragment instanceof Fragment) )
{
throw new Exception( "layout id not found: " + singleLayoutId );
}
+ Fragment currentLayoutFragment = (Fragment) singleLayoutFragment;
Fragment currentPortletFragment = null;
String singlePortletId = getActionParameter( requestContext, PORTLETENTITY );
@@ -198,9 +204,13 @@
retrieveFragmentSpecialProperties( requestContext, currentLayoutFragment, fragSizes, portletIcons );
resultMap.put( "layoutsingle", currentLayoutFragment );
}
+ else if (page.getRootFragment() instanceof Fragment)
+ {
+ retrieveFragmentSpecialProperties( requestContext, (Fragment)page.getRootFragment(), fragSizes, portletIcons );
+ }
else
{
- retrieveFragmentSpecialProperties( requestContext, page.getRootFragment(), fragSizes, portletIcons );
+ throw new Exception( "root layout not found for page: " + page.getId() );
}
resultMap.put( SIZES, fragSizes );
resultMap.put( "portletIcons", portletIcons );
@@ -239,7 +249,9 @@
if ( "layout".equals( frag.getType() ) )
{ // get layout fragment sizes
if ( fragSizes != null )
- PortletPlacementContextImpl.getColumnCountAndSizes( frag, registry, fragSizes );
+ {
+ PortletPlacementMetadataAccess.getColumnCountAndSizes( frag, registry, fragSizes );
+ }
List childFragments = frag.getFragments();
if ( childFragments != null )
@@ -281,17 +293,23 @@
Page nav;
try
{
- Fragment root = page.getRootFragment();
- boolean found = findFragment(root);
- if (!found)
- {
- nav = this.pageManager.getPage("/_user/template/navigator.psml");
- List<Fragment> navFragments = nav.getRootFragment().getFragments();
- Fragment source1 = navFragments.get(0);
- root.getFragments().add(0, source1);
- Fragment source2 = navFragments.get(1);
- root.getFragments().add(1, source2);
- // save?
+ if (page.getRootFragment() instanceof Fragment)
+ {
+ Fragment root = (Fragment)page.getRootFragment();
+ boolean found = findFragment(root);
+ if (!found)
+ {
+ nav = this.pageManager.getPage("/_user/template/navigator.psml");
+ if (nav.getRootFragment() instanceof Fragment)
+ {
+ List<Fragment> navFragments = ((Fragment)nav.getRootFragment()).getFragments();
+ Fragment source1 = navFragments.get(0);
+ root.getFragments().add(0, source1);
+ Fragment source2 = navFragments.get(1);
+ root.getFragments().add(1, source2);
+ // save?
+ }
+ }
}
}
catch (PageNotFoundException e)
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetPortletActionsAction.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetPortletActionsAction.java?rev=881862&r1=881861&r2=881862&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetPortletActionsAction.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetPortletActionsAction.java Wed Nov 18 18:24:48 2009
@@ -109,7 +109,7 @@
}
getActionsForFragments.add( fragment );
}
- getActionsForFragments.add( page.getRootContentFragment() );
+ getActionsForFragments.add( page.getRootFragment() );
}
// Run the Decoration valve to get actions
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/MovePortletAction.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/MovePortletAction.java?rev=881862&r1=881861&r2=881862&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/MovePortletAction.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/MovePortletAction.java Wed Nov 18 18:24:48 2009
@@ -19,8 +19,6 @@
import java.util.Map;
import java.util.Iterator;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.apache.jetspeed.JetspeedActions;
import org.apache.jetspeed.ajax.AJAXException;
import org.apache.jetspeed.ajax.AjaxAction;
@@ -30,12 +28,15 @@
import org.apache.jetspeed.layout.PortletActionSecurityBehavior;
import org.apache.jetspeed.layout.PortletPlacementException;
import org.apache.jetspeed.layout.PortletPlacementContext;
-import org.apache.jetspeed.om.page.Fragment;
-import org.apache.jetspeed.om.page.Page;
+import org.apache.jetspeed.om.page.ContentFragment;
+import org.apache.jetspeed.om.page.ContentPage;
import org.apache.jetspeed.page.PageManager;
import org.apache.jetspeed.page.document.NodeException;
import org.apache.jetspeed.request.RequestContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* Move Portlet portlet placement action
*
@@ -157,12 +158,12 @@
}
resultMap.put(FRAGMENTID, moveFragmentId);
- Fragment currentLayoutFragment = null;
- Fragment moveToLayoutFragment = null;
+ ContentFragment currentLayoutFragment = null;
+ ContentFragment moveToLayoutFragment = null;
// when layoutId is null we use old behavior, ignoring everything to do with multiple layout fragments
if ( layoutId != null && layoutId.length() > 0 && iMoveType != CARTESIAN )
{
- Page page = requestContext.getPage();
+ ContentPage page = requestContext.getPage();
currentLayoutFragment = page.getFragmentById( layoutId );
if ( currentLayoutFragment == null )
{
@@ -175,7 +176,7 @@
Iterator layoutChildIter = moveToLayoutFragment.getFragments().iterator();
while ( layoutChildIter.hasNext() )
{
- Fragment childFrag = (Fragment)layoutChildIter.next();
+ ContentFragment childFrag = (ContentFragment)layoutChildIter.next();
if ( childFrag != null )
{
if ( moveFragmentId.equals( childFrag.getId() ) )
@@ -189,7 +190,7 @@
{
// figure out the current layout fragment - must know to be able to find the portlet
// fragment by row/col when a new page is created
- Fragment root = requestContext.getPage().getRootFragment();
+ ContentFragment root = requestContext.getPage().getRootFragment();
currentLayoutFragment = getParentFragmentById( moveFragmentId, root );
}
}
@@ -209,8 +210,8 @@
return success;
}
- Page page = requestContext.getPage();
- Fragment fragment = page.getFragmentById( moveFragmentId );
+ ContentPage page = requestContext.getPage();
+ ContentFragment fragment = page.getFragmentById( moveFragmentId );
if ( fragment == null )
{
success = false;
@@ -246,12 +247,12 @@
}
status = "refresh";
- Page newPage = requestContext.getPage();
+ ContentPage newPage = requestContext.getPage();
//log.info("after createNewPageOnEdit page-name=" + newPage.getName() + " page-path=" + newPage.getPath() + " page-url=" + newPage.getUrl() );
- Fragment newPageRootFragment = newPage.getRootFragment();
+ ContentFragment newPageRootFragment = newPage.getRootFragment();
// using NestedFragmentContext, find portlet id for copy of target portlet in the new page
- Fragment newFragment = null;
+ ContentFragment newFragment = null;
try
{
newFragment = moveFragmentContext.getFragmentOnNewPage( newPage, registry );
@@ -276,7 +277,7 @@
//log.info( "npe newParentFragment: " + currentLayoutFragment.getType() + " " + currentLayoutFragment.getId() );
if ( moveToLayoutFragment != null )
{
- Fragment newMoveToFragment = null;
+ ContentFragment newMoveToFragment = null;
try
{
newMoveToFragment = moveToFragmentContext.getFragmentOnNewPage( newPage, registry );
@@ -305,7 +306,7 @@
else
{
PortletPlacementContext placement = null;
- Page page = requestContext.getPage();
+ ContentPage page = requestContext.getPage();
if ( currentLayoutFragment == null )
currentLayoutFragment = getParentFragmentById( moveFragmentId, page.getRootFragment() );
@@ -315,7 +316,7 @@
else
placement = new PortletPlacementContextImpl( page, registry );
- Fragment fragment = placement.getFragmentById(moveFragmentId);
+ ContentFragment fragment = placement.getFragmentById(moveFragmentId);
if ( fragment == null )
{
success = false;
@@ -323,7 +324,7 @@
return success;
}
- success = moveInFragment( requestContext, placement, fragment, null, resultMap, batch );
+ success = moveInFragment( requestContext, placement, fragment, false, resultMap, batch );
}
if ( success )
{
@@ -342,13 +343,12 @@
return success;
}
- protected boolean moveInFragment( RequestContext requestContext, PortletPlacementContext placement, Fragment fragment, Fragment placeInLayoutFragment, Map resultMap, boolean batch )
+ protected boolean moveInFragment( RequestContext requestContext, PortletPlacementContext placement, ContentFragment fragment, boolean addFragment, Map resultMap, boolean batch )
throws PortletPlacementException, NodeException, AJAXException
{
boolean success = true;
String moveFragmentId = fragment.getId();
- boolean addFragment = (placeInLayoutFragment != null);
Coordinate returnCoordinate = null;
float oldX = 0f, oldY = 0f, oldZ = 0f, oldWidth = 0f, oldHeight = 0f;
float x = -1f, y = -1f, z = -1f, width = -1f, height = -1f;
@@ -380,9 +380,9 @@
{
oldHeight = fragment.getLayoutHeight();
height = Float.parseFloat( sHeight );
- fragment.setLayoutHeight( height );
absHeightChanged = true;
}
+ fragment.updatePosition( -1.0F, -1.0F, -1.0F, -1.0F, height );
}
else if ( iMoveType == LEFT )
{
@@ -411,47 +411,33 @@
{
oldX = fragment.getLayoutX();
x = Float.parseFloat( sx );
- fragment.setLayoutX( x );
}
if ( sy != null )
{
oldY = fragment.getLayoutY();
y = Float.parseFloat( sy );
- fragment.setLayoutY( y );
}
if ( sz != null )
{
oldZ = fragment.getLayoutZ();
z = Float.parseFloat( sz );
- fragment.setLayoutZ( z );
}
if ( sWidth != null )
{
oldWidth = fragment.getLayoutWidth();
width = Float.parseFloat( sWidth );
- fragment.setLayoutWidth( width );
}
if ( sHeight != null )
{
oldHeight = fragment.getLayoutHeight();
height = Float.parseFloat( sHeight );
- fragment.setLayoutHeight( height );
}
+ fragment.updatePosition( x, y, z, width, height );
}
// synchronize back to the page layout root fragment
- Page page = placement.syncPageFragments();
+ ContentPage page = placement.syncPageFragments();
- if ( placeInLayoutFragment != null )
- {
- placeInLayoutFragment.getFragments().add( fragment );
- }
-
- if ( pageManager != null && ! batch )
- {
- pageManager.updatePage( page );
- }
-
if ( iMoveType == CARTESIAN )
{
putCartesianResult( resultMap, x, oldX, X, OLD_X );
@@ -483,15 +469,15 @@
boolean batch,
Map resultMap,
String moveFragmentId,
- Fragment moveToLayoutFragment,
- Fragment removeFromLayoutFragment )
+ ContentFragment moveToLayoutFragment,
+ ContentFragment removeFromLayoutFragment )
throws PortletPlacementException, NodeException, AJAXException
{
boolean success = true;
- Fragment placeFragment = null;
+ ContentFragment placeFragment = null;
if ( removeFromLayoutFragment != null )
{
- Page page = requestContext.getPage();
+ ContentPage page = requestContext.getPage();
PortletPlacementContext placement = new PortletPlacementContextImpl( page, registry, removeFromLayoutFragment );
placeFragment = placement.getFragmentById( moveFragmentId );
@@ -503,10 +489,12 @@
}
placement.remove( placeFragment );
page = placement.syncPageFragments();
- page.removeFragmentById( moveFragmentId );
+
+ page.moveFragment(placeFragment.getId(), removeFromLayoutFragment.getId(), moveToLayoutFragment.getId());
}
if ( placeFragment != null )
{
+ resultMap.put( PORTLETENTITY, placeFragment.getId() );
return placeFragment( requestContext,
batch,
resultMap,
@@ -519,8 +507,8 @@
protected boolean placeFragment( RequestContext requestContext,
boolean batch,
Map resultMap,
- Fragment placeFragment,
- Fragment placeInLayoutFragment )
+ ContentFragment placeFragment,
+ ContentFragment placeInLayoutFragment )
throws PortletPlacementException, NodeException, AJAXException
{
boolean success = true;
@@ -531,11 +519,10 @@
}
// add fragment
- Page page = requestContext.getPage();
- PortletPlacementContext placement = new PortletPlacementContextImpl( page, registry, placeInLayoutFragment );
- //placement.add( placeFragment, getCoordinateFromParams( requestContext ) );
+ ContentPage page = requestContext.getPage();
+ PortletPlacementContext placement = new PortletPlacementContextImpl( page, registry, placeInLayoutFragment, placeFragment );
- success = moveInFragment( requestContext, placement, placeFragment, placeInLayoutFragment, resultMap, batch );
+ success = moveInFragment( requestContext, placement, placeFragment, true, resultMap, batch );
return success;
}
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/NestedFragmentContext.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/NestedFragmentContext.java?rev=881862&r1=881861&r2=881862&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/NestedFragmentContext.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/NestedFragmentContext.java Wed Nov 18 18:24:48 2009
@@ -23,8 +23,9 @@
import org.slf4j.LoggerFactory;
import org.apache.jetspeed.components.portletregistry.PortletRegistry;
import org.apache.jetspeed.layout.PortletPlacementException;
-import org.apache.jetspeed.om.page.Fragment;
-import org.apache.jetspeed.om.page.Page;
+import org.apache.jetspeed.om.page.ContentFragment;
+import org.apache.jetspeed.om.page.ContentPage;
+
/**
* NestedFragmentContext
*
@@ -50,12 +51,12 @@
protected static final Logger log = LoggerFactory.getLogger( NestedFragmentContext.class );
protected static final String eol = System.getProperty( "line.separator" );
- private Fragment targetFragment;
- private Fragment rootFragment;
- private Page page;
+ private ContentFragment targetFragment;
+ private ContentFragment rootFragment;
+ private ContentPage page;
private List fragmentLevels;
- public NestedFragmentContext( Fragment targetFragment, Page page, PortletRegistry registry )
+ public NestedFragmentContext( ContentFragment targetFragment, ContentPage page, PortletRegistry registry )
throws PortletPlacementException
{
this.targetFragment = targetFragment;
@@ -68,8 +69,8 @@
throws PortletPlacementException
{
List nestedFragmentLevels = new ArrayList();
- Fragment nextTarget = targetFragment;
- Fragment nextParent = null;
+ ContentFragment nextTarget = targetFragment;
+ ContentFragment nextParent = null;
do
{
nextParent = NestedFragmentContext.getParentFragmentById( nextTarget.getId(), rootFragment );
@@ -93,14 +94,14 @@
this.fragmentLevels = nestedFragmentLevels;
}
- public Fragment getFragmentOnNewPage( Page newPage, PortletRegistry registry )
+ public ContentFragment getFragmentOnNewPage( ContentPage newPage, PortletRegistry registry )
throws PortletPlacementException
{
- Fragment newPageRootFragment = newPage.getRootFragment();
+ ContentFragment newPageRootFragment = newPage.getRootFragment();
int depth = fragmentLevels.size();
- Fragment nextFragment = newPageRootFragment;
+ ContentFragment nextFragment = newPageRootFragment;
for ( int i = depth -1; i >= 0 ; i-- )
{
NestedFragmentLevel level = (NestedFragmentLevel)fragmentLevels.get(i);
@@ -152,10 +153,10 @@
{
private int childRow;
private int childCol;
- private Fragment child;
- private Fragment parent;
+ private ContentFragment child;
+ private ContentFragment parent;
- NestedFragmentLevel( Fragment child, Fragment parent, PortletRegistry registry )
+ NestedFragmentLevel( ContentFragment child, ContentFragment parent, PortletRegistry registry )
throws PortletPlacementException
{
this.child = child;
@@ -173,11 +174,11 @@
{
return this.childCol;
}
- protected Fragment getChild()
+ protected ContentFragment getChild()
{
return this.child;
}
- protected Fragment getParent()
+ protected ContentFragment getParent()
{
return this.parent;
}
@@ -187,7 +188,7 @@
}
}
- public static Fragment getParentFragmentById( String id, Fragment parent )
+ public static ContentFragment getParentFragmentById( String id, ContentFragment parent )
{
// find fragment by id, tracking fragment parent
if ( id == null )
@@ -195,14 +196,14 @@
return null;
}
- Fragment matchedParent = null;
+ ContentFragment matchedParent = null;
if( parent != null )
{
// process the children
List children = parent.getFragments();
for( int i = 0, cSize = children.size() ; i < cSize ; i++)
{
- Fragment childFrag = (Fragment)children.get( i );
+ ContentFragment childFrag = (ContentFragment)children.get( i );
if ( childFrag != null )
{
if ( id.equals( childFrag.getId() ) )
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/PortletActionSecurityConstraintsBehavior.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/PortletActionSecurityConstraintsBehavior.java?rev=881862&r1=881861&r2=881862&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/PortletActionSecurityConstraintsBehavior.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/PortletActionSecurityConstraintsBehavior.java Wed Nov 18 18:24:48 2009
@@ -22,8 +22,9 @@
import org.slf4j.LoggerFactory;
import org.apache.jetspeed.Jetspeed;
import org.apache.jetspeed.administration.PortalConfiguration;
+import org.apache.jetspeed.layout.PageLayoutComponent;
import org.apache.jetspeed.layout.PortletActionSecurityBehavior;
-import org.apache.jetspeed.om.page.Page;
+import org.apache.jetspeed.om.page.ContentPage;
import org.apache.jetspeed.page.PageManager;
import org.apache.jetspeed.request.RequestContext;
@@ -40,13 +41,13 @@
protected Logger log = LoggerFactory.getLogger(PortletActionSecurityConstraintsBehavior.class);
protected String guest = "guest";
- public PortletActionSecurityConstraintsBehavior(PageManager pageManager)
+ public PortletActionSecurityConstraintsBehavior(PageManager pageManager, PageLayoutComponent pageLayoutComponent)
{
- this( pageManager, Boolean.FALSE );
+ this( pageManager, pageLayoutComponent, Boolean.FALSE );
}
- public PortletActionSecurityConstraintsBehavior(PageManager pageManager, Boolean enableCreateUserPagesFromRolesOnEdit )
+ public PortletActionSecurityConstraintsBehavior(PageManager pageManager, PageLayoutComponent pageLayoutComponent, Boolean enableCreateUserPagesFromRolesOnEdit )
{
- super( pageManager, enableCreateUserPagesFromRolesOnEdit );
+ super( pageManager, pageLayoutComponent, enableCreateUserPagesFromRolesOnEdit );
PortalConfiguration config = Jetspeed.getConfiguration();
if (config != null)
{
@@ -56,7 +57,7 @@
public boolean checkAccess(RequestContext context, String action)
{
- Page page = context.getPage();
+ ContentPage page = context.getPage();
try
{
page.checkAccess(action);
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/PortletActionSecurityPathBehavior.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/PortletActionSecurityPathBehavior.java?rev=881862&r1=881861&r2=881862&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/PortletActionSecurityPathBehavior.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/PortletActionSecurityPathBehavior.java Wed Nov 18 18:24:48 2009
@@ -16,17 +16,21 @@
*/
package org.apache.jetspeed.layout.impl;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import java.util.Locale;
+
import org.apache.jetspeed.JetspeedActions;
+import org.apache.jetspeed.layout.PageLayoutComponent;
import org.apache.jetspeed.layout.PortletActionSecurityBehavior;
import org.apache.jetspeed.om.folder.Folder;
-import org.apache.jetspeed.om.page.ContentPageImpl;
+import org.apache.jetspeed.om.page.ContentPage;
import org.apache.jetspeed.om.page.Page;
import org.apache.jetspeed.page.PageManager;
import org.apache.jetspeed.profiler.impl.ProfilerValveImpl;
import org.apache.jetspeed.request.RequestContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* Abstracted behavior of security checks for portlet actions
*
@@ -37,21 +41,23 @@
{
protected Logger log = LoggerFactory.getLogger(PortletActionSecurityPathBehavior.class);
protected PageManager pageManager;
+ protected PageLayoutComponent pageLayoutComponent;
private boolean enableCreateUserPagesFromRolesOnEdit;
- public PortletActionSecurityPathBehavior(PageManager pageManager )
+ public PortletActionSecurityPathBehavior(PageManager pageManager, PageLayoutComponent pageLayoutComponent)
{
- this( pageManager, Boolean.FALSE ) ;
+ this( pageManager, pageLayoutComponent, Boolean.FALSE ) ;
}
- public PortletActionSecurityPathBehavior(PageManager pageManager, Boolean enableCreateUserPagesFromRolesOnEdit )
+ public PortletActionSecurityPathBehavior(PageManager pageManager, PageLayoutComponent pageLayoutComponent, Boolean enableCreateUserPagesFromRolesOnEdit )
{
this.pageManager = pageManager;
+ this.pageLayoutComponent = pageLayoutComponent;
this.enableCreateUserPagesFromRolesOnEdit = ( enableCreateUserPagesFromRolesOnEdit == null ? false : enableCreateUserPagesFromRolesOnEdit.booleanValue() );
}
public boolean checkAccess(RequestContext context, String action)
{
- Page page = context.getPage();
+ ContentPage page = context.getPage();
String path = page.getPath();
if (path == null)
return false;
@@ -88,21 +94,26 @@
if ( ! this.enableCreateUserPagesFromRolesOnEdit )
return false ;
- Page page = context.getPage();
- String pagePath = page.getPath();
+ ContentPage contentPage = context.getPage();
+ String pagePath = contentPage.getPath();
try
{
if ( isPageQualifiedForCreateNewPageOnEdit( pagePath ) )
{
- String pageName = page.getName();
- this.pageManager.createUserHomePagesFromRoles(context.getSubject());
- page = this.pageManager.getPage(Folder.USER_FOLDER
+ // create user home pages
+ String pageName = contentPage.getName();
+ pageManager.createUserHomePagesFromRoles(context.getSubject());
+ Page page = pageManager.getPage(Folder.USER_FOLDER
+ context.getRequest().getUserPrincipal().getName()
+ Folder.PATH_SEPARATOR
+ pageName); // was Folder.FALLBACK_DEFAULT_PAGE prior to 2007-11-06
- context.setPage(new ContentPageImpl(page));
+
+ // TODO validate effectiveness of request context reset below
+ context.setPage(pageLayoutComponent.newContentPage(page));
+ context.getRequest().removeAttribute(ProfilerValveImpl.PORTAL_SITE_REQUEST_CONTEXT_ATTR_KEY);
+ context.getRequest().removeAttribute(ProfilerValveImpl.PROFILED_PAGE_CONTEXT_ATTR_KEY);
context.getRequest().getSession().removeAttribute(ProfilerValveImpl.PORTAL_SITE_SESSION_CONTEXT_ATTR_KEY);
- }
+ }
}
catch (Exception e)
{
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/PortletActionSecurityPathMergeBehavior.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/PortletActionSecurityPathMergeBehavior.java?rev=881862&r1=881861&r2=881862&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/PortletActionSecurityPathMergeBehavior.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/PortletActionSecurityPathMergeBehavior.java Wed Nov 18 18:24:48 2009
@@ -24,6 +24,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.apache.jetspeed.layout.PageLayoutComponent;
import org.apache.jetspeed.layout.PortletActionSecurityBehavior;
import org.apache.jetspeed.page.PageManager;
import org.apache.jetspeed.request.RequestContext;
@@ -46,13 +47,13 @@
{
protected Logger log = LoggerFactory.getLogger(PortletActionSecurityPathMergeBehavior.class);
- public PortletActionSecurityPathMergeBehavior( PageManager pageManager )
+ public PortletActionSecurityPathMergeBehavior( PageManager pageManager, PageLayoutComponent pageLayoutComponent )
{
- this( pageManager, Boolean.FALSE );
+ this( pageManager, pageLayoutComponent, Boolean.FALSE );
}
- public PortletActionSecurityPathMergeBehavior( PageManager pageManager, Boolean enableCreateUserPagesFromRolesOnEdit )
+ public PortletActionSecurityPathMergeBehavior( PageManager pageManager, PageLayoutComponent pageLayoutComponent, Boolean enableCreateUserPagesFromRolesOnEdit )
{
- super( pageManager, enableCreateUserPagesFromRolesOnEdit );
+ super( pageManager, pageLayoutComponent, enableCreateUserPagesFromRolesOnEdit );
}
public Subject getSubject(RequestContext context)
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org