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 at...@apache.org on 2008/10/16 20:19:54 UTC
svn commit: r705312 [2/5] - in
/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade:
components/jetspeed-cm/src/main/java/org/apache/jetspeed/cache/impl/
components/jetspeed-cm/src/test/java/org/apache/jetspeed/cache/
components/jetspeed-layou...
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/window/impl/PortletWindowAccessorImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/window/impl/PortletWindowAccessorImpl.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/window/impl/PortletWindowAccessorImpl.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/window/impl/PortletWindowAccessorImpl.java Thu Oct 16 11:18:59 2008
@@ -31,16 +31,13 @@
import org.apache.jetspeed.container.window.FailedToRetrievePortletWindow;
import org.apache.jetspeed.container.window.PortletWindowAccessor;
import org.apache.jetspeed.factory.PortletFactory;
-import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
-import org.apache.jetspeed.om.common.portlet.MutablePortletEntity;
import org.apache.jetspeed.om.common.portlet.PortletApplication;
import org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite;
import org.apache.jetspeed.om.page.ContentFragment;
import org.apache.jetspeed.om.window.impl.PortletWindowImpl;
import org.apache.jetspeed.util.ArgUtil;
-import org.apache.pluto.om.entity.PortletEntity;
-import org.apache.pluto.om.window.PortletWindow;
-import org.apache.pluto.om.window.PortletWindowCtrl;
+import org.apache.jetspeed.container.PortletEntity;
+import org.apache.jetspeed.container.PortletWindow;
/**
* Portlet Window Accessor Implementation
@@ -91,7 +88,7 @@
{
// remove from cache if invalid entity
checkPortletWindowEntity(found);
- ((PortletWindowCtrl)found).setPortletEntity(entity);
+ found.setPortletEntity(entity);
return found;
}
@@ -169,7 +166,7 @@
PortletEntity portletEntity = entityAccessor.getPortletEntityForFragment(fragment);
if(portletEntity != null)
{
- ((PortletWindowCtrl) portletWindow).setPortletEntity(portletEntity);
+ portletWindow.setPortletEntity(portletEntity);
// if not a valid entity, remove window from cache
checkPortletWindowEntity(portletWindow);
}
@@ -185,7 +182,7 @@
PortletWindow portletWindow = new PortletWindowImpl(fragment.getId());
boolean temporaryWindow = false;
- MutablePortletEntity portletEntity = entityAccessor.getPortletEntityForFragment(fragment);
+ PortletEntity portletEntity = entityAccessor.getPortletEntityForFragment(fragment);
if (portletEntity == null)
{
log.info("No portlet entity defined for fragment ID "+fragment.getId()+" attempting to auto-generate...");
@@ -217,7 +214,7 @@
throw new FailedToCreateWindowException("Unable to generate portlet entity.");
}
}
- ((PortletWindowCtrl) portletWindow).setPortletEntity(portletEntity);
+ portletWindow.setPortletEntity(portletEntity);
if ( !temporaryWindow )
{
@@ -261,9 +258,9 @@
{
return pe != null
&& pe.getPortletDefinition() != null
- && pe.getPortletDefinition().getPortletApplicationDefinition() != null
+ && pe.getPortletDefinition().getApplication() != null
&& portletFactory.isPortletApplicationRegistered((PortletApplication) pe.getPortletDefinition()
- .getPortletApplicationDefinition());
+ .getApplication());
}
public Set getPortletWindows()
@@ -287,7 +284,7 @@
portletFactory.updatePortletConfig(def);
}
- protected void removeForPortletApplication(MutablePortletApplication app)
+ protected void removeForPortletApplication(PortletApplication app)
{
Iterator windows = getPortletWindows().iterator();
while(windows.hasNext())
@@ -296,7 +293,7 @@
PortletDefinitionComposite pd = (PortletDefinitionComposite)window.getPortletEntity().getPortletDefinition();
if (pd != null)
{
- MutablePortletApplication windowApp = (MutablePortletApplication)pd.getPortletApplicationDefinition();
+ PortletApplication windowApp = (PortletApplication)pd.getApplication();
if (app.getName().equals(windowApp.getName()))
{
removeWindow(window);
@@ -305,7 +302,7 @@
}
}
- public void applicationRemoved(MutablePortletApplication app)
+ public void applicationRemoved(PortletApplication app)
{
if (app != null)
{
@@ -314,7 +311,7 @@
}
- public void applicationUpdated(MutablePortletApplication app)
+ public void applicationUpdated(PortletApplication app)
{
if (app != null)
{
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/AbstractDecoratorActionsFactory.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/AbstractDecoratorActionsFactory.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/AbstractDecoratorActionsFactory.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/AbstractDecoratorActionsFactory.java Thu Oct 16 11:18:59 2008
@@ -32,7 +32,7 @@
import org.apache.jetspeed.om.page.ContentFragment;
import org.apache.jetspeed.request.RequestContext;
import org.apache.jetspeed.security.SecurityAccessController;
-import org.apache.pluto.om.window.PortletWindow;
+import org.apache.jetspeed.container.PortletWindow;
public abstract class AbstractDecoratorActionsFactory implements DecoratorActionsFactory
{
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/CustomDecoratorActionsFactory.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/CustomDecoratorActionsFactory.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/CustomDecoratorActionsFactory.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/CustomDecoratorActionsFactory.java Thu Oct 16 11:18:59 2008
@@ -30,7 +30,7 @@
import org.apache.jetspeed.om.page.ContentFragment;
import org.apache.jetspeed.request.RequestContext;
import org.apache.jetspeed.security.SecurityAccessController;
-import org.apache.pluto.om.window.PortletWindow;
+import org.apache.jetspeed.container.PortletWindow;
public class CustomDecoratorActionsFactory extends AbstractDecoratorActionsFactory
{
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/DecorationFactoryImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/DecorationFactoryImpl.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/DecorationFactoryImpl.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/DecorationFactoryImpl.java Thu Oct 16 11:18:59 2008
@@ -39,7 +39,7 @@
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.common.portlet.MutablePortletApplication;
+import org.apache.jetspeed.om.common.portlet.PortletApplication;
import org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite;
import org.apache.jetspeed.om.page.Fragment;
import org.apache.jetspeed.om.page.Page;
@@ -563,14 +563,14 @@
while ( portlets.hasNext() )
{
PortletDefinitionComposite portlet = (PortletDefinitionComposite)portlets.next();
- MutablePortletApplication muta = (MutablePortletApplication)portlet.getPortletApplicationDefinition();
- String appName = muta.getName();
+ PortletApplication app = (PortletApplication)portlet.getApplication();
+ String appName = app.getName();
if ( appName == null )
continue;
if ( ! appName.equals( "jetspeed-layouts" ) )
continue;
- String uniqueName = appName + "::" + portlet.getName();
+ String uniqueName = appName + "::" + portlet.getPortletName();
list.add( new LayoutInfoImpl( uniqueName,
portlet.getDisplayNameText( request.getLocale() ),
portlet.getDescriptionText( request.getLocale() ) ) );
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/DecorationValve.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/DecorationValve.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/DecorationValve.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/DecorationValve.java Thu Oct 16 11:18:59 2008
@@ -50,7 +50,7 @@
import org.apache.jetspeed.request.RequestContext;
import org.apache.jetspeed.security.SecurityAccessController;
import org.apache.pluto.om.portlet.ContentTypeSet;
-import org.apache.pluto.om.window.PortletWindow;
+import org.apache.jetspeed.container.PortletWindow;
/**
* Assigns decorations and page actions to all of the portlet Fragments within
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/DecoratorActionsFactory.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/DecoratorActionsFactory.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/DecoratorActionsFactory.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/DecoratorActionsFactory.java Thu Oct 16 11:18:59 2008
@@ -26,7 +26,7 @@
import org.apache.jetspeed.om.page.ContentFragment;
import org.apache.jetspeed.request.RequestContext;
import org.apache.jetspeed.security.SecurityAccessController;
-import org.apache.pluto.om.window.PortletWindow;
+import org.apache.jetspeed.container.PortletWindow;
public interface DecoratorActionsFactory
{
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/DefaultDecoratorActionsFactory.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/DefaultDecoratorActionsFactory.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/DefaultDecoratorActionsFactory.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/DefaultDecoratorActionsFactory.java Thu Oct 16 11:18:59 2008
@@ -26,7 +26,7 @@
import org.apache.jetspeed.JetspeedActions;
import org.apache.jetspeed.om.common.portlet.PortletApplication;
import org.apache.jetspeed.request.RequestContext;
-import org.apache.pluto.om.window.PortletWindow;
+import org.apache.jetspeed.container.PortletWindow;
public class DefaultDecoratorActionsFactory extends AbstractDecoratorActionsFactory
{
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/PrintSoloDecoratorActionsFactory.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/PrintSoloDecoratorActionsFactory.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/PrintSoloDecoratorActionsFactory.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/PrintSoloDecoratorActionsFactory.java Thu Oct 16 11:18:59 2008
@@ -29,7 +29,7 @@
import org.apache.jetspeed.om.page.ContentFragment;
import org.apache.jetspeed.request.RequestContext;
import org.apache.jetspeed.security.SecurityAccessController;
-import org.apache.pluto.om.window.PortletWindow;
+import org.apache.jetspeed.container.PortletWindow;
public class PrintSoloDecoratorActionsFactory extends AbstractDecoratorActionsFactory
{
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/deployment/impl/JettyDeployPortletAppEventListener.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/deployment/impl/JettyDeployPortletAppEventListener.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/deployment/impl/JettyDeployPortletAppEventListener.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/deployment/impl/JettyDeployPortletAppEventListener.java Thu Oct 16 11:18:59 2008
@@ -270,7 +270,7 @@
while (iter.hasNext())
{
Element set = (Element)iter.next();
- String name = set.getAttribute("name").getName();
+ String name = set.getAttribute("name").getPortletName();
if (name.equals("contextPath"))
{
set.setText("/"+contextName);
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/engine/core/PortletActionProviderImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/engine/core/PortletActionProviderImpl.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/engine/core/PortletActionProviderImpl.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/engine/core/PortletActionProviderImpl.java Thu Oct 16 11:18:59 2008
@@ -19,7 +19,7 @@
import javax.portlet.PortletMode;
import javax.portlet.WindowState;
-import org.apache.pluto.om.window.PortletWindow;
+import org.apache.jetspeed.container.PortletWindow;
import org.apache.pluto.services.information.PortletActionProvider;
import org.apache.jetspeed.container.state.MutableNavigationalState;
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/engine/servlet/NamespaceEncodedSession.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/engine/servlet/NamespaceEncodedSession.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/engine/servlet/NamespaceEncodedSession.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/engine/servlet/NamespaceEncodedSession.java Thu Oct 16 11:18:59 2008
@@ -25,7 +25,7 @@
import org.apache.jetspeed.Jetspeed;
import org.apache.jetspeed.container.namespace.JetspeedNamespaceMapper;
import org.apache.jetspeed.container.namespace.JetspeedNamespaceMapperFactory;
-import org.apache.pluto.om.common.ObjectID;
+import org.apache.pluto.om.portlet.ObjectID;
/**
* @author Scott T Weaver
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/engine/servlet/ServletObjectAccess.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/engine/servlet/ServletObjectAccess.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/engine/servlet/ServletObjectAccess.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/engine/servlet/ServletObjectAccess.java Thu Oct 16 11:18:59 2008
@@ -25,7 +25,7 @@
import org.apache.pluto.core.CoreUtils;
import org.apache.pluto.core.InternalPortletRequest;
import org.apache.pluto.core.InternalPortletResponse;
-import org.apache.pluto.om.window.PortletWindow;
+import org.apache.jetspeed.container.PortletWindow;
import org.apache.pluto.services.factory.FactoryManager;
/**
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/engine/servlet/ServletRequestFactory.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/engine/servlet/ServletRequestFactory.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/engine/servlet/ServletRequestFactory.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/engine/servlet/ServletRequestFactory.java Thu Oct 16 11:18:59 2008
@@ -18,7 +18,7 @@
import javax.servlet.http.HttpServletRequest;
import org.apache.pluto.factory.Factory;
-import org.apache.pluto.om.window.PortletWindow;
+import org.apache.jetspeed.container.PortletWindow;
/**
* Factory interface for creating HTTP Request Wrappers
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/engine/servlet/ServletRequestFactoryImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/engine/servlet/ServletRequestFactoryImpl.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/engine/servlet/ServletRequestFactoryImpl.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/engine/servlet/ServletRequestFactoryImpl.java Thu Oct 16 11:18:59 2008
@@ -20,7 +20,7 @@
import javax.servlet.http.HttpServletRequest;
-import org.apache.pluto.om.window.PortletWindow;
+import org.apache.jetspeed.container.PortletWindow;
/**
* Factory implementation for creating HTTP Request Wrappers
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/engine/servlet/ServletRequestImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/engine/servlet/ServletRequestImpl.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/engine/servlet/ServletRequestImpl.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/engine/servlet/ServletRequestImpl.java Thu Oct 16 11:18:59 2008
@@ -49,9 +49,9 @@
import org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite;
import org.apache.jetspeed.request.JetspeedRequestContext;
import org.apache.jetspeed.request.RequestContext;
-import org.apache.pluto.om.entity.PortletEntity;
+import org.apache.jetspeed.container.PortletEntity;
import org.apache.pluto.om.portlet.PortletApplicationDefinition;
-import org.apache.pluto.om.window.PortletWindow;
+import org.apache.jetspeed.container.PortletWindow;
import org.apache.pluto.util.Enumerator;
/**
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/ChangePortletAction.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/ChangePortletAction.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/ChangePortletAction.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/ChangePortletAction.java Thu Oct 16 11:18:59 2008
@@ -38,7 +38,7 @@
import org.apache.jetspeed.om.page.ContentPage;
import org.apache.jetspeed.page.PageManager;
import org.apache.jetspeed.request.RequestContext;
-import org.apache.pluto.om.window.PortletWindow;
+import org.apache.jetspeed.container.PortletWindow;
/**
* Changes the window state or portlet mode for a given portlet window
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetPageAction.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetPageAction.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetPageAction.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetPageAction.java Thu Oct 16 11:18:59 2008
@@ -38,8 +38,8 @@
import org.apache.jetspeed.portalsite.PortalSiteRequestContext;
import org.apache.jetspeed.profiler.impl.ProfilerValveImpl;
import org.apache.jetspeed.request.RequestContext;
-import org.apache.pluto.om.common.Parameter;
-import org.apache.pluto.om.common.ParameterSet;
+import org.apache.pluto.om.portlet.Parameter;
+import org.apache.pluto.om.portlet.ParameterSet;
import org.apache.pluto.om.portlet.PortletDefinition;
/**
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetPortletsAction.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetPortletsAction.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetPortletsAction.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetPortletsAction.java Thu Oct 16 11:18:59 2008
@@ -32,14 +32,14 @@
import org.apache.jetspeed.ajax.AjaxBuilder;
import org.apache.jetspeed.components.portletregistry.PortletRegistry;
import org.apache.jetspeed.layout.PortletActionSecurityBehavior;
-import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
+import org.apache.jetspeed.om.common.portlet.PortletApplication;
import org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite;
import org.apache.jetspeed.page.PageManager;
import org.apache.jetspeed.request.RequestContext;
import org.apache.jetspeed.search.ParsedObject;
import org.apache.jetspeed.search.SearchEngine;
import org.apache.jetspeed.security.SecurityAccessController;
-import org.apache.pluto.om.common.Parameter;
+import org.apache.pluto.om.portlet.Parameter;
/**
* Get Portlets retrieves the portlet list available to the current subject
@@ -138,12 +138,12 @@
continue;
// Do not display Jetspeed Layout Applications
- MutablePortletApplication pa = (MutablePortletApplication)portlet.getPortletApplicationDefinition();
+ PortletApplication pa = (PortletApplication)portlet.getApplication();
if (pa.isLayoutApplication())
continue;
// SECURITY filtering
- String uniqueName = pa.getName() + "::" + portlet.getName();
+ String uniqueName = pa.getName() + "::" + portlet.getPortletName();
if (securityAccessController.checkPortletAccess(portlet, JetspeedActions.MASK_VIEW))
{
Parameter param = portlet.getInitParameterSet().get(PORTLET_ICON);
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/PortletPlacementContextImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/PortletPlacementContextImpl.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/PortletPlacementContextImpl.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/PortletPlacementContextImpl.java Thu Oct 16 11:18:59 2008
@@ -30,8 +30,8 @@
import org.apache.jetspeed.layout.PortletPlacementContext;
import org.apache.jetspeed.om.page.Fragment;
import org.apache.jetspeed.om.page.Page;
-import org.apache.pluto.om.common.Parameter;
-import org.apache.pluto.om.common.ParameterSet;
+import org.apache.pluto.om.portlet.Parameter;
+import org.apache.pluto.om.portlet.ParameterSet;
import org.apache.pluto.om.portlet.PortletDefinition;
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/UpdatePageAction.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/UpdatePageAction.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/UpdatePageAction.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/UpdatePageAction.java Thu Oct 16 11:18:59 2008
@@ -38,7 +38,7 @@
import org.apache.jetspeed.page.PageManager;
import org.apache.jetspeed.page.document.Node;
import org.apache.jetspeed.request.RequestContext;
-import org.apache.pluto.om.window.PortletWindow;
+import org.apache.jetspeed.container.PortletWindow;
/**
* Update Page action -- updates various parts of the PSML page
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/manager/ManagerServlet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/manager/ManagerServlet.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/manager/ManagerServlet.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/manager/ManagerServlet.java Thu Oct 16 11:18:59 2008
@@ -37,7 +37,6 @@
import org.apache.jetspeed.deployment.DeploymentManager;
import org.apache.jetspeed.deployment.DeploymentStatus;
import org.apache.jetspeed.factory.PortletFactory;
-import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
import org.apache.jetspeed.om.common.portlet.PortletApplication;
import org.apache.jetspeed.tools.pamanager.servletcontainer.ApplicationServerManager;
import org.apache.jetspeed.tools.pamanager.servletcontainer.ApplicationServerManagerResult;
@@ -190,7 +189,7 @@
writer.println("Warning: Portlet Application " + paName + " already started");
return OK;
}
- else if (pa.getApplicationType() == MutablePortletApplication.LOCAL)
+ else if (pa.getApplicationType() == PortletApplication.LOCAL)
{
writer.println("Error: Starting LOCAL Portlet Application " + paName + " not supported");
return ERROR_UNSUPPORTED;
@@ -244,7 +243,7 @@
writer.println("Portlet Application " + paName + " already stopped");
return OK;
}
- else if (pa.getApplicationType() == MutablePortletApplication.LOCAL)
+ else if (pa.getApplicationType() == PortletApplication.LOCAL)
{
writer.println("Error: Stopping LOCAL Portlet Application " + paName + " not supported");
return ERROR_UNSUPPORTED;
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/messaging/PortletMessagingImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/messaging/PortletMessagingImpl.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/messaging/PortletMessagingImpl.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/messaging/PortletMessagingImpl.java Thu Oct 16 11:18:59 2008
@@ -30,7 +30,7 @@
import org.apache.pluto.factory.PortletObjectAccess;
import org.apache.pluto.invoker.PortletInvoker;
import org.apache.pluto.invoker.PortletInvokerAccess;
-import org.apache.pluto.om.window.PortletWindow;
+import org.apache.jetspeed.container.PortletWindow;
/**
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/pipeline/valve/impl/ActionValveImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/pipeline/valve/impl/ActionValveImpl.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/pipeline/valve/impl/ActionValveImpl.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/pipeline/valve/impl/ActionValveImpl.java Thu Oct 16 11:18:59 2008
@@ -33,7 +33,6 @@
import org.apache.jetspeed.container.window.PortletWindowAccessor;
import org.apache.jetspeed.container.state.MutableNavigationalState;
import org.apache.jetspeed.exception.JetspeedException;
-import org.apache.jetspeed.om.common.portlet.MutablePortletEntity;
import org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite;
import org.apache.jetspeed.om.page.ContentFragment;
import org.apache.jetspeed.om.page.ContentFragmentImpl;
@@ -47,8 +46,8 @@
import org.apache.jetspeed.request.RequestContext;
import org.apache.pluto.PortletContainer;
import org.apache.pluto.PortletContainerException;
-import org.apache.pluto.om.entity.PortletEntity;
-import org.apache.pluto.om.window.PortletWindow;
+import org.apache.jetspeed.container.PortletEntity;
+import org.apache.jetspeed.container.PortletWindow;
/**
* <p>
@@ -343,7 +342,7 @@
if (fragment != null)
{
- ((MutablePortletEntity)window.getPortletEntity()).setFragment(fragment);
+ window.getPortletEntity().setFragment(fragment);
}
}
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/request/JetspeedRequestContext.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/request/JetspeedRequestContext.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/request/JetspeedRequestContext.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/request/JetspeedRequestContext.java Thu Oct 16 11:18:59 2008
@@ -51,11 +51,11 @@
import org.apache.jetspeed.security.SubjectHelper;
import org.apache.jetspeed.security.User;
import org.apache.jetspeed.userinfo.UserInfoManager;
-import org.apache.pluto.om.common.Language;
-import org.apache.pluto.om.common.LanguageSet;
-import org.apache.pluto.om.common.ObjectID;
+import org.apache.pluto.om.portlet.Language;
+import org.apache.pluto.om.portlet.LanguageSet;
+import org.apache.pluto.om.portlet.ObjectID;
import org.apache.pluto.om.portlet.PortletDefinition;
-import org.apache.pluto.om.window.PortletWindow;
+import org.apache.jetspeed.container.PortletWindow;
/**
* Jetspeed Request Context is associated with each portal request. The request
@@ -313,7 +313,7 @@
* getRequestForWindow
* </p>
*
- * @see org.apache.jetspeed.request.RequestContext#getRequestForWindow(org.apache.pluto.om.window.PortletWindow)
+ * @see org.apache.jetspeed.request.RequestContext#getRequestForWindow(org.apache.jetspeed.container.PortletWindow)
* @param window
* @return
*/
@@ -339,7 +339,7 @@
* getResponseForWindow
* </p>
*
- * @see org.apache.jetspeed.request.RequestContext#getResponseForWindow(org.apache.pluto.om.window.PortletWindow)
+ * @see org.apache.jetspeed.request.RequestContext#getResponseForWindow(org.apache.jetspeed.container.PortletWindow)
* @param window
* @return
*/
@@ -563,8 +563,8 @@
{
MutableLanguage languageCtl = new LanguageImpl();
languageCtl.setLocale(locale);
- languageCtl.setShortTitle(portlet.getName());
- languageCtl.setTitle(portlet.getName());
+ languageCtl.setShortTitle(portlet.getPortletName());
+ languageCtl.setTitle(portlet.getPortletName());
language = languageCtl;
}
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/resource/ResourceValveImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/resource/ResourceValveImpl.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/resource/ResourceValveImpl.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/resource/ResourceValveImpl.java Thu Oct 16 11:18:59 2008
@@ -27,7 +27,6 @@
import org.apache.commons.logging.LogFactory;
import org.apache.jetspeed.PortalReservedParameters;
import org.apache.jetspeed.container.window.PortletWindowAccessor;
-import org.apache.jetspeed.om.common.portlet.MutablePortletEntity;
import org.apache.jetspeed.om.page.ContentFragment;
import org.apache.jetspeed.om.page.ContentFragmentImpl;
import org.apache.jetspeed.om.page.Fragment;
@@ -38,7 +37,7 @@
import org.apache.jetspeed.request.RequestContext;
import org.apache.pluto.PortletContainer;
import org.apache.pluto.PortletContainerException;
-import org.apache.pluto.om.window.PortletWindow;
+import org.apache.jetspeed.container.PortletWindow;
/**
* <p>
@@ -88,7 +87,7 @@
log.error("Failed to refresh resource window.", e);
}
}
- ((MutablePortletEntity)resourceWindow.getPortletEntity()).setFragment(fragment);
+ resourceWindow.getPortletEntity().setFragment(fragment);
HttpServletResponse response = request.getResponse();
HttpServletRequest requestForWindow = request.getRequestForWindow(resourceWindow);
requestForWindow.setAttribute(PortalReservedParameters.REQUEST_CONTEXT_ATTRIBUTE, request);
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/security/impl/SecurityAccessControllerImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/security/impl/SecurityAccessControllerImpl.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/security/impl/SecurityAccessControllerImpl.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/security/impl/SecurityAccessControllerImpl.java Thu Oct 16 11:18:59 2008
@@ -22,7 +22,7 @@
import java.security.Permission;
import org.apache.jetspeed.JetspeedActions;
-import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
+import org.apache.jetspeed.om.common.portlet.PortletApplication;
import org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite;
import org.apache.jetspeed.page.PageManager;
import org.apache.jetspeed.security.PermissionFactory;
@@ -63,7 +63,7 @@
String constraintRef = portlet.getJetspeedSecurityConstraint();
if (constraintRef == null)
{
- constraintRef = ((MutablePortletApplication)portlet.getPortletApplicationDefinition()).getJetspeedSecurityConstraint();
+ constraintRef = ((PortletApplication)portlet.getApplication()).getJetspeedSecurityConstraint();
if (constraintRef == null)
{
return true; // allow access
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/information/DynamicInformationProviderImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/information/DynamicInformationProviderImpl.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/information/DynamicInformationProviderImpl.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/information/DynamicInformationProviderImpl.java Thu Oct 16 11:18:59 2008
@@ -26,7 +26,7 @@
import org.apache.pluto.services.information.DynamicInformationProvider;
import org.apache.pluto.services.information.PortletActionProvider;
import org.apache.pluto.services.information.ResourceURLProvider;
-import org.apache.pluto.om.window.PortletWindow;
+import org.apache.jetspeed.container.PortletWindow;
import org.apache.pluto.services.information.PortletURLProvider;
import org.apache.jetspeed.container.state.MutableNavigationalState;
import org.apache.jetspeed.container.state.NavigationalState;
@@ -170,7 +170,7 @@
* getPortletActionProvider
* </p>
*
- * @see org.apache.pluto.services.information.DynamicInformationProvider#getPortletActionProvider(org.apache.pluto.om.window.PortletWindow)
+ * @see org.apache.pluto.services.information.DynamicInformationProvider#getPortletActionProvider(org.apache.jetspeed.container.PortletWindow)
* @param arg0
* @return
*/
@@ -184,7 +184,7 @@
* getResourceURLProvider
* </p>
*
- * @see org.apache.pluto.services.information.DynamicInformationProvider#getResourceURLProvider(org.apache.pluto.om.window.PortletWindow)
+ * @see org.apache.pluto.services.information.DynamicInformationProvider#getResourceURLProvider(org.apache.jetspeed.container.PortletWindow)
* @param arg0
* @return
*/
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/information/PortletURLProviderImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/information/PortletURLProviderImpl.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/information/PortletURLProviderImpl.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/information/PortletURLProviderImpl.java Thu Oct 16 11:18:59 2008
@@ -23,7 +23,7 @@
import org.apache.jetspeed.container.url.PortalURL;
import org.apache.jetspeed.request.RequestContext;
-import org.apache.pluto.om.window.PortletWindow;
+import org.apache.jetspeed.container.PortletWindow;
import org.apache.pluto.services.information.PortletURLProvider;
/**
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/information/ResourceURLProviderImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/information/ResourceURLProviderImpl.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/information/ResourceURLProviderImpl.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/information/ResourceURLProviderImpl.java Thu Oct 16 11:18:59 2008
@@ -17,7 +17,7 @@
package org.apache.jetspeed.services.information;
import org.apache.jetspeed.request.RequestContext;
-import org.apache.pluto.om.window.PortletWindow;
+import org.apache.jetspeed.container.PortletWindow;
import org.apache.pluto.services.information.ResourceURLProvider;
/**
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/information/StaticInformationProviderImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/information/StaticInformationProviderImpl.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/information/StaticInformationProviderImpl.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/information/StaticInformationProviderImpl.java Thu Oct 16 11:18:59 2008
@@ -19,7 +19,7 @@
import javax.servlet.ServletConfig;
import org.apache.jetspeed.components.portletregistry.PortletRegistry;
-import org.apache.pluto.om.common.ObjectID;
+import org.apache.pluto.om.portlet.ObjectID;
import org.apache.pluto.om.portlet.PortletDefinition;
import org.apache.pluto.services.information.PortalContextProvider;
import org.apache.pluto.services.information.StaticInformationProvider;
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/title/DynamicTitleService.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/title/DynamicTitleService.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/title/DynamicTitleService.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/title/DynamicTitleService.java Thu Oct 16 11:18:59 2008
@@ -18,7 +18,7 @@
import javax.servlet.http.HttpServletRequest;
-import org.apache.pluto.om.window.PortletWindow;
+import org.apache.jetspeed.container.PortletWindow;
public interface DynamicTitleService extends org.apache.pluto.services.title.DynamicTitleService
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/title/DynamicTitleServiceImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/title/DynamicTitleServiceImpl.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/title/DynamicTitleServiceImpl.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/title/DynamicTitleServiceImpl.java Thu Oct 16 11:18:59 2008
@@ -23,9 +23,9 @@
import org.apache.jetspeed.PortalReservedParameters;
import org.apache.jetspeed.request.RequestContext;
-import org.apache.pluto.om.common.Preference;
-import org.apache.pluto.om.entity.PortletEntity;
-import org.apache.pluto.om.window.PortletWindow;
+import org.apache.pluto.om.portlet.Preference;
+import org.apache.jetspeed.container.PortletEntity;
+import org.apache.jetspeed.container.PortletWindow;
public class DynamicTitleServiceImpl implements DynamicTitleService
{
@@ -77,7 +77,7 @@
if (title == null && entity.getPortletDefinition() != null)
{
- title = entity.getPortletDefinition().getName();
+ title = entity.getPortletDefinition().getPortletName();
}
else if (title == null)
{
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/PortletApplicationManager.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/PortletApplicationManager.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/PortletApplicationManager.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/PortletApplicationManager.java Thu Oct 16 11:18:59 2008
@@ -32,7 +32,7 @@
import org.apache.jetspeed.components.portletregistry.RegistryException;
import org.apache.jetspeed.container.window.PortletWindowAccessor;
import org.apache.jetspeed.factory.PortletFactory;
-import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
+import org.apache.jetspeed.om.common.portlet.PortletApplication;
import org.apache.jetspeed.om.common.servlet.MutableWebApplication;
import org.apache.jetspeed.search.SearchEngine;
import org.apache.jetspeed.security.JetspeedPermission;
@@ -44,9 +44,8 @@
import org.apache.jetspeed.util.FileSystemHelper;
import org.apache.jetspeed.util.MultiFileChecksumHelper;
import org.apache.jetspeed.util.descriptor.PortletApplicationWar;
-import org.apache.pluto.om.common.SecurityRole;
-import org.apache.pluto.om.entity.PortletEntity;
-import org.apache.pluto.om.entity.PortletEntityCtrl;
+import org.apache.pluto.om.portlet.SecurityRole;
+import org.apache.jetspeed.container.PortletEntity;
import org.apache.pluto.om.portlet.PortletDefinition;
/**
@@ -167,7 +166,7 @@
throws RegistryException
{
checkStarted();
- startPA(contextName, "/"+contextName, warStruct, paClassLoader, MutablePortletApplication.LOCAL);
+ startPA(contextName, "/"+contextName, warStruct, paClassLoader, PortletApplication.LOCAL);
}
public void startInternalApplication(String contextName) throws RegistryException
@@ -177,13 +176,13 @@
ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
DirectoryHelper dir = new DirectoryHelper(webinf);
String appName = (contextName.startsWith("/")) ? contextName.substring(1) : contextName;
- MutablePortletApplication app = registry.getPortletApplicationByIdentifier(appName);
- if (app != null && app.getApplicationType() == MutablePortletApplication.LOCAL)
+ PortletApplication app = registry.getPortletApplicationByIdentifier(appName);
+ if (app != null && app.getApplicationType() == PortletApplication.LOCAL)
{
- app.setApplicationType(MutablePortletApplication.INTERNAL);
+ app.setApplicationType(PortletApplication.INTERNAL);
registry.updatePortletApplication(app);
}
- startPA(contextName, "/"+contextName, dir, contextClassLoader, MutablePortletApplication.INTERNAL);
+ startPA(contextName, "/"+contextName, dir, contextClassLoader, PortletApplication.INTERNAL);
// startInternal(contextName, warStruct, paClassLoader, true);
}
@@ -202,7 +201,7 @@
Thread.currentThread().setContextClassLoader(this.getClass().getClassLoader());
try
{
- startPA(contextName, contextPath, warStruct, paClassLoader, MutablePortletApplication.WEBAPP);
+ startPA(contextName, contextPath, warStruct, paClassLoader, PortletApplication.WEBAPP);
}
finally
{
@@ -214,7 +213,7 @@
public void stopLocalPortletApplication(String contextName)
throws RegistryException
{
- stopPA(contextName, MutablePortletApplication.LOCAL);
+ stopPA(contextName, PortletApplication.LOCAL);
}
public void stopPortletApplication(String contextName)
@@ -224,7 +223,7 @@
Thread.currentThread().setContextClassLoader(this.getClass().getClassLoader());
try
{
- stopPA(contextName, MutablePortletApplication.WEBAPP);
+ stopPA(contextName, PortletApplication.WEBAPP);
}
finally
{
@@ -239,7 +238,7 @@
Thread.currentThread().setContextClassLoader(this.getClass().getClassLoader());
try
{
- MutablePortletApplication pa = null;
+ PortletApplication pa = null;
try
{
@@ -297,8 +296,8 @@
}
}
- protected MutablePortletApplication registerPortletApplication(PortletApplicationWar paWar,
- MutablePortletApplication oldPA, int paType, ClassLoader paClassLoader)
+ protected PortletApplication registerPortletApplication(PortletApplicationWar paWar,
+ PortletApplication oldPA, int paType, ClassLoader paClassLoader)
throws RegistryException
{
if (oldPA != null)
@@ -307,7 +306,7 @@
oldPA = null;
}
- MutablePortletApplication pa = null;
+ PortletApplication pa = null;
boolean registered = false;
String paName = paWar.getPortletApplicationName();
@@ -322,11 +321,11 @@
MutableWebApplication wa = paWar.createWebApp();
paWar.validate();
- if (paType == MutablePortletApplication.LOCAL)
+ if (paType == PortletApplication.LOCAL)
{
wa.setContextRoot("<portal>");
}
- else if (paType == MutablePortletApplication.INTERNAL)
+ else if (paType == PortletApplication.INTERNAL)
{
// TODO: this is screwing up the PSML as its set all over the place to "jetspeed-layouts", not good
wa.setContextRoot("/" + paName);
@@ -349,7 +348,7 @@
Iterator peItr = portletEntites.iterator();
while(peItr.hasNext())
{
- PortletEntityCtrl portletEntity = (PortletEntityCtrl) peItr.next();
+ PortletEntity portletEntity = (PortletEntity) peItr.next();
portletEntity.setPortletDefinition(pd);
}
}
@@ -415,7 +414,7 @@
{
try
{
- unregisterPortletApplication(pa, (paType == MutablePortletApplication.LOCAL));
+ unregisterPortletApplication(pa, (paType == PortletApplication.LOCAL));
}
catch (Exception re)
{
@@ -486,7 +485,7 @@
}
// try to get the PA from database by context name
- MutablePortletApplication pa = registry.getPortletApplication(contextName);
+ PortletApplication pa = registry.getPortletApplication(contextName);
if (pa != null)
{
@@ -687,7 +686,7 @@
protected void stopPA(String contextName, int paType)
throws RegistryException
{
- MutablePortletApplication pa = null;
+ PortletApplication pa = null;
try
{
@@ -713,7 +712,7 @@
}
- protected void updateSearchEngine(boolean remove,MutablePortletApplication pa )
+ protected void updateSearchEngine(boolean remove,PortletApplication pa )
{
if (searchEngine != null)
{
@@ -732,7 +731,7 @@
}
}
- protected void unregisterPortletApplication(MutablePortletApplication pa,
+ protected void unregisterPortletApplication(PortletApplication pa,
boolean purgeEntityInfo)
throws RegistryException
{
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/VersionedPortletApplicationManager.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/VersionedPortletApplicationManager.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/VersionedPortletApplicationManager.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/VersionedPortletApplicationManager.java Thu Oct 16 11:18:59 2008
@@ -29,7 +29,7 @@
import org.apache.jetspeed.container.window.PortletWindowAccessor;
import org.apache.jetspeed.factory.PortletFactory;
import org.apache.jetspeed.om.common.LocalizedField;
-import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
+import org.apache.jetspeed.om.common.portlet.PortletApplication;
import org.apache.jetspeed.search.SearchEngine;
import org.apache.jetspeed.security.PermissionManager;
import org.apache.jetspeed.security.RoleManager;
@@ -112,8 +112,8 @@
//register = false;
}
- MutablePortletApplication regPA = registry.getPortletApplication(contextName);
- MutablePortletApplication newPA = paWar.createPortletApp();
+ PortletApplication regPA = registry.getPortletApplication(contextName);
+ PortletApplication newPA = paWar.createPortletApp();
if (regPA == null)
{
System.out.println("**** New portlet app found - registration required..." + contextName);
@@ -149,7 +149,7 @@
}
}
- protected String getVersion(MutablePortletApplication pa)
+ protected String getVersion(PortletApplication pa)
{
String version = "";
Collection versionList = pa.getMetadata().getFields("pa-version");
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/rules/JetspeedServiceRule.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/rules/JetspeedServiceRule.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/rules/JetspeedServiceRule.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/rules/JetspeedServiceRule.java Thu Oct 16 11:18:59 2008
@@ -18,7 +18,7 @@
import org.apache.commons.digester.Rule;
import org.apache.jetspeed.om.common.JetspeedServiceReference;
-import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
+import org.apache.jetspeed.om.common.portlet.PortletApplication;
/**
@@ -28,9 +28,9 @@
*/
public class JetspeedServiceRule extends Rule
{
- private MutablePortletApplication app;
+ private PortletApplication app;
- public JetspeedServiceRule(MutablePortletApplication app)
+ public JetspeedServiceRule(PortletApplication app)
{
this.app = app;
}
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/rules/JetspeedServicesRuleSet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/rules/JetspeedServicesRuleSet.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/rules/JetspeedServicesRuleSet.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/rules/JetspeedServicesRuleSet.java Thu Oct 16 11:18:59 2008
@@ -18,7 +18,7 @@
import org.apache.commons.digester.Digester;
import org.apache.commons.digester.RuleSetBase;
-import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
+import org.apache.jetspeed.om.common.portlet.PortletApplication;
import org.apache.jetspeed.om.impl.JetspeedServiceReferenceImpl;
/**
@@ -28,9 +28,9 @@
*/
public class JetspeedServicesRuleSet extends RuleSetBase
{
- private MutablePortletApplication app;
+ private PortletApplication app;
- public JetspeedServicesRuleSet(MutablePortletApplication app)
+ public JetspeedServicesRuleSet(PortletApplication app)
{
this.app = app;
}
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/rules/LocalizedFieldRule.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/rules/LocalizedFieldRule.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/rules/LocalizedFieldRule.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/rules/LocalizedFieldRule.java Thu Oct 16 11:18:59 2008
@@ -25,7 +25,7 @@
import org.apache.jetspeed.om.common.GenericMetadata;
import org.apache.jetspeed.om.common.LocalizedField;
-import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
+import org.apache.jetspeed.om.common.portlet.PortletApplication;
import org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite;
import org.xml.sax.Attributes;
@@ -61,9 +61,9 @@
return;
}
GenericMetadata metadata = null;
- if (obj instanceof MutablePortletApplication)
+ if (obj instanceof PortletApplication)
{
- metadata = ((MutablePortletApplication) obj).getMetadata();
+ metadata = ((PortletApplication) obj).getMetadata();
}
if (obj instanceof PortletDefinitionComposite)
{
@@ -123,9 +123,9 @@
return;
}
GenericMetadata metadata = null;
- if (obj instanceof MutablePortletApplication)
+ if (obj instanceof PortletApplication)
{
- metadata = ((MutablePortletApplication) obj).getMetadata();
+ metadata = ((PortletApplication) obj).getMetadata();
}
if (obj instanceof PortletDefinitionComposite)
{
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/rules/PortletRule.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/rules/PortletRule.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/rules/PortletRule.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/rules/PortletRule.java Thu Oct 16 11:18:59 2008
@@ -19,7 +19,7 @@
import org.apache.commons.digester.Rule;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
+import org.apache.jetspeed.om.common.portlet.PortletApplication;
import org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite;
/**
@@ -32,9 +32,9 @@
{
protected final static Log log = LogFactory.getLog(PortletRule.class);
- private MutablePortletApplication app;
+ private PortletApplication app;
- public PortletRule(MutablePortletApplication app)
+ public PortletRule(PortletApplication app)
{
this.app = app;
}
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/rules/SecurityConstraintRefRule.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/rules/SecurityConstraintRefRule.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/rules/SecurityConstraintRefRule.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/rules/SecurityConstraintRefRule.java Thu Oct 16 11:18:59 2008
@@ -17,7 +17,7 @@
package org.apache.jetspeed.tools.pamanager.rules;
import org.apache.commons.digester.Rule;
-import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
+import org.apache.jetspeed.om.common.portlet.PortletApplication;
import org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite;
/**
@@ -28,9 +28,9 @@
*/
public class SecurityConstraintRefRule extends Rule
{
- private MutablePortletApplication app = null;
+ private PortletApplication app = null;
- public SecurityConstraintRefRule(MutablePortletApplication app)
+ public SecurityConstraintRefRule(PortletApplication app)
{
this.app = app;
}
@@ -38,9 +38,9 @@
public void body(String namespace, String name, String text) throws Exception
{
Object obj = digester.peek();
- if (obj instanceof MutablePortletApplication)
+ if (obj instanceof PortletApplication)
{
- ((MutablePortletApplication) obj).setJetspeedSecurityConstraint(text);
+ ((PortletApplication) obj).setJetspeedSecurityConstraint(text);
}
else if (obj instanceof PortletDefinitionComposite)
{
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/rules/UserAttributeRefRule.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/rules/UserAttributeRefRule.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/rules/UserAttributeRefRule.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/rules/UserAttributeRefRule.java Thu Oct 16 11:18:59 2008
@@ -22,7 +22,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.jetspeed.om.common.UserAttributeRef;
-import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
+import org.apache.jetspeed.om.common.portlet.PortletApplication;
/**
* This class helps load the jetspeed portlet extension user attributes.
@@ -33,9 +33,9 @@
{
protected final static Log log = LogFactory.getLog(UserAttributeRefRule.class);
- private MutablePortletApplication app;
+ private PortletApplication app;
- public UserAttributeRefRule(MutablePortletApplication app)
+ public UserAttributeRefRule(PortletApplication app)
{
this.app = app;
}
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/rules/UserAttributeRefRuleSet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/rules/UserAttributeRefRuleSet.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/rules/UserAttributeRefRuleSet.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/rules/UserAttributeRefRuleSet.java Thu Oct 16 11:18:59 2008
@@ -22,7 +22,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
+import org.apache.jetspeed.om.common.portlet.PortletApplication;
import org.apache.jetspeed.om.impl.UserAttributeRefImpl;
/**
@@ -34,9 +34,9 @@
{
protected final static Log log = LogFactory.getLog(UserAttributeRefRuleSet.class);
- private MutablePortletApplication app;
+ private PortletApplication app;
- public UserAttributeRefRuleSet(MutablePortletApplication app)
+ public UserAttributeRefRuleSet(PortletApplication app)
{
this.app = app;
}
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/registration/RegistrationTool.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/registration/RegistrationTool.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/registration/RegistrationTool.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/registration/RegistrationTool.java Thu Oct 16 11:18:59 2008
@@ -22,7 +22,7 @@
import org.apache.commons.configuration.PropertiesConfiguration;
import org.apache.jetspeed.components.SpringComponentManager;
import org.apache.jetspeed.components.portletregistry.PortletRegistry;
-import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
+import org.apache.jetspeed.om.common.portlet.PortletApplication;
import org.apache.jetspeed.om.common.portlet.PortletApplication;
import org.apache.jetspeed.om.common.servlet.MutableWebApplication;
import org.apache.jetspeed.util.descriptor.ExtendedPortletMetadata;
@@ -109,7 +109,7 @@
WebApplicationDescriptor wad = new WebApplicationDescriptor(new FileReader(webappDescriptor), "/" + appName);
MutableWebApplication webapp = wad.createWebApplication();
PortletApplicationDescriptor pad = new PortletApplicationDescriptor(new FileReader(appDescriptor), appName);
- MutablePortletApplication app = pad.createPortletApplication();
+ PortletApplication app = pad.createPortletApplication();
app.setWebApplicationDefinition(webapp);
ExtendedPortletMetadata extMetaData = new ExtendedPortletMetadata(new FileReader(extendedDescriptor), app);
extMetaData.load();
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/userinfo/impl/AbstractUserInfoManagerImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/userinfo/impl/AbstractUserInfoManagerImpl.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/userinfo/impl/AbstractUserInfoManagerImpl.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/userinfo/impl/AbstractUserInfoManagerImpl.java Thu Oct 16 11:18:59 2008
@@ -69,10 +69,10 @@
UserAttributeRef currentAttributeRef = (UserAttributeRef) attrRefsIter.next();
if (null != currentAttributeRef)
{
- if ((currentAttribute.getName()).equals(currentAttributeRef.getNameLink()))
+ if ((currentAttribute.getPortletName()).equals(currentAttributeRef.getNameLink()))
{
if (log.isDebugEnabled())
- log.debug("Linking user attribute ref: [[name, " + currentAttribute.getName()
+ log.debug("Linking user attribute ref: [[name, " + currentAttribute.getPortletName()
+ "], [linked name, " + currentAttributeRef.getName() + "]]");
linkedUserAttributes.add(currentAttributeRef);
linkedAttribute = true;
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/userinfo/impl/MultiSourceUserInfoManagerImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/userinfo/impl/MultiSourceUserInfoManagerImpl.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/userinfo/impl/MultiSourceUserInfoManagerImpl.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/userinfo/impl/MultiSourceUserInfoManagerImpl.java Thu Oct 16 11:18:59 2008
@@ -28,13 +28,13 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.jetspeed.components.portletregistry.PortletRegistry;
-import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
+import org.apache.jetspeed.om.common.portlet.PortletApplication;
import org.apache.jetspeed.request.RequestContext;
import org.apache.jetspeed.userinfo.UserAttributeRetrievalException;
import org.apache.jetspeed.userinfo.UserAttributeSource;
import org.apache.jetspeed.userinfo.UserInfoManager;
import org.apache.jetspeed.userinfo.impl.AbstractUserInfoManagerImpl;
-import org.apache.pluto.om.common.ObjectID;
+import org.apache.pluto.om.portlet.ObjectID;
/**
* Multisource User Information manager
@@ -69,7 +69,7 @@
{
Map userInfoMap = new HashMap();
Subject subject = context.getSubject();
- MutablePortletApplication pa = portletRegistry
+ PortletApplication pa = portletRegistry
.getPortletApplication(oid);
//System.out.println("*** PA = " + pa);
if (null == pa)
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/userinfo/impl/UserInfoManagerImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/userinfo/impl/UserInfoManagerImpl.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/userinfo/impl/UserInfoManagerImpl.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/userinfo/impl/UserInfoManagerImpl.java Thu Oct 16 11:18:59 2008
@@ -30,14 +30,14 @@
import org.apache.commons.logging.LogFactory;
import org.apache.jetspeed.components.portletregistry.PortletRegistry;
import org.apache.jetspeed.om.common.UserAttributeRef;
-import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
+import org.apache.jetspeed.om.common.portlet.PortletApplication;
import org.apache.jetspeed.request.RequestContext;
import org.apache.jetspeed.security.SecurityException;
import org.apache.jetspeed.security.SubjectHelper;
import org.apache.jetspeed.security.User;
import org.apache.jetspeed.security.UserManager;
import org.apache.jetspeed.userinfo.UserInfoManager;
-import org.apache.pluto.om.common.ObjectID;
+import org.apache.pluto.om.portlet.ObjectID;
/**
* <p>
@@ -123,7 +123,7 @@
return null;
}
- MutablePortletApplication pa = registry.getPortletApplication(oid);
+ PortletApplication pa = registry.getPortletApplication(oid);
if (null == pa)
{
log.debug(PortletRequest.USER_INFO + " is set to null");
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/util/descriptor/ExtendedPortletMetadata.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/util/descriptor/ExtendedPortletMetadata.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/util/descriptor/ExtendedPortletMetadata.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/util/descriptor/ExtendedPortletMetadata.java Thu Oct 16 11:18:59 2008
@@ -27,7 +27,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.jetspeed.om.common.portlet.CustomPortletMode;
import org.apache.jetspeed.om.common.portlet.CustomWindowState;
-import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
+import org.apache.jetspeed.om.common.portlet.PortletApplication;
import org.apache.jetspeed.om.portlet.impl.CustomPortletModeImpl;
import org.apache.jetspeed.om.portlet.impl.CustomWindowStateImpl;
import org.apache.jetspeed.om.portlet.impl.PortletApplicationDefinitionImpl;
@@ -72,14 +72,14 @@
protected final static Log log = LogFactory.getLog(ExtendedPortletMetadata.class);
protected Reader extendedMetaData;
- protected MutablePortletApplication portletApp;
+ protected PortletApplication portletApp;
/**
*
* @param extendedMetaData Reader that contains the extended metadata, usually jetspeed-portlet.xml
- * @param portletApp the MutablePortletApplication we are adding the extended metadata to.
+ * @param portletApp the PortletApplication we are adding the extended metadata to.
*/
- public ExtendedPortletMetadata( Reader extendedMetaData, MutablePortletApplication portletApp )
+ public ExtendedPortletMetadata( Reader extendedMetaData, PortletApplication portletApp )
{
this.extendedMetaData = extendedMetaData;
this.portletApp = portletApp;
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/util/descriptor/PortletApplicationDescriptor.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/util/descriptor/PortletApplicationDescriptor.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/util/descriptor/PortletApplicationDescriptor.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/util/descriptor/PortletApplicationDescriptor.java Thu Oct 16 11:18:59 2008
@@ -24,7 +24,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.jetspeed.om.common.Support;
-import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
+import org.apache.jetspeed.om.common.portlet.PortletApplication;
import org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite;
import org.apache.jetspeed.om.impl.LanguageImpl;
import org.apache.jetspeed.om.impl.ParameterDescriptionImpl;
@@ -39,9 +39,9 @@
import org.apache.jetspeed.om.portlet.impl.CustomWindowStateImpl;
import org.apache.jetspeed.om.portlet.impl.PortletApplicationDefinitionImpl;
import org.apache.jetspeed.tools.pamanager.PortletApplicationException;
-import org.apache.pluto.om.common.SecurityRoleRef;
-import org.apache.pluto.om.common.SecurityRoleRefSet;
-import org.apache.pluto.om.common.SecurityRoleSet;
+import org.apache.pluto.om.portlet.SecurityRoleRef;
+import org.apache.pluto.om.portlet.SecurityRoleRefSet;
+import org.apache.pluto.om.portlet.SecurityRoleSet;
import org.apache.pluto.om.portlet.PortletDefinition;
/**
@@ -68,7 +68,7 @@
this.appName = appName;
}
- public MutablePortletApplication createPortletApplication()
+ public PortletApplication createPortletApplication()
throws PortletApplicationException
{
return createPortletApplication(this.getClass().getClassLoader());
@@ -76,12 +76,12 @@
/**
* Maps the content of the portlet application descriptor into
- * a new <code>MutablePortletApplication object</code>
+ * a new <code>PortletApplication object</code>
*
- * @return MutablePortletApplication newly created MutablePortletApplication with
+ * @return PortletApplication newly created PortletApplication with
* all values of the portlet application descriptor mapped into it.
*/
- public MutablePortletApplication createPortletApplication(ClassLoader classLoader)
+ public PortletApplication createPortletApplication(ClassLoader classLoader)
throws PortletApplicationException
{
try
@@ -188,7 +188,7 @@
PortletDefinitionComposite portletDef = (PortletDefinitionComposite) obj;
if(portletDef.getPortletIdentifier() == null)
{
- portletDef.setPortletIdentifier(portletDef.getName());
+ portletDef.setPortletIdentifier(portletDef.getPortletName());
}
((Support)obj).postLoad(classLoader);
@@ -222,7 +222,7 @@
* The PortletApplicationDefinition to validate
* @throws PortletApplicationException
*/
- public void validate(MutablePortletApplication app)
+ public void validate(PortletApplication app)
throws PortletApplicationException
{
SecurityRoleSet roles = app.getWebApplicationDefinition()
@@ -248,7 +248,7 @@
if (roles.get(roleName) == null)
{
String errorMsg = "Undefined security role " + roleName
- + " referenced from portlet " + portlet.getName();
+ + " referenced from portlet " + portlet.getPortletName();
log.error(errorMsg);
throw new PortletApplicationException(errorMsg);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org