svn commit: r877767 - /websites/staging/struts/trunk/content/
Author: buildbot Date: Mon Sep 9 07:26:00 2013 New Revision: 877767 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 Mon Sep 9 07:26:00 2013 @@ -1 +1 @@ -1520906 +1520971
svn commit: r1520971 - /struts/site/branches/next/content/markdown/birdseye.md
Author: grobmeier Date: Mon Sep 9 07:25:57 2013 New Revision: 1520971 URL: http://svn.apache.org/r1520971 Log: why should you use struts draft Modified: struts/site/branches/next/content/markdown/birdseye.md Modified: struts/site/branches/next/content/markdown/birdseye.md URL: http://svn.apache.org/viewvc/struts/site/branches/next/content/markdown/birdseye.md?rev=1520971&r1=1520970&r2=1520971&view=diff == --- struts/site/branches/next/content/markdown/birdseye.md (original) +++ struts/site/branches/next/content/markdown/birdseye.md Mon Sep 9 07:25:57 2013 @@ -56,4 +56,33 @@ is the best choice for teams who value e ## Why should you use Apache Struts? -TODO \ No newline at end of file +Apache Struts is a modern, maintained and full-featured web framework. It has been there +for years and give the huge user base it is unlikely it will go away anytime soon +in the future. Not only that we have dedicated users and developers on the project. +Apache Struts is licensed to the Apache License 2.0 and this will not change. We maintain +a clean IP and you are "safe" to use the project. Sometimes you are not "safe" to use +a project when a company controls the SCM. Access to Source Code doesn't mean it is free. +With Apache Struts, you are not only free to "do what you want with it", you can even +contribute (which is not always the case). And best of it: you can become a part of the +core team too. + +It is usually very easy to integrate other technologies with Apache Struts. If you are +using an ORM like Apache Cayenne, Hibernate or JDBC you will not have any restrictions. +Apache Struts is not even tied too much to a frontend technology. In old days it was +JSP, then came Velocity and Freemarker. Nowadays you might build your web application +with just static HTML and AngularJS. Or you want to use Sitemesh or Tiles. This all +is no problem due to Struts elegant and easy to use extension mechanisms. + +Unlike other, component oriented frameworks, we do not aim to hide the stateless nature +of the web. We think it is perfectly acceptable to build upon a Request/Response cycle. +We also think the MVC pattern is not so bad, just because it is old. In fact, we believe +the Apache Struts architecture is clean and easy to understand. + +Of course, if you wish to build components on the server side which render on the front end +side, you are most likely wrong with Struts. This is a different approach which promises +to reduce the amount of HTML/JavaScript knowledge needed and to create reusable components for +the view layer. Projects like http://wicket.apache.org";>Wicket and +http://tapestry.apache.org";>Tapestry serve this purpose very well. As with every +framework you need to decide if it makes sense for you to build components or if +you are better with the Struts-approach. +
svn commit: r1520976 - in /struts/site/branches/next/content: resources/images/asf-logo.gif site.xml
Author: grobmeier Date: Mon Sep 9 07:36:15 2013 New Revision: 1520976 URL: http://svn.apache.org/r1520976 Log: reversed order of logos, made asf logo a bit smaller Added: struts/site/branches/next/content/resources/images/asf-logo.gif (with props) Modified: struts/site/branches/next/content/site.xml Added: struts/site/branches/next/content/resources/images/asf-logo.gif URL: http://svn.apache.org/viewvc/struts/site/branches/next/content/resources/images/asf-logo.gif?rev=1520976&view=auto == Binary file - no diff available. Propchange: struts/site/branches/next/content/resources/images/asf-logo.gif -- svn:mime-type = image/gif Modified: struts/site/branches/next/content/site.xml URL: http://svn.apache.org/viewvc/struts/site/branches/next/content/site.xml?rev=1520976&r1=1520975&r2=1520976&view=diff == --- struts/site/branches/next/content/site.xml (original) +++ struts/site/branches/next/content/site.xml Mon Sep 9 07:36:15 2013 @@ -20,16 +20,16 @@ - + -Apache Software Foundation -http://www.apache.org/images/asf-logo.gif -http://www.apache.org/ - - Apache Struts images/struts.gif http://struts.apache.org/ + + +Apache Software Foundation +images/asf-logo.gif +http://www.apache.org
svn commit: r877769 - /websites/staging/struts/trunk/content/
Author: buildbot Date: Mon Sep 9 07:36:18 2013 New Revision: 877769 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 Mon Sep 9 07:36:18 2013 @@ -1 +1 @@ -1520971 +1520976
svn commit: r1520995 - /struts/site/branches/next/content/xdoc/mail.xml
Author: grobmeier Date: Mon Sep 9 08:41:32 2013 New Revision: 1520995 URL: http://svn.apache.org/r1520995 Log: refactored mailing lists Modified: struts/site/branches/next/content/xdoc/mail.xml Modified: struts/site/branches/next/content/xdoc/mail.xml URL: http://svn.apache.org/viewvc/struts/site/branches/next/content/xdoc/mail.xml?rev=1520995&r1=1520994&r2=1520995&view=diff == --- struts/site/branches/next/content/xdoc/mail.xml (original) +++ struts/site/branches/next/content/xdoc/mail.xml Mon Sep 9 08:41:32 2013 @@ -23,194 +23,156 @@ limitations under the License. - - A mailing list is an electronic discussion forum that anyone -can -subscribe to. When someone sends an email message to the -mailing list, -a copy of that message is broadcast to everyone who is -subscribed to -that mailing list. Mailing lists are the primary means of -communication -for people working within the Apache Struts Project. +can subscribe to. When someone sends an email message to the +mailing list, a copy of that message is broadcast to everyone who is +subscribed to that mailing list. Mailing lists are the primary means of +communication for people working within the Apache Struts Project. - + +HEADS UP! + +A message sent to a public mailing list +cannot be unpublished. Although we might be able to modify our own +mail archives, the message is mirrored to a lot of other archiving +systems which we do not have under control. Therefore +almost 100% of all delete requests are denied. Please make +sure you do not send any potential sensitive information to the mailing list, +including passwords, server names, ips and so on. + + + + + +Name +Subscribe +Unsubscribe +Description + + + +Struts-Announcements +mailto:announcements-subscr...@struts.apache.org?subject=subscribe&body=subscribe";>announcements-subscr...@struts.apache.org +mailto:announcements-unsubscr...@struts.apache.org?subject=unsubscribe&body=unsubscribe";>announcements-unsubscr...@struts.apache.org +Major Announcements, low-volume, read only + + + +Struts-User +mailto:user-subscr...@struts.apache.org?subject=subscribe&body=subscribe";>user-subscr...@struts.apache.org + mailto:user-unsubscr...@struts.apache.org?subject=unsubscribe&body=unsubscribe";>user-unsubscr...@struts.apache.org +Contact to other Struts-users and ask questions on installation or features + + + +Users Digest +mailto:user-digest-subscr...@struts.apache.org?subject=subscribe&body=subscribe";>user-digest-subscr...@struts.apache.org +mailto:user-digest-unsubscr...@struts.apache.org?subject=unsubscribe&body=unsubscribe";>user-digest-unsubscr...@struts.apache.org +Get a daily digest of the Struts Users list + + + + +You can read the http://mail-archives.apache.org/mod_mbox/struts-user/";>ASF Mail +or the http://markmail.org/list/org.apache.struts.users/";>Mark Mail Archives if you +are looking for older discussions. There are many other archives out there as well. + + +If you want to discuss patches or contribute to Struts you should +subscribe to the developers list. + + + + Mailing lists provide a simple and effective communication -mechanism. -With potentially thousands of subscribers, there is a -common set of -etiquette guidelines that you should observe. Please keep +mechanism. With potentially thousands of subscribers, there is a +common set of etiquette guidelines that you should observe. Please keep on reading. - + Join the lists that are appropriate for your
svn commit: r877774 - /websites/staging/struts/trunk/content/
Author: buildbot Date: Mon Sep 9 08:41:36 2013 New Revision: 84 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 Mon Sep 9 08:41:36 2013 @@ -1 +1 @@ -1520976 +1520995
svn commit: r877775 - /websites/staging/struts/trunk/content/
Author: buildbot Date: Mon Sep 9 08:43:26 2013 New Revision: 85 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 Mon Sep 9 08:43:26 2013 @@ -1 +1 @@ -1520995 +1520996
svn commit: r1520996 - /struts/site/branches/next/content/site.xml
Author: grobmeier Date: Mon Sep 9 08:43:22 2013 New Revision: 1520996 URL: http://svn.apache.org/r1520996 Log: reduced link label to minimum Modified: struts/site/branches/next/content/site.xml Modified: struts/site/branches/next/content/site.xml URL: http://svn.apache.org/viewvc/struts/site/branches/next/content/site.xml?rev=1520996&r1=1520995&r2=1520996&view=diff == --- struts/site/branches/next/content/site.xml (original) +++ struts/site/branches/next/content/site.xml Mon Sep 9 08:43:22 2013 @@ -84,7 +84,7 @@ href="mail.html" /> https://issues.apache.org/jira/browse/WW"; />
svn commit: r877776 - /websites/staging/struts/trunk/content/
Author: buildbot Date: Mon Sep 9 09:03:24 2013 New Revision: 86 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 Mon Sep 9 09:03:24 2013 @@ -1 +1 @@ -1520996 +1521001
svn commit: r1521001 - in /struts/site/branches/next/content: fml/helping.fml markdown/youatstruts.md
Author: grobmeier Date: Mon Sep 9 09:03:20 2013 New Revision: 1521001 URL: http://svn.apache.org/r1521001 Log: initial text youatstruts, took some from the faq Added: struts/site/branches/next/content/markdown/youatstruts.md - copied, changed from r1520971, struts/site/branches/next/content/markdown/birdseye.md Modified: struts/site/branches/next/content/fml/helping.fml Modified: struts/site/branches/next/content/fml/helping.fml URL: http://svn.apache.org/viewvc/struts/site/branches/next/content/fml/helping.fml?rev=1521001&r1=1521000&r2=1521001&view=diff == --- struts/site/branches/next/content/fml/helping.fml (original) +++ struts/site/branches/next/content/fml/helping.fml Mon Sep 9 09:03:20 2013 @@ -36,122 +36,6 @@ limitations under the License. --> - -Getting Involved - - - -Every volunteer project obtains its strength -from the people involved in it. -We invite you to participate as much or as little as you -choose. -The roles and responsibilities that people can assume in -the project -are based on merit. -Everybody's input matters! - - - -Here is one developer's advice how to get involved. -It specifically talks about Tomcat, -but the general idea can applied to any of the Apache -Projects. - - - - -http://jakarta.apache.org/site/contributing.html";> -Contributing --- Craig R. McClanahan - - - - -Here is another comment that was sent to the Jakarta -Turbine Mailing -List about the open source process and the contrast -between how an -open source product and a proprietary product improve -through the user -community. - - - - -http://jakarta.apache.org/site/understandingopensource.html";> -Understanding Opensource --- Cameron Riley - - - - -While written for ASF developers, -the Rules for Revolutionaries provides insight into how -the -collaborative process works, -and how our process differs from working on a hierarchical -team. - - - - -http://incubator.apache.org/learn/rules-for-revolutionaries.html";> -Rules for Revolutionaries --- James Duncan Davidson - - - - -Just using the products is a very important role. -We need people who will report issues, contribute patches, -suggest features, and so forth. -Your feedback helps the technology to evolve. - - - - - - -Joining the Mailing Lists - - - -There are a variety of ways to participate. -Regardless of how you choose to participate, -we suggest you join our mailing lists. - - - -Before joining any ASF mailing list, please be sure to -read the -Mailing List Guidelines. -If you have read and understood these guidelines, you are -welcome to -join the Struts mailing -lists. - - - -Before posting a new question, be sure to consult one of -the - -Mailing List Archives - -and the very excellent -http://www.catb.org/~esr/faqs/smart-questions.html";> -How To Ask Questions The Smart Way -by Eric Raymond. - - - -Please do be sure to -http://expita.com/nomime.html";>turn off -HTML -in your email client before posting. - - - - What can my company do to help support Apache
svn commit: r1521003 - /struts/site/branches/next/content/xdoc/mail.xml
Author: grobmeier Date: Mon Sep 9 09:12:11 2013 New Revision: 1521003 URL: http://svn.apache.org/r1521003 Log: added missing p tag Modified: struts/site/branches/next/content/xdoc/mail.xml Modified: struts/site/branches/next/content/xdoc/mail.xml URL: http://svn.apache.org/viewvc/struts/site/branches/next/content/xdoc/mail.xml?rev=1521003&r1=1521002&r2=1521003&view=diff == --- struts/site/branches/next/content/xdoc/mail.xml (original) +++ struts/site/branches/next/content/xdoc/mail.xml Mon Sep 9 09:12:11 2013 @@ -77,9 +77,11 @@ limitations under the License. -You can read the http://mail-archives.apache.org/mod_mbox/struts-user/";>ASF Mail -or the http://markmail.org/list/org.apache.struts.users/";>Mark Mail Archives if you -are looking for older discussions. There are many other archives out there as well. + +You can read the http://mail-archives.apache.org/mod_mbox/struts-user/";>ASF Mail +or the http://markmail.org/list/org.apache.struts.users/";>Mark Mail Archives if you +are looking for older discussions. There are many other archives out there as well. + If you want to discuss patches or contribute to Struts you should
svn commit: r877778 - /websites/staging/struts/trunk/content/
Author: buildbot Date: Mon Sep 9 09:12:14 2013 New Revision: 88 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 Mon Sep 9 09:12:14 2013 @@ -1 +1 @@ -1521001 +1521003
svn commit: r877779 - /websites/staging/struts/trunk/content/
Author: buildbot Date: Mon Sep 9 09:12:28 2013 New Revision: 89 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 Mon Sep 9 09:12:28 2013 @@ -1 +1 @@ -1521003 +1521004
svn commit: r1521004 - /struts/site/branches/next/content/xdoc/dev/dev-mail.xml
Author: grobmeier Date: Mon Sep 9 09:12:25 2013 New Revision: 1521004 URL: http://svn.apache.org/r1521004 Log: refactored dev mailing list Modified: struts/site/branches/next/content/xdoc/dev/dev-mail.xml Modified: struts/site/branches/next/content/xdoc/dev/dev-mail.xml URL: http://svn.apache.org/viewvc/struts/site/branches/next/content/xdoc/dev/dev-mail.xml?rev=1521004&r1=1521003&r2=1521004&view=diff == --- struts/site/branches/next/content/xdoc/dev/dev-mail.xml (original) +++ struts/site/branches/next/content/xdoc/dev/dev-mail.xml Mon Sep 9 09:12:25 2013 @@ -17,185 +17,59 @@ limitations under the License. // 78 --> - Dev Mailing List - - - -The project hosts several mailing lists. The -user list is devoted to product support. -The project also hosts several product development lists. -For help using Struts, -subscribe to user list. - - - - -Archives Carrying Struts Development Lists - - -http://mail-archives.apache.org/";>ASF Mail -Archives - - - -http://mail-archives.apache.org/mod_mbox/struts-dev/";> -Dev. list - - -http://mail-archives.apache.org/mod_mbox/struts-commits/";> -Commits list - - -http://mail-archives.apache.org/mod_mbox/struts-issues/";> -Issues list - - - - - -http://struts.markmail.org/";>Mark Mail - - - -http://struts.markmail.org/search/?q=type:announcements/";> -Announcements - - -http://markmail.org/list/org.apache.struts.dev/";> -Dev. list - - -http://markmail.org/list/org.apache.struts.commits/";> -Commits list - - -http://markmail.org/list/org.apache.struts.issues/";> -Issues list - - - -Mail-Archive - - -http://www.mail-archive.com/dev%40struts.apache.org/";> -Dev. list - - - -Gmane - - -http://news.gmane.org/gmane.comp.jakarta.struts.devel/";> -Dev. List - - - -Mailing list ARChives - - -http://marc.theaimsgroup.com/?l=struts-dev&r=1&w=2";> -Dev. List - - - -Nabble - - -http://www.nabble.com/Struts---Dev-f205.html";> -Dev. List - - - -Open Symphony - - -http://forums.opensymphony.com/forum.jspa?forumID=34";> -Dev. List (as a Forum) - - - - - - - - -If you've read the -guidelines, -please subscribe to whichever -Struts development lists are of interest. - - - - - -STRUTS-DEV Mailing List -- Subscribe to this mailing -list to communicate with other developers interested -in expanding and -improving the functionality supported by Struts -itself. - -[ -mailto:dev-subscr...@struts.apache.org?subject=subscribe&body=subscribe";> -Subscribe
svn commit: r1521007 - in /struts/site/branches/next/content: site.xml xdoc/dev/minutes.xml
Author: grobmeier Date: Mon Sep 9 09:14:48 2013 New Revision: 1521007 URL: http://svn.apache.org/r1521007 Log: removed 5 yrs old minutes which obviously are not maintained anymore Removed: struts/site/branches/next/content/xdoc/dev/minutes.xml Modified: struts/site/branches/next/content/site.xml Modified: struts/site/branches/next/content/site.xml URL: http://svn.apache.org/viewvc/struts/site/branches/next/content/site.xml?rev=1521007&r1=1521006&r2=1521007&view=diff == --- struts/site/branches/next/content/site.xml (original) +++ struts/site/branches/next/content/site.xml Mon Sep 9 09:14:48 2013 @@ -119,10 +119,6 @@ name="PMC Charter" href="dev/bylaws.html" /> -
svn commit: r877780 - /websites/staging/struts/trunk/content/
Author: buildbot Date: Mon Sep 9 09:14:52 2013 New Revision: 877780 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 Mon Sep 9 09:14:52 2013 @@ -1 +1 @@ -1521004 +1521007
svn commit: r877781 - /websites/staging/struts/trunk/content/
Author: buildbot Date: Mon Sep 9 09:15:44 2013 New Revision: 877781 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 Mon Sep 9 09:15:44 2013 @@ -1 +1 @@ -1521007 +1521009
svn commit: r1521009 - /struts/site/branches/next/content/xdoc/dev/site.xml
Author: grobmeier Date: Mon Sep 9 09:15:41 2013 New Revision: 1521009 URL: http://svn.apache.org/r1521009 Log: removed unused site.xml Removed: struts/site/branches/next/content/xdoc/dev/site.xml
svn commit: r1521010 - /struts/site/branches/next/content/site.xml
Author: grobmeier Date: Mon Sep 9 09:16:42 2013 New Revision: 1521010 URL: http://svn.apache.org/r1521010 Log: removed link to 404 sandbox page Modified: struts/site/branches/next/content/site.xml Modified: struts/site/branches/next/content/site.xml URL: http://svn.apache.org/viewvc/struts/site/branches/next/content/site.xml?rev=1521010&r1=1521009&r2=1521010&view=diff == --- struts/site/branches/next/content/site.xml (original) +++ struts/site/branches/next/content/site.xml Mon Sep 9 09:16:42 2013 @@ -124,10 +124,7 @@ name="Volunteers" href="dev/volunteers.html" /> -http://struts.apache.org/struts-sandbox/index.html"; -/> + http://svn.apache.org/viewvc/struts/";
svn commit: r877782 - /websites/staging/struts/trunk/content/
Author: buildbot Date: Mon Sep 9 09:16:45 2013 New Revision: 877782 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 Mon Sep 9 09:16:45 2013 @@ -1 +1 @@ -1521009 +1521010
svn commit: r877784 - /websites/staging/struts/trunk/content/
Author: buildbot Date: Mon Sep 9 09:23:23 2013 New Revision: 877784 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 Mon Sep 9 09:23:23 2013 @@ -1 +1 @@ -1521010 +1521011
svn commit: r877797 - /websites/staging/struts/trunk/content/
Author: buildbot Date: Mon Sep 9 13:20:23 2013 New Revision: 877797 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 Mon Sep 9 13:20:23 2013 @@ -1 +1 @@ -1521011 +1521090
svn commit: r1521090 - in /struts/site/branches/next/content: markdown/dev/ markdown/dev/git-for-struts.md site.xml
Author: grobmeier Date: Mon Sep 9 13:20:19 2013 New Revision: 1521090 URL: http://svn.apache.org/r1521090 Log: docs how to work with git and svn in Struts Added: struts/site/branches/next/content/markdown/dev/ struts/site/branches/next/content/markdown/dev/git-for-struts.md Modified: struts/site/branches/next/content/site.xml Added: struts/site/branches/next/content/markdown/dev/git-for-struts.md URL: http://svn.apache.org/viewvc/struts/site/branches/next/content/markdown/dev/git-for-struts.md?rev=1521090&view=auto == --- struts/site/branches/next/content/markdown/dev/git-for-struts.md (added) +++ struts/site/branches/next/content/markdown/dev/git-for-struts.md Mon Sep 9 13:20:19 2013 @@ -0,0 +1,90 @@ +# Using Git with Struts + +So far, Struts 2 is using SVN. There are plans to move on to GIT but +the plannings have not been completed yet. In addition we'll only +move with new versions of Struts to Git. Struts 1 will stay in SVN. + +Luckily there is a way to work with Git backed by SVN. This document +explains, how a developer: + + * can work on outdated code like Struts 1 with Git + * can synchronize Git from Github with the Struts 2 repository + +This page reflects some knowledge from the +[Git at Apache project](http://wiki.apache.org/general/GitAtApache). + +## Setting up your Struts environment + +git clone git://git.apache.org/struts2.git +cd struts2/.git +wget http://git.apache.org/authors.txt +cd .. +git config svn.authorsfile ".git/authors.txt" + +# check if your username and email are identical to those in the author file +git config user.name +git config user.email + +# if they are not identical, set the ASF values locally +# git config user.name +# 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 + + +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: + +Unable to determine upstream SVN information from working tree history + +You can go on for now and ignore this message. +After this, you'll need to fetch the old history. + +git svn fetch --log-window-size 1 + +Heads 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: + +git svn dcommit + +This will commit all your git commits to svn. One git commit == 1 svn revision. Consider rebase. + + +## Working with SVN branches + +Create a new local branch and switch to it in GIT: + +git checkout -b mybranch-svn origin/mybranch + +Map the GIT branch to the according SVN branch: + +git reset --hard origin/mybranch + +For reference, you can override the commit url: + +git svn dcommit --commit-url https://svn.apache.org/repos/asf/struts/struts2/branches/mybranch + +## Working with remote branches from GitHub + +You can add a remote branch from GitHub like this: + +git remote add opensourceio https://github.com/opensourceio/struts.git + +Pull changes with: + +git pull opensourceio anotherbranch + +When merge conflicts happen, these can be resolved using: + +git mergetool + +After the merge, you need to commit the changes to svn with: + +git svn dcommit + +## Further reading + + * [Git at Apache](http://wiki.apache.org/general/GitAtApache) + * [git-svn is a gateway drug](http://www.robbyonrails.com/articles/2008/04/10/git-svn-is-a-gateway-drug) Modified: struts/site/branches/next/content/site.xml URL: http://svn.apache.org/viewvc/struts/site/branches/next/content/site.xml?rev=1521090&r1=1521089&r2=1521090&view=diff == --- struts/site/branches/next/content/site.xml (original) +++ struts/site/branches/next/content/site.xml Mon Sep 9 13:20:19 2013 @@ -108,6 +108,9 @@ href="dev/dev-mail.html" /> +
svn commit: r877800 - /websites/staging/struts/trunk/content/
Author: buildbot Date: Mon Sep 9 13:29:08 2013 New Revision: 877800 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 Mon Sep 9 13:29:08 2013 @@ -1 +1 @@ -1521090 +1521096
svn commit: r1521096 - /struts/site/branches/next/content/xdoc/index.xml
Author: grobmeier Date: Mon Sep 9 13:29:05 2013 New Revision: 1521096 URL: http://svn.apache.org/r1521096 Log: removed redundant block, announce release instead Modified: struts/site/branches/next/content/xdoc/index.xml Modified: struts/site/branches/next/content/xdoc/index.xml URL: http://svn.apache.org/viewvc/struts/site/branches/next/content/xdoc/index.xml?rev=1521096&r1=1521095&r2=1521096&view=diff == --- struts/site/branches/next/content/xdoc/index.xml (original) +++ struts/site/branches/next/content/xdoc/index.xml Mon Sep 9 13:29:05 2013 @@ -28,7 +28,7 @@ limitations under the License. -Apache Struts 2.3.15.1 GA +Apache Struts The Apache Struts web framework is a free open-source solution for creating elegant and modern Java web applications. While the predecessor Struts 1 @@ -38,16 +38,14 @@ limitations under the License. http://struts.apache.org/download.cgi#struts23151"; class="btn btn-primary btn-large">Download Technology Primer - -Latest release: 16 July 2013. http://struts.apache.org/release/2.3.x/docs/version-notes-23151.html";>Version notes -Key technologies -Need a birds perspective on Struts 2 to decide if it is right for? -Please read our Technology Primer +Struts 2.3.15.1 GA +Apache Struts 2.3.15.1 GA has been released on 16 July 2013. +http://struts.apache.org/release/2.3.x/docs/version-notes-23151.html";>Version notes Want to help?
svn commit: r1521097 - /struts/site/branches/next/content/site.xml
Author: grobmeier Date: Mon Sep 9 13:29:46 2013 New Revision: 1521097 URL: http://svn.apache.org/r1521097 Log: call releases page downloads, renamed first steps to documentation Modified: struts/site/branches/next/content/site.xml Modified: struts/site/branches/next/content/site.xml URL: http://svn.apache.org/viewvc/struts/site/branches/next/content/site.xml?rev=1521097&r1=1521096&r2=1521097&view=diff == --- struts/site/branches/next/content/site.xml (original) +++ struts/site/branches/next/content/site.xml Mon Sep 9 13:29:46 2013 @@ -38,7 +38,7 @@ href="index.html" /> - + + +https://issues.apache.org/jira/browse/WW"; +/> + + + + @@ -78,21 +93,6 @@ href="http://struts.apache.org/release/1.3.x/index.html"; /> - - -https://issues.apache.org/jira/browse/WW"; -/> - - -
svn commit: r877801 - /websites/staging/struts/trunk/content/
Author: buildbot Date: Mon Sep 9 13:29:49 2013 New Revision: 877801 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 Mon Sep 9 13:29:49 2013 @@ -1 +1 @@ -1521096 +1521097
svn commit: r1521098 - /struts/site/branches/next/content/xdoc/downloads.xml
Author: grobmeier Date: Mon Sep 9 13:30:07 2013 New Revision: 1521098 URL: http://svn.apache.org/r1521098 Log: limit max size of vulnerability column to half Modified: struts/site/branches/next/content/xdoc/downloads.xml Modified: struts/site/branches/next/content/xdoc/downloads.xml URL: http://svn.apache.org/viewvc/struts/site/branches/next/content/xdoc/downloads.xml?rev=1521098&r1=1521097&r2=1521098&view=diff == --- struts/site/branches/next/content/xdoc/downloads.xml (original) +++ struts/site/branches/next/content/xdoc/downloads.xml Mon Sep 9 13:30:07 2013 @@ -115,7 +115,7 @@ limitations under the License. Release Release Date -Vulnerability +Vulnerability Version Notes
svn commit: r877802 - /websites/staging/struts/trunk/content/
Author: buildbot Date: Mon Sep 9 13:30:12 2013 New Revision: 877802 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 Mon Sep 9 13:30:12 2013 @@ -1 +1 @@ -1521097 +1521098
