commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kohs...@apache.org
Subject svn commit: r227306 - in /jakarta/commons/sandbox/javaflow/trunk: ./ src/java/org/apache/commons/javaflow/ src/java/org/apache/commons/javaflow/bytecode/ src/java/org/apache/commons/javaflow/bytecode/bcel/ src/test/org/apache/commons/javaflow/testcode/
Date Thu, 04 Aug 2005 05:18:25 GMT
Author: kohsuke
Date: Wed Aug  3 22:18:03 2005
New Revision: 227306

URL: http://svn.apache.org/viewcvs?rev=227306&view=rev
Log:
removed Continuable the marker interface, then renamed ContinuationCapable to bytecode.Continuable

Added:
    jakarta/commons/sandbox/javaflow/trunk/src/java/org/apache/commons/javaflow/bytecode/Continuable.java
      - copied, changed from r226930, jakarta/commons/sandbox/javaflow/trunk/src/java/org/apache/commons/javaflow/ContinuationCapable.java
Removed:
    jakarta/commons/sandbox/javaflow/trunk/src/java/org/apache/commons/javaflow/Continuable.java
    jakarta/commons/sandbox/javaflow/trunk/src/java/org/apache/commons/javaflow/ContinuationCapable.java
Modified:
    jakarta/commons/sandbox/javaflow/trunk/TODO
    jakarta/commons/sandbox/javaflow/trunk/src/java/org/apache/commons/javaflow/ContinuationClassLoader.java
    jakarta/commons/sandbox/javaflow/trunk/src/java/org/apache/commons/javaflow/bytecode/bcel/BcelClassTransformer.java
    jakarta/commons/sandbox/javaflow/trunk/src/test/org/apache/commons/javaflow/testcode/Calculator.java

Modified: jakarta/commons/sandbox/javaflow/trunk/TODO
URL: http://svn.apache.org/viewcvs/jakarta/commons/sandbox/javaflow/trunk/TODO?rev=227306&r1=227305&r2=227306&view=diff
==============================================================================
--- jakarta/commons/sandbox/javaflow/trunk/TODO (original)
+++ jakarta/commons/sandbox/javaflow/trunk/TODO Wed Aug  3 22:18:03 2005
@@ -3,8 +3,6 @@
 o integrate just4log into the build system
 o testcases!!!!
 o documentation of the rewriting process
-o get rid of the Continuable and ContinuationCapable
-  marker interfaces
 o fix rewriting bugs/limitations:
   o fix unintialized objects for method/constructor calls
   o inner classes

