taylor 2004/01/08 15:25:13
Modified: portal/src/java/org/apache/jetspeed/capability/impl
CapabilityValveImpl.java
portal/src/java/org/apache/jetspeed/container/invoker
AbstractPortletInvokerFactory.java
LocalPortletInvoker.java
PortletInvokerFactoryImpl.java
portal/src/java/org/apache/jetspeed/security/impl
RolePrincipalImpl.java
portal/src/java/org/apache/jetspeed/services/information
InformationProviderServiceImpl.java
Log:
fixed bug in release object of invoker
removed debug statements
serialized principals
Revision Changes Path
1.4 +1 -3
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/capability/impl/CapabilityValveImpl.java
Index: CapabilityValveImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/capability/impl/CapabilityValveImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CapabilityValveImpl.java 22 Dec 2003 02:18:22 -0000 1.3
+++ CapabilityValveImpl.java 8 Jan 2004 23:25:12 -0000 1.4
@@ -94,8 +94,6 @@
public void invoke(RequestContext request, ValveContext context)
throws PipelineException
{
- System.out.println("Capability Valve Invoked");
-
try
{
String requestMediaType =
request.getRequestParameter(ProfilingRule.STANDARD_MEDIATYPE);
1.4 +2 -5
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/invoker/AbstractPortletInvokerFactory.java
Index: AbstractPortletInvokerFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/invoker/AbstractPortletInvokerFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractPortletInvokerFactory.java 8 Jan 2004 20:40:33 -0000 1.3
+++ AbstractPortletInvokerFactory.java 8 Jan 2004 23:25:13 -0000 1.4
@@ -97,10 +97,7 @@
return (JetspeedPortletInvoker)pool.borrowObject();
}
- /* (non-Javadoc)
- * @see
org.apache.commons.pool.PoolableObjectFactory#passivateObject(java.lang.Object)
- */
- public void passivateObject(Object object) throws Exception
+ public void releaseObject(Object object) throws Exception
{
JetspeedPortletInvoker invoker = (JetspeedPortletInvoker)object;
pool.returnObject(invoker);
1.3 +2 -2
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/invoker/LocalPortletInvoker.java
Index: LocalPortletInvoker.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/invoker/LocalPortletInvoker.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LocalPortletInvoker.java 7 Jan 2004 22:01:05 -0000 1.2
+++ LocalPortletInvoker.java 8 Jan 2004 23:25:13 -0000 1.3
@@ -81,7 +81,7 @@
import org.apache.pluto.om.portlet.PortletDefinition;
/**
- * JetspeedPortletInvoker invokes local (internal) portlet applications.
+ * LocalPortletInvoker invokes local (internal) portlet applications.
* Local portlet applications are stored within the Jetspeed Portlet application.
* They are not separate web applications; but are stored under Jetspeed's
* WEB-INF/apps directory.
1.7 +3 -3
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/invoker/PortletInvokerFactoryImpl.java
Index: PortletInvokerFactoryImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/invoker/PortletInvokerFactoryImpl.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- PortletInvokerFactoryImpl.java 8 Jan 2004 04:09:20 -0000 1.6
+++ PortletInvokerFactoryImpl.java 8 Jan 2004 23:25:13 -0000 1.7
@@ -180,11 +180,11 @@
{
if (invoker instanceof ServletPortletInvoker)
{
- servletInvokerFactory.passivateObject(invoker);
+ servletInvokerFactory.releaseObject(invoker);
}
else
{
- localInvokerFactory.passivateObject(invoker);
+ localInvokerFactory.releaseObject(invoker);
}
}
catch (Exception e)
1.2 +4 -2
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/security/impl/RolePrincipalImpl.java
Index: RolePrincipalImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/security/impl/RolePrincipalImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RolePrincipalImpl.java 2 Dec 2003 01:52:33 -0000 1.1
+++ RolePrincipalImpl.java 8 Jan 2004 23:25:13 -0000 1.2
@@ -53,6 +53,8 @@
*/
package org.apache.jetspeed.security.impl;
+import java.io.Serializable;
+
import org.apache.jetspeed.security.RolePrincipal;
/**
@@ -61,7 +63,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">David Sean Taylor</a>
* @version $Id$
*/
-public class RolePrincipalImpl implements RolePrincipal
+public class RolePrincipalImpl implements RolePrincipal, Serializable
{
private final String roleName;
1.6 +2 -4
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/information/InformationProviderServiceImpl.java
Index: InformationProviderServiceImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/information/InformationProviderServiceImpl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- InformationProviderServiceImpl.java 18 Oct 2003 19:54:51 -0000 1.5
+++ InformationProviderServiceImpl.java 8 Jan 2004 23:25:13 -0000 1.6
@@ -97,7 +97,7 @@
if (provider != null)
{
- log.info("Static information provider " +
provider.getClass().getName());
+ // log.info("Static information provider " +
provider.getClass().getName());
}
else
{
@@ -111,8 +111,6 @@
{
DynamicInformationProvider provider =
(DynamicInformationProvider)
request.getAttribute("org.apache.jetspeed.engine.core.DynamicInformationProvider");
-
- log.info("Dynamic information provider " + provider);
if (provider == null)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
