svn commit: r1550473 - /struts/sandbox/trunk/struts2examples/pom.xml
Author: bphillips Date: Thu Dec 12 18:33:57 2013 New Revision: 1550473 URL: http://svn.apache.org/r1550473 Log: updated to Struts 2.3.16 from Maven Central - updated to latest version of log4j Modified: struts/sandbox/trunk/struts2examples/pom.xml Modified: struts/sandbox/trunk/struts2examples/pom.xml URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2examples/pom.xml?rev=1550473&r1=1550472&r2=1550473&view=diff == --- struts/sandbox/trunk/struts2examples/pom.xml (original) +++ struts/sandbox/trunk/struts2examples/pom.xml Thu Dec 12 18:33:57 2013 @@ -1,61 +1,68 @@ -http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - 4.0.0 - struts.apache.org - struts2examples - 1.0.0 - pom - Struts 2 Examples - +http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + 4.0.0 + struts.apache.org + struts2examples + 1.0.0 + pom + Struts 2 Examples + This is the parent pom for the Struts 2 examples that go with the Struts 2 Getting Started series of tutorials. - - - UTF-8 - 2.3.15.3 - 1.2.14 - - - - - bphillips - Bruce Phillips - bphill...@ku.edu - Apache Struts 2 Committer - - Committer - - + + + + UTF-8 + + 2.3.16 + + 1.2.17 + + + + + + bphillips + Bruce Phillips + bphill...@ku.edu + Apache Struts 2 Committer + + Committer + + - - -basic_struts -helloworld -using_tags -coding_actions -form_processing -form_validation -message_resource -exception_handling -debugging_struts -form_tags -form_xml_validation -control_tags -wildcard_method_selection -themes -spring_struts -annotations -interceptors -unit_testing -http_session -preparable_interface -exclude_parameters -restful2actionmapper -bean_validation - - - + + + basic_struts + helloworld + using_tags + coding_actions + form_processing + form_validation + message_resource + exception_handling + debugging_struts + form_tags + form_xml_validation + control_tags + wildcard_method_selection + themes + spring_struts + annotations + interceptors + unit_testing + http_session + preparable_interface + exclude_parameters + restful2actionmapper + bean_validation + + + + + org.apache.struts @@ -70,19 +77,23 @@ - - - + + + + + + + - - org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - 1.6 - 1.6 - - - + + org.apache.maven.plugins + maven-compiler-plugin + 2.3.2 + + 1.7 + 1.7 + + + - \ No newline at end of file +
svn commit: r1550491 - /struts/sandbox/trunk/struts2examples/themes/src/main/webapp/thankyou.jsp
Author: bphillips Date: Thu Dec 12 19:10:45 2013 New Revision: 1550491 URL: http://svn.apache.org/r1550491 Log: updated struts tags declaration Modified: struts/sandbox/trunk/struts2examples/themes/src/main/webapp/thankyou.jsp Modified: struts/sandbox/trunk/struts2examples/themes/src/main/webapp/thankyou.jsp URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2examples/themes/src/main/webapp/thankyou.jsp?rev=1550491&r1=1550490&r2=1550491&view=diff == --- struts/sandbox/trunk/struts2examples/themes/src/main/webapp/thankyou.jsp (original) +++ struts/sandbox/trunk/struts2examples/themes/src/main/webapp/thankyou.jsp Thu Dec 12 19:10:45 2013 @@ -1,7 +1,7 @@ -<%@ taglib prefix="s" uri="/struts-tags" %> <%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%> +<%@ taglib prefix="s" uri="/struts-tags" %> http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> http://www.w3.org/1999/xhtml";>
svn commit: r1550492 - in /struts/sandbox/trunk/struts2examples/themes/src/main/webapp/template/KUTheme: checkboxlist.ftl theme.properties
Author: bphillips
Date: Thu Dec 12 19:11:04 2013
New Revision: 1550492
URL: http://svn.apache.org/r1550492
Log:
added theme properties
Added:
struts/sandbox/trunk/struts2examples/themes/src/main/webapp/template/KUTheme/theme.properties
Modified:
struts/sandbox/trunk/struts2examples/themes/src/main/webapp/template/KUTheme/checkboxlist.ftl
Modified:
struts/sandbox/trunk/struts2examples/themes/src/main/webapp/template/KUTheme/checkboxlist.ftl
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2examples/themes/src/main/webapp/template/KUTheme/checkboxlist.ftl?rev=1550492&r1=1550491&r2=1550492&view=diff
==
---
struts/sandbox/trunk/struts2examples/themes/src/main/webapp/template/KUTheme/checkboxlist.ftl
(original)
+++
struts/sandbox/trunk/struts2examples/themes/src/main/webapp/template/KUTheme/checkboxlist.ftl
Thu Dec 12 19:11:04 2013
@@ -1,4 +1,3 @@
<#include "/${parameters.templateDir}/xhtml/controlheader.ftl" />
-
<#include "/${parameters.templateDir}/KUTheme_simple/checkboxlist.ftl" />
-<#include "/${parameters.templateDir}/xhtml/controlfooter.ftl" /><#nt/>
\ No newline at end of file
+<#include "/${parameters.templateDir}/xhtml/controlfooter.ftl" /><#nt/>
\ No newline at end of file
Added:
struts/sandbox/trunk/struts2examples/themes/src/main/webapp/template/KUTheme/theme.properties
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2examples/themes/src/main/webapp/template/KUTheme/theme.properties?rev=1550492&view=auto
==
---
struts/sandbox/trunk/struts2examples/themes/src/main/webapp/template/KUTheme/theme.properties
(added)
+++
struts/sandbox/trunk/struts2examples/themes/src/main/webapp/template/KUTheme/theme.properties
Thu Dec 12 19:11:04 2013
@@ -0,0 +1 @@
+parent = xhtml
\ No newline at end of file
svn commit: r1550493 - /struts/sandbox/trunk/struts2examples/themes/src/main/webapp/template/KUTheme_simple/theme.properties
Author: bphillips Date: Thu Dec 12 19:11:19 2013 New Revision: 1550493 URL: http://svn.apache.org/r1550493 Log: added theme properties Added: struts/sandbox/trunk/struts2examples/themes/src/main/webapp/template/KUTheme_simple/theme.properties Added: struts/sandbox/trunk/struts2examples/themes/src/main/webapp/template/KUTheme_simple/theme.properties URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2examples/themes/src/main/webapp/template/KUTheme_simple/theme.properties?rev=1550493&view=auto == --- struts/sandbox/trunk/struts2examples/themes/src/main/webapp/template/KUTheme_simple/theme.properties (added) +++ struts/sandbox/trunk/struts2examples/themes/src/main/webapp/template/KUTheme_simple/theme.properties Thu Dec 12 19:11:19 2013 @@ -0,0 +1 @@ +parent = xhtml \ No newline at end of file
svn commit: r1550537 - /struts/sandbox/trunk/struts2examples/themes/src/main/resources/struts.xml
Author: lukaszlenart Date: Thu Dec 12 21:37:20 2013 New Revision: 1550537 URL: http://svn.apache.org/r1550537 Log: Changes default theme to use theme defined in the project Modified: struts/sandbox/trunk/struts2examples/themes/src/main/resources/struts.xml Modified: struts/sandbox/trunk/struts2examples/themes/src/main/resources/struts.xml URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2examples/themes/src/main/resources/struts.xml?rev=1550537&r1=1550536&r2=1550537&view=diff == --- struts/sandbox/trunk/struts2examples/themes/src/main/resources/struts.xml (original) +++ struts/sandbox/trunk/struts2examples/themes/src/main/resources/struts.xml Thu Dec 12 21:37:20 2013 @@ -6,6 +6,7 @@ +
svn commit: r1550538 - /struts/sandbox/trunk/struts2examples/themes/src/main/webapp/edit.jsp
Author: lukaszlenart Date: Thu Dec 12 21:38:08 2013 New Revision: 1550538 URL: http://svn.apache.org/r1550538 Log: Removes unneeded theme attribute Modified: struts/sandbox/trunk/struts2examples/themes/src/main/webapp/edit.jsp Modified: struts/sandbox/trunk/struts2examples/themes/src/main/webapp/edit.jsp URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2examples/themes/src/main/webapp/edit.jsp?rev=1550538&r1=1550537&r2=1550538&view=diff == --- struts/sandbox/trunk/struts2examples/themes/src/main/webapp/edit.jsp (original) +++ struts/sandbox/trunk/struts2examples/themes/src/main/webapp/edit.jsp Thu Dec 12 21:38:08 2013 @@ -14,14 +14,14 @@ Use the form below to edit your information. - - - + + + - +
svn commit: r1550539 - /struts/sandbox/trunk/struts2examples/themes/pom.xml
Author: lukaszlenart Date: Thu Dec 12 21:38:48 2013 New Revision: 1550539 URL: http://svn.apache.org/r1550539 Log: Adds jetty plugin to simplify debugging Modified: struts/sandbox/trunk/struts2examples/themes/pom.xml Modified: struts/sandbox/trunk/struts2examples/themes/pom.xml URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2examples/themes/pom.xml?rev=1550539&r1=1550538&r2=1550539&view=diff == --- struts/sandbox/trunk/struts2examples/themes/pom.xml (original) +++ struts/sandbox/trunk/struts2examples/themes/pom.xml Thu Dec 12 21:38:48 2013 @@ -1,23 +1,42 @@ -http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"; xmlns="http://maven.apache.org/POM/4.0.0"; -xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> - 4.0.0 - -struts.apache.org -struts2examples -1.0.0 - - - themes - - Struts 2 Themes - - Struts 2 themes example application for the - Struts 2 getting started tutorials - war - - themes - +http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"; + xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> +4.0.0 + +struts.apache.org +struts2examples +1.0.0 + +themes + +Struts 2 Themes + +Struts 2 themes example application for the +Struts 2 getting started tutorials + + +war + + +themes + + +org.mortbay.jetty +jetty-maven-plugin +8.1.7.v20120910 + +CTRL+C +8999 +10 + + src/main/webapp/WEB-INF/web.xml + + + + + +
svn commit: r1550540 - in /struts/sandbox/trunk/struts2examples/themes/src/main: resources/template/ resources/template/KUTheme/checkboxlist.ftl resources/template/KUTheme/theme.properties webapp/temp
Author: lukaszlenart
Date: Thu Dec 12 21:39:39 2013
New Revision: 1550540
URL: http://svn.apache.org/r1550540
Log:
Moves template directory under resources to finally put it on the classpath and
uses proper theme hierarchy
Added:
struts/sandbox/trunk/struts2examples/themes/src/main/resources/template/
- copied from r1550528,
struts/sandbox/trunk/struts2examples/themes/src/main/webapp/template/
Removed:
struts/sandbox/trunk/struts2examples/themes/src/main/webapp/template/
Modified:
struts/sandbox/trunk/struts2examples/themes/src/main/resources/template/KUTheme/checkboxlist.ftl
struts/sandbox/trunk/struts2examples/themes/src/main/resources/template/KUTheme/theme.properties
Modified:
struts/sandbox/trunk/struts2examples/themes/src/main/resources/template/KUTheme/checkboxlist.ftl
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2examples/themes/src/main/resources/template/KUTheme/checkboxlist.ftl?rev=1550540&r1=1550528&r2=1550540&view=diff
==
---
struts/sandbox/trunk/struts2examples/themes/src/main/resources/template/KUTheme/checkboxlist.ftl
(original)
+++
struts/sandbox/trunk/struts2examples/themes/src/main/resources/template/KUTheme/checkboxlist.ftl
Thu Dec 12 21:39:39 2013
@@ -1,3 +1,3 @@
-<#include "/${parameters.templateDir}/xhtml/controlheader.ftl" />
+<#include
"/${parameters.templateDir}/${parameters.expandTheme}/controlheader.ftl" />
<#include "/${parameters.templateDir}/KUTheme_simple/checkboxlist.ftl" />
-<#include "/${parameters.templateDir}/xhtml/controlfooter.ftl" /><#nt/>
\ No newline at end of file
+<#include
"/${parameters.templateDir}/${parameters.expandTheme}/controlfooter.ftl"
/><#nt/>
\ No newline at end of file
Modified:
struts/sandbox/trunk/struts2examples/themes/src/main/resources/template/KUTheme/theme.properties
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2examples/themes/src/main/resources/template/KUTheme/theme.properties?rev=1550540&r1=1550528&r2=1550540&view=diff
==
---
struts/sandbox/trunk/struts2examples/themes/src/main/resources/template/KUTheme/theme.properties
(original)
+++
struts/sandbox/trunk/struts2examples/themes/src/main/resources/template/KUTheme/theme.properties
Thu Dec 12 21:39:39 2013
@@ -1 +1 @@
-parent = xhtml
\ No newline at end of file
+parent = KUTheme_simple
\ No newline at end of file
[CONF] Confluence Changes in the last 24 hours
Apache Camel Pages Page: Quartz2 edited by willem jiang[02:54 AM] (view changes) Apache Cayenne Pages Page: Board Report December 2013 edited by Michael Gentry[02:45 PM] (view changes) Apache Cloudstack Pages Page: Site-to-Site VPN VR-to-VR edited by angie shen[11:43 PM] (view changes) Apache CXF Documentation Pages Page: Bus Configuration edited by Daniel Kulp[06:49 PM] (view changes) Page: JAX-RS Data Bindings edited by Sergey Beryozkin[06:31 PM] (view changes) Apache Hive Pages Page: DesignDocs edited by Carl Steinbach[06:39 AM] (view changes) Apache MRUnit Pages Page: Board Report (December 2013) created by Brock Noland[03:30 PM] OFBiz (Open For Business) Project Open Wiki Pages Page: Dictionary for translations to German edited by Christian Geisert[04:26 PM] (view changes) Spark Pages Page: Powered By Spark edited by Andy Konwinski[02:23 AM] (view changes) Usergrid Pages Page: Policies edited by Dave Johnson[12:33 PM] (view changes) Apache VCL Pages Page: 2013-12-18 Apache VCL Board Report created by Andy Kurth[12:51 AM]
