[CONF] Confluence Changes in the last 24 hours
- This is a daily summary of all recent changes in Confluence. - Updated Spaces: - OpenJPA (openjpa) http://cwiki.apache.org/confluence/display/openjpa | |-Pages Added or Edited in This Space |-- Releasing OpenJPA was last edited by pcl (09:48 PM). | http://cwiki.apache.org/confluence/display/openjpa/Releasing+OpenJPA |-- Documentation was last edited by pcl (05:19 PM). | http://cwiki.apache.org/confluence/display/openjpa/Documentation |-- Downloads was last edited by pcl (05:16 PM). | http://cwiki.apache.org/confluence/display/openjpa/Downloads Apache Sling (SLING) http://cwiki.apache.org/confluence/display/SLING | |-Pages Added or Edited in This Space |-- Resource Type Overwrite was created by fmeschbe (01:54 AM). | http://cwiki.apache.org/confluence/display/SLING/Resource+Type+Overwrite Apache Sling Website (SLINGxSITE) http://cwiki.apache.org/confluence/display/SLINGxSITE | |-Pages Added or Edited in This Space |-- Documentation was last edited by [EMAIL PROTECTED] (07:12 AM). | http://cwiki.apache.org/confluence/display/SLINGxSITE/Documentation |-- Thread Handling was created by [EMAIL PROTECTED] (07:12 AM). | http://cwiki.apache.org/confluence/display/SLINGxSITE/Thread+Handling Apache Struts 2 Documentation (WW) http://cwiki.apache.org/confluence/display/WW | |-Pages Added or Edited in This Space |-- Version Notes 2.1.1 was last edited by jeromyevans (05:15 AM). | http://cwiki.apache.org/confluence/display/WW/Version+Notes+2.1.1 | |-New Comments in This Space |-- http://cwiki.apache.org/confluence/display/WW/Version+Notes+2.1.1 (1) |-- http://cwiki.apache.org/confluence/display/WW/Type+Conversion (1) Apache Wicket Website (WICKETxSITE) http://cwiki.apache.org/confluence/display/WICKETxSITE | |-Pages Added or Edited in This Space |-- Building from SVN was last edited by dashorst (11:49 AM). | http://cwiki.apache.org/confluence/display/WICKETxSITE/Building+from+SVN Apache Struts 2 Wiki (S2WIKI) http://cwiki.apache.org/confluence/display/S2WIKI | |-Pages Added or Edited in This Space |-- Companies that provide Struts 2 support was last edited by mno (11:38 PM). | http://cwiki.apache.org/confluence/display/S2WIKI/Companies+that+provide+Struts+2+support |-- OGNL replacement was created by bpontarelli (03:19 PM). | http://cwiki.apache.org/confluence/display/S2WIKI/OGNL+replacement Apache Geronimo v2.1 (GMOxDOC21) http://cwiki.apache.org/confluence/display/GMOxDOC21 | |-Pages Added or Edited in This Space |-- Client JNDI Names was last edited by dblevins (05:35 PM). | http://cwiki.apache.org/confluence/display/GMOxDOC21/Client+JNDI+Names |-- Developing a Simple Java Server Faces application was last edited by hcunico (03:36 PM). | http://cwiki.apache.org/confluence/display/GMOxDOC21/Developing+a+Simple+Java+Server+Faces+application |-- Documentation was last edited by hcunico (02:13 PM). | http://cwiki.apache.org/confluence/display/GMOxDOC21/Documentation |-- Create a database was last edited by beckerdo (12:01 PM). | http://cwiki.apache.org/confluence/display/GMOxDOC21/Create+a+database |-- Geronimo Administration Console was last edited by beckerdo (11:37 AM). | http://cwiki.apache.org/confluence/display/GMOxDOC21/Geronimo+Administration+Console |-- Development environment was last edited by vamsic007 (10:55 AM). | http://cwiki.apache.org/confluence/display/GMOxDOC21/Development+environment |-- Quick start - fast and easy development was last edited by vamsic007 (10:52 AM). | http://cwiki.apache.org/confluence/display/GMOxDOC21/Quick+start+-+fast+and+easy+development |-- Sample applications was last edited by hcunico (10:23 AM). | http://cwiki.apache.org/confluence/display/GMOxDOC21/Sample+applications |-- Portlets was created by hcunico (10:20 AM). | http://cwiki.apache.org/confluence/display/GMOxDOC21/Portlets |-- Extending Geronimo was created by hcunico (10:20 AM). | http://cwiki.apache.org/confluence/display/GMOxDOC21/Extending+Geronimo |-- Annotations was created by hcunico (10:19 AM). | http://cwiki.apache.org/confluence/display/GMOxDOC21/Annotations |-- Tutorials was last edited by hcunico (10:19 AM). | http://cwiki.apache.org/confluence/display/GMOxDOC21/Tutorials |-- Persistence was created by hcunico (10:18 AM). | http://cwiki.apache.org/confluence/display/GMOxDOC21/Persistence |-- Web services was created by hcunico (10:18 AM). | http://cwiki.apache.org/confluence/display/GMOxDOC21/Web+services |-- Java Server Faces was last edited by hcunico (10:17 AM). | http://cwiki.apache.org/confluence/display/GMOxDOC21/Java+Server+Faces |-- EJB applications was created by hcunico (10:14 AM). | http://cwiki.apache.org/confluence/display/GMOxDOC21/EJB+applications |-- Application c
svn commit: r629022 - /struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java
Author: mrdon
Date: Tue Feb 19 00:35:35 2008
New Revision: 629022
URL: http://svn.apache.org/viewvc?rev=629022&view=rev
Log:
Adding test to ensure slashes in names works with root namespace
WW-2461
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java?rev=629022&r1=629021&r2=629022&view=diff
==
---
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java
(original)
+++
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java
Tue Feb 19 00:35:35 2008
@@ -115,6 +115,22 @@
assertNull(mapping.getMethod());
}
+public void testGetMappingWithSlashedNameAtRoot() throws Exception {
+
+req.setupGetRequestURI("/foo/actionName.action");
+req.setupGetServletPath("/foo/actionName.action");
+req.setupGetAttribute(null);
+req.addExpectedGetAttributeName("javax.servlet.include.servlet_path");
+
+DefaultActionMapper mapper = new DefaultActionMapper();
+mapper.setSlashesInActionNames("true");
+ActionMapping mapping = mapper.getMapping(req, configManager);
+
+assertEquals("", mapping.getNamespace());
+assertEquals("foo/actionName", mapping.getName());
+assertNull(mapping.getMethod());
+}
+
public void testGetMappingWithNamespaceSlash() throws Exception {
req.setupGetRequestURI("/my.hh/abc.action");
svn commit: r629255 - in /struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/context: PreparatorServlet.java ServletContextHolderListener.java
Author: nilsga
Date: Tue Feb 19 14:36:48 2008
New Revision: 629255
URL: http://svn.apache.org/viewvc?rev=629255&view=rev
Log:
WW-2101 Added back classes with deprecation
Added:
struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/context/PreparatorServlet.java
- copied, changed from r564598,
struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/context/PreparatorServlet.java
struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/context/ServletContextHolderListener.java
- copied, changed from r564601,
struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/context/ServletContextHolderListener.java
Copied:
struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/context/PreparatorServlet.java
(from r564598,
struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/context/PreparatorServlet.java)
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/context/PreparatorServlet.java?p2=struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/context/PreparatorServlet.java&p1=struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/context/PreparatorServlet.java&r1=564598&r2=629255&rev=629255&view=diff
==
---
struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/context/PreparatorServlet.java
(original)
+++
struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/context/PreparatorServlet.java
Tue Feb 19 14:36:48 2008
@@ -20,47 +20,30 @@
*/
package org.apache.struts2.portlet.context;
-import java.io.IOException;
-
-import javax.servlet.ServletContext;
+import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.struts2.StrutsStatics;
-import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
/**
- * Since a portlet is not dispatched the same way as a servlet, the
- * [EMAIL PROTECTED] org.apache.struts2.ServletActionContext} is not
immediately available, as it
- * depends on objects from the servlet API. However, the WW2 view
implementations require access
- * to the objects in the [EMAIL PROTECTED]
org.apache.struts2.ServletActionContext}, and this servlet
- * makes sure that these are available when the portlet actions are executing
the render results.
+ * @deprecated
+ *
+ * This servlet has been deprecated. Do not use it (WW-2101)
*
*/
public class PreparatorServlet extends HttpServlet implements StrutsStatics {
private static final long serialVersionUID = 1853399729352984089L;
-private final static Log LOG = LogFactory.getLog(PreparatorServlet.class);
+private final static Logger LOG =
LoggerFactory.getLogger(PreparatorServlet.class);
-/**
- * Prepares the [EMAIL PROTECTED] org.apache.struts2.ServletActionContext}
with the
- * [EMAIL PROTECTED] ServletContext}, [EMAIL PROTECTED]
HttpServletRequest} and [EMAIL PROTECTED] HttpServletResponse}.
- */
-public void service(HttpServletRequest servletRequest,
-HttpServletResponse servletResponse) throws ServletException,
-IOException {
-LOG.debug("Preparing servlet objects for dispatch");
-ServletContext ctx = getServletContext();
-ActionContext.getContext().put(SERVLET_CONTEXT, ctx);
-ActionContext.getContext().put(HTTP_REQUEST, servletRequest);
-ActionContext.getContext().put(HTTP_RESPONSE, servletResponse);
-LOG.debug("Preparation complete");
-}
+ @Override
+ public void init(ServletConfig config) throws ServletException {
+ LOG.warn("The preparator servlet has been deprecated. It can
safely be removed from your web.xml file");
+ }
}
Copied:
struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/context/ServletContextHolderListener.java
(from r564601,
struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/context/ServletContextHolderListener.java)
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/context/ServletContextHolderListener.java?p2=struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/context/ServletContextHolderListener.java&p1=struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/context/ServletContextHolderListener.java&r1=564601&r2=629255&rev=629255&view=diff
=