Modified: jakarta/commons/sandbox/javaflow/trunk/src/java/org/apache/commons/javaflow/ContinuationClassLoader.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/sandbox/javaflow/trunk/src/java/org/apache/commons/javaflow/ContinuationClassLoader.java?rev=227306&r1=227305&r2=227306&view=diff
==============================================================================
--- jakarta/commons/sandbox/javaflow/trunk/src/java/org/apache/commons/javaflow/ContinuationClassLoader.java
(original)
+++ jakarta/commons/sandbox/javaflow/trunk/src/java/org/apache/commons/javaflow/ContinuationClassLoader.java
Wed Aug  3 22:18:03 2005
@@ -24,12 +24,16 @@
 import org.apache.commons.logging.LogFactory;
 
 /**
+ * {@link ClassLoader} that instruments class files for javaflow on-the-fly.
+ *
+ * <p>
+ * This <tt>ClassLoader</tt> enhances the 
  * @author tcurdt
  *
  */
 public final class ContinuationClassLoader extends ClassLoader {
     
-    private final static Log log = LogFactory.getLog(ContinuationCompilingClassLoader.class);
+    private final static Log log = LogFactory.getLog(ContinuationClassLoader.class);
     
     private ClassTransformer transformer = new BcelClassTransformer();
     

Copied: jakarta/commons/sandbox/javaflow/trunk/src/java/org/apache/commons/javaflow/bytecode/Continuable.java
(from r226930, jakarta/commons/sandbox/javaflow/trunk/src/java/org/apache/commons/javaflow/ContinuationCapable.java)
URL: http://svn.apache.org/viewcvs/jakarta/commons/sandbox/javaflow/trunk/src/java/org/apache/commons/javaflow/bytecode/Continuable.java?p2=jakarta/commons/sandbox/javaflow/trunk/src/java/org/apache/commons/javaflow/bytecode/Continuable.java&p1=jakarta/commons/sandbox/javaflow/trunk/src/java/org/apache/commons/javaflow/ContinuationCapable.java&r1=226930&r2=227306&rev=227306&view=diff
==============================================================================
--- jakarta/commons/sandbox/javaflow/trunk/src/java/org/apache/commons/javaflow/ContinuationCapable.java
(original)
+++ jakarta/commons/sandbox/javaflow/trunk/src/java/org/apache/commons/javaflow/bytecode/Continuable.java
Wed Aug  3 22:18:03 2005
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.javaflow;
+package org.apache.commons.javaflow.bytecode;
 
 /**
  * Marker interface to mark classes, which are transformed by the 
@@ -23,5 +23,5 @@
  * @author <a href="mailto:stephan@apache.org">Stephan Michels</a>
  * @version CVS $Id$
  */
-public interface ContinuationCapable {
+public interface Continuable {
 }

Modified: jakarta/commons/sandbox/javaflow/trunk/src/java/org/apache/commons/javaflow/bytecode/bcel/BcelClassTransformer.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/sandbox/javaflow/trunk/src/java/org/apache/commons/javaflow/bytecode/bcel/BcelClassTransformer.java?rev=227306&r1=227305&r2=227306&view=diff
==============================================================================
--- jakarta/commons/sandbox/javaflow/trunk/src/java/org/apache/commons/javaflow/bytecode/bcel/BcelClassTransformer.java
(original)
+++ jakarta/commons/sandbox/javaflow/trunk/src/java/org/apache/commons/javaflow/bytecode/bcel/BcelClassTransformer.java
Wed Aug  3 22:18:03 2005
@@ -15,12 +15,6 @@
  */
 package org.apache.commons.javaflow.bytecode.bcel;
 
-import java.io.ByteArrayInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Vector;
 import org.apache.bcel.Constants;
 import org.apache.bcel.Repository;
 import org.apache.bcel.classfile.ClassFormatException;
@@ -60,11 +54,10 @@
 import org.apache.bcel.generic.TargetLostException;
 import org.apache.bcel.generic.Type;
 import org.apache.bcel.verifier.exc.AssertionViolatedException;
-import org.apache.commons.javaflow.Continuable;
 import org.apache.commons.javaflow.Continuation;
-import org.apache.commons.javaflow.ContinuationCapable;
 import org.apache.commons.javaflow.bytecode.ClassTransformer;
 import org.apache.commons.javaflow.bytecode.Stack;
+import org.apache.commons.javaflow.bytecode.Continuable;
 import org.apache.commons.javaflow.bytecode.bcel.analyser.ControlFlowGraph;
 import org.apache.commons.javaflow.bytecode.bcel.analyser.ExceptionHandler;
 import org.apache.commons.javaflow.bytecode.bcel.analyser.ExecutionVisitor;
@@ -76,6 +69,13 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+import java.io.ByteArrayInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Vector;
+
 
 /**
  * @author tcurdt
@@ -90,7 +90,6 @@
     private static final String STACK_CLASS = Stack.class.getName();
     private static final ObjectType STACK_TYPE = new ObjectType(STACK_CLASS);
     private static final String CONTINUABLE_CLASS = Continuable.class.getName();
-    private static final String CONTINUATIONCAPABLE_CLASS = ContinuationCapable.class.getName();
     private static final String CONTINUATION_METHOD = "currentContinuation";
     private static final String STACK_METHOD = "getStack";
     private static final String POP_METHOD = "pop";
@@ -196,7 +195,7 @@
             }
         }
 
-        clazzGen.addInterface(CONTINUATIONCAPABLE_CLASS);
+        clazzGen.addInterface(CONTINUABLE_CLASS);
 
         final byte[] changed = clazzGen.getJavaClass().getBytes();
         try {

Modified: jakarta/commons/sandbox/javaflow/trunk/src/test/org/apache/commons/javaflow/testcode/Calculator.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/sandbox/javaflow/trunk/src/test/org/apache/commons/javaflow/testcode/Calculator.java?rev=227306&r1=227305&r2=227306&view=diff
==============================================================================
--- jakarta/commons/sandbox/javaflow/trunk/src/test/org/apache/commons/javaflow/testcode/Calculator.java
(original)
+++ jakarta/commons/sandbox/javaflow/trunk/src/test/org/apache/commons/javaflow/testcode/Calculator.java
Wed Aug  3 22:18:03 2005
@@ -15,18 +15,17 @@
  */
 package org.apache.commons.javaflow.testcode;
 
-import java.io.Serializable;
-
-import org.apache.commons.javaflow.Continuable;
 import org.apache.commons.javaflow.Continuation;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+import java.io.Serializable;
+
 /**
  * @author tcurdt
  *
  */
-public final class Calculator implements Continuable, Serializable, Runnable {
+public final class Calculator implements Serializable, Runnable {
     
     private static final Log log = LogFactory.getLog(Calculator.class);
 



---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org


Mime
View raw message