Author: mrdon
Date: Sat Jul 1 19:47:25 2006
New Revision: 418541
URL: http://svn.apache.org/viewvc?rev=418541&view=rev
Log:
Updating site with Struts Action renaming, and Shale moving
WW-1367 STR-2898
Modified:
struts/site/pom.xml
struts/site/src/site/fml/kickstart.fml
struts/site/src/site/fml/roadmap.fml
struts/site/src/site/resources/.htaccess
struts/site/src/site/site.xml
struts/site/src/site/xdoc/announce-2005.xml
struts/site/src/site/xdoc/announce.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
Modified: struts/site/pom.xml
URL:
http://svn.apache.org/viewvc/struts/site/pom.xml?rev=418541&r1=418540&r2=418541&view=diff
==============================================================================
--- struts/site/pom.xml (original)
+++ struts/site/pom.xml Sat Jul 1 19:47:25 2006
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.struts</groupId>
- <artifactId>struts-parent</artifactId>
+ <artifactId>struts-master</artifactId>
<version>3-SNAPSHOT</version>
</parent>
@@ -39,8 +39,7 @@
<!-- ################################################################ -->
<description>
- Struts Site is the Apache Struts home page,
- the top-level portal to all other Struts frameworks and subprojects.
+ Struts Site is the Apache Struts home page, covering all versions of
Struts.
</description>
<scm>
Modified: struts/site/src/site/fml/kickstart.fml
URL:
http://svn.apache.org/viewvc/struts/site/src/site/fml/kickstart.fml?rev=418541&r1=418540&r2=418541&view=diff
==============================================================================
--- struts/site/src/site/fml/kickstart.fml (original)
+++ struts/site/src/site/fml/kickstart.fml Sat Jul 1 19:47:25 2006
@@ -29,16 +29,16 @@
<a href="http://struts.apache.org/announce-2005.html#a20050322";>
Struts 1.2.9.</a>
The Struts 1.2.9 release has its
- <a href="http://struts.apache.org/struts-doc-1.2.9/index.html";>
+ <a href="http://struts.apache.org/1.2.9/index.html";>
own area of the website</a>.
If you are new to Java or web development as well as Apache Struts,
be sure to review the
- <a
href="http://struts.apache.org/struts-doc-1.2.9/userGuide/index.html";>
+ <a href="http://struts.apache.org/1.2.9/userGuide/index.html";>
Preface to the User Guide</a>.
</p>
<p>
- The main website is devoted to the upcoming version, Struts Action
+ The main website is devoted to the upcoming version, Struts
1.3. This version is at the
"<a href="http://svn.apache.org/dist/struts/action-lib/";>test
build</a>" stage now, but it is still 100% backwardly compatible
@@ -46,23 +46,21 @@
</p>
<p>
- Meanwhile, for the Struts Action 2 release,
+ Meanwhile, for the Struts 2 release,
we "joined forces" with another project,
<a href="http://www.opensymphony.com/webwork/";>OpenSymphony
WebWork.</a>
The WebWork codebase was donated to Apache Struts;
and the WebWork developers have joined the Apache Struts team.
- Essentially, Struts Action Framework 2.0 will be WebWork 2.3.
+ Essentially, Struts 2.0 will be WebWork 2.3.
</p>
<p>
- To learn more about using Apache Struts frameworks, you can also
visit
+ To learn more about using Apache Struts, you can also visit
<a href="http://www.StrutsCentral.net/";>Struts Central</a>,
which catalogs all the known resources about Apache Struts,
whether it is
- <a href="http://struts.apache.org/struts-action/";>Action 1</a>,
- <a href="http://wiki.apache.org/struts/StrutsTi";>Action 2</a>,
- or our offering for JavaServer Faces,
- <a href="http://struts.apache.org/struts-shale/";>Struts Shale</a>.
+ <a href="http://struts.apache.org/1.x/";>Struts 1</a>,
+ <a href="http://struts.apache.org/2.0/";>Struts 2</a>.
To keep up on the latest news about "everything Struts",
point your RSS reader at the
<a href="http://www.PlanetStruts.org/";>Planet Struts</a> news site.
@@ -132,7 +130,7 @@
<question>Are there ISPs that will host my Java web
application?</question>
<answer>
- <p>For a listing of some Java and Struts Action Framework
+ <p>For a listing of some Java and Struts
ISPs, visit the
<a href="http://struts.sf.net/community/index.html";>Struts
Community Resources</a>
@@ -166,7 +164,7 @@
<faq id="help">
<question>Where can I get help with Apache Struts?</question>
<answer>
- <p>Struts Action Framework comes complete with a
+ <p>Struts comes complete with a
<a href="../userGuide/index.html">Users Guide</a>
to
introduce people to the framework and its underlying
Modified: struts/site/src/site/fml/roadmap.fml
URL:
http://svn.apache.org/viewvc/struts/site/src/site/fml/roadmap.fml?rev=418541&r1=418540&r2=418541&view=diff
==============================================================================
--- struts/site/src/site/fml/roadmap.fml (original)
+++ struts/site/src/site/fml/roadmap.fml Sat Jul 1 19:47:25 2006
@@ -20,95 +20,13 @@
<!--<title>Roadmap FAQ</title>-->
<part id="general">
- <faq id="shale">
- <question>Why are you offering both the Struts Shale and the
Struts Action
- Framework? Don't they compete for new development?</question>
- <answer>
- <p>We do offer Apache Struts developers a choice, but, hey,
- choice is good. :)</p>
- <p>People who want to create and maintain the
- <a href="announce.html#a20051214.4">Struts Action
- Framework</a>
- are welcome to do so.
- </p>
- <p>People who want to create and maintain the
- <a href="announce.html#a20051214.2">Struts Shale
- Framework</a>
- are equally welcome.
- </p>
- <p>As a volunteer organization, we are not constrained by the
- economics of competition. All we need are volunteers who
- are ready, willing, and able to do the work. So long as we
- have volunteers, we have work for them to do.</p>
- <p>Right now, we have volunteers who want to leverage the new
- JavaServer Faces framework by using Struts Shale for new
- development. We also have volunteers who prefer to
- leverage their existing investment in Struts Action
- Framework. All are welcome.</p>
- <p>For more about volunteering, visit our
- <a href="http://struts.apache.org/helping.html";>how
- to help page.</a>
- </p>
- </answer>
- </faq>
-
- <faq id="fork">
- <question>Is Struts Shale a fork?</question>
- <answer>
- <p>No. It's an entirely new product with its own architecture.
- Shale is to JavaServer Faces what Action is to JavaServer
- Pages.
- </p>
- <p>Both frameworks will have a home here so long as there are
- volunteers ready to contribute.</p>
- <p>We encourage you to choose the framework that works best
- for you.</p>
- </answer>
- </faq>
-
- <faq id="struts">
- <question>If Shale is a new product, why is it called
- Struts?</question>
- <answer>
- <p>
- Apache Struts embraces standards, and JavaServer Faces
- (JSF) is a new standard.
- JSF is not the first standard that Struts has assimilated
- (and, undoubtedly, it will not be the last).
- </p>
- <p>
- For example, many of the original Struts taglibs overlap
- with the JavaServer Pages Standard Tag Library (JSTL).
- Some of us want to continue using the original tags.
- Others want to be able to use JSTL as much as possible.
- As a result, David Karr created the Struts EL taglibs.
- The Struts EL subproject provides JSTL versions of only
- the Struts tags that do not overlap with JSTL.
- Meanwhile, the original taglibs are available and
- maintained for those that choose to use them.
- </p>
- <p>
- Likewise, some of us want to use JSF as much as possible.
- Others want to continue using the original Action
- framework.
- As a result, Craig McClanahan created the Struts Shale
- framework.
- Shale provides the same utility as the Action framework by
- building on the JSF feature set.
- Since Shale does for JSF what Action does for JSP, we
- consider Shale to be another Struts framework.
- </p>
- </answer>
- </faq>
-
<faq id="ti">
<question>What about Ti? What about WebWork?</question>
<answer>
<p>
<a href="http://wiki.apache.org/struts/StrutsTi";>Struts
Ti</a>
- (short for Titanium) was a codename for Struts Action
- Framework 2.x.
+ (short for Titanium) was a codename for Struts 2.0.
In late November 2005, the Ti proposal was amended to
include a merger with
<a href="http://www.opensymphony.com/webwork/";>Open
@@ -134,12 +52,12 @@
<p>
People who have worked with both Struts 1.x and WebWork
2.x tend to agree that it is a logical candidate for
- Struts Action Framework 2.x.
- If you look the Struts Action 1.x roadmap and the WebWork
+ Struts 2.0.
+ If you look the Struts 1.x roadmap and the WebWork
2.x feature set,
you'll see that WebWork has already does most of what we
- wanted Struts Action framework to do.
- If we finished the roadmap ourselves, Struts Action would
+ wanted Struts framework to do.
+ If we finished the roadmap ourselves, Struts would
end up as a WebWork workalike.
Rather than reinvent the wheel,
Ti has become a proposal to put the WebWork wheel back on
@@ -147,7 +65,7 @@
</p>
<p>
At this point, the Ti codename has being dropped,
- and we are referring to the incoming WebWork codebase as
Action
+ and we are referring to the incoming WebWork codebase as
Struts
2.
</p>
</answer>
@@ -155,19 +73,19 @@
<faq id="roots">
<question>If they share the same roots,
- why did WebWork evolve more quickly than Action 1?</question>
+ why did WebWork evolve more quickly than Struts 1?</question>
<answer>
<p>
- The Struts Action 1.x series is deeply into "backward
compatibility" mode.
- Backward compatibility is an obsession with Action 1.
+ The Struts 1.x series is deeply into "backward compatibility"
mode.
+ Backward compatibility is an obsession with Struts 1.
Before making any API change, we deprecate the existing member,
and make at least one milestone release before removing the
deprecated member.
- Each Struts Action milestone is drop-and-go compatible with the
last.
+ Each Struts milestone is drop-and-go compatible with the last.
Maintaining this degree of stability takes a lot of effort,
but given the installed base, we feel it is worth the time and
trouble.
</p>
<p>
- There have been several proposals for a new Action 2 codebase.
+ There have been several proposals for a new Struts 2 codebase.
The first formal proposal was
<a
href="http://wiki.apache.org/struts/StrutsJericho";>Jericho,</a>
followed by
@@ -180,8 +98,10 @@
Shale is based on JavaServer Faces, and, when the time came,
the Apache Struts PMC found that many of us were not ready to
adopt JSF just yet.
- Shale is now a separate but equal framework,
- created and maintained by the Apache Struts community.
+ Shale was a separate but equal framework,
+ created and maintained by the Apache Struts community,
+ but later moved to its own <a
href="http://struts.apache.org/struts-shale";>Struts Shale</a>
+ project.
</p>
<p>
The Ti proposal included the idea of collaborating with other
@@ -213,7 +133,7 @@
<p>
For the time being, there is no plan to migrate XWork to
- the ASF. Struts Action has always had many dependencies on
+ the ASF. Struts has always had many dependencies on
external
packages. So long as packages like XWork and SiteMesh are
doing
well at OpenSymphony, there is no reason to make further
changes.
@@ -222,11 +142,11 @@
</faq>
<faq id="migrate">
- <question>Will it be difficult to migration from Action 1 to
- Action 2?</question>
+ <question>Will it be difficult to migration from Struts 1 to
+ Struts 2?</question>
<answer>
<p>
- Many of us have significant Struts Action 1.x
+ Many of us have significant Struts 1.x
applications in production.
Being able to migrate both applications and developer
skill sets is important to all of us.
@@ -241,16 +161,16 @@
</faq>
<faq id="obsolete">
- <question>Is Struts Action 1 obsolete?</question>
+ <question>Is Struts 1 obsolete?</question>
<answer>
<p>
- There is a robust and vibrant community of developers using
Struts Action 1
+ There is a robust and vibrant community of developers using
Struts 1
in production, and we expect that thousands of teams will
continue to base new
- projects on Action 1 and support existing projects, for many,
many years
+ projects on Struts 1 and support existing projects, for many,
many years
to come.
</p>
<p>
- New and improved extensions to Action 1 continue to appear
regularly.
+ New and improved extensions to Struts 1 continue to appear
regularly.
In <strong>2006 alone</strong>, we've seen the release of
<a href="http://strecks.sourceforge.net/";>Strecks,</a>
@@ -264,27 +184,26 @@
There are <a
href="http://opensource.atlassian.com/confluence/oss/display/BOOKS/Books+about+Struts";>dozens
of books</a> and
<a
href="http://www.husted.com/central/Resources/Action/articles-2006.html";>hundreds
of articles</a> available
- to help people get started with Action 1 or improve the
application they already have.
+ to help people get started with Struts 1 or improve the
application they already have.
</p>
<p>
- A new build of <a
href="http://svn.apache.org/dist/struts/action-lib/";>Struts Action 1.3 is
available for testing</a>,
+ A new build of <a
href="http://svn.apache.org/dist/struts/action-lib/";>Struts 1.3 is available
for testing</a>,
and a stable release is expected sometime in the first half of
2006.
- Apache Struts Action 1 continues to be the most popular and
best supported
+ Apache Struts 1 continues to be the most popular and best
supported
web application framework for Java.
If time is of the essence, a proven solution can be easiest
path.
</p>
<p>
- Of course, both Struts Shale and Struts Action Framework 2 are
on the horizon.
If you are starting a new project, and have your choice of
frameworks,
this would be a good time to consider whether you would like to
continue to use
- Action 1 or <a href="#choice">whether it's time to try
something else</a>.
+ Struts 1 or <a href="#choice">whether it's time to try
something else</a>.
</p>
</answer>
</faq>
<faq id="choice">
- <question>Which Apache Struts Framework should I use on my next
+ <question>Which Apache Struts version should I use on my next
project?</question>
<answer>
@@ -328,19 +247,11 @@
</p>
<p>
Multi-developer teams working on larger applications will
- probably find a MVC framework useful. In that case,
- we would suggest
- <a
href="http://struts.apache.org/struts-shale/index.html";>Struts
- Shale</a>
- for JSF
- or
- <a
href="http://struts.apache.org/struts-action/index.html";>
- Struts Action</a>
- for JSP.
- If you choose Action, and you or your team is
forward-looking,
- you may want to start with
- <a href="http://www.opensymphony.com/webwork/";>WebWork
2.2</a>
- today and migrate to Struts Action Framework 2 when it
arrives.
+ probably find a MVC framework useful. While both Struts 1
and 2
+ support JSP, Struts 2.0 has support for JSF and enhanced
support
+ for template languages like Velocity or Freemarker.
+ Struts 1.x has a ton of books, articles, and other
resources, so it is
+ the better choice if you need support materials.
</p>
<p>
Aside from Apache Struts products,
@@ -410,43 +321,18 @@
</answer>
</faq>
- <faq id="next">
- <question>
- Is Shale the Next Struts? Or is Action 2 the Next Struts?
- </question>
- <answer>
- <p>
- Yes.
- </p>
- <p>
- Shale is the Next Struts for JSF. Action 2 is the next
Struts for
- JSP.
- </p>
- <p>
- If you'd like a head-start on Action 2,
- you could start new development with WebWork 2 today.
- <a href="announce.html#a20051214.3">
- WebWork has joined Apache Struts,</a>
- and Action 2 will be an updated release of WebWork 2.2.
- Undoubtedly, there will be some changes,
- just as there were changes between WebWork 2.1 and Webwork
2.2,
- but the core API and architecture will remain the same.
- </p>
- </answer>
- </faq>
-
<faq id="steering">
- <question>Shouldn't the Apache Struts team focus on a single
technology
+ <question>Shouldn't the Apache Struts team focus on a single
version
and help reduce choice for the rest of us?</question>
<answer>
<p>
Apache Struts is neither a steering committee nor a
vendor. We're
a group of engineers creating the web application
frameworks that
we want to use to build our own applications. Some of us
are
- working on JSF applications, some of us are working on JSP
- applications, and some of us are working on both. Since we
have
- volunteers to work on two frameworks, we offer two
- frameworks.</p>
+ working on legacy Struts 1 applications, some of us are
working on
+ WebWork 2 or Struts 2 applications, and some of us are
working on both. Since we have
+ volunteers to work on two versions, we offer two
+ versions.</p>
<p>The Struts committers work for different employers all over
the world. It is not feasible for us to say this
technology or
@@ -465,8 +351,8 @@
We're collaborating on the frameworks that we want to use,
and
we are trying to share the wealth with others who might
want to
help us.
- If you choose to use one of our frameworks, that's great.
We're
- glad we could help. If you'd like to help us make the
frameworks
+ If you choose to use one of our versions, that's great.
We're
+ glad we could help. If you'd like to help us make the
versions
even better, feel free to return the favor. We don't want
your
money, but
<a href="helping.html">we could use your help.</a>
@@ -475,10 +361,10 @@
</faq>
<faq id="subprojects">
- <question>Why are there so many "extensions" for Action 1
now?</question>
+ <question>Why are there so many "extensions" for Struts 1
now?</question>
<answer>
<p>
- Over the years, the Action 1 framework grew to include
not only a
+ Over the years, the Struts 1 framework grew to include
not only a
controller and a set of taglibs but several other
comonents,
like Tiles, EL, Scripting, and Flow. There were also
some
optional classes that some people liked, but not
everyone needed
@@ -486,20 +372,20 @@
</p>
<p>
- For the Struts Action 1.3.0 build, we tried creating
separate
+ For the Struts 1.3.0 build, we tried creating separate
distributions for the various packages that make up
- Struts Action.
+ Struts.
Creating the separate distributions created problems
of its own,
- so for the Struts Action 1.3.1 build, and beyond,
+ so for the Struts 1.3.1 build, and beyond,
we are consolidating the extensions back into a single
- Struts Action 1.3 distribution. Each component has its
own </p>
+ Struts 1.3 distribution. Each component has its own
</p>
JAR but all share the same release cycle.
</answer>
</faq>
<faq id="classic">
- <question>Is Struts Classic another name for the Struts Action
Framework?
+ <question>Is Struts Classic another name for the Struts?
</question>
<answer>
<p>Struts Classic is a codename for the work we needed to
do to
@@ -520,12 +406,12 @@
business layer framework.
The codename for the business layer framework under
development is "Nexus".
- Like Action 1.3 and Shale, the Nexus internals are
based
+ Like Struts 1.3 and Shale, the Nexus internals are
based
on the Chain of Responsibility pattern.
</p>
<p>
OverDrive and Nexus do not complete with frameworks
like
- Action 1.3 and Shale.
+ Struts 1.3 and Struts 2.
Nexus begins where these frameworks end.
Nexus is the "rest of the stack".
</p>
Modified: struts/site/src/site/resources/.htaccess
URL:
http://svn.apache.org/viewvc/struts/site/src/site/resources/.htaccess?rev=418541&r1=418540&r2=418541&view=diff
==============================================================================
--- struts/site/src/site/resources/.htaccess (original)
+++ struts/site/src/site/resources/.htaccess Sat Jul 1 19:47:25 2006
@@ -1,20 +1,29 @@
-Redirect permanent /userGuide
http://struts.apache.org/struts-action/userGuide
-Redirect permanent /faqs
http://struts.apache.org/struts-action/faqs
-Redirect permanent /struts-core http://struts.apache.org/struts-action
-Redirect permanent /faces
http://struts.apache.org/struts-action/struts-faces
-Redirect permanent /struts-faces
http://struts.apache.org/struts-action/struts-faces
-Redirect permanent /bsf
http://struts.apache.org/struts-action/struts-scripting
-Redirect permanent /struts-bsf
http://struts.apache.org/struts-action/struts-scripting
-Redirect permanent /struts-scripting
http://struts.apache.org/struts-action/struts-scripting
-Redirect permanent /struts-plugins
http://struts.apache.org/struts-action/struts-extras
-Redirect permanent /struts-extras
http://struts.apache.org/struts-action/struts-extras
-Redirect permanent /struts-taglib
http://struts.apache.org/struts-action/struts-taglib
-Redirect permanent /struts-el
http://struts.apache.org/struts-action/struts-el
-Redirect permanent /struts-tiles
http://struts.apache.org/struts-action/struts-tiles
-Redirect permanent /learning.html
http://struts.apache.org/struts-action/learning.html
-Redirect permanent /using.html
http://struts.apache.org/struts-action/userGuide/index.html
+Redirect permanent /userGuide http://struts.apache.org/1.x/userGuide
+Redirect permanent /faqs http://struts.apache.org/1.x/faqs
+Redirect permanent /struts-core http://struts.apache.org/1.x
+Redirect permanent /faces
http://struts.apache.org/1.x/struts-faces
+Redirect permanent /struts-faces
http://struts.apache.org/1.x/struts-faces
+Redirect permanent /bsf
http://struts.apache.org/1.x/struts-scripting
+Redirect permanent /struts-bsf
http://struts.apache.org/1.x/struts-scripting
+Redirect permanent /struts-scripting
http://struts.apache.org/1.x/struts-scripting
+Redirect permanent /struts-plugins
http://struts.apache.org/1.x/struts-extras
+Redirect permanent /struts-extras
http://struts.apache.org/1.x/struts-extras
+Redirect permanent /struts-taglib
http://struts.apache.org/1.x/struts-taglib
+Redirect permanent /struts-el http://struts.apache.org/1.x/struts-el
+Redirect permanent /struts-tiles
http://struts.apache.org/1.x/struts-tiles
+Redirect permanent /learning.html
http://struts.apache.org/1.x/learning.html
+Redirect permanent /using.html
http://struts.apache.org/1.x/userGuide/index.html
Redirect permanent /shale http://struts.apache.org/struts-shale
Redirect permanent /flow
http://struts.apache.org/struts-sandbox/struts-flow
Redirect permanent /struts-flow
http://struts.apache.org/struts-sandbox/struts-flow
-Redirect permanent /struts-apps
http://struts.apache.org/struts-action/struts-apps
+Redirect permanent /struts-apps
http://struts.apache.org/1.x/struts-apps
+Redirect permanent /struts-action http://struts.apache.org/1.x
+Redirect permanent /struts-action2 http://struts.apache.org/2.0
+Redirect permanent /struts-doc-1.2.x http://struts.apache.org/1.2.x
+Redirect permanent /struts-doc-1.2.9 http://struts.apache.org/1.2.9
+Redirect permanent /struts-doc-1.2.8 http://struts.apache.org/1.2.8
+Redirect permanent /struts-doc-1.2.7 http://struts.apache.org/1.2.7
+Redirect permanent /struts-doc-1.2.4 http://struts.apache.org/1.2.4
+Redirect permanent /struts-doc-1.1 http://struts.apache.org/1.1
+Redirect permanent /struts-doc-1.0.2 http://struts.apache.org/1.0.2
Modified: struts/site/src/site/site.xml
URL:
http://svn.apache.org/viewvc/struts/site/src/site/site.xml?rev=418541&r1=418540&r2=418541&view=diff
==============================================================================
--- struts/site/src/site/site.xml (original)
+++ struts/site/src/site/site.xml Sat Jul 1 19:47:25 2006
@@ -13,9 +13,8 @@
<body>
<links>
<item name="Apache" href="http://www.apache.org"; />
- <item name="Action 1"
href="http://struts.apache.org/struts-action"; />
- <item name="Action 2"
href="http://struts.apache.org/struts-action2"; />
- <item name="Shale" href="http://struts.apache.org/struts-shale"; />
+ <item name="Struts 1" href="http://struts.apache.org/1.x"; />
+ <item name="Struts 2" href="http://struts.apache.org/2.0"; />
</links>
<menu name="Apache Struts Project">
@@ -64,10 +63,19 @@
/>
</menu>
- <menu name="Frameworks">
- <item name="Action 1"
href="http://struts.apache.org/struts-action/index.html"/>
- <item name="Action 2"
href="http://struts.apache.org/struts-action2/index.html"/>
- <item name="Shale"
href="http://struts.apache.org/struts-shale/index.html"/>
+ <menu name="Current Versions">
+ <item name="Struts 1.x"
href="http://struts.apache.org/1.x/index.html"/>
+ <item name="Struts 2.0"
href="http://struts.apache.org/2.0/index.html"/>
+ </menu>
+
+ <menu name="Past Releases">
+ <item name="Struts 1.2.x"
href="http://struts.apache.org/1.2.x/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="Development">
@@ -98,6 +106,10 @@
</menu>
<menu name="Related Projects">
+ <item
+ name="Apache Shale"
+ href="http://struts.apache.org/struts-shale/";
+ />
<item
name="Apache Beehive"
href="http://beehive.apache.org/";
Modified: struts/site/src/site/xdoc/announce-2005.xml
URL:
http://svn.apache.org/viewvc/struts/site/src/site/xdoc/announce-2005.xml?rev=418541&r1=418540&r2=418541&view=diff
==============================================================================
--- struts/site/src/site/xdoc/announce-2005.xml (original)
+++ struts/site/src/site/xdoc/announce-2005.xml Sat Jul 1 19:47:25 2006
@@ -58,7 +58,7 @@
<p>
The Apache Struts flagship product,
the leading web application framework for Java,
- is now known as the "Struts Action Framework".
+ is now known as the "Struts".
</p>
<p>
@@ -71,16 +71,16 @@
and may be downloaded separately.
For consistency, the original core framework component also
has its own name
- now: "Struts Action Framework".
+ now: "Struts".
The JARs and external dependencies for the extensions to
- Struts Action Framework
+ Struts
are being bundled into a convenient distribution known as the
"Struts Action
Framework Library".
</p>
<p>
- The Struts Action Framework 1.3.0 release will include several
+ The Struts 1.3.0 release will include several
exciting new
features, including:
</p>
@@ -113,7 +113,7 @@
</p>
<p>
- The Struts Action Framework 1.3.0 release,
+ The Struts 1.3.0 release,
and other milestones on the Apache Struts roadmap,
were discussed at ApacheCon on Tuesday, December 13, 2005, in
a talk,
@@ -218,7 +218,7 @@
scalable
web applications for the enterprise,
Apache Struts now offers the Shale Framework.
- Like the original "Struts Action Framework",
+ Like the original "Struts",
Shale provides developers with a front controller,
and several other components,
to provide the "invisible underpinnings that hold an
@@ -330,8 +330,8 @@
</p>
<p>
The Release Notes are available on the Struts web site at:
- <a
href="http://struts.apache.org/struts-doc-1.2.8/userGuide/release-notes.html";>
-
http://struts.apache.org/struts-doc-1.2.8/userGuide/release-notes.html</a>
+ <a
href="http://struts.apache.org/1.2.8/userGuide/release-notes.html";>
+
http://struts.apache.org/1.2.8/userGuide/release-notes.html</a>
</p>
<p>
Please check the wiki for the latest information on upgrading:
Modified: struts/site/src/site/xdoc/announce.xml
URL:
http://svn.apache.org/viewvc/struts/site/src/site/xdoc/announce.xml?rev=418541&r1=418540&r2=418541&view=diff
==============================================================================
--- struts/site/src/site/xdoc/announce.xml (original)
+++ struts/site/src/site/xdoc/announce.xml Sat Jul 1 19:47:25 2006
@@ -84,7 +84,7 @@
<p>
Shale began as a proposal for Struts 2.0, but instead became a
subproject, so as to provide a JSF alternative for Struts
- developers. Recent developments for Struts Action 2 now make it
+ developers. Recent developments for Struts 2 now make it
easier for Struts developers to access JSF components from
within
an "action-based" application.
</p>
@@ -107,7 +107,7 @@
</p>
<p>
Bob's current focus is to develop a kinder, gentler API for
- Action 2, having already submitted several patches and
+ Struts 2, having already submitted several patches and
<a href="http://wiki.apache.org/struts/RoughSpots";>
constructively engaged the community</a>
while handling criticisms well. He has committed several
@@ -258,7 +258,7 @@
<p>
For more information on the security issues and solutions
please see the
- <a
href="http://struts.apache.org/struts-doc-1.2.9/userGuide/release-notes.html";>
+ <a
href="http://struts.apache.org/1.2.9/userGuide/release-notes.html";>
Release Notes</a>
and the
<a href="http://wiki.apache.org/struts/StrutsUpgrade";>
Modified: struts/site/src/site/xdoc/download.xml
URL:
http://svn.apache.org/viewvc/struts/site/src/site/xdoc/download.xml?rev=418541&r1=418540&r2=418541&view=diff
==============================================================================
--- struts/site/src/site/xdoc/download.xml (original)
+++ struts/site/src/site/xdoc/download.xml Sat Jul 1 19:47:25 2006
@@ -275,7 +275,7 @@
<subsection name="Older Versions">
<p>
- Older versions of Struts Classic are available from the
+ Older versions of Struts are available from the
<a href="http://archive.apache.org/dist/struts/";>Archive
Site</a>
.
Modified: struts/site/src/site/xdoc/downloads.xml
URL:
http://svn.apache.org/viewvc/struts/site/src/site/xdoc/downloads.xml?rev=418541&r1=418540&r2=418541&view=diff
==============================================================================
--- struts/site/src/site/xdoc/downloads.xml (original)
+++ struts/site/src/site/xdoc/downloads.xml Sat Jul 1 19:47:25 2006
@@ -71,7 +71,7 @@
<ul>
<li>
<a
href="http://cvs.apache.org/dist/struts/shale/v1.0.2";>
- Struts Shale 1.0.2
+ Struts Shale 1.0.2 (now Apache Shale)
</a>
</li>
</ul>
@@ -132,13 +132,12 @@
<li>
<a
href="http://cvs.apache.org/builds/struts/maven/trunk/nightly/struts-action/";>
- Action 1 Nightly Builds</a>
+ Struts 1 Nightly Builds</a>
</li>
- <li>
+ <li>
<a
href="http://cvs.apache.org/builds/struts/nightly/struts-shale/";>
Shale Nightly Builds</a>
</li>
-
</ul>
<p>
@@ -213,9 +212,9 @@
</p>
<ul>
-
<li>http://svn.apache.org/repos/asf/struts/action/trunk</li>
+
<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/shale/trunk</li>
<li>http://svn.apache.org/repos/asf/struts/site</li>
</ul>
@@ -273,7 +272,7 @@
</p>
<p>
- With Maven installed, building the entire Action 1 codebase
+ With Maven installed, building the entire Struts 1 codebase
is as simple as
</p>
Modified: struts/site/src/site/xdoc/index.xml
URL:
http://svn.apache.org/viewvc/struts/site/src/site/xdoc/index.xml?rev=418541&r1=418540&r2=418541&view=diff
==============================================================================
--- struts/site/src/site/xdoc/index.xml (original)
+++ struts/site/src/site/xdoc/index.xml Sat Jul 1 19:47:25 2006
@@ -27,9 +27,7 @@
<a name="Welcome"/>
<section name="Welcome to Apache Struts!">
<p>
- The goal of the Apache Struts project is to encourage
- application
- architectures based on the "Model 2" approach, a variation of
+ Apache Struts is a web development framework based on the
"Model 2" approach, a variation of
the
classic Model-View-Controller (MVC) design paradigm.
Under Model 2,
@@ -38,10 +36,11 @@
</p>
<p>
- The Apache Struts project encourages Model 2 designs in two
+ The Apache Struts project makes web development easier in two
ways.
- First, by providing open source frameworks and toolkits
- that help developers build applications for the web.
+ First, by providing an open source framework (briefly known as
the
+ Struts Action Framework)
+ that helps developers build applications for the web.
Second, by providing friendly and honest
<a href="mail.html">mailing lists</a>
where both newcomers and veterans discuss how to use Apache
Struts
@@ -65,66 +64,40 @@
</p>
</subsection>
-
+
+ <a name="shale"/>
+ <subsection name="What Happened to Struts Shale?">
+ <p>
+ <a href="http://struts.apache.org/struts-shale";>Struts
Shale</a>
+ started as a Struts subproject, but
+ later <a href="announce.html#a20060628.1">graduated</a>
+ to a full top level Apache project. Apache Shale, as it
is now
+ called, builds on JavaServer Faces (JSF), making JSF
applications easier to
+ develop. Until the new Apache Struts project gets
established, its pages
+ are still located at
+ <a
href="http://struts.apache.org/struts-shale";>http://struts.apache.org/struts-shale/</a>.
+ </p>
+ </subsection>
+
<a name="cooking"/>
<subsection name="What's Cooking?">
<p>
The Apache Struts project is now comprised of two distinct
- frameworks.
- The two frameworks are the
- <strong>Struts Action Framework</strong>
+ versions of the Struts framework.
+ The two versions are
+ <strong>Struts 1</strong>
and the
- <strong>Struts Shale Framework.</strong>
- Struts Action is the original request-based framework.
- Struts Shale is a component-based framework for JavaServer
Faces.
- Both frameworks are first-class citizens of the Apache
Struts
- project.
+ <strong>Struts 2.</strong>
+ Struts 1 is the original request-based framework that has
a large and
+ active following. Struts 2
+ started with a merger with the <a
href="http://www.opensymphony.com/webwork";>
+ Opensymphony WebWork</a> project and aims to exploit Java
5 annotations
+ and other modern web framework features in an effort to
make Struts easier to
+ use and more powerful. Both versions are actively
developed and supported by
+ the Apache Struts project.
</p>
-
- <p>
-
- <b>Why two frameworks?</b>
- When
- <a href="http://java.sun.com/j2ee/javaserverfaces/";>
- JavaServer Faces</a>
- arrived, our development community chose to "make new
friends but
- keep the old".
- Some of us want to stick with a request-based framework.
- Others are ready to switch to a component-based framework
- that builds on JavaServer Faces.
- We offer both frameworks because we have volunteers to
- create and maintain both frameworks.
- </p>
-
- <p>
- If you have mature Action Framework applications in
- production, don't worry,
- we are still here, same as ever.
- After all, we have our share of mature application in
- production too.
- </p>
-
- <p>
- If you are starting a new project and want to use the
latest
- technology,
- don't worry, we are still blazing trails, same as ever.
- For projects using JavaServer Faces, we offer the Shale
- Framework.
- For projects using JSP and templating technologies, we
offer the
- original Action framework.
- </p>
-
- <p>
- <b>Is that all there is?</b>
- Not by a long shot!
- Soon, we will also offer a new Action 2 framework, based on
- <a href="http://www.opensymphony.com/webwork/";>WebWork</a>
- technology. Essentially,
- <a href="announce.html#a20051214.3">Struts Action
Framework 2.0</a>
- will be WebWork 2.3.
- </p>
-
+
<p>
Whether you are staying the course, or ready to leap
forward,
the Apache Struts project is here to help you do what you
want
Modified: struts/site/src/site/xdoc/javadoc.xml
URL:
http://svn.apache.org/viewvc/struts/site/src/site/xdoc/javadoc.xml?rev=418541&r1=418540&r2=418541&view=diff
==============================================================================
--- struts/site/src/site/xdoc/javadoc.xml (original)
+++ struts/site/src/site/xdoc/javadoc.xml Sat Jul 1 19:47:25 2006
@@ -29,14 +29,13 @@
<table>
<tr>
<th>
- <a href="struts-action/apidocs/index.html">Struts
- Action Framework 1</a>
+ <a href="1.x/apidocs/index.html">Struts 1</a>
</th>
</tr>
<tr>
<th>
- <a href="struts-shale/index.html#Shale_Documentation">
- Struts Shale Framework</a>
+ <a href="2.0/apidocs/index.html">
+ Struts 2</a>
</th>
</tr>
</table>
@@ -45,7 +44,7 @@
<section>
<p class="right">Next:
- <a
href="http://svn.apache.org/viewcvs.cgi/struts/action/trunk/?root=Apache-SVN";>
+ <a
href="http://svn.apache.org/viewcvs.cgi/struts/?root=Apache-SVN";>
Source Repository</a>
</p>
</section>
