date:20130121

svn commit: r1436267 [3/3] - /struts/site/trunk/content/resources/css/

2013-01-21 Thread lukaszlenart

Added: struts/site/trunk/content/resources/css/renderer-macros.css
URL: 
http://svn.apache.org/viewvc/struts/site/trunk/content/resources/css/renderer-macros.css?rev=1436267view=auto
==
--- struts/site/trunk/content/resources/css/renderer-macros.css (added)
+++ struts/site/trunk/content/resources/css/renderer-macros.css Mon Jan 21 
10:54:39 2013
@@ -0,0 +1,158 @@
+/*
+Styles for macros bundled in Renderer.
+*/
+
+.panelMacro {
+margin: 10px 20px;
+overflow: hidden; /* fix width next to floated content */
+}
+
+.panelMacro table {
+text-align: left;
+padding: 0 20px;
+width: 100%;
+}
+
+.panelMacro td, .panelMacro p {
+font-size: 1em;
+padding: 14px 0;
+}
+
+.searchMacro {
+font-size: 10pt;
+margin: 10px 0;
+}
+
+.searchMacro .result {
+margin-top: 3px;
+padding: 0 5px 5px 5px;
+border-bottom: 1px solid #ddd;
+}
+
+.searchMacro .resultSummary {
+margin-bottom: 7px;
+}
+
+.rssMacro {
+font-size: 10pt;
+}
+
+.rssMacro table {
+margin: 10px 0;
+width: 100%;
+border-collapse: collapse;
+}
+
+.rssMacro table th,
+.rssMacro table td {
+border: 1px solid #ccc;
+padding: 4px;
+}
+
+.rssMacro table th {
+background: #f0f0f0;
+}
+
+/* Code styles */
+.code {
+border-width: 1px;
+border-style: dashed;
+overflow: auto;
+}
+
+.code, .preformatted {
+background-color: #fff;
+}
+
+.code pre, .preformatted pre { /* needs 'pre' to override TinyMCE style */
+font-family:Courier New, Courier, monospace;
+line-height: 1.3;
+}
+
+.code-keyword {
+  color: #91;
+  background-color: inherit;
+}
+
+.code-object {
+  color: #910091;
+  background-color: inherit;
+}
+
+.code-quote {
+  color: #009100;
+  background-color: inherit;
+}
+
+.code-comment {
+  color: #808080;
+  background-color: inherit;
+}
+
+.code-xml .code-keyword {
+  color: inherit;
+  font-weight: bold;
+}
+
+.code-tag {
+  color: #91;
+  background-color: inherit;
+}
+
+/* Recently Updated Styles */
+.recentlyUpdatedItem {
+   border-bottom: #f0f0f0 1px solid;
+   border-top: #f0f0f0 1px solid;
+   margin: 10px 0 0 0;
+   padding: 0;
+   border-spacing: 0;
+   width: 100%;
+text-decoration: none;
+border-collapse: collapse;
+}
+
+.recentlyUpdatedItem td {
+padding: 10px;
+border-bottom: #f0f0f0 1px solid;
+vertical-align: top;
+}
+
+.recentlyUpdatedItem .authorAndDate {
+   background-color: #f0f0f0;
+   width: 25%;
+}
+
+.recentlyUpdatedItem .date {
+margin-top: 4px;
+font-size: 90%;
+color: #666;
+}
+
+.recentlyUpdatedItem .profilePic {
+float: right;
+background-color: #f0f0f0;
+margin: 0 2px;
+}
+
+.recentlyUpdatedItem .twixie {
+padding: 10px 0 0 4px;
+}
+
+.recentlyUpdatedItem .icon {
+padding: 8px 0 0 1px;
+}
+
+.recentlyUpdatedItem .details {
+padding-left: 7px;
+}
+
+.recentlyUpdatedItem .summary, .recentlyUpdatedItem .thumbnail {
+margin-top: 3px;
+color: #666;
+}
+
+.moreRecentlyUpdatedItems {
+text-align: right;
+margin-top: 10px;
+font-size: 10pt;
+}

Added: struts/site/trunk/content/resources/css/tables.css
URL: 
http://svn.apache.org/viewvc/struts/site/trunk/content/resources/css/tables.css?rev=1436267view=auto
==
--- struts/site/trunk/content/resources/css/tables.css (added)
+++ struts/site/trunk/content/resources/css/tables.css Mon Jan 21 10:54:39 2013
@@ -0,0 +1,24 @@
+table.confluenceTable {
+margin: 5px;
+border-collapse: collapse;
+}
+
+td.confluenceTd, table.confluenceTable td.confluenceTd {
+border-width: 1px;
+border-style: solid;
+border-color: #ddd;
+padding: 5px;
+vertical-align: top;
+min-width: 0.6em;
+}
+
+th.confluenceTh, table.confluenceTable th.confluenceTh {
+border-width: 1px;
+border-style: solid;
+border-color: #ddd;
+padding: 5px;
+background-color: #f0f0f0;
+text-align: left;
+vertical-align: top;
+min-width: 0.6em;
+}
\ No newline at end of file

