portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From woon...@apache.org
Subject svn commit: r770633 - in /portals/jetspeed-2/applications/j2-admin/trunk/src: main/java/org/apache/jetspeed/portlets/ main/java/org/apache/jetspeed/portlets/wicket/ webapp/WEB-INF/
Date Fri, 01 May 2009 11:16:20 GMT
Author: woonsan
Date: Fri May  1 11:16:20 2009
New Revision: 770633

URL: http://svn.apache.org/viewvc?rev=770633&view=rev
Log:
JS2-946: Refactoring wicket base classes for j2-admin.
Because Wicket portlet support has improved a lot since the base admin portlet was introduced,
we don't have any reason to keep it.
(For example, init params or portlet config is available without any special treatment in
the our own base portlet.)
So, I removed AdminWicketPortlet and changed to use the default WicketPortlet.

Removed:
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/wicket/AdminWicketPortlet.java
Modified:
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/AdminPortletWebPage.java
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/JetspeedServiceLocator.java
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/wicket/AbstractAdminWebApplication.java
    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/AdminPortletWebPage.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/AdminPortletWebPage.java?rev=770633&r1=770632&r2=770633&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/AdminPortletWebPage.java
(original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/AdminPortletWebPage.java
Fri May  1 11:16:20 2009
@@ -21,7 +21,6 @@
 
 import javax.portlet.PortletRequest;
 import javax.portlet.PortletResponse;
-import javax.servlet.http.HttpServletRequest;
 
 import org.apache.jetspeed.portlets.wicket.AbstractAdminWebApplication;
 import org.apache.wicket.IPageMap;
@@ -108,6 +107,8 @@
  
     /**
      * Delegates the invocation to {@link AbstractAdminWebApplication#getServiceLocator()}.
+     * Please use the corresponding method of {@link AbstractAdminWebApplication} directly.
+     * @deprecated
      */
     public JetspeedServiceLocator getServiceLocator()
     {
@@ -116,6 +117,8 @@
     
     /**
      * Delegates the invocation to {@link AbstractAdminWebApplication#getInitParam(String)}.
+     * Please use the corresponding method of {@link AbstractAdminWebApplication} directly.
+     * @deprecated
      */
     public String getInitParam(String paramKey)
     {
@@ -124,6 +127,8 @@
 
     /**
      * Delegates the invocation to {@link AbstractAdminWebApplication#getInitParamAsInteger(String)}.
+     * Please use the corresponding method of {@link AbstractAdminWebApplication} directly.
+     * @deprecated
      */
     public int getInitParamAsInteger(String paramKey)
     {
@@ -132,6 +137,8 @@
 
     /**
      * Delegates the invocation to {@link AbstractAdminWebApplication#getInitParamAsBoolean(String)}.
+     * Please use the corresponding method of {@link AbstractAdminWebApplication} directly.
+     * @deprecated
      */
     public boolean getInitParamAsBoolean(String paramKey)
     {
@@ -139,47 +146,59 @@
     }
     
     /**
-     * Delegates the invocation to {@link AbstractAdminWebApplication#getPreference(String)}.
+     * Delegates the invocation to {@link AbstractAdminWebApplication#getPreferenceValue(String)}.
+     * Please use the corresponding method of {@link AbstractAdminWebApplication} directly.
+     * @deprecated
      */
     public String getPreference(String key)
     {
-        return ((AbstractAdminWebApplication) getApplication()).getPreference(key);
+        return ((AbstractAdminWebApplication) getApplication()).getPreferenceValue(key);
     }
     
     /**
-     * Delegates the invocation to {@link AbstractAdminWebApplication#getPreferenceAsInteger(String)}.
+     * Delegates the invocation to {@link AbstractAdminWebApplication#getPreferenceValueAsInteger(String)}.
+     * Please use the corresponding method of {@link AbstractAdminWebApplication} directly.
+     * @deprecated
      */
     public int getPreferenceAsInteger(String key)
     {
-        return ((AbstractAdminWebApplication) getApplication()).getPreferenceAsInteger(key);
+        return ((AbstractAdminWebApplication) getApplication()).getPreferenceValueAsInteger(key);
     }
 
     /**
-     * Delegates the invocation to {@link AbstractAdminWebApplication#getPreferenceAsBoolean(String)}.
+     * Delegates the invocation to {@link AbstractAdminWebApplication#getPreferenceValueAsBoolean(String)}.
+     * Please use the corresponding method of {@link AbstractAdminWebApplication} directly.
+     * @deprecated
      */
     public boolean getPreferenceAsBoolean(String key)
     {
-        return ((AbstractAdminWebApplication) getApplication()).getPreferenceAsBoolean(key);
+        return ((AbstractAdminWebApplication) getApplication()).getPreferenceValueAsBoolean(key);
     }
     
     /**
-     * Delegates the invocation to {@link AbstractAdminWebApplication#getPreference(String,
String)}.
+     * Delegates the invocation to {@link AbstractAdminWebApplication#getPreferenceValue(String,
String)}.
+     * Please use the corresponding method of {@link AbstractAdminWebApplication} directly.
+     * @deprecated
      */
     public String getPreference(String key,String defaultValue)
     {
-        return ((AbstractAdminWebApplication) getApplication()).getPreference(key, defaultValue);
+        return ((AbstractAdminWebApplication) getApplication()).getPreferenceValue(key, defaultValue);
     }
     
     /**
-     * Delegates the invocation to {@link AbstractAdminWebApplication#getPreference(String,
String[])}.
+     * Delegates the invocation to {@link AbstractAdminWebApplication#getPreferenceValues(String,
String[])}.
+     * Please use the corresponding method of {@link AbstractAdminWebApplication} directly.
+     * @deprecated
      */
     public String [] getPreference(String key,String [] values)
     {
-        return ((AbstractAdminWebApplication) getApplication()).getPreference(key, values);
+        return ((AbstractAdminWebApplication) getApplication()).getPreferenceValues(key,
values);
     }
     
     /**
      * Delegates the invocation to {@link AbstractAdminWebApplication#getPortletRequest()}.
+     * Please use the corresponding method of {@link AbstractAdminWebApplication} directly.
+     * @deprecated
      */
     public PortletRequest getPortletRequest()
     {
@@ -188,6 +207,8 @@
     
     /**
      * Delegates the invocation to {@link AbstractAdminWebApplication#setTitle(String)}.
+     * Please use the corresponding method of {@link AbstractAdminWebApplication} directly.
+     * @deprecated
      */
     public void setTitle(String title)
     {
@@ -196,6 +217,8 @@
     
     /**
      * Delegates the invocation to {@link AbstractAdminWebApplication#getTitle()}.
+     * Please use the corresponding method of {@link AbstractAdminWebApplication} directly.
+     * @deprecated
      */
     public String getTitle()
     {
@@ -204,6 +227,8 @@
     
     /**
      * Delegates the invocation to {@link AbstractAdminWebApplication#getPortletName()}.
+     * Please use the corresponding method of {@link AbstractAdminWebApplication} directly.
+     * @deprecated
      */
     public String getPortletName()
     {
@@ -212,6 +237,8 @@
     
     /**
      * Delegates the invocation to {@link AbstractAdminWebApplication#getPortletResponse()}.
+     * Please use the corresponding method of {@link AbstractAdminWebApplication} directly.
+     * @deprecated
      */
     public PortletResponse getPortletResponse()
     {
@@ -219,23 +246,9 @@
     }
     
     /**
-     * Delegates the invocation to {@link AbstractAdminWebApplication#getServletRequest(PortletRequest)}.
-     */
-    public HttpServletRequest getServletRequest(PortletRequest request)
-    {
-        return ((AbstractAdminWebApplication) getApplication()).getServletRequest(request);
-    }
-    
-    /**
-     * Delegates the invocation to {@link AbstractAdminWebApplication#getServletRequest()}.
-     */
-    public HttpServletRequest getServletRequest()
-    {
-        return ((AbstractAdminWebApplication) getApplication()).getServletRequest();
-    }
- 
-    /**
      * Delegates the invocation to {@link AbstractAdminWebApplication#getIPAddress()}.
+     * Please use the corresponding method of {@link AbstractAdminWebApplication} directly.
+     * @deprecated
      */
     public String getIPAddress()
     {
@@ -243,11 +256,13 @@
     }
  
     /**
-     * Delegates the invocation to {@link AbstractAdminWebApplication#getAuthenticatedUsername()}.
+     * Delegates the invocation to {@link AbstractAdminWebApplication#getUserPrincipalName()}.
+     * Please use the corresponding method of {@link AbstractAdminWebApplication} directly.
+     * @deprecated
      */
     public String getAuthenticatedUsername()
     {
-       return ((AbstractAdminWebApplication) getApplication()).getAuthenticatedUsername();
+       return ((AbstractAdminWebApplication) getApplication()).getUserPrincipalName();
     }
     
 }
\ No newline at end of file

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/JetspeedServiceLocator.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/JetspeedServiceLocator.java?rev=770633&r1=770632&r2=770633&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/JetspeedServiceLocator.java
(original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/JetspeedServiceLocator.java
Fri May  1 11:16:20 2009
@@ -31,7 +31,6 @@
 import org.apache.jetspeed.deployment.DeploymentManager;
 import org.apache.jetspeed.factory.PortletFactory;
 import org.apache.jetspeed.page.PageManager;
-import org.apache.jetspeed.portlets.wicket.AdminWicketPortlet;
 import org.apache.jetspeed.profiler.Profiler;
 import org.apache.jetspeed.search.SearchEngine;
 import org.apache.jetspeed.security.GroupManager;
@@ -72,11 +71,6 @@
         return ((PortletConfig)getPortletRequest().getAttribute("javax.portlet.config")).getPortletContext();
       
     }
     
-    public String getPAIdentifier()
-    {
-        return (String) getPortletContext().getAttribute(AdminWicketPortlet.JETSPEED_PA_IDENTIFIER);
-    }
-
     public UserManager getUserManager()
     {
         return (UserManager)getPortletContext().getAttribute(CommonPortletServices.CPS_USER_MANAGER_COMPONENT);

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/wicket/AbstractAdminWebApplication.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/wicket/AbstractAdminWebApplication.java?rev=770633&r1=770632&r2=770633&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/wicket/AbstractAdminWebApplication.java
(original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/wicket/AbstractAdminWebApplication.java
Fri May  1 11:16:20 2009
@@ -19,18 +19,13 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.security.Principal;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
 
-import javax.portlet.GenericPortlet;
+import javax.portlet.PortletConfig;
+import javax.portlet.PortletPreferences;
 import javax.portlet.PortletRequest;
 import javax.portlet.PortletResponse;
 import javax.portlet.RenderResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
 
-import org.apache.jetspeed.PortalReservedParameters;
 import org.apache.jetspeed.portlets.JetspeedServiceLocator;
 import org.apache.wicket.RequestContext;
 import org.apache.wicket.WicketRuntimeException;
@@ -52,12 +47,12 @@
  */
 public abstract class AbstractAdminWebApplication extends WebApplication
 {
-    protected Map<String, Map<String, String>> portletInitParameters = Collections.synchronizedMap(new
HashMap<String, Map<String, String>>());
-    protected JetspeedServiceLocator serviceLocator;
     public static final String USER_ADMINISTRATION = "J2 User Administration";
-
-	public abstract Class getHomePage();
     
+    private static final String [] EMPTY_STRING_ARRAY = {};
+    
+    protected JetspeedServiceLocator serviceLocator;
+
 	protected void init()
 	{
         super.init();
@@ -85,7 +80,7 @@
          * @see org.apache.wicket.util.resource.locator.ResourceStreamLocator#locate(java.lang.Class,
          *      java.lang.String)
          */
-        public IResourceStream locate(Class clazz, String path)
+        public IResourceStream locate(Class<?> clazz, String path)
         {
             String location = this.templatesPath + path;
             
@@ -110,178 +105,150 @@
 
     }
 
-    // Utility methods
+    // Utility methods for Portlet APIs
     
-    public JetspeedServiceLocator getServiceLocator()
+    public PortletConfig getPortletConfig()
     {
-        if (serviceLocator == null)
+        return ((PortletRequestContext) RequestContext.get()).getPortletConfig();
+    }
+    
+    public PortletRequest getPortletRequest()
+    {
+        return ((PortletRequestContext) RequestContext.get()).getPortletRequest();
+    }
+
+    public PortletResponse getPortletResponse()
+    {
+        return ((PortletRequestContext) RequestContext.get()).getPortletResponse();
+    }
+
+    public String getPortletName()
+    {
+        return getPortletConfig().getPortletName();
+    }
+    
+    public void setTitle(String title)
+    {
+        PortletResponse response = getPortletResponse();
+        
+        if (response instanceof RenderResponse) 
         {
-            serviceLocator = new JetspeedServiceLocator();
+            RenderResponse renderResponse = (RenderResponse) response;
+            renderResponse.setTitle(title);
         }
-        
-        return serviceLocator;
     }
-    
-    public Map<String, String> getInitParams()
+
+    public String getTitle()
     {
-        String portletName = getPortletName();
-        Map<String, String> initParams = portletInitParameters.get(portletName);
+        PortletRequest request = ((PortletRequestContext) RequestContext.get()).getPortletRequest();
+        String title = getPortletConfig().getResourceBundle(request.getLocale()).getString("javax.portlet.title");
         
-        if (initParams == null)
+        if (title == null)
         {
-            initParams = (Map<String, String>) getPortletRequest().getAttribute(AdminWicketPortlet.INIT_PARAMS);
-            portletInitParameters.put(portletName, initParams);
+            title = getPortletName();
         }
         
-        return initParams;
+        return title;
     }
     
     public String getInitParam(String paramKey)
     {
-        String paramValue = null;
-        if (getInitParams().containsKey(paramKey))
-        {
-            paramValue = (String) getInitParams().get(paramKey);
-        }
-        return paramValue;
+        return getPortletConfig().getInitParameter(paramKey);
     }
 
     public int getInitParamAsInteger(String paramKey)
     {
-        int result = 0;
-        if (getInitParams().containsKey(paramKey))
-        {
-            String paramValue = (String) getInitParams().get(paramKey);
-            result = Integer.parseInt(paramValue);
-        }
-        return result;
+        String paramValue = getInitParam(paramKey);
+        return Integer.parseInt(paramValue);
     }
 
     public boolean getInitParamAsBoolean(String paramKey)
     {
-        boolean result = false;
-        if (getInitParams().containsKey(paramKey))
-        {
-            String paramValue = (String) getInitParams().get(paramKey);
-            result = Boolean.parseBoolean(paramValue);
-        }
-        return result;
+        String paramValue = getInitParam(paramKey);
+        return Boolean.parseBoolean(paramValue);
     }
     
-    public String getPreference(String key)
+    public String getPreferenceValue(String key, String defaultValue)
     {
         String preferenceValue = null;
-        if( getPortletRequest().getPreferences().getMap().containsKey(key))
+        PortletPreferences prefs = getPortletRequest().getPreferences();
+        
+        if (prefs.getMap().containsKey(key))
         {
-            preferenceValue = getPortletRequest().getPreferences().getValue(key, null);
+            preferenceValue = prefs.getValue(key, defaultValue);
         }
+        
         return preferenceValue;
     }
     
-    public int getPreferenceAsInteger(String key)
+    public String getPreferenceValue(String key)
     {
-        int result = 0;
-        if (getPortletRequest().getPreferences().getMap().containsKey(key))
-        {
-            String preferenceValue = getPortletRequest().getPreferences().getValue(key, null);
-            if (preferenceValue != null)
-            {
-                result = Integer.parseInt(preferenceValue);
-            }
-        }
-        return result;
-    }
-
-    public boolean getPreferenceAsBoolean(String key)
-    {
-        boolean result = false;
-        if (getPortletRequest().getPreferences().getMap().containsKey(key))
-        {
-            String preferenceValue = getPortletRequest().getPreferences().getValue(key, null);
-            if (preferenceValue != null)
-            {
-                result = Boolean.parseBoolean(preferenceValue);
-            }
-        }
-        return result;
+        return getPreferenceValue(key, (String) null);
     }
     
-    public String getPreference(String key,String defaultValue)
+    public String [] getPreferenceValues(String key, String [] defaultValues)
     {
-        String preferenceValue=null;;
-        if(getPortletRequest().getPreferences().getMap().containsKey(key))
+        String [] preferenceValues = null;
+        PortletPreferences prefs = getPortletRequest().getPreferences();
+        
+        if (prefs.getMap().containsKey(key))
         {
-            preferenceValue = getPortletRequest().getPreferences().getValue(key, defaultValue);
+            preferenceValues = prefs.getValues(key, defaultValues);
         }
-        return preferenceValue;
+        
+        return preferenceValues;
     }
     
-    public String [] getPreference(String key,String values [])
+    public String [] getPreferenceValues(String key)
     {
-        String preferenceValue[]=null;;
-        if(getPortletRequest().getPreferences().getMap().containsKey(key))
-        {
-            preferenceValue = getPortletRequest().getPreferences().getValues(key, null);
-        }
-        return preferenceValue;
+        return getPreferenceValues(key, EMPTY_STRING_ARRAY);
     }
     
-    public PortletRequest getPortletRequest()
+    public int getPreferenceValueAsInteger(String key)
     {
-        return ((PortletRequestContext) RequestContext.get()).getPortletRequest();
+        String preferenceValue = getPreferenceValue(key);
+        return (preferenceValue != null ? Integer.parseInt(preferenceValue) : 0);
     }
-    
-    public void setTitle(String title)
+
+    public boolean getPreferenceValueAsBoolean(String key)
     {
-        PortletResponse pr = getPortletResponse();
-        if (pr instanceof RenderResponse) {
-            RenderResponse rr = (RenderResponse) pr;
-            rr.setTitle(title);
-        }
+        String preferenceValue = getPreferenceValue(key);
+        return (preferenceValue != null ? Boolean.parseBoolean(preferenceValue) : false);
     }
     
-    public String getTitle()
+    public Principal getUserPrincipal()
     {
-        return (String)getPortletRequest().getAttribute(AdminWicketPortlet.PORTLET_TITLE);
+        return getPortletRequest().getUserPrincipal();
     }
     
-    public String getPortletName()
+    public String getUserPrincipalName()
     {
-        GenericPortlet portlet = (GenericPortlet) getPortletRequest().getAttribute(AdminWicketPortlet.PORTLET);
-        return portlet.getPortletName();
+        Principal p = getUserPrincipal();
+        return (p == null ? "" : p.getName());
     }
     
-    public PortletResponse getPortletResponse()
-    {
-        return ((PortletRequestContext) RequestContext.get()).getPortletResponse();
-    }
+    // Utility methods for Jetspeed APIs
     
-    public HttpServletRequest getServletRequest(PortletRequest request)
+    public JetspeedServiceLocator getServiceLocator()
     {
-        HttpServletRequest realRequest = (HttpServletRequest)((HttpServletRequestWrapper)
request).getRequest();
-        return realRequest;
+        if (serviceLocator == null)
+        {
+            serviceLocator = new JetspeedServiceLocator();
+        }
+        
+        return serviceLocator;
     }
     
-    public HttpServletRequest getServletRequest()
+    public void setServiceLocator(JetspeedServiceLocator serviceLocator)
     {
-        HttpServletRequest realRequest = (HttpServletRequest)((HttpServletRequestWrapper)
getPortletRequest()).getRequest();
-        return realRequest;
+        this.serviceLocator = serviceLocator;
     }
- 
+
     public String getIPAddress()
     {
-        org.apache.jetspeed.request.RequestContext context = (org.apache.jetspeed.request.RequestContext)
getPortletRequest().getAttribute(
-                PortalReservedParameters.REQUEST_CONTEXT_ATTRIBUTE);
+        org.apache.jetspeed.request.RequestContext context = 
+            (org.apache.jetspeed.request.RequestContext) getPortletRequest().getAttribute(org.apache.jetspeed.request.RequestContext.REQUEST_PORTALENV);
         return (context == null ? "" : context.getRequest().getRemoteAddr());
     }
  
-    public String getAuthenticatedUsername()
-    {
-        Principal p = getPortletRequest().getUserPrincipal();
-        if (p == null)
-            return "";
-        else
-            return p.getName();
-    }
-    
 }

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=770633&r1=770632&r2=770633&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 Fri May
 1 11:16:20 2009
@@ -883,7 +883,7 @@
     <portlet-name>PortalSiteManager</portlet-name>
     <display-name>Portal Site Manager</display-name>        
     <display-name xml:lang="ja">ポータルサイトマネージャ</display-name>
       
-    <portlet-class>org.apache.jetspeed.portlets.wicket.AdminWicketPortlet</portlet-class>
   
+    <portlet-class>org.apache.wicket.protocol.http.portlet.WicketPortlet</portlet-class>
   
     <init-param>
         <name>portlet-icon</name>
         <value>user-home.png</value>
@@ -934,7 +934,7 @@
     <portlet-name>RPADPortlet</portlet-name>
     <display-name>Remote Portlet Application Deployer</display-name>
     <display-name xml:lang="ja">リモートポートレットアプリケーション配備(RPAD)</display-name>
-    <portlet-class>org.apache.jetspeed.portlets.wicket.AdminWicketPortlet</portlet-class>
+    <portlet-class>org.apache.wicket.protocol.http.portlet.WicketPortlet</portlet-class>
     <init-param>
       <name>wicketFilterPath</name>
       <value>/rpad</value>
@@ -1319,7 +1319,7 @@
     <description>The Wicket User Browser displays a list of users managed in this portal.
From here you can select users for editing.</description>
     <portlet-name>JetspeedPrincipalmanagementUserPortlet</portlet-name>
     <display-name>Jetspeed Principal User Browser</display-name>
-    <portlet-class>org.apache.jetspeed.portlets.wicket.AdminWicketPortlet</portlet-class>
+    <portlet-class>org.apache.wicket.protocol.http.portlet.WicketPortlet</portlet-class>
     <init-param>
       <name>wicketFilterPath</name>
       <value>/jetspeedPrincipalmanagement</value>
@@ -1343,7 +1343,7 @@
     <description>The Wicket Group Browser displays a list of groups managed in this
portal. From here you can select groups for editing.</description>
     <portlet-name>JetspeedPrincipalmanagementGroupPortlet</portlet-name>
     <display-name>Jetspeed Principal Group Browser</display-name>
-    <portlet-class>org.apache.jetspeed.portlets.wicket.AdminWicketPortlet</portlet-class>
+    <portlet-class>org.apache.wicket.protocol.http.portlet.WicketPortlet</portlet-class>
     <init-param>
       <name>wicketFilterPath</name>
       <value>/jetspeedPrincipalmanagement</value>
@@ -1367,7 +1367,7 @@
     <description>The Wicket Roles Browser displays a list of roles managed in this
portal. From here you can select roles for editing.</description>
     <portlet-name>JetspeedPrincipalmanagementRolesPortlet</portlet-name>
     <display-name>Jetspeed Principal Roles Browser</display-name>
-    <portlet-class>org.apache.jetspeed.portlets.wicket.AdminWicketPortlet</portlet-class>
+    <portlet-class>org.apache.wicket.protocol.http.portlet.WicketPortlet</portlet-class>
     <init-param>
       <name>wicketFilterPath</name>
       <value>/jetspeedPrincipalmanagement</value>
@@ -1392,7 +1392,7 @@
         <description>wicket profiler admin</description>
         <portlet-name>WicketProfilerAdmin</portlet-name>
         <display-name>Wicket Profiler Admin</display-name>
-        <portlet-class>org.apache.jetspeed.portlets.wicket.AdminWicketPortlet</portlet-class>
+        <portlet-class>org.apache.wicket.protocol.http.portlet.WicketPortlet</portlet-class>
         <init-param>
             <name>wicketFilterPath</name>
             <value>/profileradmin</value>
@@ -1414,7 +1414,7 @@
         <description>wicket portlet tracking portlet</description>
         <portlet-name>WicketPortletTrackingPortlet</portlet-name>
         <display-name>Wicket Portlet Tracking Portlet</display-name>
-        <portlet-class>org.apache.jetspeed.portlets.wicket.AdminWicketPortlet</portlet-class>
+        <portlet-class>org.apache.wicket.protocol.http.portlet.WicketPortlet</portlet-class>
         <init-param>
             <name>wicketFilterPath</name>
             <value>/portlettracking</value>
@@ -1437,7 +1437,7 @@
             From here you import and export users, groups, roles and other Jetspeed objects.</description>
         <portlet-name>PortalDataSerializer</portlet-name>
         <display-name>Portal Data Serializer</display-name>
-        <portlet-class>org.apache.jetspeed.portlets.wicket.AdminWicketPortlet</portlet-class>
+        <portlet-class>org.apache.wicket.protocol.http.portlet.WicketPortlet</portlet-class>
         <init-param>
             <name>wicketFilterPath</name>
             <value>/portalDataSerializer</value>
@@ -1645,7 +1645,7 @@
     <description>The Portlet Registry Manager Application List displays a lost of portlet
applications deployed to this portal registry. From here you deploy, undeploy, start, stop
and edit portlet applications.</description>
     <portlet-name>RegistryApplicationsList</portlet-name>
     <display-name>Registry Applications List</display-name>
-    <portlet-class>org.apache.jetspeed.portlets.wicket.AdminWicketPortlet</portlet-class>
+    <portlet-class>org.apache.wicket.protocol.http.portlet.WicketPortlet</portlet-class>
        <init-param>
        		<name>editPage</name>
        		<value>/prm/edit</value>
@@ -1678,7 +1678,7 @@
     <description>Application Details List</description>
     <portlet-name>ApplicationDetails</portlet-name>
     <display-name>Application Details</display-name>
-    <portlet-class>org.apache.jetspeed.portlets.wicket.AdminWicketPortlet</portlet-class>
+    <portlet-class>org.apache.wicket.protocol.http.portlet.WicketPortlet</portlet-class>
        <init-param>
        		<name>editPage</name>
        		<value>/pad/edit</value>
@@ -1704,7 +1704,7 @@
     <description>Portlet Details Manager</description>
     <portlet-name>PortletDetailsManager</portlet-name>
     <display-name>Portlet Details Manager</display-name>
-    <portlet-class>org.apache.jetspeed.portlets.wicket.AdminWicketPortlet</portlet-class>
+    <portlet-class>org.apache.wicket.protocol.http.portlet.WicketPortlet</portlet-class>
        <init-param>
        		<name>editPage</name>
        		<value>/pdm/edit</value>



---------------------------------------------------------------------
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