[CONF] Confluence Changes in the last 24 hours

2007-08-14 Thread confluence
-
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
 |-- Pluggable Administration Console and Extensions User's Guide was last 
edited by becky (11:09 AM).
 |   
http://cwiki.apache.org/confluence/display/GMOxDEV/Pluggable+Administration+Console+and+Extensions+User%27s+Guide
 |-- Pluggable Administration Console and Extensions Developer's Guide was last 
edited by larsendaniel (05:58 AM).
 |   
http://cwiki.apache.org/confluence/display/GMOxDEV/Pluggable+Administration+Console+and+Extensions+Developer%27s+Guide

Apache Camel (CAMEL) http://cwiki.apache.org/confluence/display/CAMEL
|
|-Pages Added or Edited in This Space
 |-- Camel 1.1.0 Release was last edited by chirino (02:23 PM).
 |   http://cwiki.apache.org/confluence/display/CAMEL/Camel+1.1.0+Release
 |-- Spring was last edited by jstrachan (12:15 PM).
 |   http://cwiki.apache.org/confluence/display/CAMEL/Spring
 |-- DSL was last edited by jstrachan (12:05 PM).
 |   http://cwiki.apache.org/confluence/display/CAMEL/DSL
 |-- Exception Clause was created by jstrachan (11:07 AM).
 |   http://cwiki.apache.org/confluence/display/CAMEL/Exception+Clause
 |-- Error Handler was last edited by jstrachan (11:08 AM).
 |   http://cwiki.apache.org/confluence/display/CAMEL/Error+Handler
 |-- BAM Example was created by jstrachan (09:59 AM).
 |   http://cwiki.apache.org/confluence/display/CAMEL/BAM+Example
 |-- BAM was last edited by jstrachan (10:55 AM).
 |   http://cwiki.apache.org/confluence/display/CAMEL/BAM
 |-- Examples was last edited by jstrachan (09:59 AM).
 |   http://cwiki.apache.org/confluence/display/CAMEL/Examples

Apache CXF 2.0 Documentation (CXF20DOC) 
http://cwiki.apache.org/confluence/display/CXF20DOC
|
|-Pages Added or Edited in This Space
 |-- tewst was created by vghariharan3 (09:07 AM).
 |   http://cwiki.apache.org/confluence/display/CXF20DOC/tewst

Apache Roller (ROLLER) http://cwiki.apache.org/confluence/display/ROLLER
|
|-Pages Added or Edited in This Space
 |-- August 2007 Board Report was created by snoopdave (08:45 AM).
 |   http://cwiki.apache.org/confluence/display/ROLLER/August+2007+Board+Report
 |-- March 2007 Board Report was last edited by snoopdave (10:17 AM).
 |   http://cwiki.apache.org/confluence/display/ROLLER/March+2007+Board+Report
 |-- ASF Board Reports was last edited by snoopdave (08:38 AM).
 |   http://cwiki.apache.org/confluence/display/ROLLER/ASF+Board+Reports

Apache Struts 2 Documentation (WW) http://cwiki.apache.org/confluence/display/WW
|
|-Pages Added or Edited in This Space
 |-- Tutorials was last edited by husted (03:27 AM).
 |   http://cwiki.apache.org/confluence/display/WW/Tutorials

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 stanlick (06:10 
AM).
 |   
http://cwiki.apache.org/confluence/display/S2WIKI/Companies+that+provide+Struts+2+support

Apache Tuscany (TUSCANY) http://cwiki.apache.org/confluence/display/TUSCANY
|
|-Pages Added or Edited in This Space
 |-- SCA Java User Guide was last edited by haleh (01:12 PM).
 |   http://cwiki.apache.org/confluence/display/TUSCANY/SCA+Java+User+Guide
 |-- Tuscany SCA Java - FAQ was last edited by slaws (11:29 AM).
 |   http://cwiki.apache.org/confluence/display/TUSCANY/Tuscany+SCA+Java+-+FAQ

Apache Directory Project Management (DIRxPMGT) 
http://cwiki.apache.org/confluence/display/DIRxPMGT
|
|-Pages Added or Edited in This Space
 |-- OID Assignment Scheme was last edited by elecharny (02:37 PM).
 |   http://cwiki.apache.org/confluence/display/DIRxPMGT/OID+Assignment+Scheme

Apache Felix (FELIX) http://cwiki.apache.org/confluence/display/FELIX
|
|-Pages Added or Edited in This Space
 |-- How to use iPOJO Annotations was created by clement.escoffier (09:10 AM).
 |   
