[Swift-commit] r3403 - in branches/woz-01: . etc libexec/log src/org/griphyn/vdl/karajan/lib

[noreply at svn.ci.uchicago.edu]

Author: wozniak
Date: 2010-06-22 15:25:36 -0500 (Tue, 22 Jun 2010)
New Revision: 3403

Modified:
   branches/woz-01/build.xml
   branches/woz-01/etc/log4j.properties
   branches/woz-01/libexec/log/README.txt
   branches/woz-01/src/org/griphyn/vdl/karajan/lib/Log.java
Log:
Only 


Modified: branches/woz-01/build.xml
===================================================================
--- branches/woz-01/build.xml	2010-06-22 19:50:00 UTC (rev 3402)
+++ branches/woz-01/build.xml	2010-06-22 20:25:36 UTC (rev 3403)
@@ -278,7 +278,9 @@
 			  targetfile="${cog.dir}/modules/${module.name}/src/org/globus/swift/parser/marker.tmp" />
 	</target>
 
-	<target name="compileSchema">
+	<target name="compileSchema"
+		depends="check.vdldefinitions"
+		unless="vdldefinitions.ready">
 		<java classname="org.apache.xmlbeans.impl.tool.SchemaCompiler" fork="true" failonerror="true">
 			<arg value="-src"/><arg value="src"/>
 			<arg value="-javasource"/><arg value="1.4"/>
@@ -293,8 +295,18 @@
 		</java>
 	</target>
 
+	<target name="check.vdldefinitions">
+		<uptodate property="vdldefinitions.ready"
+			  targetfile="${cog.dir}/modules/${module.name}/lib/vdldefinitions.jar">
+			<srcfiles
+				dir="${cog.dir}/modules/${module.name}/src/org/globus/swift/parser"
+				includes="*.java" />
+			<srcfiles
+				dir="resources"
+				includes="swiftscript.xsd,swiftscript.xsdconfig" />
+		</uptodate>
+	</target>
 
-
 	<!-- ================================================ -->
 	<!-- Compile                                          -->
 	<!-- ================================================ -->

Modified: branches/woz-01/etc/log4j.properties
===================================================================
--- branches/woz-01/etc/log4j.properties	2010-06-22 19:50:00 UTC (rev 3402)
+++ branches/woz-01/etc/log4j.properties	2010-06-22 20:25:36 UTC (rev 3403)
@@ -9,8 +9,10 @@
 log4j.appender.FILE=org.apache.log4j.FileAppender
 log4j.appender.FILE.File=swift.log
 log4j.appender.FILE.layout=org.apache.log4j.PatternLayout
+# Original 
 log4j.appender.FILE.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSSZZZZZ} %-5p %c{1} %m%n
-
+# Modified
+# log4j.appender.FILE.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm} %-5p %c{1}.%M %m%n
 log4j.logger.swift=DEBUG
 
 log4j.logger.org.apache.axis.utils=ERROR
@@ -23,10 +25,13 @@
 log4j.logger.org.globus.cog.karajan.scheduler.WeightedHostScoreScheduler=INFO
 log4j.logger.org.griphyn.vdl.toolkit.VDLt2VDLx=DEBUG
 log4j.logger.org.griphyn.vdl.karajan.VDL2ExecutionContext=DEBUG
-log4j.logger.org.globus.cog.abstraction.impl.common.task.TaskImpl=DEBUG
-log4j.logger.org.griphyn.vdl.karajan.lib.GetFieldValue=DEBUG
+log4j.logger.org.globus.cog.abstraction.impl.common.task.TaskImpl=INFO
+# log4j.logger.org.griphyn.vdl.karajan.lib.GetFieldValue=DEBUG
 log4j.logger.org.griphyn.vdl.engine.Karajan=INFO
 log4j.logger.org.globus.cog.abstraction.coaster.rlog=INFO
 
+# log4j.logger.org.globus.cog.abstraction.impl.scheduler.common.AbstractQueuePoller=DEBUG
+
 # log4j.logger.org.globus.swift.data.Director=DEBUG
 log4j.logger.org.griphyn.vdl.karajan.lib=INFO
+log4j.logger.org.globus.cog.karajan.workflow.service.commands=DEBUG

Modified: branches/woz-01/libexec/log/README.txt
===================================================================
--- branches/woz-01/libexec/log/README.txt	2010-06-22 19:50:00 UTC (rev 3402)
+++ branches/woz-01/libexec/log/README.txt	2010-06-22 20:25:36 UTC (rev 3403)
@@ -21,22 +21,3 @@
 
 make -f ${PLOT_HOME}/coasters.mk LOG=./map-20100606-2328-nv9xntzg.log SWIFT_PLOT_HOME=${PLOT_HOME} coaster-block-timeline.png
 
-IMPROVEMENT STRATEGY: 
-
-(READABILITY)
-
-* Move dataflow operations into makefiles; refer to all scripts and 
-  files in makefiles
-
-(EFFICIENCY) 
-
-* Replace scripts that make multiple external calls per input data line 
-  with AWK, or, if necessary, Perl
-
-TODO: 
-
-* Rename all shell scripts to *.sh
-* Rename *.makefile to *.mk (DONE)
-* Stop using *.data - this clobbers tc.data
-* Rename temporary files to *.log.ptmp (plot-temporary)
-                            *.data.ptmp

Modified: branches/woz-01/src/org/griphyn/vdl/karajan/lib/Log.java
===================================================================
--- branches/woz-01/src/org/griphyn/vdl/karajan/lib/Log.java	2010-06-22 19:50:00 UTC (rev 3402)
+++ branches/woz-01/src/org/griphyn/vdl/karajan/lib/Log.java	2010-06-22 20:25:36 UTC (rev 3403)
@@ -70,6 +70,7 @@
 			cls = "unknown";
 		}
 		Level lvl = getLevel(TypeUtil.toString(LEVEL.getValue(stack)));
+                System.out.println(lvl);
 		Logger logger = getLogger(cls);
 		if (logger.isEnabledFor(lvl)) {
 		    Object smsg = MESSAGE.getValue(stack);