Author: chris.laprun(a)jboss.com
Date: 2008-03-13 19:22:28 -0400 (Thu, 13 Mar 2008)
New Revision: 10281
Added:
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/portlet/CorePortletInterceptor.java
Removed:
branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/deployment/CorePortletInvoker.java
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/AdminPropertyResolver.java
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/portlet/AjaxInterceptor.java
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/portlet/HeaderInterceptor.java
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/portlet/SignOutInterceptor.java
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/portlet/TransactionInterceptor.java
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/META-INF/jboss-service.xml
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp
branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeployment.java
branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeploymentFactory.java
branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/web/jboss/JBossWebContext.java
Log:
- Header injection now works
- Partial refresh should now work (though I haven't tested it)
- InternalContentProvider.renderWindow should now properly work
- More updates related to CorePortletInfo as a PortletInfo attachment
- Removed CorePortletInvoker which wasn't used after all
- More generification
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/portlet/AjaxInterceptor.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/portlet/AjaxInterceptor.java 2008-03-13
09:44:13 UTC (rev 10280)
+++
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/portlet/AjaxInterceptor.java 2008-03-13
23:22:28 UTC (rev 10281)
@@ -1,6 +1,6 @@
/******************************************************************************
* JBoss, a division of Red Hat *
- * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * Copyright 2008, 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. *
@@ -22,15 +22,12 @@
******************************************************************************/
package org.jboss.portal.core.aspects.portlet;
-import org.jboss.portal.common.invocation.InvocationException;
import org.jboss.portal.core.portlet.info.AjaxInfo;
import org.jboss.portal.core.portlet.info.CorePortletInfo;
-import org.jboss.portal.portlet.deployment.CorePortletInvoker;
-import org.jboss.portal.portlet.info.PortletInfo;
-import org.jboss.portal.portlet.invocation.PortletInterceptor;
import org.jboss.portal.portlet.invocation.PortletInvocation;
import org.jboss.portal.portlet.invocation.response.FragmentResponse;
import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
+import org.jboss.portal.portlet.invocation.response.ResponseProperties;
/**
* Look at the portlet ajax meta data.
@@ -40,33 +37,31 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision$
*/
-public class AjaxInterceptor extends PortletInterceptor
+public class AjaxInterceptor extends CorePortletInterceptor
{
/** . */
public static final String PARTIAL_REFRESH = "partialRefresh";
- protected Object invoke(PortletInvocation invocation) throws Exception,
InvocationException
+ protected Object invoke(PortletInvocation invocation) throws Exception
{
- System.out.println("TODO:
org.jboss.portal.core.aspects.portlet.AjaxInterceptor");
-
PortletInvocationResponse response =
(PortletInvocationResponse)invocation.invokeNext();
//
if (response instanceof FragmentResponse)
{
- PortletInfo portletInfo =
(PortletInfo)invocation.getAttribute(PortletInvocation.INVOCATION_SCOPE,
CorePortletInvoker.PORTLET_CORE_INFO);
- if (portletInfo instanceof CorePortletInfo)
+ FragmentResponse fragment = (FragmentResponse)response;
+ CorePortletInfo corePortletInfo = getCorePortletInfo(invocation);
+ if (corePortletInfo != null)
{
- CorePortletInfo corePortletInfo = (CorePortletInfo)portletInfo;
-
- if (corePortletInfo != null)
+ AjaxInfo ajax = corePortletInfo.getAjax();
+ if (ajax != null)
{
- AjaxInfo ajax = corePortletInfo.getAjax();
- if (ajax != null)
- {
-// invocation.setAttribute(PortletInvocation.RESPONSE_PROPERTIES_SCOPE,
PARTIAL_REFRESH, Boolean.valueOf(ajax.getPartialRefresh()));
- }
+ fragment = updateFragmentWithPropertiesIfNeeded(fragment);
+ ResponseProperties props = fragment.getProperties();
+ props.getTransportHeaders().setValue(PARTIAL_REFRESH, "" +
ajax.getPartialRefresh());
+
+ return fragment;
}
}
}
Added:
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/portlet/CorePortletInterceptor.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/portlet/CorePortletInterceptor.java
(rev 0)
+++
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/portlet/CorePortletInterceptor.java 2008-03-13
23:22:28 UTC (rev 10281)
@@ -0,0 +1,74 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2008, 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.aspects.portlet;
+
+import org.jboss.portal.core.portlet.info.CorePortletInfo;
+import org.jboss.portal.portlet.container.PortletContainer;
+import org.jboss.portal.portlet.container.PortletContainerInvoker;
+import org.jboss.portal.portlet.invocation.PortletInterceptor;
+import org.jboss.portal.portlet.invocation.PortletInvocation;
+import org.jboss.portal.portlet.invocation.response.FragmentResponse;
+import org.jboss.portal.portlet.invocation.response.ResponseProperties;
+
+/**
+ * @author <a href="mailto:chris.laprun@jboss.com">Chris
Laprun</a>
+ * @version $Revision$
+ */
+public abstract class CorePortletInterceptor extends PortletInterceptor
+{
+ /**
+ * Retrieve the CorePortetInfo, if any, associated with the Portlet being invoked.
+ *
+ * @param invocation the current PortletInvocation
+ * @return the CorePortetInfo associated with the Portlet being invoked or
<code>null</code> if no such information
+ * is present
+ */
+ protected CorePortletInfo getCorePortletInfo(PortletInvocation invocation)
+ {
+ PortletContainer container =
(PortletContainer)invocation.getAttribute(PortletInvocation.INVOCATION_SCOPE,
PortletContainerInvoker.PORTLET_CONTAINER);
+
+ return container.getInfo().getAttachment(CorePortletInfo.class);
+ }
+
+ /**
+ * Create a new FragmentResponse if the current one doesn't have any properties.
+ *
+ * @param fragment the current FragmentResponse
+ * @return the passed FragmentResponse or a new one with properties
+ */
+ protected FragmentResponse updateFragmentWithPropertiesIfNeeded(FragmentResponse
fragment)
+ {
+ ResponseProperties props = fragment.getProperties();
+
+ // if we don't currently have properties, copy the current response and add
properties
+ if (props == null)
+ {
+ props = new ResponseProperties();
+ fragment = new FragmentResponse(props, fragment.getAttributes(),
+ fragment.getContentType(), fragment.getBytes(), fragment.getChars(),
fragment.getTitle(),
+ fragment.getCacheControl(), fragment.getNextModes());
+ }
+ return fragment;
+ }
+}
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/portlet/HeaderInterceptor.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/portlet/HeaderInterceptor.java 2008-03-13
09:44:13 UTC (rev 10280)
+++
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/portlet/HeaderInterceptor.java 2008-03-13
23:22:28 UTC (rev 10281)
@@ -26,9 +26,6 @@
import org.jboss.portal.core.metadata.portlet.MarkupElement;
import org.jboss.portal.core.portlet.info.CorePortletInfo;
import org.jboss.portal.core.portlet.info.MarkupHeaderInfo;
-import org.jboss.portal.portlet.container.PortletContainer;
-import org.jboss.portal.portlet.container.PortletContainerInvoker;
-import org.jboss.portal.portlet.invocation.PortletInterceptor;
import org.jboss.portal.portlet.invocation.PortletInvocation;
import org.jboss.portal.portlet.invocation.response.FragmentResponse;
import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
@@ -43,7 +40,7 @@
* @author <a href="mailto:chris.laprun@jboss.com">Chris
Laprun</a>
* @version $Revision$
*/
-public class HeaderInterceptor extends PortletInterceptor
+public class HeaderInterceptor extends CorePortletInterceptor
{
protected Object invoke(PortletInvocation invocation) throws Exception
@@ -55,24 +52,15 @@
{
FragmentResponse fragment = (FragmentResponse)response;
- // Add declaratively injected header content here if needed (get it via the
component)
- PortletContainer container =
(PortletContainer)invocation.getAttribute(PortletInvocation.INVOCATION_SCOPE,
PortletContainerInvoker.PORTLET_CONTAINER);
-
- // only proceed if we have JBoss Portal specific metadata
- CorePortletInfo corePortletInfo =
container.getInfo().getAttachment(CorePortletInfo.class);
+ CorePortletInfo corePortletInfo = getCorePortletInfo(invocation);
if (corePortletInfo != null)
{
MarkupHeaderInfo headerContentInfo = corePortletInfo.getMarkupHeader();
if (headerContentInfo != null)
{
+ fragment = updateFragmentWithPropertiesIfNeeded(fragment);
ResponseProperties props = fragment.getProperties();
- // if we don't already have properties in the response, create some
- if (props == null)
- {
- props = new ResponseProperties();
- }
-
// Get the context path
String contextPath =
(String)invocation.getDispatchedRequest().getAttribute("javax.servlet.include.context_path");
@@ -81,6 +69,8 @@
{
headers.addValue(MimeResponse.MARKUP_HEAD_ELEMENT,
markupElement.toElement(contextPath));
}
+
+ return fragment;
}
}
}
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/portlet/SignOutInterceptor.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/portlet/SignOutInterceptor.java 2008-03-13
09:44:13 UTC (rev 10280)
+++
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/portlet/SignOutInterceptor.java 2008-03-13
23:22:28 UTC (rev 10281)
@@ -22,16 +22,14 @@
******************************************************************************/
package org.jboss.portal.core.aspects.portlet;
-import javax.portlet.Event;
-import javax.xml.namespace.QName;
-
-import org.jboss.portal.common.invocation.InvocationException;
import org.jboss.portal.core.controller.portlet.SignOutResponse;
import org.jboss.portal.portlet.invocation.PortletInterceptor;
import org.jboss.portal.portlet.invocation.PortletInvocation;
import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
import org.jboss.portal.portlet.invocation.response.UpdateNavigationalStateResponse;
+import javax.xml.namespace.QName;
+
/**
* @author <a href="mailto:theute@jboss.org">Thomas Heute</a>
* @version $Revision$
@@ -40,13 +38,13 @@
{
@Override
- protected Object invoke(PortletInvocation invocation) throws Exception,
InvocationException
+ protected Object invoke(PortletInvocation invocation) throws Exception
{
PortletInvocationResponse response =
(PortletInvocationResponse)invocation.invokeNext();
if (response instanceof UpdateNavigationalStateResponse)
{
UpdateNavigationalStateResponse unsr =
(UpdateNavigationalStateResponse)response;
- for (UpdateNavigationalStateResponse.Event event: unsr.getEvents())
+ for (UpdateNavigationalStateResponse.Event event : unsr.getEvents())
{
if (event.getName().equals(new
QName("http://www.jboss.com/portal",
"signOut")))
{
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/portlet/TransactionInterceptor.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/portlet/TransactionInterceptor.java 2008-03-13
09:44:13 UTC (rev 10280)
+++
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/portlet/TransactionInterceptor.java 2008-03-13
23:22:28 UTC (rev 10281)
@@ -25,33 +25,22 @@
import org.jboss.portal.common.invocation.InvocationException;
import org.jboss.portal.common.transaction.Transactions;
import org.jboss.portal.core.portlet.info.CorePortletInfo;
-import org.jboss.portal.portlet.deployment.CorePortletInvoker;
-import org.jboss.portal.portlet.info.PortletInfo;
-import org.jboss.portal.portlet.invocation.PortletInterceptor;
import org.jboss.portal.portlet.invocation.PortletInvocation;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision$
*/
-public class TransactionInterceptor extends PortletInterceptor
+public class TransactionInterceptor extends CorePortletInterceptor
{
- protected Object invoke(PortletInvocation invocation) throws Exception,
InvocationException
+ protected Object invoke(PortletInvocation invocation) throws Exception
{
- // The default type is that it does not propagate
- Transactions.Type txType = Transactions.TYPE_NOT_SUPPORTED;
-
// Override tx type if found
- PortletInfo portletInfo = (PortletInfo)
invocation.getAttribute(PortletInvocation.INVOCATION_SCOPE,
- CorePortletInvoker.PORTLET_CORE_INFO);
- if (portletInfo instanceof CorePortletInfo)
+ CorePortletInfo corePortletInfo = getCorePortletInfo(invocation);
+ if (corePortletInfo != null)
{
- CorePortletInfo corePortletInfo = (CorePortletInfo) portletInfo;
- if (corePortletInfo != null)
- {
- txType = corePortletInfo.getTxType();
- }
+ Transactions.Type txType = corePortletInfo.getTxType();
//
if (txType == Transactions.TYPE_NOT_SUPPORTED)
@@ -83,6 +72,7 @@
throw new InvocationException("Should not happen");
}
}
+
return invocation.invokeNext();
}
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java 2008-03-13
09:44:13 UTC (rev 10280)
+++
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java 2008-03-13
23:22:28 UTC (rev 10281)
@@ -26,6 +26,7 @@
import org.jboss.portal.Mode;
import org.jboss.portal.WindowState;
import org.jboss.portal.common.util.MultiValuedPropertyMap;
+import org.jboss.portal.core.aspects.portlet.AjaxInterceptor;
import org.jboss.portal.core.controller.ControllerResponse;
import org.jboss.portal.core.controller.command.response.SecurityErrorResponse;
import org.jboss.portal.core.controller.command.response.UnavailableResourceResponse;
@@ -57,13 +58,13 @@
import org.jboss.portal.portlet.invocation.response.UnavailableResponse;
import org.jboss.portal.security.spi.auth.PortalAuthorizationManager;
import org.jboss.portal.security.spi.auth.PortalAuthorizationManagerFactory;
+import org.jboss.portal.theme.impl.render.dynamic.DynaRenderOptions;
import org.w3c.dom.Element;
import javax.portlet.MimeResponse;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -211,8 +212,8 @@
RenderInvocation invocation = rendererContext.createRenderInvocation(new
WindowNavigationalState(windowState, mode, windowNS.getContentState()));
//
- List supportedWindowStates = Collections.EMPTY_LIST;
- List supportedModes = Collections.EMPTY_LIST;
+ List<WindowState> supportedWindowStates = Collections.emptyList();
+ List<Mode> supportedModes = Collections.emptyList();
PortletInvocationResponse response;
//
@@ -221,11 +222,10 @@
CapabilitiesInfo capabilitiesInfo =
instance.getPortlet().getInfo().getCapabilities();
//
- Set windowStatesInfo = capabilitiesInfo.getAllWindowStates();
- supportedWindowStates = new ArrayList(windowStatesInfo.size());
- for (Iterator i = windowStatesInfo.iterator(); i.hasNext();)
+ Set<WindowStateInfo> windowStatesInfo =
capabilitiesInfo.getAllWindowStates();
+ supportedWindowStates = new
ArrayList<WindowState>(windowStatesInfo.size());
+ for (WindowStateInfo windowStateInfo : windowStatesInfo)
{
- WindowStateInfo windowStateInfo = (WindowStateInfo)i.next();
WindowState tmp = windowStateInfo.getWindowState();
if (portal.getSupportedWindowStates().contains(tmp))
{
@@ -234,11 +234,10 @@
}
//
- Set modesInfo = capabilitiesInfo.getAllModes();
- supportedModes = new ArrayList(modesInfo.size());
- for (Iterator i = modesInfo.iterator(); i.hasNext();)
+ Set<ModeInfo> modesInfo = capabilitiesInfo.getAllModes();
+ supportedModes = new ArrayList<Mode>(modesInfo.size());
+ for (ModeInfo modeInfo : modesInfo)
{
- ModeInfo modeInfo = (ModeInfo)i.next();
Mode tmp = modeInfo.getMode();
if (portal.getSupportedModes().contains(tmp))
{
@@ -288,8 +287,6 @@
ControllerResponse cr;
if (response instanceof FragmentResponse)
{
- System.out.println("TODO:
org.jboss.portal.core.impl.model.content.InternalContentProvider.renderWindow()");
-
FragmentResponse fragment = (FragmentResponse)response;
//
@@ -299,11 +296,11 @@
windowTitle = window.getName();
}
- // header handling
String header = "";
ResponseProperties properties = fragment.getProperties();
if (properties != null)
{
+ // header handling
MultiValuedPropertyMap<Element> headers =
properties.getMarkupHeaders();
List<Element> headElements =
headers.getValues(MimeResponse.MARKUP_HEAD_ELEMENT);
StringBuffer buffer = new StringBuffer(124 * headElements.size());
@@ -311,8 +308,17 @@
{
buffer.append(element);
}
-
header = buffer.toString();
+
+ // deal with partial refresh
+ MultiValuedPropertyMap<String> transport =
properties.getTransportHeaders();
+ String partialRefreshValue =
transport.getValue(AjaxInterceptor.PARTIAL_REFRESH);
+ Boolean partialRefresh = Boolean.parseBoolean(partialRefreshValue);
+ if (partialRefresh != null && Boolean.FALSE.equals(partialRefresh))
+ {
+ DynaRenderOptions options = DynaRenderOptions.getOptions(null,
partialRefresh);
+ options.setOptions(windowProps);
+ }
}
// Handle minimized here
@@ -326,17 +332,6 @@
contentChars = fragment.getChars();
}
- // Update window props after render if needed
- System.out.println("TODO AJAX:
org.jboss.portal.core.impl.model.content.InternalContentProvider");
- /*
- Boolean partialRefresh =
(Boolean)invocation.getAttribute(PortletInvocation.RESPONSE_PROPERTIES_SCOPE,
AjaxInterceptor.PARTIAL_REFRESH);
- if (partialRefresh != null && Boolean.FALSE.equals(partialRefresh))
- {
- DynaRenderOptions options = DynaRenderOptions.getOptions(null,
partialRefresh);
- options.setOptions(windowProps);
- }
- */
-
//
cr = new MarkupResponse(windowTitle, contentChars, header);
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/META-INF/jboss-service.xml
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2008-03-13
09:44:13 UTC (rev 10280)
+++
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2008-03-13
23:22:28 UTC (rev 10281)
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+<?xml version="1.0"
encoding="UTF-8"?><!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~ JBoss, a division of Red Hat ~
~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
~ contributors as indicated by the @authors tag. See the ~
@@ -25,21 +24,15 @@
<server>
<!-- Server configuration service -->
- <mbean
- code="org.jboss.portal.server.config.ServerConfigService"
- name="portal:service=ServerConfig"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean code="org.jboss.portal.server.config.ServerConfigService"
name="portal:service=ServerConfig" xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<attribute name="ConfigLocation">conf/config.xml</attribute>
</mbean>
<!-- DTD repository -->
- <mbean
- code="org.jboss.portal.server.impl.xml.EntityResolverService"
- name="portal:service=EntityResolver"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean code="org.jboss.portal.server.impl.xml.EntityResolverService"
name="portal:service=EntityResolver"
+ xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<attribute name="DTDMapping">
<properties>
@@ -52,113 +45,86 @@
</mbean>
<!-- Runtime context for running portlet container -->
- <mbean
- code="org.jboss.portal.web.jboss.JBossWebContext"
- name="portal:service=ServletContainerFactory"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean code="org.jboss.portal.web.jboss.JBossWebContext"
name="portal:service=ServletContainerFactory" xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<!-- Portal security services-->
- <mbean
-
code="org.jboss.portal.security.impl.JBossAuthorizationDomainRegistryImpl"
- name="portal:service=AuthorizationDomainRegistry"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean
code="org.jboss.portal.security.impl.JBossAuthorizationDomainRegistryImpl"
+ name="portal:service=AuthorizationDomainRegistry"
xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
- <mbean
-
code="org.jboss.portal.security.impl.jacc.JACCPortalAuthorizationManagerFactory"
- name="portal:service=PortalAuthorizationManagerFactory"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean
code="org.jboss.portal.security.impl.jacc.JACCPortalAuthorizationManagerFactory"
+ name="portal:service=PortalAuthorizationManagerFactory"
xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- <depends
- optional-attribute-name="AuthorizationDomainRegistry"
-
proxy-type="attribute">portal:service=AuthorizationDomainRegistry</depends>
+ <depends optional-attribute-name="AuthorizationDomainRegistry"
proxy-type="attribute">
+ portal:service=AuthorizationDomainRegistry
+ </depends>
</mbean>
- <mbean
-
code="org.jboss.portal.portlet.impl.security.JBossPortletSecurityService"
- name="portal:service=PortletSecurityService"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean
code="org.jboss.portal.portlet.impl.security.JBossPortletSecurityService"
+ name="portal:service=PortletSecurityService" xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- <depends
- optional-attribute-name="PortalAuthorizationManagerFactory"
-
proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends>
- <depends
- optional-attribute-name="AuthorizationDomainRegistry"
-
proxy-type="attribute">portal:service=AuthorizationDomainRegistry</depends>
+ <depends optional-attribute-name="PortalAuthorizationManagerFactory"
proxy-type="attribute">
+ portal:service=PortalAuthorizationManagerFactory
+ </depends>
+ <depends optional-attribute-name="AuthorizationDomainRegistry"
proxy-type="attribute">
+ portal:service=AuthorizationDomainRegistry
+ </depends>
</mbean>
<!-- Server stack -->
- <mbean
- code="org.jboss.portal.server.aspects.server.SessionLockInterceptor"
- name="portal:service=Interceptor,type=Server,name=SessionLock"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean
code="org.jboss.portal.server.aspects.server.SessionLockInterceptor"
+ name="portal:service=Interceptor,type=Server,name=SessionLock"
xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
- <mbean
- code="org.jboss.portal.core.aspects.server.TransactionInterceptor"
- name="portal:service=Interceptor,type=Server,name=Transaction"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean
code="org.jboss.portal.core.aspects.server.TransactionInterceptor"
+ name="portal:service=Interceptor,type=Server,name=Transaction"
xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
- <mbean
-
code="org.jboss.portal.core.impl.api.user.UserEventBridgeTriggerInterceptor"
- name="portal:service=Interceptor,type=Server,name=UserEvent"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean
code="org.jboss.portal.core.impl.api.user.UserEventBridgeTriggerInterceptor"
+ name="portal:service=Interceptor,type=Server,name=UserEvent"
xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
- <mbean
- code="org.jboss.portal.server.aspects.server.SignOutInterceptor"
- name="portal:service=Interceptor,type=Server,name=SessionInvalidator"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean code="org.jboss.portal.server.aspects.server.SignOutInterceptor"
+ name="portal:service=Interceptor,type=Server,name=SessionInvalidator"
xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- <depends
- optional-attribute-name="ServletContainerFactory"
-
proxy-type="attribute">portal:service=ServletContainerFactory</depends>
+ <depends optional-attribute-name="ServletContainerFactory"
proxy-type="attribute">
+ portal:service=ServletContainerFactory
+ </depends>
</mbean>
- <mbean
- code="org.jboss.portal.core.aspects.server.UserInterceptor"
- name="portal:service=Interceptor,type=Server,name=User"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean code="org.jboss.portal.core.aspects.server.UserInterceptor"
+ name="portal:service=Interceptor,type=Server,name=User"
xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<attribute name="CacheUser">true</attribute>
<depends>portal:service=Module,type=IdentityServiceController</depends>
</mbean>
- <mbean
- code="org.jboss.portal.core.aspects.server.LocaleInterceptor"
- name="portal:service=Interceptor,type=Server,name=Locale"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean code="org.jboss.portal.core.aspects.server.LocaleInterceptor"
+ name="portal:service=Interceptor,type=Server,name=Locale"
xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
- <mbean
- code="org.jboss.portal.core.aspects.server.PortalContextPathInterceptor"
- name="portal:service=Interceptor,type=Server,name=PortalContextPath"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean
code="org.jboss.portal.core.aspects.server.PortalContextPathInterceptor"
+ name="portal:service=Interceptor,type=Server,name=PortalContextPath"
xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
- <mbean
- code="org.jboss.portal.server.aspects.server.ContentTypeInterceptor"
- name="portal:service=Interceptor,type=Server,name=ContentType"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean
code="org.jboss.portal.server.aspects.server.ContentTypeInterceptor"
+ name="portal:service=Interceptor,type=Server,name=ContentType"
xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
- <mbean
-
code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory"
- name="portal:service=InterceptorStackFactory,type=Server"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean
code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory"
+ name="portal:service=InterceptorStackFactory,type=Server"
xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends-list optional-attribute-name="InterceptorNames">
<depends-list-element>portal:service=Interceptor,type=Server,name=SessionLock</depends-list-element>
@@ -173,28 +139,22 @@
</mbean>
<!-- Command stack -->
- <mbean
- code="org.jboss.portal.core.aspects.controller.ControlInterceptor"
- name="portal:service=Interceptor,type=Command,name=Control"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean
code="org.jboss.portal.core.aspects.controller.ControlInterceptor"
+ name="portal:service=Interceptor,type=Command,name=Control"
xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- <depends
- optional-attribute-name="PortalControlPolicy"
-
proxy-type="attribute">portal:service=ControlPolicy,type=Portal</depends>
+ <depends optional-attribute-name="PortalControlPolicy"
proxy-type="attribute">
+ portal:service=ControlPolicy,type=Portal
+ </depends>
</mbean>
- <mbean
-
code="org.jboss.portal.core.aspects.controller.ResourceAcquisitionInterceptor"
- name="portal:service=Interceptor,type=Command,name=ResourceAcquisition"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean
code="org.jboss.portal.core.aspects.controller.ResourceAcquisitionInterceptor"
+
name="portal:service=Interceptor,type=Command,name=ResourceAcquisition"
xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
- <mbean
- code="org.jboss.portal.core.controller.ajax.AjaxInterceptor"
- name="portal:service=Interceptor,type=Command,name=Ajax"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean code="org.jboss.portal.core.controller.ajax.AjaxInterceptor"
+ name="portal:service=Interceptor,type=Command,name=Ajax"
xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<!--
this tag has to be set when context root of portal-ajax is
@@ -202,67 +162,50 @@
Uncomment and change it if you want to change context root for portal-ajax
application
<attribute name="TargetContextPath">/portal-ajax</attribute>
-->
</mbean>
- <mbean
-
code="org.jboss.portal.core.aspects.controller.NavigationalStateInterceptor"
- name="portal:service=Interceptor,type=Command,name=NavigationalState"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean
code="org.jboss.portal.core.aspects.controller.NavigationalStateInterceptor"
+ name="portal:service=Interceptor,type=Command,name=NavigationalState"
xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
- <mbean
-
code="org.jboss.portal.core.aspects.controller.node.PortalNodeInterceptor"
- name="portal:service=Interceptor,type=Command,name=PortalNode"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean
code="org.jboss.portal.core.aspects.controller.node.PortalNodeInterceptor"
+ name="portal:service=Interceptor,type=Command,name=PortalNode"
xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- <depends
- optional-attribute-name="PortalAuthorizationManagerFactory"
-
proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends>
+ <depends optional-attribute-name="PortalAuthorizationManagerFactory"
proxy-type="attribute">
+ portal:service=PortalAuthorizationManagerFactory
+ </depends>
</mbean>
- <mbean
-
code="org.jboss.portal.core.aspects.controller.PolicyEnforcementInterceptor"
- name="portal:service=Interceptor,type=Command,name=PolicyEnforcement"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean
code="org.jboss.portal.core.aspects.controller.PolicyEnforcementInterceptor"
+ name="portal:service=Interceptor,type=Command,name=PolicyEnforcement"
xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
- <mbean
-
code="org.jboss.portal.core.aspects.controller.PageCustomizerInterceptor"
- name="portal:service=Interceptor,type=Command,name=PageCustomizer"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean
code="org.jboss.portal.core.aspects.controller.PageCustomizerInterceptor"
+ name="portal:service=Interceptor,type=Command,name=PageCustomizer"
xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<attribute name="TargetContextPath">/portal-core</attribute>
<attribute
name="HeaderPath">/WEB-INF/jsp/header/header.jsp</attribute>
<attribute
name="TabsPath">/WEB-INF/jsp/header/tabs.jsp</attribute>
- <!-- Overrides the value of core.login.namespace in config.xml -->
- <!-- attribute name="LoginNamespace">dashboard</attribute
-->
- <depends
- optional-attribute-name="Config"
- proxy-type="attribute">portal:service=ServerConfig</depends>
- <depends
- optional-attribute-name="PortalAuthorizationManagerFactory"
-
proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends>
- <depends
- optional-attribute-name="PortalObjectContainer"
-
proxy-type="attribute">portal:container=PortalObject</depends>
-
+ <!-- Overrides the value of core.login.namespace in config.xml --><!--
attribute name="LoginNamespace">dashboard</attribute -->
+ <depends optional-attribute-name="Config"
proxy-type="attribute">portal:service=ServerConfig</depends>
+ <depends optional-attribute-name="PortalAuthorizationManagerFactory"
proxy-type="attribute">
+ portal:service=PortalAuthorizationManagerFactory
+ </depends>
+ <depends optional-attribute-name="PortalObjectContainer"
proxy-type="attribute">portal:container=PortalObject
+ </depends>
+
</mbean>
- <mbean
-
code="org.jboss.portal.core.aspects.controller.node.EventBroadcasterInterceptor"
- name="portal:service=Interceptor,type=Command,name=EventBroadcaster"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean
code="org.jboss.portal.core.aspects.controller.node.EventBroadcasterInterceptor"
+ name="portal:service=Interceptor,type=Command,name=EventBroadcaster"
xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- <depends
- optional-attribute-name="ListenerRegistry"
-
proxy-type="attribute">portal:service=ListenerRegistry</depends>
+ <depends optional-attribute-name="ListenerRegistry"
proxy-type="attribute">portal:service=ListenerRegistry
+ </depends>
</mbean>
- <mbean
-
code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory"
- name="portal:service=InterceptorStackFactory,type=Command"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean
code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory"
+ name="portal:service=InterceptorStackFactory,type=Command"
xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends-list optional-attribute-name="InterceptorNames">
<depends-list-element>portal:service=Interceptor,type=Command,name=ResourceAcquisition</depends-list-element>
@@ -277,134 +220,106 @@
</mbean>
<!-- Instance stack -->
- <mbean
- code="org.jboss.portal.core.model.instance.InstanceSecurityInterceptor"
- name="portal:service=Interceptor,type=Portlet,name=InstanceSecurity"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean
code="org.jboss.portal.core.model.instance.InstanceSecurityInterceptor"
+ name="portal:service=Interceptor,type=Portlet,name=InstanceSecurity"
xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- <depends optional-attribute-name="PortalAuthorizationManagerFactory"
proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends>
+ <depends optional-attribute-name="PortalAuthorizationManagerFactory"
proxy-type="attribute">
+ portal:service=PortalAuthorizationManagerFactory
+ </depends>
</mbean>
- <mbean
- code="org.jboss.portal.portlet.aspects.portlet.ConsumerCacheInterceptor"
- name="portal:service=Interceptor,type=Portlet,name=ConsumerCache"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean
code="org.jboss.portal.portlet.aspects.portlet.ConsumerCacheInterceptor"
+ name="portal:service=Interceptor,type=Portlet,name=ConsumerCache"
xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
- <mbean
-
code="org.jboss.portal.portlet.aspects.portlet.PortalSessionSynchronizationInterceptor"
-
name="portal:service=Interceptor,type=Portlet,name=PortalSessionSynchronization"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean
code="org.jboss.portal.portlet.aspects.portlet.PortalSessionSynchronizationInterceptor"
+
name="portal:service=Interceptor,type=Portlet,name=PortalSessionSynchronization"
xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
- <mbean
-
code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory"
- name="portal:service=InterceptorStackFactory,type=Instance"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean
code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory"
+ name="portal:service=InterceptorStackFactory,type=Instance"
xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends-list optional-attribute-name="InterceptorNames">
<depends-list-element>portal:service=Interceptor,type=Portlet,name=ConsumerCache</depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Portlet,name=InstanceSecurity</depends-list-element>
-
<depends-list-element>portal:service=Interceptor,type=Portlet,name=PortalSessionSynchronization</depends-list-element>
+
<depends-list-element>portal:service=Interceptor,type=Portlet,name=PortalSessionSynchronization
+ </depends-list-element>
</depends-list>
</mbean>
<!-- Producer stack -->
- <mbean
- code="org.jboss.portal.portlet.aspects.portlet.ValveInterceptor"
- name="portal:service=Interceptor,type=Portlet,name=Valve"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean code="org.jboss.portal.portlet.aspects.portlet.ValveInterceptor"
+ name="portal:service=Interceptor,type=Portlet,name=Valve"
xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
- <mbean
-
code="org.jboss.portal.portlet.aspects.portlet.ContextTrackerInterceptor"
- name="portal:service=Interceptor,type=Portlet,name=ContextTracker"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean
code="org.jboss.portal.portlet.aspects.portlet.ContextTrackerInterceptor"
+ name="portal:service=Interceptor,type=Portlet,name=ContextTracker"
xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
- <mbean
-
code="org.jboss.portal.portlet.aspects.portlet.SecureTransportInterceptor"
- name="portal:service=Interceptor,type=Portlet,name=SecureTransport"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean
code="org.jboss.portal.portlet.aspects.portlet.SecureTransportInterceptor"
+ name="portal:service=Interceptor,type=Portlet,name=SecureTransport"
xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
- <mbean
-
code="org.jboss.portal.portlet.aspects.portlet.ContextDispatcherInterceptor"
- name="portal:service=Interceptor,type=Portlet,name=ContextDispatcher"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean
code="org.jboss.portal.portlet.aspects.portlet.ContextDispatcherInterceptor"
+ name="portal:service=Interceptor,type=Portlet,name=ContextDispatcher"
xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- <depends
- optional-attribute-name="ServletContainerFactory"
-
proxy-type="attribute">portal:service=ServletContainerFactory</depends>
+ <depends optional-attribute-name="ServletContainerFactory"
proxy-type="attribute">
+ portal:service=ServletContainerFactory
+ </depends>
</mbean>
- <mbean
-
code="org.jboss.portal.portlet.aspects.portlet.PortletSessionSynchronizationInterceptor"
-
name="portal:service=Interceptor,type=Portlet,name=PortletSessionSynchronization"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean
code="org.jboss.portal.portlet.aspects.portlet.PortletSessionSynchronizationInterceptor"
+
name="portal:service=Interceptor,type=Portlet,name=PortletSessionSynchronization"
xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
- <mbean
- code="org.jboss.portal.portlet.bridge.BridgeInterceptor"
- name="portal:service=Interceptor,type=Portlet,name=Bridge"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean code="org.jboss.portal.portlet.bridge.BridgeInterceptor"
+ name="portal:service=Interceptor,type=Portlet,name=Bridge"
xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
- <mbean
- code="org.jboss.portal.portlet.aspects.portlet.ProducerCacheInterceptor"
- name="portal:service=Interceptor,type=Portlet,name=ProducerCache"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean
code="org.jboss.portal.portlet.aspects.portlet.ProducerCacheInterceptor"
+ name="portal:service=Interceptor,type=Portlet,name=ProducerCache"
xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
- <mbean
- code="org.jboss.portal.core.aspects.portlet.TransactionInterceptor"
- name="portal:service=Interceptor,type=Portlet,name=Transaction"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean
code="org.jboss.portal.core.aspects.portlet.TransactionInterceptor"
+ name="portal:service=Interceptor,type=Portlet,name=Transaction"
xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
- <mbean
- code="org.jboss.portal.core.aspects.portlet.HeaderInterceptor"
- name="portal:service=Interceptor,type=Portlet,name=Header"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean code="org.jboss.portal.core.aspects.portlet.HeaderInterceptor"
+ name="portal:service=Interceptor,type=Portlet,name=Header"
xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
- <mbean
- code="org.jboss.portal.core.aspects.portlet.AjaxInterceptor"
- name="portal:service=Interceptor,type=Portlet,name=Ajax"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean code="org.jboss.portal.core.aspects.portlet.AjaxInterceptor"
+ name="portal:service=Interceptor,type=Portlet,name=Ajax"
xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
- <mbean
- code="org.jboss.portal.core.aspects.portlet.SignOutInterceptor"
- name="portal:service=Interceptor,type=Portlet,name=SignOut"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean code="org.jboss.portal.core.aspects.portlet.SignOutInterceptor"
+ name="portal:service=Interceptor,type=Portlet,name=SignOut"
xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
- <mbean
-
code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory"
- name="portal:service=InterceptorStackFactory,type=Producer"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean
code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory"
+ name="portal:service=InterceptorStackFactory,type=Producer"
xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends-list optional-attribute-name="InterceptorNames">
<depends-list-element>portal:service=Interceptor,type=Portlet,name=Valve</depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Portlet,name=SecureTransport</depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Portlet,name=ContextDispatcher</depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Portlet,name=ContextTracker</depends-list-element>
-
<depends-list-element>portal:service=Interceptor,type=Portlet,name=PortletSessionSynchronization</depends-list-element>
+
<depends-list-element>portal:service=Interceptor,type=Portlet,name=PortletSessionSynchronization
+ </depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Portlet,name=Bridge</depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Portlet,name=Ajax</depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Portlet,name=SignOut</depends-list-element>
@@ -415,35 +330,22 @@
</mbean>
<!-- Theme and layout services -->
- <mbean
- code="org.jboss.portal.theme.impl.ThemeServiceImpl"
- name="portal:service=ThemeService"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean code="org.jboss.portal.theme.impl.ThemeServiceImpl"
name="portal:service=ThemeService" xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<attribute name="DefaultThemeName">renaissance</attribute>
</mbean>
- <mbean
- code="org.jboss.portal.theme.impl.LayoutServiceImpl"
- name="portal:service=LayoutService"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean code="org.jboss.portal.theme.impl.LayoutServiceImpl"
name="portal:service=LayoutService" xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<attribute name="DefaultLayoutName">generic</attribute>
<attribute
name="DefaultRenderSetName">divRenderer</attribute>
</mbean>
- <mbean
- code="org.jboss.portal.theme.impl.PageServiceImpl"
- name="portal:service=PageService"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean code="org.jboss.portal.theme.impl.PageServiceImpl"
name="portal:service=PageService" xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- <depends
- optional-attribute-name="LayoutService"
-
proxy-type="attribute">portal:service=LayoutService</depends>
- <depends
- optional-attribute-name="ThemeService"
- proxy-type="attribute">portal:service=ThemeService</depends>
+ <depends optional-attribute-name="LayoutService"
proxy-type="attribute">portal:service=LayoutService</depends>
+ <depends optional-attribute-name="ThemeService"
proxy-type="attribute">portal:service=ThemeService</depends>
</mbean>
<!--
@@ -540,11 +442,8 @@
-->
<!-- Session factories -->
- <mbean
- code="org.jboss.portal.jems.hibernate.SessionFactoryBinder"
- name="portal:service=Hibernate"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean code="org.jboss.portal.jems.hibernate.SessionFactoryBinder"
name="portal:service=Hibernate" xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends>jboss.jca:service=DataSourceBinding,name=@portal.datasource.name@</depends>
<!-- Uncomment in clustered mode : hibernate depends on its tree cache service
@portal.single.xml.close@
@@ -555,11 +454,8 @@
<attribute
name="SetupLocation">conf/hibernate/user/setup.txt</attribute>
<attribute
name="JNDIName">java:/portal/IdentitySessionFactory</attribute>
</mbean>
- <mbean
- code="org.jboss.portal.jems.hibernate.SessionFactoryBinder"
- name="portal:service=Hibernate,type=Instance"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean code="org.jboss.portal.jems.hibernate.SessionFactoryBinder"
name="portal:service=Hibernate,type=Instance"
+ xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends>jboss.jca:service=DataSourceBinding,name=@portal.datasource.name@</depends>
<depends>jboss.jca:service=DataSourceBinding,name=@portal.datasource.name@</depends>
@@ -570,11 +466,8 @@
<attribute
name="ConfigLocation">conf/hibernate/instance/hibernate.cfg.xml</attribute>
<attribute
name="JNDIName">java:/portal/InstanceSessionFactory</attribute>
</mbean>
- <mbean
- code="org.jboss.portal.jems.hibernate.SessionFactoryBinder"
- name="portal:service=Hibernate,type=PortalObject"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean code="org.jboss.portal.jems.hibernate.SessionFactoryBinder"
name="portal:service=Hibernate,type=PortalObject"
+ xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends>jboss.jca:service=DataSourceBinding,name=@portal.datasource.name@</depends>
<!-- Uncomment in clustered mode : hibernate depends on its tree cache service
@portal.single.xml.close@
@@ -584,11 +477,8 @@
<attribute
name="ConfigLocation">conf/hibernate/portal/hibernate.cfg.xml</attribute>
<attribute
name="JNDIName">java:/portal/PortalObjectSessionFactory</attribute>
</mbean>
- <mbean
- code="org.jboss.portal.jems.hibernate.SessionFactoryBinder"
- name="portal:service=Hibernate,type=Portlet"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean code="org.jboss.portal.jems.hibernate.SessionFactoryBinder"
name="portal:service=Hibernate,type=Portlet"
+ xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends>jboss.jca:service=DataSourceBinding,name=@portal.datasource.name@</depends>
<!-- Uncomment in clustered mode : hibernate depends on its tree cache service
@portal.single.xml.close@
@@ -600,34 +490,27 @@
</mbean>
<!--Identity-->
- <mbean
- code="org.jboss.portal.identity.service.IdentityEventManagerService"
- name="portal:service=IdentityEventManager"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean
code="org.jboss.portal.identity.service.IdentityEventManagerService"
+ name="portal:service=IdentityEventManager" xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
- <mbean
-
code="org.jboss.portal.core.identity.service.IdentityServiceControllerImpl"
- name="portal:service=Module,type=IdentityServiceController"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean
code="org.jboss.portal.core.identity.service.IdentityServiceControllerImpl"
+ name="portal:service=Module,type=IdentityServiceController"
xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends>portal:service=Hibernate</depends>
- <depends
- optional-attribute-name="IdentityEventBroadcaster"
-
proxy-type="attribute">portal:service=IdentityEventManager</depends>
+ <depends optional-attribute-name="IdentityEventBroadcaster"
proxy-type="attribute">
+ portal:service=IdentityEventManager
+ </depends>
<attribute
name="JndiName">java:/portal/IdentityServiceController</attribute>
<attribute name="RegisterMBeans">true</attribute>
<attribute
name="ConfigFile">conf/identity/identity-config.xml</attribute>
<attribute
name="DefaultConfigFile">conf/identity/standardidentity-config.xml</attribute>
</mbean>
- <mbean
- code="org.jboss.portal.core.impl.mail.MailModuleImpl"
- name="portal:service=Module,type=Mail"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean code="org.jboss.portal.core.impl.mail.MailModuleImpl"
name="portal:service=Module,type=Mail" xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends>jboss:service=Mail</depends>
<depends>portal:service=Module,type=IdentityServiceController</depends>
@@ -641,20 +524,16 @@
<attribute
name="JNDIName">java:portal/MailModule</attribute>
</mbean>
- <mbean
- code="org.jboss.security.auth.login.DynamicLoginConfig"
- name="portal:service=JAASLoginModule">
+ <mbean code="org.jboss.security.auth.login.DynamicLoginConfig"
name="portal:service=JAASLoginModule">
<depends
optional-attribute-name="LoginConfigService">jboss.security:service=XMLLoginConfig</depends>
<depends
optional-attribute-name="SecurityManagerService">jboss.security:service=JaasSecurityManager</depends>
<attribute
name="AuthConfig">conf/login-config.xml</attribute>
</mbean>
<!-- a service to schedule activity of the users -->
- <mbean
- code="org.jboss.portal.core.identity.UsersActivityStatsServiceImpl"
- name="portal:service=Module,type=UsersActivityStatsService"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean
code="org.jboss.portal.core.identity.UsersActivityStatsServiceImpl"
+ name="portal:service=Module,type=UsersActivityStatsService"
xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<!--
|Uncomment in clustered mode : broadcaster will spread info about user activity
in cluster
@@ -679,7 +558,7 @@
-->
<!-- Registries -->
-
+
<!-- mbean
code="org.jboss.portal.portlet.deployment.jboss.PortletApplicationDeployer"
name="portal:service=WebAppRegistry"
@@ -691,573 +570,409 @@
proxy-type="attribute">portal:service=ServletContainerFactory</depends>
</mbean-->
-
+
<!-- Listener registry -->
- <mbean
- code="org.jboss.portal.core.event.PortalEventListenerRegistryImpl"
- name="portal:service=ListenerRegistry"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean code="org.jboss.portal.core.event.PortalEventListenerRegistryImpl"
name="portal:service=ListenerRegistry"
+ xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<!-- The different containers -->
- <mbean
-
code="org.jboss.portal.core.impl.model.instance.persistent.PersistentInstanceContainerContext"
- name="portal:service=InstanceContainerContext"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean
code="org.jboss.portal.core.impl.model.instance.persistent.PersistentInstanceContainerContext"
+ name="portal:service=InstanceContainerContext"
xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends>portal:service=Hibernate,type=Instance</depends>
<attribute
name="SessionFactoryJNDIName">java:/portal/InstanceSessionFactory</attribute>
<attribute name="CacheNaturalId">true</attribute>
</mbean>
- <mbean
- code="org.jboss.portal.core.impl.model.instance.InstanceContainerImpl"
- name="portal:container=Instance"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean
code="org.jboss.portal.core.impl.model.instance.InstanceContainerImpl"
name="portal:container=Instance"
+ xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- <depends
- optional-attribute-name="ContainerContext"
-
proxy-type="attribute">portal:service=InstanceContainerContext</depends>
- <depends
- optional-attribute-name="StackFactory"
-
proxy-type="attribute">portal:service=InterceptorStackFactory,type=Instance</depends>
- <depends
- optional-attribute-name="PortletInvoker"
-
proxy-type="attribute">portal:service=PortletInvoker,type=Federating</depends>
- <depends
- optional-attribute-name="PortalAuthorizationManagerFactory"
-
proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends>
- <depends
- optional-attribute-name="AuthorizationDomainRegistry"
-
proxy-type="attribute">portal:service=AuthorizationDomainRegistry</depends>
+ <depends optional-attribute-name="ContainerContext"
proxy-type="attribute">portal:service=InstanceContainerContext
+ </depends>
+ <depends optional-attribute-name="StackFactory"
proxy-type="attribute">
+ portal:service=InterceptorStackFactory,type=Instance
+ </depends>
+ <depends optional-attribute-name="PortletInvoker"
proxy-type="attribute">
+ portal:service=PortletInvoker,type=Federating
+ </depends>
+ <depends optional-attribute-name="PortalAuthorizationManagerFactory"
proxy-type="attribute">
+ portal:service=PortalAuthorizationManagerFactory
+ </depends>
+ <depends optional-attribute-name="AuthorizationDomainRegistry"
proxy-type="attribute">
+ portal:service=AuthorizationDomainRegistry
+ </depends>
</mbean>
- <mbean
-
code="org.jboss.portal.core.impl.model.portal.PersistentPortalObjectContainer"
- name="portal:container=PortalObject"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean
code="org.jboss.portal.core.impl.model.portal.PersistentPortalObjectContainer"
+ name="portal:container=PortalObject" xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends>portal:service=Hibernate,type=PortalObject</depends>
- <depends
- optional-attribute-name="PortalAuthorizationManagerFactory"
-
proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends>
- <depends
- optional-attribute-name="AuthorizationDomainRegistry"
-
proxy-type="attribute">portal:service=AuthorizationDomainRegistry</depends>
- <depends
- optional-attribute-name="ContentProviderRegistry"
-
proxy-type="attribute">portal:service=ContentProviderRegistry</depends>
+ <depends optional-attribute-name="PortalAuthorizationManagerFactory"
proxy-type="attribute">
+ portal:service=PortalAuthorizationManagerFactory
+ </depends>
+ <depends optional-attribute-name="AuthorizationDomainRegistry"
proxy-type="attribute">
+ portal:service=AuthorizationDomainRegistry
+ </depends>
+ <depends optional-attribute-name="ContentProviderRegistry"
proxy-type="attribute">
+ portal:service=ContentProviderRegistry
+ </depends>
<attribute
name="SessionFactoryJNDIName">java:/portal/PortalObjectSessionFactory</attribute>
<attribute name="CacheNaturalId">true</attribute>
</mbean>
<!-- Customization manager -->
- <mbean
- code="org.jboss.portal.core.impl.model.CustomizationManagerService"
- name="portal:service=CustomizationManager"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean
code="org.jboss.portal.core.impl.model.CustomizationManagerService"
name="portal:service=CustomizationManager"
+ xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- <depends
- optional-attribute-name="PortalAuthorizationManagerFactory"
-
proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends>
- <depends
- optional-attribute-name="InstanceContainer"
- proxy-type="attribute">portal:container=Instance</depends>
- <depends
- optional-attribute-name="PortalObjectContainer"
-
proxy-type="attribute">portal:container=PortalObject</depends>
+ <depends optional-attribute-name="PortalAuthorizationManagerFactory"
proxy-type="attribute">
+ portal:service=PortalAuthorizationManagerFactory
+ </depends>
+ <depends optional-attribute-name="InstanceContainer"
proxy-type="attribute">portal:container=Instance</depends>
+ <depends optional-attribute-name="PortalObjectContainer"
proxy-type="attribute">portal:container=PortalObject
+ </depends>
<depends>portal:service=Module,type=IdentityServiceController</depends>
<attribute name="DashboardContextId">dashboard</attribute>
</mbean>
<!-- The content provider framework -->
- <mbean
-
code="org.jboss.portal.core.impl.model.content.ContentProviderRegistryService"
- name="portal:service=ContentProviderRegistry"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean
code="org.jboss.portal.core.impl.model.content.ContentProviderRegistryService"
+ name="portal:service=ContentProviderRegistry" xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
- <mbean
-
code="org.jboss.portal.core.impl.model.content.portlet.InternalPortletContentProvider"
- name="portal:service=ContentRenderer,type=portlet"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean
code="org.jboss.portal.core.impl.model.content.portlet.InternalPortletContentProvider"
+ name="portal:service=ContentRenderer,type=portlet"
xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<attribute name="ContentType">portlet</attribute>
- <depends
- optional-attribute-name="Registry"
-
proxy-type="attribute">portal:service=ContentProviderRegistry</depends>
- <depends
- optional-attribute-name="CustomizationManager"
-
proxy-type="attribute">portal:service=CustomizationManager</depends>
- <depends
- optional-attribute-name="InstanceContainer"
- proxy-type="attribute">portal:container=Instance</depends>
- <depends
- optional-attribute-name="PortalAuthorizationManagerFactory"
-
proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends>
+ <depends optional-attribute-name="Registry"
proxy-type="attribute">portal:service=ContentProviderRegistry
+ </depends>
+ <depends optional-attribute-name="CustomizationManager"
proxy-type="attribute">portal:service=CustomizationManager
+ </depends>
+ <depends optional-attribute-name="InstanceContainer"
proxy-type="attribute">portal:container=Instance</depends>
+ <depends optional-attribute-name="PortalAuthorizationManagerFactory"
proxy-type="attribute">
+ portal:service=PortalAuthorizationManagerFactory
+ </depends>
</mbean>
<!-- Integrate identity -->
- <mbean
- code="org.jboss.portal.core.identity.DashboardBridge"
- name="portal:service=IdentityDashboardBridge"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean code="org.jboss.portal.core.identity.DashboardBridge"
name="portal:service=IdentityDashboardBridge"
+ xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- <depends
- optional-attribute-name="IdentityEventEmitter"
-
proxy-type="attribute">portal:service=IdentityEventManager</depends>
- <depends
- optional-attribute-name="CustomizationManager"
-
proxy-type="attribute">portal:service=CustomizationManager</depends>
+ <depends optional-attribute-name="IdentityEventEmitter"
proxy-type="attribute">portal:service=IdentityEventManager
+ </depends>
+ <depends optional-attribute-name="CustomizationManager"
proxy-type="attribute">portal:service=CustomizationManager
+ </depends>
</mbean>
- <mbean
- code="org.jboss.portal.core.identity.SecurityBridge"
- name="portal:service=IdentitySecurityBridge"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean code="org.jboss.portal.core.identity.SecurityBridge"
name="portal:service=IdentitySecurityBridge" xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- <depends
- optional-attribute-name="IdentityEventEmitter"
-
proxy-type="attribute">portal:service=IdentityEventManager</depends>
- <depends
- optional-attribute-name="DynamicLoginConfig"
-
proxy-type="attribute">portal:service=JAASLoginModule</depends>
+ <depends optional-attribute-name="IdentityEventEmitter"
proxy-type="attribute">portal:service=IdentityEventManager
+ </depends>
+ <depends optional-attribute-name="DynamicLoginConfig"
proxy-type="attribute">portal:service=JAASLoginModule
+ </depends>
</mbean>
<!-- Command factories -->
- <mbean
-
code="org.jboss.portal.core.controller.command.mapper.DelegatingCommandFactoryService"
- name="portal:commandFactory=Delegating"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean
code="org.jboss.portal.core.controller.command.mapper.DelegatingCommandFactoryService"
+ name="portal:commandFactory=Delegating" xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
- <mbean
- code="org.jboss.portal.core.model.portal.DefaultPortalCommandFactory"
- name="portal:commandFactory=DefaultPortal"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean
code="org.jboss.portal.core.model.portal.DefaultPortalCommandFactory"
+ name="portal:commandFactory=DefaultPortal" xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- <depends
- optional-attribute-name="NextFactory"
-
proxy-type="attribute">portal:commandFactory=Delegating</depends>
- <depends
- optional-attribute-name="Container"
-
proxy-type="attribute">portal:container=PortalObject</depends>
+ <depends optional-attribute-name="NextFactory"
proxy-type="attribute">portal:commandFactory=Delegating</depends>
+ <depends optional-attribute-name="Container"
proxy-type="attribute">portal:container=PortalObject</depends>
</mbean>
- <mbean
-
code="org.jboss.portal.core.model.portal.command.mapping.DefaultPortalObjectPathMapper"
- name="portal:service=PortalObjectPathMapper,type=Default"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean
code="org.jboss.portal.core.model.portal.command.mapping.DefaultPortalObjectPathMapper"
+ name="portal:service=PortalObjectPathMapper,type=Default"
xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- <depends
- optional-attribute-name="Container"
-
proxy-type="attribute">portal:container=PortalObject</depends>
+ <depends optional-attribute-name="Container"
proxy-type="attribute">portal:container=PortalObject</depends>
<attribute name="Namespace"><![CDATA[]]></attribute>
</mbean>
- <mbean
- code="org.jboss.portal.core.model.portal.PortalObjectCommandFactory"
- name="portal:commandFactory=PortalObject"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean
code="org.jboss.portal.core.model.portal.PortalObjectCommandFactory"
name="portal:commandFactory=PortalObject"
+ xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- <depends
- optional-attribute-name="Mapper"
-
proxy-type="attribute">portal:service=PortalObjectPathMapper,type=Default</depends>
+ <depends optional-attribute-name="Mapper"
proxy-type="attribute">
+ portal:service=PortalObjectPathMapper,type=Default
+ </depends>
</mbean>
- <mbean
-
code="org.jboss.portal.core.controller.command.mapper.CommandFactoryDelegate"
- name="portal:commandFactory=Delegate,path=portal"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean
code="org.jboss.portal.core.controller.command.mapper.CommandFactoryDelegate"
+ name="portal:commandFactory=Delegate,path=portal"
xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<attribute name="Path">/portal</attribute>
- <depends
- optional-attribute-name="DelegatingFactory"
-
proxy-type="attribute">portal:commandFactory=Delegating</depends>
- <depends
- optional-attribute-name="DelegateFactory"
-
proxy-type="attribute">portal:commandFactory=PortalObject</depends>
+ <depends optional-attribute-name="DelegatingFactory"
proxy-type="attribute">portal:commandFactory=Delegating
+ </depends>
+ <depends optional-attribute-name="DelegateFactory"
proxy-type="attribute">portal:commandFactory=PortalObject
+ </depends>
</mbean>
- <mbean
-
code="org.jboss.portal.core.controller.command.mapper.SignOutCommandFactoryService"
- name="portal:commandFactory=SignOut"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean
code="org.jboss.portal.core.controller.command.mapper.SignOutCommandFactoryService"
+ name="portal:commandFactory=SignOut" xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
- <mbean
-
code="org.jboss.portal.core.controller.command.mapper.CommandFactoryDelegate"
- name="portal:commandFactory=Delegate,path=signout"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean
code="org.jboss.portal.core.controller.command.mapper.CommandFactoryDelegate"
+ name="portal:commandFactory=Delegate,path=signout"
xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<attribute name="Path">/signout</attribute>
- <depends
- optional-attribute-name="DelegatingFactory"
-
proxy-type="attribute">portal:commandFactory=Delegating</depends>
- <depends
- optional-attribute-name="DelegateFactory"
-
proxy-type="attribute">portal:commandFactory=SignOut</depends>
+ <depends optional-attribute-name="DelegatingFactory"
proxy-type="attribute">portal:commandFactory=Delegating
+ </depends>
+ <depends optional-attribute-name="DelegateFactory"
proxy-type="attribute">portal:commandFactory=SignOut</depends>
</mbean>
- <mbean
-
code="org.jboss.portal.core.model.portal.command.mapping.DashboardPortalObjectPathMapper"
- name="portal:service=PortalObjectPathMapper,type=Dashboard"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean
code="org.jboss.portal.core.model.portal.command.mapping.DashboardPortalObjectPathMapper"
+ name="portal:service=PortalObjectPathMapper,type=Dashboard"
xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- <depends
- optional-attribute-name="CustomizationManager"
-
proxy-type="attribute">portal:service=CustomizationManager</depends>
- <depends
- optional-attribute-name="Container"
-
proxy-type="attribute">portal:container=PortalObject</depends>
+ <depends optional-attribute-name="CustomizationManager"
proxy-type="attribute">portal:service=CustomizationManager
+ </depends>
+ <depends optional-attribute-name="Container"
proxy-type="attribute">portal:container=PortalObject</depends>
</mbean>
- <mbean
- code="org.jboss.portal.core.model.portal.PortalObjectCommandFactory"
- name="portal:commandFactory=Dashboard"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean
code="org.jboss.portal.core.model.portal.PortalObjectCommandFactory"
name="portal:commandFactory=Dashboard"
+ xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- <depends
- optional-attribute-name="Mapper"
-
proxy-type="attribute">portal:service=PortalObjectPathMapper,type=Dashboard</depends>
+ <depends optional-attribute-name="Mapper"
proxy-type="attribute">
+ portal:service=PortalObjectPathMapper,type=Dashboard
+ </depends>
</mbean>
- <mbean
-
code="org.jboss.portal.core.controller.command.mapper.CommandFactoryDelegate"
- name="portal:commandFactory=Delegate,path=dashboard"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean
code="org.jboss.portal.core.controller.command.mapper.CommandFactoryDelegate"
+ name="portal:commandFactory=Delegate,path=dashboard"
xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<attribute name="Path">/dashboard</attribute>
- <depends
- optional-attribute-name="DelegatingFactory"
-
proxy-type="attribute">portal:commandFactory=Delegating</depends>
- <depends
- optional-attribute-name="DelegateFactory"
-
proxy-type="attribute">portal:commandFactory=Dashboard</depends>
+ <depends optional-attribute-name="DelegatingFactory"
proxy-type="attribute">portal:commandFactory=Delegating
+ </depends>
+ <depends optional-attribute-name="DelegateFactory"
proxy-type="attribute">portal:commandFactory=Dashboard
+ </depends>
</mbean>
- <mbean
- code="org.jboss.portal.core.controller.ajax.AjaxCommandFactory"
- name="portal:commandFactory=Ajax"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean code="org.jboss.portal.core.controller.ajax.AjaxCommandFactory"
name="portal:commandFactory=Ajax" xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
- <mbean
-
code="org.jboss.portal.core.controller.command.mapper.CommandFactoryDelegate"
- name="portal:commandFactory=Delegate,path=ajax"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean
code="org.jboss.portal.core.controller.command.mapper.CommandFactoryDelegate"
+ name="portal:commandFactory=Delegate,path=ajax"
xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<attribute name="Path">/ajax</attribute>
- <depends
- optional-attribute-name="DelegatingFactory"
-
proxy-type="attribute">portal:commandFactory=Delegating</depends>
- <depends
- optional-attribute-name="DelegateFactory"
- proxy-type="attribute">portal:commandFactory=Ajax</depends>
+ <depends optional-attribute-name="DelegatingFactory"
proxy-type="attribute">portal:commandFactory=Delegating
+ </depends>
+ <depends optional-attribute-name="DelegateFactory"
proxy-type="attribute">portal:commandFactory=Ajax</depends>
</mbean>
<!-- URL factories -->
- <mbean
-
code="org.jboss.portal.core.controller.command.mapper.DelegatingURLFactoryService"
- name="portal:urlFactory=Delegating"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean
code="org.jboss.portal.core.controller.command.mapper.DelegatingURLFactoryService"
+ name="portal:urlFactory=Delegating" xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
- <mbean
- code="org.jboss.portal.core.model.portal.PortalObjectURLFactory"
- name="portal:urlFactory=PortalObject,type=Default"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean code="org.jboss.portal.core.model.portal.PortalObjectURLFactory"
+ name="portal:urlFactory=PortalObject,type=Default"
xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<attribute name="Namespace"><![CDATA[]]></attribute>
<attribute name="Path">/portal</attribute>
- <depends
- optional-attribute-name="Factory"
-
proxy-type="attribute">portal:urlFactory=Delegating</depends>
- <depends
- optional-attribute-name="Mapper"
-
proxy-type="attribute">portal:service=PortalObjectPathMapper,type=Default</depends>
+ <depends optional-attribute-name="Factory"
proxy-type="attribute">portal:urlFactory=Delegating</depends>
+ <depends optional-attribute-name="Mapper"
proxy-type="attribute">
+ portal:service=PortalObjectPathMapper,type=Default
+ </depends>
</mbean>
- <mbean
- code="org.jboss.portal.core.controller.command.mapper.SignOutURLFactory"
- name="portal:urlFactory=SignOut"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean
code="org.jboss.portal.core.controller.command.mapper.SignOutURLFactory"
name="portal:urlFactory=SignOut"
+ xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<attribute name="Path">/signout</attribute>
- <depends
- optional-attribute-name="Factory"
-
proxy-type="attribute">portal:urlFactory=Delegating</depends>
+ <depends optional-attribute-name="Factory"
proxy-type="attribute">portal:urlFactory=Delegating</depends>
</mbean>
- <mbean
- code="org.jboss.portal.core.model.portal.PortalObjectURLFactory"
- name="portal:urlFactory=PortalObject,type=Dashboard"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean code="org.jboss.portal.core.model.portal.PortalObjectURLFactory"
+ name="portal:urlFactory=PortalObject,type=Dashboard"
xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<attribute name="Namespace">dashboard</attribute>
<attribute name="Path">/dashboard</attribute>
- <depends
- optional-attribute-name="Factory"
-
proxy-type="attribute">portal:urlFactory=Delegating</depends>
- <depends
- optional-attribute-name="Mapper"
-
proxy-type="attribute">portal:service=PortalObjectPathMapper,type=Dashboard</depends>
+ <depends optional-attribute-name="Factory"
proxy-type="attribute">portal:urlFactory=Delegating</depends>
+ <depends optional-attribute-name="Mapper"
proxy-type="attribute">
+ portal:service=PortalObjectPathMapper,type=Dashboard
+ </depends>
</mbean>
<!-- The federating portlet invoker -->
- <mbean
-
code="org.jboss.portal.portlet.federation.impl.FederatingPortletInvokerService"
- name="portal:service=PortletInvoker,type=Federating"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean
code="org.jboss.portal.portlet.federation.impl.FederatingPortletInvokerService"
+ name="portal:service=PortletInvoker,type=Federating"
xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<!-- The portlet container invoker -->
- <mbean
- code="org.jboss.portal.portlet.container.PortletContainerInvoker"
- name="portal:service=PortletInvoker,type=Container"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean code="org.jboss.portal.portlet.container.PortletContainerInvoker"
+ name="portal:service=PortletInvoker,type=Container"
xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- <depends
- optional-attribute-name="StackFactory"
-
proxy-type="attribute">portal:service=InterceptorStackFactory,type=Producer</depends>
+ <depends optional-attribute-name="StackFactory"
proxy-type="attribute">
+ portal:service=InterceptorStackFactory,type=Producer
+ </depends>
</mbean>
<!-- The producer portlet invoker -->
- <mbean
-
code="org.jboss.portal.core.impl.portlet.state.PersistentPortletStatePersistenceManager"
- name="portal:service=PersistenceManager,type=Producer"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean
code="org.jboss.portal.core.impl.portlet.state.PersistentPortletStatePersistenceManager"
+ name="portal:service=PersistenceManager,type=Producer"
xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends>portal:service=Hibernate,type=Portlet</depends>
<attribute
name="SessionFactoryJNDIName">java:/portal/PortletSessionFactory</attribute>
</mbean>
- <mbean
- code="org.jboss.portal.portlet.impl.state.StateManagementPolicyService"
- name="portal:service=StateManagementPolicy,type=Producer"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean
code="org.jboss.portal.portlet.impl.state.StateManagementPolicyService"
+ name="portal:service=StateManagementPolicy,type=Producer"
xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<attribute name="PersistLocally">true</attribute>
</mbean>
- <mbean
- code="org.jboss.portal.portlet.impl.state.StateConverterV0"
- name="portal:service=StateConverter,type=Producer"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean code="org.jboss.portal.portlet.impl.state.StateConverterV0"
name="portal:service=StateConverter,type=Producer"
+ xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
- <mbean
- code="org.jboss.portal.portlet.deployment.CorePortletInvoker"
- name="portal:service=PortletInvoker,type=Core"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean
code="org.jboss.portal.core.impl.portlet.state.ProducerPortletInvoker"
+ name="portal:service=PortletInvoker,type=Producer"
xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- <depends
- optional-attribute-name="PortletInvoker"
-
proxy-type="attribute">portal:service=PortletInvoker,type=Container</depends>
+ <depends optional-attribute-name="PortletInvoker"
proxy-type="attribute">
+ portal:service=PortletInvoker,type=Container
+ </depends>
+ <depends optional-attribute-name="PersistenceManager"
proxy-type="attribute">
+ portal:service=PersistenceManager,type=Producer
+ </depends>
+ <depends optional-attribute-name="StateManagementPolicy"
proxy-type="attribute">
+ portal:service=StateManagementPolicy,type=Producer
+ </depends>
+ <depends optional-attribute-name="StateConverter"
proxy-type="attribute">
+ portal:service=StateConverter,type=Producer
+ </depends>
</mbean>
- <mbean
- code="org.jboss.portal.core.impl.portlet.state.ProducerPortletInvoker"
- name="portal:service=PortletInvoker,type=Producer"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
- <xmbean/>
- <depends
- optional-attribute-name="PortletInvoker"
-
proxy-type="attribute">portal:service=PortletInvoker,type=Core</depends>
- <depends
- optional-attribute-name="PersistenceManager"
-
proxy-type="attribute">portal:service=PersistenceManager,type=Producer</depends>
- <depends
- optional-attribute-name="StateManagementPolicy"
-
proxy-type="attribute">portal:service=StateManagementPolicy,type=Producer</depends>
- <depends
- optional-attribute-name="StateConverter"
-
proxy-type="attribute">portal:service=StateConverter,type=Producer</depends>
- </mbean>
<!-- Register the state portlet invoker on the federating portlet invoker -->
- <mbean
-
code="org.jboss.portal.portlet.federation.impl.PortletInvokerRegistrationService"
- name="portal:service=PortletInvokerRegistration,id=local"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean
code="org.jboss.portal.portlet.federation.impl.PortletInvokerRegistrationService"
+ name="portal:service=PortletInvokerRegistration,id=local"
xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<attribute name="Id">local</attribute>
- <depends
- optional-attribute-name="PortletInvoker"
-
proxy-type="attribute">portal:service=PortletInvoker,type=Producer</depends>
- <depends
- optional-attribute-name="FederatingPortletInvoker"
-
proxy-type="attribute">portal:service=PortletInvoker,type=Federating</depends>
+ <depends optional-attribute-name="PortletInvoker"
proxy-type="attribute">
+ portal:service=PortletInvoker,type=Producer
+ </depends>
+ <depends optional-attribute-name="FederatingPortletInvoker"
proxy-type="attribute">
+ portal:service=PortletInvoker,type=Federating
+ </depends>
</mbean>
<!-- The classic response handler -->
- <mbean
- code="org.jboss.portal.core.controller.classic.ClassicResponseHandler"
- name="portal:service=ResponseHandler,type=Classic"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean
code="org.jboss.portal.core.controller.classic.ClassicResponseHandler"
+ name="portal:service=ResponseHandler,type=Classic"
xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
<!-- The ajax response handler -->
- <mbean
- code="org.jboss.portal.core.controller.ajax.AjaxResponseHandler"
- name="portal:service=ResponseHandler,type=Ajax"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean code="org.jboss.portal.core.controller.ajax.AjaxResponseHandler"
+ name="portal:service=ResponseHandler,type=Ajax"
xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- <depends
- optional-attribute-name="PageService"
- proxy-type="attribute">portal:service=PageService</depends>
- <depends
- optional-attribute-name="PortalObjectContainer"
-
proxy-type="attribute">portal:container=PortalObject</depends>
+ <depends optional-attribute-name="PageService"
proxy-type="attribute">portal:service=PageService</depends>
+ <depends optional-attribute-name="PortalObjectContainer"
proxy-type="attribute">portal:container=PortalObject
+ </depends>
</mbean>
<!-- The response handler selector -->
- <mbean
- code="org.jboss.portal.core.controller.handler.ResponseHandlerSelector"
- name="portal:service=ResponseHandler,type=Selector"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean
code="org.jboss.portal.core.controller.handler.ResponseHandlerSelector"
+ name="portal:service=ResponseHandler,type=Selector"
xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- <depends
- optional-attribute-name="ClassicResponseHandler"
-
proxy-type="attribute">portal:service=ResponseHandler,type=Classic</depends>
- <depends
- optional-attribute-name="AjaxResponseHandler"
-
proxy-type="attribute">portal:service=ResponseHandler,type=Ajax</depends>
+ <depends optional-attribute-name="ClassicResponseHandler"
proxy-type="attribute">
+ portal:service=ResponseHandler,type=Classic
+ </depends>
+ <depends optional-attribute-name="AjaxResponseHandler"
proxy-type="attribute">
+ portal:service=ResponseHandler,type=Ajax
+ </depends>
</mbean>
<!-- -->
- <mbean
-
code="org.jboss.portal.core.model.portal.control.page.DefaultPageControlPolicy"
- name="portal:service=ControlPolicy,type=Page"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean
code="org.jboss.portal.core.model.portal.control.page.DefaultPageControlPolicy"
+ name="portal:service=ControlPolicy,type=Page" xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- <depends
- optional-attribute-name="PortalObjectContainer"
-
proxy-type="attribute">portal:container=PortalObject</depends>
+ <depends optional-attribute-name="PortalObjectContainer"
proxy-type="attribute">portal:container=PortalObject
+ </depends>
</mbean>
- <mbean
-
code="org.jboss.portal.core.model.portal.control.portal.DefaultPortalControlPolicy"
- name="portal:service=ControlPolicy,type=Portal"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean
code="org.jboss.portal.core.model.portal.control.portal.DefaultPortalControlPolicy"
+ name="portal:service=ControlPolicy,type=Portal"
xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- <depends
- optional-attribute-name="PortalObjectContainer"
-
proxy-type="attribute">portal:container=PortalObject</depends>
+ <depends optional-attribute-name="PortalObjectContainer"
proxy-type="attribute">portal:container=PortalObject
+ </depends>
</mbean>
<!-- The controller -->
- <mbean
- code="org.jboss.portal.core.controller.Controller"
- name="portal:service=Controller"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean code="org.jboss.portal.core.controller.Controller"
name="portal:service=Controller" xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- <depends
- optional-attribute-name="PageService"
- proxy-type="attribute">portal:service=PageService</depends>
- <depends
- optional-attribute-name="CommandFactory"
-
proxy-type="attribute">portal:commandFactory=DefaultPortal</depends>
- <depends
- optional-attribute-name="URLFactory"
-
proxy-type="attribute">portal:urlFactory=Delegating</depends>
- <depends
- optional-attribute-name="StackFactory"
-
proxy-type="attribute">portal:service=InterceptorStackFactory,type=Command</depends>
- <depends
- optional-attribute-name="PortalObjectContainer"
-
proxy-type="attribute">portal:container=PortalObject</depends>
- <depends
- optional-attribute-name="InstanceContainer"
- proxy-type="attribute">portal:container=Instance</depends>
- <depends
- optional-attribute-name="PortalAuthorizationManagerFactory"
-
proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends>
- <depends
- optional-attribute-name="CustomizationManager"
-
proxy-type="attribute">portal:service=CustomizationManager</depends>
- <depends
- optional-attribute-name="ContentRendererRegistry"
-
proxy-type="attribute">portal:service=ContentProviderRegistry</depends>
- <depends
- optional-attribute-name="ResponseHandler"
-
proxy-type="attribute">portal:service=ResponseHandler,type=Selector</depends>
- <depends
- optional-attribute-name="PageControlPolicy"
-
proxy-type="attribute">portal:service=ControlPolicy,type=Page</depends>
+ <depends optional-attribute-name="PageService"
proxy-type="attribute">portal:service=PageService</depends>
+ <depends optional-attribute-name="CommandFactory"
proxy-type="attribute">portal:commandFactory=DefaultPortal
+ </depends>
+ <depends optional-attribute-name="URLFactory"
proxy-type="attribute">portal:urlFactory=Delegating</depends>
+ <depends optional-attribute-name="StackFactory"
proxy-type="attribute">
+ portal:service=InterceptorStackFactory,type=Command
+ </depends>
+ <depends optional-attribute-name="PortalObjectContainer"
proxy-type="attribute">portal:container=PortalObject
+ </depends>
+ <depends optional-attribute-name="InstanceContainer"
proxy-type="attribute">portal:container=Instance</depends>
+ <depends optional-attribute-name="PortalAuthorizationManagerFactory"
proxy-type="attribute">
+ portal:service=PortalAuthorizationManagerFactory
+ </depends>
+ <depends optional-attribute-name="CustomizationManager"
proxy-type="attribute">portal:service=CustomizationManager
+ </depends>
+ <depends optional-attribute-name="ContentRendererRegistry"
proxy-type="attribute">
+ portal:service=ContentProviderRegistry
+ </depends>
+ <depends optional-attribute-name="ResponseHandler"
proxy-type="attribute">
+ portal:service=ResponseHandler,type=Selector
+ </depends>
+ <depends optional-attribute-name="PageControlPolicy"
proxy-type="attribute">portal:service=ControlPolicy,type=Page
+ </depends>
</mbean>
<!-- The controller factory -->
- <mbean
- code="org.jboss.portal.server.impl.RequestControllerFactoryImpl"
- name="portal:service=ControllerFactory"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean code="org.jboss.portal.server.impl.RequestControllerFactoryImpl"
name="portal:service=ControllerFactory"
+ xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- <depends
- optional-attribute-name="Controller"
- proxy-type="attribute">portal:service=Controller</depends>
+ <depends optional-attribute-name="Controller"
proxy-type="attribute">portal:service=Controller</depends>
</mbean>
<!-- -->
- <mbean
- code="org.jboss.portal.server.impl.ServerImpl"
- name="portal:service=Server"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean code="org.jboss.portal.server.impl.ServerImpl"
name="portal:service=Server" xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- <depends
- optional-attribute-name="Config"
- proxy-type="attribute">portal:service=ServerConfig</depends>
- <depends
- optional-attribute-name="ServletContainerFactory"
-
proxy-type="attribute">portal:service=ServletContainerFactory</depends>
+ <depends optional-attribute-name="Config"
proxy-type="attribute">portal:service=ServerConfig</depends>
+ <depends optional-attribute-name="ServletContainerFactory"
proxy-type="attribute">
+ portal:service=ServletContainerFactory
+ </depends>
</mbean>
<!-- -->
- <mbean
- code="org.jboss.portal.server.deployment.jboss.ServerDeployer"
- name="portal:deployer=PortalWebApp">
+ <mbean code="org.jboss.portal.server.deployment.jboss.ServerDeployer"
name="portal:deployer=PortalWebApp">
<depends>jboss.system:service=MainDeployer</depends>
<depends>portal:container=PortalObject</depends>
<depends>portal:container=Instance</depends>
- <depends
- optional-attribute-name="PortalServer"
- proxy-type="attribute">portal:service=Server</depends>
+ <depends optional-attribute-name="PortalServer"
proxy-type="attribute">portal:service=Server</depends>
</mbean>
- <!-- Portal object deployment factory -->
- <!--
+ <!-- Portal object deployment factory --><!--
| Uncomment in cluster mode : have the deployment of objects run as a clustered
singleton
@portal.single.xml.close@
<mbean
@@ -1275,39 +990,29 @@
</mbean>
@portal.single.xml.open@
-->
- <mbean
- code="org.jboss.portal.core.deployment.jboss.ObjectDeploymentFactory"
- name="portal:deploymentFactory=Object"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean
code="org.jboss.portal.core.deployment.jboss.ObjectDeploymentFactory"
name="portal:deploymentFactory=Object"
+ xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- <depends
- optional-attribute-name="Deployer"
-
proxy-type="attribute">portal:deployer=PortalWebApp</depends>
- <depends
- optional-attribute-name="PortalObjectContainer"
-
proxy-type="attribute">portal:container=PortalObject</depends>
- <depends
- optional-attribute-name="ContentProviderRegistry"
-
proxy-type="attribute">portal:service=ContentProviderRegistry</depends>
- <depends
- optional-attribute-name="PortalObjectEntityResolver"
-
proxy-type="attribute">portal:service=EntityResolver</depends>
+ <depends optional-attribute-name="Deployer"
proxy-type="attribute">portal:deployer=PortalWebApp</depends>
+ <depends optional-attribute-name="PortalObjectContainer"
proxy-type="attribute">portal:container=PortalObject
+ </depends>
+ <depends optional-attribute-name="ContentProviderRegistry"
proxy-type="attribute">
+ portal:service=ContentProviderRegistry
+ </depends>
+ <depends optional-attribute-name="PortalObjectEntityResolver"
proxy-type="attribute">portal:service=EntityResolver
+ </depends>
<attribute
name="SetupLocation">conf/data/default-object.xml</attribute>
<!-- Set to false in clustered mode, otherwise set to true -->
<attribute
name="RegistrationControlledByService">@portal.single(a)</attribute>
</mbean>
- <mbean
- code="org.jboss.portal.core.impl.portlet.info.CoreInfoBuilderFactory"
- name="portal:service=InfoBuilderFactory,type=Core"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean
code="org.jboss.portal.core.impl.portlet.info.CoreInfoBuilderFactory"
+ name="portal:service=InfoBuilderFactory,type=Core"
xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
- <!-- -->
- <!--
+ <!-- --><!--
| Uncomment in cluster mode : have the creation of instances run as a clustered
singleton
@portal.single.xml.close@
<mbean
@@ -1325,108 +1030,63 @@
</mbean>
@portal.single.xml.open@
-->
- <mbean
-
code="org.jboss.portal.core.deployment.jboss.PortletAppDeploymentFactory"
- name="portal:deploymentFactory=PortletApp"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean
code="org.jboss.portal.core.deployment.jboss.PortletAppDeploymentFactory"
+ name="portal:deploymentFactory=PortletApp" xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<!-- @portal.single.xml.close@
<depends>jboss.ha:service=HASingletonDeployer</depends>
@portal.single.xml.open@ -->
<depends>portal:service=PortletInvokerRegistration,id=local</depends>
- <depends
- optional-attribute-name="Deployer"
-
proxy-type="attribute">portal:deployer=PortalWebApp</depends>
-<!--
- <depends
- optional-attribute-name="WebAppRegistry"
-
proxy-type="attribute">portal:service=WebAppRegistry</depends>
- -->
- <depends
- optional-attribute-name="CoreInfoBuilderFactory"
-
proxy-type="attribute">portal:service=InfoBuilderFactory,type=Core</depends>
- <depends
- optional-attribute-name="PortletContainerInvoker"
-
proxy-type="attribute">portal:service=PortletInvoker,type=Container</depends>
- <depends
- optional-attribute-name="CorePortletInvoker"
-
proxy-type="attribute">portal:service=PortletInvoker,type=Core</depends>
- <depends
- optional-attribute-name="Config"
- proxy-type="attribute">portal:service=ServerConfig</depends>
- <depends
- optional-attribute-name="PortletSecurityService"
-
proxy-type="attribute">portal:service=PortletSecurityService</depends>
- <depends
- optional-attribute-name="InstanceContainer"
- proxy-type="attribute">portal:container=Instance</depends>
- <depends
- optional-attribute-name="JBossPortletEntityResolver"
-
proxy-type="attribute">portal:service=EntityResolver</depends>
- <depends
- optional-attribute-name="PortalObjectEntityResolver"
-
proxy-type="attribute">portal:service=EntityResolver</depends>
- <depends
- optional-attribute-name="PortletInstancesEntityResolver"
-
proxy-type="attribute">portal:service=EntityResolver</depends>
+ <depends optional-attribute-name="Deployer"
proxy-type="attribute">portal:deployer=PortalWebApp</depends>
+ <depends optional-attribute-name="CoreInfoBuilderFactory"
proxy-type="attribute">
+ portal:service=InfoBuilderFactory,type=Core
+ </depends>
+ <depends optional-attribute-name="PortletContainerInvoker"
proxy-type="attribute">
+ portal:service=PortletInvoker,type=Container
+ </depends>
+ <depends optional-attribute-name="Config"
proxy-type="attribute">portal:service=ServerConfig</depends>
+ <depends optional-attribute-name="PortletSecurityService"
proxy-type="attribute">
+ portal:service=PortletSecurityService
+ </depends>
+ <depends optional-attribute-name="InstanceContainer"
proxy-type="attribute">portal:container=Instance</depends>
+ <depends optional-attribute-name="JBossPortletEntityResolver"
proxy-type="attribute">portal:service=EntityResolver
+ </depends>
+ <depends optional-attribute-name="PortalObjectEntityResolver"
proxy-type="attribute">portal:service=EntityResolver
+ </depends>
+ <depends optional-attribute-name="PortletInstancesEntityResolver"
proxy-type="attribute">
+ portal:service=EntityResolver
+ </depends>
<attribute
name="StandardJBossApplicationMetaDataLocation">conf/standardjboss-portlet.xml</attribute>
<!-- Set to false in clustered mode, otherwise set to true -->
<attribute
name="CreateInstances">@portal.single(a)</attribute>
</mbean>
- <mbean
- code="org.jboss.portal.theme.deployment.jboss.LayoutDeploymentFactory"
- name="portal:deploymentFactory=Layout"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean
code="org.jboss.portal.theme.deployment.jboss.LayoutDeploymentFactory"
name="portal:deploymentFactory=Layout"
+ xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- <depends
- optional-attribute-name="Deployer"
-
proxy-type="attribute">portal:deployer=PortalWebApp</depends>
- <depends
- optional-attribute-name="LayoutService"
-
proxy-type="attribute">portal:service=LayoutService</depends>
+ <depends optional-attribute-name="Deployer"
proxy-type="attribute">portal:deployer=PortalWebApp</depends>
+ <depends optional-attribute-name="LayoutService"
proxy-type="attribute">portal:service=LayoutService</depends>
</mbean>
- <mbean
-
code="org.jboss.portal.theme.deployment.jboss.LayoutFeaturesDeploymentFactory"
- name="portal:deploymentFactory=LayoutFeatures"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean
code="org.jboss.portal.theme.deployment.jboss.LayoutFeaturesDeploymentFactory"
+ name="portal:deploymentFactory=LayoutFeatures"
xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- <depends
- optional-attribute-name="Deployer"
-
proxy-type="attribute">portal:deployer=PortalWebApp</depends>
- <depends
- optional-attribute-name="LayoutService"
-
proxy-type="attribute">portal:service=LayoutService</depends>
+ <depends optional-attribute-name="Deployer"
proxy-type="attribute">portal:deployer=PortalWebApp</depends>
+ <depends optional-attribute-name="LayoutService"
proxy-type="attribute">portal:service=LayoutService</depends>
</mbean>
- <mbean
- code="org.jboss.portal.theme.deployment.jboss.ThemeDeploymentFactory"
- name="portal:deploymentFactory=Theme"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean
code="org.jboss.portal.theme.deployment.jboss.ThemeDeploymentFactory"
name="portal:deploymentFactory=Theme"
+ xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- <depends
- optional-attribute-name="Deployer"
-
proxy-type="attribute">portal:deployer=PortalWebApp</depends>
- <depends
- optional-attribute-name="ThemeService"
- proxy-type="attribute">portal:service=ThemeService</depends>
+ <depends optional-attribute-name="Deployer"
proxy-type="attribute">portal:deployer=PortalWebApp</depends>
+ <depends optional-attribute-name="ThemeService"
proxy-type="attribute">portal:service=ThemeService</depends>
</mbean>
- <mbean
- code="org.jboss.portal.server.deployment.WebAppAdapter"
- name="portal:deployer=Adapter"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean code="org.jboss.portal.server.deployment.WebAppAdapter"
name="portal:deployer=Adapter" xmbean-dd=""
+
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- <depends
-
optional-attribute-name="InterceptedDeployer">jboss.web:service=WebServer</depends>
- <depends
- optional-attribute-name="Deployer"
-
proxy-type="attribute">portal:deployer=PortalWebApp</depends>
- <depends
- optional-attribute-name="JBossAppEntityResolver"
-
proxy-type="attribute">portal:service=EntityResolver</depends>
+ <depends
optional-attribute-name="InterceptedDeployer">jboss.web:service=WebServer</depends>
+ <depends optional-attribute-name="Deployer"
proxy-type="attribute">portal:deployer=PortalWebApp</depends>
+ <depends optional-attribute-name="JBossAppEntityResolver"
proxy-type="attribute">portal:service=EntityResolver
+ </depends>
</mbean>
</server>
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp 2008-03-13
09:44:13 UTC (rev 10280)
+++
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp 2008-03-13
23:22:28 UTC (rev 10281)
@@ -1,9 +1,9 @@
<%@ page import="org.jboss.portal.common.util.IteratorStatus" %>
<%@ page import="org.jboss.portal.core.model.instance.Instance" %>
-<%@ page import="org.jboss.portal.portlet.Portlet" %>
-<%@ page import="org.jboss.portal.portlet.PortletInvokerException" %>
-<%@ page import="org.jboss.portal.portlet.info.MetaInfo" %>
-<%@ page import="java.util.Collection" %>
+<%@ page import="org.jboss.portal.core.portlet.info.CorePortletInfo" %>
+<%@ page import="org.jboss.portal.core.portlet.info.PortletIconInfo" %>
+<%@ page import="org.jboss.portal.core.portlet.info.PortletInfoInfo" %>
+<%@ page
import="org.jboss.portal.core.ui.content.portlet.PortletContentEditorPortlet"
%>
<%@ page language="java" %>
<%@ taglib
uri="http://java.sun.com/portlet" prefix="portlet"
%>
@@ -11,11 +11,11 @@
Collection instances = (Collection)request.getAttribute("INSTANCES");
Instance selectedInstance =
(Instance)request.getAttribute("SELECTED_INSTANCE");
%>
-<%@page import="org.jboss.portal.portlet.info.PortletInfo"%>
-<%@page import="org.jboss.portal.core.portlet.info.CorePortletInfo"%>
-<%@page import="org.jboss.portal.core.portlet.info.PortletInfoInfo"%>
-<%@page import="org.jboss.portal.core.portlet.info.PortletIconInfo"%>
-<%@page
import="org.jboss.portal.core.ui.content.portlet.PortletContentEditorPortlet"%>
+<%@page import="org.jboss.portal.portlet.Portlet" %>
+<%@page import="org.jboss.portal.portlet.PortletInvokerException" %>
+<%@page import="org.jboss.portal.portlet.info.MetaInfo" %>
+<%@page import="org.jboss.portal.portlet.info.PortletInfo" %>
+<%@page import="java.util.Collection" %>
<portlet:defineObjects/>
<script type='text/javascript'
src='/portal-admin/js/domLib.js'></script>
<script type="text/javascript"
src="/portal-admin/js/fadomatic.js"></script>
@@ -44,113 +44,121 @@
%>
- <%
- Portlet portlet = null;
- try
- {
- portlet = selectedInstance.getPortlet();
- }
- catch (PortletInvokerException e)
- {
- e.printStackTrace();
- }
- if (portlet != null)
- {
- MetaInfo metaInfo = portlet.getInfo().getMeta();
+<%
+ Portlet portlet = null;
+ try
+ {
+ portlet = selectedInstance.getPortlet();
+ }
+ catch (PortletInvokerException e)
+ {
+ e.printStackTrace();
+ }
+ if (portlet != null)
+ {
+ MetaInfo metaInfo = portlet.getInfo().getMeta();
- PortletInfo info = portlet.getInfo();
+ PortletInfo info = portlet.getInfo();
- String iconLocation = getIcon(info);
+ String iconLocation = getIcon(info);
- %>
+%>
<tr class="portlet-section-selected">
- <td >
- <img src="<%= iconLocation %>" align="middle"
style="margin:0 4px 0 0"/>
- <span><%= displayName %></span>
+ <td>
+ <img src="<%= iconLocation %>" align="middle"
style="margin:0 4px 0 0"/>
+ <span><%= displayName %></span>
- <div>
- <span class="portlet-form-field-label">Portlet
name:</span><%= metaInfo.getMetaValue(MetaInfo.DISPLAY_NAME).getDefaultString()
%>
- </div>
- <div>
- <span class="portlet-form-field-label">Portlet
description:</span><%=
metaInfo.getMetaValue(MetaInfo.DESCRIPTION).getDefaultString() %>
- </div>
-
+ <div>
+ <span
+ class="portlet-form-field-label">Portlet
name:</span><%= metaInfo.getMetaValue(MetaInfo.DISPLAY_NAME).getDefaultString()
%>
+ </div>
+ <div>
+ <span
+ class="portlet-form-field-label">Portlet
description:</span><%=
metaInfo.getMetaValue(MetaInfo.DESCRIPTION).getDefaultString() %>
+ </div>
+
</td>
- </tr>
- <%
- }
+</tr>
+<%
}
+ }
- %>
+%>
- <tr>
-<td>
+<tr>
+ <td>
-<div style="height:300px; width:500px; overflow: auto; overflow-x: hidden;
border: 1px solid #333;">
- <table style="width:100%;" cellspacing="0"
cellpadding="0">
- <%
- for (IteratorStatus i = new IteratorStatus(instances); i.hasNext();)
- {
- Instance instance = (Instance)i.next();
- String rowClass = instance == selectedInstance ?
"portlet-section-selected" : (i.getIndex() % 2 == 0 ?
"portlet-section-body" : "portlet-section-alternate");
- String displayName =
instance.getDisplayName().getString(renderRequest.getLocale(), true);
- MetaInfo portletMetaInfo = instance.getPortlet().getInfo().getMeta();
+ <div style="height:300px; width:500px; overflow: auto; overflow-x: hidden;
border: 1px solid #333;">
+ <table style="width:100%;" cellspacing="0"
cellpadding="0">
+ <%
+ for (IteratorStatus i = new IteratorStatus(instances); i.hasNext();)
+ {
+ Instance instance = (Instance)i.next();
+ String rowClass = instance == selectedInstance ?
"portlet-section-selected" : (i.getIndex() % 2 == 0 ?
"portlet-section-body" : "portlet-section-alternate");
+ String displayName =
instance.getDisplayName().getString(renderRequest.getLocale(), true);
+ MetaInfo portletMetaInfo = instance.getPortlet().getInfo().getMeta();
- if (displayName == null)
- {
- displayName = instance.getId();
- }
-
- PortletInfo info = instance.getPortlet().getInfo();
+ if (displayName == null)
+ {
+ displayName = instance.getId();
+ }
- String iconLocation = getIcon(info);
+ PortletInfo info = instance.getPortlet().getInfo();
- %>
- <portlet:actionURL var="url">
- <portlet:param name="content.action.select"
value="true"/>
- <portlet:param name="content.uri" value="<%=
instance.getId() %>"/>
- </portlet:actionURL>
+ String iconLocation = getIcon(info);
- <div style="display:none">
- <div class="darktip" id="info-container-<%= displayName
%>">
- <div class="toolbar" style="width: 250px;">
- <div class="title"><%=
portletMetaInfo.getMetaValue(MetaInfo.TITLE).getDefaultString() %></div>
- </div>
- <div class="content">
+ %>
+ <portlet:actionURL var="url">
+ <portlet:param name="content.action.select"
value="true"/>
+ <portlet:param name="content.uri" value="<%=
instance.getId() %>"/>
+ </portlet:actionURL>
- <div>
- <span class="portlet-form-field-label">Portlet
name:</span><%=
portletMetaInfo.getMetaValue(MetaInfo.DISPLAY_NAME).getDefaultString() %>
- </div>
- <div>
- <span class="portlet-form-field-label">Portlet
description:</span><%=
portletMetaInfo.getMetaValue(MetaInfo.DESCRIPTION).getDefaultString() %>
- </div>
- </div>
+ <div style="display:none">
+ <div class="darktip" id="info-container-<%=
displayName %>">
+ <div class="toolbar" style="width: 250px;">
+ <div class="title"><%=
portletMetaInfo.getMetaValue(MetaInfo.TITLE).getDefaultString() %>
+ </div>
+ </div>
+ <div class="content">
+
+ <div>
+ <span
+ class="portlet-form-field-label">Portlet
name:</span><%=
portletMetaInfo.getMetaValue(MetaInfo.DISPLAY_NAME).getDefaultString() %>
+ </div>
+ <div>
+ <span
+ class="portlet-form-field-label">Portlet
description:</span><%=
portletMetaInfo.getMetaValue(MetaInfo.DESCRIPTION).getDefaultString() %>
+ </div>
+ </div>
+ </div>
+
+ </div>
+
+ <tr class="<%= rowClass %>">
+ <td>
+ <img src="<%= iconLocation %>"
align="middle" style="margin:0 4px 0 0"/>
+ <span
+ onmouseover="domTT_activate(this, event, 'content',
document.getElementById('info-container-<%= displayName
%>'),'delay', 0, 'trail', false, 'fade', 'both',
'fadeMax', 95, 'styleClass', 'none');"><a
+ href="<%= url %>"
id="portlet-instance-link"><%= displayName %>
+ </a></span></td>
+ </tr>
+ <%
+ }
+ %>
+ </table>
</div>
-
- </div>
-
- <tr class="<%= rowClass %>" >
- <td >
- <img src="<%= iconLocation %>" align="middle"
style="margin:0 4px 0 0"/>
- <span onmouseover="domTT_activate(this, event, 'content',
document.getElementById('info-container-<%= displayName
%>'),'delay', 0, 'trail', false, 'fade', 'both',
'fadeMax', 95, 'styleClass', 'none');"><a
href="<%= url %>" id="portlet-instance-link"><%=
displayName %></a></span></td>
- </tr>
- <%
- }
- %>
- </table>
-</div>
- </td>
- </tr>
+ </td>
+</tr>
</table>
<%!
private String getIcon(PortletInfo info)
{
String iconLocation = null;
- if (info instanceof CorePortletInfo)
+ CorePortletInfo cInfo = info.getAttachment(CorePortletInfo.class);
+ if (cInfo != null)
{
- CorePortletInfo cInfo = (CorePortletInfo)info;
PortletInfoInfo portletInfo = cInfo.getPortletInfo();
if (portletInfo != null && portletInfo.getPortletIconInfo() != null
&& portletInfo.getPortletIconInfo().getIconLocation(PortletIconInfo.SMALL) !=
null)
{
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/AdminPropertyResolver.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/AdminPropertyResolver.java 2008-03-13
09:44:13 UTC (rev 10280)
+++
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/AdminPropertyResolver.java 2008-03-13
23:22:28 UTC (rev 10281)
@@ -465,9 +465,9 @@
Portlet portlet = (Portlet)bean;
PortletInfo info = portlet.getInfo();
- if (info instanceof CorePortletInfo)
+ CorePortletInfo cInfo = info.getAttachment(CorePortletInfo.class);
+ if (cInfo != null)
{
- CorePortletInfo cInfo = (CorePortletInfo)portlet.getInfo();
PortletInfoInfo portletInfo = cInfo.getPortletInfo();
if (portletInfo != null && portletInfo.getPortletIconInfo() != null
&& portletInfo.getPortletIconInfo().getIconLocation(iconType) != null)
{
Deleted:
branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/deployment/CorePortletInvoker.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/deployment/CorePortletInvoker.java 2008-03-13
09:44:13 UTC (rev 10280)
+++
branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/deployment/CorePortletInvoker.java 2008-03-13
23:22:28 UTC (rev 10281)
@@ -1,172 +0,0 @@
-/******************************************************************************
- * 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.portlet.deployment;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.jboss.logging.Logger;
-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.info.PortletInfo;
-import org.jboss.portal.portlet.invocation.PortletInvocation;
-import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
-import org.jboss.portal.portlet.state.DestroyCloneFailure;
-import org.jboss.portal.portlet.state.PropertyChange;
-import org.jboss.portal.portlet.state.PropertyMap;
-
-/**
- * @author <a href="mailto:theute@jboss.org">Thomas Heute</a>
- * @version $Revision$
- */
-public class CorePortletInvoker implements PortletInvoker
-{
- public static final Object PORTLET_CORE_INFO = "PORTLET_CORE_INFO";
-
- /** . */
- private PortletInvoker portletInvoker;
-
- /** The logger. */
- protected final Logger log = Logger.getLogger(getClass());
-
- private Map<String, Map<String, PortletInfo>> portletInfoMap = new
HashMap<String, Map<String, PortletInfo>>();
-
- public PortletInvoker getPortletInvoker()
- {
- return portletInvoker;
- }
-
- public void addPortletInfo(String applicationName, String name, PortletInfo value)
- {
- Map<String, PortletInfo> map = portletInfoMap.get(applicationName);
- if (map == null)
- {
- map = new HashMap<String, PortletInfo>();
- portletInfoMap.put(applicationName, map);
- }
- map.put(name, value);
- }
-
- public PortletInfo getPortletInfo(String applicationName, String name)
- {
- Map<String, PortletInfo> map = portletInfoMap.get(applicationName);
- if (map == null)
- {
- return null;
- }
- return map.get(name);
- }
-
- public void setPortletInvoker(PortletInvoker portletInvoker)
- {
- this.portletInvoker = portletInvoker;
- }
-
- public PortletContext createClone(PortletContext portletContext) throws
IllegalArgumentException,
- PortletInvokerException, UnsupportedOperationException
- {
- return portletInvoker.createClone(portletContext);
- }
-
- public List<DestroyCloneFailure> destroyClones(List<PortletContext>
portletContexts)
- throws IllegalArgumentException, PortletInvokerException,
UnsupportedOperationException
- {
- return portletInvoker.destroyClones(portletContexts);
- }
-
- public Portlet getPortlet(PortletContext portletContext) throws
IllegalArgumentException, PortletInvokerException
- {
- return new PortletImpl(portletInvoker.getPortlet(portletContext));
- }
-
- public Set<Portlet> getPortlets() throws PortletInvokerException
- {
- return portletInvoker.getPortlets();
- }
-
- public PropertyMap getProperties(PortletContext portletContext) throws
IllegalArgumentException,
- PortletInvokerException, UnsupportedOperationException
- {
- return portletInvoker.getProperties(portletContext);
- }
-
- public PropertyMap getProperties(PortletContext portletContext, Set<String>
keys) throws IllegalArgumentException,
- PortletInvokerException, UnsupportedOperationException
- {
- return portletInvoker.getProperties(portletContext, keys);
- }
-
- public PortletInvocationResponse invoke(PortletInvocation invocation) throws
IllegalArgumentException,
- PortletInvokerException
- {
- PortletContext ctx = invocation.getTarget();
- PortletInfo info = portletInvoker.getPortlet(ctx).getInfo();
-
- invocation.setAttribute(PortletInvocation.INVOCATION_SCOPE, PORTLET_CORE_INFO,
getPortletInfo(info.getApplicationName(), info.getName()));
- try
- {
- return portletInvoker.invoke(invocation);
- }
- finally
- {
- invocation.removeAttribute(PortletInvocation.INVOCATION_SCOPE,
PORTLET_CORE_INFO);
- }
- }
-
- public PortletContext setProperties(PortletContext portletContext, PropertyChange[]
changes)
- throws IllegalArgumentException, PortletInvokerException,
UnsupportedOperationException
- {
- return portletInvoker.setProperties(portletContext, changes);
- }
-
- private class PortletImpl implements Portlet
- {
-
- private Portlet delegate;
-
- public PortletImpl(Portlet delegate)
- {
- this.delegate = delegate;
- }
-
- public PortletContext getContext()
- {
- return delegate.getContext();
- }
-
- public PortletInfo getInfo()
- {
- return getPortletInfo(delegate.getInfo().getApplicationName(),
delegate.getInfo().getName());
- }
-
- public boolean isRemote()
- {
- return delegate.isRemote();
- }
- }
-}
-
Modified:
branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeployment.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeployment.java 2008-03-13
09:44:13 UTC (rev 10280)
+++
branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeployment.java 2008-03-13
23:22:28 UTC (rev 10281)
@@ -32,7 +32,6 @@
import org.jboss.portal.portlet.container.object.PortletApplicationObject;
import org.jboss.portal.portlet.container.object.PortletContainerObject;
import org.jboss.portal.portlet.container.object.PortletFilterObject;
-import org.jboss.portal.portlet.deployment.CorePortletInvoker;
import org.jboss.portal.portlet.deployment.PortletApplicationModelFactory;
import org.jboss.portal.portlet.deployment.jboss.metadata.JBossApplicationMetaData;
import org.jboss.portal.portlet.deployment.jboss.metadata.JBossPortletMetaData;
@@ -188,8 +187,6 @@
//
PortletContainerLifeCycle portletContainerLifeCycle =
portletApplicationLifeCycle.addPortletContainer(portletContainerContext,
portletContainerObject);
-
((CorePortletInvoker)factory.getCorePortletInvoker()).addPortletInfo(portletInfo.getApplicationName(),
portletInfo.getName(), portletInfo);
-
// Now create deps
for (String filterRef : cpi.getFilterRefs())
{
Modified:
branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeploymentFactory.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeploymentFactory.java 2008-03-13
09:44:13 UTC (rev 10280)
+++
branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeploymentFactory.java 2008-03-13
23:22:28 UTC (rev 10281)
@@ -22,13 +22,6 @@
******************************************************************************/
package org.jboss.portal.portlet.deployment.jboss;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import javax.management.MBeanServer;
-
import org.jboss.deployment.DeploymentException;
import org.jboss.portal.common.io.IOTools;
import org.jboss.portal.portlet.PortletInvoker;
@@ -51,6 +44,12 @@
import org.jboss.xb.binding.UnmarshallerFactory;
import org.xml.sax.EntityResolver;
+import javax.management.MBeanServer;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
/**
* todo : remove unused ConfigService
*
@@ -80,8 +79,6 @@
private PortletInvoker portletContainerInvoker;
- private PortletInvoker corePortletInvoker;
-
private InfoBuilderFactory coreInfoBuilderFactory;
public EntityResolver getJBossPortletEntityResolver()
@@ -93,12 +90,12 @@
{
this.jbossPortletEntityResolver = jbossPortletEntityResolver;
}
-
+
public void setCoreInfoBuilderFactory(InfoBuilderFactory coreInfoBuilderFactory)
{
this.coreInfoBuilderFactory = coreInfoBuilderFactory;
}
-
+
public InfoBuilderFactory getCoreInfoBuilderFactory()
{
return coreInfoBuilderFactory;
@@ -196,7 +193,7 @@
{
return new JBossApplicationMetaDataFactory();
}
-
+
public PortletInvoker getPortletContainerInvoker()
{
return portletContainerInvoker;
@@ -207,19 +204,7 @@
this.portletContainerInvoker = portletContainerInvoker;
}
- public PortletInvoker getCorePortletInvoker()
- {
- return corePortletInvoker;
- }
-
- public void setCorePortletInvoker(PortletInvoker corePortletInvoker)
- {
- this.corePortletInvoker = corePortletInvoker;
- }
-
- /**
- * Bridge managed object event to add/remove portlet container in portlet container
invoker.
- */
+ /** Bridge managed object event to add/remove portlet container in portlet container
invoker. */
protected final ManagedObjectRegistryEventListener bridgeToInvoker = new
ManagedObjectRegistryEventListener()
{
public void onEvent(ManagedObjectRegistryEvent event)
Modified:
branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/web/jboss/JBossWebContext.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/web/jboss/JBossWebContext.java 2008-03-13
09:44:13 UTC (rev 10280)
+++
branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/web/jboss/JBossWebContext.java 2008-03-13
23:22:28 UTC (rev 10281)
@@ -25,8 +25,8 @@
import org.jboss.portal.web.RequestDispatchCallback;
import org.jboss.portal.web.ServletContainer;
import org.jboss.portal.web.ServletContainerFactory;
+import org.jboss.portal.web.command.CommandDispatcher;
import org.jboss.portal.web.impl.DefaultServletContainerFactory;
-import org.jboss.portal.web.command.CommandDispatcher;
import org.jboss.portal.web.spi.ServletContainerContext;
import javax.servlet.ServletContext;
@@ -36,8 +36,8 @@
import java.io.IOException;
/**
- * JBossWeb implementation of the spi. It implements the
<code>ServletContainerFactory</code> interface
- * but it get the returned instance from the DefaultServletContainerFactory instance.
+ * JBossWeb implementation of the spi. It implements the
<code>ServletContainerFactory</code> interface but it gets the
+ * returned instance from the DefaultServletContainerFactory instance.
*
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision$