[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 |-- Monitoring and Management Service was last edited by vhnguyen (01:21 PM). | http://cwiki.apache.org/confluence/display/GMOxDEV/Monitoring+and+Management+Service Apache Sling (SLING) http://cwiki.apache.org/confluence/display/SLING | |-Pages Added or Edited in This Space |-- First Steps was last edited by fmeschbe (06:40 AM). | http://cwiki.apache.org/confluence/display/SLING/First+Steps |-- Sling was last edited by fmeschbe (02:50 AM). | http://cwiki.apache.org/confluence/display/SLING/Sling Apache Camel (CAMEL) http://cwiki.apache.org/confluence/display/CAMEL | |-Pages Added or Edited in This Space |-- Running Examples was last edited by [EMAIL PROTECTED] (07:13 AM). | http://cwiki.apache.org/confluence/display/CAMEL/Running+Examples Apache CXF 2.0 Documentation (CXF20DOC) http://cwiki.apache.org/confluence/display/CXF20DOC | |-Pages Added or Edited in This Space |-- Client HTTP Transport was last edited by [EMAIL PROTECTED] (11:02 PM). | http://cwiki.apache.org/confluence/display/CXF20DOC/Client+HTTP+Transport |-- Servlet Transport was last edited by phoet (12:09 AM). | http://cwiki.apache.org/confluence/display/CXF20DOC/Servlet+Transport Apache Directory Server v1.5 (DIRxSRVx11) http://cwiki.apache.org/confluence/display/DIRxSRVx11 | |-Pages Added or Edited in This Space |-- 1.4.1 Configuration of ApacheDS with Spring was last edited by szoerner (11:49 AM). | http://cwiki.apache.org/confluence/display/DIRxSRVx11/1.4.1+Configuration+of+ApacheDS+with+Spring |-- Delegation of Authentication was created by akarasulu (10:26 AM). | http://cwiki.apache.org/confluence/display/DIRxSRVx11/Delegation+of+Authentication |-- ApacheDS v1.5 Developer's Guide was last edited by akarasulu (10:02 AM). | http://cwiki.apache.org/confluence/display/DIRxSRVx11/ApacheDS+v1.5+Developer%27s+Guide |-- Embedding ApacheDS as a Web Application was last edited by szoerner (09:13 AM). | http://cwiki.apache.org/confluence/display/DIRxSRVx11/Embedding+ApacheDS+as+a+Web+Application Apache Struts 2 Plugin Registry (S2PLUGINS) http://cwiki.apache.org/confluence/display/S2PLUGINS | |-Pages Added or Edited in This Space |-- JSON Plugin was last edited by musachy (07:17 AM). | http://cwiki.apache.org/confluence/display/S2PLUGINS/JSON+Plugin Apache Cayenne Documentation (CAYDOC) http://cwiki.apache.org/confluence/display/CAYDOC | |-Pages Added or Edited in This Space |-- Relationships was last edited by andrus (07:19 AM). | http://cwiki.apache.org/confluence/display/CAYDOC/Relationships |-- Guide to 3.0 Features was last edited by andrus (06:23 AM). | http://cwiki.apache.org/confluence/display/CAYDOC/Guide+to+3.0+Features |-- Modeling Object Layer was last edited by andrus (06:14 AM). | http://cwiki.apache.org/confluence/display/CAYDOC/Modeling+Object+Layer Apache Tuscany (TUSCANY) http://cwiki.apache.org/confluence/display/TUSCANY | |-Pages Added or Edited in This Space |-- SCA Java binding.ejb was last edited by rfeng (03:09 PM). | http://cwiki.apache.org/confluence/display/TUSCANY/SCA+Java+binding.ejb |-- SCA Java implementation.xquery was last edited by rfeng (02:24 PM). | http://cwiki.apache.org/confluence/display/TUSCANY/SCA+Java+implementation.xquery |-- SCA Java 1.0-incubating Release Summary was last edited by ant (12:24 PM). | http://cwiki.apache.org/confluence/display/TUSCANY/SCA+Java+1.0-incubating+Release+Summary |-- Home was last edited by ant (11:02 AM). | http://cwiki.apache.org/confluence/display/TUSCANY/Home |-- SCA JAVA 1.0-incubating was last edited by ant (10:53 AM). | http://cwiki.apache.org/confluence/display/TUSCANY/SCA+JAVA+1.0-incubating |-- SCA Java Previous Releases was last edited by ant (10:52 AM). | http://cwiki.apache.org/confluence/display/TUSCANY/SCA+Java+Previous+Releases |-- SCA Java Releases was last edited by ant (10:51 AM). | http://cwiki.apache.org/confluence/display/TUSCANY/SCA+Java+Releases Apache Wicket (WICKET) http://cwiki.apache.org/confluence/display/WICKET | |-Pages Added or Edited in This Space |-- How to switch to SSL mode was last edited by rdleeper (08:58 PM). | http://cwiki.apache.org/confluence/display/WICKET/How+to+switch+to+SSL+mode |-- Wicket's XHTML tags was last edited by ivaynberg (02:49 PM). | http://cwiki.apache.org/confluence/display/WICKET/Wicket%27s+XHTML+tags |-- Wicket Employers was last edited by [EMAIL PROTECTED] (08:58 AM). | http://cwiki.apache.org/confluence/display/WICKET/Wicket+Employers |-- Slides and presentations was created by dwayneb
svn commit: r579186 - in /struts/struts2/trunk: core/src/main/java/org/apache/struts2/components/ core/src/main/java/org/apache/struts2/views/freemarker/tags/ core/src/main/java/org/apache/struts2/vie
Author: mrdon
Date: Tue Sep 25 03:39:07 2007
New Revision: 579186
URL: http://svn.apache.org/viewvc?rev=579186&view=rev
Log:
Cleaning up unnecessary dispatcher.getInstance calls, spelling cleanups
WW-1715
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/I18n.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TagModel.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/AbstractDirective.java
struts/struts2/trunk/core/src/site/resources/tags/i18n.html
struts/struts2/trunk/plugins/struts1/src/main/java/org/apache/struts2/s1/ActionFormResetInterceptor.java
struts/struts2/trunk/plugins/struts1/src/main/java/org/apache/struts2/s1/ActionFormValidationInterceptor.java
struts/struts2/trunk/plugins/struts1/src/main/java/org/apache/struts2/s1/Struts1Action.java
struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesRequestContext.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/I18n.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/I18n.java?rev=579186&r1=579185&r2=579186&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/I18n.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/I18n.java
Tue Sep 25 03:39:07 2007
@@ -33,6 +33,8 @@
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.LocaleProvider;
import com.opensymphony.xwork2.TextProviderFactory;
+import com.opensymphony.xwork2.inject.Container;
+import com.opensymphony.xwork2.inject.Inject;
import com.opensymphony.xwork2.util.LocalizedTextUtil;
import com.opensymphony.xwork2.util.ValueStack;
@@ -86,10 +88,16 @@
public class I18n extends Component {
protected boolean pushed;
protected String name;
+protected Container container;
public I18n(ValueStack stack) {
super(stack);
}
+
+@Inject
+public void setContainer(Container container) {
+this.container = container;
+}
public boolean start(Writer writer) {
boolean result = super.start(writer);
@@ -105,7 +113,7 @@
if (bundle != null) {
final Locale locale = (Locale)
getStack().getContext().get(ActionContext.LOCALE);
TextProviderFactory tpf = new TextProviderFactory();
-Dispatcher.getInstance().getContainer().inject(tpf);
+container.inject(tpf);
getStack().push(tpf.createInstance(bundle, new
LocaleProvider() {
public Locale getLocale() {
return locale;
@@ -129,7 +137,7 @@
return super.end(writer, body);
}
-@StrutsTagAttribute(description="Name of ressource bundle to use (eg
foo/bar/customBundle)", required=true, defaultValue="String")
+@StrutsTagAttribute(description="Name of resource bundle to use (eg
foo/bar/customBundle)", required=true, defaultValue="String")
public void setName(String name) {
this.name = name;
}
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TagModel.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TagModel.java?rev=579186&r1=579185&r2=579186&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TagModel.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TagModel.java
Tue Sep 25 03:39:07 2007
@@ -34,6 +34,7 @@
import org.apache.struts2.components.Component;
import org.apache.struts2.dispatcher.Dispatcher;
+import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.inject.Container;
import com.opensymphony.xwork2.util.ValueStack;
@@ -60,7 +61,7 @@
public Writer getWriter(Writer writer, Map params)
throws TemplateModelException, IOException {
Component bean = getBean();
-Container container =
Dispatcher.getInstance().getConfigurationManager().getConfiguration().getContainer();
+Container container = (Container)
stack.getContext().get(ActionContext.CONTAINER);
container.inject(bean);
Map unwrappedParameters = unwrapParameters(params);
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/AbstractDirective.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/AbstractDirective.java?rev=579186&r1=579185&r2=579186&view=diff
==
---
str
svn commit: r579205 - in /struts/struts2/trunk/core/src: main/java/org/apache/struts2/components/ActionComponent.java test/java/org/apache/struts2/components/ActionComponentTest.java
Author: mrdon
Date: Tue Sep 25 04:23:05 2007
New Revision: 579205
URL: http://svn.apache.org/viewvc?rev=579205&view=rev
Log:
Ensuring parameters in the parameter map will be String arrays
WW-1960
Added:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/ActionComponentTest.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionComponent.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionComponent.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionComponent.java?rev=579205&r1=579204&r2=579205&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionComponent.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionComponent.java
Tue Sep 25 04:23:05 2007
@@ -22,7 +22,9 @@
import java.io.IOException;
import java.io.Writer;
+import java.lang.reflect.Array;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.Map;
import javax.servlet.ServletContext;
@@ -59,8 +61,8 @@
* id (String) - the id (if specified) to put the action under
stack's context.
* name* (String) - name of the action to be executed (without the
extension suffix eg. .action)
* namespace (String) - default to the namespace where this action
tag is invoked
- * executeResult (Boolean) - default is false. Decides wheather the
result of this action is to be executed or not
- * ignoreContextParams (Boolean) - default to false. Decides wheather
the request parameters are to be included when the action is invoked
+ * executeResult (Boolean) - default is false. Decides whether the
result of this action is to be executed or not
+ * ignoreContextParams (Boolean) - default to false. Decides whether
the request parameters are to be included when the action is invoked
*
*
*
@@ -170,18 +172,8 @@
return end;
}
-private Map createExtraContext() {
-Map parentParams = null;
-
-if (!ignoreContextParams) {
-parentParams = new
ActionContext(getStack().getContext()).getParameters();
-}
-
-Map newParams = (parentParams != null) ? new HashMap(parentParams) :
new HashMap();
-
-if (parameters != null) {
-newParams.putAll(parameters);
-}
+protected Map createExtraContext() {
+Map newParams = createParametersForContext();
ActionContext ctx = new ActionContext(stack.getContext());
ServletContext servletContext = (ServletContext)
ctx.get(ServletActionContext.SERVLET_CONTEXT);
@@ -205,6 +197,40 @@
extraContext.put(ServletActionContext.PAGE_CONTEXT, pageContext);
return extraContext;
+}
+
+/**
+ * Creates parameters map using parameters from the value stack and
component parameters. Any non-String array
+ * values will be converted into a single-value String array.
+ *
+ * @return A map of String[] parameters
+ */
+protected Map createParametersForContext() {
+Map parentParams = null;
+
+if (!ignoreContextParams) {
+parentParams = new
ActionContext(getStack().getContext()).getParameters();
+}
+
+Map newParams = (parentParams != null)
+? new HashMap(parentParams)
+: new HashMap();
+
+if (parameters != null) {
+Map params = new HashMap();
+for (Iterator i = parameters.entrySet().iterator(); i.hasNext(); )
{
+Map.Entry entry = (Map.Entry) i.next();
+String key = (String) entry.getKey();
+Object val = entry.getValue();
+if (val.getClass().isArray() && String.class ==
val.getClass().getComponentType()) {
+params.put(key, (String[])val);
+} else {
+params.put(key, new String[]{val.toString()});
+}
+}
+newParams.putAll(params);
+}
+return newParams;
}
public ActionProxy getProxy() {
Added:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/ActionComponentTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/ActionComponentTest.java?rev=579205&view=auto
==
---
struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/ActionComponentTest.java
(added)
+++
struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/ActionComponentTest.java
Tue Sep 25 04:23:05 2007
@@ -0,0 +1,54 @@
+/*
+ * $Id: ComponentTest.java 471756 2006-11-06 15:01:43Z husted $
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor
svn commit: r579210 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionComponent.java
Author: mrdon
Date: Tue Sep 25 04:55:37 2007
New Revision: 579210
URL: http://svn.apache.org/viewvc?rev=579210&view=rev
Log:
Hopefully improved method calls for the action tag
WW-2102
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionComponent.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionComponent.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionComponent.java?rev=579210&r1=579209&r2=579210&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionComponent.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionComponent.java
Tue Sep 25 04:55:37 2007
@@ -279,9 +279,7 @@
try {
proxy = actionProxyFactory.createActionProxy(namespace,
actionName, createExtraContext(), executeResult, true);
-if (null != methodName) {
-proxy.setMethod(methodName);
-}
+proxy.setMethod(methodName);
// set the new stack into the request for the taglib to use
req.setAttribute(ServletActionContext.STRUTS_VALUESTACK_KEY,
proxy.getInvocation().getStack());
proxy.execute();
svn commit: r579235 - /struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/head.ftl
Author: musachy Date: Tue Sep 25 06:20:55 2007 New Revision: 579235 URL: http://svn.apache.org/viewvc?rev=579235&view=rev Log: Make cache="true" the default for the head tag Modified: struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/head.ftl Modified: struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/head.ftl URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/head.ftl?rev=579235&r1=579234&r2=579235&view=diff == --- struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/head.ftl (original) +++ struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/head.ftl Tue Sep 25 06:20:55 2007 @@ -53,7 +53,7 @@ <#assign dojoFile="dojo.js.uncompressed.js"> -<#if parameters.cache?default(false)> +<#if parameters.cache?default(true)> <#assign profile="struts_"> <#else> <#assign profile="">
svn commit: r579250 - /struts/struts2/branches/STRUTS_2_0_X/src/site/xdoc/index.xml
Author: jholmes Date: Tue Sep 25 06:59:01 2007 New Revision: 579250 URL: http://svn.apache.org/viewvc?rev=579250&view=rev Log: Update Struts 2 version. Modified: struts/struts2/branches/STRUTS_2_0_X/src/site/xdoc/index.xml Modified: struts/struts2/branches/STRUTS_2_0_X/src/site/xdoc/index.xml URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/src/site/xdoc/index.xml?rev=579250&r1=579249&r2=579250&view=diff == --- struts/struts2/branches/STRUTS_2_0_X/src/site/xdoc/index.xml (original) +++ struts/struts2/branches/STRUTS_2_0_X/src/site/xdoc/index.xml Tue Sep 25 06:59:01 2007 @@ -32,10 +32,10 @@ -http://struts.apache.org/download.cgi#struts206";> +http://struts.apache.org/download.cgi#struts209";> - version 2.0.8 + version 2.0.9 Download Now
svn commit: r579330 - /struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotebutton/index.jsp
Author: musachy
Date: Tue Sep 25 10:48:03 2007
New Revision: 579330
URL: http://svn.apache.org/viewvc?rev=579330&view=rev
Log:
WW-2206 sx:submit does not evaluate expressions in the src attribute
Patch submitted by Wes Wannemacher.
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotebutton/index.jsp
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotebutton/index.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotebutton/index.jsp?rev=579330&r1=579329&r2=579330&view=diff
==
---
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotebutton/index.jsp
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotebutton/index.jsp
Tue Sep 25 10:48:03 2007
@@ -48,9 +48,9 @@
Use an image as submit
-
+
+ src="%{imgUrl}" href="%{ajaxTest}" />
Text to be echoed
