jon 01/05/19 17:04:05
Modified: src/java/org/apache/turbine/om NumberKey.java ObjectKey.java
src/java/org/apache/turbine/services/logging
Log4JavaLogger.java
src/java/org/apache/turbine/services/schedule JobEntry.java
TurbineNonPersistentSchedulerService.java
src/java/org/apache/turbine/services/upload
FileHandlerUploadService.java
Log:
fixed all sorts of deprecated crap
upgraded to log4j 1.1 and removed deprecated code
made ObjectKey implement comparable. might as well since it implements the
method already.
Revision Changes Path
1.7 +12 -0 jakarta-turbine/src/java/org/apache/turbine/om/NumberKey.java
Index: NumberKey.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/om/NumberKey.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- NumberKey.java 2001/05/17 20:05:15 1.6
+++ NumberKey.java 2001/05/20 00:04:03 1.7
@@ -105,6 +105,15 @@
}
/**
+ * Creates a NumberKey equivalent to <code>key</code>.
+ * Convenience only. Not very efficient at all.
+ */
+ public NumberKey(int key)
+ {
+ this.key = new BigDecimal(new Integer(key).toString());
+ }
+
+ /**
* Sets the internal representation using a String representation
* of a number
*/
@@ -168,6 +177,9 @@
return isEqual;
}
+ /**
+ * Invokes the toString() method on the object.
+ */
public String toString()
{
if ( key != null )
1.12 +7 -2 jakarta-turbine/src/java/org/apache/turbine/om/ObjectKey.java
Index: ObjectKey.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/om/ObjectKey.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ObjectKey.java 2001/03/27 06:48:29 1.11
+++ ObjectKey.java 2001/05/20 00:04:03 1.12
@@ -63,7 +63,7 @@
* and DateKey, and ComboKey which is a Key made up of a combination
* ofthe first three.
*/
-public abstract class ObjectKey implements Serializable
+public abstract class ObjectKey implements Serializable, Comparable
{
/**
* The underlying key value.
@@ -111,9 +111,14 @@
sb.append(key.toString());
}
+ /**
+ * Implements the compareTo method.
+ *
+ * @param obj the object to compare to this object
+ */
public int compareTo(Object obj)
{
- return toString().compareTo(obj.toString());
+ return toString().compareTo(obj.toString());
}
/**
1.12 +9 -9
jakarta-turbine/src/java/org/apache/turbine/services/logging/Log4JavaLogger.java
Index: Log4JavaLogger.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/logging/Log4JavaLogger.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Log4JavaLogger.java 2001/05/05 14:43:56 1.11
+++ Log4JavaLogger.java 2001/05/20 00:04:04 1.12
@@ -64,7 +64,7 @@
import org.apache.log4j.Appender;
import org.apache.log4j.AppenderSkeleton;
import org.apache.log4j.Category;
-import org.apache.log4j.FileAppender;
+import org.apache.log4j.WriterAppender;
import org.apache.log4j.Layout;
import org.apache.log4j.PatternLayout;
import org.apache.log4j.Priority;
@@ -93,7 +93,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Jon S. Stevens</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Sean Legassick</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
- * @version $Id: Log4JavaLogger.java,v 1.11 2001/05/05 14:43:56 jvanzyl Exp $
+ * @version $Id: Log4JavaLogger.java,v 1.12 2001/05/20 00:04:04 jon Exp $
*/
public class Log4JavaLogger extends BaseLogger
{
@@ -113,7 +113,7 @@
static
{
filesTable = new Hashtable();
- consoleAppender = new FileAppender(
+ consoleAppender = new WriterAppender(
new PatternLayout("%d [%t] %-5p %c - %m%n"), System.out);
}
@@ -172,7 +172,7 @@
if (loggingConfig.getFileSize() > -1)
{
((RollingFileAppender)appender)
- .setMaxFileSize(loggingConfig.getFileSize());
+ .setMaximumFileSize(loggingConfig.getFileSize());
}
filesTable.put(path, appender);
}
@@ -259,11 +259,11 @@
}
SMTPAppender appender = new SMTPAppender();
- appender.setOption(SMTPAppender.SMTP_HOST_OPTION, smtpHost);
- appender.setOption(SMTPAppender.FROM_OPTION, emailFrom);
- appender.setOption(SMTPAppender.TO_OPTION, emailTo);
- appender.setOption(SMTPAppender.SUBJECT_OPTION, emailSubject);
- appender.setOption(SMTPAppender.BUFFER_SIZE_OPTION, bufferSize);
+ appender.setSMTPHost(smtpHost);
+ appender.setFrom(emailFrom);
+ appender.setTo(emailTo);
+ appender.setSubject(emailSubject);
+ appender.setBufferSize(new Integer(bufferSize).intValue());
appender.setLayout(layout);
appender.activateOptions();
logger.addAppender(appender);
1.13 +6 -5
jakarta-turbine/src/java/org/apache/turbine/services/schedule/JobEntry.java
Index: JobEntry.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/schedule/JobEntry.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- JobEntry.java 2001/05/05 14:43:59 1.12
+++ JobEntry.java 2001/05/20 00:04:04 1.13
@@ -58,6 +58,7 @@
import java.util.Date;
import java.util.Hashtable;
import org.apache.turbine.om.BaseObject;
+import org.apache.turbine.om.NumberKey;
import org.apache.turbine.util.db.Criteria;
/**
@@ -65,7 +66,7 @@
* Unix scheduler cron.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Dave Bryson</a>
- * @version $Id: JobEntry.java,v 1.12 2001/05/05 14:43:59 jvanzyl Exp $
+ * @version $Id: JobEntry.java,v 1.13 2001/05/20 00:04:04 jon Exp $
*/
public class JobEntry extends BaseObject
{
@@ -456,7 +457,8 @@
.add(JobEntryPeer.EMAIL, getEmail())
.add(JobEntryPeer.PROPERTY, getProperty());
- if ( isModified() && getPrimaryKeyAsInt() > 0 )
+ long key = ((NumberKey)getPrimaryKey()).getBigDecimal().longValue();
+ if ( isModified() && key > 0)
{
// This is an update.
criteria.add(JobEntryPeer.OID, getPrimaryKey());
@@ -465,8 +467,7 @@
}
else
{
- // Insert new JobEntry. FIXME!! use ObjectKey
- setPrimaryKey( JobEntryPeer.doInsert(criteria).toString() );
+ setPrimaryKey( JobEntryPeer.doInsert(criteria) );
}
}
@@ -554,7 +555,7 @@
if ( !( je instanceof JobEntry ) )
return false;
- return ( ( (JobEntry)je ).getPrimaryKeyAsInt() == this.getPrimaryKeyAsInt()
);
+ return ( ((JobEntry)je).getPrimaryKey().compareTo(this.getPrimaryKey()) > 0
);
}
/**
1.7 +3 -1
jakarta-turbine/src/java/org/apache/turbine/services/schedule/TurbineNonPersistentSchedulerService.java
Index: TurbineNonPersistentSchedulerService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/schedule/TurbineNonPersistentSchedulerService.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TurbineNonPersistentSchedulerService.java 2001/05/05 14:43:59 1.6
+++ TurbineNonPersistentSchedulerService.java 2001/05/20 00:04:04 1.7
@@ -57,6 +57,8 @@
import java.util.List;
import java.util.Vector;
import javax.servlet.ServletConfig;
+import org.apache.turbine.om.NumberKey;
+import org.apache.turbine.om.ObjectKey;
import org.apache.turbine.services.resources.TurbineResources;
import org.apache.turbine.util.Log;
@@ -195,7 +197,7 @@
-1,
-1,
null);
- je.setPrimaryKey(oid);
+ je.setPrimaryKey((ObjectKey) new NumberKey(oid));
return scheduleQueue.getJob(je);
}
1.8 +5 -2
jakarta-turbine/src/java/org/apache/turbine/services/upload/FileHandlerUploadService.java
Index: FileHandlerUploadService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/upload/FileHandlerUploadService.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- FileHandlerUploadService.java 2001/05/18 18:25:55 1.7
+++ FileHandlerUploadService.java 2001/05/20 00:04:05 1.8
@@ -58,7 +58,7 @@
import org.apache.turbine.services.TurbineBaseService;
import org.apache.turbine.util.ParameterParser;
import org.apache.turbine.util.TurbineException;
-import org.apache.turbine.util.upload.FileHandler;
+//import org.apache.turbine.util.upload.FileHandler;
/**
* <p> This is an implementation of {@link UploadService} that uses
@@ -71,7 +71,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Rafal Krzewski</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Daniel Rall</a>
- * @version $Id: FileHandlerUploadService.java,v 1.7 2001/05/18 18:25:55 dlr Exp $
+ * @version $Id: FileHandlerUploadService.java,v 1.8 2001/05/20 00:04:05 jon Exp $
* @deprecated use TurbineUploadService
*/
public class FileHandlerUploadService
@@ -93,6 +93,8 @@
String path )
throws TurbineException
{
+ TurbineUpload.parseRequest(req, params, path);
+ /*
String fileRepository = getRepository();
FileHandler handler = new FileHandler( req, params, fileRepository );
handler.setMaxSize( getSizeMax() );
@@ -105,5 +107,6 @@
throw new TurbineException("File upload using FileHandler failed",
e);
}
+ */
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
