[Swift-commit] r5724 - in trunk: . bin lib src/org/griphyn/vdl/karajan src/org/griphyn/vdl/mapping src/org/griphyn/vdl/mapping/file

[davidk at ci.uchicago.edu]

Author: davidk
Date: 2012-03-24 04:05:58 -0500 (Sat, 24 Mar 2012)
New Revision: 5724

Added:
   trunk/lib/log4j-1.2.16.jar
Modified:
   trunk/.classpath
   trunk/bin/swift
   trunk/src/org/griphyn/vdl/karajan/VDSAdaptiveScheduler.java
   trunk/src/org/griphyn/vdl/mapping/AbsFile.java
   trunk/src/org/griphyn/vdl/mapping/AbstractMapper.java
   trunk/src/org/griphyn/vdl/mapping/PathElementComparator.java
   trunk/src/org/griphyn/vdl/mapping/file/TestMapper.java
Log:
Some fixes to get Swift loading in Eclipse with no errors
Mostly just involves some issues with @override
Updates to classpath
bin/swift gives warnings on modern Linux systems where /bin/sh is not bash
Explicitly use bash
Increase the default max heap size from 256M to 1024M


Modified: trunk/.classpath
===================================================================
--- trunk/.classpath	2012-03-23 21:24:34 UTC (rev 5723)
+++ trunk/.classpath	2012-03-24 09:05:58 UTC (rev 5724)
@@ -19,7 +19,7 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/abstraction-provider-coaster"/>
 	<classpathentry kind="lib" path="lib/jline-0.9.94.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/log4j"/>
+        <classpathentry kind="lib" path="lib/log4j-1.2.16.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/abstraction-provider-local"/>
 	<classpathentry kind="output" path=".build"/>
 </classpath>

Modified: trunk/bin/swift
===================================================================
--- trunk/bin/swift	2012-03-23 21:24:34 UTC (rev 5723)
+++ trunk/bin/swift	2012-03-24 09:05:58 UTC (rev 5724)
@@ -10,7 +10,7 @@
 
 CYGWIN=
 CPDELIM=":"
-HEAPMAX=256M
+HEAPMAX=1024M
 
 if echo `uname` | grep -i "cygwin"; then
 	CYGWIN="yes"

Added: trunk/lib/log4j-1.2.16.jar
===================================================================
--- trunk/lib/log4j-1.2.16.jar	                        (rev 0)
+++ trunk/lib/log4j-1.2.16.jar	2012-03-24 09:05:58 UTC (rev 5724)
@@ -0,0 +1 @@
+link ../../../lib/log4j-1.2.16.jar
\ No newline at end of file


Property changes on: trunk/lib/log4j-1.2.16.jar
___________________________________________________________________
Added: svn:special
   + *

Modified: trunk/src/org/griphyn/vdl/karajan/VDSAdaptiveScheduler.java
===================================================================
--- trunk/src/org/griphyn/vdl/karajan/VDSAdaptiveScheduler.java	2012-03-23 21:24:34 UTC (rev 5723)
+++ trunk/src/org/griphyn/vdl/karajan/VDSAdaptiveScheduler.java	2012-03-24 09:05:58 UTC (rev 5724)
@@ -470,8 +470,7 @@
         }
     }
 	
-	@Override
-    public void resourceUpdated(Service service, String name, String value) {
+	public void resourceUpdated(Service service, String name, String value) {
 	    if (logger.isInfoEnabled()) {
 	        logger.info(service + " resource updated: " + name + " -> " + value);
 	    }

Modified: trunk/src/org/griphyn/vdl/mapping/AbsFile.java
===================================================================
--- trunk/src/org/griphyn/vdl/mapping/AbsFile.java	2012-03-23 21:24:34 UTC (rev 5723)
+++ trunk/src/org/griphyn/vdl/mapping/AbsFile.java	2012-03-24 09:05:58 UTC (rev 5724)
@@ -182,7 +182,6 @@
 		return getURIAsString();
 	}
 
-    @Override
     public void clean() {
         try {
             getFileResource().deleteFile(path);

Modified: trunk/src/org/griphyn/vdl/mapping/AbstractMapper.java
===================================================================
--- trunk/src/org/griphyn/vdl/mapping/AbstractMapper.java	2012-03-23 21:24:34 UTC (rev 5723)
+++ trunk/src/org/griphyn/vdl/mapping/AbstractMapper.java	2012-03-24 09:05:58 UTC (rev 5724)
@@ -77,12 +77,10 @@
         throw new UnsupportedOperationException();
     }
 
-    @Override
     public void clean(Path path) {
         // no cleaning by default
     }
 
-    @Override
     public boolean isPersistent(Path path) {
         // persistent unless explicitly overridden
         return true;

Modified: trunk/src/org/griphyn/vdl/mapping/PathElementComparator.java
===================================================================
--- trunk/src/org/griphyn/vdl/mapping/PathElementComparator.java	2012-03-23 21:24:34 UTC (rev 5723)
+++ trunk/src/org/griphyn/vdl/mapping/PathElementComparator.java	2012-03-24 09:05:58 UTC (rev 5724)
@@ -22,7 +22,6 @@
 public class PathElementComparator implements Comparator<Comparable<?>> {
 
     @SuppressWarnings("unchecked")
-    @Override
     public int compare(Comparable<?> p1, Comparable<?> p2) {
         Comparable<Object> e1 = (Comparable<Object>) p1;
         Comparable<Object> e2 = (Comparable<Object>) p2;

Modified: trunk/src/org/griphyn/vdl/mapping/file/TestMapper.java
===================================================================
--- trunk/src/org/griphyn/vdl/mapping/file/TestMapper.java	2012-03-23 21:24:34 UTC (rev 5723)
+++ trunk/src/org/griphyn/vdl/mapping/file/TestMapper.java	2012-03-24 09:05:58 UTC (rev 5724)
@@ -70,7 +70,6 @@
         return !PARAM_TEMP.getBooleanValue(this);
     }
 
-    @Override
     public PhysicalFormat map(Path path) {
         if (remap == null) {
             if (map == null) {
@@ -83,12 +82,10 @@
         }
     }
 
-    @Override
     public Collection<Path> existing() {
         return Collections.singletonList(Path.EMPTY_PATH);
     }
 
-    @Override
     public boolean isStatic() {
         return PARAM_STATIC.getBooleanValue(this);
     }