http://cwiki.apache.org/confluence/display/FELIX/How+to+use+iPOJO+Annotations
 |-- iPOJO Maven Plug-in was created by clement.escoffier (08:35 AM).
 |   http://cwiki.apache.org/confluence/display/FELIX/iPOJO+Maven+Plug-in
 |-- iPOJO was last edited by clement.escoffier (05:12 AM).
 |   http://cwiki.apache.org/confluence/display/FELIX/iPOJO

Apache Geronimo (GMOxSITE) http://cwiki.apache.org/confluence/display/GMOxSITE
|
|-Pages Added or Edited in This Space
 |-- Apache Geronimo v2.0 - Release delayed due to security issue was created 
by hcunico (02:26 PM).
 |   
http://cwiki.apache.org/confluence/display/GMOxSITE/2007/08/13/Apache+Geronimo+v2.0+-+Release+delayed+due+to+security+issue
 |-- no show was created by hcunico (08:53 AM).
 |   http://cwiki.apache.org/confluence/display/GMOxSITE/no+show

Tuscany Wiki (T

svn commit: r565695 - /struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/Form.java

2007-08-14 Thread rgielen
Author: rgielen
Date: Tue Aug 14 03:21:53 2007
New Revision: 565695

URL: http://svn.apache.org/viewvc?view=rev&rev=565695
Log:
WW-2109:
"Intelligent" id resolution for  does not work as documented

Modified:

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

Modified: 
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/Form.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/Form.java?view=diff&rev=565695&r1=565694&r2=565695
==
--- 
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/Form.java
 (original)
+++ 
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/Form.java
 Tue Aug 14 03:21:53 2007
@@ -228,6 +228,8 @@
 
 if (id != null) {
 addParameter("id", escape(id));
+} else if ( action != null ) {
+addParameter("id", escape(action));
 }
 if (Dispatcher.getInstance().isPortletSupportActive() && 
PortletActionContext.isPortletRequest()) {
 evaluateExtraParamsPortletRequest(namespace, action);




svn commit: r565697 - /struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/Form.java

2007-08-14 Thread rgielen
Author: rgielen
Date: Tue Aug 14 03:28:35 2007
New Revision: 565697

URL: http://svn.apache.org/viewvc?view=rev&rev=565697
Log:
WW-2109:
- "Intelligent" id resolution for  does not work as documented
- minor cleanups

Modified:

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

Modified: 
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/Form.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/Form.java?view=diff&rev=565697&r1=565696&r2=565697
==
--- 
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/Form.java
 (original)
+++ 
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/Form.java
 Tue Aug 14 03:28:35 2007
@@ -20,26 +20,6 @@
  */
 package org.apache.struts2.components;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-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.views.annotations.StrutsTag;
-import org.apache.struts2.views.annotations.StrutsTagAttribute;
-import org.apache.struts2.StrutsConstants;
-import org.apache.struts2.dispatcher.Dispatcher;
-import org.apache.struts2.dispatcher.mapper.ActionMapping;
-import org.apache.struts2.portlet.context.PortletActionContext;
-import org.apache.struts2.portlet.util.PortletUrlHelper;
-import org.apache.struts2.views.util.UrlHelper;
-
 import com.opensymphony.xwork2.ActionContext;
 import com.opensymphony.xwork2.ActionInvocation;
 import com.opensymphony.xwork2.ObjectFactory;
@@ -49,12 +29,29 @@
 import com.opensymphony.xwork2.config.entities.InterceptorMapping;
 import com.opensymphony.xwork2.inject.Inject;
 import com.opensymphony.xwork2.interceptor.MethodFilterInterceptorUtil;
-import com.opensymphony.xwork2.util.ValueStack;
 import com.opensymphony.xwork2.util.TextUtils;
+import com.opensymphony.xwork2.util.ValueStack;
 import com.opensymphony.xwork2.validator.ActionValidatorManagerFactory;
 import com.opensymphony.xwork2.validator.FieldValidator;
 import com.opensymphony.xwork2.validator.ValidationInterceptor;
 import com.opensymphony.xwork2.validator.Validator;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.struts2.StrutsConstants;
+import org.apache.struts2.dispatcher.Dispatcher;
+import org.apache.struts2.dispatcher.mapper.ActionMapping;
+import org.apache.struts2.portlet.context.PortletActionContext;
+import org.apache.struts2.portlet.util.PortletUrlHelper;
+import org.apache.struts2.views.annotations.StrutsTag;
+import org.apache.struts2.views.annotations.StrutsTagAttribute;
+import org.apache.struts2.views.util.UrlHelper;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
 
 /**
  * 
@@ -344,7 +341,7 @@
 
 // Only evaluate if Client-Side js is to be enable when validate=true
 Boolean validate = (Boolean) getParameters().get("validate");
-if (validate != null && validate.booleanValue()) {
+if (validate != null && validate) {
 
 addParameter("performValidation", Boolean.FALSE);
 
@@ -352,9 +349,8 @@
 ActionConfig actionConfig = 
runtimeConfiguration.getActionConfig(namespace, actionName);
 
 if (actionConfig != null) {
-List interceptors = actionConfig.getInterceptors();
-for (Iterator i = interceptors.iterator(); i.hasNext();) {
-InterceptorMapping interceptorMapping = 
(InterceptorMapping) i.next();
+List interceptors = 
actionConfig.getInterceptors();
+for (InterceptorMapping interceptorMapping : interceptors) {
 if 
(ValidationInterceptor.class.isInstance(interceptorMapping.getInterceptor())) {
 ValidationInterceptor validationInterceptor = 
(ValidationInterceptor) interceptorMapping.getInterceptor();
 
@@ -424,10 +420,9 @@
 return Collections.EMPTY_LIST;
 }
 
-List all = 
ActionValidatorManagerFactory.getInstance().getValidators(actionClass, (String) 
getParameters().get("actionName"));
-List validators = new ArrayList();
-for (Iterator iterator = all.iterator(); iterator.hasNext();) {
-Validator validator = (Validator) iterator.next();
+List all = 
ActionValidatorManagerFactory.getInstance().getValidators(actionClass, (String) 
getParameters().get("actionName"));
+List validators = new ArrayList();
+for (Validator

svn commit: r565746 - /struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/Form.java

2007-08-14 Thread rgielen
Author: rgielen
Date: Tue Aug 14 06:40:12 2007
New Revision: 565746

URL: http://svn.apache.org/viewvc?view=rev&rev=565746
Log:
WW-2109:
id resolution for  - minor cleanups

Modified:

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

Modified: 
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/Form.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/Form.java?view=diff&rev=565746&r1=565745&r2=565746
==
--- 
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/Form.java
 (original)
+++ 
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/Form.java
 Tue Aug 14 06:40:12 2007
@@ -225,9 +225,10 @@
 
 if (id != null) {
 addParameter("id", escape(id));
-} else if ( action != null ) {
-addParameter("id", escape(action));
 }
+
+// if no id given, it will be tried to generate it from the action 
attribute in the
+// corresponding evaluateExtraParams method
 if (Dispatcher.getInstance().isPortletSupportActive() && 
PortletActionContext.isPortletRequest()) {
 evaluateExtraParamsPortletRequest(namespace, action);
 } else {
@@ -293,8 +294,8 @@
 }
 
 // if the id isn't specified, use the action name
-if (id == null) {
-addParameter("id", action);
+if (id == null && action!=null) {
+addParameter("id", escape(action));
 }
 } else if (action != null) {
 // Since we can't find an action alias in the configuration, we 
just assume
@@ -373,11 +374,6 @@
  * @param action The action to create the URL for.
  */
 private void evaluateExtraParamsPortletRequest(String namespace, String 
action) {
-
-if (this.action != null) {
-// if it isn't specified, we'll make somethig up
-action = findString(this.action);
-}
 
 String type = "action";
 if (TextUtils.stringSet(method)) {




svn commit: r565752 - /struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/css_xhtml/form-validate.ftl

2007-08-14 Thread jholmes
Author: jholmes
Date: Tue Aug 14 06:45:49 2007
New Revision: 565752

URL: http://svn.apache.org/viewvc?view=rev&rev=565752
Log:
WW-1761 templates don't specify type="text/javascript"; break W3C validation

Fixed issue of extra type="text/javascript" that was added during the fix for 
the original opening of the WW-1761 ticket.

Modified:

struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/css_xhtml/form-validate.ftl

Modified: 
struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/css_xhtml/form-validate.ftl
URL: 
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/css_xhtml/form-validate.ftl?view=diff&rev=565752&r1=565751&r2=565752
==
--- 
struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/css_xhtml/form-validate.ftl
 (original)
+++ 
struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/css_xhtml/form-validate.ftl
 Tue Aug 14 06:45:49 2007
@@ -21,7 +21,7 @@
  */
 -->
 <#if parameters.validate?default(false) == true>
-
+
 <#if parameters.onsubmit?exists>
 ${tag.addParameter('onsubmit', "${parameters.onsubmit}; return 
validateForm_${parameters.id}();")}
 <#else>




svn commit: r565756 - in /struts/struts2/trunk: core/src/main/java/org/apache/struts2/components/ plugins/portlet/src/main/java/org/apache/struts2/components/

2007-08-14 Thread rgielen
Author: rgielen
Date: Tue Aug 14 06:49:45 2007
New Revision: 565756

URL: http://svn.apache.org/viewvc?view=rev&rev=565756
Log:
WW-2109:
id resolution for  - minor cleanups

Modified:

struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Form.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ServletUrlRenderer.java

struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/components/PortletUrlRenderer.java

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Form.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Form.java?view=diff&rev=565756&r1=565755&r2=565756
==
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Form.java 
(original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Form.java 
Tue Aug 14 06:49:45 2007
@@ -20,26 +20,6 @@
  */
 package org.apache.struts2.components;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.struts2.views.annotations.StrutsTag;
-import org.apache.struts2.views.annotations.StrutsTagAttribute;
-import org.apache.struts2.StrutsConstants;
-import org.apache.struts2.dispatcher.Dispatcher;
-import org.apache.struts2.dispatcher.mapper.ActionMapping;
-//import org.apache.struts2.portlet.context.PortletActionContext;
-//import org.apache.struts2.portlet.util.PortletUrlHelper;
-import org.apache.struts2.views.util.UrlHelper;
-
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionInvocation;
 import com.opensymphony.xwork2.ObjectFactory;
 import com.opensymphony.xwork2.config.Configuration;
 import com.opensymphony.xwork2.config.RuntimeConfiguration;
@@ -48,11 +28,18 @@
 import com.opensymphony.xwork2.inject.Inject;
 import com.opensymphony.xwork2.interceptor.MethodFilterInterceptorUtil;
 import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.TextUtils;
 import com.opensymphony.xwork2.validator.ActionValidatorManagerFactory;
 import com.opensymphony.xwork2.validator.FieldValidator;
 import com.opensymphony.xwork2.validator.ValidationInterceptor;
 import com.opensymphony.xwork2.validator.Validator;
+import org.apache.struts2.StrutsConstants;
+import org.apache.struts2.views.annotations.StrutsTag;
+import org.apache.struts2.views.annotations.StrutsTagAttribute;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.*;
+import java.util.Set;
 
 /**
  * 
@@ -222,32 +209,30 @@
  * 
  */
 protected void populateComponentHtmlId(Form form) {
-boolean isAjax = "ajax".equalsIgnoreCase(this.theme);
-
-String action = null;
-if (this.action != null) {
-// if it isn't specified, we'll make somethig up
-action = findString(this.action);
-}
-
 if (id != null) {
 addParameter("id", escape(id));
+} else if (this.action != null) {
+// if it isn't specified, we'll make somethig up
+String action = findString(this.action);
+if (action != null) {
+addParameter("id", escape(action));
+}
 }
+
 urlRenderer.renderFormUrl(this);
 }
 
 /**
- * @param isAjax
- * @param namespace
- * @param action
+ * Evaluate client side JavaScript Enablement.
+ * @param actionName the actioName to check for
+ * @param namespace the namespace to check for
+ * @param actionMethod the method to ckeck for
  */
-
-
 protected void evaluateClientSideJsEnablement(String actionName, String 
namespace, String actionMethod) {
 
 // Only evaluate if Client-Side js is to be enable when validate=true
 Boolean validate = (Boolean) getParameters().get("validate");
-if (validate != null && validate.booleanValue()) {
+if (validate != null && validate) {
 
 addParameter("performValidation", Boolean.FALSE);
 
@@ -255,9 +240,8 @@
 ActionConfig actionConfig = 
runtimeConfiguration.getActionConfig(namespace, actionName);
 
 if (actionConfig != null) {
-List interceptors = actionConfig.getInterceptors();
-for (Iterator i = interceptors.iterator(); i.hasNext();) {
-InterceptorMapping interceptorMapping = 
(InterceptorMapping) i.next();
+List interceptors = 
actionConfig.getInterceptors();
+for (InterceptorMapping interceptorMapping : interceptors) {
 if 
(ValidationInterceptor.class.isInstance(interceptorMapping.getInterceptor())) {
 Val

svn commit: r565759 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Form.java

2007-08-14 Thread rgielen
Author: rgielen
Date: Tue Aug 14 06:52:41 2007
New Revision: 565759

URL: http://svn.apache.org/viewvc?view=rev&rev=565759
Log:
WW-2109:
id resolution for  - minor cleanups, some former changes rolled back 
again

Modified:

struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Form.java

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Form.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Form.java?view=diff&rev=565759&r1=565758&r2=565759
==
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Form.java 
(original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Form.java 
Tue Aug 14 06:52:41 2007
@@ -211,14 +211,10 @@
 protected void populateComponentHtmlId(Form form) {
 if (id != null) {
 addParameter("id", escape(id));
-} else if (this.action != null) {
-// if it isn't specified, we'll make somethig up
-String action = findString(this.action);
-if (action != null) {
-addParameter("id", escape(action));
-}
 }
 
+// if no id given, it will be tried to generate it from the action 
attribute
+// by the urlRenderer implementation
 urlRenderer.renderFormUrl(this);
 }
 




svn commit: r565842 - /struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/css_xhtml/checkbox.ftl

2007-08-14 Thread jholmes
Author: jholmes
Date: Tue Aug 14 10:25:15 2007
New Revision: 565842

URL: http://svn.apache.org/viewvc?view=rev&rev=565842
Log:
WW-2110 css_xhtml checkbox.ftl renders one  to many when no label exists

Modified:

struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/css_xhtml/checkbox.ftl

Modified: 
struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/css_xhtml/checkbox.ftl
URL: 
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/css_xhtml/checkbox.ftl?view=diff&rev=565842&r1=565841&r2=565842
==
--- 
struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/css_xhtml/checkbox.ftl
 (original)
+++ 
struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/css_xhtml/checkbox.ftl
 Tue Aug 14 10:25:15 2007
@@ -94,4 +94,11 @@
 >${parameters.label?html}<#rt/>
 
 
-<#include "/${parameters.templateDir}/css_xhtml/controlfooter.ftl" /><#nt/>
+<#if parameters.label?exists>
+<#if parameters.labelposition?default("top") == 'top'>
+ <#rt/>
+<#else>
+ <#rt/>
+
+
+




svn commit: r565844 - /struts/struts2/trunk/core/src/main/resources/template/css_xhtml/checkbox.ftl

2007-08-14 Thread jholmes
Author: jholmes
Date: Tue Aug 14 10:29:29 2007
New Revision: 565844

URL: http://svn.apache.org/viewvc?view=rev&rev=565844
Log:
WW-2110 css_xhtml checkbox.ftl renders one  to many when no label exists

Modified:
struts/struts2/trunk/core/src/main/resources/template/css_xhtml/checkbox.ftl

Modified: 
struts/struts2/trunk/core/src/main/resources/template/css_xhtml/checkbox.ftl
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/css_xhtml/checkbox.ftl?view=diff&rev=565844&r1=565843&r2=565844
==
--- 
struts/struts2/trunk/core/src/main/resources/template/css_xhtml/checkbox.ftl 
(original)
+++ 
struts/struts2/trunk/core/src/main/resources/template/css_xhtml/checkbox.ftl 
Tue Aug 14 10:29:29 2007
@@ -94,4 +94,11 @@
 >${parameters.label?html}<#rt/>
 
 
-<#include "/${parameters.templateDir}/css_xhtml/controlfooter.ftl" /><#nt/>
+<#if parameters.label?exists>
+<#if parameters.labelposition?default("top") == 'top'>
+ <#rt/>
+<#else>
+ <#rt/>
+
+
+




svn commit: r565854 - /struts/struts2/branches/STRUTS_2_0_X/apps/blank/pom.xml

2007-08-14 Thread jmitchell
Author: jmitchell
Date: Tue Aug 14 11:50:57 2007
New Revision: 565854

URL: http://svn.apache.org/viewvc?view=rev&rev=565854
Log:
WW-2089 align jetty config as to what is in trunk

Modified:
struts/struts2/branches/STRUTS_2_0_X/apps/blank/pom.xml

Modified: struts/struts2/branches/STRUTS_2_0_X/apps/blank/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/blank/pom.xml?view=diff&rev=565854&r1=565853&r2=565854
==
--- struts/struts2/branches/STRUTS_2_0_X/apps/blank/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_0_X/apps/blank/pom.xml Tue Aug 14 11:50:57 
2007
@@ -48,17 +48,10 @@
 
 org.mortbay.jetty
 maven-jetty-plugin
+6.0.1
 
 10
 
-
-
-org.apache.geronimo.specs
-geronimo-j2ee_1.4_spec
-1.0
-provided
-
-