morgand 01/08/23 14:31:12 Modified: latka/doc processWatchdogJSP.pl processWatchdogServlet.pl Log: no message Revision Changes Path 1.5 +2 -2 jakarta-commons/latka/doc/processWatchdogJSP.pl Index: processWatchdogJSP.pl =================================================================== RCS file: /home/cvs/jakarta-commons/latka/doc/processWatchdogJSP.pl,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- processWatchdogJSP.pl 2001/08/23 20:00:35 1.4 +++ processWatchdogJSP.pl 2001/08/23 21:31:12 1.5 @@ -19,7 +19,7 @@ $doc =~ s#debug="0" host="\${host}" port ?="\${port}"##sg; # make every gtest into a request -$doc =~ s#<gtest request="GET (.*?) HTTP/1.0"(.*?)assertion="(.*?)"\s*?testStrategy="(.*?)"\s*?/>#<request path="$1" label="$3">\n<validate>\n<TEMPLABLE>$4</TEMPLABLE>\n$2</validate>\n</request>#sg; +$doc =~ s#<gtest request="GET (.*?) HTTP/1.0"(.*?)assertion="(.*?)"\s*?testStrategy="(.*?)"\s*?/>#<request path="$1" label="$3">\n<validate>\n<TEMPLABEL>$4</TEMPLABEL>\n$2</validate>\n</request>#sg; $doc =~ s#returncode="200"#<statusCode/>#sgi; $doc =~ s#returncode="HTTP/1.0 200 OK"#<statusCode/>#sgi; @@ -28,7 +28,7 @@ $doc =~ s#responseMatch="(.*?)"#<regexp pattern="$1"/>#sg; # apply the label to the first test -$doc =~ s#<validate>\s*<TEMPLABLE>(.*?)</TEMPLABLE>\s*?(<[^>]*?)/>#<validate>\n$2 label="$1"/>#sg; +$doc =~ s#<validate>\s*<TEMPLABEL>(.*?)</TEMPLABEL>\s*?(<[^>]*?)/>#<validate>\n$2 label="$1"/>#sg; 1.2 +3 -3 jakarta-commons/latka/doc/processWatchdogServlet.pl Index: processWatchdogServlet.pl =================================================================== RCS file: /home/cvs/jakarta-commons/latka/doc/processWatchdogServlet.pl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- processWatchdogServlet.pl 2001/08/23 21:23:50 1.1 +++ processWatchdogServlet.pl 2001/08/23 21:31:12 1.2 @@ -19,7 +19,7 @@ $doc =~ s#debug="0" host="\${host}" port ?="\${port}"##sg; # make every gtest into a request -$doc =~ s#<gtest request="GET (.*?) HTTP/1.0"(.*?)assertion="(.*?)"\s*?testStrategy="(.*?)"\s*?/>#<request path="$1" label="$3">\n<validate>\n<TEMPLABLE>$4</TEMPLABLE>\n$2</validate>\n</request>#sg; +$doc =~ s#<gtest request="GET (.*?) HTTP/1.0"(.*?)assertion="(.*?)"\s*?testStrategy="(.*?)"\s*?/>#<request path="$1" label="$3">\n<validate>\n<TEMPLABEL>$4</TEMPLABEL>\n$2</validate>\n</request>#sg; # for gtests with no description $doc =~ s#<gtest request="GET (.*?) HTTP/1.0"(.*?)/>#<request path="$1">\n<validate>\n$2</validate>\n</request>#sg; @@ -43,10 +43,10 @@ # for tests with no validations, assume 200 check $doc =~ s#<validate>\s*</validate>#<validate>\n<statusCode/>\n</validate>#sg; -$doc =~ s#</TEMPLABLE>\s*</validate>#</TEMPLABLE>\n<statusCode/>\n</validate>#sg; +$doc =~ s#</TEMPLABEL>\s*</validate>#</TEMPLABEL>\n<statusCode/>\n</validate>#sg; # apply the label to the first test -$doc =~ s#<validate>\s*<TEMPLABLE>(.*?)</TEMPLABLE>\s*?(<[^>]*?)/>#<validate>\n$2 label="$1"/>#sg; +$doc =~ s#<validate>\s*<TEMPLABEL>(.*?)</TEMPLABEL>\s*?(<[^>]*?)/>#<validate>\n$2 label="$1"/>#sg;