You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tiles.apache.org by nl...@apache.org on 2012/05/28 20:28:48 UTC

svn commit: r1343354 - in /tiles/site: pom.xml src/site/apt/download.apt src/site/site.xml src/site/xdoc/contributors.xml src/site/xdoc/index.xml src/site/xdoc/volunteers.xml

Author: nlebas
Date: Mon May 28 18:28:48 2012
New Revision: 1343354

URL: http://svn.apache.org/viewvc?rev=1343354&view=rev
Log:
main site updates for the release of tiles-3.0.0, autotag-1.0.0 and request-1.0.0

Modified:
    tiles/site/pom.xml
    tiles/site/src/site/apt/download.apt
    tiles/site/src/site/site.xml
    tiles/site/src/site/xdoc/contributors.xml
    tiles/site/src/site/xdoc/index.xml
    tiles/site/src/site/xdoc/volunteers.xml

Modified: tiles/site/pom.xml
URL: http://svn.apache.org/viewvc/tiles/site/pom.xml?rev=1343354&r1=1343353&r2=1343354&view=diff
==============================================================================
--- tiles/site/pom.xml (original)
+++ tiles/site/pom.xml Mon May 28 18:28:48 2012
@@ -1,16 +1,27 @@
 <?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. * */ -->
+<!-- 
+/*
+ * $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.
+ *
+ */
+ -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -18,7 +29,7 @@
     <parent>
         <groupId>org.apache.tiles</groupId>
         <artifactId>tiles-master</artifactId>
-        <version>3</version>
+        <version>4</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -63,11 +74,11 @@
                                 <mkdir
                                     dir="${project.build.directory}/site/dtds" />
                                 <get
-                                    src="http://svn.apache.org/repos/asf/tiles/framework/trunk/tiles-core/src/main/resources/org/apache/tiles/resources/tiles-config_2_0.dtd"
+                                    src="http://svn.apache.org/repos/asf/tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/resources/org/apache/tiles/resources/tiles-config_2_0.dtd"
                                     dest="${project.build.directory}/site/dtds/tiles-config_2_0.dtd"
                                     verbose="true" ignoreerrors="true" />
                                 <get
-                                    src="http://svn.apache.org/repos/asf/tiles/framework/trunk/tiles-core/src/main/resources/org/apache/tiles/resources/tiles-config_2_1.dtd"
+                                    src="http://svn.apache.org/repos/asf/tiles/framework/branches/TILES_2_1_X/tiles-core/src/main/resources/org/apache/tiles/resources/tiles-config_2_1.dtd"
                                     dest="${project.build.directory}/site/dtds/tiles-config_2_1.dtd"
                                     verbose="true" ignoreerrors="true" />
                             </tasks>
@@ -88,12 +99,10 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-project-info-reports-plugin</artifactId>
-                <version>2.2</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.rat</groupId>
                 <artifactId>apache-rat-plugin</artifactId>
-                <version>0.6</version>
                 <configuration>
                     <excludes>
                         <exclude>forms/invitation*.txt</exclude>
@@ -102,59 +111,4 @@
             </plugin>
         </plugins>
     </reporting>
-
-    <profiles>
-        <profile>
-            <id>maven-3</id>
-            <activation>
-                <file>
-                    <exists>${basedir}</exists>
-                </file>
-            </activation>
-            <build>
-                <pluginManagement>
-                    <plugins>
-                        <plugin>
-                            <groupId>org.apache.maven.plugins</groupId>
-                            <artifactId>maven-site-plugin</artifactId>
-                            <version>3.0-beta-3</version>
-                            <configuration>
-                                <reportingPlugins>
-                                    <plugin>
-                                        <groupId>org.apache.maven.plugins</groupId>
-                                        <artifactId>maven-project-info-reports-plugin</artifactId>
-                                        <version>2.2</version>
-                                    </plugin>
-                                    <plugin>
-                                        <groupId>org.apache.rat</groupId>
-                                        <artifactId>apache-rat-plugin</artifactId>
-                                        <version>0.6</version>
-                                        <configuration>
-                                            <excludes>
-                                                <exclude>forms/invitation*.txt</exclude>
-                                            </excludes>
-                                        </configuration>
-                                    </plugin>
-                                </reportingPlugins>
-                            </configuration>
-                        </plugin>
-                    </plugins>
-                </pluginManagement>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-site-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-descriptor</id>
-                                <goals>
-                                    <goal>attach-descriptor</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-    <dependencies />
 </project>

