vmassol 01/12/28 05:34:58
Modified: contrib/scaffold build.properties.sample build.xml
contrib/scaffold/conf/sample web.xml
contrib/scaffold/src/framework/main/org/apache/scaffold/http
ContinueAction.java HelperAction.java
MasterDetailHelper.java ModelHelper.java
RelayAction.java TaskForm.java
contrib/scaffold/src/framework/main/org/apache/scaffold/lang
ChainedException.java Tokens.java
contrib/scaffold/src/framework/main/org/apache/scaffold/model
ModelAbstractException.java ModelBean.java
ModelBeanBase.java ModelException.java
ModelParameterException.java
ModelPopulateException.java
ModelResourceException.java ModelResult.java
ModelResultBase.java ModelUtils.java
contrib/scaffold/src/framework/main/org/apache/scaffold/search
LuceneUtils.java
contrib/scaffold/src/framework/main/org/apache/scaffold/sql
ResultSetUtils.java StatementUtils.java
contrib/scaffold/src/framework/main/org/apache/scaffold/util
LabelValueBean.java
contrib/scaffold/src/sample/web index.jsp
Added: contrib/scaffold build-tests-tomcat-40.xml
contrib/scaffold/conf/sample ApplicationResources.properties
struts-config.xml
contrib/scaffold/conf/sample/test cactus.properties
contrib/scaffold/conf/sample/test/tomcat40 server.xml
web.xml
contrib/scaffold/src/sample/main/org/apache/scaffold/http
TestHelperAction.java
Removed: contrib/scaffold/conf/sample Resources.properties
contrib/scaffold/conf/sample/conf struts-config.xml
Log:
added Cactus unit tests packaging as part of the sample application. That enabled me
to test the sample application and discover several issues that were preventing it
from running ... :-). There is only a single Cactus unit test for the time being, the
goal was to automate caqctus unit testing as part of the build process and automatic
packaging.
Revision Changes Path
1.2 +29 -2 jakarta-struts/contrib/scaffold/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-struts/contrib/scaffold/build.properties.sample,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.properties.sample 2001/12/23 19:32:50 1.1
+++ build.properties.sample 2001/12/28 13:34:56 1.2
@@ -6,7 +6,7 @@
# rename this file to "build.properties" in the same directory that contains the
# "build.xml" file.
#
-# $Id: build.properties.sample,v 1.1 2001/12/23 19:32:50 vmassol Exp $
+# $Id: build.properties.sample,v 1.2 2001/12/28 13:34:56 vmassol Exp $
# -----------------------------------------------------------------------------
# WARNING: The relative paths below are relative to the directory where the
@@ -22,6 +22,9 @@
# Location of the Jakarta Commons Beanutils jar
beanutils.jar=../../../jakarta-commons/beanutils/dist/commons-beanutils.jar
+# Location of the Jakarta Commons Collections jar
+collections.jar=../../../jakarta-commons/collections/dist/commons-collections.jar
+
# Location of the Jakarta Struts jar
struts.jar=../../dist/lib/struts.jar
@@ -47,8 +50,32 @@
# Location of the Struts Logic tag library. Needed to generate the sample
# application
-struts-logic.tld=../../dist/lib/struts-html.tld
+struts-logic.tld=../../dist/lib/struts-logic.tld
# Location of the Struts HTML tag library. Needed to generate the sample
# application
struts-html.tld=../../dist/lib/struts-html.tld
+
+# Location the Jakarta Cactus jar. Needed for running the unit tests and to
+# generate the sample application
+cactus.jar=../../../jakarta-cactus/target/servlet23/dist/lib/cactus.jar
+
+# Location of the Jakarta Cactus custom Ant tasks. Needed for running the unit
+# tests and to generate the sample application
+cactus.ant.jar=../../../jakarta-cactus/target/cactus-ant.jar
+
+# Location of the Junit jar. Needed by Cactus.
+junit.jar=../../../junit/junit3.7/junit.jar
+
+# Location of the Jakarta Commons HttpClient jar. Needed by Cactus.
+httpclient.jar=../../../jakarta-commons/httpclient/dist/commons-httpclient.jar
+
+# Location of the AspectJ runtime jar. Needed by Cactus.
+aspectjrt.jar=../../../aspectj/lib/aspectjrt.jar
+
+# Location of the Tomcat 4.x installation directory. Needs to be defined to
+# execute the Cactus tests on Tomcat 4.x.
+tomcat.home.40=c:/Apps/jakarta-tomcat-4.0.1
+
+# Port to use to start the servlet engines for the unit tests
+test.port=8080
1.2 +134 -5 jakarta-struts/contrib/scaffold/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/contrib/scaffold/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 2001/12/23 19:32:50 1.1
+++ build.xml 2001/12/28 13:34:56 1.2
@@ -1,5 +1,9 @@
<?xml version="1.0"?>
+<!DOCTYPE project [
+ <!ENTITY build-tests-tomcat-40 SYSTEM "file:./build-tests-tomcat-40.xml">
+]>
+
<!--
=============================================================================
Build file for Scaffold.
@@ -9,6 +13,8 @@
digester.jar [REQUIRED] Location of the Jakarta Commons Digester jar
beanutils.jar [REQUIRED] Location of the Jakarta Commons Beanutils jar
+ collections.jar [REQUIRED] Location of the Jakarta Commons Collections
+ jar
struts.jar [REQUIRED] Location of the Jakarta Struts jar
lucene.jar [REQUIRED] Location of the Jakarta Lucene jar
poolman.jar [REQUIRED] Location of the CodeStudio.com Poolman jar
@@ -23,6 +29,25 @@
struts-html.tld [OPTIONAL] Location of the Struts HTML tag library.
Needed to generate the sample application.
+ cactus.jar [OPTIONAL] Location the Jakarta Cactus jar. Needed for
+ the unit tests and to generate the sample
+ application
+ cactus.ant.jar [OPTIONAL] Location of the Jakarta Cactus custom Ant
+ tasks. Needed for the unit tests and to
+ generate the sample application
+ junit.jar [OPTIONAL] Location of the Junit jar. Needed by Cactus.
+ httpclient.jar [OPTIONAL] Location of the Jakarta Commons HttpClient
+ jar. Needed by Cactus.
+ aspectjrt.jar [OPTIONAL] Location of the AspectJ runtime jar. Needed
+ by Cactus.
+
+ tomcat.home.40 [OPTIONAL] Location of the Tomcat 4.x installation
+ directory. Needs to be defined to execute
+ the Cactus tests on Tomcat 4.x.
+
+ In addition, the junit Ant task must be present in your Ant installation
+ for running the unit tests (the junit jar must be located in ANT_HOME/lib).
+
This script should be started with the following command line :
ant <target>
@@ -32,7 +57,7 @@
@author <a href="mailto:[EMAIL PROTECTED]";>Ted Husted</a>
@author <a href="mailto:[EMAIL PROTECTED]";>Vincent Massol</a>
- @version $Id: build.xml,v 1.1 2001/12/23 19:32:50 vmassol Exp $
+ @version $Id: build.xml,v 1.2 2001/12/28 13:34:56 vmassol Exp $
=============================================================================
-->
<project name="Scaffold" default="dist" basedir=".">
@@ -59,6 +84,9 @@
<property name="optimize" value="off"/>
<property name="deprecation" value="off"/>
+ <!-- Port to use to start the servlet engines for the unit tests -->
+ <property name="test.port" value="8080"/>
+
<!--
========================================================================
Set the properties related to the source tree
@@ -69,10 +97,12 @@
<property name="src.framework.dir" value="${src.dir}/framework"/>
<property name="src.framework.main.dir" value="${src.framework.dir}/main"/>
<property name="src.sample.dir" value="${src.dir}/sample"/>
+ <property name="src.sample.main.dir" value="${src.sample.dir}/main"/>
<property name="src.sample.web.dir" value="${src.sample.dir}/web"/>
<property name="conf.dir" value="conf"/>
<property name="conf.framework.dir" value="${conf.dir}/framework"/>
<property name="conf.sample.dir" value="${conf.dir}/sample"/>
+ <property name="conf.sample.test.dir" value="${conf.dir}/sample/test"/>
<!--
========================================================================
@@ -84,14 +114,18 @@
<property name="target.classes.dir" value="${target.dir}/classes"/>
<property name="target.classes.framework.dir"
value="${target.classes.dir}/framework"/>
+ <property name="target.classes.sample.dir"
+ value="${target.classes.dir}/sample"/>
<property name="target.conf.dir" value="${target.dir}/conf"/>
<property name="target.conf.framework.dir"
value="${target.conf.dir}/framework"/>
<property name="target.conf.sample.dir"
value="${target.conf.dir}/sample"/>
<property name="target.lib.dir" value="${target.dir}/lib"/>
+ <property name="target.tld.dir" value="${target.dir}/tld"/>
<property name="target.doc.dir" value="${target.dir}/doc"/>
<property name="target.javadoc.dir" value="${target.doc.dir}/api"/>
+ <property name="target.test.dir" value="${target.dir}/test"/>
<!-- The scaffold library jar -->
<property name="target.framework.name" value="${project.name.file}"/>
@@ -124,6 +158,7 @@
<path id="compile.classpath">
<pathelement path="${digester.jar}"/>
<pathelement path="${beanutils.jar}"/>
+ <pathelement path="${collections.jar}"/>
<pathelement path="${lucene.jar}"/>
<pathelement path="${poolman.jar}"/>
<pathelement path="${struts.jar}"/>
@@ -131,6 +166,15 @@
<pathelement path="${jdbc20ext.jar}"/>
</path>
+ <!-- Test classpath -->
+ <path id="test.classpath">
+ <pathelement path="${cactus.jar}"/>
+ <pathelement path="${cactus.ant.jar}"/>
+ <pathelement path="${junit.jar}"/>
+ <pathelement path="${httpclient.jar}"/>
+ <pathelement path="${aspectjrt.jar}"/>
+ </path>
+
<!--
========================================================================
Initialize the build. Must be called by all targets
@@ -161,11 +205,22 @@
<filter token="version" value="${project.version}"/>
<filter token="project.name.text" value="${project.name.text}"/>
<filter token="project.name.file" value="${project.name.file}"/>
+ <filter token="test.port" value="${test.port}"/>
+
+ <!-- Initialize custom Ant task needed for running the server tests -->
+ <taskdef name="runservertests"
+ classname="org.apache.cactus.ant.RunServerTestsTask">
+ <classpath>
+ <pathelement location="${cactus.ant.jar}"/>
+ <pathelement path="${java.class.path}"/>
+ </classpath>
+ </taskdef>
+
</target>
<!--
========================================================================
- Compiles the sources
+ Compiles the framework sources
========================================================================
-->
<target name="compile" depends="init" description="Compile the sources">
@@ -193,6 +248,31 @@
<!--
========================================================================
+ Compiles the sample sources
+ ========================================================================
+ -->
+ <target name="compile.sample" depends="compile"
+ description="Compile the sample sources">
+
+ <mkdir dir="${target.classes.sample.dir}"/>
+
+ <javac srcdir="${src.sample.main.dir}"
+ destdir="${target.classes.sample.dir}"
+ deprecation="${deprecation}" optimize="${optimize}">
+ <classpath>
+ <pathelement location="${target.classes.framework.dir}"/>
+ </classpath>
+ <classpath refid="compile.classpath"/>
+ <classpath refid="test.classpath"/>
+ </javac>
+
+ <copy todir="${target.classes.sample.dir}"
+ file="${conf.sample.test.dir}/cactus.properties" filtering="on"/>
+
+ </target>
+
+ <!--
+ ========================================================================
Create the runtime jar file
========================================================================
-->
@@ -245,7 +325,7 @@
Generate the sample application
========================================================================
-->
- <target name="sample" depends="jar"
+ <target name="sample" depends="compile.sample,jar"
description="Generate the sample application">
<mkdir dir="${target.lib.dir}"/>
@@ -256,8 +336,15 @@
<copy todir="${target.lib.dir}" file="${struts.jar}"/>
<copy todir="${target.lib.dir}" file="${beanutils.jar}"/>
<copy todir="${target.lib.dir}" file="${digester.jar}"/>
+ <copy todir="${target.lib.dir}" file="${collections.jar}"/>
<copy todir="${target.lib.dir}" file="${lucene.jar}"/>
<copy todir="${target.lib.dir}" file="${poolman.jar}"/>
+ <copy todir="${target.tld.dir}" file="${struts-bean.tld}"/>
+ <copy todir="${target.tld.dir}" file="${struts-logic.tld}"/>
+ <copy todir="${target.tld.dir}" file="${struts-html.tld}"/>
+ <copy todir="${target.lib.dir}" file="${cactus.jar}"/>
+ <copy todir="${target.lib.dir}" file="${junit.jar}"/>
+ <copy todir="${target.lib.dir}" file="${aspectjrt.jar}"/>
<!-- Copy the manifest in order to replace the version token filter -->
<copy todir="${target.conf.sample.dir}"
@@ -267,15 +354,24 @@
manifest="${target.conf.sample.dir}/manifest"
webxml="${conf.sample.dir}/web.xml">
<lib dir="${target.lib.dir}"/>
+ <lib dir="${target.framework.dir}">
+ <include name="${target.framework.name}.jar"/>
+ </lib>
<classes dir="${conf.sample.dir}">
- <include name="Resources.properties"/>
+ <include name="ApplicationResources.properties"/>
+ </classes>
+ <classes dir="${target.classes.sample.dir}">
+ <exclude name="cactus.properties"/>
</classes>
<webinf dir=".">
<include name="LICENSE"/>
</webinf>
<webinf dir="${conf.sample.dir}">
- <include name="conf/struts-config.xml"/>
+ <include name="struts-config.xml"/>
</webinf>
+ <webinf dir="${target.tld.dir}">
+ <include name="*.tld"/>
+ </webinf>
<fileset dir="${src.sample.web.dir}"/>
</war>
@@ -317,5 +413,38 @@
</zip>
</target>
+
+ <!--
+ ========================================================================
+ Run the Cactus unit tests (automatically create a test war - the
+ sample application -, deploy it on the server to test, start the
+ server, run the Cactus unit tests in the container and stop the server
+ ========================================================================
+ -->
+ <target name="tests" depends="tests_tomcat_40"
+ description="Run the Cactus unit tests on all servlet engines">
+ </target>
+
+ <!-- Run the Cactus unit tests using JUnit -->
+ <target name="tests.client">
+
+ <junit printsummary="yes" haltonfailure="yes" haltonerror="yes"
+ fork="yes">
+ <formatter type="plain" usefile="false"/>
+
+ <test name="org.apache.scaffold.http.TestHelperAction"/>
+
+ <classpath refid="compile.classpath"/>
+ <classpath refid="test.classpath"/>
+ <classpath>
+ <pathelement location="${target.classes.framework.dir}"/>
+ <pathelement location="${target.classes.sample.dir}"/>
+ </classpath>
+
+ </junit>
+
+ </target>
+
+ &build-tests-tomcat-40;
</project>
1.1 jakarta-struts/contrib/scaffold/build-tests-tomcat-40.xml
Index: build-tests-tomcat-40.xml
===================================================================
<!--
========================================================================
Run Cactus unit tests on Tomcat 4.0
========================================================================
-->
<target name="tests_tomcat_40" depends="prepare_tests_tomcat_40"
if="tomcat.home.40">
<!-- Start the servlet engine, wait for it to be started, run the
unit tests, stop the servlet engine, wait for it to be stopped.
The servlet engine is stopped if the tests fail for any reason -->
<runservertests
testURL="http://localhost:${test.port}/${target.sample.name}/index.jsp";
startTarget="start_tomcat_40"
stopTarget="stop_tomcat_40"
testTarget="tests.client"/>
</target>
<!--
========================================================================
Start Tomcat 4.0
========================================================================
-->
<target name="start_tomcat_40">
<java classname="org.apache.catalina.startup.Bootstrap" fork="yes">
<jvmarg value="-Dcatalina.home=${tomcat.home.40}"/>
<arg value="-config"/>
<arg value="${target.tomcat40.full.dir}/conf/server.xml"/>
<arg value="start"/>
<classpath>
<!-- This is to allow the use of -Dbuild.sysclasspath=only when
starting Ant - Meaning that all jars need to be on the
initial classpath -->
<pathelement path="${java.class.path}"/>
<!-- These are ignore if -Dbuild.sysclasspath=only is used -->
<fileset dir="${tomcat.home.40}">
<include name="bin/bootstrap.jar"/>
</fileset>
</classpath>
</java>
</target>
<!--
========================================================================
Stop Tomcat 4.0
========================================================================
-->
<target name="stop_tomcat_40">
<java classname="org.apache.catalina.startup.Bootstrap" fork="yes">
<jvmarg value="-Dcatalina.home=${tomcat.home.40}"/>
<arg value="stop"/>
<classpath>
<!-- This is to allow the use of -Dbuild.sysclasspath=only when
starting Ant - Meaning that all jars need to be on the
initial classpath -->
<pathelement path="${java.class.path}"/>
<!-- These are ignored if -Dbuild.sysclasspath=only is used -->
<fileset dir="${tomcat.home.40}">
<include name="bin/bootstrap.jar"/>
<include name="server/catalina.jar"/>
</fileset>
</classpath>
</java>
</target>
<!--
========================================================================
Display a warning message if the needed servlet engine home property
is not set
========================================================================
-->
<target name="check_tests_tomcat_40" depends="init" unless="tomcat.home.40">
<echo message=""/>
<echo message="*********************************************************"/>
<echo message="WARNING : The 'tomcat.home.40' property has not been set."/>
<echo message=" No test will be run on that servlet engine."/>
<echo message="*********************************************************"/>
<echo message=""/>
</target>
<!--
========================================================================
Prepare directories and variables for running the tests
========================================================================
-->
<target name="prepare_tests_tomcat_40"
depends="check_tests_tomcat_40,sample" if="tomcat.home.40">
<echo message="tomcat.home.40 = ${tomcat.home.40}"/>
<property name="target.tomcat40.dir"
value="${target.test.dir}/tomcat40"/>
<property name="conf.tomcat40.dir"
value="${conf.sample.test.dir}/tomcat40"/>
<property name="target.tomcat40.full.dir"
value="${basedir}/${target.tomcat40.dir}"/>
<filter token="target.tomcat40.full.dir"
value="${target.tomcat40.full.dir}"/>
<!-- Create work and conf directories and copy configuration files -->
<mkdir dir="${target.tomcat40.dir}/conf"/>
<mkdir dir="${target.tomcat40.dir}/work"/>
<mkdir dir="${target.tomcat40.dir}/webapps"/>
<!-- Delete some config file so that they will be copied every time -->
<delete file="${target.tomcat40.dir}/conf/server.xml"/>
<!-- Remove the auto deployed webapp so that it is redeployed every
time -->
<delete dir="${target.tomcat40.dir}/webapps/test"/>
<!-- Copy the default tomcat web.xml to our test conf/ directory. -->
<copy file="${conf.tomcat40.dir}/web.xml"
todir="${target.tomcat40.dir}/conf"/>
<copy file="${conf.tomcat40.dir}/server.xml"
todir="${target.tomcat40.dir}/conf" filtering="on"/>
<!-- Copy the war file -->
<copy file="${target.sample.dir}/${target.sample.name}.war"
todir="${target.tomcat40.dir}/webapps"/>
</target>
1.2 +17 -7 jakarta-struts/contrib/scaffold/conf/sample/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/contrib/scaffold/conf/sample/web.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- web.xml 2001/12/23 19:32:50 1.1
+++ web.xml 2001/12/28 13:34:57 1.2
@@ -17,7 +17,7 @@
</init-param>
<init-param>
<param-name>config</param-name>
- <param-value>/WEB-INF/conf/struts-config.xml</param-value>
+ <param-value>/WEB-INF/struts-config.xml</param-value>
</init-param>
<init-param>
<param-name>debug</param-name>
@@ -34,6 +34,11 @@
<load-on-startup>2</load-on-startup>
</servlet>
+ <!-- This is only needed for Cactus integration unit tests -->
+ <servlet>
+ <servlet-name>ServletRedirector</servlet-name>
+ <servlet-class>org.apache.cactus.server.ServletTestRedirector</servlet-class>
+ </servlet>
<!-- Standard Action Servlet Mapping -->
<servlet-mapping>
@@ -41,6 +46,11 @@
<url-pattern>/do/*</url-pattern>
</servlet-mapping>
+ <!-- This is only needed for Cactus integration unit tests -->
+ <servlet-mapping>
+ <servlet-name>ServletRedirector</servlet-name>
+ <url-pattern>/ServletRedirector</url-pattern>
+ </servlet-mapping>
<!-- The Usual Welcome File List -->
<welcome-file-list>
@@ -49,18 +59,18 @@
<!-- Struts Tag Library Descriptors -->
<taglib>
- <taglib-uri>/tags/struts-bean</taglib-uri>
- <taglib-location>/WEB-INF/lib/struts-bean.tld</taglib-location>
+ <taglib-uri>/WEB-INF/struts-bean</taglib-uri>
+ <taglib-location>/WEB-INF/struts-bean.tld</taglib-location>
</taglib>
<taglib>
- <taglib-uri>/tags/struts-html</taglib-uri>
- <taglib-location>/WEB-INF/lib/struts-html.tld</taglib-location>
+ <taglib-uri>/WEB-INF/struts-html</taglib-uri>
+ <taglib-location>/WEB-INF/struts-html.tld</taglib-location>
</taglib>
<taglib>
- <taglib-uri>/tags/struts-logic</taglib-uri>
- <taglib-location>/WEB-INF/lib/struts-logic.tld</taglib-location>
+ <taglib-uri>/WEB-INF/struts-logic</taglib-uri>
+ <taglib-location>/WEB-INF/struts-logic.tld</taglib-location>
</taglib>
</web-app>
1.1
jakarta-struts/contrib/scaffold/conf/sample/ApplicationResources.properties
Index: ApplicationResources.properties
===================================================================
index.title=Scaffold Sample Application
index.heading=Hello World!
index.message=This is a sample application that does not do much but it shows
how to package a Scaffold application and also serves as an integration test
bed for Scaffold.
1.1 jakarta-struts/contrib/scaffold/conf/sample/struts-config.xml
Index: struts-config.xml
===================================================================
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!DOCTYPE struts-config PUBLIC
"-//Apache Software Foundation//DTD Struts Configuration 1.0//EN"
"http://jakarta.apache.org/struts/dtds/struts-config_1_0.dtd";>
<!--
This is a blank Struts configuration file based on the example application,
with commented examples of some items.
NOTE: If you have a generator tool to create the corresponding Java classes
for you, you could include the details in the "form-bean" declarations.
Otherwise, you would only define the "form-bean" element itself, with the
corresponding "name" and "type" attributes, as shown here.
-->
<struts-config>
<!-- ========== Data Source Configuration =============================== -->
<!--
<data-sources>
<data-source
autoCommit="false"
description="Example Data Source Configuration"
driverClass="org.postgresql.Driver"
maxCount="4"
minCount="2"
password="mypassword"
url="jdbc:postgresql://localhost/mydatabase"
user="myusername"
/>
</data-sources>
-->
<!-- ========== Form Bean Definitions =================================== -->
<form-beans>
<!-- Example logon form bean
<form-bean name="logonForm"
type="org.apache.struts.example.LogonForm"/>
-->
</form-beans>
<!-- ========== Global Forward Definitions ============================== -->
<global-forwards>
<!-- Example logon forward
<forward name="logon" path="/logon.jsp"/>
-->
</global-forwards>
<!-- ========== Action Mapping Definitions ============================== -->
<action-mappings>
<!-- Example logon action
<action path="/logon"
type="org.apache.struts.example.LogonAction"
name="logonForm"
scope="request"
input="/logon.jsp">
</action>
-->
<!-- Example logoff action
<action path="/logoff"
type="org.apache.struts.example.LogoffAction">
<forward name="success" path="/index.jsp"/>
</action>
-->
<!-- The standard administrative actions available with Struts -->
<!-- These would be either omitted or protected by security -->
<!-- in a real application deployment -->
<action path="/admin/addFormBean"
type="org.apache.struts.actions.AddFormBeanAction"/>
<action path="/admin/addForward"
type="org.apache.struts.actions.AddForwardAction"/>
<action path="/admin/addMapping"
type="org.apache.struts.actions.AddMappingAction"/>
<action path="/admin/reload"
type="org.apache.struts.actions.ReloadAction"/>
<action path="/admin/removeFormBean"
type="org.apache.struts.actions.RemoveFormBeanAction"/>
<action path="/admin/removeForward"
type="org.apache.struts.actions.RemoveForwardAction"/>
<action path="/admin/removeMapping"
type="org.apache.struts.actions.RemoveMappingAction"/>
</action-mappings>
</struts-config>
1.2 +4 -4
jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/http/ContinueAction.java
Index: ContinueAction.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/http/ContinueAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ContinueAction.java 2001/12/23 19:32:50 1.1
+++ ContinueAction.java 2001/12/28 13:34:57 1.2
@@ -21,7 +21,7 @@
* Useful for prototyping flow during development,
* and for creating blank forms for new input.
* @author Ted Husted
- * @version $Revision: 1.1 $ $Date: 2001/12/23 19:32:50 $
+ * @version $Revision: 1.2 $ $Date: 2001/12/28 13:34:57 $
*/
public final class ContinueAction extends Action {
@@ -47,9 +47,9 @@
/*
- * $Header:
/home/cvs/jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/http/ContinueAction.java,v
1.1 2001/12/23 19:32:50 vmassol Exp $
- * $Revision: 1.1 $
- * $Date: 2001/12/23 19:32:50 $
+ * $Header:
/home/cvs/jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/http/ContinueAction.java,v
1.2 2001/12/28 13:34:57 vmassol Exp $
+ * $Revision: 1.2 $
+ * $Date: 2001/12/28 13:34:57 $
*
* ====================================================================
*
@@ -77,7 +77,7 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
+ * 4. The names "The Jakarta Project", "Scaffold", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
1.2 +4 -4
jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/http/HelperAction.java
Index: HelperAction.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/http/HelperAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HelperAction.java 2001/12/23 19:32:50 1.1
+++ HelperAction.java 2001/12/28 13:34:57 1.2
@@ -41,7 +41,7 @@
* and an error condition is detected.
* <p>
* @author Ted Husted
- * @version $Revision: 1.1 $ $Date: 2001/12/23 19:32:50 $
+ * @version $Revision: 1.2 $ $Date: 2001/12/28 13:34:57 $
*/
public class HelperAction extends Action {
@@ -219,9 +219,9 @@
/*
- * $Header:
/home/cvs/jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/http/HelperAction.java,v
1.1 2001/12/23 19:32:50 vmassol Exp $
- * $Revision: 1.1 $
- * $Date: 2001/12/23 19:32:50 $
+ * $Header:
/home/cvs/jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/http/HelperAction.java,v
1.2 2001/12/28 13:34:57 vmassol Exp $
+ * $Revision: 1.2 $
+ * $Date: 2001/12/28 13:34:57 $
*
* ====================================================================
*
@@ -249,7 +249,7 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
+ * 4. The names "The Jakarta Project", "Scaffold", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
1.2 +4 -4
jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/http/MasterDetailHelper.java
Index: MasterDetailHelper.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/http/MasterDetailHelper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MasterDetailHelper.java 2001/12/23 19:32:50 1.1
+++ MasterDetailHelper.java 2001/12/28 13:34:57 1.2
@@ -20,7 +20,7 @@
* retrieves detail based on the master. (A field in the
* master record would usually match a field in the detail.)
* @author Ted Husted
- * @version $Revision: 1.1 $ $Date: 2001/12/23 19:32:50 $
+ * @version $Revision: 1.2 $ $Date: 2001/12/28 13:34:57 $
*/
public class MasterDetailHelper extends ModelHelper {
@@ -58,9 +58,9 @@
/*
- * $Header:
/home/cvs/jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/http/MasterDetailHelper.java,v
1.1 2001/12/23 19:32:50 vmassol Exp $
- * $Revision: 1.1 $
- * $Date: 2001/12/23 19:32:50 $
+ * $Header:
/home/cvs/jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/http/MasterDetailHelper.java,v
1.2 2001/12/28 13:34:57 vmassol Exp $
+ * $Revision: 1.2 $
+ * $Date: 2001/12/28 13:34:57 $
*
* ====================================================================
*
@@ -88,7 +88,7 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
+ * 4. The names "The Jakarta Project", "Scaffold", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
1.2 +4 -4
jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/http/ModelHelper.java
Index: ModelHelper.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/http/ModelHelper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ModelHelper.java 2001/12/23 19:32:51 1.1
+++ ModelHelper.java 2001/12/28 13:34:57 1.2
@@ -25,7 +25,7 @@
/**
* Standard Action to manage helper objects.
* @author Ted Husted
- * @version $Revision: 1.1 $ $Date: 2001/12/23 19:32:51 $
+ * @version $Revision: 1.2 $ $Date: 2001/12/28 13:34:57 $
*/
public class ModelHelper extends HelperAction {
@@ -127,9 +127,9 @@
/*
- * $Header:
/home/cvs/jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/http/ModelHelper.java,v
1.1 2001/12/23 19:32:51 vmassol Exp $
- * $Revision: 1.1 $
- * $Date: 2001/12/23 19:32:51 $
+ * $Header:
/home/cvs/jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/http/ModelHelper.java,v
1.2 2001/12/28 13:34:57 vmassol Exp $
+ * $Revision: 1.2 $
+ * $Date: 2001/12/28 13:34:57 $
*
* ====================================================================
*
@@ -157,7 +157,7 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
+ * 4. The names "The Jakarta Project", "Scaffold", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
1.2 +4 -4
jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/http/RelayAction.java
Index: RelayAction.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/http/RelayAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RelayAction.java 2001/12/23 19:32:51 1.1
+++ RelayAction.java 2001/12/28 13:34:57 1.2
@@ -20,7 +20,7 @@
* Standard Action to forward control to another mapping
* given as a runtime parameter (?forward=).
* @author Ted Husted
- * @version $Revision: 1.1 $ $Date: 2001/12/23 19:32:51 $
+ * @version $Revision: 1.2 $ $Date: 2001/12/28 13:34:57 $
*/
public final class RelayAction extends Action {
@@ -46,9 +46,9 @@
/*
- * $Header:
/home/cvs/jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/http/RelayAction.java,v
1.1 2001/12/23 19:32:51 vmassol Exp $
- * $Revision: 1.1 $
- * $Date: 2001/12/23 19:32:51 $
+ * $Header:
/home/cvs/jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/http/RelayAction.java,v
1.2 2001/12/28 13:34:57 vmassol Exp $
+ * $Revision: 1.2 $
+ * $Date: 2001/12/28 13:34:57 $
*
* ====================================================================
*
@@ -76,7 +76,7 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
+ * 4. The names "The Jakarta Project", "Scaffold", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
1.2 +2 -2
jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/http/TaskForm.java
Index: TaskForm.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/http/TaskForm.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TaskForm.java 2001/12/23 19:32:51 1.1
+++ TaskForm.java 2001/12/28 13:34:57 1.2
@@ -6,7 +6,7 @@
/**
* @author Ted Husted
- * @version $Revision: 1.1 $ $Date: 2001/12/23 19:32:51 $
+ * @version $Revision: 1.2 $ $Date: 2001/12/28 13:34:57 $
*/
public class TaskForm extends ActionForm {
@@ -64,7 +64,7 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
+ * 4. The names "The Jakarta Project", "Scaffold", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
1.2 +2 -2
jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/lang/ChainedException.java
Index: ChainedException.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/lang/ChainedException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ChainedException.java 2001/12/23 19:32:51 1.1
+++ ChainedException.java 2001/12/28 13:34:57 1.2
@@ -8,7 +8,7 @@
/**
* http://www.javaworld.com/javaworld/jw-08-2001/jw-0803-exceptions.html
* @author Brian Geotz
- * @version $Revision: 1.1 $ $Date: 2001/12/23 19:32:51 $
+ * @version $Revision: 1.2 $ $Date: 2001/12/28 13:34:57 $
*/
public class ChainedException extends Exception {
@@ -96,7 +96,7 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
+ * 4. The names "The Jakarta Project", "Scaffold", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
1.2 +2 -2
jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/lang/Tokens.java
Index: Tokens.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/lang/Tokens.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Tokens.java 2001/12/23 19:32:51 1.1
+++ Tokens.java 2001/12/28 13:34:57 1.2
@@ -3,7 +3,7 @@
/**
* @author Ted Husted
- * @version $Revision: 1.1 $ $Date: 2001/12/23 19:32:51 $
+ * @version $Revision: 1.2 $ $Date: 2001/12/28 13:34:57 $
*/
public final class Tokens {
@@ -81,7 +81,7 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
+ * 4. The names "The Jakarta Project", "Scaffold", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
1.2 +2 -2
jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/model/ModelAbstractException.java
Index: ModelAbstractException.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/model/ModelAbstractException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ModelAbstractException.java 2001/12/23 19:32:51 1.1
+++ ModelAbstractException.java 2001/12/28 13:34:57 1.2
@@ -5,7 +5,7 @@
* Exception for error accessing a non-concrete method.
* (index file, data file).
* @author Ted Husted
- * @version $Revision: 1.1 $ $Date: 2001/12/23 19:32:51 $
+ * @version $Revision: 1.2 $ $Date: 2001/12/28 13:34:57 $
*/
public class ModelAbstractException extends ModelException {
@@ -59,7 +59,7 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
+ * 4. The names "The Jakarta Project", "Scaffold", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
1.2 +2 -2
jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/model/ModelBean.java
Index: ModelBean.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/model/ModelBean.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ModelBean.java 2001/12/23 19:32:51 1.1
+++ ModelBean.java 2001/12/28 13:34:57 1.2
@@ -12,7 +12,7 @@
* queries.
* Known implementations: ModelBeanBase.
* @author Ted Husted
- * @version $Revision: 1.1 $ $Date: 2001/12/23 19:32:51 $
+ * @version $Revision: 1.2 $ $Date: 2001/12/28 13:34:57 $
*/
public interface ModelBean {
@@ -131,7 +131,7 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
+ * 4. The names "The Jakarta Project", "Scaffold", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
1.2 +2 -2
jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/model/ModelBeanBase.java
Index: ModelBeanBase.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/model/ModelBeanBase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ModelBeanBase.java 2001/12/23 19:32:51 1.1
+++ ModelBeanBase.java 2001/12/28 13:34:57 1.2
@@ -10,7 +10,7 @@
* The only method that must be overridden is
* ModelResult execute(Object target).
* @author Ted Husted
- * @version $Revision: 1.1 $ $Date: 2001/12/23 19:32:51 $
+ * @version $Revision: 1.2 $ $Date: 2001/12/28 13:34:57 $
*/
public abstract class ModelBeanBase implements ModelBean {
@@ -215,7 +215,7 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
+ * 4. The names "The Jakarta Project", "Scaffold", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
1.2 +2 -2
jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/model/ModelException.java
Index: ModelException.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/model/ModelException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ModelException.java 2001/12/23 19:32:51 1.1
+++ ModelException.java 2001/12/28 13:34:57 1.2
@@ -7,7 +7,7 @@
/**
* Exceptions for Model classes.
* @author Ted Husted
- * @version $Revision: 1.1 $ $Date: 2001/12/23 19:32:51 $
+ * @version $Revision: 1.2 $ $Date: 2001/12/28 13:34:57 $
*/
public class ModelException extends ChainedException {
@@ -50,7 +50,7 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
+ * 4. The names "The Jakarta Project", "Scaffold", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
1.2 +2 -2
jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/model/ModelParameterException.java
Index: ModelParameterException.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/model/ModelParameterException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ModelParameterException.java 2001/12/23 19:32:51 1.1
+++ ModelParameterException.java 2001/12/28 13:34:57 1.2
@@ -5,7 +5,7 @@
* Exception for error accessing a resource needed for a model
* (index file, data file).
* @author Ted Husted
- * @version $Revision: 1.1 $ $Date: 2001/12/23 19:32:51 $
+ * @version $Revision: 1.2 $ $Date: 2001/12/28 13:34:57 $
*/
public class ModelParameterException extends ModelException {
@@ -59,7 +59,7 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
+ * 4. The names "The Jakarta Project", "Scaffold", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
1.2 +2 -2
jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/model/ModelPopulateException.java
Index: ModelPopulateException.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/model/ModelPopulateException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ModelPopulateException.java 2001/12/23 19:32:51 1.1
+++ ModelPopulateException.java 2001/12/28 13:34:57 1.2
@@ -4,7 +4,7 @@
/**
* Exception for error populating model.
* @author Ted Husted
- * @version $Revision: 1.1 $ $Date: 2001/12/23 19:32:51 $
+ * @version $Revision: 1.2 $ $Date: 2001/12/28 13:34:57 $
*/
public class ModelPopulateException extends ModelException {
@@ -58,7 +58,7 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
+ * 4. The names "The Jakarta Project", "Scaffold", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
1.2 +2 -2
jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/model/ModelResourceException.java
Index: ModelResourceException.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/model/ModelResourceException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ModelResourceException.java 2001/12/23 19:32:51 1.1
+++ ModelResourceException.java 2001/12/28 13:34:57 1.2
@@ -5,7 +5,7 @@
* Exception for error accessing a resource needed for a model
* (index file, data file).
* @author Ted Husted
- * @version $Revision: 1.1 $ $Date: 2001/12/23 19:32:51 $
+ * @version $Revision: 1.2 $ $Date: 2001/12/28 13:34:57 $
*/
public class ModelResourceException extends ModelException {
@@ -59,7 +59,7 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
+ * 4. The names "The Jakarta Project", "Scaffold", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
1.2 +2 -2
jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/model/ModelResult.java
Index: ModelResult.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/model/ModelResult.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ModelResult.java 2001/12/23 19:32:51 1.1
+++ ModelResult.java 2001/12/28 13:34:57 1.2
@@ -18,7 +18,7 @@
* Wrappers for interate and size are provided so that they
* can be accessed as getIterate and getSize.
* @author Ted Husted
- * @version $Revision: 1.1 $ $Date: 2001/12/23 19:32:51 $
+ * @version $Revision: 1.2 $ $Date: 2001/12/28 13:34:57 $
*/
public interface ModelResult {
@@ -166,7 +166,7 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
+ * 4. The names "The Jakarta Project", "Scaffold", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
1.2 +2 -2
jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/model/ModelResultBase.java
Index: ModelResultBase.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/model/ModelResultBase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ModelResultBase.java 2001/12/23 19:32:51 1.1
+++ ModelResultBase.java 2001/12/28 13:34:57 1.2
@@ -14,7 +14,7 @@
* used "as-is" to manage a collection of beans
* returned from the resource layer.
* @author Ted Husted
- * @version $Revision: 1.1 $ $Date: 2001/12/23 19:32:51 $
+ * @version $Revision: 1.2 $ $Date: 2001/12/28 13:34:57 $
*/
public class ModelResultBase implements ModelResult {
@@ -265,7 +265,7 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
+ * 4. The names "The Jakarta Project", "Scaffold", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
1.2 +2 -2
jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/model/ModelUtils.java
Index: ModelUtils.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/model/ModelUtils.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ModelUtils.java 2001/12/23 19:32:51 1.1
+++ ModelUtils.java 2001/12/28 13:34:57 1.2
@@ -8,7 +8,7 @@
* Convenience method for transfering data to model beans
* if not based on QuerBean or ModelBeanBase.
* @author Ted Husted
- * @version $Revision: 1.1 $ $Date: 2001/12/23 19:32:51 $
+ * @version $Revision: 1.2 $ $Date: 2001/12/28 13:34:57 $
*/
public class ModelUtils {
@@ -63,7 +63,7 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
+ * 4. The names "The Jakarta Project", "Scaffold", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
1.2 +2 -2
jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/search/LuceneUtils.java
Index: LuceneUtils.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/search/LuceneUtils.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LuceneUtils.java 2001/12/23 19:32:51 1.1
+++ LuceneUtils.java 2001/12/28 13:34:58 1.2
@@ -25,7 +25,7 @@
*
* @author Craig R. McClanahan
* @author Ted Husted
- * @version $Revision: 1.1 $ $Date: 2001/12/23 19:32:51 $
+ * @version $Revision: 1.2 $ $Date: 2001/12/28 13:34:58 $
*/
public class LuceneUtils {
@@ -134,7 +134,7 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
+ * 4. The names "The Jakarta Project", "Scaffold", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
1.2 +2 -2
jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/sql/ResultSetUtils.java
Index: ResultSetUtils.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/sql/ResultSetUtils.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ResultSetUtils.java 2001/12/23 19:32:51 1.1
+++ ResultSetUtils.java 2001/12/28 13:34:58 1.2
@@ -31,7 +31,7 @@
* General purpose utility methods related to ResultSets
* <p>
* @author Ted Husted
- * @version $Revision: 1.1 $ $Date: 2001/12/23 19:32:51 $
+ * @version $Revision: 1.2 $ $Date: 2001/12/28 13:34:58 $
*/
public class ResultSetUtils {
@@ -378,7 +378,7 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
+ * 4. The names "The Jakarta Project", "Scaffold", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
1.2 +2 -2
jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/sql/StatementUtils.java
Index: StatementUtils.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/sql/StatementUtils.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- StatementUtils.java 2001/12/23 19:32:51 1.1
+++ StatementUtils.java 2001/12/28 13:34:58 1.2
@@ -15,7 +15,7 @@
* :FIXME: getCollection returns blank string exceptions when used with multiple
parameters (single OK).
* :TODO: Refactor executeUpdate methods like getCollection methods.
* @author Ted Husted
- * @version $Revision: 1.1 $ $Date: 2001/12/23 19:32:51 $
+ * @version $Revision: 1.2 $ $Date: 2001/12/28 13:34:58 $
*/
public final class StatementUtils {
@@ -346,7 +346,7 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
+ * 4. The names "The Jakarta Project", "Scaffold", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
1.2 +4 -4
jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/util/LabelValueBean.java
Index: LabelValueBean.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/util/LabelValueBean.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LabelValueBean.java 2001/12/23 19:32:52 1.1
+++ LabelValueBean.java 2001/12/28 13:34:58 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/util/LabelValueBean.java,v
1.1 2001/12/23 19:32:52 vmassol Exp $
- * $Revision: 1.1 $
- * $Date: 2001/12/23 19:32:52 $
+ * $Header:
/home/cvs/jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/util/LabelValueBean.java,v
1.2 2001/12/28 13:34:58 vmassol Exp $
+ * $Revision: 1.2 $
+ * $Date: 2001/12/28 13:34:58 $
*
* ====================================================================
*
@@ -29,7 +29,7 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
+ * 4. The names "The Jakarta Project", "Scaffold", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
@@ -67,7 +67,7 @@
* that are utilized by the <code><form:options></code> tag.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.1 $ $Date: 2001/12/23 19:32:52 $
+ * @version $Revision: 1.2 $ $Date: 2001/12/28 13:34:58 $
*/
public class LabelValueBean {
1.2 +3 -3 jakarta-struts/contrib/scaffold/src/sample/web/index.jsp
Index: index.jsp
===================================================================
RCS file: /home/cvs/jakarta-struts/contrib/scaffold/src/sample/web/index.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.jsp 2001/12/23 19:32:52 1.1
+++ index.jsp 2001/12/28 13:34:58 1.2
@@ -1,7 +1,7 @@
<%@ page language="java" %>
-<%@ taglib uri="/tags/struts-bean.tld" prefix="bean" %>
-<%@ taglib uri="/tags/struts-html.tld" prefix="html" %>
-<%@ taglib uri="/tags/struts-logic.tld" prefix="logic" %>
+<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
+<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
+<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
<html:html locale="true">
<head>
1.1
jakarta-struts/contrib/scaffold/conf/sample/test/cactus.properties
Index: cactus.properties
===================================================================
# Configuration file for Cactus.
# Each project using Cactus need to have such a file put in the client side
# CLASSPATH (Meaning the directory containgin this file should be in the client
# side CLASSPATH, not the file itself of course ... :) )
# Defines the URLs that will be used by Cactus to call it's redirectors.
# You need to specify in these URLs the webapp context that you use for your
# application. In the example below, the context is "test".
# Servlet Redirector. Used by ServletTestCase test cases.
cactus.servletRedirectorURL =
http://localhost:@test.port@[EMAIL PROTECTED]@-sample/ServletRedirector
1.1
jakarta-struts/contrib/scaffold/conf/sample/test/tomcat40/server.xml
Index: server.xml
===================================================================
<Server port="8005" shutdown="SHUTDOWN" debug="0">
<Service name="Tomcat-Standalone">
<Connector className="org.apache.catalina.connector.http.HttpConnector"
port="@test.port@" minProcessors="5" maxProcessors="75"
acceptCount="10" debug="0"/>
<Engine name="Standalone" defaultHost="localhost" debug="0">
<Realm className="org.apache.catalina.realm.MemoryRealm" />
<Host name="localhost" debug="0"
appBase="@target.tomcat40.full.dir@/webapps">
</Host>
</Engine>
</Service>
</Server>
1.1
jakarta-struts/contrib/scaffold/conf/sample/test/tomcat40/web.xml
Index: web.xml
===================================================================
<?xml version="1.0" encoding="ISO-8859-1"?>
<!DOCTYPE web-app
PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
"http://java.sun.com/j2ee/dtds/web-app_2_3.dtd";>
<web-app>
<!-- Mappings in this file are the defaults for all Contexts -->
<!-- The default servlet that serves static resources -->
<servlet>
<servlet-name>default</servlet-name>
<servlet-class>org.apache.catalina.servlets.DefaultServlet</servlet-class>
<init-param>
<param-name>debug</param-name>
<param-value>0</param-value>
</init-param>
<init-param>
<param-name>listings</param-name>
<param-value>true</param-value>
</init-param>
<load-on-startup>1</load-on-startup>
</servlet>
<!-- The invoker servlet that executes non-registered servlets -->
<servlet>
<servlet-name>invoker</servlet-name>
<servlet-class>org.apache.catalina.servlets.InvokerServlet</servlet-class>
<init-param>
<param-name>debug</param-name>
<param-value>0</param-value>
</init-param>
<load-on-startup>2</load-on-startup>
</servlet>
<!-- The JSP page compiler and execution servlet -->
<servlet>
<servlet-name>jsp</servlet-name>
<servlet-class>org.apache.jasper.servlet.JspServlet</servlet-class>
<!-- Uncomment the following to use Jikes for JSP compilation -->
<!--
<init-param>
<param-name>jspCompilerPlugin</param-name>
<param-value>org.apache.jasper.compiler.JikesJavaCompiler</param-value>
</init-param>
-->
<init-param>
<!-- An alternate java encoding -->
<param-name>javaEncoding</param-name>
<param-value>UTF-8</param-value>
</init-param>
<init-param>
<!-- Levels: FATAL ERROR WARNING INFORMATION DEBUG -->
<param-name>logVerbosityLevel</param-name>
<param-value>WARNING</param-value>
</init-param>
<load-on-startup>4</load-on-startup>
</servlet>
<!-- SSIInvoker Servlet -->
<servlet>
<servlet-name>ssi</servlet-name>
<servlet-class>org.apache.catalina.servlets.SsiInvokerServlet</servlet-class>
<init-param>
<!-- debug > 0 == debug enabled -->
<param-name>debug</param-name>
<param-value>0</param-value>
</init-param>
<init-param>
<!-- time in seconds before the SSI page expires -->
<param-name>expires</param-name>
<param-value>666</param-value>
</init-param>
<init-param>
<!-- 0 == false; 1 == true -->
<param-name>buffered</param-name>
<param-value>1</param-value>
</init-param>
<init-param>
<!-- 0 == false; 1 == true -->
<param-name>isVirtualWebappRelative</param-name>
<param-value>0</param-value>
</init-param>
<load-on-startup>5</load-on-startup>
</servlet>
<!-- CGIServlet -->
<servlet>
<servlet-name>cgi</servlet-name>
<servlet-class>org.apache.catalina.servlets.CGIServlet</servlet-class>
<init-param>
<!-- debug > 0 == debug enabled -->
<param-name>debug</param-name>
<param-value>6</param-value>
</init-param>
<init-param>
<!-- clientInputTimeout is the time in milliseconds to wait for-->
<!-- input from the client browser before assuming there is none -->
<param-name>clientInputTimeout</param-name>
<param-value>100</param-value>
</init-param>
<init-param>
<!-- The CGI search path will start at -->
<!-- webAppRootDir + File.separator + cgiPathPrefix -->
<param-name>cgiPathPrefix</param-name>
<param-value>WEB-INF/cgi</param-value>
</init-param>
<load-on-startup>6</load-on-startup>
</servlet>
<!-- The mapping for the default servlet -->
<servlet-mapping>
<servlet-name>default</servlet-name>
<url-pattern>/</url-pattern>
</servlet-mapping>
<!-- The mapping for the invoker servlet -->
<!-- Comment this out if you do not want "invoker" service -->
<servlet-mapping>
<servlet-name>invoker</servlet-name>
<url-pattern>/servlet/*</url-pattern>
</servlet-mapping>
<!-- The mapping for the JSP servlet -->
<!-- Comment this out if you do not want "jsp" service -->
<servlet-mapping>
<servlet-name>jsp</servlet-name>
<url-pattern>*.jsp</url-pattern>
</servlet-mapping>
<!-- The mapping for SSI-->
<servlet-mapping>
<servlet-name>ssi</servlet-name>
<url-pattern>*.shtml</url-pattern>
</servlet-mapping>
<!-- The mapping for the CGI Gateway servlet -->
<!-- Comment this out if you do not want "CGI Gateway" service -->
<servlet-mapping>
<servlet-name>cgi</servlet-name>
<url-pattern>/cgi-bin/*</url-pattern>
</servlet-mapping>
<!-- Set the default session timeout (in seconds) -->
<session-config>
<session-timeout>30</session-timeout>
</session-config>
<!-- Establish the default MIME type mappings -->
<mime-mapping>
<extension>txt</extension>
<mime-type>text/plain</mime-type>
</mime-mapping>
<mime-mapping>
<extension>html</extension>
<mime-type>text/html</mime-type>
</mime-mapping>
<mime-mapping>
<extension>htm</extension>
<mime-type>text/html</mime-type>
</mime-mapping>
<mime-mapping>
<extension>gif</extension>
<mime-type>image/gif</mime-type>
</mime-mapping>
<mime-mapping>
<extension>jpg</extension>
<mime-type>image/jpeg</mime-type>
</mime-mapping>
<mime-mapping>
<extension>jpe</extension>
<mime-type>image/jpeg</mime-type>
</mime-mapping>
<mime-mapping>
<extension>jpeg</extension>
<mime-type>image/jpeg</mime-type>
</mime-mapping>
<mime-mapping>
<extension>java</extension>
<mime-type>text/plain</mime-type>
</mime-mapping>
<mime-mapping>
<extension>body</extension>
<mime-type>text/html</mime-type>
</mime-mapping>
<mime-mapping>
<extension>rtx</extension>
<mime-type>text/richtext</mime-type>
</mime-mapping>
<mime-mapping>
<extension>tsv</extension>
<mime-type>text/tab-separated-values</mime-type>
</mime-mapping>
<mime-mapping>
<extension>etx</extension>
<mime-type>text/x-setext</mime-type>
</mime-mapping>
<mime-mapping>
<extension>ps</extension>
<mime-type>application/x-postscript</mime-type>
</mime-mapping>
<mime-mapping>
<extension>class</extension>
<mime-type>application/java</mime-type>
</mime-mapping>
<mime-mapping>
<extension>csh</extension>
<mime-type>application/x-csh</mime-type>
</mime-mapping>
<mime-mapping>
<extension>sh</extension>
<mime-type>application/x-sh</mime-type>
</mime-mapping>
<mime-mapping>
<extension>tcl</extension>
<mime-type>application/x-tcl</mime-type>
</mime-mapping>
<mime-mapping>
<extension>tex</extension>
<mime-type>application/x-tex</mime-type>
</mime-mapping>
<mime-mapping>
<extension>texinfo</extension>
<mime-type>application/x-texinfo</mime-type>
</mime-mapping>
<mime-mapping>
<extension>texi</extension>
<mime-type>application/x-texinfo</mime-type>
</mime-mapping>
<mime-mapping>
<extension>t</extension>
<mime-type>application/x-troff</mime-type>
</mime-mapping>
<mime-mapping>
<extension>tr</extension>
<mime-type>application/x-troff</mime-type>
</mime-mapping>
<mime-mapping>
<extension>roff</extension>
<mime-type>application/x-troff</mime-type>
</mime-mapping>
<mime-mapping>
<extension>man</extension>
<mime-type>application/x-troff-man</mime-type>
</mime-mapping>
<mime-mapping>
<extension>me</extension>
<mime-type>application/x-troff-me</mime-type>
</mime-mapping>
<mime-mapping>
<extension>ms</extension>
<mime-type>application/x-wais-source</mime-type>
</mime-mapping>
<mime-mapping>
<extension>src</extension>
<mime-type>application/x-wais-source</mime-type>
</mime-mapping>
<mime-mapping>
<extension>zip</extension>
<mime-type>application/zip</mime-type>
</mime-mapping>
<mime-mapping>
<extension>bcpio</extension>
<mime-type>application/x-bcpio</mime-type>
</mime-mapping>
<mime-mapping>
<extension>cpio</extension>
<mime-type>application/x-cpio</mime-type>
</mime-mapping>
<mime-mapping>
<extension>gtar</extension>
<mime-type>application/x-gtar</mime-type>
</mime-mapping>
<mime-mapping>
<extension>shar</extension>
<mime-type>application/x-shar</mime-type>
</mime-mapping>
<mime-mapping>
<extension>sv4cpio</extension>
<mime-type>application/x-sv4cpio</mime-type>
</mime-mapping>
<mime-mapping>
<extension>sv4crc</extension>
<mime-type>application/x-sv4crc</mime-type>
</mime-mapping>
<mime-mapping>
<extension>tar</extension>
<mime-type>application/x-tar</mime-type>
</mime-mapping>
<mime-mapping>
<extension>ustar</extension>
<mime-type>application/x-ustar</mime-type>
</mime-mapping>
<mime-mapping>
<extension>dvi</extension>
<mime-type>application/x-dvi</mime-type>
</mime-mapping>
<mime-mapping>
<extension>hdf</extension>
<mime-type>application/x-hdf</mime-type>
</mime-mapping>
<mime-mapping>
<extension>latex</extension>
<mime-type>application/x-latex</mime-type>
</mime-mapping>
<mime-mapping>
<extension>bin</extension>
<mime-type>application/octet-stream</mime-type>
</mime-mapping>
<mime-mapping>
<extension>oda</extension>
<mime-type>application/oda</mime-type>
</mime-mapping>
<mime-mapping>
<extension>pdf</extension>
<mime-type>application/pdf</mime-type>
</mime-mapping>
<mime-mapping>
<extension>ps</extension>
<mime-type>application/postscript</mime-type>
</mime-mapping>
<mime-mapping>
<extension>eps</extension>
<mime-type>application/postscript</mime-type>
</mime-mapping>
<mime-mapping>
<extension>ai</extension>
<mime-type>application/postscript</mime-type>
</mime-mapping>
<mime-mapping>
<extension>rtf</extension>
<mime-type>application/rtf</mime-type>
</mime-mapping>
<mime-mapping>
<extension>nc</extension>
<mime-type>application/x-netcdf</mime-type>
</mime-mapping>
<mime-mapping>
<extension>cdf</extension>
<mime-type>application/x-netcdf</mime-type>
</mime-mapping>
<mime-mapping>
<extension>cer</extension>
<mime-type>application/x-x509-ca-cert</mime-type>
</mime-mapping>
<mime-mapping>
<extension>exe</extension>
<mime-type>application/octet-stream</mime-type>
</mime-mapping>
<mime-mapping>
<extension>gz</extension>
<mime-type>application/x-gzip</mime-type>
</mime-mapping>
<mime-mapping>
<extension>Z</extension>
<mime-type>application/x-compress</mime-type>
</mime-mapping>
<mime-mapping>
<extension>z</extension>
<mime-type>application/x-compress</mime-type>
</mime-mapping>
<mime-mapping>
<extension>hqx</extension>
<mime-type>application/mac-binhex40</mime-type>
</mime-mapping>
<mime-mapping>
<extension>mif</extension>
<mime-type>application/x-mif</mime-type>
</mime-mapping>
<mime-mapping>
<extension>ief</extension>
<mime-type>image/ief</mime-type>
</mime-mapping>
<mime-mapping>
<extension>tiff</extension>
<mime-type>image/tiff</mime-type>
</mime-mapping>
<mime-mapping>
<extension>tif</extension>
<mime-type>image/tiff</mime-type>
</mime-mapping>
<mime-mapping>
<extension>ras</extension>
<mime-type>image/x-cmu-raster</mime-type>
</mime-mapping>
<mime-mapping>
<extension>pnm</extension>
<mime-type>image/x-portable-anymap</mime-type>
</mime-mapping>
<mime-mapping>
<extension>pbm</extension>
<mime-type>image/x-portable-bitmap</mime-type>
</mime-mapping>
<mime-mapping>
<extension>pgm</extension>
<mime-type>image/x-portable-graymap</mime-type>
</mime-mapping>
<mime-mapping>
<extension>ppm</extension>
<mime-type>image/x-portable-pixmap</mime-type>
</mime-mapping>
<mime-mapping>
<extension>rgb</extension>
<mime-type>image/x-rgb</mime-type>
</mime-mapping>
<mime-mapping>
<extension>xbm</extension>
<mime-type>image/x-xbitmap</mime-type>
</mime-mapping>
<mime-mapping>
<extension>xpm</extension>
<mime-type>image/x-xpixmap</mime-type>
</mime-mapping>
<mime-mapping>
<extension>xwd</extension>
<mime-type>image/x-xwindowdump</mime-type>
</mime-mapping>
<mime-mapping>
<extension>au</extension>
<mime-type>audio/basic</mime-type>
</mime-mapping>
<mime-mapping>
<extension>snd</extension>
<mime-type>audio/basic</mime-type>
</mime-mapping>
<mime-mapping>
<extension>aif</extension>
<mime-type>audio/x-aiff</mime-type>
</mime-mapping>
<mime-mapping>
<extension>aiff</extension>
<mime-type>audio/x-aiff</mime-type>
</mime-mapping>
<mime-mapping>
<extension>aifc</extension>
<mime-type>audio/x-aiff</mime-type>
</mime-mapping>
<mime-mapping>
<extension>wav</extension>
<mime-type>audio/x-wav</mime-type>
</mime-mapping>
<mime-mapping>
<extension>mpeg</extension>
<mime-type>video/mpeg</mime-type>
</mime-mapping>
<mime-mapping>
<extension>mpg</extension>
<mime-type>video/mpeg</mime-type>
</mime-mapping>
<mime-mapping>
<extension>mpe</extension>
<mime-type>video/mpeg</mime-type>
</mime-mapping>
<mime-mapping>
<extension>qt</extension>
<mime-type>video/quicktime</mime-type>
</mime-mapping>
<mime-mapping>
<extension>mov</extension>
<mime-type>video/quicktime</mime-type>
</mime-mapping>
<mime-mapping>
<extension>qt</extension>
<mime-type>video/quicktime</mime-type>
</mime-mapping>
<mime-mapping>
<extension>avi</extension>
<mime-type>video/x-msvideo</mime-type>
</mime-mapping>
<mime-mapping>
<extension>movie</extension>
<mime-type>video/x-sgi-movie</mime-type>
</mime-mapping>
<mime-mapping>
<extension>avx</extension>
<mime-type>video/x-rad-screenplay</mime-type>
</mime-mapping>
<mime-mapping>
<extension>wrl</extension>
<mime-type>x-world/x-vrml</mime-type>
</mime-mapping>
<mime-mapping>
<extension>mpv2</extension>
<mime-type>video/mpeg2</mime-type>
</mime-mapping>
<mime-mapping> <!-- WML Source -->
<extension>wml</extension>
<mime-type>text/vnd.wap.wml</mime-type>
</mime-mapping>
<mime-mapping> <!-- Compiled WML -->
<extension>wmlc</extension>
<mime-type>application/vnd.wap.wmlc</mime-type>
</mime-mapping>
<mime-mapping> <!-- WML Script Source -->
<extension>wmls</extension>
<mime-type>text/vnd.wap.wmls</mime-type>
</mime-mapping>
<mime-mapping> <!-- Compiled WML Script -->
<extension>wmlscriptc</extension>
<mime-type>application/vnd.wap.wmlscriptc</mime-type>
</mime-mapping>
<mime-mapping> <!-- Wireless Bitmap -->
<extension>wbmp</extension>
<mime-type>image/vnd.wap.wbmp</mime-type>
</mime-mapping>
<mime-mapping>
<extension>mp2</extension>
<mime-type>audio/x-mpeg</mime-type>
</mime-mapping>
<mime-mapping>
<extension>mp3</extension>
<mime-type>audio/x-mpeg</mime-type>
</mime-mapping>
<mime-mapping>
<extension>mp1</extension>
<mime-type>audio/x-mpeg</mime-type>
</mime-mapping>
<mime-mapping>
<extension>mpa</extension>
<mime-type>audio/x-mpeg</mime-type>
</mime-mapping>
<mime-mapping>
<extension>abs</extension>
<mime-type>audio/x-mpeg</mime-type>
</mime-mapping>
<mime-mapping>
<extension>mpega</extension>
<mime-type>audio/x-mpeg</mime-type>
</mime-mapping>
<mime-mapping>
<extension>midi</extension>
<mime-type>audio/x-midi</mime-type>
</mime-mapping>
<mime-mapping>
<extension>mid</extension>
<mime-type>audio/x-midi</mime-type>
</mime-mapping>
<mime-mapping>
<extension>smf</extension>
<mime-type>audio/x-midi</mime-type>
</mime-mapping>
<mime-mapping>
<extension>kar</extension>
<mime-type>audio/x-midi</mime-type>
</mime-mapping>
<mime-mapping>
<extension>aiff</extension>
<mime-type>audio/x-aiff</mime-type>
</mime-mapping>
<mime-mapping>
<extension>aif</extension>
<mime-type>audio/x-aiff</mime-type>
</mime-mapping>
<mime-mapping>
<extension>aifc</extension>
<mime-type>audio/x-aiff</mime-type>
</mime-mapping>
<mime-mapping>
<extension>aim</extension>
<mime-type>application/x-aim</mime-type>
</mime-mapping>
<mime-mapping>
<extension>art</extension>
<mime-type>image/x-jg</mime-type>
</mime-mapping>
<mime-mapping>
<extension>au</extension>
<mime-type>audio/basic</mime-type>
</mime-mapping>
<mime-mapping>
<extension>snd</extension>
<mime-type>audio/basic</mime-type>
</mime-mapping>
<mime-mapping>
<extension>ulw</extension>
<mime-type>audio/basic</mime-type>
</mime-mapping>
<mime-mapping>
<extension>bmp</extension>
<mime-type>image/bmp</mime-type>
</mime-mapping>
<mime-mapping>
<extension>dib</extension>
<mime-type>image/bmp</mime-type>
</mime-mapping>
<mime-mapping>
<extension>cdf</extension>
<mime-type>application/x-cdf</mime-type>
</mime-mapping>
<mime-mapping>
<extension>dv</extension>
<mime-type>video/x-dv</mime-type>
</mime-mapping>
<mime-mapping>
<extension>m3u</extension>
<mime-type>audio/x-mpegurl</mime-type>
</mime-mapping>
<mime-mapping>
<extension>jar</extension>
<mime-type>application/java-archive</mime-type>
</mime-mapping>
<mime-mapping>
<extension>hqx</extension>
<mime-type>application/mac-binhex40</mime-type>
</mime-mapping>
<mime-mapping>
<extension>pnt</extension>
<mime-type>image/x-macpaint</mime-type>
</mime-mapping>
<mime-mapping>
<extension>mac</extension>
<mime-type>image/x-macpaint</mime-type>
</mime-mapping>
<mime-mapping>
<extension>asf</extension>
<mime-type>video/x-ms-asf</mime-type>
</mime-mapping>
<mime-mapping>
<extension>asx</extension>
<mime-type>video/x-ms-asf</mime-type>
</mime-mapping>
<mime-mapping>
<extension>doc</extension>
<mime-type>application/msword</mime-type>
</mime-mapping>
<mime-mapping>
<extension>rm</extension>
<mime-type>application/vnd.rn-realmedia</mime-type>
</mime-mapping>
<mime-mapping>
<extension>psd</extension>
<mime-type>image/x-photoshop</mime-type>
</mime-mapping>
<mime-mapping>
<extension>pic</extension>
<mime-type>image/pict</mime-type>
</mime-mapping>
<mime-mapping>
<extension>pict</extension>
<mime-type>image/pict</mime-type>
</mime-mapping>
<mime-mapping>
<extension>pct</extension>
<mime-type>image/pict</mime-type>
</mime-mapping>
<mime-mapping>
<extension>pls</extension>
<mime-type>audio/x-scpls</mime-type>
</mime-mapping>
<mime-mapping>
<extension>png</extension>
<mime-type>image/png</mime-type>
</mime-mapping>
<mime-mapping>
<extension>qti</extension>
<mime-type>image/x-quicktime</mime-type>
</mime-mapping>
<mime-mapping>
<extension>qtif</extension>
<mime-type>image/x-quicktime</mime-type>
</mime-mapping>
<mime-mapping>
<extension>swf</extension>
<mime-type>application/x-shockwave-flash</mime-type>
</mime-mapping>
<mime-mapping>
<extension>dtd</extension>
<mime-type>text/plain</mime-type>
</mime-mapping>
<!-- Establish the default list of welcome files -->
<welcome-file-list>
<welcome-file>index.html</welcome-file>
<welcome-file>index.htm</welcome-file>
<welcome-file>index.jsp</welcome-file>
</welcome-file-list>
<!-- ================ Security Constraints for Testing =============== -->
<!--
<security-constraint>
<web-resource-collection>
<web-resource-name>The Entire Web Application</web-resource-name>
<url-pattern>/*</url-pattern>
</web-resource-collection>
<auth-constraint>
<role-name>tomcat</role-name>
</auth-constraint>
</security-constraint>
<login-config>
<auth-method>BASIC</auth-method>
<realm-name>Tomcat Supported Realm</realm-name>
</login-config>
<security-role>
<description>
An example role defined in "conf/tomcat-users.xml"
</description>
<role-name>tomcat</role-name>
</security-role>
-->
</web-app>
1.1
jakarta-struts/contrib/scaffold/src/sample/main/org/apache/scaffold/http/TestHelperAction.java
Index: TestHelperAction.java
===================================================================
package org.apache.scaffold.http;
import java.util.Locale;
import junit.framework.Test;
import junit.framework.TestSuite;
import org.apache.cactus.ServletTestCase;
import org.apache.cactus.WebRequest;
/**
* Integration unit tests for <code>HelperAction</code>.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Vincent Massol</a>
*/
public class TestHelperAction extends ServletTestCase
{
/**
* Defines the testcase name for JUnit.
*
* @param theName the testcase's name.
*/
public TestHelperAction(String theName)
{
super(theName);
}
/**
* Start the tests.
*
* @param theArgs the arguments. Not used
*/
public static void main(String[] theArgs)
{
junit.swingui.TestRunner.main(new String[] {
TestHelperAction.class.getName()});
}
/**
* @return a test suite (<code>TestSuite</code>) that includes all methods
* starting with "test"
*/
public static Test suite()
{
// All methods starting with "test" will be executed in the test suite.
return new TestSuite(TestHelperAction.class);
}
//-------------------------------------------------------------------------
/**
* Verify that calling <code>getLocale()</code> with no locale defined in
* the request and no session returns the default locale.
*/
public void beginGetLocaleNoLocaleInRequestNoSession(WebRequest request)
{
request.setAutomaticSession(false);
}
/**
* Verify that calling <code>getLocale()</code> with no locale defined in
* the request and no session returns the default locale.
*/
public void testGetLocaleNoLocaleInRequestNoSession()
{
HelperAction helper = new HelperAction();
Locale locale = helper.getLocale(request);
assertEquals(Locale.getDefault(), locale);
}
//-------------------------------------------------------------------------
}
/*
* $Header:
/home/cvs/jakarta-struts/contrib/scaffold/src/sample/main/org/apache/scaffold/http/TestHelperAction.java,v
1.1 2001/12/28 13:34:58 vmassol Exp $
* $Revision: 1.1 $
* $Date: 2001/12/28 13:34:58 $
*
* ====================================================================
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution, if
* any, must include the following acknowlegement:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
* 4. The names "The Jakarta Project", "Scaffold", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache"
* nor may "Apache" appear in their names without prior written
* permission of the Apache Group.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
*/
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
