You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@groovy.apache.org by pa...@apache.org on 2015/06/09 22:48:52 UTC
[1/3] incubator-groovy git commit: remove duplicated license header
Repository: incubator-groovy
Updated Branches:
refs/heads/master 5ad8c5bfc -> ad5bdb1b2
remove duplicated license header
Project: http://git-wip-us.apache.org/repos/asf/incubator-groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-groovy/commit/816f2e9c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-groovy/tree/816f2e9c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-groovy/diff/816f2e9c
Branch: refs/heads/master
Commit: 816f2e9cfb35f49be654e861aff1166d4c452a0a
Parents: 5ad8c5b
Author: pascalschumacher <pa...@gmx.net>
Authored: Tue Jun 9 22:10:52 2015 +0200
Committer: pascalschumacher <pa...@gmx.net>
Committed: Tue Jun 9 22:10:52 2015 +0200
----------------------------------------------------------------------
.../spec/test/MarkupTemplateEngineSpecTest.groovy | 16 ----------------
1 file changed, 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/816f2e9c/subprojects/groovy-templates/src/spec/test/MarkupTemplateEngineSpecTest.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-templates/src/spec/test/MarkupTemplateEngineSpecTest.groovy b/subprojects/groovy-templates/src/spec/test/MarkupTemplateEngineSpecTest.groovy
index 995e583..a108253 100644
--- a/subprojects/groovy-templates/src/spec/test/MarkupTemplateEngineSpecTest.groovy
+++ b/subprojects/groovy-templates/src/spec/test/MarkupTemplateEngineSpecTest.groovy
@@ -22,22 +22,6 @@ import groovy.text.markup.TemplateConfiguration
import java.nio.charset.Charset
-/*
- * Copyright 2003-2014 the original author or authors.
- *
- * 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.
- */
-
class MarkupTemplateEngineSpecTest extends GroovyTestCase {
private MarkupTemplateEngine engine
private TemplateConfiguration config
[2/3] incubator-groovy git commit: Add Apache license header because
Apache Rat requires it
Posted by pa...@apache.org.
Add Apache license header because Apache Rat requires it
Project: http://git-wip-us.apache.org/repos/asf/incubator-groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-groovy/commit/be9ad90e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-groovy/tree/be9ad90e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-groovy/diff/be9ad90e
Branch: refs/heads/master
Commit: be9ad90eaca71ffee6bb9c632663a007e08fe275
Parents: 816f2e9
Author: pascalschumacher <pa...@gmx.net>
Authored: Tue Jun 9 22:41:15 2015 +0200
Committer: pascalschumacher <pa...@gmx.net>
Committed: Tue Jun 9 22:41:15 2015 +0200
----------------------------------------------------------------------
.../main/resources/groovy/ui/icons/credits.txt | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/be9ad90e/subprojects/groovy-console/src/main/resources/groovy/ui/icons/credits.txt
----------------------------------------------------------------------
diff --git a/subprojects/groovy-console/src/main/resources/groovy/ui/icons/credits.txt b/subprojects/groovy-console/src/main/resources/groovy/ui/icons/credits.txt
index 3933e7e..118978e 100644
--- a/subprojects/groovy-console/src/main/resources/groovy/ui/icons/credits.txt
+++ b/subprojects/groovy-console/src/main/resources/groovy/ui/icons/credits.txt
@@ -1,3 +1,22 @@
+/*
+ * 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.
+ */
+
These icons are from the famfamfam.com silk icons set
http://www.famfamfam.com/lab/icons/silk/
[3/3] incubator-groovy git commit: inline testdata because otherwise
we would have to add a Apache license header to the testdata file
Posted by pa...@apache.org.
inline testdata because otherwise we would have to add a Apache license header to the testdata file
Project: http://git-wip-us.apache.org/repos/asf/incubator-groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-groovy/commit/ad5bdb1b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-groovy/tree/ad5bdb1b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-groovy/diff/ad5bdb1b
Branch: refs/heads/master
Commit: ad5bdb1b27174314b5f17629778742aacc8938ea
Parents: be9ad90
Author: pascalschumacher <pa...@gmx.net>
Authored: Tue Jun 9 22:43:11 2015 +0200
Committer: pascalschumacher <pa...@gmx.net>
Committed: Tue Jun 9 22:43:11 2015 +0200
----------------------------------------------------------------------
src/test/groovy/io/LineColumnReaderTest.groovy | 52 ++++++++++++++++++++-
src/test/groovy/io/sample-text-file.txt | 49 -------------------
2 files changed, 51 insertions(+), 50 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ad5bdb1b/src/test/groovy/io/LineColumnReaderTest.groovy
----------------------------------------------------------------------
diff --git a/src/test/groovy/io/LineColumnReaderTest.groovy b/src/test/groovy/io/LineColumnReaderTest.groovy
index 9e46a4d..56c0793 100644
--- a/src/test/groovy/io/LineColumnReaderTest.groovy
+++ b/src/test/groovy/io/LineColumnReaderTest.groovy
@@ -25,7 +25,57 @@ import java.nio.CharBuffer
*/
class LineColumnReaderTest extends GroovyTestCase {
- def reader = new LineColumnReader(new FileReader(new File('src/test/groovy/io/sample-text-file.txt')))
+ String text = '''L'invitation au voyage
+
+Mon enfant, ma soeur,
+Songe à la douceur
+D'aller là-bas vivre ensemble !
+Aimer à loisir,
+Aimer et mourir
+Au pays qui te ressemble !
+Les soleils mouillés
+De ces ciels brouillés
+Pour mon esprit ont les charmes
+Si mystérieux
+De tes traîtres yeux,
+Brillant à travers leurs larmes.
+
+Là, tout n'est qu'ordre et beauté,
+Luxe, calme et volupté.
+
+Des meubles luisants,
+Polis par les ans,
+Décoreraient notre chambre ;
+Les plus rares fleurs
+Mêlant leurs odeurs
+Aux vagues senteurs de l'ambre,
+Les riches plafonds,
+Les miroirs profonds,
+La splendeur orientale,
+Tout y parlerait
+À l'âme en secret
+Sa douce langue natale.
+
+Là, tout n'est qu'ordre et beauté,
+Luxe, calme et volupté.
+
+Vois sur ces canaux
+Dormir ces vaisseaux
+Dont l'humeur est vagabonde ;
+C'est pour assouvir
+Ton moindre désir
+Qu'ils viennent du bout du monde.
+- Les soleils couchants
+Revêtent les champs,
+Les canaux, la ville entière,
+D'hyacinthe et d'or ;
+Le monde s'endort
+Dans une chaude lumière.
+
+Là, tout n'est qu'ordre et beauté,
+Luxe, calme et volupté.'''
+
+ def reader = new LineColumnReader(new StringReader(text))
void testReadLine() {
reader.withReader { LineColumnReader r ->
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ad5bdb1b/src/test/groovy/io/sample-text-file.txt
----------------------------------------------------------------------
diff --git a/src/test/groovy/io/sample-text-file.txt b/src/test/groovy/io/sample-text-file.txt
deleted file mode 100644
index e662db2..0000000
--- a/src/test/groovy/io/sample-text-file.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-L'invitation au voyage
-
-Mon enfant, ma soeur,
-Songe à la douceur
-D'aller là-bas vivre ensemble !
-Aimer à loisir,
-Aimer et mourir
-Au pays qui te ressemble !
-Les soleils mouillés
-De ces ciels brouillés
-Pour mon esprit ont les charmes
-Si mystérieux
-De tes traîtres yeux,
-Brillant à travers leurs larmes.
-
-Là, tout n'est qu'ordre et beauté,
-Luxe, calme et volupté.
-
-Des meubles luisants,
-Polis par les ans,
-Décoreraient notre chambre ;
-Les plus rares fleurs
-Mêlant leurs odeurs
-Aux vagues senteurs de l'ambre,
-Les riches plafonds,
-Les miroirs profonds,
-La splendeur orientale,
-Tout y parlerait
-À l'âme en secret
-Sa douce langue natale.
-
-Là, tout n'est qu'ordre et beauté,
-Luxe, calme et volupté.
-
-Vois sur ces canaux
-Dormir ces vaisseaux
-Dont l'humeur est vagabonde ;
-C'est pour assouvir
-Ton moindre désir
-Qu'ils viennent du bout du monde.
-- Les soleils couchants
-Revêtent les champs,
-Les canaux, la ville entière,
-D'hyacinthe et d'or ;
-Le monde s'endort
-Dans une chaude lumière.
-
-Là, tout n'est qu'ordre et beauté,
-Luxe, calme et volupté.
\ No newline at end of file