You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by wo...@apache.org on 2007/10/22 13:54:13 UTC
svn commit: r587064 [3/3] - in /portals/jetspeed-2/branches/JETSPEED-2.1.3:
./ commons/src/java/org/apache/jetspeed/aggregator/
commons/src/java/org/apache/jetspeed/container/
commons/src/java/org/apache/jetspeed/container/session/ components/portal/
c...
Modified: portals/jetspeed-2/branches/JETSPEED-2.1.3/components/portal/src/java/org/apache/jetspeed/container/invoker/ServletPortletInvoker.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3/components/portal/src/java/org/apache/jetspeed/container/invoker/ServletPortletInvoker.java?rev=587064&r1=587063&r2=587064&view=diff
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-2.1.3/components/portal/src/java/org/apache/jetspeed/container/invoker/ServletPortletInvoker.java (original)
+++ portals/jetspeed-2/branches/JETSPEED-2.1.3/components/portal/src/java/org/apache/jetspeed/container/invoker/ServletPortletInvoker.java Mon Oct 22 04:54:11 2007
@@ -16,6 +16,7 @@
*/
package org.apache.jetspeed.container.invoker;
+import java.lang.reflect.Constructor;
import java.io.IOException;
import javax.portlet.ActionRequest;
@@ -43,7 +44,6 @@
import org.apache.jetspeed.factory.PortletInstance;
import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
import org.apache.jetspeed.request.RequestContext;
-import org.apache.jetspeed.aggregator.Worker;
import org.apache.jetspeed.aggregator.CurrentWorkerContext;
import org.apache.pluto.om.portlet.PortletDefinition;
import org.apache.pluto.om.servlet.WebApplicationDefinition;
@@ -78,8 +78,21 @@
protected PortletDefinition portletDefinition;
protected boolean activated = false;
protected String servletMappingName;
+
+ /**
+ * Wheter the servlet request instance should be wrapped or not if it is under WebSphere environment.
+ */
+ protected boolean wrapRequestOfWebSphere;
-
+ public ServletPortletInvoker()
+ {
+ this(false);
+ }
+
+ public ServletPortletInvoker(boolean wrapRequestOfWebSphere)
+ {
+ this.wrapRequestOfWebSphere = wrapRequestOfWebSphere;
+ }
/* (non-Javadoc)
* @see org.apache.jetspeed.container.invoker.JetspeedPortletInvoker#passivate()
@@ -173,7 +186,7 @@
// In case of parallel mode, get portlet definition object from the worker thread context.
// Otherwise, refer the member variable.
- boolean isParallelMode = (Thread.currentThread() instanceof Worker || CurrentWorkerContext.getCurrentWorkerContextUsed());
+ boolean isParallelMode = CurrentWorkerContext.getParallelRenderingMode();
if (isParallelMode)
{
@@ -194,11 +207,6 @@
}
String portletApplicationName = webApplicationDefinition.getContextRoot();
- // gather all required data from request and response
- ServletRequest servletRequest = ((HttpServletRequestWrapper)((HttpServletRequestWrapper)((HttpServletRequestWrapper)portletRequest).getRequest()).getRequest()).getRequest();
-
- ServletResponse servletResponse = ((HttpServletResponseWrapper) portletResponse).getResponse();
-
ServletContext appContext = jetspeedContext.getContext(portletApplicationName);
if (null == appContext)
{
@@ -219,6 +227,10 @@
throw new PortletException(message);
}
+ // gather all required data from request and response
+ ServletRequest servletRequest = getServletRequestForContainer(portletRequest, appContext);
+ ServletResponse servletResponse = getServletResponseForContainer(portletResponse);
+
try
{
RequestContext requestContext = (RequestContext) servletRequest.getAttribute(PortalReservedParameters.REQUEST_CONTEXT_ATTRIBUTE);
@@ -297,4 +309,75 @@
}
+ protected ServletRequest getServletRequestForContainer(PortletRequest portletRequest, ServletContext appContext)
+ {
+ ServletRequest servletRequest = ((HttpServletRequestWrapper)((HttpServletRequestWrapper)((HttpServletRequestWrapper)portletRequest).getRequest()).getRequest()).getRequest();
+
+ if (this.wrapRequestOfWebSphere && CurrentWorkerContext.getParallelRenderingMode())
+ {
+ String entAppNameOnWebSphere = (String) appContext.getAttribute("com.ibm.websphere.servlet.enterprise.application.name");
+
+ // If the container is WebSphere, wrap the request.
+ if (entAppNameOnWebSphere != null)
+ {
+ try
+ {
+ servletRequest = wrapWebSphereSRTServletRequest(servletRequest);
+ }
+ catch (Throwable th)
+ {
+ log.error("Failed to load websphere system classes.", th);
+ }
+ }
+ }
+
+ return servletRequest;
+ }
+
+ protected ServletResponse getServletResponseForContainer(PortletResponse portletResponse)
+ {
+ ServletResponse servletResponse = ((HttpServletResponseWrapper) portletResponse).getResponse();
+ return servletResponse;
+ }
+
+ private static Class adjustedSRTServletRequestClazz;
+ private static Constructor adjustedSRTServletRequestClazzConstructor;
+
+ private static ServletRequest wrapWebSphereSRTServletRequest(ServletRequest servletRequest) throws Throwable
+ {
+ if (adjustedSRTServletRequestClazzConstructor == null)
+ {
+ if (adjustedSRTServletRequestClazz == null)
+ {
+ synchronized (ServletPortletInvoker.class)
+ {
+ if (adjustedSRTServletRequestClazz == null)
+ {
+ adjustedSRTServletRequestClazz = new AdjustedSRTServletRequestClassLoader().defineAdjustedSRTServletRequestClass();
+ }
+ }
+ }
+
+ adjustedSRTServletRequestClazzConstructor = adjustedSRTServletRequestClazz.getConstructors()[0];
+ }
+
+ Object [] args = new Object [] { servletRequest };
+ return (ServletRequest) adjustedSRTServletRequestClazzConstructor.newInstance(args);
+ }
+
+ private static class AdjustedSRTServletRequestClassLoader extends ClassLoader
+ {
+ public AdjustedSRTServletRequestClassLoader()
+ {
+ super(PortletRequestContext.class.getClassLoader());
+ }
+
+ public Class defineAdjustedSRTServletRequestClass() throws Throwable
+ {
+ byte [] bytes = AdjustedSRTServletRequestDump.dumpInner1();
+ Class inner1 = defineClass("org.apache.jetspeed.container.invoker.AdjustedSRTServletRequest$1", bytes, 0, bytes.length);
+ bytes = AdjustedSRTServletRequestDump.dump();
+ return defineClass("org.apache.jetspeed.container.invoker.AdjustedSRTServletRequest", bytes, 0, bytes.length);
+ }
+ }
}
Modified: portals/jetspeed-2/branches/JETSPEED-2.1.3/components/portal/src/java/org/apache/jetspeed/container/invoker/ServletPortletInvokerFactory.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3/components/portal/src/java/org/apache/jetspeed/container/invoker/ServletPortletInvokerFactory.java?rev=587064&r1=587063&r2=587064&view=diff
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-2.1.3/components/portal/src/java/org/apache/jetspeed/container/invoker/ServletPortletInvokerFactory.java (original)
+++ portals/jetspeed-2/branches/JETSPEED-2.1.3/components/portal/src/java/org/apache/jetspeed/container/invoker/ServletPortletInvokerFactory.java Mon Oct 22 04:54:11 2007
@@ -1,9 +1,9 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
@@ -23,6 +23,22 @@
*/
public class ServletPortletInvokerFactory
{
+
+ /**
+ * Wheter the servlet request instance should be wrapped or not if it is under WebSphere environment.
+ */
+ protected boolean wrapRequestOfWebSphere;
+
+ public ServletPortletInvokerFactory()
+ {
+ this(false);
+ }
+
+ public ServletPortletInvokerFactory(boolean wrapRequestOfWebSphere)
+ {
+ this.wrapRequestOfWebSphere = wrapRequestOfWebSphere;
+ }
+
/**
* <p>
* createInstance
@@ -34,7 +50,7 @@
*/
public ServletPortletInvoker createInstance()
{
- return new ServletPortletInvoker();
+ return new ServletPortletInvoker(this.wrapRequestOfWebSphere);
}
/**
Modified: portals/jetspeed-2/branches/JETSPEED-2.1.3/components/portal/src/java/org/apache/jetspeed/container/session/PortalSessionMonitorImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3/components/portal/src/java/org/apache/jetspeed/container/session/PortalSessionMonitorImpl.java?rev=587064&r1=587063&r2=587064&view=diff
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-2.1.3/components/portal/src/java/org/apache/jetspeed/container/session/PortalSessionMonitorImpl.java (original)
+++ portals/jetspeed-2/branches/JETSPEED-2.1.3/components/portal/src/java/org/apache/jetspeed/container/session/PortalSessionMonitorImpl.java Mon Oct 22 04:54:11 2007
@@ -64,6 +64,11 @@
{
return sessionKey;
}
+
+ public HttpSession getSession()
+ {
+ return session;
+ }
/* (non-Javadoc)
Modified: portals/jetspeed-2/branches/JETSPEED-2.1.3/components/portal/src/java/org/apache/jetspeed/container/session/PortalSessionsManagerImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3/components/portal/src/java/org/apache/jetspeed/container/session/PortalSessionsManagerImpl.java?rev=587064&r1=587063&r2=587064&view=diff
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-2.1.3/components/portal/src/java/org/apache/jetspeed/container/session/PortalSessionsManagerImpl.java (original)
+++ portals/jetspeed-2/branches/JETSPEED-2.1.3/components/portal/src/java/org/apache/jetspeed/container/session/PortalSessionsManagerImpl.java Mon Oct 22 04:54:11 2007
@@ -23,6 +23,9 @@
import javax.servlet.http.HttpSession;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
/**
* PortalSessionsManagerImpl
*
@@ -31,6 +34,9 @@
*/
public class PortalSessionsManagerImpl implements PortalSessionsManager
{
+
+ private static Log log = LogFactory.getLog(PortalSessionsManagerImpl.class);
+
private static final class PortalSessionRegistry
{
long portalSessionKey;
@@ -139,6 +145,13 @@
{
if ( portalSession != null && paSession != null )
{
+ if (portalSession == paSession)
+ {
+ // On WebSphere 6.1.0.11, strange symptoms like this occur...
+ log.warn("servlet context name of paSession(" + paSession.getId() + "): " + paSession.getServletContext().getServletContextName());
+ return;
+ }
+
PortalSessionRegistry psr = (PortalSessionRegistry)portalSessionsRegistry.get(portalSession.getId());
if (psr == null)
{
@@ -225,7 +238,9 @@
psr.psm = new PortalSessionMonitorImpl(-1);
portalSessionsRegistry.put(restoredPasm.getPortalSessionId(), psr);
}
+
// save the restored instance
+ restoredPasm.getSession().setAttribute(PortletApplicationSessionMonitor.SESSION_KEY, restoredPasm);
psr.sessionMonitors.put(restoredPasm.getContextPath(), restoredPasm);
}
Modified: portals/jetspeed-2/branches/JETSPEED-2.1.3/components/portal/src/java/org/apache/jetspeed/engine/servlet/ServletRequestImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3/components/portal/src/java/org/apache/jetspeed/engine/servlet/ServletRequestImpl.java?rev=587064&r1=587063&r2=587064&view=diff
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-2.1.3/components/portal/src/java/org/apache/jetspeed/engine/servlet/ServletRequestImpl.java (original)
+++ portals/jetspeed-2/branches/JETSPEED-2.1.3/components/portal/src/java/org/apache/jetspeed/engine/servlet/ServletRequestImpl.java Mon Oct 22 04:54:11 2007
@@ -40,7 +40,6 @@
import org.apache.jetspeed.Jetspeed;
import org.apache.jetspeed.PortalReservedParameters;
import org.apache.jetspeed.aggregator.CurrentWorkerContext;
-import org.apache.jetspeed.aggregator.Worker;
import org.apache.jetspeed.container.PortletDispatcherIncludeAware;
import org.apache.jetspeed.container.namespace.JetspeedNamespaceMapper;
import org.apache.jetspeed.container.namespace.JetspeedNamespaceMapperFactory;
@@ -414,9 +413,8 @@
Enumeration attrNames = super.getAttributeNames();
// In parallel mode, adjust attributes by the values of the current thread
- Thread ct = Thread.currentThread();
- if (ct instanceof Worker || CurrentWorkerContext.getCurrentWorkerContextUsed())
+ if (CurrentWorkerContext.getParallelRenderingMode())
{
// If cached attributes map is null, it should be re-created.
@@ -460,9 +458,7 @@
// In parallel mode, first look up from the worker.
- Thread ct = Thread.currentThread();
-
- if (ct instanceof Worker || CurrentWorkerContext.getCurrentWorkerContextUsed())
+ if (CurrentWorkerContext.getParallelRenderingMode())
{
value = CurrentWorkerContext.getAttribute(name);
@@ -632,10 +628,7 @@
// In parallel mode, put attribute into worker.
- Thread ct = Thread.currentThread();
- boolean currentWorkerContextUsed = CurrentWorkerContext.getCurrentWorkerContextUsed();
-
- if (ct instanceof Worker || currentWorkerContextUsed)
+ if (CurrentWorkerContext.getParallelRenderingMode())
{
// when it is parallel rendering, the cached request attributes should be re-created later by setting it to null.
cachedAttributes = null;
@@ -649,7 +642,7 @@
CurrentWorkerContext.setAttribute(name, value);
}
- if (currentWorkerContextUsed || name.startsWith("org.apache.jetspeed"))
+ if (name.startsWith("org.apache.jetspeed"))
{
setAttributeInternal(name, value);
}
@@ -698,9 +691,7 @@
// In parallel mode, remove attribute from worker.
- Thread ct = Thread.currentThread();
-
- if (ct instanceof Worker || CurrentWorkerContext.getCurrentWorkerContextUsed())
+ if (CurrentWorkerContext.getParallelRenderingMode())
{
// when it is parallel rendering, the cached request attributes should be re-created later by setting it to null.
cachedAttributes = null;
Modified: portals/jetspeed-2/branches/JETSPEED-2.1.3/components/portal/src/java/org/apache/jetspeed/request/JetspeedRequestContextComponent.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3/components/portal/src/java/org/apache/jetspeed/request/JetspeedRequestContextComponent.java?rev=587064&r1=587063&r2=587064&view=diff
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-2.1.3/components/portal/src/java/org/apache/jetspeed/request/JetspeedRequestContextComponent.java (original)
+++ portals/jetspeed-2/branches/JETSPEED-2.1.3/components/portal/src/java/org/apache/jetspeed/request/JetspeedRequestContextComponent.java Mon Oct 22 04:54:11 2007
@@ -28,7 +28,6 @@
import org.apache.commons.logging.LogFactory;
import org.apache.jetspeed.PortalReservedParameters;
import org.apache.jetspeed.aggregator.CurrentWorkerContext;
-import org.apache.jetspeed.aggregator.Worker;
import org.apache.jetspeed.userinfo.UserInfoManager;
/**
@@ -132,8 +131,7 @@
{
RequestContext rc = null;
- Thread ct = Thread.currentThread();
- if (ct instanceof Worker || CurrentWorkerContext.getCurrentWorkerContextUsed())
+ if (CurrentWorkerContext.getParallelRenderingMode())
{
rc = (RequestContext) CurrentWorkerContext.getAttribute(PortalReservedParameters.REQUEST_CONTEXT_ATTRIBUTE);
}
Modified: portals/jetspeed-2/branches/JETSPEED-2.1.3/core-build.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3/core-build.xml?rev=587064&r1=587063&r2=587064&view=diff
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-2.1.3/core-build.xml (original)
+++ portals/jetspeed-2/branches/JETSPEED-2.1.3/core-build.xml Mon Oct 22 04:54:11 2007
@@ -374,6 +374,32 @@
</properties>
</dependency>
-
+
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>2.2</version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm-attrs</artifactId>
+ <version>2.2</version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>commonj</groupId>
+ <artifactId>commonj-twm</artifactId>
+ <version>1.1</version>
+ <properties>
+ <war.bundle>false</war.bundle>
+ </properties>
+ </dependency>
+
</dependencies>
</project>
Modified: portals/jetspeed-2/branches/JETSPEED-2.1.3/jetspeed-api/src/java/org/apache/jetspeed/aggregator/WorkerMonitor.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3/jetspeed-api/src/java/org/apache/jetspeed/aggregator/WorkerMonitor.java?rev=587064&r1=587063&r2=587064&view=diff
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-2.1.3/jetspeed-api/src/java/org/apache/jetspeed/aggregator/WorkerMonitor.java (original)
+++ portals/jetspeed-2/branches/JETSPEED-2.1.3/jetspeed-api/src/java/org/apache/jetspeed/aggregator/WorkerMonitor.java Mon Oct 22 04:54:11 2007
@@ -60,10 +60,6 @@
*/
int getRunningJobsCount();
- void setQueue(Queue queue);
-
- Worker getWorker();
-
/**
* Start processing a job, assign it to a worker thread.
*
@@ -71,10 +67,4 @@
*/
void process(RenderingJob job);
- /**
- * Release a job on completion
- *
- * @param worker
- */
- void release(Worker worker);
}
Modified: portals/jetspeed-2/branches/JETSPEED-2.1.3/jetspeed-api/src/java/org/apache/jetspeed/container/session/PortalSessionMonitor.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3/jetspeed-api/src/java/org/apache/jetspeed/container/session/PortalSessionMonitor.java?rev=587064&r1=587063&r2=587064&view=diff
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-2.1.3/jetspeed-api/src/java/org/apache/jetspeed/container/session/PortalSessionMonitor.java (original)
+++ portals/jetspeed-2/branches/JETSPEED-2.1.3/jetspeed-api/src/java/org/apache/jetspeed/container/session/PortalSessionMonitor.java Mon Oct 22 04:54:11 2007
@@ -18,6 +18,7 @@
import java.io.Serializable;
+import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpSessionActivationListener;
import javax.servlet.http.HttpSessionBindingListener;
@@ -34,4 +35,5 @@
long getSessionKey();
String getSessionId();
void invalidateSession();
+ HttpSession getSession();
}
Modified: portals/jetspeed-2/branches/JETSPEED-2.1.3/jetspeed-api/src/java/org/apache/jetspeed/container/session/PortletApplicationSessionMonitor.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3/jetspeed-api/src/java/org/apache/jetspeed/container/session/PortletApplicationSessionMonitor.java?rev=587064&r1=587063&r2=587064&view=diff
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-2.1.3/jetspeed-api/src/java/org/apache/jetspeed/container/session/PortletApplicationSessionMonitor.java (original)
+++ portals/jetspeed-2/branches/JETSPEED-2.1.3/jetspeed-api/src/java/org/apache/jetspeed/container/session/PortletApplicationSessionMonitor.java Mon Oct 22 04:54:11 2007
@@ -18,6 +18,7 @@
import java.io.Serializable;
+import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpSessionActivationListener;
import javax.servlet.http.HttpSessionBindingListener;
@@ -34,4 +35,5 @@
String getPortalSessionId();
String getContextPath();
void invalidateSession();
+ HttpSession getSession();
}
Modified: portals/jetspeed-2/branches/JETSPEED-2.1.3/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3/pom.xml?rev=587064&r1=587063&r2=587064&view=diff
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-2.1.3/pom.xml (original)
+++ portals/jetspeed-2/branches/JETSPEED-2.1.3/pom.xml Mon Oct 22 04:54:11 2007
@@ -205,6 +205,8 @@
<xalan.version>2.4.1</xalan.version>
<xerces.version>2.3.0</xerces.version>
<xml-apis.version>1.0.b2</xml-apis.version>
+ <asm.version>2.2</asm.version>
+ <commonj.version>1.1</commonj.version>
</properties>
<!-- Default Modules -->
@@ -941,6 +943,26 @@
<artifactId>ant</artifactId>
<version>${ant.version}</version>
</dependency>
+
+ <!-- ASM -->
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>${asm.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm-attrs</artifactId>
+ <version>${asm.version}</version>
+ </dependency>
+
+ <!-- CommonJ -->
+ <dependency>
+ <groupId>commonj</groupId>
+ <artifactId>commonj-twm</artifactId>
+ <version>${commonj.version}</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -1136,12 +1158,6 @@
<groupId>isorelax</groupId>
<artifactId>isorelax</artifactId>
<version>20020414</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
- <version>1.5.3</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/assembly/aggregation.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/assembly/aggregation.xml?rev=587064&r1=587063&r2=587064&view=diff
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/assembly/aggregation.xml (original)
+++ portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/assembly/aggregation.xml Mon Oct 22 04:54:11 2007
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
@@ -134,6 +134,7 @@
</constructor-arg>
</bean>
+ <!-- The default Worker Monitor -->
<bean id="org.apache.jetspeed.aggregator.WorkerMonitor"
class="org.apache.jetspeed.aggregator.impl.WorkerMonitorImpl"
init-method="start" destroy-method="stop" >
@@ -156,6 +157,29 @@
</constructor-arg>
</bean>
+
+ <!--
+ Commonj Work Manager and Worker Monitor
+
+ If you want to use Commonj Work Manager provided by the container, uncomment the followings
+ and replace 'org.apache.jetspeed.aggregator.WorkerMonitor' with 'org.apache.jetspeed.aggregator.CommonjWorkerMonitor' in this file.
+ -->
+
+ <!--
+ <bean id="JetspeedWorkManager" class="org.springframework.jndi.JndiObjectFactoryBean">
+ <property name="resourceRef"><value>false</value></property>
+ <property name="jndiName">
+ <value>java:comp/env/wm/jetspeed</value>
+ </property>
+ </bean>
+ <bean id="org.apache.jetspeed.aggregator.CommonjWorkerMonitor"
+ class="org.apache.jetspeed.aggregator.impl.CommonjWorkerMonitorImpl"
+ init-method="start" destroy-method="stop" >
+ <constructor-arg index="0">
+ <ref bean="JetspeedWorkManager" />
+ </constructor-arg>
+ </bean>
+ -->
<bean id="HeaderAggregatorPortal" class="org.apache.jetspeed.aggregator.impl.HeaderAggregatorImpl">
<constructor-arg index="0">
Modified: portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/assembly/pluto-factories.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/assembly/pluto-factories.xml?rev=587064&r1=587063&r2=587064&view=diff
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/assembly/pluto-factories.xml (original)
+++ portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/assembly/pluto-factories.xml Mon Oct 22 04:54:11 2007
@@ -28,8 +28,12 @@
/>
<bean id="ServletPortletInvokerFactory"
- class="org.apache.jetspeed.container.invoker.ServletPortletInvokerFactory"
- />
+ class="org.apache.jetspeed.container.invoker.ServletPortletInvokerFactory">
+ <!-- Set the following argument to true when you are running the system with parallel rendering mode under WebSphere. -->
+ <constructor-arg index="0">
+ <value>false</value>
+ </constructor-arg>
+ </bean>
<bean id="javax.portlet.ActionRequest"
class="org.apache.jetspeed.components.factorybeans.PlutoFactoryFactoryBean"
Modified: portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/web.xml?rev=587064&r1=587063&r2=587064&view=diff
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/web.xml (original)
+++ portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/web.xml Mon Oct 22 04:54:11 2007
@@ -45,6 +45,13 @@
<param-value>48</param-value>
</init-param>
</filter>
+
+ <!--
+ <filter>
+ <filter-name>PortalFilter</filter-name>
+ <filter-class>org.apache.jetspeed.login.filter.PortalFilter</filter-class>
+ </filter>
+ -->
<filter-mapping>
<filter-name>XXSUrlAttackFilter</filter-name>
@@ -56,14 +63,7 @@
<servlet-name>default</servlet-name>
</filter-mapping>
- <!--
- <filter>
- <filter-name>PortalFilter</filter-name>
- <filter-class>org.apache.jetspeed.login.filter.PortalFilter</filter-class>
- </filter>
- -->
<!--
-
<filter-mapping>
<filter-name>PortalFilter</filter-name>
<url-pattern>/*</url-pattern>
@@ -286,6 +286,20 @@
<res-type>javax.sql.DataSource</res-type>
<res-auth>Container</res-auth>
</resource-ref>
+
+ <!-- JNDI CommonJ WorkManager resource -->
+ <!--
+ If you want to use Commonj Work Manager provided by the container in parallel rendering, uncomment the following.
+ -->
+ <!--
+ <resource-ref>
+ <description>WorkManager</description>
+ <res-ref-name>wm/jetspeed</res-ref-name>
+ <res-type>commonj.work.WorkManager</res-type>
+ <res-auth>Container</res-auth>
+ <res-sharing-scope>Shareable</res-sharing-scope>
+ </resource-ref>
+ -->
<!-- Protect LogInRedirectory.jsp. This will require a login when called -->
<security-constraint>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org