svn commit: r409957 - /struts/action2/trunk/core/src/main/resources/template/css_xhtml/form-validate.ftl

2006-05-28 Thread tmjee 
Author: tmjee
Date: Sun May 28 07:09:09 2006
New Revision: 409957

URL: http://svn.apache.org/viewvc?rev=409957&view=rev
Log:
- remove the unecessary customOnsubmit() js function call, cause now we
  are using dojo.event.connect to connect the form's onsubmit event, see
  form-close.ftl of the simple theme


Modified:

struts/action2/trunk/core/src/main/resources/template/css_xhtml/form-validate.ftl

Modified: 
struts/action2/trunk/core/src/main/resources/template/css_xhtml/form-validate.ftl
URL: 
http://svn.apache.org/viewvc/struts/action2/trunk/core/src/main/resources/template/css_xhtml/form-validate.ftl?rev=409957&r1=409956&r2=409957&view=diff
==
--- 
struts/action2/trunk/core/src/main/resources/template/css_xhtml/form-validate.ftl
 (original)
+++ 
struts/action2/trunk/core/src/main/resources/template/css_xhtml/form-validate.ftl
 Sun May 28 07:09:09 2006
@@ -1,8 +1,8 @@
 <#if parameters.validate?default(false) == true>
 
 <#if parameters.onsubmit?exists>
