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/03/31 00:40:25 UTC
svn commit: r760209 [1/3] - in
/portals/jetspeed-2/applications/j2-admin/trunk: ./
src/main/java/org/apache/jetspeed/portlets/
src/main/java/org/apache/jetspeed/portlets/entityeditor/
src/main/java/org/apache/jetspeed/portlets/palm/ src/main/java/org/a...
Author: taylor
Date: Mon Mar 30 22:40:23 2009
New Revision: 760209
URL: http://svn.apache.org/viewvc?rev=760209&view=rev
Log:
http://issues.apache.org/jira/browse/JS2-946, work in progress, check point
Added:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/AdminPortletWebPage.java (with props)
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/JetspeedServiceLocator.java (with props)
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationBean.java (with props)
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationDataProvider.java (with props)
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationModel.java (with props)
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationsListApplication.java (with props)
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationsListEdit.html (with props)
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationsListEdit.java (with props)
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationsListEdit.properties (with props)
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationsListEdit2.html (with props)
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationsListHome$ActionPanel.html (with props)
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationsListHome$RunningPanel.html (with props)
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationsListHome.html (with props)
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationsListHome.java (with props)
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationsListHome.properties (with props)
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/PortletDataProvider.java (with props)
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/PortletDefinitionBean.java (with props)
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/PortletDefinitionModel.java (with props)
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/PortletsListHome.html (with props)
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/PortletsListHome.java (with props)
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/UploadPortletApp.html (with props)
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/UploadPortletApp.java (with props)
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/UploadPortletApp.properties (with props)
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/running.gif (with props)
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/stop.gif (with props)
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/pom.xml
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/entityeditor/PortletEntityBrowserPortlet.java
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/palm/PortletApplicationLifecycleManager.java
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/palm/PortletApplicationStatusBean.java
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/pam/beans/PortletApplicationBean.java
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet.java
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/users/UserDetailsPortlet.java
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserAdd.java
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserAdmin.java
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserBrowser.java
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserDetails.java
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager.java
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/wicket/AdminWicketPortlet.java
portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/jetspeed-portlet.xml
portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/portlet.xml
portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/web.xml
Modified: portals/jetspeed-2/applications/j2-admin/trunk/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/pom.xml?rev=760209&r1=760208&r2=760209&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/pom.xml (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/pom.xml Mon Mar 30 22:40:23 2009
@@ -115,7 +115,6 @@
<javax.servlet.version>2.4</javax.servlet.version>
<javax.servlet.jsp.version>2.0</javax.servlet.jsp.version>
<javax.transaction.version>1.0.1B</javax.transaction.version>
- <portlet-api.version>1.0</portlet-api.version>
<jaxen.version>1.0-FCS</jaxen.version>
<jdom.version>1.0</jdom.version>
<log4j.version>1.2.14</log4j.version>
@@ -143,7 +142,7 @@
<jcr.version>1.0</jcr.version>
<jackrabbit.version>1.4</jackrabbit.version>
<myfaces.version>1.1.5</myfaces.version>
- <wicket.version>1.4-rc1</wicket.version>
+ <wicket.version>1.4-rc2</wicket.version>
<slf4j.version>1.4.3</slf4j.version>
</properties>
Added: 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=760209&view=auto
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/AdminPortletWebPage.java (added)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/AdminPortletWebPage.java Mon Mar 30 22:40:23 2009
@@ -0,0 +1,199 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+package org.apache.jetspeed.portlets;
+
+import java.security.Principal;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.portlet.PortletRequest;
+import javax.portlet.PortletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequestWrapper;
+
+import org.apache.jetspeed.PortalReservedParameters;
+import org.apache.jetspeed.portlets.wicket.AdminWicketPortlet;
+import org.apache.wicket.RequestContext;
+import org.apache.wicket.markup.html.WebPage;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.protocol.http.portlet.PortletRequestContext;
+
+
+/**
+ * General Portlet functionality provided to Admin Portlets via inheritance in an abstract class
+ *
+ * @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
+ * @version $Id$
+ */
+public abstract class AdminPortletWebPage extends WebPage
+{
+ protected Map<String, String> initParams = null;
+ protected JetspeedServiceLocator serviceLocator;
+
+ public AdminPortletWebPage()
+ {
+ initParams = (Map<String, String>) getPortletRequest().getAttribute(AdminWicketPortlet.INIT_PARAMS);
+ serviceLocator = new JetspeedServiceLocator();
+ }
+
+ public JetspeedServiceLocator getServiceLocator()
+ {
+ return serviceLocator;
+ }
+
+ public String getInitParam(String paramKey)
+ {
+ String paramValue = null;
+ if (initParams.containsKey(paramKey))
+ {
+ paramValue = (String) initParams.get(paramKey);
+ }
+ return paramValue;
+ }
+
+ public int getInitParamAsInteger(String paramKey)
+ {
+ int result = 0;
+ if (initParams.containsKey(paramKey))
+ {
+ String paramValue = (String) initParams.get(paramKey);
+ result = Integer.parseInt(paramValue);
+ }
+ return result;
+ }
+
+ public boolean getInitParamAsBoolean(String paramKey)
+ {
+ boolean result = false;
+ if (initParams.containsKey(paramKey))
+ {
+ String paramValue = (String) initParams.get(paramKey);
+ result = Boolean.parseBoolean(paramValue);
+ }
+ return result;
+ }
+
+ public String getPreference(String key)
+ {
+ String preferenceValue = null;
+ if( getPortletRequest().getPreferences().getMap().containsKey(key))
+ {
+ preferenceValue = getPortletRequest().getPreferences().getValue(key, null);
+ }
+ return preferenceValue;
+ }
+
+ public int getPreferenceAsInteger(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;
+ }
+
+ public String getPreference(String key,String defaultValue)
+ {
+ String preferenceValue=null;;
+ if(getPortletRequest().getPreferences().getMap().containsKey(key))
+ {
+ preferenceValue = getPortletRequest().getPreferences().getValue(key, defaultValue);
+ }
+ return preferenceValue;
+ }
+
+ public String [] getPreference(String key,String values [])
+ {
+ String preferenceValue[]=null;;
+ if(getPortletRequest().getPreferences().getMap().containsKey(key))
+ {
+ preferenceValue = getPortletRequest().getPreferences().getValues(key, null);
+ }
+ return preferenceValue;
+ }
+
+ protected PortletRequest getPortletRequest()
+ {
+ return ((PortletRequestContext) RequestContext.get()).getPortletRequest();
+ }
+
+ protected PortletResponse getPortletResponse()
+ {
+ return ((PortletRequestContext) RequestContext.get()).getPortletResponse();
+ }
+
+ protected HttpServletRequest getServletRequest(PortletRequest request)
+ {
+ HttpServletRequest realRequest = (HttpServletRequest)((HttpServletRequestWrapper) request).getRequest();
+ return realRequest;
+ }
+
+ protected HttpServletRequest getServletRequest()
+ {
+ HttpServletRequest realRequest = (HttpServletRequest)((HttpServletRequestWrapper) getPortletRequest()).getRequest();
+ return realRequest;
+ }
+
+ protected String getIPAddress()
+ {
+ org.apache.jetspeed.request.RequestContext context = (org.apache.jetspeed.request.RequestContext) getPortletRequest().getAttribute(
+ PortalReservedParameters.REQUEST_CONTEXT_ATTRIBUTE);
+ return (context == null ? "" : context.getRequest().getRemoteAddr());
+ }
+
+ protected String messageSubstition(String resource, String[]keys, Object[]values)
+ {
+ HashMap<String, Object> vars = new HashMap<String, Object>(keys.length);
+ for (int ix = 0; ix < keys.length; ix++)
+ {
+ if (values[ix] == null)
+ vars.put(keys[ix], "");
+ else
+ vars.put(keys[ix], values[ix]);
+ }
+ return getString(resource, new Model<HashMap<String, Object>>(vars));
+ }
+
+ protected String getAuthenticatedUsername()
+ {
+ Principal p = getPortletRequest().getUserPrincipal();
+ if (p == null)
+ return "";
+ else
+ return p.getName();
+ }
+}
\ No newline at end of file
Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/AdminPortletWebPage.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/AdminPortletWebPage.java
------------------------------------------------------------------------------
svn:keywords = Id
Added: 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=760209&view=auto
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/JetspeedServiceLocator.java (added)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/JetspeedServiceLocator.java Mon Mar 30 22:40:23 2009
@@ -0,0 +1,164 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+package org.apache.jetspeed.portlets;
+
+import java.io.Serializable;
+
+import javax.portlet.PortletConfig;
+import javax.portlet.PortletContext;
+import javax.portlet.PortletRequest;
+
+import org.apache.jetspeed.CommonPortletServices;
+import org.apache.jetspeed.administration.PortalConfiguration;
+import org.apache.jetspeed.audit.AuditActivity;
+import org.apache.jetspeed.components.portletregistry.PortletRegistry;
+import org.apache.jetspeed.decoration.DecorationFactory;
+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;
+import org.apache.jetspeed.security.JetspeedPrincipalManagerProvider;
+import org.apache.jetspeed.security.PasswordCredential;
+import org.apache.jetspeed.security.RoleManager;
+import org.apache.jetspeed.security.SecurityException;
+import org.apache.jetspeed.security.User;
+import org.apache.jetspeed.security.UserManager;
+import org.apache.jetspeed.tools.pamanager.PortletApplicationManagement;
+import org.apache.jetspeed.tools.pamanager.servletcontainer.ApplicationServerManager;
+import org.apache.wicket.RequestContext;
+import org.apache.wicket.protocol.http.portlet.PortletRequestContext;
+
+/**
+ * Locates Jetspeed Services either by name or with direct accessors
+ *
+ * @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
+ * @version $Id$
+ */
+public class JetspeedServiceLocator implements Serializable
+{
+ private static final long serialVersionUID = 1L;
+
+ public Object getService(String serviceName)
+ {
+ return getPortletContext().getAttribute(serviceName);
+ }
+
+ public PortletRequest getPortletRequest()
+ {
+ return ((PortletRequestContext) RequestContext.get()).getPortletRequest();
+ }
+
+ public PortletContext getPortletContext()
+ {
+ 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);
+ }
+
+ public RoleManager getRoleManager()
+ {
+ return (RoleManager) getPortletContext().getAttribute(CommonPortletServices.CPS_ROLE_MANAGER_COMPONENT);
+ }
+
+ public GroupManager getGroupManager()
+ {
+ return (GroupManager) getPortletContext().getAttribute(CommonPortletServices.CPS_GROUP_MANAGER_COMPONENT);
+ }
+
+ public Profiler getProfiler()
+ {
+ return (Profiler) getPortletContext().getAttribute(CommonPortletServices.CPS_PROFILER_COMPONENT);
+ }
+
+ public AuditActivity getAuditActivity()
+ {
+ return (AuditActivity) getPortletContext().getAttribute(CommonPortletServices.CPS_AUDIT_ACTIVITY);
+ }
+
+ public PageManager getPageManager()
+ {
+ return (PageManager) getPortletContext().getAttribute(CommonPortletServices.CPS_PAGE_MANAGER_COMPONENT);
+ }
+
+ public PortletRegistry getPortletRegistry()
+ {
+ return (PortletRegistry) getPortletContext().getAttribute(CommonPortletServices.CPS_REGISTRY_COMPONENT);
+ }
+
+ public SearchEngine getSearchEngine()
+ {
+ return (SearchEngine)getPortletContext().getAttribute(CommonPortletServices.CPS_SEARCH_COMPONENT);
+ }
+
+ public PortalConfiguration getPortalConfiguration()
+ {
+ return (PortalConfiguration) getPortletContext().getAttribute(CommonPortletServices.CPS_PORTAL_CONFIGURATION);
+ }
+
+ public JetspeedPrincipalManagerProvider getJetspeedPrincipalManagerProvider()
+ {
+ return (JetspeedPrincipalManagerProvider) getPortletContext().getAttribute(CommonPortletServices.CPS_JETSPEED_PRINCIPAL_MANAGER_PROVIDER);
+ }
+
+ public DecorationFactory getDecorationFactory()
+ {
+ return (DecorationFactory) getPortletContext().getAttribute(CommonPortletServices.CPS_DECORATION_FACTORY);
+ }
+
+ public PageManager getCastorPageManager()
+ {
+ return (PageManager) getPortletContext().getAttribute(CommonPortletServices.CPS_IMPORTER_MANAGER);
+ }
+
+ public PortletFactory getPortletFactory()
+ {
+ return (PortletFactory) getPortletContext().getAttribute(CommonPortletServices.CPS_PORTLET_FACTORY_COMPONENT);
+ }
+
+ public ApplicationServerManager getApplicationServerManager()
+ {
+ return (ApplicationServerManager) getPortletContext().getAttribute(CommonPortletServices.CPS_APPLICATION_SERVER_MANAGER_COMPONENT);
+ }
+
+ public PortletApplicationManagement getPortletApplicationManager()
+ {
+ return (PortletApplicationManagement) getPortletContext().getAttribute(CommonPortletServices.CPS_PORTLET_APPLICATION_MANAGER);
+ }
+
+ public DeploymentManager getDeploymentManager()
+ {
+ return (DeploymentManager) getPortletContext().getAttribute(CommonPortletServices.CPS_DEPLOYMENT_MANAGER_COMPONENT);
+ }
+
+ public PasswordCredential getCredential(User user) throws SecurityException
+ {
+ return getUserManager().getPasswordCredential(user);
+ }
+
+}
Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/JetspeedServiceLocator.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/JetspeedServiceLocator.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/entityeditor/PortletEntityBrowserPortlet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/entityeditor/PortletEntityBrowserPortlet.java?rev=760209&r1=760208&r2=760209&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/entityeditor/PortletEntityBrowserPortlet.java (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/entityeditor/PortletEntityBrowserPortlet.java Mon Mar 30 22:40:23 2009
@@ -31,8 +31,8 @@
import org.apache.jetspeed.PortalReservedParameters;
import org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent;
import org.apache.jetspeed.components.portletregistry.PortletRegistry;
+import org.apache.jetspeed.om.portlet.PortletDefinition;
import org.apache.jetspeed.request.RequestContext;
-import org.apache.pluto.om.portlet.PortletDefinition;
import org.apache.portals.bridges.velocity.GenericVelocityPortlet;
import org.apache.velocity.context.Context;
Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/palm/PortletApplicationLifecycleManager.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/palm/PortletApplicationLifecycleManager.java?rev=760209&r1=760208&r2=760209&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/palm/PortletApplicationLifecycleManager.java (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/palm/PortletApplicationLifecycleManager.java Mon Mar 30 22:40:23 2009
@@ -185,7 +185,7 @@
{
try
{
- ApplicationServerManagerResult result = asm.start(pa.getContextRoot());
+ ApplicationServerManagerResult result = asm.start(pa.getContextPath());
if ( !result.isOk() )
{
publishStatusMessage(request, "PALM", "status", null, result.getMessage());
@@ -213,7 +213,7 @@
{
try
{
- ApplicationServerManagerResult result = asm.stop(pa.getContextRoot());
+ ApplicationServerManagerResult result = asm.stop(pa.getContextPath());
if ( !result.isOk() )
{
publishStatusMessage(request, "PALM", "status", null, result.getMessage());
@@ -237,7 +237,7 @@
{
try
{
- ApplicationServerManagerResult result = asm.undeploy(pa.getContextRoot());
+ ApplicationServerManagerResult result = asm.undeploy(pa.getContextPath());
if ( !result.isOk() )
{
publishStatusMessage(request, "PALM", "status", null, result.getMessage());
Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/palm/PortletApplicationStatusBean.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/palm/PortletApplicationStatusBean.java?rev=760209&r1=760208&r2=760209&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/palm/PortletApplicationStatusBean.java (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/palm/PortletApplicationStatusBean.java Mon Mar 30 22:40:23 2009
@@ -45,7 +45,7 @@
}
else
{
- this.path = pa.getContextRoot();
+ this.path = pa.getContextPath();
}
this.running = running;
}
Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/pam/beans/PortletApplicationBean.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/pam/beans/PortletApplicationBean.java?rev=760209&r1=760208&r2=760209&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/pam/beans/PortletApplicationBean.java (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/pam/beans/PortletApplicationBean.java Mon Mar 30 22:40:23 2009
@@ -18,6 +18,8 @@
import java.util.List;
import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
import javax.portlet.PortletMode;
import javax.portlet.WindowState;
@@ -34,13 +36,13 @@
import org.apache.jetspeed.om.portlet.GenericMetadata;
import org.apache.jetspeed.om.portlet.Listener;
import org.apache.jetspeed.om.portlet.PortletApplication;
+import org.apache.jetspeed.om.portlet.PortletDefinition;
import org.apache.jetspeed.om.portlet.PublicRenderParameter;
import org.apache.jetspeed.om.portlet.SecurityConstraint;
import org.apache.jetspeed.om.portlet.SecurityRole;
import org.apache.jetspeed.om.portlet.UserAttribute;
import org.apache.jetspeed.om.portlet.UserAttributeRef;
-import org.apache.pluto.om.portlet.PortletApplicationDefinition;
-import org.apache.pluto.om.portlet.PortletDefinition;
+import org.apache.pluto.container.om.portlet.PortletApplicationDefinition;
/**
* This portlet is a browser over all the portlet applications in the system.
@@ -301,7 +303,7 @@
public String getContextRoot()
{
- return pa.getContextRoot();
+ return pa.getContextPath();
}
public CustomPortletMode getCustomPortletMode(String name)
@@ -421,7 +423,7 @@
public void setContextRoot(String contextRoot)
{
- pa.setContextRoot(contextRoot);
+ pa.setContextPath(contextRoot);
}
public void setJetspeedSecurityConstraint(String constraint)
@@ -463,4 +465,52 @@
{
pa.setVersion(version);
}
+
+ public String getLocalContextPath()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public void setLocalContextPath(String localContextPath)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void addLocaleEncodingMapping(Locale locale, String encoding)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void addServletMappingURLPattern(String servletMappingURLPattern)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ public String getContextPath()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Map<Locale, String> getLocaleEncodingMappings()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Set<String> getServletMappingURLPatterns()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public void setContextPath(String contextPath)
+ {
+ // TODO Auto-generated method stub
+
+ }
}
Added: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationBean.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationBean.java?rev=760209&view=auto
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationBean.java (added)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationBean.java Mon Mar 30 22:40:23 2009
@@ -0,0 +1,89 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jetspeed.portlets.prm;
+
+import org.apache.jetspeed.om.portlet.PortletApplication;
+import org.apache.wicket.IClusterable;
+
+/**
+ * Represents a portlet application in the wicket widget
+ *
+ * @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
+ * @version $Id$
+ */
+public class ApplicationBean implements IClusterable
+{
+ protected String name;
+ protected String path;
+ protected String version;
+ protected boolean local;
+ protected boolean running;
+ private static final long serialVersionUID = 1L;
+
+ public ApplicationBean(PortletApplication app)
+ {
+ this(app, false);
+ }
+
+ public ApplicationBean(PortletApplication pa, boolean running)
+ {
+ super();
+ this.name = pa.getName();
+ this.version = pa.getVersion();
+ this.local = pa.getApplicationType() == PortletApplication.LOCAL;
+ if (local)
+ {
+ this.path = "<local>";
+ }
+ else
+ {
+ this.path = pa.getContextPath();
+ }
+ this.running = running;
+ }
+
+ public String toString()
+ {
+ return getName();
+ }
+
+ public String getPath()
+ {
+ return path;
+ }
+
+ public boolean isLocal()
+ {
+ return local;
+ }
+
+ public String getName()
+ {
+ return name;
+ }
+
+ public boolean isRunning()
+ {
+ return running;
+ }
+
+ public String getVersion()
+ {
+ return version;
+ }
+
+}
Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationBean.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationBean.java
------------------------------------------------------------------------------
svn:keywords = Id
Added: 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=760209&view=auto
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationDataProvider.java (added)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationDataProvider.java Mon Mar 30 22:40:23 2009
@@ -0,0 +1,245 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jetspeed.portlets.prm;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.jetspeed.om.portlet.PortletApplication;
+import org.apache.jetspeed.portlets.JetspeedServiceLocator;
+import org.apache.jetspeed.search.ParsedObject;
+import org.apache.jetspeed.search.SearchResults;
+import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;
+import org.apache.wicket.markup.repeater.data.IDataProvider;
+import org.apache.wicket.model.IModel;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Provides Data to sortable and detachable list views for Portlet Applications
+ *
+ * @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
+ * @version $Id$
+ */
+public class ApplicationDataProvider extends SortableDataProvider<ApplicationBean> implements IDataProvider<ApplicationBean>
+{
+ public enum AppOrderBy { NAME_ASC, NAME_DESC, VERSION_ASC, VERSION_DESC, PATH_ASC, PATH_DESC }
+ private JetspeedServiceLocator serviceLocator;
+ private boolean searchMode = false;
+ private List<ApplicationBean> portletApps = null;
+ private List<ApplicationBean> searchResults = null;
+ private AppOrderBy orderBy = AppOrderBy.NAME_ASC;
+ private static final long serialVersionUID = 1L;
+ private final static Logger log = LoggerFactory.getLogger(ApplicationDataProvider.class);
+
+ public ApplicationDataProvider(JetspeedServiceLocator locator)
+ {
+ this.serviceLocator = locator;
+ setSort("name", true);
+ }
+
+ public Iterator<ApplicationBean> iterator(int first, int count)
+ {
+ retrieveApplications();
+ int last = first + count;
+ if (last > portletApps.size())
+ last = portletApps.size() - 1;
+ if (last < 0)
+ last = 0;
+ return portletApps.subList(first, last).iterator();
+ }
+
+ public int size()
+ {
+ if (searchMode)
+ {
+ if (searchResults == null)
+ return 0;
+ return searchResults.size();
+ }
+ else
+ {
+ if (portletApps == null)
+ return 0;
+ return portletApps.size();
+ }
+ }
+
+ /**
+ * @see org.apache.wicket.model.IDetachable#detach()
+ */
+ public void detach()
+ {
+ }
+
+ public void retrieveApplications()
+ {
+ if (searchMode)
+ {
+ if (searchResults != null)
+ {
+ portletApps = searchResults;
+ return;
+ }
+ searchMode = false;
+ }
+ else
+ {
+ portletApps = new ArrayList<ApplicationBean>();
+ Collection<PortletApplication> apps = serviceLocator.getPortletRegistry().getPortletApplications();
+ for (PortletApplication app : apps)
+ {
+ boolean isRunning = serviceLocator.getPortletFactory().isPortletApplicationRegistered(app);
+ portletApps.add(new ApplicationBean(app, isRunning));
+ }
+ sort(portletApps, this.orderBy);
+ }
+ }
+
+ public void setSearchMode(boolean mode)
+ {
+ this.searchMode = mode;
+ }
+
+ public boolean getSearchMode()
+ {
+ return this.searchMode;
+ }
+
+ @SuppressWarnings("unchecked")
+ public void searchApplications(String search)
+ {
+ try
+ {
+ if (search == null)
+ {
+ searchMode = false;
+ return;
+ }
+ searchResults = new ArrayList<ApplicationBean>();
+ SearchResults results = serviceLocator.getSearchEngine().search(search);
+ if (results.size() > 0)
+ {
+ for (ParsedObject po : results.getResults())
+ {
+ Map<String, String> fields = po.getFields();
+ if(fields != null && po.getType().equals(ParsedObject.OBJECT_TYPE_PORTLET_APPLICATION))
+ {
+ String paName;
+ Object id = fields.get(ParsedObject.ID);
+ if (id instanceof Collection)
+ {
+ Collection<String> coll = (Collection<String>) id;
+ paName = coll.iterator().next();
+ }
+ else
+ {
+ paName = (String) id;
+ }
+ PortletApplication pa = serviceLocator.getPortletRegistry().getPortletApplication(paName);
+ if (pa != null)
+ {
+ boolean isRunning = serviceLocator.getPortletFactory().isPortletApplicationRegistered(pa);
+ searchResults.add(new ApplicationBean(pa, isRunning));
+ }
+ }
+ }
+ sort(searchResults, this.orderBy);
+ }
+ searchMode = true;
+ }
+ catch (Exception e)
+ {
+ log.error("Registry Search failure: ", e);
+ }
+ }
+
+ public void sort(List<ApplicationBean> list, AppOrderBy orderBy)
+ {
+ Collections.sort(list, new AppComparator(orderBy));
+ }
+
+ public class AppComparator implements Comparator<ApplicationBean>
+ {
+ AppOrderBy orderBy;
+
+ public AppComparator(AppOrderBy order)
+ {
+ this.orderBy = order;
+ }
+
+ public int compare(ApplicationBean app1, ApplicationBean app2)
+ {
+ String p1 = "";
+ String p2 = "";
+ if (orderBy == AppOrderBy.NAME_ASC)
+ {
+ p1 = app1.getName();
+ p2 = app2.getName();
+ }
+ else if (orderBy == AppOrderBy.NAME_DESC)
+ {
+ p2 = app1.getName();
+ p1 = app2.getName();
+ }
+ else if (orderBy == AppOrderBy.VERSION_ASC)
+ {
+ p1 = app1.getVersion();
+ p2 = app2.getVersion();
+ }
+ else if (orderBy == AppOrderBy.VERSION_DESC)
+ {
+ p2 = app1.getVersion();
+ p1 = app2.getVersion();
+ }
+ else if (orderBy == AppOrderBy.PATH_ASC)
+ {
+ p1 = app1.getPath();
+ p2 = app2.getPath();
+ }
+ else if (orderBy == AppOrderBy.PATH_DESC)
+ {
+ p2 = app1.getPath();
+ p1 = app2.getPath();
+ }
+ p1 = (p1 == null) ? "" : p1;
+ p2 = (p2 == null) ? "" : p2;
+ return p1.compareToIgnoreCase(p2);
+ }
+ }
+
+ public IModel<ApplicationBean> model(ApplicationBean object)
+ {
+ return new ApplicationModel((ApplicationBean)object);
+ }
+
+ public AppOrderBy getOrderBy()
+ {
+ return orderBy;
+ }
+
+ public void setOrderBy(AppOrderBy orderBy)
+ {
+ this.orderBy = orderBy;
+ }
+}
+
Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationDataProvider.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationDataProvider.java
------------------------------------------------------------------------------
svn:keywords = Id
Added: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationModel.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationModel.java?rev=760209&view=auto
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationModel.java (added)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationModel.java Mon Mar 30 22:40:23 2009
@@ -0,0 +1,69 @@
+package org.apache.jetspeed.portlets.prm;
+
+import org.apache.wicket.model.LoadableDetachableModel;
+
+/**
+ * Provides a model for a single portlet application bean
+ *
+ * @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
+ * @version $Id$
+ */
+class ApplicationModel extends LoadableDetachableModel<ApplicationBean>
+{
+ private static final long serialVersionUID = 1L;
+ private ApplicationBean pa;
+
+ /**
+ * @param c
+ */
+ public ApplicationModel(ApplicationBean pa)
+ {
+ this.pa = pa;
+ }
+
+
+ /**
+ * @see java.lang.Object#hashCode()
+ */
+ public int hashCode()
+ {
+ return pa.getName().hashCode();
+ }
+
+ /**
+ * used for dataview with ReuseIfModelsEqualStrategy item reuse strategy
+ *
+ * @see org.apache.wicket.markup.repeater.ReuseIfModelsEqualStrategy
+ * @see java.lang.Object#equals(java.lang.Object)
+ */
+ public boolean equals(final Object obj)
+ {
+ if (obj == this)
+ {
+ return true;
+ }
+ else if (obj == null)
+ {
+ return false;
+ }
+ else if (obj instanceof ApplicationModel)
+ {
+ ApplicationModel other = (ApplicationModel)obj;
+ return pa.getName().equals(other.getModelBean().getName());
+ }
+ return false;
+ }
+
+ public ApplicationBean getModelBean()
+ {
+ return this.pa;
+ }
+
+ /**
+ * @see org.apache.wicket.model.LoadableDetachableModel#load()
+ */
+ protected ApplicationBean load()
+ {
+ return pa;
+ }
+}
\ No newline at end of file
Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationModel.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationModel.java
------------------------------------------------------------------------------
svn:keywords = Id
Added: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationsListApplication.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationsListApplication.java?rev=760209&view=auto
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationsListApplication.java (added)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationsListApplication.java Mon Mar 30 22:40:23 2009
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jetspeed.portlets.prm;
+
+import org.apache.jetspeed.portlets.wicket.AbstractAdminWebApplication;
+
+/**
+ * Portlet Registry Manager
+ *
+ * @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
+ * @version $Id$
+ */
+public class ApplicationsListApplication extends AbstractAdminWebApplication
+{
+ public static final String PRM_TOPIC = "org.apache.jetspeed.portlets.prm.Topic";
+ public static final String SELECTED_APP_EVENT = "org.apache.jetspeed.portlets.prm.SelectedAppEvent";
+
+ @Override
+ public Class<ApplicationsListHome> getHomePage()
+ {
+ return ApplicationsListHome.class;
+ }
+
+ protected void init()
+ {
+ mountBookmarkablePage("/edit", ApplicationsListEdit.class);
+ }
+}
\ No newline at end of file
Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationsListApplication.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationsListApplication.java
------------------------------------------------------------------------------
svn:keywords = Id
Added: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationsListEdit.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationsListEdit.html?rev=760209&view=auto
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationsListEdit.html (added)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationsListEdit.html Mon Mar 30 22:40:23 2009
@@ -0,0 +1,25 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:wicket="http://wicket.sourceforge.net/"
+ xml:lang="en"
+ lang="en">
+<head>
+<style type="text/css">
+table.padded-table td { padding:8px; border:solid 1px; }
+</style>
+
+</head>
+<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="rowsDisplayed"/></span>
+ <input type='text' wicket:id="rows" size="5" style='font-size: 10px;'></input>
+ <input type='submit' wicket:id="editModeSaveButton" value="save"/>
+ <div wicket:id="feedback" style="font-size: 9px;color: red;"></div>
+ </form>
+ </div>
+</body>
+</html>
+
\ No newline at end of file
Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationsListEdit.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationsListEdit.html
------------------------------------------------------------------------------
svn:keywords = Id
Added: 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=760209&view=auto
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationsListEdit.java (added)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationsListEdit.java Mon Mar 30 22:40:23 2009
@@ -0,0 +1,105 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jetspeed.portlets.prm;
+
+import javax.portlet.ActionResponse;
+import javax.portlet.PortletMode;
+import javax.portlet.PortletPreferences;
+import javax.portlet.ReadOnlyException;
+
+import org.apache.jetspeed.portlets.AdminPortletWebPage;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.form.Button;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.form.TextField;
+import org.apache.wicket.markup.html.panel.FeedbackPanel;
+import org.apache.wicket.model.PropertyModel;
+import org.apache.wicket.model.ResourceModel;
+import org.apache.wicket.validation.validator.RangeValidator;
+
+/**
+ * Edit Mode for Portlet Application List widget
+ *
+ * @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
+ * @version $Id$
+ */
+public class ApplicationsListEdit extends AdminPortletWebPage
+{
+ public ApplicationsListEdit()
+ {
+ WebMarkupContainer formGroup = new WebMarkupContainer("formGroup");
+ add(formGroup);
+ EditModeForm form = new EditModeForm("editModeForm", this.getPreferenceAsInteger("rows"));
+ formGroup.add(form);
+ }
+
+ @SuppressWarnings("serial")
+ private class EditModeForm extends Form<Void>
+ {
+ private int rows = 8;
+
+ @SuppressWarnings("unchecked")
+ public EditModeForm(String name, final int rows)
+ {
+ 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)));
+ add(new Button("editModeSaveButton", new ResourceModel("save"))
+ {
+ @Override
+ public void onSubmit()
+ {
+ ApplicationsListEdit editPage = (ApplicationsListEdit)this.getPage();
+ PortletPreferences prefs = editPage.getPortletRequest().getPreferences();
+ FeedbackPanel feedback = (FeedbackPanel)this.getParent().get("feedback");
+ try
+ {
+ prefs.setValue("rows", Integer.toString(EditModeForm.this.getRows()));
+ prefs.store();
+ ActionResponse ar = (ActionResponse)editPage.getPortletResponse();
+ ar.setPortletMode(PortletMode.VIEW);
+ }
+ catch (ReadOnlyException e)
+ {
+ feedback.error(getString("errorReadonly"));
+ }
+ catch (Exception oe)
+ {
+ feedback.error(getString("errorPrefs") + oe.getMessage());
+ }
+ }
+ });
+ FeedbackPanel feedback = new FeedbackPanel("feedback");
+ add(feedback);
+ }
+
+ public int getRows()
+ {
+ return rows;
+ }
+
+ public void setRows(int rows)
+ {
+ this.rows = rows;
+ }
+
+
+ }
+
+
+}
Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationsListEdit.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationsListEdit.java
------------------------------------------------------------------------------
svn:keywords = Id
Added: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationsListEdit.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationsListEdit.properties?rev=760209&view=auto
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationsListEdit.properties (added)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationsListEdit.properties Mon Mar 30 22:40:23 2009
@@ -0,0 +1,4 @@
+save=Save
+rowsDisplayed=No. of Rows Displayed:
+errorReadonly=Preference 'rows' is readonly, cannot update
+errorPrefs=Preference 'rows' could not be stored:
\ No newline at end of file
Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationsListEdit.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationsListEdit.properties
------------------------------------------------------------------------------
svn:keywords = Id
Added: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationsListEdit2.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationsListEdit2.html?rev=760209&view=auto
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationsListEdit2.html (added)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationsListEdit2.html Mon Mar 30 22:40:23 2009
@@ -0,0 +1,163 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:wicket="http://wicket.sourceforge.net/"
+ xml:lang="en"
+ lang="en">
+<head>
+<style type="text/css">
+body, table {
+ font-size:8pt;
+ font-family:Verdana,Arial;
+ border-collapse:collapse;
+}
+table.padded-table td { padding:4px; border-bottom:1px solid #e9e9e9; font-size:8pt; font-family:Verdana,Arial; border-collapse:collapse; }
+table.padded-table tr th { padding:4px; background:#efefef; border-bottom:1px solid #e9e9e9; }
+
+table.padded-table-2 td { padding:4px; border:1px solid #e9e9e9; }
+table.padded-table-2 tr th { padding:4px; background:#efefef; border:1px solid #e9e9e9; }
+
+table.padded-table-3 td { padding:4px; border:1px solid #e9e9e9; }
+table.padded-table-3 tr { border-left:2px solid #fff; border-right:2px solid #fff; }
+table.padded-table-3 tr th { padding:4px; background:#efefef; }
+
+portlet-section-header
+portlet-section-body
+portlet-section-alternate
+portlet-section-footer
+
+
+.pager {
+ font-size:8pt;
+ font-family:Verdana,Arial;
+}
+
+span.label-red { background:#e71f15;padding:2px;color:#fff;font-weight:bold; }
+span.label-green { background:#5ad400;padding:2px;color:#fff;font-weight:bold; }
+</style>
+
+</head>
+<body>
+
+ <table cellpadding="0" cellspacing="0" class="padded-table">
+ <tr>
+ <th>Name</th>
+ <th>Version</th>
+ <th><a href="#">Path</a></th>
+ <th>Status</th>
+ <th>Actions</th>
+ </tr>
+ <tr>
+ <td><a href="#">demo</a></td>
+ <td>1.0</td>
+ <td>/demo</td>
+ <td>paused</td>
+ <td>start</td>
+ </tr>
+ <tr>
+ <td><a href="#">demo</a></td>
+ <td>1.0</td>
+ <td>/demo</td>
+ <td><span class="label-red">error</span></td>
+ <td>restart</td>
+ </tr>
+ <tr>
+ <td><a href="#">demo</a></td>
+ <td>1.0</td>
+ <td>/demo</td>
+ <td><span class="label-green">running</span></td>
+ <td>stop</td>
+ </tr>
+ <tr>
+ <td><a href="#">demo</a></td>
+ <td>1.0</td>
+ <td>/demo</td>
+ <td>-</td>
+ <td>start</td>
+ </tr>
+ </table>
+
+ <div class="pager" style="padding-top:10px;"><a href="#">next</a> 1 .. 10 <b>11</b> 12 13 .. 25 <a href="#">previous</a></div>
+
+ <br/>
+ <table cellpadding="0" cellspacing="0" class="padded-table-2">
+ <tr>
+ <th>Name</th>
+ <th>Version</th>
+ <th><a href="#">Path</a></th>
+ <th>Status</th>
+ <th>Actions</th>
+ </tr>
+ <tr>
+ <td><a href="#">demo</a></td>
+ <td>1.0</td>
+ <td>/demo</td>
+ <td>paused</td>
+ <td>start</td>
+ </tr>
+ <tr>
+ <td><a href="#">demo</a></td>
+ <td>1.0</td>
+ <td>/demo</td>
+ <td><span class="label-red">error</span></td>
+ <td>restart</td>
+ </tr>
+ <tr>
+ <td><a href="#">demo</a></td>
+ <td>1.0</td>
+ <td>/demo</td>
+ <td><span class="label-green">running</span></td>
+ <td>stop</td>
+ </tr>
+ <tr>
+ <td><a href="#">demo</a></td>
+ <td>1.0</td>
+ <td>/demo</td>
+ <td>-</td>
+ <td>start</td>
+ </tr>
+ </table>
+
+ <br/>
+ <table cellpadding="0" cellspacing="0" class="padded-table-3">
+ <tr>
+ <th>Name</th>
+ <th>Version</th>
+ <th><a href="#">Path</a></th>
+ <th>Status</th>
+ <th>Actions</th>
+ </tr>
+ <tr>
+ <td><a href="#">demo</a></td>
+ <td>1.0</td>
+ <td>/demo</td>
+ <td>paused</td>
+ <td>start</td>
+ </tr>
+ <tr>
+ <td><a href="#">demo</a></td>
+ <td>1.0</td>
+ <td>/demo</td>
+ <td><span class="label-red">error</span></td>
+ <td>restart</td>
+ </tr>
+ <tr>
+ <td><a href="#">demo</a></td>
+ <td>1.0</td>
+ <td>/demo</td>
+ <td><span class="label-green">running</span></td>
+ <td>stop</td>
+ </tr>
+ <tr>
+ <td><a href="#">demo</a></td>
+ <td>1.0</td>
+ <td>/demo</td>
+ <td>-</td>
+ <td>start</td>
+ </tr>
+ </table>
+
+</body>
+</html>
+
Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationsListEdit2.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationsListEdit2.html
------------------------------------------------------------------------------
svn:keywords = Id
Added: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationsListHome$ActionPanel.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationsListHome%24ActionPanel.html?rev=760209&view=auto
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationsListHome$ActionPanel.html (added)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationsListHome$ActionPanel.html Mon Mar 30 22:40:23 2009
@@ -0,0 +1,6 @@
+<wicket:panel>
+<a style='font-size: 8pt;' href="#" wicket:id="start"><wicket:message key="start"/></a>
+<a style='font-size: 8pt;' href="#" wicket:id="stop"><wicket:message key="stop"/></a>
+<a style='font-size: 8pt;' href="#" wicket:id="undeploy"><wicket:message key="undeploy"/></a>
+<a style='font-size: 8pt;' href="#" wicket:id="delete"><wicket:message key="delete"/></a>
+</wicket:panel>
\ No newline at end of file
Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationsListHome$ActionPanel.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationsListHome$ActionPanel.html
------------------------------------------------------------------------------
svn:keywords = Id
Added: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationsListHome$RunningPanel.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationsListHome%24RunningPanel.html?rev=760209&view=auto
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationsListHome$RunningPanel.html (added)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationsListHome$RunningPanel.html Mon Mar 30 22:40:23 2009
@@ -0,0 +1,3 @@
+<wicket:panel>
+<img wicket:id="running"/>
+</wicket:panel>
\ No newline at end of file
Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationsListHome$RunningPanel.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationsListHome$RunningPanel.html
------------------------------------------------------------------------------
svn:keywords = Id
Added: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationsListHome.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationsListHome.html?rev=760209&view=auto
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationsListHome.html (added)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationsListHome.html Mon Mar 30 22:40:23 2009
@@ -0,0 +1,116 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:wicket="http://wicket.sourceforge.net/"
+ xml:lang="en"
+ lang="en">
+<head>
+<style type="text/css">
+.feedbackPanelERROR {font-size: 9px;color: red; }
+.feedbackPanelWARN {font-size: 9px;color: orange; }
+.feedbackPanelINFO {font-size: 9px;color: blue; }
+
+.newjet .alternate { padding:4px; border:1px solid #e9e9e9; font-size:8pt; font-family:Verdana,Arial; border-collapse:collapse; color:green;}
+
+. wicket_orderUp
+{
+ padding:4px; background:#efefef; border:1px solid #e9e9e9; font-size:8pt; font-family:Verdana,Arial; border-collapse:collapse;
+}
+. wicket_orderDown
+{
+ padding:4px; background:#efefef; border:1px solid #e9e9e9; font-size:8pt; font-family:Verdana,Arial; border-collapse:collapse;
+}
+. wicket_orderNone
+{
+ padding:4px; background:#efefef; border:1px solid #e9e9e9; font-size:8pt; font-family:Verdana,Arial; border-collapse:collapse;
+}
+
+.newjet .portlet-section-header
+{
+ padding:4px; background:#efefef; border:1px solid #e9e9e9; font-size:8pt; font-family:Verdana,Arial; border-collapse:collapse;
+}
+
+.newjet .portlet-section-body
+{
+ padding:4px; border:1px solid #e9e9e9; font-size:8pt; font-family:Verdana,Arial; border-collapse:collapse;
+}
+
+.newjet .portlet-section-alternate
+{
+ padding:4px; border:1px solid #e9e9e9; font-size:8pt; font-family:Verdana,Arial; border-collapse:collapse;
+}
+
+.newjet .portlet-section-footer
+{
+ padding:4px; background:#efefef; border:1px solid #e9e9e9; font-size:8pt; font-family:Verdana,Arial; border-collapse:collapse; padding-top:5px;
+};
+
+</style>
+
+</head>
+<body>
+<div class='newjet'>
+<table border='1' height="100%">
+<tr>
+ <td border='0' width="15px"> </td>
+ <td border='1'>
+ <table class='portlet.section.body'>
+ <tr class='portlet.section.header'>
+ <td height = "100%" valign = "top" border='1' >
+ <form wicket:id="appSearchForm">
+ <input type='text' wicket:id="appSearchField" size="25" style='font-size: 10px;'></input>
+ <input type='submit' wicket:id="appSearchButton" value='search'/> |
+ <a wicket:id="appDeploy" style='font-size: 10px;'><wicket:message key="deploy"/></a> |
+ <a wicket:id="appHome" style='font-size: 10px;'><wicket:message key="refresh"/></a>
+ </form>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <table>
+ <tr><td>
+ <table>
+ <tr class='portlet.section.header'>
+ <th wicket:id="appOrderByName" style='padding:4px; background:#efefef; border:1px solid #e9e9e9; font-size:8pt; font-family:Verdana,Arial; border-collapse:collapse;' class='portlet-section-header'><wicket:message key="name"/></th>
+ <th wicket:id="appOrderByVersion" class='portlet-section-header'><wicket:message key="version"/></th>
+ <th wicket:id="appOrderByPath" class='portlet-section-header'><wicket:message key="path"/></th>
+ <th class='portlet-section-header'><wicket:message key="status"/></th>
+ <th class='portlet-section-header'><wicket:message key="actions"/></th>
+ </tr>
+ <tr wicket:id="appTable" class='portlet.section.body'>
+ <td class='portlet-section-body'><a href='#' wicket:id='nameLink'><span wicket:id="nameLabel">[name]</span></a></td>
+ <td class='portlet-section-body'><span wicket:id="version">[version]</span></td>
+ <td class='portlet-section-body'><span wicket:id="path">[path]</span></td>
+ <td class='portlet-section-body'><span wicket:id="running">[running]</span></td>
+ <td class='portlet-section-body'><span wicket:id="actions">[actions]</span></td>
+ </tr>
+ </table>
+ <span wicket:id="appNavigator">[dataview navigator]</span>
+ <div wicket:id="feedback"></div>
+ </td>
+ <td>
+ <table>
+ <tr>
+ <th wicket:id="plOrderByName" style='font-size: 10px;'>Portlet Name</th>
+ <th wicket:id="plOrderByDisplayName" style='font-size: 10px;'>Display Name</th>
+ </tr>
+ <tr wicket:id="portletTable">
+ <td><span style='font-size: 10px;' wicket:id="name">[name]</span></td>
+ <td><span style='font-size: 10px;' wicket:id="displayName">[title]</span></td>
+ </tr>
+ </table>
+ <span wicket:id="plNavigator">[dataview navigator]</span>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ </td>
+</tr>
+</table>
+<br/>
+</div>
+</body>
+</html>
\ No newline at end of file
Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationsListHome.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/prm/ApplicationsListHome.html
------------------------------------------------------------------------------
svn:keywords = Id
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org