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 [4/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-registry/src/main/java/org/apache/jetspeed/om/impl/UserAttributeImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/impl/UserAttributeImpl.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/impl/UserAttributeImpl.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/impl/UserAttributeImpl.java Thu Oct 16 11:18:59 2008
@@ -51,7 +51,7 @@
private String name;
/**
- * @see org.apache.jetspeed.om.common.UserAttribute#getName()
+ * @see org.apache.jetspeed.om.common.UserAttribute#getPortletName()
*/
public String getName()
{
@@ -59,7 +59,7 @@
}
/**
- * @see org.apache.jetspeed.om.common.UserAttribute#setName(java.lang.String)
+ * @see org.apache.jetspeed.om.common.UserAttribute#setPortletName(java.lang.String)
*/
public void setName(String name)
{
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/impl/UserAttributeRefImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/impl/UserAttributeRefImpl.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/impl/UserAttributeRefImpl.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/impl/UserAttributeRefImpl.java Thu Oct 16 11:18:59 2008
@@ -56,7 +56,7 @@
*/
public UserAttributeRefImpl(UserAttribute userAttribute)
{
- this.name = userAttribute.getName();
+ this.name = userAttribute.getPortletName();
this.description = userAttribute.getDescription();
}
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/FragmentPortletDefinition.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/FragmentPortletDefinition.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/FragmentPortletDefinition.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/FragmentPortletDefinition.java Thu Oct 16 11:18:59 2008
@@ -27,21 +27,21 @@
import org.apache.jetspeed.om.common.preference.PreferenceSetComposite;
import org.apache.jetspeed.om.page.Fragment;
import org.apache.jetspeed.om.preference.impl.FragmentPortletPreferenceSet;
-import org.apache.pluto.om.common.Description;
-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.ObjectID;
-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.Language;
+import org.apache.pluto.om.portlet.LanguageSet;
+import org.apache.pluto.om.portlet.ObjectID;
+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.Description;
+import org.apache.pluto.om.portlet.DescriptionSet;
+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.SecurityRoleRef;
+import org.apache.pluto.om.portlet.SecurityRoleRefSet;
import org.apache.pluto.om.servlet.ServletDefinition;
/**
@@ -135,9 +135,9 @@
return portletDefinition.addSecurityRoleRef(roleName, roleLink);
}
- public String getClassName()
+ public String getPortletClass()
{
- return portletDefinition.getClassName();
+ return portletDefinition.getPortletClass();
}
public ContentTypeSet getContentTypeSet()
@@ -205,9 +205,9 @@
return portletDefinition.getMetadata();
}
- public String getName()
+ public String getPortletName()
{
- return portletDefinition.getName();
+ return portletDefinition.getPortletName();
}
public PortletApplicationDefinition getPortletApplicationDefinition()
@@ -255,9 +255,9 @@
return portletDefinition.getUniqueName();
}
- public void setClassName(String arg0)
+ public void setPortletClass(String arg0)
{
- portletDefinition.setClassName(arg0);
+ portletDefinition.setPortletClass(arg0);
}
public void setContentTypeSet(ContentTypeSet contentTypes)
@@ -305,9 +305,9 @@
portletDefinition.setMetadata(metadata);
}
- public void setName(String arg0)
+ public void setPortletName(String arg0)
{
- portletDefinition.setName(arg0);
+ portletDefinition.setPortletName(arg0);
}
public void setPortletApplicationDefinition(PortletApplicationDefinition pad)
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/PortletApplicationDefinitionImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/PortletApplicationDefinitionImpl.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/PortletApplicationDefinitionImpl.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/PortletApplicationDefinitionImpl.java Thu Oct 16 11:18:59 2008
@@ -37,13 +37,10 @@
import org.apache.jetspeed.om.common.UserAttributeRef;
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.common.portlet.PortletDefinitionComposite;
import org.apache.jetspeed.om.impl.UserAttributeImpl;
-import org.apache.jetspeed.util.JetspeedLongObjectID;
-import org.apache.pluto.om.common.ObjectID;
import org.apache.pluto.om.portlet.PortletDefinition;
-import org.apache.pluto.om.portlet.PortletDefinitionList;
import org.apache.pluto.om.servlet.WebApplicationDefinition;
/**
@@ -53,7 +50,7 @@
* @version $Id$
* @since 1.0
*/
-public class PortletApplicationDefinitionImpl implements MutablePortletApplication, Serializable, Support
+public class PortletApplicationDefinitionImpl implements PortletApplication, Serializable, Support
{
/**
* Unique id of the application. This serves as the primary key in database
@@ -96,7 +93,7 @@
private PortletDefinitionListImpl listWrapper = new PortletDefinitionListImpl();
- private int applicationType = MutablePortletApplication.WEBAPP;
+ private int applicationType = PortletApplication.WEBAPP;
private String checksum = "0";
private long checksumLong = -1;
@@ -136,7 +133,7 @@
}
/**
- * @see org.apache.jetspeed.om.common.Application#getName()
+ * @see org.apache.jetspeed.om.common.Application#getPortletName()
*/
public String getName()
{
@@ -144,7 +141,7 @@
}
/**
- * @see org.apache.jetspeed.om.common.Application#setName(String)
+ * @see org.apache.jetspeed.om.common.Application#setPortletName(String)
*/
public void setName(String name)
{
@@ -200,7 +197,7 @@
}
/**
- * @see org.apache.jetspeed.om.common.portlet.MutablePortletApplication#setWebApplicationDefinition(org.apache.pluto.om.servlet.WebApplicationDefinition)
+ * @see org.apache.jetspeed.om.common.portlet.PortletApplication#setWebApplicationDefinition(org.apache.pluto.om.servlet.WebApplicationDefinition)
*/
public void setWebApplicationDefinition(WebApplicationDefinition wad)
{
@@ -209,7 +206,7 @@
}
/**
- * @see org.apache.jetspeed.om.common.portlet.MutablePortletApplication#addPortletDefinition(org.apache.pluto.om.portlet.PortletDefinition)
+ * @see org.apache.jetspeed.om.common.portlet.PortletApplication#addPortletDefinition(org.apache.pluto.om.portlet.PortletDefinition)
*/
public void addPortletDefinition(PortletDefinition pd)
{
@@ -218,7 +215,7 @@
}
/**
- * @see org.apache.jetspeed.om.common.portlet.MutablePortletApplication#getPortletDefinitions()
+ * @see org.apache.jetspeed.om.common.portlet.PortletApplication#getPortletDefinitions()
*/
public Collection getPortletDefinitions()
{
@@ -226,7 +223,7 @@
}
/**
- * @see org.apache.jetspeed.om.common.portlet.MutablePortletApplication#getPortletDefinitionByName(java.lang.String)
+ * @see org.apache.jetspeed.om.common.portlet.PortletApplication#getPortletDefinitionByName(java.lang.String)
*/
public PortletDefinition getPortletDefinitionByName(String name)
{
@@ -235,7 +232,7 @@
}
/**
- * @see org.apache.jetspeed.om.common.portlet.MutablePortletApplication#setPortletDefinitionList(org.apache.pluto.om.portlet.PortletDefinitionList)
+ * @see org.apache.jetspeed.om.common.portlet.PortletApplication#setPortletDefinitionList(org.apache.pluto.om.portlet.PortletDefinitionList)
*/
public void setPortletDefinitionList(PortletDefinitionList portlets)
{
@@ -243,7 +240,7 @@
}
/**
- * @see org.apache.jetspeed.om.common.portlet.MutablePortletApplication#setUserAttributeRefs(java.util.Collection)
+ * @see org.apache.jetspeed.om.common.portlet.PortletApplication#setUserAttributeRefs(java.util.Collection)
*/
public void setUserAttributeRefs(Collection userAttributeRefs)
{
@@ -251,7 +248,7 @@
}
/**
- * @see org.apache.jetspeed.om.common.portlet.MutablePortletApplication#getUserAttributeRefs()
+ * @see org.apache.jetspeed.om.common.portlet.PortletApplication#getUserAttributeRefs()
*/
public Collection getUserAttributeRefs()
{
@@ -259,7 +256,7 @@
}
/**
- * @see org.apache.jetspeed.om.common.portlet.MutablePortletApplication#addUserAttributeRef(org.apache.jetspeed.om.common.UserAttributeRef)
+ * @see org.apache.jetspeed.om.common.portlet.PortletApplication#addUserAttributeRef(org.apache.jetspeed.om.common.UserAttributeRef)
*/
public void addUserAttributeRef(UserAttributeRef userAttributeRef)
{
@@ -267,7 +264,7 @@
}
/**
- * @see org.apache.jetspeed.om.common.portlet.MutablePortletApplication#addUserAttribute(org.apache.jetspeed.om.common.UserAttribute)
+ * @see org.apache.jetspeed.om.common.portlet.PortletApplication#addUserAttribute(org.apache.jetspeed.om.common.UserAttribute)
*/
public void addUserAttribute(UserAttribute userAttribute)
{
@@ -275,7 +272,7 @@
}
/**
- * @see org.apache.jetspeed.om.common.portlet.MutablePortletApplication#addUserAttribute(java.lang.String, java.lang.String)
+ * @see org.apache.jetspeed.om.common.portlet.PortletApplication#addUserAttribute(java.lang.String, java.lang.String)
*/
public void addUserAttribute(String userName, String description)
{
@@ -286,7 +283,7 @@
}
/**
- * @see org.apache.jetspeed.om.common.portlet.MutablePortletApplication#setUserAttributes(java.util.Collection)
+ * @see org.apache.jetspeed.om.common.portlet.PortletApplication#setUserAttributes(java.util.Collection)
*/
public void setUserAttributes(Collection userAttributes)
{
@@ -294,7 +291,7 @@
}
/**
- * @see org.apache.jetspeed.om.common.portlet.MutablePortletApplication#getUserAttributes()
+ * @see org.apache.jetspeed.om.common.portlet.PortletApplication#getUserAttributes()
*/
public Collection getUserAttributes()
{
@@ -302,7 +299,7 @@
}
/**
- * @see org.apache.jetspeed.om.common.portlet.MutablePortletApplication#setApplicationIdentifier(java.lang.String)
+ * @see org.apache.jetspeed.om.common.portlet.PortletApplication#setApplicationIdentifier(java.lang.String)
*/
public void setApplicationIdentifier(String applicationIdentifier)
{
@@ -310,7 +307,7 @@
}
/**
- * @see org.apache.jetspeed.om.common.portlet.MutablePortletApplication#getApplicationIdentifier()
+ * @see org.apache.jetspeed.om.common.portlet.PortletApplication#getApplicationIdentifier()
*/
public String getApplicationIdentifier()
{
@@ -318,7 +315,7 @@
}
/**
- * @see org.apache.jetspeed.om.common.portlet.MutablePortletApplication#setApplicationType(int)
+ * @see org.apache.jetspeed.om.common.portlet.PortletApplication#setApplicationType(int)
*/
public void setApplicationType(int type)
{
@@ -326,7 +323,7 @@
}
/**
- * @see org.apache.jetspeed.om.common.portlet.MutablePortletApplication#getApplicationType()
+ * @see org.apache.jetspeed.om.common.portlet.PortletApplication#getApplicationType()
*/
public int getApplicationType()
{
@@ -334,7 +331,7 @@
}
/**
- * @see org.apache.jetspeed.om.common.portlet.MutablePortletApplication#getMetadata()
+ * @see org.apache.jetspeed.om.common.portlet.PortletApplication#getMetadata()
*/
public GenericMetadata getMetadata()
{
@@ -350,7 +347,7 @@
}
/**
- * @see org.apache.jetspeed.om.common.portlet.MutablePortletApplication#setMetadata(org.apache.jetspeed.om.common.GenericMetadata)
+ * @see org.apache.jetspeed.om.common.portlet.PortletApplication#setMetadata(org.apache.jetspeed.om.common.GenericMetadata)
*/
public void setMetadata(GenericMetadata metadata)
{
@@ -382,7 +379,7 @@
}
/* (non-Javadoc)
- * @see org.apache.jetspeed.om.common.portlet.MutablePortletApplication#addJetspeedService(org.apache.jetspeed.om.common.JetspeedServiceReference)
+ * @see org.apache.jetspeed.om.common.portlet.PortletApplication#addJetspeedService(org.apache.jetspeed.om.common.JetspeedServiceReference)
*/
public void addJetspeedService(JetspeedServiceReference service)
{
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/PortletDefinitionImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/PortletDefinitionImpl.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/PortletDefinitionImpl.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/PortletDefinitionImpl.java Thu Oct 16 11:18:59 2008
@@ -37,7 +37,7 @@
import org.apache.jetspeed.om.common.MutableDisplayName;
import org.apache.jetspeed.om.common.ParameterComposite;
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.common.preference.PreferenceComposite;
import org.apache.jetspeed.om.common.preference.PreferenceSetComposite;
@@ -58,22 +58,22 @@
import org.apache.ojb.broker.PersistenceBroker;
import org.apache.ojb.broker.PersistenceBrokerAware;
import org.apache.ojb.broker.PersistenceBrokerException;
-import org.apache.pluto.om.common.Description;
-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.ObjectID;
-import org.apache.pluto.om.common.Parameter;
-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.Language;
+import org.apache.pluto.om.portlet.LanguageSet;
+import org.apache.pluto.om.portlet.ObjectID;
+import org.apache.pluto.om.portlet.Parameter;
+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.Description;
+import org.apache.pluto.om.portlet.DescriptionSet;
+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.SecurityRoleRef;
+import org.apache.pluto.om.portlet.SecurityRoleRefSet;
import org.apache.pluto.om.servlet.ServletDefinition;
/**
@@ -118,7 +118,7 @@
protected List portletEntities;
/** PortletApplicationDefinition this PortletDefinition belongs to */
- private MutablePortletApplication app;
+ private PortletApplication app;
protected long appId;
private String expirationCache;
@@ -161,17 +161,17 @@
}
/**
- * @see org.apache.pluto.om.portlet.PortletDefinition#getClassName()
+ * @see org.apache.pluto.om.portlet.PortletDefinition#getPortletClass()
*/
- public String getClassName()
+ public String getPortletClass()
{
return className;
}
/**
- * @see org.apache.pluto.om.portlet.PortletDefinition#getName()
+ * @see org.apache.pluto.om.portlet.PortletDefinition#getPortletName()
*/
- public String getName()
+ public String getPortletName()
{
return name;
}
@@ -276,7 +276,7 @@
}
/**
- * @see org.apache.pluto.om.portlet.PortletDefinitionCtrl#setId(java.lang.String)
+ * @see org.apache.pluto.om.portlet.PortletDefinition#setId(java.lang.String)
*/
public void setId( String oid )
{
@@ -284,23 +284,23 @@
}
/**
- * @see org.apache.pluto.om.portlet.PortletDefinitionCtrl#setClassName(java.lang.String)
+ * @see org.apache.pluto.om.portlet.PortletDefinition#setPortletClass(java.lang.String)
*/
- public void setClassName( String className )
+ public void setPortletClass( String className )
{
this.className = className;
}
/**
- * @see org.apache.pluto.om.portlet.PortletDefinitionCtrl#setName(java.lang.String)
+ * @see org.apache.pluto.om.portlet.PortletDefinition#setPortletName(java.lang.String)
*/
- public void setName( String name )
+ public void setPortletName( String name )
{
this.name = name;
}
/**
- * @see org.apache.pluto.om.portlet.PortletDefinitionCtrl#setPortletClassLoader(java.lang.ClassLoader)
+ * @see org.apache.pluto.om.portlet.PortletDefinition#setPortletClassLoader(java.lang.ClassLoader)
*/
public void setPortletClassLoader( ClassLoader loader )
{
@@ -499,7 +499,7 @@
*/
public void setPortletApplicationDefinition( PortletApplicationDefinition pad )
{
- app = (MutablePortletApplication) pad;
+ app = (PortletApplication) pad;
}
/**
@@ -516,7 +516,7 @@
return true;
}
boolean sameAppId = (appId == pd.appId);
- boolean sameName = (pd.getName() != null && name != null && pd.getName().equals(name));
+ boolean sameName = (pd.getPortletName() != null && name != null && pd.getPortletName().equals(name));
return sameName && sameAppId;
}
return false;
@@ -583,7 +583,7 @@
}
/**
- * @see org.apache.pluto.om.portlet.PortletDefinitionCtrl#setDescriptions(org.apache.pluto.om.common.DescriptionSet)
+ * @see org.apache.pluto.om.portlet.PortletDefinition#setDescriptions(org.apache.pluto.om.common.DescriptionSet)
*/
public void setDescriptions( DescriptionSet arg0 )
{
@@ -591,7 +591,7 @@
}
/**
- * @see org.apache.pluto.om.portlet.PortletDefinitionCtrl#setDisplayNames(org.apache.pluto.om.common.DisplayNameSet)
+ * @see org.apache.pluto.om.portlet.PortletDefinition#setDisplayNames(org.apache.pluto.om.common.DisplayNameSet)
*/
public void setDisplayNames( DisplayNameSet arg0 )
{
@@ -708,7 +708,7 @@
* portletDefinition.
* </p>
*
- * @see org.apache.pluto.om.portlet.PortletDefinitionCtrl#store()
+ * @see org.apache.pluto.om.portlet.PortletDefinition#store()
* @throws java.io.IOException
*/
public void store() throws IOException
@@ -785,7 +785,7 @@
}
/**
- * @see org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite#addSecurityRoleRef(org.apache.pluto.om.common.SecurityRoleRef)
+ * @see org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite#addSecurityRoleRef(org.apache.pluto.om.portlet.SecurityRoleRef)
*/
public void addSecurityRoleRef( SecurityRoleRef securityRef )
{
@@ -808,7 +808,7 @@
}
/**
- * @see org.apache.jetspeed.om.common.portlet.MutablePortletApplication#getMetadata()
+ * @see org.apache.jetspeed.om.common.portlet.PortletApplication#getMetadata()
*/
public GenericMetadata getMetadata()
{
@@ -824,7 +824,7 @@
}
/**
- * @see org.apache.jetspeed.om.common.portlet.MutablePortletApplication#setMetadata(org.apache.jetspeed.om.common.GenericMetadata)
+ * @see org.apache.jetspeed.om.common.portlet.PortletApplication#setMetadata(org.apache.jetspeed.om.common.GenericMetadata)
*/
public void setMetadata( GenericMetadata metadata )
{
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/PortletDefinitionListImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/PortletDefinitionListImpl.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/PortletDefinitionListImpl.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/PortletDefinitionListImpl.java Thu Oct 16 11:18:59 2008
@@ -23,7 +23,7 @@
-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.om.portlet.PortletDefinitionList;
@@ -94,7 +94,7 @@
while (itr.hasNext())
{
PortletDefinition pd = (PortletDefinition) itr.next();
- if (pd.getName().equals(name))
+ if (pd.getPortletName().equals(name))
{
return pd;
}
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/preference/impl/FragmentPortletPreferenceSet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/preference/impl/FragmentPortletPreferenceSet.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/preference/impl/FragmentPortletPreferenceSet.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/preference/impl/FragmentPortletPreferenceSet.java Thu Oct 16 11:18:59 2008
@@ -26,7 +26,7 @@
import org.apache.jetspeed.om.common.preference.PreferenceSetComposite;
import org.apache.jetspeed.om.page.Fragment;
-import org.apache.pluto.om.common.Preference;
+import org.apache.pluto.om.portlet.Preference;
/**
* This is a per-request wrapper for a PreferenceSet that allows
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/preference/impl/PreferenceSetImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/preference/impl/PreferenceSetImpl.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/preference/impl/PreferenceSetImpl.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/preference/impl/PreferenceSetImpl.java Thu Oct 16 11:18:59 2008
@@ -33,8 +33,8 @@
import org.apache.jetspeed.om.common.preference.PreferenceComposite;
import org.apache.jetspeed.om.common.preference.PreferenceSetComposite;
import org.apache.jetspeed.om.common.preference.PreferencesValidatorFactory;
-import org.apache.pluto.om.common.Description;
-import org.apache.pluto.om.common.Preference;
+import org.apache.pluto.om.portlet.Preference;
+import org.apache.pluto.om.portlet.Description;
/**
* @version $Id$
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/servlet/impl/WebApplicationDefinitionImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/servlet/impl/WebApplicationDefinitionImpl.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/servlet/impl/WebApplicationDefinitionImpl.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/servlet/impl/WebApplicationDefinitionImpl.java Thu Oct 16 11:18:59 2008
@@ -18,32 +18,9 @@
import java.io.Serializable;
import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Locale;
+import java.util.List;
-import javax.servlet.ServletContext;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.jetspeed.om.common.MutableDescription;
-import org.apache.jetspeed.om.common.MutableDisplayName;
-import org.apache.jetspeed.om.common.servlet.MutableWebApplication;
-import org.apache.jetspeed.om.impl.DescriptionImpl;
-import org.apache.jetspeed.om.impl.DescriptionSetImpl;
-import org.apache.jetspeed.om.impl.DisplayNameSetImpl;
-import org.apache.jetspeed.om.impl.WebAppDescriptionImpl;
-import org.apache.jetspeed.om.impl.WebAppDisplayNameImpl;
-import org.apache.jetspeed.util.JetspeedLocale;
-import org.apache.jetspeed.util.JetspeedLongObjectID;
-import org.apache.pluto.om.common.Description;
-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.ObjectID;
-import org.apache.pluto.om.common.ParameterSet;
-import org.apache.pluto.om.servlet.ServletDefinitionList;
-import org.apache.pluto.om.common.SecurityRole;
-import org.apache.pluto.om.common.SecurityRoleSet;
+import org.apache.jetspeed.om.servlet.WebApplicationDefinition;
/**
*
@@ -53,215 +30,61 @@
* @version $Id$
*
*/
-public class WebApplicationDefinitionImpl implements MutableWebApplication, Serializable
+public class WebApplicationDefinitionImpl implements WebApplicationDefinition, Serializable
{
+ private static final long serialVersionUID = 257065602152274557L;
+
+ @SuppressWarnings("unused")
private Long id;
- private JetspeedLongObjectID oid;
- private Collection displayNames = new ArrayList();
- private DisplayNameSetImpl DNCollWrapper = new DisplayNameSetImpl();
-
- private Collection descriptions = new ArrayList();
- private DescriptionSetImpl descCollWrapper = new DescriptionSetImpl(DescriptionImpl.TYPE_WEB_APP);
- private Collection securityRoles = new ArrayList();
- private SecurityRoleSetImpl secRolesListWrapper = new SecurityRoleSetImpl();
-
+ private String name;
+ private String displayName;
+ private String description;
+ private List<String> roles = new ArrayList<String>();
+
private String contextRoot;
- private ParameterSet initParameters;
-
- private static final Log log = LogFactory.getLog(WebApplicationDefinitionImpl.class);
-
- /**
- * @see org.apache.pluto.om.servlet.WebApplicationDefinition#getId()
- */
- public ObjectID getId()
- {
- if ( oid == null && id != null )
- {
- oid = new JetspeedLongObjectID(id);
- }
- return oid;
- }
-
- /**
- * @see org.apache.pluto.om.servlet.WebApplicationDefinition#getDisplayName()
- */
- public DisplayName getDisplayName(Locale locale)
- {
-
- if (displayNames != null)
- {
- DNCollWrapper.setInnerCollection(displayNames);
- return DNCollWrapper.get(locale);
- }
- return null;
-
- }
-
- /**
- * @see org.apache.pluto.om.servlet.WebApplicationDefinition#getDescription()
- */
- public Description getDescription(Locale locale)
+
+ public String getId()
{
- if (descriptions != null)
- {
- descCollWrapper.setInnerCollection(descriptions);
- return descCollWrapper.get(locale);
- }
- return null;
-
+ return name;
}
-
- /**
- * @see org.apache.pluto.om.servlet.WebApplicationDefinition#getInitParameterSet()
- */
- public ParameterSet getInitParameterSet()
+
+ public void setId(String id)
{
- return initParameters;
+ this.name = id;
}
- /**
- * @see org.apache.pluto.om.servlet.WebApplicationDefinition#getServletDefinitionList()
- */
- public ServletDefinitionList getServletDefinitionList()
+ public String getDisplayName()
{
- // TODO Auto-generated method stub
- return null;
+ return displayName;
}
- /**
- * @see org.apache.pluto.om.servlet.WebApplicationDefinition#getServletContext(javax.servlet.ServletContext)
- */
- public ServletContext getServletContext(ServletContext servletContext)
+ public String getDescription()
{
- // TODO Auto-generated method stub
- return null;
+ return description;
}
- /**
- * @see org.apache.pluto.om.servlet.WebApplicationDefinition#getContextRoot()
- */
public String getContextRoot()
{
return contextRoot;
}
- /**
- * @see org.apache.pluto.om.servlet.WebApplicationDefinitionCtrl#setDisplayName(java.lang.String)
- */
- public void setDisplayNameSet(DisplayNameSet displayNames)
+ public void setDisplayName(String displayName)
{
- this.displayNames = ((DisplayNameSetImpl) displayNames).getInnerCollection();
+ this.displayName = displayName;
}
- /**
- * @see org.apache.jetspeed.om.common.servlet.WebApplicationComposite#setContextRoot(java.lang.String)
- */
public void setContextRoot(String contextRoot)
{
this.contextRoot = contextRoot;
}
- /**
- * @see org.apache.jetspeed.om.common.servlet.MutableWebApplication#addDescription(java.util.Locale, java.lang.String)
- */
- public void addDescription(Locale locale, String description)
- {
- if (descriptions == null)
- {
- descriptions = new ArrayList();
- }
- descCollWrapper.setInnerCollection(descriptions);
- try
- {
- MutableDescription descObj = new WebAppDescriptionImpl();
-
- descObj.setLocale(locale);
- descObj.setDescription(description);
- descCollWrapper.addDescription(descObj);
- }
- catch (Exception e)
- {
- String msg = "Unable to instantiate Description implementor, " + e.toString();
- log.error(msg, e);
- throw new IllegalStateException(msg);
- }
- }
-
- /**
- * @see org.apache.jetspeed.om.common.servlet.MutableWebApplication#addDisplayName(java.util.Locale, java.lang.String)
- */
- public void addDisplayName(Locale locale, String name)
- {
- if (displayNames == null)
- {
- displayNames = new ArrayList();
- }
- DNCollWrapper.setInnerCollection(displayNames);
- try
- {
- MutableDisplayName dn = new WebAppDisplayNameImpl();
-
- dn.setLocale(locale);
- dn.setDisplayName(name);
- DNCollWrapper.addDisplayName(dn);
- }
- catch (Exception e)
- {
- String msg = "Unable to instantiate DisplayName implementor, " + e.toString();
- log.error(msg, e);
- throw new IllegalStateException(msg);
- }
-
- }
-
- /**
- * @see org.apache.jetspeed.om.common.servlet.MutableWebApplication#setDescriptionSet(org.apache.pluto.om.common.DescriptionSet)
- */
- public void setDescriptionSet(DescriptionSet descriptions)
- {
- this.descriptions = ((DescriptionSetImpl) descriptions).getInnerCollection();
- }
-
- /**
- * Remove when Castor is mapped correctly
- * @deprecated
- * @return
- */
- public String getDescription()
+ public void setDescription(String description)
{
- Description desc = getDescription(JetspeedLocale.getDefaultLocale());
- if (desc != null)
- {
- return desc.getDescription();
- }
- return null;
- }
-
- /**
- * Remove when Castor is mapped correctly
- * @deprecated
- * @param desc
- */
- public void setDescription(String desc)
- {
- addDescription(JetspeedLocale.getDefaultLocale(), desc);
- }
-
- /**
- * @see org.apache.pluto.om.servlet.WebApplicationDefinition#getSecurityRoles()
- */
- public SecurityRoleSet getSecurityRoles()
+ this.description = description;
+ }
+
+ public List<String> getRoles()
{
- secRolesListWrapper.setInnerCollection(securityRoles);
- return secRolesListWrapper;
+ return roles;
}
-
- /**
- * @see org.apache.jetspeed.om.common.servlet.MutableWebApplication#addSecurityRole(org.apache.pluto.om.common.SecurityRole)
- */
- public void addSecurityRole(SecurityRole securityRole)
- {
- secRolesListWrapper.setInnerCollection(securityRoles);
- secRolesListWrapper.add(securityRole);
- }
}
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/window/impl/PortletWindowImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/window/impl/PortletWindowImpl.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/window/impl/PortletWindowImpl.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/window/impl/PortletWindowImpl.java Thu Oct 16 11:18:59 2008
@@ -18,12 +18,12 @@
import java.io.Serializable;
-import org.apache.pluto.om.window.PortletWindow;
-import org.apache.pluto.om.window.PortletWindowCtrl;
-import org.apache.pluto.om.window.PortletWindowListCtrl;
-import org.apache.pluto.om.entity.PortletEntity;
-import org.apache.pluto.om.common.ObjectID;
-import org.apache.jetspeed.util.JetspeedObjectID;
+import javax.portlet.PortletMode;
+import javax.portlet.WindowState;
+
+import org.apache.jetspeed.container.PortletEntity;
+import org.apache.jetspeed.container.PortletWindow;
+import org.apache.pluto.PortletWindowID;
/**
* <P>
@@ -35,20 +35,20 @@
* @author <a href="mailto:david@bluesunrise.com">David Sean Taylor</a>
* @version $Id$
**/
-public class PortletWindowImpl implements PortletWindow, PortletWindowCtrl, Serializable
+public class PortletWindowImpl implements PortletWindow, PortletWindowID, Serializable
{
- private ObjectID objectId = null;
+ private static final long serialVersionUID = 6578938580906866201L;
+
private transient PortletEntity portletEntity = null;
+ private String id;
+ private PortletMode portletMode;
+ private WindowState windowState;
+
private boolean instantlyRendered;
public PortletWindowImpl(String id)
{
- this.objectId = JetspeedObjectID.createFromString(id);
- }
-
- public PortletWindowImpl(ObjectID oid)
- {
- this.objectId = oid;
+ this.id = id;
}
public PortletWindowImpl()
@@ -61,10 +61,16 @@
*
* @return the object identifier
**/
- public ObjectID getId()
+ public PortletWindowID getId()
{
- return objectId;
+ return this;
}
+
+ public String getStringId()
+ {
+ return id;
+ }
+
/**
* Returns the portlet entity
*
@@ -83,7 +89,7 @@
*/
public void setId(String id)
{
- objectId = JetspeedObjectID.createFromString(id);
+ this.id = id;
}
/**
@@ -94,7 +100,7 @@
public void setPortletEntity(PortletEntity portletEntity)
{
this.portletEntity = portletEntity;
- ((PortletWindowListCtrl)portletEntity.getPortletWindowList()).add(this);
+ this.portletEntity.setPortletWindow(this);
}
/**
@@ -113,4 +119,23 @@
return this.instantlyRendered;
}
+ public PortletMode getPortletMode()
+ {
+ return portletMode;
+ }
+
+ public void setPortletMode(PortletMode portletMode)
+ {
+ this.portletMode = portletMode;
+ }
+
+ public WindowState getWindowState()
+ {
+ return windowState;
+ }
+
+ public void setWindowState(WindowState windowState)
+ {
+ this.windowState = windowState;
+ }
}
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/serializer/JetspeedRegistrySerializer.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/serializer/JetspeedRegistrySerializer.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/serializer/JetspeedRegistrySerializer.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/serializer/JetspeedRegistrySerializer.java Thu Oct 16 11:18:59 2008
@@ -25,8 +25,7 @@
import org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent;
import org.apache.jetspeed.components.portletpreferences.PortletPreferencesProvider;
import org.apache.jetspeed.components.portletregistry.PortletRegistry;
-import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
-import org.apache.jetspeed.om.common.portlet.MutablePortletEntity;
+import org.apache.jetspeed.container.PortletEntity;
import org.apache.jetspeed.om.common.portlet.PortletApplication;
import org.apache.jetspeed.om.common.preference.PreferenceSetComposite;
import org.apache.jetspeed.search.SearchEngine;
@@ -41,9 +40,8 @@
import org.apache.jetspeed.serializer.objects.JSPortlet;
import org.apache.jetspeed.serializer.objects.JSPortlets;
import org.apache.jetspeed.serializer.objects.JSSnapshot;
-import org.apache.pluto.om.common.Preference;
+import org.apache.pluto.om.portlet.Preference;
import org.apache.pluto.om.portlet.PortletDefinition;
-import org.apache.pluto.om.portlet.PortletDefinitionList;
/**
* JetspeedRegistrySerializer - Registry component serializer
@@ -150,7 +148,7 @@
while (it.hasNext())
{
JSApplication app = (JSApplication) it.next();
- MutablePortletApplication portletApp = registry.getPortletApplication(app.getName());
+ PortletApplication portletApp = registry.getPortletApplication(app.getName());
if (portletApp != null)
{
importPA(app, portletApp, settings, log);
@@ -158,7 +156,7 @@
}
}
- void importPA(JSApplication app, MutablePortletApplication pa, Map settings, Log log) throws SerializerException
+ void importPA(JSApplication app, PortletApplication pa, Map settings, Log log) throws SerializerException
{
System.out.println("--processed PA " + pa.getName() + " with id=" + pa.getId());
@@ -187,7 +185,7 @@
while (it.hasNext())
{
JSEntity entity = (JSEntity) it.next();
- MutablePortletEntity portletEntity = entityAccess.getPortletEntity(entity.getId());
+ PortletEntity portletEntity = entityAccess.getPortletEntity(entity.getId());
if (portletEntity == null)
{
portletEntity = entityAccess.newPortletEntityInstance(pd, entity.getId());
@@ -206,7 +204,7 @@
}
}
- private void importEntityPref(JSEntity entity, MutablePortletEntity portletEntity, Map settings, Log log)
+ private void importEntityPref(JSEntity entity, PortletEntity portletEntity, Map settings, Log log)
{
if (isSettingSet(settings, JetspeedSerializer.KEY_PROCESS_USER_PREFERENCES))
{
@@ -277,7 +275,7 @@
{
try
{
- MutablePortletApplication pa = (MutablePortletApplication) list.next();
+ PortletApplication pa = (PortletApplication) list.next();
// PortletApplicationDefinition pa =
// (PortletApplicationDefinition)list.next();
JSApplication app = exportPA(pa, settings, log);
@@ -294,14 +292,13 @@
}
}
- private JSApplication exportPA(MutablePortletApplication pa, Map settings, Log log) throws SerializerException
+ private JSApplication exportPA(PortletApplication pa, Map settings, Log log) throws SerializerException
{
/**
* while more PAs for each portletDef
* list:entityMan:getPortletEntity(pd)
*/
- PortletDefinitionList portletList = pa.getPortletDefinitionList(); // .get(JetspeedObjectID.createFromString(TEST_PORTLET));
- Iterator pi = portletList.iterator();
+ Iterator pi = pa.getPortlets().iterator();
PortletDefinition pd = null;
JSPortlets portlets = new JSPortlets();
@@ -313,11 +310,11 @@
JSPortlet p = exportPD(pd, settings, log);
if (p != null)
{
- log.debug("--processed PA " + pa.getName() + " with pd=" + pd.getName());
+ log.debug("--processed PA " + pa.getName() + " with pd=" + pd.getPortletName());
portlets.add(p);
}
else
- log.debug("--processed PA " + pa.getName() + " with NULL pd=" + pd.getName());
+ log.debug("--processed PA " + pa.getName() + " with NULL pd=" + pd.getPortletName());
}
catch (Exception e)
@@ -359,7 +356,7 @@
while (list.hasNext())
{
- MutablePortletEntity entity = (MutablePortletEntity) list.next();
+ PortletEntity entity = (PortletEntity) list.next();
JSEntity jsEntity = exportEntityPref(entity, settings, log);
if (jsEntity != null)
entities.add(jsEntity);
@@ -368,8 +365,8 @@
if (!entities.isEmpty())
{
JSPortlet portlet = new JSPortlet();
- portlet.setName(pd.getName());
- log.debug("-----exporting for PD=" + pd.getName());
+ portlet.setName(pd.getPortletName());
+ log.debug("-----exporting for PD=" + pd.getPortletName());
portlet.setEntities(entities);
return portlet;
}
@@ -382,7 +379,7 @@
}
}
- JSEntity exportEntityPref(MutablePortletEntity entity, Map settings, Log log)
+ JSEntity exportEntityPref(PortletEntity entity, Map settings, Log log)
{
JSEntity jsEntity = null;
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletentity/TestPortletEntityDAO.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletentity/TestPortletEntityDAO.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletentity/TestPortletEntityDAO.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletentity/TestPortletEntityDAO.java Thu Oct 16 11:18:59 2008
@@ -25,8 +25,8 @@
import org.apache.jetspeed.Jetspeed;
import org.apache.jetspeed.components.portletregistry.PortletRegistry;
import org.apache.jetspeed.components.util.DatasourceEnabledSpringTestCase;
+import org.apache.jetspeed.container.PortletEntity;
import org.apache.jetspeed.engine.MockJetspeedEngine;
-import org.apache.jetspeed.om.common.portlet.MutablePortletEntity;
import org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite;
import org.apache.jetspeed.om.common.preference.PreferenceComposite;
import org.apache.jetspeed.om.common.preference.PreferenceSetComposite;
@@ -100,7 +100,7 @@
while (pi.hasNext())
{
pd = (PortletDefinitionComposite) pi.next();
- assertTrue("Portlet Def not found", pd.getName().equals("EntityTestPortlet"));
+ assertTrue("Portlet Def not found", pd.getPortletName().equals("EntityTestPortlet"));
}
assertNotNull("Portlet Def is null", pd);
@@ -109,7 +109,7 @@
mockf1.expects(new InvokeAtLeastOnceMatcher()).method("getId").will(new ReturnStub(TEST_ENTITY));
ContentFragment f1 = new ContentFragmentTestImpl((Fragment) mockf1.proxy(), new HashMap());
- MutablePortletEntity entity = entityAccess
+ PortletEntity entity = entityAccess
.generateEntityFromFragment(new ContentFragmentTestImpl(f1, new HashMap()));
PreferenceSetComposite prefs = (PreferenceSetComposite) entity.getPreferenceSet();
prefs.remove("pref1");
@@ -206,7 +206,7 @@
assertNull(pref2);
- MutablePortletEntity entity2 = entityAccess.getPortletEntityForFragment(f1);
+ PortletEntity entity2 = entityAccess.getPortletEntityForFragment(f1);
assertTrue("entity id ", entity2.getId().toString().equals(TEST_ENTITY));
assertNotNull("entity's portlet ", entity2.getPortletDefinition());
mockf1.verify();
@@ -215,7 +215,7 @@
mockf2.expects(new InvokeAtLeastOnceMatcher()).method("getName").will(new ReturnStub(pd.getUniqueName()));
ContentFragment f2 = new ContentFragmentTestImpl((Fragment) mockf2.proxy(), new HashMap());
- MutablePortletEntity entity5 = entityAccess.newPortletEntityInstance(pd);
+ PortletEntity entity5 = entityAccess.newPortletEntityInstance(pd);
System.out.println("before storing entity: " + entity5.getId());
@@ -223,7 +223,7 @@
System.out.println("store done: " + entity5.getId());
mockf2.expects(new InvokeAtLeastOnceMatcher()).method("getId").will(new ReturnStub(entity5.getId().toString()));
- MutablePortletEntity entity6 = entityAccess.getPortletEntityForFragment(f2);
+ PortletEntity entity6 = entityAccess.getPortletEntityForFragment(f2);
assertNotNull(entity6);
System.out.println("reget : " + entity6.getId());
@@ -234,7 +234,7 @@
{
JetspeedObjectID objId = JetspeedObjectID.createFromString(TEST_ENTITY);
- MutablePortletEntity entity = entityAccess.getPortletEntity(objId);
+ PortletEntity entity = entityAccess.getPortletEntity(objId);
System.out.println("entity == " + entity);
if (entity != null)
@@ -265,8 +265,8 @@
webApp.addDisplayName(Locale.FRENCH, "Display Name: Le fromage est dans mon pantalon!");
PortletDefinitionComposite portlet = new PortletDefinitionImpl();
- portlet.setClassName("org.apache.Portlet");
- portlet.setName(TEST_PORTLET);
+ portlet.setPortletClass("org.apache.Portlet");
+ portlet.setPortletName(TEST_PORTLET);
portlet.addDescription(Locale.getDefault(), "Portlet description.");
portlet.addDisplayName(Locale.getDefault(), "Portlet display Name.");
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/AbstractRegistryTest.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/AbstractRegistryTest.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/AbstractRegistryTest.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/AbstractRegistryTest.java Thu Oct 16 11:18:59 2008
@@ -25,7 +25,7 @@
import org.apache.jetspeed.engine.MockJetspeedEngine;
import org.apache.jetspeed.om.common.DublinCore;
import org.apache.jetspeed.om.common.GenericMetadata;
-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.DublinCoreImpl;
import org.apache.jetspeed.om.portlet.impl.PortletDefinitionImpl;
@@ -118,7 +118,7 @@
protected void verifyData(boolean afterUpdates) throws Exception
{
- MutablePortletApplication app;
+ PortletApplication app;
WebApplicationDefinitionImpl webApp;
PortletDefinitionComposite portlet;
@@ -158,7 +158,7 @@
validateDublinCore(portlet.getMetadata());
assertNotNull("Portlet Application was not set in the portlet defintion.", portlet
- .getPortletApplicationDefinition());
+ .getApplication());
assertNotNull("French description was not materialized for the web app.", webApp.getDescription(Locale.FRENCH));
assertNotNull("French display name was not materialized for the web app.", webApp.getDisplayName(Locale.FRENCH));
assertNotNull("description was not materialized for the portlet.", portlet.getDescription(Locale.getDefault()));
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/TestPortletRegistryDAO.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/TestPortletRegistryDAO.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/TestPortletRegistryDAO.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/TestPortletRegistryDAO.java Thu Oct 16 11:18:59 2008
@@ -33,7 +33,7 @@
import org.apache.jetspeed.om.common.UserAttribute;
import org.apache.jetspeed.om.common.UserAttributeRef;
import org.apache.jetspeed.om.common.portlet.ContentTypeComposite;
-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.common.preference.PreferenceComposite;
import org.apache.jetspeed.om.impl.DublinCoreImpl;
@@ -45,7 +45,7 @@
import org.apache.jetspeed.om.portlet.impl.PortletDefinitionImpl;
import org.apache.jetspeed.om.servlet.impl.WebApplicationDefinitionImpl;
import org.apache.jetspeed.util.JetspeedLocale;
-import org.apache.pluto.om.common.PreferenceSetCtrl;
+import org.apache.pluto.om.portlet.PreferenceSetCtrl;
import org.apache.pluto.om.portlet.PortletApplicationDefinition;
/**
@@ -184,8 +184,8 @@
webApp.addDisplayName(Locale.FRENCH, "Display Name: Le fromage est dans mon pantalon!");
PortletDefinitionComposite portlet = new PortletDefinitionImpl();
- portlet.setClassName("org.apache.Portlet");
- portlet.setName("Portlet 1");
+ portlet.setPortletClass("org.apache.Portlet");
+ portlet.setPortletName("Portlet 1");
portlet.addDescription(Locale.getDefault(), "POrtlet description.");
portlet.addDisplayName(Locale.getDefault(), "Portlet display Name.");
@@ -221,7 +221,7 @@
protected void verifyData(boolean afterUpdates) throws Exception
{
- MutablePortletApplication app;
+ PortletApplication app;
WebApplicationDefinitionImpl webApp;
PortletDefinitionComposite portlet;
@@ -266,7 +266,7 @@
validateDublinCore(portlet.getMetadata());
assertNotNull("Portlet Application was not set in the portlet defintion.", portlet
- .getPortletApplicationDefinition());
+ .getApplication());
assertNotNull("French description was not materialized for the web app.", webApp.getDescription(Locale.FRENCH));
assertNotNull("French display name was not materialized for the web app.", webApp.getDisplayName(Locale.FRENCH));
assertNotNull("description was not materialized for the portlet.", portlet.getDescription(Locale.getDefault()));
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/TestRegistryCache.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/TestRegistryCache.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/TestRegistryCache.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/TestRegistryCache.java Thu Oct 16 11:18:59 2008
@@ -30,7 +30,7 @@
import org.apache.jetspeed.om.common.UserAttribute;
import org.apache.jetspeed.om.common.UserAttributeRef;
import org.apache.jetspeed.om.common.portlet.ContentTypeComposite;
-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.common.preference.PreferenceComposite;
import org.apache.jetspeed.om.impl.JetspeedServiceReferenceImpl;
@@ -41,7 +41,7 @@
import org.apache.jetspeed.om.portlet.impl.PortletDefinitionImpl;
import org.apache.jetspeed.om.servlet.impl.WebApplicationDefinitionImpl;
import org.apache.jetspeed.util.JetspeedLocale;
-import org.apache.pluto.om.common.PreferenceSetCtrl;
+import org.apache.pluto.om.portlet.PreferenceSetCtrl;
import org.apache.pluto.om.portlet.PortletApplicationDefinition;
/**
@@ -75,14 +75,14 @@
// impl not complete
public void xtestProxy() throws Exception
{
- MutablePortletApplication app = portletRegistry.getPortletApplication("PA-001");
- MutablePortletApplication cached = MutablePortletApplicationProxy.createProxy(app);
- if (cached instanceof MutablePortletApplication)
+ PortletApplication app = portletRegistry.getPortletApplication("PA-001");
+ PortletApplication cached = PortletApplicationProxyImpl.createProxy(app);
+ if (cached instanceof PortletApplication)
System.out.println("ISA Mutable");
if (cached instanceof PortletApplicationProxy)
System.out.println("ISA Mutable Proxy");
PortletApplicationProxy proxy = (PortletApplicationProxy)cached;
- MutablePortletApplication two = proxy.getRealApplication();
+ PortletApplication two = proxy.getRealApplication();
proxy.setRealApplication(two);
System.out.println("Two is " + two);
assertEquals(app, two);
@@ -91,14 +91,14 @@
public void testCache() throws Exception
{
assertNotNull(portletRegistry);
- MutablePortletApplication one = portletRegistry.getPortletApplication("PA-001");
- MutablePortletApplication two = portletRegistry.getPortletApplication("PA-001");
+ PortletApplication one = portletRegistry.getPortletApplication("PA-001");
+ PortletApplication two = portletRegistry.getPortletApplication("PA-001");
assertEquals(one, two);
PortletDefinitionComposite def = portletRegistry.getPortletDefinitionByUniqueName("PA-001::Portlet-1");
assertNotNull(def);
assertEquals(def.getPortletApplicationDefinition(), one);
assertEquals(def, two.getPortletDefinitions().iterator().next());
- MutablePortletApplication o = (MutablePortletApplication)portletRegistry.getPortletApplications().iterator().next();
+ PortletApplication o = (PortletApplication)portletRegistry.getPortletApplications().iterator().next();
assertEquals(one, o);
assertEquals(portletRegistry.getAllPortletDefinitions().iterator().next(), def);
}
@@ -133,8 +133,8 @@
webApp.addDisplayName(Locale.FRENCH, "Display Name: Le fromage est dans mon pantalon!");
PortletDefinitionComposite portlet = new PortletDefinitionImpl();
- portlet.setClassName("org.apache.Portlet");
- portlet.setName("Portlet-1");
+ portlet.setPortletClass("org.apache.Portlet");
+ portlet.setPortletName("Portlet-1");
portlet.addDescription(Locale.getDefault(), "POrtlet description.");
portlet.addDisplayName(Locale.getDefault(), "Portlet display Name.");
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/direct/TestRegistryDirectAll.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/direct/TestRegistryDirectAll.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/direct/TestRegistryDirectAll.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/direct/TestRegistryDirectAll.java Thu Oct 16 11:18:59 2008
@@ -41,7 +41,7 @@
import org.apache.jetspeed.om.portlet.impl.PortletDefinitionImpl;
import org.apache.jetspeed.om.servlet.impl.WebApplicationDefinitionImpl;
import org.apache.jetspeed.util.JetspeedLocale;
-import org.apache.pluto.om.common.PreferenceSetCtrl;
+import org.apache.pluto.om.portlet.PreferenceSetCtrl;
/**
*
@@ -104,8 +104,8 @@
webApp.addDisplayName(Locale.FRENCH, "Display Name: Le fromage est dans mon pantalon!");
PortletDefinitionComposite portlet = new PortletDefinitionImpl();
- portlet.setClassName("org.apache.Portlet");
- portlet.setName("Portlet 1");
+ portlet.setPortletClass("org.apache.Portlet");
+ portlet.setPortletName("Portlet 1");
portlet.addDescription(Locale.getDefault(), "Portlet description.");
portlet.addDisplayName(Locale.getDefault(), "Portlet display Name.");
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/direct/TestRegistryDirectPart1a.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/direct/TestRegistryDirectPart1a.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/direct/TestRegistryDirectPart1a.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/direct/TestRegistryDirectPart1a.java Thu Oct 16 11:18:59 2008
@@ -41,7 +41,7 @@
import org.apache.jetspeed.om.portlet.impl.PortletDefinitionImpl;
import org.apache.jetspeed.om.servlet.impl.WebApplicationDefinitionImpl;
import org.apache.jetspeed.util.JetspeedLocale;
-import org.apache.pluto.om.common.PreferenceSetCtrl;
+import org.apache.pluto.om.portlet.PreferenceSetCtrl;
/**
*
@@ -101,8 +101,8 @@
webApp.addDisplayName(Locale.FRENCH, "Display Name: Le fromage est dans mon pantalon!");
PortletDefinitionComposite portlet = new PortletDefinitionImpl();
- portlet.setClassName("org.apache.Portlet");
- portlet.setName("Portlet 1");
+ portlet.setPortletClass("org.apache.Portlet");
+ portlet.setPortletName("Portlet 1");
portlet.addDescription(Locale.getDefault(), "Portlet description.");
portlet.addDisplayName(Locale.getDefault(), "Portlet display Name.");
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-search/src/main/java/org/apache/jetspeed/search/handlers/pam/PortletApplicationHandler.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-search/src/main/java/org/apache/jetspeed/search/handlers/pam/PortletApplicationHandler.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-search/src/main/java/org/apache/jetspeed/search/handlers/pam/PortletApplicationHandler.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-search/src/main/java/org/apache/jetspeed/search/handlers/pam/PortletApplicationHandler.java Thu Oct 16 11:18:59 2008
@@ -21,7 +21,7 @@
import org.apache.commons.collections.MultiHashMap;
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.AbstractObjectHandler;
import org.apache.jetspeed.search.BaseParsedObject;
import org.apache.jetspeed.search.ParsedObject;
@@ -46,10 +46,10 @@
{
BaseParsedObject result = null;
- if(o instanceof MutablePortletApplication)
+ if(o instanceof PortletApplication)
{
result = new BaseParsedObject();
- MutablePortletApplication pa = (MutablePortletApplication) o;
+ PortletApplication pa = (PortletApplication) o;
result.setDescription(pa.getDescription());
result.setTitle(pa.getName());
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-search/src/main/java/org/apache/jetspeed/search/handlers/pam/PortletDefinitionHandler.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-search/src/main/java/org/apache/jetspeed/search/handlers/pam/PortletDefinitionHandler.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-search/src/main/java/org/apache/jetspeed/search/handlers/pam/PortletDefinitionHandler.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-search/src/main/java/org/apache/jetspeed/search/handlers/pam/PortletDefinitionHandler.java Thu Oct 16 11:18:59 2008
@@ -28,9 +28,9 @@
import org.apache.jetspeed.search.BaseParsedObject;
import org.apache.jetspeed.search.ParsedObject;
import org.apache.jetspeed.util.JetspeedLocale;
-import org.apache.pluto.om.common.Description;
-import org.apache.pluto.om.common.DisplayName;
-import org.apache.pluto.om.common.Language;
+import org.apache.pluto.om.portlet.Language;
+import org.apache.pluto.om.portlet.Description;
+import org.apache.pluto.om.portlet.DisplayName;
/**
* @author <a href="mailto: jford@apache.org">Jeremy Ford</a>
@@ -70,7 +70,7 @@
//TODO: this is common to PAs as well, possible refactor
MultiHashMap fieldMap = new MultiHashMap();
- fieldMap.put(ID, pd.getName());
+ fieldMap.put(ID, pd.getPortletName());
PortletApplication pa = (PortletApplication)pd.getPortletApplicationDefinition();
fieldMap.put(PORTLET_APPLICATION, pa.getName());
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-statistics/src/test/java/org/apache/jetspeed/statistics/TestStatistics.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-statistics/src/test/java/org/apache/jetspeed/statistics/TestStatistics.java?rev=705312&r1=705311&r2=705312&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-statistics/src/test/java/org/apache/jetspeed/statistics/TestStatistics.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-statistics/src/test/java/org/apache/jetspeed/statistics/TestStatistics.java Thu Oct 16 11:18:59 2008
@@ -161,7 +161,7 @@
app.setName("MyApp");
PortletDefinitionImpl portlet = new PortletDefinitionImpl();
portlet.setPortletApplicationDefinition(app);
- portlet.setName("TestPortlet");
+ portlet.setPortletName("TestPortlet");
portlet.setPortletApplicationDefinition(app);
long elapsedTime = 123;
statistics.logPortletAccess(request, portlet.getUniqueName(), "401",
@@ -211,7 +211,7 @@
app.setName("MyApp");
PortletDefinitionImpl portlet = new PortletDefinitionImpl();
portlet.setPortletApplicationDefinition(app);
- portlet.setName("TestPortlet");
+ portlet.setPortletName("TestPortlet");
portlet.setPortletApplicationDefinition(app);
long elapsedTime = 123 + i;
//System.out.println("logging something, number "+i);
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/aggregator/ContentDispatcherCtrl.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/aggregator/ContentDispatcherCtrl.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/aggregator/ContentDispatcherCtrl.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/aggregator/ContentDispatcherCtrl.java Thu Oct 16 11:18:59 2008
@@ -20,7 +20,7 @@
import org.apache.jetspeed.om.page.Fragment;
import org.apache.jetspeed.request.RequestContext;
-import org.apache.pluto.om.window.PortletWindow;
+import org.apache.jetspeed.container.PortletWindow;
/**
* <p>The ContentDispatcher control interface used for updating the content of
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/aggregator/PortletRenderer.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/aggregator/PortletRenderer.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/aggregator/PortletRenderer.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/aggregator/PortletRenderer.java Thu Oct 16 11:18:59 2008
@@ -24,7 +24,7 @@
import org.apache.jetspeed.container.window.FailedToRetrievePortletWindow;
import org.apache.jetspeed.om.page.ContentFragment;
import org.apache.jetspeed.request.RequestContext;
-import org.apache.pluto.om.window.PortletWindow;
+import org.apache.jetspeed.container.PortletWindow;
/**
* <h4>PortletRendererService<br />
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/aggregator/PortletTrackingManager.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/aggregator/PortletTrackingManager.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/aggregator/PortletTrackingManager.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/aggregator/PortletTrackingManager.java Thu Oct 16 11:18:59 2008
@@ -18,7 +18,7 @@
import java.util.List;
-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/jetspeed-api/src/main/java/org/apache/jetspeed/aggregator/RenderingJob.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/aggregator/RenderingJob.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/aggregator/RenderingJob.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/aggregator/RenderingJob.java Thu Oct 16 11:18:59 2008
@@ -22,7 +22,7 @@
import org.apache.jetspeed.om.page.ContentFragment;
import org.apache.jetspeed.request.RequestContext;
import org.apache.pluto.om.portlet.PortletDefinition;
-import org.apache.pluto.om.window.PortletWindow;
+import org.apache.jetspeed.container.PortletWindow;
/**
* Worker thread processes jobs and notify its WorkerMonitor when completed.
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/cache/PortletWindowCache.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/cache/PortletWindowCache.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/cache/PortletWindowCache.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/cache/PortletWindowCache.java Thu Oct 16 11:18:59 2008
@@ -19,8 +19,8 @@
import java.util.List;
import java.util.Set;
-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;
/**
* {@link org.apache.jetspeed.cache.impl.PortletWindowCache} is an abstraction of a caching mechanism for use
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/cluster/NodeInformation.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/cluster/NodeInformation.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/cluster/NodeInformation.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/cluster/NodeInformation.java Thu Oct 16 11:18:59 2008
@@ -17,7 +17,6 @@
package org.apache.jetspeed.cluster;
import java.util.Date;
-import org.apache.pluto.om.common.ObjectID;
/**
* Node Information Interface
@@ -41,7 +40,6 @@
*/
public void setContextName(String contextName);
-
/**
* Getter for ObjectID
* @return
@@ -53,13 +51,6 @@
*
* @param id
*/
- public void setId(ObjectID id);
-
- /**
- * setter for ObjectID
- *
- * @param id
- */
public void setId(Long id);
/**
* setter for ObjectID
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/components/portletentity/PortletEntityAccessComponent.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/portletentity/PortletEntityAccessComponent.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/portletentity/PortletEntityAccessComponent.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/components/portletentity/PortletEntityAccessComponent.java Thu Oct 16 11:18:59 2008
@@ -18,11 +18,9 @@
import java.util.Collection;
-import org.apache.jetspeed.om.common.portlet.MutablePortletEntity;
import org.apache.jetspeed.om.page.ContentFragment;
import org.apache.jetspeed.om.page.Fragment;
-import org.apache.pluto.om.common.ObjectID;
-import org.apache.pluto.om.entity.PortletEntity;
+import org.apache.jetspeed.container.PortletEntity;
import org.apache.pluto.om.portlet.PortletDefinition;
/**
@@ -45,9 +43,7 @@
* @param id
* @return
*/
- MutablePortletEntity getPortletEntity(ObjectID id);
-
- MutablePortletEntity getPortletEntity(String id);
+ PortletEntity getPortletEntity(String id);
/**
*
@@ -59,7 +55,7 @@
* @return
* @throws PortletEntityNotGeneratedException
*/
- MutablePortletEntity generateEntityFromFragment(ContentFragment fragment) throws PortletEntityNotGeneratedException;
+ PortletEntity generateEntityFromFragment(ContentFragment fragment) throws PortletEntityNotGeneratedException;
/**
*
@@ -70,7 +66,7 @@
* @param fragment
* @return
*/
- ObjectID generateEntityKey(Fragment fragment);
+ String generateEntityKey(Fragment fragment);
/**
*
@@ -81,8 +77,8 @@
* @param portletDefinition
* @return
*/
- MutablePortletEntity newPortletEntityInstance(PortletDefinition portletDefinition);
- MutablePortletEntity newPortletEntityInstance(PortletDefinition portletDefinition, String id);
+ PortletEntity newPortletEntityInstance(PortletDefinition portletDefinition);
+ PortletEntity newPortletEntityInstance(PortletDefinition portletDefinition, String id);
/**
*
@@ -94,7 +90,7 @@
* @return
* @throws PortletEntityNotStoredException
*/
- MutablePortletEntity getPortletEntityForFragment(ContentFragment fragment) throws PortletEntityNotStoredException;
+ PortletEntity getPortletEntityForFragment(ContentFragment fragment) throws PortletEntityNotStoredException;
/**
*
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/components/portletpreferences/PortletPreferencesProvider.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/portletpreferences/PortletPreferencesProvider.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/portletpreferences/PortletPreferencesProvider.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/components/portletpreferences/PortletPreferencesProvider.java Thu Oct 16 11:18:59 2008
@@ -18,7 +18,7 @@
import java.util.Iterator;
-import org.apache.jetspeed.om.common.portlet.MutablePortletEntity;
+import org.apache.jetspeed.container.PortletEntity;
import org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite;
import org.apache.jetspeed.om.common.preference.PreferenceSetComposite;
@@ -26,10 +26,10 @@
{
void init() throws Exception;
public PreferenceSetComposite getPreferenceSet(PortletDefinitionComposite pd);
- public PreferenceSetComposite getPreferenceSet(MutablePortletEntity pe);
- public PreferenceSetComposite getPreferenceSet(MutablePortletEntity pe, String userName);
- public Iterator<String> getUserNames(MutablePortletEntity pe);
+ public PreferenceSetComposite getPreferenceSet(PortletEntity pe);
+ public PreferenceSetComposite getPreferenceSet(PortletEntity pe, String userName);
+ public Iterator<String> getUserNames(PortletEntity pe);
public void savePreferenceSet(PortletDefinitionComposite pd, PreferenceSetComposite preferenceSet);
- public void savePreferenceSet(MutablePortletEntity pe, PreferenceSetComposite preferenceSet);
- public void savePreferenceSet(MutablePortletEntity pe, String userName, PreferenceSetComposite preferenceSet);
+ public void savePreferenceSet(PortletEntity pe, PreferenceSetComposite preferenceSet);
+ public void savePreferenceSet(PortletEntity pe, String userName, PreferenceSetComposite preferenceSet);
}
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/components/portletregistry/FailedToStorePortletDefinitionException.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/FailedToStorePortletDefinitionException.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/FailedToStorePortletDefinitionException.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/components/portletregistry/FailedToStorePortletDefinitionException.java Thu Oct 16 11:18:59 2008
@@ -76,13 +76,13 @@
public FailedToStorePortletDefinitionException( PortletDefinition portlet, Throwable nested )
{
- this("Unable to store portlet definition "+portlet.getName()+". Reason: "+nested.toString(), nested);
+ this("Unable to store portlet definition "+portlet.getPortletName()+". Reason: "+nested.toString(), nested);
}
public FailedToStorePortletDefinitionException( PortletDefinition portlet, String reason )
{
- this("Unable to store portlet definition "+portlet.getName()+". Resaon: "+reason);
+ this("Unable to store portlet definition "+portlet.getPortletName()+". Resaon: "+reason);
}
}
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/components/portletregistry/PortletRegistry.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/PortletRegistry.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/PortletRegistry.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/components/portletregistry/PortletRegistry.java Thu Oct 16 11:18:59 2008
@@ -19,10 +19,10 @@
import java.util.Collection;
import java.util.Locale;
-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.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.PortletApplicationDefinition;
import org.apache.pluto.om.portlet.PortletDefinition;
@@ -46,16 +46,11 @@
Collection getAllPortletDefinitions();
/**
- * Retreives a PortletApplication by it's unique ObjectID.
- * The unqiue ObjectID is generally a function of the native
- * storage mechanism of the container whether it be auto-generated
- * by an RDBMS, O/R tool or some other mechanism.
- * This is different than the portlet applaiction's unique indentfier
- * which is specified within the portlet.xml
+ * Retreives a PortletApplication by it's id.
* @param id
* @return
*/
- MutablePortletApplication getPortletApplication( ObjectID id );
+ PortletApplication getPortletApplicationById( String id );
/**
* Retreives a PortletApplication by it's unique name. We use
@@ -64,7 +59,7 @@
* @param id
* @return PortletApplicationComposite
*/
- MutablePortletApplication getPortletApplication( String name );
+ PortletApplication getPortletApplication( String name );
/**
* Locates a portlet application using it's unique <code>identifier</code>
@@ -72,7 +67,7 @@
* @param identifier Unique id for this portlet application
* @return portlet application matching this unique id.
*/
- MutablePortletApplication getPortletApplicationByIdentifier( String identifier );
+ PortletApplication getPortletApplicationByIdentifier( String identifier );
Collection getPortletApplications();
@@ -161,7 +156,7 @@
* @return boolean <code>true</code> if a portlet with this identity
* is alreay registered, <code>false</code> if it has not.
*/
- boolean portletDefinitionExists( String portletName, MutablePortletApplication app );
+ boolean portletDefinitionExists( String portletName, PortletApplication app );
/**
* Creates a new <code>PortletApplicationDefinition</code>
@@ -193,6 +188,4 @@
void addRegistryListener(RegistryEventListener listener);
void removeRegistryEventListner(RegistryEventListener listener);
-
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org