You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by jo...@apache.org on 2003/11/15 05:21:30 UTC
cvs commit: cocoon-2.1/src/blocks/mail/java/org/apache/cocoon/mail MailMessageSender.java
joerg 2003/11/14 20:21:30
Modified: src/java/org/apache/cocoon/environment/commandline
CommandLineRequest.java
src/java/org/apache/cocoon/components/modules/output
SessionAttributeOutputModule.java
RequestAttributeOutputModule.java
RequestAttributeMap.java
src/blocks/repository/java/org/apache/cocoon/generation
TraversableGenerator.java
XPathTraversableGenerator.java
src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements
EPBottom.java EPRight.java EPCols.java EPTop.java
EPLeft.java EPStyleRegion.java EPFont.java
src/blocks/portal/java/org/apache/cocoon/portal/event/impl
LayoutRemoveEvent.java
src/blocks/portal/java/org/apache/cocoon/portal/transformation
ProxyTransformer.java
src/java/org/apache/cocoon/util PostInputStream.java
EnumerationFactory.java
src/blocks/midi/java/org/apache/cocoon/components/midi/xmidi
ByteLen.java
src/java/org/apache/cocoon/components/source SourceUtil.java
src/blocks/jsp/java/org/apache/cocoon/components/jsp
JSPEngineImplWLS.java
JSPEngineImplNamedDispatcherInclude.java
src/blocks/eventcache/java/org/apache/cocoon/caching
EventAware.java EventRegistry.java
src/blocks/woody/java/org/apache/cocoon/woody/datatype
EnumSelectionList.java FlowJXPathSelectionList.java
src/java/org/apache/cocoon/servlet/multipart
MultipartParser.java
src/blocks/repository/java/org/apache/cocoon/transformation
SourcePropsWritingTransformer.java
src/blocks/jms/java/org/apache/cocoon/samples/jms
JMSTrigger.java
src/blocks/session-fw/java/org/apache/cocoon/components/language/markup/xsp
XSPSessionFwHelper.java
src/java/org/apache/cocoon/acting
AbstractValidatorAction.java
FormValidatorAction.java
src/blocks/qdox/java/org/apache/cocoon/components/source/impl
QDoxSourceFactory.java
src/blocks/eventcache/java/org/apache/cocoon/caching/validity
NamedEvent.java Event.java
src/java/org/apache/cocoon/components/crawler
CocoonCrawler.java
src/java/org/apache/cocoon/components/language/programming/java
Pizza.java JstyleFormatter.java Jikes.java
src/blocks/jms/java/org/apache/cocoon/components/jms
JMSEventListener.java JMSConnectionImpl.java
JMSConnection.java
src/blocks/slide/java/org/apache/cocoon/components/repository
PrincipalGroup.java Principal.java
src/blocks/scratchpad/java/org/apache/cocoon/transformation/constrained
AbstractConstrainedTransformer.java
src/java/org/apache/cocoon/components/flow
ContinuationsDisposer.java Interpreter.java
src/blocks/slide/java/org/apache/cocoon/components/repository/impl
SlideLoggerAdapter.java
src/blocks/scratchpad/java/org/apache/cocoon/util
SourceCache.java SourceReloader.java
src/blocks/taglib/java/org/apache/cocoon/taglib
VarTagSupport.java
src/blocks/portal-fw/java/org/apache/cocoon/webapps/portal/context
SessionContextProviderImpl.java
src/blocks/scratchpad/java/org/apache/cocoon/selection
DateSelector.java
src/blocks/databases/java/org/apache/cocoon/components/modules/database
AutoIncrementModule.java
src/java/org/apache/cocoon/components/modules/input
LocateResource.java
src/java/org/apache/cocoon/bean BeanListener.java
Target.java
src/blocks/lucene/java/org/apache/cocoon/components/search
SimpleLuceneXMLIndexerImpl.java
src/blocks/woody/java/org/apache/cocoon/woody/formmodel
AbstractDatatypeWidgetDefinition.java
src/blocks/woody/java/org/apache/cocoon/woody/event
ProcessingPhaseEvent.java
src/java/org/apache/cocoon/components/treeprocessor
TreeProcessor.java
src/blocks/mail/java/org/apache/cocoon/generation
IMAPGenerator.java
src/blocks/eventcache/java/org/apache/cocoon/caching/impl
DefaultEventRegistryImpl.java
src/blocks/portal/java/org/apache/cocoon/portal/layout/impl
CompositeLayoutImpl.java
src/java/org/apache/cocoon/transformation
SimpleFormTransformer.java
src/blocks/mail/java/org/apache/cocoon/mail
MailMessageSender.java
Log:
massive JavaDoc error fixing
Revision Changes Path
1.4 +10 -15 cocoon-2.1/src/java/org/apache/cocoon/environment/commandline/CommandLineRequest.java
Index: CommandLineRequest.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/environment/commandline/CommandLineRequest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CommandLineRequest.java 6 Jul 2003 20:37:48 -0000 1.3
+++ CommandLineRequest.java 15 Nov 2003 04:21:28 -0000 1.4
@@ -262,21 +262,16 @@
* you must call this method before
* the response is committed.
*
+ * @param create <code>true</code> to create a new session for this request
+ * if necessary;
+ * <code>false</code> to return <code>null</code> if there's
+ * no current session
+ *
+ * @return the <code>Session</code> associated with this request or
+ * <code>null</code> if <code>create</code> is <code>false</code>
+ * and the request has no valid session
*
- *
- *
- * @param <code>true</code> to create
- * a new session for this request if necessary;
- * <code>false</code> to return <code>null</code>
- * if there's no current session
- *
- *
- * @return the <code>Session</code> associated
- * with this request or <code>null</code> if
- * <code>create</code> is <code>false</code>
- * and the request has no valid session
- *
- * @see #getSession()
+ * @see #getSession()
*
*
*/
1.2 +2 -2 cocoon-2.1/src/java/org/apache/cocoon/components/modules/output/SessionAttributeOutputModule.java
Index: SessionAttributeOutputModule.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/modules/output/SessionAttributeOutputModule.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SessionAttributeOutputModule.java 9 Mar 2003 00:09:05 -0000 1.1
+++ SessionAttributeOutputModule.java 15 Nov 2003 04:21:28 -0000 1.2
@@ -83,7 +83,7 @@
* communicate an attribute value to further processing logic.
* @param modeConf column's mode configuration from resource
* description. This argument is optional.
- * @param request The request object
+ * @param objectModel The objectModel
* @param name The attribute's label, consisting of "table.column"
* or "table.column[index]" in case of multiple attributes of the
* same spec.
1.2 +2 -2 cocoon-2.1/src/java/org/apache/cocoon/components/modules/output/RequestAttributeOutputModule.java
Index: RequestAttributeOutputModule.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/modules/output/RequestAttributeOutputModule.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RequestAttributeOutputModule.java 9 Mar 2003 00:09:05 -0000 1.1
+++ RequestAttributeOutputModule.java 15 Nov 2003 04:21:28 -0000 1.2
@@ -83,7 +83,7 @@
* communicate an attribute value to further processing logic.
* @param modeConf column's mode configuration from resource
* description. This argument is optional.
- * @param request The request object
+ * @param objectModel The objectModel
* @param name The attribute's label, consisting of "table.column"
* or "table.column[index]" in case of multiple attributes of the
* same spec.
1.2 +2 -2 cocoon-2.1/src/java/org/apache/cocoon/components/modules/output/RequestAttributeMap.java
Index: RequestAttributeMap.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/modules/output/RequestAttributeMap.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RequestAttributeMap.java 9 Mar 2003 00:09:05 -0000 1.1
+++ RequestAttributeMap.java 15 Nov 2003 04:21:28 -0000 1.2
@@ -76,7 +76,7 @@
* communicate an attribute value to further processing logic.
* @param modeConf column's mode configuration from resource
* description. This argument is optional.
- * @param request The request object
+ * @param objectModel The objectModel
* @param name The attribute's label, consisting of "table.column"
* or "table.column[index]" in case of multiple attributes of the
* same spec.
1.5 +2 -2 cocoon-2.1/src/blocks/repository/java/org/apache/cocoon/generation/TraversableGenerator.java
Index: TraversableGenerator.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/repository/java/org/apache/cocoon/generation/TraversableGenerator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TraversableGenerator.java 3 Nov 2003 17:13:33 -0000 1.4
+++ TraversableGenerator.java 15 Nov 2003 04:21:28 -0000 1.5
@@ -299,7 +299,7 @@
* before generation has occured. So the returned object is kept by the
* generator and filled with each of the resources that is traversed.
*
- * @see TraversableGenerator.CollectionValidity
+ * @see org.apache.cocoon.components.source.impl.MultiSourceValidity
*/
public SourceValidity getValidity() {
if (this.validity == null) {
1.4 +2 -3 cocoon-2.1/src/blocks/repository/java/org/apache/cocoon/generation/XPathTraversableGenerator.java
Index: XPathTraversableGenerator.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/repository/java/org/apache/cocoon/generation/XPathTraversableGenerator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XPathTraversableGenerator.java 28 Oct 2003 14:08:50 -0000 1.3
+++ XPathTraversableGenerator.java 15 Nov 2003 04:21:28 -0000 1.4
@@ -251,10 +251,9 @@
/**
* Performs an XPath query on the source.
- * @param xmlFile the Source the XPath is performed on.
+ * @param in the Source the XPath is performed on.
* @throws SAXException if something goes wrong while adding the XML snippet.
*/
-
protected void performXPathQuery(TraversableSource in)
throws SAXException {
doc = null;
1.4 +1 -2 cocoon-2.1/src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/EPBottom.java
Index: EPBottom.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/EPBottom.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- EPBottom.java 5 Sep 2003 07:31:40 -0000 1.3
+++ EPBottom.java 15 Nov 2003 04:21:28 -0000 1.4
@@ -114,7 +114,6 @@
* @param attributes the array of Attribute instances; may be
* empty, will never be null
* @param parent the parent ElementProcessor; may be null
- * @param filesystem the POIFSFileSystem object
*
* @exception IOException if anything is wrong
*/
1.4 +1 -2 cocoon-2.1/src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/EPRight.java
Index: EPRight.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/EPRight.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- EPRight.java 5 Sep 2003 07:31:40 -0000 1.3
+++ EPRight.java 15 Nov 2003 04:21:28 -0000 1.4
@@ -112,7 +112,6 @@
* @param attributes the array of Attribute instances; may be
* empty, will never be null
* @param parent the parent ElementProcessor; may be null
- * @param filesystem the POIFSFileSystem object
*
* @exception IOException if anything is wrong
*/
1.4 +1 -2 cocoon-2.1/src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/EPCols.java
Index: EPCols.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/EPCols.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- EPCols.java 5 Sep 2003 07:31:40 -0000 1.3
+++ EPCols.java 15 Nov 2003 04:21:28 -0000 1.4
@@ -122,7 +122,6 @@
* @param attributes the array of Attribute instances; may be
* empty, will never be null
* @param parent the parent ElementProcessor; may be null
- * @param filesystem the POIFSFileSystem object
*
* @exception IOException if anything is wrong
*/
1.4 +1 -2 cocoon-2.1/src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/EPTop.java
Index: EPTop.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/EPTop.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- EPTop.java 5 Sep 2003 07:31:40 -0000 1.3
+++ EPTop.java 15 Nov 2003 04:21:28 -0000 1.4
@@ -112,7 +112,6 @@
* @param attributes the array of Attribute instances; may be
* empty, will never be null
* @param parent the parent ElementProcessor; may be null
- * @param filesystem the POIFSFileSystem object
*
* @exception IOException if anything is wrong
*/
1.4 +1 -2 cocoon-2.1/src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/EPLeft.java
Index: EPLeft.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/EPLeft.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- EPLeft.java 5 Sep 2003 07:31:40 -0000 1.3
+++ EPLeft.java 15 Nov 2003 04:21:28 -0000 1.4
@@ -113,7 +113,6 @@
* @param attributes the array of Attribute instances; may be
* empty, will never be null
* @param parent the parent ElementProcessor; may be null
- * @param filesystem the POIFSFileSystem object
*
* @exception IOException if anything is wrong
*/
1.4 +1 -2 cocoon-2.1/src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/EPStyleRegion.java
Index: EPStyleRegion.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/EPStyleRegion.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- EPStyleRegion.java 5 Sep 2003 07:31:40 -0000 1.3
+++ EPStyleRegion.java 15 Nov 2003 04:21:28 -0000 1.4
@@ -117,7 +117,6 @@
* @param attributes the array of Attribute instances; may be
* empty, will never be null
* @param parent the parent ElementProcessor; may be null
- * @param filesystem the POIFSFileSystem object
*
* @exception IOException if anything is wrong
*/
1.4 +1 -2 cocoon-2.1/src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/EPFont.java
Index: EPFont.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/EPFont.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- EPFont.java 5 Sep 2003 07:31:40 -0000 1.3
+++ EPFont.java 15 Nov 2003 04:21:28 -0000 1.4
@@ -132,7 +132,6 @@
* @param attributes the array of Attribute instances; may be
* empty, will never be null
* @param parent the parent ElementProcessor; may be null
- * @param filesystem the POIFSFileSystem object
*
* @exception IOException if anything is wrong
*/
1.3 +1 -2 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/event/impl/LayoutRemoveEvent.java
Index: LayoutRemoveEvent.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/event/impl/LayoutRemoveEvent.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LayoutRemoveEvent.java 26 May 2003 12:49:13 -0000 1.2
+++ LayoutRemoveEvent.java 15 Nov 2003 04:21:28 -0000 1.3
@@ -65,7 +65,6 @@
/**
* @param target
- * @param action
*/
public LayoutRemoveEvent(Object target) {
super(target);
1.5 +2 -2 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/transformation/ProxyTransformer.java
Index: ProxyTransformer.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/transformation/ProxyTransformer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ProxyTransformer.java 20 Oct 2003 13:37:10 -0000 1.4
+++ ProxyTransformer.java 15 Nov 2003 04:21:28 -0000 1.5
@@ -593,7 +593,7 @@
/**
* Resolve the possibly relative uri to an absolue uri based on given document base.
- * @param the uri to resolve
+ * @param uri the uri to resolve
* @param documentBase the current document base
* @return returns an absolute URI based on document base (e.g. http://mydomain.com/some/file.html)
* @throws MalformedURLException if uri or document base is malformed.
1.2 +3 -3 cocoon-2.1/src/java/org/apache/cocoon/util/PostInputStream.java
Index: PostInputStream.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/util/PostInputStream.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PostInputStream.java 9 Mar 2003 00:09:43 -0000 1.1
+++ PostInputStream.java 15 Nov 2003 04:21:28 -0000 1.2
@@ -100,7 +100,7 @@
/**
* Sets the underlying input stream and contentLen value .
*
- * @param inputStream the input stream; can not be null.
+ * @param input the input stream; can not be null.
* @param len the post message body length.
*
* @throws IllegalArgumentException
@@ -116,7 +116,7 @@
/**
* Sets the underlying input stream and contentLen value .
*
- * @param inputStream the input stream; can not be null.
+ * @param input the input stream; can not be null.
* @param len the post message body length.
*
* @throws IOException
1.3 +4 -4 cocoon-2.1/src/java/org/apache/cocoon/util/EnumerationFactory.java
Index: EnumerationFactory.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/util/EnumerationFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- EnumerationFactory.java 16 Mar 2003 17:49:16 -0000 1.2
+++ EnumerationFactory.java 15 Nov 2003 04:21:28 -0000 1.3
@@ -138,13 +138,13 @@
//--------------------------------------------------------------------------
// Numeric representation:
+ public int getPos () { // Ada'Pos
+ return pos;
+ }
/**
* Access to the numeric representation.
* @param value the numeric value
*/
- public int getPos () { // Ada'Pos
- return pos;
- }
public static EnumerationFactory getVal (int value) { // Ada'Val
return (EnumerationFactory) allObjects.elementAt (value);
}
1.3 +25 -24 cocoon-2.1/src/blocks/midi/java/org/apache/cocoon/components/midi/xmidi/ByteLen.java
Index: ByteLen.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/midi/java/org/apache/cocoon/components/midi/xmidi/ByteLen.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ByteLen.java 14 Oct 2003 20:17:11 -0000 1.2
+++ ByteLen.java 15 Nov 2003 04:21:28 -0000 1.3
@@ -62,37 +62,38 @@
*/
public class ByteLen {
-/**
- * Default constructor.
- * As of Jan 8, 2001, this is not used.
- */
- public ByteLen() {}
+ /**
+ * Default constructor.
+ * As of Jan 8, 2001, this is not used.
+ */
+ public ByteLen() {
+ }
-/**
- * Constructor used in the
- * {@link org.apache.cocoon.components.midi.xmidi.Utils#deltaToInt(byte[],int) MX.deltaToInt}
- * method to create this class, which it then returns.
- * @param byte[] b - a byte array; used to set ba
- * @param int l - a length; used to set len
- */
+ /**
+ * Constructor used in the
+ * {@link org.apache.cocoon.components.midi.xmidi.Utils#deltaToInt(byte[],int) MX.deltaToInt}
+ * method to create this class, which it then returns.
+ * @param b a byte array; used to set {@link #ba}
+ * @param l a length; used to set {@link #len}
+ */
public ByteLen(byte[] b, int l) {
ba = b;
len = l;
}
-/**
- * A byte array.
- */
+ /**
+ * A byte array.
+ */
public byte[] ba;
-/**
- * As used in the
- * {@link org.apache.cocoon.components.midi.xmidi.Utils#deltaToInt(byte[],int) MX.deltaToInt}
- * method, it is the length of the delta field being converted,
- * not the length of the array.
- * <p>
- * There is nothing about this class that requires that this variable
- * be used in this way. It could be any int.
- */
+ /**
+ * As used in the
+ * {@link org.apache.cocoon.components.midi.xmidi.Utils#deltaToInt(byte[],int) MX.deltaToInt}
+ * method, it is the length of the delta field being converted,
+ * not the length of the array.
+ * <p>
+ * There is nothing about this class that requires that this variable
+ * be used in this way. It could be any int.
+ */
public int len;
}
1.10 +6 -6 cocoon-2.1/src/java/org/apache/cocoon/components/source/SourceUtil.java
Index: SourceUtil.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/source/SourceUtil.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- SourceUtil.java 20 Oct 2003 08:47:29 -0000 1.9
+++ SourceUtil.java 15 Nov 2003 04:21:28 -0000 1.10
@@ -147,12 +147,12 @@
/**
* Generates SAX events from the given source
- * <b>NOTE</b> : if the implementation can produce lexical events, care should be taken
- * that <code>handler</code> can actually
- * directly implement the LexicalHandler interface!
+ * <b>NOTE</b> : if the implementation can produce lexical events, care
+ * should be taken that <code>handler</code> can actually directly implement
+ * the LexicalHandler interface!
* @param source the data
* @throws ProcessingException if no suitable converter is found
- * @deprecated Use the {@link #toSAX(ServiceManager, Source, String, ContentHandler)
+ * @deprecated Use the {@link #toSAX(ServiceManager, Source, String, ContentHandler)}
* method instead.
*/
static public void toSAX( ComponentManager manager, Source source,
@@ -222,7 +222,7 @@
* directly implement the LexicalHandler interface!
* @param source the data
* @throws ProcessingException if no suitable converter is found
- * @deprecated Use {@link #parse(ServiceManager, Source, ContentHandler}.
+ * @deprecated Use {@link #parse(ServiceManager, Source, ContentHandler)}.
*/
static public void parse( ComponentManager manager,
Source source,
1.3 +6 -5 cocoon-2.1/src/blocks/jsp/java/org/apache/cocoon/components/jsp/JSPEngineImplWLS.java
Index: JSPEngineImplWLS.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/jsp/java/org/apache/cocoon/components/jsp/JSPEngineImplWLS.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JSPEngineImplWLS.java 10 Jul 2003 23:38:04 -0000 1.2
+++ JSPEngineImplWLS.java 15 Nov 2003 04:21:28 -0000 1.3
@@ -51,6 +51,7 @@
package org.apache.cocoon.components.jsp;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.avalon.framework.parameters.ParameterException;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.parameters.Parameterizable;
import org.apache.avalon.framework.thread.ThreadSafe;
@@ -95,11 +96,11 @@
String servletName = DEFAULT_SERVLET_NAME;
/**
- * Set the sitemap-provided configuration.
- * @param conf The configuration information
- * @exception ConfigurationException
+ * parameterize
+ * @param params Parameters
+ * @exception ParameterException
*/
- public void parameterize(Parameters params) {
+ public void parameterize(Parameters params) throws ParameterException {
this.servletName = params.getParameter( CONFIG_SERVLET_NAME, DEFAULT_SERVLET_NAME);
}
1.5 +6 -5 cocoon-2.1/src/blocks/jsp/java/org/apache/cocoon/components/jsp/JSPEngineImplNamedDispatcherInclude.java
Index: JSPEngineImplNamedDispatcherInclude.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/jsp/java/org/apache/cocoon/components/jsp/JSPEngineImplNamedDispatcherInclude.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JSPEngineImplNamedDispatcherInclude.java 12 Jul 2003 13:30:02 -0000 1.4
+++ JSPEngineImplNamedDispatcherInclude.java 15 Nov 2003 04:21:28 -0000 1.5
@@ -51,6 +51,7 @@
package org.apache.cocoon.components.jsp;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.avalon.framework.parameters.ParameterException;
import org.apache.avalon.framework.parameters.Parameterizable;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
@@ -97,11 +98,11 @@
String servletName = DEFAULT_SERVLET_NAME;
/**
- * Set the sitemap-provided configuration.
- * @param conf The configuration information
- * @exception ConfigurationException
+ * parameterize
+ * @param params Parameters
+ * @exception ParameterException
*/
- public void parameterize(Parameters params) {
+ public void parameterize(Parameters params) throws ParameterException {
this.servletName = params.getParameter(CONFIG_SERVLET_NAME, DEFAULT_SERVLET_NAME);
}
1.2 +2 -2 cocoon-2.1/src/blocks/eventcache/java/org/apache/cocoon/caching/EventAware.java
Index: EventAware.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/eventcache/java/org/apache/cocoon/caching/EventAware.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EventAware.java 14 Jul 2003 02:50:45 -0000 1.1
+++ EventAware.java 15 Nov 2003 04:21:28 -0000 1.2
@@ -64,7 +64,7 @@
/**
* Receive notification of an Event.
*
- * @param The Event
+ * @param e The Event
*/
public void processEvent(Event e);
1.4 +4 -4 cocoon-2.1/src/blocks/eventcache/java/org/apache/cocoon/caching/EventRegistry.java
Index: EventRegistry.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/eventcache/java/org/apache/cocoon/caching/EventRegistry.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- EventRegistry.java 2 Oct 2003 04:21:17 -0000 1.3
+++ EventRegistry.java 15 Nov 2003 04:21:28 -0000 1.4
@@ -75,8 +75,8 @@
/**
* Map an event to a key
*
- * @param event
- * @param key
+ * @param e event
+ * @param key key
*/
public void register(Event e, Serializable key);
@@ -90,7 +90,7 @@
/**
* Retrieve an array of all keys mapped to this event.
*
- * @param event
+ * @param e event
* @return an array of keys which should not be modified or null if
* no keys are mapped to this event.
*/
1.3 +2 -3 cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/datatype/EnumSelectionList.java
Index: EnumSelectionList.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/datatype/EnumSelectionList.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- EnumSelectionList.java 9 Nov 2003 09:21:19 -0000 1.2
+++ EnumSelectionList.java 15 Nov 2003 04:21:28 -0000 1.3
@@ -60,8 +60,7 @@
import org.xml.sax.SAXException;
/**
- * Builds a selection list with possible values for a class implementing
- * the {@link Enum} interface.
+ * Builds a EnumSelectionList.
* @version CVS $Id$
*/
public class EnumSelectionList implements SelectionList {
1.3 +3 -2 cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/datatype/FlowJXPathSelectionList.java
Index: FlowJXPathSelectionList.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/datatype/FlowJXPathSelectionList.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FlowJXPathSelectionList.java 3 Nov 2003 23:16:12 -0000 1.2
+++ FlowJXPathSelectionList.java 15 Nov 2003 04:21:28 -0000 1.3
@@ -91,10 +91,11 @@
* Builds a dynamic selection list from an in-memory collection.
* @see org.apache.cocoon.woody.formmodel.Field#setSelectionList(Object model, String valuePath, String labelPath)
* @param model The collection used as a model for the selection list.
- * @param keyPath An XPath expression referring to the attribute used
+ * @param valuePath An XPath expression referring to the attribute used
* to populate the values of the list's items.
* @param labelPath An XPath expression referring to the attribute used
* to populate the labels of the list's items.
+ * @param datatype
*/
public FlowJXPathSelectionList(Object model, String valuePath, String labelPath, Datatype datatype) {
this.model = model;
1.5 +1 -3 cocoon-2.1/src/java/org/apache/cocoon/servlet/multipart/MultipartParser.java
Index: MultipartParser.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/servlet/multipart/MultipartParser.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MultipartParser.java 8 Nov 2003 15:36:46 -0000 1.4
+++ MultipartParser.java 15 Nov 2003 04:21:28 -0000 1.5
@@ -104,8 +104,6 @@
* @param saveUploadedFilesToDisk Write fileparts to the uploadDirectory. If true the corresponding object
* in the hashtable will contain a FilePartFile, if false a FilePartArray
* @param uploadDirectory The directory to write to if saveUploadedFilesToDisk is true.
- * @param saveUploadedFilesToDisk
- * @param uploadDirectory
* @param allowOverwrite Allow existing files to be overwritten.
* @param silentlyRename If file exists rename file (using filename+number).
* @param maxUploadSize The maximum content length accepted.
1.3 +2 -2 cocoon-2.1/src/blocks/repository/java/org/apache/cocoon/transformation/SourcePropsWritingTransformer.java
Index: SourcePropsWritingTransformer.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/repository/java/org/apache/cocoon/transformation/SourcePropsWritingTransformer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SourcePropsWritingTransformer.java 27 Oct 2003 17:39:10 -0000 1.2
+++ SourcePropsWritingTransformer.java 15 Nov 2003 04:21:29 -0000 1.3
@@ -127,7 +127,7 @@
* @param resolver Source Resolver
* @param objectModel Object model
* @param src URI of the source attribute
- * @param parameters Parameters for the transformer
+ * @param par Parameters for the transformer
*/
public void setup(SourceResolver resolver, Map objectModel, String src, Parameters par)
throws ProcessingException, SAXException, IOException {
1.4 +2 -2 cocoon-2.1/src/blocks/jms/java/org/apache/cocoon/samples/jms/JMSTrigger.java
Index: JMSTrigger.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/jms/java/org/apache/cocoon/samples/jms/JMSTrigger.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JMSTrigger.java 20 Oct 2003 07:19:33 -0000 1.3
+++ JMSTrigger.java 15 Nov 2003 04:21:29 -0000 1.4
@@ -106,7 +106,7 @@
/**
* Get initial context.
*
- * @return
+ * @return initial context
* @throws NamingException
*/
public Context getContext() throws NamingException {
1.5 +2 -3 cocoon-2.1/src/blocks/session-fw/java/org/apache/cocoon/components/language/markup/xsp/XSPSessionFwHelper.java
Index: XSPSessionFwHelper.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/session-fw/java/org/apache/cocoon/components/language/markup/xsp/XSPSessionFwHelper.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XSPSessionFwHelper.java 21 Oct 2003 07:52:02 -0000 1.4
+++ XSPSessionFwHelper.java 15 Nov 2003 04:21:29 -0000 1.5
@@ -72,10 +72,9 @@
/** GetXML Fragment from the given session context and path
*
*
- * @param session The Session object
+ * @param cm The ComponentManager
* @param context The Session context tha define where to search
* @param path The parameter path
- * @param defaultValue Value to substitute in absence of the required Fragment
**/
public static DocumentFragment getXML(ComponentManager cm, String context, String path) throws ProcessingException {
1.6 +9 -9 cocoon-2.1/src/java/org/apache/cocoon/acting/AbstractValidatorAction.java
Index: AbstractValidatorAction.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/acting/AbstractValidatorAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractValidatorAction.java 24 Sep 2003 21:26:51 -0000 1.5
+++ AbstractValidatorAction.java 15 Nov 2003 04:21:29 -0000 1.6
@@ -226,13 +226,13 @@
implements Configurable {
/**
- * Reads parameter values for all parameters that are contained in the active
- * constraint list. If a parameter has multiple values, all are stored in the
+ * Reads parameter values for all parameters that are contained in the active
+ * constraint list. If a parameter has multiple values, all are stored in the
* resulting map.
*
* @param objectModel the object model
* @param set a collection of parameter names
- * @return
+ * @return HashMap
*/
abstract protected HashMap createMapOfParameters(Map objectModel, Collection set);
@@ -362,7 +362,7 @@
* @param params Map of parameter values to be validated
* @param isString boolean indicating if the value is string encoded
* @param type string holding the name of the datatype to validate value
- * @return
+ * @return ValidatorActionHelper
*/
protected ValidatorActionHelper validateValue(
String name,
@@ -918,7 +918,7 @@
* attribute. An empty array results in an empty map.
*
* @param descriptor
- * @return
+ * @return index map or empty map
*/
protected Map indexConfiguration(Configuration[] descriptor) {
if (descriptor == null)
@@ -937,7 +937,7 @@
*
* @param valsetstr
* @param consets
- * @return
+ * @return collection of all parameters to validate
*/
protected Collection resolveConstraints(String valsetstr, Map consets) {
/* get the list of params to be validated */
@@ -956,7 +956,7 @@
/**
* Checks the default setting for reloading the descriptor file.
- * @return
+ * @return boolean
*/
protected boolean isDescriptorReloadable() {
// read global parameter settings
@@ -1000,7 +1000,7 @@
* @param set
* @param params
* @param isString
- * @return
+ * @return boolean all parameters ok or not
*/
protected boolean validateSetOfParameters(
Map desc,
1.3 +2 -2 cocoon-2.1/src/java/org/apache/cocoon/acting/FormValidatorAction.java
Index: FormValidatorAction.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/acting/FormValidatorAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FormValidatorAction.java 15 Aug 2003 15:53:20 -0000 1.2
+++ FormValidatorAction.java 15 Nov 2003 04:21:29 -0000 1.3
@@ -80,7 +80,7 @@
*
* @param objectModel the object model
* @param set a collection of parameter names
- * @return
+ * @return HashMap of required parameters
*/
protected HashMap createMapOfParameters(Map objectModel, Collection set) {
String name;
1.3 +2 -2 cocoon-2.1/src/blocks/qdox/java/org/apache/cocoon/components/source/impl/QDoxSourceFactory.java
Index: QDoxSourceFactory.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/qdox/java/org/apache/cocoon/components/source/impl/QDoxSourceFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- QDoxSourceFactory.java 25 Oct 2003 18:06:19 -0000 1.2
+++ QDoxSourceFactory.java 15 Nov 2003 04:21:29 -0000 1.3
@@ -200,7 +200,7 @@
}
/**
- * @see org.apache.avalon.framework.service.Serviceable#Service(org.apache.avalon.framework.service.ServiceManager)
+ * @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
*/
public void service(ServiceManager manager) throws ServiceException {
if (getLogger().isDebugEnabled()) {
1.3 +2 -2 cocoon-2.1/src/blocks/eventcache/java/org/apache/cocoon/caching/validity/NamedEvent.java
Index: NamedEvent.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/eventcache/java/org/apache/cocoon/caching/validity/NamedEvent.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NamedEvent.java 5 Sep 2003 04:02:51 -0000 1.2
+++ NamedEvent.java 15 Nov 2003 04:21:29 -0000 1.3
@@ -60,7 +60,7 @@
/**
* Constructor takes a simple String as event name.
*
- * @param String name
+ * @param name name
*/
public NamedEvent(String name) {
m_name = name;
1.3 +2 -2 cocoon-2.1/src/blocks/eventcache/java/org/apache/cocoon/caching/validity/Event.java
Index: Event.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/eventcache/java/org/apache/cocoon/caching/validity/Event.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Event.java 5 Sep 2003 04:02:51 -0000 1.2
+++ Event.java 15 Nov 2003 04:21:29 -0000 1.3
@@ -61,7 +61,7 @@
* is important for determining whether a received event
* should uncache a held Pipeline key.
*
- * @param event Another Event to compare.
+ * @param e Another Event to compare.
* @return true if
*/
public abstract boolean equals(Event e);
1.4 +2 -2 cocoon-2.1/src/java/org/apache/cocoon/components/crawler/CocoonCrawler.java
Index: CocoonCrawler.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/crawler/CocoonCrawler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CocoonCrawler.java 6 Oct 2003 16:30:41 -0000 1.3
+++ CocoonCrawler.java 15 Nov 2003 04:21:29 -0000 1.4
@@ -87,7 +87,7 @@
* </p>
*
* @param url The URL to start crawling from
- * @param depth The maximum depth to crawl to. -1 for no maxiumum.
+ * @param maxDepth The maximum depth to crawl to. -1 for no maxiumum.
*/
void crawl(URL url, int maxDepth);
1.2 +2 -6 cocoon-2.1/src/java/org/apache/cocoon/components/language/programming/java/Pizza.java
Index: Pizza.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/language/programming/java/Pizza.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Pizza.java 9 Mar 2003 00:09:00 -0000 1.1
+++ Pizza.java 15 Nov 2003 04:21:29 -0000 1.2
@@ -89,11 +89,7 @@
/**
* Compile a source file yielding a loadable class file.
*
- * @param filename The object program base file name
- * @param baseDirectory The directory containing the object program file
- * @param encoding The encoding expected in the source file or
- * <code>null</code> if it is the platform's default encoding
- * @exception LanguageException If an error occurs during compilation
+ * @exception IOException
*/
public boolean compile() throws IOException {
1.2 +4 -3 cocoon-2.1/src/java/org/apache/cocoon/components/language/programming/java/JstyleFormatter.java
Index: JstyleFormatter.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/language/programming/java/JstyleFormatter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JstyleFormatter.java 9 Mar 2003 00:09:00 -0000 1.1
+++ JstyleFormatter.java 15 Nov 2003 04:21:29 -0000 1.2
@@ -127,9 +127,10 @@
* The encoding can be <code>null</code> for the platform's default
* encoding
*
- * @param PARAM_NAME Param description
+ * @param out
+ * @param encoding
* @return the value
- * @exception EXCEPTION_NAME If an error occurs
+ * @exception UnsupportedEncodingException
*/
protected String getString(ByteArrayOutputStream out, String encoding)
throws UnsupportedEncodingException
1.3 +2 -2 cocoon-2.1/src/java/org/apache/cocoon/components/language/programming/java/Jikes.java
Index: Jikes.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/language/programming/java/Jikes.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Jikes.java 24 Mar 2003 14:33:57 -0000 1.2
+++ Jikes.java 15 Nov 2003 04:21:29 -0000 1.3
@@ -190,7 +190,7 @@
* Parse the compiler error stream to produce a list of
* <code>CompilerError</code>s
*
- * @param errors The error stream
+ * @param input The error stream
* @return The list of compiler error messages
* @exception IOException If an error occurs during message collection
*/
1.5 +2 -2 cocoon-2.1/src/blocks/jms/java/org/apache/cocoon/components/jms/JMSEventListener.java
Index: JMSEventListener.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/jms/java/org/apache/cocoon/components/jms/JMSEventListener.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JMSEventListener.java 20 Oct 2003 07:19:33 -0000 1.4
+++ JMSEventListener.java 15 Nov 2003 04:21:29 -0000 1.5
@@ -172,7 +172,7 @@
* want to override this method.
*
* @param message
- * @return
+ * @return cache key
*/
protected String convertMessage(String message) {
int pos = message.indexOf('|');
1.5 +5 -5 cocoon-2.1/src/blocks/jms/java/org/apache/cocoon/components/jms/JMSConnectionImpl.java
Index: JMSConnectionImpl.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/jms/java/org/apache/cocoon/components/jms/JMSConnectionImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JMSConnectionImpl.java 20 Oct 2003 07:19:33 -0000 1.4
+++ JMSConnectionImpl.java 15 Nov 2003 04:21:29 -0000 1.5
@@ -125,7 +125,7 @@
* Register a new TopicListener for this connection.
*
* @param listener
- * @param string
+ * @param selector
*/
public synchronized void registerListener(
MessageListener listener,
@@ -159,7 +159,7 @@
/**
* Get a new TopicPublisher for this connection.
*
- * @return
+ * @return TopicPublisher
* @throws JMSException
* @throws NamingException
*/
@@ -171,7 +171,7 @@
* Get the session associated with this connection. This is needed for example to
* create messages.
*
- * @return
+ * @return session associated with this connection
* @throws NamingException
* @throws JMSException
*/
@@ -182,7 +182,7 @@
/**
* Get initial context.
*
- * @return
+ * @return initial context
* @throws NamingException
*/
protected Context setupContext() throws NamingException {
1.5 +2 -2 cocoon-2.1/src/blocks/jms/java/org/apache/cocoon/components/jms/JMSConnection.java
Index: JMSConnection.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/jms/java/org/apache/cocoon/components/jms/JMSConnection.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JMSConnection.java 20 Oct 2003 07:19:33 -0000 1.4
+++ JMSConnection.java 15 Nov 2003 04:21:29 -0000 1.5
@@ -72,7 +72,7 @@
* Register a new TopicListener for this connection.
*
* @param listener
- * @param string
+ * @param selector
*
* @throws CacadingException if the connection was not successfully
* initialized, JMSException or NamingException if errors occur during
1.4 +2 -2 cocoon-2.1/src/blocks/slide/java/org/apache/cocoon/components/repository/PrincipalGroup.java
Index: PrincipalGroup.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/slide/java/org/apache/cocoon/components/repository/PrincipalGroup.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PrincipalGroup.java 5 Sep 2003 07:31:45 -0000 1.3
+++ PrincipalGroup.java 15 Nov 2003 04:21:29 -0000 1.4
@@ -75,7 +75,7 @@
/**
* Sets the name of the group.
*
- * @param Name of the group.
+ * @param name Name of the group.
*/
public void setName(String name) {
this.name = name;
1.4 +2 -2 cocoon-2.1/src/blocks/slide/java/org/apache/cocoon/components/repository/Principal.java
Index: Principal.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/slide/java/org/apache/cocoon/components/repository/Principal.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Principal.java 5 Sep 2003 07:31:45 -0000 1.3
+++ Principal.java 15 Nov 2003 04:21:29 -0000 1.4
@@ -107,7 +107,7 @@
/**
* Sets the role of the user
*
- * @param Role of the principal
+ * @param role Role of the principal
*/
public void setRole(String role) {
this.role = role;
1.3 +2 -3 cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/transformation/constrained/AbstractConstrainedTransformer.java
Index: AbstractConstrainedTransformer.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/transformation/constrained/AbstractConstrainedTransformer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractConstrainedTransformer.java 5 Sep 2003 07:04:34 -0000 1.2
+++ AbstractConstrainedTransformer.java 15 Nov 2003 04:21:29 -0000 1.3
@@ -307,9 +307,8 @@
* Utility methods also for subclasses
*
*@author Nicola Ken Barozzi
- *@created 14 mei 2002
+ *@since 14 May 2002
*/
-
public class RipperListener extends ElementEventAdapter {
public void elementValueRecieved(ElementValueEvent e) {
1.2 +1 -1 cocoon-2.1/src/java/org/apache/cocoon/components/flow/ContinuationsDisposer.java
Index: ContinuationsDisposer.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/flow/ContinuationsDisposer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ContinuationsDisposer.java 26 Aug 2003 09:04:39 -0000 1.1
+++ ContinuationsDisposer.java 15 Nov 2003 04:21:29 -0000 1.2
@@ -62,7 +62,7 @@
* the invalidation of a continuation upon the {@link ContinuationsDisposer}
* object passed during the creation of the WebContinuation.
*
- * @param kont the {@link WebContinuation} value representing the
+ * @param webContinuation the {@link WebContinuation} value representing the
* continuation object.
*/
public void disposeContinuation(WebContinuation webContinuation);
1.4 +2 -2 cocoon-2.1/src/java/org/apache/cocoon/components/flow/Interpreter.java
Index: Interpreter.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/flow/Interpreter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Interpreter.java 7 May 2003 04:36:33 -0000 1.3
+++ Interpreter.java 15 Nov 2003 04:21:29 -0000 1.4
@@ -180,7 +180,7 @@
/**
* Forward the request to a Cocoon pipeline.
*
- * @param URI a <code>String</code>, the URI of the forwarded request
+ * @param uri a <code>String</code>, the URI of the forwarded request
* @param bizData an <code>Object</code>, the business data object
* to be made available to the forwarded pipeline
* @param continuation a <code>WebContinuation</code>, the
1.4 +7 -6 cocoon-2.1/src/blocks/slide/java/org/apache/cocoon/components/repository/impl/SlideLoggerAdapter.java
Index: SlideLoggerAdapter.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/slide/java/org/apache/cocoon/components/repository/impl/SlideLoggerAdapter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SlideLoggerAdapter.java 5 Sep 2003 07:31:46 -0000 1.3
+++ SlideLoggerAdapter.java 15 Nov 2003 04:21:29 -0000 1.4
@@ -134,7 +134,7 @@
/**
* Set the logger level for the default channel
*
- * @param data The object to log.
+ * @param level the logger level
*/
public void setLoggerLevel(int level) {
currentLogLevel = level;
@@ -143,7 +143,8 @@
/**
* Set the logger level for the specified channel
*
- * @param data The object to log.
+ * @param channel
+ * @param level the logger level
*/
public void setLoggerLevel(String channel, int level) {
currentLogLevel = level;
@@ -151,8 +152,7 @@
/**
* Get the logger level for the default channel
- *
- * @param data The object to log.
+ * @return logger level
*/
public int getLoggerLevel() {
return currentLogLevel;
@@ -161,7 +161,8 @@
/**
* Get the logger level for the specified channel
*
- * @param data The object to log.
+ * @param channel the channel
+ * @return logger level
*/
public int getLoggerLevel(String channel) {
if (this.logger.isDebugEnabled()) {
1.2 +132 -132 cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/util/SourceCache.java
Index: SourceCache.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/util/SourceCache.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SourceCache.java 9 Nov 2003 13:33:24 -0000 1.1
+++ SourceCache.java 15 Nov 2003 04:21:29 -0000 1.2
@@ -1,133 +1,133 @@
-/*
-
- ============================================================================
- The Apache Software License, Version 1.1
- ============================================================================
-
- Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modifica-
- tion, 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 acknowledgment: "This product includes software
- developed by the Apache Software Foundation (http://www.apache.org/)."
- Alternately, this acknowledgment may appear in the software itself, if
- and wherever such third-party acknowledgments normally appear.
-
- 4. The names "Apache Cocoon" 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
- apache@apache.org.
-
- 5. Products derived from this software may not be called "Apache", nor may
- "Apache" appear in their name, without prior written permission of the
- Apache Software Foundation.
-
- 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 (INCLU-
- DING, 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 and was originally created by
- Stefano Mazzocchi <st...@apache.org>. For more information on the Apache
- Software Foundation, please see <http://www.apache.org/>.
-
-*/
-package org.apache.cocoon.util;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-
-import org.apache.excalibur.source.SourceResolver;
-
-/**
- * A source cache caches Objects that are created from a source. It handles
- * transparently rereading sources and recreation of objects if the source
- * validity has expired or the object has been cleaned from the cache. For
- * this, a reloader callback needs to be registered that actually does the
- * recreation of the cached object.
- *
- * <p>Example:</p>
- * <pre>
- *
- * public void service(ServiceManager manager) {
- * ...
- * // obtain source cache on startup / service / initialize
- * SourceCache cache = (SourceCache) manager.lookup(SourceCache.ROLE);
- * // register reloader
- * // with anonymous class handling the callback
- * cache.register( new SourceReloader() {
- * public Object reload(Source src, Object param) {
- * return refresh(src, (String) param[0], (Integer) param[1] );
- * });
- * }
- *
- * // have callback method. Private is OK because its used from a anonymous
- * // nested class.
- * private CreatedObject refresh(Source src, String param1, Integer param2) {
- * ...
- * }
- *
- *
- * public void foo() {
- * ...
- * // use cache
- * CreatedObject foo = (CreatedObject) cache.getObject(resolver, key, uri,
- * ... Object[] { param1, new Integer(param2) });
- * }
- *
- * public void dispose() {
- * // release source cache on dispose
- * manager.release(cache);
- * }
- *
- * </pre>
- *
- * @since 2.1.4
- * @author <a href="mailto:haul@apache.org">Christian Haul</a>
- * @version CVS $Id$
- */
-public interface SourceCache {
-
- public static final String ROLE = SourceCache.class.getName();
-
- /**
- * Register a source reloader that will recreate cached objects.
- * Often, this will be done using an anonymous nested class.
- *
- * @param reloader
- */
- void register(SourceReloader reloader);
-
- /**
- * Retrieve an object from the cache. Transparently reloads and
- * recreates objects using the registered source reloader if the
- * objects identified by the key hasn't been cached or has been
- * cleared from the cache, or source has changed.
- *
- * @param A source resolver to use.
- * @param An object used as a key to the cached object.
- * @param A string holding the URI.
- * @param Parameters to pass to the source reloader.
- * @return Cached object.
- * @throws MalformedURLException
- * @throws IOException
- */
- Object getObject(SourceResolver resolver, Object key, String uri, Object parameter)
- throws MalformedURLException, IOException;
+/*
+
+ ============================================================================
+ The Apache Software License, Version 1.1
+ ============================================================================
+
+ Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without modifica-
+ tion, 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 acknowledgment: "This product includes software
+ developed by the Apache Software Foundation (http://www.apache.org/)."
+ Alternately, this acknowledgment may appear in the software itself, if
+ and wherever such third-party acknowledgments normally appear.
+
+ 4. The names "Apache Cocoon" 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
+ apache@apache.org.
+
+ 5. Products derived from this software may not be called "Apache", nor may
+ "Apache" appear in their name, without prior written permission of the
+ Apache Software Foundation.
+
+ 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 (INCLU-
+ DING, 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 and was originally created by
+ Stefano Mazzocchi <st...@apache.org>. For more information on the Apache
+ Software Foundation, please see <http://www.apache.org/>.
+
+*/
+package org.apache.cocoon.util;
+
+import java.io.IOException;
+import java.net.MalformedURLException;
+
+import org.apache.excalibur.source.SourceResolver;
+
+/**
+ * A source cache caches Objects that are created from a source. It handles
+ * transparently rereading sources and recreation of objects if the source
+ * validity has expired or the object has been cleaned from the cache. For
+ * this, a reloader callback needs to be registered that actually does the
+ * recreation of the cached object.
+ *
+ * <p>Example:</p>
+ * <pre>
+ *
+ * public void service(ServiceManager manager) {
+ * ...
+ * // obtain source cache on startup / service / initialize
+ * SourceCache cache = (SourceCache) manager.lookup(SourceCache.ROLE);
+ * // register reloader
+ * // with anonymous class handling the callback
+ * cache.register( new SourceReloader() {
+ * public Object reload(Source src, Object param) {
+ * return refresh(src, (String) param[0], (Integer) param[1] );
+ * });
+ * }
+ *
+ * // have callback method. Private is OK because its used from a anonymous
+ * // nested class.
+ * private CreatedObject refresh(Source src, String param1, Integer param2) {
+ * ...
+ * }
+ *
+ *
+ * public void foo() {
+ * ...
+ * // use cache
+ * CreatedObject foo = (CreatedObject) cache.getObject(resolver, key, uri,
+ * ... Object[] { param1, new Integer(param2) });
+ * }
+ *
+ * public void dispose() {
+ * // release source cache on dispose
+ * manager.release(cache);
+ * }
+ *
+ * </pre>
+ *
+ * @since 2.1.4
+ * @author <a href="mailto:haul@apache.org">Christian Haul</a>
+ * @version CVS $Id$
+ */
+public interface SourceCache {
+
+ public static final String ROLE = SourceCache.class.getName();
+
+ /**
+ * Register a source reloader that will recreate cached objects.
+ * Often, this will be done using an anonymous nested class.
+ *
+ * @param reloader
+ */
+ void register(SourceReloader reloader);
+
+ /**
+ * Retrieve an object from the cache. Transparently reloads and
+ * recreates objects using the registered source reloader if the
+ * objects identified by the key hasn't been cached or has been
+ * cleared from the cache, or source has changed.
+ *
+ * @param resolver A source resolver to use.
+ * @param key An object used as a key to the cached object.
+ * @param uri A string holding the URI.
+ * @param parameter Parameters to pass to the source reloader.
+ * @return Cached object.
+ * @throws MalformedURLException
+ * @throws IOException
+ */
+ Object getObject(SourceResolver resolver, Object key, String uri, Object parameter)
+ throws MalformedURLException, IOException;
}
1.2 +73 -73 cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/util/SourceReloader.java
Index: SourceReloader.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/util/SourceReloader.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SourceReloader.java 9 Nov 2003 13:33:24 -0000 1.1
+++ SourceReloader.java 15 Nov 2003 04:21:29 -0000 1.2
@@ -1,73 +1,73 @@
-/*
-
- ============================================================================
- The Apache Software License, Version 1.1
- ============================================================================
-
- Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modifica-
- tion, 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 acknowledgment: "This product includes software
- developed by the Apache Software Foundation (http://www.apache.org/)."
- Alternately, this acknowledgment may appear in the software itself, if
- and wherever such third-party acknowledgments normally appear.
-
- 4. The names "Apache Cocoon" 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
- apache@apache.org.
-
- 5. Products derived from this software may not be called "Apache", nor may
- "Apache" appear in their name, without prior written permission of the
- Apache Software Foundation.
-
- 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 (INCLU-
- DING, 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 and was originally created by
- Stefano Mazzocchi <st...@apache.org>. For more information on the Apache
- Software Foundation, please see <http://www.apache.org/>.
-
-*/
-package org.apache.cocoon.util;
-
-import org.apache.excalibur.source.Source;
-
-/**
- * Load data from a source and return an object.
- *
- * @since 2.1.4
- * @author <a href="mailto:haul@apache.org">Christian Haul</a>
- * @version CVS $Id$
- */
-public interface SourceReloader {
-
- /**
- * Load data from a source and return an object.
- *
- * @param A source.
- * @param A parameter.
- * @return An object.
- */
- Object reload(Source src, Object parameter);
-
-}
+/*
+
+ ============================================================================
+ The Apache Software License, Version 1.1
+ ============================================================================
+
+ Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without modifica-
+ tion, 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 acknowledgment: "This product includes software
+ developed by the Apache Software Foundation (http://www.apache.org/)."
+ Alternately, this acknowledgment may appear in the software itself, if
+ and wherever such third-party acknowledgments normally appear.
+
+ 4. The names "Apache Cocoon" 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
+ apache@apache.org.
+
+ 5. Products derived from this software may not be called "Apache", nor may
+ "Apache" appear in their name, without prior written permission of the
+ Apache Software Foundation.
+
+ 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 (INCLU-
+ DING, 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 and was originally created by
+ Stefano Mazzocchi <st...@apache.org>. For more information on the Apache
+ Software Foundation, please see <http://www.apache.org/>.
+
+*/
+package org.apache.cocoon.util;
+
+import org.apache.excalibur.source.Source;
+
+/**
+ * Load data from a source and return an object.
+ *
+ * @since 2.1.4
+ * @author <a href="mailto:haul@apache.org">Christian Haul</a>
+ * @version CVS $Id$
+ */
+public interface SourceReloader {
+
+ /**
+ * Load data from a source and return an object.
+ *
+ * @param src A source.
+ * @param parameter A parameter.
+ * @return An object.
+ */
+ Object reload(Source src, Object parameter);
+
+}
1.3 +2 -2 cocoon-2.1/src/blocks/taglib/java/org/apache/cocoon/taglib/VarTagSupport.java
Index: VarTagSupport.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/taglib/java/org/apache/cocoon/taglib/VarTagSupport.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- VarTagSupport.java 16 Mar 2003 17:49:08 -0000 1.2
+++ VarTagSupport.java 15 Nov 2003 04:21:29 -0000 1.3
@@ -105,7 +105,7 @@
* Register the name and object specified.
*
* @param name the name of the attribute to set
- * @param attribute the object to associate with the name
+ * @param value the object to associate with the name
*/
protected final void setVariable(String name, Object value) {
JXPathContext context = getVariableContext();
1.4 +1 -2 cocoon-2.1/src/blocks/portal-fw/java/org/apache/cocoon/webapps/portal/context/SessionContextProviderImpl.java
Index: SessionContextProviderImpl.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal-fw/java/org/apache/cocoon/webapps/portal/context/SessionContextProviderImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SessionContextProviderImpl.java 23 May 2003 12:13:14 -0000 1.3
+++ SessionContextProviderImpl.java 15 Nov 2003 04:21:29 -0000 1.4
@@ -91,7 +91,6 @@
/**
* Get the context
* @param name The name of the context
- * @param objectModel The objectModel of the current request.
* @return The context
* @throws ProcessingException If the context is not available.
*/
1.4 +4 -4 cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/selection/DateSelector.java
Index: DateSelector.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/selection/DateSelector.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DateSelector.java 24 Oct 2003 08:49:49 -0000 1.3
+++ DateSelector.java 15 Nov 2003 04:21:29 -0000 1.4
@@ -219,7 +219,7 @@
* set fields which are not set by parsing the date attribute value
*
* @param cal Calendar parsed in
- * @param defautl_cal Calendar object providing default value for unset
+ * @param default_cal Calendar object providing default value for unset
* fields of cal
*/
protected void setUnsetFields( Calendar cal, Calendar default_cal ) {
@@ -250,7 +250,7 @@
* invocations
*
* @param objectModel the objectModel of the pipeline processing
- * @param paramters unused here
+ * @param parameters unused here
* @return Object which is an object of class DataSelectorContext
*/
public Object getSelectorContext(Map objectModel, Parameters parameters) {
@@ -275,7 +275,7 @@
/**
* Evaluate select for a given expression
*
- * @param the expression to test against, as now expression
+ * @param expression the expression to test against, as now expression
* should be a name defined as <code>NAME_ATTR</code> in the
* configuration section of this selector
* @param selectorContext is the SelectorContext set up by
1.3 +3 -8 cocoon-2.1/src/blocks/databases/java/org/apache/cocoon/components/modules/database/AutoIncrementModule.java
Index: AutoIncrementModule.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/databases/java/org/apache/cocoon/components/modules/database/AutoIncrementModule.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AutoIncrementModule.java 5 Sep 2003 12:46:12 -0000 1.2
+++ AutoIncrementModule.java 15 Nov 2003 04:21:30 -0000 1.3
@@ -74,16 +74,12 @@
/**
* Return key attribute value of last inserted row.
*
- * @param name a String that specifies what the caller thinks
- * would identify a set of parameters. This is mainly a fallback
- * if no modeConf is present.
-
* @param tableConf Table's configuration from resource description.
* @param columnConf column's configuration from resource description.
* @param modeConf this mode's configuration from resource description.
* @param conn Connection
* @param stmt Statement that was executed to insert the last row.
- * @param request The request object
+ * @param objectModel The objectModel
* @return value representing the last key value value.
* */
Object getPostValue( Configuration tableConf, Configuration columnConf, Configuration modeConf,
@@ -120,8 +116,7 @@
* @param columnConf column's configuration from resource description.
* @param modeConf this mode's configuration from resource description.
* @param conn Connection
- * @param request The request object
- * @param idx In case of multiple rows to be inserted, index to the desired row
+ * @param objectModel The objectModel
* @return exact value for key attribute column
* */
Object getPreValue( Configuration tableConf, Configuration columnConf, Configuration modeConf,
1.2 +4 -4 cocoon-2.1/src/java/org/apache/cocoon/components/modules/input/LocateResource.java
Index: LocateResource.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/modules/input/LocateResource.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LocateResource.java 15 Aug 2003 15:55:45 -0000 1.1
+++ LocateResource.java 15 Nov 2003 04:21:30 -0000 1.2
@@ -104,7 +104,7 @@
* Calculate the minimal length of the URL, that is the position
* of the first ":" if a protocol is provided or otherwise 0.
* @param name
- * @return
+ * @return minimal length
*/
protected int calculateMinLen(String name) {
@@ -120,7 +120,7 @@
*
* @param urlstring
* @param minLen
- * @return
+ * @return shortened URI
*/
protected String shortenURI(String urlstring, int minLen) {
@@ -154,7 +154,7 @@
* @param urlstring
* @param filename
* @param minLen
- * @return
+ * @return urlstring if resource was found, <code>null</code> otherwise
*/
protected String locateResource(String urlstring, String filename, int minLen) {
String sourcename = null;
1.4 +9 -3 cocoon-2.1/src/java/org/apache/cocoon/bean/BeanListener.java
Index: BeanListener.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/bean/BeanListener.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BeanListener.java 18 Sep 2003 12:11:50 -0000 1.3
+++ BeanListener.java 15 Nov 2003 04:21:30 -0000 1.4
@@ -61,9 +61,14 @@
/**
* Report a page as successfully generated
- * @param uri URI of page that has been generated
+ * @param sourceURI
+ * @param destinationURI
+ * @param pageSize
* @param linksInPage Number of links found in this page
+ * @param newLinksinPage
* @param pagesRemaining Number of pages still to be generated
+ * @param pagesComplete
+ * @param timeTaken
*/
public void pageGenerated(String sourceURI,
String destinationURI,
@@ -77,7 +82,8 @@
/**
* Report a that was skipped because its URI matched an
* include/exclude pattern.
- * @param msg
+ * @param uri
+ * @param message
*/
public void pageSkipped(String uri, String message);
1.10 +4 -3 cocoon-2.1/src/java/org/apache/cocoon/bean/Target.java
Index: Target.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/bean/Target.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Target.java 31 Oct 2003 21:41:59 -0000 1.9
+++ Target.java 15 Nov 2003 04:21:30 -0000 1.10
@@ -342,7 +342,8 @@
/**
*
- * @return
+ * @return destination URI after all authentication details have been
+ * removed
*/
public String getAuthlessDestURI() throws ProcessingException {
return NetUtils.removeAuthorisation(this.getDestinationURI());
@@ -432,7 +433,7 @@
return _toString;
}
/**
- * @return
+ * @return boolean
*/
public boolean confirmExtensions() {
return confirmExtension;
1.5 +3 -3 cocoon-2.1/src/blocks/lucene/java/org/apache/cocoon/components/search/SimpleLuceneXMLIndexerImpl.java
Index: SimpleLuceneXMLIndexerImpl.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/lucene/java/org/apache/cocoon/components/search/SimpleLuceneXMLIndexerImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SimpleLuceneXMLIndexerImpl.java 28 Aug 2003 16:56:48 -0000 1.4
+++ SimpleLuceneXMLIndexerImpl.java 15 Nov 2003 04:21:30 -0000 1.5
@@ -168,8 +168,8 @@
/**
* configure
*
- * @param conf Description of Parameter
- * @exception ConfigurationException Description of Exception
+ * @param configuration
+ * @exception ConfigurationException
* @since
*/
public void configure(Configuration configuration) throws ConfigurationException {
1.6 +1 -1 cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/formmodel/AbstractDatatypeWidgetDefinition.java
Index: AbstractDatatypeWidgetDefinition.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/formmodel/AbstractDatatypeWidgetDefinition.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractDatatypeWidgetDefinition.java 3 Nov 2003 23:25:06 -0000 1.5
+++ AbstractDatatypeWidgetDefinition.java 15 Nov 2003 04:21:30 -0000 1.6
@@ -109,7 +109,7 @@
* if any.
* @see org.apache.cocoon.woody.formmodel.Field#setSelectionList(Object model, String valuePath, String labelPath)
* @param model The collection used as a model for the selection list.
- * @param keyPath An XPath expression referring to the attribute used
+ * @param valuePath An XPath expression referring to the attribute used
* to populate the values of the list's items.
* @param labelPath An XPath expression referring to the attribute used
* to populate the labels of the list's items.
1.2 +0 -3 cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/event/ProcessingPhaseEvent.java
Index: ProcessingPhaseEvent.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/event/ProcessingPhaseEvent.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ProcessingPhaseEvent.java 24 Sep 2003 20:47:05 -0000 1.1
+++ ProcessingPhaseEvent.java 15 Nov 2003 04:21:30 -0000 1.2
@@ -61,9 +61,6 @@
private ProcessingPhase phase;
- /**
- * @param sourceWidget
- */
public ProcessingPhaseEvent(Form form, ProcessingPhase phase) {
super(form);
this.phase = phase;
1.16 +2 -2 cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java
Index: TreeProcessor.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- TreeProcessor.java 15 Oct 2003 18:02:53 -0000 1.15
+++ TreeProcessor.java 15 Nov 2003 04:21:30 -0000 1.16
@@ -336,7 +336,7 @@
* Do the actual processing, be it producing the response or just building the pipeline
* @param environment
* @param context
- * @return
+ * @return true if the pipeline was successfully built, false otherwise.
* @throws Exception
*/
protected boolean process(Environment environment, InvokeContext context)
1.4 +1 -1 cocoon-2.1/src/blocks/mail/java/org/apache/cocoon/generation/IMAPGenerator.java
Index: IMAPGenerator.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/mail/java/org/apache/cocoon/generation/IMAPGenerator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- IMAPGenerator.java 20 Oct 2003 18:16:07 -0000 1.3
+++ IMAPGenerator.java 15 Nov 2003 04:21:30 -0000 1.4
@@ -34,7 +34,7 @@
* and activation.jar in xml-cocoon2/lib/local/, and recompile. These jars could actually be
* moved to lib/optional and added to jars.xml in the future.
*
- * @todo. Refactor all of this to use the MailCommandManager, etc...
+ * TODO Refactor all of this to use the MailCommandManager, etc...
*
* @author <a href="mailto:tony@apache.org">Tony Collen</a>
*/
1.8 +3 -3 cocoon-2.1/src/blocks/eventcache/java/org/apache/cocoon/caching/impl/DefaultEventRegistryImpl.java
Index: DefaultEventRegistryImpl.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/eventcache/java/org/apache/cocoon/caching/impl/DefaultEventRegistryImpl.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DefaultEventRegistryImpl.java 2 Oct 2003 04:21:17 -0000 1.7
+++ DefaultEventRegistryImpl.java 15 Nov 2003 04:21:30 -0000 1.8
@@ -102,8 +102,8 @@
* Registers (stores) a two-way mapping between this Event and this
* PipelineCacheKey for later retrieval.
*
- * @param event The event to
- * @param key
+ * @param e The event to
+ * @param key key
*/
public void register(Event e, Serializable key) {
synchronized(this) {
1.3 +4 -4 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/layout/impl/CompositeLayoutImpl.java
Index: CompositeLayoutImpl.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/layout/impl/CompositeLayoutImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CompositeLayoutImpl.java 2 Sep 2003 08:34:20 -0000 1.2
+++ CompositeLayoutImpl.java 15 Nov 2003 04:21:30 -0000 1.3
@@ -79,8 +79,8 @@
/**
* Add indexed item to the itemList.
- * @param index, index for the position inside the list
- * @param item, item to add
+ * @param index index for the position inside the list
+ * @param item item to add
*/
public final void addItem(int index, Item item) {
this.items.add(index, item);
@@ -89,7 +89,7 @@
/**
* Add Item to the ItemList.
- * @param item, item to add
+ * @param item item to add
*/
public final void addItem(Item item) {
this.items.add(item);
1.9 +3 -3 cocoon-2.1/src/java/org/apache/cocoon/transformation/SimpleFormTransformer.java
Index: SimpleFormTransformer.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/transformation/SimpleFormTransformer.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- SimpleFormTransformer.java 27 Oct 2003 21:28:39 -0000 1.8
+++ SimpleFormTransformer.java 15 Nov 2003 04:21:30 -0000 1.9
@@ -1170,8 +1170,8 @@
* invoking super's method, so that the element itself is skipped, or afterwards,
* so that only the children are skipped.
*
- * @param increment skip counter
- * @param skip only children
+ * @param skip
+ * @param children
* @param uri
* @param name
* @param raw
1.7 +2 -2 cocoon-2.1/src/blocks/mail/java/org/apache/cocoon/mail/MailMessageSender.java
Index: MailMessageSender.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/mail/java/org/apache/cocoon/mail/MailMessageSender.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- MailMessageSender.java 8 Nov 2003 17:42:36 -0000 1.6
+++ MailMessageSender.java 15 Nov 2003 04:21:30 -0000 1.7
@@ -509,7 +509,7 @@
}
/** Sets the optional body source Mime Type of the email message.
- * @param srcMimeTyoe The optional body source Mime Type of the email message
+ * @param srcMimeType The optional body source Mime Type of the email message
*/
public void setBodyFromSrcMimeType(String srcMimeType) {
if (!("".equals(srcMimeType) || "null".equals(srcMimeType))) {