[CONF] Confluence Changes in the last 24 hours

2007-08-23 Thread confluence 
-
This is a daily summary of all recent changes in Confluence.

-
Updated Spaces:
-

Apache Directory Community & Resources (directory) 
http://cwiki.apache.org/confluence/display/directory
|
|-Pages Added or Edited in This Space
 |-- Architecting the Modern LDAP Renaissance. The Apache Directory Vision was 
last edited by akarasulu (06:14 PM).
 |   
http://cwiki.apache.org/confluence/display/directory/Architecting+the+Modern+LDAP+Renaissance.+The+Apache+Directory+Vision
 |-- Conference materials was last edited by ersiner (03:23 AM).
 |   http://cwiki.apache.org/confluence/display/directory/Conference+materials
 |-- LDAP Stored Procedures and Triggers in ApacheDS was last edited by ersiner 
(03:20 AM).
 |   
http://cwiki.apache.org/confluence/display/directory/LDAP+Stored+Procedures+and+Triggers+in+ApacheDS

Apache Geronimo Development (GMOxDEV) 
http://cwiki.apache.org/confluence/display/GMOxDEV
|
|-Pages Added or Edited in This Space
 |-- Monitoring and Management Service was created by vhnguyen (10:20 AM).
 |   
http://cwiki.apache.org/confluence/display/GMOxDEV/Monitoring+and+Management+Service

Apache Camel (CAMEL) http://cwiki.apache.org/confluence/display/CAMEL
|
|-Pages Added or Edited in This Space
 |-- Enterprise Integration Patterns was last edited by chirino (07:40 AM).
 |   
http://cwiki.apache.org/confluence/display/CAMEL/Enterprise+Integration+Patterns
 |-- Component List was last edited by chirino (07:23 AM).
 |   http://cwiki.apache.org/confluence/display/CAMEL/Component+List

Apache Tuscany (TUSCANY) http://cwiki.apache.org/confluence/display/TUSCANY
|
|-Pages Added or Edited in This Space
 |-- Home was last edited by [EMAIL PROTECTED] (09:40 AM).
 |   http://cwiki.apache.org/confluence/display/TUSCANY/Home

Apache Geronimo v2.0 - ES (GMOxDOC20es) 
http://cwiki.apache.org/confluence/display/GMOxDOC20es
|
|-Pages Added or Edited in This Space
 |-- Instalación was last edited by [EMAIL PROTECTED] (10:42 PM).
 |   http://cwiki.apache.org/confluence/pages/viewpage.action?pageId=61760
 |-- NOTAS-DE-LA-VERSION-2.0.1.TXT was created by [EMAIL PROTECTED] (10:25 PM).
 |   
http://cwiki.apache.org/confluence/display/GMOxDOC20es/NOTAS-DE-LA-VERSION-2.0.1.TXT
 |-- Documentación was last edited by [EMAIL PROTECTED] (09:49 PM).
 |   http://cwiki.apache.org/confluence/pages/viewpage.action?pageId=61755

Apache Wicket (WICKET) http://cwiki.apache.org/confluence/display/WICKET
|
|-Pages Added or Edited in This Space
 |-- Acegi and Wicket-auth-roles was last edited by [EMAIL PROTECTED] (08:45 
AM).
 |   
http://cwiki.apache.org/confluence/display/WICKET/Acegi+and+Wicket-auth-roles
 |-- Object Container, adding Flash to a Wicket Application was created by 
jkriesten (02:42 AM).
 |   
http://cwiki.apache.org/confluence/display/WICKET/Object+Container%2C+adding+Flash+to+a+Wicket+Application

Apache Felix (FELIX) http://cwiki.apache.org/confluence/display/FELIX
|
|-Pages Added or Edited in This Space
 |-- Maven Bundle Plugin (BND) was last edited by [EMAIL PROTECTED] (08:42 AM).
 |   
http://cwiki.apache.org/confluence/display/FELIX/Maven+Bundle+Plugin+%28BND%29
 |
 |-New Comments in This Space
 |-- 
