Repository: struts Updated Branches: refs/heads/develop ae4e3d116 -> 5f2898ead
http://git-wip-us.apache.org/repos/asf/struts/blob/5f2898ea/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 8d09370..673c53e 100644 --- a/pom.xml +++ b/pom.xml @@ -131,12 +131,12 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> - <version>3.2</version> + <version>3.3</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-project-info-reports-plugin</artifactId> - <version>2.4</version> + <version>2.6</version> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> @@ -287,7 +287,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> - <version>3.1</version> + <version>3.3</version> <configuration> <stagingSiteURL>${siteDeploy.url}</stagingSiteURL> <relativizeDecorationLinks>false</relativizeDecorationLinks> @@ -311,20 +311,37 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-project-info-reports-plugin</artifactId> + <version>2.7</version> </plugin> - <!-- <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - <configuration> - <configLocation>http://svn.apache.org/repos/asf/struts/maven/trunk/build/struts_checks.xml</configLocation> - </configuration> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>2.9</version> + <reportSets> + <reportSet> + <reports> + <report>javadoc</report> + </reports> + </reportSet> + </reportSets> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> - <artifactId>jxr-maven-plugin</artifactId> - <version>2.0-beta-1</version> + <artifactId>rat-maven-plugin</artifactId> + <configuration> + <includes> + <include>pom.xml</include> + <include>src/**</include> + </includes> + <excludes> + <exclude>src/test/resources/org/apache/struts2/views/jsp/ui/*</exclude> + <exclude>src/main/resources/org/apache/struts2/static/domTT.js</exclude> + <exclude>src/test/resources/org/apache/struts2/interceptor/validation/*</exclude> + <exclude>src/site/resources/tags/**</exclude> + <exclude>src/main/resources/*LICENSE.txt</exclude> + </excludes> + </configuration> </plugin> - --> </plugins> </reporting> http://git-wip-us.apache.org/repos/asf/struts/blob/5f2898ea/src/site/markdown/plugins.md ---------------------------------------------------------------------- diff --git a/src/site/markdown/plugins.md b/src/site/markdown/plugins.md deleted file mode 100644 index 332a102..0000000 --- a/src/site/markdown/plugins.md +++ /dev/null @@ -1,37 +0,0 @@ -# Apache Struts Plugins - -Apache Struts provides a plugin mechanism which allows to extend the framework -easily. A few selected plugins are bundled with Struts and are maintained by the -Struts team. These plugins are linked below. You can find community build plugins -linked on the [Struts 2 Plugin Wiki](https://cwiki.apache.org/S2PLUGINS/home.html). - -## API References - - * [CDI](struts2-plugins/struts2-cdi-browser-plugin/apidocs/index.html) - * [Codebehind](struts2-plugins/struts2-codebehind-browser-plugin/apidocs/index.html) - * [Config Browser](struts2-plugins/struts2-config-browser-plugin/apidocs/index.html) - * [Convention](struts2-plugins/struts2-convention-plugin/apidocs/index.html) - * [Dojo](struts2-plugins/struts2-dojo-plugin/apidocs/index.html) - * [DWR](struts2-plugins/struts2-dwr-plugin/apidocs/index.html) - * [Embedded JSP](struts2-plugins/struts2-embeddedjsp-plugin/apidocs/index.html) - * [GXP](struts2-plugins/struts2-gxp-plugin/apidocs/index.html) - * [JasperReports](struts2-plugins/struts2-jasperreports-plugin/apidocs/index.html) - * [JavaTemplates](struts2-plugins/struts2-javatemplates-plugin/apidocs/index.html) - * [JFreeChart](struts2-plugins/struts2-jfreechart-plugin/apidocs/index.html) - * [JavaServer Faces](struts2-plugins/struts2-jsf-plugin/apidocs/index.html) - * [JSON](struts2-plugins/struts2-json-plugin/apidocs/index.html) - * [JUnit](struts2-plugins/struts2-junit-plugin/apidocs/index.html) - * [OSGi](struts2-plugins/struts2-osgi-plugin/apidocs/index.html) - * [OVAL](struts2-plugins/struts2-oval-plugin/apidocs/index.html) - * [Pell Multipart](struts2-plugins/struts2-pell-multipart-plugin/apidocs/index.html) - * [Plexus](struts2-plugins/struts2-plexus-plugin/apidocs/index.html) - * [Portlet](struts2-plugins/struts2-portlet-plugin/apidocs/index.html) - * [Portlet Tiles](struts2-plugins/struts2-portlet-tiles-plugin/apidocs/index.html) - * [Rest](struts2-plugins/struts2-rest-plugin/apidocs/index.html) - * [Sitegraph](struts2-plugins/struts2-sitegraph-plugin/apidocs/index.html) - * [Sitemesh](struts2-plugins/struts2-sitemesh-plugin/apidocs/index.html) - * [Spring](struts2-plugins/struts2-spring-plugin/apidocs/index.html) - * [Struts 1](struts2-plugins/struts2-struts1-plugin/apidocs/index.html) - * [TestNG](struts2-plugins/struts2-testng-plugin/apidocs/index.html) - * [Tiles](struts2-plugins/struts2-tiles-plugin/apidocs/index.html) - * [Tiles 3](struts2-plugins/struts2-tiles3-plugin/apidocs/index.html) http://git-wip-us.apache.org/repos/asf/struts/blob/5f2898ea/src/site/resources/archetype-catalog.xml ---------------------------------------------------------------------- diff --git a/src/site/resources/archetype-catalog.xml b/src/site/resources/archetype-catalog.xml deleted file mode 100644 index fab8fde..0000000 --- a/src/site/resources/archetype-catalog.xml +++ /dev/null @@ -1,50 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<archetype-catalog xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-catalog/1.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-catalog/1.0.0 - http://maven.apache.org/xsd/archetype-catalog-1.0.0.xsd";> - <archetypes> - <archetype> - <groupId>org.apache.struts</groupId> - <artifactId>struts2-archetype-blank</artifactId> - <version>2.3.16.2</version> - <repository>http://repo1.maven.org/maven2/</repository> - <description>Struts 2 Archetypes - Blank</description> - </archetype> - <archetype> - <groupId>org.apache.struts</groupId> - <artifactId>struts2-archetype-convention</artifactId> - <version>2.3.16.2</version> - <repository>http://repo1.maven.org/maven2/</repository> - <description>Struts 2 Archetypes - Blank Convention</description> - </archetype> - <archetype> - <groupId>org.apache.struts</groupId> - <artifactId>struts2-archetype-dbportlet</artifactId> - <version>2.3.16.2</version> - <repository>http://repo1.maven.org/maven2/</repository> - <description>Struts 2 Archetypes - Database Portlet</description> - </archetype> - <archetype> - <groupId>org.apache.struts</groupId> - <artifactId>struts2-archetype-plugin</artifactId> - <version>2.3.16.2</version> - <repository>http://repo1.maven.org/maven2/</repository> - <description>Struts 2 Archetypes - Plugin</description> - </archetype> - <archetype> - <groupId>org.apache.struts</groupId> - <artifactId>struts2-archetype-portlet</artifactId> - <version>2.3.16.2</version> - <repository>http://repo1.maven.org/maven2/</repository> - <description>Struts 2 Archetypes - Portlet</description> - </archetype> - <archetype> - <groupId>org.apache.struts</groupId> - <artifactId>struts2-archetype-starter</artifactId> - <version>2.3.16.2</version> - <repository>http://repo1.maven.org/maven2/</repository> - <description>Struts 2 Archetypes - Starter</description> - </archetype> - </archetypes> -</archetype-catalog> http://git-wip-us.apache.org/repos/asf/struts/blob/5f2898ea/src/site/resources/css/site.css ---------------------------------------------------------------------- diff --git a/src/site/resources/css/site.css b/src/site/resources/css/site.css deleted file mode 100644 index 356442c..0000000 --- a/src/site/resources/css/site.css +++ /dev/null @@ -1,71 +0,0 @@ -/* - * $Id: $ - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License - */ - -a.externalLink, a.externalLink:link, a.externalLink:visited, a.externalLink:active, a.externalLink:hover { - background:none; - padding-right:0; -} - -img.poweredBy { - margin-left:17px; -} - -.hero-unit h1 { - font-size: 40px; - margin-top: 20px; -} - -.hero-unit { - padding: 20px; -} - -.right { - text-align: right; -} - -.section img { - margin: 20px; -} - -a:visited { - color: #00438a; -} - -a.btn-primary:visited, a.btn-info:visited { - color: #fff; -} - -.right { - float: right; -} - -#bannerRight img { margin-right: 80px; } - -.breadcrumb { padding-right: 130px; } - -#bodyColumn .row { - padding:20px; -} - -.huge { - font-size: 24px; - line-height: 52px; -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/struts/blob/5f2898ea/src/site/resources/images/download.gif ---------------------------------------------------------------------- diff --git a/src/site/resources/images/download.gif b/src/site/resources/images/download.gif deleted file mode 100644 index c67d21b..0000000 Binary files a/src/site/resources/images/download.gif and /dev/null differ http://git-wip-us.apache.org/repos/asf/struts/blob/5f2898ea/src/site/resources/images/help.gif ---------------------------------------------------------------------- diff --git a/src/site/resources/images/help.gif b/src/site/resources/images/help.gif deleted file mode 100644 index 728f837..0000000 Binary files a/src/site/resources/images/help.gif and /dev/null differ http://git-wip-us.apache.org/repos/asf/struts/blob/5f2898ea/src/site/resources/images/plugins.gif ---------------------------------------------------------------------- diff --git a/src/site/resources/images/plugins.gif b/src/site/resources/images/plugins.gif deleted file mode 100644 index b1a8c13..0000000 Binary files a/src/site/resources/images/plugins.gif and /dev/null differ http://git-wip-us.apache.org/repos/asf/struts/blob/5f2898ea/src/site/resources/images/struts2-arch.png ---------------------------------------------------------------------- diff --git a/src/site/resources/images/struts2-arch.png b/src/site/resources/images/struts2-arch.png deleted file mode 100644 index a9979bf..0000000 Binary files a/src/site/resources/images/struts2-arch.png and /dev/null differ http://git-wip-us.apache.org/repos/asf/struts/blob/5f2898ea/src/site/resources/images/struts2-merger.png ---------------------------------------------------------------------- diff --git a/src/site/resources/images/struts2-merger.png b/src/site/resources/images/struts2-merger.png deleted file mode 100644 index 0891bd5..0000000 Binary files a/src/site/resources/images/struts2-merger.png and /dev/null differ http://git-wip-us.apache.org/repos/asf/struts/blob/5f2898ea/src/site/resources/images/struts2-merger2.png ---------------------------------------------------------------------- diff --git a/src/site/resources/images/struts2-merger2.png b/src/site/resources/images/struts2-merger2.png deleted file mode 100644 index f11c9f0..0000000 Binary files a/src/site/resources/images/struts2-merger2.png and /dev/null differ http://git-wip-us.apache.org/repos/asf/struts/blob/5f2898ea/src/site/resources/images/struts2.png ---------------------------------------------------------------------- diff --git a/src/site/resources/images/struts2.png b/src/site/resources/images/struts2.png deleted file mode 100644 index 1ca27b1..0000000 Binary files a/src/site/resources/images/struts2.png and /dev/null differ http://git-wip-us.apache.org/repos/asf/struts/blob/5f2898ea/src/site/site.xml ---------------------------------------------------------------------- diff --git a/src/site/site.xml b/src/site/site.xml index 85fb5a3..7ce4095 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -1,8 +1,6 @@ <?xml version="1.0" encoding="ISO-8859-1"?> <!-- /* - * $Id$ - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -25,7 +23,7 @@ <skin> <groupId>org.apache.maven.skins</groupId> <artifactId>maven-fluido-skin</artifactId> - <version>1.3.0</version> + <version>1.3.1</version> </skin> <bannerLeft> <name>Apache Software Foundation</name> @@ -34,87 +32,38 @@ </bannerLeft> <bannerRight> <name>Apache Struts</name> - <src>http://struts.apache.org/images/struts.gif</src> + <src>http://struts.apache.org/img/struts-logo.svg</src> <href>http://struts.apache.org/</href> </bannerRight> + <publishDate position="none"/> + <version position="none"/> <body> <links> - <item name="Apache" - href="http://www.apache.org/"/> - <item name="Struts" - href="http://struts.apache.org/"/> + <item name="Apache" href="http://www.apache.org/"/> + <item name="Struts" href="http://struts.apache.org/"/> </links> - <menu name="Struts 2"> - <item name="Welcome" - href="index.html"/> - <item name="Releases" - href="http://struts.apache.org/downloads.html"/> - <item name="Thanks!" - href="http://apache.org/foundation/thanks.html"/> - <item name="Sponsorship" - href="http://apache.org/foundation/sponsorship.html"/> - </menu> - <menu name="Parent project"> - <item name="Apache Struts" - href="http://struts.apache.org/"/> + <menu name="Top Site"> + <item name="Apache Struts" href="http://struts.apache.org/"/> </menu> <menu name="Documentation"> - <item name="Getting Started" - href="docs/home.html"/> - <item name="Tutorials" - href="docs/tutorials.html"/> - <item name="FAQs" - href="docs/faqs.html"/> - <item name="Guides" - href="docs/guides.html"/> - </menu> - - <menu name="Support"> - <item name="User Mailing List" - href="http://struts.apache.org/mail.html"/> - <item name="Issue Tracker (JIRA)" - href="https://issues.apache.org/jira/browse/WW"/> - <item name="Wiki Pages" - href="https://cwiki.apache.org/confluence/display/S2WIKI/Welcome+to+Apache+Struts2"/> + <item name="Getting Started" href="docs/home.html"/> + <item name="Tutorials" href="docs/tutorials.html"/> + <item name="FAQs" href="docs/faqs.html"/> + <item name="Guides" href="docs/guides.html"/> </menu> <menu name="Reference"> - <item name="XWork API" - href="xwork-core/apidocs/index.html"/> - <item name="Struts Core API" - href="struts2-core/apidocs/index.html"/> - <item name="Plugin APIs" - href="plugins.html"/> - <item name="Tag Reference" - href="docs/tag-reference.html"/> - <item name="Plugin Registry" - href="http://cwiki.apache.org/S2PLUGINS/home.html"/> - </menu> - - <menu name="Development"> - <item name="Struts 2.x Draft Docs" - href="index.html"/> - <item name="How to Help FAQ" - href="http://struts.apache.org/helping.html"/> - <item name="Development Lists" - href="http://struts.apache.org/dev/dev-mail.html"/> - <item name="Source Code" - href="http://struts.apache.org/dev/builds.html"/> - <item name="Release Guidelines" - href="http://struts.apache.org/dev/releases.html"/> - <item name="Volunteers" - href="http://struts.apache.org/dev/volunteers.html"/> - <item name="PMC Charter" - href="http://struts.apache.org/dev/bylaws.html"/> - <item name="Sonar Analysis" - href="https://analysis.apache.org/dashboard/index/org.apache.struts:struts2-parent"/> - <item name="Source Repository" - href="http://svn.apache.org/viewcvs.cgi/struts/"/> + <item name="XWork API" href="xwork-core/apidocs/index.html"/> + <item name="Struts Core API" href="struts2-core/apidocs/index.html"/> + <item name="Plugin APIs" href="plugins.html"/> + <item name="Tag Reference" href="docs/tag-reference.html"/> + <item name="Plugin Registry" href="http://cwiki.apache.org/S2PLUGINS/home.html"/> </menu> <menu ref="reports"/> + <menu ref="modules"/> <footer> <div class="row span12"> http://git-wip-us.apache.org/repos/asf/struts/blob/5f2898ea/src/site/xdoc/index.xml.vm ---------------------------------------------------------------------- diff --git a/src/site/xdoc/index.xml.vm b/src/site/xdoc/index.xml.vm deleted file mode 100644 index e8f8dc9..0000000 --- a/src/site/xdoc/index.xml.vm +++ /dev/null @@ -1,260 +0,0 @@ -<?xml version="1.0"?> -<!-- -/* - * $Id$ - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ ---> -<!-- -// ======================================================================== 78 ---> -<document> - - <properties> - <title>Welcome</title> - </properties> - - <body> - - <section name="About Apache Struts 2"> - <a name="Welcome"/> - - <div class="hero-unit"> - <div style="float:left;margin-left:16px;margin-right:16px"> - <a href="docs/home.html"><img src="images/struts2-merger2.png" alt="Struts 2 and WebWork merger"/></a> - </div> - <p> - <strong>Apache Struts 2 is an elegant, extensible framework</strong> for creating enterprise-ready Java web applications. - The framework is designed to streamline the full development cycle, - from building, to deploying, to maintaining applications over time. - </p> - - <p> - Apache Struts 2 was originally known as WebWork 2. - After working independently for several years, - the WebWork and Struts communities joined forces to create Struts<sup>2</sup>. - This new version of Struts is simpler to use and - closer to how Struts was always meant to be. - </p> - </div> - <div> - <table><tr><td> - #set($aname=$currentVersion.replaceAll('\.', "")) - <a href="http://struts.apache.org/download.cgi#struts${aname}";> - <div style="background:url(images/download.gif) no-repeat scroll 0%; width:200px; height:80px; float:left;position:relative;margin:5px"> - <span style="top:15px;position:absolute;color:white;padding-left:10px"> - <small>version ${currentVersion}</small> - <br /> - <span style="font-weight: bold; font-size:140%">Download Now</span> - </span> - </div> - </a> - </td><td> - <a href="docs/home.html" style="margin:10px"> - <div style="background:url(images/help.gif) no-repeat scroll 0%; width:200px; height:80px; float:left;position:relative;margin:5px"> - <span style="top:15px;position:absolute;color:white;padding-left:10px"> - <span style="font-weight: bold; font-size:140%">Get Started</span> - </span> - </div> - </a> - </td><td> - <a href="https://cwiki.apache.org/confluence/display/S2PLUGINS/Home"; style="margin:10px"> - <div style="background:url(images/plugins.gif) no-repeat scroll 0%; width:200px; height:80px; float:left;position:relative;margin:5px"> - <span style="top:15px;position:absolute;color:white;padding-left:10px"> - <span style="font-weight: bold; font-size:140%">Plugin Registry</span> - </span> - </div> - </a> - </td></tr> - </table></div> - </section> - - <section name="Build! Deploy! Maintain!"> - <table> - <tr> - <td colspan="2"> - <span class="huge">Build!</span> - <ul> - <li> - <strong>Easy startup</strong> - - Jumpstart new projects with our bootstrap tutorial and template application or Maven - archetype. - </li> - <li> - <strong>Improved Design</strong> - - Code clean against HTTP-independant framework interfaces. - </li> - <li> - <strong>Enhanced Tags</strong> - - Code less with stylesheet-driven form tags that provide their own markup. - </li> - <li> - <strong>Stateful Checkboxes</strong> - - Avoid special handling with smart checkboxes that know when they are toggled. - </li> - <li> - <strong>Flexible Cancel Buttons</strong> - - Go directly to a different action on cancel. - </li> - <li> - <strong>First-class AJAX support</strong> - - Add interactivity and flexibility with AJAX tags that look and feel just like standard - Struts tags. - </li> - <li> - <strong>Easy Spring integration</strong> - - Inject dependencies into Actions using Spring without glue code or red tape. (Plexus - support also available.) - </li> - <li> - <strong>Enhanced Results</strong> - - Do more with speciality results for JasperReports, JFreeChart, Action chaining, and - file downloading. - </li> - <li> - <strong>POJO forms</strong> - - No more ActionForms! Use any JavaBean to capture form input or - put properties directly on an Action class. Use both binary and String properties! - </li> - <li> - <strong>POJO Actions</strong> - - Use any class as an Action class -- even the - interface is optional! - </li> - <!-- Experimental - <li> - strong>Zero Configuration</strong> - Optionally, replace XML configuration with convention and annotation. - </li> - --> - </ul> - </td> - </tr> - <tr> - <td width="50%"> - <span class="huge">Deploy!</span > - <ul> - <li> - <strong>Easy plugins</strong><br/> - Add framework extensions by dropping in a JAR. - No manual configuration required! Bundled plugins add support for JavaServer Faces, - JasperReports, JFreeChart, Tiles, and more ... - </li> - <li> - <strong>Integrated profiling</strong><br/> - Peek inside Struts<sup>2</sup> - to find where the cycles are going! - </li> - <li> - <strong>Precise Error Reporting</strong><br/> - Flip directly to the location and line of an error. - </li> - <!-- Experimental - <li> - <strong>Easy portlets</strong> - Automatic portlet support allows portal and servlet - deployments with no code changes. - </li> - <li> - <strong>REST-ful URLs</strong> - Use search-engine friendly URLs, like category/action/movie/Thrillers. - </li> - --> - </ul> - - </td> - <td width="50%"> - <span class="huge">Maintain!</span > - <ul> - <li> - <strong>Easy-to-test Actions</strong><br/> - Test Struts<sup>2</sup> - Actions directly, - without resorting to mock HTTP objects. - </li> - <li> - <strong>Intelligent Defaults</strong><br/> - Skip obvious and redundant settings. Most framework configuration - elements have a default value that we can set and forget. Say it once! - </li> - <li> - <strong>Easy-to-customize controller</strong><br/> - Customize the request handling - per action, if desired. Struts<sup>2</sup> - only does what you want it to do! - </li> - <li> - <strong>Integrating Debugging</strong><br/> - Research problem reports with built-in - debugging tools. - </li> - <li> - <strong>Easy-to-tweak tags</strong><br/> - Customize tag markup by editing a FreeMarker - template. No need to grok the taglib API! - <em>JSP, FreeMarker, and Velocity tags are fully supported.</em> - </li> - </ul> - </td> - </tr> - </table> - - <subsection> - <p> - To download the framework, visit - <a href="http://struts.apache.org/download.cgi#struts${aname}";> - Apache Struts Distributions. - </a> - For more about Apache Struts 2, visit - <a href="docs/home.html"> - Getting Started. - </a> - For more about framework extensions, visit the - <a href="http://cwiki.apache.org/S2PLUGINS/home.html";> - Struts 2 Plugin Registry. - </a> - For help with migrating, visit our - <a href="docs/migration-guide.html"> - Migration Guide. - </a> - </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> - For a full list of requirements, including dependencies used by optional plugins, - see <a href="struts2-core/dependencies.html">Project Dependencies</a> - </p> - - </section> - - <section name="Licensing of Apache Struts Distributions"> - <p>Apache Struts is distributed under the <a href="license.html">Apache License, Version 2.0</a></p> - </section> - </body> -</document> http://git-wip-us.apache.org/repos/asf/struts/blob/5f2898ea/src/site/xdoc/jxr.xml ---------------------------------------------------------------------- diff --git a/src/site/xdoc/jxr.xml b/src/site/xdoc/jxr.xml deleted file mode 100755 index f7f1024..0000000 --- a/src/site/xdoc/jxr.xml +++ /dev/null @@ -1,46 +0,0 @@ -<?xml version="1.0"?> -<!-- -/* - * $Id$ - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ ---> -<!-- -// ======================================================================== 78 ---> -<document> - - <properties> - <title>Source Xref report</title> - </properties> - - <body> - - <section name="Struts 2 - Source Xref"> - - <ul> - <li> - <a href="struts-core/jxr.html" target="_blank"> - Struts Core</a></li> - </ul> - - </section> - - </body> -</document> http://git-wip-us.apache.org/repos/asf/struts/blob/5f2898ea/xwork-core/src/site/site.xml ---------------------------------------------------------------------- diff --git a/xwork-core/src/site/site.xml b/xwork-core/src/site/site.xml new file mode 100644 index 0000000..07a667e --- /dev/null +++ b/xwork-core/src/site/site.xml @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<!-- +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +--> +<project name="Struts 2"> + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>1.3.1</version> + </skin> + <bannerLeft> + <name>Apache Software Foundation</name> + <src>http://www.apache.org/images/asf-logo.gif</src> + <href>http://www.apache.org/</href> + </bannerLeft> + <bannerRight> + <name>Apache Struts</name> + <src>http://struts.apache.org/img/struts-logo.svg</src> + <href>http://struts.apache.org/</href> + </bannerRight> + <publishDate position="none"/> + <version position="none"/> + <body> + <links> + <item name="Apache" href="http://www.apache.org/"/> + <item name="Struts" href="http://struts.apache.org/"/> + </links> + + <menu ref="parent"/> + <menu ref="reports"/> + + <footer> + <div class="row span12"> + Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts + project logos are trademarks of The Apache Software Foundation. + </div> + </footer> + + </body> +</project>
