update SPEL after pathUtil method name change

spring-attic · Jun 5, 2012 · 97680ab · 97680ab
1 parent fbef23e
commit 97680ab
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -7,3 +7,4 @@ springBatchAdminVersion = 1.2.1.RELEASE
 junitVersion = 4.8.1
 
 version = 1.0.0.BUILD-SNAPSHOT
+
diff --git a/samples/wordcount-batch-notification/wordcount-notification-context.xml b/samples/wordcount-batch-notification/wordcount-notification-context.xml
@@ -37,7 +37,7 @@
 
 	<job id="wc-job"
               input-path="/user/hadoop/input"
-              output-path="#{@pathUtils.getTimeBasedPathFromRoot()}"
+              output-path="#{@pathUtils.format()}"
               mapper="org.apache.hadoop.examples.WordCount.TokenizerMapper"
               reducer="org.apache.hadoop.examples.WordCount.IntSumReducer"
               validate-paths="false"
@@ -60,7 +60,7 @@
 
     <beans:bean name="pathUtils" class="org.springframework.data.hadoop.util.PathUtils" 
     p:rootPath="/user/hadoop/output"
-    p:pathFormat="year/month/day/hour/minute/second"/>
+    p:pathFormat="yyyy/MM/dd/HH/mm/ss"/>
 
 
 

diff --git a/samples/wordcount-batch/wordcount-context.xml b/samples/wordcount-batch/wordcount-context.xml
@@ -32,11 +32,11 @@
 
     <beans:bean name="pathUtils" class="org.springframework.data.hadoop.util.PathUtils" 
     p:rootPath="/user/hadoop/output"
-    p:pathFormat="year/month/day/hour/minute/second"/>
+    p:pathFormat="yyyy/MM/dd/HH/mm/ss"/>
 
     <job id="wc-job"
               input-path="/user/hadoop/input"
-              output-path="#{@pathUtils.getTimeBasedPathFromRoot()}"
+              output-path="#{@pathUtils.format()}"
               mapper="org.apache.hadoop.examples.WordCount.TokenizerMapper"
               reducer="org.apache.hadoop.examples.WordCount.IntSumReducer"
               validate-paths="false"

diff --git a/templates/MapReduce/src/main/resources/workflow-context.xml b/templates/MapReduce/src/main/resources/workflow-context.xml
@@ -27,10 +27,10 @@
 
 	<beans:bean name="pathUtils"
 		class="org.springframework.data.hadoop.util.PathUtils" p:rootPath="${wordcount-job.output.path}"
-		p:pathFormat="year/month/day/hour/minute/second" />
+		p:pathFormat="yyyy/MM/dd/HH/mm/ss" />
 
 	<job id="wordcount-job" input-path="${wordcount-job.input.path}"
-		output-path="#{@pathUtils.getTimeBasedPathFromRoot()}" mapper="${wordcount-job.mapper.class}"
+		output-path="#{@pathUtils.format()}" mapper="${wordcount-job.mapper.class}"
 		reducer="${wordcount-job.reducer.class}"
 		jar="${wordcount-job.jar.path}" validate-paths="false" />