JBoss Portal SVN: r10607 - branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/render.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2008-04-16 10:12:51 -0400 (Wed, 16 Apr 2008)
New Revision: 10607
Modified:
branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/render/RenderPageCommand.java
Log:
JBPORTAL-1991 - use cached user profile
Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/render/RenderPageCommand.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/render/RenderPageCommand.java 2008-04-16 13:13:50 UTC (rev 10606)
+++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/render/RenderPageCommand.java 2008-04-16 14:12:51 UTC (rev 10607)
@@ -40,6 +40,7 @@
import org.jboss.portal.core.model.portal.content.WindowRendition;
import org.jboss.portal.core.theme.PageRendition;
import org.jboss.portal.core.theme.WindowContextFactory;
+import org.jboss.portal.core.aspects.server.UserInterceptor;
import org.jboss.portal.identity.User;
import org.jboss.portal.identity.UserProfileModule;
import org.jboss.portal.security.spi.auth.PortalAuthorizationManager;
@@ -50,6 +51,7 @@
import org.jboss.portal.theme.ThemeConstants;
import org.jboss.portal.theme.ThemeService;
import org.jboss.portal.theme.page.PageResult;
+import org.jboss.portal.server.ServerInvocation;
import javax.naming.InitialContext;
import javax.naming.NamingException;
@@ -57,6 +59,7 @@
import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
+import java.util.Map;
/**
* Render a full page.
@@ -163,9 +166,21 @@
// Name is not bound anymore, it could happen during a shutdown, we don't do anything
}
- //
- String themeId = (String)userProfileModule.getProperty(user, User.INFO_USER_THEME);
+ // If its possible use cachec user profile to obtain theme
+ Map profile = (Map)getContext().getAttribute(ServerInvocation.PRINCIPAL_SCOPE, UserInterceptor.PROFILE_KEY);
+
+ String themeId = null;
+
+ if (profile == null)
+ {
+ themeId = (String)userProfileModule.getProperty(user, User.INFO_USER_THEME);
+ }
+ else
+ {
+ themeId = (String)profile.get(User.INFO_USER_THEME);
+ }
+
if (themeId != null)
{
theme = themeService.getThemeById(themeId);
18 years
JBoss Portal SVN: r10606 - in branches/JBoss_Portal_Branch_2_7: faces/src/main/org/jboss/portal/faces/component/portlet and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-04-16 09:13:50 -0400 (Wed, 16 Apr 2008)
New Revision: 10606
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/faces/src/main/org/jboss/portal/faces/component/portlet/JSFInvocation.java
Log:
Fixed a content selector bug
Fixed a JSFInvocation issue when no portlet mode or window state was explicitly defined
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-04-16 11:03:11 UTC (rev 10605)
+++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp 2008-04-16 13:13:50 UTC (rev 10606)
@@ -12,12 +12,13 @@
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="javax.portlet.PortletURL" %>
<%@ page import="java.net.URLEncoder" %>
+<%@page import="org.jboss.portal.portlet.impl.info.ContainerPortletInfo"%>
+<%@page import="org.jboss.portal.core.metadata.portlet.PortletInfoMetaData"%>
<portlet:defineObjects/>
<script type='text/javascript' src='/portal-admin/js/domLib.js'></script>
<script type="text/javascript" src="/portal-admin/js/fadomatic.js"></script>
@@ -182,11 +183,12 @@
private String getIcon(PortletInfo info)
{
String iconLocation = null;
- if (info instanceof CorePortletInfo)
+ if (info instanceof ContainerPortletInfo)
{
- CorePortletInfo cInfo = (CorePortletInfo)info;
- PortletInfoInfo portletInfo = cInfo.getPortletInfo();
- if (portletInfo != null && portletInfo.getPortletIconInfo() != null && portletInfo.getPortletIconInfo().getIconLocation(PortletIconInfo.SMALL) != null)
+ ContainerPortletInfo cInfo = (ContainerPortletInfo)info;
+ PortletInfoInfo portletInfo = cInfo.getAttachment(PortletInfoInfo.class);
+ if (portletInfo != null && portletInfo.getPortletIconInfo() != null
+ && portletInfo.getPortletIconInfo().getIconLocation(PortletIconInfo.SMALL) != null)
{
iconLocation = portletInfo.getPortletIconInfo().getIconLocation(PortletIconInfo.SMALL);
}
Modified: branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/component/portlet/JSFInvocation.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/component/portlet/JSFInvocation.java 2008-04-16 11:03:11 UTC (rev 10605)
+++ branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/component/portlet/JSFInvocation.java 2008-04-16 13:13:50 UTC (rev 10606)
@@ -163,6 +163,24 @@
//
PortletInvocation action = new ActionInvocation(portletInvocationContext);
+ if (mode != null)
+ {
+ action.setMode(mode);
+ }
+ else
+ {
+ action.setMode(Mode.VIEW);
+ }
+
+ if (windowState != null)
+ {
+ action.setWindowState(windowState);
+ }
+ else
+ {
+ action.setWindowState(WindowState.NORMAL);
+ }
+
//
return invoke(portlet, action);
}
@@ -178,7 +196,25 @@
//
PortletInvocation render = new RenderInvocation(portletInvocationContext);
+
+ if (mode != null)
+ {
+ render.setMode(mode);
+ }
+ else
+ {
+ render.setMode(Mode.VIEW);
+ }
+ if (windowState != null)
+ {
+ render.setWindowState(windowState);
+ }
+ else
+ {
+ render.setWindowState(WindowState.NORMAL);
+ }
+
//
return invoke(portlet, render);
}
@@ -225,6 +261,7 @@
this.invocation = invocation;
this.navigationalState = navigationalState;
+
//
addResolver(PortletInvocation.INVOCATION_SCOPE, new MapAttributeResolver());
// addResolver(PortletInvocation.REQUEST_SCOPE, controllerContext);
18 years
JBoss Portal SVN: r10605 - branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/component/portlet.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-04-16 07:03:11 -0400 (Wed, 16 Apr 2008)
New Revision: 10605
Modified:
branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/component/portlet/JSFInvocation.java
Log:
Principal scope needed
Modified: branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/component/portlet/JSFInvocation.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/component/portlet/JSFInvocation.java 2008-04-16 06:41:26 UTC (rev 10604)
+++ branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/component/portlet/JSFInvocation.java 2008-04-16 11:03:11 UTC (rev 10605)
@@ -26,6 +26,7 @@
import org.jboss.portal.WindowState;
import org.jboss.portal.common.invocation.EmptyAttributeResolver;
import org.jboss.portal.common.invocation.resolver.MapAttributeResolver;
+import org.jboss.portal.common.invocation.resolver.PrincipalAttributeResolver;
import org.jboss.portal.common.net.media.MediaType;
import org.jboss.portal.common.text.FastURLEncoder;
import org.jboss.portal.common.util.MarkupInfo;
@@ -227,7 +228,7 @@
//
addResolver(PortletInvocation.INVOCATION_SCOPE, new MapAttributeResolver());
// addResolver(PortletInvocation.REQUEST_SCOPE, controllerContext);
-// addResolver(PortletInvocation.PRINCIPAL_SCOPE, controllerContext);
+ addResolver(PortletInvocation.PRINCIPAL_SCOPE, new PrincipalAttributeResolver(clientRequest));
// addResolver(PortletInvocation.REQUEST_PROPERTIES_SCOPE, EmptyAttributeResolver.getInstance());
// addResolver(PortletInvocation.RESPONSE_PROPERTIES_SCOPE, new MapAttributeResolver());
}
18 years
JBoss Portal SVN: r10604 - modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2008-04-16 02:41:26 -0400 (Wed, 16 Apr 2008)
New Revision: 10604
Modified:
modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap/LDAPExtUserModuleImpl.java
modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap/LDAPUserModuleImpl.java
Log:
bobo
Modified: modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap/LDAPExtUserModuleImpl.java
===================================================================
--- modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap/LDAPExtUserModuleImpl.java 2008-04-16 06:39:37 UTC (rev 10603)
+++ modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap/LDAPExtUserModuleImpl.java 2008-04-16 06:41:26 UTC (rev 10604)
@@ -52,6 +52,7 @@
public User findUserByUserName(String userName) throws IdentityException, IllegalArgumentException, NoSuchUserException
{
+ Context ctx = null;
try
{
log.debug("findUserByUserName(): username = " + userName);
@@ -73,7 +74,7 @@
"Posible data inconsistency");
}
SearchResult res = (SearchResult)sr.iterator().next();
- Context ctx = (Context)res.getObject();
+ ctx = (Context)res.getObject();
String dn = ctx.getNameInNamespace();
User user = createUserInstance(res.getAttributes(), dn);
ctx.close();
@@ -89,6 +90,20 @@
{
throw new IdentityException("User search failed.", e);
}
+ finally
+ {
+ try
+ {
+ if (ctx != null)
+ {
+ ctx.close();
+ }
+ }
+ catch (NamingException e)
+ {
+ throw new IdentityException("Failed to close LDAP connection", e);
+ }
+ }
throw new NoSuchUserException("No user found with name: " + userName);
}
Modified: modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap/LDAPUserModuleImpl.java
===================================================================
--- modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap/LDAPUserModuleImpl.java 2008-04-16 06:39:37 UTC (rev 10603)
+++ modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap/LDAPUserModuleImpl.java 2008-04-16 06:41:26 UTC (rev 10604)
@@ -65,6 +65,7 @@
public User findUserByUserName(String userName) throws IdentityException, IllegalArgumentException, NoSuchUserException
{
+ Context ctx = null;
try
{
log.debug("findUserByUserName(): username = " + userName);
@@ -85,7 +86,7 @@
"Posible data inconsistency");
}
SearchResult res = (SearchResult)sr.iterator().next();
- Context ctx = (Context)res.getObject();
+ ctx = (Context)res.getObject();
String dn = ctx.getNameInNamespace();
User user = createUserInstance(res.getAttributes(), dn);
ctx.close();
@@ -101,6 +102,20 @@
{
throw new IdentityException("User search failed.", e);
}
+ finally
+ {
+ try
+ {
+ if (ctx != null)
+ {
+ ctx.close();
+ }
+ }
+ catch (NamingException e)
+ {
+ throw new IdentityException("Failed to close LDAP connection", e);
+ }
+ }
throw new NoSuchUserException("No user found with name: " + userName);
}
18 years
JBoss Portal SVN: r10603 - modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/ldap.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2008-04-16 02:39:37 -0400 (Wed, 16 Apr 2008)
New Revision: 10603
Modified:
modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/ldap/LDAPExtUserModuleImpl.java
modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/ldap/LDAPUserModuleImpl.java
Log:
bobo
Modified: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/ldap/LDAPExtUserModuleImpl.java
===================================================================
--- modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/ldap/LDAPExtUserModuleImpl.java 2008-04-16 00:26:13 UTC (rev 10602)
+++ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/ldap/LDAPExtUserModuleImpl.java 2008-04-16 06:39:37 UTC (rev 10603)
@@ -52,6 +52,7 @@
public User findUserByUserName(String userName) throws IdentityException, IllegalArgumentException, NoSuchUserException
{
+ Context ctx = null;
try
{
log.debug("findUserByUserName(): username = " + userName);
@@ -73,7 +74,7 @@
"Posible data inconsistency");
}
SearchResult res = (SearchResult)sr.iterator().next();
- Context ctx = (Context)res.getObject();
+ ctx = (Context)res.getObject();
String dn = ctx.getNameInNamespace();
User user = createUserInstance(res.getAttributes(), dn);
ctx.close();
@@ -89,6 +90,21 @@
{
throw new IdentityException("User search failed.", e);
}
+ finally
+ {
+ try
+ {
+ if (ctx != null)
+ {
+ ctx.close();
+ }
+ }
+ catch (NamingException e)
+ {
+ throw new IdentityException("Failed to close LDAP connection", e);
+ }
+ }
+
throw new NoSuchUserException("No user found with name: " + userName);
}
Modified: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/ldap/LDAPUserModuleImpl.java
===================================================================
--- modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/ldap/LDAPUserModuleImpl.java 2008-04-16 00:26:13 UTC (rev 10602)
+++ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/ldap/LDAPUserModuleImpl.java 2008-04-16 06:39:37 UTC (rev 10603)
@@ -65,6 +65,7 @@
public User findUserByUserName(String userName) throws IdentityException, IllegalArgumentException, NoSuchUserException
{
+ Context ctx = null;
try
{
log.debug("findUserByUserName(): username = " + userName);
@@ -85,7 +86,7 @@
"Posible data inconsistency");
}
SearchResult res = (SearchResult)sr.iterator().next();
- Context ctx = (Context)res.getObject();
+ ctx = (Context)res.getObject();
String dn = ctx.getNameInNamespace();
User user = createUserInstance(res.getAttributes(), dn);
ctx.close();
@@ -101,6 +102,20 @@
{
throw new IdentityException("User search failed.", e);
}
+ finally
+ {
+ try
+ {
+ if (ctx != null)
+ {
+ ctx.close();
+ }
+ }
+ catch (NamingException e)
+ {
+ throw new IdentityException("Failed to close LDAP connection", e);
+ }
+ }
throw new NoSuchUserException("No user found with name: " + userName);
}
18 years
JBoss Portal SVN: r10602 - modules/common/trunk/common/src/main/java/org/jboss/portal/common/value.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-04-15 20:26:13 -0400 (Tue, 15 Apr 2008)
New Revision: 10602
Modified:
modules/common/trunk/common/src/main/java/org/jboss/portal/common/value/BooleanValue.java
modules/common/trunk/common/src/main/java/org/jboss/portal/common/value/Converter.java
modules/common/trunk/common/src/main/java/org/jboss/portal/common/value/FloatValue.java
modules/common/trunk/common/src/main/java/org/jboss/portal/common/value/Helper.java
modules/common/trunk/common/src/main/java/org/jboss/portal/common/value/IntegerValue.java
modules/common/trunk/common/src/main/java/org/jboss/portal/common/value/StringValue.java
modules/common/trunk/common/src/main/java/org/jboss/portal/common/value/Value.java
Log:
mark some code as deprecated because we are going to remove it as soon as it won't be referenced anymore by the main core portal
Modified: modules/common/trunk/common/src/main/java/org/jboss/portal/common/value/BooleanValue.java
===================================================================
--- modules/common/trunk/common/src/main/java/org/jboss/portal/common/value/BooleanValue.java 2008-04-16 00:20:18 UTC (rev 10601)
+++ modules/common/trunk/common/src/main/java/org/jboss/portal/common/value/BooleanValue.java 2008-04-16 00:26:13 UTC (rev 10602)
@@ -27,6 +27,7 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 5451 $
*/
+@Deprecated
public class BooleanValue extends Value
{
Modified: modules/common/trunk/common/src/main/java/org/jboss/portal/common/value/Converter.java
===================================================================
--- modules/common/trunk/common/src/main/java/org/jboss/portal/common/value/Converter.java 2008-04-16 00:20:18 UTC (rev 10601)
+++ modules/common/trunk/common/src/main/java/org/jboss/portal/common/value/Converter.java 2008-04-16 00:26:13 UTC (rev 10602)
@@ -30,6 +30,7 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 7200 $
*/
+@Deprecated
public interface Converter
{
/**
Modified: modules/common/trunk/common/src/main/java/org/jboss/portal/common/value/FloatValue.java
===================================================================
--- modules/common/trunk/common/src/main/java/org/jboss/portal/common/value/FloatValue.java 2008-04-16 00:20:18 UTC (rev 10601)
+++ modules/common/trunk/common/src/main/java/org/jboss/portal/common/value/FloatValue.java 2008-04-16 00:26:13 UTC (rev 10602)
@@ -26,6 +26,7 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 5451 $
*/
+@Deprecated
public class FloatValue extends Value
{
Modified: modules/common/trunk/common/src/main/java/org/jboss/portal/common/value/Helper.java
===================================================================
--- modules/common/trunk/common/src/main/java/org/jboss/portal/common/value/Helper.java 2008-04-16 00:20:18 UTC (rev 10601)
+++ modules/common/trunk/common/src/main/java/org/jboss/portal/common/value/Helper.java 2008-04-16 00:26:13 UTC (rev 10602)
@@ -30,6 +30,7 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 7200 $
*/
+@Deprecated
public class Helper
{
Modified: modules/common/trunk/common/src/main/java/org/jboss/portal/common/value/IntegerValue.java
===================================================================
--- modules/common/trunk/common/src/main/java/org/jboss/portal/common/value/IntegerValue.java 2008-04-16 00:20:18 UTC (rev 10601)
+++ modules/common/trunk/common/src/main/java/org/jboss/portal/common/value/IntegerValue.java 2008-04-16 00:26:13 UTC (rev 10602)
@@ -27,6 +27,7 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 5451 $
*/
+@Deprecated
public class IntegerValue extends Value
{
Modified: modules/common/trunk/common/src/main/java/org/jboss/portal/common/value/StringValue.java
===================================================================
--- modules/common/trunk/common/src/main/java/org/jboss/portal/common/value/StringValue.java 2008-04-16 00:20:18 UTC (rev 10601)
+++ modules/common/trunk/common/src/main/java/org/jboss/portal/common/value/StringValue.java 2008-04-16 00:26:13 UTC (rev 10602)
@@ -29,6 +29,7 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 5451 $
*/
+@Deprecated
public class StringValue extends Value
{
Modified: modules/common/trunk/common/src/main/java/org/jboss/portal/common/value/Value.java
===================================================================
--- modules/common/trunk/common/src/main/java/org/jboss/portal/common/value/Value.java 2008-04-16 00:20:18 UTC (rev 10601)
+++ modules/common/trunk/common/src/main/java/org/jboss/portal/common/value/Value.java 2008-04-16 00:26:13 UTC (rev 10602)
@@ -61,6 +61,7 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 5451 $
*/
+@Deprecated
public abstract class Value implements Serializable, Cloneable
{
18 years
JBoss Portal SVN: r10601 - modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-04-15 20:20:18 -0400 (Tue, 15 Apr 2008)
New Revision: 10601
Added:
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/ContainerPortletDispatcher.java
Log:
forgot to add that important class
Added: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/ContainerPortletDispatcher.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/ContainerPortletDispatcher.java (rev 0)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/ContainerPortletDispatcher.java 2008-04-16 00:20:18 UTC (rev 10601)
@@ -0,0 +1,44 @@
+/******************************************************************************
+ * 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.portlet.container;
+
+import org.jboss.portal.portlet.PortletInvokerInterceptor;
+import org.jboss.portal.portlet.invocation.PortletInvocation;
+import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
+import org.jboss.portal.portlet.PortletInvokerException;
+
+/**
+ * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+public class ContainerPortletDispatcher extends PortletInvokerInterceptor
+{
+
+ public PortletInvocationResponse invoke(PortletInvocation invocation) throws IllegalArgumentException, PortletInvokerException
+ {
+ PortletContainer container = (PortletContainer)invocation.getAttribute(ContainerPortletInvoker.PORTLET_CONTAINER);
+
+ //
+ return container.dispatch(invocation);
+ }
+}
18 years
JBoss Portal SVN: r10600 - in modules/portlet/trunk: management/src/main/java/org/jboss/portal/portlet/management and 8 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-04-15 20:17:02 -0400 (Tue, 15 Apr 2008)
New Revision: 10600
Added:
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/PortletInvokerInterceptor.java
Modified:
modules/portlet/trunk/bridge/src/main/java/org/jboss/portal/portlet/bridge/BridgeInterceptor.java
modules/portlet/trunk/management/src/main/java/org/jboss/portal/portlet/management/PortletContainerManagementInterceptorImpl.java
modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/jboss-beans.xml
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/CCPPInterceptor.java
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ConsumerCacheInterceptor.java
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ContextDispatcherInterceptor.java
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/EventPayloadInterceptor.java
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/LocalInterceptor.java
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/PortletCustomizationInterceptor.java
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ProducerCacheInterceptor.java
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/RequestAttributeConversationInterceptor.java
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/SecureTransportInterceptor.java
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ValveInterceptor.java
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/ContainerPortletInvoker.java
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/consumer/ConsumerPortletInvoker.java
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/producer/ProducerPortletInvoker.java
modules/portlet/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/jboss-beans.xml
modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/jboss-beans.xml
Log:
move the PortetInvokerInterceptor to o.j.p.portlet package as it is related to that package
Modified: modules/portlet/trunk/bridge/src/main/java/org/jboss/portal/portlet/bridge/BridgeInterceptor.java
===================================================================
--- modules/portlet/trunk/bridge/src/main/java/org/jboss/portal/portlet/bridge/BridgeInterceptor.java 2008-04-16 00:07:05 UTC (rev 10599)
+++ modules/portlet/trunk/bridge/src/main/java/org/jboss/portal/portlet/bridge/BridgeInterceptor.java 2008-04-16 00:17:02 UTC (rev 10600)
@@ -23,7 +23,7 @@
package org.jboss.portal.portlet.bridge;
import org.jboss.portal.portlet.invocation.PortletInvocation;
-import org.jboss.portal.portlet.invocation.PortletInvokerInterceptor;
+import org.jboss.portal.portlet.PortletInvokerInterceptor;
import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
import org.jboss.portal.portlet.PortletInvokerException;
Modified: modules/portlet/trunk/management/src/main/java/org/jboss/portal/portlet/management/PortletContainerManagementInterceptorImpl.java
===================================================================
--- modules/portlet/trunk/management/src/main/java/org/jboss/portal/portlet/management/PortletContainerManagementInterceptorImpl.java 2008-04-16 00:07:05 UTC (rev 10599)
+++ modules/portlet/trunk/management/src/main/java/org/jboss/portal/portlet/management/PortletContainerManagementInterceptorImpl.java 2008-04-16 00:17:02 UTC (rev 10600)
@@ -27,10 +27,10 @@
import org.jboss.portal.portlet.PortletContext;
import org.jboss.portal.portlet.PortletInvokerException;
+import org.jboss.portal.portlet.PortletInvokerInterceptor;
import org.jboss.portal.portlet.invocation.ActionInvocation;
import org.jboss.portal.portlet.invocation.PortletInvocation;
import org.jboss.portal.portlet.invocation.RenderInvocation;
-import org.jboss.portal.portlet.invocation.PortletInvokerInterceptor;
import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
/**
Modified: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/jboss-beans.xml
===================================================================
--- modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/jboss-beans.xml 2008-04-16 00:07:05 UTC (rev 10599)
+++ modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/jboss-beans.xml 2008-04-16 00:17:02 UTC (rev 10600)
@@ -52,7 +52,7 @@
<bean name="ProducerStateConverter" class="org.jboss.portal.portlet.impl.state.StateConverterV0"/>
<!-- The consumer portlet invoker -->
- <bean name="ConsumerPortletInvoker" class="org.jboss.portal.portlet.invocation.PortletInvokerInterceptor">
+ <bean name="ConsumerPortletInvoker" class="org.jboss.portal.portlet.PortletInvokerInterceptor">
<property name="next"><inject bean="ConsumerCacheInterceptor"/></property>
</bean>
<bean name="ConsumerCacheInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ConsumerCacheInterceptor">
Copied: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/PortletInvokerInterceptor.java (from rev 10596, modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/PortletInvokerInterceptor.java)
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/PortletInvokerInterceptor.java (rev 0)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/PortletInvokerInterceptor.java 2008-04-16 00:17:02 UTC (rev 10600)
@@ -0,0 +1,129 @@
+/******************************************************************************
+ * 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.portlet;
+
+import org.jboss.portal.portlet.state.DestroyCloneFailure;
+import org.jboss.portal.portlet.state.PropertyMap;
+import org.jboss.portal.portlet.state.PropertyChange;
+import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
+import org.jboss.portal.portlet.invocation.PortletInvocation;
+
+import java.util.Set;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicReference;
+
+/**
+ * A base class for {@link org.jboss.portal.portlet.PortletInvoker} interface interceptors. The subclasses
+ * extends it and override the intercepted methods. The next interceptor in the chain is wired in the field
+ * {@link #next} of the interceptor. When the interceptor wants to give control to the next interceptor, it must
+ * invoke the same method on the super class. If no next interceptor is configured the invocation of the parent
+ * method will throw an {@link IllegalStateException}.
+ *
+ * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+public class PortletInvokerInterceptor implements PortletInvoker
+{
+
+ /** . */
+ private final AtomicReference<PortletInvoker> next = new AtomicReference<PortletInvoker>();
+
+ public PortletInvokerInterceptor()
+ {
+ }
+
+ public PortletInvokerInterceptor(PortletInvoker next)
+ {
+ this.next.set(next);
+ }
+
+ public PortletInvoker getNext()
+ {
+ return next.get();
+ }
+
+ public void setNext(PortletInvoker next)
+ {
+ this.next.set(next);
+ }
+
+ public Set<Portlet> getPortlets() throws PortletInvokerException
+ {
+ return safeGetNext().getPortlets();
+ }
+
+ public Portlet getPortlet(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException
+ {
+ return safeGetNext().getPortlet(portletContext);
+ }
+
+ public PortletInvocationResponse invoke(PortletInvocation invocation) throws IllegalArgumentException, PortletInvokerException
+ {
+ return safeGetNext().invoke(invocation);
+ }
+
+ public PortletContext createClone(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException
+ {
+ return safeGetNext().createClone(portletContext);
+ }
+
+ public List<DestroyCloneFailure> destroyClones(List<PortletContext> portletContexts) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException
+ {
+ return safeGetNext().destroyClones(portletContexts);
+ }
+
+ public PropertyMap getProperties(PortletContext portletContext, Set<String> keys) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException
+ {
+ return safeGetNext().getProperties(portletContext, keys);
+ }
+
+ public PropertyMap getProperties(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException
+ {
+ return safeGetNext().getProperties(portletContext);
+ }
+
+ public PortletContext setProperties(PortletContext portletContext, PropertyChange[] changes) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException
+ {
+ return safeGetNext().setProperties(portletContext, changes);
+ }
+
+ /**
+ * Attempt to get the next invoker, the method never returns a null value and rather throws an {@link IllegalStateException}
+ * if the next invoker cannot be obtained.
+ *
+ * @return the non null next invoker
+ */
+ private PortletInvoker safeGetNext()
+ {
+ PortletInvoker next = this.next.get();
+
+ //
+ if (next == null)
+ {
+ throw new IllegalStateException("No next invoker");
+ }
+
+ //
+ return next;
+ }
+}
Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/CCPPInterceptor.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/CCPPInterceptor.java 2008-04-16 00:07:05 UTC (rev 10599)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/CCPPInterceptor.java 2008-04-16 00:17:02 UTC (rev 10600)
@@ -23,7 +23,7 @@
package org.jboss.portal.portlet.aspects.portlet;
import org.jboss.portal.portlet.invocation.PortletInvocation;
-import org.jboss.portal.portlet.invocation.PortletInvokerInterceptor;
+import org.jboss.portal.portlet.PortletInvokerInterceptor;
import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
import org.jboss.portal.portlet.PortletInvokerException;
Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ConsumerCacheInterceptor.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ConsumerCacheInterceptor.java 2008-04-16 00:07:05 UTC (rev 10599)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ConsumerCacheInterceptor.java 2008-04-16 00:17:02 UTC (rev 10600)
@@ -24,7 +24,7 @@
import org.jboss.portal.portlet.invocation.PortletInvocation;
import org.jboss.portal.portlet.invocation.RenderInvocation;
-import org.jboss.portal.portlet.invocation.PortletInvokerInterceptor;
+import org.jboss.portal.portlet.PortletInvokerInterceptor;
import org.jboss.portal.portlet.aspects.portlet.cache.ContentRef;
import org.jboss.portal.portlet.aspects.portlet.cache.StrongContentRef;
import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ContextDispatcherInterceptor.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ContextDispatcherInterceptor.java 2008-04-16 00:07:05 UTC (rev 10599)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ContextDispatcherInterceptor.java 2008-04-16 00:17:02 UTC (rev 10600)
@@ -29,7 +29,7 @@
import org.jboss.portal.web.ServletContainer;
import org.jboss.portal.web.ServletContainerFactory;
import org.jboss.portal.portlet.invocation.PortletInvocation;
-import org.jboss.portal.portlet.invocation.PortletInvokerInterceptor;
+import org.jboss.portal.portlet.PortletInvokerInterceptor;
import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
import org.jboss.portal.portlet.spi.ServerContext;
import org.jboss.portal.portlet.PortletInvokerException;
Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/EventPayloadInterceptor.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/EventPayloadInterceptor.java 2008-04-16 00:07:05 UTC (rev 10599)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/EventPayloadInterceptor.java 2008-04-16 00:17:02 UTC (rev 10600)
@@ -24,7 +24,7 @@
import org.jboss.portal.portlet.invocation.PortletInvocation;
import org.jboss.portal.portlet.invocation.EventInvocation;
-import org.jboss.portal.portlet.invocation.PortletInvokerInterceptor;
+import org.jboss.portal.portlet.PortletInvokerInterceptor;
import org.jboss.portal.portlet.invocation.response.ErrorResponse;
import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
import org.jboss.portal.portlet.container.PortletContainer;
Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/LocalInterceptor.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/LocalInterceptor.java 2008-04-16 00:07:05 UTC (rev 10599)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/LocalInterceptor.java 2008-04-16 00:17:02 UTC (rev 10600)
@@ -23,7 +23,7 @@
package org.jboss.portal.portlet.aspects.portlet;
import org.jboss.portal.portlet.invocation.PortletInvocation;
-import org.jboss.portal.portlet.invocation.PortletInvokerInterceptor;
+import org.jboss.portal.portlet.PortletInvokerInterceptor;
import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
import org.jboss.portal.portlet.PortletInvokerException;
Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/PortletCustomizationInterceptor.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/PortletCustomizationInterceptor.java 2008-04-16 00:07:05 UTC (rev 10599)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/PortletCustomizationInterceptor.java 2008-04-16 00:17:02 UTC (rev 10600)
@@ -25,7 +25,7 @@
import org.jboss.portal.portlet.invocation.PortletInvocation;
import org.jboss.portal.portlet.invocation.ActionInvocation;
import org.jboss.portal.portlet.invocation.EventInvocation;
-import org.jboss.portal.portlet.invocation.PortletInvokerInterceptor;
+import org.jboss.portal.portlet.PortletInvokerInterceptor;
import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
import org.jboss.portal.portlet.spi.InstanceContext;
import org.jboss.portal.portlet.spi.UserContext;
Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ProducerCacheInterceptor.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ProducerCacheInterceptor.java 2008-04-16 00:07:05 UTC (rev 10599)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ProducerCacheInterceptor.java 2008-04-16 00:17:02 UTC (rev 10600)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.portlet.aspects.portlet;
-import org.jboss.portal.portlet.invocation.PortletInvokerInterceptor;
+import org.jboss.portal.portlet.PortletInvokerInterceptor;
/**
* Not removed as it is a place holder to implement producer cache (i.e caching markup
Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/RequestAttributeConversationInterceptor.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/RequestAttributeConversationInterceptor.java 2008-04-16 00:07:05 UTC (rev 10599)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/RequestAttributeConversationInterceptor.java 2008-04-16 00:17:02 UTC (rev 10600)
@@ -27,7 +27,7 @@
import org.jboss.portal.portlet.invocation.RenderInvocation;
import org.jboss.portal.portlet.invocation.EventInvocation;
import org.jboss.portal.portlet.invocation.ResourceInvocation;
-import org.jboss.portal.portlet.invocation.PortletInvokerInterceptor;
+import org.jboss.portal.portlet.PortletInvokerInterceptor;
import org.jboss.portal.portlet.invocation.response.UpdateNavigationalStateResponse;
import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
import org.jboss.portal.portlet.container.PortletContainer;
Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/SecureTransportInterceptor.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/SecureTransportInterceptor.java 2008-04-16 00:07:05 UTC (rev 10599)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/SecureTransportInterceptor.java 2008-04-16 00:17:02 UTC (rev 10600)
@@ -29,7 +29,7 @@
import org.jboss.portal.portlet.info.PortletInfo;
import org.jboss.portal.portlet.info.SecurityInfo;
import org.jboss.portal.portlet.invocation.PortletInvocation;
-import org.jboss.portal.portlet.invocation.PortletInvokerInterceptor;
+import org.jboss.portal.portlet.PortletInvokerInterceptor;
import org.jboss.portal.portlet.invocation.response.InsufficientTransportGuaranteeResponse;
import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
import org.jboss.portal.portlet.spi.SecurityContext;
Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ValveInterceptor.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ValveInterceptor.java 2008-04-16 00:07:05 UTC (rev 10599)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ValveInterceptor.java 2008-04-16 00:17:02 UTC (rev 10600)
@@ -27,7 +27,7 @@
import org.jboss.portal.portlet.container.PortletContainerContext;
import org.jboss.portal.portlet.container.managed.PortletApplicationRegistry;
import org.jboss.portal.portlet.invocation.PortletInvocation;
-import org.jboss.portal.portlet.invocation.PortletInvokerInterceptor;
+import org.jboss.portal.portlet.PortletInvokerInterceptor;
import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
import org.jboss.portal.portlet.invocation.response.UnavailableResponse;
import org.jboss.portal.portlet.impl.jsr168.PortletContainerImpl;
Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/ContainerPortletInvoker.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/ContainerPortletInvoker.java 2008-04-16 00:07:05 UTC (rev 10599)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/ContainerPortletInvoker.java 2008-04-16 00:17:02 UTC (rev 10600)
@@ -22,7 +22,6 @@
******************************************************************************/
package org.jboss.portal.portlet.container;
-import org.jboss.portal.common.invocation.InterceptorStackFactory;
import org.jboss.portal.common.invocation.InvocationException;
import org.jboss.portal.portlet.NoSuchPortletException;
import org.jboss.portal.portlet.Portlet;
@@ -33,7 +32,7 @@
import org.jboss.portal.portlet.impl.info.ContainerPreferenceInfo;
import org.jboss.portal.portlet.info.PortletInfo;
import org.jboss.portal.portlet.invocation.PortletInvocation;
-import org.jboss.portal.portlet.invocation.PortletInvokerInterceptor;
+import org.jboss.portal.portlet.PortletInvokerInterceptor;
import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
import org.jboss.portal.portlet.state.PropertyChange;
import org.jboss.portal.portlet.state.PropertyMap;
Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/consumer/ConsumerPortletInvoker.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/consumer/ConsumerPortletInvoker.java 2008-04-16 00:07:05 UTC (rev 10599)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/consumer/ConsumerPortletInvoker.java 2008-04-16 00:17:02 UTC (rev 10600)
@@ -29,8 +29,8 @@
import org.jboss.portal.portlet.PortletContext;
import org.jboss.portal.portlet.PortletInvokerException;
import org.jboss.portal.portlet.StateEvent;
+import org.jboss.portal.portlet.PortletInvokerInterceptor;
import org.jboss.portal.portlet.invocation.PortletInvocation;
-import org.jboss.portal.portlet.invocation.PortletInvokerInterceptor;
import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
import org.jboss.portal.portlet.spi.InstanceContext;
import org.jboss.portal.portlet.state.AccessMode;
Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/producer/ProducerPortletInvoker.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/producer/ProducerPortletInvoker.java 2008-04-16 00:07:05 UTC (rev 10599)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/producer/ProducerPortletInvoker.java 2008-04-16 00:17:02 UTC (rev 10600)
@@ -36,7 +36,7 @@
import org.jboss.portal.portlet.invocation.ActionInvocation;
import org.jboss.portal.portlet.invocation.PortletInvocation;
import org.jboss.portal.portlet.invocation.RenderInvocation;
-import org.jboss.portal.portlet.invocation.PortletInvokerInterceptor;
+import org.jboss.portal.portlet.PortletInvokerInterceptor;
import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
import org.jboss.portal.portlet.spi.InstanceContext;
import org.jboss.portal.portlet.state.AbstractPropertyContext;
Modified: modules/portlet/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/jboss-beans.xml
===================================================================
--- modules/portlet/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/jboss-beans.xml 2008-04-16 00:07:05 UTC (rev 10599)
+++ modules/portlet/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/jboss-beans.xml 2008-04-16 00:17:02 UTC (rev 10600)
@@ -65,7 +65,7 @@
<bean name="ProducerStateConverter" class="org.jboss.portal.portlet.impl.state.StateConverterV0"/>
<!-- The consumer portlet invoker -->
- <bean name="ConsumerPortletInvoker" class="org.jboss.portal.portlet.invocation.PortletInvokerInterceptor">
+ <bean name="ConsumerPortletInvoker" class="org.jboss.portal.portlet.PortletInvokerInterceptor">
<property name="next"><inject bean="ConsumerCacheInterceptor"/></property>
</bean>
<bean name="ConsumerCacheInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ConsumerCacheInterceptor">
Modified: modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/jboss-beans.xml
===================================================================
--- modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/jboss-beans.xml 2008-04-16 00:07:05 UTC (rev 10599)
+++ modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/jboss-beans.xml 2008-04-16 00:17:02 UTC (rev 10600)
@@ -65,7 +65,7 @@
<bean name="ProducerStateConverter" class="org.jboss.portal.portlet.impl.state.StateConverterV0"/>
<!-- The consumer portlet invoker -->
- <bean name="ConsumerPortletInvoker" class="org.jboss.portal.portlet.invocation.PortletInvokerInterceptor">
+ <bean name="ConsumerPortletInvoker" class="org.jboss.portal.portlet.PortletInvokerInterceptor">
<property name="next"><inject bean="ConsumerCacheInterceptor"/></property>
</bean>
<bean name="ConsumerCacheInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ConsumerCacheInterceptor">
18 years
JBoss Portal SVN: r10599 - in modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet: aspects/portlet/cache and 1 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-04-15 20:07:05 -0400 (Tue, 15 Apr 2008)
New Revision: 10599
Added:
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/cache/
Removed:
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/cache/
Modified:
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ConsumerCacheInterceptor.java
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/cache/ContentRef.java
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/cache/SoftContentRef.java
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/cache/StrongContentRef.java
Log:
remove cache interceptor related classes to the o.j.p.portlet.aspects.portlet package
Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ConsumerCacheInterceptor.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ConsumerCacheInterceptor.java 2008-04-16 00:00:37 UTC (rev 10598)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ConsumerCacheInterceptor.java 2008-04-16 00:07:05 UTC (rev 10599)
@@ -25,8 +25,8 @@
import org.jboss.portal.portlet.invocation.PortletInvocation;
import org.jboss.portal.portlet.invocation.RenderInvocation;
import org.jboss.portal.portlet.invocation.PortletInvokerInterceptor;
-import org.jboss.portal.portlet.invocation.response.cache.ContentRef;
-import org.jboss.portal.portlet.invocation.response.cache.StrongContentRef;
+import org.jboss.portal.portlet.aspects.portlet.cache.ContentRef;
+import org.jboss.portal.portlet.aspects.portlet.cache.StrongContentRef;
import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
import org.jboss.portal.portlet.invocation.response.RevalidateMarkupResponse;
import org.jboss.portal.portlet.invocation.response.ContentResponse;
Copied: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/cache (from rev 10533, modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/cache)
Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/cache/ContentRef.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/cache/ContentRef.java 2008-04-11 07:23:55 UTC (rev 10533)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/cache/ContentRef.java 2008-04-16 00:07:05 UTC (rev 10599)
@@ -20,7 +20,7 @@
* 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.invocation.response.cache;
+package org.jboss.portal.portlet.aspects.portlet.cache;
import org.jboss.portal.portlet.invocation.response.ContentResponse;
Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/cache/SoftContentRef.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/cache/SoftContentRef.java 2008-04-11 07:23:55 UTC (rev 10533)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/cache/SoftContentRef.java 2008-04-16 00:07:05 UTC (rev 10599)
@@ -20,7 +20,7 @@
* 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.invocation.response.cache;
+package org.jboss.portal.portlet.aspects.portlet.cache;
import org.jboss.portal.portlet.invocation.response.ContentResponse;
Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/cache/StrongContentRef.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/cache/StrongContentRef.java 2008-04-11 07:23:55 UTC (rev 10533)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/cache/StrongContentRef.java 2008-04-16 00:07:05 UTC (rev 10599)
@@ -20,7 +20,7 @@
* 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.invocation.response.cache;
+package org.jboss.portal.portlet.aspects.portlet.cache;
import org.jboss.portal.portlet.invocation.response.ContentResponse;
18 years
JBoss Portal SVN: r10598 - in modules/portlet/trunk: test/src/main/java/org/jboss/portal/portlet/test and 1 other directory.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-04-15 20:00:37 -0400 (Tue, 15 Apr 2008)
New Revision: 10598
Removed:
modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/InterceptorStackFactoryImpl.java
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/InterceptorStackFactoryImpl.java
Log:
remove now useless InterceptorStackFactoryImpl
Deleted: modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/InterceptorStackFactoryImpl.java
===================================================================
--- modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/InterceptorStackFactoryImpl.java 2008-04-15 23:51:51 UTC (rev 10597)
+++ modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/InterceptorStackFactoryImpl.java 2008-04-16 00:00:37 UTC (rev 10598)
@@ -1,84 +0,0 @@
-/******************************************************************************
- * 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.portlet.portal;
-
-import org.jboss.portal.common.invocation.Interceptor;
-import org.jboss.portal.common.invocation.InterceptorStack;
-import org.jboss.portal.common.invocation.InterceptorStackFactory;
-
-/**
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision: 1.1 $
- */
-public class InterceptorStackFactoryImpl implements InterceptorStackFactory
-{
-
- /** . */
- private volatile Interceptor[] interceptors;
-
- /** . */
- private final InterceptorStackImpl stack = new InterceptorStackImpl();
-
- public Interceptor[] getInterceptors()
- {
- return interceptors;
- }
-
- public void setInterceptors(Interceptor[] interceptors)
- {
- this.interceptors = interceptors;
- }
-
- public InterceptorStack getInterceptorStack()
- {
- return stack;
- }
-
- private class InterceptorStackImpl implements InterceptorStack
- {
-
- public int getLength()
- {
- // Avoid dirty reads
- Interceptor[] interceptors = InterceptorStackFactoryImpl.this.interceptors;
-
- //
- return interceptors != null ? interceptors.length : 0;
- }
-
- public Interceptor getInterceptor(int i) throws ArrayIndexOutOfBoundsException
- {
- // Avoid dirty reads
- Interceptor[] interceptors = InterceptorStackFactoryImpl.this.interceptors;
-
- //
- if (interceptors == null)
- {
- throw new ArrayIndexOutOfBoundsException("No interceptors");
- }
-
- //
- return interceptors[i];
- }
- }
-}
\ No newline at end of file
Deleted: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/InterceptorStackFactoryImpl.java
===================================================================
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/InterceptorStackFactoryImpl.java 2008-04-15 23:51:51 UTC (rev 10597)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/InterceptorStackFactoryImpl.java 2008-04-16 00:00:37 UTC (rev 10598)
@@ -1,84 +0,0 @@
-/******************************************************************************
- * 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.portlet.test;
-
-import org.jboss.portal.common.invocation.Interceptor;
-import org.jboss.portal.common.invocation.InterceptorStack;
-import org.jboss.portal.common.invocation.InterceptorStackFactory;
-
-/**
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision: 1.1 $
- */
-public class InterceptorStackFactoryImpl implements InterceptorStackFactory
-{
-
- /** . */
- private volatile Interceptor[] interceptors;
-
- /** . */
- private final InterceptorStackImpl stack = new InterceptorStackImpl();
-
- public Interceptor[] getInterceptors()
- {
- return interceptors;
- }
-
- public void setInterceptors(Interceptor[] interceptors)
- {
- this.interceptors = interceptors;
- }
-
- public InterceptorStack getInterceptorStack()
- {
- return stack;
- }
-
- private class InterceptorStackImpl implements InterceptorStack
- {
-
- public int getLength()
- {
- // Avoid dirty reads
- Interceptor[] interceptors = InterceptorStackFactoryImpl.this.interceptors;
-
- //
- return interceptors != null ? interceptors.length : 0;
- }
-
- public Interceptor getInterceptor(int i) throws ArrayIndexOutOfBoundsException
- {
- // Avoid dirty reads
- Interceptor[] interceptors = InterceptorStackFactoryImpl.this.interceptors;
-
- //
- if (interceptors == null)
- {
- throw new ArrayIndexOutOfBoundsException("No interceptors");
- }
-
- //
- return interceptors[i];
- }
- }
-}
18 years