From noreply at svn.ci.uchicago.edu Tue Nov 3 19:41:03 2009 From: noreply at svn.ci.uchicago.edu (noreply at svn.ci.uchicago.edu) Date: Tue, 3 Nov 2009 19:41:03 -0600 (CST) Subject: [Swift-commit] r3187 - trunk/src/org/griphyn/vdl/mapping/file Message-ID: <20091104014103.B3AF49CCC0@vm-125-59.ci.uchicago.edu> Author: hategan Date: 2009-11-03 19:41:03 -0600 (Tue, 03 Nov 2009) New Revision: 3187 Modified: trunk/src/org/griphyn/vdl/mapping/file/RegularExpressionMapper.java Log: fixed primitive check Modified: trunk/src/org/griphyn/vdl/mapping/file/RegularExpressionMapper.java =================================================================== --- trunk/src/org/griphyn/vdl/mapping/file/RegularExpressionMapper.java 2009-10-31 19:06:57 UTC (rev 3186) +++ trunk/src/org/griphyn/vdl/mapping/file/RegularExpressionMapper.java 2009-11-04 01:41:03 UTC (rev 3187) @@ -41,8 +41,10 @@ public PhysicalFormat map(Path path) { if (PARAM_MATCH.getRawValue(this) instanceof DSHandle) { DSHandle h = (DSHandle) PARAM_MATCH.getRawValue(this); - throw new IllegalArgumentException("Non-primitive value specified for " + - PARAM_MATCH.getName() + "; maybe you meant @filename(" + h.getPathFromRoot() + ")?"); + if (!h.getType().isPrimitive()) { + throw new IllegalArgumentException("Non-primitive value specified for " + + PARAM_MATCH.getName() + "; maybe you meant @filename(" + h.getPathFromRoot() + ")?"); + } } String match = PARAM_MATCH.getStringValue(this); String source = PARAM_SOURCE.getStringValue(this); From noreply at svn.ci.uchicago.edu Fri Nov 6 10:36:25 2009 From: noreply at svn.ci.uchicago.edu (noreply at svn.ci.uchicago.edu) Date: Fri, 6 Nov 2009 10:36:25 -0600 (CST) Subject: [Swift-commit] r3188 - trunk/src/org/griphyn/vdl/mapping/file Message-ID: <20091106163626.079ED9CC87@vm-125-59.ci.uchicago.edu> Author: hategan Date: 2009-11-06 10:36:25 -0600 (Fri, 06 Nov 2009) New Revision: 3188 Modified: trunk/src/org/griphyn/vdl/mapping/file/ConcurrentMapper.java Log: fixed class cast exception when specifying parameters to the concurrent mapper Modified: trunk/src/org/griphyn/vdl/mapping/file/ConcurrentMapper.java =================================================================== --- trunk/src/org/griphyn/vdl/mapping/file/ConcurrentMapper.java 2009-11-04 01:41:03 UTC (rev 3187) +++ trunk/src/org/griphyn/vdl/mapping/file/ConcurrentMapper.java 2009-11-06 16:36:25 UTC (rev 3188) @@ -23,8 +23,8 @@ } public void setParams(Map params) { - String prefix = (String) PARAM_PREFIX.getValue(params); - prefix = "_concurrent/" + prefix + "-" + PARAM_THREAD_PREFIX.getValue(params); + String prefix = PARAM_PREFIX.getStringValue(this); + prefix = "_concurrent/" + prefix + "-" + PARAM_THREAD_PREFIX.getStringValue(this); PARAM_PREFIX.setValue(params, prefix); super.setParams(params); } From noreply at svn.ci.uchicago.edu Fri Nov 6 11:04:17 2009 From: noreply at svn.ci.uchicago.edu (noreply at svn.ci.uchicago.edu) Date: Fri, 6 Nov 2009 11:04:17 -0600 (CST) Subject: [Swift-commit] r3189 - trunk/src/org/griphyn/vdl/mapping/file Message-ID: <20091106170417.91FD09CC87@vm-125-59.ci.uchicago.edu> Author: hategan Date: 2009-11-06 11:04:17 -0600 (Fri, 06 Nov 2009) New Revision: 3189 Modified: trunk/src/org/griphyn/vdl/mapping/file/ConcurrentMapper.java Log: except I fixed it a bit too much Modified: trunk/src/org/griphyn/vdl/mapping/file/ConcurrentMapper.java =================================================================== --- trunk/src/org/griphyn/vdl/mapping/file/ConcurrentMapper.java 2009-11-06 16:36:25 UTC (rev 3188) +++ trunk/src/org/griphyn/vdl/mapping/file/ConcurrentMapper.java 2009-11-06 17:04:17 UTC (rev 3189) @@ -24,7 +24,7 @@ public void setParams(Map params) { String prefix = PARAM_PREFIX.getStringValue(this); - prefix = "_concurrent/" + prefix + "-" + PARAM_THREAD_PREFIX.getStringValue(this); + prefix = "_concurrent/" + prefix + "-" + PARAM_THREAD_PREFIX.getValue(params); PARAM_PREFIX.setValue(params, prefix); super.setParams(params); } From noreply at svn.ci.uchicago.edu Fri Nov 6 11:14:44 2009 From: noreply at svn.ci.uchicago.edu (noreply at svn.ci.uchicago.edu) Date: Fri, 6 Nov 2009 11:14:44 -0600 (CST) Subject: [Swift-commit] r3190 - trunk/src/org/griphyn/vdl/mapping/file Message-ID: <20091106171444.D9CA39CC87@vm-125-59.ci.uchicago.edu> Author: hategan Date: 2009-11-06 11:14:44 -0600 (Fri, 06 Nov 2009) New Revision: 3190 Modified: trunk/src/org/griphyn/vdl/mapping/file/ConcurrentMapper.java Log: null looks ugly if prefix is not specified Modified: trunk/src/org/griphyn/vdl/mapping/file/ConcurrentMapper.java =================================================================== --- trunk/src/org/griphyn/vdl/mapping/file/ConcurrentMapper.java 2009-11-06 17:04:17 UTC (rev 3189) +++ trunk/src/org/griphyn/vdl/mapping/file/ConcurrentMapper.java 2009-11-06 17:14:44 UTC (rev 3190) @@ -24,7 +24,8 @@ public void setParams(Map params) { String prefix = PARAM_PREFIX.getStringValue(this); - prefix = "_concurrent/" + prefix + "-" + PARAM_THREAD_PREFIX.getValue(params); + prefix = "_concurrent/" + (prefix == null ? "" : prefix + "-") + + PARAM_THREAD_PREFIX.getValue(params); PARAM_PREFIX.setValue(params, prefix); super.setParams(params); } From noreply at svn.ci.uchicago.edu Wed Nov 11 18:44:21 2009 From: noreply at svn.ci.uchicago.edu (noreply at svn.ci.uchicago.edu) Date: Wed, 11 Nov 2009 18:44:21 -0600 (CST) Subject: [Swift-commit] r3191 - in trunk/src/org/griphyn/vdl/mapping: . file Message-ID: <20091112004421.779FE9CCA3@vm-125-59.ci.uchicago.edu> Author: hategan Date: 2009-11-11 18:44:21 -0600 (Wed, 11 Nov 2009) New Revision: 3191 Modified: trunk/src/org/griphyn/vdl/mapping/MappingParam.java trunk/src/org/griphyn/vdl/mapping/file/ConcurrentMapper.java Log: the prefix is not set yet on this mapper, so it cannot be accessed like that Modified: trunk/src/org/griphyn/vdl/mapping/MappingParam.java =================================================================== --- trunk/src/org/griphyn/vdl/mapping/MappingParam.java 2009-11-06 17:14:44 UTC (rev 3190) +++ trunk/src/org/griphyn/vdl/mapping/MappingParam.java 2009-11-12 00:44:21 UTC (rev 3191) @@ -59,8 +59,30 @@ return value; } } + + public Object getValue(Map params) { + Object value = params.get(name); + if (value instanceof DSHandle) { + DSHandle handle = (DSHandle) value; + checkHandle(handle); + return handle.toString(); + } + else if (value == null) { + if (!defSet) { + throw new InvalidMappingParameterException("Missing required mapping parameter: " + + name); + } + else { + return defValue; + } + } + else { + return value; + } + } + + - /** return the raw value of this parameter. Defaulting and type * conversion will not occur. */ public Object getRawValue(Mapper mapper) { @@ -85,6 +107,13 @@ return null; return String.valueOf(value); } + + public String getStringValue(Map params) { + Object value = getValue(params); + if (value == null) + return null; + return String.valueOf(value); + } public void setValue(Mapper mapper, Object value) { mapper.setParam(name, value); @@ -135,10 +164,6 @@ } } - public Object getValue(Map map) { - return map.get(name); - } - public void setValue(Map map, Object value) { map.put(name, value); } Modified: trunk/src/org/griphyn/vdl/mapping/file/ConcurrentMapper.java =================================================================== --- trunk/src/org/griphyn/vdl/mapping/file/ConcurrentMapper.java 2009-11-06 17:14:44 UTC (rev 3190) +++ trunk/src/org/griphyn/vdl/mapping/file/ConcurrentMapper.java 2009-11-12 00:44:21 UTC (rev 3191) @@ -23,7 +23,7 @@ } public void setParams(Map params) { - String prefix = PARAM_PREFIX.getStringValue(this); + String prefix = PARAM_PREFIX.getStringValue(params); prefix = "_concurrent/" + (prefix == null ? "" : prefix + "-") + PARAM_THREAD_PREFIX.getValue(params); PARAM_PREFIX.setValue(params, prefix); @@ -66,5 +66,4 @@ } remappedPaths.put(path, file); } -} - +} \ No newline at end of file From noreply at svn.ci.uchicago.edu Tue Nov 24 16:12:31 2009 From: noreply at svn.ci.uchicago.edu (noreply at svn.ci.uchicago.edu) Date: Tue, 24 Nov 2009 16:12:31 -0600 (CST) Subject: [Swift-commit] r3192 - trunk/src/org/griphyn/vdl/karajan/lib Message-ID: <20091124221231.A77A29CC8B@vm-125-59.ci.uchicago.edu> Author: hategan Date: 2009-11-24 16:12:30 -0600 (Tue, 24 Nov 2009) New Revision: 3192 Modified: trunk/src/org/griphyn/vdl/karajan/lib/TCProfile.java Log: fixed environment bug Modified: trunk/src/org/griphyn/vdl/karajan/lib/TCProfile.java =================================================================== --- trunk/src/org/griphyn/vdl/karajan/lib/TCProfile.java 2009-11-12 00:44:21 UTC (rev 3191) +++ trunk/src/org/griphyn/vdl/karajan/lib/TCProfile.java 2009-11-24 22:12:30 UTC (rev 3192) @@ -66,7 +66,7 @@ TransformationCatalogEntry tce = null; if (tr != null) { - getTCE(tc, new FQN(tr), bc); + tce = getTCE(tc, new FQN(tr), bc); } Map env = new HashMap(); From noreply at svn.ci.uchicago.edu Mon Nov 30 14:21:32 2009 From: noreply at svn.ci.uchicago.edu (noreply at svn.ci.uchicago.edu) Date: Mon, 30 Nov 2009 14:21:32 -0600 (CST) Subject: [Swift-commit] r3193 - branches Message-ID: <20091130202132.B727C9CCAF@vm-125-59.ci.uchicago.edu> Author: hategan Date: 2009-11-30 14:21:32 -0600 (Mon, 30 Nov 2009) New Revision: 3193 Added: branches/1.0/ Log: creating stable branch Copied: branches/1.0 (from rev 3192, trunk) From noreply at svn.ci.uchicago.edu Mon Nov 30 14:48:30 2009 From: noreply at svn.ci.uchicago.edu (noreply at svn.ci.uchicago.edu) Date: Mon, 30 Nov 2009 14:48:30 -0600 (CST) Subject: [Swift-commit] r3194 - www/downloads Message-ID: <20091130204830.7229D9CCAF@vm-125-59.ci.uchicago.edu> Author: hategan Date: 2009-11-30 14:48:30 -0600 (Mon, 30 Nov 2009) New Revision: 3194 Modified: www/downloads/index.php Log: added note about stable branch Modified: www/downloads/index.php =================================================================== --- www/downloads/index.php 2009-11-30 20:21:32 UTC (rev 3193) +++ www/downloads/index.php 2009-11-30 20:48:30 UTC (rev 3194) @@ -86,6 +86,12 @@

Building Swift

+ Note: The development code has the highest chance of containing buggy and + untested code. If you need stability please use one of the releases or the stable + branch below. +

+ +

You need Apache Ant for the actual build, and a Java JDK ≥ 1.4. @@ -123,6 +129,38 @@ The dist directory will contain the complete build.

+

Stable branch

+ +

+ Checkout CoG: +

svn co \ +https://cogkit.svn.sourceforge.net/svnroot/cogkit/branches/4.1.7/src/cog
+
+

+ +

+ Checkout Swift: +

cd cog/modules
+
svn co https://svn.ci.uchicago.edu/svn/vdl2/branches/1.0 swift
+
+

+ +

+ Change directory to the swift module: +

cd swift
+
+

+ +

+ Build the thing: +

ant dist
+
+

+ +

+ The dist directory will contain the complete build. +

+

Historical releases

Swift 0.8 - 2009/01/30