craigmcc 02/01/21 17:18:07
Modified: . build-webapp.xml build.xml
src/share/org/apache/struts/action Action.java
ActionServlet.java
src/share/org/apache/struts/taglib/html ImgTag.java
Log:
Add dependencies on commons-services.jar and commons-validator.jar, and
copy them into the "target/library" directory.
Clean up warnings when creating Javadocs for the core classes.
Revision Changes Path
1.8 +10 -0 jakarta-struts/build-webapp.xml
Index: build-webapp.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/build-webapp.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- build-webapp.xml 16 Jan 2002 03:05:22 -0000 1.7
+++ build-webapp.xml 22 Jan 2002 01:18:07 -0000 1.8
@@ -69,6 +69,14 @@
of the Jakarta Commons POOL
package (version 1.0 or later).
+ commons-services.jar (required). The path to the JAR file
+ of the Jakarta Commons SERVICES
+ package (version 1.0 or later).
+
+ commons-validator.jar (required). The path to the JAR file
+ of the Jakarta Commons VALIDATOR
+ package (version 1.0 or later).
+
servlet.jar MUST be set to the pathname of the
servlet API classes you wish to
compile against.
@@ -169,6 +177,8 @@
<pathelement location="${commons-digester.jar}"/>
<pathelement location="${commons-logging.jar}"/>
<pathelement location="${commons-pool.jar}"/>
+ <pathelement location="${commons-services.jar}"/>
+ <pathelement location="${commons-validator.jar}"/>
<pathelement location="${jdbc20ext.jar}"/>
<pathelement location="${servlet.jar}"/>
<pathelement location="${struts.libs}/struts.jar"/>
1.60 +20 -1 jakarta-struts/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/build.xml,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- build.xml 16 Jan 2002 03:05:22 -0000 1.59
+++ build.xml 22 Jan 2002 01:18:07 -0000 1.60
@@ -48,6 +48,14 @@
of the Jakarta Commons POOL
package (version 1.0 or later).
+ commons-services.jar (required). The path to the JAR file
+ of the Jakarta Commons SERVICES
+ package (version 1.0 or later).
+
+ commons-validator.jar (required). The path to the JAR file
+ of the Jakarta Commons VALIDATOR
+ package (version 1.0 or later).
+
jdbc20ext.jar (required). The path to the JAR file
for the JDBC 2.0 Optional Package APIs.
@@ -163,8 +171,11 @@
<pathelement location="${commons-digester.jar}"/>
<pathelement location="${commons-logging.jar}"/>
<pathelement location="${commons-pool.jar}"/>
+ <pathelement location="${commons-services.jar}"/>
+ <pathelement location="${commons-validator.jar}"/>
<pathelement location="${jdbc20ext.jar}"/>
<pathelement location="${servlet.jar}"/>
+ <pathelement location="${xerces.jar}"/>
</path>
@@ -182,6 +193,8 @@
<pathelement location="${commons-digester.jar}"/>
<pathelement location="${commons-logging.jar}"/>
<pathelement location="${commons-pool.jar}"/>
+ <pathelement location="${commons-services.jar}"/>
+ <pathelement location="${commons-validator.jar}"/>
<pathelement location="${servlet.jar}"/>
<pathelement location="${junit.jar}"/>
<pathelement location="${jdbc20ext.jar}"/>
@@ -236,6 +249,10 @@
tofile="${build.home}/library/commons-logging.jar"/>
<copy file="${commons-pool.jar}"
tofile="${build.home}/library/commons-pool.jar"/>
+ <copy file="${commons-services.jar}"
+ tofile="${build.home}/library/commons-services.jar"/>
+ <copy file="${commons-validator.jar}"
+ tofile="${build.home}/library/commons-validator.jar"/>
<copy file="${jdbc20ext.jar}"
tofile="${build.home}/library/jdbc2_0-stdext.jar"/>
</target>
@@ -304,7 +321,9 @@
version="true"
windowtitle="Apache Struts API Documentation"
doctitle="<h1>Apache Struts Framework (Version
${project.version})</h1>"
- bottom="Copyright © 2000-2001 - Apache Software Foundation"/>
+ bottom="Copyright © 2000-2001 - Apache Software Foundation">
+ <classpath refid="compile.classpath"/>
+ </javadoc>
</target>
<!--
1.36 +5 -6 jakarta-struts/src/share/org/apache/struts/action/Action.java
Index: Action.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/action/Action.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- Action.java 17 Jan 2002 00:15:05 -0000 1.35
+++ Action.java 22 Jan 2002 01:18:07 -0000 1.36
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/Action.java,v 1.35
2002/01/17 00:15:05 craigmcc Exp $
- * $Revision: 1.35 $
- * $Date: 2002/01/17 00:15:05 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/Action.java,v 1.36
2002/01/22 01:18:07 craigmcc Exp $
+ * $Revision: 1.36 $
+ * $Date: 2002/01/22 01:18:07 $
*
* ====================================================================
*
@@ -109,7 +109,7 @@
* by this Action.</p>
*
* @author Craig R. McClanahan
- * @version $Revision: 1.35 $ $Date: 2002/01/17 00:15:05 $
+ * @version $Revision: 1.36 $ $Date: 2002/01/22 01:18:07 $
*/
public class Action {
@@ -518,8 +518,7 @@
* skipped by the controller servlet.
*
* @param request The servlet request we are processing
- * @see org.apache.struts.taglib.CancelTag
- * @see org.apache.struts.action.ValidatingActionForm
+ * @see org.apache.struts.taglib.html.CancelTag
*/
protected boolean isCancelled(HttpServletRequest request) {
1.89 +4 -6
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.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- ActionServlet.java 20 Jan 2002 05:34:08 -0000 1.88
+++ ActionServlet.java 22 Jan 2002 01:18:07 -0000 1.89
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/ActionServlet.java,v 1.88
2002/01/20 05:34:08 craigmcc Exp $
- * $Revision: 1.88 $
- * $Date: 2002/01/20 05:34:08 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/ActionServlet.java,v 1.89
2002/01/22 01:18:07 craigmcc Exp $
+ * $Revision: 1.89 $
+ * $Date: 2002/01/22 01:18:07 $
*
* ====================================================================
*
@@ -98,8 +98,6 @@
import org.apache.struts.util.MessageResourcesFactory;
import org.apache.struts.util.RequestUtils;
import org.apache.struts.util.ServletContextWriter;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
/**
@@ -266,7 +264,7 @@
*
* @author Craig R. McClanahan
* @author Ted Husted
- * @version $Revision: 1.88 $ $Date: 2002/01/20 05:34:08 $
+ * @version $Revision: 1.89 $ $Date: 2002/01/22 01:18:07 $
*/
public class ActionServlet
1.16 +4 -9
jakarta-struts/src/share/org/apache/struts/taglib/html/ImgTag.java
Index: ImgTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/ImgTag.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ImgTag.java 13 Jan 2002 03:38:38 -0000 1.15
+++ ImgTag.java 22 Jan 2002 01:18:07 -0000 1.16
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/ImgTag.java,v 1.15
2002/01/13 03:38:38 craigmcc Exp $
- * $Revision: 1.15 $
- * $Date: 2002/01/13 03:38:38 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/ImgTag.java,v 1.16
2002/01/22 01:18:07 craigmcc Exp $
+ * $Revision: 1.16 $
+ * $Date: 2002/01/22 01:18:07 $
*
* ====================================================================
*
@@ -95,7 +95,7 @@
*
* @author Michael Westbay
* @author Craig McClanahan
- * @version $Revision: 1.15 $
+ * @version $Revision: 1.16 $
*/
public class ImgTag extends BaseHandlerTag {
@@ -623,15 +623,10 @@
/**
* Return the specified src URL, modified as necessary with optional
* request parameters.
- * <p>
- * This is based on the way a
- * <a href="LinkTag.html#hyperlink">hyperlink</a>
- * is generated for the <a href="LinkTag.html">LinkTag</a>.
*
* @param url The URL to be modified (or null if this url will not be used)
*
* @exception JspException if an error occurs preparing the URL
- * @see LinkTag#hyperlink
*/
protected String url(String url) throws JspException {
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
