svn commit: r1521364 - /struts/struts2/trunk/core/src/main/resources/org/apache/struts2/struts-messages_en.properties

2013-09-10 Thread lukaszlenart 
Author: lukaszlenart
Date: Tue Sep 10 07:23:51 2013
New Revision: 1521364

URL: http://svn.apache.org/r1521364
Log:
WW-4195 Duplicates existing default messages with suffix _en

Added:

struts/struts2/trunk/core/src/main/resources/org/apache/struts2/struts-messages_en.properties
  - copied, changed from r1520220, 
struts/struts2/trunk/core/src/main/resources/org/apache/struts2/struts-messages.properties

Copied: 
struts/struts2/trunk/core/src/main/resources/org/apache/struts2/struts-messages_en.properties
 (from r1520220, 
struts/struts2/trunk/core/src/main/resources/org/apache/struts2/struts-messages.properties)
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/org/apache/struts2/struts-messages_en.properties?p2=struts/struts2/trunk/core/src/main/resources/org/apache/struts2/struts-messages_en.propertiesp1=struts/struts2/trunk/core/src/main/resources/org/apache/struts2/struts-messages.propertiesr1=1520220r2=1521364rev=1521364view=diff
==
--- 
struts/struts2/trunk/core/src/main/resources/org/apache/struts2/struts-messages.properties
 (original)
+++ 
struts/struts2/trunk/core/src/main/resources/org/apache/struts2/struts-messages_en.properties
 Tue Sep 10 07:23:51 2013
@@ -18,6 +18,10 @@
 # specific language governing permissions and limitations
 # under the License.
 #
+
+# WARNING! This file is the exact copy of struts-messages.properties!
+# See https://issues.apache.org/jira/browse/WW-4195 for more details!
+
 struts.messages.invalid.token=The form has already been processed or no token 
was supplied, please try again.
 struts.internal.invalid.token=Form token {0} does not match the session token 
{1}.

svn commit: r877897 - /websites/staging/struts/trunk/content/

2013-09-10 Thread buildbot 
Author: buildbot
Date: Tue Sep 10 11:51:49 2013
New Revision: 877897

Log:
Staging update by buildbot for struts

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

Propchange: websites/staging/struts/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Tue Sep 10 11:51:49 2013
@@ -1 +1 @@
-1521098
+1521442

svn commit: r1521442 - in /struts/site/branches/next/content: markdown/dev/troubleshooting-git-svn.md site.xml

2013-09-10 Thread grobmeier 
Author: grobmeier
Date: Tue Sep 10 11:51:45 2013
New Revision: 1521442

URL: http://svn.apache.org/r1521442
Log:
added some trouble shooting tipps

Added:
struts/site/branches/next/content/markdown/dev/troubleshooting-git-svn.md
Modified:
struts/site/branches/next/content/site.xml

