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 vk...@apache.org on 2008/11/10 11:54:38 UTC
svn commit: r712645 - in
/portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring: ./
src/main/java/org/apache/jetspeed/portlets/admin/
src/main/java/org/apache/jetspeed/portlets/custom/
src/main/java/org/apache/jetspeed/portlets/entityed...
Author: vkumar
Date: Mon Nov 10 02:54:37 2008
New Revision: 712645
URL: http://svn.apache.org/viewvc?rev=712645&view=rev
Log:
Add new dependencies in pom.xml
Organizing java imports
commenting out wicket and portlet entities portlet in portlet.xml
Modified:
portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/pom.xml
portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/admin/JetspeedDataImporter.java
portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/custom/CustomConfigModePortlet.java
portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/entityeditor/PortletEntityBrowserPortlet.java
portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/entityeditor/PortletEntityEditorPortlet.java
portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/pam/beans/PortletApplicationBean.java
portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/profiler/ProfileRulesExtent.java
portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/registration/ForgottenPasswordPortlet.java
portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/rpad/RepositoryManager.java
portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/rpad/simple/SimpleRepository.java
portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/security/constraints/ConstraintsViewController.java
portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/security/permissions/SecurityPermissionsPortlet.java
portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/security/roles/RoleChooserPortlet.java
portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/security/users/JetspeedUserBean.java
portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/security/users/RoleChooserPortlet.java
portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/security/users/UserBrowserPortlet.java
portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/security/users/UserChooserPortlet.java
portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/security/users/UserDetailsPortlet.java
portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserAdd.java
portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserBrowser.java
portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserBrowserApplication.java
portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserDetailsApplication.java
portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/tags/PortletTreeControlTag.java
portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/tags/TreeControlTag.java
portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/tracking/PortletTrackingPortlet.java
portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/wicket/AbstractAdminWebApplication.java
portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/wicket/AdminWicketPortlet.java
portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/wicket/component/CheckBoxPropertyColumn.java
portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/wicket/component/LinkPropertyColumn.java
portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/wicket/component/PortletOddEvenItem.java
portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/wicket/component/SelectionImagePropertyColumn.java
portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/wicket/component/TextFieldPropertyColumn.java
portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/webapp/WEB-INF/portlet.xml
Modified: portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/pom.xml?rev=712645&r1=712644&r2=712645&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/pom.xml (original)
+++ portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/pom.xml Mon Nov 10 02:54:37 2008
@@ -87,7 +87,7 @@
<lucene.version>2.2.0</lucene.version>
<oro.version>2.0.8</oro.version>
<portlet-api.version>1.0</portlet-api.version>
- <org.apache.pluto.version>1.0.1</org.apache.pluto.version>
+ <org.apache.pluto.version>2.0.0-SNAPSHOT</org.apache.pluto.version>
<regexp.version>1.2</regexp.version>
<groovy.version>1.5.1</groovy.version>
<saxpath.version>1.0-FCS</saxpath.version>
@@ -132,7 +132,7 @@
<!-- Pluto Container -->
<dependency>
<groupId>org.apache.pluto</groupId>
- <artifactId>pluto</artifactId>
+ <artifactId>pluto-container-api</artifactId>
<version>${org.apache.pluto.version}</version>
<scope>provided</scope>
</dependency>
@@ -162,6 +162,11 @@
</dependency>
<dependency>
<groupId>org.apache.portals.jetspeed-2</groupId>
+ <artifactId>jetspeed-portlet-factory</artifactId>
+ <version>${jetspeed-2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.portals.jetspeed-2</groupId>
<artifactId>portals-gems</artifactId>
<version>2.1.3</version>
</dependency>
Modified: portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/admin/JetspeedDataImporter.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/admin/JetspeedDataImporter.java?rev=712645&r1=712644&r2=712645&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/admin/JetspeedDataImporter.java (original)
+++ portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/admin/JetspeedDataImporter.java Mon Nov 10 02:54:37 2008
@@ -18,10 +18,8 @@
package org.apache.jetspeed.portlets.admin;
import java.io.File;
-import java.io.FileOutputStream;
import java.io.IOException;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
import javax.portlet.ActionRequest;
Modified: portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/custom/CustomConfigModePortlet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/custom/CustomConfigModePortlet.java?rev=712645&r1=712644&r2=712645&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/custom/CustomConfigModePortlet.java (original)
+++ portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/custom/CustomConfigModePortlet.java Mon Nov 10 02:54:37 2008
@@ -17,34 +17,30 @@
package org.apache.jetspeed.portlets.custom;
import java.io.IOException;
-import java.util.List;
import java.util.ArrayList;
+import java.util.HashSet;
import java.util.Iterator;
+import java.util.List;
import java.util.Set;
-import java.util.HashSet;
-import javax.portlet.PortletConfig;
-import javax.portlet.PortletContext;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
+import javax.portlet.PortletConfig;
+import javax.portlet.PortletContext;
import javax.portlet.PortletException;
import javax.portlet.PortletMode;
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
import javax.portlet.WindowState;
-import org.springframework.util.StringUtils;
-
-import org.apache.portals.bridges.velocity.GenericVelocityPortlet;
-import org.apache.velocity.context.Context;
-
import org.apache.jetspeed.CommonPortletServices;
-import org.apache.jetspeed.PortalReservedParameters;
-import org.apache.jetspeed.om.page.Page;
-import org.apache.jetspeed.om.page.Fragment;
-import org.apache.jetspeed.om.common.SecurityConstraints;
import org.apache.jetspeed.om.common.SecurityConstraint;
+import org.apache.jetspeed.om.common.SecurityConstraints;
+import org.apache.jetspeed.om.page.Fragment;
+import org.apache.jetspeed.om.page.Page;
import org.apache.jetspeed.page.PageManager;
+import org.apache.portals.bridges.velocity.GenericVelocityPortlet;
+import org.springframework.util.StringUtils;
/**
* Common Custom Config Mode Portlet
Modified: portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/entityeditor/PortletEntityBrowserPortlet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/entityeditor/PortletEntityBrowserPortlet.java?rev=712645&r1=712644&r2=712645&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/entityeditor/PortletEntityBrowserPortlet.java (original)
+++ portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/entityeditor/PortletEntityBrowserPortlet.java Mon Nov 10 02:54:37 2008
@@ -30,7 +30,6 @@
import org.apache.jetspeed.CommonPortletServices;
import org.apache.jetspeed.PortalReservedParameters;
import org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent;
-import org.apache.jetspeed.components.portletentity.PortletEntityNotStoredException;
import org.apache.jetspeed.components.portletregistry.PortletRegistry;
import org.apache.jetspeed.request.RequestContext;
import org.apache.pluto.om.portlet.PortletDefinition;
Modified: portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/entityeditor/PortletEntityEditorPortlet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/entityeditor/PortletEntityEditorPortlet.java?rev=712645&r1=712644&r2=712645&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/entityeditor/PortletEntityEditorPortlet.java (original)
+++ portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/entityeditor/PortletEntityEditorPortlet.java Mon Nov 10 02:54:37 2008
@@ -17,7 +17,6 @@
package org.apache.jetspeed.portlets.entityeditor;
import java.io.IOException;
-import java.util.Arrays;
import java.util.List;
import javax.portlet.ActionRequest;
Modified: portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/pam/beans/PortletApplicationBean.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/pam/beans/PortletApplicationBean.java?rev=712645&r1=712644&r2=712645&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/pam/beans/PortletApplicationBean.java (original)
+++ portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/pam/beans/PortletApplicationBean.java Mon Nov 10 02:54:37 2008
@@ -1,9 +1,9 @@
/*
- * 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
+ * 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
@@ -16,21 +16,35 @@
*/
package org.apache.jetspeed.portlets.pam.beans;
-import java.util.Collection;
+import java.util.List;
+import java.util.Locale;
import javax.portlet.PortletMode;
import javax.portlet.WindowState;
+import javax.xml.namespace.QName;
-import org.apache.jetspeed.om.common.GenericMetadata;
-import org.apache.jetspeed.om.common.portlet.PortletApplication;
-import org.apache.pluto.om.common.ObjectID;
+import org.apache.jetspeed.om.portlet.ContainerRuntimeOption;
+import org.apache.jetspeed.om.portlet.CustomPortletMode;
+import org.apache.jetspeed.om.portlet.CustomWindowState;
+import org.apache.jetspeed.om.portlet.Description;
+import org.apache.jetspeed.om.portlet.DisplayName;
+import org.apache.jetspeed.om.portlet.EventDefinition;
+import org.apache.jetspeed.om.portlet.Filter;
+import org.apache.jetspeed.om.portlet.FilterMapping;
+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.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.om.portlet.PortletDefinitionList;
-import org.apache.pluto.om.servlet.WebApplicationDefinition;
/**
* This portlet is a browser over all the portlet applications in the system.
- *
+ *
* @author <a href="mailto:jford@apache.com">Jeremy Ford</a>
* @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
* @version $Id: PortletApplicationBean.java 348264 2005-11-22 22:06:45Z taylor $
@@ -38,14 +52,14 @@
public class PortletApplicationBean implements PortletApplication
{
PortletApplication pa;
-
-
+
public PortletApplicationBean(PortletApplication pa)
{
this.pa = pa;
}
-
- /* (non-Javadoc)
+
+ /*
+ * (non-Javadoc)
* @see org.apache.jetspeed.om.common.portlet.PortletApplication#getMetadata()
*/
public GenericMetadata getMetadata()
@@ -53,7 +67,8 @@
return pa.getMetadata();
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
* @see org.apache.jetspeed.om.common.portlet.PortletApplication#getName()
*/
public String getName()
@@ -61,55 +76,44 @@
return pa.getName();
}
- /* (non-Javadoc)
- * @see org.apache.jetspeed.om.common.portlet.PortletApplication#getPortletDefinitions()
- */
- public Collection getPortletDefinitions()
- {
- return pa.getPortletDefinitions();
- }
-
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
* @see org.apache.jetspeed.om.common.portlet.PortletApplication#getPortletDefinitionByName(java.lang.String)
*/
public PortletDefinition getPortletDefinitionByName(String name)
{
- return pa.getPortletDefinitionByName(name);
+ return pa.getPortlet(name);
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
* @see org.apache.jetspeed.om.common.portlet.PortletApplication#getUserAttributeRefs()
*/
- public Collection getUserAttributeRefs()
+ public List<UserAttributeRef> getUserAttributeRefs()
{
return pa.getUserAttributeRefs();
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
* @see org.apache.jetspeed.om.common.portlet.PortletApplication#getUserAttributes()
*/
- public Collection getUserAttributes()
+ public List<UserAttribute> getUserAttributes()
{
return pa.getUserAttributes();
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
* @see org.apache.jetspeed.om.common.portlet.PortletApplication#getApplicationIdentifier()
*/
public String getApplicationIdentifier()
{
- return pa.getApplicationIdentifier();
- }
-
- /* (non-Javadoc)
- * @see org.apache.jetspeed.om.common.portlet.PortletApplication#getDescription()
- */
- public String getDescription()
- {
- return pa.getDescription();
+ return pa.getName();
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
* @see org.apache.jetspeed.om.common.portlet.PortletApplication#getApplicationType()
*/
public int getApplicationType()
@@ -117,15 +121,8 @@
return pa.getApplicationType();
}
- /* (non-Javadoc)
- * @see org.apache.pluto.om.portlet.PortletApplicationDefinition#getId()
- */
- public ObjectID getId()
- {
- return pa.getId();
- }
-
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
* @see org.apache.pluto.om.portlet.PortletApplicationDefinition#getVersion()
*/
public String getVersion()
@@ -133,43 +130,36 @@
return pa.getVersion();
}
- /* (non-Javadoc)
- * @see org.apache.pluto.om.portlet.PortletApplicationDefinition#getPortletDefinitionList()
- */
- public PortletDefinitionList getPortletDefinitionList()
+ public List<org.apache.jetspeed.om.portlet.PortletDefinition> getPortletDefinitionList()
{
- return pa.getPortletDefinitionList();
+ return pa.getPortlets();
}
-
- /* (non-Javadoc)
- * @see org.apache.pluto.om.portlet.PortletApplicationDefinition#getWebApplicationDefinition()
- */
- public WebApplicationDefinition getWebApplicationDefinition()
+ public PortletApplicationDefinition getWebApplicationDefinition()
{
- return pa.getWebApplicationDefinition();
+ return pa;
}
- public Collection getJetspeedServices()
+ public List getJetspeedServices()
{
return pa.getJetspeedServices();
}
- public Collection getCustomPortletModes()
+ public List<CustomPortletMode> getCustomPortletModes()
{
return pa.getCustomPortletModes();
}
- public Collection getCustomWindowStates()
+ public List getCustomWindowStates()
{
return pa.getCustomWindowStates();
}
- public Collection getSupportedPortletModes()
+ public List getSupportedPortletModes()
{
return pa.getSupportedPortletModes();
}
- public Collection getSupportedWindowStates()
+ public List getSupportedWindowStates()
{
return pa.getSupportedWindowStates();
}
@@ -193,13 +183,284 @@
{
return pa.getCustomWindowState(state);
}
-
+
public String getJetspeedSecurityConstraint()
{
return pa.getJetspeedSecurityConstraint();
}
+
public boolean isLayoutApplication()
{
return pa.isLayoutApplication();
- }
+ }
+
+ public ContainerRuntimeOption addContainerRuntimeOption(String name)
+ {
+ return pa.addContainerRuntimeOption(name);
+ }
+
+ public CustomPortletMode addCustomPortletMode(String name)
+ {
+ return pa.addCustomPortletMode(name);
+ }
+
+ public CustomWindowState addCustomWindowState(String name)
+ {
+ return pa.addCustomWindowState(name);
+ }
+
+ public Description addDescription(String lang)
+ {
+ return pa.addDescription(lang);
+ }
+
+ public DisplayName addDisplayName(String lang)
+ {
+ return pa.addDisplayName(lang);
+ }
+
+ public EventDefinition addEventDefinition(String name)
+ {
+ return pa.addEventDefinition(name);
+ }
+
+ public EventDefinition addEventDefinition(QName qname)
+ {
+ return pa.addEventDefinition(qname);
+ }
+
+ public Filter addFilter(String filterName)
+ {
+ return pa.addFilter(filterName);
+ }
+
+ public FilterMapping addFilterMapping(String filterName)
+ {
+ return pa.addFilterMapping(filterName);
+ }
+
+ public void addJetspeedServiceReference(String name)
+ {
+ pa.addJetspeedServiceReference(name);
+ }
+
+ public Listener addListener(String listenerClass)
+ {
+ return pa.addListener(listenerClass);
+ }
+
+ public org.apache.jetspeed.om.portlet.PortletDefinition addPortlet(String name)
+ {
+ return pa.addPortlet(name);
+ }
+
+ public PublicRenderParameter addPublicRenderParameter(String name, String identifier)
+ {
+ return pa.addPublicRenderParameter(name, identifier);
+ }
+
+ public PublicRenderParameter addPublicRenderParameter(QName qname, String identifier)
+ {
+ return pa.addPublicRenderParameter(qname, identifier);
+ }
+
+ public SecurityConstraint addSecurityConstraint(String transportGuarantee)
+ {
+ return pa.addSecurityConstraint(transportGuarantee);
+ }
+
+ public SecurityRole addSecurityRole(String name)
+ {
+ return pa.addSecurityRole(name);
+ }
+
+ public UserAttribute addUserAttribute(String name)
+ {
+ return pa.addUserAttribute(name);
+ }
+
+ public UserAttributeRef addUserAttributeRef(String name)
+ {
+ return pa.addUserAttributeRef(name);
+ }
+
+ public long getChecksum()
+ {
+ return pa.getChecksum();
+ }
+
+ public ContainerRuntimeOption getContainerRuntimeOption(String name)
+ {
+ return pa.getContainerRuntimeOption(name);
+ }
+
+ public List<ContainerRuntimeOption> getContainerRuntimeOptions()
+ {
+ return pa.getContainerRuntimeOptions();
+ }
+
+ public String getContextRoot()
+ {
+ return pa.getContextRoot();
+ }
+
+ public CustomPortletMode getCustomPortletMode(String name)
+ {
+ return getCustomPortletMode(name);
+ }
+
+ public CustomWindowState getCustomWindowState(String name)
+ {
+ return pa.getCustomWindowState(name);
+ }
+
+ public Description getDescription(Locale locale)
+ {
+ return pa.getDescription(locale);
+ }
+
+ public List<Description> getDescriptions()
+ {
+ return pa.getDescriptions();
+ }
+
+ public DisplayName getDisplayName(Locale locale)
+ {
+ return pa.getDisplayName(locale);
+ }
+
+ public List<DisplayName> getDisplayNames()
+ {
+ return pa.getDisplayNames();
+ }
+
+ public List<EventDefinition> getEventDefinitions()
+ {
+ return pa.getEventDefinitions();
+ }
+
+ public Filter getFilter(String filterName)
+ {
+ return pa.getFilter(filterName);
+ }
+
+ public FilterMapping getFilterMapping(String filterName)
+ {
+ return pa.getFilterMapping(filterName);
+ }
+
+ public List<FilterMapping> getFilterMappings()
+ {
+ return pa.getFilterMappings();
+ }
+
+ public List<Filter> getFilters()
+ {
+ return pa.getFilters();
+ }
+
+ public List<Listener> getListeners()
+ {
+ return pa.getListeners();
+ }
+
+ public org.apache.jetspeed.om.portlet.PortletDefinition getPortlet(String name)
+ {
+ return pa.getPortlet(name);
+ }
+
+ public List<org.apache.jetspeed.om.portlet.PortletDefinition> getPortlets()
+ {
+ return pa.getPortlets();
+ }
+
+ public PublicRenderParameter getPublicRenderParameter(String identifier)
+ {
+ return pa.getPublicRenderParameter(identifier);
+ }
+
+ public List<PublicRenderParameter> getPublicRenderParameters()
+ {
+ return pa.getPublicRenderParameters();
+ }
+
+ public long getRevision()
+ {
+ return pa.getRevision();
+ }
+
+ public List<SecurityConstraint> getSecurityConstraints()
+ {
+ return pa.getSecurityConstraints();
+ }
+
+ public List<SecurityRole> getSecurityRoles()
+ {
+ return pa.getSecurityRoles();
+ }
+
+ public UserAttribute getUserAttribute(String name)
+ {
+ return pa.getUserAttribute(name);
+ }
+
+ public UserAttributeRef getUserAttributeRef(String name)
+ {
+ return pa.getUserAttributeRef(name);
+ }
+
+ public void setApplicationType(int type)
+ {
+ pa.setApplicationType(type);
+ }
+
+ public void setChecksum(long checksum)
+ {
+ pa.setChecksum(checksum);
+ }
+
+ public void setContextRoot(String contextRoot)
+ {
+ pa.setContextRoot(contextRoot);
+ }
+
+ public void setJetspeedSecurityConstraint(String constraint)
+ {
+ pa.setJetspeedSecurityConstraint(constraint);
+ }
+
+ public void setRevision(long revision)
+ {
+ pa.setRevision(revision);
+ }
+
+ public String getDefaultNamespace()
+ {
+ return pa.getDefaultNamespace();
+ }
+
+ public String getResourceBundle()
+ {
+ return pa.getResourceBundle();
+ }
+
+ public void setDefaultNamespace(String nameSpace)
+ {
+ pa.setDefaultNamespace(nameSpace);
+ }
+
+ public void setName(String name)
+ {
+ pa.setName(name);
+ }
+
+ public void setResourceBundle(String resourceBundle)
+ {
+ pa.setResourceBundle(resourceBundle);
+ }
+
+ public void setVersion(String version)
+ {
+ pa.setVersion(version);
+ }
}
Modified: portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/profiler/ProfileRulesExtent.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/profiler/ProfileRulesExtent.java?rev=712645&r1=712644&r2=712645&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/profiler/ProfileRulesExtent.java (original)
+++ portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/profiler/ProfileRulesExtent.java Mon Nov 10 02:54:37 2008
@@ -18,7 +18,6 @@
// import java.io.Serializable;
import java.util.Collection;
-//import java.util.LinkedList;
import java.util.Map;
import javax.faces.context.FacesContext;
Modified: portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/registration/ForgottenPasswordPortlet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/registration/ForgottenPasswordPortlet.java?rev=712645&r1=712644&r2=712645&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/registration/ForgottenPasswordPortlet.java (original)
+++ portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/registration/ForgottenPasswordPortlet.java Mon Nov 10 02:54:37 2008
@@ -26,6 +26,7 @@
import java.util.Locale;
import java.util.Map;
import java.util.ResourceBundle;
+
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
import javax.portlet.PortletConfig;
Modified: portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/rpad/RepositoryManager.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/rpad/RepositoryManager.java?rev=712645&r1=712644&r2=712645&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/rpad/RepositoryManager.java (original)
+++ portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/rpad/RepositoryManager.java Mon Nov 10 02:54:37 2008
@@ -16,10 +16,6 @@
*/
package org.apache.jetspeed.portlets.rpad;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.xml.sax.SAXException;
-
import java.io.BufferedWriter;
import java.io.File;
import java.io.FileNotFoundException;
@@ -36,6 +32,10 @@
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.xml.sax.SAXException;
+
public class RepositoryManager
{
/**
Modified: portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/rpad/simple/SimpleRepository.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/rpad/simple/SimpleRepository.java?rev=712645&r1=712644&r2=712645&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/rpad/simple/SimpleRepository.java (original)
+++ portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/rpad/simple/SimpleRepository.java Mon Nov 10 02:54:37 2008
@@ -16,9 +16,6 @@
*/
package org.apache.jetspeed.portlets.rpad.simple;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
@@ -32,6 +29,8 @@
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.jetspeed.portlets.rpad.PortletApplication;
import org.apache.jetspeed.portlets.rpad.Repository;
import org.xml.sax.InputSource;
Modified: portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/security/constraints/ConstraintsViewController.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/security/constraints/ConstraintsViewController.java?rev=712645&r1=712644&r2=712645&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/security/constraints/ConstraintsViewController.java (original)
+++ portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/security/constraints/ConstraintsViewController.java Mon Nov 10 02:54:37 2008
@@ -16,29 +16,27 @@
*/
package org.apache.jetspeed.portlets.security.constraints;
-import java.util.HashMap;
+import java.util.HashMap;
import java.util.List;
-import java.util.Map;
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import javax.portlet.PortletConfig;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-import javax.portlet.PortletSession;
-
-import org.apache.jetspeed.CommonPortletServices;
-import org.apache.jetspeed.om.page.PageSecurity;
-import org.apache.jetspeed.page.PageManager;
+import java.util.Map;
+
+import javax.portlet.PortletConfig;
+import javax.portlet.PortletException;
+import javax.portlet.PortletSession;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+
+import org.apache.jetspeed.CommonPortletServices;
+import org.apache.jetspeed.om.page.PageSecurity;
+import org.apache.jetspeed.page.PageManager;
import org.apache.jetspeed.security.Group;
+import org.apache.jetspeed.security.GroupManager;
import org.apache.jetspeed.security.Role;
-import org.apache.jetspeed.security.RoleManager;
-import org.apache.jetspeed.security.GroupManager;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.web.portlet.ModelAndView;
-import org.springframework.web.portlet.context.PortletConfigAware;
-import org.springframework.web.portlet.mvc.AbstractController;
+import org.apache.jetspeed.security.RoleManager;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.web.portlet.ModelAndView;
+import org.springframework.web.portlet.context.PortletConfigAware;
+import org.springframework.web.portlet.mvc.AbstractController;
public class ConstraintsViewController extends AbstractController implements InitializingBean, PortletConfigAware
{
Modified: portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/security/permissions/SecurityPermissionsPortlet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/security/permissions/SecurityPermissionsPortlet.java?rev=712645&r1=712644&r2=712645&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/security/permissions/SecurityPermissionsPortlet.java (original)
+++ portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/security/permissions/SecurityPermissionsPortlet.java Mon Nov 10 02:54:37 2008
@@ -17,7 +17,6 @@
package org.apache.jetspeed.portlets.security.permissions;
import java.io.IOException;
-import java.util.ArrayList;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
@@ -42,7 +41,6 @@
import org.apache.jetspeed.security.PermissionManager;
import org.apache.jetspeed.security.Role;
import org.apache.jetspeed.security.RoleManager;
-import org.apache.jetspeed.security.SecurityException;
import org.apache.portals.gems.dojo.AbstractDojoVelocityPortlet;
import org.apache.velocity.context.Context;
Modified: portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/security/roles/RoleChooserPortlet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/security/roles/RoleChooserPortlet.java?rev=712645&r1=712644&r2=712645&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/security/roles/RoleChooserPortlet.java (original)
+++ portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/security/roles/RoleChooserPortlet.java Mon Nov 10 02:54:37 2008
@@ -16,20 +16,19 @@
*/
package org.apache.jetspeed.portlets.security.roles;
-import java.sql.Types;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.portlet.PortletConfig;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-
-import org.apache.jetspeed.CommonPortletServices;
-import org.apache.jetspeed.security.Role;
-import org.apache.jetspeed.security.RoleManager;
-import org.apache.portals.gems.browser.BrowserIterator;
-import org.apache.portals.gems.browser.BrowserPortlet;
-import org.apache.portals.gems.browser.DatabaseBrowserIterator;
+import java.sql.Types;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.portlet.PortletConfig;
+import javax.portlet.PortletException;
+import javax.portlet.RenderRequest;
+
+import org.apache.jetspeed.CommonPortletServices;
+import org.apache.jetspeed.security.RoleManager;
+import org.apache.portals.gems.browser.BrowserIterator;
+import org.apache.portals.gems.browser.BrowserPortlet;
+import org.apache.portals.gems.browser.DatabaseBrowserIterator;
/**
* RoleChooserPortlet
Modified: portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/security/users/JetspeedUserBean.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/security/users/JetspeedUserBean.java?rev=712645&r1=712644&r2=712645&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/security/users/JetspeedUserBean.java (original)
+++ portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/security/users/JetspeedUserBean.java Mon Nov 10 02:54:37 2008
@@ -24,7 +24,6 @@
import javax.security.auth.Subject;
-import org.apache.jetspeed.security.SecurityAttribute;
import org.apache.jetspeed.security.User;
/**
Modified: portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/security/users/RoleChooserPortlet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/security/users/RoleChooserPortlet.java?rev=712645&r1=712644&r2=712645&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/security/users/RoleChooserPortlet.java (original)
+++ portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/security/users/RoleChooserPortlet.java Mon Nov 10 02:54:37 2008
@@ -16,22 +16,19 @@
*/
package org.apache.jetspeed.portlets.security.users;
-import java.security.Principal;
-import java.sql.Types;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.portlet.PortletConfig;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-
-import org.apache.jetspeed.CommonPortletServices;
-import org.apache.jetspeed.security.Role;
-import org.apache.jetspeed.security.RoleManager;
-import org.apache.portals.gems.browser.BrowserIterator;
-import org.apache.portals.gems.browser.DatabaseBrowserIterator;
-import org.apache.portals.gems.browser.BrowserPortlet;
+import java.sql.Types;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.portlet.PortletConfig;
+import javax.portlet.PortletException;
+import javax.portlet.RenderRequest;
+
+import org.apache.jetspeed.CommonPortletServices;
+import org.apache.jetspeed.security.RoleManager;
+import org.apache.portals.gems.browser.BrowserIterator;
+import org.apache.portals.gems.browser.BrowserPortlet;
+import org.apache.portals.gems.browser.DatabaseBrowserIterator;
/**
* RoleChooserPortlet
Modified: portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/security/users/UserBrowserPortlet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/security/users/UserBrowserPortlet.java?rev=712645&r1=712644&r2=712645&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/security/users/UserBrowserPortlet.java (original)
+++ portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/security/users/UserBrowserPortlet.java Mon Nov 10 02:54:37 2008
@@ -20,7 +20,6 @@
import java.security.Principal;
import java.util.Collection;
import java.util.Iterator;
-import java.util.LinkedList;
import java.util.List;
import java.util.Locale;
@@ -39,7 +38,6 @@
import org.apache.jetspeed.portlets.tags.TreeControlNode;
import org.apache.jetspeed.profiler.Profiler;
import org.apache.jetspeed.security.PasswordCredential;
-import org.apache.jetspeed.security.Role;
import org.apache.jetspeed.security.RoleManager;
import org.apache.jetspeed.security.SecurityException;
import org.apache.jetspeed.security.User;
Modified: portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/security/users/UserChooserPortlet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/security/users/UserChooserPortlet.java?rev=712645&r1=712644&r2=712645&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/security/users/UserChooserPortlet.java (original)
+++ portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/security/users/UserChooserPortlet.java Mon Nov 10 02:54:37 2008
@@ -16,9 +16,7 @@
*/
package org.apache.jetspeed.portlets.security.users;
-import java.sql.Types;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import javax.portlet.PortletConfig;
@@ -27,7 +25,6 @@
import org.apache.jetspeed.CommonPortletServices;
import org.apache.jetspeed.portlets.security.SecurityUtil;
-import org.apache.jetspeed.security.User;
import org.apache.jetspeed.security.UserManager;
import org.apache.portals.gems.browser.BrowserIterator;
import org.apache.portals.gems.browser.DatabaseBrowserIterator;
Modified: portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/security/users/UserDetailsPortlet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/security/users/UserDetailsPortlet.java?rev=712645&r1=712644&r2=712645&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/security/users/UserDetailsPortlet.java (original)
+++ portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/security/users/UserDetailsPortlet.java Mon Nov 10 02:54:37 2008
@@ -27,7 +27,6 @@
import java.util.List;
import java.util.Map;
import java.util.ResourceBundle;
-import java.util.Set;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
@@ -47,10 +46,9 @@
import org.apache.jetspeed.audit.AuditActivity;
import org.apache.jetspeed.components.portletregistry.PortletRegistry;
import org.apache.jetspeed.container.JetspeedPortletContext;
-import org.apache.jetspeed.om.common.UserAttribute;
-import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
import org.apache.jetspeed.om.folder.Folder;
import org.apache.jetspeed.om.folder.FolderNotFoundException;
+import org.apache.jetspeed.om.portlet.UserAttribute;
import org.apache.jetspeed.page.PageManager;
import org.apache.jetspeed.page.document.NodeSet;
import org.apache.jetspeed.portlets.security.SecurityResources;
@@ -134,7 +132,7 @@
private GroupManager groupManager;
private Profiler profiler;
private PortletRegistry registry;
- private String paIdentifier;
+ private String paName;
private Collection paUserAttributes;
private boolean initPrefsAndAttr;
private PortalConfiguration configuration;
@@ -190,7 +188,7 @@
throw new PortletException("Failed to find the Audit Activity on portlet initialization");
}
- paIdentifier = ((MutablePortletApplication) ((JetspeedPortletContext) config.getPortletContext()).getApplication()).getApplicationIdentifier();
+ paName = ((JetspeedPortletContext) config.getPortletContext()).getApplicationName();
}
public void doView(RenderRequest request, RenderResponse response) throws PortletException, IOException
@@ -405,7 +403,7 @@
anonymousUserTabMap.put(tb.getId(), tb);
}
// refresh PA UserAttributes (kinda hack but can't communicate between PAM and Security PA yet to signal a refresh is needed)
- paUserAttributes = registry.getPortletApplicationByIdentifier(paIdentifier).getUserAttributes();
+ paUserAttributes = registry.getPortletApplication(paName).getUserAttributes();
}
protected void renderRoleInformation(RenderRequest request) throws PortletException
Modified: portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserAdd.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserAdd.java?rev=712645&r1=712644&r2=712645&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserAdd.java (original)
+++ portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserAdd.java Mon Nov 10 02:54:37 2008
@@ -29,7 +29,6 @@
import org.apache.jetspeed.portlets.security.SecurityUtil;
import org.apache.jetspeed.profiler.rules.ProfilingRule;
import org.apache.jetspeed.security.PasswordCredential;
-import org.apache.jetspeed.security.Role;
import org.apache.jetspeed.security.SecurityException;
import org.apache.jetspeed.security.User;
import org.apache.portals.messaging.PortletMessaging;
Modified: portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserBrowser.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserBrowser.java?rev=712645&r1=712644&r2=712645&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserBrowser.java (original)
+++ portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserBrowser.java Mon Nov 10 02:54:37 2008
@@ -16,50 +16,31 @@
*/
package org.apache.jetspeed.portlets.security.users;
-import java.io.Serializable;
import java.io.NotSerializableException;
-import java.util.List;
import java.util.ArrayList;
import java.util.Iterator;
+import java.util.List;
-import javax.portlet.PortletContext;
-import javax.portlet.PortletSession;
-import javax.portlet.PortletRequest;
-
-import org.apache.wicket.RequestContext;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.model.ResourceModel;
-import org.apache.wicket.model.PropertyModel;
-import org.apache.wicket.markup.html.WebPage;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.form.TextField;
-import org.apache.wicket.markup.html.form.CheckBox;
-import org.apache.wicket.markup.repeater.Item;
-import org.apache.wicket.markup.repeater.OddEvenItem;
-import org.apache.wicket.protocol.http.portlet.PortletRequestContext;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolbar;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.NavigationToolbar;
-import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;
-
-import org.apache.portals.messaging.PortletMessaging;
-
-import org.apache.jetspeed.CommonPortletServices;
-import org.apache.jetspeed.security.UserManager;
-import org.apache.jetspeed.security.SecurityException;
import org.apache.jetspeed.portlets.security.SecurityResources;
import org.apache.jetspeed.portlets.security.SecurityUtil;
-import org.apache.jetspeed.audit.AuditActivity;
-import org.apache.jetspeed.components.portletregistry.PortletRegistry;
-
-import org.apache.jetspeed.portlets.wicket.component.SelectionImagePropertyColumn;
import org.apache.jetspeed.portlets.wicket.component.LinkPropertyColumn;
import org.apache.jetspeed.portlets.wicket.component.PortletOddEvenItem;
+import org.apache.jetspeed.portlets.wicket.component.SelectionImagePropertyColumn;
+import org.apache.jetspeed.security.SecurityException;
+import org.apache.portals.messaging.PortletMessaging;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolbar;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.NavigationToolbar;
+import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;
+import org.apache.wicket.markup.html.form.CheckBox;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.form.TextField;
+import org.apache.wicket.markup.repeater.Item;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.model.PropertyModel;
+import org.apache.wicket.model.ResourceModel;
/**
* User Browser Wicket WebPage
Modified: portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserBrowserApplication.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserBrowserApplication.java?rev=712645&r1=712644&r2=712645&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserBrowserApplication.java (original)
+++ portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserBrowserApplication.java Mon Nov 10 02:54:37 2008
@@ -16,13 +16,6 @@
*/
package org.apache.jetspeed.portlets.security.users;
-import org.apache.wicket.Request;
-import org.apache.wicket.RequestCycle;
-import org.apache.wicket.Response;
-import org.apache.wicket.protocol.http.WebApplication;
-import org.apache.wicket.protocol.http.WebRequest;
-import org.apache.wicket.protocol.http.WebRequestCycle;
-
import org.apache.jetspeed.portlets.wicket.AbstractAdminWebApplication;
/**
Modified: portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserDetailsApplication.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserDetailsApplication.java?rev=712645&r1=712644&r2=712645&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserDetailsApplication.java (original)
+++ portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/security/users/WicketUserDetailsApplication.java Mon Nov 10 02:54:37 2008
@@ -18,25 +18,14 @@
import javax.portlet.PortletRequest;
-import org.apache.wicket.Request;
-import org.apache.wicket.RequestContext;
-import org.apache.wicket.RequestCycle;
-import org.apache.wicket.Response;
-import org.apache.wicket.protocol.http.WebApplication;
-import org.apache.wicket.protocol.http.WebRequest;
-import org.apache.wicket.protocol.http.WebRequestCycle;
-import org.apache.wicket.protocol.http.portlet.PortletRequestContext;
-
-import org.apache.portals.messaging.PortletMessaging;
-
import org.apache.jetspeed.CommonPortletServices;
-import org.apache.jetspeed.security.User;
-import org.apache.jetspeed.security.UserManager;
-import org.apache.jetspeed.security.SecurityException;
import org.apache.jetspeed.portlets.security.SecurityResources;
-import org.apache.jetspeed.portlets.security.SecurityUtil;
-
import org.apache.jetspeed.portlets.wicket.AbstractAdminWebApplication;
+import org.apache.jetspeed.security.User;
+import org.apache.jetspeed.security.UserManager;
+import org.apache.portals.messaging.PortletMessaging;
+import org.apache.wicket.RequestContext;
+import org.apache.wicket.protocol.http.portlet.PortletRequestContext;
/**
* User Details Wicket Application
Modified: portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/tags/PortletTreeControlTag.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/tags/PortletTreeControlTag.java?rev=712645&r1=712644&r2=712645&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/tags/PortletTreeControlTag.java (original)
+++ portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/tags/PortletTreeControlTag.java Mon Nov 10 02:54:37 2008
@@ -17,6 +17,7 @@
package org.apache.jetspeed.portlets.tags;
import java.io.IOException;
+
import javax.portlet.PortletRequest;
import javax.portlet.PortletURL;
import javax.portlet.RenderResponse;
Modified: portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/tags/TreeControlTag.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/tags/TreeControlTag.java?rev=712645&r1=712644&r2=712645&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/tags/TreeControlTag.java (original)
+++ portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/tags/TreeControlTag.java Mon Nov 10 02:54:37 2008
@@ -21,6 +21,7 @@
import java.io.IOException;
import java.net.URLEncoder;
+
import javax.servlet.http.HttpServletResponse;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.JspWriter;
Modified: portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/tracking/PortletTrackingPortlet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/tracking/PortletTrackingPortlet.java?rev=712645&r1=712644&r2=712645&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/tracking/PortletTrackingPortlet.java (original)
+++ portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/tracking/PortletTrackingPortlet.java Mon Nov 10 02:54:37 2008
@@ -34,8 +34,8 @@
import org.apache.jetspeed.CommonPortletServices;
import org.apache.jetspeed.aggregator.PortletTrackingManager;
-import org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite;
-import org.apache.pluto.om.window.PortletWindow;
+import org.apache.jetspeed.container.PortletWindow;
+import org.apache.jetspeed.om.portlet.PortletDefinition;
import org.apache.portals.bridges.velocity.GenericVelocityPortlet;
import org.apache.velocity.context.Context;
@@ -72,7 +72,7 @@
{
PortletWindow window = (PortletWindow)outOfService.next();
String id = window.getId().toString();
- PortletDefinitionComposite pd = (PortletDefinitionComposite)window.getPortletEntity().getPortletDefinition();
+ PortletDefinition pd = (PortletDefinition)window.getPortletEntity().getPortletDefinition();
String uniqueName = pd.getUniqueName();
if (!portlets.containsKey(uniqueName))
{
Modified: portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/wicket/AbstractAdminWebApplication.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/wicket/AbstractAdminWebApplication.java?rev=712645&r1=712644&r2=712645&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/wicket/AbstractAdminWebApplication.java (original)
+++ portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/wicket/AbstractAdminWebApplication.java Mon Nov 10 02:54:37 2008
@@ -19,14 +19,11 @@
import java.net.MalformedURLException;
import java.net.URL;
-import org.apache.wicket.Response;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.UrlResourceStream;
import org.apache.wicket.util.resource.locator.ResourceStreamLocator;
-import org.apache.wicket.util.string.Strings;
-import org.apache.wicket.util.file.IResourceFinder;
/**
* Abstract Admin Wicket Application to load customized templates from /WEB-INF/templates/.
Modified: portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/wicket/AdminWicketPortlet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/wicket/AdminWicketPortlet.java?rev=712645&r1=712644&r2=712645&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/wicket/AdminWicketPortlet.java (original)
+++ portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/wicket/AdminWicketPortlet.java Mon Nov 10 02:54:37 2008
@@ -17,21 +17,19 @@
package org.apache.jetspeed.portlets.wicket;
import java.io.IOException;
-import java.util.Map;
import java.util.HashMap;
+import java.util.Map;
import javax.portlet.PortletConfig;
-import javax.portlet.PortletContext;
import javax.portlet.PortletException;
import javax.portlet.PortletRequest;
import javax.portlet.PortletResponse;
-import org.apache.wicket.util.string.StringList;
-import org.apache.wicket.util.string.IStringIterator;
-import org.apache.wicket.protocol.http.portlet.WicketPortlet;
-
import org.apache.jetspeed.container.JetspeedPortletContext;
-import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
+import org.apache.jetspeed.om.portlet.PortletApplication;
+import org.apache.wicket.protocol.http.portlet.WicketPortlet;
+import org.apache.wicket.util.string.IStringIterator;
+import org.apache.wicket.util.string.StringList;
/**
* AdminWicketPortlet which overrides init() and processRequest() to pass cps: components to Wicket pages.
@@ -41,10 +39,10 @@
*/
public class AdminWicketPortlet extends WicketPortlet
{
- public static final String JETSPEED_PA_IDENTIFIER = "JetspeedPAIdentifier";
+ public static final String JETSPEED_PA_IDENTIFIER = "JetspeedPAName";
public static final String SERVICE_COMPONENT_NAMES = "serviceComponentNames";
- protected String paIdentifier;
+ protected String paName;
protected StringList serviceComponentNameList;
protected Map serviceComponentsMap = null;
@@ -75,12 +73,12 @@
}
}
- this.paIdentifier = ((MutablePortletApplication) ((JetspeedPortletContext) config.getPortletContext()).getApplication()).getApplicationIdentifier();
+ this.paName = ((PortletApplication) ((JetspeedPortletContext) config.getPortletContext()).getPortletApplicationDefinition()).getName();
}
protected void processRequest(PortletRequest request, PortletResponse response, String requestType, String pageType) throws PortletException, IOException
{
- request.setAttribute(JETSPEED_PA_IDENTIFIER, this.paIdentifier);
+ request.setAttribute(JETSPEED_PA_IDENTIFIER, this.paName);
if (this.serviceComponentNameList != null)
{
Modified: portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/wicket/component/CheckBoxPropertyColumn.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/wicket/component/CheckBoxPropertyColumn.java?rev=712645&r1=712644&r2=712645&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/wicket/component/CheckBoxPropertyColumn.java (original)
+++ portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/wicket/component/CheckBoxPropertyColumn.java Mon Nov 10 02:54:37 2008
@@ -17,14 +17,13 @@
package org.apache.jetspeed.portlets.wicket.component;
import org.apache.wicket.AttributeModifier;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn;
+import org.apache.wicket.markup.html.form.CheckBox;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.PropertyModel;
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.markup.html.link.Link;
-import org.apache.wicket.markup.html.form.CheckBox;
-import org.apache.wicket.markup.repeater.Item;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn;
/**
* CheckBoxPropertyColumn to show selection column with checkbox.
Modified: portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/wicket/component/LinkPropertyColumn.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/wicket/component/LinkPropertyColumn.java?rev=712645&r1=712644&r2=712645&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/wicket/component/LinkPropertyColumn.java (original)
+++ portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/wicket/component/LinkPropertyColumn.java Mon Nov 10 02:54:37 2008
@@ -16,13 +16,13 @@
*/
package org.apache.jetspeed.portlets.wicket.component;
-import org.apache.wicket.model.IModel;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn;
import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.markup.html.link.PopupSettings;
+import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.markup.repeater.Item;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn;
+import org.apache.wicket.model.IModel;
/**
* LinkPropertyColumn to show simple link column.
Modified: portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/wicket/component/PortletOddEvenItem.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/wicket/component/PortletOddEvenItem.java?rev=712645&r1=712644&r2=712645&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/wicket/component/PortletOddEvenItem.java (original)
+++ portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/wicket/component/PortletOddEvenItem.java Mon Nov 10 02:54:37 2008
@@ -16,9 +16,9 @@
*/
package org.apache.jetspeed.portlets.wicket.component;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.markup.repeater.OddEvenItem;
import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.markup.repeater.OddEvenItem;
+import org.apache.wicket.model.IModel;
/**
* PortletOddEvenItem to show rows with different colors.
Modified: portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/wicket/component/SelectionImagePropertyColumn.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/wicket/component/SelectionImagePropertyColumn.java?rev=712645&r1=712644&r2=712645&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/wicket/component/SelectionImagePropertyColumn.java (original)
+++ portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/wicket/component/SelectionImagePropertyColumn.java Mon Nov 10 02:54:37 2008
@@ -17,13 +17,12 @@
package org.apache.jetspeed.portlets.wicket.component;
import org.apache.wicket.AttributeModifier;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn;
import org.apache.wicket.markup.html.image.Image;
+import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.markup.repeater.Item;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
/**
* SelectionImagePropertyColumn to show selection column with image icons.
Modified: portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/wicket/component/TextFieldPropertyColumn.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/wicket/component/TextFieldPropertyColumn.java?rev=712645&r1=712644&r2=712645&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/wicket/component/TextFieldPropertyColumn.java (original)
+++ portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/wicket/component/TextFieldPropertyColumn.java Mon Nov 10 02:54:37 2008
@@ -16,14 +16,12 @@
*/
package org.apache.jetspeed.portlets.wicket.component;
-import org.apache.wicket.AttributeModifier;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.model.PropertyModel;
-import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn;
import org.apache.wicket.markup.html.form.TextField;
+import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.markup.repeater.Item;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.PropertyModel;
/**
* TextFieldPropertyColumn to show selection column with textbox.
Modified: portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/webapp/WEB-INF/portlet.xml?rev=712645&r1=712644&r2=712645&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/webapp/WEB-INF/portlet.xml (original)
+++ portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/webapp/WEB-INF/portlet.xml Mon Nov 10 02:54:37 2008
@@ -200,7 +200,7 @@
</preference>
</portlet-preferences>
</portlet>
-
+<!--
<portlet>
<description>The Wicket User Browser displays a list of users managed in this portal. From here you can select users for editing. Place this portlet on the same page as the Wicket User Details portlet.</description>
<description xml:lang="ja">ã¦ã¼ã¶ã¼ãã©ã¦ã¶ã¯ãã®ãã¼ã¿ã«å
ã§ç®¡çããã¦ããã¦ã¼ã¶ã¼ã®ãªã¹ãã表示ãã¾ãããã®ãã¼ãã¬ããã«ãããã¦ã¼ã¶ã¼ã追å ã»ç·¨éãããã¨ãã§ãã¾ãã</description>
@@ -232,7 +232,7 @@
<keywords>admin,security,users</keywords>
</portlet-info>
</portlet>
-
+ -->
<portlet id="UserDetailsPortlet">
<description>The User Details portlet displays a users details in a tabbed view. From here you can add, edit, and delete User information. Place this portlet on the same page as the User Browser portlet.</description>
<description xml:lang="ja">ã¦ã¼ã¶ã¼è©³ç´°ãã¼ãã¬ããã¯ã¿ãã§è¡¨ç¤ºãããã¦ã¼ã¶ã¼æ
å ±ã®è©³ç´°ã表示ãã¾ãããã®ãã¼ãã¬ããã«ãããã¦ã¼ã¶ã¼æ
å ±ã®è¿½å ã»ç·¨éãããã¨ãã§ãã¾ãã</description>
@@ -1048,7 +1048,7 @@
<keywords>admin,profiler,profile</keywords>
</portlet-info>
</portlet>
-
+<!--
<portlet id="PortletEntityBrowserPortlet">
<description>Administrative portlet for browsing over all Portlet Entities by portlet. Place this portlet on the same page as the Portlet Entity Editor</description>
<description xml:lang="ja">ãã¼ãã¬ããã¨ã³ãã£ãã£ãä¸è¦§ããæ©è½ãæä¾ãã¾ãããã¼ãã¬ããã¨ã³ãã£ãã£ã¨ãã£ã¿ã¨åããã¼ã¸ã«ç½®ãã¦ãã ããã</description>
@@ -1114,7 +1114,7 @@
<keywords>admin,applications,apps,entity,manager</keywords>
</portlet-info>
</portlet>
-
+ -->
<portlet id="StatisticsPortlet">
<description>Provides statistics about portal access hits by page, portlet, and by user. Statistical results are sorted by highest hit rate.</description>
<description xml:lang="ja">ãã¼ã¸ããã¼ãã¬ãããã¦ã¼ã¶ã¼ãã¨ã®ãã¼ã¿ã«ã¢ã¯ã»ã¹ã«ã¤ãã¦ã®çµ±è¨æ©è½ãæä¾ãã¾ããçµ±è¨çµæã¯ããããå²åãé«ãé ã«ã½ã¼ãããã¾ãã</description>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org