[CONF] Confluence Changes in the last 24 hours
- This is a daily summary of all recent changes in Confluence. - Updated Spaces: - Apache Geronimo Development (GMOxDEV) http://cwiki.apache.org/confluence/display/GMOxDEV | |-Pages Added or Edited in This Space |-- Geronimo Architecture was last edited by hcunico (11:25 AM). | http://cwiki.apache.org/confluence/display/GMOxDEV/Geronimo+Architecture |-- Committing patches to the Subversion Repository was last edited by hcunico (11:18 AM). | http://cwiki.apache.org/confluence/display/GMOxDEV/Committing+patches+to+the+Subversion+Repository |-- Integration Testing was last edited by hcunico (11:15 AM). | http://cwiki.apache.org/confluence/display/GMOxDEV/Integration+Testing Apache Geronimo v1.2 (GMOxDOC12) http://cwiki.apache.org/confluence/display/GMOxDOC12 | |-Pages Added or Edited in This Space |-- Installation was last edited by hcunico (11:39 AM). | http://cwiki.apache.org/confluence/display/GMOxDOC12/Installation |-- Deployment plans was last edited by hcunico (07:43 AM). | http://cwiki.apache.org/confluence/display/GMOxDOC12/Deployment+plans |-- Documentation was last edited by hcunico (07:39 AM). | http://cwiki.apache.org/confluence/display/GMOxDOC12/Documentation |-- Geronimo Administration Console was last edited by hcunico (07:38 AM). | http://cwiki.apache.org/confluence/display/GMOxDOC12/Geronimo+Administration+Console Felix (FELIX) http://cwiki.apache.org/confluence/display/FELIX | |-Pages Added or Edited in This Space |-- Index was last edited by [EMAIL PROTECTED] (08:22 AM). | http://cwiki.apache.org/confluence/display/FELIX/Index |-- downloads was last edited by [EMAIL PROTECTED] (08:19 AM). | http://cwiki.apache.org/confluence/display/FELIX/downloads Apache Geronimo Documentation (geronimo) http://cwiki.apache.org/confluence/display/geronimo | |-Pages Added or Edited in This Space |-- Index was last edited by hcunico (11:53 AM). | http://cwiki.apache.org/confluence/display/geronimo/Index |-- Recently updated was last edited by hcunico (11:35 AM). | http://cwiki.apache.org/confluence/display/geronimo/Recently+updated Apache Directory Server v1.1 Documentation (DIRxSRVx11) http://cwiki.apache.org/confluence/display/DIRxSRVx11 | |-Pages Added or Edited in This Space |-- Schema Subsystem Redesign was last edited by ersiner (06:51 AM). | http://cwiki.apache.org/confluence/display/DIRxSRVx11/Schema+Subsystem+Redesign |-- Schema Checking was last edited by elecharny (04:05 AM). | http://cwiki.apache.org/confluence/display/DIRxSRVx11/Schema+Checking Apache Geronimo Project Management (GMOxPMGT) http://cwiki.apache.org/confluence/display/GMOxPMGT | |-Pages Added or Edited in This Space |-- Apache Geronimo Development Status was last edited by hcunico (12:46 PM). | http://cwiki.apache.org/confluence/display/GMOxPMGT/Apache+Geronimo+Development+Status |-- Geronimo Package Tracking was last edited by hcunico (12:41 PM). | http://cwiki.apache.org/confluence/display/GMOxPMGT/Geronimo+Package+Tracking Apache Struts 2 Documentation (WW) http://cwiki.apache.org/confluence/display/WW | |-Pages Added or Edited in This Space |-- FreeMarker was last edited by mrdon (11:21 PM). | http://cwiki.apache.org/confluence/display/WW/FreeMarker UIMA (UIMA) http://cwiki.apache.org/confluence/display/UIMA | |-Pages Added or Edited in This Space |-- Working on Eclipse UIMA Plugins was created by schor (11:03 AM). | http://cwiki.apache.org/confluence/display/UIMA/Working+on+Eclipse+UIMA+Plugins Apache CXF (CXF) http://cwiki.apache.org/confluence/display/CXF | |-Pages Added or Edited in This Space |-- Navigation was last edited by ericjohnson (12:55 PM). | http://cwiki.apache.org/confluence/display/CXF/Navigation |-- Download was last edited by ericjohnson (12:53 PM). | http://cwiki.apache.org/confluence/display/CXF/Download - CONFLUENCE INFORMATION This message is automatically generated by Confluence Unsubscribe or edit your notifications preferences http://cwiki.apache.org/confluence/users/viewnotifications.action If you think it was sent incorrectly contact one of the administrators http://cwiki.apache.org/confluence/administrators.action If you want more information on Confluence, or have a bug to report see http://www.atlassian.com/software/confluence
svn commit: r487799 - in /struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2: TilesPlugin.java util/PlugInConfigContextAdapter.java
Author: apetrelli
Date: Sat Dec 16 04:43:50 2006
New Revision: 487799
URL: http://svn.apache.org/viewvc?view=rev&rev=487799
Log:
STR-2986
Corrected problems in Tiles 2 plugin.
Modified:
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesPlugin.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/util/PlugInConfigContextAdapter.java
Modified:
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesPlugin.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesPlugin.java?view=diff&rev=487799&r1=487798&r2=487799
==
---
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesPlugin.java
(original)
+++
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesPlugin.java
Sat Dec 16 04:43:50 2006
@@ -123,6 +123,9 @@
*/
public void init(ActionServlet servlet, ModuleConfig moduleConfig)
throws ServletException {
+
+currentPlugInConfigContextAdapter = new PlugInConfigContextAdapter(
+this.currentPlugInConfigObject, servlet.getServletContext());
// Set RequestProcessor class
this.initRequestProcessorClass(moduleConfig);
@@ -218,7 +221,5 @@
*/
public void setCurrentPlugInConfigObject(PlugInConfig plugInConfigObject) {
this.currentPlugInConfigObject = plugInConfigObject;
-currentPlugInConfigContextAdapter = new PlugInConfigContextAdapter(
-this.currentPlugInConfigObject);
}
}
Modified:
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/util/PlugInConfigContextAdapter.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/util/PlugInConfigContextAdapter.java?view=diff&rev=487799&r1=487798&r2=487799
==
---
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/util/PlugInConfigContextAdapter.java
(original)
+++
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/util/PlugInConfigContextAdapter.java
Sat Dec 16 04:43:50 2006
@@ -21,29 +21,56 @@
package org.apache.struts.tiles2.util;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
import java.util.Enumeration;
+import java.util.LinkedHashSet;
+import java.util.Set;
+import javax.servlet.RequestDispatcher;
+import javax.servlet.Servlet;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+
+import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.iterators.IteratorEnumeration;
import org.apache.struts.config.PlugInConfig;
/**
- * Adapts a [EMAIL PROTECTED] PlugInConfig} object to become a context-like
object,
+ * Adapts a [EMAIL PROTECTED] PlugInConfig} object to become a ServletContext
object,
* exposing init parameters methods.
*/
-public class PlugInConfigContextAdapter {
+public class PlugInConfigContextAdapter implements ServletContext {
/**
* The internal plugin config object.
*/
private PlugInConfig plugInConfigObject;
+
+/**
+ * The servlet context.
+ */
+private ServletContext rootContext;
+
+/**
+ * The set of all parameter names.
+ */
+private Set parameterNames;
/**
* Constructor.
*
* @param plugInConfigObject The plugin config object to use.
*/
-public PlugInConfigContextAdapter(PlugInConfig plugInConfigObject) {
+public PlugInConfigContextAdapter(PlugInConfig plugInConfigObject,
+ServletContext servletContext) {
this.plugInConfigObject = plugInConfigObject;
+this.rootContext = servletContext;
+parameterNames = new LinkedHashSet();
+
parameterNames.addAll(this.plugInConfigObject.getProperties().keySet());
+CollectionUtils.addAll(parameterNames, this.rootContext
+.getInitParameterNames());
}
/**
@@ -53,7 +80,15 @@
* @return The value of the parameter.
*/
public String getInitParameter(String parameterName) {
-return
plugInConfigObject.getProperties().get(parameterName).toString();
+String retValue;
+
+retValue = (String) plugInConfigObject.getProperties()
+.get(parameterName);
+if (retValue == null) {
+retValue = rootContext.getInitParameter(parameterName);
+}
+
+return retValue;
}
/**
@@ -62,7 +97,96 @@
* @return The names of all initialization parameters.
*/
public Enumeration getInitParameterNames() {
-return new IteratorEnumeration(plugInConfigObject.getProperties()
-.keySet().iterator());
+return new IteratorEnumeration(parameterNames.iterator());
+}
+
+
svn commit: r487800 - /struts/struts1/trunk/tiles2/src/test/java/org/apache/struts/tiles2/TestTilesPlugin.java
Author: apetrelli Date: Sat Dec 16 04:44:49 2006 New Revision: 487800 URL: http://svn.apache.org/viewvc?view=rev&rev=487800 Log: STR-2986 Corrected tests asserts and wrong resources. Modified: struts/struts1/trunk/tiles2/src/test/java/org/apache/struts/tiles2/TestTilesPlugin.java Modified: struts/struts1/trunk/tiles2/src/test/java/org/apache/struts/tiles2/TestTilesPlugin.java URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/test/java/org/apache/struts/tiles2/TestTilesPlugin.java?view=diff&rev=487800&r1=487799&r2=487800 == --- struts/struts1/trunk/tiles2/src/test/java/org/apache/struts/tiles2/TestTilesPlugin.java (original) +++ struts/struts1/trunk/tiles2/src/test/java/org/apache/struts/tiles2/TestTilesPlugin.java Sat Dec 16 04:44:49 2006 @@ -115,7 +115,7 @@ pluginConfig.addProperty( "definitions-config", -"/org/apache/struts/tiles/config/" + configFileName); +"/org/apache/struts/tiles2/config/" + configFileName); moduleConfig.addPlugInConfig(pluginConfig); return moduleConfig; @@ -172,7 +172,8 @@ // Retrieve TilesContainer TilesContainer container = TilesAccess.getContainer(actionServlet .getServletContext()); -assertSame(container.getClass().getName(), BasicTilesContainer.class); +assertSame(container.getClass().getName(), +BasicTilesContainer.class.getName()); // Retrieve factory for module1 DefinitionsFactory factory1 = ((BasicTilesContainer) container) @@ -210,7 +211,8 @@ // Retrieve TilesContainer TilesContainer container = TilesAccess.getContainer(actionServlet .getServletContext()); - assertSame(container.getClass().getName(), BasicTilesContainer.class); + assertSame(container.getClass().getName(), + BasicTilesContainer.class.getName()); // Retrieve factory for module1 DefinitionsFactory factory1 = ((BasicTilesContainer) container)
svn commit: r487866 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/URL.java
Author: mrdon
Date: Sat Dec 16 11:35:55 2006
New Revision: 487866
URL: http://svn.apache.org/viewvc?view=rev&rev=487866
Log:
Better handle when querystring is null for some containers
WW-1563
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/URL.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/URL.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/URL.java?view=diff&rev=487866&r1=487865&r2=487866
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/URL.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/URL.java
Sat Dec 16 11:35:55 2006
@@ -212,6 +212,9 @@
private String extractQueryString() {
// Parse the query string to make sure that the parameters come from
the query, and not some posted data
String query = req.getQueryString();
+if (query == null) {
+query = (String)
req.getAttribute("javax.servlet.forward.query_string");
+}
if (query != null) {
// Remove possible #foobar suffix
