Author: thomas.heute(a)jboss.com Date: 2007-02-16 10:04:45 -0500 (Fri, 16 Feb 2007) New Revision: 6317 Added: trunk/core-admin/.classpath trunk/core-admin/.project Modified: trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/InstanceManagerBean.java trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/PortletManagerBean.java trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/actions/PreferenceAction.java trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/actions/PropertyAction.java Log: - Dillonism - Eclipse files Added: trunk/core-admin/.classpath =================================================================== --- trunk/core-admin/.classpath (rev 0) +++ trunk/core-admin/.classpath 2007-02-16 15:04:45 UTC (rev 6317) @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="src/main"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry combineaccessrules="false" kind="src" path="/common"/> + <classpathentry combineaccessrules="false" kind="src" path="/faces"/> + <classpathentry combineaccessrules="false" kind="src" path="/security"/> + <classpathentry kind="lib" path="/thirdparty/apache-myfaces/lib/myfaces-api.jar"/> + <classpathentry combineaccessrules="false" kind="src" path="/identity"/> + <classpathentry kind="lib" path="/thirdparty/apache-tomahawk/lib/tomahawk.jar"/> + <classpathentry combineaccessrules="false" kind="src" path="/api"/> + <classpathentry combineaccessrules="false" kind="src" path="/core"/> + <classpathentry combineaccessrules="false" kind="src" path="/portlet"/> + <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-common.jar"/> + <classpathentry combineaccessrules="false" kind="src" path="/theme"/> + <classpathentry combineaccessrules="false" kind="src" path="/portlet-federation"/> + <classpathentry kind="output" path="bin"/> +</classpath> Added: trunk/core-admin/.project =================================================================== --- trunk/core-admin/.project (rev 0) +++ trunk/core-admin/.project 2007-02-16 15:04:45 UTC (rev 6317) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>core-admin</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> Modified: trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/InstanceManagerBean.java =================================================================== --- trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/InstanceManagerBean.java 2007-02-16 14:37:51 UTC (rev 6316) +++ trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/InstanceManagerBean.java 2007-02-16 15:04:45 UTC (rev 6317) @@ -22,9 +22,21 @@ ******************************************************************************/ package org.jboss.portal.core.portlet.management; +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.Locale; +import java.util.Map; + +import javax.faces.context.ExternalContext; +import javax.faces.context.FacesContext; +import javax.faces.model.SelectItem; + import org.jboss.logging.Logger; import org.jboss.portal.common.util.LocalizedString; -import org.jboss.portal.common.util.Tools; import org.jboss.portal.common.value.Value; import org.jboss.portal.core.model.instance.Instance; import org.jboss.portal.core.model.instance.InstanceContainer; @@ -32,8 +44,6 @@ import org.jboss.portal.faces.matrix.Cell; import org.jboss.portal.faces.matrix.Row; import org.jboss.portal.faces.matrix.RowSetModel; -import org.jboss.portal.identity.IdentityException; -import org.jboss.portal.identity.Role; import org.jboss.portal.identity.RoleModule; import org.jboss.portal.portlet.Portlet; import org.jboss.portal.portlet.PortletInvokerException; @@ -41,22 +51,8 @@ import org.jboss.portal.portlet.info.PreferencesInfo; import org.jboss.portal.portlet.state.PropertyMap; import org.jboss.portal.security.AuthorizationDomainRegistry; -import org.jboss.portal.security.SecurityConstants; import org.jboss.portal.security.spi.provider.DomainConfigurator; -import javax.faces.context.ExternalContext; -import javax.faces.context.FacesContext; -import javax.faces.model.SelectItem; -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.Locale; -import java.util.Map; -import java.util.Set; - /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @author <a href="mailto:boleslaw dot dawidowicz at jboss.org">Boleslaw Dawidowicz</a> Modified: trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java =================================================================== --- trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java 2007-02-16 14:37:51 UTC (rev 6316) +++ trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java 2007-02-16 15:04:45 UTC (rev 6317) @@ -22,6 +22,28 @@ ******************************************************************************/ package org.jboss.portal.core.portlet.management; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Set; +import java.util.SortedSet; +import java.util.TreeSet; + +import javax.faces.application.FacesMessage; +import javax.faces.component.UIComponent; +import javax.faces.context.FacesContext; +import javax.faces.model.SelectItem; +import javax.faces.validator.ValidatorException; + import org.apache.myfaces.custom.tree2.HtmlTree; import org.apache.myfaces.custom.tree2.TreeModel; import org.apache.myfaces.custom.tree2.TreeModelBase; @@ -30,7 +52,6 @@ import org.jboss.portal.api.node.PortalNode; import org.jboss.portal.common.MediaType; import org.jboss.portal.common.util.LocalizedString; -import org.jboss.portal.common.util.Tools; import org.jboss.portal.core.aspects.controller.node.Navigation; import org.jboss.portal.core.impl.model.portal.PortalObjectImpl; import org.jboss.portal.core.model.instance.Instance; @@ -44,13 +65,11 @@ import org.jboss.portal.faces.el.PropertyDef; import org.jboss.portal.faces.el.TypeDef; import org.jboss.portal.identity.IdentityException; -import org.jboss.portal.identity.Role; import org.jboss.portal.identity.RoleModule; import org.jboss.portal.portlet.Portlet; import org.jboss.portal.portlet.info.MetaInfo; import org.jboss.portal.portlet.info.PortletInfo; import org.jboss.portal.security.AuthorizationDomainRegistry; -import org.jboss.portal.security.SecurityConstants; import org.jboss.portal.security.spi.auth.PortalAuthorizationManagerFactory; import org.jboss.portal.security.spi.provider.DomainConfigurator; import org.jboss.portal.theme.LayoutService; @@ -63,27 +82,6 @@ import org.jboss.portal.theme.strategy.LayoutStrategy; import org.jboss.portlet.JBossRenderResponse; -import javax.faces.application.FacesMessage; -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.model.SelectItem; -import javax.faces.validator.ValidatorException; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.Set; -import java.util.SortedSet; -import java.util.TreeSet; - /** The portal object manager bean. */ public class PortalObjectManagerBean implements Serializable { Modified: trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/PortletManagerBean.java =================================================================== --- trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/PortletManagerBean.java 2007-02-16 14:37:51 UTC (rev 6316) +++ trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/PortletManagerBean.java 2007-02-16 15:04:45 UTC (rev 6317) @@ -22,42 +22,38 @@ ******************************************************************************/ package org.jboss.portal.core.portlet.management; +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.Locale; +import java.util.Map; + +import javax.faces.context.FacesContext; +import javax.faces.model.SelectItem; + import org.jboss.logging.Logger; import org.jboss.portal.common.util.LocalizedString; -import org.jboss.portal.common.util.Tools; import org.jboss.portal.common.value.Value; import org.jboss.portal.core.model.instance.InstanceContainer; import org.jboss.portal.faces.matrix.Cell; import org.jboss.portal.faces.matrix.Row; import org.jboss.portal.faces.matrix.RowSetModel; -import org.jboss.portal.portlet.federation.FederatedPortletInvoker; -import org.jboss.portal.portlet.federation.FederatingPortletInvoker; -import org.jboss.portal.identity.IdentityException; -import org.jboss.portal.identity.Role; import org.jboss.portal.identity.RoleModule; import org.jboss.portal.portlet.Portlet; import org.jboss.portal.portlet.PortletContext; import org.jboss.portal.portlet.PortletInvoker; import org.jboss.portal.portlet.PortletInvokerException; +import org.jboss.portal.portlet.federation.FederatedPortletInvoker; +import org.jboss.portal.portlet.federation.FederatingPortletInvoker; import org.jboss.portal.portlet.info.MetaInfo; import org.jboss.portal.portlet.info.PreferenceInfo; import org.jboss.portal.portlet.info.PreferencesInfo; import org.jboss.portal.security.AuthorizationDomainRegistry; -import org.jboss.portal.security.SecurityConstants; import org.jboss.portal.security.spi.provider.DomainConfigurator; -import javax.faces.context.FacesContext; -import javax.faces.model.SelectItem; -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.Locale; -import java.util.Map; -import java.util.Set; - /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @author <a href="mailto:boleslaw dot dawidowicz at jboss.org">Boleslaw Dawidowicz</a> Modified: trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/actions/PreferenceAction.java =================================================================== --- trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/actions/PreferenceAction.java 2007-02-16 14:37:51 UTC (rev 6316) +++ trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/actions/PreferenceAction.java 2007-02-16 15:04:45 UTC (rev 6317) @@ -33,7 +33,6 @@ import org.jboss.portal.portlet.PortletInvokerException; import org.jboss.portal.portlet.state.PropertyChange; import org.jboss.portal.portlet.state.PropertyMap; -import org.jboss.portal.portlet.state.SimplePropertyMap; import java.util.ArrayList; import java.util.Arrays; @@ -156,8 +155,6 @@ { // Instance instance = manager.getSelectedInstance(); - PropertyMap prefs = instance.getProperties(); - PropertyMap newPrefs = new SimplePropertyMap(prefs); // String key = row.getHandback(); Modified: trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/actions/PropertyAction.java =================================================================== --- trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/actions/PropertyAction.java 2007-02-16 14:37:51 UTC (rev 6316) +++ trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/actions/PropertyAction.java 2007-02-16 15:04:45 UTC (rev 6317) @@ -23,7 +23,6 @@ package org.jboss.portal.core.portlet.management.actions; import org.apache.myfaces.component.html.ext.HtmlDataTable; -import org.jboss.logging.Logger; import org.jboss.portal.core.portlet.management.PortalObjectManagerBean; import javax.faces.application.FacesMessage; @@ -37,8 +36,6 @@ */ public class PropertyAction { - private Logger log = Logger.getLogger(getClass()); - /** . */ private PortalObjectManagerBean pomgr; @@ -48,8 +45,6 @@ private String propertyValue; - private static final String ERROR_WRONG_NAME = "Wrong property name!"; - private static final String ERROR_EMPTY_NAME = "Property name cannot be blank!"; public PortalObjectManagerBean getPortalObjectManager()