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 [5/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/jetspeed-api/src/main/java/org/apache/jetspeed/components/portletregistry/RegistryEventListener.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/components/portletregistry/RegistryEventListener.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/components/portletregistry/RegistryEventListener.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/components/portletregistry/RegistryEventListener.java Thu Oct 16 11:18:59 2008
@@ -16,7 +16,7 @@
*/
package org.apache.jetspeed.components.portletregistry;
-import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
+import org.apache.jetspeed.om.common.portlet.PortletApplication;
import org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite;
/**
@@ -33,9 +33,9 @@
* updated by the registry or when the
* state modification is otherwise detected
*
- * @param MutablePortletApplicaiton new managed application
+ * @param PortletApplicaiton new managed application
*/
- void applicationUpdated(MutablePortletApplication app);
+ void applicationUpdated(PortletApplication app);
/**
* portletUpdated - invoked when the definition of a portlet definition is
@@ -50,9 +50,9 @@
* applicationRemoved - invoked when the definition of a portlet application is
* removed by the registry
*
- * @param MutablePortletApplicaiton removed portlet application
+ * @param PortletApplicaiton removed portlet application
*/
- void applicationRemoved(MutablePortletApplication app);
+ void applicationRemoved(PortletApplication app);
/**
* portletUpdated - invoked when the definition of a portlet definition is
Added: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/container/PortletEntity.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/container/PortletEntity.java?rev=705312&view=auto
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/container/PortletEntity.java (added)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/container/PortletEntity.java Thu Oct 16 11:18:59 2008
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jetspeed.container;
+
+import org.apache.jetspeed.om.page.Fragment;
+import org.apache.pluto.om.portlet.PortletDefinition;
+
+/**
+ * @version $Id$
+ *
+ */
+public interface PortletEntity extends org.apache.pluto.PortletEntity
+{
+ Long getOid();
+ String getId();
+ void setId(String id);
+
+ // TODO: temporary replacement for old api PortletWindowList - this should be removed too shortly
+ void setPortletWindow(PortletWindow window);
+
+ void setPortletDefinition(PortletDefinition portletDefinition);
+
+ String getPortletUniqueName();
+
+ // TODO: Moved from MutablePortletEntity - do we really still need this?
+ void setFragment(Fragment fragment);
+
+
+ // TODO: Moved from MutablePortletEntity - do we really still need this?
+ /**
+ * <p>
+ * Persistence callback to allow a PortletEntity instance to persist children
+ * objects (like portlet preferences) <em>within</em> the same transaction.
+ * </p>
+ * <p>
+ * This method must be called <em>always</em> from the #store() method. Using a callback from
+ * the persistence manager might not be reliable when the PortletEntity <em>itself</em>
+ * isn't changed but children might.
+ * </p>
+ * <p>
+ * Notably condition when this might happen is the Pluto 1.0.1 preferences handling calling
+ * the portletEntity store() method
+ * */
+ void storeChildren();
+}
Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/container/PortletEntity.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/container/PortletEntity.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/container/PortletEntity.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/container/PortletWindow.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/container/PortletWindow.java?rev=705312&view=auto
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/container/PortletWindow.java (added)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/container/PortletWindow.java Thu Oct 16 11:18:59 2008
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jetspeed.container;
+
+import javax.portlet.PortletMode;
+import javax.portlet.WindowState;
+
+/**
+ * @version $Id$
+ *
+ */
+public interface PortletWindow extends org.apache.pluto.PortletWindow
+{
+ void setId(String id);
+ PortletEntity getPortletEntity();
+ void setPortletEntity(PortletEntity entity);
+ void setPortletMode(PortletMode mode);
+ void setWindowState(WindowState state);
+}
Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/container/PortletWindow.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/container/PortletWindow.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/container/PortletWindow.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/container/state/MutableNavigationalState.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/container/state/MutableNavigationalState.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/container/state/MutableNavigationalState.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/container/state/MutableNavigationalState.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;
/**
* MutableNavigationalState
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/container/state/NavigationalState.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/container/state/NavigationalState.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/container/state/NavigationalState.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/container/state/NavigationalState.java Thu Oct 16 11:18:59 2008
@@ -24,7 +24,7 @@
import javax.portlet.WindowState;
import org.apache.jetspeed.request.RequestContext;
-import org.apache.pluto.om.window.PortletWindow;
+import org.apache.jetspeed.container.PortletWindow;
/**
* NavigationalState gives readonly access to the state of the Portal URL and all navigational state context
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/container/url/PortalURL.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/container/url/PortalURL.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/container/url/PortalURL.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/container/url/PortalURL.java Thu Oct 16 11:18:59 2008
@@ -23,7 +23,7 @@
import javax.servlet.http.HttpServletRequest;
import org.apache.jetspeed.container.state.NavigationalState;
-import org.apache.pluto.om.window.PortletWindow;
+import org.apache.jetspeed.container.PortletWindow;
/**
* <p>
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/container/window/PortletWindowAccessor.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/container/window/PortletWindowAccessor.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/container/window/PortletWindowAccessor.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/container/window/PortletWindowAccessor.java Thu Oct 16 11:18:59 2008
@@ -20,8 +20,8 @@
import org.apache.jetspeed.components.portletentity.PortletEntityNotStoredException;
import org.apache.jetspeed.om.page.ContentFragment;
-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;
/**
* Portlet Window Accessor
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/layout/JetspeedPowerTool.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/layout/JetspeedPowerTool.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/layout/JetspeedPowerTool.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/layout/JetspeedPowerTool.java Thu Oct 16 11:18:59 2008
@@ -27,7 +27,7 @@
import org.apache.jetspeed.locator.TemplateLocatorException;
import org.apache.jetspeed.om.page.ContentFragment;
import org.apache.jetspeed.om.page.Page;
-import org.apache.pluto.om.entity.PortletEntity;
+import org.apache.jetspeed.container.PortletEntity;
/**
* JetspeedPowerTool
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/mockobjects/request/MockRequestContext.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/mockobjects/request/MockRequestContext.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/mockobjects/request/MockRequestContext.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/mockobjects/request/MockRequestContext.java Thu Oct 16 11:18:59 2008
@@ -35,10 +35,10 @@
import org.apache.jetspeed.pipeline.Pipeline;
import org.apache.jetspeed.profiler.Profiler;
import org.apache.jetspeed.request.RequestContext;
-import org.apache.pluto.om.common.Language;
-import org.apache.pluto.om.common.ObjectID;
+import org.apache.pluto.om.portlet.Language;
+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;
@@ -243,7 +243,7 @@
/*
* (non-Javadoc)
*
- * @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)
*/
public HttpServletRequest getRequestForWindow( PortletWindow window )
{
@@ -265,7 +265,7 @@
/*
* (non-Javadoc)
*
- * @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)
*/
public HttpServletResponse getResponseForWindow( PortletWindow window )
{
@@ -291,7 +291,7 @@
/*
* (non-Javadoc)
*
- * @see org.apache.jetspeed.request.RequestContext#setActionWindow(org.apache.pluto.om.window.PortletWindow)
+ * @see org.apache.jetspeed.request.RequestContext#setActionWindow(org.apache.jetspeed.container.PortletWindow)
*/
public void setActionWindow( PortletWindow window )
{
@@ -500,7 +500,7 @@
/* (non-Javadoc)
- * @see org.apache.jetspeed.request.RequestContext#popActionFailure(org.apache.pluto.om.window.PortletWindow)
+ * @see org.apache.jetspeed.request.RequestContext#popActionFailure(org.apache.jetspeed.container.PortletWindow)
*/
public Throwable popActionFailure(PortletWindow window)
{
@@ -508,7 +508,7 @@
return null;
}
/* (non-Javadoc)
- * @see org.apache.jetspeed.request.RequestContext#setActionFailure(org.apache.pluto.om.window.PortletWindow, java.lang.Throwable)
+ * @see org.apache.jetspeed.request.RequestContext#setActionFailure(org.apache.jetspeed.container.PortletWindow, java.lang.Throwable)
*/
public void setActionFailure(PortletWindow window, Throwable actionFailure)
{
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/common/LocalizedField.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/common/LocalizedField.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/common/LocalizedField.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/common/LocalizedField.java Thu Oct 16 11:18:59 2008
@@ -18,7 +18,7 @@
import java.util.Locale;
-import org.apache.pluto.om.common.ObjectID;
+import org.apache.pluto.om.portlet.ObjectID;
/**
* LocalizedField
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/common/MutableDescription.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/common/MutableDescription.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/common/MutableDescription.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/common/MutableDescription.java Thu Oct 16 11:18:59 2008
@@ -18,7 +18,7 @@
import java.util.Locale;
-import org.apache.pluto.om.common.Description;
+import org.apache.pluto.om.portlet.Description;
/**
* MutableDescription
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/common/MutableDescriptionSet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/common/MutableDescriptionSet.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/common/MutableDescriptionSet.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/common/MutableDescriptionSet.java Thu Oct 16 11:18:59 2008
@@ -18,8 +18,8 @@
-import org.apache.pluto.om.common.Description;
-import org.apache.pluto.om.common.DescriptionSet;
+import org.apache.pluto.om.portlet.Description;
+import org.apache.pluto.om.portlet.DescriptionSet;
/**
* MutableDescriptionSet
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/common/MutableDisplayName.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/common/MutableDisplayName.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/common/MutableDisplayName.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/common/MutableDisplayName.java Thu Oct 16 11:18:59 2008
@@ -18,7 +18,7 @@
import java.util.Locale;
-import org.apache.pluto.om.common.DisplayName;
+import org.apache.pluto.om.portlet.DisplayName;
/**
* MutableDisplayName
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/common/MutableDisplayNameSet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/common/MutableDisplayNameSet.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/common/MutableDisplayNameSet.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/common/MutableDisplayNameSet.java Thu Oct 16 11:18:59 2008
@@ -16,8 +16,8 @@
*/
package org.apache.jetspeed.om.common;
-import org.apache.pluto.om.common.DisplayName;
-import org.apache.pluto.om.common.DisplayNameSet;
+import org.apache.pluto.om.portlet.DisplayName;
+import org.apache.pluto.om.portlet.DisplayNameSet;
/**
* MutableDisplayNameSet
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/common/MutableLanguage.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/common/MutableLanguage.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/common/MutableLanguage.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/common/MutableLanguage.java Thu Oct 16 11:18:59 2008
@@ -20,7 +20,7 @@
import java.util.Collection;
import java.util.Locale;
-import org.apache.pluto.om.common.Language;
+import org.apache.pluto.om.portlet.Language;
/**
*
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/common/ParameterComposite.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/common/ParameterComposite.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/common/ParameterComposite.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/common/ParameterComposite.java Thu Oct 16 11:18:59 2008
@@ -19,9 +19,9 @@
import java.io.Serializable;
import java.util.Locale;
-import org.apache.pluto.om.common.DescriptionSet;
-import org.apache.pluto.om.common.Parameter;
-import org.apache.pluto.om.common.ParameterCtrl;
+import org.apache.pluto.om.portlet.DescriptionSet;
+import org.apache.pluto.om.portlet.Parameter;
+import org.apache.pluto.om.portlet.ParameterCtrl;
/**
*
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/common/SecurityRoleRefComposite.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/common/SecurityRoleRefComposite.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/common/SecurityRoleRefComposite.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/common/SecurityRoleRefComposite.java Thu Oct 16 11:18:59 2008
@@ -19,10 +19,10 @@
import java.io.Serializable;
import java.util.Locale;
-import org.apache.pluto.om.common.Description;
-import org.apache.pluto.om.common.DescriptionSet;
-import org.apache.pluto.om.common.SecurityRoleRef;
-import org.apache.pluto.om.common.SecurityRoleRefCtrl;
+import org.apache.pluto.om.portlet.Description;
+import org.apache.pluto.om.portlet.DescriptionSet;
+import org.apache.pluto.om.portlet.SecurityRoleRef;
+import org.apache.pluto.om.portlet.SecurityRoleRefCtrl;
/**
*
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/common/UserAttributeRef.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/common/UserAttributeRef.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/common/UserAttributeRef.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/common/UserAttributeRef.java Thu Oct 16 11:18:59 2008
@@ -18,6 +18,9 @@
import java.io.Serializable;
+import org.apache.pluto.om.ElementFactoryList;
+import org.apache.pluto.om.portlet.Description;
+
/**
* <p>Interface allowing mapping of user attributes between the portal implementation
* and the portlet attribute definition according to the Portlet specs (PLT.17.2 Accessing
@@ -41,10 +44,5 @@
/** Setter for the user-attribute-ref name-link. */
void setNameLink(String nameLink);
- /** Getter for the user-attribute description. */
- String getDescription();
-
- /** Setter for the user-attribute description. */
- void setDescription(String description);
-
+ ElementFactoryList<Description> getDescriptions();
}
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/common/portlet/PortletApplication.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/common/portlet/PortletApplication.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/common/portlet/PortletApplication.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/common/portlet/PortletApplication.java Thu Oct 16 11:18:59 2008
@@ -16,12 +16,15 @@
*/
package org.apache.jetspeed.om.common.portlet;
-import java.util.Collection;
+import java.util.List;
import javax.portlet.PortletMode;
import javax.portlet.WindowState;
import org.apache.jetspeed.om.common.GenericMetadata;
+import org.apache.jetspeed.om.common.JetspeedServiceReference;
+import org.apache.jetspeed.om.common.UserAttributeRef;
+import org.apache.jetspeed.om.servlet.WebApplicationDefinition;
import org.apache.pluto.om.portlet.PortletApplicationDefinition;
import org.apache.pluto.om.portlet.PortletDefinition;
@@ -39,6 +42,20 @@
public interface PortletApplication extends PortletApplicationDefinition
{
/**
+ * The checksum on the portlet XML from the last deployment
+ *
+ * @param checksum
+ */
+ void setChecksum(long checksum);
+
+ /**
+ * The checksum on the portlet XML from the last deployment
+ *
+ * @return
+ */
+ long getChecksum();
+
+ /**
* Returns the metadata from the extended jetspeed-portlet.xml
*
* @return Jetspeed specific metadata
@@ -46,18 +63,14 @@
public GenericMetadata getMetadata();
/**
- * Gets the name of the Portlet Application.
+ * Returns the corresponding web application to this portlet application.
+ * The return value cannot be NULL.
*
- * @return Name of the application
+ * @return a web application
*/
- String getName();
+ public WebApplicationDefinition getWebApplicationDefinition();
/**
- * @return
- */
- Collection getPortletDefinitions();
-
- /**
* Finds a portlet by portlet name, searching this portlet application's collection.
*
* @param name The portlet name.
@@ -69,52 +82,67 @@
* <p>Gets the collection of user attribute refs associated
* with this portlet application.</p>
*/
- Collection getUserAttributeRefs();
+ List<UserAttributeRef> getUserAttributeRefs();
+
+ String getApplicationIdentifier();
+ void setApplicationIdentifier(String identifier);
+
+ String getDescription();
+ void setDescription(String description);
/**
- * <p>Gets the collection of user attributes associated
- * with this portlet application.</p>
+ * Marks this application as a standard web application,
+ * stored in the web application server's web application space.
*/
- Collection getUserAttributes();
-
- String getApplicationIdentifier();
+ int WEBAPP = 0;
/**
- * @return
+ * Marks this application as a LOCAL portlet application,
+ * stored in Jetspeed managed portlet application space.
*/
- String getDescription();
+ int LOCAL = 1;
/**
* Gets the Portlet Application type.
* Valid values are:
* <p>
- * {@link MutablePortletApplication#WEBAPP} - A standard web application, stored in the web application
+ * {@link PortletApplication#WEBAPP} - A standard web application, stored in the web application
* server's web application space.
* <p>
- * {@link MutablePortletApplication#LOCAL} - A local portlet application stored within Jetspeed's web application.
+ * {@link PortletApplication#LOCAL} - A local portlet application stored within Jetspeed's web application.
* <p>
* @return The type of portlet application.
*/
int getApplicationType();
-
+
+ /**
+ * Sets the Portlet Application type.
+ * Valid values are:
+ * <p>
+ * {@link PortletApplication#WEBAPP} - A standard web application, stored in the web application
+ * server's web application space.
+ * <p>
+ * {@link PortletApplication#LOCAL} - A local portlet application stored within Jetspeed's web application.
+ * <p>
+ * @param type The type of portlet application.
+ */
+ void setApplicationType(int type);
+
/**
* Gets a collection of all Jetspeed Services allowed for this application.
*
* @see org.apache.jetspeed.om.common.JetspeedServiceReference
* @return The collection of services of type <code>JetspeedServiceReference</code>.
*/
- Collection getJetspeedServices();
-
- Collection getCustomPortletModes();
- Collection getCustomWindowStates();
+ List<JetspeedServiceReference> getJetspeedServices();
PortletMode getMappedPortletMode(PortletMode mode);
WindowState getMappedWindowState(WindowState state);
PortletMode getCustomPortletMode(PortletMode mode);
WindowState getCustomWindowState(WindowState state);
- Collection getSupportedPortletModes();
- Collection getSupportedWindowStates();
+ List<PortletMode> getSupportedPortletModes();
+ List<WindowState> getSupportedWindowStates();
/**
* <p>
@@ -136,6 +164,23 @@
String getJetspeedSecurityConstraint();
/**
+ * <p>
+ * Set the Jetspeed Security Constraint reference for this portlet application.
+ * This security constraint name references a Jetspeed-specific Security Constraint.
+ * Security Constraints are not Java Security Permissions, but a
+ * Jetspeed specific way of securing portlets, also known as PSML constraints.
+ * See the <i>page.security</i> file for examples of defining security constraint definitions.
+ * If the portlet application does not define a constraint, then no security constraints
+ * will be applied to this portlet. Security constraints for a portlet are normally
+ * checking during the render process of a portlet.
+ * </p>
+ *
+ * @param constraint The name of the Security Definition defined in
+ * the Jetspeed Security Constraints
+ */
+ void setJetspeedSecurityConstraint(String constraint);
+
+ /**
* Returns true if the portlet application is a layout application
* Layouts are not "general" portlets, but instead used to group together
* other layouts and portlet fragments
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/common/portlet/PortletDefinitionComposite.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/common/portlet/PortletDefinitionComposite.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/common/portlet/PortletDefinitionComposite.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/common/portlet/PortletDefinitionComposite.java Thu Oct 16 11:18:59 2008
@@ -23,21 +23,20 @@
import org.apache.jetspeed.om.common.GenericMetadata;
import org.apache.jetspeed.om.common.ParameterComposite;
import org.apache.jetspeed.om.common.preference.PreferenceComposite;
-import org.apache.pluto.om.common.DescriptionSet;
-import org.apache.pluto.om.common.DisplayName;
-import org.apache.pluto.om.common.DisplayNameSet;
-import org.apache.pluto.om.common.Language;
-import org.apache.pluto.om.common.LanguageSet;
-import org.apache.pluto.om.common.ParameterSet;
-import org.apache.pluto.om.common.Preference;
-import org.apache.pluto.om.common.PreferenceSet;
-import org.apache.pluto.om.common.SecurityRoleRef;
-import org.apache.pluto.om.common.SecurityRoleRefSet;
+import org.apache.pluto.om.portlet.DescriptionSet;
+import org.apache.pluto.om.portlet.Language;
+import org.apache.pluto.om.portlet.LanguageSet;
+import org.apache.pluto.om.portlet.ParameterSet;
+import org.apache.pluto.om.portlet.Preference;
+import org.apache.pluto.om.portlet.PreferenceSet;
import org.apache.pluto.om.portlet.ContentType;
import org.apache.pluto.om.portlet.ContentTypeSet;
+import org.apache.pluto.om.portlet.DisplayName;
+import org.apache.pluto.om.portlet.DisplayNameSet;
import org.apache.pluto.om.portlet.PortletApplicationDefinition;
import org.apache.pluto.om.portlet.PortletDefinition;
-import org.apache.pluto.om.portlet.PortletDefinitionCtrl;
+import org.apache.pluto.om.portlet.SecurityRoleRef;
+import org.apache.pluto.om.portlet.SecurityRoleRefSet;
/**
*
@@ -47,7 +46,7 @@
* @version $Id$
*
*/
-public interface PortletDefinitionComposite extends PortletDefinition, PortletDefinitionCtrl, Serializable
+public interface PortletDefinitionComposite extends PortletDefinition, Serializable
{
GenericMetadata getMetadata();
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/common/preference/PreferenceComposite.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/common/preference/PreferenceComposite.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/common/preference/PreferenceComposite.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/common/preference/PreferenceComposite.java Thu Oct 16 11:18:59 2008
@@ -22,9 +22,9 @@
import java.util.List;
import java.util.Locale;
-import org.apache.pluto.om.common.Description;
-import org.apache.pluto.om.common.Preference;
-import org.apache.pluto.om.common.PreferenceCtrl;
+import org.apache.pluto.om.portlet.Preference;
+import org.apache.pluto.om.portlet.PreferenceCtrl;
+import org.apache.pluto.om.portlet.Description;
/**
*
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/common/preference/PreferenceSetComposite.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/common/preference/PreferenceSetComposite.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/common/preference/PreferenceSetComposite.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/common/preference/PreferenceSetComposite.java Thu Oct 16 11:18:59 2008
@@ -18,8 +18,8 @@
import java.util.Set;
-import org.apache.pluto.om.common.PreferenceSet;
-import org.apache.pluto.om.common.PreferenceSetCtrl;
+import org.apache.pluto.om.portlet.PreferenceSet;
+import org.apache.pluto.om.portlet.PreferenceSetCtrl;
/**
* <p>
Added: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/servlet/WebApplicationDefinition.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/servlet/WebApplicationDefinition.java?rev=705312&view=auto
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/servlet/WebApplicationDefinition.java (added)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/servlet/WebApplicationDefinition.java Thu Oct 16 11:18:59 2008
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jetspeed.om.servlet;
+
+import java.util.List;
+
+/**
+ * @version $Id$
+ *
+ */
+public interface WebApplicationDefinition
+{
+ String getId();
+ void setId(String id);
+
+ String getDisplayName();
+ void setDisplayName(String displayName);
+
+ String getDescription();
+ void setDescription(String description);
+
+ List<String> getRoles();
+
+ String getContextRoot();
+ void setContextRoot(String contextRoot);
+}
Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/servlet/WebApplicationDefinition.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/servlet/WebApplicationDefinition.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/servlet/WebApplicationDefinition.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/request/RequestContext.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/request/RequestContext.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/request/RequestContext.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/request/RequestContext.java Thu Oct 16 11:18:59 2008
@@ -32,10 +32,10 @@
import org.apache.jetspeed.om.page.ContentPage;
import org.apache.jetspeed.pipeline.Pipeline;
import org.apache.jetspeed.profiler.Profiler;
-import org.apache.pluto.om.common.Language;
-import org.apache.pluto.om.common.ObjectID;
+import org.apache.pluto.om.portlet.Language;
+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;
/**
* Portal Request Context is associated with each request
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/userinfo/UserInfoManager.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/userinfo/UserInfoManager.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/userinfo/UserInfoManager.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/userinfo/UserInfoManager.java Thu Oct 16 11:18:59 2008
@@ -20,7 +20,7 @@
import org.apache.jetspeed.request.RequestContext;
-import org.apache.pluto.om.common.ObjectID;
+import org.apache.pluto.om.portlet.ObjectID;
/**
* <p>The {@link UserInfoManager} retrieve the Map that will be set as a
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/container/ContainerRequest.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/container/ContainerRequest.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/container/ContainerRequest.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/container/ContainerRequest.java Thu Oct 16 11:18:59 2008
@@ -20,7 +20,7 @@
import javax.servlet.http.HttpServletRequestWrapper;
import javax.portlet.PortletRequest;
-import org.apache.pluto.om.portlet.PortletDefinition;
+import org.apache.pluto.om.portlet.Portlet;
/**
* The container request wrappers the servlet request and is used
@@ -31,17 +31,17 @@
*/
public class ContainerRequest extends HttpServletRequestWrapper
{
- protected PortletDefinition portletDef;
+ protected Portlet portletDef;
protected PortletRequest portletRequest;
public ContainerRequest(HttpServletRequest httpRequest,
- PortletDefinition portletDef)
+ Portlet portletDef)
{
super(httpRequest);
this.portletDef = portletDef;
}
- public PortletDefinition getPortletDefinition()
+ public Portlet getPortletDefinition()
{
return this.portletDef;
}
@@ -55,6 +55,5 @@
{
this.portletRequest = portletRequest;
}
-
}
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/container/ContainerResponse.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/container/ContainerResponse.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/container/ContainerResponse.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/container/ContainerResponse.java Thu Oct 16 11:18:59 2008
@@ -21,7 +21,7 @@
import javax.portlet.RenderResponse;
import javax.portlet.ActionResponse;
-import org.apache.pluto.om.portlet.PortletDefinition;
+import org.apache.pluto.om.portlet.Portlet;
/**
* The container response wrappers the servlet response and is used
@@ -34,16 +34,16 @@
{
RenderResponse renderResponse;
ActionResponse actionResponse;
- PortletDefinition portletDef;
+ Portlet portletDef;
public ContainerResponse(HttpServletResponse response,
- PortletDefinition portletDef)
+ Portlet portletDef)
{
super(response);
this.portletDef = portletDef;
}
- public PortletDefinition getPortletDefinition()
+ public Portlet getPortletDefinition()
{
return this.portletDef;
}
@@ -67,5 +67,4 @@
{
this.actionResponse = actionResponse;
}
-
}
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/container/InternalPortletConfig.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/container/InternalPortletConfig.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/container/InternalPortletConfig.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/container/InternalPortletConfig.java Thu Oct 16 11:18:59 2008
@@ -16,7 +16,7 @@
*/
package org.apache.jetspeed.container;
-import org.apache.pluto.om.portlet.PortletDefinition;
+import org.apache.pluto.om.portlet.Portlet;
/**
* This interface defines the internal methods used on the Portlet Config.
@@ -27,6 +27,6 @@
*/
public interface InternalPortletConfig
{
- PortletDefinition getPortletDefinition();
- void setPortletDefinition(PortletDefinition pd);
+ Portlet getPortletDefinition();
+ void setPortletDefinition(Portlet pd);
}
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/container/InternalPortletContext.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/container/InternalPortletContext.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/container/InternalPortletContext.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/container/InternalPortletContext.java Thu Oct 16 11:18:59 2008
@@ -18,7 +18,7 @@
import javax.servlet.ServletContext;
-import org.apache.pluto.om.portlet.PortletApplicationDefinition;
+import org.apache.pluto.om.portlet.PortletApp;
@@ -33,5 +33,5 @@
{
public ServletContext getServletContext();
- public PortletApplicationDefinition getApplication();
+ public PortletApp getApplication();
}
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/container/JetspeedPortletConfig.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/container/JetspeedPortletConfig.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/container/JetspeedPortletConfig.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/container/JetspeedPortletConfig.java Thu Oct 16 11:18:59 2008
@@ -18,17 +18,17 @@
import java.util.Enumeration;
import java.util.Iterator;
+import java.util.List;
import java.util.Locale;
import java.util.ResourceBundle;
import javax.portlet.PortletConfig;
import javax.portlet.PortletContext;
-import org.apache.pluto.om.common.Language;
-import org.apache.pluto.om.common.LanguageSet;
-import org.apache.pluto.om.common.Parameter;
-import org.apache.pluto.om.common.ParameterSet;
-import org.apache.pluto.om.portlet.PortletDefinition;
+import org.apache.pluto.om.portlet.Language;
+import org.apache.pluto.om.portlet.LanguageSet;
+import org.apache.pluto.om.portlet.InitParam;
+import org.apache.pluto.om.portlet.Portlet;
/**
* Implements the Portlet API Portlet Config class
@@ -42,17 +42,17 @@
// private static final Log log = LogFactory.getLog(JetspeedPortletConfig.class);
private PortletContext portletContext;
- private PortletDefinition portletDefinition;
+ private Portlet portlet;
- public JetspeedPortletConfig(PortletContext portletContext, PortletDefinition portletEntity)
+ public JetspeedPortletConfig(PortletContext portletContext, Portlet portletEntity)
{
this.portletContext = portletContext;
- this.portletDefinition = portletEntity;
+ this.portlet = portletEntity;
}
public String getPortletName()
{
- return portletDefinition.getName();
+ return portlet.getName();
}
public PortletContext getPortletContext()
@@ -62,6 +62,7 @@
public ResourceBundle getResourceBundle(Locale locale)
{
+ portlet.getSupportedLocales()
LanguageSet languageSet = portletDefinition.getLanguageSet();
Language lang = languageSet.get(locale);
@@ -82,50 +83,46 @@
throw new IllegalArgumentException("Required parameter name is null");
}
//if (log.isDebugEnabled()) log.debug("Getting init parameter for: " + name);
- ParameterSet parameters = portletDefinition.getInitParameterSet();
- Parameter param = parameters.get(name);
-
- if (param != null)
+ for (InitParam param : portlet.getInitParams())
{
- // if (log.isDebugEnabled()) log.debug("Param: [[name," + name + "], [value, " + param.getValue() + "]]");
- return param.getValue();
+ if (param.getParamName().equals(name))
+ {
+ return param.getParamValue();
+ }
}
-
return null;
}
- public Enumeration getInitParameterNames()
+ public Enumeration<String> getInitParameterNames()
{
- return new java.util.Enumeration()
+ return new java.util.Enumeration<String>()
{
- private ParameterSet parameters = portletDefinition.getInitParameterSet();
- private Iterator iterator = parameters.iterator();
+ private Iterator<InitParam> iterator = portlet.getInitParams().iterator();
public boolean hasMoreElements()
{
return iterator.hasNext();
}
- public Object nextElement()
+ public String nextElement()
{
if (iterator.hasNext())
- return ((Parameter) iterator.next()).getName();
- else
- return null;
+ {
+ return iterator.next().getParamName();
+ }
+ return null;
}
};
-
}
- public void setPortletDefinition(PortletDefinition pd)
+ public void setPortletDefinition(Portlet pd)
{
- this.portletDefinition = pd;
+ this.portlet = pd;
}
// internal portlet config implementation
- public PortletDefinition getPortletDefinition()
+ public Portlet getPortletDefinition()
{
- return portletDefinition;
+ return portlet;
}
-
}
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/container/JetspeedPortletContext.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/container/JetspeedPortletContext.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/container/JetspeedPortletContext.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/container/JetspeedPortletContext.java Thu Oct 16 11:18:59 2008
@@ -29,7 +29,7 @@
import org.apache.jetspeed.dispatcher.JetspeedRequestDispatcher;
import org.apache.jetspeed.om.common.JetspeedServiceReference;
-import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
+import org.apache.jetspeed.om.common.portlet.PortletApplication;
import org.apache.jetspeed.services.JetspeedPortletServices;
import org.apache.jetspeed.services.PortletServices;
import org.apache.pluto.om.portlet.PortletApplicationDefinition;
@@ -50,12 +50,12 @@
public static final String LOCAL_PA_ROOT = "/WEB-INF/apps";
private ServletContext servletContext;
- private MutablePortletApplication application;
+ private PortletApplication application;
public JetspeedPortletContext(ServletContext servletContext, PortletApplicationDefinition application)
{
this.servletContext = servletContext;
- this.application = (MutablePortletApplication)application;
+ this.application = (PortletApplication)application;
}
public int getMajorVersion()
@@ -257,7 +257,7 @@
return servletContext.getServletContextName();
}
- private String localizePath(String path, MutablePortletApplication app)
+ private String localizePath(String path, PortletApplication app)
{
if (path == null)
{
@@ -266,7 +266,7 @@
return path;
// TODO: local PA with own/extra resource paths support
/*
- if (app.getApplicationType() == MutablePortletApplication.WEBAPP)
+ if (app.getApplicationType() == PortletApplication.WEBAPP)
{
return path;
}
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/portlet/PortletObjectProxy.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/portlet/PortletObjectProxy.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/portlet/PortletObjectProxy.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/portlet/PortletObjectProxy.java Thu Oct 16 11:18:59 2008
@@ -47,8 +47,8 @@
import org.apache.jetspeed.Jetspeed;
import org.apache.jetspeed.components.portletregistry.PortletRegistry;
import org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite;
-import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
-import org.apache.pluto.om.servlet.WebApplicationDefinition;
+import org.apache.jetspeed.om.common.portlet.PortletApplication;
+import org.apache.jetspeed.om.servlet.WebApplicationDefinition;
import org.apache.jetspeed.factory.PortletFactory;
import org.apache.jetspeed.factory.PortletInstance;
@@ -307,7 +307,7 @@
ServletContext portalAppContext = ((ServletConfig) Jetspeed.getComponentManager().getComponent("ServletConfig")).getServletContext();
PortletDefinitionComposite portletDef = (PortletDefinitionComposite) registry.getPortletDefinitionByUniqueName(this.customConfigModePortletUniqueName);
- MutablePortletApplication portletApp = (MutablePortletApplication) portletDef.getPortletApplicationDefinition();
+ PortletApplication portletApp = (PortletApplication) portletDef.getApplication();
WebApplicationDefinition webAppDef = portletApp.getWebApplicationDefinition();
String portletAppName = webAppDef.getContextRoot();
ServletContext portletAppContext = portalAppContext.getContext(portletAppName);
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/util/JetspeedObjectID.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/util/JetspeedObjectID.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/util/JetspeedObjectID.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/util/JetspeedObjectID.java Thu Oct 16 11:18:59 2008
@@ -18,7 +18,7 @@
import java.io.Serializable;
-import org.apache.pluto.om.common.ObjectID;
+import org.apache.pluto.om.portlet.ObjectID;
import org.apache.pluto.om.portlet.PortletDefinition;
/**
@@ -80,6 +80,6 @@
*/
public static JetspeedObjectID createPortletEntityId(PortletDefinition portletDefinition, String instanceName)
{
- return createFromString(portletDefinition.getName() + ":" + portletDefinition.getId().toString() + ":" + instanceName);
+ return createFromString(portletDefinition.getPortletName() + ":" + portletDefinition.getId().toString() + ":" + instanceName);
}
}
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/util/PortalObjectID.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/util/PortalObjectID.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/util/PortalObjectID.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/util/PortalObjectID.java Thu Oct 16 11:18:59 2008
@@ -16,7 +16,7 @@
*/
package org.apache.jetspeed.util;
-import org.apache.pluto.om.common.ObjectID;
+import org.apache.pluto.om.portlet.ObjectID;
/**
* PortalObjectID
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org