http://cwiki.apache.org/confluence/display/FELIX/Maven+Bundle+Plugin+%28BND%29 
(1)

Apache Geronimo (GMOxSITE) http://cwiki.apache.org/confluence/display/GMOxSITE
|
|-Pages Added or Edited in This Space
 |-- Apache Geronimo v2.0.1 Release was last edited by hcunico (10:17 AM).
 |   
http://cwiki.apache.org/confluence/display/GMOxSITE/Apache+Geronimo+v2.0.1+Release

Apache Qpid (qpid) http://cwiki.apache.org/confluence/display/qpid
|
|-Pages Added or Edited in This Space
 |-- Low-Level API Diagram was created by rupertlssmith (07:14 AM).
 |   http://cwiki.apache.org/confluence/display/qpid/Low-Level+API+Diagram

Apache ActiveMQ (ACTIVEMQ) http://cwiki.apache.org/confluence/display/ACTIVEMQ
|
|-Pages Added or Edited in This Space
 |-- ActiveSpace was last edited by jstrachan (07:55 AM).
 |   http://cwiki.apache.org/confluence/display/ACTIVEMQ/ActiveSpace
 |-- ActiveSoap was last edited by jstrachan (07:55 AM).
 |   http://cwiki.apache.org/confluence/display/ACTIVEMQ/ActiveSoap

Apache Geronimo v2.0 (GMOxDOC20) 
http://cwiki.apache.org/confluence/display/GMOxDOC20
|
|-Pages Added or Edited in This Space
 |-- Sample applications was last edited by hcunico (09:37 AM).
 |   http://cwiki.apache.org/confluence/display/GMOxDOC20/Sample+applications

Tuscany Wiki (TUSCANYWIKI) 
http://cwiki.apache.org/confluence/display/TUSCANYWIKI
|
|-Pages Added or Edited in This Space
 |-- Tuscany SCA Native Release M4 Design Specifications was last edited by 
[EMAIL PROTECTED] (01:13 PM).
 |   
http://cwiki.apache.org/confluence/display/TUSCANYWIKI/Tuscany+SCA+Native+Release+M4+Design+Specifications
 |-- DAS Release & Feature History

svn commit: r568888 - /struts/struts2/branches/STRUTS_2_0_X/apps/portlet/src/main/webapp/WEB-INF/web.xml

2007-08-23 Thread rgielen 
Author: rgielen
Date: Thu Aug 23 01:48:28 2007
New Revision: 56

URL: http://svn.apache.org/viewvc?rev=56&view=rev
Log:
WW-1989, WW-2052, WW-2053, WW-2101, WW-2105:
Backporting portlet servlet wrapping, portlet redirect/redirectAction result 
and related issues to 2.0.x

Modified:

struts/struts2/branches/STRUTS_2_0_X/apps/portlet/src/main/webapp/WEB-INF/web.xml

Modified: 
struts/struts2/branches/STRUTS_2_0_X/apps/portlet/src/main/webapp/WEB-INF/web.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/portlet/src/main/webapp/WEB-INF/web.xml?rev=56&r1=568887&r2=56&view=diff
==
--- 
struts/struts2/branches/STRUTS_2_0_X/apps/portlet/src/main/webapp/WEB-INF/web.xml
 (original)
+++ 
struts/struts2/branches/STRUTS_2_0_X/apps/portlet/src/main/webapp/WEB-INF/web.xml
 Thu Aug 23 01:48:28 2007
@@ -26,15 +26,6 @@
 
org.springframework.web.context.ContextLoaderListener
 
 
-
-
org.apache.struts2.portlet.context.ServletContextHolderListener
-
-
-
-preparator
-
org.apache.struts2.portlet.context.PreparatorServlet
-
-
 
 dwr
 uk.ltd.getahead.dwr.DWRServlet

