Author: ate
Date: Mon Apr 21 00:36:07 2008
New Revision: 650040
URL: http://svn.apache.org/viewvc?rev=650040&view=rev
Log:
Dropping unused interface methods and their related implementation methods
(and also never have been used since their definition back in early 2004).
These methods concerned creating/accessing PortletWindows/PortletEntites
specifically *per user*, which we never did or do within Jetspeed.
PortletWindow *state* is by itself already scoped to a user and a PortletEntity
its *preferences* are scoped to a user as well, but never the PortletWindow or
PortletEntity itself.
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/window/impl/PortletWindowAccessorImpl.java
portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletentity/PersistenceBrokerPortletEntityAccess.java
portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/components/portletentity/PortletEntityAccessComponent.java
portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/container/window/PortletWindowAccessor.java
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/window/impl/PortletWindowAccessorImpl.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/window/impl/PortletWindowAccessorImpl.java?rev=650040&r1=650039&r2=650040&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/window/impl/PortletWindowAccessorImpl.java
(original)
+++
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/window/impl/PortletWindowAccessorImpl.java
Mon Apr 21 00:36:07 2008
@@ -185,40 +185,18 @@
}
}
- public PortletWindow getPortletWindow(ContentFragment fragment, String
principal) throws FailedToRetrievePortletWindow, FailedToCreateWindowException,
PortletEntityNotStoredException
- {
- ArgUtil.assertNotNull(ContentFragment.class, fragment, this,
"getPortletWindow(Fragment fragment, String principal)");
- ArgUtil.assertNotNull(String.class, principal, this,
"getPortletWindow(Fragment fragment, String principal)");
- PortletWindow portletWindow = getWindowFromCache(fragment);
- if (portletWindow == null)
- {
- return createPortletWindow(fragment, principal);
- }
- else
- {
- // make sure the window has the most up-to-date portlet entity
- validateWindow(fragment, portletWindow);
- }
- return portletWindow;
- }
-
private PortletWindow createPortletWindow(ContentFragment fragment) throws
FailedToCreateWindowException, PortletEntityNotStoredException
- {
- return createPortletWindow(fragment, null);
- }
-
- private PortletWindow createPortletWindow(ContentFragment fragment, String
principal) throws FailedToCreateWindowException, PortletEntityNotStoredException
{
PortletWindow portletWindow = new PortletWindowImpl(fragment.getId());
boolean temporaryWindow = false;
- MutablePortletEntity portletEntity =
entityAccessor.getPortletEntityForFragment(fragment, principal);
+ MutablePortletEntity portletEntity =
entityAccessor.getPortletEntityForFragment(fragment);
if (portletEntity == null)
{
log.info("No portlet entity defined for fragment ID
"+fragment.getId()+" attempting to auto-generate...");
try
{
- portletEntity =
entityAccessor.generateEntityFromFragment(fragment, principal);
+ portletEntity =
entityAccessor.generateEntityFromFragment(fragment);
// not portlet definition most likely means that the portlet
has not been deployed so dont worry about storing off the entity
if(isValidPortletEntity(portletEntity))
{
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletentity/PersistenceBrokerPortletEntityAccess.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletentity/PersistenceBrokerPortletEntityAccess.java?rev=650040&r1=650039&r2=650040&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletentity/PersistenceBrokerPortletEntityAccess.java
(original)
+++
portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletentity/PersistenceBrokerPortletEntityAccess.java
Mon Apr 21 00:36:07 2008
@@ -124,18 +124,16 @@
* generateEntityFromFragment
* </p>
*
- * @see
org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent#generateEntityFromFragment(org.apache.jetspeed.om.page.Fragment,
- * java.lang.String)
+ * @see
org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent#generateEntityFromFragment(org.apache.jetspeed.om.page.Fragment)
* @param fragment
- * @param principal
* @return @throws
* PortletEntityNotGeneratedException
*/
- public MutablePortletEntity generateEntityFromFragment( ContentFragment
fragment, String principal )
+ public MutablePortletEntity generateEntityFromFragment( ContentFragment
fragment)
throws PortletEntityNotGeneratedException
{
PortletDefinition pd =
registry.getPortletDefinitionByUniqueName(fragment.getName());
- ObjectID entityKey = generateEntityKey(fragment, principal);
+ ObjectID entityKey = generateEntityKey(fragment);
MutablePortletEntity portletEntity = null;
if (pd != null)
@@ -163,23 +161,6 @@
/**
*
* <p>
- * generateEntityFromFragment
- * </p>
- *
- * @see
org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent#generateEntityFromFragment(org.apache.jetspeed.om.page.Fragment)
- * @param fragment
- * @return @throws
- * PortletEntityNotGeneratedException
- */
- public MutablePortletEntity generateEntityFromFragment( ContentFragment
fragment )
- throws PortletEntityNotGeneratedException
- {
- return generateEntityFromFragment(fragment, null);
- }
-
- /**
- *
- * <p>
* generateEntityKey
* </p>
*
@@ -189,16 +170,9 @@
* @param principal
* @return
*/
- public ObjectID generateEntityKey( Fragment fragment, String principal )
+ public ObjectID generateEntityKey( Fragment fragment)
{
- StringBuffer key = new StringBuffer();
- if (principal != null && principal.length() > 0)
- {
- key.append(principal);
- key.append("/");
- }
- key.append(fragment.getId());
- return JetspeedObjectID.createFromString(key.toString());
+ return JetspeedObjectID.createFromString(fragment.getId());
}
/**
@@ -312,14 +286,9 @@
return getPortletEntity(oid);
}
- public MutablePortletEntity getPortletEntityForFragment( ContentFragment
fragment, String principal ) throws PortletEntityNotStoredException
- {
- return getPortletEntity(generateEntityKey(fragment, principal),
fragment);
- }
-
public MutablePortletEntity getPortletEntityForFragment( ContentFragment
fragment ) throws PortletEntityNotStoredException
{
- return getPortletEntity(generateEntityKey(fragment, null), fragment);
+ return getPortletEntity(generateEntityKey(fragment), fragment);
}
public MutablePortletEntity newPortletEntityInstance( PortletDefinition
portletDefinition )
Modified:
portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/components/portletentity/PortletEntityAccessComponent.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/components/portletentity/PortletEntityAccessComponent.java?rev=650040&r1=650039&r2=650040&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/components/portletentity/PortletEntityAccessComponent.java
(original)
+++
portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/components/portletentity/PortletEntityAccessComponent.java
Mon Apr 21 00:36:07 2008
@@ -58,19 +58,6 @@
* </p>
*
* @param fragment
- * @param principal
- * @return
- * @throws PortletEntityNotGeneratedException
- */
- MutablePortletEntity generateEntityFromFragment(ContentFragment
fragment, String principal) throws PortletEntityNotGeneratedException;
-
- /**
- *
- * <p>
- * generateEntityFromFragment
- * </p>
- *
- * @param fragment
* @return
* @throws PortletEntityNotGeneratedException
*/
@@ -83,10 +70,9 @@
* </p>
*
* @param fragment
- * @param principal
* @return
*/
- ObjectID generateEntityKey(Fragment fragment, String principal);
+ ObjectID generateEntityKey(Fragment fragment);
/**
*
@@ -99,19 +85,6 @@
*/
MutablePortletEntity newPortletEntityInstance(PortletDefinition
portletDefinition);
MutablePortletEntity newPortletEntityInstance(PortletDefinition
portletDefinition, String id);
-
- /**
- *
- * <p>
- * getPortletEntityForFragment
- * </p>
- *
- * @param fragment
- * @param principal
- * @return
- * @throws PortletEntityNotStoredException
- */
- MutablePortletEntity getPortletEntityForFragment(ContentFragment
fragment, String principal) throws PortletEntityNotStoredException;
/**
*
Modified:
portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/container/window/PortletWindowAccessor.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/container/window/PortletWindowAccessor.java?rev=650040&r1=650039&r2=650040&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/container/window/PortletWindowAccessor.java
(original)
+++
portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/container/window/PortletWindowAccessor.java
Mon Apr 21 00:36:07 2008
@@ -43,18 +43,6 @@
PortletWindow getPortletWindow(ContentFragment fragment) throws
FailedToRetrievePortletWindow, PortletEntityNotStoredException;
/**
- * Get the portlet window for a fragment and given principal
- * @param fragment
- * @param principal
- * @return
- * @throws FailedToCreateWindowException
- * @throws FailedToRetrievePortletWindow
- * @throws PortletEntityNotStoredException
- * @throws InconsistentWindowStateException If the window references a
non-existsent PortletEntity
- */
- PortletWindow getPortletWindow(ContentFragment fragment, String principal)
throws FailedToCreateWindowException, FailedToRetrievePortletWindow,
PortletEntityNotStoredException;
-
- /**
* Lookup a portlet window in the cache
* If not found, return null
*
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
