You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by mr...@apache.org on 2009/01/29 23:52:09 UTC
svn commit: r739062 - in /ode/sandbox/simpel/src:
main/antlr/org/apache/ode/simpel/antlr/ main/java/org/apache/ode/rest/
main/java/org/apache/ode/simpel/omodel/ test/java/org/apache/ode/simpel/
Author: mriou
Date: Thu Jan 29 22:52:08 2009
New Revision: 739062
URL: http://svn.apache.org/viewvc?rev=739062&view=rev
Log:
Test case fix, using parseInt to have an integer. Todos cleanup.
Modified:
ode/sandbox/simpel/src/main/antlr/org/apache/ode/simpel/antlr/SimPEL.g
ode/sandbox/simpel/src/main/java/org/apache/ode/rest/ProcessWebResource.java
ode/sandbox/simpel/src/main/java/org/apache/ode/simpel/omodel/OBuilder.java
ode/sandbox/simpel/src/test/java/org/apache/ode/simpel/RestfulSimPELTest.java
Modified: ode/sandbox/simpel/src/main/antlr/org/apache/ode/simpel/antlr/SimPEL.g
URL: http://svn.apache.org/viewvc/ode/sandbox/simpel/src/main/antlr/org/apache/ode/simpel/antlr/SimPEL.g?rev=739062&r1=739061&r2=739062&view=diff
==============================================================================
--- ode/sandbox/simpel/src/main/antlr/org/apache/ode/simpel/antlr/SimPEL.g (original)
+++ ode/sandbox/simpel/src/main/antlr/org/apache/ode/simpel/antlr/SimPEL.g Thu Jan 29 22:52:08 2009
@@ -316,7 +316,6 @@
funct_call
: fn=ID '(' (e+=expr)? (',' e+=expr)* ')' -> ^(CALL ID $e*);
-// TODO add && || !
s_expr : condExpr;
condExpr: boolExpr ( ('==' ^|'!=' ^|'<' ^|'>' ^|'<=' ^|'>=' ^) boolExpr )?;
boolExpr: aexpr (('&&'|'||')^ aexpr )?;
Modified: ode/sandbox/simpel/src/main/java/org/apache/ode/rest/ProcessWebResource.java
URL: http://svn.apache.org/viewvc/ode/sandbox/simpel/src/main/java/org/apache/ode/rest/ProcessWebResource.java?rev=739062&r1=739061&r2=739062&view=diff
==============================================================================
--- ode/sandbox/simpel/src/main/java/org/apache/ode/rest/ProcessWebResource.java (original)
+++ ode/sandbox/simpel/src/main/java/org/apache/ode/rest/ProcessWebResource.java Thu Jan 29 22:52:08 2009
@@ -76,6 +76,8 @@
return Response.status(408).entity("The server timed out while processing the request.").build();
}
+ // TODO handle faults and failures
+
if (mex.getResponse() == null) {
return Response.status(204).build();
} else {
Modified: ode/sandbox/simpel/src/main/java/org/apache/ode/simpel/omodel/OBuilder.java
URL: http://svn.apache.org/viewvc/ode/sandbox/simpel/src/main/java/org/apache/ode/simpel/omodel/OBuilder.java?rev=739062&r1=739061&r2=739062&view=diff
==============================================================================
--- ode/sandbox/simpel/src/main/java/org/apache/ode/simpel/omodel/OBuilder.java (original)
+++ ode/sandbox/simpel/src/main/java/org/apache/ode/simpel/omodel/OBuilder.java Thu Jan 29 22:52:08 2009
@@ -23,7 +23,6 @@
import java.util.*;
/**
- * TODO e4x templates
* TODO resources aren't available if they're not used
*/
public class OBuilder extends BaseCompiler {
Modified: ode/sandbox/simpel/src/test/java/org/apache/ode/simpel/RestfulSimPELTest.java
URL: http://svn.apache.org/viewvc/ode/sandbox/simpel/src/test/java/org/apache/ode/simpel/RestfulSimPELTest.java?rev=739062&r1=739061&r2=739062&view=diff
==============================================================================
--- ode/sandbox/simpel/src/test/java/org/apache/ode/simpel/RestfulSimPELTest.java (original)
+++ ode/sandbox/simpel/src/test/java/org/apache/ode/simpel/RestfulSimPELTest.java Thu Jan 29 22:52:08 2009
@@ -64,6 +64,7 @@
" value = resource(\"/value\"); \n" +
" inc = resource(\"/inc\"); \n" +
" dec = resource(\"/dec\"); \n" +
+ " counter = parseInt(counter); \n" +
" scope { \n" +
" while(counter>0) { \n" +
" wait(\"PT1S\"); \n" + // TODO support time as well as duration
@@ -74,20 +75,20 @@
" links.decrement = dec; \n" +
" links.value = value; \n" +
" reply(links); \n" +
- " } onQuery(value) {\n" +
+ " } onQuery(value) { \n" +
" reply(counter); \n" +
- " } onReceive(dec) {\n" +
+ " } onReceive(dec) { \n" +
" counter = counter - 1; \n" +
" reply(counter); \n" +
- " } onReceive(inc) {\n" +
- " counter = counter - (-1); \n" + // TODO fix the - - hack
+ " } onReceive(inc) { \n" +
+ " counter = counter + 1; \n" + // TODO fix the - - hack
" reply(counter); \n" +
" } \n" +
"}";
public void testCounter() throws Exception {
server.start();
- Descriptor desc = new Descriptor();
+ Descriptor desc = new Descriptor(); // TODO remove the descriptor to use environment-based configuration
desc.setAddress("/counter");
server.deploy(COUNTER, desc);