Index: Tstamp.java
===================================================================
RCS file: /home/cvspublic/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Tstamp.java,v
retrieving revision 1.5
diff -r1.5 Tstamp.java
63c63
<  * Sets TSTAMP, DSTAMP and TODAY
---
>  * Sets TSTAMP, DSTAMP, TODAY, TSTAMP-1 and DSTAMP-1
66a67
>  * @author chr@active.ch
70,85c71,96
<     public void execute() throws BuildException {
<         try {
<             Date d = new Date();
< 
<             SimpleDateFormat dstamp = new SimpleDateFormat ("yyyyMMdd");
<             project.setProperty("DSTAMP", dstamp.format(d));
< 
<             SimpleDateFormat tstamp = new SimpleDateFormat ("HHmm");
<             project.setProperty("TSTAMP", tstamp.format(d));
< 
<             SimpleDateFormat today  = new SimpleDateFormat ("MMMM d yyyy", Locale.US);
<             project.setProperty("TODAY", today.format(d));
<         } catch (Exception e) {
<             throw new BuildException(e);
<         }
<     }
---
> 		public void execute() throws BuildException {
> 				try {
> 						Date d = new Date();
> 
> 						SimpleDateFormat dstamp = new SimpleDateFormat ("yyyyMMdd");
> 						project.setProperty("DSTAMP", dstamp.format(d));
> 
> 						SimpleDateFormat tstamp = new SimpleDateFormat ("HHmm");
> 						project.setProperty("TSTAMP", tstamp.format(d));
> 
> 						SimpleDateFormat today  = new SimpleDateFormat ("MMMM d yyyy", Locale.US);
> 						project.setProperty("TODAY", today.format(d));
> 
> 						Calendar cal = Calendar.getInstance();
> 						cal.setTime(d);
> 						cal.roll(Calendar.DAY_OF_MONTH, false);
> 						project.setProperty("DSTAMP-1", dstamp.format(cal.getTime()));
> 
> 						cal.setTime(d);
> 						cal.roll(Calendar.HOUR_OF_DAY, false);
> 						project.setProperty("TSTAMP-1", tstamp.format(cal.getTime()));
> 
> 				} catch (Exception e) {
> 						throw new BuildException(e);
> 				}
> 		}
Index: Tstamp.java
===================================================================
RCS file: /home/cvspublic/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Tstamp.java,v
retrieving revision 1.5
diff -u -r1.5 Tstamp.java
--- Tstamp.java	2000/09/14 07:19:52	1.5
+++ Tstamp.java	2000/11/16 19:10:17
@@ -60,27 +60,38 @@
 import java.text.*;
 
 /**
- * Sets TSTAMP, DSTAMP and TODAY
+ * Sets TSTAMP, DSTAMP, TODAY, TSTAMP-1 and DSTAMP-1
  *
  * @author costin@dnt.ro
  * @author stefano@apache.org
+ * @author chr@active.ch
  */
 public class Tstamp extends Task {
 
-    public void execute() throws BuildException {
-        try {
-            Date d = new Date();
-
-            SimpleDateFormat dstamp = new SimpleDateFormat ("yyyyMMdd");
-            project.setProperty("DSTAMP", dstamp.format(d));
-
-            SimpleDateFormat tstamp = new SimpleDateFormat ("HHmm");
-            project.setProperty("TSTAMP", tstamp.format(d));
-
-            SimpleDateFormat today  = new SimpleDateFormat ("MMMM d yyyy", Locale.US);
-            project.setProperty("TODAY", today.format(d));
-        } catch (Exception e) {
-            throw new BuildException(e);
-        }
-    }
+		public void execute() throws BuildException {
+				try {
+						Date d = new Date();
+
+						SimpleDateFormat dstamp = new SimpleDateFormat ("yyyyMMdd");
+						project.setProperty("DSTAMP", dstamp.format(d));
+
+						SimpleDateFormat tstamp = new SimpleDateFormat ("HHmm");
+						project.setProperty("TSTAMP", tstamp.format(d));
+
+						SimpleDateFormat today  = new SimpleDateFormat ("MMMM d yyyy", Locale.US);
+						project.setProperty("TODAY", today.format(d));
+
+						Calendar cal = Calendar.getInstance();
+						cal.setTime(d);
+						cal.roll(Calendar.DAY_OF_MONTH, false);
+						project.setProperty("DSTAMP-1", dstamp.format(cal.getTime()));
+
+						cal.setTime(d);
+						cal.roll(Calendar.HOUR_OF_DAY, false);
+						project.setProperty("TSTAMP-1", tstamp.format(cal.getTime()));
+
+				} catch (Exception e) {
+						throw new BuildException(e);
+				}
+		}
 }
