portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r774751 - in /portals/jetspeed-2: applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/tracking/ applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/serializer/resources/ portal/trunk/components/jet...
Date Thu, 14 May 2009 12:48:55 GMT
Author: ate
Date: Thu May 14 12:48:53 2009
New Revision: 774751

URL: http://svn.apache.org/viewvc?rev=774751&view=rev
Log:
JS2-1013: Remove obsolete usage of and dependency on Pluto provided PortletEntity interface
as it is no longer used within Jetspeed either
See: http://issues.apache.org/jira/browse/JS2-1013

Modified:
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/tracking/PortletTrackingPortlet.java
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/tracking/WicketPortletTrackingPortlet.java
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/serializer/resources/PortalDataSerializer.properties
    portals/jetspeed-2/portal/trunk/components/jetspeed-cm/src/test/java/org/apache/jetspeed/cache/general/cache-test.xml
    portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/invoker/JetspeedPortletInvokerService.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/window/MockPortletWindow.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-registry/pom.xml
    portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/JETSPEED-INF/ojb/registry_repository.xml
    portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletentity/PersistenceBrokerPortletEntityAccess.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletentity/PortletEntityImpl.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/window/impl/PortletWindowImpl.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/serializer/JetspeedRegistrySerializer.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/direct/TestRegistryDirectAll.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/test/resources/registry-test.xml
    portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/src/main/java/org/apache/jetspeed/statistics/impl/BatchedPageStatistics.java
  (contents, props changed)
    portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/src/main/java/org/apache/jetspeed/statistics/impl/BatchedPortletStatistics.java
  (contents, props changed)
    portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/src/main/java/org/apache/jetspeed/statistics/impl/BatchedStatistics.java
  (contents, props changed)
    portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/src/main/java/org/apache/jetspeed/statistics/impl/BatchedUserStatistics.java
  (contents, props changed)
    portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/src/main/java/org/apache/jetspeed/statistics/impl/PortalStatisticsImpl.java
  (contents, props changed)
    portals/jetspeed-2/portal/trunk/etc/registration/assembly/registry.xml
    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/PortletEntity.java
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/ddl-schema/registry-schema.xml
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/ajax.xml
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/versioned-deployment/jetspeed-services.xml
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-services.xml
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/registry.xml
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/serializer.xml
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/static-bean-references.xml
    portals/jetspeed-2/portal/trunk/src/site/xdoc/guides/guide-migration.xml

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/tracking/PortletTrackingPortlet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/tracking/PortletTrackingPortlet.java?rev=774751&r1=774750&r2=774751&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/tracking/PortletTrackingPortlet.java
(original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/tracking/PortletTrackingPortlet.java
Thu May 14 12:48:53 2009
@@ -72,7 +72,7 @@
         {
             PortletWindow window = (PortletWindow)outOfService.next();
             String id = window.getId().toString();
-            PortletDefinition pd = (PortletDefinition)window.getPortletEntity().getPortletDefinition();
+            PortletDefinition pd = window.getPortletDefinition();
             String uniqueName = pd.getUniqueName();
             if (!portlets.containsKey(uniqueName))
             {

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/tracking/WicketPortletTrackingPortlet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/tracking/WicketPortletTrackingPortlet.java?rev=774751&r1=774750&r2=774751&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/tracking/WicketPortletTrackingPortlet.java
(original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/tracking/WicketPortletTrackingPortlet.java
Thu May 14 12:48:53 2009
@@ -123,7 +123,7 @@
         {
             PortletWindow window = outOfService.next();
             String id = window.getId().toString();
-            PortletDefinition pd = (PortletDefinition)window.getPortletEntity().getPortletDefinition();
+            PortletDefinition pd = window.getPortletDefinition();
             String uniqueName = pd.getUniqueName();
             if (!portlets.containsKey(uniqueName))
             {

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/serializer/resources/PortalDataSerializer.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/serializer/resources/PortalDataSerializer.properties?rev=774751&r1=774750&r2=774751&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/serializer/resources/PortalDataSerializer.properties
(original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/serializer/resources/PortalDataSerializer.properties
Thu May 14 12:48:53 2009
@@ -20,8 +20,7 @@
 export.permissions=Permissions (triggers exporting Users/Groups/Roles)
 export.profiling_rules=Profiling Rules
 export.capabilities=Capabilities (mimetypes, mediatypes, capabilities, clients)
-export.portlet_entities=Portlet Entities
-export.user_preferences=User Preferences (triggers exporting Portlet Entities)
+export.user_preferences=User Preferences
 export.action=Export
 
 export.message.exception=Export failed: {0} with message {1}   

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-cm/src/test/java/org/apache/jetspeed/cache/general/cache-test.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-cm/src/test/java/org/apache/jetspeed/cache/general/cache-test.xml?rev=774751&r1=774750&r2=774751&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-cm/src/test/java/org/apache/jetspeed/cache/general/cache-test.xml
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-cm/src/test/java/org/apache/jetspeed/cache/general/cache-test.xml
Thu May 14 12:48:53 2009
@@ -19,10 +19,6 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
     
-  <!--
-    - Application context definition for PortletEntity using Apache OJB.
-	-->
-     
      <!-- define our caching service.  This one uses a simple hashmap and counts method
access
      	- for testing purposes 
        -->

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/invoker/JetspeedPortletInvokerService.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/invoker/JetspeedPortletInvokerService.java?rev=774751&r1=774750&r2=774751&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/invoker/JetspeedPortletInvokerService.java
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/invoker/JetspeedPortletInvokerService.java
Thu May 14 12:48:53 2009
@@ -142,7 +142,7 @@
     protected JetspeedPortletInvoker getInvoker(PortletRequestContext requestContext)
     {
         JetspeedPortletInvoker invoker;
-        PortletDefinition portletDefinition = (PortletDefinition)requestContext.getPortletWindow().getPortletEntity().getPortletDefinition();
+        PortletDefinition portletDefinition = (PortletDefinition)requestContext.getPortletWindow().getPortletDefinition();
         if (portletDefinition.getApplication().getApplicationType() == PortletApplication.LOCAL)
         {
             invoker = new LocalPortletInvoker(portalContext, requestResponseUnwrapper);

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/window/MockPortletWindow.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/window/MockPortletWindow.java?rev=774751&r1=774750&r2=774751&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/window/MockPortletWindow.java
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/window/MockPortletWindow.java
Thu May 14 12:48:53 2009
@@ -32,7 +32,6 @@
 import org.apache.jetspeed.om.portlet.PortletDefinition;
 import org.apache.jetspeed.request.RequestContext;
 import org.apache.jetspeed.util.KeyValue;
-import org.apache.pluto.container.PortletEntity;
 import org.apache.pluto.container.PortletRequestContext;
 import org.apache.pluto.container.PortletResponseContext;
 import org.w3c.dom.Element;
@@ -154,15 +153,6 @@
     }
 
     /* (non-Javadoc)
-     * @see org.apache.pluto.container.PortletWindow#getPortletEntity()
-     */
-    public PortletEntity getPortletEntity()
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /* (non-Javadoc)
      * @see org.apache.pluto.container.PortletWindow#getPortletMode()
      */
     public PortletMode getPortletMode()

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-registry/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-registry/pom.xml?rev=774751&r1=774750&r2=774751&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-registry/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-registry/pom.xml Thu May 14 12:48:53
2009
@@ -126,6 +126,8 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
                     <excludes>
+                        <!-- PortletEntity usage is obsolete -->
+                        <exclude>**/TestPortletEntityDAO.java</exclude>
                         <!--
                             The following tests have been aggregated into
                             TestRegistryDirectAll because the individual

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/JETSPEED-INF/ojb/registry_repository.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/JETSPEED-INF/ojb/registry_repository.xml?rev=774751&r1=774750&r2=774751&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/JETSPEED-INF/ojb/registry_repository.xml
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/JETSPEED-INF/ojb/registry_repository.xml
Thu May 14 12:48:53 2009
@@ -851,7 +851,7 @@
 
  <!--
    - P O R T L E T  E N T I T Y
- -->
+   
      <class-descriptor
       class="org.apache.jetspeed.components.portletentity.PortletEntityImpl"
       table="PORTLET_ENTITY"
@@ -888,6 +888,7 @@
       />
 
   </class-descriptor>
+ -->
 
    <!--
    - P O R T L E T   P R E F E R E N C E S

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=774751&r1=774750&r2=774751&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
Thu May 14 12:48:53 2009
@@ -40,6 +40,7 @@
  * 
  * @author <a href="mailto:weaver@apache.org">Scott T. Weaver </a>
  * @version $Id: PersistenceBrokerPortletEntityAccess.java,v 1.5 2005/04/29 13:59:08 weaver
Exp $
+ * @obsolete
  *  
  */
 public class PersistenceBrokerPortletEntityAccess extends PersistenceBrokerDaoSupport

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletentity/PortletEntityImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletentity/PortletEntityImpl.java?rev=774751&r1=774750&r2=774751&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletentity/PortletEntityImpl.java
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletentity/PortletEntityImpl.java
Thu May 14 12:48:53 2009
@@ -29,6 +29,7 @@
  * @author <a href="mailto:taylor@apache.org">David Sean Taylor </a>
  * @author <a href="mailto:weaver@apache.org">Scott T. Weaver </a>
  * @version $Id: PortletEntityImpl.java,v 1.9 2005/04/29 13:59:08 weaver Exp $
+ * @obsolete
  */
 public class PortletEntityImpl implements PortletEntity
 {   

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/window/impl/PortletWindowImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/window/impl/PortletWindowImpl.java?rev=774751&r1=774750&r2=774751&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/window/impl/PortletWindowImpl.java
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/window/impl/PortletWindowImpl.java
Thu May 14 12:48:53 2009
@@ -40,7 +40,6 @@
 import org.apache.jetspeed.portlet.HeaderPhaseSupportConstants;
 import org.apache.jetspeed.request.RequestContext;
 import org.apache.jetspeed.util.KeyValue;
-import org.apache.pluto.container.PortletEntity;
 import org.apache.pluto.container.PortletRequestContext;
 import org.apache.pluto.container.PortletResponseContext;
 import org.w3c.dom.Element;
@@ -55,7 +54,7 @@
  * @author <a href="mailto:david@bluesunrise.com">David Sean Taylor</a>
  * @version $Id$
  **/
-public class PortletWindowImpl implements PortletWindow, PortletEntity, PortletWindowID,
RenderTrackable
+public class PortletWindowImpl implements PortletWindow, PortletWindowID, RenderTrackable
 {
     private static final long serialVersionUID = 6578938580906866201L;
     
@@ -146,11 +145,6 @@
         return fragment;
     }
     
-    public PortletEntity getPortletEntity()
-    {
-        return pd != null ? this : null;
-    }
-
     /**
      * Checks if the content is instantly rendered from JPT.
      */

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/serializer/JetspeedRegistrySerializer.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/serializer/JetspeedRegistrySerializer.java?rev=774751&r1=774750&r2=774751&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/serializer/JetspeedRegistrySerializer.java
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/serializer/JetspeedRegistrySerializer.java
Thu May 14 12:48:53 2009
@@ -22,7 +22,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent;
 import org.apache.jetspeed.components.portletpreferences.JetspeedPreferenceImpl;
 import org.apache.jetspeed.components.portletpreferences.PortletPreferencesProvider;
 import org.apache.jetspeed.components.portletregistry.PortletRegistry;
@@ -51,7 +50,6 @@
  */
 public class JetspeedRegistrySerializer extends AbstractJetspeedComponentSerializer
 {
-    protected PortletEntityAccessComponent entityAccess;
     protected PortletRegistry registry;
     protected PortletPreferencesProvider prefsProvider;
     protected SearchEngine searchEngine;
@@ -61,11 +59,10 @@
      * @param entityAccess
      * @param searchEngine
      */
-    public JetspeedRegistrySerializer(PortletRegistry registry, PortletEntityAccessComponent
entityAccess, PortletPreferencesProvider prefsProvider,
+    public JetspeedRegistrySerializer(PortletRegistry registry, PortletPreferencesProvider
prefsProvider,
                                       SearchEngine searchEngine)
     {
         this.registry = registry;
-        this.entityAccess = entityAccess;
         this.prefsProvider = prefsProvider;
         this.searchEngine = searchEngine;
     }
@@ -102,7 +99,7 @@
     {
         if (isSettingSet(settings, JetspeedSerializer.KEY_PROCESS_USER_PREFERENCES))
         {
-            log.info("deleting applications and entities");
+            log.info("deleting applications");
             try
             {
                 for (PortletApplication pa : registry.getPortletApplications())
@@ -113,10 +110,6 @@
                         searchEngine.remove(pa);
                         searchEngine.remove(portlets);
                     }
-                    for (PortletDefinition pd : portlets)
-                    {
-                        entityAccess.removePortletEntities(pd);
-                    }
                     registry.removeApplication(pa);
                 }
             }

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/direct/TestRegistryDirectAll.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/direct/TestRegistryDirectAll.java?rev=774751&r1=774750&r2=774751&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/direct/TestRegistryDirectAll.java
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/direct/TestRegistryDirectAll.java
Thu May 14 12:48:53 2009
@@ -89,7 +89,7 @@
         UserAttribute ua = app.addUserAttribute("user.name.family");
         ua.addDescription(lang).setDescription("User Last Name");
 
-        app.addJetspeedServiceReference("PortletEntityAccessComponent");
+//        app.addJetspeedServiceReference("PortletEntityAccessComponent");
         app.addJetspeedServiceReference("PortletRegistryComponent");
 
         addDublinCore(app.getMetadata());

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/test/resources/registry-test.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/test/resources/registry-test.xml?rev=774751&r1=774750&r2=774751&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/test/resources/registry-test.xml
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/test/resources/registry-test.xml
Thu May 14 12:48:53 2009
@@ -107,6 +107,7 @@
         - but this is cleaner as there is no need to ever access the unwrapped object.
     -->
 
+    <!-- PortletEntity is obsolete 
     <bean id="portletEntityAccessImpl" class="org.apache.jetspeed.components.portletentity.PersistenceBrokerPortletEntityAccess">
         <constructor-arg>
             <ref bean="portletRegistry" />
@@ -120,14 +121,14 @@
         <property name="target">
             <ref bean="portletEntityAccessImpl" />
         </property>
-        <!--
+        <!-
             <property name="preInterceptors">
             <list>
             <ref bean="portletEntityCachingAdvisor"/>
             <ref bean="portletEntityRemoveFromCacheAdvisor"/>
             </list>
             </property>
-        -->
+        ->
         <property name="transactionAttributes">
             <props>
                 <prop key="remove*">PROPAGATION_REQUIRED</prop>
@@ -136,5 +137,6 @@
             </props>
         </property>
     </bean>
+    -->
     
 </beans>

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/src/main/java/org/apache/jetspeed/statistics/impl/BatchedPageStatistics.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/src/main/java/org/apache/jetspeed/statistics/impl/BatchedPageStatistics.java?rev=774751&r1=774750&r2=774751&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/src/main/java/org/apache/jetspeed/statistics/impl/BatchedPageStatistics.java
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/src/main/java/org/apache/jetspeed/statistics/impl/BatchedPageStatistics.java
Thu May 14 12:48:53 2009
@@ -29,7 +29,7 @@
  * 
  * @author <a href="mailto:chris@bluesunrise.com">Chris Schaefer </a>
  * @author <a href="mailto:taylor@apache.org">David Sean Taylor </a>
- * @version $Id: TestPortletEntityDAO.java,v 1.3 2005/05/24 14:43:19 ate Exp $
+ * @version $Id$
  */
 public class BatchedPageStatistics extends BatchedStatistics
 {

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/src/main/java/org/apache/jetspeed/statistics/impl/BatchedPageStatistics.java
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/src/main/java/org/apache/jetspeed/statistics/impl/BatchedPortletStatistics.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/src/main/java/org/apache/jetspeed/statistics/impl/BatchedPortletStatistics.java?rev=774751&r1=774750&r2=774751&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/src/main/java/org/apache/jetspeed/statistics/impl/BatchedPortletStatistics.java
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/src/main/java/org/apache/jetspeed/statistics/impl/BatchedPortletStatistics.java
Thu May 14 12:48:53 2009
@@ -33,7 +33,7 @@
  * 
  * @author <a href="mailto:chris@bluesunrise.com">Chris Schaefer </a>
  * @author <a href="mailto:taylor@apache.org">David Sean Taylor </a>
- * @version $Id: TestPortletEntityDAO.java,v 1.3 2005/05/24 14:43:19 ate Exp $
+ * @version $Id$
  */
 public class BatchedPortletStatistics extends BatchedStatistics
 {

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/src/main/java/org/apache/jetspeed/statistics/impl/BatchedPortletStatistics.java
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/src/main/java/org/apache/jetspeed/statistics/impl/BatchedStatistics.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/src/main/java/org/apache/jetspeed/statistics/impl/BatchedStatistics.java?rev=774751&r1=774750&r2=774751&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/src/main/java/org/apache/jetspeed/statistics/impl/BatchedStatistics.java
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/src/main/java/org/apache/jetspeed/statistics/impl/BatchedStatistics.java
Thu May 14 12:48:53 2009
@@ -32,7 +32,7 @@
  * 
  * @author <a href="mailto:chris@bluesunrise.com">Chris Schaefer </a>
  * @author <a href="mailto:taylor@apache.org">David Sean Taylor </a>
- * @version $Id: TestPortletEntityDAO.java,v 1.3 2005/05/24 14:43:19 ate Exp $
+ * @version $Id$
  */
 public abstract class BatchedStatistics implements Runnable
 {

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/src/main/java/org/apache/jetspeed/statistics/impl/BatchedStatistics.java
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/src/main/java/org/apache/jetspeed/statistics/impl/BatchedUserStatistics.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/src/main/java/org/apache/jetspeed/statistics/impl/BatchedUserStatistics.java?rev=774751&r1=774750&r2=774751&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/src/main/java/org/apache/jetspeed/statistics/impl/BatchedUserStatistics.java
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/src/main/java/org/apache/jetspeed/statistics/impl/BatchedUserStatistics.java
Thu May 14 12:48:53 2009
@@ -29,7 +29,7 @@
  * 
  * @author <a href="mailto:chris@bluesunrise.com">Chris Schaefer </a>
  * @author <a href="mailto:taylor@apache.org">David Sean Taylor </a>
- * @version $Id: TestPortletEntityDAO.java,v 1.3 2005/05/24 14:43:19 ate Exp $
+ * @version $Id$
  */
 public class BatchedUserStatistics extends BatchedStatistics
 {

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/src/main/java/org/apache/jetspeed/statistics/impl/BatchedUserStatistics.java
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/src/main/java/org/apache/jetspeed/statistics/impl/PortalStatisticsImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/src/main/java/org/apache/jetspeed/statistics/impl/PortalStatisticsImpl.java?rev=774751&r1=774750&r2=774751&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/src/main/java/org/apache/jetspeed/statistics/impl/PortalStatisticsImpl.java
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/src/main/java/org/apache/jetspeed/statistics/impl/PortalStatisticsImpl.java
Thu May 14 12:48:53 2009
@@ -57,7 +57,7 @@
  * 
  * @author <a href="mailto:chris@bluesunrise.com">Chris Schaefer </a>
  * @author <a href="mailto:taylor@apache.org">David Sean Taylor </a>
- * @version $Id: TestPortletEntityDAO.java,v 1.3 2005/05/24 14:43:19 ate Exp $
+ * @version $Id$
  */
 public class PortalStatisticsImpl extends PersistenceBrokerDaoSupport implements
         PortalStatistics

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/src/main/java/org/apache/jetspeed/statistics/impl/PortalStatisticsImpl.java
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: portals/jetspeed-2/portal/trunk/etc/registration/assembly/registry.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/etc/registration/assembly/registry.xml?rev=774751&r1=774750&r2=774751&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/etc/registration/assembly/registry.xml (original)
+++ portals/jetspeed-2/portal/trunk/etc/registration/assembly/registry.xml Thu May 14 12:48:53
2009
@@ -64,6 +64,7 @@
         </property>
     </bean>
 
+    <!-- PortletEntity is obsolete
     <bean id="portletEntityAccessImpl" class="org.apache.jetspeed.components.portletentity.PersistenceBrokerPortletEntityAccess">
         <constructor-arg>
             <ref bean="portletRegistry" />
@@ -77,14 +78,14 @@
         <property name="target">
             <ref bean="portletEntityAccessImpl" />
         </property>
-        <!--
+        <!-
             <property name="preInterceptors">
             <list>
             <ref bean="portletEntityCachingAdvisor"/>
             <ref bean="portletEntityRemoveFromCacheAdvisor"/>
             </list>
             </property>
-        -->
+        ->
         <property name="transactionAttributes">
             <props>
                 <prop key="remove*">PROPAGATION_REQUIRED</prop>
@@ -94,7 +95,7 @@
         </property>
     </bean>
     
-  <!-- Inject Portlet Entity Proxy into Portlet Entity impl -->
+  <!- Inject Portlet Entity Proxy into Portlet Entity impl ->
   <bean id="injectEntityAccessProxy" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
       <property name="targetObject"><ref bean="portletEntityAccessImpl"/></property>
       <property name="targetMethod"><value>setEntityAccessProxy</value></property>
@@ -104,5 +105,5 @@
           </list>
       </property>
   </bean>
-    
+  -->  
 </beans>
\ No newline at end of file

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=774751&r1=774750&r2=774751&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
Thu May 14 12:48:53 2009
@@ -30,7 +30,7 @@
  * 
  * @author <a href="mailto:weaver@apache.org">Scott T. Weaver</a>
  * @version $Id: PortletEntityAccessComponent.java,v 1.8 2005/04/29 13:59:46 weaver Exp $
- *
+ * @obsolete Pluto no longer provides a PortletEntity interface and Jetspeed no longer uses
it. 
  */
 public interface PortletEntityAccessComponent
 {

Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/container/PortletEntity.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/container/PortletEntity.java?rev=774751&r1=774750&r2=774751&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/container/PortletEntity.java
(original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/container/PortletEntity.java
Thu May 14 12:48:53 2009
@@ -22,15 +22,14 @@
 
 /**
  * @version $Id$
- *
+ * @obsolete Pluto no longer provides a PortletEntity interface and Jetspeed no longer uses
it. 
  */
-public interface PortletEntity extends org.apache.pluto.container.PortletEntity
+public interface PortletEntity // extends org.apache.pluto.container.PortletEntity
 {
     Long getOid();
     String getId();
     void setId(String id);
     
-    // TODO: temporary replacement for old api PortletWindowList - this should be removed
too shortly
     void setPortletWindow(PortletWindow window);
 
     PortletDefinition getPortletDefinition();
@@ -39,6 +38,5 @@
     String getPortletUniqueName();
 
     void setFragment(Fragment fragment);
-    Fragment getFragment();
-    
+    Fragment getFragment();    
 }

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/ddl-schema/registry-schema.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/ddl-schema/registry-schema.xml?rev=774751&r1=774750&r2=774751&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/ddl-schema/registry-schema.xml
(original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/ddl-schema/registry-schema.xml
Thu May 14 12:48:53 2009
@@ -121,14 +121,13 @@
     </table>
 
     <!--
-       Portlet Entity
+       Portlet Entity - obsolete
        Represents the managed state of individual portlet instance within a "page"
        The instance within a "page" key is based on Window ID + principal
        Without the principal, the key represents the default preferences for the window
-    -->
     <table name="PORTLET_ENTITY">
         <column name="PEID" primaryKey="true" required="true" type="INTEGER"/>
-       <!-- <column name="PORTLET_DEFINITION_ID" required="true" type="INTEGER"/>
-->
+       <!- <column name="PORTLET_DEFINITION_ID" required="true" type="INTEGER"/>
->
         <column name="ID" required="true" size="80" type="VARCHAR"/>
         <column name="APP_NAME" required="true" size="80" type="VARCHAR"/>
         <column name="PORTLET_NAME" required="true" size="80" type="VARCHAR"/>
@@ -136,6 +135,7 @@
             <unique-column name="ID"/>
         </unique>
     </table>
+    -->
     
    <!-- 
       Preferences

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/ajax.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/ajax.xml?rev=774751&r1=774750&r2=774751&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/ajax.xml
(original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/ajax.xml
Thu May 14 12:48:53 2009
@@ -28,12 +28,14 @@
         <entry key="portletRegistry.getPortletApplication">
           <value>org.apache.jetspeed.components.portletregistry.PortletRegistry</value>
         </entry>
+        <!-- PortletEntity is obsolete 
         <entry key="entityAccess.getPortletEntities">
           <value>org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent</value>
         </entry>
         <entry key="entityAccess.getPortletEntity">
           <value>org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent</value>
         </entry>
+        -->
       </map>
     </constructor-arg>
     <constructor-arg>
@@ -62,12 +64,14 @@
         <entry key="portletRegistry.getPortletApplication">
           <value>/ajax/portlet_definitions.ajax</value>
         </entry>
+        <!-- PortletEntity is obsolete 
         <entry key="entityAccess.getPortletEntities">
           <value>/ajax/portlet_entities.ajax</value>
         </entry>
         <entry key="entityAccess.getPortletEntity">
           <value>/ajax/portlet_entity.ajax</value>
         </entry>
+        -->
       </map>
     </constructor-arg>
   </bean>

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/versioned-deployment/jetspeed-services.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/versioned-deployment/jetspeed-services.xml?rev=774751&r1=774750&r2=774751&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/versioned-deployment/jetspeed-services.xml
(original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/versioned-deployment/jetspeed-services.xml
Thu May 14 12:48:53 2009
@@ -49,9 +49,11 @@
         <entry key="SSO">
           <ref bean="org.apache.jetspeed.sso.SSOProvider" />
         </entry>
+        <!-- PortletEntity is obsolete
         <entry key="EntityAccessor">
           <ref bean='org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent'
/>
         </entry>
+         -->
         <entry key="PortletFactory">
           <ref bean="portletFactory" />
         </entry>

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-services.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-services.xml?rev=774751&r1=774750&r2=774751&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-services.xml
(original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-services.xml
Thu May 14 12:48:53 2009
@@ -50,9 +50,11 @@
         <entry key="SSO">
           <ref bean="org.apache.jetspeed.sso.SSOManager" />
           </entry>
+        <!-- PortletEntity is obsolete 
         <entry key="EntityAccessor">
           <ref bean='org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent'
/>
         </entry>
+        -->
         <!-- ApplicationServerManager currently only supported for Tomcat. Comment out
for others like JBoss -->
         <entry key="ApplicationServerManager">
           <ref bean="org.apache.jetspeed.tools.pamanager.servletcontainer.ApplicationServerManager"
/>

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/registry.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/registry.xml?rev=774751&r1=774750&r2=774751&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/registry.xml
(original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/registry.xml
Thu May 14 12:48:53 2009
@@ -129,10 +129,11 @@
   </bean>
 
   <!--
+    - PortletEntity is obsolete
+    
     - PortletEntity business object: OJB implementation, as an inner bean wrapped
     - by an outer transactional proxy. The two bean definitions could have been separate,
     - but this is cleaner as there is no need to ever access the unwrapped object.
-  -->
 
   <bean id="portletEntityAccessImpl"
     class="org.apache.jetspeed.components.portletentity.PersistenceBrokerPortletEntityAccess">
@@ -140,14 +141,14 @@
     <constructor-arg>
       <ref bean="portletRegistry" />
     </constructor-arg>
-    <!-- 
+    <!- 
       All preferences were shared. With JS2-449, preferences are now
       stored 'per user'. The username is stored in the preferences FULL_PATH
       To turn on mergeSharedPreferences configure this property to true 
       This will NOT turn off per user prefs, 
       but instead merge with them, where user prefs override.
       boolean
-    -->
+    ->
     <constructor-arg type="boolean">
       <value>false</value>
     </constructor-arg>
@@ -162,14 +163,14 @@
     <property name="target">
       <ref bean="portletEntityAccessImpl" />
     </property>
-    <!--
+    <!-
       <property name="preInterceptors">
       <list>
       <ref bean="portletEntityCachingAdvisor"/>
       <ref bean="portletEntityRemoveFromCacheAdvisor"/>
       </list>
       </property>
-    -->
+    ->
     <property name="transactionAttributes">
       <props>
         <prop key="remove*">PROPAGATION_REQUIRED</prop>
@@ -180,5 +181,6 @@
       </props>
     </property>
   </bean>
+  -->
 
 </beans>

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/serializer.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/serializer.xml?rev=774751&r1=774750&r2=774751&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/serializer.xml
(original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/serializer.xml
Thu May 14 12:48:53 2009
@@ -26,9 +26,8 @@
         </bean>
         <bean class="org.apache.jetspeed.serializer.JetspeedRegistrySerializer">
           <constructor-arg index="0" ref="org.apache.jetspeed.components.portletregistry.PortletRegistry"
/>
-          <constructor-arg index="1" ref="org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent"
/>
-          <constructor-arg index="2" ref="org.apache.jetspeed.components.portletpreferences.PortletPreferencesProvider"
/>
-          <constructor-arg index="3" ref="org.apache.jetspeed.search.SearchEngine" />
+          <constructor-arg index="1" ref="org.apache.jetspeed.components.portletpreferences.PortletPreferencesProvider"
/>
+          <constructor-arg index="2" ref="org.apache.jetspeed.search.SearchEngine" />
         </bean>
         <!-- 
           <bean class="org.apache.jetspeed.serializer.JetspeedUserTemplateSerializer">

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/static-bean-references.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/static-bean-references.xml?rev=774751&r1=774750&r2=774751&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/static-bean-references.xml
(original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/static-bean-references.xml
Thu May 14 12:48:53 2009
@@ -29,6 +29,7 @@
     </property>
   </bean>
 
+  <!-- PortletEntity is obsolete
   <bean id="_portletEntityImplPortletRegistryInitializer"
     class="org.apache.jetspeed.components.LifecycleAwareStaticClassInitializer">
     <meta key="j2:cat" value="default or registry" />
@@ -39,6 +40,7 @@
       <ref bean="portletRegistry" />
     </property>
   </bean>
+   -->
 
   <bean id="_abstractBaseElementInitializer"
     class="org.apache.jetspeed.components.LifecycleAwareStaticClassInitializer">

Modified: portals/jetspeed-2/portal/trunk/src/site/xdoc/guides/guide-migration.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/src/site/xdoc/guides/guide-migration.xml?rev=774751&r1=774750&r2=774751&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/src/site/xdoc/guides/guide-migration.xml (original)
+++ portals/jetspeed-2/portal/trunk/src/site/xdoc/guides/guide-migration.xml Thu May 14 12:48:53
2009
@@ -42,6 +42,9 @@
               <td>SECURITY_GROUP_ROLE</td>
             </tr>
             <tr>
+              <td>PORTLET_ENTITY</td>              
+            </tr>
+            <tr>
               <td>PREFS_NODE</td>
             </tr>
             <tr>
@@ -157,27 +160,6 @@
               <td>LONGVARCHAR, Not required</td>
             </tr>
             <tr>
-              <td>PORTLET_ENTITY</td>
-              <td>ID</td>
-              <td>MODIFY</td>
-              <td>VARCHAR(255), Required</td>
-              <td>VARCHAR(80), Required</td>
-            </tr>
-            <tr>
-              <td>PORTLET_ENTITY</td>
-              <td>APP_NAME</td>
-              <td>MODIFY</td>
-              <td>VARCHAR(255), Required</td>
-              <td>VARCHAR(80), Required</td>
-            </tr>
-            <tr>
-              <td>PORTLET_ENTITY</td>
-              <td>PORTLET_NAME</td>
-              <td>MODIFY</td>
-              <td>VARCHAR(255), Required</td>
-              <td>VARCHAR(80), Required</td>
-            </tr>
-            <tr>
               <td>SECURITY_PRINCIPAL</td>
               <td>CLASSNAME</td>
               <td>DROP</td>
@@ -461,14 +443,6 @@
                     <th>Referencing column(s)</th>
                     <th>Cascade</th>
                 </tr>
-                <tr>
-                    <td>PORTLET_PREFERENCE_VALUE</td> 
-                    <td>FK_PORTLET_ENTITY</td>
-                    <td>ENTITY_ID</td>
-                    <td>PORTLET_ENTITY</td>
-                    <td>ID</td>
-                    <td>CASCADE DELETE</td>
-                </tr>
             </table>
         </subsection>                         
       </section>    



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message