svn commit: r568892 - in /struts/struts2/branches/STRUTS_2_0_X/core/src: main/java/org/apache/struts2/portlet/context/ main/java/org/apache/struts2/portlet/util/ test/java/org/apache/struts2/portlet/c

2007-08-23 Thread rgielen 
Author: rgielen
Date: Thu Aug 23 01:51:20 2007
New Revision: 568892

URL: http://svn.apache.org/viewvc?rev=568892&view=rev
Log:
WW-1989, WW-2052, WW-2053, WW-2101, WW-2105:
Backporting portlet servlet wrapping, portlet redirect/redirectAction result 
and related issues to 2.0.x

Removed:

struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/portlet/context/PreparatorServlet.java

struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/portlet/context/ServletContextHolderListener.java

struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/portlet/util/HttpServletRequestMock.java

struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/portlet/context/PreparatorServletTest.java

struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/portlet/context/ServletContextHolderListenerTest.java

svn commit: r568894 - in /struts/struts2/branches/STRUTS_2_0_X/core/src: main/java/org/apache/struts2/portlet/interceptor/ main/java/org/apache/struts2/portlet/result/ test/java/org/apache/struts2/por

2007-08-23 Thread rgielen 
Author: rgielen
Date: Thu Aug 23 01:54:10 2007
New Revision: 568894

URL: http://svn.apache.org/viewvc?rev=568894&view=rev
Log:
WW-1989, WW-2052, WW-2053, WW-2101, WW-2105:
Backporting portlet servlet wrapping, portlet redirect/redirectAction result 
and related issues to 2.0.x

Added:

struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/portlet/interceptor/PortletAwareInterceptor.java

struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/portlet/interceptor/PortletContextAware.java

struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/portlet/interceptor/PortletRequestAware.java

struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/portlet/interceptor/PortletResponseAware.java

struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/portlet/interceptor/PortletStateInterceptor.java

struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/portlet/result/PortletActionRedirectResult.java

struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/portlet/interceptor/

struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/portlet/interceptor/PortletAwareInterceptorTest.java

Added: 
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/portlet/interceptor/PortletAwareInterceptor.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/portlet/interceptor/PortletAwareInterceptor.java?rev=568894&view=auto
==
--- 
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/portlet/interceptor/PortletAwareInterceptor.java
 (added)
+++ 
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/portlet/interceptor/PortletAwareInterceptor.java
 Thu Aug 23 01:54:10 2007
