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 ta...@apache.org on 2009/05/06 10:06:44 UTC

svn commit: r772093 - in /portals/jetspeed-2/applications/j2-admin/trunk/src: main/java/org/apache/jetspeed/portlets/prm/ main/java/org/apache/jetspeed/portlets/prm/application/ main/java/org/apache/jetspeed/portlets/prm/portlet/ main/resources/org/apa...

Author: taylor
Date: Wed May  6 08:06:42 2009
New Revision: 772093

URL: http://svn.apache.org/viewvc?rev=772093&view=rev
Log:
https://issues.apache.org/jira/browse/JS2-946
fix issues with:

1. sorting
2. edit mode
3. search
4. refresh
5. cloning

Modified:
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationDataProvider.java
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationsListEdit.java
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationsListHome.java
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/PortletDataProvider.java
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/UploadPortletApp.java
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/application/ApplicationDetailsApplication.java
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/application/ApplicationDetailsView.java
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/portlet/DetailsPanel.java
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/ApplicationsListEdit.html
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/ApplicationsListHome.html
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/application/DetailsPanel.html
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/portlet/DetailsPanel.html
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_ca.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_en.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_es.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_hu.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_it.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_ja.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_ko.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_ua.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_zh.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_zh_TW.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/portlet.xml

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationDataProvider.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationDataProvider.java?rev=772093&r1=772092&r2=772093&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationDataProvider.java (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationDataProvider.java Wed May  6 08:06:42 2009
@@ -91,6 +91,7 @@
      */
     public void detach()
     {
+       super.detach();
     }
 
     public void refresh()
@@ -165,9 +166,10 @@
                         }
                     }
                 }
-                sort(searchResults, this.orderBy);
             }
-            searchMode = true;
+            searchMode = true;            
+            sort(searchResults, this.orderBy);
+            refresh();
         }
         catch (Exception e)
         {
@@ -180,6 +182,11 @@
         Collections.sort(list, new AppComparator(orderBy));
     }
     
