svn commit: r695241 - in /maven/components/trunk: maven-core/src/main/java/org/apache/maven/extension/DefaultBuildExtensionScanner.java maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java

[sisbell]

Author: sisbell
Date: Sun Sep 14 08:36:56 2008
New Revision: 695241

URL: http://svn.apache.org/viewvc?rev=695241&view=rev
Log:
Fix: mng2562 - timestamp

Modified:
    
maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultBuildExtensionScanner.java
    
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java

Modified: 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultBuildExtensionScanner.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultBuildExtensionScanner.java?rev=695241&r1=695240&r2=695241&view=diff
==============================================================================
--- 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultBuildExtensionScanner.java
 (original)
+++ 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultBuildExtensionScanner.java
 Sun Sep 14 08:36:56 2008
@@ -49,14 +49,8 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
+import java.util.*;
+import java.text.SimpleDateFormat;
 
 public class DefaultBuildExtensionScanner
     implements BuildExtensionScanner, LogEnabled
@@ -163,11 +157,20 @@
 
                 config.setExecutionProperties( execProps );
 
+                //INTERPOLATION
                 List<InterpolatorProperty> interpolatorProperties = new 
ArrayList<InterpolatorProperty>();
                     interpolatorProperties.addAll( 
InterpolatorProperty.toInterpolatorProperties( config.getExecutionProperties(), 
                 PomInterpolatorTag.SYSTEM_PROPERTIES.name()));
                     interpolatorProperties.addAll( 
InterpolatorProperty.toInterpolatorProperties( config.getUserProperties(),
                 PomInterpolatorTag.USER_PROPERTIES.name()));
+                if(config.getBuildStartTime() != null)
+                {
+                    interpolatorProperties.add(new 
InterpolatorProperty("${build.timestamp}",
+                        new SimpleDateFormat("yyyyMMdd-hhmm").format( 
config.getBuildStartTime() ),
+                        PomInterpolatorTag.PROJECT_PROPERTIES.name()));
+                }
+
+
                 model = PomClassicTransformer.interpolateModel( model, 
interpolatorProperties, modelPom.getParentFile());
 
                 grabManagedPluginsWithExtensionsFlagTurnedOn( model, 
managedPluginsWithExtensionsFlag );

Modified: 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=695241&r1=695240&r2=695241&view=diff
==============================================================================
--- 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
 (original)
+++ 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
 Sun Sep 14 08:36:56 2008
@@ -64,11 +64,8 @@
 import java.io.StringReader;
 import java.io.Writer;
 import java.net.URL;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.text.SimpleDateFormat;
 
 
 /**
@@ -538,6 +535,13 @@
         interpolatorProperties.addAll( 
InterpolatorProperty.toInterpolatorProperties( config.getUserProperties(),
                 PomInterpolatorTag.USER_PROPERTIES.name()));
 
+        if(config.getBuildStartTime() != null)
+        {
+            interpolatorProperties.add(new 
InterpolatorProperty("${build.timestamp}",
+                new SimpleDateFormat("yyyyMMdd-hhmm").format( 
config.getBuildStartTime() ),
+                PomInterpolatorTag.PROJECT_PROPERTIES.name()));
+        }
+
         MavenProject mavenProject;
         try
         {