@@ -0,0 +1,84 @@
+/*
+ * $Id: $
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.struts2.portlet.interceptor;
+
+import javax.portlet.PortletContext;
+import javax.portlet.PortletRequest;
+import javax.portlet.PortletResponse;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.struts2.StrutsStatics;
+import org.apache.struts2.interceptor.PrincipalAware;
+import org.apache.struts2.portlet.PortletActionConstants;
+
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.interceptor.AbstractInterceptor;
+
+public class PortletAwareInterceptor extends AbstractInterceptor implements 
PortletActionConstants, StrutsStatics {
+
+   private static final long serialVersionUID = 2476509721059587700L;
+   
+   private static final Log LOG = 
LogFactory.getLog(PortletAwareInterceptor.class);
+
+   /**
+ * Sets action properties based on the interfaces an action implements. 
Things like application properties,
+ * parameters, session attributes, etc are set based on the implementing 
interface.
+ *
+ * @param invocation an encapsulation of the action execution state.
+ * @throws Exception if an error occurs when setting action properties.
+ */
+public String intercept(ActionInvocation invocation) throws Exception {
+final Object action = invocation.getAction();
+final ActionContext context = invocation.getInvocationContext();
+
+if (action instanceof PortletRequestAware) {
+PortletRequest request = (PortletRequest) context.get(REQUEST);
+((PortletRequestAware) action).setPortletRequest(request);
+}
+
+if (action instanceof PortletResponseAware) {
+PortletResponse response = (PortletResponse) context.get(RESPONSE);
+((PortletResponseAware) action).setPortletResponse(response);
+}
+if (action instanceof PrincipalAware) {
+PortletRequest request = (PortletRequest) context.get(REQUEST);
+((PrincipalAware) action).setPrincipalProxy(new 
PortletPrincipalProxy(request));
+}
+if (action instanceof PortletC

svn commit: r568895 - in /struts/struts2/branches/STRUTS_2_0_X/core/src: main/java/org/apache/struts2/components/ main/java/org/apache/struts2/portlet/ main/java/org/apache/struts2/portlet/context/ ma

2007-08-23 Thread rgielen 
Author: rgielen
Date: Thu Aug 23 01:57:36 2007
New Revision: 568895

URL: http://svn.apache.org/viewvc?rev=568895&view=rev
Log:
WW-1989, WW-2052, WW-2053, WW-2101, WW-2105:
Backporting portlet servlet wrapping, portlet redirect/redirectAction result 
and related issues to 2.0.x

Modified:

struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/URL.java

struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/portlet/PortletActionConstants.java

struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/portlet/context/PortletActionContext.java

struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/portlet/dispatcher/DirectRenderFromEventAction.java

struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java

struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/portlet/result/PortletResult.java

struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java

struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/views/freemarker/PortletFreemarkerResult.java

struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/struts-portlet-default.xml

struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/portlet/dispatcher/Jsr168DispatcherTest.java

struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/portlet/result/PortletResultTest.java

Modified: 
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/URL.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/URL.java?rev=568895&r1=568894&r2=568895&view=diff
==
--- 
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/URL.java
 (original)
+++ 
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/URL.java
 Thu Aug 23 01:57:36 2007
@@ -341,7 +341,7 @@
 this.windowState = windowState;
 }
 
-@StrutsTagAttribute(description="Specifies if this should be a portlet 
render or action URL")
+@StrutsTagAttribute(description="Specifies if this should be a portlet 
render or action URL. Default is \"render\". To create an action URL, use 
\"action\".")
 public void setPortletUrlType(String portletUrlType) {
 this.portletUrlType = portletUrlType;
 }

Modified: 
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/portlet/PortletActionConstants.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/portlet/PortletActionConstants.java?rev=568895&r1=568894&r2=568895&view=diff
==
--- 
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/portlet/PortletActionConstants.java
 (original)
+++ 
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/portlet/PortletActionConstants.java
 Thu Aug 23 01:57:36 2007
@@ -103,4 +103,24 @@
  * [EMAIL PROTECTED] 
org.apache.struts2.portlet.context.PortletActionContext}.
  */
 String DEFAULT_ACTION_FOR_MODE = "struts.portlet.defaultActionForMode";
+
+/**
+ * Key for request attribute indicating if the action has been reset.
+ */
+String ACTION_RESET = "struts.portlet.actionReset";
+
+/**
+ * Key for session attribute indicating the location of the render direct 
action.
+ */
+String RENDER_DIRECT_LOCATION = "struts.portlet.renderDirectLocation";
+
+/**
+ * Session key where the value stack from the event phase is stored.
+ */
+String STACK_FROM_EVENT_PHASE = "struts.portlet.valueStackFromEventPhase";
+
+/**
+ * Default name of dispatcher servlet in web.xml
+ */
+String DEFAULT_DISPATCHER_SERVLET_NAME = "Struts2PortletDispatcherServlet";
 }

Modified: 
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/portlet/context/PortletActionContext.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/portlet/context/PortletActionContext.java?rev=568895&r1=568894&r2=568895&view=diff
==
--- 
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/portlet/context/PortletActionContext.java
 (original)
+++ 
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/portlet/context/PortletActionContext.java
 Thu Aug 23 01:57:36 2007
@@ -22,16 +22,11 @@
 
 import java.util.Map;
 
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletConfig;
-import javax.

svn commit: r568896 - /struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/portlet/servlet/

2007-08-23 Thread rgielen 
Author: rgielen
Date: Thu Aug 23 02:05:56 2007
New Revision: 568896

