svn commit: r1521783 - in /struts/struts2/trunk/archetypes/struts2-archetype-angularjs: ./ src/main/resources/META-INF/maven/ src/main/resources/archetype-resources/ src/main/resources/archetype-resou
Author: grobmeier Date: Wed Sep 11 10:24:18 2013 New Revision: 1521783 URL: http://svn.apache.org/r1521783 Log: Add archetype for Struts2 with AngularJS Added: struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/README.txt (with props) struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/java/InitListener.java (with props) struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/appengine-web.xml (with props) struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/site/ struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/site/site.xml - copied, changed from r1521602, struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/test/java/actions/IndexTest.java struts/struts2/trunk/archetypes/struts2-archetype-angularjs/struts2-archetype-convention (1).iml struts/struts2/trunk/archetypes/struts2-archetype-angularjs/struts2-archetype-convention.iml Modified: struts/struts2/trunk/archetypes/struts2-archetype-angularjs/README.txt struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/META-INF/maven/archetype-metadata.xml struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/LICENSE.txt struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/NOTICE.txt struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/pom.xml struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/java/actions/HelloAction.java struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/java/actions/Index.java struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/resources/package.properties struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/resources/package_es.properties struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/resources/struts.xml struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/content/hello.jsp struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/test/java/actions/HelloActionTest.java struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/test/java/actions/IndexTest.java 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=1521783&r1=1521782&r2=1521783&view=diff == --- struts/struts2/trunk/archetypes/struts2-archetype-angularjs/README.txt (original) +++ struts/struts2/trunk/archetypes/struts2-archetype-angularjs/README.txt Wed Sep 11 10:24:18 2013 @@ -1,48 +1,48 @@ -INFORMATION -=== -- This is Struts 2's "HTML5 AngularJS" Maven Archetype - -USAGE -= - -- change directory to where the web app template is to be created, - for example, a 'projects' directory (which you may need to create): - - cd /home/tmjee/projects - -- run the following command to generate the sample web app template, assuming :- -- root java package -> com.mycompany.mysystem - -- the webapp war name -> myWebApp - - - mvn archetype:generate -B -DgroupId=com.mycompany.mysystem \ - -DartifactId=myWebApp \ - -DarchetypeGroupId=org.apache.struts \ - -DarchetypeArtifactId=struts2-archetype-angularjs \ - -DarchetypeVersion= \ - -DremoteRepositories=http://people.apache.org/repo/m2-snapshot-repository - -IMPORTANT: -== -- The generated template uses the 'example' package, regardless of what you -specify during mvn archetype:create. - -Unfortunately, the Maven Archetype plugin does not currently provide a way to -move resource files into a package structure. - -- to compile, execute - mvn compile - -- to run test cases execute - mvn test - -- to clean execute - mvn clean - -- to package execute - mvn package - -- to start it with jetty6 execute - mvn jetty:run - +INFORMATION +=
svn commit: r1521819 - in /struts/struts2/trunk/archetypes/struts2-archetype-angularjs: ./ src/main/resources/META-INF/maven/ src/main/resources/archetype-resources/ src/main/resources/archetype-resou
Author: grobmeier Date: Wed Sep 11 12:32:00 2013 New Revision: 1521819 URL: http://svn.apache.org/r1521819 Log: reverted wrong git svn dcommit Removed: struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/README.txt struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/java/InitListener.java struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/appengine-web.xml struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/site/ struts/struts2/trunk/archetypes/struts2-archetype-angularjs/struts2-archetype-convention (1).iml struts/struts2/trunk/archetypes/struts2-archetype-angularjs/struts2-archetype-convention.iml Modified: struts/struts2/trunk/archetypes/struts2-archetype-angularjs/README.txt struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/META-INF/maven/archetype-metadata.xml struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/LICENSE.txt struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/NOTICE.txt struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/pom.xml struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/java/actions/HelloAction.java struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/java/actions/Index.java struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/resources/package.properties struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/resources/package_es.properties struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/resources/struts.xml struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/content/hello.jsp struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/test/java/actions/HelloActionTest.java struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/test/java/actions/IndexTest.java 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=1521819&r1=1521818&r2=1521819&view=diff == --- struts/struts2/trunk/archetypes/struts2-archetype-angularjs/README.txt (original) +++ struts/struts2/trunk/archetypes/struts2-archetype-angularjs/README.txt Wed Sep 11 12:32:00 2013 @@ -1,48 +1,48 @@ -INFORMATION -=== -- This is Struts 2's "Blank Convetion" Maven Archetype - -USAGE -= - -- change directory to where the web app template is to be created, - for example, a 'projects' directory (which you may need to create): - - cd /home/tmjee/projects - -- run the following command to generate the sample web app template, assuming :- -- root java package -> com.mycompany.mysystem - -- the webapp war name -> myWebApp - - - mvn archetype:generate -B -DgroupId=com.mycompany.mysystem \ - -DartifactId=myWebApp \ - -DarchetypeGroupId=org.apache.struts \ - -DarchetypeArtifactId=struts2-archetype-convention \ - -DarchetypeVersion=2.1.8 \ - -DremoteRepositories=http://people.apache.org/repo/m2-snapshot-repository - -IMPORTANT: -== -- The generated template uses the 'example' package, regardless of what you -specify during mvn archetype:create. - -Unfortunately, the Maven Archetype plugin does not currently provide a way to -move resource files into a package structure. - -- to compile, execute - mvn compile - -- to run test cases execute - mvn test - -- to clean execute - mvn clean - -- to package execute - mvn package - -- to start it with jetty6 execute - mvn jetty:run - +INFORMATION +=== +- This is Struts 2's "HTML5 AngularJS" Maven Archetype + +USAGE += + +- change directory to where the web app template is to be created, + for example, a 'projects' directory (which you may need to create): + + cd /home/tmjee/projects + +- run the following command to generate the sample
svn commit: r1521820 - /struts/site/trunk/content/markdown/dev/git-for-struts.md
Author: grobmeier Date: Wed Sep 11 12:35:52 2013 New Revision: 1521820 URL: http://svn.apache.org/r1521820 Log: some more corrections and tipps 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=1521820&r1=1521819&r2=1521820&view=diff == --- struts/site/trunk/content/markdown/dev/git-for-struts.md (original) +++ struts/site/trunk/content/markdown/dev/git-for-struts.md Wed Sep 11 12:35:52 2013 @@ -29,7 +29,7 @@ This page reflects some knowledge from t # git config user.name # git config user.email -git svn init -s https://svn.apache.org/repos/asf/struts/struts2/ +git svn init --prefix=originsvn/ -s https://svn.apache.org/repos/asf/struts/struts2/ git svn rebase @@ -55,6 +55,19 @@ When you change something in the code, y git svn dcommit This will commit all your git commits to svn. One git commit == 1 svn revision. Consider rebase. +Please don't forget, there is the --dry-run option, which tests the commit only. + +It will output things like: + +diff-tree 56bfadfc12a8129e5ea6668714fae34704242636~1 56bfadfc12a8129e5ea6668714fae34704242636 + +You can watch the modification with git again: + +git diff-tree 56bfadfc12a8129e5ea6668714fae34704242636~1 56bfadfc12a8129e5ea6668714fae34704242636 + +Which will output for example: + +:00 100644 e2b24b623fc1cf2d0316a48bb1d69a9eeb7e0719 A .gitignore ## Working with SVN branches @@ -92,12 +105,13 @@ If you are sending a pull request, pleas 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) +[https://github.com/apachestruts/struts2](https://github.com/apachestruts/struts2) -It is of course possible to add us as upstream repo: +Please send the pull request to "trunk". -git remote add upstream https://github.com/apachestruts/struts2 +It is of course possible to add us as upstream repo: +git remote add upstream g...@github.com:apachestruts/struts2 ## Working with remote branches from GitHub @@ -117,6 +131,14 @@ After the merge, you need to commit the git svn dcommit +## What, if the svn commit goes wrong + +When git svn messed up the repository, you just can revert the SVN revision. Reverting in SVN +is basically merging a previous commit. Like: + +svn merge -r1521783:1521602 . +svn commit -m 'reverted wrong git svn dcommit' . + ## Further reading * [Git at Apache](http://wiki.apache.org/general/GitAtApache)
svn commit: r878035 - in /websites/staging/struts/trunk/content: ./ dev/
Author: buildbot Date: Wed Sep 11 12:37:30 2013 New Revision: 878035 Log: Staging update by buildbot for struts Modified: websites/staging/struts/trunk/content/ (props changed) websites/staging/struts/trunk/content/announce-2002.html websites/staging/struts/trunk/content/announce-2003.html websites/staging/struts/trunk/content/announce-2004.html websites/staging/struts/trunk/content/announce-2005.html websites/staging/struts/trunk/content/announce-2006.html websites/staging/struts/trunk/content/announce-2007.html websites/staging/struts/trunk/content/announce-2008.html websites/staging/struts/trunk/content/announce-2009.html websites/staging/struts/trunk/content/announce-2010.html websites/staging/struts/trunk/content/announce-2011.html websites/staging/struts/trunk/content/announce-2012.html websites/staging/struts/trunk/content/announce.html websites/staging/struts/trunk/content/birdseye.html websites/staging/struts/trunk/content/dev/builds.html websites/staging/struts/trunk/content/dev/bylaws.html websites/staging/struts/trunk/content/dev/dev-mail.html websites/staging/struts/trunk/content/dev/git-for-struts.html websites/staging/struts/trunk/content/dev/releases.html websites/staging/struts/trunk/content/dev/troubleshooting-git-svn.html websites/staging/struts/trunk/content/dev/volunteers.html websites/staging/struts/trunk/content/download.html websites/staging/struts/trunk/content/downloads.html websites/staging/struts/trunk/content/faqs.html websites/staging/struts/trunk/content/helping.html websites/staging/struts/trunk/content/index.html websites/staging/struts/trunk/content/javadoc.html websites/staging/struts/trunk/content/kickstart.html websites/staging/struts/trunk/content/mail.html websites/staging/struts/trunk/content/primer.html websites/staging/struts/trunk/content/release-checklist.html websites/staging/struts/trunk/content/roadmap.html websites/staging/struts/trunk/content/security.html websites/staging/struts/trunk/content/struts1eol-announcement.html websites/staging/struts/trunk/content/struts1eol-press.html websites/staging/struts/trunk/content/youatstruts.html Propchange: websites/staging/struts/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Wed Sep 11 12:37:30 2013 @@ -1 +1 @@ -1521634 +1521820 Modified: websites/staging/struts/trunk/content/announce-2002.html == --- websites/staging/struts/trunk/content/announce-2002.html (original) +++ websites/staging/struts/trunk/content/announce-2002.html Wed Sep 11 12:37:30 2013 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"> - + Announcements - 2002 and prior @@ -164,7 +164,7 @@ - Last Published: 2013-09-10 + Last Published: 2013-09-11 Modified: websites/staging/struts/trunk/content/announce-2003.html == --- websites/staging/struts/trunk/content/announce-2003.html (original) +++ websites/staging/struts/trunk/content/announce-2003.html Wed Sep 11 12:37:30 2013 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"> - + Announcements - 2003 @@ -164,7 +164,7 @@ - Last Published: 2013-09-10 + Last Published: 2013-09-11 Modified: websites/staging/struts/trunk/content/announce-2004.html == --- websites/staging/struts/trunk/content/announce-2004.html (original) +++ websites/staging/struts/trunk/content/announce-2004.html Wed Sep 11 12:37:30 2013 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"> - + Announcements - 2004 @@ -164,7 +164,7 @@ - Last Published: 2013-09-10 + Last Published: 2013-09-11 Modified: websites/staging/struts/trunk/content/announce-2005.html == --- websites/staging/struts/trunk/content/announce-2005.html (original) +++ websites/staging/struts/trunk/content/announce-2005.html Wed Sep 11 12:37:30 2013 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"> - +
svn commit: r1521944 - in /struts/struts2/trunk: apps/jboss-blank/ archetypes/ archetypes/struts2-archetype-dbportlet/ archetypes/struts2-archetype-portlet/ archetypes/struts2-archetype-starter/ plugi
Author: jogep Date: Wed Sep 11 17:25:25 2013 New Revision: 1521944 URL: http://svn.apache.org/r1521944 Log: Revert: WW-4197 Update Archetypes READMEs Removed: struts/struts2/trunk/apps/jboss-blank/struts2-jboss-blank.iml struts/struts2/trunk/archetypes/struts2-archetype-dbportlet/struts2-archetype-dbportlet.iml struts/struts2/trunk/archetypes/struts2-archetype-portlet/struts2-archetype-portlet.iml struts/struts2/trunk/archetypes/struts2-archetype-starter/struts2-archetype-starter.iml struts/struts2/trunk/archetypes/struts2-archetypes.iml struts/struts2/trunk/plugins/gxp/struts2-gxp-plugin.iml struts/struts2/trunk/plugins/struts2-plugins.iml
svn commit: r1521940 - in /struts/struts2/trunk: apps/jboss-blank/ archetypes/ archetypes/struts2-archetype-angularjs/ archetypes/struts2-archetype-blank/ archetypes/struts2-archetype-convention/ arch
Author: jogep Date: Wed Sep 11 17:06:05 2013 New Revision: 1521940 URL: http://svn.apache.org/r1521940 Log: WW-4197 Update Archetypes READMEs Added: struts/struts2/trunk/apps/jboss-blank/struts2-jboss-blank.iml struts/struts2/trunk/archetypes/struts2-archetype-dbportlet/struts2-archetype-dbportlet.iml struts/struts2/trunk/archetypes/struts2-archetype-portlet/struts2-archetype-portlet.iml struts/struts2/trunk/archetypes/struts2-archetype-starter/struts2-archetype-starter.iml struts/struts2/trunk/archetypes/struts2-archetypes.iml struts/struts2/trunk/plugins/gxp/struts2-gxp-plugin.iml struts/struts2/trunk/plugins/struts2-plugins.iml 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-portlet/README.txt struts/struts2/trunk/archetypes/struts2-archetype-starter/README.txt Added: struts/struts2/trunk/apps/jboss-blank/struts2-jboss-blank.iml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/jboss-blank/struts2-jboss-blank.iml?rev=1521940&view=auto == --- struts/struts2/trunk/apps/jboss-blank/struts2-jboss-blank.iml (added) +++ struts/struts2/trunk/apps/jboss-blank/struts2-jboss-blank.iml Wed Sep 11 17:06:05 2013 @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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=1521940&r1=1521939&r2=1521940&view=diff == --- struts/struts2/trunk/archetypes/struts2-archetype-angularjs/README.txt (original) +++ struts/struts2/trunk/archetypes/struts2-archetype-angularjs/README.txt Wed Sep 11 17:06:05 2013 @@ -16,12 +16,12 @@ USAGE - the webapp war name -> myWebApp - mvn archetype:generate -B -DgroupId=com.mycompany.mysystem \ +mvn archetype:generate -B -DgroupId=com.mycompany.mysystem \ -DartifactId=myWebApp \ -DarchetypeGroupId=org.apache.struts \ -DarchetypeArtifactId=struts2-archetype-angularjs \ -DarchetypeVersion= \ - -DremoteRepositories=http://people.apache.org/repo/m2-snapshot-repository + -DremoteRepositories=http://struts.apache.org 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=1521940&r1=1521939&r2=1521940&view=diff == --- struts/struts2/trunk/archetypes/struts2-archetype-blank/README.txt (original) +++ struts/struts2/trunk/archetypes/struts2-archetype-blank/README.txt Wed Sep 11 17:06:05 2013 @@ -16,13 +16,12 @@ USAGE - the webapp war name -> myWebApp - mvn archetype:create -DgroupId=com.myCompany.mySystem \ - -DartifactId=myWebApp \ - -DarchetypeGroupId=org.apache.struts \ - -DarchetypeArtifactId=struts2-archetype-blank \ - -DarchetypeVersion= \ - -DremoteRepositories=http://people.apache.org/repo/m2-snapshot-repository - +mvn archetype:generate -B -DgroupId=com.mycompany.mysystem \ + -DartifactId=myWebApp \ + -DarchetypeGroupId=org.apache.struts \ + -DarchetypeArtifactId=struts2-archetype-blank \ + -DarchetypeVersion= \ + -DremoteRepositories=http://struts.apache.org IMPORTANT: == - The generated template uses the 'example' package, regardless of what you Modified: struts/struts2/trunk/archetypes/struts2-archetype-convention/README.txt URL: http://svn
