[embjopr-commits] EMBJOPR SVN: r247 - in trunk/core/src/main/java/org/jboss/on/embedded: ui and 2 other directories.

Author: ips Date: 2009-03-20 11:21:36 -0400 (Fri, 20 Mar 2009) New Revision: 247 Modified: trunk/core/src/main/java/org/jboss/on/embedded/LoggingInventoryEventListener.java trunk/core/src/main/java/org/jboss/on/embedded/ui/NavigationAction.java trunk/core/src/main/java/org/jboss/on/embedded/ui/SingleResourceContentAction.java trunk/core/src/main/java/org/jboss/on/embedded/ui/SingleResourceOperationAction.java trunk/core/src/main/java/org/jboss/on/embedded/ui/configuration/resource/ResourceConfigurationUIBean.java trunk/core/src/main/java/org/jboss/on/embedded/ui/content/CreateContentBackedResourceAction.java trunk/core/src/main/java/org/jboss/on/embedded/ui/content/UpdateBackingContentAction.java Log: make several Seam components Serializable in order to quiet warnings from Seam; neaten up some debug log messages Modified: trunk/core/src/main/java/org/jboss/on/embedded/LoggingInventoryEventListener.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/LoggingInventoryEventListener.java 2009-03-20 13:03:03 UTC (rev 246) +++ trunk/core/src/main/java/org/jboss/on/embedded/LoggingInventoryEventListener.java 2009-03-20 15:21:36 UTC (rev 247) @@ -19,6 +19,7 @@ package org.jboss.on.embedded; import java.util.Set; +import java.util.HashSet; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -34,31 +35,28 @@ public void resourcesAdded(Set<Resource> resources) { - log.debug("The following resources have been added"); - log(resources); + log.debug("The following Resources have been added: " + toString(resources)); } public void resourcesRemoved(Set<Resource> resources) { - log.debug("The following resources have been removed"); - log(resources); + log.debug("The following Resources have been removed: " + toString(resources)); return; } public void resourceActivated(Resource resource) { - log.debug("The following resource has been activated"); - log(resource); + Set resources = new HashSet(); + resources.add(resource); + log.debug("The following Resource has been activated: " + toString(resources)); return; } - - private void log(Set<Resource> resources) { - for (Resource resource : resources) { - log(resource); - } + + private static String toString(Set<Resource> resources) { + StringBuilder stringBuilder = new StringBuilder(); + for (Resource resource : resources) + stringBuilder.append("Resource[").append(resource.getId()).append("]: ").append(resource.getName()).append(", "); + stringBuilder.delete(stringBuilder.length() - 2, stringBuilder.length()); + return stringBuilder.toString(); } - - private void log(Resource resource) { - log.debug("Resource[" + resource.getId() + "]: " + resource.getName()); - } } Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/NavigationAction.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/ui/NavigationAction.java 2009-03-20 13:03:03 UTC (rev 246) +++ trunk/core/src/main/java/org/jboss/on/embedded/ui/NavigationAction.java 2009-03-20 15:21:36 UTC (rev 247) @@ -23,6 +23,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +import java.io.Serializable; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; @@ -65,7 +66,7 @@ // Most actions should be dealing with CommonActionUtil for getting hold of resources etc. @Name("navigationAction") @Scope(ScopeType.SESSION) -public class NavigationAction +public class NavigationAction implements Serializable { private Set<JONTreeNode> expandedYet = new HashSet<JONTreeNode>(); Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/SingleResourceContentAction.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/ui/SingleResourceContentAction.java 2009-03-20 13:03:03 UTC (rev 246) +++ trunk/core/src/main/java/org/jboss/on/embedded/ui/SingleResourceContentAction.java 2009-03-20 15:21:36 UTC (rev 247) @@ -33,10 +33,11 @@ import java.util.List; import java.util.Set; import java.util.ArrayList; +import java.io.Serializable; @Name("contentDisplayAction") @Scope(ScopeType.SESSION) -public class SingleResourceContentAction +public class SingleResourceContentAction implements Serializable { @Out(value = "currentResource", required = false, scope = ScopeType.PAGE) private Resource resource; Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/SingleResourceOperationAction.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/ui/SingleResourceOperationAction.java 2009-03-20 13:03:03 UTC (rev 246) +++ trunk/core/src/main/java/org/jboss/on/embedded/ui/SingleResourceOperationAction.java 2009-03-20 15:21:36 UTC (rev 247) @@ -49,6 +49,7 @@ import java.util.Set; import java.util.Map; import java.util.HashMap; +import java.io.Serializable; import javax.faces.application.FacesMessage; @@ -58,7 +59,7 @@ */ @Name("operationAction") @Scope(value = ScopeType.CONVERSATION) -public class SingleResourceOperationAction +public class SingleResourceOperationAction implements Serializable { @In private transient FacesMessages facesMessages; Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/configuration/resource/ResourceConfigurationUIBean.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/ui/configuration/resource/ResourceConfigurationUIBean.java 2009-03-20 13:03:03 UTC (rev 246) +++ trunk/core/src/main/java/org/jboss/on/embedded/ui/configuration/resource/ResourceConfigurationUIBean.java 2009-03-20 15:21:36 UTC (rev 247) @@ -48,6 +48,7 @@ import java.util.Map; import java.util.Set; import java.util.ResourceBundle; +import java.io.Serializable; /** * Managed Bean to handle Resource Configuration pages. Both Create and Edit Resource configurations @@ -57,7 +58,7 @@ */ @Name("resourceConfigurationUIBean") @Scope(ScopeType.CONVERSATION) -public class ResourceConfigurationUIBean extends AbstractResourceConfigurationUIBean +public class ResourceConfigurationUIBean extends AbstractResourceConfigurationUIBean implements Serializable { public static final String MANAGED_BEAN_NAME = "resourceConfigurationUIBean"; Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/content/CreateContentBackedResourceAction.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/ui/content/CreateContentBackedResourceAction.java 2009-03-20 13:03:03 UTC (rev 246) +++ trunk/core/src/main/java/org/jboss/on/embedded/ui/content/CreateContentBackedResourceAction.java 2009-03-20 15:21:36 UTC (rev 247) @@ -21,6 +21,7 @@ import java.io.File; import java.io.IOException; +import java.io.Serializable; import javax.faces.application.FacesMessage; @@ -57,7 +58,8 @@ */ @Name("createContentBackedResourceAction") @Scope(ScopeType.CONVERSATION) -public class CreateContentBackedResourceAction extends AbstractFileUploadAction { +public class CreateContentBackedResourceAction extends AbstractFileUploadAction implements Serializable +{ private static final String INITIAL_PACKAGE_VERSION = "1.0"; private final Log log = LogFactory.getLog(this.getClass()); Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/content/UpdateBackingContentAction.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/ui/content/UpdateBackingContentAction.java 2009-03-20 13:03:03 UTC (rev 246) +++ trunk/core/src/main/java/org/jboss/on/embedded/ui/content/UpdateBackingContentAction.java 2009-03-20 15:21:36 UTC (rev 247) @@ -21,6 +21,7 @@ import java.io.File; import java.io.IOException; +import java.io.Serializable; import java.util.HashSet; import java.util.Set; @@ -61,7 +62,8 @@ */ @Name("updateBackingContentAction") @Scope(ScopeType.CONVERSATION) -public class UpdateBackingContentAction extends AbstractFileUploadAction { +public class UpdateBackingContentAction extends AbstractFileUploadAction implements Serializable +{ private final Log log = LogFactory.getLog(this.getClass()); @Out