You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by Rene Gielen <re...@gmail.com> on 2013/09/11 16:02:39 UTC
Re: bad commits with git...
This is when you realize that git-svn is not "real" git. Such problems
would not arise after switching the S2 repo tree from svn to git...
- René
Am 11.09.13 12:31, schrieb Christian Grobmeier:
> Hi,
>
> its easy to mess up the svn repos with git - prove below :-)
>
> I forked from the official struts-mirror and added our svn as git svn repos.
> The I tried to merge the strutsathon outcome (angularjs) with my repo.
> Somewhere in between Johannes added the files manually to SVN.
> I fetched and tried to get these changes, but for some reason my Git repos
> thought I would have the more accurate changes, which is not the case.
>
> I am going to revert this below.
>
> *sigh*. Actually it's not exactly easy - but I will figure it out.
>
> Am 11.09.13 12:24, schrieb grobmeier@apache.org:
>> 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=<CURRENT_STRUTS_VERSION> \
>> - -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 "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
>> +
>>
>> Modified: struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/META-INF/maven/archetype-metadata.xml
>> URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/META-INF/maven/archetype-metadata.xml?rev=1521783&r1=1521782&r2=1521783&view=diff
>> ==============================================================================
>> --- struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/META-INF/maven/archetype-metadata.xml (original)
>> +++ struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/META-INF/maven/archetype-metadata.xml Wed Sep 11 10:24:18 2013
>> @@ -1,5 +1,5 @@
>> <?xml version="1.0" encoding="UTF-8"?>
>> -<archetype-descriptor name="struts2-archetype-angularjs">
>> +<archetype-descriptor name="struts2-archetype-convention">
>>
>> <fileSets>
>> <fileSet filtered="true" packaged="true">
>> @@ -57,12 +57,6 @@
>> <include>**/*</include>
>> </includes>
>> </fileSet>
>> - <fileSet filtered="false" packaged="false">
>> - <directory>src/main/webapp/partials</directory>
>> - <includes>
>> - <include>**/*</include>
>> - </includes>
>> - </fileSet>
>> </fileSets>
>>
>> </archetype-descriptor>
>>
>> Modified: struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/LICENSE.txt
>> URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/LICENSE.txt?rev=1521783&r1=1521782&r2=1521783&view=diff
>> ==============================================================================
>> --- struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/LICENSE.txt (original)
>> +++ struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/LICENSE.txt Wed Sep 11 10:24:18 2013
>> @@ -1,174 +1,174 @@
>> - Apache License
>> - Version 2.0, January 2004
>> - http://www.apache.org/licenses/
>> -
>> - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
>> -
>> - 1. Definitions.
>> -
>> - "License" shall mean the terms and conditions for use, reproduction,
>> - and distribution as defined by Sections 1 through 9 of this document.
>> -
>> - "Licensor" shall mean the copyright owner or entity authorized by
>> - the copyright owner that is granting the License.
>> -
>> - "Legal Entity" shall mean the union of the acting entity and all
>> - other entities that control, are controlled by, or are under common
>> - control with that entity. For the purposes of this definition,
>> - "control" means (i) the power, direct or indirect, to cause the
>> - direction or management of such entity, whether by contract or
>> - otherwise, or (ii) ownership of fifty percent (50%) or more of the
>> - outstanding shares, or (iii) beneficial ownership of such entity.
>> -
>> - "You" (or "Your") shall mean an individual or Legal Entity
>> - exercising permissions granted by this License.
>> -
>> - "Source" form shall mean the preferred form for making modifications,
>> - including but not limited to software source code, documentation
>> - source, and configuration files.
>> -
>> - "Object" form shall mean any form resulting from mechanical
>> - transformation or translation of a Source form, including but
>> - not limited to compiled object code, generated documentation,
>> - and conversions to other media types.
>> -
>> - "Work" shall mean the work of authorship, whether in Source or
>> - Object form, made available under the License, as indicated by a
>> - copyright notice that is included in or attached to the work
>> - (an example is provided in the Appendix below).
>> -
>> - "Derivative Works" shall mean any work, whether in Source or Object
>> - form, that is based on (or derived from) the Work and for which the
>> - editorial revisions, annotations, elaborations, or other modifications
>> - represent, as a whole, an original work of authorship. For the purposes
>> - of this License, Derivative Works shall not include works that remain
>> - separable from, or merely link (or bind by name) to the interfaces of,
>> - the Work and Derivative Works thereof.
>> -
>> - "Contribution" shall mean any work of authorship, including
>> - the original version of the Work and any modifications or additions
>> - to that Work or Derivative Works thereof, that is intentionally
>> - submitted to Licensor for inclusion in the Work by the copyright owner
>> - or by an individual or Legal Entity authorized to submit on behalf of
>> - the copyright owner. For the purposes of this definition, "submitted"
>> - means any form of electronic, verbal, or written communication sent
>> - to the Licensor or its representatives, including but not limited to
>> - communication on electronic mailing lists, source code control systems,
>> - and issue tracking systems that are managed by, or on behalf of, the
>> - Licensor for the purpose of discussing and improving the Work, but
>> - excluding communication that is conspicuously marked or otherwise
>> - designated in writing by the copyright owner as "Not a Contribution."
>> -
>> - "Contributor" shall mean Licensor and any individual or Legal Entity
>> - on behalf of whom a Contribution has been received by Licensor and
>> - subsequently incorporated within the Work.
>> -
>> - 2. Grant of Copyright License. Subject to the terms and conditions of
>> - this License, each Contributor hereby grants to You a perpetual,
>> - worldwide, non-exclusive, no-charge, royalty-free, irrevocable
>> - copyright license to reproduce, prepare Derivative Works of,
>> - publicly display, publicly perform, sublicense, and distribute the
>> - Work and such Derivative Works in Source or Object form.
>> -
>> - 3. Grant of Patent License. Subject to the terms and conditions of
>> - this License, each Contributor hereby grants to You a perpetual,
>> - worldwide, non-exclusive, no-charge, royalty-free, irrevocable
>> - (except as stated in this section) patent license to make, have made,
>> - use, offer to sell, sell, import, and otherwise transfer the Work,
>> - where such license applies only to those patent claims licensable
>> - by such Contributor that are necessarily infringed by their
>> - Contribution(s) alone or by combination of their Contribution(s)
>> - with the Work to which such Contribution(s) was submitted. If You
>> - institute patent litigation against any entity (including a
>> - cross-claim or counterclaim in a lawsuit) alleging that the Work
>> - or a Contribution incorporated within the Work constitutes direct
>> - or contributory patent infringement, then any patent licenses
>> - granted to You under this License for that Work shall terminate
>> - as of the date such litigation is filed.
>> -
>> - 4. Redistribution. You may reproduce and distribute copies of the
>> - Work or Derivative Works thereof in any medium, with or without
>> - modifications, and in Source or Object form, provided that You
>> - meet the following conditions:
>> -
>> - (a) You must give any other recipients of the Work or
>> - Derivative Works a copy of this License; and
>> -
>> - (b) You must cause any modified files to carry prominent notices
>> - stating that You changed the files; and
>> -
>> - (c) You must retain, in the Source form of any Derivative Works
>> - that You distribute, all copyright, patent, trademark, and
>> - attribution notices from the Source form of the Work,
>> - excluding those notices that do not pertain to any part of
>> - the Derivative Works; and
>> -
>> - (d) If the Work includes a "NOTICE" text file as part of its
>> - distribution, then any Derivative Works that You distribute must
>> - include a readable copy of the attribution notices contained
>> - within such NOTICE file, excluding those notices that do not
>> - pertain to any part of the Derivative Works, in at least one
>> - of the following places: within a NOTICE text file distributed
>> - as part of the Derivative Works; within the Source form or
>> - documentation, if provided along with the Derivative Works; or,
>> - within a display generated by the Derivative Works, if and
>> - wherever such third-party notices normally appear. The contents
>> - of the NOTICE file are for informational purposes only and
>> - do not modify the License. You may add Your own attribution
>> - notices within Derivative Works that You distribute, alongside
>> - or as an addendum to the NOTICE text from the Work, provided
>> - that such additional attribution notices cannot be construed
>> - as modifying the License.
>> -
>> - You may add Your own copyright statement to Your modifications and
>> - may provide additional or different license terms and conditions
>> - for use, reproduction, or distribution of Your modifications, or
>> - for any such Derivative Works as a whole, provided Your use,
>> - reproduction, and distribution of the Work otherwise complies with
>> - the conditions stated in this License.
>> -
>> - 5. Submission of Contributions. Unless You explicitly state otherwise,
>> - any Contribution intentionally submitted for inclusion in the Work
>> - by You to the Licensor shall be under the terms and conditions of
>> - this License, without any additional terms or conditions.
>> - Notwithstanding the above, nothing herein shall supersede or modify
>> - the terms of any separate license agreement you may have executed
>> - with Licensor regarding such Contributions.
>> -
>> - 6. Trademarks. This License does not grant permission to use the trade
>> - names, trademarks, service marks, or product names of the Licensor,
>> - except as required for reasonable and customary use in describing the
>> - origin of the Work and reproducing the content of the NOTICE file.
>> -
>> - 7. Disclaimer of Warranty. Unless required by applicable law or
>> - agreed to in writing, Licensor provides the Work (and each
>> - Contributor provides its Contributions) on an "AS IS" BASIS,
>> - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
>> - implied, including, without limitation, any warranties or conditions
>> - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
>> - PARTICULAR PURPOSE. You are solely responsible for determining the
>> - appropriateness of using or redistributing the Work and assume any
>> - risks associated with Your exercise of permissions under this License.
>> -
>> - 8. Limitation of Liability. In no event and under no legal theory,
>> - whether in tort (including negligence), contract, or otherwise,
>> - unless required by applicable law (such as deliberate and grossly
>> - negligent acts) or agreed to in writing, shall any Contributor be
>> - liable to You for damages, including any direct, indirect, special,
>> - incidental, or consequential damages of any character arising as a
>> - result of this License or out of the use or inability to use the
>> - Work (including but not limited to damages for loss of goodwill,
>> - work stoppage, computer failure or malfunction, or any and all
>> - other commercial damages or losses), even if such Contributor
>> - has been advised of the possibility of such damages.
>> -
>> - 9. Accepting Warranty or Additional Liability. While redistributing
>> - the Work or Derivative Works thereof, You may choose to offer,
>> - and charge a fee for, acceptance of support, warranty, indemnity,
>> - or other liability obligations and/or rights consistent with this
>> - License. However, in accepting such obligations, You may act only
>> - on Your own behalf and on Your sole responsibility, not on behalf
>> - of any other Contributor, and only if You agree to indemnify,
>> - defend, and hold each Contributor harmless for any liability
>> - incurred by, or claims asserted against, such Contributor by reason
>> - of your accepting any such warranty or additional liability.
>> + Apache License
>> + Version 2.0, January 2004
>> + http://www.apache.org/licenses/
>> +
>> + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
>> +
>> + 1. Definitions.
>> +
>> + "License" shall mean the terms and conditions for use, reproduction,
>> + and distribution as defined by Sections 1 through 9 of this document.
>> +
>> + "Licensor" shall mean the copyright owner or entity authorized by
>> + the copyright owner that is granting the License.
>> +
>> + "Legal Entity" shall mean the union of the acting entity and all
>> + other entities that control, are controlled by, or are under common
>> + control with that entity. For the purposes of this definition,
>> + "control" means (i) the power, direct or indirect, to cause the
>> + direction or management of such entity, whether by contract or
>> + otherwise, or (ii) ownership of fifty percent (50%) or more of the
>> + outstanding shares, or (iii) beneficial ownership of such entity.
>> +
>> + "You" (or "Your") shall mean an individual or Legal Entity
>> + exercising permissions granted by this License.
>> +
>> + "Source" form shall mean the preferred form for making modifications,
>> + including but not limited to software source code, documentation
>> + source, and configuration files.
>> +
>> + "Object" form shall mean any form resulting from mechanical
>> + transformation or translation of a Source form, including but
>> + not limited to compiled object code, generated documentation,
>> + and conversions to other media types.
>> +
>> + "Work" shall mean the work of authorship, whether in Source or
>> + Object form, made available under the License, as indicated by a
>> + copyright notice that is included in or attached to the work
>> + (an example is provided in the Appendix below).
>> +
>> + "Derivative Works" shall mean any work, whether in Source or Object
>> + form, that is based on (or derived from) the Work and for which the
>> + editorial revisions, annotations, elaborations, or other modifications
>> + represent, as a whole, an original work of authorship. For the purposes
>> + of this License, Derivative Works shall not include works that remain
>> + separable from, or merely link (or bind by name) to the interfaces of,
>> + the Work and Derivative Works thereof.
>> +
>> + "Contribution" shall mean any work of authorship, including
>> + the original version of the Work and any modifications or additions
>> + to that Work or Derivative Works thereof, that is intentionally
>> + submitted to Licensor for inclusion in the Work by the copyright owner
>> + or by an individual or Legal Entity authorized to submit on behalf of
>> + the copyright owner. For the purposes of this definition, "submitted"
>> + means any form of electronic, verbal, or written communication sent
>> + to the Licensor or its representatives, including but not limited to
>> + communication on electronic mailing lists, source code control systems,
>> + and issue tracking systems that are managed by, or on behalf of, the
>> + Licensor for the purpose of discussing and improving the Work, but
>> + excluding communication that is conspicuously marked or otherwise
>> + designated in writing by the copyright owner as "Not a Contribution."
>> +
>> + "Contributor" shall mean Licensor and any individual or Legal Entity
>> + on behalf of whom a Contribution has been received by Licensor and
>> + subsequently incorporated within the Work.
>> +
>> + 2. Grant of Copyright License. Subject to the terms and conditions of
>> + this License, each Contributor hereby grants to You a perpetual,
>> + worldwide, non-exclusive, no-charge, royalty-free, irrevocable
>> + copyright license to reproduce, prepare Derivative Works of,
>> + publicly display, publicly perform, sublicense, and distribute the
>> + Work and such Derivative Works in Source or Object form.
>> +
>> + 3. Grant of Patent License. Subject to the terms and conditions of
>> + this License, each Contributor hereby grants to You a perpetual,
>> + worldwide, non-exclusive, no-charge, royalty-free, irrevocable
>> + (except as stated in this section) patent license to make, have made,
>> + use, offer to sell, sell, import, and otherwise transfer the Work,
>> + where such license applies only to those patent claims licensable
>> + by such Contributor that are necessarily infringed by their
>> + Contribution(s) alone or by combination of their Contribution(s)
>> + with the Work to which such Contribution(s) was submitted. If You
>> + institute patent litigation against any entity (including a
>> + cross-claim or counterclaim in a lawsuit) alleging that the Work
>> + or a Contribution incorporated within the Work constitutes direct
>> + or contributory patent infringement, then any patent licenses
>> + granted to You under this License for that Work shall terminate
>> + as of the date such litigation is filed.
>> +
>> + 4. Redistribution. You may reproduce and distribute copies of the
>> + Work or Derivative Works thereof in any medium, with or without
>> + modifications, and in Source or Object form, provided that You
>> + meet the following conditions:
>> +
>> + (a) You must give any other recipients of the Work or
>> + Derivative Works a copy of this License; and
>> +
>> + (b) You must cause any modified files to carry prominent notices
>> + stating that You changed the files; and
>> +
>> + (c) You must retain, in the Source form of any Derivative Works
>> + that You distribute, all copyright, patent, trademark, and
>> + attribution notices from the Source form of the Work,
>> + excluding those notices that do not pertain to any part of
>> + the Derivative Works; and
>> +
>> + (d) If the Work includes a "NOTICE" text file as part of its
>> + distribution, then any Derivative Works that You distribute must
>> + include a readable copy of the attribution notices contained
>> + within such NOTICE file, excluding those notices that do not
>> + pertain to any part of the Derivative Works, in at least one
>> + of the following places: within a NOTICE text file distributed
>> + as part of the Derivative Works; within the Source form or
>> + documentation, if provided along with the Derivative Works; or,
>> + within a display generated by the Derivative Works, if and
>> + wherever such third-party notices normally appear. The contents
>> + of the NOTICE file are for informational purposes only and
>> + do not modify the License. You may add Your own attribution
>> + notices within Derivative Works that You distribute, alongside
>> + or as an addendum to the NOTICE text from the Work, provided
>> + that such additional attribution notices cannot be construed
>> + as modifying the License.
>> +
>> + You may add Your own copyright statement to Your modifications and
>> + may provide additional or different license terms and conditions
>> + for use, reproduction, or distribution of Your modifications, or
>> + for any such Derivative Works as a whole, provided Your use,
>> + reproduction, and distribution of the Work otherwise complies with
>> + the conditions stated in this License.
>> +
>> + 5. Submission of Contributions. Unless You explicitly state otherwise,
>> + any Contribution intentionally submitted for inclusion in the Work
>> + by You to the Licensor shall be under the terms and conditions of
>> + this License, without any additional terms or conditions.
>> + Notwithstanding the above, nothing herein shall supersede or modify
>> + the terms of any separate license agreement you may have executed
>> + with Licensor regarding such Contributions.
>> +
>> + 6. Trademarks. This License does not grant permission to use the trade
>> + names, trademarks, service marks, or product names of the Licensor,
>> + except as required for reasonable and customary use in describing the
>> + origin of the Work and reproducing the content of the NOTICE file.
>> +
>> + 7. Disclaimer of Warranty. Unless required by applicable law or
>> + agreed to in writing, Licensor provides the Work (and each
>> + Contributor provides its Contributions) on an "AS IS" BASIS,
>> + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
>> + implied, including, without limitation, any warranties or conditions
>> + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
>> + PARTICULAR PURPOSE. You are solely responsible for determining the
>> + appropriateness of using or redistributing the Work and assume any
>> + risks associated with Your exercise of permissions under this License.
>> +
>> + 8. Limitation of Liability. In no event and under no legal theory,
>> + whether in tort (including negligence), contract, or otherwise,
>> + unless required by applicable law (such as deliberate and grossly
>> + negligent acts) or agreed to in writing, shall any Contributor be
>> + liable to You for damages, including any direct, indirect, special,
>> + incidental, or consequential damages of any character arising as a
>> + result of this License or out of the use or inability to use the
>> + Work (including but not limited to damages for loss of goodwill,
>> + work stoppage, computer failure or malfunction, or any and all
>> + other commercial damages or losses), even if such Contributor
>> + has been advised of the possibility of such damages.
>> +
>> + 9. Accepting Warranty or Additional Liability. While redistributing
>> + the Work or Derivative Works thereof, You may choose to offer,
>> + and charge a fee for, acceptance of support, warranty, indemnity,
>> + or other liability obligations and/or rights consistent with this
>> + License. However, in accepting such obligations, You may act only
>> + on Your own behalf and on Your sole responsibility, not on behalf
>> + of any other Contributor, and only if You agree to indemnify,
>> + defend, and hold each Contributor harmless for any liability
>> + incurred by, or claims asserted against, such Contributor by reason
>> + of your accepting any such warranty or additional liability.
>>
>> Modified: struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/NOTICE.txt
>> URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/NOTICE.txt?rev=1521783&r1=1521782&r2=1521783&view=diff
>> ==============================================================================
>> --- struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/NOTICE.txt (original)
>> +++ struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/NOTICE.txt Wed Sep 11 10:24:18 2013
>> @@ -1,6 +1,6 @@
>> -Apache Struts
>> -
>> -Copyright 2006-2011 The Apache Software Foundation
>> -
>> -This product includes software developed at
>> -The Apache Software Foundation (http://www.apache.org/
>> +Apache Struts
>> +
>> +Copyright 2006-2011 The Apache Software Foundation
>> +
>> +This product includes software developed at
>> +The Apache Software Foundation (http://www.apache.org/
>>
>> Added: struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/README.txt
>> URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/README.txt?rev=1521783&view=auto
>> ==============================================================================
>> --- struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/README.txt (added)
>> +++ struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/README.txt Wed Sep 11 10:24:18 2013
>> @@ -0,0 +1,10 @@
>> +README.txt - blank convention
>> +
>> +This is an "empty" Google App Engine aware application that you can deploy as the basis of your own
>> +application.
>> +
>> +For more on getting started with Struts, see
>> +
>> +* http://cwiki.apache.org/WW/home.html
>> +
>> +----------------------------------------------------------------------------
>> \ No newline at end of file
>>
>> Propchange: struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/README.txt
>> ------------------------------------------------------------------------------
>> svn:eol-style = native
>>
>> Modified: struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/pom.xml
>> URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/pom.xml?rev=1521783&r1=1521782&r2=1521783&view=diff
>> ==============================================================================
>> --- struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/pom.xml (original)
>> +++ struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/pom.xml Wed Sep 11 10:24:18 2013
>> @@ -67,7 +67,7 @@
>> <dependency>
>> <groupId>javax.servlet</groupId>
>> <artifactId>servlet-api</artifactId>
>> - <version>2.5</version>
>> + <version>2.4</version>
>> <scope>provided</scope>
>> </dependency>
>>
>> @@ -93,7 +93,7 @@
>> <plugin>
>> <groupId>org.mortbay.jetty</groupId>
>> <artifactId>jetty-maven-plugin</artifactId>
>> - <version>8.1.12.v20130726</version>
>> + <version>8.1.7.v20120910</version>
>> <configuration>
>> <stopKey>CTRL+C</stopKey>
>> <stopPort>8999</stopPort>
>> @@ -108,6 +108,11 @@
>> </systemProperty>
>> </systemProperties>
>> <scanIntervalSeconds>10</scanIntervalSeconds>
>> + <webAppSourceDirectory>\${basedir}/src/main/webapp/</webAppSourceDirectory>
>> + <webAppConfig>
>> + <contextPath>\${artifactId}</contextPath>
>> + <descriptor>\${basedir}/src/main/webapp/WEB-INF/web.xml</descriptor>
>> + </webAppConfig>
>> </configuration>
>> <dependencies>
>> <dependency>
>>
>> Added: struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/java/InitListener.java
>> URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/java/InitListener.java?rev=1521783&view=auto
>> ==============================================================================
>> --- struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/java/InitListener.java (added)
>> +++ struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/java/InitListener.java Wed Sep 11 10:24:18 2013
>> @@ -0,0 +1,25 @@
>> +package ${package};
>> +
>> +import ognl.OgnlRuntime;
>> +
>> +import javax.servlet.ServletContextEvent;
>> +import javax.servlet.ServletContextListener;
>> +import java.util.logging.Logger;
>> +
>> +
>> +/**
>> + * To allow works Struts 2 with Google App Engine
>> + */
>> +public class InitListener implements ServletContextListener {
>> +
>> + public InitListener() {
>> + }
>> +
>> + public void contextInitialized(ServletContextEvent sce) {
>> + OgnlRuntime.setSecurityManager(null);
>> + }
>> +
>> + public void contextDestroyed(ServletContextEvent sce) {
>> + }
>> +
>> +}
>>
>> Propchange: struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/java/InitListener.java
>> ------------------------------------------------------------------------------
>> svn:eol-style = native
>>
>> Modified: struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/java/actions/HelloAction.java
>> URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/java/actions/HelloAction.java?rev=1521783&r1=1521782&r2=1521783&view=diff
>> ==============================================================================
>> --- struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/java/actions/HelloAction.java (original)
>> +++ struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/java/actions/HelloAction.java Wed Sep 11 10:24:18 2013
>> @@ -1,23 +1,3 @@
>> -/*
>> - * $Id$
>> - *
>> - * Licensed to the Apache Software Foundation (ASF) under one
>> - * or more contributor license agreements. See the NOTICE file
>> - * distributed with this work for additional information
>> - * regarding copyright ownership. The ASF licenses this file
>> - * to you under the Apache License, Version 2.0 (the
>> - * "License"); you may not use this file except in compliance
>> - * with the License. You may obtain a copy of the License at
>> - *
>> - * http://www.apache.org/licenses/LICENSE-2.0
>> - *
>> - * Unless required by applicable law or agreed to in writing,
>> - * software distributed under the License is distributed on an
>> - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
>> - * KIND, either express or implied. See the License for the
>> - * specific language governing permissions and limitations
>> - * under the License.
>> - */
>> package ${package}.actions;
>>
>> import com.opensymphony.xwork2.ActionSupport;
>> @@ -27,8 +7,6 @@ import com.opensymphony.xwork2.ActionSup
>> */
>> public class HelloAction extends ActionSupport {
>>
>> - private static final long serialVersionUID = -3243216917801206214L;
>> -
>> public String execute() throws Exception {
>> setMessage(getText(MESSAGE));
>> return SUCCESS;
>>
>> Modified: struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/java/actions/Index.java
>> URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/java/actions/Index.java?rev=1521783&r1=1521782&r2=1521783&view=diff
>> ==============================================================================
>> --- struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/java/actions/Index.java (original)
>> +++ struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/java/actions/Index.java Wed Sep 11 10:24:18 2013
>> @@ -1,23 +1,3 @@
>> -/*
>> - * $Id$
>> - *
>> - * Licensed to the Apache Software Foundation (ASF) under one
>> - * or more contributor license agreements. See the NOTICE file
>> - * distributed with this work for additional information
>> - * regarding copyright ownership. The ASF licenses this file
>> - * to you under the Apache License, Version 2.0 (the
>> - * "License"); you may not use this file except in compliance
>> - * with the License. You may obtain a copy of the License at
>> - *
>> - * http://www.apache.org/licenses/LICENSE-2.0
>> - *
>> - * Unless required by applicable law or agreed to in writing,
>> - * software distributed under the License is distributed on an
>> - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
>> - * KIND, either express or implied. See the License for the
>> - * specific language governing permissions and limitations
>> - * under the License.
>> - */
>> package ${package}.actions;
>>
>> import com.opensymphony.xwork2.Action;
>> @@ -30,8 +10,6 @@ import org.apache.struts2.convention.ann
>> })
>> public class Index extends ActionSupport {
>>
>> - private static final long serialVersionUID = 6153177836211979662L;
>> -
>> private String redirectName;
>>
>> public String execute() {
>>
>> Modified: struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/resources/package.properties
>> URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/resources/package.properties?rev=1521783&r1=1521782&r2=1521783&view=diff
>> ==============================================================================
>> --- struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/resources/package.properties (original)
>> +++ struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/resources/package.properties Wed Sep 11 10:24:18 2013
>> @@ -1 +1,2 @@
>> hello.message = Struts is up and running...
>> +requiredstring= ${getText(fieldName)} is required.
>>
>> Modified: struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/resources/package_es.properties
>> URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/resources/package_es.properties?rev=1521783&r1=1521782&r2=1521783&view=diff
>> ==============================================================================
>> --- struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/resources/package_es.properties (original)
>> +++ struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/resources/package_es.properties Wed Sep 11 10:24:18 2013
>> @@ -1 +1,2 @@
>> hello.message = \u00A1Struts est\u00E1 bien\!...
>> +requiredstring = ${getText(fieldName)} es requerido.
>>
>> Modified: struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/resources/struts.xml
>> URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/resources/struts.xml?rev=1521783&r1=1521782&r2=1521783&view=diff
>> ==============================================================================
>> --- struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/resources/struts.xml (original)
>> +++ struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/resources/struts.xml Wed Sep 11 10:24:18 2013
>> @@ -7,7 +7,4 @@
>> <constant name="struts.enable.DynamicMethodInvocation" value="false"/>
>> <constant name="struts.devMode" value="true"/>
>>
>> - <constant name="struts.convention.default.parent.package" value="angularstruts"/>
>> - <package name="angularstruts" extends="json-default"></package>
>> -
>> </struts>
>>
>> Added: struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/appengine-web.xml
>> URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/appengine-web.xml?rev=1521783&view=auto
>> ==============================================================================
>> --- struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/appengine-web.xml (added)
>> +++ struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/appengine-web.xml Wed Sep 11 10:24:18 2013
>> @@ -0,0 +1,6 @@
>> +<?xml version="1.0" encoding="utf-8"?>
>> +<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
>> + <application>${artifactId}</application>
>> + <version>1</version>
>> + <sessions-enabled>true</sessions-enabled>
>> +</appengine-web-app>
>>
>> Propchange: struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/appengine-web.xml
>> ------------------------------------------------------------------------------
>> svn:eol-style = native
>>
>> Modified: struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/content/hello.jsp
>> URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/content/hello.jsp?rev=1521783&r1=1521782&r2=1521783&view=diff
>> ==============================================================================
>> --- struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/content/hello.jsp (original)
>> +++ struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/content/hello.jsp Wed Sep 11 10:24:18 2013
>> @@ -1,26 +1,16 @@
>> <%@ page contentType="text/html; charset=UTF-8" %>
>> <%@ taglib prefix="s" uri="/struts-tags" %>
>> <!DOCTYPE html>
>> -<html lang="en" ng-app="angularstruts">
>> +<html lang="en" ng-app>
>> <head>
>> <meta charset="utf-8">
>> <title>My AngularJS Struts2 App</title>
>> </head>
>> <body>
>>
>> -<h2><s:property value="message"/></h2>
>> -
>> -<div>
>> - <a href="#/home">Home</a> - <a href="#/projects">Projects</a>
>> -</div>
>> -
>> -<div ng-controller="AppController">
>> - <div ng-view></div>
>> -</div>
>> +<p>Nothing here {{'yet' + '!'}}</p>
>>
>> <script src="<s:url value="js/lib/angular/angular.min.js" />"></script>
>> -<script src="<s:url value="js/directives.js" />"></script>
>> -<script src="<s:url value="js/controllers.js" />"></script>
>> -<script src="<s:url value="js/bootstrap.js" />"></script>
>> +
>> </body>
>> </html>
>>
>> Modified: struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
>> URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml?rev=1521783&r1=1521782&r2=1521783&view=diff
>> ==============================================================================
>> --- struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml (original)
>> +++ struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml Wed Sep 11 10:24:18 2013
>> @@ -1,8 +1,13 @@
>> <?xml version="1.0" encoding="UTF-8"?>
>> -<web-app id="struts_angularjs" version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
>> +<web-app id="struts_blank" version="2.4"
>> + xmlns="http://java.sun.com/xml/ns/j2ee"
>> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
>> - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
>> - <display-name>Struts Blank AngularJS App</display-name>
>> + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
>> + <display-name>Struts Blank Convention</display-name>
>> +
>> + <listener>
>> + <listener-class>${package}.InitListener</listener-class>
>> + </listener>
>>
>> <filter>
>> <filter-name>struts2</filter-name>
>>
>> Modified: struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/test/java/actions/HelloActionTest.java
>> URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/test/java/actions/HelloActionTest.java?rev=1521783&r1=1521782&r2=1521783&view=diff
>> ==============================================================================
>> --- struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/test/java/actions/HelloActionTest.java (original)
>> +++ struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/test/java/actions/HelloActionTest.java Wed Sep 11 10:24:18 2013
>> @@ -1,23 +1,3 @@
>> -/*
>> - * $Id$
>> - *
>> - * Licensed to the Apache Software Foundation (ASF) under one
>> - * or more contributor license agreements. See the NOTICE file
>> - * distributed with this work for additional information
>> - * regarding copyright ownership. The ASF licenses this file
>> - * to you under the Apache License, Version 2.0 (the
>> - * "License"); you may not use this file except in compliance
>> - * with the License. You may obtain a copy of the License at
>> - *
>> - * http://www.apache.org/licenses/LICENSE-2.0
>> - *
>> - * Unless required by applicable law or agreed to in writing,
>> - * software distributed under the License is distributed on an
>> - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
>> - * KIND, either express or implied. See the License for the
>> - * specific language governing permissions and limitations
>> - * under the License.
>> - */
>> package ${package}.actions;
>>
>> import com.opensymphony.xwork2.ActionSupport;
>>
>> Modified: struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/test/java/actions/IndexTest.java
>> URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/test/java/actions/IndexTest.java?rev=1521783&r1=1521782&r2=1521783&view=diff
>> ==============================================================================
>> --- struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/test/java/actions/IndexTest.java (original)
>> +++ struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/test/java/actions/IndexTest.java Wed Sep 11 10:24:18 2013
>> @@ -1,23 +1,3 @@
>> -/*
>> - * $Id$
>> - *
>> - * Licensed to the Apache Software Foundation (ASF) under one
>> - * or more contributor license agreements. See the NOTICE file
>> - * distributed with this work for additional information
>> - * regarding copyright ownership. The ASF licenses this file
>> - * to you under the Apache License, Version 2.0 (the
>> - * "License"); you may not use this file except in compliance
>> - * with the License. You may obtain a copy of the License at
>> - *
>> - * http://www.apache.org/licenses/LICENSE-2.0
>> - *
>> - * Unless required by applicable law or agreed to in writing,
>> - * software distributed under the License is distributed on an
>> - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
>> - * KIND, either express or implied. See the License for the
>> - * specific language governing permissions and limitations
>> - * under the License.
>> - */
>> package ${package}.actions;
>>
>> import com.opensymphony.xwork2.ActionSupport;
>>
>> Copied: struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/site/site.xml (from r1521602, struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/test/java/actions/IndexTest.java)
>> URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/site/site.xml?p2=struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/site/site.xml&p1=struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/test/java/actions/IndexTest.java&r1=1521602&r2=1521783&rev=1521783&view=diff
>> ==============================================================================
>> --- struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/test/java/actions/IndexTest.java (original)
>> +++ struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/site/site.xml Wed Sep 11 10:24:18 2013
>> @@ -1,5 +1,7 @@
>> +<?xml version="1.0" encoding="ISO-8859-1"?>
>> +<!--
>> /*
>> - * $Id$
>> + * $Id: site.xml 1082279 2011-03-16 19:43:51Z lukaszlenart $
>> *
>> * Licensed to the Apache Software Foundation (ASF) under one
>> * or more contributor license agreements. See the NOTICE file
>> @@ -18,17 +20,28 @@
>> * specific language governing permissions and limitations
>> * under the License.
>> */
>> -package ${package}.actions;
>> +-->
>> +<project name="Struts 2">
>> + <bannerLeft>
>> + <name>Apache Software Foundation</name>
>> + <src>http://www.apache.org/images/asf-logo.gif</src>
>> + <href>http://www.apache.org/</href>
>> + </bannerLeft>
>> + <bannerRight>
>> + <name>Apache Struts</name>
>> + <src>http://struts.apache.org/images/struts.gif</src>
>> + <href>http://struts.apache.org/</href>
>> + </bannerRight>
>> + <body>
>> + <links>
>> + <item name="Apache"
>> + href="http://www.apache.org/"/>
>> + <item name="Struts"
>> + href="http://struts.apache.org/index.html"/>
>> + </links>
>>
>> -import com.opensymphony.xwork2.ActionSupport;
>> -import org.apache.struts2.StrutsTestCase;
>> + <menu ref="parent"/>
>> + <menu ref="reports"/>
>>
>> -public class IndexTest extends StrutsTestCase {
>> -
>> - public void testIndex() throws Exception {
>> - Index index = new Index();
>> - String result = index.execute();
>> - assertTrue("Expected a success result!", ActionSupport.SUCCESS.equals(result));
>> - assertTrue("Expected the 'hello' action name!!", "hello".equals(index.getRedirectName()));
>> - }
>> -}
>> + </body>
>> +</project>
>>
>> Added: struts/struts2/trunk/archetypes/struts2-archetype-angularjs/struts2-archetype-convention (1).iml
>> URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-angularjs/struts2-archetype-convention%20%281%29.iml?rev=1521783&view=auto
>> ==============================================================================
>> --- struts/struts2/trunk/archetypes/struts2-archetype-angularjs/struts2-archetype-convention (1).iml (added)
>> +++ struts/struts2/trunk/archetypes/struts2-archetype-angularjs/struts2-archetype-convention (1).iml Wed Sep 11 10:24:18 2013
>> @@ -0,0 +1,14 @@
>> +<?xml version="1.0" encoding="UTF-8"?>
>> +<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
>> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
>> + <output url="file://$MODULE_DIR$/target/classes" />
>> + <output-test url="file://$MODULE_DIR$/target/test-classes" />
>> + <content url="file://$MODULE_DIR$">
>> + <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
>> + <excludeFolder url="file://$MODULE_DIR$/target" />
>> + </content>
>> + <orderEntry type="inheritedJdk" />
>> + <orderEntry type="sourceFolder" forTests="false" />
>> + </component>
>> +</module>
>> +
>>
>> Added: struts/struts2/trunk/archetypes/struts2-archetype-angularjs/struts2-archetype-convention.iml
>> URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-angularjs/struts2-archetype-convention.iml?rev=1521783&view=auto
>> ==============================================================================
>> --- struts/struts2/trunk/archetypes/struts2-archetype-angularjs/struts2-archetype-convention.iml (added)
>> +++ struts/struts2/trunk/archetypes/struts2-archetype-angularjs/struts2-archetype-convention.iml Wed Sep 11 10:24:18 2013
>> @@ -0,0 +1,34 @@
>> +<?xml version="1.0" encoding="UTF-8"?>
>> +<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
>> + <component name="FacetManager">
>> + <facet type="web" name="Web">
>> + <configuration>
>> + <descriptors>
>> + <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml" />
>> + </descriptors>
>> + <webroots>
>> + <root url="file://$MODULE_DIR$/src/main/resources/archetype-resources/src/main/webapp" relative="/" />
>> + </webroots>
>> + </configuration>
>> + <facet type="google-app-engine" name="Google App Engine">
>> + <configuration />
>> + </facet>
>> + <facet type="Struts2" name="Struts 2">
>> + <configuration>
>> + <propertiesKeys disabled="false" />
>> + </configuration>
>> + </facet>
>> + </facet>
>> + </component>
>> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
>> + <output url="file://$MODULE_DIR$/target/classes" />
>> + <output-test url="file://$MODULE_DIR$/target/test-classes" />
>> + <content url="file://$MODULE_DIR$">
>> + <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
>> + <excludeFolder url="file://$MODULE_DIR$/target" />
>> + </content>
>> + <orderEntry type="inheritedJdk" />
>> + <orderEntry type="sourceFolder" forTests="false" />
>> + </component>
>> +</module>
>> +
>>
>>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
> For additional commands, e-mail: dev-help@struts.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org
Re: bad commits with git...
Posted by Christian Grobmeier <gr...@gmail.com>.
Am 11.09.13 16:02, schrieb Rene Gielen:
> This is when you realize that git-svn is not "real" git. Such problems
> would not arise after switching the S2 repo tree from svn to git...
leaves the question, if I should stop here. Basically what I documented
so far is good (in theory).
After the switch to native git, its just "true" for Struts 1 where no
contributions are expected any more.
Oh, and probably for the main site. But these seem less complicated than
the huge repos.
>
> - René
>
> Am 11.09.13 12:31, schrieb Christian Grobmeier:
>> Hi,
>>
>> its easy to mess up the svn repos with git - prove below :-)
>>
>> I forked from the official struts-mirror and added our svn as git svn repos.
>> The I tried to merge the strutsathon outcome (angularjs) with my repo.
>> Somewhere in between Johannes added the files manually to SVN.
>> I fetched and tried to get these changes, but for some reason my Git repos
>> thought I would have the more accurate changes, which is not the case.
>>
>> I am going to revert this below.
>>
>> *sigh*. Actually it's not exactly easy - but I will figure it out.
>>
>> Am 11.09.13 12:24, schrieb grobmeier@apache.org:
>>> 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=<CURRENT_STRUTS_VERSION> \
>>> - -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 "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
>>> +
>>>
>>> Modified: struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/META-INF/maven/archetype-metadata.xml
>>> URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/META-INF/maven/archetype-metadata.xml?rev=1521783&r1=1521782&r2=1521783&view=diff
>>> ==============================================================================
>>> --- struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/META-INF/maven/archetype-metadata.xml (original)
>>> +++ struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/META-INF/maven/archetype-metadata.xml Wed Sep 11 10:24:18 2013
>>> @@ -1,5 +1,5 @@
>>> <?xml version="1.0" encoding="UTF-8"?>
>>> -<archetype-descriptor name="struts2-archetype-angularjs">
>>> +<archetype-descriptor name="struts2-archetype-convention">
>>>
>>> <fileSets>
>>> <fileSet filtered="true" packaged="true">
>>> @@ -57,12 +57,6 @@
>>> <include>**/*</include>
>>> </includes>
>>> </fileSet>
>>> - <fileSet filtered="false" packaged="false">
>>> - <directory>src/main/webapp/partials</directory>
>>> - <includes>
>>> - <include>**/*</include>
>>> - </includes>
>>> - </fileSet>
>>> </fileSets>
>>>
>>> </archetype-descriptor>
>>>
>>> Modified: struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/LICENSE.txt
>>> URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/LICENSE.txt?rev=1521783&r1=1521782&r2=1521783&view=diff
>>> ==============================================================================
>>> --- struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/LICENSE.txt (original)
>>> +++ struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/LICENSE.txt Wed Sep 11 10:24:18 2013
>>> @@ -1,174 +1,174 @@
>>> - Apache License
>>> - Version 2.0, January 2004
>>> - http://www.apache.org/licenses/
>>> -
>>> - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
>>> -
>>> - 1. Definitions.
>>> -
>>> - "License" shall mean the terms and conditions for use, reproduction,
>>> - and distribution as defined by Sections 1 through 9 of this document.
>>> -
>>> - "Licensor" shall mean the copyright owner or entity authorized by
>>> - the copyright owner that is granting the License.
>>> -
>>> - "Legal Entity" shall mean the union of the acting entity and all
>>> - other entities that control, are controlled by, or are under common
>>> - control with that entity. For the purposes of this definition,
>>> - "control" means (i) the power, direct or indirect, to cause the
>>> - direction or management of such entity, whether by contract or
>>> - otherwise, or (ii) ownership of fifty percent (50%) or more of the
>>> - outstanding shares, or (iii) beneficial ownership of such entity.
>>> -
>>> - "You" (or "Your") shall mean an individual or Legal Entity
>>> - exercising permissions granted by this License.
>>> -
>>> - "Source" form shall mean the preferred form for making modifications,
>>> - including but not limited to software source code, documentation
>>> - source, and configuration files.
>>> -
>>> - "Object" form shall mean any form resulting from mechanical
>>> - transformation or translation of a Source form, including but
>>> - not limited to compiled object code, generated documentation,
>>> - and conversions to other media types.
>>> -
>>> - "Work" shall mean the work of authorship, whether in Source or
>>> - Object form, made available under the License, as indicated by a
>>> - copyright notice that is included in or attached to the work
>>> - (an example is provided in the Appendix below).
>>> -
>>> - "Derivative Works" shall mean any work, whether in Source or Object
>>> - form, that is based on (or derived from) the Work and for which the
>>> - editorial revisions, annotations, elaborations, or other modifications
>>> - represent, as a whole, an original work of authorship. For the purposes
>>> - of this License, Derivative Works shall not include works that remain
>>> - separable from, or merely link (or bind by name) to the interfaces of,
>>> - the Work and Derivative Works thereof.
>>> -
>>> - "Contribution" shall mean any work of authorship, including
>>> - the original version of the Work and any modifications or additions
>>> - to that Work or Derivative Works thereof, that is intentionally
>>> - submitted to Licensor for inclusion in the Work by the copyright owner
>>> - or by an individual or Legal Entity authorized to submit on behalf of
>>> - the copyright owner. For the purposes of this definition, "submitted"
>>> - means any form of electronic, verbal, or written communication sent
>>> - to the Licensor or its representatives, including but not limited to
>>> - communication on electronic mailing lists, source code control systems,
>>> - and issue tracking systems that are managed by, or on behalf of, the
>>> - Licensor for the purpose of discussing and improving the Work, but
>>> - excluding communication that is conspicuously marked or otherwise
>>> - designated in writing by the copyright owner as "Not a Contribution."
>>> -
>>> - "Contributor" shall mean Licensor and any individual or Legal Entity
>>> - on behalf of whom a Contribution has been received by Licensor and
>>> - subsequently incorporated within the Work.
>>> -
>>> - 2. Grant of Copyright License. Subject to the terms and conditions of
>>> - this License, each Contributor hereby grants to You a perpetual,
>>> - worldwide, non-exclusive, no-charge, royalty-free, irrevocable
>>> - copyright license to reproduce, prepare Derivative Works of,
>>> - publicly display, publicly perform, sublicense, and distribute the
>>> - Work and such Derivative Works in Source or Object form.
>>> -
>>> - 3. Grant of Patent License. Subject to the terms and conditions of
>>> - this License, each Contributor hereby grants to You a perpetual,
>>> - worldwide, non-exclusive, no-charge, royalty-free, irrevocable
>>> - (except as stated in this section) patent license to make, have made,
>>> - use, offer to sell, sell, import, and otherwise transfer the Work,
>>> - where such license applies only to those patent claims licensable
>>> - by such Contributor that are necessarily infringed by their
>>> - Contribution(s) alone or by combination of their Contribution(s)
>>> - with the Work to which such Contribution(s) was submitted. If You
>>> - institute patent litigation against any entity (including a
>>> - cross-claim or counterclaim in a lawsuit) alleging that the Work
>>> - or a Contribution incorporated within the Work constitutes direct
>>> - or contributory patent infringement, then any patent licenses
>>> - granted to You under this License for that Work shall terminate
>>> - as of the date such litigation is filed.
>>> -
>>> - 4. Redistribution. You may reproduce and distribute copies of the
>>> - Work or Derivative Works thereof in any medium, with or without
>>> - modifications, and in Source or Object form, provided that You
>>> - meet the following conditions:
>>> -
>>> - (a) You must give any other recipients of the Work or
>>> - Derivative Works a copy of this License; and
>>> -
>>> - (b) You must cause any modified files to carry prominent notices
>>> - stating that You changed the files; and
>>> -
>>> - (c) You must retain, in the Source form of any Derivative Works
>>> - that You distribute, all copyright, patent, trademark, and
>>> - attribution notices from the Source form of the Work,
>>> - excluding those notices that do not pertain to any part of
>>> - the Derivative Works; and
>>> -
>>> - (d) If the Work includes a "NOTICE" text file as part of its
>>> - distribution, then any Derivative Works that You distribute must
>>> - include a readable copy of the attribution notices contained
>>> - within such NOTICE file, excluding those notices that do not
>>> - pertain to any part of the Derivative Works, in at least one
>>> - of the following places: within a NOTICE text file distributed
>>> - as part of the Derivative Works; within the Source form or
>>> - documentation, if provided along with the Derivative Works; or,
>>> - within a display generated by the Derivative Works, if and
>>> - wherever such third-party notices normally appear. The contents
>>> - of the NOTICE file are for informational purposes only and
>>> - do not modify the License. You may add Your own attribution
>>> - notices within Derivative Works that You distribute, alongside
>>> - or as an addendum to the NOTICE text from the Work, provided
>>> - that such additional attribution notices cannot be construed
>>> - as modifying the License.
>>> -
>>> - You may add Your own copyright statement to Your modifications and
>>> - may provide additional or different license terms and conditions
>>> - for use, reproduction, or distribution of Your modifications, or
>>> - for any such Derivative Works as a whole, provided Your use,
>>> - reproduction, and distribution of the Work otherwise complies with
>>> - the conditions stated in this License.
>>> -
>>> - 5. Submission of Contributions. Unless You explicitly state otherwise,
>>> - any Contribution intentionally submitted for inclusion in the Work
>>> - by You to the Licensor shall be under the terms and conditions of
>>> - this License, without any additional terms or conditions.
>>> - Notwithstanding the above, nothing herein shall supersede or modify
>>> - the terms of any separate license agreement you may have executed
>>> - with Licensor regarding such Contributions.
>>> -
>>> - 6. Trademarks. This License does not grant permission to use the trade
>>> - names, trademarks, service marks, or product names of the Licensor,
>>> - except as required for reasonable and customary use in describing the
>>> - origin of the Work and reproducing the content of the NOTICE file.
>>> -
>>> - 7. Disclaimer of Warranty. Unless required by applicable law or
>>> - agreed to in writing, Licensor provides the Work (and each
>>> - Contributor provides its Contributions) on an "AS IS" BASIS,
>>> - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
>>> - implied, including, without limitation, any warranties or conditions
>>> - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
>>> - PARTICULAR PURPOSE. You are solely responsible for determining the
>>> - appropriateness of using or redistributing the Work and assume any
>>> - risks associated with Your exercise of permissions under this License.
>>> -
>>> - 8. Limitation of Liability. In no event and under no legal theory,
>>> - whether in tort (including negligence), contract, or otherwise,
>>> - unless required by applicable law (such as deliberate and grossly
>>> - negligent acts) or agreed to in writing, shall any Contributor be
>>> - liable to You for damages, including any direct, indirect, special,
>>> - incidental, or consequential damages of any character arising as a
>>> - result of this License or out of the use or inability to use the
>>> - Work (including but not limited to damages for loss of goodwill,
>>> - work stoppage, computer failure or malfunction, or any and all
>>> - other commercial damages or losses), even if such Contributor
>>> - has been advised of the possibility of such damages.
>>> -
>>> - 9. Accepting Warranty or Additional Liability. While redistributing
>>> - the Work or Derivative Works thereof, You may choose to offer,
>>> - and charge a fee for, acceptance of support, warranty, indemnity,
>>> - or other liability obligations and/or rights consistent with this
>>> - License. However, in accepting such obligations, You may act only
>>> - on Your own behalf and on Your sole responsibility, not on behalf
>>> - of any other Contributor, and only if You agree to indemnify,
>>> - defend, and hold each Contributor harmless for any liability
>>> - incurred by, or claims asserted against, such Contributor by reason
>>> - of your accepting any such warranty or additional liability.
>>> + Apache License
>>> + Version 2.0, January 2004
>>> + http://www.apache.org/licenses/
>>> +
>>> + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
>>> +
>>> + 1. Definitions.
>>> +
>>> + "License" shall mean the terms and conditions for use, reproduction,
>>> + and distribution as defined by Sections 1 through 9 of this document.
>>> +
>>> + "Licensor" shall mean the copyright owner or entity authorized by
>>> + the copyright owner that is granting the License.
>>> +
>>> + "Legal Entity" shall mean the union of the acting entity and all
>>> + other entities that control, are controlled by, or are under common
>>> + control with that entity. For the purposes of this definition,
>>> + "control" means (i) the power, direct or indirect, to cause the
>>> + direction or management of such entity, whether by contract or
>>> + otherwise, or (ii) ownership of fifty percent (50%) or more of the
>>> + outstanding shares, or (iii) beneficial ownership of such entity.
>>> +
>>> + "You" (or "Your") shall mean an individual or Legal Entity
>>> + exercising permissions granted by this License.
>>> +
>>> + "Source" form shall mean the preferred form for making modifications,
>>> + including but not limited to software source code, documentation
>>> + source, and configuration files.
>>> +
>>> + "Object" form shall mean any form resulting from mechanical
>>> + transformation or translation of a Source form, including but
>>> + not limited to compiled object code, generated documentation,
>>> + and conversions to other media types.
>>> +
>>> + "Work" shall mean the work of authorship, whether in Source or
>>> + Object form, made available under the License, as indicated by a
>>> + copyright notice that is included in or attached to the work
>>> + (an example is provided in the Appendix below).
>>> +
>>> + "Derivative Works" shall mean any work, whether in Source or Object
>>> + form, that is based on (or derived from) the Work and for which the
>>> + editorial revisions, annotations, elaborations, or other modifications
>>> + represent, as a whole, an original work of authorship. For the purposes
>>> + of this License, Derivative Works shall not include works that remain
>>> + separable from, or merely link (or bind by name) to the interfaces of,
>>> + the Work and Derivative Works thereof.
>>> +
>>> + "Contribution" shall mean any work of authorship, including
>>> + the original version of the Work and any modifications or additions
>>> + to that Work or Derivative Works thereof, that is intentionally
>>> + submitted to Licensor for inclusion in the Work by the copyright owner
>>> + or by an individual or Legal Entity authorized to submit on behalf of
>>> + the copyright owner. For the purposes of this definition, "submitted"
>>> + means any form of electronic, verbal, or written communication sent
>>> + to the Licensor or its representatives, including but not limited to
>>> + communication on electronic mailing lists, source code control systems,
>>> + and issue tracking systems that are managed by, or on behalf of, the
>>> + Licensor for the purpose of discussing and improving the Work, but
>>> + excluding communication that is conspicuously marked or otherwise
>>> + designated in writing by the copyright owner as "Not a Contribution."
>>> +
>>> + "Contributor" shall mean Licensor and any individual or Legal Entity
>>> + on behalf of whom a Contribution has been received by Licensor and
>>> + subsequently incorporated within the Work.
>>> +
>>> + 2. Grant of Copyright License. Subject to the terms and conditions of
>>> + this License, each Contributor hereby grants to You a perpetual,
>>> + worldwide, non-exclusive, no-charge, royalty-free, irrevocable
>>> + copyright license to reproduce, prepare Derivative Works of,
>>> + publicly display, publicly perform, sublicense, and distribute the
>>> + Work and such Derivative Works in Source or Object form.
>>> +
>>> + 3. Grant of Patent License. Subject to the terms and conditions of
>>> + this License, each Contributor hereby grants to You a perpetual,
>>> + worldwide, non-exclusive, no-charge, royalty-free, irrevocable
>>> + (except as stated in this section) patent license to make, have made,
>>> + use, offer to sell, sell, import, and otherwise transfer the Work,
>>> + where such license applies only to those patent claims licensable
>>> + by such Contributor that are necessarily infringed by their
>>> + Contribution(s) alone or by combination of their Contribution(s)
>>> + with the Work to which such Contribution(s) was submitted. If You
>>> + institute patent litigation against any entity (including a
>>> + cross-claim or counterclaim in a lawsuit) alleging that the Work
>>> + or a Contribution incorporated within the Work constitutes direct
>>> + or contributory patent infringement, then any patent licenses
>>> + granted to You under this License for that Work shall terminate
>>> + as of the date such litigation is filed.
>>> +
>>> + 4. Redistribution. You may reproduce and distribute copies of the
>>> + Work or Derivative Works thereof in any medium, with or without
>>> + modifications, and in Source or Object form, provided that You
>>> + meet the following conditions:
>>> +
>>> + (a) You must give any other recipients of the Work or
>>> + Derivative Works a copy of this License; and
>>> +
>>> + (b) You must cause any modified files to carry prominent notices
>>> + stating that You changed the files; and
>>> +
>>> + (c) You must retain, in the Source form of any Derivative Works
>>> + that You distribute, all copyright, patent, trademark, and
>>> + attribution notices from the Source form of the Work,
>>> + excluding those notices that do not pertain to any part of
>>> + the Derivative Works; and
>>> +
>>> + (d) If the Work includes a "NOTICE" text file as part of its
>>> + distribution, then any Derivative Works that You distribute must
>>> + include a readable copy of the attribution notices contained
>>> + within such NOTICE file, excluding those notices that do not
>>> + pertain to any part of the Derivative Works, in at least one
>>> + of the following places: within a NOTICE text file distributed
>>> + as part of the Derivative Works; within the Source form or
>>> + documentation, if provided along with the Derivative Works; or,
>>> + within a display generated by the Derivative Works, if and
>>> + wherever such third-party notices normally appear. The contents
>>> + of the NOTICE file are for informational purposes only and
>>> + do not modify the License. You may add Your own attribution
>>> + notices within Derivative Works that You distribute, alongside
>>> + or as an addendum to the NOTICE text from the Work, provided
>>> + that such additional attribution notices cannot be construed
>>> + as modifying the License.
>>> +
>>> + You may add Your own copyright statement to Your modifications and
>>> + may provide additional or different license terms and conditions
>>> + for use, reproduction, or distribution of Your modifications, or
>>> + for any such Derivative Works as a whole, provided Your use,
>>> + reproduction, and distribution of the Work otherwise complies with
>>> + the conditions stated in this License.
>>> +
>>> + 5. Submission of Contributions. Unless You explicitly state otherwise,
>>> + any Contribution intentionally submitted for inclusion in the Work
>>> + by You to the Licensor shall be under the terms and conditions of
>>> + this License, without any additional terms or conditions.
>>> + Notwithstanding the above, nothing herein shall supersede or modify
>>> + the terms of any separate license agreement you may have executed
>>> + with Licensor regarding such Contributions.
>>> +
>>> + 6. Trademarks. This License does not grant permission to use the trade
>>> + names, trademarks, service marks, or product names of the Licensor,
>>> + except as required for reasonable and customary use in describing the
>>> + origin of the Work and reproducing the content of the NOTICE file.
>>> +
>>> + 7. Disclaimer of Warranty. Unless required by applicable law or
>>> + agreed to in writing, Licensor provides the Work (and each
>>> + Contributor provides its Contributions) on an "AS IS" BASIS,
>>> + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
>>> + implied, including, without limitation, any warranties or conditions
>>> + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
>>> + PARTICULAR PURPOSE. You are solely responsible for determining the
>>> + appropriateness of using or redistributing the Work and assume any
>>> + risks associated with Your exercise of permissions under this License.
>>> +
>>> + 8. Limitation of Liability. In no event and under no legal theory,
>>> + whether in tort (including negligence), contract, or otherwise,
>>> + unless required by applicable law (such as deliberate and grossly
>>> + negligent acts) or agreed to in writing, shall any Contributor be
>>> + liable to You for damages, including any direct, indirect, special,
>>> + incidental, or consequential damages of any character arising as a
>>> + result of this License or out of the use or inability to use the
>>> + Work (including but not limited to damages for loss of goodwill,
>>> + work stoppage, computer failure or malfunction, or any and all
>>> + other commercial damages or losses), even if such Contributor
>>> + has been advised of the possibility of such damages.
>>> +
>>> + 9. Accepting Warranty or Additional Liability. While redistributing
>>> + the Work or Derivative Works thereof, You may choose to offer,
>>> + and charge a fee for, acceptance of support, warranty, indemnity,
>>> + or other liability obligations and/or rights consistent with this
>>> + License. However, in accepting such obligations, You may act only
>>> + on Your own behalf and on Your sole responsibility, not on behalf
>>> + of any other Contributor, and only if You agree to indemnify,
>>> + defend, and hold each Contributor harmless for any liability
>>> + incurred by, or claims asserted against, such Contributor by reason
>>> + of your accepting any such warranty or additional liability.
>>>
>>> Modified: struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/NOTICE.txt
>>> URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/NOTICE.txt?rev=1521783&r1=1521782&r2=1521783&view=diff
>>> ==============================================================================
>>> --- struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/NOTICE.txt (original)
>>> +++ struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/NOTICE.txt Wed Sep 11 10:24:18 2013
>>> @@ -1,6 +1,6 @@
>>> -Apache Struts
>>> -
>>> -Copyright 2006-2011 The Apache Software Foundation
>>> -
>>> -This product includes software developed at
>>> -The Apache Software Foundation (http://www.apache.org/
>>> +Apache Struts
>>> +
>>> +Copyright 2006-2011 The Apache Software Foundation
>>> +
>>> +This product includes software developed at
>>> +The Apache Software Foundation (http://www.apache.org/
>>>
>>> Added: struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/README.txt
>>> URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/README.txt?rev=1521783&view=auto
>>> ==============================================================================
>>> --- struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/README.txt (added)
>>> +++ struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/README.txt Wed Sep 11 10:24:18 2013
>>> @@ -0,0 +1,10 @@
>>> +README.txt - blank convention
>>> +
>>> +This is an "empty" Google App Engine aware application that you can deploy as the basis of your own
>>> +application.
>>> +
>>> +For more on getting started with Struts, see
>>> +
>>> +* http://cwiki.apache.org/WW/home.html
>>> +
>>> +----------------------------------------------------------------------------
>>> \ No newline at end of file
>>>
>>> Propchange: struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/README.txt
>>> ------------------------------------------------------------------------------
>>> svn:eol-style = native
>>>
>>> Modified: struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/pom.xml
>>> URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/pom.xml?rev=1521783&r1=1521782&r2=1521783&view=diff
>>> ==============================================================================
>>> --- struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/pom.xml (original)
>>> +++ struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/pom.xml Wed Sep 11 10:24:18 2013
>>> @@ -67,7 +67,7 @@
>>> <dependency>
>>> <groupId>javax.servlet</groupId>
>>> <artifactId>servlet-api</artifactId>
>>> - <version>2.5</version>
>>> + <version>2.4</version>
>>> <scope>provided</scope>
>>> </dependency>
>>>
>>> @@ -93,7 +93,7 @@
>>> <plugin>
>>> <groupId>org.mortbay.jetty</groupId>
>>> <artifactId>jetty-maven-plugin</artifactId>
>>> - <version>8.1.12.v20130726</version>
>>> + <version>8.1.7.v20120910</version>
>>> <configuration>
>>> <stopKey>CTRL+C</stopKey>
>>> <stopPort>8999</stopPort>
>>> @@ -108,6 +108,11 @@
>>> </systemProperty>
>>> </systemProperties>
>>> <scanIntervalSeconds>10</scanIntervalSeconds>
>>> + <webAppSourceDirectory>\${basedir}/src/main/webapp/</webAppSourceDirectory>
>>> + <webAppConfig>
>>> + <contextPath>\${artifactId}</contextPath>
>>> + <descriptor>\${basedir}/src/main/webapp/WEB-INF/web.xml</descriptor>
>>> + </webAppConfig>
>>> </configuration>
>>> <dependencies>
>>> <dependency>
>>>
>>> Added: struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/java/InitListener.java
>>> URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/java/InitListener.java?rev=1521783&view=auto
>>> ==============================================================================
>>> --- struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/java/InitListener.java (added)
>>> +++ struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/java/InitListener.java Wed Sep 11 10:24:18 2013
>>> @@ -0,0 +1,25 @@
>>> +package ${package};
>>> +
>>> +import ognl.OgnlRuntime;
>>> +
>>> +import javax.servlet.ServletContextEvent;
>>> +import javax.servlet.ServletContextListener;
>>> +import java.util.logging.Logger;
>>> +
>>> +
>>> +/**
>>> + * To allow works Struts 2 with Google App Engine
>>> + */
>>> +public class InitListener implements ServletContextListener {
>>> +
>>> + public InitListener() {
>>> + }
>>> +
>>> + public void contextInitialized(ServletContextEvent sce) {
>>> + OgnlRuntime.setSecurityManager(null);
>>> + }
>>> +
>>> + public void contextDestroyed(ServletContextEvent sce) {
>>> + }
>>> +
>>> +}
>>>
>>> Propchange: struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/java/InitListener.java
>>> ------------------------------------------------------------------------------
>>> svn:eol-style = native
>>>
>>> Modified: struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/java/actions/HelloAction.java
>>> URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/java/actions/HelloAction.java?rev=1521783&r1=1521782&r2=1521783&view=diff
>>> ==============================================================================
>>> --- struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/java/actions/HelloAction.java (original)
>>> +++ struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/java/actions/HelloAction.java Wed Sep 11 10:24:18 2013
>>> @@ -1,23 +1,3 @@
>>> -/*
>>> - * $Id$
>>> - *
>>> - * Licensed to the Apache Software Foundation (ASF) under one
>>> - * or more contributor license agreements. See the NOTICE file
>>> - * distributed with this work for additional information
>>> - * regarding copyright ownership. The ASF licenses this file
>>> - * to you under the Apache License, Version 2.0 (the
>>> - * "License"); you may not use this file except in compliance
>>> - * with the License. You may obtain a copy of the License at
>>> - *
>>> - * http://www.apache.org/licenses/LICENSE-2.0
>>> - *
>>> - * Unless required by applicable law or agreed to in writing,
>>> - * software distributed under the License is distributed on an
>>> - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
>>> - * KIND, either express or implied. See the License for the
>>> - * specific language governing permissions and limitations
>>> - * under the License.
>>> - */
>>> package ${package}.actions;
>>>
>>> import com.opensymphony.xwork2.ActionSupport;
>>> @@ -27,8 +7,6 @@ import com.opensymphony.xwork2.ActionSup
>>> */
>>> public class HelloAction extends ActionSupport {
>>>
>>> - private static final long serialVersionUID = -3243216917801206214L;
>>> -
>>> public String execute() throws Exception {
>>> setMessage(getText(MESSAGE));
>>> return SUCCESS;
>>>
>>> Modified: struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/java/actions/Index.java
>>> URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/java/actions/Index.java?rev=1521783&r1=1521782&r2=1521783&view=diff
>>> ==============================================================================
>>> --- struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/java/actions/Index.java (original)
>>> +++ struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/java/actions/Index.java Wed Sep 11 10:24:18 2013
>>> @@ -1,23 +1,3 @@
>>> -/*
>>> - * $Id$
>>> - *
>>> - * Licensed to the Apache Software Foundation (ASF) under one
>>> - * or more contributor license agreements. See the NOTICE file
>>> - * distributed with this work for additional information
>>> - * regarding copyright ownership. The ASF licenses this file
>>> - * to you under the Apache License, Version 2.0 (the
>>> - * "License"); you may not use this file except in compliance
>>> - * with the License. You may obtain a copy of the License at
>>> - *
>>> - * http://www.apache.org/licenses/LICENSE-2.0
>>> - *
>>> - * Unless required by applicable law or agreed to in writing,
>>> - * software distributed under the License is distributed on an
>>> - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
>>> - * KIND, either express or implied. See the License for the
>>> - * specific language governing permissions and limitations
>>> - * under the License.
>>> - */
>>> package ${package}.actions;
>>>
>>> import com.opensymphony.xwork2.Action;
>>> @@ -30,8 +10,6 @@ import org.apache.struts2.convention.ann
>>> })
>>> public class Index extends ActionSupport {
>>>
>>> - private static final long serialVersionUID = 6153177836211979662L;
>>> -
>>> private String redirectName;
>>>
>>> public String execute() {
>>>
>>> Modified: struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/resources/package.properties
>>> URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/resources/package.properties?rev=1521783&r1=1521782&r2=1521783&view=diff
>>> ==============================================================================
>>> --- struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/resources/package.properties (original)
>>> +++ struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/resources/package.properties Wed Sep 11 10:24:18 2013
>>> @@ -1 +1,2 @@
>>> hello.message = Struts is up and running...
>>> +requiredstring= ${getText(fieldName)} is required.
>>>
>>> Modified: struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/resources/package_es.properties
>>> URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/resources/package_es.properties?rev=1521783&r1=1521782&r2=1521783&view=diff
>>> ==============================================================================
>>> --- struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/resources/package_es.properties (original)
>>> +++ struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/resources/package_es.properties Wed Sep 11 10:24:18 2013
>>> @@ -1 +1,2 @@
>>> hello.message = \u00A1Struts est\u00E1 bien\!...
>>> +requiredstring = ${getText(fieldName)} es requerido.
>>>
>>> Modified: struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/resources/struts.xml
>>> URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/resources/struts.xml?rev=1521783&r1=1521782&r2=1521783&view=diff
>>> ==============================================================================
>>> --- struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/resources/struts.xml (original)
>>> +++ struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/resources/struts.xml Wed Sep 11 10:24:18 2013
>>> @@ -7,7 +7,4 @@
>>> <constant name="struts.enable.DynamicMethodInvocation" value="false"/>
>>> <constant name="struts.devMode" value="true"/>
>>>
>>> - <constant name="struts.convention.default.parent.package" value="angularstruts"/>
>>> - <package name="angularstruts" extends="json-default"></package>
>>> -
>>> </struts>
>>>
>>> Added: struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/appengine-web.xml
>>> URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/appengine-web.xml?rev=1521783&view=auto
>>> ==============================================================================
>>> --- struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/appengine-web.xml (added)
>>> +++ struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/appengine-web.xml Wed Sep 11 10:24:18 2013
>>> @@ -0,0 +1,6 @@
>>> +<?xml version="1.0" encoding="utf-8"?>
>>> +<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
>>> + <application>${artifactId}</application>
>>> + <version>1</version>
>>> + <sessions-enabled>true</sessions-enabled>
>>> +</appengine-web-app>
>>>
>>> Propchange: struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/appengine-web.xml
>>> ------------------------------------------------------------------------------
>>> svn:eol-style = native
>>>
>>> Modified: struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/content/hello.jsp
>>> URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/content/hello.jsp?rev=1521783&r1=1521782&r2=1521783&view=diff
>>> ==============================================================================
>>> --- struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/content/hello.jsp (original)
>>> +++ struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/content/hello.jsp Wed Sep 11 10:24:18 2013
>>> @@ -1,26 +1,16 @@
>>> <%@ page contentType="text/html; charset=UTF-8" %>
>>> <%@ taglib prefix="s" uri="/struts-tags" %>
>>> <!DOCTYPE html>
>>> -<html lang="en" ng-app="angularstruts">
>>> +<html lang="en" ng-app>
>>> <head>
>>> <meta charset="utf-8">
>>> <title>My AngularJS Struts2 App</title>
>>> </head>
>>> <body>
>>>
>>> -<h2><s:property value="message"/></h2>
>>> -
>>> -<div>
>>> - <a href="#/home">Home</a> - <a href="#/projects">Projects</a>
>>> -</div>
>>> -
>>> -<div ng-controller="AppController">
>>> - <div ng-view></div>
>>> -</div>
>>> +<p>Nothing here {{'yet' + '!'}}</p>
>>>
>>> <script src="<s:url value="js/lib/angular/angular.min.js" />"></script>
>>> -<script src="<s:url value="js/directives.js" />"></script>
>>> -<script src="<s:url value="js/controllers.js" />"></script>
>>> -<script src="<s:url value="js/bootstrap.js" />"></script>
>>> +
>>> </body>
>>> </html>
>>>
>>> Modified: struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
>>> URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml?rev=1521783&r1=1521782&r2=1521783&view=diff
>>> ==============================================================================
>>> --- struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml (original)
>>> +++ struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml Wed Sep 11 10:24:18 2013
>>> @@ -1,8 +1,13 @@
>>> <?xml version="1.0" encoding="UTF-8"?>
>>> -<web-app id="struts_angularjs" version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
>>> +<web-app id="struts_blank" version="2.4"
>>> + xmlns="http://java.sun.com/xml/ns/j2ee"
>>> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
>>> - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
>>> - <display-name>Struts Blank AngularJS App</display-name>
>>> + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
>>> + <display-name>Struts Blank Convention</display-name>
>>> +
>>> + <listener>
>>> + <listener-class>${package}.InitListener</listener-class>
>>> + </listener>
>>>
>>> <filter>
>>> <filter-name>struts2</filter-name>
>>>
>>> Modified: struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/test/java/actions/HelloActionTest.java
>>> URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/test/java/actions/HelloActionTest.java?rev=1521783&r1=1521782&r2=1521783&view=diff
>>> ==============================================================================
>>> --- struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/test/java/actions/HelloActionTest.java (original)
>>> +++ struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/test/java/actions/HelloActionTest.java Wed Sep 11 10:24:18 2013
>>> @@ -1,23 +1,3 @@
>>> -/*
>>> - * $Id$
>>> - *
>>> - * Licensed to the Apache Software Foundation (ASF) under one
>>> - * or more contributor license agreements. See the NOTICE file
>>> - * distributed with this work for additional information
>>> - * regarding copyright ownership. The ASF licenses this file
>>> - * to you under the Apache License, Version 2.0 (the
>>> - * "License"); you may not use this file except in compliance
>>> - * with the License. You may obtain a copy of the License at
>>> - *
>>> - * http://www.apache.org/licenses/LICENSE-2.0
>>> - *
>>> - * Unless required by applicable law or agreed to in writing,
>>> - * software distributed under the License is distributed on an
>>> - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
>>> - * KIND, either express or implied. See the License for the
>>> - * specific language governing permissions and limitations
>>> - * under the License.
>>> - */
>>> package ${package}.actions;
>>>
>>> import com.opensymphony.xwork2.ActionSupport;
>>>
>>> Modified: struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/test/java/actions/IndexTest.java
>>> URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/test/java/actions/IndexTest.java?rev=1521783&r1=1521782&r2=1521783&view=diff
>>> ==============================================================================
>>> --- struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/test/java/actions/IndexTest.java (original)
>>> +++ struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/test/java/actions/IndexTest.java Wed Sep 11 10:24:18 2013
>>> @@ -1,23 +1,3 @@
>>> -/*
>>> - * $Id$
>>> - *
>>> - * Licensed to the Apache Software Foundation (ASF) under one
>>> - * or more contributor license agreements. See the NOTICE file
>>> - * distributed with this work for additional information
>>> - * regarding copyright ownership. The ASF licenses this file
>>> - * to you under the Apache License, Version 2.0 (the
>>> - * "License"); you may not use this file except in compliance
>>> - * with the License. You may obtain a copy of the License at
>>> - *
>>> - * http://www.apache.org/licenses/LICENSE-2.0
>>> - *
>>> - * Unless required by applicable law or agreed to in writing,
>>> - * software distributed under the License is distributed on an
>>> - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
>>> - * KIND, either express or implied. See the License for the
>>> - * specific language governing permissions and limitations
>>> - * under the License.
>>> - */
>>> package ${package}.actions;
>>>
>>> import com.opensymphony.xwork2.ActionSupport;
>>>
>>> Copied: struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/site/site.xml (from r1521602, struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/test/java/actions/IndexTest.java)
>>> URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/site/site.xml?p2=struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/site/site.xml&p1=struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/test/java/actions/IndexTest.java&r1=1521602&r2=1521783&rev=1521783&view=diff
>>> ==============================================================================
>>> --- struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/test/java/actions/IndexTest.java (original)
>>> +++ struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/site/site.xml Wed Sep 11 10:24:18 2013
>>> @@ -1,5 +1,7 @@
>>> +<?xml version="1.0" encoding="ISO-8859-1"?>
>>> +<!--
>>> /*
>>> - * $Id$
>>> + * $Id: site.xml 1082279 2011-03-16 19:43:51Z lukaszlenart $
>>> *
>>> * Licensed to the Apache Software Foundation (ASF) under one
>>> * or more contributor license agreements. See the NOTICE file
>>> @@ -18,17 +20,28 @@
>>> * specific language governing permissions and limitations
>>> * under the License.
>>> */
>>> -package ${package}.actions;
>>> +-->
>>> +<project name="Struts 2">
>>> + <bannerLeft>
>>> + <name>Apache Software Foundation</name>
>>> + <src>http://www.apache.org/images/asf-logo.gif</src>
>>> + <href>http://www.apache.org/</href>
>>> + </bannerLeft>
>>> + <bannerRight>
>>> + <name>Apache Struts</name>
>>> + <src>http://struts.apache.org/images/struts.gif</src>
>>> + <href>http://struts.apache.org/</href>
>>> + </bannerRight>
>>> + <body>
>>> + <links>
>>> + <item name="Apache"
>>> + href="http://www.apache.org/"/>
>>> + <item name="Struts"
>>> + href="http://struts.apache.org/index.html"/>
>>> + </links>
>>>
>>> -import com.opensymphony.xwork2.ActionSupport;
>>> -import org.apache.struts2.StrutsTestCase;
>>> + <menu ref="parent"/>
>>> + <menu ref="reports"/>
>>>
>>> -public class IndexTest extends StrutsTestCase {
>>> -
>>> - public void testIndex() throws Exception {
>>> - Index index = new Index();
>>> - String result = index.execute();
>>> - assertTrue("Expected a success result!", ActionSupport.SUCCESS.equals(result));
>>> - assertTrue("Expected the 'hello' action name!!", "hello".equals(index.getRedirectName()));
>>> - }
>>> -}
>>> + </body>
>>> +</project>
>>>
>>> Added: struts/struts2/trunk/archetypes/struts2-archetype-angularjs/struts2-archetype-convention (1).iml
>>> URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-angularjs/struts2-archetype-convention%20%281%29.iml?rev=1521783&view=auto
>>> ==============================================================================
>>> --- struts/struts2/trunk/archetypes/struts2-archetype-angularjs/struts2-archetype-convention (1).iml (added)
>>> +++ struts/struts2/trunk/archetypes/struts2-archetype-angularjs/struts2-archetype-convention (1).iml Wed Sep 11 10:24:18 2013
>>> @@ -0,0 +1,14 @@
>>> +<?xml version="1.0" encoding="UTF-8"?>
>>> +<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
>>> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
>>> + <output url="file://$MODULE_DIR$/target/classes" />
>>> + <output-test url="file://$MODULE_DIR$/target/test-classes" />
>>> + <content url="file://$MODULE_DIR$">
>>> + <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
>>> + <excludeFolder url="file://$MODULE_DIR$/target" />
>>> + </content>
>>> + <orderEntry type="inheritedJdk" />
>>> + <orderEntry type="sourceFolder" forTests="false" />
>>> + </component>
>>> +</module>
>>> +
>>>
>>> Added: struts/struts2/trunk/archetypes/struts2-archetype-angularjs/struts2-archetype-convention.iml
>>> URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-angularjs/struts2-archetype-convention.iml?rev=1521783&view=auto
>>> ==============================================================================
>>> --- struts/struts2/trunk/archetypes/struts2-archetype-angularjs/struts2-archetype-convention.iml (added)
>>> +++ struts/struts2/trunk/archetypes/struts2-archetype-angularjs/struts2-archetype-convention.iml Wed Sep 11 10:24:18 2013
>>> @@ -0,0 +1,34 @@
>>> +<?xml version="1.0" encoding="UTF-8"?>
>>> +<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
>>> + <component name="FacetManager">
>>> + <facet type="web" name="Web">
>>> + <configuration>
>>> + <descriptors>
>>> + <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml" />
>>> + </descriptors>
>>> + <webroots>
>>> + <root url="file://$MODULE_DIR$/src/main/resources/archetype-resources/src/main/webapp" relative="/" />
>>> + </webroots>
>>> + </configuration>
>>> + <facet type="google-app-engine" name="Google App Engine">
>>> + <configuration />
>>> + </facet>
>>> + <facet type="Struts2" name="Struts 2">
>>> + <configuration>
>>> + <propertiesKeys disabled="false" />
>>> + </configuration>
>>> + </facet>
>>> + </facet>
>>> + </component>
>>> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
>>> + <output url="file://$MODULE_DIR$/target/classes" />
>>> + <output-test url="file://$MODULE_DIR$/target/test-classes" />
>>> + <content url="file://$MODULE_DIR$">
>>> + <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
>>> + <excludeFolder url="file://$MODULE_DIR$/target" />
>>> + </content>
>>> + <orderEntry type="inheritedJdk" />
>>> + <orderEntry type="sourceFolder" forTests="false" />
>>> + </component>
>>> +</module>
>>> +
>>>
>>>
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
>> For additional commands, e-mail: dev-help@struts.apache.org
>>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
> For additional commands, e-mail: dev-help@struts.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org
Re: bad commits with git...
Posted by Christian Grobmeier <gr...@gmail.com>.
Am 11.09.13 16:02, schrieb Rene Gielen:
> This is when you realize that git-svn is not "real" git. Such problems
> would not arise after switching the S2 repo tree from svn to git...
oh and not to forget: git svn is really slow..!
> - René
>
> Am 11.09.13 12:31, schrieb Christian Grobmeier:
>> Hi,
>>
>> its easy to mess up the svn repos with git - prove below :-)
>>
>> I forked from the official struts-mirror and added our svn as git svn repos.
>> The I tried to merge the strutsathon outcome (angularjs) with my repo.
>> Somewhere in between Johannes added the files manually to SVN.
>> I fetched and tried to get these changes, but for some reason my Git repos
>> thought I would have the more accurate changes, which is not the case.
>>
>> I am going to revert this below.
>>
>> *sigh*. Actually it's not exactly easy - but I will figure it out.
>>
>> Am 11.09.13 12:24, schrieb grobmeier@apache.org:
>>> 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=<CURRENT_STRUTS_VERSION> \
>>> - -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 "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
>>> +
>>>
>>> Modified: struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/META-INF/maven/archetype-metadata.xml
>>> URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/META-INF/maven/archetype-metadata.xml?rev=1521783&r1=1521782&r2=1521783&view=diff
>>> ==============================================================================
>>> --- struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/META-INF/maven/archetype-metadata.xml (original)
>>> +++ struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/META-INF/maven/archetype-metadata.xml Wed Sep 11 10:24:18 2013
>>> @@ -1,5 +1,5 @@
>>> <?xml version="1.0" encoding="UTF-8"?>
>>> -<archetype-descriptor name="struts2-archetype-angularjs">
>>> +<archetype-descriptor name="struts2-archetype-convention">
>>>
>>> <fileSets>
>>> <fileSet filtered="true" packaged="true">
>>> @@ -57,12 +57,6 @@
>>> <include>**/*</include>
>>> </includes>
>>> </fileSet>
>>> - <fileSet filtered="false" packaged="false">
>>> - <directory>src/main/webapp/partials</directory>
>>> - <includes>
>>> - <include>**/*</include>
>>> - </includes>
>>> - </fileSet>
>>> </fileSets>
>>>
>>> </archetype-descriptor>
>>>
>>> Modified: struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/LICENSE.txt
>>> URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/LICENSE.txt?rev=1521783&r1=1521782&r2=1521783&view=diff
>>> ==============================================================================
>>> --- struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/LICENSE.txt (original)
>>> +++ struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/LICENSE.txt Wed Sep 11 10:24:18 2013
>>> @@ -1,174 +1,174 @@
>>> - Apache License
>>> - Version 2.0, January 2004
>>> - http://www.apache.org/licenses/
>>> -
>>> - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
>>> -
>>> - 1. Definitions.
>>> -
>>> - "License" shall mean the terms and conditions for use, reproduction,
>>> - and distribution as defined by Sections 1 through 9 of this document.
>>> -
>>> - "Licensor" shall mean the copyright owner or entity authorized by
>>> - the copyright owner that is granting the License.
>>> -
>>> - "Legal Entity" shall mean the union of the acting entity and all
>>> - other entities that control, are controlled by, or are under common
>>> - control with that entity. For the purposes of this definition,
>>> - "control" means (i) the power, direct or indirect, to cause the
>>> - direction or management of such entity, whether by contract or
>>> - otherwise, or (ii) ownership of fifty percent (50%) or more of the
>>> - outstanding shares, or (iii) beneficial ownership of such entity.
>>> -
>>> - "You" (or "Your") shall mean an individual or Legal Entity
>>> - exercising permissions granted by this License.
>>> -
>>> - "Source" form shall mean the preferred form for making modifications,
>>> - including but not limited to software source code, documentation
>>> - source, and configuration files.
>>> -
>>> - "Object" form shall mean any form resulting from mechanical
>>> - transformation or translation of a Source form, including but
>>> - not limited to compiled object code, generated documentation,
>>> - and conversions to other media types.
>>> -
>>> - "Work" shall mean the work of authorship, whether in Source or
>>> - Object form, made available under the License, as indicated by a
>>> - copyright notice that is included in or attached to the work
>>> - (an example is provided in the Appendix below).
>>> -
>>> - "Derivative Works" shall mean any work, whether in Source or Object
>>> - form, that is based on (or derived from) the Work and for which the
>>> - editorial revisions, annotations, elaborations, or other modifications
>>> - represent, as a whole, an original work of authorship. For the purposes
>>> - of this License, Derivative Works shall not include works that remain
>>> - separable from, or merely link (or bind by name) to the interfaces of,
>>> - the Work and Derivative Works thereof.
>>> -
>>> - "Contribution" shall mean any work of authorship, including
>>> - the original version of the Work and any modifications or additions
>>> - to that Work or Derivative Works thereof, that is intentionally
>>> - submitted to Licensor for inclusion in the Work by the copyright owner
>>> - or by an individual or Legal Entity authorized to submit on behalf of
>>> - the copyright owner. For the purposes of this definition, "submitted"
>>> - means any form of electronic, verbal, or written communication sent
>>> - to the Licensor or its representatives, including but not limited to
>>> - communication on electronic mailing lists, source code control systems,
>>> - and issue tracking systems that are managed by, or on behalf of, the
>>> - Licensor for the purpose of discussing and improving the Work, but
>>> - excluding communication that is conspicuously marked or otherwise
>>> - designated in writing by the copyright owner as "Not a Contribution."
>>> -
>>> - "Contributor" shall mean Licensor and any individual or Legal Entity
>>> - on behalf of whom a Contribution has been received by Licensor and
>>> - subsequently incorporated within the Work.
>>> -
>>> - 2. Grant of Copyright License. Subject to the terms and conditions of
>>> - this License, each Contributor hereby grants to You a perpetual,
>>> - worldwide, non-exclusive, no-charge, royalty-free, irrevocable
>>> - copyright license to reproduce, prepare Derivative Works of,
>>> - publicly display, publicly perform, sublicense, and distribute the
>>> - Work and such Derivative Works in Source or Object form.
>>> -
>>> - 3. Grant of Patent License. Subject to the terms and conditions of
>>> - this License, each Contributor hereby grants to You a perpetual,
>>> - worldwide, non-exclusive, no-charge, royalty-free, irrevocable
>>> - (except as stated in this section) patent license to make, have made,
>>> - use, offer to sell, sell, import, and otherwise transfer the Work,
>>> - where such license applies only to those patent claims licensable
>>> - by such Contributor that are necessarily infringed by their
>>> - Contribution(s) alone or by combination of their Contribution(s)
>>> - with the Work to which such Contribution(s) was submitted. If You
>>> - institute patent litigation against any entity (including a
>>> - cross-claim or counterclaim in a lawsuit) alleging that the Work
>>> - or a Contribution incorporated within the Work constitutes direct
>>> - or contributory patent infringement, then any patent licenses
>>> - granted to You under this License for that Work shall terminate
>>> - as of the date such litigation is filed.
>>> -
>>> - 4. Redistribution. You may reproduce and distribute copies of the
>>> - Work or Derivative Works thereof in any medium, with or without
>>> - modifications, and in Source or Object form, provided that You
>>> - meet the following conditions:
>>> -
>>> - (a) You must give any other recipients of the Work or
>>> - Derivative Works a copy of this License; and
>>> -
>>> - (b) You must cause any modified files to carry prominent notices
>>> - stating that You changed the files; and
>>> -
>>> - (c) You must retain, in the Source form of any Derivative Works
>>> - that You distribute, all copyright, patent, trademark, and
>>> - attribution notices from the Source form of the Work,
>>> - excluding those notices that do not pertain to any part of
>>> - the Derivative Works; and
>>> -
>>> - (d) If the Work includes a "NOTICE" text file as part of its
>>> - distribution, then any Derivative Works that You distribute must
>>> - include a readable copy of the attribution notices contained
>>> - within such NOTICE file, excluding those notices that do not
>>> - pertain to any part of the Derivative Works, in at least one
>>> - of the following places: within a NOTICE text file distributed
>>> - as part of the Derivative Works; within the Source form or
>>> - documentation, if provided along with the Derivative Works; or,
>>> - within a display generated by the Derivative Works, if and
>>> - wherever such third-party notices normally appear. The contents
>>> - of the NOTICE file are for informational purposes only and
>>> - do not modify the License. You may add Your own attribution
>>> - notices within Derivative Works that You distribute, alongside
>>> - or as an addendum to the NOTICE text from the Work, provided
>>> - that such additional attribution notices cannot be construed
>>> - as modifying the License.
>>> -
>>> - You may add Your own copyright statement to Your modifications and
>>> - may provide additional or different license terms and conditions
>>> - for use, reproduction, or distribution of Your modifications, or
>>> - for any such Derivative Works as a whole, provided Your use,
>>> - reproduction, and distribution of the Work otherwise complies with
>>> - the conditions stated in this License.
>>> -
>>> - 5. Submission of Contributions. Unless You explicitly state otherwise,
>>> - any Contribution intentionally submitted for inclusion in the Work
>>> - by You to the Licensor shall be under the terms and conditions of
>>> - this License, without any additional terms or conditions.
>>> - Notwithstanding the above, nothing herein shall supersede or modify
>>> - the terms of any separate license agreement you may have executed
>>> - with Licensor regarding such Contributions.
>>> -
>>> - 6. Trademarks. This License does not grant permission to use the trade
>>> - names, trademarks, service marks, or product names of the Licensor,
>>> - except as required for reasonable and customary use in describing the
>>> - origin of the Work and reproducing the content of the NOTICE file.
>>> -
>>> - 7. Disclaimer of Warranty. Unless required by applicable law or
>>> - agreed to in writing, Licensor provides the Work (and each
>>> - Contributor provides its Contributions) on an "AS IS" BASIS,
>>> - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
>>> - implied, including, without limitation, any warranties or conditions
>>> - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
>>> - PARTICULAR PURPOSE. You are solely responsible for determining the
>>> - appropriateness of using or redistributing the Work and assume any
>>> - risks associated with Your exercise of permissions under this License.
>>> -
>>> - 8. Limitation of Liability. In no event and under no legal theory,
>>> - whether in tort (including negligence), contract, or otherwise,
>>> - unless required by applicable law (such as deliberate and grossly
>>> - negligent acts) or agreed to in writing, shall any Contributor be
>>> - liable to You for damages, including any direct, indirect, special,
>>> - incidental, or consequential damages of any character arising as a
>>> - result of this License or out of the use or inability to use the
>>> - Work (including but not limited to damages for loss of goodwill,
>>> - work stoppage, computer failure or malfunction, or any and all
>>> - other commercial damages or losses), even if such Contributor
>>> - has been advised of the possibility of such damages.
>>> -
>>> - 9. Accepting Warranty or Additional Liability. While redistributing
>>> - the Work or Derivative Works thereof, You may choose to offer,
>>> - and charge a fee for, acceptance of support, warranty, indemnity,
>>> - or other liability obligations and/or rights consistent with this
>>> - License. However, in accepting such obligations, You may act only
>>> - on Your own behalf and on Your sole responsibility, not on behalf
>>> - of any other Contributor, and only if You agree to indemnify,
>>> - defend, and hold each Contributor harmless for any liability
>>> - incurred by, or claims asserted against, such Contributor by reason
>>> - of your accepting any such warranty or additional liability.
>>> + Apache License
>>> + Version 2.0, January 2004
>>> + http://www.apache.org/licenses/
>>> +
>>> + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
>>> +
>>> + 1. Definitions.
>>> +
>>> + "License" shall mean the terms and conditions for use, reproduction,
>>> + and distribution as defined by Sections 1 through 9 of this document.
>>> +
>>> + "Licensor" shall mean the copyright owner or entity authorized by
>>> + the copyright owner that is granting the License.
>>> +
>>> + "Legal Entity" shall mean the union of the acting entity and all
>>> + other entities that control, are controlled by, or are under common
>>> + control with that entity. For the purposes of this definition,
>>> + "control" means (i) the power, direct or indirect, to cause the
>>> + direction or management of such entity, whether by contract or
>>> + otherwise, or (ii) ownership of fifty percent (50%) or more of the
>>> + outstanding shares, or (iii) beneficial ownership of such entity.
>>> +
>>> + "You" (or "Your") shall mean an individual or Legal Entity
>>> + exercising permissions granted by this License.
>>> +
>>> + "Source" form shall mean the preferred form for making modifications,
>>> + including but not limited to software source code, documentation
>>> + source, and configuration files.
>>> +
>>> + "Object" form shall mean any form resulting from mechanical
>>> + transformation or translation of a Source form, including but
>>> + not limited to compiled object code, generated documentation,
>>> + and conversions to other media types.
>>> +
>>> + "Work" shall mean the work of authorship, whether in Source or
>>> + Object form, made available under the License, as indicated by a
>>> + copyright notice that is included in or attached to the work
>>> + (an example is provided in the Appendix below).
>>> +
>>> + "Derivative Works" shall mean any work, whether in Source or Object
>>> + form, that is based on (or derived from) the Work and for which the
>>> + editorial revisions, annotations, elaborations, or other modifications
>>> + represent, as a whole, an original work of authorship. For the purposes
>>> + of this License, Derivative Works shall not include works that remain
>>> + separable from, or merely link (or bind by name) to the interfaces of,
>>> + the Work and Derivative Works thereof.
>>> +
>>> + "Contribution" shall mean any work of authorship, including
>>> + the original version of the Work and any modifications or additions
>>> + to that Work or Derivative Works thereof, that is intentionally
>>> + submitted to Licensor for inclusion in the Work by the copyright owner
>>> + or by an individual or Legal Entity authorized to submit on behalf of
>>> + the copyright owner. For the purposes of this definition, "submitted"
>>> + means any form of electronic, verbal, or written communication sent
>>> + to the Licensor or its representatives, including but not limited to
>>> + communication on electronic mailing lists, source code control systems,
>>> + and issue tracking systems that are managed by, or on behalf of, the
>>> + Licensor for the purpose of discussing and improving the Work, but
>>> + excluding communication that is conspicuously marked or otherwise
>>> + designated in writing by the copyright owner as "Not a Contribution."
>>> +
>>> + "Contributor" shall mean Licensor and any individual or Legal Entity
>>> + on behalf of whom a Contribution has been received by Licensor and
>>> + subsequently incorporated within the Work.
>>> +
>>> + 2. Grant of Copyright License. Subject to the terms and conditions of
>>> + this License, each Contributor hereby grants to You a perpetual,
>>> + worldwide, non-exclusive, no-charge, royalty-free, irrevocable
>>> + copyright license to reproduce, prepare Derivative Works of,
>>> + publicly display, publicly perform, sublicense, and distribute the
>>> + Work and such Derivative Works in Source or Object form.
>>> +
>>> + 3. Grant of Patent License. Subject to the terms and conditions of
>>> + this License, each Contributor hereby grants to You a perpetual,
>>> + worldwide, non-exclusive, no-charge, royalty-free, irrevocable
>>> + (except as stated in this section) patent license to make, have made,
>>> + use, offer to sell, sell, import, and otherwise transfer the Work,
>>> + where such license applies only to those patent claims licensable
>>> + by such Contributor that are necessarily infringed by their
>>> + Contribution(s) alone or by combination of their Contribution(s)
>>> + with the Work to which such Contribution(s) was submitted. If You
>>> + institute patent litigation against any entity (including a
>>> + cross-claim or counterclaim in a lawsuit) alleging that the Work
>>> + or a Contribution incorporated within the Work constitutes direct
>>> + or contributory patent infringement, then any patent licenses
>>> + granted to You under this License for that Work shall terminate
>>> + as of the date such litigation is filed.
>>> +
>>> + 4. Redistribution. You may reproduce and distribute copies of the
>>> + Work or Derivative Works thereof in any medium, with or without
>>> + modifications, and in Source or Object form, provided that You
>>> + meet the following conditions:
>>> +
>>> + (a) You must give any other recipients of the Work or
>>> + Derivative Works a copy of this License; and
>>> +
>>> + (b) You must cause any modified files to carry prominent notices
>>> + stating that You changed the files; and
>>> +
>>> + (c) You must retain, in the Source form of any Derivative Works
>>> + that You distribute, all copyright, patent, trademark, and
>>> + attribution notices from the Source form of the Work,
>>> + excluding those notices that do not pertain to any part of
>>> + the Derivative Works; and
>>> +
>>> + (d) If the Work includes a "NOTICE" text file as part of its
>>> + distribution, then any Derivative Works that You distribute must
>>> + include a readable copy of the attribution notices contained
>>> + within such NOTICE file, excluding those notices that do not
>>> + pertain to any part of the Derivative Works, in at least one
>>> + of the following places: within a NOTICE text file distributed
>>> + as part of the Derivative Works; within the Source form or
>>> + documentation, if provided along with the Derivative Works; or,
>>> + within a display generated by the Derivative Works, if and
>>> + wherever such third-party notices normally appear. The contents
>>> + of the NOTICE file are for informational purposes only and
>>> + do not modify the License. You may add Your own attribution
>>> + notices within Derivative Works that You distribute, alongside
>>> + or as an addendum to the NOTICE text from the Work, provided
>>> + that such additional attribution notices cannot be construed
>>> + as modifying the License.
>>> +
>>> + You may add Your own copyright statement to Your modifications and
>>> + may provide additional or different license terms and conditions
>>> + for use, reproduction, or distribution of Your modifications, or
>>> + for any such Derivative Works as a whole, provided Your use,
>>> + reproduction, and distribution of the Work otherwise complies with
>>> + the conditions stated in this License.
>>> +
>>> + 5. Submission of Contributions. Unless You explicitly state otherwise,
>>> + any Contribution intentionally submitted for inclusion in the Work
>>> + by You to the Licensor shall be under the terms and conditions of
>>> + this License, without any additional terms or conditions.
>>> + Notwithstanding the above, nothing herein shall supersede or modify
>>> + the terms of any separate license agreement you may have executed
>>> + with Licensor regarding such Contributions.
>>> +
>>> + 6. Trademarks. This License does not grant permission to use the trade
>>> + names, trademarks, service marks, or product names of the Licensor,
>>> + except as required for reasonable and customary use in describing the
>>> + origin of the Work and reproducing the content of the NOTICE file.
>>> +
>>> + 7. Disclaimer of Warranty. Unless required by applicable law or
>>> + agreed to in writing, Licensor provides the Work (and each
>>> + Contributor provides its Contributions) on an "AS IS" BASIS,
>>> + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
>>> + implied, including, without limitation, any warranties or conditions
>>> + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
>>> + PARTICULAR PURPOSE. You are solely responsible for determining the
>>> + appropriateness of using or redistributing the Work and assume any
>>> + risks associated with Your exercise of permissions under this License.
>>> +
>>> + 8. Limitation of Liability. In no event and under no legal theory,
>>> + whether in tort (including negligence), contract, or otherwise,
>>> + unless required by applicable law (such as deliberate and grossly
>>> + negligent acts) or agreed to in writing, shall any Contributor be
>>> + liable to You for damages, including any direct, indirect, special,
>>> + incidental, or consequential damages of any character arising as a
>>> + result of this License or out of the use or inability to use the
>>> + Work (including but not limited to damages for loss of goodwill,
>>> + work stoppage, computer failure or malfunction, or any and all
>>> + other commercial damages or losses), even if such Contributor
>>> + has been advised of the possibility of such damages.
>>> +
>>> + 9. Accepting Warranty or Additional Liability. While redistributing
>>> + the Work or Derivative Works thereof, You may choose to offer,
>>> + and charge a fee for, acceptance of support, warranty, indemnity,
>>> + or other liability obligations and/or rights consistent with this
>>> + License. However, in accepting such obligations, You may act only
>>> + on Your own behalf and on Your sole responsibility, not on behalf
>>> + of any other Contributor, and only if You agree to indemnify,
>>> + defend, and hold each Contributor harmless for any liability
>>> + incurred by, or claims asserted against, such Contributor by reason
>>> + of your accepting any such warranty or additional liability.
>>>
>>> Modified: struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/NOTICE.txt
>>> URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/NOTICE.txt?rev=1521783&r1=1521782&r2=1521783&view=diff
>>> ==============================================================================
>>> --- struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/NOTICE.txt (original)
>>> +++ struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/NOTICE.txt Wed Sep 11 10:24:18 2013
>>> @@ -1,6 +1,6 @@
>>> -Apache Struts
>>> -
>>> -Copyright 2006-2011 The Apache Software Foundation
>>> -
>>> -This product includes software developed at
>>> -The Apache Software Foundation (http://www.apache.org/
>>> +Apache Struts
>>> +
>>> +Copyright 2006-2011 The Apache Software Foundation
>>> +
>>> +This product includes software developed at
>>> +The Apache Software Foundation (http://www.apache.org/
>>>
>>> Added: struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/README.txt
>>> URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/README.txt?rev=1521783&view=auto
>>> ==============================================================================
>>> --- struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/README.txt (added)
>>> +++ struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/README.txt Wed Sep 11 10:24:18 2013
>>> @@ -0,0 +1,10 @@
>>> +README.txt - blank convention
>>> +
>>> +This is an "empty" Google App Engine aware application that you can deploy as the basis of your own
>>> +application.
>>> +
>>> +For more on getting started with Struts, see
>>> +
>>> +* http://cwiki.apache.org/WW/home.html
>>> +
>>> +----------------------------------------------------------------------------
>>> \ No newline at end of file
>>>
>>> Propchange: struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/README.txt
>>> ------------------------------------------------------------------------------
>>> svn:eol-style = native
>>>
>>> Modified: struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/pom.xml
>>> URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/pom.xml?rev=1521783&r1=1521782&r2=1521783&view=diff
>>> ==============================================================================
>>> --- struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/pom.xml (original)
>>> +++ struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/pom.xml Wed Sep 11 10:24:18 2013
>>> @@ -67,7 +67,7 @@
>>> <dependency>
>>> <groupId>javax.servlet</groupId>
>>> <artifactId>servlet-api</artifactId>
>>> - <version>2.5</version>
>>> + <version>2.4</version>
>>> <scope>provided</scope>
>>> </dependency>
>>>
>>> @@ -93,7 +93,7 @@
>>> <plugin>
>>> <groupId>org.mortbay.jetty</groupId>
>>> <artifactId>jetty-maven-plugin</artifactId>
>>> - <version>8.1.12.v20130726</version>
>>> + <version>8.1.7.v20120910</version>
>>> <configuration>
>>> <stopKey>CTRL+C</stopKey>
>>> <stopPort>8999</stopPort>
>>> @@ -108,6 +108,11 @@
>>> </systemProperty>
>>> </systemProperties>
>>> <scanIntervalSeconds>10</scanIntervalSeconds>
>>> + <webAppSourceDirectory>\${basedir}/src/main/webapp/</webAppSourceDirectory>
>>> + <webAppConfig>
>>> + <contextPath>\${artifactId}</contextPath>
>>> + <descriptor>\${basedir}/src/main/webapp/WEB-INF/web.xml</descriptor>
>>> + </webAppConfig>
>>> </configuration>
>>> <dependencies>
>>> <dependency>
>>>
>>> Added: struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/java/InitListener.java
>>> URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/java/InitListener.java?rev=1521783&view=auto
>>> ==============================================================================
>>> --- struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/java/InitListener.java (added)
>>> +++ struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/java/InitListener.java Wed Sep 11 10:24:18 2013
>>> @@ -0,0 +1,25 @@
>>> +package ${package};
>>> +
>>> +import ognl.OgnlRuntime;
>>> +
>>> +import javax.servlet.ServletContextEvent;
>>> +import javax.servlet.ServletContextListener;
>>> +import java.util.logging.Logger;
>>> +
>>> +
>>> +/**
>>> + * To allow works Struts 2 with Google App Engine
>>> + */
>>> +public class InitListener implements ServletContextListener {
>>> +
>>> + public InitListener() {
>>> + }
>>> +
>>> + public void contextInitialized(ServletContextEvent sce) {
>>> + OgnlRuntime.setSecurityManager(null);
>>> + }
>>> +
>>> + public void contextDestroyed(ServletContextEvent sce) {
>>> + }
>>> +
>>> +}
>>>
>>> Propchange: struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/java/InitListener.java
>>> ------------------------------------------------------------------------------
>>> svn:eol-style = native
>>>
>>> Modified: struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/java/actions/HelloAction.java
>>> URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/java/actions/HelloAction.java?rev=1521783&r1=1521782&r2=1521783&view=diff
>>> ==============================================================================
>>> --- struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/java/actions/HelloAction.java (original)
>>> +++ struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/java/actions/HelloAction.java Wed Sep 11 10:24:18 2013
>>> @@ -1,23 +1,3 @@
>>> -/*
>>> - * $Id$
>>> - *
>>> - * Licensed to the Apache Software Foundation (ASF) under one
>>> - * or more contributor license agreements. See the NOTICE file
>>> - * distributed with this work for additional information
>>> - * regarding copyright ownership. The ASF licenses this file
>>> - * to you under the Apache License, Version 2.0 (the
>>> - * "License"); you may not use this file except in compliance
>>> - * with the License. You may obtain a copy of the License at
>>> - *
>>> - * http://www.apache.org/licenses/LICENSE-2.0
>>> - *
>>> - * Unless required by applicable law or agreed to in writing,
>>> - * software distributed under the License is distributed on an
>>> - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
>>> - * KIND, either express or implied. See the License for the
>>> - * specific language governing permissions and limitations
>>> - * under the License.
>>> - */
>>> package ${package}.actions;
>>>
>>> import com.opensymphony.xwork2.ActionSupport;
>>> @@ -27,8 +7,6 @@ import com.opensymphony.xwork2.ActionSup
>>> */
>>> public class HelloAction extends ActionSupport {
>>>
>>> - private static final long serialVersionUID = -3243216917801206214L;
>>> -
>>> public String execute() throws Exception {
>>> setMessage(getText(MESSAGE));
>>> return SUCCESS;
>>>
>>> Modified: struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/java/actions/Index.java
>>> URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/java/actions/Index.java?rev=1521783&r1=1521782&r2=1521783&view=diff
>>> ==============================================================================
>>> --- struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/java/actions/Index.java (original)
>>> +++ struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/java/actions/Index.java Wed Sep 11 10:24:18 2013
>>> @@ -1,23 +1,3 @@
>>> -/*
>>> - * $Id$
>>> - *
>>> - * Licensed to the Apache Software Foundation (ASF) under one
>>> - * or more contributor license agreements. See the NOTICE file
>>> - * distributed with this work for additional information
>>> - * regarding copyright ownership. The ASF licenses this file
>>> - * to you under the Apache License, Version 2.0 (the
>>> - * "License"); you may not use this file except in compliance
>>> - * with the License. You may obtain a copy of the License at
>>> - *
>>> - * http://www.apache.org/licenses/LICENSE-2.0
>>> - *
>>> - * Unless required by applicable law or agreed to in writing,
>>> - * software distributed under the License is distributed on an
>>> - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
>>> - * KIND, either express or implied. See the License for the
>>> - * specific language governing permissions and limitations
>>> - * under the License.
>>> - */
>>> package ${package}.actions;
>>>
>>> import com.opensymphony.xwork2.Action;
>>> @@ -30,8 +10,6 @@ import org.apache.struts2.convention.ann
>>> })
>>> public class Index extends ActionSupport {
>>>
>>> - private static final long serialVersionUID = 6153177836211979662L;
>>> -
>>> private String redirectName;
>>>
>>> public String execute() {
>>>
>>> Modified: struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/resources/package.properties
>>> URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/resources/package.properties?rev=1521783&r1=1521782&r2=1521783&view=diff
>>> ==============================================================================
>>> --- struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/resources/package.properties (original)
>>> +++ struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/resources/package.properties Wed Sep 11 10:24:18 2013
>>> @@ -1 +1,2 @@
>>> hello.message = Struts is up and running...
>>> +requiredstring= ${getText(fieldName)} is required.
>>>
>>> Modified: struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/resources/package_es.properties
>>> URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/resources/package_es.properties?rev=1521783&r1=1521782&r2=1521783&view=diff
>>> ==============================================================================
>>> --- struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/resources/package_es.properties (original)
>>> +++ struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/resources/package_es.properties Wed Sep 11 10:24:18 2013
>>> @@ -1 +1,2 @@
>>> hello.message = \u00A1Struts est\u00E1 bien\!...
>>> +requiredstring = ${getText(fieldName)} es requerido.
>>>
>>> Modified: struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/resources/struts.xml
>>> URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/resources/struts.xml?rev=1521783&r1=1521782&r2=1521783&view=diff
>>> ==============================================================================
>>> --- struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/resources/struts.xml (original)
>>> +++ struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/resources/struts.xml Wed Sep 11 10:24:18 2013
>>> @@ -7,7 +7,4 @@
>>> <constant name="struts.enable.DynamicMethodInvocation" value="false"/>
>>> <constant name="struts.devMode" value="true"/>
>>>
>>> - <constant name="struts.convention.default.parent.package" value="angularstruts"/>
>>> - <package name="angularstruts" extends="json-default"></package>
>>> -
>>> </struts>
>>>
>>> Added: struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/appengine-web.xml
>>> URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/appengine-web.xml?rev=1521783&view=auto
>>> ==============================================================================
>>> --- struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/appengine-web.xml (added)
>>> +++ struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/appengine-web.xml Wed Sep 11 10:24:18 2013
>>> @@ -0,0 +1,6 @@
>>> +<?xml version="1.0" encoding="utf-8"?>
>>> +<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
>>> + <application>${artifactId}</application>
>>> + <version>1</version>
>>> + <sessions-enabled>true</sessions-enabled>
>>> +</appengine-web-app>
>>>
>>> Propchange: struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/appengine-web.xml
>>> ------------------------------------------------------------------------------
>>> svn:eol-style = native
>>>
>>> Modified: struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/content/hello.jsp
>>> URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/content/hello.jsp?rev=1521783&r1=1521782&r2=1521783&view=diff
>>> ==============================================================================
>>> --- struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/content/hello.jsp (original)
>>> +++ struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/content/hello.jsp Wed Sep 11 10:24:18 2013
>>> @@ -1,26 +1,16 @@
>>> <%@ page contentType="text/html; charset=UTF-8" %>
>>> <%@ taglib prefix="s" uri="/struts-tags" %>
>>> <!DOCTYPE html>
>>> -<html lang="en" ng-app="angularstruts">
>>> +<html lang="en" ng-app>
>>> <head>
>>> <meta charset="utf-8">
>>> <title>My AngularJS Struts2 App</title>
>>> </head>
>>> <body>
>>>
>>> -<h2><s:property value="message"/></h2>
>>> -
>>> -<div>
>>> - <a href="#/home">Home</a> - <a href="#/projects">Projects</a>
>>> -</div>
>>> -
>>> -<div ng-controller="AppController">
>>> - <div ng-view></div>
>>> -</div>
>>> +<p>Nothing here {{'yet' + '!'}}</p>
>>>
>>> <script src="<s:url value="js/lib/angular/angular.min.js" />"></script>
>>> -<script src="<s:url value="js/directives.js" />"></script>
>>> -<script src="<s:url value="js/controllers.js" />"></script>
>>> -<script src="<s:url value="js/bootstrap.js" />"></script>
>>> +
>>> </body>
>>> </html>
>>>
>>> Modified: struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
>>> URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml?rev=1521783&r1=1521782&r2=1521783&view=diff
>>> ==============================================================================
>>> --- struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml (original)
>>> +++ struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml Wed Sep 11 10:24:18 2013
>>> @@ -1,8 +1,13 @@
>>> <?xml version="1.0" encoding="UTF-8"?>
>>> -<web-app id="struts_angularjs" version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
>>> +<web-app id="struts_blank" version="2.4"
>>> + xmlns="http://java.sun.com/xml/ns/j2ee"
>>> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
>>> - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
>>> - <display-name>Struts Blank AngularJS App</display-name>
>>> + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
>>> + <display-name>Struts Blank Convention</display-name>
>>> +
>>> + <listener>
>>> + <listener-class>${package}.InitListener</listener-class>
>>> + </listener>
>>>
>>> <filter>
>>> <filter-name>struts2</filter-name>
>>>
>>> Modified: struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/test/java/actions/HelloActionTest.java
>>> URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/test/java/actions/HelloActionTest.java?rev=1521783&r1=1521782&r2=1521783&view=diff
>>> ==============================================================================
>>> --- struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/test/java/actions/HelloActionTest.java (original)
>>> +++ struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/test/java/actions/HelloActionTest.java Wed Sep 11 10:24:18 2013
>>> @@ -1,23 +1,3 @@
>>> -/*
>>> - * $Id$
>>> - *
>>> - * Licensed to the Apache Software Foundation (ASF) under one
>>> - * or more contributor license agreements. See the NOTICE file
>>> - * distributed with this work for additional information
>>> - * regarding copyright ownership. The ASF licenses this file
>>> - * to you under the Apache License, Version 2.0 (the
>>> - * "License"); you may not use this file except in compliance
>>> - * with the License. You may obtain a copy of the License at
>>> - *
>>> - * http://www.apache.org/licenses/LICENSE-2.0
>>> - *
>>> - * Unless required by applicable law or agreed to in writing,
>>> - * software distributed under the License is distributed on an
>>> - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
>>> - * KIND, either express or implied. See the License for the
>>> - * specific language governing permissions and limitations
>>> - * under the License.
>>> - */
>>> package ${package}.actions;
>>>
>>> import com.opensymphony.xwork2.ActionSupport;
>>>
>>> Modified: struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/test/java/actions/IndexTest.java
>>> URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/test/java/actions/IndexTest.java?rev=1521783&r1=1521782&r2=1521783&view=diff
>>> ==============================================================================
>>> --- struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/test/java/actions/IndexTest.java (original)
>>> +++ struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/test/java/actions/IndexTest.java Wed Sep 11 10:24:18 2013
>>> @@ -1,23 +1,3 @@
>>> -/*
>>> - * $Id$
>>> - *
>>> - * Licensed to the Apache Software Foundation (ASF) under one
>>> - * or more contributor license agreements. See the NOTICE file
>>> - * distributed with this work for additional information
>>> - * regarding copyright ownership. The ASF licenses this file
>>> - * to you under the Apache License, Version 2.0 (the
>>> - * "License"); you may not use this file except in compliance
>>> - * with the License. You may obtain a copy of the License at
>>> - *
>>> - * http://www.apache.org/licenses/LICENSE-2.0
>>> - *
>>> - * Unless required by applicable law or agreed to in writing,
>>> - * software distributed under the License is distributed on an
>>> - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
>>> - * KIND, either express or implied. See the License for the
>>> - * specific language governing permissions and limitations
>>> - * under the License.
>>> - */
>>> package ${package}.actions;
>>>
>>> import com.opensymphony.xwork2.ActionSupport;
>>>
>>> Copied: struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/site/site.xml (from r1521602, struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/test/java/actions/IndexTest.java)
>>> URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/site/site.xml?p2=struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/site/site.xml&p1=struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/test/java/actions/IndexTest.java&r1=1521602&r2=1521783&rev=1521783&view=diff
>>> ==============================================================================
>>> --- struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/test/java/actions/IndexTest.java (original)
>>> +++ struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/site/site.xml Wed Sep 11 10:24:18 2013
>>> @@ -1,5 +1,7 @@
>>> +<?xml version="1.0" encoding="ISO-8859-1"?>
>>> +<!--
>>> /*
>>> - * $Id$
>>> + * $Id: site.xml 1082279 2011-03-16 19:43:51Z lukaszlenart $
>>> *
>>> * Licensed to the Apache Software Foundation (ASF) under one
>>> * or more contributor license agreements. See the NOTICE file
>>> @@ -18,17 +20,28 @@
>>> * specific language governing permissions and limitations
>>> * under the License.
>>> */
>>> -package ${package}.actions;
>>> +-->
>>> +<project name="Struts 2">
>>> + <bannerLeft>
>>> + <name>Apache Software Foundation</name>
>>> + <src>http://www.apache.org/images/asf-logo.gif</src>
>>> + <href>http://www.apache.org/</href>
>>> + </bannerLeft>
>>> + <bannerRight>
>>> + <name>Apache Struts</name>
>>> + <src>http://struts.apache.org/images/struts.gif</src>
>>> + <href>http://struts.apache.org/</href>
>>> + </bannerRight>
>>> + <body>
>>> + <links>
>>> + <item name="Apache"
>>> + href="http://www.apache.org/"/>
>>> + <item name="Struts"
>>> + href="http://struts.apache.org/index.html"/>
>>> + </links>
>>>
>>> -import com.opensymphony.xwork2.ActionSupport;
>>> -import org.apache.struts2.StrutsTestCase;
>>> + <menu ref="parent"/>
>>> + <menu ref="reports"/>
>>>
>>> -public class IndexTest extends StrutsTestCase {
>>> -
>>> - public void testIndex() throws Exception {
>>> - Index index = new Index();
>>> - String result = index.execute();
>>> - assertTrue("Expected a success result!", ActionSupport.SUCCESS.equals(result));
>>> - assertTrue("Expected the 'hello' action name!!", "hello".equals(index.getRedirectName()));
>>> - }
>>> -}
>>> + </body>
>>> +</project>
>>>
>>> Added: struts/struts2/trunk/archetypes/struts2-archetype-angularjs/struts2-archetype-convention (1).iml
>>> URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-angularjs/struts2-archetype-convention%20%281%29.iml?rev=1521783&view=auto
>>> ==============================================================================
>>> --- struts/struts2/trunk/archetypes/struts2-archetype-angularjs/struts2-archetype-convention (1).iml (added)
>>> +++ struts/struts2/trunk/archetypes/struts2-archetype-angularjs/struts2-archetype-convention (1).iml Wed Sep 11 10:24:18 2013
>>> @@ -0,0 +1,14 @@
>>> +<?xml version="1.0" encoding="UTF-8"?>
>>> +<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
>>> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
>>> + <output url="file://$MODULE_DIR$/target/classes" />
>>> + <output-test url="file://$MODULE_DIR$/target/test-classes" />
>>> + <content url="file://$MODULE_DIR$">
>>> + <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
>>> + <excludeFolder url="file://$MODULE_DIR$/target" />
>>> + </content>
>>> + <orderEntry type="inheritedJdk" />
>>> + <orderEntry type="sourceFolder" forTests="false" />
>>> + </component>
>>> +</module>
>>> +
>>>
>>> Added: struts/struts2/trunk/archetypes/struts2-archetype-angularjs/struts2-archetype-convention.iml
>>> URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-angularjs/struts2-archetype-convention.iml?rev=1521783&view=auto
>>> ==============================================================================
>>> --- struts/struts2/trunk/archetypes/struts2-archetype-angularjs/struts2-archetype-convention.iml (added)
>>> +++ struts/struts2/trunk/archetypes/struts2-archetype-angularjs/struts2-archetype-convention.iml Wed Sep 11 10:24:18 2013
>>> @@ -0,0 +1,34 @@
>>> +<?xml version="1.0" encoding="UTF-8"?>
>>> +<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
>>> + <component name="FacetManager">
>>> + <facet type="web" name="Web">
>>> + <configuration>
>>> + <descriptors>
>>> + <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml" />
>>> + </descriptors>
>>> + <webroots>
>>> + <root url="file://$MODULE_DIR$/src/main/resources/archetype-resources/src/main/webapp" relative="/" />
>>> + </webroots>
>>> + </configuration>
>>> + <facet type="google-app-engine" name="Google App Engine">
>>> + <configuration />
>>> + </facet>
>>> + <facet type="Struts2" name="Struts 2">
>>> + <configuration>
>>> + <propertiesKeys disabled="false" />
>>> + </configuration>
>>> + </facet>
>>> + </facet>
>>> + </component>
>>> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
>>> + <output url="file://$MODULE_DIR$/target/classes" />
>>> + <output-test url="file://$MODULE_DIR$/target/test-classes" />
>>> + <content url="file://$MODULE_DIR$">
>>> + <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
>>> + <excludeFolder url="file://$MODULE_DIR$/target" />
>>> + </content>
>>> + <orderEntry type="inheritedJdk" />
>>> + <orderEntry type="sourceFolder" forTests="false" />
>>> + </component>
>>> +</module>
>>> +
>>>
>>>
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
>> For additional commands, e-mail: dev-help@struts.apache.org
>>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
> For additional commands, e-mail: dev-help@struts.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org