Modified: tiles/site/src/site/apt/download.apt
URL: http://svn.apache.org/viewvc/tiles/site/src/site/apt/download.apt?rev=1343354&r1=1343353&r2=1343354&view=diff
==============================================================================
--- tiles/site/src/site/apt/download.apt (original)
+++ tiles/site/src/site/apt/download.apt Mon May 28 18:28:48 2012
@@ -23,6 +23,112 @@
 ~~ under the License.
 ~~
 
+Download Tiles 3.0.0 (BETA) or Tiles Request 1.0.0 (BETA)
+
+  Tiles is distributed in several formats for your convenience; the binary distribution includes all dependencies.
+
+  Tiles Request is included in Tiles binary distribution, but a separate distribution is available, if you're interested.
+
+  You will be prompted for a mirror - if the file is not found on yours, please be patient, as it may take 24
+  hours to reach all mirrors.
+
+  Apache Tiles 3.0.0 and Apache Tiles Request 1.0.0 are distributed under the {{{http://tiles.apache.org/license.html} Apache License, version 2.0}}.
+
+* Binary distribution (Java 6.0 and above)
+
+*-------------------------+---------+----------+-----------+
+|                         | Mirrors | Checksum | Signature |
+*-------------------------+---------+----------+-----------+
+| Tiles 3.0.0 (tar.gz)      | {{{http://www.apache.org/dyn/closer.cgi/tiles/v3.0.0/tiles-3.0.0-bin.tar.gz} tiles-3.0.0-bin.tar.gz}} | {{{http://www.apache.org/dist/tiles/v3.0.0/tiles-3.0.0-bin.tar.gz.md5} tiles-3.0.0-bin.tar.gz.md5}} | {{{http://www.apache.org/dist/tiles/v3.0.0/tiles-3.0.0-bin.tar.gz.asc} tiles-3.0.0-bin.tar.gz.asc}} |
+*-------------------------+---------+----------+-----------+
+| Tiles 3.0.0 (zip)         | {{{http://www.apache.org/dyn/closer.cgi/tiles/v3.0.0/tiles-3.0.0-bin.zip} tiles-3.0.0-bin.zip}} | {{{http://www.apache.org/dist/tiles/v3.0.0/tiles-3.0.0-bin.zip.md5} tiles-3.0.0-bin.zip.md5}} | {{{http://www.apache.org/dist/tiles/v3.0.0/tiles-3.0.0-bin.zip.asc} tiles-3.0.0-bin.zip.asc}} |
+*-------------------------+---------+----------+-----------+
+| Tiles Request 1.0.0 (tar.gz) | {{{http://www.apache.org/dyn/closer.cgi/tiles/request/v1.0.0/tiles-request-1.0.0-bin.tar.gz} tiles-request-1.0.0-bin.tar.gz}} | {{{http://www.apache.org/dist/tiles/request/v1.0.0/tiles-request-1.0.0-bin.tar.gz.md5} tiles-request-1.0.0-bin.tar.gz.md5}} | {{{http://www.apache.org/dist/tiles/request/v1.0.0/tiles-request-1.0.0-bin.tar.gz.asc} tiles-request-1.0.0-bin.tar.gz.asc}} |
+*-------------------------+---------+----------+-----------+
+| Tiles Request 1.0.0 (zip) | {{{http://www.apache.org/dyn/closer.cgi/tiles/request/v1.0.0/tiles-request-1.0.0-bin.zip} tiles-request-1.0.0-bin.zip}} | {{{http://www.apache.org/dist/tiles/request/v1.0.0/tiles-request-1.0.0-bin.zip.md5} tiles-request-1.0.0-bin.zip.md5}} | {{{http://www.apache.org/dist/tiles/request/v1.0.0/tiles-request-1.0.0-bin.zip.asc} tiles-request-1.0.0-bin.zip.asc}} |
+*-------------------------+---------+----------+-----------+
+
+* Source distribution
+
+*-------------------------+---------+----------+-----------+
+|                         | Mirrors | Checksum | Signature |
+*-------------------------+---------+----------+-----------+
+| Tiles 3.0.0 (tar.gz)    | {{{http://www.apache.org/dyn/closer.cgi/tiles/v3.0.0/tiles-3.0.0-src.tar.gz} tiles-3.0.0-src.tar.gz}} | {{{http://www.apache.org/dist/tiles/v3.0.0/tiles-3.0.0-src.tar.gz.md5} tiles-3.0.0-src.tar.gz.md5}} | {{{http://www.apache.org/dist/tiles/v3.0.0/tiles-3.0.0-src.tar.gz.asc} tiles-3.0.0-src.tar.gz.asc}} |
+*-------------------------+---------+----------+-----------+
+| Tiles 3.0.0 (zip)       | {{{http://www.apache.org/dyn/closer.cgi/tiles/v3.0.0/tiles-3.0.0-src.zip} tiles-3.0.0-src.zip}} | {{{http://www.apache.org/dist/tiles/v3.0.0/tiles-3.0.0-src.zip.md5} tiles-3.0.0-src.zip.md5}} | {{{http://www.apache.org/dist/tiles/v3.0.0/tiles-3.0.0-src.zip.asc} tiles-3.0.0-src.zip.asc}} |
+*-------------------------+---------+----------+-----------+
+| Tiles Request 1.0.0 (tar.gz) | {{{http://www.apache.org/dyn/closer.cgi/tiles/request/v1.0.0/tiles-request-1.0.0-src.tar.gz} tiles-request-1.0.0-src.tar.gz}} | {{{http://www.apache.org/dist/tiles/request/v1.0.0/tiles-request-1.0.0-src.tar.gz.md5} tiles-request-1.0.0-src.tar.gz.md5}} | {{{http://www.apache.org/dist/tiles/request/v1.0.0/tiles-request-1.0.0-src.tar.gz.asc} tiles-request-1.0.0-src.tar.gz.asc}} |
+*-------------------------+---------+----------+-----------+
+| Tiles Request 1.0.0 (zip) | {{{http://www.apache.org/dyn/closer.cgi/tiles/request/v1.0.0/tiles-request-1.0.0-src.zip} tiles-request-1.0.0-src.zip}} | {{{http://www.apache.org/dist/tiles/request/v1.0.0/tiles-request-1.0.0-src.zip.md5} tiles-request-1.0.0-src.zip.md5}} | {{{http://www.apache.org/dist/tiles/request/v1.0.0/tiles-request-1.0.0-src.zip.asc} tiles-request-1.0.0-src.zip.asc}} |
+*-------------------------+---------+----------+-----------+
+
+* Documentation
+
+*-------------------------+---------+----------+-----------+
+|                         | Mirrors | Checksum | Signature |
+*-------------------------+---------+----------+-----------+
+| Tiles 3.0.0 (tar.gz)    | {{{http://www.apache.org/dyn/closer.cgi/tiles/v3.0.0/tiles-3.0.0-docs.tar.gz} tiles-3.0.0-docs.tar.gz}} | {{{http://www.apache.org/dist/tiles/v3.0.0/tiles-3.0.0-docs.tar.gz.md5} tiles-3.0.0-docs.tar.gz.md5}} | {{{http://www.apache.org/dist/tiles/v3.0.0/tiles-3.0.0-docs.tar.gz.asc} tiles-3.0.0-docs.tar.gz.asc}} |
+*-------------------------+---------+----------+-----------+
+| Tiles 3.0.0 (zip)       | {{{http://www.apache.org/dyn/closer.cgi/tiles/v3.0.0/tiles-3.0.0-docs.zip} tiles-3.0.0-docs.zip}} | {{{http://www.apache.org/dist/tiles/v3.0.0/tiles-3.0.0-docs.zip.md5} tiles-3.0.0-docs.zip.md5}} | {{{http://www.apache.org/dist/tiles/v3.0.0/tiles-3.0.0-docs.zip.asc} tiles-3.0.0-docs.zip.asc}} |
+*-------------------------+---------+----------+-----------+
+| Tiles Request 1.0.0 (tar.gz) | {{{http://www.apache.org/dyn/closer.cgi/tiles/request/v1.0.0/tiles-request-1.0.0-docs.tar.gz} tiles-request-1.0.0-docs.tar.gz}} | {{{http://www.apache.org/dist/tiles/request/v1.0.0/tiles-request-1.0.0-docs.tar.gz.md5} tiles-request-1.0.0-docs.tar.gz.md5}} | {{{http://www.apache.org/dist/tiles/request/v1.0.0/tiles-request-1.0.0-docs.tar.gz.asc} tiles-request-1.0.0-docs.tar.gz.asc}} |
+*-------------------------+---------+----------+-----------+
+| Tiles Request 1.0.0 (zip) | {{{http://www.apache.org/dyn/closer.cgi/tiles/request/v1.0.0/tiles-request-1.0.0-docs.zip} tiles-request-1.0.0-docs.zip}} | {{{http://www.apache.org/dist/tiles/request/v1.0.0/tiles-request-1.0.0-docs.zip.md5} tiles-request-1.0.0-docs.zip.md5}} | {{{http://www.apache.org/dist/tiles/request/v1.0.0/tiles-request-1.0.0-docs.zip.asc} tiles-request-1.0.0-docs.zip.asc}} |
+*-------------------------+---------+----------+-----------+
+
+* Sample web application
+
+*-------------------------+---------+----------+-----------+
+|                         | Mirrors | Checksum | Signature |
+*-------------------------+---------+----------+-----------+
+| Tiles 3.0.0 (WAR   )    | {{{http://www.apache.org/dyn/closer.cgi/tiles/v3.0.0/tiles-test.war} tiles-test.war}} | {{{http://www.apache.org/dist/tiles/v3.0.0/tiles-test.war.md5} tiles-test.war.md5}} | {{{http://www.apache.org/dist/tiles/v3.0.0/tiles-test.war.asc} tiles-test.war.asc}} |
+*-------------------------+---------+----------+-----------+
+
+* {Tiles 3 as a Maven dependency}
+
+  Tiles has also been published to the public Maven repository.
+
+  The complete Tiles dependency with all supported technologies is achievable with
+  the following dependency declaration:
+
+----------------------------------------
+  <dependency>
+    <groupId>org.apache.tiles</groupId>
+    <artifactId>tiles-extras</artifactId>
+    <version>3.0.0</version>
+  </dependency>
+----------------------------------------
+
+  The basic Tiles dependency with only servlet support can be added this way:
+
+----------------------------------------
+  <dependency>
+    <groupId>org.apache.tiles</groupId>
+    <artifactId>tiles-servlet</artifactId>
+    <version>3.0.0</version>
+  </dependency>
+----------------------------------------
+
+  If you need a dependency to Tiles JSP support, Declare the dependency this way:
+
+----------------------------------------
+  <dependency>
+    <groupId>org.apache.tiles</groupId>
+    <artifactId>tiles-jsp</artifactId>
+    <version>3.0.0</version>
+  </dependency>
+----------------------------------------
+
+* System {Requirements}
+
+*----------------------+------------------------------------------------+
+| <<JDK>>              | 6.0 or above.                                  |
+*----------------------+------------------------------------------------+
+| <<Servlet>>          | 2.5 or above. It might work with Servlet 2.4   |
+*----------------------+------------------------------------------------+
+| <<JSP>>              | 2.1 or Above. It might work with JSP 2.0.      |
+*----------------------+------------------------------------------------+
+
 Download Tiles 2.2.2 (GA)
 
   Tiles is distributed in several formats for your convenience.
@@ -72,7 +178,7 @@ Download Tiles 2.2.2 (GA)
 | Tiles 2.2.2 (WAR   )    | {{{http://www.apache.org/dyn/closer.cgi/tiles/v2.2.2/tiles-test.war} tiles-test.war}} | {{{http://www.apache.org/dist/tiles/v2.2.2/tiles-test.war.md5} tiles-test.war.md5}} | {{{http://www.apache.org/dist/tiles/v2.2.2/tiles-test.war.asc} tiles-test.war.asc}} |
 *-------------------------+---------+----------+-----------+
 
-* Usage in Maven 2
+* {Tiles 2 as a Maven dependency}
 
   Tiles has also been published to the public Maven repository.
 

Modified: tiles/site/src/site/site.xml
URL: http://svn.apache.org/viewvc/tiles/site/src/site/site.xml?rev=1343354&r1=1343353&r2=1343354&view=diff
==============================================================================
--- tiles/site/src/site/site.xml (original)
+++ tiles/site/src/site/site.xml Mon May 28 18:28:48 2012
@@ -120,8 +120,8 @@
                     href="http://velocity.apache.org"/>
         </menu>
 
-        <menu ref="modules"/>
-        <menu ref="reports"/>
+        ${modules}
+        ${reports}
 
     </body>
 </project>

Modified: tiles/site/src/site/xdoc/contributors.xml
URL: http://svn.apache.org/viewvc/tiles/site/src/site/xdoc/contributors.xml?rev=1343354&r1=1343353&r2=1343354&view=diff
==============================================================================
--- tiles/site/src/site/xdoc/contributors.xml (original)
+++ tiles/site/src/site/xdoc/contributors.xml Mon May 28 18:28:48 2012
@@ -42,6 +42,8 @@ limitations under the License.
 		      <li><strong>Mike Calmus</strong>:
 		      <a href="https://issues.apache.org/jira/browse/TILES-237">TILES-222</a>,
 		      <a href="https://issues.apache.org/jira/browse/TILES-237">TILES-237</a></li>
+		      <li><strong>Morten Lied Johansen</strong>:
+		      <a href="https://issues.apache.org/jira/browse/TREQ-11">TREQ-11</a></li>
 		      <li><strong>Neil Aggarwal</strong>:
 		      <a href="https://issues.apache.org/jira/browse/TILES-207">TILES-207</a></li>
 		      <li><strong>Niall Pemberton</strong>:

Modified: tiles/site/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/tiles/site/src/site/xdoc/index.xml?rev=1343354&r1=1343353&r2=1343354&view=diff
==============================================================================
--- tiles/site/src/site/xdoc/index.xml (original)
+++ tiles/site/src/site/xdoc/index.xml Mon May 28 18:28:48 2012
@@ -41,14 +41,40 @@
               <a href="download.html">Download</a>
             </li>
             <li>
-              <a href="download.html#maven-repo">Maven Repository</a>
+              <a href="download.html#Tiles_2_as_a_Maven_dependency">Maven Repository</a>
+            </li>
+            <li>
+              <a href="/framework/2.2/index.html">Documentation</a>
+            </li>
+            <li>
+              <a
+                href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311046&amp;version=12314702">Release Notes</a>
+            </li>
+          </ul>
+        </div>
+        <span style="display: block; text-align: right; font-size: smaller">Released: 28 May, 2012</span>
+        <p>
+          <a href="download.html">
+            <img style="vertical-align: top;" src="images/folder-open.gif"
+              border="0" alt="" title="download"></img>
+            Tiles 3.0.0 (BETA)
+          </a>
+          <small>(7.0MB)</small>
+        </p>
+        <div style="font-size: smaller">
+          <ul>
+            <li>
+              <a href="download.html">Download</a>
+            </li>
+            <li>
+              <a href="download.html#Tiles_3_as_a_Maven_dependency">Maven Repository</a>
             </li>
             <li>
               <a href="/framework/index.html">Documentation</a>
             </li>
             <li>
               <a
-                href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=10160&amp;styleName=Html&amp;version=21941">Release Notes</a>
+                href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311046&amp;version=12314704">Release Notes</a>
             </li>
           </ul>
         </div>

Modified: tiles/site/src/site/xdoc/volunteers.xml
URL: http://svn.apache.org/viewvc/tiles/site/src/site/xdoc/volunteers.xml?rev=1343354&r1=1343353&r2=1343354&view=diff
==============================================================================
--- tiles/site/src/site/xdoc/volunteers.xml (original)
+++ tiles/site/src/site/xdoc/volunteers.xml Mon May 28 18:28:48 2012
@@ -68,12 +68,19 @@ limitations under the License.
                         <strong>Martin Cooper</strong>
                         (martinc at apache.org)
                     </li>
-
+                    <li>
+                        <strong>Michael Semb Weber</strong>
+                        (mck at apache.org)
+                    </li>
                     <li>
                         <strong>Nathan Bubna</strong>
                         (nbubna at apache.org)
                     </li>
                     <li>
+                        <strong>Nicolas Le Bas</strong>
+                        (nlebas at apache.org)
+                    </li>
+                    <li>
                         <strong>Wendy Smoak</strong>
                         (wsmoak at apache.org)
                     </li>