[portal-commits] JBoss Portal SVN: r5915 - in trunk/core/src: main/org/jboss/portal/core/deployment/jboss main/org/jboss/portal/core/impl/model main/org/jboss/portal/core/impl/model/instance main/org/jboss/portal/core/impl/model/portal main/org/jboss/portal/core/management main/org/jboss/portal/core/metadata main/org/jboss/portal/core/model/instance main/org/jboss/portal/core/model/instance/command main/org/jboss/portal/core/portlet/dashboard main/org/jboss/portal/core/portlet/management main/org/jboss/portal/core/portlet/management/actions main/org/jboss/portal/test/core/model/instance resources/portal-core-sar/META-INF
portal-commits at lists.jboss.org
portal-commits at lists.jboss.org
Wed Dec 20 17:03:13 EST 2006
Author: julien at jboss.com
Date: 2006-12-20 17:02:51 -0500 (Wed, 20 Dec 2006)
New Revision: 5915
Added:
trunk/core/src/main/org/jboss/portal/core/impl/model/portal/DashboardContext.java
Removed:
trunk/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceContainerListener.java
Modified:
trunk/core/src/main/org/jboss/portal/core/deployment/jboss/PortletAppDeployment.java
trunk/core/src/main/org/jboss/portal/core/impl/model/CustomizationManagerService.java
trunk/core/src/main/org/jboss/portal/core/impl/model/instance/PersistentInstanceContainer.java
trunk/core/src/main/org/jboss/portal/core/impl/model/portal/AbstractPortalObjectContainer.java
trunk/core/src/main/org/jboss/portal/core/impl/model/portal/ContextImpl.java
trunk/core/src/main/org/jboss/portal/core/impl/model/portal/ObjectNode.java
trunk/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java
trunk/core/src/main/org/jboss/portal/core/impl/model/portal/WindowImpl.java
trunk/core/src/main/org/jboss/portal/core/management/PortalImpl.java
trunk/core/src/main/org/jboss/portal/core/metadata/InstancesMetaData.java
trunk/core/src/main/org/jboss/portal/core/model/instance/InstanceContainer.java
trunk/core/src/main/org/jboss/portal/core/model/instance/command/InvokePortletInstanceCommand.java
trunk/core/src/main/org/jboss/portal/core/portlet/dashboard/Configurator.java
trunk/core/src/main/org/jboss/portal/core/portlet/management/InstanceManagerBean.java
trunk/core/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java
trunk/core/src/main/org/jboss/portal/core/portlet/management/actions/CreateInstanceAction.java
trunk/core/src/main/org/jboss/portal/test/core/model/instance/InstanceContainerTestCase.java
trunk/core/src/resources/portal-core-sar/META-INF/jboss-service.xml
Log:
- renamed *Instance methods on InstanceContainer to *Definition
- started to implement stuff for per dashboard window -> destroy associated instance customization in instance container
Modified: trunk/core/src/main/org/jboss/portal/core/deployment/jboss/PortletAppDeployment.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/deployment/jboss/PortletAppDeployment.java 2006-12-20 21:40:00 UTC (rev 5914)
+++ trunk/core/src/main/org/jboss/portal/core/deployment/jboss/PortletAppDeployment.java 2006-12-20 22:02:51 UTC (rev 5915)
@@ -357,7 +357,7 @@
private void handleInstance(InstanceMetaDataContext metaDataCtx) throws PortletInvokerException, SecurityConfigurationException, DuplicateInstanceException
{
InstanceMetaData metaData = metaDataCtx.metaData;
- Instance instance = factory.getInstanceContainer().getInstance(metaData.getId());
+ Instance instance = factory.getInstanceContainer().getDefinition(metaData.getId());
if (instance == null)
{
createInstance(metaData);
@@ -411,7 +411,7 @@
String resolvedRef = resolvePortletRef(metaData.getPortletRef());
// Create the instance
- Instance instance = factory.getInstanceContainer().createInstance(metaData.getId(), resolvedRef);
+ Instance instance = factory.getInstanceContainer().createDefinition(metaData.getId(), resolvedRef);
// Configure
configureInstance(instance, metaData);
Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/CustomizationManagerService.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/impl/model/CustomizationManagerService.java 2006-12-20 21:40:00 UTC (rev 5914)
+++ trunk/core/src/main/org/jboss/portal/core/impl/model/CustomizationManagerService.java 2006-12-20 22:02:51 UTC (rev 5915)
@@ -118,7 +118,7 @@
}
// Get the instance
- Instance instance = instanceContainer.getInstance(instanceId);
+ Instance instance = instanceContainer.getDefinition(instanceId);
if (instance != null)
{
// If we are in the context of an existing user we get a customization for that user
Deleted: trunk/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceContainerListener.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceContainerListener.java 2006-12-20 21:40:00 UTC (rev 5914)
+++ trunk/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceContainerListener.java 2006-12-20 22:02:51 UTC (rev 5915)
@@ -1,10 +0,0 @@
-package org.jboss.portal.core.impl.model.instance;
-
-public interface InstanceContainerListener
-{
-
- void portletInstanceCreated(InstanceDefinitionImpl instance);
-
- void portletInstanceDestroyed(InstanceDefinitionImpl instance);
-
-}
Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/instance/PersistentInstanceContainer.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/impl/model/instance/PersistentInstanceContainer.java 2006-12-20 21:40:00 UTC (rev 5914)
+++ trunk/core/src/main/org/jboss/portal/core/impl/model/instance/PersistentInstanceContainer.java 2006-12-20 22:02:51 UTC (rev 5915)
@@ -81,8 +81,6 @@
PermissionRepository, PermissionFactory
{
- private List listeners = new ArrayList();
-
/** . */
protected InterceptorStackFactory stackFactory;
@@ -239,7 +237,7 @@
sessionFactory = null;
}
- public InstanceDefinition getInstance(String id)
+ public InstanceDefinition getDefinition(String id)
{
if (id == null)
{
@@ -249,12 +247,12 @@
return lookup(session, id);
}
- public InstanceDefinition createInstance(String id, String portletId) throws DuplicateInstanceException, IllegalArgumentException, PortletInvokerException
+ public InstanceDefinition createDefinition(String id, String portletId) throws DuplicateInstanceException, IllegalArgumentException, PortletInvokerException
{
- return createInstance(id, portletId, cloneOnCreate);
+ return createDefinition(id, portletId, cloneOnCreate);
}
- public InstanceDefinition createInstance(String id, String portletId, boolean clone) throws DuplicateInstanceException, PortletInvokerException
+ public InstanceDefinition createDefinition(String id, String portletId, boolean clone) throws DuplicateInstanceException, PortletInvokerException
{
if (id == null)
{
@@ -275,7 +273,7 @@
portletInvoker.getPortlet(portletContext);
//
- InstanceDefinitionImpl instance = null;
+ InstanceDefinitionImpl instance;
try
{
// Create the persistent instance which may raise a constraint violation exception if it already exist
@@ -311,13 +309,11 @@
session.update(instance);
}
- raiseCreatedPortletInstanceEvent(instance);
-
//
return instance;
}
- public void destroyInstance(String id) throws PortletInvokerException, NoSuchInstanceException
+ public void destroyDefinition(String id) throws PortletInvokerException, NoSuchInstanceException
{
if (id == null)
{
@@ -408,32 +404,10 @@
//
session.flush();
-
- raiseDestroyedPortletInstanceEvent(instance);
}
- private void raiseCreatedPortletInstanceEvent(InstanceDefinitionImpl instance)
+ public Collection getDefinitions()
{
- Iterator it = listeners.iterator();
- while (it.hasNext())
- {
- InstanceContainerListener listener = (InstanceContainerListener)it.next();
- listener.portletInstanceCreated(instance);
- }
- }
-
- private void raiseDestroyedPortletInstanceEvent(InstanceDefinitionImpl instance)
- {
- Iterator it = listeners.iterator();
- while (it.hasNext())
- {
- InstanceContainerListener listener = (InstanceContainerListener)it.next();
- listener.portletInstanceDestroyed(instance);
- }
- }
-
- public Collection getInstances()
- {
//
PortalAuthorizationManager mgr = portalAuthorizationManagerFactory.getManager();
@@ -687,16 +661,6 @@
return this;
}
- public void addListener(InstanceContainerListener listener)
- {
- listeners.add(listener);
- }
-
- public void removeListener(InstanceContainerListener listener)
- {
- listeners.remove(listener);
- }
-
private void removeBindings(Session session, InstanceDefinitionImpl instance)
{
if (instance.getSecurityBindings() != null)
Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/portal/AbstractPortalObjectContainer.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/impl/model/portal/AbstractPortalObjectContainer.java 2006-12-20 21:40:00 UTC (rev 5914)
+++ trunk/core/src/main/org/jboss/portal/core/impl/model/portal/AbstractPortalObjectContainer.java 2006-12-20 22:02:51 UTC (rev 5915)
@@ -26,6 +26,7 @@
import org.jboss.portal.core.model.portal.PortalObjectContainer;
import org.jboss.portal.core.model.portal.PortalObjectPermission;
import org.jboss.portal.core.model.portal.PortalObjectId;
+import org.jboss.portal.core.model.instance.InstanceContainer;
import org.jboss.portal.jems.as.system.AbstractJBossService;
import org.jboss.portal.security.PortalPermission;
import org.jboss.portal.security.PortalPermissionCollection;
@@ -39,7 +40,6 @@
import java.util.Collection;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.Set;
/**
@@ -53,6 +53,19 @@
/** . */
private PortalObjectIdImpl rootId = new PortalObjectIdImpl();
+ /** . */
+ private InstanceContainer instanceContainer;
+
+ public InstanceContainer getInstanceContainer()
+ {
+ return instanceContainer;
+ }
+
+ public void setInstanceContainer(InstanceContainer instanceContainer)
+ {
+ this.instanceContainer = instanceContainer;
+ }
+
public PortalObject getRootObject()
{
return getObject(rootId);
Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/portal/ContextImpl.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/impl/model/portal/ContextImpl.java 2006-12-20 21:40:00 UTC (rev 5914)
+++ trunk/core/src/main/org/jboss/portal/core/impl/model/portal/ContextImpl.java 2006-12-20 22:02:51 UTC (rev 5915)
@@ -105,10 +105,4 @@
clone.setDeclaredPropertyMap(new HashMap(getDeclaredPropertyMap()));
return clone;
}
-
- public boolean isDashboard()
- {
- Object b = declaredPropertyMap.get("dashboard");
- return "true".equals(b);
- }
}
Added: trunk/core/src/main/org/jboss/portal/core/impl/model/portal/DashboardContext.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/impl/model/portal/DashboardContext.java 2006-12-20 21:40:00 UTC (rev 5914)
+++ trunk/core/src/main/org/jboss/portal/core/impl/model/portal/DashboardContext.java 2006-12-20 22:02:51 UTC (rev 5915)
@@ -0,0 +1,44 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.core.impl.model.portal;
+
+/**
+ * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
+ * @version $Revision: 1.1 $
+ */
+public class DashboardContext
+{
+
+ /** . */
+ private final String id;
+
+ public DashboardContext(String id)
+ {
+ this.id = id;
+ }
+
+ public String getId()
+ {
+ return id;
+ }
+}
Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/portal/ObjectNode.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/impl/model/portal/ObjectNode.java 2006-12-20 21:40:00 UTC (rev 5914)
+++ trunk/core/src/main/org/jboss/portal/core/impl/model/portal/ObjectNode.java 2006-12-20 22:02:51 UTC (rev 5915)
@@ -155,6 +155,7 @@
throw new IllegalArgumentException("No null name accepted");
}
+ //
log.debug("Removing child of '" + path + "' with name '" + name + "'");
ObjectNode child = (ObjectNode)children.get(name);
if (child == null)
@@ -169,6 +170,9 @@
child.removeChild(childName);
}
+ // Callback
+ child.getObject().destroy();
+
// Let the container destroy it
context.destroyChild(child);
Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java 2006-12-20 21:40:00 UTC (rev 5914)
+++ trunk/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java 2006-12-20 22:02:51 UTC (rev 5915)
@@ -48,23 +48,23 @@
// Persistent fields
/** The primary key when the object is persisted */
- protected Long key;
+ private Long key;
/** . */
- protected Map declaredPropertyMap;
+ private Map declaredPropertyMap;
/** . */
- protected String listener;
+ private String listener;
/** The node. */
- protected ObjectNode objectNode;
+ private ObjectNode objectNode;
// Runtime fields
- protected Collection collection;
- protected Map properties;
- protected PortalObjectIdImpl id;
- protected Boolean dashboard;
+ private Collection collection;
+ private Map properties;
+ private PortalObjectIdImpl id;
+ private DashboardContext dashboardContext;
public PortalObjectImpl()
{
@@ -392,21 +392,45 @@
return getChild(portalName);
}
- public boolean isDashboard()
+ public final boolean isDashboard()
{
- if (dashboard == null)
+ return getDashboardContext() != null;
+ }
+
+ /**
+ * Overridable callback.
+ */
+ protected void destroy()
+ {
+ }
+
+ protected final DashboardContext getDashboardContext()
+ {
+ if (dashboardContext == null)
{
- ObjectNode parent = objectNode.getParent();
- if (parent == null)
+ // Get parent object
+ PortalObjectImpl parent = (PortalObjectImpl)getParent();
+
+ // We need the parent to find out the context details
+ if (parent instanceof ContextImpl)
{
- dashboard = Boolean.FALSE;
+ ContextImpl context = (ContextImpl)parent;
+
+ //
+ String dashboard = context.getDeclaredProperty("dashboard");
+ if ("true".equals(dashboard))
+ {
+ String dashboardId = getName();
+ dashboardContext = new DashboardContext(dashboardId);
+ }
}
- else
+ else if (parent != null)
{
- PortalObjectImpl parentObject = parent.getObject();
- dashboard = Boolean.valueOf(parentObject.isDashboard());
+ dashboardContext = parent.getDashboardContext();
}
}
- return dashboard.booleanValue();
+
+ //
+ return dashboardContext;
}
}
Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/portal/WindowImpl.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/impl/model/portal/WindowImpl.java 2006-12-20 21:40:00 UTC (rev 5914)
+++ trunk/core/src/main/org/jboss/portal/core/impl/model/portal/WindowImpl.java 2006-12-20 22:02:51 UTC (rev 5915)
@@ -24,6 +24,8 @@
import org.jboss.portal.core.model.portal.PortalObject;
import org.jboss.portal.core.model.portal.Window;
+import org.jboss.portal.core.model.instance.InstanceContainer;
+import org.jboss.portal.core.model.instance.Instance;
import java.util.HashMap;
@@ -70,4 +72,29 @@
clone.setDeclaredPropertyMap(new HashMap(getDeclaredPropertyMap()));
return clone;
}
+
+ protected void destroy()
+ {
+ // Destroy the associated customization
+ DashboardContext dbctx = getDashboardContext();
+ if (dbctx != null)
+ {
+ String dashboardId = dbctx.getId();
+
+ //
+ AbstractPortalObjectContainer container = (AbstractPortalObjectContainer)getObjectNode().getContext().getContainer();
+ InstanceContainer instanceContainer = container.getInstanceContainer();
+ Instance instance = instanceContainer.getDefinition(instanceRef);
+
+ //
+ if (instance != null)
+ {
+ // That's how we manufacture dash board keys
+ String customizationId = dashboardId + "." + getId();
+
+ //
+ Instance customizedInstance = instance.getCustomization(customizationId);
+ }
+ }
+ }
}
Modified: trunk/core/src/main/org/jboss/portal/core/management/PortalImpl.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/management/PortalImpl.java 2006-12-20 21:40:00 UTC (rev 5914)
+++ trunk/core/src/main/org/jboss/portal/core/management/PortalImpl.java 2006-12-20 22:02:51 UTC (rev 5915)
@@ -36,7 +36,7 @@
public int getNbInstances()
{
- return instanceContainer.getInstances().size();
+ return instanceContainer.getDefinitions().size();
}
public void setInstanceContainer(InstanceContainer instanceContainer)
Modified: trunk/core/src/main/org/jboss/portal/core/metadata/InstancesMetaData.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/metadata/InstancesMetaData.java 2006-12-20 21:40:00 UTC (rev 5914)
+++ trunk/core/src/main/org/jboss/portal/core/metadata/InstancesMetaData.java 2006-12-20 22:02:51 UTC (rev 5915)
@@ -68,7 +68,7 @@
InstanceMetaData instanceMD = (InstanceMetaData)i.next();
try
{
- container.destroyInstance(instanceMD.getId());
+ container.destroyDefinition(instanceMD.getId());
}
catch (NoSuchInstanceException e)
{
Modified: trunk/core/src/main/org/jboss/portal/core/model/instance/InstanceContainer.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/model/instance/InstanceContainer.java 2006-12-20 21:40:00 UTC (rev 5914)
+++ trunk/core/src/main/org/jboss/portal/core/model/instance/InstanceContainer.java 2006-12-20 22:02:51 UTC (rev 5915)
@@ -22,7 +22,6 @@
******************************************************************************/
package org.jboss.portal.core.model.instance;
-import org.jboss.portal.core.impl.model.instance.InstanceContainerListener;
import org.jboss.portal.portlet.PortletInvoker;
import org.jboss.portal.portlet.PortletInvokerException;
import org.jboss.portal.security.spi.provider.AuthorizationDomain;
@@ -51,7 +50,7 @@
* @param id the instance id
* @throws IllegalArgumentException if the instance id is null
*/
- InstanceDefinition getInstance(String id) throws IllegalArgumentException;
+ InstanceDefinition getDefinition(String id) throws IllegalArgumentException;
/**
* Create a new instance of the specified portlet.
@@ -62,7 +61,7 @@
* @throws DuplicateInstanceException if the instance already exist
* @throws IllegalArgumentException if the instance id is null
*/
- InstanceDefinition createInstance(String id, String portletId) throws DuplicateInstanceException, IllegalArgumentException, PortletInvokerException;
+ InstanceDefinition createDefinition(String id, String portletId) throws DuplicateInstanceException, IllegalArgumentException, PortletInvokerException;
/**
* Create a new instance of the specified portlet.
@@ -74,7 +73,7 @@
* @throws DuplicateInstanceException if the instance already exist
* @throws IllegalArgumentException if the instance id is null
*/
- InstanceDefinition createInstance(String id, String portletId, boolean clone) throws DuplicateInstanceException, IllegalArgumentException, PortletInvokerException;
+ InstanceDefinition createDefinition(String id, String portletId, boolean clone) throws DuplicateInstanceException, IllegalArgumentException, PortletInvokerException;
/**
* Destroy the specified instance.
@@ -82,14 +81,14 @@
* @param id
* @throws IllegalArgumentException if the instance id is null
*/
- void destroyInstance(String id) throws NoSuchInstanceException, PortletInvokerException, IllegalArgumentException;
+ void destroyDefinition(String id) throws NoSuchInstanceException, PortletInvokerException, IllegalArgumentException;
/**
* Return all the instances in the container.
*
* @return a collection containing the instances in the container
*/
- Collection getInstances();
+ Collection getDefinitions();
/**
* Return the AuthorizationDomain
@@ -97,8 +96,4 @@
* @return the authorization domain
*/
AuthorizationDomain getAuthorizationDomain();
-
- void addListener(InstanceContainerListener listener);
-
- void removeListener(InstanceContainerListener listener);
}
Modified: trunk/core/src/main/org/jboss/portal/core/model/instance/command/InvokePortletInstanceCommand.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/model/instance/command/InvokePortletInstanceCommand.java 2006-12-20 21:40:00 UTC (rev 5914)
+++ trunk/core/src/main/org/jboss/portal/core/model/instance/command/InvokePortletInstanceCommand.java 2006-12-20 22:02:51 UTC (rev 5915)
@@ -67,7 +67,7 @@
InstanceContainer container = context.getController().getInstanceContainer();
//
- instance = container.getInstance(instanceId);
+ instance = container.getDefinition(instanceId);
if (instance == null)
{
throw new ControllerException("Configurator portlet instance " + instanceId + " not found");
Modified: trunk/core/src/main/org/jboss/portal/core/portlet/dashboard/Configurator.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/portlet/dashboard/Configurator.java 2006-12-20 21:40:00 UTC (rev 5914)
+++ trunk/core/src/main/org/jboss/portal/core/portlet/dashboard/Configurator.java 2006-12-20 22:02:51 UTC (rev 5915)
@@ -130,7 +130,7 @@
}
// load insances this user has access to.
- List available_instances = (List)instanceContainer.getInstances();
+ List available_instances = (List)instanceContainer.getDefinitions();
resp.setContentType("text/html");
try
Modified: trunk/core/src/main/org/jboss/portal/core/portlet/management/InstanceManagerBean.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/portlet/management/InstanceManagerBean.java 2006-12-20 21:40:00 UTC (rev 5914)
+++ trunk/core/src/main/org/jboss/portal/core/portlet/management/InstanceManagerBean.java 2006-12-20 22:02:51 UTC (rev 5915)
@@ -179,7 +179,7 @@
{
if (selectedId != null)
{
- return instanceContainer.getInstance(selectedId);
+ return instanceContainer.getDefinition(selectedId);
}
else
{
@@ -218,7 +218,7 @@
public Collection getInstances()
{
List instances = new ArrayList();
- for (Iterator i = instanceContainer.getInstances().iterator(); i.hasNext();)
+ for (Iterator i = instanceContainer.getDefinitions().iterator(); i.hasNext();)
{
Instance instance = (Instance)i.next();
try
@@ -274,7 +274,7 @@
try
{
- instanceContainer.destroyInstance(id);
+ instanceContainer.destroyDefinition(id);
//
if (id.equals(selectedId))
Modified: trunk/core/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java 2006-12-20 21:40:00 UTC (rev 5914)
+++ trunk/core/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java 2006-12-20 22:02:51 UTC (rev 5915)
@@ -422,7 +422,7 @@
public SelectItem[] getInstanceItems()
{
- Collection instances = instanceContainer.getInstances();
+ Collection instances = instanceContainer.getDefinitions();
//sort instances by id
List sortedInstances = new LinkedList();
Modified: trunk/core/src/main/org/jboss/portal/core/portlet/management/actions/CreateInstanceAction.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/portlet/management/actions/CreateInstanceAction.java 2006-12-20 21:40:00 UTC (rev 5914)
+++ trunk/core/src/main/org/jboss/portal/core/portlet/management/actions/CreateInstanceAction.java 2006-12-20 22:02:51 UTC (rev 5915)
@@ -95,7 +95,7 @@
InstanceContainer container = instanceMgr.getInstanceContainer();
try
{
- Instance instance = container.createInstance(instanceId, portlet.getContext().getId());
+ Instance instance = container.createDefinition(instanceId, portlet.getContext().getId());
instanceMgr.setSelectedId(instanceId);
//
Modified: trunk/core/src/main/org/jboss/portal/test/core/model/instance/InstanceContainerTestCase.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/test/core/model/instance/InstanceContainerTestCase.java 2006-12-20 21:40:00 UTC (rev 5914)
+++ trunk/core/src/main/org/jboss/portal/test/core/model/instance/InstanceContainerTestCase.java 2006-12-20 22:02:51 UTC (rev 5915)
@@ -325,7 +325,7 @@
});
//
- Instance instance = instanceContainer.createInstance("MyInstance", "MyPortlet", true);
+ Instance instance = instanceContainer.createDefinition("MyInstance", "MyPortlet", true);
assertNotNull(instance);
//
@@ -366,7 +366,7 @@
try
{
TransactionAssert.beginTransaction();
- instanceContainer.createInstance("MyInstance", "UnknownPortlet");
+ instanceContainer.createDefinition("MyInstance", "UnknownPortlet");
fail("Was expecting NoSuchPortletException");
}
catch (NoSuchPortletException expected)
@@ -434,12 +434,12 @@
//
TransactionAssert.beginTransaction();
- instanceContainer.createInstance("MyInstance", popId, cloneInstance);
+ instanceContainer.createDefinition("MyInstance", popId, cloneInstance);
TransactionAssert.commitTransaction();
//
TransactionAssert.beginTransaction();
- InstanceDefinition instanceDef = instanceContainer.getInstance("MyInstance");
+ InstanceDefinition instanceDef = instanceContainer.getDefinition("MyInstance");
Instance instance = instanceDef;
if (identity != null)
{
@@ -493,7 +493,7 @@
// Check state
TransactionAssert.beginTransaction();
- InstanceDefinitionImpl instanceImpl = (InstanceDefinitionImpl)instanceContainer.getInstance("MyInstance");
+ InstanceDefinitionImpl instanceImpl = (InstanceDefinitionImpl)instanceContainer.getDefinition("MyInstance");
assertNotNull(instanceImpl);
Set userInstances = instanceImpl.getCustomizations();
assertNotNull(userInstances);
@@ -523,7 +523,7 @@
// Check state
TransactionAssert.beginTransaction();
- InstanceDefinitionImpl instanceImpl = (InstanceDefinitionImpl)instanceContainer.getInstance("MyInstance");
+ InstanceDefinitionImpl instanceImpl = (InstanceDefinitionImpl)instanceContainer.getDefinition("MyInstance");
assertNotNull(instanceImpl);
Set userInstances = instanceImpl.getCustomizations();
assertNotNull(userInstances);
@@ -546,7 +546,7 @@
// Check state
TransactionAssert.beginTransaction();
- InstanceDefinitionImpl instanceImpl = (InstanceDefinitionImpl)instanceContainer.getInstance("MyInstance");
+ InstanceDefinitionImpl instanceImpl = (InstanceDefinitionImpl)instanceContainer.getDefinition("MyInstance");
assertNotNull(instanceImpl);
Set userInstances = instanceImpl.getCustomizations();
assertNotNull(userInstances);
@@ -581,7 +581,7 @@
// Check state
TransactionAssert.beginTransaction();
- InstanceDefinitionImpl instanceImpl = (InstanceDefinitionImpl)instanceContainer.getInstance("MyInstance");
+ InstanceDefinitionImpl instanceImpl = (InstanceDefinitionImpl)instanceContainer.getDefinition("MyInstance");
assertNotNull(instanceImpl);
Set userInstances = instanceImpl.getCustomizations();
assertNotNull(userInstances);
@@ -618,7 +618,7 @@
// Check state
TransactionAssert.beginTransaction();
- InstanceDefinitionImpl instanceImpl = (InstanceDefinitionImpl)instanceContainer.getInstance("MyInstance");
+ InstanceDefinitionImpl instanceImpl = (InstanceDefinitionImpl)instanceContainer.getDefinition("MyInstance");
Set userInstances = instanceImpl.getCustomizations();
assertNotNull(userInstances);
assertEquals(0, userInstances.size());
@@ -640,7 +640,7 @@
// Check state
TransactionAssert.beginTransaction();
- InstanceDefinitionImpl instanceImpl = (InstanceDefinitionImpl)instanceContainer.getInstance("MyInstance");
+ InstanceDefinitionImpl instanceImpl = (InstanceDefinitionImpl)instanceContainer.getDefinition("MyInstance");
Set userInstances = instanceImpl.getCustomizations();
assertNotNull(userInstances);
assertEquals(0, userInstances.size());
@@ -662,7 +662,7 @@
// Check state
TransactionAssert.beginTransaction();
- InstanceDefinitionImpl instanceImpl = (InstanceDefinitionImpl)instanceContainer.getInstance("MyInstance");
+ InstanceDefinitionImpl instanceImpl = (InstanceDefinitionImpl)instanceContainer.getDefinition("MyInstance");
Set userInstances = instanceImpl.getCustomizations();
assertNotNull(userInstances);
assertEquals(0, userInstances.size());
@@ -684,7 +684,7 @@
// Check state
TransactionAssert.beginTransaction();
- InstanceDefinitionImpl instanceImpl = (InstanceDefinitionImpl)instanceContainer.getInstance("MyInstance");
+ InstanceDefinitionImpl instanceImpl = (InstanceDefinitionImpl)instanceContainer.getDefinition("MyInstance");
Set userInstances = instanceImpl.getCustomizations();
assertNotNull(userInstances);
assertEquals(0, userInstances.size());
@@ -704,12 +704,12 @@
// Create the instance
TransactionAssert.beginTransaction();
- instanceContainer.createInstance("MyInstance", "MyPortlet", true);
+ instanceContainer.createDefinition("MyInstance", "MyPortlet", true);
TransactionAssert.commitTransaction();
// Create a clone for a user
TransactionAssert.beginTransaction();
- Instance instance = instanceContainer.getInstance("MyInstance").getCustomization("julien");
+ Instance instance = instanceContainer.getDefinition("MyInstance").getCustomization("julien");
PortletInvocation action = new ActionInvocation(new ActionContextImpl(Mode.VIEW));
action.setUserContext(new UserContextImpl("julien"));
instance.invoke(action);
@@ -717,7 +717,7 @@
//
TransactionAssert.beginTransaction();
- InstanceDefinitionImpl instanceImpl = (InstanceDefinitionImpl)instanceContainer.getInstance("MyInstance");
+ InstanceDefinitionImpl instanceImpl = (InstanceDefinitionImpl)instanceContainer.getDefinition("MyInstance");
PortletContext sharedPortletContext = instanceImpl.getPortletContext();
assertNotNull(producer.getPortlet(sharedPortletContext));
assertNotNull(instance);
@@ -732,7 +732,7 @@
//
TransactionAssert.beginTransaction();
- instanceContainer.destroyInstance("MyInstance");
+ instanceContainer.destroyDefinition("MyInstance");
TransactionAssert.commitTransaction();
//
@@ -764,24 +764,24 @@
portletContainer.addPortlet("MyPortlet", new TestPortletSupport());
TransactionAssert.beginTransaction();
- instanceContainer.createInstance("MyInstance", "MyPortlet");
+ instanceContainer.createDefinition("MyInstance", "MyPortlet");
TransactionAssert.commitTransaction();
//
TransactionAssert.beginTransaction();
- Instance instance = instanceContainer.getInstance("MyInstance");
+ Instance instance = instanceContainer.getDefinition("MyInstance");
assertNotNull(instance);
TransactionAssert.commitTransaction();
//
TransactionAssert.beginTransaction();
- instanceContainer.destroyInstance("MyInstance");
- instanceContainer.createInstance("MyInstance", "MyPortlet");
+ instanceContainer.destroyDefinition("MyInstance");
+ instanceContainer.createDefinition("MyInstance", "MyPortlet");
TransactionAssert.commitTransaction();
//
TransactionAssert.beginTransaction();
- instance = instanceContainer.getInstance("MyInstance");
+ instance = instanceContainer.getDefinition("MyInstance");
assertNotNull(instance);
TransactionAssert.commitTransaction();
}
Modified: trunk/core/src/resources/portal-core-sar/META-INF/jboss-service.xml
===================================================================
--- trunk/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2006-12-20 21:40:00 UTC (rev 5914)
+++ trunk/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2006-12-20 22:02:51 UTC (rev 5915)
@@ -592,11 +592,14 @@
<depends
optional-attribute-name="AuthorizationDomainRegistry"
proxy-type="attribute">portal:service=AuthorizationDomainRegistry</depends>
+ <depends
+ optional-attribute-name="InstanceContainer"
+ proxy-type="attribute">portal:container=Instance</depends>
<attribute name="SessionFactoryJNDIName">java:/portal/PortalObjectSessionFactory</attribute>
<attribute name="CacheNaturalId">true</attribute>
</mbean>
- <!-- Customization maanger -->
+ <!-- Customization manager -->
<mbean
code="org.jboss.portal.core.impl.model.CustomizationManagerService"
name="portal:service=CustomizationManager"
More information about the portal-commits
mailing list