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 2009/03/30 13:37:03 UTC
svn commit: r759927 - in /portals/jetspeed-2/portal/trunk:
components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/PortletDefinitionImpl.java
jetspeed-portal-resources/src/main/resources/assembly/static-bean-references.xml
Author: ate
Date: Mon Mar 30 11:37:02 2009
New Revision: 759927
URL: http://svn.apache.org/viewvc?rev=759927&view=rev
Log:
JS2-871: Upgrade Pluto container to version 2.0 for up-to-date JSR-168 support
- Pluto 2.0 doesn't call into PortletDefinition.store() method anymore, so we don't need the *static* PortletRegistry callback access anymore either
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/PortletDefinitionImpl.java
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/static-bean-references.xml
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/PortletDefinitionImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/PortletDefinitionImpl.java?rev=759927&r1=759926&r2=759927&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/PortletDefinitionImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/PortletDefinitionImpl.java Mon Mar 30 11:37:02 2009
@@ -16,7 +16,6 @@
*/
package org.apache.jetspeed.om.portlet.impl;
-import java.io.IOException;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
@@ -28,8 +27,6 @@
import javax.xml.namespace.QName;
import org.apache.jetspeed.components.portletpreferences.PortletPreferencesProvider;
-import org.apache.jetspeed.components.portletregistry.PortletRegistry;
-import org.apache.jetspeed.components.portletregistry.RegistryException;
import org.apache.jetspeed.om.common.Support;
import org.apache.jetspeed.om.portlet.ContainerRuntimeOption;
import org.apache.jetspeed.om.portlet.Description;
@@ -64,7 +61,6 @@
public class PortletDefinitionImpl implements PortletDefinition, Serializable, Support, PersistenceBrokerAware
{
private static final long serialVersionUID = 1L;
- private static PortletRegistry registry;
private static PortletPreferencesProvider portletPreferencesProvider;
private PortletApplication app;
@@ -95,11 +91,6 @@
private List<SupportedPublicRenderParameter> supportedPublicRenderParameters;
private Preferences descriptorPreferences = new PreferencesImpl();
- public static void setPortletRegistry(PortletRegistry registry)
- {
- PortletDefinitionImpl.registry = registry;
- }
-
public static void setPortletPreferencesProvider(PortletPreferencesProvider portletPreferencesProvider)
{
PortletDefinitionImpl.portletPreferencesProvider = portletPreferencesProvider;
@@ -379,28 +370,6 @@
return hasher.toHashCode();
}
- /**
- * <p>
- * store will attempt to perform an atomic persistence call against this
- * portletDefinition.
- * </p>
- *
- * @see org.apache.pluto.container.om.portlet.PortletDefinition#store()
- * @throws java.io.IOException
- */
- public void store() throws IOException
- {
- try
- {
- registry.savePortletDefinition(this);
- }
- catch (RegistryException e)
- {
- IOException ioe = new IOException("Failed to store portlet definition: "+e.getMessage());
- ioe.initCause(e);
- }
- }
-
public void storeChildren()
{
// TODO
Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/static-bean-references.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/static-bean-references.xml?rev=759927&r1=759926&r2=759927&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/static-bean-references.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/static-bean-references.xml Mon Mar 30 11:37:02 2009
@@ -18,17 +18,6 @@
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
- <bean id="_portletDefinitionImplPortletRegistryInitializer"
- class="org.apache.jetspeed.components.LifecycleAwareStaticClassInitializer">
- <meta key="j2:cat" value="default,registry" />
- <property name="className" value="org.apache.jetspeed.om.portlet.impl.PortletDefinitionImpl" />
- <property name="methodName" value="setPortletRegistry" />
- <property name="typeName" value="org.apache.jetspeed.components.portletregistry.PortletRegistry" />
- <property name="value">
- <ref bean="portletRegistry" />
- </property>
- </bean>
-
<bean id="_portletDefinitionImplPortletPreferencesProviderInitializer"
class="org.apache.jetspeed.components.LifecycleAwareStaticClassInitializer">
<meta key="j2:cat" value="default,registry" />
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org