You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by hu...@apache.org on 2005/11/15 00:01:28 UTC
svn commit: r344259 - in /struts: apps/trunk/
apps/trunk/blank/src/webapp/WEB-INF/src/
apps/trunk/cookbook/src/webapp/jsp/bean/
apps/trunk/cookbook/src/webapp/jsp/dyna/
apps/trunk/cookbook/src/webapp/jsp/localization/
apps/trunk/cookbook/src/webapp/jsp...
Author: husted
Date: Mon Nov 14 15:01:19 2005
New Revision: 344259
URL: http://svn.apache.org/viewcvs?rev=344259&view=rev
Log:
Apps - Minor changes to accomodate new layout.
Site - Update reference to Extras.
Added:
struts/apps/trunk/examples/src/webapp/exercise/struts-power.gif (with props)
Modified:
struts/apps/trunk/blank/src/webapp/WEB-INF/src/build.xml
struts/apps/trunk/cookbook/src/webapp/jsp/bean/source.jsp
struts/apps/trunk/cookbook/src/webapp/jsp/dyna/source.jsp
struts/apps/trunk/cookbook/src/webapp/jsp/localization/source.jsp
struts/apps/trunk/cookbook/src/webapp/jsp/logic/source.jsp
struts/apps/trunk/cookbook/src/webapp/jsp/messages/source.jsp
struts/apps/trunk/examples/src/webapp/welcome.jsp
struts/apps/trunk/project.xml
struts/build/trunk/maven.xml
struts/extras/trunk/project.xml
struts/site/trunk/xdocs/navigation.xml
Modified: struts/apps/trunk/blank/src/webapp/WEB-INF/src/build.xml
URL: http://svn.apache.org/viewcvs/struts/apps/trunk/blank/src/webapp/WEB-INF/src/build.xml?rev=344259&r1=344258&r2=344259&view=diff
==============================================================================
--- struts/apps/trunk/blank/src/webapp/WEB-INF/src/build.xml (original)
+++ struts/apps/trunk/blank/src/webapp/WEB-INF/src/build.xml Mon Nov 14 15:01:19 2005
@@ -7,7 +7,7 @@
<!-- Project settings -->
- <property name="project.title" value="Jakarta Struts Blank "/>
+ <property name="project.title" value="Apache Struts Blank "/>
<property name="project.distname" value="blank"/>
<property name="project.version" value="1.3"/>
@@ -78,7 +78,7 @@
version="true"
windowtitle="${project.title} API Documentation"
doctitle="<h1>${project.title} Documentation (Version ${project.version})</h1>"
- bottom="Copyright © 2002">
+ bottom="Copyright © 2002-2005">
<classpath refid="compile.classpath"/>
</javadoc>
</target>
Modified: struts/apps/trunk/cookbook/src/webapp/jsp/bean/source.jsp
URL: http://svn.apache.org/viewcvs/struts/apps/trunk/cookbook/src/webapp/jsp/bean/source.jsp?rev=344259&r1=344258&r2=344259&view=diff
==============================================================================
--- struts/apps/trunk/cookbook/src/webapp/jsp/bean/source.jsp (original)
+++ struts/apps/trunk/cookbook/src/webapp/jsp/bean/source.jsp Mon Nov 14 15:01:19 2005
@@ -11,7 +11,7 @@
<link rel="stylesheet" type="text/css" href="../../css/example.css" />
</head>
<body>
-<html:link action="/processBean">
+<html:link action="/prepareBean">
<img src="../../images/execute.gif" width="24" height="24" alt="Execute example" class="icon" />
</html:link>
<a href="../../index.jsp"><img src="../../images/return.gif" height="24" width="24" alt="Return to examples page" class="icon" /></a>
Modified: struts/apps/trunk/cookbook/src/webapp/jsp/dyna/source.jsp
URL: http://svn.apache.org/viewcvs/struts/apps/trunk/cookbook/src/webapp/jsp/dyna/source.jsp?rev=344259&r1=344258&r2=344259&view=diff
==============================================================================
--- struts/apps/trunk/cookbook/src/webapp/jsp/dyna/source.jsp (original)
+++ struts/apps/trunk/cookbook/src/webapp/jsp/dyna/source.jsp Mon Nov 14 15:01:19 2005
@@ -11,7 +11,7 @@
<link rel="stylesheet" type="text/css" href="../../css/example.css" />
</head>
<body>
-<html:link action="/processdyna">
+<html:link action="/processDyna">
<img src="../../images/execute.gif" width="24" height="24" alt="Execute example" class="icon" />
</html:link>
<a href="../../index.jsp"><img src="../../images/return.gif" height="24" width="24" alt="Return to examples page" class="icon" /></a>
Modified: struts/apps/trunk/cookbook/src/webapp/jsp/localization/source.jsp
URL: http://svn.apache.org/viewcvs/struts/apps/trunk/cookbook/src/webapp/jsp/localization/source.jsp?rev=344259&r1=344258&r2=344259&view=diff
==============================================================================
--- struts/apps/trunk/cookbook/src/webapp/jsp/localization/source.jsp (original)
+++ struts/apps/trunk/cookbook/src/webapp/jsp/localization/source.jsp Mon Nov 14 15:01:19 2005
@@ -30,15 +30,15 @@
<h2>Configuration files</h2>
<p><html:link page="/source.jsp?src=/WEB-INF/struts-config.xml">struts-config.xml</html:link></p>
-<p><html:link page="/source.jsp?src=/WEB-INF/src/resources/ApplicationResources.properties">ApplicationResources.properties</html:link></p>
-<p><html:link page="/source.jsp?src=/WEB-INF/src/resources/ApplicationResources_en_CA.properties">ApplicationResources_en_CA.properties</html:link></p>
-<p><html:link page="/source.jsp?src=/WEB-INF/src/resources/ApplicationResources_en_US.properties">ApplicationResources_en_US.properties</html:link></p>
-<p><html:link page="/source.jsp?src=/WEB-INF/src/resources/ApplicationResources_en_GB.properties">ApplicationResources_en_GB.properties</html:link></p>
-<p><html:link page="/source.jsp?src=/WEB-INF/src/resources/ApplicationResources_fr.properties">ApplicationResources_fr.properties</html:link></p>
-<p><html:link page="/source.jsp?src=/WEB-INF/src/resources/ApplicationResources_de.properties">ApplicationResources_de.properties</html:link></p>
-<p><html:link page="/source.jsp?src=/WEB-INF/src/resources/ApplicationResources_es.properties">ApplicationResources_es.properties</html:link></p>
-<p><html:link page="/source.jsp?src=/WEB-INF/src/resources/ApplicationResources_it.properties">ApplicationResources_it.properties</html:link></p>
-<p><html:link page="/source.jsp?src=/WEB-INF/src/resources/ApplicationResources_pt.properties">ApplicationResources_pt.properties</html:link></p>
+<p><html:link page="/source.jsp?src=/WEB-INF/src/java/examples/ApplicationResources.properties">ApplicationResources.properties</html:link></p>
+<p><html:link page="/source.jsp?src=/WEB-INF/src/java/examples/ApplicationResources_en_CA.properties">ApplicationResources_en_CA.properties</html:link></p>
+<p><html:link page="/source.jsp?src=/WEB-INF/src/java/examples/ApplicationResources_en_US.properties">ApplicationResources_en_US.properties</html:link></p>
+<p><html:link page="/source.jsp?src=/WEB-INF/src/java/examples/ApplicationResources_en_GB.properties">ApplicationResources_en_GB.properties</html:link></p>
+<p><html:link page="/source.jsp?src=/WEB-INF/src/java/examples/ApplicationResources_fr.properties">ApplicationResources_fr.properties</html:link></p>
+<p><html:link page="/source.jsp?src=/WEB-INF/src/java/examples/ApplicationResources_de.properties">ApplicationResources_de.properties</html:link></p>
+<p><html:link page="/source.jsp?src=/WEB-INF/src/java/examples/ApplicationResources_es.properties">ApplicationResources_es.properties</html:link></p>
+<p><html:link page="/source.jsp?src=/WEB-INF/src/java/examples/ApplicationResources_it.properties">ApplicationResources_it.properties</html:link></p>
+<p><html:link page="/source.jsp?src=/WEB-INF/src/java/examples/ApplicationResources_pt.properties">ApplicationResources_pt.properties</html:link></p>
<h2>Other source files</h2>
<p>None</p>
Modified: struts/apps/trunk/cookbook/src/webapp/jsp/logic/source.jsp
URL: http://svn.apache.org/viewcvs/struts/apps/trunk/cookbook/src/webapp/jsp/logic/source.jsp?rev=344259&r1=344258&r2=344259&view=diff
==============================================================================
--- struts/apps/trunk/cookbook/src/webapp/jsp/logic/source.jsp (original)
+++ struts/apps/trunk/cookbook/src/webapp/jsp/logic/source.jsp Mon Nov 14 15:01:19 2005
@@ -11,7 +11,7 @@
<link rel="stylesheet" type="text/css" href="../../css/example.css" />
</head>
<body>
-<html:link action="/processSimple">
+<html:link action="/prepareLogic">
<img src="../../images/execute.gif" width="24" height="24" alt="Execute example" class="icon" />
</html:link>
<a href="../../index.jsp"><img src="../../images/return.gif" height="24" width="24" alt="Return to examples page" class="icon" /></a>
Modified: struts/apps/trunk/cookbook/src/webapp/jsp/messages/source.jsp
URL: http://svn.apache.org/viewcvs/struts/apps/trunk/cookbook/src/webapp/jsp/messages/source.jsp?rev=344259&r1=344258&r2=344259&view=diff
==============================================================================
--- struts/apps/trunk/cookbook/src/webapp/jsp/messages/source.jsp (original)
+++ struts/apps/trunk/cookbook/src/webapp/jsp/messages/source.jsp Mon Nov 14 15:01:19 2005
@@ -29,7 +29,8 @@
<h2>Configuration files</h2>
<p><html:link page="/source.jsp?src=/WEB-INF/struts-config.xml">struts-config.xml</html:link></p>
-<p><html:link page="/source.jsp?src=/WEB-INF/src/resources/ApplicationResources.properties">ApplicationResources.properties</html:link></p>
+<p><html:link page="/source.jsp?src=/WEB-INF/src/java/examples/ApplicationResources.properties">ApplicationResources.properties</html:link></p>
+src\java\examples
<h2>Other source files</h2>
<p>None</p>
Added: struts/apps/trunk/examples/src/webapp/exercise/struts-power.gif
URL: http://svn.apache.org/viewcvs/struts/apps/trunk/examples/src/webapp/exercise/struts-power.gif?rev=344259&view=auto
==============================================================================
Binary file - no diff available.
Propchange: struts/apps/trunk/examples/src/webapp/exercise/struts-power.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: struts/apps/trunk/examples/src/webapp/welcome.jsp
URL: http://svn.apache.org/viewcvs/struts/apps/trunk/examples/src/webapp/welcome.jsp?rev=344259&r1=344258&r2=344259&view=diff
==============================================================================
--- struts/apps/trunk/examples/src/webapp/welcome.jsp (original)
+++ struts/apps/trunk/examples/src/webapp/welcome.jsp Mon Nov 14 15:01:19 2005
@@ -48,11 +48,9 @@
<ul>
<li>Struts Blank</li>
- <li>Struts Documentation</li>
+ <li>Struts Cookbook (more examples)</li>
<li>Struts MailReader</li>
-
- <li>Struts Tiles Documentation</li>
</ul>
<p><strong>Struts Blank</strong> is an application template. Explode this WAR under your own application's name, and you can start coding! <strong>Struts Documentation</strong> is a copy of everything you'll find on the website: User Guide, Developer's Guide, FAQs, and How-Tos. <strong>Struts Mailreader</strong> is a starter business application, much like the one most of you need to developer. <strong>Struts Tiles Documentation</strong> explores the more advanced features of Tiles.</p>
Modified: struts/apps/trunk/project.xml
URL: http://svn.apache.org/viewcvs/struts/apps/trunk/project.xml?rev=344259&r1=344258&r2=344259&view=diff
==============================================================================
--- struts/apps/trunk/project.xml (original)
+++ struts/apps/trunk/project.xml Mon Nov 14 15:01:19 2005
@@ -73,6 +73,17 @@
<dependency>
<groupId>struts</groupId>
+ <artifactId>struts-extras</artifactId>
+ <version>1.3.0-dev</version>
+ <url>http://struts.apache.org/download.cgi</url>
+ <properties>
+ <war.bundle>true</war.bundle>
+ <cactus.bundle>true</cactus.bundle>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>struts</groupId>
<artifactId>struts-taglib</artifactId>
<version>1.3.0-dev</version>
<url>http://struts.apache.org/download.cgi</url>
Modified: struts/build/trunk/maven.xml
URL: http://svn.apache.org/viewcvs/struts/build/trunk/maven.xml?rev=344259&r1=344258&r2=344259&view=diff
==============================================================================
--- struts/build/trunk/maven.xml (original)
+++ struts/build/trunk/maven.xml Mon Nov 14 15:01:19 2005
@@ -17,9 +17,9 @@
<ant:mkdir dir="nightly/struts-bsf/"/>
<ant:mkdir dir="nightly/struts-core/"/>
<ant:mkdir dir="nightly/struts-el/"/>
+ <ant:mkdir dir="nightly/struts-extras/"/>
<ant:mkdir dir="nightly/struts-faces/"/>
<ant:mkdir dir="nightly/struts-flow/"/>
- <ant:mkdir dir="nightly/struts-plugins/"/>
<ant:mkdir dir="nightly/struts-sandbox/"/>
<ant:mkdir dir="nightly/struts-site/"/>
<ant:mkdir dir="nightly/struts-taglib/"/>
Modified: struts/extras/trunk/project.xml
URL: http://svn.apache.org/viewcvs/struts/extras/trunk/project.xml?rev=344259&r1=344258&r2=344259&view=diff
==============================================================================
--- struts/extras/trunk/project.xml (original)
+++ struts/extras/trunk/project.xml Mon Nov 14 15:01:19 2005
@@ -20,11 +20,11 @@
<extend>build/project.xml</extend>
- <id>struts-plugins</id>
+ <id>struts-extras</id>
- <name>Struts Plugins</name>
+ <name>Struts Extras</name>
- <package>org.apache.struts.plugins</package>
+ <package>org.apache.struts</package>
<!-- ################################################################ -->
<!-- Project management section -->
@@ -32,17 +32,17 @@
<shortDescription>
- Optional but often useful plugins to Struts Core.
+ Optional but often useful extension classes to Struts Core.
</shortDescription>
<description>
The purpose of this subproject is to provide a separate and common location to
-provide optional but often useful plugins to Struts Core.
+provide optional but often useful extension classes to Struts Core.
</description>
<repository>
- <connection>scm|svn|http|//svn.apache.org/repos/asf/struts/plugins/trunk</connection>
- <developerConnection>scm|svn|https|//svn.apache.org/repos/asf/struts/plugins/trunk</developerConnection>
- <url>http://svn.apache.org/repos/asf/struts/plugins/trunk</url>
+ <connection>scm|svn|http|//svn.apache.org/repos/asf/struts/extras/trunk</connection>
+ <developerConnection>scm|svn|https|//svn.apache.org/repos/asf/struts/extras/trunk</developerConnection>
+ <url>http://svn.apache.org/repos/asf/struts/extras/trunk</url>
</repository>
<versions />
Modified: struts/site/trunk/xdocs/navigation.xml
URL: http://svn.apache.org/viewcvs/struts/site/trunk/xdocs/navigation.xml?rev=344259&r1=344258&r2=344259&view=diff
==============================================================================
--- struts/site/trunk/xdocs/navigation.xml (original)
+++ struts/site/trunk/xdocs/navigation.xml Mon Nov 14 15:01:19 2005
@@ -63,7 +63,7 @@
<menu name="Core Extensions">
<item name="BSF Scripting" href="/struts-bsf/index.html"/>
<item name="EL" href="/struts-el/index.html"/>
- <item name="Extras" href="/struts-plugins/index.html"/>
+ <item name="Extras" href="/struts-extras/index.html"/>
<item name="Flow" href="/struts-flow/index.html"/>
<item name="JSF Integration" href="/struts-faces/index.html"/>
<item name="JSP Taglib" href="/struts-taglib/index.html"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org