You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by he...@apache.org on 2003/04/07 17:30:53 UTC
cvs commit: jakarta-turbine-2/src/java/org/apache/turbine/util/pool BoundedBuffer.java
henning 2003/04/07 08:30:53
Modified: src/java/org/apache/turbine/om Retrievable.java
src/java/org/apache/turbine/services
InstantiationException.java ServiceBroker.java
src/java/org/apache/turbine/services/cache
RefreshableCachedObject.java
src/java/org/apache/turbine/services/crypto
TurbineCryptoService.java
src/java/org/apache/turbine/services/crypto/provider
ClearCrypt.java JavaCrypt.java OldJavaCrypt.java
src/java/org/apache/turbine/services/factory Factory.java
TurbineFactoryService.java
src/java/org/apache/turbine/services/intake
TurbineIntake.java
src/java/org/apache/turbine/services/intake/model Group.java
src/java/org/apache/turbine/services/intake/transform
DTDResolver.java XmlToAppData.java
src/java/org/apache/turbine/services/intake/validator
DefaultValidator.java FileValidator.java
src/java/org/apache/turbine/services/intake/xmlmodel
AppData.java Rule.java XmlField.java
src/java/org/apache/turbine/services/localization
Localization.java
src/java/org/apache/turbine/services/mimetype
TurbineMimeTypeService.java
src/java/org/apache/turbine/services/mimetype/util
CharSetMap.java
src/java/org/apache/turbine/services/pool
TurbinePoolService.java
src/java/org/apache/turbine/services/schedule JobQueue.java
WorkerThread.java
src/java/org/apache/turbine/services/upload
TurbineUpload.java
src/java/org/apache/turbine/services/xmlrpc/util
AuthenticatedFileHandler.java
src/java/org/apache/turbine/util DataStreamParser.java
ParameterParser.java
src/java/org/apache/turbine/util/parser BaseValueParser.java
DefaultCookieParser.java
DefaultParameterParser.java
src/java/org/apache/turbine/util/pool BoundedBuffer.java
Log:
Lots of style fixes and javadoc fixes.
Revision Changes Path
1.5 +9 -2 jakarta-turbine-2/src/java/org/apache/turbine/om/Retrievable.java
Index: Retrievable.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/om/Retrievable.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Retrievable.java 9 Mar 2003 02:45:15 -0000 1.4
+++ Retrievable.java 7 Apr 2003 15:30:48 -0000 1.5
@@ -65,13 +65,20 @@
/**
* get an id that differentiates this object from others
* of its class.
+ *
+ * @return The id value
*/
String getQueryKey();
/**
* set an id that differentiates this object from others
* of its class.
+ *
+ * @param key The new id value
+ *
+ * @throws Exception A problem occured while setting the id.
*/
- void setQueryKey(String key) throws Exception;
+ void setQueryKey(String key)
+ throws Exception;
}
1.5 +2 -2 jakarta-turbine-2/src/java/org/apache/turbine/services/InstantiationException.java
Index: InstantiationException.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/InstantiationException.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- InstantiationException.java 9 Mar 2003 07:16:45 -0000 1.4
+++ InstantiationException.java 7 Apr 2003 15:30:48 -0000 1.5
@@ -84,7 +84,7 @@
* and nested Throwable.
*
* @param msg The detail message.
- * @param t the exception or error that caused this exception
+ * @param nested the exception or error that caused this exception
* to be thrown.
*/
public InstantiationException(String msg, Throwable t)
1.9 +2 -2 jakarta-turbine-2/src/java/org/apache/turbine/services/ServiceBroker.java
Index: ServiceBroker.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/ServiceBroker.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ServiceBroker.java 9 Mar 2003 07:16:45 -0000 1.8
+++ ServiceBroker.java 7 Apr 2003 15:30:48 -0000 1.9
@@ -91,7 +91,7 @@
boolean isRegistered(String serviceName);
/**
- * Performs early initialization of specified service.
+ * Performs early initialization of the specified service.
*
* @param name The name of the service.
* @exception InitializationException if the service is unknown
1.5 +14 -5 jakarta-turbine-2/src/java/org/apache/turbine/services/cache/RefreshableCachedObject.java
Index: RefreshableCachedObject.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/cache/RefreshableCachedObject.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- RefreshableCachedObject.java 9 Mar 2003 03:06:25 -0000 1.4
+++ RefreshableCachedObject.java 7 Apr 2003 15:30:49 -0000 1.5
@@ -67,6 +67,7 @@
* cached object, and resetting its expire time.
*
* @author <a href="mailto:nissim@nksystems.com">Nissim Karpenstein</a>
+ * @author <a href="mailto:hps@intermeta.de">Henning P. Schmiedehausen</a>
* @version $Id$
*/
public class RefreshableCachedObject
@@ -110,13 +111,21 @@
lastAccess = System.currentTimeMillis();
}
- /** sets the timeToLive member (in milliseconds) */
- public synchronized void setTTL(long l)
+ /**
+ * Sets the timeToLive value
+ *
+ * @param timeToLive the new Value in milliseconds
+ */
+ public synchronized void setTTL(long timeToLive)
{
- timeToLive = l;
+ this.timeToLive = timeToLive;
}
- /** gets the timeToLive member (in milliseconds) */
+ /**
+ * Gets the timeToLive value.
+ *
+ * @return The current timeToLive value (in milliseconds)
+ */
public synchronized long getTTL()
{
return timeToLive;
1.5 +3 -1 jakarta-turbine-2/src/java/org/apache/turbine/services/crypto/TurbineCryptoService.java
Index: TurbineCryptoService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/crypto/TurbineCryptoService.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TurbineCryptoService.java 9 Mar 2003 03:06:26 -0000 1.4
+++ TurbineCryptoService.java 7 Apr 2003 15:30:49 -0000 1.5
@@ -55,10 +55,12 @@
*/
import java.security.NoSuchAlgorithmException;
+
import java.util.Hashtable;
import java.util.Iterator;
import org.apache.commons.configuration.Configuration;
+
import org.apache.turbine.services.BaseService;
import org.apache.turbine.services.InitializationException;
import org.apache.turbine.services.TurbineServices;
1.5 +2 -2 jakarta-turbine-2/src/java/org/apache/turbine/services/crypto/provider/ClearCrypt.java
Index: ClearCrypt.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/crypto/provider/ClearCrypt.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ClearCrypt.java 9 Mar 2003 03:06:26 -0000 1.4
+++ ClearCrypt.java 7 Apr 2003 15:30:49 -0000 1.5
@@ -60,7 +60,7 @@
* This is a dummy for "cleartext" encryption. It goes through
* the notions of the CryptoAlgorithm interface but actually does
* nothing. It can be used as a replacement for the "encrypt = no"
- * setting in TurbineResources.
+ * setting in the TR.props.
*
* Can be used as the default crypto algorithm
*
1.5 +2 -1 jakarta-turbine-2/src/java/org/apache/turbine/services/crypto/provider/JavaCrypt.java
Index: JavaCrypt.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/crypto/provider/JavaCrypt.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JavaCrypt.java 9 Mar 2003 03:06:26 -0000 1.4
+++ JavaCrypt.java 7 Apr 2003 15:30:49 -0000 1.5
@@ -57,6 +57,7 @@
import java.security.MessageDigest;
import org.apache.commons.codec.base64.Base64;
+
import org.apache.turbine.services.crypto.CryptoAlgorithm;
/**
1.5 +3 -1 jakarta-turbine-2/src/java/org/apache/turbine/services/crypto/provider/OldJavaCrypt.java
Index: OldJavaCrypt.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/crypto/provider/OldJavaCrypt.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- OldJavaCrypt.java 9 Mar 2003 03:06:26 -0000 1.4
+++ OldJavaCrypt.java 7 Apr 2003 15:30:49 -0000 1.5
@@ -56,7 +56,9 @@
import java.io.ByteArrayOutputStream;
import java.io.OutputStream;
+
import java.security.MessageDigest;
+
import javax.mail.internet.MimeUtility;
import org.apache.turbine.services.crypto.CryptoAlgorithm;
1.5 +3 -3 jakarta-turbine-2/src/java/org/apache/turbine/services/factory/Factory.java
Index: Factory.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/factory/Factory.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Factory.java 9 Mar 2003 03:06:26 -0000 1.4
+++ Factory.java 7 Apr 2003 15:30:49 -0000 1.5
@@ -58,7 +58,7 @@
/**
* Factory is an interface for object factories. Object factories
- * can be registered to the Factory Service to support customized
+ * can be registered with the Factory Service to support customized
* functionality during instantiation of specific classes that
* the service itself cannot provide. Examples include
* instantiation of XML parsers and secure sockets requiring
@@ -71,7 +71,7 @@
{
/**
* Initializes the factory. This method is called by
- * the Factory Service before the factory is taken into use.
+ * the Factory Service before the factory is used.
*
* @param className the name of the production class
* @throws TurbineException if initialization fails.
1.7 +16 -14 jakarta-turbine-2/src/java/org/apache/turbine/services/factory/TurbineFactoryService.java
Index: TurbineFactoryService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/factory/TurbineFactoryService.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TurbineFactoryService.java 9 Mar 2003 03:06:26 -0000 1.6
+++ TurbineFactoryService.java 7 Apr 2003 15:30:49 -0000 1.7
@@ -57,12 +57,14 @@
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.ObjectOutputStream;
+
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Vector;
import org.apache.commons.configuration.Configuration;
+
import org.apache.turbine.services.InitializationException;
import org.apache.turbine.services.TurbineBaseService;
import org.apache.turbine.util.TurbineException;
@@ -161,7 +163,7 @@
throw new InitializationException(
"No such class loader '" +
(String) loaders.get(i) +
- "' for TurbinbeFactoryService", x);
+ "' for TurbineFactoryService", x);
}
}
}
@@ -232,7 +234,7 @@
* @throws TurbineException if instantiation fails.
*/
public Object getInstance(String className,
- ClassLoader loader)
+ ClassLoader loader)
throws TurbineException
{
if (className == null)
@@ -281,8 +283,8 @@
* @throws TurbineException if instantiation fails.
*/
public Object getInstance(String className,
- Object[] params,
- String[] signature)
+ Object[] params,
+ String[] signature)
throws TurbineException
{
if (className == null)
@@ -328,9 +330,9 @@
* @throws TurbineException if instantiation fails.
*/
public Object getInstance(String className,
- ClassLoader loader,
- Object[] params,
- String[] signature)
+ ClassLoader loader,
+ Object[] params,
+ String[] signature)
throws TurbineException
{
if (className == null)
@@ -415,8 +417,8 @@
* @throws TurbineException if instantiation fails.
*/
protected Object getInstance(Class clazz,
- Object params[],
- String signature[])
+ Object params[],
+ String signature[])
throws TurbineException
{
/* Try to construct. */
@@ -444,8 +446,8 @@
* @throws ClassNotFoundException if any of the classes is not found.
*/
protected Class[] getSignature(Class clazz,
- Object params[],
- String signature[])
+ Object params[],
+ String signature[])
throws ClassNotFoundException
{
if (signature != null)
@@ -499,7 +501,7 @@
* @param loader the loader of the new context.
*/
protected Object switchObjectContext(Object object,
- ClassLoader loader)
+ ClassLoader loader)
{
ByteArrayOutputStream bout =
new ByteArrayOutputStream();
@@ -574,7 +576,7 @@
* @throws ClassNotFoundException if the class was not found.
*/
protected Class loadClass(String className,
- ClassLoader loader)
+ ClassLoader loader)
throws ClassNotFoundException
{
return loader != null ?
1.4 +2 -1 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/TurbineIntake.java
Index: TurbineIntake.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/TurbineIntake.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TurbineIntake.java 9 Mar 2003 03:06:26 -0000 1.3
+++ TurbineIntake.java 7 Apr 2003 15:30:49 -0000 1.4
@@ -55,6 +55,7 @@
*/
import java.beans.IntrospectionException;
+
import java.lang.reflect.Method;
import org.apache.turbine.services.TurbineServices;
1.7 +3 -1 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/Group.java
Index: Group.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/Group.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Group.java 9 Mar 2003 03:06:27 -0000 1.6
+++ Group.java 7 Apr 2003 15:30:50 -0000 1.7
@@ -62,7 +62,9 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+
import org.apache.commons.pool.BaseKeyedPoolableObjectFactory;
+
import org.apache.turbine.om.Retrievable;
import org.apache.turbine.services.intake.IntakeException;
import org.apache.turbine.services.intake.TurbineIntake;
1.8 +1 -6 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/transform/DTDResolver.java
Index: DTDResolver.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/transform/DTDResolver.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DTDResolver.java 9 Mar 2003 03:06:28 -0000 1.7
+++ DTDResolver.java 7 Apr 2003 15:30:50 -0000 1.8
@@ -163,8 +163,3 @@
return new InputSource();
}
}
-
-
-
-
-
1.7 +3 -1 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/transform/XmlToAppData.java
Index: XmlToAppData.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/transform/XmlToAppData.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XmlToAppData.java 9 Mar 2003 03:06:28 -0000 1.6
+++ XmlToAppData.java 7 Apr 2003 15:30:50 -0000 1.7
@@ -57,12 +57,14 @@
import java.io.BufferedReader;
import java.io.FileReader;
import java.io.IOException;
+
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+
import org.apache.turbine.services.intake.xmlmodel.AppData;
import org.apache.turbine.services.intake.xmlmodel.Rule;
import org.apache.turbine.services.intake.xmlmodel.XmlField;
1.7 +2 -1 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/validator/DefaultValidator.java
Index: DefaultValidator.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/validator/DefaultValidator.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DefaultValidator.java 9 Mar 2003 03:06:28 -0000 1.6
+++ DefaultValidator.java 7 Apr 2003 15:30:50 -0000 1.7
@@ -58,6 +58,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+
import org.apache.oro.text.regex.MalformedPatternException;
import org.apache.oro.text.regex.Pattern;
import org.apache.oro.text.regex.Perl5Compiler;
1.7 +2 -1 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/validator/FileValidator.java
Index: FileValidator.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/validator/FileValidator.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FileValidator.java 9 Mar 2003 03:06:28 -0000 1.6
+++ FileValidator.java 7 Apr 2003 15:30:50 -0000 1.7
@@ -57,6 +57,7 @@
import java.util.Map;
import org.apache.commons.fileupload.FileItem;
+
import org.apache.turbine.services.intake.IntakeException;
/**
1.5 +5 -3 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/xmlmodel/AppData.java
Index: AppData.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/xmlmodel/AppData.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AppData.java 9 Mar 2003 03:06:28 -0000 1.4
+++ AppData.java 7 Apr 2003 15:30:51 -0000 1.5
@@ -54,6 +54,8 @@
* <http://www.apache.org/>.
*/
+import java.io.Serializable;
+
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -70,7 +72,7 @@
* @version $Id$
*/
public class AppData
- implements java.io.Serializable
+ implements Serializable
{
/** List of groups */
private List inputs;
@@ -159,7 +161,7 @@
StringBuffer qualifiedGroupName = new StringBuffer();
qualifiedGroupName.append(groupPrefix)
- .append(":")
+ .append(':')
.append(group.getName());
if (qualifiedGroupName.toString().equals(groupName))
1.5 +4 -2 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/xmlmodel/Rule.java
Index: Rule.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/xmlmodel/Rule.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Rule.java 9 Mar 2003 03:06:28 -0000 1.4
+++ Rule.java 7 Apr 2003 15:30:51 -0000 1.5
@@ -54,6 +54,8 @@
* <http://www.apache.org/>.
*/
+import java.io.Serializable;
+
import org.apache.turbine.services.intake.validator.Constraint;
import org.xml.sax.Attributes;
@@ -65,7 +67,7 @@
* @version $Id$
*/
public class Rule
- implements Constraint, java.io.Serializable
+ implements Constraint, Serializable
{
private String name;
private String value;
1.8 +9 -6 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/xmlmodel/XmlField.java
Index: XmlField.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/xmlmodel/XmlField.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XmlField.java 9 Mar 2003 03:06:28 -0000 1.7
+++ XmlField.java 7 Apr 2003 15:30:51 -0000 1.8
@@ -54,7 +54,11 @@
* <http://www.apache.org/>.
*/
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
import java.io.Serializable;
+
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
@@ -468,16 +472,15 @@
}
// this methods are called during serialization
- private void writeObject(java.io.ObjectOutputStream stream)
- throws java.io.IOException
+ private void writeObject(ObjectOutputStream stream)
+ throws IOException
{
stream.defaultWriteObject();
}
- private void readObject(java.io.ObjectInputStream stream)
- throws java.io.IOException, ClassNotFoundException
+ private void readObject(ObjectInputStream stream)
+ throws IOException, ClassNotFoundException
{
stream.defaultReadObject();
}
-
}
1.10 +3 -1 jakarta-turbine-2/src/java/org/apache/turbine/services/localization/Localization.java
Index: Localization.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/localization/Localization.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Localization.java 9 Mar 2003 03:06:29 -0000 1.9
+++ Localization.java 7 Apr 2003 15:30:51 -0000 1.10
@@ -1,3 +1,4 @@
+
package org.apache.turbine.services.localization;
/* ====================================================================
@@ -56,6 +57,7 @@
import java.util.Locale;
import java.util.ResourceBundle;
+
import javax.servlet.http.HttpServletRequest;
import org.apache.turbine.services.TurbineServices;
1.6 +3 -1 jakarta-turbine-2/src/java/org/apache/turbine/services/mimetype/TurbineMimeTypeService.java
Index: TurbineMimeTypeService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/mimetype/TurbineMimeTypeService.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TurbineMimeTypeService.java 9 Mar 2003 03:06:29 -0000 1.5
+++ TurbineMimeTypeService.java 7 Apr 2003 15:30:51 -0000 1.6
@@ -56,9 +56,11 @@
import java.io.File;
import java.io.IOException;
+
import java.util.Locale;
import org.apache.commons.configuration.Configuration;
+
import org.apache.turbine.services.InitializationException;
import org.apache.turbine.services.TurbineBaseService;
import org.apache.turbine.services.mimetype.util.CharSetMap;
1.4 +2 -1 jakarta-turbine-2/src/java/org/apache/turbine/services/mimetype/util/CharSetMap.java
Index: CharSetMap.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/mimetype/util/CharSetMap.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CharSetMap.java 9 Mar 2003 03:06:29 -0000 1.3
+++ CharSetMap.java 7 Apr 2003 15:30:51 -0000 1.4
@@ -58,6 +58,7 @@
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
+
import java.util.HashMap;
import java.util.Hashtable;
import java.util.Locale;
1.7 +3 -1 jakarta-turbine-2/src/java/org/apache/turbine/services/pool/TurbinePoolService.java
Index: TurbinePoolService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/pool/TurbinePoolService.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TurbinePoolService.java 9 Mar 2003 03:06:30 -0000 1.6
+++ TurbinePoolService.java 7 Apr 2003 15:30:51 -0000 1.7
@@ -55,11 +55,13 @@
*/
import java.lang.reflect.Method;
+
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import org.apache.commons.configuration.Configuration;
+
import org.apache.turbine.services.InitializationException;
import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.services.factory.FactoryService;
1.5 +1 -2 jakarta-turbine-2/src/java/org/apache/turbine/services/schedule/JobQueue.java
Index: JobQueue.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/schedule/JobQueue.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JobQueue.java 9 Mar 2003 03:06:30 -0000 1.4
+++ JobQueue.java 7 Apr 2003 15:30:51 -0000 1.5
@@ -227,4 +227,3 @@
Collections.sort(queue, aComparator);
}
}
-
1.6 +2 -2 jakarta-turbine-2/src/java/org/apache/turbine/services/schedule/WorkerThread.java
Index: WorkerThread.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/schedule/WorkerThread.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- WorkerThread.java 9 Mar 2003 03:06:30 -0000 1.5
+++ WorkerThread.java 7 Apr 2003 15:30:51 -0000 1.6
@@ -109,7 +109,7 @@
}
catch (Exception e)
{
- log.error("Error in WorkerThread for sheduled job #" +
+ log.error("Error in WorkerThread for scheduled job #" +
je.getPrimaryKey() + ", task: " + je.getTask(), e);
}
finally
1.6 +2 -2 jakarta-turbine-2/src/java/org/apache/turbine/services/upload/TurbineUpload.java
Index: TurbineUpload.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/upload/TurbineUpload.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TurbineUpload.java 9 Mar 2003 03:06:34 -0000 1.5
+++ TurbineUpload.java 7 Apr 2003 15:30:52 -0000 1.6
@@ -111,7 +111,6 @@
return true;
}
-
/**
* Retrieves the value of the 'automatic' property of {@link
* UploadService}. This reports whether the Upload Service
@@ -129,6 +128,7 @@
// Short circuit evaluation of the && operator!
return isAvailable() && getService().getAutomatic();
}
+
/**
* <p> Retrieves the value of 'size.max' property of {@link
* UploadService}.
1.7 +1 -0 jakarta-turbine-2/src/java/org/apache/turbine/services/xmlrpc/util/AuthenticatedFileHandler.java
Index: AuthenticatedFileHandler.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/xmlrpc/util/AuthenticatedFileHandler.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AuthenticatedFileHandler.java 9 Mar 2003 03:06:35 -0000 1.6
+++ AuthenticatedFileHandler.java 7 Apr 2003 15:30:52 -0000 1.7
@@ -59,6 +59,7 @@
import org.apache.turbine.om.security.User;
import org.apache.turbine.services.security.TurbineSecurity;
import org.apache.turbine.util.TurbineException;
+
import org.apache.xmlrpc.AuthenticatedXmlRpcHandler;
/**
1.6 +3 -1 jakarta-turbine-2/src/java/org/apache/turbine/util/DataStreamParser.java
Index: DataStreamParser.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/util/DataStreamParser.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DataStreamParser.java 9 Mar 2003 02:54:11 -0000 1.5
+++ DataStreamParser.java 7 Apr 2003 15:30:52 -0000 1.6
@@ -59,6 +59,7 @@
import java.io.InputStreamReader;
import java.io.Reader;
import java.io.StreamTokenizer;
+
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -66,6 +67,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+
import org.apache.turbine.util.parser.BaseValueParser;
/**
1.9 +2 -1 jakarta-turbine-2/src/java/org/apache/turbine/util/ParameterParser.java
Index: ParameterParser.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/util/ParameterParser.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ParameterParser.java 14 Mar 2003 18:33:03 -0000 1.8
+++ ParameterParser.java 7 Apr 2003 15:30:52 -0000 1.9
@@ -80,6 +80,7 @@
* @author <a href="mailto:ilkka.priha@simsoft.fi">Ilkka Priha</a>
* @author <a href="mailto:jon@clearink.com">Jon S. Stevens</a>
* @author <a href="mailto:sean@informage.net">Sean Legassick</a>
+ * @author <a href="mailto:hps@intermeta.de">Henning P. Schmiedehausen</a>
* @version $Id$
*/
public interface ParameterParser
1.19 +2 -2 jakarta-turbine-2/src/java/org/apache/turbine/util/parser/BaseValueParser.java
Index: BaseValueParser.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/util/parser/BaseValueParser.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- BaseValueParser.java 3 Apr 2003 01:13:11 -0000 1.18
+++ BaseValueParser.java 7 Apr 2003 15:30:52 -0000 1.19
@@ -430,7 +430,7 @@
public boolean getBoolean(String name, boolean defaultValue)
{
Boolean result = getBooleanObject(name);
- return (result==null ? defaultValue : result.booleanValue());
+ return (result == null ? defaultValue : result.booleanValue());
}
/**
1.12 +2 -2 jakarta-turbine-2/src/java/org/apache/turbine/util/parser/DefaultCookieParser.java
Index: DefaultCookieParser.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/util/parser/DefaultCookieParser.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- DefaultCookieParser.java 9 Mar 2003 03:26:49 -0000 1.11
+++ DefaultCookieParser.java 7 Apr 2003 15:30:52 -0000 1.12
@@ -60,6 +60,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+
import org.apache.turbine.util.CookieParser;
import org.apache.turbine.util.DynamicURI;
import org.apache.turbine.util.RunData;
@@ -138,7 +139,6 @@
* @return the parsed RunData object or null.
* @deprecated Don't use the Run Data object. use getRequest().
*/
-
public RunData getRunData()
{
return data;
1.16 +3 -1 jakarta-turbine-2/src/java/org/apache/turbine/util/parser/DefaultParameterParser.java
Index: DefaultParameterParser.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/util/parser/DefaultParameterParser.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- DefaultParameterParser.java 26 Mar 2003 19:06:28 -0000 1.15
+++ DefaultParameterParser.java 7 Apr 2003 15:30:52 -0000 1.16
@@ -55,6 +55,7 @@
*/
import java.net.URLDecoder;
+
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Map;
@@ -69,6 +70,7 @@
import org.apache.turbine.services.upload.TurbineUpload;
import org.apache.turbine.services.upload.UploadService;
+
import org.apache.turbine.util.ParameterParser;
import org.apache.turbine.util.TurbineException;
import org.apache.turbine.util.pool.Recyclable;
1.4 +3 -1 jakarta-turbine-2/src/java/org/apache/turbine/util/pool/BoundedBuffer.java
Index: BoundedBuffer.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/util/pool/BoundedBuffer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BoundedBuffer.java 9 Mar 2003 02:54:13 -0000 1.3
+++ BoundedBuffer.java 7 Apr 2003 15:30:53 -0000 1.4
@@ -88,7 +88,9 @@
throws IllegalArgumentException
{
if (capacity <= 0)
+ {
throw new IllegalArgumentException();
+ }
array_ = new Object[capacity];
emptySlots_ = capacity;
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org