URL: http://svn.apache.org/viewvc?rev=568896&view=rev
Log:
WW-1989, WW-2052, WW-2053, WW-2101, WW-2105:
Backporting portlet servlet wrapping, portlet redirect/redirectAction result 
and related issues to 2.0.x

Added:

struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/portlet/servlet/

struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/portlet/servlet/PortletHttpSession.java

struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/portlet/servlet/PortletServletConfig.java

struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/portlet/servlet/PortletServletContext.java

struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/portlet/servlet/PortletServletInputStream.java

struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/portlet/servlet/PortletServletOutputStream.java

struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/portlet/servlet/PortletServletRequest.java

struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/portlet/servlet/PortletServletRequestDispatcher.java

struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/portlet/servlet/PortletServletResponse.java

struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/portlet/servlet/package.html

Added: 
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/portlet/servlet/PortletHttpSession.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/portlet/servlet/PortletHttpSession.java?rev=568896&view=auto
==
--- 
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/portlet/servlet/PortletHttpSession.java
 (added)
+++ 
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/portlet/servlet/PortletHttpSession.java
 Thu Aug 23 02:05:56 2007
@@ -0,0 +1,214 @@
+/*
+ * $Id: $
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.struts2.portlet.servlet;
+
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.List;
+
+import javax.portlet.PortletSession;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpSession;
+import javax.servlet.http.HttpSessionContext;
+
+/**
+ * Wrapper object exposing a [EMAIL PROTECTED] PortletSession} as a [EMAIL 
PROTECTED] HttpSession} instance.
+ * Clients accessing this session object will in fact operate on the
+ * [EMAIL PROTECTED] PortletSession} object wrapped by this session object.
+ */
+public class PortletHttpSession implements HttpSession {
+
+   private PortletSession portletSession;
+
+   public PortletHttpSession(PortletSession portletSession) {
+   this.portletSession = portletSession;
+   }
+
+   /*
+* (non-Javadoc)
+* 
+* @see javax.servlet.http.HttpSession#getAttribute(java.lang.String)
+*/
+   public Object getAttribute(String name) {
+   return portletSession.getAttribute(name);
+   }
+
+   /*
+* (non-Javadoc)
+* 
+* @see javax.servlet.http.HttpSession#getAttributeNames()
+*/
+   public Enumeration getAttributeNames() {
+   return portletSession.getAttributeNames();
+   }
+
+   /*
+* (non-Javadoc)
+* 
+* @see javax.servlet.http.HttpSession#getCreationTime()
+*/
+   public long getCreationTime() {
+   return portletSession.getCreationTime();
+   }
+
+   /*
+* (non-Javadoc)
+* 
+* @see javax.servlet.http.HttpSession#getId()
+*/
+   public String getId() {
+   return portletSession.getId();
+   }
+
+   /*
+* (non-Javadoc)
+* 
+* @see javax.servlet.http.HttpSession#getLastAccessedTime()
+*/
+   public long getLastAccessedTime() {
+   return portletSession.getLastAccessedTime();
+   }
+

svn commit: r568984 - /struts/struts2/trunk/core/pom.xml

2007-08-23 Thread jholmes 
Author: jholmes
Date: Thu Aug 23 06:39:58 2007
New Revision: 568984

URL: http://svn.apache.org/viewvc?rev=568984&view=rev
Log:
Revert upgrade from OGNL 2.6.11 to 2.7. There were compilation issues in the 
Struts 1 plugin due to differences in one of the OGNL interfaces that the 
Struts 1 plugin uses for accessing DynaBean properties.

Modified:
struts/struts2/trunk/core/pom.xml

Modified: struts/struts2/trunk/core/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/pom.xml?rev=568984&r1=568983&r2=568984&view=diff
==
--- struts/struts2/trunk/core/pom.xml (original)
+++ struts/struts2/trunk/core/pom.xml Thu Aug 23 06:39:58 2007
@@ -321,9 +321,9 @@
 
 
 
-ognl
+opensymphony
 ognl
-2.7
+2.6.11

[Struts Wiki] Update of "StrutsConsultants" by RidaBenjelloun

2007-08-23 Thread Apache Wiki 
Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Struts Wiki" for change 
notification.

The following page has been changed by RidaBenjelloun:
http://wiki.apache.org/struts/StrutsConsultants

--
  
   *  David Gagnon M.Sc.A., ing., Freelancer, Montreal  -- mailto:[EMAIL 
PROTECTED]
   *  DBGROUPS -- http://www.dbgroups.com/
+  *  [http://www.doculibre.com/ Doculibre Inc.]  Québec, Montréal, Ottawa 

   *  Information Soft -- http://www.informationsoft.com/
   *  Mayford Technologies -- http://www.mayford.ca/
   *  Sandoval Software Solutions Inc. -- http://www.sandoval.ca/

svn commit: r568991 - /struts/struts1/trunk/core/src/test/java/org/apache/struts/action/TestActionServlet.java

2007-08-23 Thread bayard 
Author: bayard
Date: Thu Aug 23 06:49:58 2007
New Revision: 568991

URL: http://svn.apache.org/viewvc?rev=568991&view=rev
Log:
Making some of the fail messages a bit more expressive so I can tell that they 
are all NullPointerExceptions. These are presumably happening due to STR-3085

Modified:

struts/struts1/trunk/core/src/test/java/org/apache/struts/action/TestActionServlet.java

Modified: 
struts/struts1/trunk/core/src/test/java/org/apache/struts/action/TestActionServlet.java
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/test/java/org/apache/struts/action/TestActionServlet.java?rev=568991&r1=568990&r2=568991&view=diff
==
--- 
struts/struts1/trunk/core/src/test/java/org/apache/struts/action/TestActionServlet.java
 (original)
+++ 
struts/struts1/trunk/core/src/test/java/org/apache/struts/action/TestActionServlet.java
 Thu Aug 23 06:49:58 2007
@@ -488,7 +488,7 @@
 try {
 actionServlet.initModuleExceptionConfigs(moduleConfig);
 } catch (Exception e) {
-fail("Unexpected exception caught.");
+fail("Unexpected exception caught: " + e);
 }
 }
 
@@ -668,7 +668,7 @@
 try {
 actionServlet.initModuleForwards(moduleConfig);
 } catch (Exception e) {
-fail("Unexpected exception caught.");
+fail("Unexpected exception caught: " + e);
 }
 }
 
