You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by ws...@apache.org on 2006/07/10 03:26:44 UTC
svn commit: r420392 - in /struts/sandbox/trunk/tiles: ./ src/site/
src/site/xdoc/ tiles-core/src/main/java/org/apache/tiles/servlets/
tiles-core/src/site/ tiles-test/src/main/webapp/
tiles-test/src/main/webapp/WEB-INF/
Author: wsmoak
Date: Sun Jul 9 18:26:43 2006
New Revision: 420392
URL: http://svn.apache.org/viewvc?rev=420392&view=rev
Log:
Renaming Standalone Tiles as Tiles 2.
Advance the version number to 2.0-SNAPSHOT.
Remove the struts-build extension jar and use a URL for the Checkstyle config file.
SB-32
Modified:
struts/sandbox/trunk/tiles/pom.xml
struts/sandbox/trunk/tiles/src/site/site.xml
struts/sandbox/trunk/tiles/src/site/xdoc/index.xml
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/servlets/TilesServlet.java
struts/sandbox/trunk/tiles/tiles-core/src/site/site.xml
struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/WEB-INF/web.xml
struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/index.jsp
Modified: struts/sandbox/trunk/tiles/pom.xml
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/pom.xml?rev=420392&r1=420391&r2=420392&view=diff
==============================================================================
--- struts/sandbox/trunk/tiles/pom.xml (original)
+++ struts/sandbox/trunk/tiles/pom.xml Sun Jul 9 18:26:43 2006
@@ -25,18 +25,18 @@
<parent>
<groupId>org.apache.struts</groupId>
- <artifactId>struts-parent</artifactId>
- <version>2</version>
+ <artifactId>struts-master</artifactId>
+ <version>3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.struts.tiles</groupId>
<artifactId>tiles-parent</artifactId>
- <version>0.3-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>Standalone Tiles</name>
+ <name>Tiles 2</name>
<url>http://struts.apache.org</url>
- <description>Standalone Tiles</description>
+ <description>Tiles 2</description>
<inceptionYear>2000</inceptionYear>
@@ -97,14 +97,6 @@
</plugins>
</pluginManagement>
- <extensions>
- <extension>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts-build</artifactId>
- <version>1.0.1</version>
- </extension>
- </extensions>
-
<defaultGoal>install</defaultGoal>
</build>
@@ -134,7 +126,7 @@
<plugin>
<artifactId>maven-checkstyle-plugin</artifactId>
<configuration>
- <configLocation>org/apache/struts/build/struts_checks.xml</configLocation>
+ <configLocation>http://svn.apache.org/repos/asf/struts/maven/trunk/build/struts_checks.xml</configLocation>
</configuration>
</plugin>
<plugin>
Modified: struts/sandbox/trunk/tiles/src/site/site.xml
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/src/site/site.xml?rev=420392&r1=420391&r2=420392&view=diff
==============================================================================
--- struts/sandbox/trunk/tiles/src/site/site.xml (original)
+++ struts/sandbox/trunk/tiles/src/site/site.xml Sun Jul 9 18:26:43 2006
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<project name="Apache Struts - Standalone Tiles">
+<project name="Apache Struts - Tiles 2">
<bannerLeft>
<name>Apache Software Foundation</name>
<src>http://www.apache.org/images/asf-logo.gif</src>
@@ -14,9 +14,9 @@
<links>
<item name="Apache" href="http://www.apache.org" />
- <item name="Action" 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" />
+ <item name="Tiles 2" href="http://struts.apache.org/struts-sandbox/tiles" />
</links>
<menu name="Documentation">
@@ -38,6 +38,9 @@
<item
name="Struts Sandbox"
href="http://struts.apache.org/struts-sandbox"/>
+ <item
+ name="Tiles 2"
+ href="http://struts.apache.org/struts-sandbox/tiles"/>
</menu>
${modules}
Modified: struts/sandbox/trunk/tiles/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/src/site/xdoc/index.xml?rev=420392&r1=420391&r2=420392&view=diff
==============================================================================
--- struts/sandbox/trunk/tiles/src/site/xdoc/index.xml (original)
+++ struts/sandbox/trunk/tiles/src/site/xdoc/index.xml Sun Jul 9 18:26:43 2006
@@ -2,31 +2,31 @@
<document>
<properties>
- <title>Apache Struts - Standalone Tiles</title>
+ <title>Apache Struts - Tiles 2</title>
</properties>
<body>
- <section name="Standalone Tiles">
+ <section name="Tiles 2">
<a name="background"/>
<subsection name="Background">
- <p>Standalone Tiles is an effort to extract the Tiles library
- from Struts Action. It is currently housed in the Sandbox area
+ <p><strong>Tiles 2</strong> is an effort to extract the Tiles library
+ from Struts. It is currently housed in the Sandbox area
of the Apache Struts Subversion repository.</p>
<p>Much of the <a
href="http://struts.apache.org/struts-action/struts-tiles">
Struts Tiles</a> documentation will also be useful in
- understanding how to use Standalone Tiles.</p>
+ understanding how to use Tiles 2.</p>
</subsection>
<a name="downloads"/>
<subsection name="Downloads">
- <p>As a sandbox project, Standalone Tiles has no formal
+ <p>As a sandbox project, Tiles 2 has no formal
releases. However, snapshots are occasionally published to
Apache's Maven 2 snapshot repository, which can be accessed with
the following configuration:</p>
@@ -37,20 +37,20 @@
<name>Apache Maven Snapshot Repository</name>
<url>http://people.apache.org/maven-snapshot-repository</url>
</repository>
- ]]>
- </source>
+ ]]>
+ </source>
<p>After configuring the repository, declare a dependency on
- Standalone Tiles:</p>
+ Tiles 2:</p>
<source><![CDATA[
<dependency>
<groupId>org.apache.struts.tiles</groupId>
<artifactId>tiles-core</artifactId>
- <version>0.3-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
- ]]>
- </source>
+ ]]>
+ </source>
<p>If you are not using Maven 2, you can find a recent development
snapshot of tiles-core.jar <a
@@ -75,7 +75,7 @@
<section name="Mailing Lists">
<a name="mail"/>
- <p>Standalone Tiles is being developed by the Apache Struts
+ <p>Tiles 2 is being developed by the Apache Struts
community, and shares the <i>dev at struts.apache.org</i> mailing
list. Subscription information can be found <a
href="http://struts.apache.org/mail.html">here</a>.</p>
@@ -90,8 +90,8 @@
<p>Please report any bugs or enhancement requests in the <a
href="issue-tracking.html">Apache Struts Issue Tracking System</a>,
- using project <code>Sandbox</code> and component <code>Standalone
- Tiles</code>.</p>
+ using project <code>Sandbox</code> and component
+ <code>Tiles</code>.</p>
</section>
Modified: struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/servlets/TilesServlet.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/servlets/TilesServlet.java?rev=420392&r1=420391&r2=420392&view=diff
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/servlets/TilesServlet.java (original)
+++ struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/servlets/TilesServlet.java Sun Jul 9 18:26:43 2006
@@ -91,7 +91,7 @@
* <p/>
* When Tiles was bundled with Struts it reliably produced the same error message if anything
* was amiss in your Tiles configuration file: <i>Can't find definitions config file.</i>
- * Standalone Tiles, OTOH, will display explicit error messages, such as <i>Error while parsing file
+ * Tiles 2, OTOH, will display explicit error messages, such as <i>Error while parsing file
* '/WEB-INF/tiles.xml'. The element type "tiles-definitions" must be terminated by the matching
* end-tag tiles-definitions".</i> The following explains how it works.
* <p/>
@@ -103,7 +103,7 @@
* <i>Cant find definitions config file</i> message. It was up to you to dig through
* the servlet container's log to find out what really went wrong.
*
- * The standalone Tiles servlet, OTOH, places the exception's message in application scope
+ * The Tiles 2 servlet, OTOH, places the exception's message in application scope
* and retrieves it when tiles:insert blows up. It throws an exception with the original error
* message, which is subsequently displayed in the browser, saving you the trouble of looking
* at the log file.
Modified: struts/sandbox/trunk/tiles/tiles-core/src/site/site.xml
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/site/site.xml?rev=420392&r1=420391&r2=420392&view=diff
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-core/src/site/site.xml (original)
+++ struts/sandbox/trunk/tiles/tiles-core/src/site/site.xml Sun Jul 9 18:26:43 2006
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<project name="Apache Struts - Standalone Tiles - Core">
+<project name="Apache Struts - Tiles 2 - Core">
<body>
<menu name="Documentation">
Modified: struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/WEB-INF/web.xml?rev=420392&r1=420391&r2=420392&view=diff
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/WEB-INF/web.xml (original)
+++ struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/WEB-INF/web.xml Sun Jul 9 18:26:43 2006
@@ -5,7 +5,7 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
- <display-name>Standalone Tiles Test Application</display-name>
+ <display-name>Tiles 2 Test Application</display-name>
<!-- Standard Action Servlet Configuration -->
<!--
Modified: struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/index.jsp?rev=420392&r1=420391&r2=420392&view=diff
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/index.jsp (original)
+++ struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/index.jsp Sun Jul 9 18:26:43 2006
@@ -1,7 +1,7 @@
<html>
<body>
- <h1>Standalone Tiles Test Application</h1>
+ <h1>Tiles 2 Test Application</h1>
<a href="testput.jsp">Test Put Tag</a><br/>
<a href="testdef.jsp">Test Definition Tag</a><br/>