You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by at...@apache.org on 2008/05/02 06:13:51 UTC
svn commit: r652758 [2/2] - in /portals/pluto/branches/2.0-spi-refactoring:
pluto-container-api/src/main/java/org/apache/pluto/om/portlet/
pluto-container/src/main/java/org/apache/pluto/
pluto-container/src/main/java/org/apache/pluto/core/ pluto-contai...
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestImpl.java?rev=652758&r1=652757&r2=652758&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestImpl.java Thu May 1 21:13:47 2008
@@ -57,8 +57,8 @@
import org.apache.pluto.OptionalContainerServices;
import org.apache.pluto.PortletContainer;
import org.apache.pluto.PortletContainerException;
+import org.apache.pluto.PortletWindow;
import org.apache.pluto.internal.InternalPortletRequest;
-import org.apache.pluto.internal.InternalPortletWindow;
import org.apache.pluto.internal.PortletEntity;
import org.apache.pluto.om.common.SecurityRoleRef;
import org.apache.pluto.om.portlet.Portlet;
@@ -98,7 +98,7 @@
protected PortletContainer container;
/** The portlet window which is the target of this portlet request. */
- protected InternalPortletWindow internalPortletWindow;
+ protected PortletWindow portletWindow;
/**
* The PortletContext associated with this Request. This PortletContext must
@@ -145,22 +145,22 @@
public PortletRequestImpl(InternalPortletRequest internalPortletRequest) {
this(internalPortletRequest.getPortletContainer(),
- internalPortletRequest.getInternalPortletWindow(),
+ internalPortletRequest.getPortletWindow(),
internalPortletRequest.getHttpServletRequest());
}
/**
* Creates a PortletRequestImpl instance.
* @param container the portlet container.
- * @param internalPortletWindow the internal portlet window.
+ * @param portletWindow the internal portlet window.
* @param servletRequest the underlying servlet request.
*/
public PortletRequestImpl(PortletContainer container,
- InternalPortletWindow internalPortletWindow,
+ PortletWindow portletWindow,
HttpServletRequest servletRequest) {
super(servletRequest);
this.container = container;
- this.internalPortletWindow = internalPortletWindow;
+ this.portletWindow = portletWindow;
this.portalContext = container.getRequiredContainerServices().getPortalContext();
this.servletRequest = servletRequest;
}
@@ -172,7 +172,7 @@
* @see javax.portlet.PortletRequest#getWindowId()
*/
public String getWindowId() {
- return internalPortletWindow.getId().getStringId();
+ return portletWindow.getId().getStringId();
}
/**
@@ -198,11 +198,11 @@
}
public PortletMode getPortletMode() {
- return internalPortletWindow.getPortletMode();
+ return portletWindow.getPortletMode();
}
public WindowState getWindowState() {
- return internalPortletWindow.getWindowState();
+ return portletWindow.getWindowState();
}
public PortletSession getPortletSession() {
@@ -281,7 +281,7 @@
}
portletSession = new PortletSessionImpl(
portletContext,
- internalPortletWindow,
+ portletWindow,
httpSession);
}
//for RequestDispatcher
@@ -301,7 +301,7 @@
.getPortalCallbackService()
.getRequestProperties(
getHttpServletRequest(),
- internalPortletWindow);
+ portletWindow);
if (propertyMap != null) {
String[] properties = (String[]) propertyMap.get(name);
@@ -328,7 +328,7 @@
.getPortalCallbackService()
.getRequestProperties(
getHttpServletRequest(),
- internalPortletWindow);
+ portletWindow);
if (map != null) {
String[] properties = (String[]) map.get(name);
@@ -350,7 +350,7 @@
// get properties from PropertyManager
Map map = container.getRequiredContainerServices()
.getPortalCallbackService()
- .getRequestProperties(getHttpServletRequest(), internalPortletWindow);
+ .getRequestProperties(getHttpServletRequest(), portletWindow);
if (map != null) {
v.addAll(map.keySet());
@@ -376,7 +376,7 @@
}
public String getContextPath() {
- String contextPath = internalPortletWindow.getContextPath();
+ String contextPath = portletWindow.getPortletEntity().getPortletDefinition().getApplication().getContextPath();
if ("/".equals(contextPath)) {
contextPath = "";
}
@@ -402,7 +402,7 @@
* @return true if it is determined the user has the given role.
*/
public boolean isUserInRole(String roleName) {
- PortletEntity entity = internalPortletWindow.getPortletEntity();
+ PortletEntity entity = portletWindow.getPortletEntity();
Portlet def = entity.getPortletDefinition();
SecurityRoleRef ref = null;
@@ -440,7 +440,7 @@
String encodedName = isNameReserved(name) ?
name :
- mapper.encode(internalPortletWindow.getId(), name);
+ mapper.encode(portletWindow.getId(), name);
Object attribute = getHttpServletRequest()
.getAttribute(encodedName);
@@ -464,7 +464,7 @@
String portletAttribute = isNameReserved(attribute) ?
attribute :
mapper.decode(
- internalPortletWindow.getId(), attribute);
+ portletWindow.getId(), attribute);
if (portletAttribute != null) { // it is in the portlet's namespace
portletAttributes.add(portletAttribute);
@@ -482,7 +482,7 @@
final OptionalContainerServices optionalContainerServices = container.getOptionalContainerServices();
final UserInfoService userInfoService = optionalContainerServices.getUserInfoService();
- userInfoMap = userInfoService.getUserInfo( this, this.internalPortletWindow );
+ userInfoMap = userInfoService.getUserInfo( this, this.portletWindow );
} catch (PortletContainerException e) {
LOG.warn("Unable to retrieve user attribute map for user " + getRemoteUser() + ". Returning null.");
return null;
@@ -493,8 +493,8 @@
public String getParameter(String name) {
ArgumentUtility.validateNotNull("parameterName", name);
- List<String> publicRenderParameterNames = internalPortletWindow.getPortletEntity().getPortletDefinition().getPublicRenderParameter();
- PortletURLProvider urlProvider = container.getRequiredContainerServices().getPortalCallbackService().getPortletURLProvider(getHttpServletRequest(), internalPortletWindow);
+ List<String> publicRenderParameterNames = portletWindow.getPortletEntity().getPortletDefinition().getPublicRenderParameter();
+ PortletURLProvider urlProvider = container.getRequiredContainerServices().getPortalCallbackService().getPortletURLProvider(getHttpServletRequest(), portletWindow);
String[] values = null;
if (publicRenderParameterNames != null){
if (publicRenderParameterNames.contains(name))
@@ -518,10 +518,10 @@
public String[] getParameterValues(String name) {
ArgumentUtility.validateNotNull("parameterName", name);
- List<String> publicRenderParameterNames = internalPortletWindow.getPortletEntity().getPortletDefinition().getPublicRenderParameter();
+ List<String> publicRenderParameterNames = portletWindow.getPortletEntity().getPortletDefinition().getPublicRenderParameter();
PortletURLProvider urlProvider = container.getRequiredContainerServices()
.getPortalCallbackService()
- .getPortletURLProvider(getHttpServletRequest(), internalPortletWindow);
+ .getPortletURLProvider(getHttpServletRequest(), portletWindow);
String[] values = null;
if (publicRenderParameterNames != null){
@@ -542,12 +542,12 @@
public Map getParameterMap() {
Map<String, String[]>map = StringUtils.copyParameters(baseGetParameterMap());
- List<String> publicRenderParameterNames = internalPortletWindow.getPortletEntity().getPortletDefinition().getPublicRenderParameter();
+ List<String> publicRenderParameterNames = portletWindow.getPortletEntity().getPortletDefinition().getPublicRenderParameter();
if (publicRenderParameterNames!=null){
PortletURLProvider urlProvider = container
.getRequiredContainerServices()
.getPortalCallbackService()
- .getPortletURLProvider(getHttpServletRequest(), internalPortletWindow);
+ .getPortletURLProvider(getHttpServletRequest(), portletWindow);
String[] values = null;
for (String string : publicRenderParameterNames) {
values = urlProvider.getPublicRenderParameters(string);
@@ -566,7 +566,7 @@
public void setAttribute(String name, Object value) {
ArgumentUtility.validateNotNull("attributeName", name);
String encodedName = isNameReserved(name) ?
- name : mapper.encode(internalPortletWindow.getId(), name);
+ name : mapper.encode(portletWindow.getId(), name);
if (value == null) {
removeAttribute(name);
} else {
@@ -577,7 +577,7 @@
public void removeAttribute(String name) {
ArgumentUtility.validateNotNull("attributeName", name);
String encodedName = isNameReserved(name) ?
- name : mapper.encode(internalPortletWindow.getId(), name);
+ name : mapper.encode(portletWindow.getId(), name);
getHttpServletRequest().removeAttribute(encodedName);
}
@@ -603,7 +603,7 @@
public Enumeration getResponseContentTypes() {
if (contentTypes == null) {
contentTypes = new Vector();
- Portlet dd = internalPortletWindow.getPortletEntity().getPortletDefinition();
+ Portlet dd = portletWindow.getPortletEntity().getPortletDefinition();
Iterator supports = dd.getSupports().iterator();
while (supports.hasNext()) {
Supports sup = (Supports) supports.next();
@@ -664,8 +664,8 @@
// InternalPortletRequest Impl ---------------------------------------------
- public InternalPortletWindow getInternalPortletWindow() {
- return internalPortletWindow;
+ public PortletWindow getPortletWindow() {
+ return portletWindow;
}
public PortletContainer getPortletContainer() {
@@ -742,7 +742,7 @@
return true;
}
- Portlet dd = internalPortletWindow.getPortletEntity()
+ Portlet dd = portletWindow.getPortletEntity()
.getPortletDefinition();
Iterator mimes = dd.getSupports().iterator();
@@ -913,7 +913,7 @@
if (portletPreferences == null) {
portletPreferences = new PortletPreferencesImpl(
getPortletContainer(),
- getInternalPortletWindow(),
+ getPortletWindow(),
this,
Constants.METHOD_ACTION);
}
@@ -929,8 +929,8 @@
PortletURLProvider urlProvider = container
.getRequiredContainerServices()
.getPortalCallbackService()
- .getPortletURLProvider(getHttpServletRequest(), internalPortletWindow);
- List<String> publicRenderParameterNames = internalPortletWindow.getPortletEntity().getPortletDefinition().getPublicRenderParameter();
+ .getPortletURLProvider(getHttpServletRequest(), portletWindow);
+ List<String> publicRenderParameterNames = portletWindow.getPortletEntity().getPortletDefinition().getPublicRenderParameter();
String[] values = null;
if (publicRenderParameterNames != null){
for (String string : publicRenderParameterNames) {
@@ -944,7 +944,7 @@
}
public String getWindowID() {
- return internalPortletWindow.getId().getStringId();
+ return portletWindow.getId().getStringId();
}
private void setLifecyclePhase() {
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletResponseImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletResponseImpl.java?rev=652758&r1=652757&r2=652758&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletResponseImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletResponseImpl.java Thu May 1 21:13:47 2008
@@ -34,8 +34,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.pluto.PortletContainer;
+import org.apache.pluto.PortletWindow;
import org.apache.pluto.internal.InternalPortletResponse;
-import org.apache.pluto.internal.InternalPortletWindow;
import org.apache.pluto.spi.ResourceURLProvider;
import org.apache.pluto.util.ArgumentUtility;
import org.apache.pluto.util.DummyPrintWriter;
@@ -61,8 +61,8 @@
/** The portlet container. */
private PortletContainer container;
- /** The internal portlet window. */
- private InternalPortletWindow internalPortletWindow;
+ /** The portlet window. */
+ private PortletWindow portletWindow;
/** The servlet request of the target/portlet's web module. */
private HttpServletRequest httpServletRequest;
@@ -85,13 +85,13 @@
// Constructor -------------------------------------------------------------
public PortletResponseImpl(PortletContainer container,
- InternalPortletWindow internalPortletWindow,
+ PortletWindow portletWindow,
HttpServletRequest servletRequest,
HttpServletResponse servletResponse) {
super(servletResponse);
this.container = container;
this.httpServletRequest = servletRequest;
- this.internalPortletWindow = internalPortletWindow;
+ this.portletWindow = portletWindow;
}
@@ -103,7 +103,7 @@
.getPortalCallbackService()
.addResponseProperty(
getHttpServletRequest(),
- internalPortletWindow,
+ portletWindow,
name, value);
}
@@ -114,17 +114,17 @@
.getPortalCallbackService()
.addResponseProperty(
getHttpServletRequest(),
- internalPortletWindow,
+ portletWindow,
name, value);
}
public void addProperty(String key, Element element) {
- container.getRequiredContainerServices().getPortalCallbackService().addResponseProperty(getHttpServletRequest(), internalPortletWindow, key, element);
+ container.getRequiredContainerServices().getPortalCallbackService().addResponseProperty(getHttpServletRequest(), portletWindow, key, element);
}
public void addProperty(Cookie cookie) {
- container.getRequiredContainerServices().getPortalCallbackService().addResponseProperty(getHttpServletRequest(), internalPortletWindow, cookie);
+ container.getRequiredContainerServices().getPortalCallbackService().addResponseProperty(getHttpServletRequest(), portletWindow, cookie);
}
public void setProperty(String name, String value) {
@@ -133,7 +133,7 @@
.getPortalCallbackService()
.setResponseProperty(
getHttpServletRequest(),
- internalPortletWindow,
+ portletWindow,
name, value);
}
@@ -148,7 +148,7 @@
.getPortalCallbackService()
.getResourceURLProvider(
httpServletRequest,
- internalPortletWindow);
+ portletWindow);
if (path.indexOf("://") != -1) {
provider.setAbsoluteURL(path);
} else {
@@ -160,8 +160,8 @@
// InternalPortletResponse impl --------------------------------------------
- public InternalPortletWindow getInternalPortletWindow() {
- return internalPortletWindow;
+ public PortletWindow getPortletWindow() {
+ return portletWindow;
}
@@ -242,7 +242,7 @@
public ResourceURL createResourceURL(){
return new ResourceURLImpl(getContainer(),
- getInternalPortletWindow(),
+ getPortletWindow(),
getHttpServletRequest(),
getHttpServletResponse());
}
@@ -259,7 +259,7 @@
*/
private PortletURL createURL(boolean isAction, boolean isResourceServing) {
return new PortletURLImpl(getContainer(),
- getInternalPortletWindow(),
+ getPortletWindow(),
getHttpServletRequest(),
getHttpServletResponse(),
isAction);
@@ -267,7 +267,7 @@
public String getNamespace() {
- String namespace = mapper.encode(getInternalPortletWindow().getId(), "");
+ String namespace = mapper.encode(getPortletWindow().getId(), "");
StringBuffer validNamespace = new StringBuffer();
for (int i = 0; i < namespace.length(); i++) {
char ch = namespace.charAt(i);
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletSessionImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletSessionImpl.java?rev=652758&r1=652757&r2=652758&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletSessionImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletSessionImpl.java Thu May 1 21:13:47 2008
@@ -32,7 +32,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.pluto.internal.InternalPortletWindow;
+import org.apache.pluto.PortletWindow;
import org.apache.pluto.util.ArgumentUtility;
/**
@@ -62,8 +62,8 @@
/** The portlet context. */
private PortletContext portletContext;
- /** The internal portlet window. */
- private InternalPortletWindow internalPortletWindow;
+ /** The portlet window. */
+ private PortletWindow portletWindow;
//
private boolean isIncludeOrForward = false;
@@ -74,10 +74,10 @@
* Constructs an instance.
*/
public PortletSessionImpl(PortletContext portletContext,
- InternalPortletWindow internalPortletWindow,
+ PortletWindow portletWindow,
HttpSession httpSession) {
this.portletContext = portletContext;
- this.internalPortletWindow = internalPortletWindow;
+ this.portletWindow = portletWindow;
this.httpSession = httpSession;
}
@@ -229,7 +229,7 @@
private String createPortletScopedId(String name) {
StringBuffer buffer = new StringBuffer();
buffer.append(PORTLET_SCOPE_NAMESPACE);
- buffer.append(internalPortletWindow.getId().getStringId());
+ buffer.append(portletWindow.getId().getStringId());
buffer.append(ID_NAME_SEPARATOR);
buffer.append(name);
return buffer.toString();
@@ -249,7 +249,7 @@
&& name.indexOf(ID_NAME_SEPARATOR) > -1) {
String id = name.substring(PORTLET_SCOPE_NAMESPACE.length(),
name.indexOf(ID_NAME_SEPARATOR));
- return (id.equals(internalPortletWindow.getId().getStringId()));
+ return (id.equals(portletWindow.getId().getStringId()));
}
// Application-scoped attribute names are not in portlet scope.
else {
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletURLImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletURLImpl.java?rev=652758&r1=652757&r2=652758&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletURLImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletURLImpl.java Thu May 1 21:13:47 2008
@@ -25,7 +25,7 @@
import javax.portlet.WindowStateException;
import org.apache.pluto.PortletContainer;
-import org.apache.pluto.internal.InternalPortletWindow;
+import org.apache.pluto.PortletWindow;
/**
* Refactoring where functionality was pushed into JSR-286 <code>BaseURL</code>.
@@ -35,11 +35,11 @@
public class PortletURLImpl extends BaseURLImpl implements PortletURL {
public PortletURLImpl(PortletContainer container,
- InternalPortletWindow internalPortletWindow,
+ PortletWindow portletWindow,
javax.servlet.http.HttpServletRequest servletRequest,
javax.servlet.http.HttpServletResponse servletResponse,
boolean isAction) {
- super(container,internalPortletWindow,servletRequest,
+ super(container,portletWindow,servletRequest,
servletResponse,isAction,false);
}
@@ -70,7 +70,7 @@
}
public void removePublicRenderParameter(String name) {
- List<String> publicRenderParameterNames = internalPortletWindow.getPortletEntity().getPortletDefinition().getPublicRenderParameter();
+ List<String> publicRenderParameterNames = portletWindow.getPortletEntity().getPortletDefinition().getPublicRenderParameter();
if (publicRenderParameterNames != null){
if (publicRenderParameterNames.contains(name)){
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/RenderRequestImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/RenderRequestImpl.java?rev=652758&r1=652757&r2=652758&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/RenderRequestImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/RenderRequestImpl.java Thu May 1 21:13:47 2008
@@ -36,8 +36,8 @@
import org.apache.commons.logging.LogFactory;
import org.apache.pluto.Constants;
import org.apache.pluto.PortletContainer;
+import org.apache.pluto.PortletWindow;
import org.apache.pluto.internal.InternalPortletRequest;
-import org.apache.pluto.internal.InternalPortletWindow;
import org.apache.pluto.internal.InternalRenderRequest;
/**
@@ -69,11 +69,11 @@
}
public RenderRequestImpl(PortletContainer container,
- InternalPortletWindow internalPortletWindow,
+ PortletWindow portletWindow,
HttpServletRequest servletRequest) {
- super(container, internalPortletWindow, servletRequest);
+ super(container, portletWindow, servletRequest);
if (LOG.isDebugEnabled()) {
- LOG.debug("Created render request for: " + internalPortletWindow);
+ LOG.debug("Created render request for: " + portletWindow);
}
}
@@ -84,7 +84,7 @@
if (portletPreferences == null) {
portletPreferences = new PortletPreferencesImpl(
getPortletContainer(),
- getInternalPortletWindow(),
+ getPortletWindow(),
this,
Constants.METHOD_RENDER);
}
@@ -265,6 +265,6 @@
}
public Cookie[] getCookieProperties() {
- return container.getRequiredContainerServices().getPortalCallbackService().getRequestPropertyCookie(this, internalPortletWindow);
+ return container.getRequiredContainerServices().getPortalCallbackService().getRequestPropertyCookie(this, portletWindow);
}
}
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/RenderResponseImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/RenderResponseImpl.java?rev=652758&r1=652757&r2=652758&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/RenderResponseImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/RenderResponseImpl.java Thu May 1 21:13:47 2008
@@ -29,7 +29,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.pluto.PortletContainer;
-import org.apache.pluto.internal.InternalPortletWindow;
+import org.apache.pluto.PortletWindow;
import org.apache.pluto.internal.InternalRenderResponse;
import org.apache.pluto.spi.PortalCallbackService;
import org.apache.pluto.util.ArgumentUtility;
@@ -48,10 +48,10 @@
private String contenType;
public RenderResponseImpl(PortletContainer container,
- InternalPortletWindow internalPortletWindow,
+ PortletWindow portletWindow,
HttpServletRequest servletRequest,
HttpServletResponse servletResponse) {
- super(container, internalPortletWindow, servletRequest, servletResponse);
+ super(container, portletWindow, servletRequest, servletResponse);
}
public void setTitle(String title) {
@@ -59,12 +59,12 @@
.getRequiredContainerServices()
.getPortalCallbackService();
callback.setTitle(this.getHttpServletRequest(),
- getInternalPortletWindow(),
+ getPortletWindow(),
title);
}
public void setNextPossiblePortletModes(Collection<PortletMode> portletModes) {
- PortletMode tmpPortletMode = super.getInternalPortletWindow().getPortletMode();
+ PortletMode tmpPortletMode = super.getPortletWindow().getPortletMode();
PortletMode portletMode = PortletMode.VIEW;
boolean next = false;
boolean first = true;
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/ResourceRequestImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/ResourceRequestImpl.java?rev=652758&r1=652757&r2=652758&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/ResourceRequestImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/ResourceRequestImpl.java Thu May 1 21:13:47 2008
@@ -29,7 +29,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.pluto.Constants;
import org.apache.pluto.PortletContainer;
-import org.apache.pluto.internal.InternalPortletWindow;
+import org.apache.pluto.PortletWindow;
import org.apache.pluto.internal.InternalResourceRequest;
import org.apache.pluto.spi.PortletURLProvider;
import org.apache.pluto.util.ArgumentUtility;
@@ -51,11 +51,11 @@
// Constructor -------------------------------------------------------------
public ResourceRequestImpl(PortletContainer container,
- InternalPortletWindow internalPortletWindow,
+ PortletWindow portletWindow,
HttpServletRequest servletRequest) {
- super(container, internalPortletWindow, servletRequest);
+ super(container, portletWindow, servletRequest);
if (LOG.isDebugEnabled()) {
- LOG.debug("Created action request for: " + internalPortletWindow);
+ LOG.debug("Created action request for: " + portletWindow);
}
}
@@ -73,7 +73,7 @@
public String[] getParameterValues(String name) {
ArgumentUtility.validateNotNull("parameterName", name);
String values1[] = super.getParameterValues(name);
- PortletURLProvider urlProvider = container.getRequiredContainerServices().getPortalCallbackService().getPortletURLProvider(getHttpServletRequest(), internalPortletWindow);
+ PortletURLProvider urlProvider = container.getRequiredContainerServices().getPortalCallbackService().getPortletURLProvider(getHttpServletRequest(), portletWindow);
String values2[] = urlProvider.getPrivateRenderParameters(name);
String values[] = null;
int length1 = 0;
@@ -106,7 +106,7 @@
ArgumentUtility.validateNotNull("parameterName", name);
String value = super.getParameter(name);
if (value == null){
- PortletURLProvider urlProvider = container.getRequiredContainerServices().getPortalCallbackService().getPortletURLProvider(getHttpServletRequest(), internalPortletWindow);
+ PortletURLProvider urlProvider = container.getRequiredContainerServices().getPortalCallbackService().getPortletURLProvider(getHttpServletRequest(), portletWindow);
String[] values1 = urlProvider.getPrivateRenderParameters(name);
if (values1!= null){
if (values1.length>0){
@@ -126,7 +126,7 @@
if (portletPreferences == null) {
portletPreferences = new PortletPreferencesImpl(
getPortletContainer(),
- getInternalPortletWindow(),
+ getPortletWindow(),
this,
Constants.METHOD_ACTION);
}
@@ -147,7 +147,7 @@
}
public Cookie[] getCookieProperties() {
- return container.getRequiredContainerServices().getPortalCallbackService().getRequestPropertyCookie(this, internalPortletWindow);
+ return container.getRequiredContainerServices().getPortalCallbackService().getRequestPropertyCookie(this, portletWindow);
}
public ServletInputStream getInputStream() throws IOException {
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/ResourceResponseImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/ResourceResponseImpl.java?rev=652758&r1=652757&r2=652758&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/ResourceResponseImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/ResourceResponseImpl.java Thu May 1 21:13:47 2008
@@ -23,7 +23,7 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.pluto.PortletContainer;
-import org.apache.pluto.internal.InternalPortletWindow;
+import org.apache.pluto.PortletWindow;
import org.apache.pluto.internal.InternalResourceResponse;
import org.apache.pluto.util.ArgumentUtility;
import org.apache.pluto.util.StringUtils;
@@ -33,10 +33,10 @@
public ResourceResponseImpl(PortletContainer container,
- InternalPortletWindow internalPortletWindow,
+ PortletWindow portletWindow,
HttpServletRequest servletRequest,
HttpServletResponse servletResponse) {
- super(container, internalPortletWindow, servletRequest,
+ super(container, portletWindow, servletRequest,
servletResponse);
}
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/ResourceURLImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/ResourceURLImpl.java?rev=652758&r1=652757&r2=652758&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/ResourceURLImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/ResourceURLImpl.java Thu May 1 21:13:47 2008
@@ -20,7 +20,7 @@
import javax.portlet.ResourceURL;
import org.apache.pluto.PortletContainer;
-import org.apache.pluto.internal.InternalPortletWindow;
+import org.apache.pluto.PortletWindow;
import org.apache.pluto.spi.PortletURLProvider;
/**
@@ -30,10 +30,10 @@
*/
public class ResourceURLImpl extends BaseURLImpl implements ResourceURL {
public ResourceURLImpl(PortletContainer container,
- InternalPortletWindow internalPortletWindow,
+ PortletWindow portletWindow,
javax.servlet.http.HttpServletRequest servletRequest,
javax.servlet.http.HttpServletResponse servletResponse) {
- super(container,internalPortletWindow,servletRequest,
+ super(container,portletWindow,servletRequest,
servletResponse,false,true);
}
@@ -109,7 +109,7 @@
String[] tmp1 = this.servletRequest.getParameterValues(name);
if (tmp1!=null)
lenght += tmp1.length;
- PortletURLProvider urlProvider = container.getRequiredContainerServices().getPortalCallbackService().getPortletURLProvider(super.servletRequest, internalPortletWindow);
+ PortletURLProvider urlProvider = container.getRequiredContainerServices().getPortalCallbackService().getPortletURLProvider(super.servletRequest, portletWindow);
String[] tmp2 = urlProvider.getPrivateRenderParameters(name);
if (tmp2!=null)
lenght += tmp2.length;
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/StateAwareResponseImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/StateAwareResponseImpl.java?rev=652758&r1=652757&r2=652758&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/StateAwareResponseImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/StateAwareResponseImpl.java Thu May 1 21:13:47 2008
@@ -37,14 +37,12 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpServletResponseWrapper;
-import javax.xml.XMLConstants;
import javax.xml.namespace.QName;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.pluto.PortletContainer;
-import org.apache.pluto.PortletContainerException;
-import org.apache.pluto.internal.InternalPortletWindow;
+import org.apache.pluto.PortletWindow;
import org.apache.pluto.om.portlet.Portlet;
import org.apache.pluto.om.portlet.Supports;
import org.apache.pluto.spi.EventProvider;
@@ -80,10 +78,10 @@
private EventRequest eventRequest;
public StateAwareResponseImpl(PortletContainer container,
- InternalPortletWindow internalPortletWindow,
+ PortletWindow portletWindow,
HttpServletRequest servletRequest,
HttpServletResponse servletResponse) {
- super(container, internalPortletWindow, servletRequest,
+ super(container, portletWindow, servletRequest,
servletResponse);
context = container.getRequiredContainerServices().getPortalContext();
callback = container.getRequiredContainerServices().getPortalCallbackService();
@@ -98,7 +96,7 @@
}
EventProvider provider = callback.getEventProvider(
- getHttpServletRequest(),getInternalPortletWindow());
+ getHttpServletRequest(),getPortletWindow());
provider.registerToFireEvent(qname, value);
redirectAllowed = false;
@@ -108,14 +106,9 @@
* @see javax.portlet.StateAwareResponse#setEvent(java.lang.String, java.lang.Object)
*/
public void setEvent(String name, Serializable value) {
- String contextPath = getInternalPortletWindow().getContextPath();
+ PortletWindow window = getPortletWindow();
String defaultNamespace;
- try {
- defaultNamespace = getContainer().getPortletApplicationDescriptor(contextPath).getDefaultNamespace();
- } catch (PortletContainerException e) {
- LOG.error(contextPath, e);
- defaultNamespace = XMLConstants.NULL_NS_URI;
- }
+ defaultNamespace = window.getPortletEntity().getPortletDefinition().getApplication().getDefaultNamespace();
QName qname = new QName(defaultNamespace, name);
setEvent(qname, value);
redirectAllowed = false;
@@ -135,7 +128,7 @@
ResourceURLProvider provider = callback.getResourceURLProvider(
getHttpServletRequest(),
- getInternalPortletWindow()
+ getPortletWindow()
);
if (location.indexOf("://") != -1) {
@@ -246,7 +239,7 @@
throw new IllegalArgumentException(
"Render parameter key must not be null.");
}
- List<String> publicRenderParameterNames = super.getInternalPortletWindow().getPortletEntity().getPortletDefinition().getPublicRenderParameter();
+ List<String> publicRenderParameterNames = super.getPortletWindow().getPortletEntity().getPortletDefinition().getPublicRenderParameter();
if (publicRenderParameterNames != null){
if (publicRenderParameterNames.contains(key)){
publicRenderParameter.put(key, new String[] {value});
@@ -271,7 +264,7 @@
throw new IllegalArgumentException(
"name and values must not be null or values be an empty array");
}
- List<String> publicRenderParameterNames = super.getInternalPortletWindow().getPortletEntity().getPortletDefinition().getPublicRenderParameter();
+ List<String> publicRenderParameterNames = super.getPortletWindow().getPortletEntity().getPortletDefinition().getPublicRenderParameter();
if (publicRenderParameterNames != null){
if (publicRenderParameterNames.contains(key)){
publicRenderParameter.put(key,StringUtils.copy(values));
@@ -321,7 +314,7 @@
}
protected boolean isPortletModeAllowedByPortlet(PortletMode mode) {
- Portlet dd = getInternalPortletWindow().getPortletEntity()
+ Portlet dd = getPortletWindow().getPortletEntity()
.getPortletDefinition();
Iterator supports = dd.getSupports().iterator();
@@ -579,7 +572,7 @@
}
public void removePublicRenderParameter(String name) {
- List<String> publicRenderParameterNames = super.getInternalPortletWindow().getPortletEntity().getPortletDefinition().getPublicRenderParameter();
+ List<String> publicRenderParameterNames = super.getPortletWindow().getPortletEntity().getPortletDefinition().getPublicRenderParameter();
if (publicRenderParameterNames != null){
if (publicRenderParameterNames.contains(name)){
publicRenderParameter.put(name,new String[] {null});
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletEnvironmentService.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletEnvironmentService.java?rev=652758&r1=652757&r2=652758&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletEnvironmentService.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletEnvironmentService.java Thu May 1 21:13:47 2008
@@ -22,7 +22,7 @@
import org.apache.pluto.PortletContainer;
import org.apache.pluto.internal.InternalActionRequest;
import org.apache.pluto.internal.InternalActionResponse;
-import org.apache.pluto.internal.InternalPortletWindow;
+import org.apache.pluto.PortletWindow;
import org.apache.pluto.internal.InternalRenderRequest;
import org.apache.pluto.internal.InternalRenderResponse;
import org.apache.pluto.internal.InternalResourceRequest;
@@ -39,35 +39,35 @@
PortletContainer container,
HttpServletRequest servletRequest,
HttpServletResponse servletResponse,
- InternalPortletWindow internalPortletWindow);
+ PortletWindow portletWindow);
InternalActionResponse createActionResponse(
PortletContainer container,
HttpServletRequest servletRequest,
HttpServletResponse servletResponse,
- InternalPortletWindow internalPortletWindow);
+ PortletWindow portletWindow);
InternalRenderRequest createRenderRequest(
PortletContainer container,
HttpServletRequest servletRequest,
HttpServletResponse servletResponse,
- InternalPortletWindow internalPortletWindow);
+ PortletWindow portletWindow);
InternalRenderResponse createRenderResponse(
PortletContainer container,
HttpServletRequest servletRequest,
HttpServletResponse servletResponse,
- InternalPortletWindow internalPortletWindow);
+ PortletWindow portletWindow);
InternalResourceRequest createResourceRequest(
PortletContainer container,
HttpServletRequest servletRequest,
HttpServletResponse servletResponse,
- InternalPortletWindow internalPortletWindow);
+ PortletWindow portletWindow);
InternalResourceResponse createResourceResponse(
PortletContainer container,
HttpServletRequest servletRequest,
HttpServletResponse servletResponse,
- InternalPortletWindow internalPortletWindow);
+ PortletWindow portletWindow);
}
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletInvokerService.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletInvokerService.java?rev=652758&r1=652757&r2=652758&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletInvokerService.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletInvokerService.java Thu May 1 21:13:47 2008
@@ -29,8 +29,9 @@
import javax.portlet.RenderResponse;
import javax.portlet.ResourceRequest;
import javax.portlet.ResourceResponse;
+import javax.servlet.ServletContext;
-import org.apache.pluto.internal.InternalPortletWindow;
+import org.apache.pluto.PortletWindow;
import org.apache.pluto.spi.FilterManager;
/**
@@ -38,21 +39,21 @@
*/
public interface PortletInvokerService {
- public void action(ActionRequest req, ActionResponse res, InternalPortletWindow window, FilterManager filterManager)
+ public void action(ServletContext containerContext, ActionRequest req, ActionResponse res, PortletWindow window, FilterManager filterManager)
throws IOException, PortletException;
- public void event(EventRequest request, EventResponse response, InternalPortletWindow window, FilterManager filterManager)
+ public void event(ServletContext containerContext, EventRequest request, EventResponse response, PortletWindow window, FilterManager filterManager)
throws IOException, PortletException;
- public void render(RenderRequest req, RenderResponse res, InternalPortletWindow window, FilterManager filterManager)
+ public void render(ServletContext containerContext, RenderRequest req, RenderResponse res, PortletWindow window, FilterManager filterManager)
throws IOException, PortletException;
- public void serveResource(ResourceRequest req, ResourceResponse res, InternalPortletWindow window, FilterManager filterManager)
+ public void serveResource(ServletContext containerContext, ResourceRequest req, ResourceResponse res, PortletWindow window, FilterManager filterManager)
throws IOException, PortletException;
- public void load(PortletRequest req, PortletResponse res, InternalPortletWindow window)
+ public void load(ServletContext containerContext, PortletRequest req, PortletResponse res, PortletWindow window)
throws IOException, PortletException;
- public void admin(PortletRequest req, PortletResponse res, InternalPortletWindow window)
+ public void admin(ServletContext containerContext, PortletRequest req, PortletResponse res, PortletWindow window)
throws IOException, PortletException;
}
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/test/java/org/apache/pluto/core/ContainerInvocationTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/test/java/org/apache/pluto/core/ContainerInvocationTest.java?rev=652758&r1=652757&r2=652758&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/test/java/org/apache/pluto/core/ContainerInvocationTest.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/test/java/org/apache/pluto/core/ContainerInvocationTest.java Thu May 1 21:13:47 2008
@@ -7,6 +7,7 @@
import org.apache.pluto.PortletWindow;
import org.apache.pluto.PortletWindowID;
+import org.apache.pluto.internal.PortletEntity;
public class ContainerInvocationTest extends TestCase
@@ -37,6 +38,9 @@
public PortletMode getPortletMode() {
return null; //To change body of implemented methods use File | Settings | File Templates.
}
+ public PortletEntity getPortletEntity() {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
});
}
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/test/java/org/apache/pluto/internal/impl/PortletRequestImplTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/test/java/org/apache/pluto/internal/impl/PortletRequestImplTest.java?rev=652758&r1=652757&r2=652758&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/test/java/org/apache/pluto/internal/impl/PortletRequestImplTest.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/test/java/org/apache/pluto/internal/impl/PortletRequestImplTest.java Thu May 1 21:13:47 2008
@@ -30,7 +30,7 @@
import org.apache.pluto.RequiredContainerServices;
import org.apache.pluto.core.PortletContainerImpl;
import org.apache.pluto.internal.InternalPortletRequest;
-import org.apache.pluto.internal.InternalPortletWindow;
+import org.apache.pluto.PortletWindow;
import org.apache.pluto.spi.CCPPProfileService;
import org.apache.pluto.spi.optional.UserInfoService;
import org.jmock.Mock;
@@ -55,7 +55,7 @@
private Mock mockPortletContext = null;
private Mock mockHttpServletRequest = null;
- private InternalPortletWindow window = null;
+ private PortletWindow window = null;
/* (non-Javadoc)
* @see junit.framework.TestCase#setUp()
@@ -74,7 +74,7 @@
mockContainer = mock( PortletContainerImpl.class,
new Class[] { String.class, RequiredContainerServices.class, OptionalContainerServices.class },
new Object[] { "Mock Pluto Container", (RequiredContainerServices) mockServices.proxy(), null } );
- window = (InternalPortletWindow) mock( InternalPortletWindow.class ).proxy();
+ window = (PortletWindow) mock( PortletWindow.class ).proxy();
mockHttpServletRequest = mock( HttpServletRequest.class );
// Constructor expectations for RenderRequestImpl
@@ -153,8 +153,8 @@
super(internalPortletRequest);
}
- public TestPortletRequestImpl(PortletContainer container, InternalPortletWindow internalPortletWindow, HttpServletRequest servletRequest) {
- super(container, internalPortletWindow, servletRequest);
+ public TestPortletRequestImpl(PortletContainer container, PortletWindow portletWindow, HttpServletRequest servletRequest) {
+ super(container, portletWindow, servletRequest);
}
public PortletPreferences getPreferences() {
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PortletAppDD.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PortletAppDD.java?rev=652758&r1=652757&r2=652758&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PortletAppDD.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PortletAppDD.java Thu May 1 21:13:47 2008
@@ -92,6 +92,8 @@
})
public class PortletAppDD implements PortletApp {
+ private String contextPath;
+
/** The defined portlets within the system. */
@XmlElement(name = "portlet", type=PortletDD.class, namespace = "http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd")
private List<Portlet> portlets = null;
@@ -163,6 +165,22 @@
*/
public PortletAppDD() {
}
+
+ /* (non-Javadoc)
+ * @see org.apache.pluto.om.portlet.PortletApp#getContextPath()
+ */
+ public String getContextPath()
+ {
+ return contextPath;
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.pluto.om.portlet.PortletApp#setContextPath(java.lang.String)
+ */
+ public void setContextPath(String contextPath)
+ {
+ this.contextPath = contextPath;
+ }
/* (non-Javadoc)
* @see org.apache.pluto.descriptors.portlet.PortletApp#getPortlets()
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PortletDD.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PortletDD.java?rev=652758&r1=652757&r2=652758&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PortletDD.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PortletDD.java Thu May 1 21:13:47 2008
@@ -20,8 +20,10 @@
import java.util.ArrayList;
import java.util.List;
+import javax.xml.bind.Unmarshaller;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
import javax.xml.namespace.QName;
@@ -34,6 +36,7 @@
import org.apache.pluto.om.portlet.EventDefinitionReference;
import org.apache.pluto.om.portlet.ExpirationCache;
import org.apache.pluto.om.portlet.Portlet;
+import org.apache.pluto.om.portlet.PortletApp;
import org.apache.pluto.om.portlet.PortletInfo;
import org.apache.pluto.om.portlet.PortletPreferences;
import org.apache.pluto.om.portlet.Supports;
@@ -113,6 +116,9 @@
public class PortletDD implements Portlet {
private static final String QNAME_JSR286 = "http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd";
+
+ @XmlTransient
+ private PortletAppDD application;
@XmlElement(name = "supports",type=SupportsDD.class)
private List<Supports> supports = null;
@@ -247,8 +253,16 @@
return toString().hashCode();
}
-
/* (non-Javadoc)
+ * @see org.apache.pluto.om.portlet.Portlet#getApplication()
+ */
+ public PortletApp getApplication()
+ {
+ return application;
+ }
+
+
+ /* (non-Javadoc)
* @see org.apache.pluto.descriptors.portlet.Portlet#getInitParams()
*/
public List<InitParam> getInitParams() {
@@ -555,5 +569,9 @@
public List<ContainerRuntimeOption> getContainerRuntimeOption() {
return containerRuntimeOption;
}
+
+ public void afterUnmarshal(Unmarshaller u, Object parent) {
+ application = (PortletAppDD)parent;
+ }
}
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/EventProviderImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/EventProviderImpl.java?rev=652758&r1=652757&r2=652758&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/EventProviderImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/EventProviderImpl.java Thu May 1 21:13:47 2008
@@ -46,7 +46,6 @@
import org.apache.pluto.PortletContainer;
import org.apache.pluto.PortletContainerException;
import org.apache.pluto.PortletWindow;
-import org.apache.pluto.core.PortletContainerImpl;
import org.apache.pluto.driver.AttributeKeys;
import org.apache.pluto.driver.config.DriverConfiguration;
import org.apache.pluto.driver.core.PortalRequestContext;
@@ -55,9 +54,7 @@
import org.apache.pluto.driver.services.portal.PortletWindowConfig;
import org.apache.pluto.driver.url.PortalURL;
import org.apache.pluto.driver.url.impl.PortalURLParserImpl;
-import org.apache.pluto.internal.InternalPortletWindow;
import org.apache.pluto.internal.impl.EventImpl;
-import org.apache.pluto.internal.impl.InternalPortletWindowImpl;
import org.apache.pluto.om.portlet.EventDefinition;
import org.apache.pluto.om.portlet.Portlet;
import org.apache.pluto.om.portlet.PortletApp;
@@ -224,7 +221,7 @@
// iterate all portlets in the portal
for (PortletWindowConfig config : portlets) {
- PortletWindow window = new PortletWindowImpl(config, portalURL);
+ PortletWindow window = new PortletWindowImpl(container, config, portalURL);
if (portletNames != null) {
for (String portlet : portletNames) {
if (portlet.equals(config.getId())) {
@@ -505,12 +502,10 @@
private boolean isDeclaredAsPublishingEvent(QName qname) {
ServletContext servletContext = PortalRequestContext
.getContext(request).getServletContext();
- InternalPortletWindow internalPortletWindow = new InternalPortletWindowImpl(
- servletContext, this.portletWindow);
String applicationId = PortletWindowConfig
- .parseContextPath(internalPortletWindow.getId().getStringId());
+ .parseContextPath(portletWindow.getId().getStringId());
String portletName = PortletWindowConfig
- .parsePortletName(internalPortletWindow.getId().getStringId());
+ .parsePortletName(portletWindow.getId().getStringId());
if (portletRegistry == null) {
portletRegistry = ((PortletContainer) servletContext
.getAttribute(AttributeKeys.PORTLET_CONTAINER))
@@ -524,57 +519,44 @@
e1.printStackTrace();
}
if (events != null) {
- String contextPath = portletWindow.getContextPath();
- try {
- PortletApp portletAppDD = container
- .getPortletApplicationDescriptor(contextPath);
- String defaultNamespace = portletAppDD.getDefaultNamespace();
- if (defaultNamespace == null) {
- defaultNamespace = XMLConstants.NULL_NS_URI;
- }
- for (QName name : events) {
- String namespaceURI = name.getNamespaceURI();
- if (XMLConstants.NULL_NS_URI.equals(namespaceURI)) {
- name = new QName(defaultNamespace, name.getLocalPart());
- }
- if (qname.equals(name)) {
- return true;
- }
- }
- } catch (PortletContainerException e) {
- LOG.error(qname, e);
- }
+ String defaultNamespace = portletWindow.getPortletEntity().getPortletDefinition().getApplication().getDefaultNamespace();
+ if (defaultNamespace == null) {
+ defaultNamespace = XMLConstants.NULL_NS_URI;
+ }
+ for (QName name : events) {
+ String namespaceURI = name.getNamespaceURI();
+ if (XMLConstants.NULL_NS_URI.equals(namespaceURI)) {
+ name = new QName(defaultNamespace, name.getLocalPart());
+ }
+ if (qname.equals(name)) {
+ return true;
+ }
+ }
}
return false;
}
private boolean isValueInstanceOfDefinedClass(QName qname,
Serializable value) {
- PortletApp portletAppDD = null;
- try {
- portletAppDD = container
- .getPortletApplicationDescriptor(portletWindow
- .getContextPath());
- if (portletAppDD.getEvents() != null) {
-
-
- for (EventDefinition def : portletAppDD.getEvents()){
- if (def.getQName() != null){
- if (def.getQName().equals(qname))
- return value.getClass().getName().equals(
- def.getJavaClass());
- }
- else{
- QName tmp = new QName(portletAppDD.getDefaultNamespace(),def.getName());
- if (tmp.equals(qname))
- return value.getClass().getName().equals(
- def.getJavaClass());
- }
- }
- }
- } catch (PortletContainerException e) {
- LOG.error(qname, e);
- }
+ PortletApp app = portletWindow.getPortletEntity().getPortletDefinition().getApplication();
+ List<EventDefinition> events = app.getEvents();
+ if (events != null) {
+
+
+ for (EventDefinition def : events){
+ if (def.getQName() != null){
+ if (def.getQName().equals(qname))
+ return value.getClass().getName().equals(
+ def.getJavaClass());
+ }
+ else{
+ QName tmp = new QName(app.getDefaultNamespace(),def.getName());
+ if (tmp.equals(qname))
+ return value.getClass().getName().equals(
+ def.getJavaClass());
+ }
+ }
+ }
// event not declared
return true;
}
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletURLListenerImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletURLListenerImpl.java?rev=652758&r1=652757&r2=652758&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletURLListenerImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletURLListenerImpl.java Thu May 1 21:13:47 2008
@@ -46,7 +46,7 @@
LOG.error(message, new IllegalArgumentException(message));
}
//this list is needed for the classnames
- List<Listener> portletURLFilterList = portletApp.getListener();//internalPortletWindow.get getPortletEntity(). getPortletDefinition().getUrlGenerationListener();
+ List<Listener> portletURLFilterList = portletApp.getListener();
//Iterate over the classnames and for each entry in the list the filter..URL is called.
if (portletURLFilterList != null){
for (Listener listener : portletURLFilterList) {
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletURLProviderImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletURLProviderImpl.java?rev=652758&r1=652757&r2=652758&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletURLProviderImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletURLProviderImpl.java Thu May 1 21:13:47 2008
@@ -39,12 +39,12 @@
private String window;
public PortletURLProviderImpl(HttpServletRequest request,
- PortletWindow internalPortletWindow) {
+ PortletWindow portletWindow) {
PortalRequestContext ctx = (PortalRequestContext)
request.getAttribute(PortalRequestContext.REQUEST_KEY);
url = ctx.createPortalURL();
- this.window = internalPortletWindow.getId().getStringId();
+ this.window = portletWindow.getId().getStringId();
}
public void setPortletMode(PortletMode mode) {
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletWindowThread.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletWindowThread.java?rev=652758&r1=652757&r2=652758&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletWindowThread.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletWindowThread.java Thu May 1 21:13:47 2008
@@ -39,11 +39,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.pluto.EventContainer;
-import org.apache.pluto.PortletContainer;
import org.apache.pluto.PortletContainerException;
import org.apache.pluto.PortletWindow;
-import org.apache.pluto.driver.AttributeKeys;
-import org.apache.pluto.driver.core.PortalRequestContext;
import org.apache.pluto.driver.core.PortalServletRequest;
import org.apache.pluto.internal.impl.EventImpl;
import org.apache.pluto.om.portlet.EventDefinition;
@@ -118,7 +115,7 @@
// now test if object is jaxb
EventDefinition eventDefinitionDD = getEventDefintion(event.getQName());
- ClassLoader loader = portletRegistry.getClassLoader(portletWindow.getPortletName());//Thread.currentThread().getContextClassLoader();
+ ClassLoader loader = portletRegistry.getClassLoader(portletWindow.getPortletEntity().getPortletDefinition().getPortletName());
Class<? extends Serializable> clazz = loader.loadClass(eventDefinitionDD.getJavaClass()).asSubclass(Serializable.class);
JAXBContext jc = JAXBContext.newInstance(clazz);
@@ -156,10 +153,7 @@
}
private EventDefinition getEventDefintion(QName name) throws PortletContainerException {
- PortalRequestContext context = PortalRequestContext.getContext(eventProvider.getRequest());
- ServletContext servletContext = context.getServletContext();
- PortletContainer container = (PortletContainer) servletContext.getAttribute(AttributeKeys.PORTLET_CONTAINER);
- PortletApp appDD = container.getPortletApplicationDescriptor(portletWindow.getContextPath());
+ PortletApp appDD = portletWindow.getPortletEntity().getPortletDefinition().getApplication();
for (EventDefinition def : appDD.getEvents()){
if (def.getQName() != null){
if (def.getQName().equals(name))
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/ResourceURLProviderImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/ResourceURLProviderImpl.java?rev=652758&r1=652757&r2=652758&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/ResourceURLProviderImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/ResourceURLProviderImpl.java Thu May 1 21:13:47 2008
@@ -27,7 +27,7 @@
private String base = "";
public ResourceURLProviderImpl(HttpServletRequest req,
- PortletWindow internalPortletWindow) {
+ PortletWindow portletWindow) {
}
public void setAbsoluteURL(String path) {
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverFilter.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverFilter.java?rev=652758&r1=652757&r2=652758&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverFilter.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverFilter.java Thu May 1 21:13:47 2008
@@ -154,7 +154,7 @@
// Action window config will only exist if there is an action request.
if (actionWindowConfig != null) {
- PortletWindowImpl portletWindow = new PortletWindowImpl(
+ PortletWindowImpl portletWindow = new PortletWindowImpl(container,
actionWindowConfig, portalURL);
if (LOG.isDebugEnabled()) {
LOG.debug("Processing action request for window: "
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverServlet.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverServlet.java?rev=652758&r1=652757&r2=652758&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverServlet.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverServlet.java Thu May 1 21:13:47 2008
@@ -123,7 +123,7 @@
// Action window config will only exist if there is an action request.
if (actionWindowConfig != null) {
- PortletWindowImpl portletWindow = new PortletWindowImpl(
+ PortletWindowImpl portletWindow = new PortletWindowImpl(container,
actionWindowConfig, portalURL);
if (LOG.isDebugEnabled()) {
LOG.debug("Processing action request for window: "
@@ -148,7 +148,7 @@
} catch (PortletContainerException e) {
LOG.warn(e);
}
- PortletWindowImpl portletWindow = new PortletWindowImpl(
+ PortletWindowImpl portletWindow = new PortletWindowImpl(container,
resourceWindowConfig, portalURL);
if (LOG.isDebugEnabled()) {
LOG.debug("Processing resource Serving request for window: "
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/core/PortletWindowImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/core/PortletWindowImpl.java?rev=652758&r1=652757&r2=652758&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/core/PortletWindowImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/core/PortletWindowImpl.java Thu May 1 21:13:47 2008
@@ -19,21 +19,31 @@
import javax.portlet.PortletMode;
import javax.portlet.WindowState;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.pluto.PortletContainer;
+import org.apache.pluto.PortletContainerException;
import org.apache.pluto.PortletWindow;
import org.apache.pluto.PortletWindowID;
import org.apache.pluto.driver.services.portal.PortletWindowConfig;
import org.apache.pluto.driver.url.PortalURL;
+import org.apache.pluto.internal.PortletEntity;
+import org.apache.pluto.internal.impl.PortletEntityImpl;
/**
* Implementation of <code>PortletWindow</code> interface.
*/
public class PortletWindowImpl implements PortletWindow {
+ /** Logger. */
+ private static final Log LOG = LogFactory.getLog(PortletWindowImpl.class);
+
// Private Member Variables ------------------------------------------------
private PortletWindowConfig config;
private PortalURL portalURL;
private PortletWindowIDImpl objectIdImpl;
+ private PortletEntity entity;
// Constructor -------------------------------------------------------------
@@ -43,9 +53,19 @@
* @param config the portlet window configuration.
* @param portalURL the portal URL.
*/
- public PortletWindowImpl(PortletWindowConfig config, PortalURL portalURL) {
+ public PortletWindowImpl(PortletContainer container, PortletWindowConfig config, PortalURL portalURL) {
this.config = config;
this.portalURL = portalURL;
+ try
+ {
+ this.entity = new PortletEntityImpl(container.getOptionalContainerServices().getPortletRegistryService().getPortletDescriptor(config.getContextPath(), config.getPortletName()));
+ }
+ catch (PortletContainerException ex)
+ {
+ String message = "Unable to load Portlet App Deployment Descriptor:"+ ex.getMessage();
+ LOG.error(message, ex);
+ throw new RuntimeException(message);
+ }
}
@@ -73,4 +93,8 @@
}
return objectIdImpl;
}
+
+ public PortletEntity getPortletEntity() {
+ return entity;
+ }
}
\ No newline at end of file
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/core/ResourceURLProviderImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/core/ResourceURLProviderImpl.java?rev=652758&r1=652757&r2=652758&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/core/ResourceURLProviderImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/core/ResourceURLProviderImpl.java Thu May 1 21:13:47 2008
@@ -39,7 +39,7 @@
private String base = "";
public ResourceURLProviderImpl(HttpServletRequest req,
- PortletWindow internalPortletWindow) {
+ PortletWindow portletWindow) {
PortalRequestContext ctx = (PortalRequestContext)
req.getAttribute(PortalRequestContext.REQUEST_KEY);
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletTag.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletTag.java?rev=652758&r1=652757&r2=652758&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletTag.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletTag.java Thu May 1 21:13:47 2008
@@ -121,8 +121,12 @@
(HttpServletRequest) pageContext.getRequest());
PortalURL portalURL = portalEnv.getRequestedPortalURL();
+ // Retrieve the portlet container from servlet context.
+ PortletContainer container = (PortletContainer)
+ servletContext.getAttribute(AttributeKeys.PORTLET_CONTAINER);
+
// Create the portlet window to render.
- PortletWindow window = new PortletWindowImpl(windowConfig, portalURL);
+ PortletWindow window = new PortletWindowImpl(container, windowConfig, portalURL);
// Check if someone else is maximized. If yes, don't show content.
Map windowStates = portalURL.getWindowStates();
@@ -142,10 +146,6 @@
PortalServletResponse portalResponse = new PortalServletResponse(
(HttpServletResponse) pageContext.getResponse());
- // Retrieve the portlet container from servlet context.
- PortletContainer container = (PortletContainer)
- servletContext.getAttribute(AttributeKeys.PORTLET_CONTAINER);
-
// Render the portlet and cache the response.
try {
container.doRender(window, portalRequest, portalResponse);