You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by hu...@apache.org on 2006/11/17 20:27:06 UTC
svn commit: r476267 - in /struts: site/src/site/ site/src/site/xdoc/
struts1/trunk/src/site/ struts2/trunk/apps/mailreader/
struts2/trunk/apps/mailreader/src/main/java/
struts2/trunk/apps/mailreader/src/main/java/mailreader2/
struts2/trunk/apps/mailrea...
Author: husted
Date: Fri Nov 17 11:27:04 2006
New Revision: 476267
URL: http://svn.apache.org/viewvc?view=rev&rev=476267
Log:
SITE-14 Interim commit for discussion purposes. Next, I would like to create a dev subfolder, so that the "product development" pages can have their own menu.
Added:
struts/site/src/site/xdoc/builds.xml
- copied, changed from r476137, struts/site/src/site/xdoc/downloads.xml
struts/site/src/site/xdoc/dev-mail.xml
- copied, changed from r476137, struts/site/src/site/xdoc/mail.xml
struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/Registration-Registration_save-validation.xml
- copied unchanged from r475091, struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/Registration-Registration!save-validation.xml
struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/Subscription-Subscription_save-validation.xml
- copied unchanged from r475091, struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/Subscription-Subscription!save-validation.xml
Removed:
struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/Registration-Registration!save-validation.xml
struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/Subscription-Subscription!save-validation.xml
Modified:
struts/site/src/site/site.xml
struts/site/src/site/xdoc/bylaws.xml
struts/site/src/site/xdoc/download.xml
struts/site/src/site/xdoc/downloads.xml
struts/site/src/site/xdoc/index.xml
struts/site/src/site/xdoc/javadoc.xml
struts/site/src/site/xdoc/mail.xml
struts/site/src/site/xdoc/primer.xml
struts/site/src/site/xdoc/releases.xml
struts/site/src/site/xdoc/volunteers.xml
struts/struts1/trunk/src/site/site.xml
struts/struts2/trunk/apps/mailreader/pom.xml
struts/struts2/trunk/apps/mailreader/src/main/java/mailreader-support.xml
struts/struts2/trunk/apps/mailreader/src/main/webapp/ChangePassword.jsp
struts/struts2/trunk/apps/mailreader/src/main/webapp/Login.jsp
struts/struts2/trunk/apps/mailreader/src/main/webapp/MainMenu.jsp
struts/struts2/trunk/apps/mailreader/src/main/webapp/Registration.jsp
struts/struts2/trunk/apps/mailreader/src/main/webapp/Subscription.jsp
struts/struts2/trunk/apps/mailreader/src/main/webapp/Welcome.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/validation/storeErrorsAcrossRequestCancel.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/validation/storeErrorsAcrossRequestExample.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/validation/storeErrorsAcrossRequestOk.jsp
struts/struts2/trunk/src/site/site.xml
struts/struts2/trunk/src/site/xdoc/index.xml
Modified: struts/site/src/site/site.xml
URL: http://svn.apache.org/viewvc/struts/site/src/site/site.xml?view=diff&rev=476267&r1=476266&r2=476267
==============================================================================
--- struts/site/src/site/site.xml (original)
+++ struts/site/src/site/site.xml Fri Nov 17 11:27:04 2006
@@ -12,101 +12,127 @@
</bannerRight>
<body>
<links>
- <item name="Apache" href="http://www.apache.org" />
- <item name="Struts 1" href="http://struts.apache.org/1.x/" />
- <item name="Struts 2" href="http://struts.apache.org/2.x/" />
+ <item
+ name="Apache"
+ href="http://www.apache.org" />
+ <item
+ name="Struts 2"
+ href="http://struts.apache.org/2.x/" />
+ <item
+ name="Struts 1"
+ href="http://struts.apache.org/1.x/" />
</links>
- <menu name="Apache Struts Project">
+ <menu name="Apache Struts Framework">
<item
name="Welcome"
href="index.html"
/>
<item
- name="Announcements"
- href="announce.html"
+ name="Releases"
+ href="downloads.html"
/>
<item
- name="FAQs"
- href="faqs.html"
+ name="Kickstart FAQ"
+ href="kickstart.html"
/>
- <item
- name="Key Technologies"
- href="primer.html"
- />
- </menu>
-
- <menu name="Community">
<item
- name="Mailing Lists"
- href="mail.html"
- />
- <item
- name="Issue Tracker (JIRA)"
- href="http://issues.apache.org/struts/"
- />
- <item
- name="Wiki Pages"
- href="http://wiki.apache.org/struts"
+ name="Roadmap FAQ"
+ href="roadmap.html"
/>
<item
name="Website Stats"
href="http://people.apache.org/~vgritsenko/stats/projects/struts"
/>
+ </menu>
+ <menu name="Product Documentation">
+ <item
+ name="Key Technologies"
+ href="primer.html" />
+ <item
+ name="Javadoc Index"
+ href="javadoc.html" />
+ <item
+ name="Struts 2.x"
+ href="http://struts.apache.org/2.x/index.html"/>
+ <item
+ name="Struts 1.3"
+ href="http://struts.apache.org/1.x/index.html"/>
+ <item
+ name="Struts 1.2"
+ href="http://struts.apache.org/1.2.x/index.html"/>
+ </menu>
+
+ <menu name="Past Releases">
+ <item
+ name="Struts 1.3.5"
+ href="http://struts.apache.org/1.3.5/index.html"/>
+ <item
+ name="Struts 1.2.9"
+ href="http://struts.apache.org/1.2.9/index.html"/>
+ <item
+ name="Struts 1.2.8"
+ href="http://struts.apache.org/1.2.8/index.html"/>
+ <item
+ name="Struts 1.2.7"
+ href="http://struts.apache.org/1.2.7/index.html"/>
+ <item
+ name="Struts 1.2.4"
+ href="http://struts.apache.org/1.2.4/index.html"/>
+ <item
+ name="Struts 1.1"
+ href="http://struts.apache.org/1.1/index.html"/>
+ <item
+ name="Struts 1.0.2"
+ href="http://struts.apache.org/1.0.2/index.html"/>
</menu>
- <menu name="Download">
+ <menu name="Product Support">
<item
- name="Binaries"
- href="downloads.html"
+ name="User Mailing List"
+ href="mail.html"
/>
<item
- name="Source Code"
- href="downloads.html#Source_Code"
+ name="Issue Tracker (JIRA)"
+ href="http://issues.apache.org/struts/"
/>
</menu>
- <menu name="Current Versions">
- <item name="Struts 1.2" href="http://struts.apache.org/1.2.x/index.html"/>
- <item name="Struts 1.3" href="http://struts.apache.org/1.x/index.html"/>
- <item name="Struts 2" href="http://struts.apache.org/2.x/index.html"/>
- </menu>
-
- <menu name="Past Releases">
- <item name="Struts 1.3.5" href="http://struts.apache.org/1.3.5/index.html"/>
- <item name="Struts 1.2.9" href="http://struts.apache.org/1.2.9/index.html"/>
- <item name="Struts 1.2.8" href="http://struts.apache.org/1.2.8/index.html"/>
- <item name="Struts 1.2.7" href="http://struts.apache.org/1.2.7/index.html"/>
- <item name="Struts 1.2.4" href="http://struts.apache.org/1.2.4/index.html"/>
- <item name="Struts 1.1" href="http://struts.apache.org/1.1/index.html"/>
- <item name="Struts 1.0.2" href="http://struts.apache.org/1.0.2/index.html"/>
- </menu>
+ <menu name="Product Development">
+ <item
+ name="How to Help FAQ"
+ href="helping.html"
+ />
- <menu name="Development">
<item
- name="PMC Charter"
- href="bylaws.html"
+ name="Dev Mailing List"
+ href="dev-mail.html"
/>
<item
- name="Volunteers"
- href="volunteers.html"
+ name="Nightly Builds"
+ href="builds.html"
/>
+
<item
name="Release Guidelines"
href="releases.html"
/>
<item
- name="Javadoc Index"
- href="javadoc.html"
+ name="Volunteers"
+ href="volunteers.html"
/>
<item
- name="Source Repository"
- href="http://svn.apache.org/viewcvs.cgi/struts/"
+ name="PMC Charter"
+ href="bylaws.html"
/>
<item
name="Sandbox"
href="http://struts.apache.org/struts-sandbox/index.html"
+ />
+ <item
+ name="Source Repository"
+ href="http://svn.apache.org/viewcvs.cgi/struts/"
/>
</menu>
Copied: struts/site/src/site/xdoc/builds.xml (from r476137, struts/site/src/site/xdoc/downloads.xml)
URL: http://svn.apache.org/viewvc/struts/site/src/site/xdoc/builds.xml?view=diff&rev=476267&p1=struts/site/src/site/xdoc/downloads.xml&r1=476137&p2=struts/site/src/site/xdoc/builds.xml&r2=476267
==============================================================================
--- struts/site/src/site/xdoc/downloads.xml (original)
+++ struts/site/src/site/xdoc/builds.xml Fri Nov 17 11:27:04 2006
@@ -19,87 +19,51 @@
<document>
<properties>
- <title>Downloads</title>
+ <title>Builds</title>
</properties>
<body>
- <section name="Apache Struts Downloads">
+ <a name="NightlyBuilds"/>
+ <section name="Nightly Builds">
- <p>
- The Apache Struts framework is available to the public
- at no charge
- in both binary and source distributions under the
- <a href="http://apache.org/licenses/">Apache Software
- License.</a>
- Each subproject offers a production release, as well as a
- milestone
- releases and "nightly" development builds.
- Individual JARs are also made available through
- <a href="http://maven.apache.org">Apache Maven</a>
- repositories,
- like
- <a href="http://ibiblio.org">ibiblio.</a>
- </p>
+ <p>
+ For developers who are helping to create and maintain
+ the Apache Struts framework,
+ the latest development build is made available each
+ morning.
+ <em>Use at your own risk!</em>
+ </p>
- <subsection name="Releases and Milestone Builds">
- <a name="ReleasesAndMilestones"/>
<p>
- Releases and milestone builds of Apache Struts products
- are available from our distribution site, or from mirror
- sites.
+ If you do not plan to contribute to the development of the framework,
+ then you probably want to download a
+ <a href="downloads.html">Release</a> instead.
</p>
+
<ul>
+
<li>
- <strong>General Availability (GA) Releases</strong>
- <ul>
- <li>
- <a href="http://struts.apache.org/download.cgi#struts135">
- Struts 1.3.5
- </a>
- </li>
- <li>
- <a href="http://struts.apache.org/download.cgi">
- Struts 1.2.9
- </a>
- </li>
- <li>
- <a href="http://struts.apache.org/download.cgi">
- Struts Scripting 1.0.1
- </a>
- </li>
- </ul>
- </li>
- <li>
- <strong>Beta Releases</strong>
- <ul>
- <li>
- <a href="http://struts.apache.org/download.cgi#struts201">
- Struts 2.0.1
- </a>
- </li>
- </ul>
- </li>
- <li>
- <strong>Older Releases</strong>
- are available from the
- <ul>
- <li>
- <a href="http://archive.apache.org/dist/struts/">
- Archive Site
- </a>
- </li>
- </ul>
+ <a href="http://people.apache.org/builds/struts/nightlies/">
+ Struts Nightly Builds</a>
</li>
</ul>
- </subsection>
-
- <a name="DevelopmentBuilds"/>
- <subsection name="Development Builds">
<p>
- The latest
- <em>development build</em>
- of Apache Struts products are available
+ Be sure to check the Release Notes for a nightly build,
+ so you have a better idea of what you are getting!
+ </p>
+
+ </section>
+
+ <a name="TestBuilds"/>
+ <section name="Test Builds">
+
+ <p>
+ As we prepare for a new release,
+ the project group may create interim
+ <em>test builds</em>.
+ When test builds are available,
+ we post them
<a href="http://people.apache.org/builds/struts/">here</a>
in binary, source and library distributions.
Library distributions include any external dependencies
@@ -107,17 +71,18 @@
</p>
<p>
- Development builds are being reviewed for quality
- by the Apache Struts community.
+ A test build is made available so that it can be reviewed for quality
+ by the Apache Struts development group.
When a build is judged "ready for prime time",
it is promoted to "General Availability" status and may be
made the "Best Available" release.
- If the community feels that a build requires more testing,
- then it may be marked with "Beta" status.
- </p>
-
- </subsection>
-
+ If the group feels that a build requires more testing,
+ then it may be marked as "Beta" release.
+ When a test build is upgraded to "Beta" or "GA"
+ by a vote of the project members,
+ we make the distribution available as
+ a formal <a href="download.html">Apache Release.</a>
+ </p>
<a name="MavenSnapshots"/>
<subsection name="Maven Snapshots">
<p>
@@ -139,44 +104,11 @@
</repository>
</repositories></code></pre></p>
</subsection>
-
- <a name="NightlyBuilds"/>
- <subsection name="Nightly Builds">
-
- <p>
- For developers who are helping to create and maintain
- Struts products,
- or who just want "the latest bits",
- the latest development version is made available each
- morning.
- Use at your own risk!
- </p>
-
- <ul>
-
- <li>
- <a href="http://people.apache.org/builds/struts/nightlies/">
- Struts Nightly Builds</a>
- </li>
- </ul>
+ </section>
- <p>
- Be sure to check the Release Notes for a nightly build,
- so you have a better idea of what you are getting!
- </p>
-
- <ul><li>
- Snapshot builds of
- <a href="http://people.apache.org/builds/struts/2.0.1">
- <strong>Struts 2.0.1</strong>
- </a>
- are now available for early testing.
- </li></ul>
-
- </subsection>
<a name="SourceCode"/>
- <subsection name="Source Code">
+ <section name="Source Code">
<p>
Access to the Apache Struts source repository is available
@@ -274,13 +206,11 @@
Subversion wiki page</a>.
</p>
- </subsection>
-
<a name="Building"/>
- <subsection name="Building Struts">
+ <subsection name="Building Apache Struts">
<p>
- If you are building Struts source,
+ If you are building Apache Struts from source,
we recommend that you install and use
<a href="http://maven.apache.org">
Apache Maven 2.</a>
@@ -310,16 +240,25 @@
</p>
<p>
- For more about using Maven to build Apache Struts,
+ For more about using Maven to build Struts 2,
+ see
+ <a href="WW/building-the-framework-from-source.html">Bulding the framework from source</a>
+ in the
+ <a href="WW/contributors-guide.html">Struts 2 Contributors Guide.</a>
+ </p>
+
+ <p>
+ For more about using Maven to build Struts 1,
see our
<a href="http://wiki.apache.org/struts/StrutsMaintenanceMaven">
Maven wiki page.</a>
</p>
</subsection>
+ </section>
<a name="Licensing"/>
- <subsection name="Licensing of Apache Struts Distributions">
+ <section name="Licensing of Apache Struts Builds">
<p>
Apache Struts 2 source code and documentation is
licensed to the Apache Software Foundation (ASF) under one
@@ -346,13 +285,12 @@
specific language governing permissions and limitations
under the License.
</p>
- </subsection>
</section>
<section>
<p class="right">
Next:
- <a href="bylaws.html">Project Charter</a>
+ <a href="releases.html">Release Guidelines</a>
</p>
</section>
Modified: struts/site/src/site/xdoc/bylaws.xml
URL: http://svn.apache.org/viewvc/struts/site/src/site/xdoc/bylaws.xml?view=diff&rev=476267&r1=476266&r2=476267
==============================================================================
--- struts/site/src/site/xdoc/bylaws.xml (original)
+++ struts/site/src/site/xdoc/bylaws.xml Fri Nov 17 11:27:04 2006
@@ -431,12 +431,5 @@
</subsection>
</section>
- <section>
- <p class="right">
- Next:
- <a href="volunteers.html">Volunteers</a>
- </p>
- </section>
-
</body>
</document>
Copied: struts/site/src/site/xdoc/dev-mail.xml (from r476137, struts/site/src/site/xdoc/mail.xml)
URL: http://svn.apache.org/viewvc/struts/site/src/site/xdoc/dev-mail.xml?view=diff&rev=476267&p1=struts/site/src/site/xdoc/mail.xml&r1=476137&p2=struts/site/src/site/xdoc/dev-mail.xml&r2=476267
==============================================================================
--- struts/site/src/site/xdoc/mail.xml (original)
+++ struts/site/src/site/xdoc/dev-mail.xml Fri Nov 17 11:27:04 2006
@@ -19,7 +19,7 @@
<document>
<properties>
- <title>Mailing Lists</title>
+ <title>Dev Mailing List</title>
</properties>
<body>
@@ -27,243 +27,16 @@
<section name="Mailing Lists">
<p>
- A mailing list is an electronic discussion forum that anyone
- can
- subscribe to. When someone sends an email message to the
- mailing list,
- a copy of that message is broadcast to everyone who is
- subscribed to
- that mailing list. Mailing lists are the primary means of
- communication
- for people working within the Apache Struts Project.
+ The project hosts several mailing lists. The
+ <a href="mail.html">user list</a> is devoted to product support.
+ The project also hosts several <bold>product development</bold> lists.
+ <strong>For help using Struts,
+ subscribe to <a href="mail.html">user list.</a></strong>
</p>
-
- <subsection name="Guidelines">
-
- <p>
- Mailing lists provide a simple and effective communication
- mechanism.
- With potentially thousands of subscribers, there is a
- common set of
- etiquette guidelines that you should observe. Please keep
- on reading.
- </p>
-
- <p>
- <strong>
- <a name="respect">Respect the mailing list type</a>
- </strong>
- </p>
-
- <ul>
- <li>
- The "User" list is where you can send questions and
- comments about
- configuration, setup, usage and other "user" types of
- questions.
- </li>
- <li>
- The "Developer" (or "Dev") list is where you can send
- questions and
- comments about the actual software source code and
- general
- "development" types of questions.
- Questions about the "future" of Struts are
- best addressed to the dev list.
- </li>
- </ul>
-
- <p>Some questions may seem appropriate for posting on both the
- "user" and
- the "developer" lists.
- In this case, pick one and only one.
- Do not cross post, unless a Committer asks that the
- thread be moved to the other list.
- </p>
-
- <p>Asking a configuration question on the developers list is
- discouraged because the time of our developers is as
- precious as yours.
- By contacting the developers directly instead of the user
- base you are abusing resources.
- In fact, it is unlikely that you will get a quicker answer,
- if any answer at all
- </p>
-
- <p>
- Conversely, a question about the future of Struts
- or the operation of the Struts project is best posted to the
- dev list.
- The focus of the user list should be one "how" to do
- something with the framework we have today.
- The focus of the dev list is how we want to do something
- with a future version of the framework.
- </p>
- <p>
- <strong>
- Join the lists that are appropriate for your
- discussion.
- </strong>
- <br/>
- Please make sure that you are joining the list that is
- appropriate for the
- topic or product that you would like to discuss. For
- example,
- please do not join the Struts mailing list and ask
- questions about Tomcat.
- Instead, you should join the Tomcat User list and ask your
- questions
- there.
- </p>
- <p>
- If you would like to discuss a topic outside the usual scope of our mailing lists,
- please create a
- <a href="http://quicktopic.com/">
- <strong>QuickTopic</strong>
- </a>
- and invite others to join the conversation.
- </p>
- <p>
- <strong>
- <a name="smart">Ask smart questions.</a>
- </strong>
- <br/>
- Every volunteer project obtains its strength from the
- people involved
- in it. You are welcome to join any of our mailing lists.
- You can
- choose to lurk, or actively participate; it's up to you.
- The level of
- community responsiveness to specific questions is
- generally directly
- proportional to the amount of effort you spend formulating
- your
- question. Eric Raymond and Rick Moen have even written an
- essay entitled
- <a
- href="http://www.catb.org/~esr/faqs/smart-questions.html">
- <strong>"Asking
- Smart Questions"</strong>
- </a>
- precisely on this topic.
- </p>
-
- <p>
- <strong>
- <a name="short">Keep your email short and to the point.</a>
- </strong>
- <br/>
- If your email is more than about a page of text, chances
- are that it
- won't get read by very many people. It is much better to
- try to pack a
- lot of informative information (see above about asking
- smart questions)
- into as small of an email as possible. If you are replying
- to a previous
- email, it is a good idea to only quote the parts that you
- are replying
- to and to remove the unnecessary bits. This makes it
- easier for people
- to follow a thread as well as making the email archives
- easier to search
- and read.
- </p>
-
- <p>
- <strong>
- <a name="plain">Do your best to ensure that you are not sending HTML
- or "Stylelized" email to the list.</a>
- </strong>
- <br/>
- If you are using Outlook or Outlook Express or Eudora,
- chances are that
- you are sending HTML email by default. There is usually a
- setting that
- will allow you to send "Plain Text" email. If you are
- using Microsoft
- products to send email, there are several bugs in the
- software that
- prevent you from turning off the sending of HTML email.
- </p>
-
- <p>
- <strong>
- <a name="post">Do not cross post messages.</a>
- </strong>
- <br/>
- In other words, pick a mailing list and send your messages
- to that mailing
- list only. Do not send your messages to multiple mailing
- lists. The reason is
- that people may be subscribed to one list and not to the
- other. Therefore,
- some people will only see part of the conversation.
- </p>
-
- <p>
- <strong>
- <a name="reply-to">Watch where you are sending email.</a>
- </strong>
- The majority of our mailing lists have set the Reply-To to
- go back to the
- list. That means that when you Reply to a message, it will
- go to the list
- and not to the original author directly. The reason is
- because it helps
- facilitate discussion on the list for everyone to benefit
- from. Be careful
- of this as sometimes you may intend to reply to a message
- directly to someone
- instead of the entire list.
- The appropriate contents of the Reply-To header is an
- age-old debate that
- should not be brought up on the mailing lists. You can
- examine opposing points of view
- <a href="http://www.unicom.com/pw/reply-to-harmful.html">
- condemning</a>
- our convention and
- <a href="http://marc.merlins.org/netrants/reply-to-useful.html">
- condoning</a>
- it. Bringing this up for debate on a mailing list will add
- nothing
- new and is considered off-topic.
- </p>
-
- <p>
- <strong>
- <a name="trolls">Don't feed the trolls.</a>
- </strong>
- </p>
- <blockquote>
- <p>
- "In Internet terminology, a troll is a person who posts rude or offensive messages on the
- Internet, such as in online discussion forums, to disrupt discussion or to upset its
- participants (see Anonymous Internet posting). "Troll" can also mean the message itself or be a
- verb meaning to post such messages. "Trolling" is also commonly used to describe the activity."
- </p>
- <p>
- For more, see
- <a href="http://en.wikipedia.org/wiki/Internet_trolls">Internet Trolls</a>
- in the Wikipedia.
- </p>
- </blockquote>
- <p>
- If someone makes an off-topic post that offends you,
- our best advice is to filter posts from that person to the trash.
- When subscribers do choose to respond, sometimes a thread
- will feed on itself, and grow out of control.
- When that happens, our best advice is to filter the entire thread to the trash.
- </p>
- <p>
- Our spam filters will catch most types of commercial spam,
- but troll spam is a hard for software to spot.
- The best defense is to withhold from the troll what he or she wants most: A response.
- </p>
- </subsection>
+
<subsection name="Archives">
- <p>Archives Carrying Struts Lists</p>
+ <p>Archives Carrying Struts Development Lists</p>
<ul>
<li>
<a href="http://mail-archives.apache.org/">ASF Mail
@@ -271,10 +44,6 @@
</li>
<ul>
<li>
- <a href="http://mail-archives.apache.org/mod_mbox/struts-user/">
- User list</a>
- </li>
- <li>
<a href="http://mail-archives.apache.org/mod_mbox/struts-dev/">
Dev. list</a>
</li>
@@ -287,48 +56,35 @@
Issues list</a>
</li>
- </ul>
+ </ul>
<li>Mail-Archive</li>
<ul>
<li>
- <a href="http://www.mail-archive.com/user%40struts.apache.org/">
- User list</a>
- </li>
- <li>
<a href="http://www.mail-archive.com/dev%40struts.apache.org/">
Dev. list</a>
</li>
</ul>
+
<li>Gmane</li>
<ul>
<li>
- <a href="http://news.gmane.org/gmane.comp.jakarta.struts.user/">
- User List</a>
- </li>
- <li>
<a href="http://news.gmane.org/gmane.comp.jakarta.struts.devel/">
Dev. List</a>
</li>
</ul>
+
<li>Mailing list ARChives</li>
<ul>
<li>
- <a href="http://marc.theaimsgroup.com/?l=struts-user&r=1&w=2">
- User List</a>
- </li>
- <li>
<a href="http://marc.theaimsgroup.com/?l=struts-dev&r=1&w=2">
Dev. List</a>
</li>
</ul>
+
<li>Nabble</li>
<ul>
<li>
- <a href="http://www.nabble.com/Struts---User-f206.html">
- User List</a>
- </li>
- <li>
<a href="http://www.nabble.com/Struts---Dev-f205.html">
Dev. List</a>
</li>
@@ -339,93 +95,15 @@
<subsection name="Subscribing">
<p>
- Now that you've read the guidelines (you
- <em>have</em>
- read the rest of the page, haven't you?), please subscribe
- to
- whichever Struts lists are of interest.
+ If you've read the
+ <a href="mail.html">guidelines</a>,
+ please subscribe to whichever
+ Struts development lists are of interest.
</p>
<ul>
<li>
- <strong>STRUTS-ANNOUNCEMENTS Mailing List</strong>
- - Subscribe to this list
- to receiving only major announcements regarding
- Struts. This is a low-volume,
- read-only list.
- <br/>
- [
- <a href="mailto:announcements-subscribe@struts.apache.org?subject=subscribe&body=subscribe">
- Subscribe</a>
- ]
- <br/>
- [
- <a href="mailto:announcements-unsubscribe@struts.apache.org?subject=unsubscribe&body=unsubscribe">
- Unsubscribe</a>
- ]
- </li>
-
- <li>
- <strong>STRUTS-USER Mailing List</strong>
- - Subscribe to this list
- to communicate with other developers that are using
- Struts for their own applications, including questions
- about the
- installation of Struts, and the usage of particular
- Struts features.
- <br/>
- [
- <a href="mailto:user-subscribe@struts.apache.org?subject=subscribe&body=subscribe">
- Subscribe</a>
- ]
- <br/>
- [
- <a href="mailto:user-unsubscribe@struts.apache.org?subject=unsubscribe&body=unsubscribe">
- Unsubscribe</a>
- ]
- </li>
- <li>
- <strong>STRUTS-USER Digest</strong>
- - Subscribe to this list to receive
- a daily digest of the Struts USER list.
- <br/>
- [
- <a href="mailto:user-digest-subscribe@struts.apache.org?subject=subscribe&body=subscribe">
- Subscribe</a>
- ]
- <br/>
- [
- <a href="mailto:user-digest-unsubscribe@struts.apache.org?subject=unsubscribe&body=unsubscribe">
- Unsubscribe</a>
- ]
- <br/>
- If you subscribe to the Digest, you can also post to
- the User list.
- (Just don't quote the entire Digest mailing in a
- reply!)
- </li>
-
- <li>
- <strong>STRUTS-USER Newsgroup</strong>
- - The User list is also mirrored online,
- so that you can participate
- <strong>without</strong>
- subscribing to the regular mailing
- list.
- <br/>
- [
- <a href="http://struts_user.roomity.com">Struts User
- on Roomity</a>
- ]
- <br/>
- This is another way to post to the User list without
- subscribing to the
- regular list.
- <br/>
- </li>
-
- <li>
<strong>STRUTS-DEV Mailing List</strong>
- Subscribe to this mailing
list to communicate with other developers interested
@@ -479,29 +157,13 @@
</ul>
- <p>
- Please note that the Struts User list enjoys a "casual
- friday" policy.
- More off-topic messages are tolerated on Fridays so long
- as the
- message is prefixed with the token [FRIDAY].
- If you'd rather not be troubled by these postings, please
- set your
- mail filter accordingly.
- Posting [FRIDAY] articles on any other weekday is
- <strong>strongly
- discouraged</strong>
- .
- We thank you for your cooperation.
- </p>
-
</subsection>
</section>
<section>
<p class="right">
<strong>Next:</strong>
- <a href="bylaws.html">PMC Charter</a>
+ <a href="builds.html">Nightly Builds</a>
</p>
</section>
Modified: struts/site/src/site/xdoc/download.xml
URL: http://svn.apache.org/viewvc/struts/site/src/site/xdoc/download.xml?view=diff&rev=476267&r1=476266&r2=476267
==============================================================================
--- struts/site/src/site/xdoc/download.xml (original)
+++ struts/site/src/site/xdoc/download.xml Fri Nov 17 11:27:04 2006
@@ -19,17 +19,17 @@
<document>
<properties>
- <title>Download</title>
+ <title>Download a Release</title>
</properties>
<body>
<a name="download"/>
- <section name="Download Struts">
+ <section name="Download a Release of Apache Struts">
<p>
- Use the links below to download Apache Struts from one of our
- mirrors. You can
+ Use the links below to download a release of Apache Struts
+ from one of our mirrors. You can
<a href="#verify">verify the integrity</a>
of the downloaded files using signatures downloaded from our
main distribution directory.
Modified: struts/site/src/site/xdoc/downloads.xml
URL: http://svn.apache.org/viewvc/struts/site/src/site/xdoc/downloads.xml?view=diff&rev=476267&r1=476266&r2=476267
==============================================================================
--- struts/site/src/site/xdoc/downloads.xml (original)
+++ struts/site/src/site/xdoc/downloads.xml Fri Nov 17 11:27:04 2006
@@ -19,21 +19,18 @@
<document>
<properties>
- <title>Downloads</title>
+ <title>Releases</title>
</properties>
<body>
- <section name="Apache Struts Downloads">
+ <section name="Apache Struts Releases">
<p>
- The Apache Struts framework is available to the public
- at no charge
- in both binary and source distributions under the
- <a href="http://apache.org/licenses/">Apache Software
- License.</a>
- Each subproject offers a production release, as well as a
- milestone
- releases and "nightly" development builds.
+ Releases of the Apache Struts framework
+ are made available to the public at no charge,
+ under the
+ <a href="http://apache.org/licenses/">Apache License,</a>
+ in both binary and source distributions.
Individual JARs are also made available through
<a href="http://maven.apache.org">Apache Maven</a>
repositories,
@@ -41,16 +38,9 @@
<a href="http://ibiblio.org">ibiblio.</a>
</p>
- <subsection name="Releases and Milestone Builds">
- <a name="ReleasesAndMilestones"/>
- <p>
- Releases and milestone builds of Apache Struts products
- are available from our distribution site, or from mirror
- sites.
- </p>
<ul>
<li>
- <strong>General Availability (GA) Releases</strong>
+ <strong>General Availability (GA) Releases</strong> - <em>Ready for Prime Time!</em>
<ul>
<li>
<a href="http://struts.apache.org/download.cgi#struts135">
@@ -70,7 +60,7 @@
</ul>
</li>
<li>
- <strong>Beta Releases</strong>
+ <strong>Beta Releases</strong> - <em>Help test the next release!</em>
<ul>
<li>
<a href="http://struts.apache.org/download.cgi#struts201">
@@ -91,235 +81,29 @@
</ul>
</li>
</ul>
- </subsection>
-
- <a name="DevelopmentBuilds"/>
- <subsection name="Development Builds">
-
- <p>
- The latest
- <em>development build</em>
- of Apache Struts products are available
- <a href="http://people.apache.org/builds/struts/">here</a>
- in binary, source and library distributions.
- Library distributions include any external dependencies
- needed to use a product with your application.
- </p>
-
- <p>
- Development builds are being reviewed for quality
- by the Apache Struts community.
- When a build is judged "ready for prime time",
- it is promoted to "General Availability" status and may be
- made the "Best Available" release.
- If the community feels that a build requires more testing,
- then it may be marked with "Beta" status.
- </p>
-
- </subsection>
- <a name="MavenSnapshots"/>
- <subsection name="Maven Snapshots">
<p>
- When a distribution is first made available,
- it is rated as a development build or "snapshot".
- Later, the quality of the distribution may be upgraded to
- "Beta" or "General Availability", based on feedback from
- the community, and then made available through ibiblio and
- other public Maven repositories.
- To obtain an early distribution via Maven,
- specify the ASF Snapshot repository in the project's POM.
+ Project releases are approved by a vote the
+ Apache Struts <a href="bylaws.html">Project Management Committee.</a>
+ Support for a release is provided by
+ <a href="volunteers.html">project volunteers</a>
+ on the <a href="mail.html">User mailing list.</a>
+ Additional free support is provided by many other
+ volunteer subscribers to the list.
+ Issues with a release may be discussed on the list
+ and reported through the
+ <a href="http://issues.apache.org/struts/">issue tracker.</a>
</p>
-
-<p><pre><code><repositories>
- <repository>
- <id>apache.snapshots</id>
- <name>ASF Maven 2 Snapshot</name>
- <url>http://people.apache.org/repo/m2-snapshot-repository</url>
- </repository>
-</repositories></code></pre></p>
- </subsection>
-
- <a name="NightlyBuilds"/>
- <subsection name="Nightly Builds">
-
- <p>
- For developers who are helping to create and maintain
- Struts products,
- or who just want "the latest bits",
- the latest development version is made available each
- morning.
- Use at your own risk!
- </p>
-
- <ul>
-
- <li>
- <a href="http://people.apache.org/builds/struts/nightlies/">
- Struts Nightly Builds</a>
- </li>
- </ul>
-
- <p>
- Be sure to check the Release Notes for a nightly build,
- so you have a better idea of what you are getting!
- </p>
-
- <ul><li>
- Snapshot builds of
- <a href="http://people.apache.org/builds/struts/2.0.1">
- <strong>Struts 2.0.1</strong>
- </a>
- are now available for early testing.
- </li></ul>
-
- </subsection>
-
- <a name="SourceCode"/>
- <subsection name="Source Code">
-
- <p>
- Access to the Apache Struts source repository is available
- through
- both
- <a href="http://svn.apache.org/viewcvs.cgi/struts/?root=Apache-SVN">
- web browser</a>
- and
- <a href="http://subversion.tigris.org/">
- Subversion client</a>
- interfaces.
- </p>
-
- <p>
- To download the trunk (HEAD revision) of all Struts
- subprojects,
- a convenience directory has been added, named
- <b>current</b>.
- The current directory uses a Subversion feature called
- externals which stores properties on the directory.
- With those properties,
- Subversion has all the information it needs to
- automaticaly download
- the head revision of all the Struts subprojects.
- </p>
-
- <p>
- With the
- <a href="http://subversion.tigris.org/">Subversion
- client</a>
- installed, obtaining a working copy of the Struts codebase
- is as simple as
- </p>
-
- <code>> svn checkout
- http://svn.apache.org/repos/asf/struts/current</code>
-
- <p>
- While Externals work well in practice, there are caveats.
- For example,
- since all the subdirectories are still really different
- slices
- from the repository,
- relative paths might not work the way you expect.
- For more, see the
- <a href="http://svnbook.red-bean.com/en/1.1/ch07s04.html">
- Externals Definitions</a>
- section of the
- <a href="http://svnbook.red-bean.com/">Subversion Book</a>.
- </p>
-
- <p>
- To check out individual sub-projects from the Subversion
- repository,
- you can specify one of the following URLs:
- </p>
-
- <ul>
- <li>http://svn.apache.org/repos/asf/struts/struts1/trunk</li>
- <li>http://svn.apache.org/repos/asf/struts/struts2/trunk</li>
- <li>http://svn.apache.org/repos/asf/struts/sandbox/trunk</li>
- <li>http://svn.apache.org/repos/asf/struts/site</li>
- </ul>
-
- <p>
- (Committers with write access should use the
- <strong>https</strong>
- protocol instead.
- See the ASF
- <a href="http://www.apache.org/dev/version-control.html#https-svn">
- Source Code Repositories</a>
- page for details.)
- </p>
-
- <p>
- <strong>Warning:</strong>
- If you try to check out everything under 'struts',
- be aware that you will get not just the most recent code
- ('trunk'),
- but a copy of every tag and branch ever created
- for Struts.
- A complete checkout of Struts from day one, including all
- the branches,
- will take some time and might max out your disk volume!
- </p>
-
- <p>
- For more about using version control systems at Apache,
- see the ASF's
- <a href="http://www.apache.org/dev/version-control.html#anon-svn">
- Source Code Repositories</a>
- page.
- For more about how Apache Struts uses Subversion, see our
- <a href="http://wiki.apache.org/struts/StrutsMaintenanceSvn">
- Subversion wiki page</a>.
- </p>
-
- </subsection>
-
- <a name="Building"/>
- <subsection name="Building Struts">
-
- <p>
- If you are building Struts source,
- we recommend that you install and use
- <a href="http://maven.apache.org">
- Apache Maven 2.</a>
- During the build process, Maven will automatically acquire
- whatever external JARs your system may need.
- (Of course,
- you can still use your build system of choice to build
- your own applications!)
- </p>
-
- <p>
- With Maven installed, building a Struts codebase is as
- simple as
- </p>
-
- <code>/current/struts1/> mvn install</code>
-
- <p>
- or
- </p>
-
- <code>/current/struts2/> mvn install</code>
-
- <p>
- Maven will automatically download any dependencies as
- needed.
- </p>
-
- <p>
- For more about using Maven to build Apache Struts,
- see our
- <a href="http://wiki.apache.org/struts/StrutsMaintenanceMaven">
- Maven wiki page.</a>
- </p>
-
- </subsection>
+
+ <p>
+ The user mailing list and issue tracker are the <strong>only</strong>
+ support options hosted by the Apache Struts project.
+ </p>
+
+ </section>
<a name="Licensing"/>
- <subsection name="Licensing of Apache Struts Distributions">
+ <section name="Licensing of Apache Struts Releases">
<p>
Apache Struts 2 source code and documentation is
licensed to the Apache Software Foundation (ASF) under one
@@ -346,13 +130,12 @@
specific language governing permissions and limitations
under the License.
</p>
- </subsection>
</section>
<section>
<p class="right">
Next:
- <a href="bylaws.html">Project Charter</a>
+ <a href="kickstart.html">Kickstart FAQ</a>
</p>
</section>
Modified: struts/site/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/struts/site/src/site/xdoc/index.xml?view=diff&rev=476267&r1=476266&r2=476267
==============================================================================
--- struts/site/src/site/xdoc/index.xml (original)
+++ struts/site/src/site/xdoc/index.xml Fri Nov 17 11:27:04 2006
@@ -28,7 +28,8 @@
<section name="Recent Releases">
<p>
- Visit the <a href="downloads.html">distributions</a> page for links to releases and distributions.
+ Scroll down for more about <a href="#Welcome">Apache Struts</a>
+ and the <a href="#Project">Apache Struts project.</a>
</p>
<a name="2.0.1"/>
@@ -188,7 +189,7 @@
<p>
A stable release of Struts 2 is expected in the fourth
quarter of 2006.
- An intitial <a href="downloads.html">BETA release</a>
+ A <a href="downloads.html">BETA release</a>
is now available.
</p>
@@ -218,7 +219,7 @@
<section>
<p class="right">
<strong>Next:</strong>
- <a href="announce.html">Announcements</a>
+ <a href="downloads.html">Releases</a>
</p>
</section>
Modified: struts/site/src/site/xdoc/javadoc.xml
URL: http://svn.apache.org/viewvc/struts/site/src/site/xdoc/javadoc.xml?view=diff&rev=476267&r1=476266&r2=476267
==============================================================================
--- struts/site/src/site/xdoc/javadoc.xml (original)
+++ struts/site/src/site/xdoc/javadoc.xml Fri Nov 17 11:27:04 2006
@@ -44,8 +44,8 @@
<section>
<p class="right">Next:
- <a href="http://svn.apache.org/viewcvs.cgi/struts/?root=Apache-SVN">
- Source Repository</a>
+ <a href="mail.html">
+ User Mailing List</a>
</p>
</section>
Modified: struts/site/src/site/xdoc/mail.xml
URL: http://svn.apache.org/viewvc/struts/site/src/site/xdoc/mail.xml?view=diff&rev=476267&r1=476266&r2=476267
==============================================================================
--- struts/site/src/site/xdoc/mail.xml (original)
+++ struts/site/src/site/xdoc/mail.xml Fri Nov 17 11:27:04 2006
@@ -263,7 +263,7 @@
</subsection>
<subsection name="Archives">
- <p>Archives Carrying Struts Lists</p>
+ <p>Archives Carrying Struts User List</p>
<ul>
<li>
<a href="http://mail-archives.apache.org/">ASF Mail
@@ -274,20 +274,7 @@
<a href="http://mail-archives.apache.org/mod_mbox/struts-user/">
User list</a>
</li>
- <li>
- <a href="http://mail-archives.apache.org/mod_mbox/struts-dev/">
- Dev. list</a>
- </li>
- <li>
- <a href="http://mail-archives.apache.org/mod_mbox/struts-commits/">
- Commits list</a>
- </li>
- <li>
- <a href="http://mail-archives.apache.org/mod_mbox/struts-issues/">
- Issues list</a>
- </li>
-
- </ul>
+ </ul>
<li>Mail-Archive</li>
<ul>
@@ -295,10 +282,6 @@
<a href="http://www.mail-archive.com/user%40struts.apache.org/">
User list</a>
</li>
- <li>
- <a href="http://www.mail-archive.com/dev%40struts.apache.org/">
- Dev. list</a>
- </li>
</ul>
<li>Gmane</li>
<ul>
@@ -306,10 +289,6 @@
<a href="http://news.gmane.org/gmane.comp.jakarta.struts.user/">
User List</a>
</li>
- <li>
- <a href="http://news.gmane.org/gmane.comp.jakarta.struts.devel/">
- Dev. List</a>
- </li>
</ul>
<li>Mailing list ARChives</li>
<ul>
@@ -317,10 +296,6 @@
<a href="http://marc.theaimsgroup.com/?l=struts-user&r=1&w=2">
User List</a>
</li>
- <li>
- <a href="http://marc.theaimsgroup.com/?l=struts-dev&r=1&w=2">
- Dev. List</a>
- </li>
</ul>
<li>Nabble</li>
<ul>
@@ -328,10 +303,6 @@
<a href="http://www.nabble.com/Struts---User-f206.html">
User List</a>
</li>
- <li>
- <a href="http://www.nabble.com/Struts---Dev-f205.html">
- Dev. List</a>
- </li>
</ul>
</ul>
@@ -342,8 +313,7 @@
Now that you've read the guidelines (you
<em>have</em>
read the rest of the page, haven't you?), please subscribe
- to
- whichever Struts lists are of interest.
+ to whichever Struts lists are of interest.
</p>
<ul>
@@ -424,60 +394,13 @@
regular list.
<br/>
</li>
-
- <li>
- <strong>STRUTS-DEV Mailing List</strong>
- - Subscribe to this mailing
- list to communicate with other developers interested
- in expanding and
- improving the functionality supported by Struts
- itself.
- <br/>
- [
- <a href="mailto:dev-subscribe@struts.apache.org?subject=subscribe&body=subscribe">
- Subscribe</a>
- ]
- <br/>
- [
- <a href="mailto:dev-unsubscribe@struts.apache.org?subject=unsubscribe&body=unsubscribe">
- Unsubscribe</a>
- ]
- </li>
-
- <li>
- <strong>STRUTS-COMMITS Mailing List</strong>
- - Subscribe to this mailing
- to receive notifications of changes to the Struts
- source code repository.
- <br/>
- [
- <a href="mailto:commits-subscribe@struts.apache.org?subject=subscribe&body=subscribe">
- Subscribe</a>
- ]
- <br/>
- [
- <a href="mailto:commits-unsubscribe@struts.apache.org?subject=unsubscribe&body=unsubscribe">
- Unsubscribe</a>
- ]
- </li>
- <li>
- <strong>STRUTS-ISSUES Mailing List</strong>
- - Subscribe to this mailing
- to receive notifications from the Struts JIRA issue
- tracker.
- <br/>
- [
- <a href="mailto:issues-subscribe@struts.apache.org?subject=subscribe&body=subscribe">
- Subscribe</a>
- ]
- <br/>
- [
- <a href="mailto:issues-unsubscribe@struts.apache.org?subject=unsubscribe&body=unsubscribe">
- Unsubscribe</a>
- ]
- </li>
-
</ul>
+
+ <p>
+ <em>To subscribe to the Dev list,
+ please visit the <a href="dev-mail.html">
+ product development</a> area.</em>
+ </p>
<p>
Please note that the Struts User list enjoys a "casual
@@ -490,8 +413,7 @@
mail filter accordingly.
Posting [FRIDAY] articles on any other weekday is
<strong>strongly
- discouraged</strong>
- .
+ discouraged.</strong>
We thank you for your cooperation.
</p>
@@ -501,7 +423,7 @@
<section>
<p class="right">
<strong>Next:</strong>
- <a href="bylaws.html">PMC Charter</a>
+ <a href="helping.html">How to Help FAQ</a>
</p>
</section>
Modified: struts/site/src/site/xdoc/primer.xml
URL: http://svn.apache.org/viewvc/struts/site/src/site/xdoc/primer.xml?view=diff&rev=476267&r1=476266&r2=476267
==============================================================================
--- struts/site/src/site/xdoc/primer.xml (original)
+++ struts/site/src/site/xdoc/primer.xml Fri Nov 17 11:27:04 2006
@@ -1618,7 +1618,7 @@
<section>
<p class="right">
<strong>Next:</strong>
- <a href="mail.html">Mailing Lists</a>
+ <a href="javadoc.html">Javadoc Index</a>
</p>
</section>
Modified: struts/site/src/site/xdoc/releases.xml
URL: http://svn.apache.org/viewvc/struts/site/src/site/xdoc/releases.xml?view=diff&rev=476267&r1=476266&r2=476267
==============================================================================
--- struts/site/src/site/xdoc/releases.xml (original)
+++ struts/site/src/site/xdoc/releases.xml Fri Nov 17 11:27:04 2006
@@ -298,7 +298,7 @@
</section>
<section>
<p class="right">Next:
- <a href="javadoc.html">Javadoc Index</a>
+ <a href="volunteers.html">Volunteers</a>
</p>
</section>
</body>
Modified: struts/site/src/site/xdoc/volunteers.xml
URL: http://svn.apache.org/viewvc/struts/site/src/site/xdoc/volunteers.xml?view=diff&rev=476267&r1=476266&r2=476267
==============================================================================
--- struts/site/src/site/xdoc/volunteers.xml (original)
+++ struts/site/src/site/xdoc/volunteers.xml Fri Nov 17 11:27:04 2006
@@ -1416,7 +1416,7 @@
<section>
<p class="right">
Next:
- <a href="releases.html">Release Guidelines</a>
+ <a href="bylaws.html">PMC Charter</a>
</p>
</section>
</body>
Modified: struts/struts1/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/src/site/site.xml?view=diff&rev=476267&r1=476266&r2=476267
==============================================================================
--- struts/struts1/trunk/src/site/site.xml (original)
+++ struts/struts1/trunk/src/site/site.xml Fri Nov 17 11:27:04 2006
@@ -13,8 +13,8 @@
<body>
<links>
<item name="Apache" href="http://www.apache.org/" />
- <item name="Struts 1" href="http://struts.apache.org/1.x/" />
<item name="Struts 2" href="http://struts.apache.org/2.x/" />
+ <item name="Struts 1" href="http://struts.apache.org/1.x/" />
</links>
<menu name="Struts 1">
<item
@@ -30,7 +30,7 @@
href="roadmap.html"
/>
<item
- name="Download"
+ name="Releases"
href="http://struts.apache.org/downloads.html"/>
</menu>
@@ -55,12 +55,23 @@
name="DTDDoc"
href="dtddoc/index.html"
/>
+ </menu>
+
+ <menu name="Product Support">
+ <item
+ name="User Mailing List"
+ href="http://struts.apache.org/mail.html"
+ />
+ <item
+ name="Issue Tracker (JIRA)"
+ href="http://issues.apache.org/struts/"
+ />
<item
- name="Source Repository"
- href="http://svn.apache.org/viewcvs.cgi/struts/struts1/trunk/?root=Apache-SVN"
+ name="Wiki Pages"
+ href="http://wiki.apache.org/struts/"
/>
</menu>
-
+
<menu name="Components">
<item name="Struts Apps"
Modified: struts/struts2/trunk/apps/mailreader/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/pom.xml?view=diff&rev=476267&r1=476266&r2=476267
==============================================================================
--- struts/struts2/trunk/apps/mailreader/pom.xml (original)
+++ struts/struts2/trunk/apps/mailreader/pom.xml Fri Nov 17 11:27:04 2006
@@ -31,7 +31,12 @@
<artifactId>struts-mailreader-dao</artifactId>
<version>1.3.5</version>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-spring-plugin</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
</dependencies>
<build>
Modified: struts/struts2/trunk/apps/mailreader/src/main/java/mailreader-support.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/main/java/mailreader-support.xml?view=diff&rev=476267&r1=476266&r2=476267
==============================================================================
--- struts/struts2/trunk/apps/mailreader/src/main/java/mailreader-support.xml (original)
+++ struts/struts2/trunk/apps/mailreader/src/main/java/mailreader-support.xml Fri Nov 17 11:27:04 2006
@@ -20,7 +20,7 @@
<result type="redirect-action">Welcome</result>
</action>
- <action name="Login!*" method="{1}" class="mailreader2.Login">
+ <action name="Login_*" method="{1}" class="mailreader2.Login">
<result name="input">/Login.jsp</result>
<result name="cancel" type="redirect-action">Welcome</result>
<result type="redirect-action">MainMenu</result>
@@ -31,7 +31,7 @@
<interceptor-ref name="guest"/>
</action>
- <action name="Registration!*" method="{1}" class="mailreader2.Registration">
+ <action name="Registration_*" method="{1}" class="mailreader2.Registration">
<result name="input">/Registration.jsp</result>
<result type="redirect-action">MainMenu</result>
<interceptor-ref name="guest"/>
@@ -42,14 +42,14 @@
<global-results>
<result name="input">/Subscription.jsp</result>
- <result type="redirect-action">Registration!input</result>
+ <result type="redirect-action">Registration_input</result>
</global-results>
- <action name="Subscription!save" method="save" class="mailreader2.Subscription">
+ <action name="Subscription_save" method="save" class="mailreader2.Subscription">
<interceptor-ref name="user-submit" />
</action>
- <action name="Subscription!*" method="{1}" class="mailreader2.Subscription" />
+ <action name="Subscription_*" method="{1}" class="mailreader2.Subscription" />
</package>
Modified: struts/struts2/trunk/apps/mailreader/src/main/webapp/ChangePassword.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/main/webapp/ChangePassword.jsp?view=diff&rev=476267&r1=476266&r2=476267
==============================================================================
--- struts/struts2/trunk/apps/mailreader/src/main/webapp/ChangePassword.jsp (original)
+++ struts/struts2/trunk/apps/mailreader/src/main/webapp/ChangePassword.jsp Fri Nov 17 11:27:04 2006
@@ -16,7 +16,7 @@
</p>
<p>
- <a href="<s:url action="Login!input"/>">
+ <a href="<s:url action="Login_input"/>">
<s:text name="change.try"/>
</a>
</p>
Modified: struts/struts2/trunk/apps/mailreader/src/main/webapp/Login.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/main/webapp/Login.jsp?view=diff&rev=476267&r1=476266&r2=476267
==============================================================================
--- struts/struts2/trunk/apps/mailreader/src/main/webapp/Login.jsp (original)
+++ struts/struts2/trunk/apps/mailreader/src/main/webapp/Login.jsp Fri Nov 17 11:27:04 2006
@@ -13,15 +13,15 @@
<s:actionerror />
<s:form action="Login" validate="true">
- <s:textfield label="%{getText('username')}" name="username"/>
+ <s:textfield key="username" />
- <s:password label="%{getText('password')}" name="password" showPassword="true"/>
+ <s:password key="password" showPassword="true"/>
- <s:submit value="%{getText('button.save')}"/>
+ <s:submit key="button.save"/>
- <s:reset value="%{getText('button.reset')}"/>
+ <s:reset key="button.reset"/>
- <s:submit action="Login!cancel" value="%{getText('button.cancel')}"
+ <s:submit action="Login_cancel" key="button.cancel}"
onclick="form.onsubmit=null"/>
</s:form>
Modified: struts/struts2/trunk/apps/mailreader/src/main/webapp/MainMenu.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/main/webapp/MainMenu.jsp?view=diff&rev=476267&r1=476266&r2=476267
==============================================================================
--- struts/struts2/trunk/apps/mailreader/src/main/webapp/MainMenu.jsp (original)
+++ struts/struts2/trunk/apps/mailreader/src/main/webapp/MainMenu.jsp Fri Nov 17 11:27:04 2006
@@ -13,7 +13,7 @@
<h3><s:text name="mainMenu.heading"/> <s:property
value="user.fullName"/></h3>
<ul>
- <li><a href="<s:url action="Registration!input" />">
+ <li><a href="<s:url action="Registration_input" />">
<s:text name="mainMenu.registration"/>
</a>
</li>
Modified: struts/struts2/trunk/apps/mailreader/src/main/webapp/Registration.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/main/webapp/Registration.jsp?view=diff&rev=476267&r1=476266&r2=476267
==============================================================================
--- struts/struts2/trunk/apps/mailreader/src/main/webapp/Registration.jsp (original)
+++ struts/struts2/trunk/apps/mailreader/src/main/webapp/Registration.jsp Fri Nov 17 11:27:04 2006
@@ -17,44 +17,44 @@
<body onLoad="self.focus();document.Registration.username.focus()">
<s:actionerror/>
-<s:form action="Registration!save" validate="false">
+<s:form action="Registration_save" validate="false">
<s:token />
<s:hidden name="task"/>
<s:if test="task == 'Create'">
- <s:textfield label="%{getText('username')}" name="username"/>
+ <s:textfield key="username"/>
</s:if>
<s:else>
- <s:label label="%{getText('username')}" name="username"/>
+ <s:label key="username"/>
<s:hidden name="username"/>
</s:else>
- <s:password label="%{getText('password')}" name="password"/>
+ <s:password key="password"/>
- <s:password label="%{getText('password2')}" name="password2"/>
+ <s:password key="password2"/>
- <s:textfield label="%{getText('fullName')}"
+ <s:textfield key="fullName"
name="user.fullName"/>
- <s:textfield label="%{getText('fromAddress')}"
+ <s:textfield key="fromAddress"
name="user.fromAddress"/>
- <s:textfield label="%{getText('replyToAddress')}"
+ <s:textfield key="replyToAddress"
name="user.replyToAddress"/>
<s:if test="task == 'Create'">
- <s:submit value="%{getText('button.save')}" action="Registration!save"/>
+ <s:submit key="button.save" action="Registration_save"/>
- <s:reset value="%{getText('button.reset')}"/>
+ <s:reset key="button.reset"/>
- <s:submit action="Welcome" value="%{getText('button.cancel')}"
+ <s:submit action="Welcome" key="button.cancel"
onclick="form.onsubmit=null"/>
</s:if>
<s:else>
- <s:submit value="%{getText('button.save')}" action="Registration"/>
+ <s:submit key="button.save" action="Registration"/>
- <s:reset value="%{getText('button.reset')}"/>
+ <s:reset key="button.reset"/>
- <s:submit action="MainMenu" value="%{getText('button.cancel')}"
+ <s:submit action="MainMenu" key="button.cancel"
onclick="form.onsubmit=null"/>
</s:else>
@@ -101,11 +101,11 @@
</td>
<td align="center">
- <a href="<s:url action="Subscription!delete"><s:param name="host" value="host"/></s:url>">
+ <a href="<s:url action="Subscription_delete"><s:param name="host" value="host"/></s:url>">
<s:text name="registration.deleteSubscription"/>
</a>
- <a href="<s:url action="Subscription!edit"><s:param name="host" value="host"/></s:url>">
+ <a href="<s:url action="Subscription_edit"><s:param name="host" value="host"/></s:url>">
<s:text name="registration.editSubscription"/>
</a>
@@ -115,7 +115,7 @@
</table>
- <a href="<s:url action="Subscription!input"/>"><s:text
+ <a href="<s:url action="Subscription_input"/>"><s:text
name="registration.addSubscription"/></a>
</s:if>
Modified: struts/struts2/trunk/apps/mailreader/src/main/webapp/Subscription.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/main/webapp/Subscription.jsp?view=diff&rev=476267&r1=476266&r2=476267
==============================================================================
--- struts/struts2/trunk/apps/mailreader/src/main/webapp/Subscription.jsp (original)
+++ struts/struts2/trunk/apps/mailreader/src/main/webapp/Subscription.jsp Fri Nov 17 11:27:04 2006
@@ -20,45 +20,45 @@
<body onLoad="self.focus();document.Subscription.username.focus()">
<s:actionerror/>
-<s:form action="Subscription!save" validate="true">
+<s:form action="Subscription_save" validate="true">
<s:token />
<s:hidden name="task"/>
- <s:label label="%{getText('username')}" name="user.username"/>
+ <s:label key="username" name="user.username"/>
<s:if test="task == 'Create'">
- <s:textfield label="%{getText('mailHostname')}" name="host"/>
+ <s:textfield key="mailHostname" name="host"/>
</s:if>
<s:else>
- <s:label label="%{getText('mailHostname')}" name="host"/>
+ <s:label key="mailHostname" name="host"/>
<s:hidden name="host"/>
</s:else>
<s:if test="task == 'Delete'">
- <s:label label="%{getText('mailUsername')}"
+ <s:label key="mailUsername"
name="subscription.username"/>
- <s:label label="%{getText('mailPassword')}"
+ <s:label key="mailPassword"
name="subscription.password"/>
- <s:label label="%{getText('mailServerType')}"
+ <s:label key="mailServerType"
name="subscription.type"/>
- <s:label label="%{getText('autoConnect')}"
+ <s:label key="autoConnect"
name="subscription.autoConnect"/>
- <s:submit value="%{getText('button.confirm')}"/>
+ <s:submit key="button.confirm"/>
</s:if>
<s:else>
- <s:textfield label="%{getText('mailUsername')}"
+ <s:textfield key="mailUsername"
name="subscription.username"/>
- <s:textfield label="%{getText('mailPassword')}"
+ <s:textfield key="mailPassword"
name="subscription.password"/>
- <s:select label="%{getText('mailServerType')}"
+ <s:select key="mailServerType"
name="subscription.type" list="types"/>
- <s:checkbox label="%{getText('autoConnect')}"
+ <s:checkbox key="autoConnect"
name="subscription.autoConnect"/>
- <s:submit value="%{getText('button.save')}"/>
- <s:reset value="%{getText('button.reset')}"/>
+ <s:submit key="button.save"/>
+ <s:reset key="button.reset"/>
</s:else>
- <s:submit action="Registration!input"
- value="%{getText('button.cancel')}"
+ <s:submit action="Registration_input"
+ key="button.cancel"
onclick="form.onsubmit=null"/>
</s:form>
Modified: struts/struts2/trunk/apps/mailreader/src/main/webapp/Welcome.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/main/webapp/Welcome.jsp?view=diff&rev=476267&r1=476266&r2=476267
==============================================================================
--- struts/struts2/trunk/apps/mailreader/src/main/webapp/Welcome.jsp (original)
+++ struts/struts2/trunk/apps/mailreader/src/main/webapp/Welcome.jsp Fri Nov 17 11:27:04 2006
@@ -14,9 +14,9 @@
<h3><s:text name="index.heading"/></h3>
<ul>
- <li><a href="<s:url action="Registration!input"/>"><s:text
+ <li><a href="<s:url action="Registration_input"/>"><s:text
name="index.registration"/></a></li>
- <li><a href="<s:url action="Login!input"/>"><s:text
+ <li><a href="<s:url action="Login_input"/>"><s:text
name="index.login"/></a></li>
</ul>
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/validation/storeErrorsAcrossRequestCancel.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/validation/storeErrorsAcrossRequestCancel.jsp?view=diff&rev=476267&r1=476266&r2=476267
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/validation/storeErrorsAcrossRequestCancel.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/validation/storeErrorsAcrossRequestCancel.jsp Fri Nov 17 11:27:04 2006
@@ -1,7 +1,7 @@
<%@ page language="java" contentType="text/html; charset=UTF-8"
pageEncoding="UTF-8"%>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<%@taglib prefix="s" uri="/tags" %>
+<%@taglib prefix="s" uri="/struts-tags" %>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/validation/storeErrorsAcrossRequestExample.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/validation/storeErrorsAcrossRequestExample.jsp?view=diff&rev=476267&r1=476266&r2=476267
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/validation/storeErrorsAcrossRequestExample.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/validation/storeErrorsAcrossRequestExample.jsp Fri Nov 17 11:27:04 2006
@@ -1,6 +1,6 @@
<%@ page language="java" contentType="text/html; charset=UTF-8"
pageEncoding="UTF-8"%>
-<%@taglib prefix="s" uri="/tags" %>
+<%@taglib prefix="s" uri="/struts-tags" %>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/validation/storeErrorsAcrossRequestOk.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/validation/storeErrorsAcrossRequestOk.jsp?view=diff&rev=476267&r1=476266&r2=476267
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/validation/storeErrorsAcrossRequestOk.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/validation/storeErrorsAcrossRequestOk.jsp Fri Nov 17 11:27:04 2006
@@ -1,6 +1,6 @@
<%@ page language="java" contentType="text/html; charset=UTF-8"
pageEncoding="UTF-8"%>
-<%@taglib prefix="s" uri="/tags" %>
+<%@taglib prefix="s" uri="/struts-tags" %>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
Modified: struts/struts2/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/src/site/site.xml?view=diff&rev=476267&r1=476266&r2=476267
==============================================================================
--- struts/struts2/trunk/src/site/site.xml (original)
+++ struts/struts2/trunk/src/site/site.xml Fri Nov 17 11:27:04 2006
@@ -13,8 +13,8 @@
<body>
<links>
<item name="Apache" href="http://www.apache.org" />
- <item name="Struts 1" href="http://struts.apache.org/1.x" />
<item name="Struts 2" href="http://struts.apache.org/2.x" />
+ <item name="Struts 1" href="http://struts.apache.org/1.x" />
</links>
<menu name="Struts 2">
<item
@@ -22,7 +22,7 @@
href="index.html"
/>
<item
- name="Download"
+ name="Releases"
href="http://struts.apache.org/downloads.html"/>
</menu>
@@ -66,15 +66,11 @@
name="Tag Reference"
href="http://struts.apache.org/WW/tag-reference.html"
/>
- <item
- name="Source Repository"
- href="http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/?root=Apache-SVN"
- />
</menu>
- <menu name="Community">
+ <menu name="Product Support">
<item
- name="Mailing Lists"
+ name="User Mailing List"
href="http://struts.apache.org/mail.html"
/>
<item
Modified: struts/struts2/trunk/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/src/site/xdoc/index.xml?view=diff&rev=476267&r1=476266&r2=476267
==============================================================================
--- struts/struts2/trunk/src/site/xdoc/index.xml (original)
+++ struts/struts2/trunk/src/site/xdoc/index.xml Fri Nov 17 11:27:04 2006
@@ -90,6 +90,9 @@
<strong>First-class AJAX support</strong> - The AJAX theme gives interactive
applications a boost.
</li>
+ <li>
+ <em>Coming in Struts 2.0.2</em> -- <strong>Zero Configuration</strong> - Optionally, replace XML configuration with convention and annotation.
+ </li>
</ul></li>
<li>
@@ -108,6 +111,9 @@
<strong>Easy portlets</strong> - Automatic portlet support allows portal and servlet
deployments with no code changes.
</li>
+ <li>
+ <strong>Integrated profiling</strong> - Peek inside Struts to find the cycles are going!
+ </li>
</ul></li>
<li>
@@ -154,6 +160,30 @@
</p>
</subsection>
</section>
+
+ <section name="Platform Requirements">
+
+ <p>
+ Apache Struts 2 requires:
+ </p>
+
+ <ul>
+ <li>Servlet API 2.4</li>
+ <li>JSP API 2.0</li>
+ <li>Java 5</li>
+ </ul>
+
+ <p>
+ An alternate set of JARs for Java 4 are also available.
+ See the "J4" distribution.
+ </p>
+
+ <p>
+ For a full list of requirements, including dependencies used by optional plugins,
+ see <a href="http://struts.apache.org/2.x/struts2-core/dependencies.html">Project Dependencies</a>
+ </p>
+
+ </section>
<section name="Licensing of Apache Struts Distributions">
<p>