-${tag.addParameter('onsubmit', "${parameters.onsubmit}; 
customOnsubmit(); return validateForm_${parameters.id}();")}
+${tag.addParameter('onsubmit', "${parameters.onsubmit}; return 
validateForm_${parameters.id}();")}
 <#else>
-${tag.addParameter('onsubmit', "customOnsubmit(); return 
validateForm_${parameters.id}();")}
+${tag.addParameter('onsubmit', "return 
validateForm_${parameters.id}();")}

svn commit: r409958 - in /struts/action2/trunk/core/src/main: java/org/apache/struts/action2/components/template/ java/org/apache/struts/action2/views/freemarker/ resources/template/ajax/ resources/te

2006-05-28 Thread tmjee 
Author: tmjee
Date: Sun May 28 07:17:17 2006
New Revision: 409958

URL: http://svn.apache.org/viewvc?rev=409958&view=rev
Log:
WW-1304


Added:

struts/action2/trunk/core/src/main/resources/template/css_xhtml/control-close.ftl
struts/action2/trunk/core/src/main/resources/template/css_xhtml/control.ftl

struts/action2/trunk/core/src/main/resources/template/css_xhtml/controlheader-core.ftl

struts/action2/trunk/core/src/main/resources/template/xhtml/control-close.ftl
struts/action2/trunk/core/src/main/resources/template/xhtml/control.ftl
Modified:

struts/action2/trunk/core/src/main/java/org/apache/struts/action2/components/template/FreemarkerTemplateEngine.java

struts/action2/trunk/core/src/main/java/org/apache/struts/action2/views/freemarker/FreemarkerResult.java
struts/action2/trunk/core/src/main/resources/template/ajax/controlheader.ftl
struts/action2/trunk/core/src/main/resources/template/ajax/form.ftl
struts/action2/trunk/core/src/main/resources/template/ajax/head.ftl
struts/action2/trunk/core/src/main/resources/template/ajax/submit-ajax.ftl
struts/action2/trunk/core/src/main/resources/template/ajax/submit.ftl
struts/action2/trunk/core/src/main/resources/template/ajax/textarea.ftl
struts/action2/trunk/core/src/main/resources/template/ajax/theme.properties

struts/action2/trunk/core/src/main/resources/template/css_xhtml/checkboxlist.ftl
struts/action2/trunk/core/src/main/resources/template/css_xhtml/combobox.ftl

struts/action2/trunk/core/src/main/resources/template/css_xhtml/controlheader.ftl

struts/action2/trunk/core/src/main/resources/template/css_xhtml/datepicker.ftl

struts/action2/trunk/core/src/main/resources/template/css_xhtml/doubleselect.ftl
struts/action2/trunk/core/src/main/resources/template/css_xhtml/file.ftl

struts/action2/trunk/core/src/main/resources/template/css_xhtml/form-close.ftl
struts/action2/trunk/core/src/main/resources/template/css_xhtml/form.ftl
struts/action2/trunk/core/src/main/resources/template/css_xhtml/label.ftl

struts/action2/trunk/core/src/main/resources/template/css_xhtml/optiontransferselect.ftl
struts/action2/trunk/core/src/main/resources/template/css_xhtml/password.ftl
struts/action2/trunk/core/src/main/resources/template/css_xhtml/radiomap.ftl

struts/action2/trunk/core/src/main/resources/template/css_xhtml/richtexteditor.ftl
struts/action2/trunk/core/src/main/resources/template/css_xhtml/select.ftl
struts/action2/trunk/core/src/main/resources/template/css_xhtml/text.ftl
struts/action2/trunk/core/src/main/resources/template/css_xhtml/textarea.ftl

struts/action2/trunk/core/src/main/resources/template/css_xhtml/updownselect.ftl
struts/action2/trunk/core/src/main/resources/template/xhtml/form-close.ftl
struts/action2/trunk/core/src/main/resources/template/xhtml/form.ftl

Modified: 
struts/action2/trunk/core/src/main/java/org/apache/struts/action2/components/template/FreemarkerTemplateEngine.java
URL: 
http://svn.apache.org/viewvc/struts/action2/trunk/core/src/main/java/org/apache/struts/action2/components/template/FreemarkerTemplateEngine.java?rev=409958&r1=409957&r2=409958&view=diff
==
--- 
struts/action2/trunk/core/src/main/java/org/apache/struts/action2/components/template/FreemarkerTemplateEngine.java
 (original)
+++ 
struts/action2/trunk/core/src/main/java/org/apache/struts/action2/components/template/FreemarkerTemplateEngine.java
 Sun May 28 07:17:17 2006
@@ -109,6 +109,7 @@
 SimpleHash model = freemarkerManager.buildTemplateModel(stack, action, 
servletContext, req, res, config.getObjectWrapper());
 
 model.put("tag", templateContext.getTag());
+model.put("themeProperties", 
getThemeProps(templateContext.getTemplate()));
 
 // the BodyContent JSP writer doesn't like it when FM flushes 
automatically --
 // so let's just not do it (it will be flushed eventually anyway)

Modified: 
struts/action2/trunk/core/src/main/java/org/apache/struts/action2/views/freemarker/FreemarkerResult.java
URL: 
http://svn.apache.org/viewvc/struts/action2/trunk/core/src/main/java/org/apache/struts/action2/views/freemarker/FreemarkerResult.java?rev=409958&r1=409957&r2=409958&view=diff
==
--- 
struts/action2/trunk/core/src/main/java/org/apache/struts/action2/views/freemarker/FreemarkerResult.java
 (original)
+++ 
struts/action2/trunk/core/src/main/java/org/apache/struts/action2/views/freemarker/FreemarkerResult.java
 Sun May 28 07:17:17 2006
@@ -134,7 +134,7 @@
 String base = ResourceUtil.getResourceBase(req);
 location = base + "/" + location;
 }
-
+
 Template template = configuration.getTemplate(location, 
deduceLocale());
 TemplateModel model = createModel();
 

Modified: 
struts/action2/trunk/core/src/mai

svn commit: r410002 - in /struts/action2/trunk: apps/showcase/src/main/webapp/WEB-INF/classes/xwork-jsf.xml core/src/main/resources/struts-default.xml core/src/main/resources/struts-jsf.xml

2006-05-28 Thread jcarreira 
Author: jcarreira
Date: Sun May 28 15:59:31 2006
New Revision: 410002

URL: http://svn.apache.org/viewvc?rev=410002&view=rev
Log:
Moved JSF configurations into a separate config file so if you don't use / have 
JSF libraries it won't break

Added:
struts/action2/trunk/core/src/main/resources/struts-jsf.xml
Modified:

struts/action2/trunk/apps/showcase/src/main/webapp/WEB-INF/classes/xwork-jsf.xml
struts/action2/trunk/core/src/main/resources/struts-default.xml

Modified: 
struts/action2/trunk/apps/showcase/src/main/webapp/WEB-INF/classes/xwork-jsf.xml
URL: 
http://svn.apache.org/viewvc/struts/action2/trunk/apps/showcase/src/main/webapp/WEB-INF/classes/xwork-jsf.xml?rev=410002&r1=410001&r2=410002&view=diff
==
--- 
struts/action2/trunk/apps/showcase/src/main/webapp/WEB-INF/classes/xwork-jsf.xml
 (original)
+++ 
struts/action2/trunk/apps/showcase/src/main/webapp/WEB-INF/classes/xwork-jsf.xml
 Sun May 28 15:59:31 2006
@@ -1,8 +1,9 @@
 http://www.opensymphony.com/xwork/xwork-1.1.1.dtd";>
 
 
+
 
-
+

 
 

Modified: struts/action2/trunk/core/src/main/resources/struts-default.xml
URL: 
http://svn.apache.org/viewvc/struts/action2/trunk/core/src/main/resources/struts-default.xml?rev=410002&r1=410001&r2=410002&view=diff
==
--- struts/action2/trunk/core/src/main/resources/struts-default.xml (original)
+++ struts/action2/trunk/core/src/main/resources/struts-default.xml Sun May 28 
15:59:31 2006
@@ -13,8 +13,7 @@
 
 
 
-   
-
+
 
 
 
@@ -46,14 +45,6 @@
 
 

-   
-   
-   
-   
-   
-   
-   
-
 
 
 
@@ -185,16 +176,6 @@
 
 input,back,cancel
 
-
-   
-   
-   
-
-   
-   
-   
-   
-   
 
 
 

Added: struts/action2/trunk/core/src/main/resources/struts-jsf.xml
URL: 
http://svn.apache.org/viewvc/struts/action2/trunk/core/src/main/resources/struts-jsf.xml?rev=410002&view=auto
==
--- struts/action2/trunk/core/src/main/resources/struts-jsf.xml (added)
+++ struts/action2/trunk/core/src/main/resources/struts-jsf.xml Sun May 28 
15:59:31 2006
@@ -0,0 +1,29 @@
+http://www.opensymphony.com/xwork/xwork-1.1.1.dtd";>
+
+
+
+   
+
+
+
+   
+   
+   
+   
+   
+   
+   
+
+   
+   
+
+   
+   
+   
+   
+   
+
+
+
+
+

svn commit: r410003 - in /struts/action2/trunk/apps: pom.xml shopping-cart/pom.xml showcase/pom.xml

2006-05-28 Thread wsmoak 
Author: wsmoak
Date: Sun May 28 16:19:54 2006
New Revision: 410003

URL: http://svn.apache.org/viewvc?rev=410003&view=rev
Log:
Move struts-core out of  because it is required by all 
example apps.

Modified:
struts/action2/trunk/apps/pom.xml
struts/action2/trunk/apps/shopping-cart/pom.xml
struts/action2/trunk/apps/showcase/pom.xml

Modified: struts/action2/trunk/apps/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/action2/trunk/apps/pom.xml?rev=410003&r1=410002&r2=410003&view=diff
==
--- struts/action2/trunk/apps/pom.xml (original)
+++ struts/action2/trunk/apps/pom.xml Sun May 28 16:19:54 2006
@@ -118,15 +118,17 @@
 ${pom.artifactId}
   
 
-
-
-  
+
+
 
 org.apache.struts.action2
 struts-core
 ${pom.version}
 
+
 
+
+  
 
 
 org.springframework

Modified: struts/action2/trunk/apps/shopping-cart/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/action2/trunk/apps/shopping-cart/pom.xml?rev=410003&r1=410002&r2=410003&view=diff
==
--- struts/action2/trunk/apps/shopping-cart/pom.xml (original)
+++ struts/action2/trunk/apps/shopping-cart/pom.xml Sun May 28 16:19:54 2006
@@ -21,12 +21,6 @@
   
   
   
-  org.apache.struts.action2
-  struts-core
-  ${pom.version}
-  
-  
-  
   opensymphony
   sitemesh
   2.2.1

Modified: struts/action2/trunk/apps/showcase/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/action2/trunk/apps/showcase/pom.xml?rev=410003&r1=410002&r2=410003&view=diff
==
--- struts/action2/trunk/apps/showcase/pom.xml (original)
+++ struts/action2/trunk/apps/showcase/pom.xml Sun May 28 16:19:54 2006
@@ -32,11 +32,6 @@
 
 
 
-org.apache.struts.action2
-struts-core
-
-
-
 opensymphony
 sitemesh
 2.2.1

svn commit: r410010 - in /struts/action2/trunk/apps: blank/pom.xml pom.xml shopping-cart/pom.xml showcase/pom.xml starter/pom.xml

2006-05-28 Thread wsmoak 
Author: wsmoak
Date: Sun May 28 18:21:19 2006
New Revision: 410010

URL: http://svn.apache.org/viewvc?rev=410010&view=rev
Log:
Restore the  section in apps/pom.xml.  
All of the example apps require both struts-core and Spring.

Modified:
struts/action2/trunk/apps/blank/pom.xml
struts/action2/trunk/apps/pom.xml
struts/action2/trunk/apps/shopping-cart/pom.xml
struts/action2/trunk/apps/showcase/pom.xml
struts/action2/trunk/apps/starter/pom.xml

Modified: struts/action2/trunk/apps/blank/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/action2/trunk/apps/blank/pom.xml?rev=410010&r1=410009&r2=410010&view=diff
==
--- struts/action2/trunk/apps/blank/pom.xml (original)
+++ struts/action2/trunk/apps/blank/pom.xml Sun May 28 18:21:19 2006
@@ -20,12 +20,6 @@
  provided
   
   
-  
-  org.apache.struts.action2
-  struts-core
-  ${pom.version}
-  
-
 
 
 

Modified: struts/action2/trunk/apps/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/action2/trunk/apps/pom.xml?rev=410010&r1=410009&r2=410010&view=diff
==
--- struts/action2/trunk/apps/pom.xml (original)
+++ struts/action2/trunk/apps/pom.xml Sun May 28 18:21:19 2006
@@ -120,16 +120,14 @@
 
 
 
+
 
 org.apache.struts.action2
 struts-core
 ${pom.version}
 
-
 
-
-  
-
+  
 
 org.springframework
 spring-beans
@@ -160,7 +158,6 @@
 1.2.6
 test
 
-  
-
+
 
 

Modified: struts/action2/trunk/apps/shopping-cart/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/action2/trunk/apps/shopping-cart/pom.xml?rev=410010&r1=410009&r2=410010&view=diff
==
--- struts/action2/trunk/apps/shopping-cart/pom.xml (original)
+++ struts/action2/trunk/apps/shopping-cart/pom.xml Sun May 28 18:21:19 2006
@@ -25,27 +25,6 @@
   sitemesh
   2.2.1
   
-
-  
-  org.springframework
-  spring-beans
-  
-
-  
-  org.springframework
-  spring-core
-  
-  
-  
-  org.springframework
-  spring-context
-  
-  
-  
-  org.springframework
-  spring-web
-  
-
 
 
 

Modified: struts/action2/trunk/apps/showcase/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/action2/trunk/apps/showcase/pom.xml?rev=410010&r1=410009&r2=410010&view=diff
==
--- struts/action2/trunk/apps/showcase/pom.xml (original)
+++ struts/action2/trunk/apps/showcase/pom.xml Sun May 28 18:21:19 2006
@@ -41,27 +41,6 @@
 log4j
 1.2.9
 
-
-
-org.springframework
-spring-beans
-
-   
-
-org.springframework
-spring-core
-
-   
-
-org.springframework
-spring-context
-
-   
-
-org.springframework
-spring-web
-
-   
 
 uk.ltd.getahead
 dwr

Modified: struts/action2/trunk/apps/starter/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/action2/trunk/apps/starter/pom.xml?rev=410010&r1=410009&r2=410010&view=diff
==
--- struts/action2/trunk/apps/starter/pom.xml (original)
+++ struts/action2/trunk/apps/starter/pom.xml Sun May 28 18:21:19 2006
@@ -20,13 +20,6 @@
provided
 
 
-
-org.apache.struts.action2
-struts-core
-${pom.version}
-  
-
-

svn commit: r410029 - in /struts/action/trunk/core/src/test/java/org/apache/struts/config: TestModuleConfig.java struts-config-1.1.xml

2006-05-28 Thread niallp 
Author: niallp
Date: Sun May 28 23:46:04 2006
New Revision: 410029

URL: http://svn.apache.org/viewvc?rev=410029&view=rev
Log:
Fix for STR-2877 - TestModuleConfig fails when run offline

Modified:

struts/action/trunk/core/src/test/java/org/apache/struts/config/TestModuleConfig.java

struts/action/trunk/core/src/test/java/org/apache/struts/config/struts-config-1.1.xml

Modified: 
struts/action/trunk/core/src/test/java/org/apache/struts/config/TestModuleConfig.java
URL: 
http://svn.apache.org/viewvc/struts/action/trunk/core/src/test/java/org/apache/struts/config/TestModuleConfig.java?rev=410029&r1=410028&r2=410029&view=diff
==
--- 
struts/action/trunk/core/src/test/java/org/apache/struts/config/TestModuleConfig.java
 (original)
+++ 
struts/action/trunk/core/src/test/java/org/apache/struts/config/TestModuleConfig.java
 Sun May 28 23:46:04 2006
@@ -156,7 +156,7 @@
 // Prepare a Digester for parsing a struts-config.xml file
 testCustomMappingParseBase("-//Apache Software Foundation//DTD Struts 
Configuration 1.1//EN",
 "/org/apache/struts/resources/struts-config_1_1.dtd",
-"/org/apache/struts/config/struts-config-custom-mapping.xml");
+"/org/apache/struts/config/struts-config-custom-mapping-1.1.xml");
 }
 
 /**

Modified: 
struts/action/trunk/core/src/test/java/org/apache/struts/config/struts-config-1.1.xml
URL: 
http://svn.apache.org/viewvc/struts/action/trunk/core/src/test/java/org/apache/struts/config/struts-config-1.1.xml?rev=410029&r1=410028&r2=410029&view=diff
==
--- 
struts/action/trunk/core/src/test/java/org/apache/struts/config/struts-config-1.1.xml
 (original)
+++ 
struts/action/trunk/core/src/test/java/org/apache/struts/config/struts-config-1.1.xml
 Sun May 28 23:46:04 2006
@@ -1,8 +1,8 @@
 
 
 http://jakarta.apache.org/struts/dtds/struts-config_1_2.dtd";>
+"-//Apache Software Foundation//DTD Struts Configuration 1.1//EN"
+"http://jakarta.apache.org/struts/dtds/struts-config_1_1.dtd";>

svn commit: r410032 - in /struts/action/branches/STRUTS_1_2_BRANCH/src/test/org/apache/struts/config: TestModuleConfig.java struts-config-1.1.xml

2006-05-28 Thread niallp 
Author: niallp
Date: Sun May 28 23:51:32 2006
New Revision: 410032

URL: http://svn.apache.org/viewvc?rev=410032&view=rev
Log:
Port fix for STR-2877 to 1.2.x branch - TestModuleConfig fails when run offline

Modified:

struts/action/branches/STRUTS_1_2_BRANCH/src/test/org/apache/struts/config/TestModuleConfig.java

struts/action/branches/STRUTS_1_2_BRANCH/src/test/org/apache/struts/config/struts-config-1.1.xml

Modified: 
struts/action/branches/STRUTS_1_2_BRANCH/src/test/org/apache/struts/config/TestModuleConfig.java
URL: 
http://svn.apache.org/viewvc/struts/action/branches/STRUTS_1_2_BRANCH/src/test/org/apache/struts/config/TestModuleConfig.java?rev=410032&r1=410031&r2=410032&view=diff
==
--- 
struts/action/branches/STRUTS_1_2_BRANCH/src/test/org/apache/struts/config/TestModuleConfig.java
 (original)
+++ 
struts/action/branches/STRUTS_1_2_BRANCH/src/test/org/apache/struts/config/TestModuleConfig.java
 Sun May 28 23:51:32 2006
@@ -206,7 +206,7 @@
 testCustomMappingParseBase
  ("-//Apache Software Foundation//DTD Struts Configuration 
1.1//EN",
   "/org/apache/struts/resources/struts-config_1_1.dtd",
- 
"/org/apache/struts/config/struts-config-custom-mapping.xml");
+ 
"/org/apache/struts/config/struts-config-custom-mapping-1.1.xml");
 
  }
 

Modified: 
struts/action/branches/STRUTS_1_2_BRANCH/src/test/org/apache/struts/config/struts-config-1.1.xml
URL: 
http://svn.apache.org/viewvc/struts/action/branches/STRUTS_1_2_BRANCH/src/test/org/apache/struts/config/struts-config-1.1.xml?rev=410032&r1=410031&r2=410032&view=diff
==
--- 
struts/action/branches/STRUTS_1_2_BRANCH/src/test/org/apache/struts/config/struts-config-1.1.xml
 (original)
+++ 
struts/action/branches/STRUTS_1_2_BRANCH/src/test/org/apache/struts/config/struts-config-1.1.xml
 Sun May 28 23:51:32 2006
@@ -1,8 +1,8 @@
 
 
 http://jakarta.apache.org/struts/dtds/struts-config_1_2.dtd";>
+  "-//Apache Software Foundation//DTD Struts Configuration 1.1//EN"
+  "http://jakarta.apache.org/struts/dtds/struts-config_1_1.dtd";>