Added: struts/site/branches/next/content/markdown/dev/troubleshooting-git-svn.md
URL: 
http://svn.apache.org/viewvc/struts/site/branches/next/content/markdown/dev/troubleshooting-git-svn.md?rev=1521442view=auto
==
--- struts/site/branches/next/content/markdown/dev/troubleshooting-git-svn.md 
(added)
+++ struts/site/branches/next/content/markdown/dev/troubleshooting-git-svn.md 
Tue Sep 10 11:51:45 2013
@@ -0,0 +1,80 @@
+# Troubleshooting Git-Svn
+
+## Git-Svn shows certificate errors
+
+Most likely this is caused because you are having a SVN client v1.6 on
+your path. Please upgrade to SVN 1.7.
+
+## Git-Svn exits with Code 6
+
+To the date of this writing, Git-Svn is not compatible with SVN client
+v1.8. You most likely need to downgrade your client to v1.7.
+
+If you are running MacPorts you can check if you have subversion 1.7 already
+installed with:
+
+port intalled
+
+If you have, you can activate it with:
+
+port activate subversion @1.7.10_1
+
+Please note, subversion 1.7 needs a specific depedency to be activated as well.
+Otherwise you will receive a dyld: Library not loaded: 
/opt/local/lib/libserf-1.0.dylib error.
+You can do this with:
+
+port activate serf1 @1.2.1_1
+
+If you have these version not installed on your system, you'll need to a
+bit more work because MacPorts doesn't support installing older packages out 
of the box.
+
+You'll need to manually checkout a specific revision of the portfiles. Please 
activate the
+latest subversion version you have and make sure it is running. Then:
+
+# checkout the revision with subversion 1.7 
+svn co -r 106653 
http://svn.macports.org/repository/macports/trunk/dports/devel/subversion/
+cd subversion
+port install
+# Subversion 1.7 should install now
+cd ..
+rm -rf subversion
+
+Do the same with serf1:
+
+# checkout serf1 1.2.1_1
+svn co -r 108607 
http://svn.macports.org/repository/macports/trunk/dports/www/serf1
+cd serf1
+port install
+# Serf1 1.2.1 should install now
+cd ..
+rm -rf serf1
+
+port install should now list the desired packages. Activate them.
+
+Further reading:
+
+ * [Downgrading 
Subversion](http://www.philipp.haussleiter.de/2013/08/downgrading-subversion-from-1-8-to-1-7-in-macports/)
+ * [Installing older 
ports](https://trac.macports.org/wiki/howto/InstallingOlderPort)
+
+## Git-Svn is not installed
+
+If you see:
+
+# git svn --version
+git: 'svn' is not a git command. See 'git --help'.
+
+On Macs running MacPort you can easily install it with:
+
+port install git-core +svn
+
+Make sure you have the +svn there, otherwise git will install without
+svn support. If that was your error, you'll need to uninstall git-core and 
reinstall it
+again.
+
+If you are seeing an error like this:
+
+Error: org.macports.activate for port python27 returned: Image error: 
/Applications/MacPorts/Python 2.7/Build Applet.app/Contents/Info.plist already 
exists and does not belong to a registered port.  Unable to activate port 
python27. Use 'port -f activate python27' to force the activation.
+
+It means you have already had a previous Python 2.7 installation running. This 
can happen
+if you have reinstalled MacPorts. Try to remove the folder. Please make a 
backup beforehand.
+

Modified: struts/site/branches/next/content/site.xml
URL: 
http://svn.apache.org/viewvc/struts/site/branches/next/content/site.xml?rev=1521442r1=1521441r2=1521442view=diff
==
--- struts/site/branches/next/content/site.xml (original)
+++ struts/site/branches/next/content/site.xml Tue Sep 10 11:51:45 2013
@@ -111,6 +111,9 @@
 name=Git for Struts
 href=dev/git-for-struts.html /
 item
+name=Troubleshooting Git-Svn
+href=dev/troubleshooting-git-svn.html / 
   
+item
 name=Source Code
 href=dev/builds.html
 /

svn commit: r1521447 [2/3] - in /struts/site/trunk/content: ./ fml/ markdown/ markdown/dev/ resources/css/ resources/images/ xdoc/ xdoc/dev/

2013-09-10 Thread grobmeier 
Modified: struts/site/trunk/content/xdoc/index.xml
URL: 
http://svn.apache.org/viewvc/struts/site/trunk/content/xdoc/index.xml?rev=1521447r1=1521446r2=1521447view=diff
==
--- struts/site/trunk/content/xdoc/index.xml (original)
+++ struts/site/trunk/content/xdoc/index.xml Tue Sep 10 12:00:15 2013
@@ -18,9 +18,8 @@ limitations under the License.
 //  78
 --
 document
-
 properties
-titleWelcome/title
+titleWelcome to the Apache Struts project/title
 /properties
 
 head
@@ -28,27 +27,41 @@ limitations under the License.
 /head
 
 body
-
 div class=hero-unit
-h1Apache Struts 2.3.15.1 GA/h1
+h1Apache Struts/h1
 p
-Released on 16 July 2013.
-The a 
href=http://struts.apache.org/release/2.3.x/docs/version-notes-23151.html;version
 notes/a
-are available online. Scroll down for more about a 
href=#WelcomeApache Struts/a,
-the a href=#ProjectApache Struts project/a, and a 
href=#NewbiesStruts for Newbies/a
+The Apache Struts web framework is a free open-source solution 
for creating
+elegant and modern Java web applications. While the 
predecessor Struts 1
+used a lot of XML in old times, Struts 2 applications can be 
configured
+by Convention. Struts 2 applications support the MVC 
pattern, allow a
+REST-like approach and enables you to create full-featured 
AJAX applications.
 /p
-a href=http://struts.apache.org/download.cgi#struts23151; 
class=btn btn-primaryDownload/a
-a href=primer.html class=btn btn-infoRead more/a
-
-h1Apache Struts 1 End-Of-Life (EOL)/h1
-p
-The Apache Struts Project Team would like to inform you that 
the Struts 1.x web framework
-has reached its end of life and is no longer officially 
supported.
-/p
-a href=struts1eol-announcement.html class=btn btn-infoRead 
more/a
-a href=struts1eol-press.html class=btn btn-infoPress 
release/a
+a href=http://struts.apache.org/download.cgi#struts23151; 
class=btn btn-primary btn-largeDownload/a
+a href=primer.html class=btn btn-info btn-largeTechnology 
Primer/a
 /div
 
+table class=showcase
+tr
+td width=33%
+h2Struts 2.3.15.1 GA/h2
+Apache Struts 2.3.15.1 GA has been released on 16 July 
2013.
+a 
href=http://struts.apache.org/release/2.3.x/docs/version-notes-23151.html;Version
 notes/a
+/td
+td width=33%
+h2Want to help?/h2
+We welcome your help! If you want to more about how to 
build
+and patch the Struts 2 codebase, please read the a 
href=#Developer Docs/a
+/td
+td width=33%
+h2Apache Struts 1/h2
+strongEnd-Of-Life (EOL)/strongbr/
+The Struts 1.x web framework has reached its end of life 
and is no longer officially supported.
+a href=struts1eol-announcement.htmlRead the 
announcment/a or the official a href=struts1eol-press.htmlPress 
release/a
+/td
+/tr
+
+/table
+
 div class=row
 div class=pull-left
divOfficial IRC channel: a 
href=irc://irc.freenode.net/struts#struts/a/div
@@ -64,183 +77,5 @@ limitations under the License.
 a href=https://twitter.com/TheApacheStruts; 
class=twitter-follow-button data-show-count=falseFollow 
@TheApacheStruts/a
 /div
 /div
-
-div class=row
-div class=span12
-h2The Apache Struts web framework/h2
-a name=Welcome/
-p
-The Apache Struts web framework is a free open-source 
solution for creating
-Java web applications.
-/p
-
-p
-Web applications differ from conventional websites in that
-web applications can create a dynamic response.
-Many websites deliver only static pages.
-A web application can interact with databases and
-business logic engines to customize a response.
-/p
-
-p
-Web applications based on JavaServer Pages sometimes
-commingle database code, page design code, and control
-flow code.
-In practice, we find that unless these concerns are
-separated,
-

svn commit: r1521448 - /struts/site/branches/next/

2013-09-10 Thread grobmeier 
Author: grobmeier
Date: Tue Sep 10 12:00:51 2013
New Revision: 1521448

URL: http://svn.apache.org/r1521448
Log:
remove merged branch

Removed:
struts/site/branches/next/

svn commit: r877900 - /websites/staging/struts/trunk/content/

2013-09-10 Thread buildbot 
Author: buildbot
Date: Tue Sep 10 12:01:51 2013
New Revision: 877900

Log:
Staging update by buildbot for struts

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

Propchange: websites/staging/struts/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Tue Sep 10 12:01:51 2013
@@ -1 +1 @@
-1521447
+1521448

svn commit: r877899 [8/11] - in /websites/staging/struts/trunk/content: ./ css/ dev/ images/

2013-09-10 Thread buildbot 
Modified: websites/staging/struts/trunk/content/mail.html
==
--- websites/staging/struts/trunk/content/mail.html (original)
+++ websites/staging/struts/trunk/content/mail.html Tue Sep 10 12:01:49 2013
@@ -1,13 +1,13 @@
 !DOCTYPE html
 !--
- | Generated by Apache Maven Doxia at Sep 5, 2013
+ | Generated by Apache Maven Doxia at Sep 10, 2013
  | Rendered using Apache Maven Fluido Skin 1.3.0
 --
 html xmlns=http://www.w3.org/1999/xhtml; xml:lang=en lang=en
   head
 meta charset=UTF-8 /
 meta name=viewport content=width=device-width, initial-scale=1.0 /
-meta name=Date-Revision-mmdd content=20130905 /
+meta name=Date-Revision-mmdd content=20130910 /
 meta http-equiv=Content-Language content=en /
 title
 Mailing Lists/title
@@ -20,7 +20,7 @@
 
 
 /head
-body class=topBarDisabled
+body class=topBarEnabled
   
 
 
@@ -33,262 +33,148 @@
 alt=Fork me on GitHub
 /a
   
-
+
 
-
-div class=container-fluid
-  div id=banner
-div class=pull-left
-a href=http://www.apache.org/; 
id=bannerLeft
-   
 img src=http://www.apache.org/images/asf-logo.gif;  alt=Apache 
Software Foundation/
-/a
-  /div
-div class=pull-righta href=../ 
id=bannerRight
-   
 img src=images/struts.gif  alt=Apache Struts/
-/a
-  /div
-div class=clearhr//div
-  /div
-
-  div id=breadcrumbs
-ul class=breadcrumb
 
-
-  li id=publishDateLast Published: 2013-09-05/li
-  
-
-
-  
-  
-li class=pull-right  a href=../release/1.3.x/index.html 
title=Struts 1 (EOL)
-Struts 1 (EOL)/a
-  /li
-
-li class=divider pull-right|/li
-  
-li class=pull-right  a href=../release/2.3.x/index.html 
title=Struts 2
-Struts 2/a
-  /li
-
-li class=divider pull-right|/li
-  
-li class=pull-right  a href=http://www.apache.org/; 
class=externalLink title=Apache
-Apache/a
-  /li
-
-/ul
-  /div
 
+div id=topbar class=navbar navbar-fixed-top 
+  div class=navbar-inner
+  div class=containerdiv 
class=nav-collapse
 
-  div class=row-fluid
-div id=leftColumn class=span3
-  div class=well sidebar-nav
 
-
-ul class=nav nav-list
-li class=nav-headerApache Struts/li
-
-  li
-
-  a href=index.html title=Welcome
-  i class=none/i
-Welcome/a
-/li
-  
-  li
-
-  a href=downloads.html title=Releases
-  i class=none/i
-Releases/a
-/li
-  
-  li
-
-  a href=announce.html title=Announcements
-  i class=none/i
-Announcements/a
-/li
-  
-  li
-
-  a href=http://www.apache.org/licenses/; 
class=externalLink title=License
-  i class=none/i
-License/a
-/li
-  
-  li
-
-  a href=kickstart.html title=Kickstart FAQ
-  i class=none/i
-Kickstart FAQ/a
-/li
-  
-  li
-
-  a 
href=http://people.apache.org/~vgritsenko/stats/projects/struts; 
class=externalLink title=Website Stats
-  i class=none/i
-Website Stats/a
-/li
+ul class=nav
+  li class=dropdown
+a href=# class=dropdown-toggle data-toggle=dropdownApache 
Struts b class=caret/b/a
+ul class=dropdown-menu
+
+  li  a href=index.html  
title=WelcomeWelcome/a
+/li
   
-  li
-
-  a href=http://apache.org/foundation/thanks.html; 
class=externalLink title=Thanks!
-  i class=none/i
-Thanks!/a
-/li
+  li  a href=downloads.html  
title=DownloadsDownloads/a
+/li
   
-  li
-
-  a 
href=http://apache.org/foundation/sponsorship.html; class=externalLink 
title=Sponsorship
-  i class=none/i
-Sponsorship/a
-/li

svn commit: r877899 [11/11] - in /websites/staging/struts/trunk/content: ./ css/ dev/ images/

2013-09-10 Thread buildbot 
Added: websites/staging/struts/trunk/content/youatstruts.html
==
--- websites/staging/struts/trunk/content/youatstruts.html (added)
+++ websites/staging/struts/trunk/content/youatstruts.html Tue Sep 10 12:01:49 
2013
@@ -0,0 +1,205 @@
+!DOCTYPE html
+!--
+ | Generated by Apache Maven Doxia at Sep 10, 2013
+ | Rendered using Apache Maven Fluido Skin 1.3.0
+--
+html xmlns=http://www.w3.org/1999/xhtml; xml:lang=en lang=en
+  head
+meta charset=UTF-8 /
+meta name=viewport content=width=device-width, initial-scale=1.0 /
+meta name=Date-Revision-mmdd content=20130910 /
+meta http-equiv=Content-Language content=en /
+titleYou at Struts/title
+link rel=stylesheet href=./css/apache-maven-fluido-1.3.0.min.css /
+link rel=stylesheet href=./css/site.css /
+link rel=stylesheet href=./css/print.css media=print /
+
+  
+script type=text/javascript 
src=./js/apache-maven-fluido-1.3.0.min.js/script
+
+
+/head
+body class=topBarEnabled
+  
+
+
+
+
+
+a href=http://github.com/apache/struts2;
+  img style=position: absolute; top: 0; right: 0; border: 0; z-index: 
1;
+
src=https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa.png;
+alt=Fork me on GitHub
+/a
+  
+
+
+
+
+div id=topbar class=navbar navbar-fixed-top 
+  div class=navbar-inner
+  div class=containerdiv 
class=nav-collapse
+
+
+ul class=nav
+  li class=dropdown
+a href=# class=dropdown-toggle data-toggle=dropdownApache 
Struts b class=caret/b/a
+ul class=dropdown-menu
+
+  li  a href=index.html  
title=WelcomeWelcome/a
+/li
+  
+  li  a href=downloads.html  
title=DownloadsDownloads/a
+/li
+  
+  li  a href=announce.html  
title=AnnouncementsAnnouncements/a
+/li
+  
+  li  a href=http://www.apache.org/licenses/;  
title=LicenseLicense/a
+/li
+  
+  li  a 
href=http://apache.org/foundation/thanks.html;  title=Thanks!Thanks!/a
+/li
+  
+  li  a 
href=http://apache.org/foundation/sponsorship.html;  
title=SponsorshipSponsorship/a
+/li
+  /ul
+  /li
+li class=dropdown
+a href=# class=dropdown-toggle data-toggle=dropdownSupport b 
class=caret/b/a
+ul class=dropdown-menu
+
+  li  a href=mail.html  title=User Mailing 
ListUser Mailing List/a
+/li
+  
+  li  a 
href=https://issues.apache.org/jira/browse/WW;  title=Issue TrackerIssue 
Tracker/a
+/li
+  
+  li  a href=security.html  title=Reporting 
Security IssuesReporting Security Issues/a
+/li
+  /ul
+  /li
+li class=dropdown
+a href=# class=dropdown-toggle 
data-toggle=dropdownDocumentation b class=caret/b/a
+ul class=dropdown-menu
+
+  li  a href=birdseye.html  title=Birds 
EyeBirds Eye/a
+/li
+  
+  li  a href=primer.html  title=Key 
TechnologiesKey Technologies/a
+/li
+  
+  li  a href=kickstart.html  title=Kickstart 
FAQKickstart FAQ/a
+/li
+  
+  li  a href=../release/2.3.x/index.html  
title=Struts 2.3.xStruts 2.3.x/a
+/li
+  
+  li  a href=../release/1.3.x/index.html  
title=Struts 1.3.xStruts 1.3.x/a
+/li
+  /ul
+  /li
+li class=dropdown
+a href=# class=dropdown-toggle 
data-toggle=dropdownContributing b class=caret/b/a
+ul class=dropdown-menu
+
+  li  a href=youatstruts.html  title=You at 
StrutsYou at Struts/a
+/li
+  
+  li  a href=helping.html  title=How to Help 
FAQHow to Help FAQ/a
+/li
+  
+  li  a href=dev/dev-mail.html  
title=Development ListsDevelopment Lists/a
+/li
+  
+  li  a href=dev/git-for-struts.html  title=Git 
for StrutsGit for Struts/a
+/li
+  
+  li  a href=dev/troubleshooting-git-svn.html  
title=Troubleshooting Git-SvnTroubleshooting Git-Svn/a
+/li
+  
+  li  a href=dev/builds.html  title=Source 
CodeSource Code/a
+/li
+  
+  li  a href=dev/releases.html  title=Release 
GuidelinesRelease Guidelines/a
+/li

svn commit: r1521449 - in /struts/struts2/trunk: apps/blank/src/site/ apps/jboss-blank/src/site/ apps/mailreader/src/site/ apps/portlet/src/site/ apps/rest-showcase/src/site/ apps/showcase/src/site/ a

2013-09-10 Thread grobmeier 
Author: grobmeier
Date: Tue Sep 10 12:08:04 2013
New Revision: 1521449

URL: http://svn.apache.org/r1521449
Log:
removed unused site folder and site.xml

Removed:
struts/struts2/trunk/apps/blank/src/site/
struts/struts2/trunk/apps/jboss-blank/src/site/
struts/struts2/trunk/apps/mailreader/src/site/
struts/struts2/trunk/apps/portlet/src/site/
struts/struts2/trunk/apps/rest-showcase/src/site/
struts/struts2/trunk/apps/showcase/src/site/
struts/struts2/trunk/apps/src/site/
struts/struts2/trunk/archetypes/src/site/
struts/struts2/trunk/archetypes/struts2-archetype-blank/src/site/
struts/struts2/trunk/archetypes/struts2-archetype-convention/src/site/
struts/struts2/trunk/archetypes/struts2-archetype-dbportlet/src/site/
struts/struts2/trunk/archetypes/struts2-archetype-plugin/src/site/
struts/struts2/trunk/archetypes/struts2-archetype-portlet/src/site/
struts/struts2/trunk/archetypes/struts2-archetype-starter/src/site/
struts/struts2/trunk/bundles/admin/src/site/
struts/struts2/trunk/bundles/demo/src/site/
struts/struts2/trunk/bundles/src/site/
struts/struts2/trunk/plugins/cdi/src/site/
struts/struts2/trunk/plugins/codebehind/src/site/
struts/struts2/trunk/plugins/config-browser/src/site/
struts/struts2/trunk/plugins/convention/src/site/
struts/struts2/trunk/plugins/dojo/src/site/
struts/struts2/trunk/plugins/dwr/src/site/
struts/struts2/trunk/plugins/embeddedjsp/src/site/
struts/struts2/trunk/plugins/gxp/src/site/
struts/struts2/trunk/plugins/jasperreports/src/site/
struts/struts2/trunk/plugins/javatemplates/src/site/
struts/struts2/trunk/plugins/jfreechart/src/site/
struts/struts2/trunk/plugins/jsf/src/site/
struts/struts2/trunk/plugins/json/src/site/
struts/struts2/trunk/plugins/junit/src/site/
struts/struts2/trunk/plugins/osgi/src/site/
struts/struts2/trunk/plugins/oval/src/site/
struts/struts2/trunk/plugins/pell-multipart/src/site/
struts/struts2/trunk/plugins/plexus/src/site/
struts/struts2/trunk/plugins/portlet-tiles/src/site/
struts/struts2/trunk/plugins/portlet/src/site/
struts/struts2/trunk/plugins/rest/src/site/
struts/struts2/trunk/plugins/sitegraph/src/site/
struts/struts2/trunk/plugins/sitemesh/src/site/
struts/struts2/trunk/plugins/spring/src/site/
struts/struts2/trunk/plugins/src/site/
struts/struts2/trunk/plugins/struts1/src/site/
struts/struts2/trunk/plugins/testng/src/site/
struts/struts2/trunk/plugins/tiles/src/site/
struts/struts2/trunk/plugins/tiles3/src/site/
struts/struts2/trunk/xwork-core/src/site/

svn commit: r1521450 - /struts/struts2/trunk/src/site/site.xml

2013-09-10 Thread grobmeier 
Author: grobmeier
Date: Tue Sep 10 12:10:09 2013
New Revision: 1521450

URL: http://svn.apache.org/r1521450
Log:
removed 404 link to sandbox

Modified:
struts/struts2/trunk/src/site/site.xml

Modified: struts/struts2/trunk/src/site/site.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/src/site/site.xml?rev=1521450r1=1521449r2=1521450view=diff
==
--- struts/struts2/trunk/src/site/site.xml (original)
+++ struts/struts2/trunk/src/site/site.xml Tue Sep 10 12:10:09 2013
@@ -108,8 +108,6 @@
   href=http://struts.apache.org/dev/volunteers.html/
 item name=PMC Charter
   href=http://struts.apache.org/dev/bylaws.html/
-item name=Sandbox
-  href=http://struts.apache.org/struts-sandbox/index.html/
 item name=Source Repository
   href=http://svn.apache.org/viewcvs.cgi/struts//
 /menu

svn commit: r1521451 - /struts/struts2/trunk/src/site/site.xml

2013-09-10 Thread grobmeier 
Author: grobmeier
Date: Tue Sep 10 12:12:37 2013
New Revision: 1521451

URL: http://svn.apache.org/r1521451
Log:
added link to sonar

Modified:
struts/struts2/trunk/src/site/site.xml

Modified: struts/struts2/trunk/src/site/site.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/src/site/site.xml?rev=1521451r1=1521450r2=1521451view=diff
==
--- struts/struts2/trunk/src/site/site.xml (original)
+++ struts/struts2/trunk/src/site/site.xml Tue Sep 10 12:12:37 2013
@@ -108,6 +108,8 @@
   href=http://struts.apache.org/dev/volunteers.html/
 item name=PMC Charter
   href=http://struts.apache.org/dev/bylaws.html/
+item name=Sonar Analysis
+  
href=https://analysis.apache.org/dashboard/index/org.apache.struts:struts2-parent/
 item name=Source Repository
   href=http://svn.apache.org/viewcvs.cgi/struts//
 /menu

svn commit: r1521459 - /struts/site/trunk/content/xdoc/index.xml

2013-09-10 Thread grobmeier 
Author: grobmeier
Date: Tue Sep 10 12:22:44 2013
New Revision: 1521459

URL: http://svn.apache.org/r1521459
Log:
dedicated row for social media

Modified:
struts/site/trunk/content/xdoc/index.xml

Modified: struts/site/trunk/content/xdoc/index.xml
URL: 
http://svn.apache.org/viewvc/struts/site/trunk/content/xdoc/index.xml?rev=1521459r1=1521458r2=1521459view=diff
==
--- struts/site/trunk/content/xdoc/index.xml (original)
+++ struts/site/trunk/content/xdoc/index.xml Tue Sep 10 12:22:44 2013
@@ -63,17 +63,16 @@ limitations under the License.
 /table
 
 div class=row
-div class=pull-left
+div class=span12
divOfficial IRC channel: a 
href=irc://irc.freenode.net/struts#struts/a/div
 /div
-div class=pull-right
+/div
+
+div class=row
+div class=span12
 div id=fb-root/div
 div class=fb-like 
data-href=https://www.facebook.com/apachestruts; data-send=true 
data-width=450 data-show-faces=false/div
-/div
-div class=pull-right
 div class=g-plusone data-size=medium 
data-href=http://struts.apache.org/;/div
-/div
-div class=pull-right
 a href=https://twitter.com/TheApacheStruts; 
class=twitter-follow-button data-show-count=falseFollow 
@TheApacheStruts/a
 /div
 /div

svn commit: r877904 - in /websites/staging/struts/trunk/content: ./ index.html

2013-09-10 Thread buildbot 
Author: buildbot
Date: Tue Sep 10 12:24:12 2013
New Revision: 877904

Log:
Staging update by buildbot for struts

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

Propchange: websites/staging/struts/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Tue Sep 10 12:24:12 2013
@@ -1 +1 @@
-1521448
+1521459

Modified: websites/staging/struts/trunk/content/index.html
==
--- websites/staging/struts/trunk/content/index.html (original)
+++ websites/staging/struts/trunk/content/index.html Tue Sep 10 12:24:12 2013
@@ -176,7 +176,7 @@
 
 div id=bodyColumn 
   
-!-- $Id: index.xml 1521447 2013-09-10 12:00:15Z grobmeier $
+!-- $Id: index.xml 1521459 2013-09-10 12:22:44Z grobmeier $
 Copyright 1999-2006 The Apache Software Foundation
 Licensed under the Apache License, Version 2.0 (the License);
 you may not use this file except in compliance with the License.
@@ -226,17 +226,16 @@ limitations under the License. --!-- /
 /table
 
 div class=row
-div class=pull-left
+div class=span12
divOfficial IRC channel: a class=externalLink 
href=irc://irc.freenode.net/struts#struts/a/div
 /div
-div class=pull-right
+/div
+
+div class=row
+div class=span12
 div id=fb-root/div
 div class=fb-like 
data-href=https://www.facebook.com/apachestruts; data-send=true 
data-width=450 data-show-faces=false/div
-/div
-div class=pull-right
 div class=g-plusone data-size=medium 
data-href=http://struts.apache.org/;/div
-/div
-div class=pull-right
 a class=twitter-follow-button 
href=https://twitter.com/TheApacheStruts;Follow @TheApacheStruts/a
 /div
 /div

svn commit: r1521465 - /struts/site/trunk/content/markdown/dev/git-for-struts.md

2013-09-10 Thread grobmeier 
Author: grobmeier
Date: Tue Sep 10 12:33:48 2013
New Revision: 1521465

URL: http://svn.apache.org/r1521465
Log:
removed wrong information

Modified:
struts/site/trunk/content/markdown/dev/git-for-struts.md

Modified: struts/site/trunk/content/markdown/dev/git-for-struts.md
URL: 
http://svn.apache.org/viewvc/struts/site/trunk/content/markdown/dev/git-for-struts.md?rev=1521465r1=1521464r2=1521465view=diff
==
--- struts/site/trunk/content/markdown/dev/git-for-struts.md (original)
+++ struts/site/trunk/content/markdown/dev/git-for-struts.md Tue Sep 10 
12:33:48 2013
@@ -33,12 +33,17 @@ This page reflects some knowledge from t
 git svn rebase
 
 
-You might need to accept SSL certificates from Apache. Please check the 
fingerprint of the servers.
-If in doubt, ask at Struts mailing list if somebody can confirm the server. It 
also might
-happen that the last command quits with:
+You might need to accept SSL certificates from Apache. Please check the 
+[fingerprint of the servers](http://www.apache.org/dev/machines).
+If in doubt, ask at Struts mailing list or Apache infra. 
+
+If you are frequently asked on the certificates or if you get that error:
 
 Unable to determine upstream SVN information from working tree history
 
+...then you should make sure you are using SVN version 1.7 (not 1.8, not 1.6).
+Please also consult the [troubleshooting page](troubleshooting-git-svn.html).
+
 You can go on for now and ignore this message.
 After this, you'll need to fetch the old history.

svn commit: r877906 - in /websites/staging/struts/trunk/content: ./ dev/git-for-struts.html

2013-09-10 Thread buildbot 
Author: buildbot
Date: Tue Sep 10 12:35:16 2013
New Revision: 877906

Log:
Staging update by buildbot for struts

Modified:
websites/staging/struts/trunk/content/   (props changed)
websites/staging/struts/trunk/content/dev/git-for-struts.html

Propchange: websites/staging/struts/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Tue Sep 10 12:35:16 2013
@@ -1 +1 @@
-1521459
+1521466

Modified: websites/staging/struts/trunk/content/dev/git-for-struts.html
==
--- websites/staging/struts/trunk/content/dev/git-for-struts.html (original)
+++ websites/staging/struts/trunk/content/dev/git-for-struts.html Tue Sep 10 
12:35:16 2013
@@ -196,9 +196,9 @@ git config user.email
 
 git svn init --prefix=origin/ --tags=tags --trunk=trunk --branches=branches 
https://svn.apache.org/repos/asf/struts/struts2
 git svn rebase
-/pre/divpYou might need to accept SSL certificates from Apache. Please 
check the fingerprint of the servers. If in doubt, ask at Struts mailing list 
if somebody can confirm the server. It also might happen that the last command 
quits with:/p
+/pre/divpYou might need to accept SSL certificates from Apache. Please 
check the a class=externalLink 
href=http://www.apache.org/dev/machines;fingerprint of the servers/a. If in 
doubt, ask at Struts mailing list or Apache infra. /ppIf you are frequently 
asked on the certificates or if you get that error:/p
 div class=sourcepre class=prettyprintUnable to determine upstream SVN 
information from working tree history
-/pre/divpYou can go on for now and ignore this message. After this, 
youll need to fetch the old history./p
+/pre/divpthen you should make sure you are using SVN version 1.7 (not 
1.8, not 1.6). Please also consult the a 
href=troubleshooting-git-svn.htmltroubleshooting page/a./ppYou can go 
on for now and ignore this message. After this, youll need to fetch the old 
history./p
 div class=sourcepre class=prettyprintgit svn fetch --log-window-size 
1
 /pre/divpHeads up: this command above will need a good while to run - 
please plan accordingly. When you change something in the code, you can commit 
it with:/p
 div class=sourcepre class=prettyprintgit svn dcommit

svn commit: r1521558 - /struts/site/trunk/content/xdoc/index.xml

2013-09-10 Thread grobmeier 
Author: grobmeier
Date: Tue Sep 10 17:38:24 2013
New Revision: 1521558

URL: http://svn.apache.org/r1521558
Log:
worked in new teaser text from Dave Newton and Aaron Johnson

Modified:
struts/site/trunk/content/xdoc/index.xml

Modified: struts/site/trunk/content/xdoc/index.xml
URL: 
http://svn.apache.org/viewvc/struts/site/trunk/content/xdoc/index.xml?rev=1521558r1=1521557r2=1521558view=diff
==
--- struts/site/trunk/content/xdoc/index.xml (original)
+++ struts/site/trunk/content/xdoc/index.xml Tue Sep 10 17:38:24 2013
@@ -30,11 +30,10 @@ limitations under the License.
 div class=hero-unit
 h1Apache Struts/h1
 p
-The Apache Struts web framework is a free open-source solution 
for creating
-elegant and modern Java web applications. While the 
predecessor Struts 1
-used a lot of XML in old times, Struts 2 applications can be 
configured
-by Convention. Struts 2 applications support the MVC 
pattern, allow a
-REST-like approach and enables you to create full-featured 
AJAX applications.
+Apache Struts is a free, open-source, MVC framework for 
creating elegant,
+modern Java web applications.  It favors convention over 
configuration, is
+extensible using a plugin architecture, and ships with plugins 
to support 
+REST, AJAX and JSON.
 /p
 a href=http://struts.apache.org/download.cgi#struts23151; 
class=btn btn-primary btn-largeDownload/a
 a href=primer.html class=btn btn-info btn-largeTechnology 
Primer/a
@@ -50,7 +49,7 @@ limitations under the License.
 td width=33%
 h2Want to help?/h2
 We welcome your help! If you want to more about how to 
build
-and patch the Struts 2 codebase, please read the a 
href=#Developer Docs/a
+and patch the Struts 2 codebase, please read the a 
href=youatstruts.htmlDeveloper Docs/a
 /td
 td width=33%
 h2Apache Struts 1/h2

svn commit: r1521565 [3/19] - in /struts/struts2/trunk/archetypes/struts2-archetype-angularjs: ./ src/ src/main/ src/main/resources/ src/main/resources/META-INF/ src/main/resources/META-INF/maven/ src

2013-09-10 Thread jogep 
Added: 
struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular-bootstrap-prettify.min.js
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular-bootstrap-prettify.min.js?rev=1521565view=auto
==
--- 
struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular-bootstrap-prettify.min.js
 (added)
+++ 
struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular-bootstrap-prettify.min.js
 Tue Sep 10 17:55:21 2013
@@ -0,0 +1,41 @@
+/*
+ AngularJS v1.0.8
+ (c) 2010-2012 Google, Inc. http://angularjs.org
+ License: MIT
+*/
+(function(u,s,H){'use strict';function F(c){return 
c.replace(/\/g,amp;).replace(/\/g,lt;).replace(/\/g,gt;).replace(//g,quot;)}function
 A(c,e){var 
b=s.element(pre+e+/pre);c.html();c.append(b.contents());return c}var 
w={},x={value:{}},K={angular.js:http://code.angularjs.org/+s.version.full+/angular.min.js,angular-resource.js:http://code.angularjs.org/+s.version.full+/angular-resource.min.js,angular-sanitize.js:http://code.angularjs.org/+s.version.full+/angular-sanitize.min.js;,
+angular-cookies.js:http://code.angularjs.org/+s.version.full+/angular-cookies.min.js};w.jsFiddle=function(c,e,b){return{terminal:!0,link:function(n,a,o){function
 d(a,b){return'input type=hidden name='+a+' value='+e(b)+''}var 
p={html:,css:,js:};s.forEach(o.jsFiddle.split( ),function(a,b){var 
d=a.split(.)[1];p[d]+=d==html?b==0?div 
ng-app+(o.module?'='+o.module+'':)+\n+c(a,2):\n\n\n  \!-- CACHE FILE: 
+a+' --\\n  script type=text/ng-template id='+a+'\n'+c(a,
+4)+  \/script\n:c(a)+\n});p.html+=/div\n;A(a,'form class=jsfiddle 
method=post action=http://jsfiddle.net/api/post/library/pure/; 
target=_blank'+d(title,AngularJS Example: )+d(css,'/style \!-- Ugly 
Hack due to jsFiddle issue: http://goo.gl/BUfGZ --\ \nlink rel=stylesheet 
href=http://twitter.github.com/bootstrap/assets/css/bootstrap.css;\n'+b.angular+(o.resource?b.resource:)+style\n+p.css)+d(html,p.html)+d(js,p.js)+'button
 class=btn btn-primaryi class=icon-white icon-pencil/i Edit 
Me/button/form')}}};
+w.code=function(){return{restrict:E,terminal:!0}};w.prettyprint=[reindentCode,function(c){return{restrict:C,terminal:!0,compile:function(e){e.html(u.prettyPrintOne(c(e.html()),H,!0))}}}];w.ngSetText=[getEmbeddedTemplate,function(c){return{restrict:CA,priority:10,compile:function(e,b){A(e,F(c(b.ngSetText)))}}}];w.ngHtmlWrap=[reindentCode,templateMerge,function(c,e){return{compile:function(b,c){var
 a={head:,module:,body:b.text()};s.forEach((c.ngHtmlWrap||).split( 
),function(b){if(b){var b=
+K[b]||b,d=b.split(/\./).pop();d==css?a.head+='link rel=stylesheet 
href='+b+' type=text/css\n':d==js?a.head+='script 
src='+b+'\/script\n':a.module='='+b+''}});A(b,F(e(!doctype 
html\nhtml ng-app{{module}}\n  head\n{{head:4}}  /head\n  
body\n{{body:4}}  
/body\n/html,a)))}}}];w.ngSetHtml=[getEmbeddedTemplate,function(c){return{restrict:CA,priority:10,compile:function(e,b){A(e,c(b.ngSetHtml))}}}];w.ngEvalJavascript=[getEmbeddedTemplate,function(c){return{compile:function(e,
+b){var 
n=c(b.ngEvalJavascript);try{u.execScript?u.execScript(n||''):u.eval(n)}catch(a){u.console?u.console.log(n,\n,a):u.alert(a)];w.ngEmbedApp=[$templateCache,$browser,$rootScope,$location,function(c,e,b,n){return{terminal:!0,link:function(a,o,d){var
 
a=[],p,u;a.push([$provide,function(a){a.value($templateCache,c);a.value($anchorScroll,s.noop);a.value($browser,e);a.provider($location,function(){this.$get=[$rootScope,function(a){b.$on($locationChangeSuccess,function(b,
+d,c){a.$broadcast($locationChangeSuccess,d,c)});return 
n}];this.html5Mode=s.noop});a.decorator($timeout,[$rootScope,$delegate,function(a,b){return
 s.extend(function(d,c){return 
cc50?setTimeout(function(){a.$apply(d)},c):b.apply(this,arguments)},b)}]);a.decorator($rootScope,[$delegate,function(a){p=a;u=b.$watch(function(){p.$digest()});return
 
p}])}]);d.ngEmbedAppa.push(d.ngEmbedApp);o.bind(click,function(a){a.target.attributes.getNamedItem(ng-click)a.preventDefault()});o.bind($destroy,
+function(){u();p.$destroy()});s.bootstrap(o,a)}}}];x.reindentCode=function(){return
 function(c,e){if(!c)return c;for(var b=c.split(/\r?\n/),n=  
.substr(0,e||0),a;b.lengthb[0].match(/^\s*$/);)b.shift();for(;b.lengthb[b.length-1].match(/^\s*$/);)b.pop();var
 o=999;for(a=0;ab.length;a++){var 
d=b[0],p=d.match(/^\s*/)[0];if(p!==dp.lengtho)o=p.length}for(a=0;ab.length;a++)b[a]=n+b[a].substring(o);b.push();return
 b.join(\n)}};x.templateMerge=[reindentCode,function(c){return function(e,
+b){return 
e.replace(/\{\{(\w+)(?:\:(\d+))?\}\}/g,function(e,a,o){e=b[a];o(e=c(e,o));return

svn commit: r1521565 [19/19] - in /struts/struts2/trunk/archetypes/struts2-archetype-angularjs: ./ src/ src/main/ src/main/resources/ src/main/resources/META-INF/ src/main/resources/META-INF/maven/ sr

2013-09-10 Thread jogep 
Added: 
struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_zh-hans.js
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_zh-hans.js?rev=1521565view=auto
==
--- 
struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_zh-hans.js
 (added)
+++ 
struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_zh-hans.js
 Tue Sep 10 17:55:21 2013
@@ -0,0 +1,98 @@
+angular.module(ngLocale, [], [$provide, function($provide) {
+var PLURAL_CATEGORY = {ZERO: zero, ONE: one, TWO: two, FEW: few, MANY: 
many, OTHER: other};
+$provide.value($locale, {
+  DATETIME_FORMATS: {
+AMPMS: {
+  0: 上午,
+  1: 下午
+},
+DAY: {
+  0: 星期日,
+  1: 星期一,
+  2: 星期二,
+  3: 星期三,
+  4: 星期四,
+  5: 星期五,
+  6: 星期六
+},
+MONTH: {
+  0: 1月,
+  1: 2月,
+  2: 3月,
+  3: 4月,
+  4: 5月,
+  5: 6月,
+  6: 7月,
+  7: 8月,
+  8: 9月,
+  9: 10月,
+  10: 11月,
+  11: 12月
+},
+SHORTDAY: {
+  0: 周日,
+  1: 周一,
+  2: 周二,
+  3: 周三,
+  4: 周四,
+  5: 周五,
+  6: 周六
+},
+SHORTMONTH: {
+  0: 1月,
+  1: 2月,
+  2: 3月,
+  3: 4月,
+  4: 5月,
+  5: 6月,
+  6: 7月,
+  7: 8月,
+  8: 9月,
+  9: 10月,
+  10: 11月,
+  11: 12月
+},
+fullDate: y年M月d日,
+longDate: y年M月d日,
+medium: -M-d ah:mm:ss,
+mediumDate: -M-d,
+mediumTime: ah:mm:ss,
+short: yy-M-d ah:mm,
+shortDate: yy-M-d,
+shortTime: ah:mm
+  },
+  NUMBER_FORMATS: {
+CURRENCY_SYM: ¥,
+DECIMAL_SEP: .,
+GROUP_SEP: ,,
+PATTERNS: {
+  0: {
+gSize: 3,
+lgSize: 3,
+macFrac: 0,
+maxFrac: 3,
+minFrac: 0,
+minInt: 1,
+negPre: -,
+negSuf: ,
+posPre: ,
+posSuf: 
+  },
+  1: {
+gSize: 3,
+lgSize: 3,
+macFrac: 0,
+maxFrac: 2,
+minFrac: 2,
+minInt: 1,
+negPre: (\u00A4,
+negSuf: ),
+posPre: \u00A4,
+posSuf: 
+  }
+}
+  },
+  id: zh-hans,
+  pluralCat: function (n) {  return PLURAL_CATEGORY.OTHER;}
+});
+}]);
\ No newline at end of file

Added: 
struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_zh-hant-hk.js
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_zh-hant-hk.js?rev=1521565view=auto
==
--- 
struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_zh-hant-hk.js
 (added)
+++ 
struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/i18n/angular-locale_zh-hant-hk.js
 Tue Sep 10 17:55:21 2013
@@ -0,0 +1,98 @@
+angular.module(ngLocale, [], [$provide, function($provide) {
+var PLURAL_CATEGORY = {ZERO: zero, ONE: one, TWO: two, FEW: few, MANY: 
many, OTHER: other};
+$provide.value($locale, {
+  DATETIME_FORMATS: {
+AMPMS: {
+  0: 上午,
+  1: 下午
+},
+DAY: {
+  0: 星期日,
+  1: 星期一,
+  2: 星期二,
+  3: 星期三,
+  4: 星期四,
+  5: 星期五,
+  6: 星期六
+},
+MONTH: {
+  0: 1月,
+  1: 2月,
+  2: 3月,
+  3: 4月,
+  4: 5月,
+  5: 6月,
+  6: 7月,
+  7: 8月,
+  8: 9月,
+  9: 10月,
+  10: 11月,
+  11: 12月
+},
+SHORTDAY: {
+  0: 週日,
+  1: 週一,
+  2: 週二,
+  3: 週三,
+  4: 週四,
+  5: 週五,
+  6: 週六
+},
+SHORTMONTH: {
+  0: 1月,
+  1: 2月,
+  2: 3月,
+  3: 4月,
+  4: 5月,
+  5: 6月,
+  6: 7月,
+  7: 8月,
+  8: 9月,
+  9: 10月,
+  10: 11月,
+  11: 12月
+},
+fullDate: y年M月d日,
+longDate: y年M月d日,
+medium: y年M月d日 ahh:mm:ss,
+mediumDate: y年M月d日,
+mediumTime: ahh:mm:ss,
+short: yy年M月d日 ah:mm,
+shortDate: yy年M月d日,
+shortTime: ah:mm
+  },
+  NUMBER_FORMATS: {
+CURRENCY_SYM: ¥,
+DECIMAL_SEP: .,
+GROUP_SEP: ,,
+

svn commit: r1521565 [5/19] - in /struts/struts2/trunk/archetypes/struts2-archetype-angularjs: ./ src/ src/main/ src/main/resources/ src/main/resources/META-INF/ src/main/resources/META-INF/maven/ src

2013-09-10 Thread jogep 
Added: 
struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular-sanitize.js
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular-sanitize.js?rev=1521565view=auto
==
--- 
struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular-sanitize.js
 (added)
+++ 
struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/lib/angular/angular-sanitize.js
 Tue Sep 10 17:55:21 2013
@@ -0,0 +1,556 @@
+/**
+ * @license AngularJS v1.0.8
+ * (c) 2010-2012 Google, Inc. http://angularjs.org
+ * License: MIT
+ */
+(function(window, angular, undefined) {
+'use strict';
+
+/**
+ * @ngdoc overview
+ * @name ngSanitize
+ * @description
+ * 
+ * The `ngSanitize` module provides functionality to sanitize HTML.
+ * 
+ * # Installation
+ * As a separate module, it must be loaded after Angular core is loaded; 
otherwise, an 'Uncaught Error:
+ * No module: ngSanitize' runtime error will occur.
+ *
+ * pre
+ *   script src=angular.js/script
+ *   script src=angular-sanitize.js/script
+ * /pre
+ *
+ * # Usage
+ * To make sure the module is available to your application, declare it as a 
dependency of you application
+ * module.
+ *
+ * pre
+ *   angular.module('app', ['ngSanitize']);
+ * /pre
+ */
+
+/*
+ * HTML Parser By Misko Hevery (mi...@hevery.com)
+ * based on:  HTML Parser By John Resig (ejohn.org)
+ * Original code by Erik Arvidsson, Mozilla Public License
+ * http://erik.eae.net/simplehtmlparser/simplehtmlparser.js
+ *
+ * // Use like so:
+ * htmlParser(htmlString, {
+ * start: function(tag, attrs, unary) {},
+ * end: function(tag) {},
+ * chars: function(text) {},
+ * comment: function(text) {}
+ * });
+ *
+ */
+
+
+/**
+ * @ngdoc service
+ * @name ngSanitize.$sanitize
+ * @function
+ *
+ * @description
+ *   The input is sanitized by parsing the html into tokens. All safe tokens 
(from a whitelist) are
+ *   then serialized back to properly escaped html string. This means that no 
unsafe input can make
+ *   it into the returned string, however, since our parser is more strict 
than a typical browser
+ *   parser, it's possible that some obscure input, which would be recognized 
as valid HTML by a
+ *   browser, won't make it through the sanitizer.
+ *
+ * @param {string} html Html input.
+ * @returns {string} Sanitized html.
+ *
+ * @example
+   doc:example module=ngSanitize
+ doc:source
+   script
+ function Ctrl($scope) {
+   $scope.snippet =
+ 'p style=color:bluean html\n' +
+ 'em onmouseover=this.textContent=\'PWN3D!\'click here/em\n' 
+
+ 'snippet/p';
+ }
+   /script
+   div ng-controller=Ctrl
+  Snippet: textarea ng-model=snippet cols=60 rows=3/textarea
+   table
+ tr
+   tdFilter/td
+   tdSource/td
+   tdRendered/td
+ /tr
+ tr id=html-filter
+   tdhtml filter/td
+   td
+ prelt;div ng-bind-html=snippetgt;br/lt;/divgt;/pre
+   /td
+   td
+ div ng-bind-html=snippet/div
+   /td
+ /tr
+ tr id=escaped-html
+   tdno filter/td
+   tdprelt;div 
ng-bind=snippetgt;br/lt;/divgt;/pre/td
+   tddiv ng-bind=snippet/div/td
+ /tr
+ tr id=html-unsafe-filter
+   tdunsafe html filter/td
+   tdprelt;div 
ng-bind-html-unsafe=snippetgt;br/lt;/divgt;/pre/td
+   tddiv ng-bind-html-unsafe=snippet/div/td
+ /tr
+   /table
+ /div
+ /doc:source
+ doc:scenario
+   it('should sanitize the html snippet ', function() {
+ expect(using('#html-filter').element('div').html()).
+   toBe('pan html\nemclick here/em\nsnippet/p');
+   });
+
+   it('should escape snippet without any filter', function() {
+ expect(using('#escaped-html').element('div').html()).
+   toBe(lt;p style=\color:blue\gt;an html\n +
+lt;em onmouseover=\this.textContent='PWN3D!'\gt;click 
herelt;/emgt;\n +
+snippetlt;/pgt;);
+   });
+
+   it('should inline raw snippet if filtered as unsafe', function() {
+ expect(using('#html-unsafe-filter').element(div).html()).
+   toBe(p style=\color:blue\an html\n +
+em onmouseover=\this.textContent='PWN3D!'\click 
here/em\n +
+snippet/p);
+   });
+
+   it('should update', function() {
+ input('snippet').enter('new btext/b');
+

svn commit: r877933 - in /websites/staging/struts/trunk/content: ./ index.html

2013-09-10 Thread buildbot 
Author: buildbot
Date: Tue Sep 10 17:39:53 2013
New Revision: 877933

Log:
Staging update by buildbot for struts

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

Propchange: websites/staging/struts/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Tue Sep 10 17:39:53 2013
@@ -1 +1 @@
-1521466
+1521558

Modified: websites/staging/struts/trunk/content/index.html
==
--- websites/staging/struts/trunk/content/index.html (original)
+++ websites/staging/struts/trunk/content/index.html Tue Sep 10 17:39:53 2013
@@ -176,7 +176,7 @@
 
 div id=bodyColumn 
   
-!-- $Id: index.xml 1521459 2013-09-10 12:22:44Z grobmeier $
+!-- $Id: index.xml 1521558 2013-09-10 17:38:24Z grobmeier $
 Copyright 1999-2006 The Apache Software Foundation
 Licensed under the Apache License, Version 2.0 (the License);
 you may not use this file except in compliance with the License.
@@ -193,11 +193,10 @@ limitations under the License. --!-- /
 div class=hero-unit
 h1Apache Struts/h1
 p
-The Apache Struts web framework is a free open-source solution 
for creating
-elegant and modern Java web applications. While the 
predecessor Struts 1
-used a lot of XML in old times, Struts 2 applications can be 
configured
-by quot;Conventionquot;. Struts 2 applications support the 
MVC pattern, allow a
-REST-like approach and enables you to create full-featured 
AJAX applications.
+Apache Struts is a free, open-source, MVC framework for 
creating elegant,
+modern Java web applications.  It favors convention over 
configuration, is
+extensible using a plugin architecture, and ships with plugins 
to support 
+REST, AJAX and JSON.
 /p
 a class=btn btn-primary btn-large 
href=http://struts.apache.org/download.cgi#struts23151;Download/a
 a href=primer.html class=btn btn-info btn-largeTechnology 
Primer/a
@@ -213,7 +212,7 @@ limitations under the License. --!-- /
 td width=33%
 div class=sectionh2Want to help?a 
name=Want_to_help/a/h2
 We welcome your help! If you want to more about how to 
build
-and patch the Struts 2 codebase, please read the a 
href=#aDeveloper Docs/a
+and patch the Struts 2 codebase, please read the a 
href=youatstruts.htmlDeveloper Docs/a
 /td
 td width=33%
 div class=sectionh2Apache Struts 1a 
name=Apache_Struts_1/a/h2

svn commit: r1521598 - /struts/struts2/trunk/archetypes/pom.xml

2013-09-10 Thread jogep 
Author: jogep
Date: Tue Sep 10 19:27:42 2013
New Revision: 1521598

URL: http://svn.apache.org/r1521598
Log:
WW-4196 Add a new Struts2 Archetype for HTML5 web applications with AngularJS

Modified:
struts/struts2/trunk/archetypes/pom.xml

Modified: struts/struts2/trunk/archetypes/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/pom.xml?rev=1521598r1=1521597r2=1521598view=diff
==
--- struts/struts2/trunk/archetypes/pom.xml (original)
+++ struts/struts2/trunk/archetypes/pom.xml Tue Sep 10 19:27:42 2013
@@ -40,6 +40,7 @@
/scm
 
 modules
+modulestruts2-archetype-angularjs/module
 modulestruts2-archetype-blank/module
 modulestruts2-archetype-convention/module
 modulestruts2-archetype-dbportlet/module

svn commit: r1521602 - in /struts/struts2/trunk/archetypes: struts2-archetype-angularjs/README.txt struts2-archetype-blank/README.txt struts2-archetype-convention/README.txt struts2-archetype-dbportle

2013-09-10 Thread jogep 
Author: jogep
Date: Tue Sep 10 19:29:54 2013
New Revision: 1521602

URL: http://svn.apache.org/r1521602
Log:
Fix typo and change hardcoded Struts version to Placeholder

Modified:
struts/struts2/trunk/archetypes/struts2-archetype-angularjs/README.txt
struts/struts2/trunk/archetypes/struts2-archetype-blank/README.txt
struts/struts2/trunk/archetypes/struts2-archetype-convention/README.txt
struts/struts2/trunk/archetypes/struts2-archetype-dbportlet/README.txt
struts/struts2/trunk/archetypes/struts2-archetype-starter/README.txt

Modified: struts/struts2/trunk/archetypes/struts2-archetype-angularjs/README.txt
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-angularjs/README.txt?rev=1521602r1=1521601r2=1521602view=diff
==
--- struts/struts2/trunk/archetypes/struts2-archetype-angularjs/README.txt 
(original)
+++ struts/struts2/trunk/archetypes/struts2-archetype-angularjs/README.txt Tue 
Sep 10 19:29:54 2013
@@ -20,7 +20,7 @@ USAGE
-DartifactId=myWebApp \

-DarchetypeGroupId=org.apache.struts \

-DarchetypeArtifactId=struts2-archetype-angularjs \
-   
-DarchetypeVersion=2.3.16 \
+   
-DarchetypeVersion=CURRENT_STRUTS_VERSION \

-DremoteRepositories=http://people.apache.org/repo/m2-snapshot-repository
 
 IMPORTANT:

Modified: struts/struts2/trunk/archetypes/struts2-archetype-blank/README.txt
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-blank/README.txt?rev=1521602r1=1521601r2=1521602view=diff
==
--- struts/struts2/trunk/archetypes/struts2-archetype-blank/README.txt 
(original)
+++ struts/struts2/trunk/archetypes/struts2-archetype-blank/README.txt Tue Sep 
10 19:29:54 2013
@@ -20,7 +20,7 @@ USAGE
-DartifactId=myWebApp \
-DarchetypeGroupId=org.apache.struts \
-DarchetypeArtifactId=struts2-archetype-blank \
-   -DarchetypeVersion=2.0.9-SNAPSHOT \
+   -DarchetypeVersion=CURRENT_STRUTS_VERSION \

-DremoteRepositories=http://people.apache.org/repo/m2-snapshot-repository
 
 IMPORTANT:

Modified: 
struts/struts2/trunk/archetypes/struts2-archetype-convention/README.txt
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-convention/README.txt?rev=1521602r1=1521601r2=1521602view=diff
==
--- struts/struts2/trunk/archetypes/struts2-archetype-convention/README.txt 
(original)
+++ struts/struts2/trunk/archetypes/struts2-archetype-convention/README.txt Tue 
Sep 10 19:29:54 2013
@@ -1,6 +1,6 @@
 INFORMATION
 ===
-- This is Struts 2's Blank Convetion Maven Archetype
+- This is Struts 2's Blank Convention Maven Archetype
 
 USAGE
 =
@@ -20,7 +20,7 @@ USAGE
-DartifactId=myWebApp \

-DarchetypeGroupId=org.apache.struts \

-DarchetypeArtifactId=struts2-archetype-convention \
-   
-DarchetypeVersion=2.1.8 \
+   
-DarchetypeVersion=CURRENT_STRUTS_VERSION \

-DremoteRepositories=http://people.apache.org/repo/m2-snapshot-repository
 
 IMPORTANT:

Modified: struts/struts2/trunk/archetypes/struts2-archetype-dbportlet/README.txt
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-dbportlet/README.txt?rev=1521602r1=1521601r2=1521602view=diff
==
--- struts/struts2/trunk/archetypes/struts2-archetype-dbportlet/README.txt 
(original)
+++ struts/struts2/trunk/archetypes/struts2-archetype-dbportlet/README.txt Tue 
Sep 10 19:29:54 2013
@@ -22,7 +22,7 @@ USAGE
-DartifactId=myWebApp \
-DarchetypeGroupId=org.apache.struts \
-DarchetypeArtifactId=struts2-archetype-dbportlet \
-   -DarchetypeVersion=2.0.9-SNAPSHOT \
+   -DarchetypeVersion=CURRENT_STRUTS_VERSION \

-DremoteRepositories=http://people.apache.org/maven-snapshot-repository
 
 - to compile, execute

Modified: struts/struts2/trunk/archetypes/struts2-archetype-starter/README.txt
URL:

svn commit: r877953 - in /websites/staging/struts/trunk/content: ./ dev/git-for-struts.html

2013-09-10 Thread buildbot 
Author: buildbot
Date: Tue Sep 10 19:38:01 2013
New Revision: 877953

Log:
Staging update by buildbot for struts

Modified:
websites/staging/struts/trunk/content/   (props changed)
websites/staging/struts/trunk/content/dev/git-for-struts.html

Propchange: websites/staging/struts/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Tue Sep 10 19:38:01 2013
@@ -1 +1 @@
-1521558
+1521605

Modified: websites/staging/struts/trunk/content/dev/git-for-struts.html
==
--- websites/staging/struts/trunk/content/dev/git-for-struts.html (original)
+++ websites/staging/struts/trunk/content/dev/git-for-struts.html Tue Sep 10 
19:38:01 2013
@@ -208,6 +208,12 @@ git svn rebase
 div class=sourcepre class=prettyprintgit reset --hard origin/mybranch
 /pre/divpFor reference, you can override the commit url:/p
 div class=sourcepre class=prettyprintgit svn dcommit --commit-url 
https://svn.apache.org/repos/asf/struts/struts2/branches/mybranch
+/pre/div/divdiv class=sectionh2Contributing with GitHuba 
name=Contributing_with_GitHub/a/h2pIf you would like to contribute 
using the GitHub tools you need to know we can only accept your work if we have 
your a class=externalLink 
href=http://www.apache.org/licenses/icla.txt;ICLA/a on file. Please read 
the document carefully, sign and send it to us. Basically this document 
protects you and the end users for legal problems. It allows the Apache 
Software Foundation to use your code and distribute it. You should receive an 
email a few days after you submitted it and appear in the a 
class=externalLink 
href=http://people.apache.org/committer-index.html;committer index/a in the 
section unlisted CLAs./ppOnce done, you can clone the a 
class=externalLink href=https://github.com/apache/struts2;Apache Struts 
mirror on GitHub/a:/p
+div class=sourcepre class=prettyprintgit clone 
g...@github.com:apache/struts2.git struts2-mirror.git
+/pre/divpPlease create an issue on our a class=externalLink 
href=https://issues.apache.org/jira/browse/WW;issue tracker/a. Youll 
receive an issue number which you should use to create a working branch (for 
example WW-4196)./ppIf you are sending a pull request, please send it to 
the Apache Struts teams repo and not the official mirror. We cannot accept and 
close pull requests there which is the reason we have an own account. You can 
find it here:/p
+div class=sourcepre 
class=prettyprint[https://github.com/apachestruts/struts2](https://github.com/apachestruts/struts2)
+/pre/divpIt is of course possible to add us as upstream repo:/p
+div class=sourcepre class=prettyprintgit remote add upstream 
https://github.com/apachestruts/struts2
 /pre/div/divdiv class=sectionh2Working with remote branches from 
GitHuba name=Working_with_remote_branches_from_GitHub/a/h2pYou can 
add a remote branch from GitHub like this:/p
 div class=sourcepre class=prettyprintgit remote add opensourceio 
https://github.com/opensourceio/struts.git
 /pre/divpPull changes with:/p

svn commit: r1521605 - /struts/site/trunk/content/markdown/dev/git-for-struts.md

2013-09-10 Thread grobmeier 
Author: grobmeier
Date: Tue Sep 10 19:36:34 2013
New Revision: 1521605

URL: http://svn.apache.org/r1521605
Log:
draft instructions for users who want to work with github

Modified:
struts/site/trunk/content/markdown/dev/git-for-struts.md

Modified: struts/site/trunk/content/markdown/dev/git-for-struts.md
URL: 
http://svn.apache.org/viewvc/struts/site/trunk/content/markdown/dev/git-for-struts.md?rev=1521605r1=1521604r2=1521605view=diff
==
--- struts/site/trunk/content/markdown/dev/git-for-struts.md (original)
+++ struts/site/trunk/content/markdown/dev/git-for-struts.md Tue Sep 10 
19:36:34 2013
@@ -71,6 +71,34 @@ For reference, you can override the comm
 
 git svn dcommit --commit-url 
https://svn.apache.org/repos/asf/struts/struts2/branches/mybranch
 
+## Contributing with GitHub
+
+If you would like to contribute using the GitHub tools you need to know we can 
only
+accept your work if we have your 
[ICLA](http://www.apache.org/licenses/icla.txt) on file.
+Please read the document carefully, sign and send it to us. Basically this 
document
+protects you and the end users for legal problems. It allows the Apache 
Software Foundation
+to use your code and distribute it.
+You should receive an email a few days after you submitted it and appear in 
the 
+[committer index](http://people.apache.org/committer-index.html) in the 
section unlisted CLAs.
+
+Once done, you can clone the [Apache Struts mirror on 
GitHub](https://github.com/apache/struts2):
+
+git clone g...@github.com:apache/struts2.git struts2-mirror.git
+
+Please create an issue on our [issue 
tracker](https://issues.apache.org/jira/browse/WW).
+You'll receive an issue number which you should use to create a working branch 
(for example WW-4196).
+
+If you are sending a pull request, please send it to the Apache Struts teams 
repo and not
+the official mirror. We cannot accept and close pull requests there which is 
the reason
+we have an own account. You can find it here:
+
+
[https://github.com/apachestruts/struts2](https://github.com/apachestruts/struts2)
+
+It is of course possible to add us as upstream repo:
+
+git remote add upstream https://github.com/apachestruts/struts2
+
+
 ## Working with remote branches from GitHub
 
 You can add a remote branch from GitHub like this:

svn commit: r877962 - in /websites/staging/struts/trunk/content: ./ dev/git-for-struts.html

2013-09-10 Thread buildbot 
Author: buildbot
Date: Tue Sep 10 20:43:05 2013
New Revision: 877962

Log:
Staging update by buildbot for struts

Modified:
websites/staging/struts/trunk/content/   (props changed)
websites/staging/struts/trunk/content/dev/git-for-struts.html

Propchange: websites/staging/struts/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Tue Sep 10 20:43:05 2013
@@ -1 +1 @@
-1521605
+1521634

Modified: websites/staging/struts/trunk/content/dev/git-for-struts.html
==
--- websites/staging/struts/trunk/content/dev/git-for-struts.html (original)
+++ websites/staging/struts/trunk/content/dev/git-for-struts.html Tue Sep 10 
20:43:05 2013
@@ -194,7 +194,7 @@ git config user.email
 # git config user.name lt;Your Namegt;
 # git config user.email lt;Your Emailgt;
 
-git svn init --prefix=origin/ --tags=tags --trunk=trunk --branches=branches 
https://svn.apache.org/repos/asf/struts/struts2
+git svn init -s https://svn.apache.org/repos/asf/struts/struts2/
 git svn rebase
 /pre/divpYou might need to accept SSL certificates from Apache. Please 
check the a class=externalLink 
href=http://www.apache.org/dev/machines;fingerprint of the servers/a. If in 
doubt, ask at Struts mailing list or Apache infra. /ppIf you are frequently 
asked on the certificates or if you get that error:/p
 div class=sourcepre class=prettyprintUnable to determine upstream SVN 
information from working tree history

svn commit: r1521634 - /struts/site/trunk/content/markdown/dev/git-for-struts.md

2013-09-10 Thread grobmeier 
Author: grobmeier
Date: Tue Sep 10 20:41:38 2013
New Revision: 1521634

URL: http://svn.apache.org/r1521634
Log:
pimped url

Modified:
struts/site/trunk/content/markdown/dev/git-for-struts.md

Modified: struts/site/trunk/content/markdown/dev/git-for-struts.md
URL: 
http://svn.apache.org/viewvc/struts/site/trunk/content/markdown/dev/git-for-struts.md?rev=1521634r1=1521633r2=1521634view=diff
==
--- struts/site/trunk/content/markdown/dev/git-for-struts.md (original)
+++ struts/site/trunk/content/markdown/dev/git-for-struts.md Tue Sep 10 
20:41:38 2013
@@ -29,7 +29,7 @@ This page reflects some knowledge from t
 # git config user.name Your Name
 # git config user.email Your Email
 
-git svn init --prefix=origin/ --tags=tags --trunk=trunk 
--branches=branches https://svn.apache.org/repos/asf/struts/struts2
+git svn init -s https://svn.apache.org/repos/asf/struts/struts2/
 git svn rebase

[CONF] Confluence Changes in the last 24 hours

2013-09-10 Thread Anonymous (Confluence) 







   Apache Ambari (Incubating)


Pages

 Page:
 Releasing Ambari
edited by Sumit Mohanty[05:13 PM]
(view changes)

 Page:
 Create a new Cluster
edited by subin m[03:04 PM]
(view changes)

 Page:
 Adding a New Service to an Existing Cluster with python client
edited by subin m[02:15 PM]
(view changes)

 Page:
 Louis Vuitton Alma MM 100% Authentic 80% Off Free Shipping
created by Anne Wolf[09:42 AM]

 Page:
 Louis Vuitton Alma 100% Authentic 80% Off Free Shipping
created by Anne Wolf[09:36 AM]

 Page:
 Louis Vuitton Artsy GM 100% Authentic 80% Off Free Shipping
created by Anne Wolf[09:35 AM]

 Page:
 Louis Vuitton Artsy MM 100% Authentic 80% Off Free Shipping
created by Anne Wolf[09:32 AM]

 Page:
 Louis Vuitton Speedy 35 100% Authentic 80% Off Free Shipping
created by Anne Wolf[09:28 AM]

 Page:
 Louis Vuitton Speedy 30 100% Authentic 80% Off Free Shipping
created by Anne Wolf[09:25 AM]

 Page:
 Louis Vuitton Speedy 25 100% Authentic 80% Off Free Shipping
created by Anne Wolf[09:23 AM]

 Page:
 Louis Vuitton Neverfull GM 100% Authentic 80% Off Free Shipping
created by Anne Wolf[09:21 AM]

 Page:
 Louis Vuitton Neverfull MM 100% Authentic 80% Off Free Shipping
created by Anne Wolf[09:19 AM]

 Page:
 Louis Vuitton Neverfull PM 100% Authentic 80% Off Free Shipping
created by Anne Wolf[09:17 AM]

 Page:
 supriyaatco
created by supriyaatco[04:19 AM]

 Page:
 Replica Omega Skeleton Watches Outlet For Sale Replica Omega In 2013
created by jrhansheng[01:42 AM]

 Page:
 New Arrival Replica Omega Mania Watches Hot Sale With Big Discount
created by jrhansheng[01:41 AM]

 Page:
 Luxury and Affordable Replica Omega Railmaster Watches For Sale
created by jrhansheng[01:40 AM]

 Page:
 Lastest Style Replica Omega Ladymatic Watches Best Selling In 2013
created by jrhansheng[01:39 AM]

 Page:
 omega speedmaster replica
created by jrhansheng[01:34 AM]

 Page:
 omega seamaster replica
created by jrhansheng