Repository: incubator-groovy Updated Branches: refs/heads/GROOVY_2_4_X f86017107 -> ee7f422f8
remove some rat warnings and minor cleanup Project: http://git-wip-us.apache.org/repos/asf/incubator-groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-groovy/commit/ee7f422f Tree: http://git-wip-us.apache.org/repos/asf/incubator-groovy/tree/ee7f422f Diff: http://git-wip-us.apache.org/repos/asf/incubator-groovy/diff/ee7f422f Branch: refs/heads/GROOVY_2_4_X Commit: ee7f422f8e4e1708d9a16ea7ef9ea55a6854cba4 Parents: f860171 Author: Paul King <pa...@asert.com.au> Authored: Thu May 21 19:02:32 2015 +1000 Committer: Paul King <pa...@asert.com.au> Committed: Thu May 21 19:19:22 2015 +1000 ---------------------------------------------------------------------- config/licensing/rat-excludes.txt | 20 +- src/bin/grape | 18 + src/bin/grape.bat | 19 + src/bin/groovy | 18 + src/bin/groovy.bat | 19 + src/bin/groovyConsole | 18 + src/bin/groovyConsole.bat | 19 + src/bin/groovyc | 18 + src/bin/groovyc.bat | 19 + src/bin/groovydoc | 18 + src/bin/groovydoc.bat | 19 + src/bin/groovysh | 18 + src/bin/groovysh.bat | 19 + src/bin/java2groovy | 18 + src/bin/java2groovy.bat | 19 + src/bin/startGroovy | 18 + src/bin/startGroovy.bat | 19 + src/main/org/codehaus/groovy/antlr/groovy.g | 20 +- src/main/org/codehaus/groovy/antlr/java/java.g | 20 +- src/native/base.c | 85 --- src/tck/build.xml | 202 ------ src/tck/src/manifest.txt | 2 - src/tck/styles/junit-frames.xsl | 723 -------------------- 23 files changed, 345 insertions(+), 1023 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ee7f422f/config/licensing/rat-excludes.txt ---------------------------------------------------------------------- diff --git a/config/licensing/rat-excludes.txt b/config/licensing/rat-excludes.txt index 1053903..8087598 100644 --- a/config/licensing/rat-excludes.txt +++ b/config/licensing/rat-excludes.txt @@ -17,23 +17,25 @@ build .*\.iws .*\.bnd gradlew +latex +assets +resources +test-resources gradlew\.bat .*\.adoc .*\.gradle -.*\.js -.*\.css -.*\.tpl -.*\.xml -.*\.html -.*\.xsd .*\.properties .*\.policy -.*\.eps -.*\.mps -.*\.tex .*\.txt .*\.gif .*\.png .*\.jar .*\.conf +.*\.icns .*\.text +META-INF +WEB-INF +package\.html +overview\.html +overviewj\.html +config http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ee7f422f/src/bin/grape ---------------------------------------------------------------------- diff --git a/src/bin/grape b/src/bin/grape index c752a15..8ac4548 100644 --- a/src/bin/grape +++ b/src/bin/grape @@ -1,4 +1,22 @@ #!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- ############################################################################## ## ## http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ee7f422f/src/bin/grape.bat ---------------------------------------------------------------------- diff --git a/src/bin/grape.bat b/src/bin/grape.bat index 2ba9914..695422a 100644 --- a/src/bin/grape.bat +++ b/src/bin/grape.bat @@ -1,3 +1,22 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + @if "%DEBUG%" == "" @echo off @rem http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ee7f422f/src/bin/groovy ---------------------------------------------------------------------- diff --git a/src/bin/groovy b/src/bin/groovy index ed85600..f278f48 100644 --- a/src/bin/groovy +++ b/src/bin/groovy @@ -1,4 +1,22 @@ #!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- ############################################################################## ## ## http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ee7f422f/src/bin/groovy.bat ---------------------------------------------------------------------- diff --git a/src/bin/groovy.bat b/src/bin/groovy.bat index 9486dbd..5449485 100644 --- a/src/bin/groovy.bat +++ b/src/bin/groovy.bat @@ -1,3 +1,22 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + @if "%DEBUG%" == "" @echo off @rem http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ee7f422f/src/bin/groovyConsole ---------------------------------------------------------------------- diff --git a/src/bin/groovyConsole b/src/bin/groovyConsole index 5286e3d..74a67a9 100644 --- a/src/bin/groovyConsole +++ b/src/bin/groovyConsole @@ -1,4 +1,22 @@ #!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- ############################################################################## ## ## http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ee7f422f/src/bin/groovyConsole.bat ---------------------------------------------------------------------- diff --git a/src/bin/groovyConsole.bat b/src/bin/groovyConsole.bat index b21cbe2..6841da0 100644 --- a/src/bin/groovyConsole.bat +++ b/src/bin/groovyConsole.bat @@ -1,3 +1,22 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + @if "%DEBUG%" == "" @echo off @rem http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ee7f422f/src/bin/groovyc ---------------------------------------------------------------------- diff --git a/src/bin/groovyc b/src/bin/groovyc index 68bdb5a..330bc26 100644 --- a/src/bin/groovyc +++ b/src/bin/groovyc @@ -1,4 +1,22 @@ #!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- ############################################################################## ## ## http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ee7f422f/src/bin/groovyc.bat ---------------------------------------------------------------------- diff --git a/src/bin/groovyc.bat b/src/bin/groovyc.bat index 4fc5b0e..cb60e86 100644 --- a/src/bin/groovyc.bat +++ b/src/bin/groovyc.bat @@ -1,3 +1,22 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + @if "%DEBUG%" == "" @echo off @rem http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ee7f422f/src/bin/groovydoc ---------------------------------------------------------------------- diff --git a/src/bin/groovydoc b/src/bin/groovydoc index a4c4d0f..3f8ddd4 100644 --- a/src/bin/groovydoc +++ b/src/bin/groovydoc @@ -1,4 +1,22 @@ #!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- ############################################################################## ## ## http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ee7f422f/src/bin/groovydoc.bat ---------------------------------------------------------------------- diff --git a/src/bin/groovydoc.bat b/src/bin/groovydoc.bat index dbfa27b..3296ba7 100644 --- a/src/bin/groovydoc.bat +++ b/src/bin/groovydoc.bat @@ -1,3 +1,22 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + @if "%DEBUG%" == "" @echo off @rem http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ee7f422f/src/bin/groovysh ---------------------------------------------------------------------- diff --git a/src/bin/groovysh b/src/bin/groovysh index 5672969..2494f66 100644 --- a/src/bin/groovysh +++ b/src/bin/groovysh @@ -1,4 +1,22 @@ #!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- ############################################################################## ## ## http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ee7f422f/src/bin/groovysh.bat ---------------------------------------------------------------------- diff --git a/src/bin/groovysh.bat b/src/bin/groovysh.bat index 6eb53e4..ff090da 100644 --- a/src/bin/groovysh.bat +++ b/src/bin/groovysh.bat @@ -1,3 +1,22 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + @if "%DEBUG%" == "" @echo off @rem http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ee7f422f/src/bin/java2groovy ---------------------------------------------------------------------- diff --git a/src/bin/java2groovy b/src/bin/java2groovy index 56f6307..119b063 100644 --- a/src/bin/java2groovy +++ b/src/bin/java2groovy @@ -1,4 +1,22 @@ #!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- ############################################################################## ## ## http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ee7f422f/src/bin/java2groovy.bat ---------------------------------------------------------------------- diff --git a/src/bin/java2groovy.bat b/src/bin/java2groovy.bat index 660be74..c137b39 100644 --- a/src/bin/java2groovy.bat +++ b/src/bin/java2groovy.bat @@ -1,3 +1,22 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + @if "%DEBUG%" == "" @echo off @rem http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ee7f422f/src/bin/startGroovy ---------------------------------------------------------------------- diff --git a/src/bin/startGroovy b/src/bin/startGroovy index 0aae91d..7bd4b35 100644 --- a/src/bin/startGroovy +++ b/src/bin/startGroovy @@ -1,4 +1,22 @@ # -*- mode:sh -*- +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- ############################################################################## ## ## http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ee7f422f/src/bin/startGroovy.bat ---------------------------------------------------------------------- diff --git a/src/bin/startGroovy.bat b/src/bin/startGroovy.bat index 7f27e49..7d86dd3 100644 --- a/src/bin/startGroovy.bat +++ b/src/bin/startGroovy.bat @@ -1,3 +1,22 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + @if "%DEBUG%" == "" @echo off @rem ########################################################################## @rem ## http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ee7f422f/src/main/org/codehaus/groovy/antlr/groovy.g ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/antlr/groovy.g b/src/main/org/codehaus/groovy/antlr/groovy.g index 7527359..2cc12f2 100644 --- a/src/main/org/codehaus/groovy/antlr/groovy.g +++ b/src/main/org/codehaus/groovy/antlr/groovy.g @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ // Note: Please don't use physical tabs. Logical tabs for indent are width 4. header { package org.codehaus.groovy.antlr.parser; @@ -194,7 +212,7 @@ import antlr.TokenStreamRecognitionException; * o fixed various rules so that they call the correct Create Method * to make sure that the line information are correct * - * This grammar is in the PUBLIC DOMAIN + * Based on an original grammar released in the PUBLIC DOMAIN */ class GroovyRecognizer extends Parser; http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ee7f422f/src/main/org/codehaus/groovy/antlr/java/java.g ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/antlr/java/java.g b/src/main/org/codehaus/groovy/antlr/java/java.g index 29647c2..5d25962 100644 --- a/src/main/org/codehaus/groovy/antlr/java/java.g +++ b/src/main/org/codehaus/groovy/antlr/java/java.g @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ // Note: Please don't use physical tabs. Logical tabs for indent are width 4. header { package org.codehaus.groovy.antlr.java; @@ -182,7 +200,7 @@ import antlr.LexerSharedInputState; * o I have taken java.g for Java1.5 from Michael Studman (1.22.4) * and have made some changes to enable use by java2groovy tool (Jan 2007) * - * This grammar is in the PUBLIC DOMAIN + * Based on an original grammar released in the PUBLIC DOMAIN */ class JavaRecognizer extends Parser; http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ee7f422f/src/native/base.c ---------------------------------------------------------------------- diff --git a/src/native/base.c b/src/native/base.c deleted file mode 100644 index 2200421..0000000 --- a/src/native/base.c +++ /dev/null @@ -1,85 +0,0 @@ -#ifdef __APPLE__ -#ifdef __MACH__ -#define MACOSX -#define UNIX -#endif -#endif - -#ifdef __linux__ -#define UNIX -#define LINUX -#endif - -#ifdef UNIX -#include <errno.h> -#include <stdlib.h> -#include <string.h> -#include <stdio.h> -#endif - -#ifdef LINUX -#include <unistd.h> -#include <linux/limits.h> -#include <malloc.h> -#endif - -#ifdef MACOSX -#include <mach-o/dyld.h> -#include <sys/param.h> -#endif - -int main(int argc, char* argv[]) { - - // Get the location of the executable -- platform specific -#ifdef UNIX - char *jarexe = malloc((MAXPATHLEN+2)*sizeof(char)); -#endif - -#ifdef MACOSX - uint32_t length = MAXPATHLEN + 2; - while (_NSGetExecutablePath((char*)jarexe, &length) == -1) { - free(jarexe); - jarexe = malloc((length)*sizeof(char)); - } -#endif - -#ifdef LINUX - char temp[PATH_MAX]; - sprintf(temp, "/proc/%d/exe", getpid()); - realpath(temp, jarexe); -#endif - - // Setup the command line. - // TODO: Add -J support for passing Java options - char* argv2[argc+2]; - argv2[0] = "java"; - argv2[1] = JAVA_CLASS_NAME; - - // Setup the CLASSPATH environment - char *CLASSPATH = (char*) getenv("CLASSPATH"); - if (!CLASSPATH) CLASSPATH=""; - char *NEWCLASSPATH = (char*) calloc(strlen(CLASSPATH)+1+strlen(jarexe)+1, sizeof(char)); // +1 for :, +1 for null terminator - sprintf(NEWCLASSPATH, "%s:%s", jarexe, CLASSPATH); - setenv("CLASSPATH", NEWCLASSPATH, 1); - - // Setup the rest of the command line that was passed in. - // TODO: This will also be affected by -J options - int i; - for (i = 1; i < argc; i++) { - argv2[i+1] = argv[i]; - } - argv2[argc+1] = 0; - - // Execute java -#ifdef UNIX - free(jarexe); - execvp("java", argv2); -#endif - - // Report if the exec fails - printf("Cannot execute '"); - for (i = 0; i < argc+1; i ++) { printf("%s ", argv2[i]); } -#ifdef UNIX - printf("', caused by error: %d\n. In order to run %s you must have the Java VM you want to use in your PATH", errno, argv[0]); -#endif -} http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ee7f422f/src/tck/build.xml ---------------------------------------------------------------------- diff --git a/src/tck/build.xml b/src/tck/build.xml deleted file mode 100644 index b2d8316..0000000 --- a/src/tck/build.xml +++ /dev/null @@ -1,202 +0,0 @@ -<?xml version="1.0"?> -<project name="tck" default="default"> - - <!-- -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- --> - <!-- compile settings --> - <!-- -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- --> - <property name="build.debug" value="on"/> - - <!-- -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- --> - <!-- directories --> - <!-- -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- --> - <property name="src.dir" value="src"/> - <property name="build.dir" value="build"/> - <property name="build.classes.dir" value="${build.dir}/classes"/> - <property name="dist.dir" value="dist"/> - - <!-- javadoc properties --> - <property name="javadoc.dir" value="doc"/> - <property name="javadoc.packages" value="org.codehaus.groovy.*"/> - - <!-- junit properties --> - <property name="junit.style.dir" value="styles"/> - <property name="testcase.src.dir" value="test"/> - <property name="generated.test.src.dir" value="gentest"/> - - <property name="test.classes.dir" value="${build.dir}/test/classes"/> - - <!-- TODO: here you specify where the classes to test reside --> - <property name="items.under.test.dir" value="../../target/install/lib"/> - - <property name="test.reports.dir" value="reports"/> - - <!-- -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- --> - <!-- targets --> - <!-- -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- --> - <target name="default" - depends="clean,test-compile" - description="default: run the groovy test suite" - /> - - <target name="all" - depends="test,dist" - description="build and test everything" - /> - - <target name="clean" description="remove all built files"> - <delete dir="${javadoc.dir}" /> - <delete dir="${build.dir}" /> - <delete dir="${dist.dir}" /> - <delete dir="${generated.test.src.dir}" /> - </target> - - <target name="dist" - depends="compile" - description="create distributables (jars etc)"> - <mkdir dir="${dist.dir}" /> - <jar jarfile="${dist.dir}/tck.jar" - manifest="${src.dir}/manifest.txt"> - <fileset dir="${build.classes.dir}"/> - </jar> - </target> - - <target name="docs" depends="init" description="generate documentation"> - <mkdir dir="${javadoc.dir}" /> - <javadoc sourcepath="${src.dir}" - destdir="${javadoc.dir}" - packagenames="${javadoc.packages}" - use="true" - windowtitle="tck" - private="true"/> - </target> - - <target name="run" depends="compile" description="compile and run"> - <java classname="org.codehaus.groovy.tck.GenerateTestCases" - fork="yes" - classpathref="project.classpath"/> - </target> - - <target name="plain-test" - depends="test-compile" - description="run all test cases"> - <junit haltonfailure="true" fork="no"> - <classpath refid="project.classpath"/> - <formatter type="plain" usefile="false"/> - <formatter type="xml" usefile="true"/> - <batchtest todir="${test.reports.dir}"> - <fileset dir="${test.classes.dir}"> - <include name="**/*Test.class" /> - </fileset> - </batchtest> - </junit> - </target> - - <target name="test" - depends="test-compile" - description="HTML output of test cases"> - <mkdir dir="${test.reports.dir}"/> - <junit haltonfailure="false" fork="no"> - <classpath refid="project.classpath"/> - <formatter type="xml" usefile="true"/> - - <batchtest todir="${test.reports.dir}"> - <fileset dir="${test.classes.dir}"> - <include name="**/*Test.class" /> - </fileset> - </batchtest> - - </junit> - - <junitreport todir="${test.reports.dir}"> - <fileset dir="${test.reports.dir}"> - <include name="TEST-*.xml"/> - </fileset> - <report format="frames" styledir="${junit.style.dir}" todir="${test.reports.dir}"/> - </junitreport> - <echo> -+-------------------------+ -| open reports/index.html | -+-------------------------+ -</echo> - </target> - - - - <target name="compile" depends="init" description="compile java and groovy sources"> - <mkdir dir="${build.classes.dir}" /> - - <groovyc destdir="${build.classes.dir}" - srcdir="${src.dir}" - listfiles="true"> - <classpath refid="project.classpath"/> - </groovyc> - - <javac srcdir="${src.dir}" - destdir="${build.classes.dir}" - classpathref="project.classpath" - debug="${build.debug}" - deprecation="on"/> - </target> - - <target name="generate" depends="dist" description="generate test cases"> - <mkdir dir="${generated.test.src.dir}" /> - <taskdef name="gentests" classname="org.codehaus.groovy.tck.GenerateTestCases" classpathref="project.classpath"/> - - <gentests destdir="${generated.test.src.dir}" - srcdir="${testcase.src.dir}" - listfiles="true"/> - </target> - - <target name="test-compile" depends="generate" description="compile tests"> - <mkdir dir="${test.classes.dir}" /> - <javac srcdir="${generated.test.src.dir}" - destdir="${test.classes.dir}" - classpathref="project.classpath" - debug="${build.debug}" - deprecation="on"> - </javac> - </target> - - <target name="independent-test-compile" depends="generate" description="compile tests"> - <mkdir dir="${test.classes.dir}" /> - <javac srcdir="${generated.test.src.dir}" - destdir="${test.classes.dir}" - classpathref="project.classpath" - debug="${build.debug}" - deprecation="on"> - </javac> - </target> - - <target name="init" depends="init.sub.build,init.independent.build"> - <tstamp/> - </target> - - <!-- -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- --> - <!-- Datatypes --> - <!-- -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- --> - - <!-- this target is performed we are within a maven build --> - <target name="init.sub.build" if="maven.compile.source"> - - <path id="project.classpath"> - <pathelement location="${test.classes.dir}"/> - <path refid="passed.classpath"/> - <pathelement location="${build.classes.dir}"/> - </path> - - </target> - - <!-- this target is performed when ant is called from command line --> - <target name="init.independent.build" unless="maven.compile.source"> - - <path id="project.classpath"> - <pathelement location="${test.classes.dir}"/> - <pathelement location="${build.classes.dir}"/> - <fileset dir="${items.under.test.dir}"> - <include name="**/*.jar" /> - </fileset> - </path> - - </target> - -</project> http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ee7f422f/src/tck/src/manifest.txt ---------------------------------------------------------------------- diff --git a/src/tck/src/manifest.txt b/src/tck/src/manifest.txt deleted file mode 100644 index 2dd0636..0000000 --- a/src/tck/src/manifest.txt +++ /dev/null @@ -1,2 +0,0 @@ -Manifest-Version: 1.0 -Main-Class: org.codehaus.groovy.tck.GenerateTestCases http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ee7f422f/src/tck/styles/junit-frames.xsl ---------------------------------------------------------------------- diff --git a/src/tck/styles/junit-frames.xsl b/src/tck/styles/junit-frames.xsl deleted file mode 100644 index c208c5a..0000000 --- a/src/tck/styles/junit-frames.xsl +++ /dev/null @@ -1,723 +0,0 @@ -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" - xmlns:lxslt="http://xml.apache.org/xslt" - xmlns:redirect="http://xml.apache.org/xalan/redirect" - xmlns:stringutils="xalan://org.apache.tools.ant.util.StringUtils" - extension-element-prefixes="redirect"> -<xsl:output method="html" indent="yes" encoding="US-ASCII"/> -<xsl:decimal-format decimal-separator="." grouping-separator=","/> -<!-- - Copyright 2001-2004 The Apache Software Foundation - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> - -<!-- - - Sample stylesheet to be used with Ant JUnitReport output. - - It creates a set of HTML files a la javadoc where you can browse easily - through all packages and classes. - - @author Stephane Bailliez <a href="mailto:sbaill...@apache.org"/> - @author Erik Hatcher <a href="mailto:ehatc...@apache.org"/> - @author Martijn Kruithof <a href="mailto:mart...@kruithof.xs4all.nl"/> - ---> -<xsl:param name="output.dir" select="'.'"/> - - -<xsl:template match="testsuites"> - <!-- create the index.html --> - <redirect:write file="{$output.dir}/index.html"> - <xsl:call-template name="index.html"/> - </redirect:write> - - <!-- create the stylesheet.css --> - <redirect:write file="{$output.dir}/stylesheet.css"> - <xsl:call-template name="stylesheet.css"/> - </redirect:write> - - <!-- create the overview-packages.html at the root --> - <redirect:write file="{$output.dir}/overview-summary.html"> - <xsl:apply-templates select="." mode="overview.packages"/> - </redirect:write> - - <!-- create the all-packages.html at the root --> - <redirect:write file="{$output.dir}/overview-frame.html"> - <xsl:apply-templates select="." mode="all.packages"/> - </redirect:write> - - <!-- create the all-classes.html at the root --> - <redirect:write file="{$output.dir}/allclasses-frame.html"> - <xsl:apply-templates select="." mode="all.classes"/> - </redirect:write> - - <!-- process all packages --> - <xsl:for-each select="./testsuite[not(./@package = preceding-sibling::testsuite/@package)]"> - <xsl:call-template name="package"> - <xsl:with-param name="name" select="@package"/> - </xsl:call-template> - </xsl:for-each> -</xsl:template> - - -<xsl:template name="package"> - <xsl:param name="name"/> - <xsl:variable name="package.dir"> - <xsl:if test="not($name = '')"><xsl:value-of select="translate($name,'.','/')"/></xsl:if> - <xsl:if test="$name = ''">.</xsl:if> - </xsl:variable> - <!--Processing package <xsl:value-of select="@name"/> in <xsl:value-of select="$output.dir"/> --> - <!-- create a classes-list.html in the package directory --> - <redirect:write file="{$output.dir}/{$package.dir}/package-frame.html"> - <xsl:call-template name="classes.list"> - <xsl:with-param name="name" select="$name"/> - </xsl:call-template> - </redirect:write> - - <!-- create a package-summary.html in the package directory --> - <redirect:write file="{$output.dir}/{$package.dir}/package-summary.html"> - <xsl:call-template name="package.summary"> - <xsl:with-param name="name" select="$name"/> - </xsl:call-template> - </redirect:write> - - <!-- for each class, creates a @name.html --> - <!-- @bug there will be a problem with inner classes having the same name, it will be overwritten --> - <xsl:for-each select="/testsuites/testsuite[@package = $name]"> - <redirect:write file="{$output.dir}/{$package.dir}/{@name}.html"> - <xsl:apply-templates select="." mode="class.details"/> - </redirect:write> - <xsl:if test="string-length(./system-out)!=0"> - <redirect:write file="{$output.dir}/{$package.dir}/{@name}-out.txt"> - <xsl:value-of select="./system-out" /> - </redirect:write> - </xsl:if> - <xsl:if test="string-length(./system-err)!=0"> - <redirect:write file="{$output.dir}/{$package.dir}/{@name}-err.txt"> - <xsl:value-of select="./system-err" /> - </redirect:write> - </xsl:if> - </xsl:for-each> -</xsl:template> - -<xsl:template name="index.html"> -<html> - <head> - <title>Groovy TCK Results.</title> - </head> - <frameset cols="20%,80%"> - <frameset rows="30%,70%"> - <frame src="overview-frame.html" name="packageListFrame"/> - <frame src="allclasses-frame.html" name="classListFrame"/> - </frameset> - <frame src="overview-summary.html" name="classFrame"/> - <noframes> - <h2>Frame Alert</h2> - <p> - This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client. - </p> - </noframes> - </frameset> -</html> -</xsl:template> - -<!-- this is the stylesheet css to use for nearly everything --> -<xsl:template name="stylesheet.css"> -body { - font:normal 68% verdana,arial,helvetica; - color:#000000; -} -table tr td, table tr th { - font-size: 68%; -} -table.details tr th{ - font-weight: bold; - text-align:left; - background:#a6caf0; -} -table.details tr td{ - background:#eeeee0; -} - -p { - line-height:1.5em; - margin-top:0.5em; margin-bottom:1.0em; -} -h1 { - margin: 0px 0px 5px; font: 165% verdana,arial,helvetica -} -h2 { - margin-top: 1em; margin-bottom: 0.5em; font: bold 125% verdana,arial,helvetica -} -h3 { - margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica -} -h4 { - margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica -} -h5 { - margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica -} -h6 { - margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica -} -.Error { - font-weight:bold; color:red; -} -.Failure { - font-weight:bold; color:purple; -} -.Properties { - text-align:right; -} -</xsl:template> - - -<!-- ====================================================================== - This page is created for every testsuite class. - It prints a summary of the testsuite and detailed information about - testcase methods. - ====================================================================== --> -<xsl:template match="testsuite" mode="class.details"> - <xsl:variable name="package.name" select="@package"/> - <xsl:variable name="class.name"><xsl:if test="not($package.name = '')"><xsl:value-of select="$package.name"/>.</xsl:if><xsl:value-of select="@name"/></xsl:variable> - <html> - <head> - <title>Groovy TCK Results: <xsl:value-of select="$class.name"/></title> - <xsl:call-template name="create.stylesheet.link"> - <xsl:with-param name="package.name" select="$package.name"/> - </xsl:call-template> - <script type="text/javascript" language="JavaScript"> - var TestCases = new Array(); - var cur; - <xsl:apply-templates select="properties"/> - </script> - <script type="text/javascript" language="JavaScript"><![CDATA[ - function displayProperties (name) { - var win = window.open('','JUnitSystemProperties','scrollbars=1,resizable=1'); - var doc = win.document.open(); - doc.write("<html><head><title>Properties of " + name + "</title>"); - doc.write("<style type=\"text/css\">"); - doc.write("body {font:normal 68% verdana,arial,helvetica; color:#000000; }"); - doc.write("table tr td, table tr th { font-size: 68%; }"); - doc.write("table.properties { border-collapse:collapse; border-left:solid 1 #cccccc; border-top:solid 1 #cccccc; padding:5px; }"); - doc.write("table.properties th { text-align:left; border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc; background-color:#eeeeee; }"); - doc.write("table.properties td { font:normal; text-align:left; border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc; background-color:#fffffff; }"); - doc.write("h3 { margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica }"); - doc.write("</style>"); - doc.write("</head><body>"); - doc.write("<h3>Properties of " + name + "</h3>"); - doc.write("<div align=\"right\"><a href=\"javascript:window.close();\">Close</a></div>"); - doc.write("<table class='properties'>"); - doc.write("<tr><th>Name</th><th>Value</th></tr>"); - for (prop in TestCases[name]) { - doc.write("<tr><th>" + prop + "</th><td>" + TestCases[name][prop] + "</td></tr>"); - } - doc.write("</table>"); - doc.write("</body></html>"); - doc.close(); - win.focus(); - } - ]]> - </script> - </head> - <body> - <xsl:call-template name="pageHeader"/> - <h3>Class <xsl:value-of select="$class.name"/></h3> - - - <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%"> - <xsl:call-template name="testsuite.test.header"/> - <xsl:apply-templates select="." mode="print.test"/> - </table> - <h2>Tests</h2> - <xsl:if test="string-length(./system-out)!=0"> - <a> - <xsl:attribute name="href">./<xsl:value-of select="@name"/>-out.txt</xsl:attribute> - sources » - </a> - </xsl:if> - <p/> - <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%"> - <xsl:call-template name="testcase.test.header"/> - <!-- - test can even not be started at all (failure to load the class) - so report the error directly - --> - <xsl:if test="./error"> - <tr class="Error"> - <td colspan="4"><xsl:apply-templates select="./error"/></td> - </tr> - </xsl:if> - <xsl:apply-templates select="./testcase" mode="print.test"/> - </table> - <div class="Properties"> - <a> - <xsl:attribute name="href">javascript:displayProperties('<xsl:value-of select="@package"/>.<xsl:value-of select="@name"/>');</xsl:attribute> - Properties » - </a> - </div> - <xsl:if test="string-length(./system-out)!=0"> - <div class="Properties"> - <a> - <xsl:attribute name="href">./<xsl:value-of select="@name"/>-out.txt</xsl:attribute> - System.out » - </a> - </div> - </xsl:if> - <xsl:if test="string-length(./system-err)!=0"> - <div class="Properties"> - <a> - <xsl:attribute name="href">./<xsl:value-of select="@name"/>-err.txt</xsl:attribute> - System.err » - </a> - </div> - </xsl:if> - </body> - </html> -</xsl:template> - - <!-- - Write properties into a JavaScript data structure. - This is based on the original idea by Erik Hatcher (ehatc...@apache.org) - --> - <xsl:template match="properties"> - cur = TestCases['<xsl:value-of select="../@package"/>.<xsl:value-of select="../@name"/>'] = new Array(); - <xsl:for-each select="property"> - <xsl:sort select="@name"/> - cur['<xsl:value-of select="@name"/>'] = '<xsl:call-template name="JS-escape"><xsl:with-param name="string" select="@value"/></xsl:call-template>'; - </xsl:for-each> - </xsl:template> - - -<!-- ====================================================================== - This page is created for every package. - It prints the name of all classes that belongs to this package. - @param name the package name to print classes. - ====================================================================== --> -<!-- list of classes in a package --> -<xsl:template name="classes.list"> - <xsl:param name="name"/> - <html> - <head> - <title>Groovy TCK Classes: <xsl:value-of select="$name"/></title> - <xsl:call-template name="create.stylesheet.link"> - <xsl:with-param name="package.name" select="$name"/> - </xsl:call-template> - </head> - <body> - <table width="100%"> - <tr> - <td nowrap="nowrap"> - <h2><a href="package-summary.html" target="classFrame"> - <xsl:value-of select="$name"/> - <xsl:if test="$name = ''"><none></xsl:if> - </a></h2> - </td> - </tr> - </table> - - <h2>Classes</h2> - <table width="100%"> - <xsl:for-each select="/testsuites/testsuite[./@package = $name]"> - <xsl:sort select="@name"/> - <tr> - <td nowrap="nowrap"> - <a href="{@name}.html" target="classFrame"><xsl:value-of select="@name"/></a> - </td> - </tr> - </xsl:for-each> - </table> - </body> - </html> -</xsl:template> - - -<!-- - Creates an all-classes.html file that contains a link to all package-summary.html - on each class. ---> -<xsl:template match="testsuites" mode="all.classes"> - <html> - <head> - <title>All Groovy TCK Classes</title> - <xsl:call-template name="create.stylesheet.link"> - <xsl:with-param name="package.name"/> - </xsl:call-template> - </head> - <body> - <h2>Classes</h2> - <table width="100%"> - <xsl:apply-templates select="testsuite" mode="all.classes"> - <xsl:sort select="@name"/> - </xsl:apply-templates> - </table> - </body> - </html> -</xsl:template> - -<xsl:template match="testsuite" mode="all.classes"> - <xsl:variable name="package.name" select="@package"/> - <tr> - <td nowrap="nowrap"> - <a target="classFrame"> - <xsl:attribute name="href"> - <xsl:if test="not($package.name='')"> - <xsl:value-of select="translate($package.name,'.','/')"/><xsl:text>/</xsl:text> - </xsl:if><xsl:value-of select="@name"/><xsl:text>.html</xsl:text> - </xsl:attribute> - <xsl:value-of select="@name"/> - </a> - </td> - </tr> -</xsl:template> - - -<!-- - Creates an html file that contains a link to all package-summary.html files on - each package existing on testsuites. - @bug there will be a problem here, I don't know yet how to handle unnamed package :( ---> -<xsl:template match="testsuites" mode="all.packages"> - <html> - <head> - <title>All Groovy TCK Packages</title> - <xsl:call-template name="create.stylesheet.link"> - <xsl:with-param name="package.name"/> - </xsl:call-template> - </head> - <body> - <h2><a href="overview-summary.html" target="classFrame">Home</a></h2> - <h2>Packages</h2> - <table width="100%"> - <xsl:apply-templates select="testsuite[not(./@package = preceding-sibling::testsuite/@package)]" mode="all.packages"> - <xsl:sort select="@package"/> - </xsl:apply-templates> - </table> - </body> - </html> -</xsl:template> - -<xsl:template match="testsuite" mode="all.packages"> - <tr> - <td nowrap="nowrap"> - <a href="./{translate(@package,'.','/')}/package-summary.html" target="classFrame"> - <xsl:value-of select="@package"/> - <xsl:if test="@package = ''"><none></xsl:if> - </a> - </td> - </tr> -</xsl:template> - - -<xsl:template match="testsuites" mode="overview.packages"> - <html> - <head> - <title>Groovy TCK Results: Summary</title> - <xsl:call-template name="create.stylesheet.link"> - <xsl:with-param name="package.name"/> - </xsl:call-template> - </head> - <body> - <xsl:attribute name="onload">open('allclasses-frame.html','classListFrame')</xsl:attribute> - <xsl:call-template name="pageHeader"/> - <h2>Summary</h2> - <xsl:variable name="testCount" select="sum(testsuite/@tests)"/> - <xsl:variable name="errorCount" select="sum(testsuite/@errors)"/> - <xsl:variable name="failureCount" select="sum(testsuite/@failures)"/> - <xsl:variable name="timeCount" select="sum(testsuite/@time)"/> - <xsl:variable name="successRate" select="($testCount - $failureCount - $errorCount) div $testCount"/> - <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%"> - <tr valign="top"> - <th>Tests</th> - <th>Failures</th> - <th>Errors</th> - <th>Success rate</th> - <th>Time</th> - </tr> - <tr valign="top"> - <xsl:attribute name="class"> - <xsl:choose> - <xsl:when test="$errorCount > 0">Error</xsl:when> - <xsl:when test="$failureCount > 0">Failure</xsl:when> - <xsl:otherwise>Pass</xsl:otherwise> - </xsl:choose> - </xsl:attribute> - <td><xsl:value-of select="$testCount"/></td> - <td><xsl:value-of select="$failureCount"/></td> - <td><xsl:value-of select="$errorCount"/></td> - <td> - <xsl:call-template name="display-percent"> - <xsl:with-param name="value" select="$successRate"/> - </xsl:call-template> - </td> - <td> - <xsl:call-template name="display-time"> - <xsl:with-param name="value" select="$timeCount"/> - </xsl:call-template> - </td> - - </tr> - </table> - <table border="0" width="95%"> - <tr> - <td style="text-align: justify;"> - Note: <em>failures</em> are anticipated and checked for with assertions while <em>errors</em> are unanticipated. - </td> - </tr> - </table> - - <h2>Packages</h2> - <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%"> - <xsl:call-template name="testsuite.test.header"/> - <xsl:for-each select="testsuite[not(./@package = preceding-sibling::testsuite/@package)]"> - <xsl:sort select="@package" order="ascending"/> - <!-- get the node set containing all testsuites that have the same package --> - <xsl:variable name="insamepackage" select="/testsuites/testsuite[./@package = current()/@package]"/> - <tr valign="top"> - <!-- display a failure if there is any failure/error in the package --> - <xsl:attribute name="class"> - <xsl:choose> - <xsl:when test="sum($insamepackage/@errors) > 0">Error</xsl:when> - <xsl:when test="sum($insamepackage/@failures) > 0">Failure</xsl:when> - <xsl:otherwise>Pass</xsl:otherwise> - </xsl:choose> - </xsl:attribute> - <td><a href="./{translate(@package,'.','/')}/package-summary.html"> - <xsl:value-of select="@package"/> - <xsl:if test="@package = ''"><none></xsl:if> - </a></td> - <td><xsl:value-of select="sum($insamepackage/@tests)"/></td> - <td><xsl:value-of select="sum($insamepackage/@errors)"/></td> - <td><xsl:value-of select="sum($insamepackage/@failures)"/></td> - <td> - <xsl:call-template name="display-time"> - <xsl:with-param name="value" select="sum($insamepackage/@time)"/> - </xsl:call-template> - </td> - </tr> - </xsl:for-each> - </table> - </body> - </html> -</xsl:template> - - -<xsl:template name="package.summary"> - <xsl:param name="name"/> - <html> - <head> - <xsl:call-template name="create.stylesheet.link"> - <xsl:with-param name="package.name" select="$name"/> - </xsl:call-template> - </head> - <body> - <xsl:attribute name="onload">open('package-frame.html','classListFrame')</xsl:attribute> - <xsl:call-template name="pageHeader"/> - <h3>Package <xsl:value-of select="$name"/></h3> - - <!--table border="0" cellpadding="5" cellspacing="2" width="95%"> - <xsl:call-template name="class.metrics.header"/> - <xsl:apply-templates select="." mode="print.metrics"/> - </table--> - - <xsl:variable name="insamepackage" select="/testsuites/testsuite[./@package = $name]"/> - <xsl:if test="count($insamepackage) > 0"> - <h2>Classes</h2> - <p> - <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%"> - <xsl:call-template name="testsuite.test.header"/> - <xsl:apply-templates select="$insamepackage" mode="print.test"> - <xsl:sort select="@name"/> - </xsl:apply-templates> - </table> - </p> - </xsl:if> - </body> - </html> -</xsl:template> - - -<!-- - transform string like a.b.c to ../../../ - @param path the path to transform into a descending directory path ---> -<xsl:template name="path"> - <xsl:param name="path"/> - <xsl:if test="contains($path,'.')"> - <xsl:text>../</xsl:text> - <xsl:call-template name="path"> - <xsl:with-param name="path"><xsl:value-of select="substring-after($path,'.')"/></xsl:with-param> - </xsl:call-template> - </xsl:if> - <xsl:if test="not(contains($path,'.')) and not($path = '')"> - <xsl:text>../</xsl:text> - </xsl:if> -</xsl:template> - - -<!-- create the link to the stylesheet based on the package name --> -<xsl:template name="create.stylesheet.link"> - <xsl:param name="package.name"/> - <link rel="stylesheet" type="text/css" title="Style"><xsl:attribute name="href"><xsl:if test="not($package.name = 'unnamed package')"><xsl:call-template name="path"><xsl:with-param name="path" select="$package.name"/></xsl:call-template></xsl:if>stylesheet.css</xsl:attribute></link> -</xsl:template> - - -<!-- Page HEADER --> -<xsl:template name="pageHeader"> - <img src="http://groovy.codehaus.org/images/groovy-logo.png" alt="Groovy"/> - <h1>TCK Results</h1> - <table width="100%"> - <tr> - <td align="left"></td> - <td align="right"><a href="http://groovy.codehaus.org/jsr/spec">Specification</a>.</td> - </tr> - </table> - <hr size="1"/> -</xsl:template> - -<!-- class header --> -<xsl:template name="testsuite.test.header"> - <tr valign="top"> - <th width="80%">Name</th> - <th>Tests</th> - <th>Errors</th> - <th>Failures</th> - <th nowrap="nowrap">Time(s)</th> - </tr> -</xsl:template> - -<!-- method header --> -<xsl:template name="testcase.test.header"> - <tr valign="top"> - <th>Name</th> - <th>Status</th> - <th width="80%">Type</th> - <th nowrap="nowrap">Time(s)</th> - </tr> -</xsl:template> - - -<!-- class information --> -<xsl:template match="testsuite" mode="print.test"> - <tr valign="top"> - <xsl:attribute name="class"> - <xsl:choose> - <xsl:when test="@errors[.> 0]">Error</xsl:when> - <xsl:when test="@failures[.> 0]">Failure</xsl:when> - <xsl:otherwise>Pass</xsl:otherwise> - </xsl:choose> - </xsl:attribute> - <td><a href="{@name}.html"><xsl:value-of select="@name"/></a></td> - <td><xsl:apply-templates select="@tests"/></td> - <td><xsl:apply-templates select="@errors"/></td> - <td><xsl:apply-templates select="@failures"/></td> - <td><xsl:call-template name="display-time"> - <xsl:with-param name="value" select="@time"/> - </xsl:call-template> - </td> - </tr> -</xsl:template> - -<xsl:template match="testcase" mode="print.test"> - <tr valign="top"> - <xsl:attribute name="class"> - <xsl:choose> - <xsl:when test="error">Error</xsl:when> - <xsl:when test="failure">Failure</xsl:when> - <xsl:otherwise>TableRowColor</xsl:otherwise> - </xsl:choose> - </xsl:attribute> - <td><xsl:value-of select="@name"/></td> - <xsl:choose> - <xsl:when test="failure"> - <td>Failure</td> - <td><xsl:apply-templates select="failure"/></td> - </xsl:when> - <xsl:when test="error"> - <td>Error</td> - <td><xsl:apply-templates select="error"/></td> - </xsl:when> - <xsl:otherwise> - <td>Success</td> - <td></td> - </xsl:otherwise> - </xsl:choose> - <td> - <xsl:call-template name="display-time"> - <xsl:with-param name="value" select="@time"/> - </xsl:call-template> - </td> - </tr> -</xsl:template> - - -<!-- Note : the below template error and failure are the same style - so just call the same style store in the toolkit template --> -<xsl:template match="failure"> - <xsl:call-template name="display-failures"/> -</xsl:template> - -<xsl:template match="error"> - <xsl:call-template name="display-failures"/> -</xsl:template> - -<!-- Style for the error and failure in the testcase template --> -<xsl:template name="display-failures"> - <xsl:choose> - <xsl:when test="not(@message)">N/A</xsl:when> - <xsl:otherwise> - <xsl:value-of select="@message"/> - </xsl:otherwise> - </xsl:choose> - <!-- display the stacktrace --> - <br/><br/> - <code> - <xsl:call-template name="br-replace"> - <xsl:with-param name="word" select="."/> - </xsl:call-template> - </code> - <!-- the latter is better but might be problematic for non-21" monitors... --> - <!--pre><xsl:value-of select="."/></pre--> -</xsl:template> - -<xsl:template name="JS-escape"> - <xsl:param name="string"/> - <xsl:param name="tmp1" select="stringutils:replace(string($string),'\','\\')"/> - <xsl:param name="tmp2" select="stringutils:replace(string($tmp1),"'","\'")"/> - <xsl:value-of select="$tmp2"/> -</xsl:template> - - -<!-- - template that will convert a carriage return into a br tag - @param word the text from which to convert CR to BR tag ---> -<xsl:template name="br-replace"> - <xsl:param name="word"/> - <xsl:param name="br"><br/></xsl:param> - <xsl:value-of select='stringutils:replace(string($word),"
",$br)'/> -</xsl:template> - -<xsl:template name="display-time"> - <xsl:param name="value"/> - <xsl:value-of select="format-number($value,'0.000')"/> -</xsl:template> - -<xsl:template name="display-percent"> - <xsl:param name="value"/> - <xsl:value-of select="format-number($value,'0.00%')"/> -</xsl:template> -</xsl:stylesheet> -