@@ -846,7 +846,7 @@
 try {
 actionServlet.initModuleActions(moduleConfig);
 } catch (Exception e) {
-fail("Unexpected exception caught.");
+fail("Unexpected exception caught: " + e);
 }
 }

svn commit: r569239 - /struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionServlet.java

2007-08-23 Thread pbenedict 
Author: pbenedict
Date: Thu Aug 23 21:10:12 2007
New Revision: 569239

URL: http://svn.apache.org/viewvc?rev=569239&view=rev
Log:
STR-3085: Swallow NPE and return null

Modified:

struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionServlet.java

Modified: 
struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionServlet.java
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionServlet.java?rev=569239&r1=569238&r2=569239&view=diff
==
--- 
struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionServlet.java
 (original)
+++ 
struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionServlet.java
 Thu Aug 23 21:10:12 2007
@@ -1957,8 +1957,12 @@
  * @return the array of plugins or null
  */
 private PlugIn[] getModulePlugIns(ModuleConfig moduleConfig) {
-String plugInKey = Globals.PLUG_INS_KEY + moduleConfig.getPrefix(); 
-return (PlugIn[]) getServletContext().getAttribute(plugInKey);
+try {
+String plugInKey = Globals.PLUG_INS_KEY + 
moduleConfig.getPrefix(); 
+return (PlugIn[]) getServletContext().getAttribute(plugInKey);
+} catch (NullPointerException e) {
+return null;
+}
 }
 
 /**