+    public void sort()
+    {
+        this.sort(this.portletApps, this.orderBy);
+    }
+    
     public class AppComparator implements Comparator<ApplicationBean>
     {
         AppOrderBy orderBy;

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationsListEdit.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationsListEdit.java?rev=772093&r1=772092&r2=772093&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationsListEdit.java (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationsListEdit.java Wed May  6 08:06:42 2009
@@ -43,35 +43,41 @@
     {
         WebMarkupContainer formGroup = new WebMarkupContainer("formGroup");
         add(formGroup);
-        EditModeForm form = new EditModeForm("editModeForm", this.getPreferenceAsInteger("rows"));        
+        int appRows = ((ApplicationsListApplication)this.getApplication()).getPreferenceValueAsInteger("appRows");
+        int portletRows = ((ApplicationsListApplication)this.getApplication()).getPreferenceValueAsInteger("portletRows");
+        EditModeForm form = new EditModeForm("editModeForm", appRows, portletRows);        
         formGroup.add(form);
     }
     
     @SuppressWarnings("serial")
     private class EditModeForm extends Form<Void>
     {
-        private int rows = 8;
+        private int appRows = 8;
+        private int portletRows = 8;
         
         @SuppressWarnings("unchecked")
-        public EditModeForm(String name, final int rows)
+        public EditModeForm(String name, final int appRows, final int portletRows)
         {
             super(name);
-            if (rows > 0)
-                this.rows = rows;
-            add(new TextField("rows", new PropertyModel(this, "rows"), Integer.class).setRequired(true).add(new RangeValidator(1,1000)));
+            if (appRows > 0)
+                this.appRows = appRows;
+            if (portletRows > 0)
+                this.portletRows = portletRows;
+            add(new TextField("appRows", new PropertyModel(this, "appRows"), Integer.class).setRequired(true).add(new RangeValidator(1,1000)));
+            add(new TextField("portletRows", new PropertyModel(this, "portletRows"), Integer.class).setRequired(true).add(new RangeValidator(1,1000)));
             add(new Button("editModeSaveButton", new ResourceModel("pam.details.action.save"))
             {
                 @Override
                 public void onSubmit()
                 {
-                    ApplicationsListEdit editPage = (ApplicationsListEdit)this.getPage();
-                    PortletPreferences prefs = editPage.getPortletRequest().getPreferences();
+                    PortletPreferences prefs = ((ApplicationsListApplication)this.getApplication()).getPortletRequest().getPreferences();
                     FeedbackPanel feedback = (FeedbackPanel)this.getParent().get("feedback");
                     try
                     {
-                        prefs.setValue("rows", Integer.toString(EditModeForm.this.getRows()));
+                        prefs.setValue("appRows", Integer.toString(EditModeForm.this.getAppRows()));
+                        prefs.setValue("portletRows", Integer.toString(EditModeForm.this.getPortletRows()));
                         prefs.store();
-                        ActionResponse ar = (ActionResponse)editPage.getPortletResponse();
+                        ActionResponse ar = (ActionResponse)((ApplicationsListApplication)this.getApplication()).getPortletResponse();
                         ar.setPortletMode(PortletMode.VIEW);                        
                     }
                     catch (ReadOnlyException e)
@@ -88,16 +94,25 @@
             add(feedback);
         }
                 
-        public int getRows()
+        public int getAppRows()
         {
-            return rows;
+            return appRows;
         }
         
-        public void setRows(int rows)
+        public void setAppRows(int appRows)
         {
-            this.rows = rows;
+            this.appRows = appRows;
         }
 
+        public int getPortletRows()
+        {
+            return portletRows;
+        }
+        
+        public void setPortletRows(int portletRows)
+        {
+            this.portletRows = portletRows;
+        }
         
     }     
     

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationsListHome.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationsListHome.java?rev=772093&r1=772092&r2=772093&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationsListHome.java (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationsListHome.java Wed May  6 08:06:42 2009
@@ -104,6 +104,13 @@
                                                      ApplicationsListApplication.SELECTED_APPLICATION_EVENT, 
                                                      pa
                                                      );
+                            DataView portletView = (DataView) getPage().get(PORTLET_TABLE);                    
+                            PortletDataProvider pdp = (PortletDataProvider) portletView.getDataProvider();
+                            if (pdp.getSearchMode() == true)
+                            {
+                                pdp.setSearchMode(false);                            
+                                pdp.refresh();
+                            }
                         }
                         catch (NotSerializableException e)
                         {
@@ -121,7 +128,7 @@
             }
         };
         
-        dataView.setItemsPerPage(((AbstractAdminWebApplication) getApplication()).getPreferenceValueAsInteger("rows"));
+        dataView.setItemsPerPage(((AbstractAdminWebApplication) getApplication()).getPreferenceValueAsInteger("appRows"));
 
         add(new OrderByLink("appOrderByName", "name", applicationDataProvider, VoidCssProvider.getInstance())
         {
@@ -137,7 +144,7 @@
                 {
                     applicationDataProvider.setOrderBy(AppOrderBy.NAME_ASC);
                 }
-                
+                applicationDataProvider.sort();                
                 dataView.setCurrentPage(0);
             }
         });
@@ -156,7 +163,7 @@
                 {
                     applicationDataProvider.setOrderBy(AppOrderBy.VERSION_ASC);
                 }
-                
+                applicationDataProvider.sort();
                 dataView.setCurrentPage(0);
             }
         });
@@ -175,7 +182,7 @@
                 {
                     applicationDataProvider.setOrderBy(AppOrderBy.PATH_ASC);
                 }
-                
+                applicationDataProvider.sort();
                 dataView.setCurrentPage(0);
             }
         });
@@ -222,24 +229,23 @@
                 item.add(link);
             }
         };
-
-        portletListView.setItemsPerPage(10);
-
-        add(new OrderByBorder("plOrderByName", "name", portletListDataProvider)
+        
+        portletListView.setItemsPerPage(((AbstractAdminWebApplication) getApplication()).getPreferenceValueAsInteger("portletRows"));
+        add(new OrderByBorder("plOrderByDisplayName", "name", portletListDataProvider)
         {
             private static final long serialVersionUID = 1L;
 
             protected void onSortChanged()
             {
-                if (portletListDataProvider.getOrderBy() == PortletOrderBy.NAME_ASC)
+                if (portletListDataProvider.getOrderBy() == PortletOrderBy.DISPLAY_NAME_ASC)
                 {
-                    portletListDataProvider.setOrderBy(PortletOrderBy.NAME_DESC);
+                    portletListDataProvider.setOrderBy(PortletOrderBy.DISPLAY_NAME_DESC);
                 }
                 else
                 {
-                    portletListDataProvider.setOrderBy(PortletOrderBy.NAME_ASC);
+                    portletListDataProvider.setOrderBy(PortletOrderBy.DISPLAY_NAME_ASC);
                 }
-                
+                portletListDataProvider.sort();
                 dataView.setCurrentPage(0);
             }
         });
@@ -538,9 +544,12 @@
                 @Override
                 public void onSubmit()
                 {
-                    DataView view = (DataView) getPage().get(APP_TABLE);
-                    ApplicationDataProvider dp = (ApplicationDataProvider) view.getDataProvider();
-                    dp.searchApplications(getAppSearchField());
+                    DataView appView = (DataView) getPage().get(APP_TABLE);
+                    DataView portletView = (DataView) getPage().get(PORTLET_TABLE);
+                    ApplicationDataProvider adp = (ApplicationDataProvider) appView.getDataProvider();
+                    adp.searchApplications(getAppSearchField());
+                    PortletDataProvider pdp = (PortletDataProvider) portletView.getDataProvider();
+                    pdp.searchPortlets(getAppSearchField());                    
                 }
             });
             
