husted 2004/07/08 06:22:24
Modified: . build-webapp.xml build.properties.sample build.xml
project.xml
doc/userGuide installation.xml
Log:
(Hopefully) final round of changes before tagging 1.2.1.
Revision Changes Path
1.17 +0 -1 jakarta-struts/build-webapp.xml
Index: build-webapp.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/build-webapp.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- build-webapp.xml 7 Jul 2004 11:12:02 -0000 1.16
+++ build-webapp.xml 8 Jul 2004 13:22:23 -0000 1.17
@@ -173,7 +173,6 @@
<pathelement location="${commons-fileupload.jar}"/>
<pathelement location="${commons-logging.jar}"/>
<pathelement location="${commons-validator.jar}"/>
- <pathelement location="${jdbc20ext.jar}"/>
<pathelement location="${servlet.jar}"/>
<pathelement location="${struts.libs}/struts.jar"/>
<pathelement location="${webapp.libs}"/>
1.53 +8 -18 jakarta-struts/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-struts/build.properties.sample,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- build.properties.sample 8 Mar 2004 23:27:34 -0000 1.52
+++ build.properties.sample 8 Jul 2004 13:22:23 -0000 1.53
@@ -32,31 +32,31 @@
# if you are going to execute the "deploy.catalina" target.
catalina.home=${apache.home}/jakarta-tomcat-4.0.6
-# The JAR file containing the Beanutils package (Version 1.6.1 or later)
+# The JAR file containing the Beanutils package (see Installation page)
# from the Jakarta Commons project.
commons-beanutils.jar=${commons-lib.home}/beanutils/dist/commons-beanutils.jar
-# The JAR file containing the Collections package (Version 2.1 or later)
+# The JAR file containing the Collections package (see Installation page)
# from the Jakarta Commons project.
commons-collections.jar=${commons-lib.home}/collections/dist/commons-collections.jar
-# The JAR file containing the Digester package (Version 1.5 or later)
+# The JAR file containing the Digester package (see Installation page)
# from the Jakarta Commons project.
commons-digester.jar=${commons-lib.home}/digester/dist/commons-digester.jar
-# The JAR file containing the FileUpload package (Version 1.0 or later)
+# The JAR file containing the FileUpload package (see Installation page)
# from the Jakarta Commons project.
commons-fileupload.jar=${commons-lib.home}/fileupload/dist/commons-fileupload-1.0.jar
-# The JAR file containing the Lang package (Version 1.0.1 or later)
+# The JAR file containing the Lang package (see Installation page)
# from the Jakarta Commons project.
commons-lang.jar=${commons-lib.home}/lang/dist/commons-lang-2.0.jar
-# The JAR file containing the Logging package (Version 1.0.3 or later)
+# The JAR file containing the Logging package (see Installation page)
# from the Jakarta Commons project.
commons-logging.jar=${commons-lib.home}/logging/dist/commons-logging.jar
-# The JAR file containing the Validator package (Version 1.1.2 or later)
+# The JAR file containing the Validator package (see Installation page)
# from the Jakarta Commons project.
commons-validator.jar=${commons-lib.home}/validator/dist/commons-validator.jar
@@ -106,16 +106,6 @@
# you do not have PMD installed, do not set this property.
pmd.home = /Java/Programs/SourceForge/pmd-1.2.1
-#############################Maven Variables #######################################
-# CVS Start Change Log date
-cvs.start=17 April 2003
-
-
-# If you are using ssh tunneling & have a .cvspass file setup
-cvs.developer.host=localhost
-cvs.developer.id=rleland
-
-#############################End of Maven Variables
#######################################
# Properties related to Struts Contrib
# -----------------------------------------
1.133 +1 -1 jakarta-struts/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/build.xml,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- build.xml 7 Jul 2004 17:00:25 -0000 1.132
+++ build.xml 8 Jul 2004 13:22:23 -0000 1.133
@@ -148,7 +148,7 @@
<property name="project.name" value="jakarta-struts"/>
<!-- Version of the project -->
- <property name="project.version" value="1.2.1-dev"/>
+ <property name="project.version" value="1.2.1"/>
<!-- ========== Derived Properties ======================================== -->
1.30 +21 -10 jakarta-struts/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/project.xml,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- project.xml 24 Jun 2004 00:34:56 -0000 1.29
+++ project.xml 8 Jul 2004 13:22:24 -0000 1.30
@@ -6,20 +6,20 @@
<currentVersion>1.2.1-dev</currentVersion>
<organization>
<name>The Apache Software Foundation</name>
- <url>http://jakarta.apache.org/</url>
- <logo>http://jakarta.apache.org/images/jakarta-logo.gif</logo>
+ <url>http://struts.apache.org/</url>
+ <logo>http://struts.apache.org/images/jakarta-logo.gif</logo>
</organization>
<!-- <logo>/images/struts-blue.gif</logo>-->
- <logo>http://jakarta.apache.org/struts/images/struts.gif</logo>
+ <logo>http://struts.apache.org/struts/images/struts.gif</logo>
<inceptionYear>2000</inceptionYear>
<package>org.apache.struts</package>
<shortDescription>MVC Web Application Framework</shortDescription>
<!-- Gump integration -->
<gumpRepositoryId>jakarta</gumpRepositoryId>
<description>The core of the Struts framework is a flexible control layer based
on standard technologies like Java Servlets, JavaBeans, ResourceBundles, and
Extensible Markup Language (XML), as well as various Jakarta Commons packages. Struts
encourages application architectures based on the Model 2 approach, a variation of the
classic Model-View-Controller (MVC) design paradigm. Struts provides its own
Controller component and integrates with other technologies to provide the Model and
the View. For the Model, Struts can interact with any standard data access technology,
including Enterprise Java Beans, JDBC, and Object Relational Bridge. For the View,
Struts works well with JavaServer Pages, including JSTL and JSF, as well as Velocity
Templates, XSLT, and other presentation systems. The Struts framework provides the
invisible underpinnings every professional web application needs to survive. Struts
helps you create an extensible development environment for your application, based on
published standards and proven design patterns.</description>
- <url>http://jakarta.apache.org/</url>
+ <url>http://struts.apache.org/</url>
<issueTrackingUrl>http://issues.apache.org/bugzilla/</issueTrackingUrl>
- <siteAddress>jakarta.apache.org/struts</siteAddress>
+ <siteAddress>struts.apache.org</siteAddress>
<siteDirectory>/www/jakarta.apache.org/struts</siteDirectory>
<distributionDirectory>/www/apache.mirrors.pair.com/jakarta/struts/</distributionDirectory>
<repository>
@@ -43,18 +43,23 @@
<name>1.2.0</name>
<tag>STRUTS_1_2_0</tag>
</version>
+ <version>
+ <id>1.2.1</id>
+ <name>1.2.1</name>
+ <tag>STRUTS_1_2_1</tag>
+ </version>
</versions>
<mailingLists>
<mailingList>
<name>Struts User List</name>
- <subscribe>[EMAIL PROTECTED]</subscribe>
- <unsubscribe>[EMAIL PROTECTED]</unsubscribe>
+ <subscribe>[EMAIL PROTECTED]</subscribe>
+ <unsubscribe>[EMAIL PROTECTED]</unsubscribe>
<archive>http://mail-archives.apache.org/eyebrowse/SummarizeList?listId=42</archive>
</mailingList>
<mailingList>
<name>Struts Developer List</name>
- <subscribe>[EMAIL PROTECTED]</subscribe>
- <unsubscribe>[EMAIL PROTECTED]</unsubscribe>
+ <subscribe>[EMAIL PROTECTED]</subscribe>
+ <unsubscribe>[EMAIL PROTECTED]</unsubscribe>
<archive>http://mail-archives.apache.org/eyebrowse/SummarizeList?listId=41</archive>
</mailingList>
</mailingLists>
@@ -149,6 +154,12 @@
<email>germuska at apache.org</email>
<organization></organization>
</developer>
+ <developer>
+ <id>niallp</id>
+ <name>Niall Pemberton</name>
+ <email>niallp at apache.org</email>
+ <organization></organization>
+ </developer>
</developers>
<contributors>
<contributor>
@@ -205,7 +216,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.0.3</version>
+ <version>1.0.4</version>
<url>http://jakarta.apache.org/commons/logging.html</url>
<properties>
<war.bundle>true</war.bundle>
1.42 +25 -16 jakarta-struts/doc/userGuide/installation.xml
Index: installation.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/doc/userGuide/installation.xml,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- installation.xml 7 Jul 2004 11:12:02 -0000 1.41
+++ installation.xml 8 Jul 2004 13:22:24 -0000 1.42
@@ -62,18 +62,24 @@
<li><strong>Ant Build System</strong> - If you are building Struts from the
source distribution, you must download and install version 1.5.4 (or later)
of the <a href="http://jakarta.apache.org/ant";>Ant</a> build system.
- This package is also strongly recommended for use in developing your
- own web applications based on Struts.
<ul>
<li>Make sure that the "ant" and "ant.bat" scripts are executable, by
adding the $ANT_HOME/bin directory to your PATH environment
variable.</li>
- </ul>
+ <li>
+ Copy and review either the "build.properties.sample" or
+ "build.properties.sample.lib" file as "build.properties".
+ The latter is recommended if you are not active in Jakarta
+ Commons development.
+ </li>
+ <li>
<a href="http://maven.apache.org/";>Maven</a> property files are also
provided, but the Maven build is still experimental. New developers
may find Maven easier to use, since it acquires the appropriate JARs
automatically.
</li>
+ </ul>
+ </li>
<li><strong>Servlet API Classes</strong> - In order to compile Struts itself,
or applications that use Struts, you will need a <code>servlet.jar</code>
@@ -96,13 +102,14 @@
build Struts from source:
<ul>
<li><a href="http://www.antlr.org/";>ANTLR</a> (Version 2.7.2)</li>
- <li><a href="http://jakarta.apache.org/commons/beanutils/";>Commons
Beanutils</a> (Version 1.6.1)</li>
- <li><a href="http://jakarta.apache.org/commons/collections/";>Commons
Collections</a> (Version 2.1)</li>
- <li><a href="http://jakarta.apache.org/commons/digester/";>Commons
Digester</a> (Version 1.5)</li>
- <li><a href="http://jakarta.apache.org/commons/fileupload/";>Commons
FileUpload</a> (Version 1.0)</li>
- <li><a href="http://jakarta.apache.org/commons/logging/";>Commons Logging</a>
(Version 1.0.4)</li>
- <li><a href="http://jakarta.apache.org/commons/validator/";>Commons
Validator</a> (Version 1.1.3) </li>
- <li><a href="http://jakarta.apache.org/oro/";>Jakarta ORO</a> (Version 2.0.7
or later)</li>
+ <li><a href="http://jakarta.apache.org/commons/beanutils/";>Jakarta Commons
Beanutils</a> (Version 1.6.1)</li>
+ <li><a href="http://jakarta.apache.org/commons/collections/";>Jakarta Commons
Collections</a> (Version 2.1)</li>
+ <li><a href="http://jakarta.apache.org/commons/digester/";>Jakarta Commons
Digester</a> (Version 1.5)</li>
+ <li><a href="http://jakarta.apache.org/commons/fileupload/";>Jakarta Commons
FileUpload</a> (Version 1.0)</li>
+ <li><a href="http://jakarta.apache.org/commons/logging/";>Jakarta Commons
Logging</a> (Version 2.0)</li>
+ <li><a href="http://jakarta.apache.org/commons/logging/";>Jakarta Commons
Logging</a> (Version 1.0.4)</li>
+ <li><a href="http://jakarta.apache.org/commons/validator/";>Jakarta Commons
Validator</a> (Version 1.1.3) </li>
+ <li><a href="http://jakarta.apache.org/oro/";>Jakarta ORO</a> (Version
2.0.7)</li>
</ul>
ANTLR is a <a href="http://antlr.org/license.html";>public domain library</a>;
all other libraries are distributed under the
@@ -122,12 +129,14 @@
<a href="http://xml.apache.org/xalan";>here</a>.
</li>
- <li><strong>Cactus Testing</strong> - If you plan on testing the Struts
applications
- in this distribution, you must download and install version 1.3
- of the <a href="http://jakarta.apache.org/cactus";>Cactus</a> test framework.
- This package is also recommended for use in developing your
- own unit tests for your web applications based on Struts.
- </li>
+ <li><strong>Unit tests</strong> - To verify your build against the JUnit and
+ Cactus unit tests, three other packages must be available:
+ <ul>
+ <li><a href="http://jakarta.apache.org/cactus";>Jakarta Cactus</a> (Version
1.4.1)</li>
+ <li><a href="http://jakarta.apache.org/commons/lang/";>Jakarta Commons
Lang</a> (Version 2.0)</li>
+ <li><a href="http://www.junit.org";>JUnit</a> (Version 3.8.1)</li>
+ </ul>
+ </li>
</ul>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
