Author: mriou
Date: Mon Jan 19 14:44:19 2009
New Revision: 735861
URL: http://svn.apache.org/viewvc?rev=735861&view=rev
Log:
Server cleanup in the RESTful SimPEL test case.
Modified:
ode/sandbox/simpel/src/main/antlr/org/apache/ode/simpel/antlr/SimPEL.g
ode/sandbox/simpel/src/main/antlr/org/apache/ode/simpel/antlr/SimPELWalker.g
ode/sandbox/simpel/src/main/java/org/apache/ode/rest/ProcessWebResource.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=735861&r1=735860&r2=735861&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 Mon
Jan 19 14:44:19 2009
@@ -143,20 +143,21 @@
// Simple activities
invoke
-options {backtrack=true;}
- : invoke_base param_block -> ^(INVOKE invoke_base) param_block;
+ : invoke_base param_block -> ^(INVOKE invoke_base) param_block
+ | invoke_base SEMI -> ^(INVOKE invoke_base);
invoke_base
: 'invoke' '(' p=ID ',' o=ID (',' in=ID)? ')' -> ^($p $o $in?);
receive
-options {backtrack=true;}
- : receive_base param_block -> ^(RECEIVE receive_base) param_block;
+ : receive_base param_block -> ^(RECEIVE receive_base) param_block
+ | receive_base SEMI -> ^(RECEIVE receive_base);
receive_base
: 'receive' '(' p=ID (',' o=ID (',' correlation)? )? ')' -> ^($p
$o? correlation?);
request
options {backtrack=true;}
- : request_base param_block -> ^(REQUEST request_base) param_block;
+ : request_base param_block -> ^(REQUEST request_base) param_block
+ | request_base SEMI -> ^(REQUEST request_base);
request_base
: 'request' '(' expr (',' meth=STRING (',' msg=ID)?)? ')' ->
^(REQ_BASE expr $meth? $msg?);
Modified:
ode/sandbox/simpel/src/main/antlr/org/apache/ode/simpel/antlr/SimPELWalker.g
URL:
http://svn.apache.org/viewvc/ode/sandbox/simpel/src/main/antlr/org/apache/ode/simpel/antlr/SimPELWalker.g?rev=735861&r1=735860&r2=735861&view=diff
==============================================================================
---
ode/sandbox/simpel/src/main/antlr/org/apache/ode/simpel/antlr/SimPELWalker.g
(original)
+++
ode/sandbox/simpel/src/main/antlr/org/apache/ode/simpel/antlr/SimPELWalker.g
Mon Jan 19 14:44:19 2009
@@ -28,16 +28,16 @@
private ErrorListener el;
public void setErrorListener(ErrorListener el) {
- this.el = el;
+ this.el = el;
}
public void displayRecognitionError(String[] tokenNames,
RecognitionException e) {
- el.reportRecognitionError(tokenNames, e.line, getErrorMessage(e,
tokenNames), e);
+ el.reportRecognitionError(tokenNames, e.line, getErrorMessage(e,
tokenNames), e);
}
public String getErrorMessage(RecognitionException e, String[] tokenNames)
{
- List stack = getRuleInvocationStack(e, this.getClass().getName());
- String msg = null;
- if ( e instanceof NoViableAltException ) {
+ List stack = getRuleInvocationStack(e, this.getClass().getName());
+ String msg = null;
+ if ( e instanceof NoViableAltException ) {
NoViableAltException nvae = (NoViableAltException)e;
msg = " no viable alt; token="+e.token+"
(decision="+nvae.decisionNumber+" state "+nvae.stateNumber+")"+
" decision=<<"+nvae.grammarDecisionDescription+">>";
@@ -59,12 +59,12 @@
return builder;
}
public void setBuilder(OBuilder builder) {
- this.builder = builder;
+ this.builder = builder;
}
private String text(org.antlr.runtime.tree.Tree t) {
- if (t == null) return null;
- else return t.getText();
+ if (t == null) return null;
+ else return t.getText();
}
private String deepText(org.antlr.runtime.tree.Tree t) {
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=735861&r1=735860&r2=735861&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
Mon Jan 19 14:44:19 2009
@@ -84,7 +84,7 @@
.entity(DOMUtils.domToString(DOMUtils.getFirstChildElement(DOMUtils
.getFirstChildElement(mex.getResponse().getMessage()))))
.type("application/xml")
- .header("Location", _root+mex.getResource().getUrl())
+ .header("Location", _root + mex.getResource().getUrl())
.build();
}
}
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=735861&r1=735860&r2=735861&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
Mon Jan 19 14:44:19 2009
@@ -15,6 +15,20 @@
public class RestfulSimPELTest extends TestCase {
+ EmbeddedServer server;
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ server = new EmbeddedServer();
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ super.tearDown();
+ server.stop();
+ }
+
private static final String HELLO_WORLD =
"process HelloWorld {\n" +
" receive(self) { |name|\n" +
@@ -24,7 +38,6 @@
"}";
public void testRestfulHelloWorld() throws Exception {
- EmbeddedServer server = new EmbeddedServer();
server.start();
Descriptor desc = new Descriptor();
desc.setAddress("/hello");
@@ -39,9 +52,8 @@
String response = resp.getEntity(String.class);
System.out.println("=> " + response);
assertTrue(response.indexOf("Hello foo") > 0);
- assertTrue(resp.getMetadata().get("Location").get(0),
resp.getMetadata().get("Location").get(0).matches("/hello/[0-9]*"));
+ assertTrue(resp.getMetadata().get("Location").get(0),
resp.getMetadata().get("Location").get(0).matches(".*/hello/[0-9]*"));
System.out.println("loc " + resp.getMetadata().get("Location"));
- server.stop();
}
private static final String COUNTER =
@@ -73,7 +85,6 @@
"}";
public void testCounter() throws Exception {
- EmbeddedServer server = new EmbeddedServer();
server.start();
Descriptor desc = new Descriptor();
desc.setAddress("/counter");
@@ -138,8 +149,6 @@
Thread.sleep(1500);
queryResponse =
instance.path("/").type("application/xml").get(ClientResponse.class);
assertTrue(queryResponse.getStatus() == 410);
-
- server.stop();
}
public static final String CALLING_GET =
@@ -153,7 +162,6 @@
"}";
public void testCallingGet() throws Exception {
- EmbeddedServer server = new EmbeddedServer();
server.start();
Descriptor desc = new Descriptor();
desc.setAddress("/feedget");
@@ -191,7 +199,6 @@
"}";
public void testAllMethods() throws Exception {
- EmbeddedServer server = new EmbeddedServer();
server.start();
Descriptor desc = new Descriptor();
desc.setAddress("/gppdproc");