@@ -563,10 +572,14 @@
                 @Override
                 public void onClick()
                 {
-                    DataView<ApplicationBean> view = (DataView<ApplicationBean>) getPage().get(APP_TABLE);
-                    ApplicationDataProvider dp = (ApplicationDataProvider) view.getDataProvider();
-                    dp.setSearchMode(false);
-                    dp.refresh();
+                    DataView appView = (DataView) getPage().get(APP_TABLE);
+                    ApplicationDataProvider adp = (ApplicationDataProvider) appView.getDataProvider();
+                    adp.setSearchMode(false);
+                    adp.refresh();
+                    DataView portletView = (DataView) getPage().get(PORTLET_TABLE);                    
+                    PortletDataProvider pdp = (PortletDataProvider) portletView.getDataProvider();
+                    pdp.setSearchMode(false);
+                    pdp.refresh();
                 }
             });
         }

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/PortletDataProvider.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/PortletDataProvider.java?rev=772093&r1=772092&r2=772093&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/PortletDataProvider.java (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/PortletDataProvider.java Wed May  6 08:06:42 2009
@@ -54,7 +54,7 @@
     private Locale locale;
     private static final long serialVersionUID = 1L;
     private final static Logger log = LoggerFactory.getLogger(PortletDataProvider.class);
-    private PortletOrderBy orderBy = PortletOrderBy.NAME_ASC;
+    private PortletOrderBy orderBy = PortletOrderBy.DISPLAY_NAME_ASC;
     
     public PortletDataProvider(String defaultAppName, Locale locale, JetspeedServiceLocator locator)
     {
@@ -232,10 +232,10 @@
                         }                        
                     }
                 }
-                sort(searchResults, this.orderBy);                
             }
-            searchMode = true;
-            
+            searchMode = true;            
+            sort(searchResults, this.orderBy);                
+            refresh();
         }
         catch (Exception e)
         {
@@ -253,14 +253,22 @@
         this.orderBy = orderBy;
     }
 
