sraeburn 2003/08/09 23:00:49
Modified: contrib/struts-el build-webapp.xml build-tests.xml
build.properties.sample
doc/userGuide installation.xml configuration.xml
. build-all-clean.bat.sample build.xml
build-webapp.xml build.properties.sample
build-tests.xml
src/share/org/apache/struts/config DataSourceConfig.java
conf/share MANIFEST.MF
src/share/org/apache/struts/action ActionServlet.java
doc/faqs database.xml
Removed: contrib/struts-legacy/src/conf MANIFEST.MF
contrib/struts-legacy build.xml LICENSE.txt STATUS.txt
build.properties.sample
contrib/struts-legacy/src/jdk/1.3/org/apache/struts/legacy
GenericConnection.java
src/share/org/apache/struts/util GenericDataSource.java
contrib/struts-legacy/src/java/org/apache/struts/legacy
package.html GenericDataSource.java
contrib/struts-legacy/src/jdk/1.4/org/apache/struts/legacy
GenericConnection.java
Log:
Removed GenericDataSource and struts-legacy
Revision Changes Path
1.6 +0 -5 jakarta-struts/contrib/struts-el/build-webapp.xml
Index: build-webapp.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/contrib/struts-el/build-webapp.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build-webapp.xml 7 Jun 2003 21:53:28 -0000 1.5
+++ build-webapp.xml 10 Aug 2003 06:00:48 -0000 1.6
@@ -77,10 +77,6 @@
servlet API classes you wish to
compile against.
- struts-legacy.jar (required). The path to the JAR file
- of the Jakarta Struts Legacy
- package (version 1.0 or later).
-
struts.libs If specified, must be the pathname of a
directory from which "struts.jar" will be
copied to your WEB-INF/lib directory, and
@@ -181,7 +177,6 @@
<pathelement location="${commons-validator.jar}"/>
<pathelement location="${jdbc20ext.jar}"/>
<pathelement location="${servlet.jar}"/>
- <pathelement location="${struts-legacy.jar}"/>
<pathelement location="${struts.libs}/struts.jar"/>
<pathelement location="${struts.libs}/struts-el.jar"/>
<pathelement location="${webapp.libs}"/>
1.7 +0 -3 jakarta-struts/contrib/struts-el/build-tests.xml
Index: build-tests.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/contrib/struts-el/build-tests.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build-tests.xml 7 Jun 2003 21:53:28 -0000 1.6
+++ build-tests.xml 10 Aug 2003 06:00:48 -0000 1.7
@@ -111,7 +111,6 @@
<pathelement location="${xalanj.jar}"/>
<pathelement location="${jtidy.jar}"/>
<pathelement location="${servlet.jar}"/>
- <pathelement location="${struts-legacy.jar}"/>
<pathelement location="${struts.jar}"/>
<pathelement location="${jstl.jar}"/>
<pathelement location="${jstl-standard.jar}"/>
@@ -202,8 +201,6 @@
<copy file="${commons-logging.jar}"
todir="${out.test.dir}/lib"/>
<copy file="${commons-validator.jar}"
- todir="${out.test.dir}/lib"/>
- <copy file="${struts-legacy.jar}"
todir="${out.test.dir}/lib"/>
<war warfile="${out.test.dir}/test.war"
1.6 +1 -5 jakarta-struts/contrib/struts-el/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-struts/contrib/struts-el/build.properties.sample,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build.properties.sample 7 Jun 2003 21:53:28 -0000 1.5
+++ build.properties.sample 10 Aug 2003 06:00:48 -0000 1.6
@@ -48,10 +48,6 @@
# the the Jakarta ORO project.
jakarta-oro.jar = <path to jakarta-oro.jar>
-# The JAR file containing version 1.0 (or later) of the Struts Legacy package
-# from the Jakarta Struts contrib area.
-struts-legacy.jar = <path to struts-legacy.jar>
-
# Properties related to Struts unit testing
# -----------------------------------------
1.32 +0 -2 jakarta-struts/doc/userGuide/installation.xml
Index: installation.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/doc/userGuide/installation.xml,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- installation.xml 26 Jul 2003 03:56:25 -0000 1.31
+++ installation.xml 10 Aug 2003 06:00:48 -0000 1.32
@@ -352,8 +352,6 @@
Validator package JAR file from the Jakarta Commons project.</li>
<li><strong>servletapi.home</strong> - Pathname to the directory of
your binary distribution of the Servlet API classes.</li>
- <li><strong>struts-legacy.jar</strong> - Pathname of the Struts Legacy
- package JAR file from the Jakarta Struts contrib area.</li>
<li><strong>tomcat.home</strong> - Pathname to the directory of your
binary distribution of Tomcat 3.2 (required only if you wish to
use the <code>deploy.tomcat</code> target).</li>
1.24 +5 -12 jakarta-struts/doc/userGuide/configuration.xml
Index: configuration.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/doc/userGuide/configuration.xml,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- configuration.xml 8 Jul 2003 00:30:33 -0000 1.23
+++ configuration.xml 10 Aug 2003 06:00:48 -0000 1.24
@@ -381,13 +381,6 @@
And other sundry properties.
</p>
- <p>
- As a further convenience, Struts provides a default DataSource
- implementation, [<code>org.apache.struts.util.GenericDataSource</code>].
- The <code>type</code> property can be used to specify another
- implementation:
- </p>
-
<pre><code><![CDATA[
<data-source type="org.apache.commons.dbcp.BasicDataSource">
<!-- ... set-property elements ... -->
@@ -395,11 +388,11 @@
]]></code></pre>
<p>
- In Struts 1.1, the GenericDataSource is deprecated, and it is
- recommended that you use the Commons BasicDataSource instead.
- In practice, if you need to use the DataSource manager, you should use
- whatever DataSource implementation works best with your container or
- database.
+ In Struts 1.2.0, the GenericDataSource has been removed, and it is
+ recommended that you use the Commons BasicDataSource or other DataSource
+ implementation instead. In practice, if you need to use the DataSource
+ manager, you should use whatever DataSource implementation works best
+ with your container or database.
</p>
<p>
1.9 +1 -4 jakarta-struts/build-all-clean.bat.sample
Index: build-all-clean.bat.sample
===================================================================
RCS file: /home/cvs/jakarta-struts/build-all-clean.bat.sample,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- build-all-clean.bat.sample 7 Jun 2003 21:53:28 -0000 1.8
+++ build-all-clean.bat.sample 10 Aug 2003 06:00:49 -0000 1.9
@@ -66,9 +66,6 @@
cd ..\fileupload
call maven
-cd ..\..\jakarta-struts-current\contrib\struts-legacy
-call ant %CLEAN% dist
-
cd ..\..\
call ant %CLEAN% dist
1.119 +2 -28 jakarta-struts/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/build.xml,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- build.xml 9 Aug 2003 19:29:30 -0000 1.118
+++ build.xml 10 Aug 2003 06:00:49 -0000 1.119
@@ -65,10 +65,6 @@
compile against.
[Version 2.2 or 2.3]
- struts-legacy.jar The path to the JAR file of the Jakarta
- Struts Legacy package.
- [Version 1.0 or later]
-
OPTIONAL PROPERTIES
@@ -205,14 +201,10 @@
<!-- Web directory -->
<property name="web.dir" value="web"/>
- <!-- Pointer to struts-legacy.jar -->
- <property name="struts-legacy.jar"
value="${basedir}/contrib/struts-legacy/dist/struts-legacy.jar"/>
-
<!-- Compilation Classpath -->
<path id="compile.classpath">
<pathelement location="${commons-beanutils.jar}"/>
<pathelement location="${commons-collections.jar}"/>
- <pathelement location="${struts-legacy.jar}"/>
<pathelement location="${commons-digester.jar}"/>
<pathelement location="${commons-fileupload.jar}"/>
<pathelement location="${commons-lang.jar}"/>
@@ -266,8 +258,6 @@
tofile="${build.home}/library/commons-beanutils.jar"/>
<copy file="${commons-collections.jar}"
tofile="${build.home}/library/commons-collections.jar"/>
- <copy file="${struts-legacy.jar}"
- tofile="${build.home}/library/struts-legacy.jar"/>
<copy file="${commons-digester.jar}"
tofile="${build.home}/library/commons-digester.jar"/>
<copy file="${commons-fileupload.jar}"
@@ -415,14 +405,6 @@
<copy file="README" tofile="${dist.home}/README"/>
</target>
-<!--
- Construct distributable struts legacy support for datasources
--->
- <target name="dist.legacy" >
- <ant antfile="build.xml" dir="contrib/struts-legacy"
- target="dist"/>
- </target>
-
<!--
Build the contrib modules that are packaged with the binary
@@ -448,7 +430,7 @@
Construct complete binary distribution
-->
<target name="dist"
- depends="dist.legacy,dist.library,dist.webapps,dist.source,dist.contrib"
+ depends="dist.library,dist.webapps,dist.source,dist.contrib"
description="Construct binary distribution"/>
<!--
@@ -740,14 +722,6 @@
</target>
<!--
- Clean struts legacy distribution
--->
- <target name="clean.legacy" >
- <ant antfile="build.xml" dir="contrib/struts-legacy"
- inheritall="false" target="clean"/>
- </target>
-
-<!--
Clean contrib distribution
-->
<target name="clean.contrib" >
@@ -758,7 +732,7 @@
<!--
Clean up build and distribution directories
-->
- <target name="clean" depends="clean.legacy, clean.contrib"
+ <target name="clean" depends="clean.contrib"
description="Clean build and distribution directories">
<delete dir="${build.home}"/>
<delete dir="${dist.home}"/>
1.15 +0 -5 jakarta-struts/build-webapp.xml
Index: build-webapp.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/build-webapp.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- build-webapp.xml 7 Jun 2003 21:53:28 -0000 1.14
+++ build-webapp.xml 10 Aug 2003 06:00:49 -0000 1.15
@@ -77,10 +77,6 @@
servlet API classes you wish to
compile against.
- struts-legacy.jar (required). The path to the JAR file
- of the Jakarta Struts Legacy
- package (version 1.0 or later).
-
struts.libs If specified, must be the pathname of a
directory from which "struts.jar" will be
copied to your WEB-INF/lib directory, and
@@ -178,7 +174,6 @@
<pathelement location="${commons-lang.jar}"/>
<pathelement location="${commons-logging.jar}"/>
<pathelement location="${commons-validator.jar}"/>
- <pathelement location="${struts-legacy.jar}"/>
<pathelement location="${jdbc20ext.jar}"/>
<pathelement location="${servlet.jar}"/>
<pathelement location="${struts.libs}/struts.jar"/>
1.46 +1 -10 jakarta-struts/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-struts/build.properties.sample,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- build.properties.sample 1 Aug 2003 04:55:51 -0000 1.45
+++ build.properties.sample 10 Aug 2003 06:00:49 -0000 1.46
@@ -80,15 +80,6 @@
# version 2.2 or 2.3)
servlet.jar=${apache.home}/jakarta-servletapi/lib/servlet.jar
-# The JAR file containing the Struts Legacy package (Version 1.0 or later)
-# from the Struts contrib area.
-struts-legacy.jar=contrib/struts-legacy/dist/struts-legacy.jar
-
-# Specify the jdk.version you are using. This is used to determine which src
-# to build for struts.legacy (See contrib/struts-legacy for further details)
-# The default is 1.3
-jdk.version=1.3
-
# The directory containing your binary distribution of Tomcat 3.3, from CVS
# module "jakarta-tomcat" (and branch "TOMCAT_32") at jakarta.apache.org.
# This is only required if you are going to execute the "deploy.tomcat" target.
1.22 +0 -3 jakarta-struts/build-tests.xml
Index: build-tests.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/build-tests.xml,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- build-tests.xml 1 Aug 2003 04:56:02 -0000 1.21
+++ build-tests.xml 10 Aug 2003 06:00:49 -0000 1.22
@@ -113,7 +113,6 @@
<pathelement location="${cactus.jar}"/>
<pathelement location="${junit.jar}"/>
<pathelement location="${servlet.jar}"/>
- <pathelement location="${struts-legacy.jar}"/>
<pathelement location="${struts.jar}"/>
</path>
@@ -207,8 +206,6 @@
<copy file="${commons-logging.jar}"
todir="${out.test.dir}/lib"/>
<copy file="${commons-validator.jar}"
- todir="${out.test.dir}/lib"/>
- <copy file="${struts-legacy.jar}"
todir="${out.test.dir}/lib"/>
<war warfile="${out.test.dir}/test.war"
webxml="${conf.test.dir}/web.xml">
1.8 +5 -5
jakarta-struts/src/share/org/apache/struts/config/DataSourceConfig.java
Index: DataSourceConfig.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/config/DataSourceConfig.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DataSourceConfig.java 24 Jul 2002 05:28:05 -0000 1.7
+++ DataSourceConfig.java 10 Aug 2003 06:00:49 -0000 1.8
@@ -132,7 +132,7 @@
* The fully qualified class name of the <code>javax.sql.DataSource</code>
* implementation class.
*/
- protected String type = "org.apache.struts.util.GenericDataSource";
+ protected String type;
public String getType() {
return (this.type);
1.8 +1 -2 jakarta-struts/conf/share/MANIFEST.MF
Index: MANIFEST.MF
===================================================================
RCS file: /home/cvs/jakarta-struts/conf/share/MANIFEST.MF,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- MANIFEST.MF 26 Jun 2003 01:14:24 -0000 1.7
+++ MANIFEST.MF 10 Aug 2003 06:00:49 -0000 1.8
@@ -13,5 +13,4 @@
commons-digester.jar
commons-logging.jar
commons-validator.jar
- jakarta-oro.jar
- struts-legacy.jar
\ No newline at end of file
+ jakarta-oro.jar
\ No newline at end of file
1.167 +4 -8
jakarta-struts/src/share/org/apache/struts/action/ActionServlet.java
Index: ActionServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/ActionServlet.java,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- ActionServlet.java 8 Aug 2003 23:26:36 -0000 1.166
+++ ActionServlet.java 10 Aug 2003 06:00:49 -0000 1.167
@@ -106,7 +106,6 @@
import org.apache.struts.config.ModuleConfig;
import org.apache.struts.config.ModuleConfigFactory;
import org.apache.struts.config.PlugInConfig;
-import org.apache.struts.util.GenericDataSource;
import org.apache.struts.util.MessageResources;
import org.apache.struts.util.MessageResourcesFactory;
import org.apache.struts.util.ModuleUtils;
@@ -814,9 +813,6 @@
ds = (DataSource)
RequestUtils.applicationInstance(dscs[i].getType());
BeanUtils.populate(ds, dscs[i].getProperties());
- if (ds instanceof GenericDataSource) {
- ((GenericDataSource) ds).open();
- }
ds.setLogWriter(scw);
} catch (Exception e) {
1.9 +4 -39 jakarta-struts/doc/faqs/database.xml
Index: database.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/doc/faqs/database.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- database.xml 12 Jun 2003 01:15:12 -0000 1.8
+++ database.xml 10 Aug 2003 06:00:49 -0000 1.9
@@ -84,48 +84,13 @@
The Jakarta Commons dbcp's BasicDataSource
[<code>org.apache.commons.dbcp.BasicDataSource</code>] also works well
with the DataSource manager, if a native component is not available.
- The Struts distribution includes a Generic DataSource class in its util
- package, but this is a very simple implementation.
- The Generic DataSource is deprecated and will be removed in a future
- release in favor of plugging in the BasicDataSource, or another
- DataSource implementation.
</p>
-
+
<p>
- This is how you would specify a default data source for your application
- from the struts-config.xml:
+ <b>Note:</b> The Generic DataSource which was included with previous
+ versions of Struts has been removed as of release 1.2.0 in favor of
+ plugging in the BasicDataSource, or another DataSource implementation.
</p>
-
-<pre><code><![CDATA[
- <!-- configuration for GenericDataSource wrapper -->
- <data-source>
- <set-property
- property="autoCommit"
- value="false"/>
- <set-property
- property="description"
- value="Example Data Source Configuration"/>
- <set-property
- property="driverClass"
- value="org.postgresql.Driver"/>
- <set-property
- property="maxCount"
- value="4"/>
- <set-property
- property="minCount"
- value="2"/>
- <set-property
- property="password"
- value="mypassword"/>
- <set-property
- property="url"
- value="jdbc:postgresql://localhost/mydatabase"/>
- <set-property
- property="user"
- value="myusername"/>
- </data-source>
- </data-sources>
- ]]></code></pre>
<p>
This is how you would specify a DBCP BasicDataSource for your application:
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