Added: struts/site/trunk/content/resources/css/tabs.css
URL: 
http://svn.apache.org/viewvc/struts/site/trunk/content/resources/css/tabs.css?rev=1436267view=auto
==
--- struts/site/trunk/content/resources/css/tabs.css (added)
+++ struts/site/trunk/content/resources/css/tabs.css Mon Jan 21 10:54:39 2013
@@ -0,0 +1,46 @@
+#tab-navigation {
+border-bottom: 1px solid;
+margin: 0 -10px;
+margin-bottom: 10px;
+padding: 0 10px;
+}
+
+.tab-navigation {
+list-style: none;
+display: block;
+margin: 0 0 -1px;
+padding: 0;
+overflow: hidden;
+}
+.tab-navigation .tab {
+float: left;
+display: inline;
+font-weight: bold;
+margin: 0 5px -1px 0;
+}
+.tab-navigation .tab a {
+padding: .3em .4em;
+text-decoration: none;
+display:

svn commit: r1436267 [1/3] - /struts/site/trunk/content/resources/css/

2013-01-21 Thread lukaszlenart

Author: lukaszlenart
Date: Mon Jan 21 10:54:39 2013
New Revision: 1436267

URL: http://svn.apache.org/viewvc?rev=1436267view=rev
Log:
Merges /style into /css - styles used by exported docs from Confluence

Added:
struts/site/trunk/content/resources/css/content-types.css
struts/site/trunk/content/resources/css/default-theme.css
struts/site/trunk/content/resources/css/default.css
struts/site/trunk/content/resources/css/information-macros.css
struts/site/trunk/content/resources/css/layout-macros.css
struts/site/trunk/content/resources/css/login.css
struts/site/trunk/content/resources/css/master-ie.css
struts/site/trunk/content/resources/css/master.css
struts/site/trunk/content/resources/css/maven-base.css
struts/site/trunk/content/resources/css/maven-classic.css
struts/site/trunk/content/resources/css/maven-theme.css
struts/site/trunk/content/resources/css/menu-ie.css
struts/site/trunk/content/resources/css/menu.css
struts/site/trunk/content/resources/css/panels.css
struts/site/trunk/content/resources/css/print.css
struts/site/trunk/content/resources/css/readme.txt
struts/site/trunk/content/resources/css/renderer-macros.css
struts/site/trunk/content/resources/css/tables.css
struts/site/trunk/content/resources/css/tabs.css
struts/site/trunk/content/resources/css/wiki-content.css

Added: struts/site/trunk/content/resources/css/content-types.css
URL: 
http://svn.apache.org/viewvc/struts/site/trunk/content/resources/css/content-types.css?rev=1436267view=auto
==
--- struts/site/trunk/content/resources/css/content-types.css (added)
+++ struts/site/trunk/content/resources/css/content-types.css Mon Jan 21 
10:54:39 2013
@@ -0,0 +1,115 @@
+a.content-type-page span, div.content-type-page, span.content-type-page {
+background-image: url(../../../images/icons/docs_16.gif);
+background-repeat: no-repeat;
+}
+
+a.content-type-blogpost span, div.content-type-blogpost, 
span.content-type-blogpost {
+background-image: url(../../../images/icons/blogentry_16.gif);
+background-repeat: no-repeat;
+}
+
+a.content-type-comment span, div.content-type-comment, 
span.content-type-comment {
+background-image: url(../../../images/icons/comment_16.gif);
+background-repeat: no-repeat;
+}
+
+a.content-type-space span, div.content-type-space, span.content-type-space,
+a.content-type-spacedesc span, div.content-type-spacedesc, 
span.content-type-spacedesc {
+background-image: url(../../../images/icons/web_16.gif);
+background-repeat: no-repeat;
+}
+
+a.content-type-personalspacedesc span, div.content-type-personalspacedesc, 
span.content-type-personalspacedesc {
+background-image: url(../../../images/icons/personal_space_16.gif);
+background-repeat: no-repeat;
+}
+
+a.content-type-mail span, div.content-type-mail, span.content-type-mail {
+background-image: url(../../../images/icons/mail_content_16.gif);
+background-repeat: no-repeat;
+}
+
+a.content-type-attachment span, div.content-type-attachment, 
span.content-type-attachment {
+background-image: url(../../../images/icons/attachments/file.gif);
+background-repeat: no-repeat;
+}
+
+a.content-type-file span, div.content-type-file, span.content-type-file {
+background-image: url(../../../images/icons/attachments/file.gif);
+background-repeat: no-repeat;
+}
+
+a.content-type-attachment-application-pdf span, 
div.content-type-attachment-application-pdf, 
span.content-type-attachment-application-pdf {
+background-image: url(../../../images/icons/attachments/pdf.gif);
+background-repeat: no-repeat;
+}
+
+a.content-type-attachment-image span, div.content-type-attachment-image, 
span.content-type-attachment-image {
+background-image: url(../../../images/icons/attachments/image.gif);
+background-repeat: no-repeat;
+}
+
+a.content-type-attachment-text-xml span, div.content-type-attachment-text-xml, 
span.content-type-attachment-text-xml {
+background-image: url(../../../images/icons/attachments/xml.gif);
+background-repeat: no-repeat;
+}
+
+a.content-type-attachment-text-html span, 
div.content-type-attachment-text-html, span.content-type-attachment-text-html {
+background-image: url(../../../images/icons/attachments/html.gif);
+background-repeat: no-repeat;
+}
+
+a.content-type-attachment-text span, div.content-type-attachment-text, 
span.content-type-attachment-text {
+background-image: url(../../../images/icons/attachments/text.gif);
+background-repeat: no-repeat;
+}
+
+a.content-type-attachment-application-zip span, 
div.content-type-attachment-application-zip, 
span.content-type-attachment-application-zip {
+background-image: url(../../../images/icons/attachments/zip.gif);
+background-repeat: no-repeat;
+}
+
+a.content-type-attachment-application-excel span, 
div.content-type-attachment-application-excel,

svn commit: r847441 [1/3] - in /websites/staging/struts/trunk/content: ./ css/

2013-01-21 Thread buildbot

Author: buildbot
Date: Mon Jan 21 10:54:44 2013
New Revision: 847441

Log:
Staging update by buildbot for struts

Added:
websites/staging/struts/trunk/content/css/content-types.css
websites/staging/struts/trunk/content/css/default-theme.css
websites/staging/struts/trunk/content/css/default.css
websites/staging/struts/trunk/content/css/information-macros.css
websites/staging/struts/trunk/content/css/layout-macros.css
websites/staging/struts/trunk/content/css/login.css
websites/staging/struts/trunk/content/css/master-ie.css
websites/staging/struts/trunk/content/css/master.css
websites/staging/struts/trunk/content/css/maven-base.css
websites/staging/struts/trunk/content/css/maven-classic.css
websites/staging/struts/trunk/content/css/maven-theme.css
websites/staging/struts/trunk/content/css/menu-ie.css
websites/staging/struts/trunk/content/css/menu.css
websites/staging/struts/trunk/content/css/panels.css
websites/staging/struts/trunk/content/css/readme.txt
websites/staging/struts/trunk/content/css/renderer-macros.css
websites/staging/struts/trunk/content/css/tables.css
websites/staging/struts/trunk/content/css/tabs.css
websites/staging/struts/trunk/content/css/wiki-content.css
Modified:
websites/staging/struts/trunk/content/   (props changed)
websites/staging/struts/trunk/content/css/print.css

Propchange: websites/staging/struts/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Mon Jan 21 10:54:44 2013
@@ -1 +1 @@
-1435536
+1436267

Added: websites/staging/struts/trunk/content/css/content-types.css
==
--- websites/staging/struts/trunk/content/css/content-types.css (added)
+++ websites/staging/struts/trunk/content/css/content-types.css Mon Jan 21 
10:54:44 2013
@@ -0,0 +1,115 @@
+a.content-type-page span, div.content-type-page, span.content-type-page {
+background-image: url(../../../images/icons/docs_16.gif);
+background-repeat: no-repeat;
+}
+
+a.content-type-blogpost span, div.content-type-blogpost, 
span.content-type-blogpost {
+background-image: url(../../../images/icons/blogentry_16.gif);
+background-repeat: no-repeat;
+}
+
+a.content-type-comment span, div.content-type-comment, 
span.content-type-comment {
+background-image: url(../../../images/icons/comment_16.gif);
+background-repeat: no-repeat;
+}
+
+a.content-type-space span, div.content-type-space, span.content-type-space,
+a.content-type-spacedesc span, div.content-type-spacedesc, 
span.content-type-spacedesc {
+background-image: url(../../../images/icons/web_16.gif);
+background-repeat: no-repeat;
+}
+
+a.content-type-personalspacedesc span, div.content-type-personalspacedesc, 
span.content-type-personalspacedesc {
+background-image: url(../../../images/icons/personal_space_16.gif);
+background-repeat: no-repeat;
+}
+
+a.content-type-mail span, div.content-type-mail, span.content-type-mail {
+background-image: url(../../../images/icons/mail_content_16.gif);
+background-repeat: no-repeat;
+}
+
+a.content-type-attachment span, div.content-type-attachment, 
span.content-type-attachment {
+background-image: url(../../../images/icons/attachments/file.gif);
+background-repeat: no-repeat;
+}
+
+a.content-type-file span, div.content-type-file, span.content-type-file {
+background-image: url(../../../images/icons/attachments/file.gif);
+background-repeat: no-repeat;
+}
+
+a.content-type-attachment-application-pdf span, 
div.content-type-attachment-application-pdf, 
span.content-type-attachment-application-pdf {
+background-image: url(../../../images/icons/attachments/pdf.gif);
+background-repeat: no-repeat;
+}
+
+a.content-type-attachment-image span, div.content-type-attachment-image, 
span.content-type-attachment-image {
+background-image: url(../../../images/icons/attachments/image.gif);
+background-repeat: no-repeat;
+}
+
+a.content-type-attachment-text-xml span, div.content-type-attachment-text-xml, 
span.content-type-attachment-text-xml {
+background-image: url(../../../images/icons/attachments/xml.gif);
+background-repeat: no-repeat;
+}
+
+a.content-type-attachment-text-html span, 
div.content-type-attachment-text-html, span.content-type-attachment-text-html {
+background-image: url(../../../images/icons/attachments/html.gif);
+background-repeat: no-repeat;
+}
+
+a.content-type-attachment-text span, div.content-type-attachment-text, 
span.content-type-attachment-text {
+background-image: url(../../../images/icons/attachments/text.gif);
+background-repeat: no-repeat;
+}
+
+a.content-type-attachment-application-zip span, 
div.content-type-attachment-application-zip, 
span.content-type-attachment-application-zip {
+background-image: url(../../../images/icons/attachments/zip.gif);
+

svn commit: r847441 [3/3] - in /websites/staging/struts/trunk/content: ./ css/

2013-01-21 Thread buildbot

Added: websites/staging/struts/trunk/content/css/renderer-macros.css
==
--- websites/staging/struts/trunk/content/css/renderer-macros.css (added)
+++ websites/staging/struts/trunk/content/css/renderer-macros.css Mon Jan 21 
10:54:44 2013
@@ -0,0 +1,158 @@
+/*
+Styles for macros bundled in Renderer.
+*/
+
+.panelMacro {
+margin: 10px 20px;
+overflow: hidden; /* fix width next to floated content */
+}
+
+.panelMacro table {
+text-align: left;
+padding: 0 20px;
+width: 100%;
+}
+
+.panelMacro td, .panelMacro p {
+font-size: 1em;
+padding: 14px 0;
+}
+
+.searchMacro {
+font-size: 10pt;
+margin: 10px 0;
+}
+
+.searchMacro .result {
+margin-top: 3px;
+padding: 0 5px 5px 5px;
+border-bottom: 1px solid #ddd;
+}
+
+.searchMacro .resultSummary {
+margin-bottom: 7px;
+}
+
+.rssMacro {
+font-size: 10pt;
+}
+
+.rssMacro table {
+margin: 10px 0;
+width: 100%;
+border-collapse: collapse;
+}
+
+.rssMacro table th,
+.rssMacro table td {
+border: 1px solid #ccc;
+padding: 4px;
+}
+
+.rssMacro table th {
+background: #f0f0f0;
+}
+
+/* Code styles */
+.code {
+border-width: 1px;
+border-style: dashed;
+overflow: auto;
+}
+
+.code, .preformatted {
+background-color: #fff;
+}
+
+.code pre, .preformatted pre { /* needs 'pre' to override TinyMCE style */
+font-family:Courier New, Courier, monospace;
+line-height: 1.3;
+}
+
+.code-keyword {
+  color: #91;
+  background-color: inherit;
+}
+
+.code-object {
+  color: #910091;
+  background-color: inherit;
+}
+
+.code-quote {
+  color: #009100;
+  background-color: inherit;
+}
+
+.code-comment {
+  color: #808080;
+  background-color: inherit;
+}
+
+.code-xml .code-keyword {
+  color: inherit;
+  font-weight: bold;
+}
+
+.code-tag {
+  color: #91;
+  background-color: inherit;
+}
+
+/* Recently Updated Styles */
+.recentlyUpdatedItem {
+   border-bottom: #f0f0f0 1px solid;
+   border-top: #f0f0f0 1px solid;
+   margin: 10px 0 0 0;
+   padding: 0;
+   border-spacing: 0;
+   width: 100%;
+text-decoration: none;
+border-collapse: collapse;
+}
+
+.recentlyUpdatedItem td {
+padding: 10px;
+border-bottom: #f0f0f0 1px solid;
+vertical-align: top;
+}
+
+.recentlyUpdatedItem .authorAndDate {
+   background-color: #f0f0f0;
+   width: 25%;
+}
+
+.recentlyUpdatedItem .date {
+margin-top: 4px;
+font-size: 90%;
+color: #666;
+}
+
+.recentlyUpdatedItem .profilePic {
+float: right;
+background-color: #f0f0f0;
+margin: 0 2px;
+}
+
+.recentlyUpdatedItem .twixie {
+padding: 10px 0 0 4px;
+}
+
+.recentlyUpdatedItem .icon {
+padding: 8px 0 0 1px;
+}
+
+.recentlyUpdatedItem .details {
+padding-left: 7px;
+}
+
+.recentlyUpdatedItem .summary, .recentlyUpdatedItem .thumbnail {
+margin-top: 3px;
+color: #666;
+}
+
+.moreRecentlyUpdatedItems {
+text-align: right;
+margin-top: 10px;
+font-size: 10pt;
+}

Added: websites/staging/struts/trunk/content/css/tables.css
==
--- websites/staging/struts/trunk/content/css/tables.css (added)
+++ websites/staging/struts/trunk/content/css/tables.css Mon Jan 21 10:54:44 
2013
@@ -0,0 +1,24 @@
+table.confluenceTable {
+margin: 5px;
+border-collapse: collapse;
+}
+
+td.confluenceTd, table.confluenceTable td.confluenceTd {
+border-width: 1px;
+border-style: solid;
+border-color: #ddd;
+padding: 5px;
+vertical-align: top;
+min-width: 0.6em;
+}
+
+th.confluenceTh, table.confluenceTable th.confluenceTh {
+border-width: 1px;
+border-style: solid;
+border-color: #ddd;
+padding: 5px;
+background-color: #f0f0f0;
+text-align: left;
+vertical-align: top;
+min-width: 0.6em;
+}
\ No newline at end of file

Added: websites/staging/struts/trunk/content/css/tabs.css
==
--- websites/staging/struts/trunk/content/css/tabs.css (added)
+++ websites/staging/struts/trunk/content/css/tabs.css Mon Jan 21 10:54:44 2013
@@ -0,0 +1,46 @@
+#tab-navigation {
+border-bottom: 1px solid;
+margin: 0 -10px;
+margin-bottom: 10px;
+padding: 0 10px;
+}
+
+.tab-navigation {
+list-style: none;
+display: block;
+margin: 0 0 -1px;
+padding: 0;
+overflow: hidden;
+}
+.tab-navigation .tab {
+float: left;
+display: inline;
+font-weight: bold;
+margin: 0 5px -1px 0;
+}
+.tab-navigation .tab a {
+padding: .3em .4em;
+text-decoration: none;
+display: block;
+-moz-border-radius-topleft: 3px;
+-moz-border-radius-topright: 3px;
+-webkit-border-top-left-radius: 3px;
+-webkit-border-top-right-radius: 3px;
+}
+.tab-navigation .notab {
+margin: 1px 1px 0 1px;
+padding: .3em;
+float: left;
+}
+
+/* Make the following more specific, so

svn commit: r1436268 - /struts/site/trunk/content/resources/.htaccess

2013-01-21 Thread lukaszlenart

Author: lukaszlenart
Date: Mon Jan 21 10:58:53 2013
New Revision: 1436268

URL: http://svn.apache.org/viewvc?rev=1436268view=rev
Log:
Adds redirect to support already exported docs

Modified:
struts/site/trunk/content/resources/.htaccess

Modified: struts/site/trunk/content/resources/.htaccess
URL: 
http://svn.apache.org/viewvc/struts/site/trunk/content/resources/.htaccess?rev=1436268r1=1436267r2=1436268view=diff
==
--- struts/site/trunk/content/resources/.htaccess (original)
+++ struts/site/trunk/content/resources/.htaccess Mon Jan 21 10:58:53 2013
@@ -32,3 +32,4 @@ Redirect permanent /struts-doc-1.0.2
 Redirect permanent /struts-action   http://struts.apache.org/1.x
 Redirect permanent /struts-action2  http://struts.apache.org/2.x
 Redirect permanent /WW  http://struts.apache.org/2.x/docs 
+Redirect permanent /style  http://struts.apache.org/css
\ No newline at end of file

svn commit: r847442 - in /websites/staging/struts/trunk/content: ./ .htaccess

2013-01-21 Thread buildbot

Author: buildbot
Date: Mon Jan 21 10:58:57 2013
New Revision: 847442

Log:
Staging update by buildbot for struts

Modified:
websites/staging/struts/trunk/content/   (props changed)
websites/staging/struts/trunk/content/.htaccess

Propchange: websites/staging/struts/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Mon Jan 21 10:58:57 2013
@@ -1 +1 @@
-1436267
+1436268

Modified: websites/staging/struts/trunk/content/.htaccess
==
--- websites/staging/struts/trunk/content/.htaccess (original)
+++ websites/staging/struts/trunk/content/.htaccess Mon Jan 21 10:58:57 2013
@@ -32,3 +32,4 @@ Redirect permanent /struts-doc-1.0.2
 Redirect permanent /struts-action   http://struts.apache.org/1.x
 Redirect permanent /struts-action2  http://struts.apache.org/2.x
 Redirect permanent /WW  http://struts.apache.org/2.x/docs 
+Redirect permanent /style  http://struts.apache.org/css
\ No newline at end of file

svn commit: r1436269 - /struts/site/trunk/content/resources/.htaccess

2013-01-21 Thread lukaszlenart

Author: lukaszlenart
Date: Mon Jan 21 10:59:05 2013
New Revision: 1436269

URL: http://svn.apache.org/viewvc?rev=1436269view=rev
Log:
Adds redirect to support already exported docs

Modified:
struts/site/trunk/content/resources/.htaccess

Modified: struts/site/trunk/content/resources/.htaccess
URL: 
http://svn.apache.org/viewvc/struts/site/trunk/content/resources/.htaccess?rev=1436269r1=1436268r2=1436269view=diff
==
--- struts/site/trunk/content/resources/.htaccess (original)
+++ struts/site/trunk/content/resources/.htaccess Mon Jan 21 10:59:05 2013
@@ -32,4 +32,4 @@ Redirect permanent /struts-doc-1.0.2
 Redirect permanent /struts-action   http://struts.apache.org/1.x
 Redirect permanent /struts-action2  http://struts.apache.org/2.x
 Redirect permanent /WW  http://struts.apache.org/2.x/docs 
-Redirect permanent /style  http://struts.apache.org/css
\ No newline at end of file
+Redirect permanent /style   http://struts.apache.org/css
\ No newline at end of file

svn commit: r847443 - in /websites/staging/struts/trunk/content: ./ .htaccess

2013-01-21 Thread buildbot

Author: buildbot
Date: Mon Jan 21 10:59:09 2013
New Revision: 847443

Log:
Staging update by buildbot for struts

Modified:
websites/staging/struts/trunk/content/   (props changed)
websites/staging/struts/trunk/content/.htaccess

Propchange: websites/staging/struts/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Mon Jan 21 10:59:09 2013
@@ -1 +1 @@
-1436268
+1436269

Modified: websites/staging/struts/trunk/content/.htaccess
==
--- websites/staging/struts/trunk/content/.htaccess (original)
+++ websites/staging/struts/trunk/content/.htaccess Mon Jan 21 10:59:09 2013
@@ -32,4 +32,4 @@ Redirect permanent /struts-doc-1.0.2
 Redirect permanent /struts-action   http://struts.apache.org/1.x
 Redirect permanent /struts-action2  http://struts.apache.org/2.x
 Redirect permanent /WW  http://struts.apache.org/2.x/docs 
-Redirect permanent /style  http://struts.apache.org/css
\ No newline at end of file
+Redirect permanent /style   http://struts.apache.org/css
\ No newline at end of file

svn commit: r1436272 - /struts/site/trunk/content/resources/.htaccess

2013-01-21 Thread lukaszlenart

Author: lukaszlenart
Date: Mon Jan 21 11:06:31 2013
New Revision: 1436272

URL: http://svn.apache.org/viewvc?rev=1436272view=rev
Log:
Adds proper path where this file is stored

Modified:
struts/site/trunk/content/resources/.htaccess

Modified: struts/site/trunk/content/resources/.htaccess
URL: 
http://svn.apache.org/viewvc/struts/site/trunk/content/resources/.htaccess?rev=1436272r1=1436271r2=1436272view=diff
==
--- struts/site/trunk/content/resources/.htaccess (original)
+++ struts/site/trunk/content/resources/.htaccess Mon Jan 21 11:06:31 2013
@@ -1,4 +1,5 @@
-# This file is maintained at site/src/site/resources/.htaccess
+# This file is maintained at site/trunk/content/resources/.htaccess
+
 Redirect permanent /userGuide   http://struts.apache.org/1.x/userGuide
 Redirect permanent /faqshttp://struts.apache.org/1.x/faqs
 Redirect permanent /struts-core http://struts.apache.org/1.x
@@ -32,4 +33,4 @@ Redirect permanent /struts-doc-1.0.2
 Redirect permanent /struts-action   http://struts.apache.org/1.x
 Redirect permanent /struts-action2  http://struts.apache.org/2.x
 Redirect permanent /WW  http://struts.apache.org/2.x/docs 
-Redirect permanent /style   http://struts.apache.org/css
\ No newline at end of file
+Redirect permanent /style   http://struts.apache.org/css

svn commit: r847444 - in /websites/staging/struts/trunk/content: ./ .htaccess

2013-01-21 Thread buildbot

Author: buildbot
Date: Mon Jan 21 11:06:34 2013
New Revision: 847444

Log:
Staging update by buildbot for struts

Modified:
websites/staging/struts/trunk/content/   (props changed)
websites/staging/struts/trunk/content/.htaccess

Propchange: websites/staging/struts/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Mon Jan 21 11:06:34 2013
@@ -1 +1 @@
-1436269
+1436272

Modified: websites/staging/struts/trunk/content/.htaccess
==
--- websites/staging/struts/trunk/content/.htaccess (original)
+++ websites/staging/struts/trunk/content/.htaccess Mon Jan 21 11:06:34 2013
@@ -1,4 +1,5 @@
-# This file is maintained at site/src/site/resources/.htaccess
+# This file is maintained at site/trunk/content/resources/.htaccess
+
 Redirect permanent /userGuide   http://struts.apache.org/1.x/userGuide
 Redirect permanent /faqshttp://struts.apache.org/1.x/faqs
 Redirect permanent /struts-core http://struts.apache.org/1.x
@@ -32,4 +33,4 @@ Redirect permanent /struts-doc-1.0.2
 Redirect permanent /struts-action   http://struts.apache.org/1.x
 Redirect permanent /struts-action2  http://struts.apache.org/2.x
 Redirect permanent /WW  http://struts.apache.org/2.x/docs 
-Redirect permanent /style   http://struts.apache.org/css
\ No newline at end of file
+Redirect permanent /style   http://struts.apache.org/css

svn commit: r1436290 - /struts/struts2/trunk/plugins/json/src/main/java/org/apache/struts2/json/JSONWriter.java

2013-01-21 Thread lukaszlenart

Author: lukaszlenart
Date: Mon Jan 21 11:37:16 2013
New Revision: 1436290

URL: http://svn.apache.org/viewvc?rev=1436290view=rev
Log:
Solves problem with possible NPE when key is null - 
https://github.com/apache/struts2/pull/4

Modified:

struts/struts2/trunk/plugins/json/src/main/java/org/apache/struts2/json/JSONWriter.java

Modified: 
struts/struts2/trunk/plugins/json/src/main/java/org/apache/struts2/json/JSONWriter.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/json/src/main/java/org/apache/struts2/json/JSONWriter.java?rev=1436290r1=1436289r2=1436290view=diff
==
--- 
struts/struts2/trunk/plugins/json/src/main/java/org/apache/struts2/json/JSONWriter.java
 (original)
+++ 
struts/struts2/trunk/plugins/json/src/main/java/org/apache/struts2/json/JSONWriter.java
 Mon Jan 21 11:37:16 2013
@@ -408,18 +408,18 @@ public class JSONWriter {
 }
 
 Object key = entry.getKey();
+if (key == null) {
+LOG.error(Cannot build expression for null key in #0, 
exprStack);
+continue;
+}
+
 String expr = null;
 if (this.buildExpr) {
-if (key == null) {
-LOG.error(Cannot build expression for null key in  + 
this.exprStack);
+expr = this.expandExpr(key.toString());
+if (this.shouldExcludeProperty(expr)) {
 continue;
-} else {
-expr = this.expandExpr(key.toString());
-if (this.shouldExcludeProperty(expr)) {
-continue;
-}
-expr = this.setExprStack(expr);
 }
+expr = this.setExprStack(expr);
 }
 if (hasData) {
 this.add(',');
@@ -427,8 +427,7 @@ public class JSONWriter {
 hasData = true;
 if (!warnedNonString  !(key instanceof String)) {
 if (LOG.isWarnEnabled()) {
-LOG.warn(JavaScript doesn't support non-String keys, 
using toString() on 
-+ key.getClass().getName());
+LOG.warn(JavaScript doesn't support non-String keys, 
using toString() on #0, key.getClass().getName());
 }
 warnedNonString = true;
 }

svn commit: r1436526 - in /struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/conversion: annotations/Conversion.java impl/XWorkConverter.java

2013-01-21 Thread lukaszlenart

Author: lukaszlenart
Date: Mon Jan 21 18:13:32 2013
New Revision: 1436526

URL: http://svn.apache.org/viewvc?rev=1436526view=rev
Log:
WW-3829 adds better logging and improve example in JavaDoc

Modified:

struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/annotations/Conversion.java

struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkConverter.java

Modified: 
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/annotations/Conversion.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/annotations/Conversion.java?rev=1436526r1=1436525r2=1436526view=diff
==
--- 
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/annotations/Conversion.java
 (original)
+++ 
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/annotations/Conversion.java
 Mon Jan 21 18:13:32 2013
@@ -22,13 +22,13 @@ import java.lang.annotation.Target;
 
 /**
  * !-- START SNIPPET: description --
- * p/A marker annotation for type conversions at Type level.
+ * A marker annotation for type conversions at Type level.
  * !-- END SNIPPET: description --
  *
  * p/ uAnnotation usage:/u
  *
  * !-- START SNIPPET: usage --
- * p/The Conversion annotation must be applied at Type level.
+ * The Conversion annotation must be applied at Type level. Check also 
[TypeConversion Annotation] for more examples!
  * !-- END SNIPPET: usage --
  *
  * p/ uAnnotation parameters:/u
@@ -58,8 +58,24 @@ import java.lang.annotation.Target;
  *
  * pre
  * !-- START SNIPPET: example --
- * #64;Conversion()
+ * #64;Conversion(
+ * conversions = {
+ *  // key must be the name of a property for which converter should 
be used
+ *  #64;TypeConversion(key = date, converter = 
org.demo.converter.DateConverter)
+ * }
+ * )
  * public class ConversionAction implements Action {
+ *
+ * private Date date;
+ *
+ * public setDate(Date date) {
+ * this.date = date;
+ * }
+ *
+ * public Date getDate() {
+ * return date;
+ * }
+ *
  * }
  *
  * !-- END SNIPPET: example --

Modified: 
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkConverter.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkConverter.java?rev=1436526r1=1436525r2=1436526view=diff
==
--- 
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkConverter.java
 (original)
+++ 
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkConverter.java
 Mon Jan 21 18:13:32 2013
@@ -20,8 +20,8 @@ import com.opensymphony.xwork2.FileManag
 import com.opensymphony.xwork2.FileManagerFactory;
 import com.opensymphony.xwork2.ObjectFactory;
 import com.opensymphony.xwork2.XWorkConstants;
-import com.opensymphony.xwork2.XWorkMessages;
 import com.opensymphony.xwork2.XWorkException;
+import com.opensymphony.xwork2.XWorkMessages;
 import com.opensymphony.xwork2.conversion.TypeConverter;
 import com.opensymphony.xwork2.conversion.annotations.Conversion;
 import com.opensymphony.xwork2.conversion.annotations.ConversionRule;
@@ -29,10 +29,15 @@ import com.opensymphony.xwork2.conversio
 import com.opensymphony.xwork2.conversion.annotations.TypeConversion;
 import com.opensymphony.xwork2.inject.Inject;
 import com.opensymphony.xwork2.ognl.XWorkTypeConverterWrapper;
-import com.opensymphony.xwork2.util.*;
+import com.opensymphony.xwork2.util.AnnotationUtils;
+import com.opensymphony.xwork2.util.ClassLoaderUtil;
+import com.opensymphony.xwork2.util.CompoundRoot;
+import com.opensymphony.xwork2.util.LocalizedTextUtil;
+import com.opensymphony.xwork2.util.ValueStack;
 import com.opensymphony.xwork2.util.logging.Logger;
 import com.opensymphony.xwork2.util.logging.LoggerFactory;
 import com.opensymphony.xwork2.util.reflection.ReflectionContextState;
+import org.apache.commons.lang3.StringUtils;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -40,10 +45,16 @@ import java.lang.annotation.Annotation;
 import java.lang.reflect.Member;
 import java.lang.reflect.Method;
 import java.net.URL;
-import java.util.*;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import java.text.MessageFormat;
 
 
 /**
@@ -587,7 +598,11 @@ public class XWorkConverter extends Defa
 break;
 }
 if (LOG.isDebugEnabled()) {
-

svn commit: r1436528 - /struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/annotations/Conversion.java

2013-01-21 Thread lukaszlenart

Author: lukaszlenart
Date: Mon Jan 21 18:17:13 2013
New Revision: 1436528

URL: http://svn.apache.org/viewvc?rev=1436528view=rev
Log:
WW-3829 moves link to wiki

Modified:

struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/annotations/Conversion.java

Modified: 
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/annotations/Conversion.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/annotations/Conversion.java?rev=1436528r1=1436527r2=1436528view=diff
==
--- 
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/annotations/Conversion.java
 (original)
+++ 
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/annotations/Conversion.java
 Mon Jan 21 18:17:13 2013
@@ -28,7 +28,7 @@ import java.lang.annotation.Target;
  * p/ uAnnotation usage:/u
  *
  * !-- START SNIPPET: usage --
- * The Conversion annotation must be applied at Type level. Check also 
[TypeConversion Annotation] for more examples!
+ * The Conversion annotation must be applied at Type level.
  * !-- END SNIPPET: usage --
  *
  * p/ uAnnotation parameters:/u

svn commit: r1436637 - in /struts/struts2/trunk/plugins/javatemplates/src: main/java/org/apache/struts2/views/java/simple/AnchorHandler.java test/java/org/apache/struts2/views/java/simple/AnchorTest.j

2013-01-21 Thread lukaszlenart

Author: lukaszlenart
Date: Mon Jan 21 21:47:13 2013
New Revision: 1436637

URL: http://svn.apache.org/viewvc?rev=1436637view=rev
Log:
WW-3920 adds support for scripting events

Modified:

struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/AnchorHandler.java

struts/struts2/trunk/plugins/javatemplates/src/test/java/org/apache/struts2/views/java/simple/AnchorTest.java

Modified: 
struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/AnchorHandler.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/AnchorHandler.java?rev=1436637r1=1436636r2=1436637view=diff
==
--- 
struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/AnchorHandler.java
 (original)
+++ 
struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/AnchorHandler.java
 Mon Jan 21 21:47:13 2013
@@ -20,36 +20,40 @@
  */
 package org.apache.struts2.views.java.simple;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.struts2.views.java.Attributes;
 import org.apache.struts2.views.java.TagGenerator;
-import org.apache.commons.lang3.StringUtils;
 
 import java.io.IOException;
 import java.util.Map;
 
 public class AnchorHandler extends AbstractTagHandler implements TagGenerator {
+
 public void generate() throws IOException {
-//all rendering must happend at the end of the tag, so we can support 
nested params
+MapString, Object params = context.getParameters();
+
+Attributes attrs = new Attributes();
+attrs.addIfExists(name, params.get(name))
+.addIfExists(id, params.get(id))
+.addIfExists(class, params.get(cssClass))
+.addIfExists(style, params.get(cssStyle))
+.addIfExists(href, params.get(href), false)
+.addIfExists(title, params.get(title))
+.addIfExists(tabindex, params.get(tabindex));
+start(a, attrs);
 }
 
 public static class CloseHandler extends AbstractTagHandler implements 
TagGenerator {
+
 public void generate() throws IOException {
 MapString, Object params = context.getParameters();
-
-Attributes attrs = new Attributes();
-
-attrs.addIfExists(name, params.get(name))
-.addIfExists(id, params.get(id))
-.addIfExists(class, params.get(cssClass))
-.addIfExists(style, params.get(cssStyle))
-.addIfExists(href, params.get(href), false)
-.addIfExists(title, params.get(title))
-.addIfExists(tabindex, params.get(tabindex));
-start(a, attrs);
 String body = (String) params.get(body);
-if (StringUtils.isNotEmpty(body))
+if (StringUtils.isNotEmpty(body)) {
 characters(body, false);
+}
 end(a);
 }
+
 }
+
 }

Modified: 
struts/struts2/trunk/plugins/javatemplates/src/test/java/org/apache/struts2/views/java/simple/AnchorTest.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/javatemplates/src/test/java/org/apache/struts2/views/java/simple/AnchorTest.java?rev=1436637r1=1436636r2=1436637view=diff
==
--- 
struts/struts2/trunk/plugins/javatemplates/src/test/java/org/apache/struts2/views/java/simple/AnchorTest.java
 (original)
+++ 
struts/struts2/trunk/plugins/javatemplates/src/test/java/org/apache/struts2/views/java/simple/AnchorTest.java
 Mon Jan 21 21:47:13 2013
@@ -46,6 +46,28 @@ public class AnchorTest extends Abstract
 assertEquals(expected, output);
 }
 