-	public void changeAppName(String appName) {
+	public void changeAppName(String appName) 
+	{
 		this.appName = appName;
 		
 		refresh();
 	}
 
-	public String getAppName() {
+	public String getAppName() 
+	{
 		return appName;
 	}    
+	
+    public void sort()
+    {
+        this.sort(this.portlets, this.orderBy);
+    }
+
     
 }

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/UploadPortletApp.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/UploadPortletApp.java?rev=772093&r1=772092&r2=772093&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/UploadPortletApp.java (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/UploadPortletApp.java Wed May  6 08:06:42 2009
@@ -25,6 +25,7 @@
 import org.apache.jetspeed.audit.AuditActivity;
 import org.apache.jetspeed.deployment.DeploymentManager;
 import org.apache.jetspeed.portlets.AdminPortletWebPage;
+import org.apache.jetspeed.portlets.wicket.AbstractAdminWebApplication;
 import org.apache.wicket.markup.html.form.Button;
 import org.apache.wicket.markup.html.form.Form;
 import org.apache.wicket.markup.html.form.upload.FileUpload;
@@ -61,6 +62,7 @@
             @Override
             public void onSubmit()
             {
+                AbstractAdminWebApplication app = ((AbstractAdminWebApplication)getApplication());
                 FeedbackPanel feedback = (FeedbackPanel) UploadPortletApp.this.get("feedback");
                 final FileUpload upload = fileUpload;
                 if (upload != null)
@@ -81,9 +83,8 @@
                         
                         UploadPortletApp.this.dm.deploy(tempFile);
                         feedback.info("Deployed 1 portlet application to server: " + upload.getClientFileName());
-                        UploadPortletApp page = (UploadPortletApp)getPage();
-                        page.getServiceLocator().getAuditActivity().logAdminRegistryActivity(
-                                getAuthenticatedUsername(), getIPAddress(), AuditActivity.REGISTRY_DEPLOY, ApplicationsListHome.PORTLET_REGISTRY_MANAGER);                                                    
+                        app.getServiceLocator().getAuditActivity().logAdminRegistryActivity(
+                                app.getUserPrincipalName(), app.getIPAddress(), AuditActivity.REGISTRY_DEPLOY, ApplicationsListHome.PORTLET_REGISTRY_MANAGER);                                                    
                     }
                     catch (Exception e)
                     {

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/application/ApplicationDetailsApplication.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/application/ApplicationDetailsApplication.java?rev=772093&r1=772092&r2=772093&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/application/ApplicationDetailsApplication.java (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/application/ApplicationDetailsApplication.java Wed May  6 08:06:42 2009
@@ -16,7 +16,6 @@
  */
 package org.apache.jetspeed.portlets.prm.application;
 
-import org.apache.jetspeed.portlets.prm.ApplicationsListApplication;
 import org.apache.jetspeed.portlets.wicket.AbstractAdminWebApplication;
 import org.apache.wicket.resource.loader.BundleStringResourceLoader;
 

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/application/ApplicationDetailsView.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/application/ApplicationDetailsView.java?rev=772093&r1=772092&r2=772093&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/application/ApplicationDetailsView.java (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/application/ApplicationDetailsView.java Wed May  6 08:06:42 2009
@@ -40,7 +40,7 @@
 
     public ApplicationDetailsView()
     {
-        this.title = getPortletName();
+        this.title = ((ApplicationDetailsApplication)getApplication()).getPortletName();
     }
 
     void constructLayout()
@@ -110,13 +110,15 @@
     @Override
     protected void onBeforeRender()
     {
-        PortletApplicationNodeBean receivedPANodeBean = (ApplicationBean) PortletMessaging.consume(getPortletRequest(), ApplicationsListApplication.PRM_TOPIC,
+        PortletApplicationNodeBean receivedPANodeBean = (ApplicationBean) 
+                PortletMessaging.consume(((ApplicationDetailsApplication)getApplication()).getPortletRequest(), 
+                ApplicationsListApplication.PRM_TOPIC,
                 ApplicationsListApplication.SELECTED_APPLICATION_EVENT);
 
         if (receivedPANodeBean != null)
         {
             this.paNodeBean = receivedPANodeBean;
-            this.title = getPortletName() + " - " + paNodeBean.getApplicationName();
+            this.title = ((ApplicationDetailsApplication)getApplication()).getPortletName() + " - " + paNodeBean.getApplicationName();
             this.dirty = true;
         }
 
@@ -126,7 +128,7 @@
             dirty = false;
         }
 
-        setTitle(title);
+        ((ApplicationDetailsApplication)getApplication()).setTitle(title);
 
         super.onBeforeRender();
     }

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/portlet/DetailsPanel.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/portlet/DetailsPanel.java?rev=772093&r1=772092&r2=772093&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/portlet/DetailsPanel.java (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/portlet/DetailsPanel.java Wed May  6 08:06:42 2009
@@ -21,6 +21,7 @@
 import java.util.List;
 import java.util.Locale;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.jetspeed.components.portletregistry.FailedToStorePortletDefinitionException;
 import org.apache.jetspeed.components.portletregistry.PortletRegistry;
 import org.apache.jetspeed.components.portletregistry.RegistryException;
@@ -187,7 +188,7 @@
                     PortletApplication app = registry.getPortletApplication(paNodeBean.getApplicationName());
                     PortletDefinition def = app.getPortlet(paNodeBean.getName());
                     def.setExpirationCache(getExpirationCache().intValue());
-                    registry.savePortletDefinition(def);
+                    registry.savePortletDefinition(def);                    
                 }
                 catch (FailedToStorePortletDefinitionException e)
                 {
@@ -195,6 +196,9 @@
                 }
             }
         });
+
+        CloneForm cloneForm = new CloneForm("cloneForm", definition);
+        add(cloneForm);                
         
         add(form);
     }
@@ -208,5 +212,49 @@
     {
         return expirationCache;
     }
+
+    private class CloneForm extends Form<Void>
+    {
+        private static final long serialVersionUID = 1L;
+        
+        private String cloneName;
+
+        public CloneForm(String name, final PortletDefinition portlet)
+        {
+            super(name);
+            add(new TextField("cloneName", new PropertyModel(this, "cloneName")));        
+            add(new Button("cloneButton", new ResourceModel("pam.details.action.clone"))
+            {
+                @Override
+                public void onSubmit()
+                {
+                    try
+                    {
+                        String cloneName = getCloneName();
+                        if (!StringUtils.isBlank(cloneName))
+                        {
+                            PortletRegistry registry = ((AbstractAdminWebApplication) getApplication()).getServiceLocator().getPortletRegistry();
+                            registry.clonePortletDefinition(portlet, cloneName);
+                        }
+                    }
+                    catch (RegistryException e)
+                    {
+                        logger.error("Failed to update jetspeed security constraint defs of application.", e);
+                    }
+                }
+            });
+        }
+
+        public String getCloneName()
+        {
+            return cloneName;
+        }
+        
+        public void setCloneName(String name)
+        {
+            this.cloneName = name;
+        }
+        
+    }
     
 }

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/ApplicationsListEdit.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/ApplicationsListEdit.html?rev=772093&r1=772092&r2=772093&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/ApplicationsListEdit.html (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/ApplicationsListEdit.html Wed May  6 08:06:42 2009
@@ -29,8 +29,24 @@
 <body>
     <div style='border-width: .1em; border-style: solid; border-color: #000; padding:.4em' wicket:id='formGroup'>    
     <form wicket:id="editModeForm">
-      <span><wicket:message key="pam.details.message.rowsDisplayed"/></span>    
-      <input type='text' wicket:id="rows" size="5" style='font-size: 10px;'></input>
+      <table>
+      <tr>
+      <td>
+      <span><wicket:message key="pam.details.message.appRowsDisplayed"/></span>
+      </td>
+      <td>    
+      <input type='text' wicket:id="appRows" size="5" style='font-size: 10px;'></input>
+      </td>
+      </tr>
+      <tr>
+      <td>
+      <span><wicket:message key="pam.details.message.portletRowsDisplayed"/></span>
+      </td>
+      <td>    
+      <input type='text' wicket:id="portletRows" size="5" style='font-size: 10px;'></input>
+      </td>
+      </tr>
+      </table>
       <input type='submit' wicket:id="editModeSaveButton" value="save"/>          
       <div wicket:id="feedback" style="font-size: 9px;color: red;"></div>    
     </form> 	

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/ApplicationsListHome.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/ApplicationsListHome.html?rev=772093&r1=772092&r2=772093&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/ApplicationsListHome.html (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/ApplicationsListHome.html Wed May  6 08:06:42 2009
@@ -69,7 +69,7 @@
 	</tr>
 	<tr>
 		<th class="portlet-section-subheader">
-		  <span wicket:id="plOrderByName"><wicket:message key="pam.details.name"/></span>
+		  <span wicket:id="plOrderByDisplayName"><wicket:message key="pam.details.name"/></span>
 		</th>
 	</tr>
 	<tr wicket:id="portletTable">

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/application/DetailsPanel.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/application/DetailsPanel.html?rev=772093&r1=772092&r2=772093&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/application/DetailsPanel.html (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/application/DetailsPanel.html Wed May  6 08:06:42 2009
@@ -43,7 +43,7 @@
         </select>
         <input type="submit" wicket:id="jsecSave" />
     </div>
-    </form>	
+    </form>
 	</wicket:panel>
 </body>
 </html>
\ No newline at end of file

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/portlet/DetailsPanel.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/portlet/DetailsPanel.html?rev=772093&r1=772092&r2=772093&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/portlet/DetailsPanel.html (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/portlet/DetailsPanel.html Wed May  6 08:06:42 2009
@@ -57,6 +57,19 @@
         </tr>
 	</table>
 	</form>
+    <div>
+<form action="post" wicket:id="cloneForm">    
+	<table style="border-collapse: collapse; width: 100%; margin-top: 8px; float: left;">
+		<thead>
+			<tr>
+				<th class="portlet-section-subheader"><wicket:message key="pam.details.action.clone"/></th>
+			</tr>
+		</thead> 
+     </table>
+  	   <input type='text' wicket:id="cloneName" />
+       <input type="submit" wicket:id="cloneButton" />         
+    </form>
+    </div>    		
 	</wicket:panel>
 </body>
 </html>
\ No newline at end of file

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources.properties?rev=772093&r1=772092&r2=772093&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources.properties (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources.properties Wed May  6 08:06:42 2009
@@ -124,6 +124,7 @@
 pam.details.action.search = Search
 pam.details.action.delete = Delete
 pam.details.action.save = Save
+pam.details.action.clone = Clone
 pam.details.deployment.title = Deploy Portlet Application
 pam.details.action.cancel = Cancel
 pam.details.action.uploadFile = Upload File
@@ -138,6 +139,7 @@
 pam.details.action.status.deleteOK = Portlet application removal from registry was successful: {0}
 pam.details.action.status.serverReadyFailure = Failed to {1} application: {0}. Portlet Application was not found in registry
 pam.details.action.status.serverNotAvailable = Failed to {1} application: {0}. Connection to Application Server is not available. 
-pam.details.message.rowsDisplayed = No. of Rows Displayed:
+pam.details.message.appRowsDisplayed = No. of Application Rows Displayed:
+pam.details.message.portletRowsDisplayed = No. of Portlet Rows Displayed:
 pam.details.message.errorReadonly = Preference 'rows' is readonly, cannot update
 pam.details.message.errorPrefs = Preference 'rows' could not be stored:

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_ca.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_ca.properties?rev=772093&r1=772092&r2=772093&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_ca.properties (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_ca.properties Wed May  6 08:06:42 2009
@@ -122,6 +122,7 @@
 pam.details.action.search = Search
 pam.details.action.delete = Delete
 pam.details.action.save = Save
+pam.details.action.clone = Clone
 pam.details.deployment.title = Deploy Portlet Application
 pam.details.action.cancel = Cancel
 pam.details.action.uploadFile = Upload File
@@ -136,6 +137,7 @@
 pam.details.action.status.deleteOK = Portlet application removal from registry was successful: {0}
 pam.details.action.status.serverReadyFailure = Failed to {1} application: {0}. Portlet Application was not found in registry
 pam.details.action.status.serverNotAvailable = Failed to {1} application: {0}. Connection to Application Server is not available. 
-pam.details.message.rowsDisplayed = No. of Rows Displayed:
+pam.details.message.appRowsDisplayed = No. of Application Rows Displayed:
+pam.details.message.portletRowsDisplayed = No. of Portlet Rows Displayed:
 pam.details.message.errorReadonly = Preference 'rows' is readonly, cannot update
 pam.details.message.errorPrefs = Preference 'rows' could not be stored:

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_en.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_en.properties?rev=772093&r1=772092&r2=772093&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_en.properties (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_en.properties Wed May  6 08:06:42 2009
@@ -124,6 +124,7 @@
 pam.details.action.search = Search
 pam.details.action.delete = Delete
 pam.details.action.save = Save
+pam.details.action.clone = Clone
 pam.details.deployment.title = Deploy Portlet Application
 pam.details.action.cancel = Cancel
 pam.details.action.uploadFile = Upload File
@@ -138,6 +139,7 @@
 pam.details.action.status.deleteOK = Portlet application removal from registry was successful: {0}
 pam.details.action.status.serverReadyFailure = Failed to {1} application: {0}. Portlet Application was not found in registry
 pam.details.action.status.serverNotAvailable = Failed to {1} application: {0}. Connection to Application Server is not available. 
-pam.details.message.rowsDisplayed = No. of Rows Displayed:
+pam.details.message.appRowsDisplayed = No. of Application Rows Displayed:
+pam.details.message.portletRowsDisplayed = No. of Portlet Rows Displayed:
 pam.details.message.errorReadonly = Preference 'rows' is readonly, cannot update
 pam.details.message.errorPrefs = Preference 'rows' could not be stored:

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_es.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_es.properties?rev=772093&r1=772092&r2=772093&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_es.properties (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_es.properties Wed May  6 08:06:42 2009
@@ -124,6 +124,7 @@
 pam.details.action.search = Search
 pam.details.action.delete = Delete
 pam.details.action.save = Save
+pam.details.action.clone = Clone
 pam.details.deployment.title = Deploy Portlet Application
 pam.details.action.cancel = Cancel
 pam.details.action.uploadFile = Upload File
@@ -138,6 +139,7 @@
 pam.details.action.status.deleteOK = Portlet application removal from registry was successful: {0}
 pam.details.action.status.serverReadyFailure = Failed to {1} application: {0}. Portlet Application was not found in registry
 pam.details.action.status.serverNotAvailable = Failed to {1} application: {0}. Connection to Application Server is not available. 
-pam.details.message.rowsDisplayed = No. of Rows Displayed:
+pam.details.message.appRowsDisplayed = No. of Application Rows Displayed:
+pam.details.message.portletRowsDisplayed = No. of Portlet Rows Displayed:
 pam.details.message.errorReadonly = Preference 'rows' is readonly, cannot update
 pam.details.message.errorPrefs = Preference 'rows' could not be stored:

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_hu.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_hu.properties?rev=772093&r1=772092&r2=772093&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_hu.properties (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_hu.properties Wed May  6 08:06:42 2009
@@ -124,6 +124,7 @@
 pam.details.action.search = Search
 pam.details.action.delete = Delete
 pam.details.action.save = Save
+pam.details.action.clone = Clone
 pam.details.deployment.title = Deploy Portlet Application
 pam.details.action.cancel = Cancel
 pam.details.action.uploadFile = Upload File
@@ -138,6 +139,7 @@
 pam.details.action.status.deleteOK = Portlet application removal from registry was successful: {0}
 pam.details.action.status.serverReadyFailure = Failed to {1} application: {0}. Portlet Application was not found in registry
 pam.details.action.status.serverNotAvailable = Failed to {1} application: {0}. Connection to Application Server is not available. 
-pam.details.message.rowsDisplayed = No. of Rows Displayed:
+pam.details.message.appRowsDisplayed = No. of Application Rows Displayed:
+pam.details.message.portletRowsDisplayed = No. of Portlet Rows Displayed:
 pam.details.message.errorReadonly = Preference 'rows' is readonly, cannot update
 pam.details.message.errorPrefs = Preference 'rows' could not be stored:

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_it.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_it.properties?rev=772093&r1=772092&r2=772093&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_it.properties (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_it.properties Wed May  6 08:06:42 2009
@@ -124,6 +124,7 @@
 pam.details.action.search = Search
 pam.details.action.delete = Delete
 pam.details.action.save = Save
+pam.details.action.clone = Clone
 pam.details.deployment.title = Deploy Portlet Application
 pam.details.action.cancel = Cancel
 pam.details.action.uploadFile = Upload File
@@ -138,6 +139,7 @@
 pam.details.action.status.deleteOK = Portlet application removal from registry was successful: {0}
 pam.details.action.status.serverReadyFailure = Failed to {1} application: {0}. Portlet Application was not found in registry
 pam.details.action.status.serverNotAvailable = Failed to {1} application: {0}. Connection to Application Server is not available. 
-pam.details.message.rowsDisplayed = No. of Rows Displayed:
+pam.details.message.appRowsDisplayed = No. of Application Rows Displayed:
+pam.details.message.portletRowsDisplayed = No. of Portlet Rows Displayed:
 pam.details.message.errorReadonly = Preference 'rows' is readonly, cannot update
 pam.details.message.errorPrefs = Preference 'rows' could not be stored:

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_ja.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_ja.properties?rev=772093&r1=772092&r2=772093&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_ja.properties (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_ja.properties Wed May  6 08:06:42 2009
@@ -123,6 +123,7 @@
 pam.details.action.search = Search
 pam.details.action.delete = Delete
 pam.details.action.save = Save
+pam.details.action.clone = Clone
 pam.details.deployment.title = Deploy Portlet Application
 pam.details.action.cancel = Cancel
 pam.details.action.uploadFile = Upload File
@@ -137,6 +138,7 @@
 pam.details.action.status.deleteOK = Portlet application removal from registry was successful: {0}
 pam.details.action.status.serverReadyFailure = Failed to {1} application: {0}. Portlet Application was not found in registry
 pam.details.action.status.serverNotAvailable = Failed to {1} application: {0}. Connection to Application Server is not available. 
-pam.details.message.rowsDisplayed = No. of Rows Displayed:
+pam.details.message.appRowsDisplayed = No. of Application Rows Displayed:
+pam.details.message.portletRowsDisplayed = No. of Portlet Rows Displayed:
 pam.details.message.errorReadonly = Preference 'rows' is readonly, cannot update
 pam.details.message.errorPrefs = Preference 'rows' could not be stored:

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_ko.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_ko.properties?rev=772093&r1=772092&r2=772093&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_ko.properties (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_ko.properties Wed May  6 08:06:42 2009
@@ -126,6 +126,7 @@
 pam.details.action.search = Search
 pam.details.action.delete = Delete
 pam.details.action.save = Save
+pam.details.action.clone = Clone
 pam.details.deployment.title = Deploy Portlet Application
 pam.details.action.cancel = Cancel
 pam.details.action.uploadFile = Upload File
@@ -140,6 +141,7 @@
 pam.details.action.status.deleteOK = Portlet application removal from registry was successful: {0}
 pam.details.action.status.serverReadyFailure = Failed to {1} application: {0}. Portlet Application was not found in registry
 pam.details.action.status.serverNotAvailable = Failed to {1} application: {0}. Connection to Application Server is not available. 
-pam.details.message.rowsDisplayed = No. of Rows Displayed:
+pam.details.message.appRowsDisplayed = No. of Application Rows Displayed:
+pam.details.message.portletRowsDisplayed = No. of Portlet Rows Displayed:
 pam.details.message.errorReadonly = Preference 'rows' is readonly, cannot update
 pam.details.message.errorPrefs = Preference 'rows' could not be stored:

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_ua.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_ua.properties?rev=772093&r1=772092&r2=772093&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_ua.properties (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_ua.properties Wed May  6 08:06:42 2009
@@ -124,6 +124,7 @@
 pam.details.action.search = Search
 pam.details.action.delete = Delete
 pam.details.action.save = Save
+pam.details.action.clone = Clone
 pam.details.deployment.title = Deploy Portlet Application
 pam.details.action.cancel = Cancel
 pam.details.action.uploadFile = Upload File
@@ -138,6 +139,7 @@
 pam.details.action.status.deleteOK = Portlet application removal from registry was successful: {0}
 pam.details.action.status.serverReadyFailure = Failed to {1} application: {0}. Portlet Application was not found in registry
 pam.details.action.status.serverNotAvailable = Failed to {1} application: {0}. Connection to Application Server is not available. 
-pam.details.message.rowsDisplayed = No. of Rows Displayed:
+pam.details.message.appRowsDisplayed = No. of Application Rows Displayed:
+pam.details.message.portletRowsDisplayed = No. of Portlet Rows Displayed:
 pam.details.message.errorReadonly = Preference 'rows' is readonly, cannot update
 pam.details.message.errorPrefs = Preference 'rows' could not be stored:

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_zh.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_zh.properties?rev=772093&r1=772092&r2=772093&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_zh.properties (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_zh.properties Wed May  6 08:06:42 2009
@@ -124,6 +124,7 @@
 pam.details.action.search = Search
 pam.details.action.delete = Delete
 pam.details.action.save = Save
+pam.details.action.clone = Clone
 pam.details.deployment.title = Deploy Portlet Application
 pam.details.action.cancel = Cancel
 pam.details.action.uploadFile = Upload File
@@ -138,6 +139,7 @@
 pam.details.action.status.deleteOK = Portlet application removal from registry was successful: {0}
 pam.details.action.status.serverReadyFailure = Failed to {1} application: {0}. Portlet Application was not found in registry
 pam.details.action.status.serverNotAvailable = Failed to {1} application: {0}. Connection to Application Server is not available. 
-pam.details.message.rowsDisplayed = No. of Rows Displayed:
+pam.details.message.appRowsDisplayed = No. of Application Rows Displayed:
+pam.details.message.portletRowsDisplayed = No. of Portlet Rows Displayed:
 pam.details.message.errorReadonly = Preference 'rows' is readonly, cannot update
 pam.details.message.errorPrefs = Preference 'rows' could not be stored:

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_zh_TW.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_zh_TW.properties?rev=772093&r1=772092&r2=772093&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_zh_TW.properties (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/prm/resources/PRMResources_zh_TW.properties Wed May  6 08:06:42 2009
@@ -124,6 +124,7 @@
 pam.details.action.search = Search
 pam.details.action.delete = Delete
 pam.details.action.save = Save
+pam.details.action.clone = Clone
 pam.details.deployment.title = Deploy Portlet Application
 pam.details.action.cancel = Cancel
 pam.details.action.uploadFile = Upload File
@@ -138,6 +139,7 @@
 pam.details.action.status.deleteOK = Portlet application removal from registry was successful: {0}
 pam.details.action.status.serverReadyFailure = Failed to {1} application: {0}. Portlet Application was not found in registry
 pam.details.action.status.serverNotAvailable = Failed to {1} application: {0}. Connection to Application Server is not available. 
-pam.details.message.rowsDisplayed = No. of Rows Displayed:
+pam.details.message.appRowsDisplayed = No. of Application Rows Displayed:
+pam.details.message.portletRowsDisplayed = No. of Portlet Rows Displayed:
 pam.details.message.errorReadonly = Preference 'rows' is readonly, cannot update
 pam.details.message.errorPrefs = Preference 'rows' could not be stored:

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/portlet.xml?rev=772093&r1=772092&r2=772093&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/portlet.xml (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/portlet.xml Wed May  6 08:06:42 2009
@@ -1696,7 +1696,11 @@
 	    </portlet-info>
 	    <portlet-preferences>
 	    	<preference>
-    	        <name>rows</name>
+    	        <name>appRows</name>
+	            <value>10</value>
+	    	</preference>
+	    	<preference>
+    	        <name>portletRows</name>
 	            <value>10</value>
 	    	</preference>
 	    </portlet-preferences>



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