+public void testRenderScriptingEvents() {
+tag.setName(name_);
+tag.setOnclick(alert('click'));
+tag.setOnchange(alert('change));
+tag.setOnfocus(alert('focus'));
+tag.setOnselect(alert('select'));
+tag.setOndblclick(alert('dbclick'));
+tag.setOnkeydown(alert('keydown'));
+tag.setOnkeypress(alert('keypress'));
+tag.setHref(http://sometest.com?ab=10;);
+
+tag.evaluateParams();
+map.putAll(tag.getParameters());
+theme.renderTag(getTagName(), context);
+theme.renderTag(getTagName() + -close, context);
+String output = writer.getBuffer().toString();
+String expected = a name=\name_\ id=\name_\ 
href=\http://sometest.com?ab=10\; onclick=\alert('click')\  +
+ondblclick=\alert('dbclick')\ onfocus=\alert('focus')\ 
onkeypress=\alert('keypress')\  +
+onkeydown=\alert('keydown')\ onselect=\alert('select')\ 
onchange=\alert('change)\/a;
+assertEquals(expected, output);
+}
+
 @Override
 protected

svn commit: r1436643 - /struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/JavaTemplateEngine.java

2013-01-21 Thread lukaszlenart

Author: lukaszlenart
Date: Mon Jan 21 21:52:34 2013
New Revision: 1436643

URL: http://svn.apache.org/viewvc?rev=1436643view=rev
Log:
WW-3922 uses default template engine to support cooperation with other plugins

Modified:

struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/JavaTemplateEngine.java

Modified: 
struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/JavaTemplateEngine.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/JavaTemplateEngine.java?rev=1436643r1=1436642r2=1436643view=diff
==
--- 
struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/JavaTemplateEngine.java
 (original)
+++ 
struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/JavaTemplateEngine.java
 Mon Jan 21 21:52:34 2013
@@ -20,20 +20,23 @@
  */
 package org.apache.struts2.views.java;
 
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ObjectFactory;
+import com.opensymphony.xwork2.config.ConfigurationException;
+import com.opensymphony.xwork2.inject.Inject;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
 import org.apache.struts2.StrutsException;
 import org.apache.struts2.components.template.BaseTemplateEngine;
 import org.apache.struts2.components.template.Template;
+import org.apache.struts2.components.template.TemplateEngine;
+import org.apache.struts2.components.template.TemplateEngineManager;
 import org.apache.struts2.components.template.TemplateRenderingContext;
 import org.apache.struts2.views.java.simple.SimpleTheme;
 
 import java.util.HashMap;
 import java.util.StringTokenizer;
 
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.ClassLoaderUtil;
-import com.opensymphony.xwork2.inject.Inject;
-
 /**
  * Template engine that renders tags using java implementations
  */
@@ -41,26 +44,59 @@ public class JavaTemplateEngine extends 
 
 private static final Logger LOG = 
LoggerFactory.getLogger(JavaTemplateEngine.class);
 
-private Themes themes = new Themes() {{
-add(new SimpleTheme());
-}};
+// The struts template engine manager
+protected TemplateEngineManager templateEngineManager;
+
+// The struts default template type. If struts ever changes this will need 
updating.
+private String defaultTemplateType = ftl;
+
+@Inject
+public void setTemplateEngineManager(TemplateEngineManager mgr) {
+this.templateEngineManager = mgr;
+}
+
+private Themes themes = new Themes() {
+{
+add(new SimpleTheme());
+}
+};
 
 @Override
 protected String getSuffix() {
 return java;
 }
 
-public void renderTemplate(TemplateRenderingContext templateContext)
-throws Exception {
+public void renderTemplate(TemplateRenderingContext templateContext) 
throws Exception {
 Template t = templateContext.getTemplate();
 Theme theme = themes.get(t.getTheme());
 if (theme == null) {
-throw new StrutsException(Cannot render tag [ + t.getName() + ] 
because theme [ + t.getTheme() + ] was not found.);
+// Theme not supported, so do what struts would have done if we 
were not here.
+if (LOG.isDebugEnabled()) {
+LOG.debug(Theme not found [#0] trying default template engine 
using template type [#1], t.getTheme(), defaultTemplateType);
+}
+final TemplateEngine engine = 
templateEngineManager.getTemplateEngine(templateContext.getTemplate(), 
defaultTemplateType);
+
+if (engine == null) {
+// May be the default template has changed?
+throw new ConfigurationException(Unable to find a 
TemplateEngine for template type ' + defaultTemplateType
++ ' whilst trying to render template  + 
templateContext.getTemplate());
+} else {
+try {
+// Retry render
+engine.renderTemplate(templateContext);
+} catch (Exception e) {
+// Give up and throw a new StrutsException(e);
+throw new StrutsException(Cannot render tag [ + 
t.getName() + ] because theme [
++ t.getTheme() + ] was not found., e);
+}
+}
+} else {
+// Render our template
+theme.renderTag(t.getName(), templateContext);
 }
-theme.renderTag(t.getName(), templateContext);
 }
 
-private class Themes {
+private static class Themes {
 private HashMapString, Theme themes = new HashMapString, Theme();

svn commit: r1436650 - /struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/CheckboxListHandler.java

2013-01-21 Thread lukaszlenart

Author: lukaszlenart
Date: Mon Jan 21 22:07:08 2013
New Revision: 1436650

URL: http://svn.apache.org/viewvc?rev=1436650view=rev
Log:
WW-3912 adds proper support for checked attribute

Modified:

struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/CheckboxListHandler.java

Modified: 
struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/CheckboxListHandler.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/CheckboxListHandler.java?rev=1436650r1=1436649r2=1436650view=diff
==
--- 
struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/CheckboxListHandler.java
 (original)
+++ 
struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/CheckboxListHandler.java
 Mon Jan 21 22:07:08 2013
@@ -68,7 +68,7 @@ public class CheckboxListHandler extends
 a.add(type, checkbox)
.add(name, name)
.add(value, itemKeyStr)
-   .addIfTrue(checked, params.get(nameValue))
+   .addIfTrue(checked, isChecked(params, itemKeyStr))
.addIfTrue(readonly, params.get(readonly))
.addIfTrue(disabled, disabled)
.addIfExists(tabindex, params.get(tabindex))
@@ -101,4 +101,18 @@ public class CheckboxListHandler extends
 }
 }
 }
+
+private Boolean isChecked(MapString, Object params, String itemKeyStr) {
+Boolean checked = false;
+if (itemKeyStr != null) {
+String[] nameValues = (String[]) params.get(nameValue);
+for (String value : nameValues) {
+if (checked = value.equalsIgnoreCase(itemKeyStr)) {
+break;
+}
+}
+}
+return checked;
+}
+
 }

svn commit: r1436660 - /struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/CheckboxListHandler.java

2013-01-21 Thread lukaszlenart

Author: lukaszlenart
Date: Mon Jan 21 22:23:18 2013
New Revision: 1436660

URL: http://svn.apache.org/viewvc?rev=1436660view=rev
Log:
WW-3919 adds proper logic to render id attribute

Modified:

struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/CheckboxListHandler.java

Modified: 
struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/CheckboxListHandler.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/CheckboxListHandler.java?rev=1436660r1=1436659r2=1436660view=diff
==
--- 
struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/CheckboxListHandler.java
 (original)
+++ 
struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/CheckboxListHandler.java
 Mon Jan 21 22:23:18 2013
@@ -72,13 +72,13 @@ public class CheckboxListHandler extends
.addIfTrue(readonly, params.get(readonly))
.addIfTrue(disabled, disabled)
.addIfExists(tabindex, params.get(tabindex))
-   .addIfExists(id, name + - + 
Integer.toString(cnt++));
+.addIfExists(id, id + - + Integer.toString(cnt));
start(input, a);
end(input);
 
 //Label section
 a = new Attributes();
-a.add(for,id)
+a.add(for,id + - + Integer.toString(cnt))
.addIfExists(class, params.get(cssClass))
.addIfExists(style, params.get(cssStyle));
 super.start(label, a);
@@ -97,7 +97,7 @@ public class CheckboxListHandler extends
 end(input);
 
 stack.pop();
-
+cnt++;
 }
 }
 }

[CONF] Confluence Changes in the last 24 hours

2013-01-21 Thread confluence

This is a daily summary of all recent changes in Confluence.

-
Updated Spaces:
-


Apache Camel (https://cwiki.apache.org/confluence/display/CAMEL)

Pages
-
Camel 3.0 - Ideas edited by  hadr...@apache.org  (11:09 PM)
https://cwiki.apache.org/confluence/display/CAMEL/Camel+3.0+-+Ideas

Camel 3.0 - Roadmap edited by  muellerc  (04:24 PM)
https://cwiki.apache.org/confluence/display/CAMEL/Camel+3.0+-+Roadmap

Graceful Shutdown edited by  scranton  (08:32 AM)
https://cwiki.apache.org/confluence/display/CAMEL/Graceful+Shutdown

Message Filter edited by  scranton  (06:49 AM)
https://cwiki.apache.org/confluence/display/CAMEL/Message+Filter

Throttler edited by  scranton  (06:39 AM)
https://cwiki.apache.org/confluence/display/CAMEL/Throttler

Camel 2.11.0 Release edited by  davsclaus  (05:39 AM)
https://cwiki.apache.org/confluence/display/CAMEL/Camel+2.11.0+Release

camel-jboss edited by  davsclaus  (02:57 AM)
https://cwiki.apache.org/confluence/display/CAMEL/camel-jboss

Twitter edited by  njiang  (02:45 AM)
https://cwiki.apache.org/confluence/display/CAMEL/Twitter

Crypto edited by  njiang  (12:48 AM)
https://cwiki.apache.org/confluence/display/CAMEL/Crypto



Apache Cloudstack (https://cwiki.apache.org/confluence/display/CLOUDSTACK)

Pages
-
Apache CloudStack Weekly News - 28 January 2013 created by jzb (10:43 PM)
https://cwiki.apache.org/confluence/display/CLOUDSTACK/Apache+CloudStack+Weekly+News+-+28+January+2013

Apache CloudStack Weekly News - 21 January 2013 edited by  jzb  (10:37 PM)
https://cwiki.apache.org/confluence/display/CLOUDSTACK/Apache+CloudStack+Weekly+News+-+21+January+2013

Current Maintainers Per Component edited by  bhaisaab  (07:39 PM)
https://cwiki.apache.org/confluence/display/CLOUDSTACK/Current+Maintainers+Per+Component

Draft - CloudStack Community Events Plan edited by  karenv  (05:24 PM)
https://cwiki.apache.org/confluence/display/CLOUDSTACK/Draft+-+CloudStack+Community+Events+Plan

Feature Proposal -- In-Guest Customization created by alex.heneveld (01:10 PM)
https://cwiki.apache.org/confluence/display/CLOUDSTACK/Feature+Proposal+--+In-Guest+Customization

Feature Proposal -- Composite Application Blueprints created by alex.heneveld 
(01:05 PM)
https://cwiki.apache.org/confluence/display/CLOUDSTACK/Feature+Proposal+--+Composite+Application+Blueprints

devcloud-kvm edited by  mlsorensen  (12:33 PM)
https://cwiki.apache.org/confluence/display/CLOUDSTACK/devcloud-kvm

AWS Style NIC support created by siwater (06:54 AM)
https://cwiki.apache.org/confluence/display/CLOUDSTACK/AWS+Style+NIC+support

AWS Style Health Checks edited by  rajesh.batt...@citrix.com  (12:19 PM)
https://cwiki.apache.org/confluence/display/CLOUDSTACK/AWS+Style+Health+Checks

nTier Apps 2.0 Functional Spec edited by  kis...@cloud.com  (07:23 AM)
https://cwiki.apache.org/confluence/display/CLOUDSTACK/nTier+Apps+2.0+Functional+Spec

FS - Persistent Networks edited by  likitha.she...@citrix.com  (06:44 AM)
https://cwiki.apache.org/confluence/display/CLOUDSTACK/FS+-+Persistent+Networks

Base Image Updation facility edited by  harikrishna.patn...@citrix.com  (04:10 
AM)
https://cwiki.apache.org/confluence/display/CLOUDSTACK/Base+Image+Updation+facility

Multiple Ip ranges FS edited by  bharat.kumar  (03:28 AM)
https://cwiki.apache.org/confluence/display/CLOUDSTACK/Multiple+Ip+ranges+FS

CPU and RAM Overcommit edited by  bharat.kumar  (12:12 AM)
https://cwiki.apache.org/confluence/display/CLOUDSTACK/CPU+and+RAM+Overcommit

Midokura Networking Plugin created by dcahill (12:11 AM)
https://cwiki.apache.org/confluence/display/CLOUDSTACK/Midokura+Networking+Plugin



Apache cTAKES (https://cwiki.apache.org/confluence/display/CTAKES)

Pages
-
cTAKES 3.0 Developer Guide edited by  bleeker  (10:24 AM)
https://cwiki.apache.org/confluence/display/CTAKES/cTAKES+3.0+Developer+Guide



Drill Wiki (https://cwiki.apache.org/confluence/display/DRILL)

Pages
-
Reference Interpreter edited by  jacques  (10:09 PM)
https://cwiki.apache.org/confluence/display/DRILL/Reference+Interpreter



Apache Flex (https://cwiki.apache.org/confluence/display/FLEX)

Pages
-
Designer  Developer Tools created by masuland (06:35 AM)
https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=30749573



Apache Hive (https://cwiki.apache.org/confluence/display/Hive)

Pages
-
Proposed Changes to Hive Bylaws for Submodule Committers edited by  alangates  
(04:39 PM)

svn commit: r1436267 [3/3] - /struts/site/trunk/content/resources/css/

svn commit: r1436267 [1/3] - /struts/site/trunk/content/resources/css/

svn commit: r847441 [1/3] - in /websites/staging/struts/trunk/content: ./ css/

svn commit: r847441 [3/3] - in /websites/staging/struts/trunk/content: ./ css/

svn commit: r1436268 - /struts/site/trunk/content/resources/.htaccess

svn commit: r847442 - in /websites/staging/struts/trunk/content: ./ .htaccess

svn commit: r1436269 - /struts/site/trunk/content/resources/.htaccess

svn commit: r847443 - in /websites/staging/struts/trunk/content: ./ .htaccess

svn commit: r1436272 - /struts/site/trunk/content/resources/.htaccess

svn commit: r847444 - in /websites/staging/struts/trunk/content: ./ .htaccess

svn commit: r1436290 - /struts/struts2/trunk/plugins/json/src/main/java/org/apache/struts2/json/JSONWriter.java

svn commit: r1436526 - in /struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/conversion: annotations/Conversion.java impl/XWorkConverter.java

svn commit: r1436528 - /struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/annotations/Conversion.java

svn commit: r1436637 - in /struts/struts2/trunk/plugins/javatemplates/src: main/java/org/apache/struts2/views/java/simple/AnchorHandler.java test/java/org/apache/struts2/views/java/simple/AnchorTest.j

svn commit: r1436643 - /struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/JavaTemplateEngine.java

svn commit: r1436650 - /struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/CheckboxListHandler.java

svn commit: r1436660 - /struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/CheckboxListHandler.java

[CONF] Confluence Changes in the last 24 hours

18 matches

Site Navigation

Mail list logo

Footer information