[tapestry-5] Git Push Summary
Repository: tapestry-5 Updated Tags: refs/tags/5.5.0-alpha-10 [created] 0f2c01c9a
tapestry-5 git commit: increment version number
Repository: tapestry-5 Updated Branches: refs/heads/master 0f2c01c9a -> 1a257084f increment version number Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/1a257084 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/1a257084 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/1a257084 Branch: refs/heads/master Commit: 1a257084f36300a304f2044c16bdca3436921b55 Parents: 0f2c01c Author: Jochen KemnadeAuthored: Mon Nov 27 13:18:48 2017 +0100 Committer: Jochen Kemnade Committed: Mon Nov 27 13:18:48 2017 +0100 -- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/1a257084/build.gradle -- diff --git a/build.gradle b/build.gradle index 0b75976..c48a8c7 100755 --- a/build.gradle +++ b/build.gradle @@ -33,7 +33,7 @@ project.version = tapestryVersion() def tapestryVersion() { def major = "5.5.0" -def minor = "-alpha-10" +def minor = "-alpha-11" // When building on the CI server, make sure -SNAPSHOT is appended, as it is a nightly build. // When building normally, or for a release, no suffix is desired.
[2/3] tapestry-5 git commit: TAP5-2591: add support for TypeScript modules
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/0f2c01c9/tapestry-webresources/src/main/resources/org/apache/tapestry5/webresources/internal/typescript.js -- diff --git a/tapestry-webresources/src/main/resources/org/apache/tapestry5/webresources/internal/typescript.js b/tapestry-webresources/src/main/resources/org/apache/tapestry5/webresources/internal/typescript.js new file mode 100644 index 000..eb75ba8 --- /dev/null +++ b/tapestry-webresources/src/main/resources/org/apache/tapestry5/webresources/internal/typescript.js @@ -0,0 +1,97680 @@ +/*! * +Copyright (c) Microsoft Corporation. All rights reserved. +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 + +THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED +WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE, +MERCHANTABLITY OR NON-INFRINGEMENT. + +See the Apache Version 2.0 License for specific language governing permissions +and limitations under the License. +* */ + +"use strict"; +var __assign = (this && this.__assign) || Object.assign || function(t) { +for (var s, i = 1, n = arguments.length; i < n; i++) { +s = arguments[i]; +for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) +t[p] = s[p]; +} +return t; +}; +var __extends = (this && this.__extends) || (function () { +var extendStatics = Object.setPrototypeOf || +({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) || +function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; }; +return function (d, b) { +extendStatics(d, b); +function __() { this.constructor = d; } +d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); +}; +})(); +var ts; +(function (ts) { +// token > SyntaxKind.Identifer => token is a keyword +// Also, If you add a new SyntaxKind be sure to keep the `Markers` section at the bottom in sync +var SyntaxKind; +(function (SyntaxKind) { +SyntaxKind[SyntaxKind["Unknown"] = 0] = "Unknown"; +SyntaxKind[SyntaxKind["EndOfFileToken"] = 1] = "EndOfFileToken"; +SyntaxKind[SyntaxKind["SingleLineCommentTrivia"] = 2] = "SingleLineCommentTrivia"; +SyntaxKind[SyntaxKind["MultiLineCommentTrivia"] = 3] = "MultiLineCommentTrivia"; +SyntaxKind[SyntaxKind["NewLineTrivia"] = 4] = "NewLineTrivia"; +SyntaxKind[SyntaxKind["WhitespaceTrivia"] = 5] = "WhitespaceTrivia"; +// We detect and preserve #! on the first line +SyntaxKind[SyntaxKind["ShebangTrivia"] = 6] = "ShebangTrivia"; +// We detect and provide better error recovery when we encounter a git merge marker. This +// allows us to edit files with git-conflict markers in them in a much more pleasant manner. +SyntaxKind[SyntaxKind["ConflictMarkerTrivia"] = 7] = "ConflictMarkerTrivia"; +// Literals +SyntaxKind[SyntaxKind["NumericLiteral"] = 8] = "NumericLiteral"; +SyntaxKind[SyntaxKind["StringLiteral"] = 9] = "StringLiteral"; +SyntaxKind[SyntaxKind["JsxText"] = 10] = "JsxText"; +SyntaxKind[SyntaxKind["JsxTextAllWhiteSpaces"] = 11] = "JsxTextAllWhiteSpaces"; +SyntaxKind[SyntaxKind["RegularExpressionLiteral"] = 12] = "RegularExpressionLiteral"; +SyntaxKind[SyntaxKind["NoSubstitutionTemplateLiteral"] = 13] = "NoSubstitutionTemplateLiteral"; +// Pseudo-literals +SyntaxKind[SyntaxKind["TemplateHead"] = 14] = "TemplateHead"; +SyntaxKind[SyntaxKind["TemplateMiddle"] = 15] = "TemplateMiddle"; +SyntaxKind[SyntaxKind["TemplateTail"] = 16] = "TemplateTail"; +// Punctuation +SyntaxKind[SyntaxKind["OpenBraceToken"] = 17] = "OpenBraceToken"; +SyntaxKind[SyntaxKind["CloseBraceToken"] = 18] = "CloseBraceToken"; +SyntaxKind[SyntaxKind["OpenParenToken"] = 19] = "OpenParenToken"; +SyntaxKind[SyntaxKind["CloseParenToken"] = 20] = "CloseParenToken"; +SyntaxKind[SyntaxKind["OpenBracketToken"] = 21] = "OpenBracketToken"; +SyntaxKind[SyntaxKind["CloseBracketToken"] = 22] = "CloseBracketToken"; +SyntaxKind[SyntaxKind["DotToken"] = 23] = "DotToken"; +SyntaxKind[SyntaxKind["DotDotDotToken"] = 24] = "DotDotDotToken"; +SyntaxKind[SyntaxKind["SemicolonToken"] = 25] = "SemicolonToken"; +SyntaxKind[SyntaxKind["CommaToken"] = 26] = "CommaToken"; +SyntaxKind[SyntaxKind["LessThanToken"] = 27] =
[1/3] tapestry-5 git commit: TAP5-2591: add support for TypeScript modules
Repository: tapestry-5 Updated Branches: refs/heads/master 80f65eb4b -> 0f2c01c9a http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/0f2c01c9/tapestry-webresources/src/test/groovy/t5/webresources/tests/TypeScriptCompilerSpec.groovy -- diff --git a/tapestry-webresources/src/test/groovy/t5/webresources/tests/TypeScriptCompilerSpec.groovy b/tapestry-webresources/src/test/groovy/t5/webresources/tests/TypeScriptCompilerSpec.groovy new file mode 100644 index 000..aafd30a --- /dev/null +++ b/tapestry-webresources/src/test/groovy/t5/webresources/tests/TypeScriptCompilerSpec.groovy @@ -0,0 +1,58 @@ +package t5.webresources.tests; + +import org.apache.tapestry5.SymbolConstants +import org.apache.tapestry5.internal.InternalSymbols +import org.apache.tapestry5.internal.test.PageTesterContext +import org.apache.tapestry5.internal.webresources.TypeScriptCompiler +import org.apache.tapestry5.ioc.MappedConfiguration +import org.apache.tapestry5.ioc.annotations.Autobuild +import org.apache.tapestry5.ioc.annotations.Inject +import org.apache.tapestry5.ioc.annotations.SubModule +import org.apache.tapestry5.ioc.internal.util.ClasspathResource +import org.apache.tapestry5.modules.AssetsModule +import org.apache.tapestry5.modules.TapestryModule +import org.apache.tapestry5.services.ApplicationGlobals +import org.apache.tapestry5.webresources.modules.WebResourcesModule + +import spock.lang.Shared +import spock.lang.Specification + +@SubModule([TapestryModule, WebResourcesModule, TypeScriptCompilerSpec.TestModule, AssetsModule]) +class TypeScriptCompilerSpec extends Specification { + + @Autobuild + private TypeScriptCompiler typeScriptCompiler; + + @Inject + @Shared + private ApplicationGlobals applicationGlobals + + def setupSpec(){ +applicationGlobals.storeContext(new PageTesterContext("/test")); + } + + def "Compile Hello World example"(){ +when: +def resource = new ClasspathResource("t5/webresources/greeter.ts") +def compiled = typeScriptCompiler.transform(resource, null) +then: +compiled.text == TypeScriptCompilerSpec.class.getResourceAsStream('/t5/webresources/greeter-compiled.js').text + } + + def "Type information is preserved"(){ +when: +def resource = new ClasspathResource("t5/webresources/park-example.ts") +def compiled = typeScriptCompiler.transform(resource, null) +then: +compiled.text == TypeScriptCompilerSpec.class.getResourceAsStream('/t5/webresources/park-example-compiled.js').text + } + + public static class TestModule { + +def contributeApplicationDefaults(MappedConfiguration configuration){ + configuration.add(InternalSymbols.APP_NAME, "test") + configuration.add("tapestry.app-package", "typescript") + configuration.add(SymbolConstants.MINIFICATION_ENABLED, false) +} + } +} http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/0f2c01c9/tapestry-webresources/src/test/resources/t5/webresources/greeter-compiled.js -- diff --git a/tapestry-webresources/src/test/resources/t5/webresources/greeter-compiled.js b/tapestry-webresources/src/test/resources/t5/webresources/greeter-compiled.js new file mode 100644 index 000..0794189 --- /dev/null +++ b/tapestry-webresources/src/test/resources/t5/webresources/greeter-compiled.js @@ -0,0 +1,8 @@ +define(["require", "exports"], function (require, exports) { +"use strict"; +function greeter(person) { +return "Hello, " + person; +} +var user = "Jane User"; +document.body.innerHTML = greeter(user); +}); http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/0f2c01c9/tapestry-webresources/src/test/resources/t5/webresources/greeter.ts -- diff --git a/tapestry-webresources/src/test/resources/t5/webresources/greeter.ts b/tapestry-webresources/src/test/resources/t5/webresources/greeter.ts new file mode 100644 index 000..7fc2d1a --- /dev/null +++ b/tapestry-webresources/src/test/resources/t5/webresources/greeter.ts @@ -0,0 +1,7 @@ +function greeter(person) { +return "Hello, " + person; +} + +var user = "Jane User"; + +document.body.innerHTML = greeter(user); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/0f2c01c9/tapestry-webresources/src/test/resources/t5/webresources/park-example-compiled.js -- diff --git a/tapestry-webresources/src/test/resources/t5/webresources/park-example-compiled.js b/tapestry-webresources/src/test/resources/t5/webresources/park-example-compiled.js new file mode 100644 index 000..6d8e725 --- /dev/null +++ b/tapestry-webresources/src/test/resources/t5/webresources/park-example-compiled.js @@ -0,0 +1,26 @@ +var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { +var c
[3/3] tapestry-5 git commit: TAP5-2591: add support for TypeScript modules
TAP5-2591: add support for TypeScript modules Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/0f2c01c9 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/0f2c01c9 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/0f2c01c9 Branch: refs/heads/master Commit: 0f2c01c9a6747721ceaebba114a15bf48fb577e9 Parents: 80f65eb Author: Jochen KemnadeAuthored: Mon Nov 27 13:00:35 2017 +0100 Committer: Jochen Kemnade Committed: Mon Nov 27 13:00:35 2017 +0100 -- tapestry-webresources/build.gradle | 3 +- .../webresources/TypeScriptCompiler.java|76 + .../modules/WebResourcesModule.java | 8 +- .../webresources/internal/invoke-typescript.js |24 + .../webresources/internal/typescript.js | 97680 + .../tests/TypeScriptCompilerSpec.groovy |58 + .../t5/webresources/greeter-compiled.js | 8 + .../test/resources/t5/webresources/greeter.ts | 7 + .../t5/webresources/park-example-compiled.js|26 + .../resources/t5/webresources/park-example.ts | 6 + 10 files changed, 97894 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/0f2c01c9/tapestry-webresources/build.gradle -- diff --git a/tapestry-webresources/build.gradle b/tapestry-webresources/build.gradle index 874cfef..775cdde 100644 --- a/tapestry-webresources/build.gradle +++ b/tapestry-webresources/build.gradle @@ -8,7 +8,8 @@ dependencies { testCompile project(":tapestry-runner") testCompile "org.gebish:geb-spock:${versions.geb}" - +testCompile "org.spockframework:spock-tapestry:${versions.spock}" + testCompile "org.seleniumhq.selenium:selenium-java:${versions.selenium}", { exclude group: "org.eclipse.jetty" } http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/0f2c01c9/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/TypeScriptCompiler.java -- diff --git a/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/TypeScriptCompiler.java b/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/TypeScriptCompiler.java new file mode 100755 index 000..355aee1 --- /dev/null +++ b/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/TypeScriptCompiler.java @@ -0,0 +1,76 @@ +package org.apache.tapestry5.internal.webresources; + +import java.io.IOException; +import java.io.InputStream; +import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; +import java.util.Arrays; + +import org.apache.commons.io.IOUtils; +import org.apache.tapestry5.ContentType; +import org.apache.tapestry5.annotations.Path; +import org.apache.tapestry5.internal.InternalConstants; +import org.apache.tapestry5.ioc.OperationTracker; +import org.apache.tapestry5.ioc.Resource; +import org.apache.tapestry5.ioc.internal.util.ClasspathResource; +import org.apache.tapestry5.ioc.internal.util.InternalUtils; +import org.apache.tapestry5.services.assets.ResourceDependencies; +import org.apache.tapestry5.services.assets.ResourceTransformer; +import org.mozilla.javascript.NativeObject; + +public class TypeScriptCompiler implements ResourceTransformer { + private final static Charset UTF8 = StandardCharsets.UTF_8; + + private final RhinoExecutorPool executorPool; + + @Override + public ContentType getTransformedContentType() + { + return InternalConstants.JAVASCRIPT_CONTENT_TYPE; + } + + public TypeScriptCompiler(final OperationTracker tracker, + @Path("classpath:org/apache/tapestry5/webresources/internal/typescript.js") final Resource typescript) + { + this.executorPool = new RhinoExecutorPool(tracker, Arrays. asList(typescript, + new ClasspathResource("org/apache/tapestry5/webresources/internal/invoke-typescript.js"))); + + } + + private static String getString(final NativeObject object, final String key) + { + return object.get(key).toString(); + } + + @Override + public InputStream transform(final Resource source, final ResourceDependencies dependencies) throws IOException + { + InputStream is = null; + String content; + + try + { + is = source.openStream(); + content = IOUtils.toString(is, UTF8); + } finally { + InternalUtils.close(is); + } + + RhinoExecutor executor = executorPool.get(); + + try { + + NativeObject result = (NativeObject) executor.invokeFunction("transpile", content, source.toString()); + + if (result.containsKey("exception"))
[2/3] tapestry-5 git commit: upgrade webdrivermanager
upgrade webdrivermanager Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/18a685d8 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/18a685d8 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/18a685d8 Branch: refs/heads/master Commit: 18a685d83500fcbe3d30ea0e03cd0142f327830c Parents: 4bf5566 Author: Jochen KemnadeAuthored: Mon Nov 27 11:41:58 2017 +0100 Committer: Jochen Kemnade Committed: Mon Nov 27 11:41:58 2017 +0100 -- tapestry-test/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/18a685d8/tapestry-test/build.gradle -- diff --git a/tapestry-test/build.gradle b/tapestry-test/build.gradle index f46ecc0..8753084 100644 --- a/tapestry-test/build.gradle +++ b/tapestry-test/build.gradle @@ -5,7 +5,7 @@ dependencies { compile project(":tapestry-test-data") compile project(":tapestry-runner") - compile ("io.github.bonigarcia:webdrivermanager:1.7.2") + compile ("io.github.bonigarcia:webdrivermanager:2.0.0") compile "org.seleniumhq.selenium:selenium-leg-rc:${versions.selenium}", { exclude group: "org.seleniumhq.selenium", module: "jetty-repacked"
[1/3] tapestry-5 git commit: upgrade Selenium
Repository: tapestry-5 Updated Branches: refs/heads/master 8530a2763 -> 80f65eb4b upgrade Selenium Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/4bf55668 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/4bf55668 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/4bf55668 Branch: refs/heads/master Commit: 4bf5566864d2c3e7ce3f030f17a5522d5b55bcde Parents: 8530a27 Author: Jochen KemnadeAuthored: Mon Nov 27 11:40:32 2017 +0100 Committer: Jochen Kemnade Committed: Mon Nov 27 11:40:32 2017 +0100 -- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/4bf55668/build.gradle -- diff --git a/build.gradle b/build.gradle index b29fd91..a453677 100755 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ project.ext.versions = [ hibernate: "5.1.0.Final", slf4j: "1.7.25", geb: "2.0", -selenium: "3.7.0" +selenium: "3.7.1" ] ext.continuousIntegrationBuild = Boolean.getBoolean("ci")
[3/3] tapestry-5 git commit: upgrade Gradle wrapper
upgrade Gradle wrapper Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/80f65eb4 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/80f65eb4 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/80f65eb4 Branch: refs/heads/master Commit: 80f65eb4ba86c0c03d49744269097df12ffe3be2 Parents: 18a685d Author: Jochen KemnadeAuthored: Mon Nov 27 11:42:09 2017 +0100 Committer: Jochen Kemnade Committed: Mon Nov 27 11:42:09 2017 +0100 -- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- quickstart/filtered/archetype-resources/build.gradle | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/80f65eb4/build.gradle -- diff --git a/build.gradle b/build.gradle index a453677..0b75976 100755 --- a/build.gradle +++ b/build.gradle @@ -427,7 +427,7 @@ task continuousIntegration { } task wrapper(type: Wrapper) { -gradleVersion = '4.3' +gradleVersion = '4.3.1' description "Regenerates the Gradle Wrapper files" } http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/80f65eb4/gradle/wrapper/gradle-wrapper.properties -- diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 92165ee..0e680f3 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.3.1-bin.zip http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/80f65eb4/quickstart/filtered/archetype-resources/build.gradle -- diff --git a/quickstart/filtered/archetype-resources/build.gradle b/quickstart/filtered/archetype-resources/build.gradle index e9c946e..a6889a5 100644 --- a/quickstart/filtered/archetype-resources/build.gradle +++ b/quickstart/filtered/archetype-resources/build.gradle @@ -87,7 +87,7 @@ test { } task wrapper(type: Wrapper) { -gradleVersion = '4.3' +gradleVersion = '4.3.1' } // TODO: Configure execution mode for jettyRun task
tapestry-5 git commit: TAP5-2453: restore test classes
Repository: tapestry-5 Updated Branches: refs/heads/master 5c617af6b -> 8530a2763 TAP5-2453: restore test classes Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/8530a276 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/8530a276 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/8530a276 Branch: refs/heads/master Commit: 8530a27636f4fdc69ca7bb4877f6e31b87fe5292 Parents: 5c617af Author: Jochen KemnadeAuthored: Wed Nov 8 14:56:07 2017 +0100 Committer: Jochen Kemnade Committed: Wed Nov 8 14:56:07 2017 +0100 -- .../tapestry5/ioc/internal/util/Pair.java | 42 .../ioc/internal/util/StringLongPair.java | 19 + 2 files changed, 61 insertions(+) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/8530a276/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/Pair.java -- diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/Pair.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/Pair.java new file mode 100644 index 000..00722f4 --- /dev/null +++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/Pair.java @@ -0,0 +1,42 @@ +// Copyright 2008 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. + +package org.apache.tapestry5.ioc.internal.util; + +public class Pair +{ +private K key; + +private V value; + +public K getKey() +{ +return key; +} + +public void setKey(K key) +{ +this.key = key; +} + +public V getValue() +{ +return value; +} + +public void setValue(V value) +{ +this.value = value; +} +} http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/8530a276/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/StringLongPair.java -- diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/StringLongPair.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/StringLongPair.java new file mode 100644 index 000..0071beb --- /dev/null +++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/StringLongPair.java @@ -0,0 +1,19 @@ +// Copyright 2008 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. + +package org.apache.tapestry5.ioc.internal.util; + +public class StringLongPair extends Pair +{ +}
tapestry-5 git commit: TAP5-2453: move GenericsUtils (and tests) to plastic
Repository: tapestry-5 Updated Branches: refs/heads/master 91272172c -> 5c617af6b TAP5-2453: move GenericsUtils (and tests) to plastic Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/5c617af6 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/5c617af6 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/5c617af6 Branch: refs/heads/master Commit: 5c617af6b3bfef81d79c573aec0acf29e1d0eb8c Parents: 9127217 Author: Jochen KemnadeAuthored: Wed Nov 8 14:24:48 2017 +0100 Committer: Jochen Kemnade Committed: Wed Nov 8 14:24:48 2017 +0100 -- .../ioc/internal/util/GenericsUtils.java| 613 --- .../ioc/internal/util/GenericsUtils.java| 613 +++ .../groovy/ioc/specs/GenericUtilsSpec.groovy| 40 ++ .../ioc/internal/util/BaseGenericBean.java | 30 + .../ioc/internal/util/NonGenericBean.java | 30 + .../tapestry5/ioc/internal/util/Pair.java | 42 ++ .../tapestry5/ioc/internal/util/StringBean.java | 20 + .../ioc/internal/util/StringLongPair.java | 19 + .../groovy/ioc/specs/GenericUtilsSpec.groovy| 40 -- .../ioc/internal/util/BaseGenericBean.java | 30 - .../ioc/internal/util/NonGenericBean.java | 30 - .../tapestry5/ioc/internal/util/Pair.java | 42 -- .../tapestry5/ioc/internal/util/StringBean.java | 20 - .../ioc/internal/util/StringLongPair.java | 19 - 14 files changed, 794 insertions(+), 794 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5c617af6/commons/src/main/java/org/apache/tapestry5/ioc/internal/util/GenericsUtils.java -- diff --git a/commons/src/main/java/org/apache/tapestry5/ioc/internal/util/GenericsUtils.java b/commons/src/main/java/org/apache/tapestry5/ioc/internal/util/GenericsUtils.java deleted file mode 100644 index 9bf4d00..000 --- a/commons/src/main/java/org/apache/tapestry5/ioc/internal/util/GenericsUtils.java +++ /dev/null @@ -1,613 +0,0 @@ -// 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. - -package org.apache.tapestry5.ioc.internal.util; - -import java.lang.reflect.*; -import java.util.LinkedList; - -/** - * Static methods related to the use of JDK 1.5 generics. - */ -@SuppressWarnings("unchecked") -public class GenericsUtils -{ -/** - * Analyzes the method in the context of containingClass and returns the Class that is represented by - * the method's generic return type. Any parameter information in the generic return type is lost. If you want - * to preserve the type parameters of the return type consider using - * {@link #extractActualType(java.lang.reflect.Type, java.lang.reflect.Method)}. - * - * @param containingClass class which either contains or inherited the method - * @param method method from which to extract the return type - * @return the class represented by the methods generic return type, resolved based on the context . - * @see #extractActualType(java.lang.reflect.Type, java.lang.reflect.Method) - * @see #resolve(java.lang.reflect.Type,java.lang.reflect.Type) - * @see #asClass(java.lang.reflect.Type) - */ -public static Class extractGenericReturnType(Class containingClass, Method method) -{ -return asClass(resolve(method.getGenericReturnType(), containingClass)); -} - - -/** - * Analyzes the field in the context of containingClass and returns the Class that is represented by - * the field's generic type. Any parameter information in the generic type is lost, if you want - * to preserve the type parameters of the return type consider using - * {@link #getTypeVariableIndex(java.lang.reflect.TypeVariable)}. - * - * @param containingClass class which either contains or inherited the field - * @param field field from which to extract the type - * @return the class represented by the field's generic type, resolved based on the containingClass. - * @see #extractActualType(java.lang.reflect.Type, java.lang.reflect.Field) - * @see #resolve(java.lang.reflect.Type,java.lang.reflect.Type) - * @see #asClass(java.lang.reflect.Type) -
[1/2] tapestry-5 git commit: Revert "fix clicks on wrong elements"
Repository: tapestry-5 Updated Branches: refs/heads/master 2e96e0179 -> 91272172c Revert "fix clicks on wrong elements" This reverts commit 2e96e017954e25f3acb3b03fd4a2d88ed30ef3df. Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/2a71ad95 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/2a71ad95 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/2a71ad95 Branch: refs/heads/master Commit: 2a71ad95b61c2acca558b094be1ab82d41bd09bb Parents: 2e96e01 Author: Jochen KemnadeAuthored: Mon Nov 6 13:09:26 2017 +0100 Committer: Jochen Kemnade Committed: Mon Nov 6 13:09:26 2017 +0100 -- .../main/java/org/apache/tapestry5/test/SeleniumTestCase.java| 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/2a71ad95/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java -- diff --git a/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java b/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java index ca256a3..1214c92 100644 --- a/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java +++ b/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java @@ -1625,9 +1625,7 @@ public abstract class SeleniumTestCase extends Assert implements Selenium for (String text : linkText) { -WebElement link = webDriver.findElement(By.linkText(text)); -scrollIntoView(link); -link.click(); +webDriver.findElement(By.linkText(text)).click(); } }
[2/2] tapestry-5 git commit: Revert "avoid some unnecessary waiting"
Revert "avoid some unnecessary waiting" This reverts commit 6b44b2cd5fe7fe093d109bff9ba7c0812f219ff2. Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/91272172 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/91272172 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/91272172 Branch: refs/heads/master Commit: 91272172c99a9d502111c93f2a5ab4cf271e836f Parents: 2a71ad9 Author: Jochen KemnadeAuthored: Mon Nov 6 13:09:27 2017 +0100 Committer: Jochen Kemnade Committed: Mon Nov 6 13:09:27 2017 +0100 -- .../main/java/org/apache/tapestry5/test/SeleniumTestCase.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/91272172/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java -- diff --git a/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java b/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java index 1214c92..a1fba91 100644 --- a/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java +++ b/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java @@ -1474,8 +1474,9 @@ public abstract class SeleniumTestCase extends Assert implements Selenium */ protected final void openBaseURL() { -webDriver.navigate().to(baseURL); +open(baseURL); +waitForPageToLoad(); } /** @@ -1625,7 +1626,7 @@ public abstract class SeleniumTestCase extends Assert implements Selenium for (String text : linkText) { -webDriver.findElement(By.linkText(text)).click(); +clickAndWait("link=" + text); } }
tapestry-5 git commit: fix clicks on wrong elements
Repository: tapestry-5 Updated Branches: refs/heads/master 6b44b2cd5 -> 2e96e0179 fix clicks on wrong elements Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/2e96e017 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/2e96e017 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/2e96e017 Branch: refs/heads/master Commit: 2e96e017954e25f3acb3b03fd4a2d88ed30ef3df Parents: 6b44b2c Author: Jochen KemnadeAuthored: Mon Nov 6 12:36:13 2017 +0100 Committer: Jochen Kemnade Committed: Mon Nov 6 12:36:13 2017 +0100 -- .../main/java/org/apache/tapestry5/test/SeleniumTestCase.java| 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/2e96e017/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java -- diff --git a/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java b/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java index 1214c92..ca256a3 100644 --- a/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java +++ b/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java @@ -1625,7 +1625,9 @@ public abstract class SeleniumTestCase extends Assert implements Selenium for (String text : linkText) { -webDriver.findElement(By.linkText(text)).click(); +WebElement link = webDriver.findElement(By.linkText(text)); +scrollIntoView(link); +link.click(); } }
tapestry-5 git commit: avoid some unnecessary waiting
Repository: tapestry-5 Updated Branches: refs/heads/master 232f029f3 -> 6b44b2cd5 avoid some unnecessary waiting Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/6b44b2cd Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/6b44b2cd Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/6b44b2cd Branch: refs/heads/master Commit: 6b44b2cd5fe7fe093d109bff9ba7c0812f219ff2 Parents: 232f029 Author: Jochen KemnadeAuthored: Mon Nov 6 12:26:23 2017 +0100 Committer: Jochen Kemnade Committed: Mon Nov 6 12:26:23 2017 +0100 -- .../main/java/org/apache/tapestry5/test/SeleniumTestCase.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/6b44b2cd/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java -- diff --git a/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java b/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java index a1fba91..1214c92 100644 --- a/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java +++ b/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java @@ -1474,9 +1474,8 @@ public abstract class SeleniumTestCase extends Assert implements Selenium */ protected final void openBaseURL() { -open(baseURL); +webDriver.navigate().to(baseURL); -waitForPageToLoad(); } /** @@ -1626,7 +1625,7 @@ public abstract class SeleniumTestCase extends Assert implements Selenium for (String text : linkText) { -clickAndWait("link=" + text); +webDriver.findElement(By.linkText(text)).click(); } }
tapestry-5 git commit: increment version number
Repository: tapestry-5 Updated Branches: refs/heads/master adf455bd9 -> 232f029f3 increment version number Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/232f029f Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/232f029f Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/232f029f Branch: refs/heads/master Commit: 232f029f3b5e0d6e7407e09a65e53485f20e5b25 Parents: adf455b Author: Jochen KemnadeAuthored: Fri Nov 3 12:02:33 2017 +0100 Committer: Jochen Kemnade Committed: Fri Nov 3 12:02:33 2017 +0100 -- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/232f029f/build.gradle -- diff --git a/build.gradle b/build.gradle index 40feca1..b29fd91 100755 --- a/build.gradle +++ b/build.gradle @@ -33,7 +33,7 @@ project.version = tapestryVersion() def tapestryVersion() { def major = "5.5.0" -def minor = "-alpha-9" +def minor = "-alpha-10" // When building on the CI server, make sure -SNAPSHOT is appended, as it is a nightly build. // When building normally, or for a release, no suffix is desired.
[tapestry-5] Git Push Summary
Repository: tapestry-5 Updated Tags: refs/tags/5.5.0-alpha-9 [created] adf455bd9
tapestry-5 git commit: improve wait for page load
Repository: tapestry-5 Updated Branches: refs/heads/master 9c5e8abc4 -> adf455bd9 improve wait for page load Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/adf455bd Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/adf455bd Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/adf455bd Branch: refs/heads/master Commit: adf455bd9d3bd49a41472e891213d640e159742a Parents: 9c5e8ab Author: Jochen KemnadeAuthored: Fri Nov 3 11:53:09 2017 +0100 Committer: Jochen Kemnade Committed: Fri Nov 3 11:53:09 2017 +0100 -- .../apache/tapestry5/test/SeleniumTestCase.java | 18 -- 1 file changed, 12 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/adf455bd/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java -- diff --git a/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java b/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java index 4a64591..a1fba91 100644 --- a/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java +++ b/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java @@ -19,6 +19,7 @@ import com.thoughtworks.selenium.webdriven.WebDriverCommandProcessor; import org.openqa.selenium.By; import org.openqa.selenium.JavascriptExecutor; +import org.openqa.selenium.NoSuchElementException; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; import org.openqa.selenium.firefox.FirefoxDriver; @@ -1377,15 +1378,20 @@ public abstract class SeleniumTestCase extends Assert implements Selenium // In a limited number of cases, a "page" is an container error page or raw HTML content // that does not include the body element and data-page-initialized element. In those cases, // there will never be page initialization in the Tapestry sense and we return immediately. - -if (!isElementPresent("css=body[data-page-initialized]")) +try { -return; -} - +WebElement body = webDriver.findElement(By.cssSelector("body")); - waitForCondition(ExpectedConditions.attributeToBe(By.cssSelector("body"), "data-page-initialized", "true"), 30); +if (body.getAttribute("data-page-initialized") == null) +{ +return; +} +waitForCondition(ExpectedConditions.attributeToBe(body, "data-page-initialized", "true"), 30); +} catch (NoSuchElementException e) +{ +// no body element found, there's nothing to wait for +} } @Override
tapestry-5 git commit: increment version number
Repository: tapestry-5 Updated Branches: refs/heads/master 3eaf96507 -> 7c398b117 increment version number Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/7c398b11 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/7c398b11 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/7c398b11 Branch: refs/heads/master Commit: 7c398b117aa3ce073cab0b45d1902a18b404e20a Parents: 3eaf965 Author: Jochen KemnadeAuthored: Fri Nov 3 11:33:34 2017 +0100 Committer: Jochen Kemnade Committed: Fri Nov 3 11:33:34 2017 +0100 -- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/7c398b11/build.gradle -- diff --git a/build.gradle b/build.gradle index 12a364b..40feca1 100755 --- a/build.gradle +++ b/build.gradle @@ -33,7 +33,7 @@ project.version = tapestryVersion() def tapestryVersion() { def major = "5.5.0" -def minor = "-alpha-8" +def minor = "-alpha-9" // When building on the CI server, make sure -SNAPSHOT is appended, as it is a nightly build. // When building normally, or for a release, no suffix is desired.
[tapestry-5] Git Push Summary
Repository: tapestry-5 Updated Tags: refs/tags/5.5.0-alpha-8 [created] 3eaf96507
tapestry-5 git commit: improve wait for page load
Repository: tapestry-5 Updated Branches: refs/heads/master 8932267e4 -> 3eaf96507 improve wait for page load Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/3eaf9650 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/3eaf9650 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/3eaf9650 Branch: refs/heads/master Commit: 3eaf96507902268728b07a77894ebcef024819a5 Parents: 8932267 Author: Jochen KemnadeAuthored: Fri Nov 3 11:18:55 2017 +0100 Committer: Jochen Kemnade Committed: Fri Nov 3 11:18:55 2017 +0100 -- .../apache/tapestry5/test/SeleniumTestCase.java | 32 +--- 1 file changed, 8 insertions(+), 24 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/3eaf9650/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java -- diff --git a/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java b/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java index 313e4e5..6ae7c64 100644 --- a/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java +++ b/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java @@ -13,13 +13,10 @@ package org.apache.tapestry5.test; import com.thoughtworks.selenium.CommandProcessor; -import com.thoughtworks.selenium.HttpCommandProcessor; import com.thoughtworks.selenium.Selenium; import com.thoughtworks.selenium.webdriven.WebDriverBackedSelenium; import com.thoughtworks.selenium.webdriven.WebDriverCommandProcessor; -import io.github.bonigarcia.wdm.FirefoxDriverManager; - import org.openqa.selenium.By; import org.openqa.selenium.JavascriptExecutor; import org.openqa.selenium.WebDriver; @@ -27,7 +24,6 @@ import org.openqa.selenium.WebElement; import org.openqa.selenium.firefox.FirefoxDriver; import org.openqa.selenium.firefox.FirefoxOptions; import org.openqa.selenium.firefox.FirefoxProfile; -import org.openqa.selenium.interactions.Actions; import org.openqa.selenium.internal.WrapsDriver; import org.openqa.selenium.remote.DesiredCapabilities; import org.openqa.selenium.support.ui.ExpectedCondition; @@ -980,7 +976,7 @@ public abstract class SeleniumTestCase extends Assert implements Selenium @Override public boolean isElementPresent(String locator) { -return selenium.isElementPresent(locator); +return webDriver.findElement(convertLocator(locator)) != null; } @Override @@ -1353,7 +1349,12 @@ public abstract class SeleniumTestCase extends Assert implements Selenium protected void waitForCondition(ExpectedCondition condition) { - WebDriverWait wait = new WebDriverWait(webDriver, 10); + waitForCondition(condition, 10l); +} + +protected void waitForCondition(ExpectedCondition condition, long timeoutSeconds) +{ + WebDriverWait wait = new WebDriverWait(webDriver, timeoutSeconds); wait.until(condition); } @@ -1382,26 +1383,9 @@ public abstract class SeleniumTestCase extends Assert implements Selenium return; } -final long pollingStartTime = System.currentTimeMillis(); - -long sleepTime = 20; - -while (true) -{ -if (isElementPresent("css=body[data-page-initialized='true']")) -{ -return; -} - -if ((System.currentTimeMillis() - pollingStartTime) > 3) -{ -reportAndThrowAssertionError("Page did not finish initializing after 30 seconds."); -} -sleep(sleepTime); + waitForCondition(ExpectedConditions.attributeToBe(By.cssSelector("body"), "data-page-initialized", "true"), 30); -sleepTime *= 2; -} } @Override
[2/3] tapestry-5 git commit: upgrade Selenium
upgrade Selenium Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/df3f282b Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/df3f282b Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/df3f282b Branch: refs/heads/master Commit: df3f282ba31928b2cbe370ed6422aa1fa227863c Parents: be704c5 Author: Jochen KemnadeAuthored: Fri Nov 3 11:00:42 2017 +0100 Committer: Jochen Kemnade Committed: Fri Nov 3 11:00:42 2017 +0100 -- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/df3f282b/build.gradle -- diff --git a/build.gradle b/build.gradle index c898aa6..f2abc08 100755 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ project.ext.versions = [ hibernate: "5.1.0.Final", slf4j: "1.7.25", geb: "1.1.1", -selenium: "3.6.0" +selenium: "3.7.0" ] ext.continuousIntegrationBuild = Boolean.getBoolean("ci")
[1/3] tapestry-5 git commit: upgrade Closure Compiler
Repository: tapestry-5 Updated Branches: refs/heads/master 127f62edf -> 8932267e4 upgrade Closure Compiler Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/be704c55 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/be704c55 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/be704c55 Branch: refs/heads/master Commit: be704c55d29a00a3707407c945b15191c1a7d39e Parents: 127f62e Author: Jochen KemnadeAuthored: Fri Nov 3 11:00:32 2017 +0100 Committer: Jochen Kemnade Committed: Fri Nov 3 11:00:32 2017 +0100 -- tapestry-webresources/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/be704c55/tapestry-webresources/build.gradle -- diff --git a/tapestry-webresources/build.gradle b/tapestry-webresources/build.gradle index cdc1751..874cfef 100644 --- a/tapestry-webresources/build.gradle +++ b/tapestry-webresources/build.gradle @@ -3,7 +3,7 @@ description = "Integration with WRO4J to perform runtime CoffeeScript compilatio dependencies { compile project(":tapestry-core") compile "com.github.sommeri:less4j:1.12.0" -compile "com.google.javascript:closure-compiler-unshaded:v20170910" +compile "com.google.javascript:closure-compiler-unshaded:v20171023" compile "org.mozilla:rhino:1.7.7.2" testCompile project(":tapestry-runner")
[3/3] tapestry-5 git commit: upgrade Geb
upgrade Geb Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/8932267e Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/8932267e Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/8932267e Branch: refs/heads/master Commit: 8932267e47d13b3043d144f520224f3107e56888 Parents: df3f282 Author: Jochen KemnadeAuthored: Fri Nov 3 11:01:02 2017 +0100 Committer: Jochen Kemnade Committed: Fri Nov 3 11:01:02 2017 +0100 -- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/8932267e/build.gradle -- diff --git a/build.gradle b/build.gradle index f2abc08..12a364b 100755 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ project.ext.versions = [ spock: "1.1-groovy-2.4", hibernate: "5.1.0.Final", slf4j: "1.7.25", -geb: "1.1.1", +geb: "2.0", selenium: "3.7.0" ]
tapestry-5 git commit: TAP5-2032, TAP5-2449, TAP5-1493: consider overridden methods first so we don't end up resolving types on the wrong classes
Repository: tapestry-5 Updated Branches: refs/heads/master 3fbcb2602 -> 127f62edf TAP5-2032, TAP5-2449, TAP5-1493: consider overridden methods first so we don't end up resolving types on the wrong classes Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/127f62ed Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/127f62ed Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/127f62ed Branch: refs/heads/master Commit: 127f62edf90b2a838896626143f2ca9e6a718a76 Parents: 3fbcb26 Author: Jochen KemnadeAuthored: Fri Nov 3 09:41:29 2017 +0100 Committer: Jochen Kemnade Committed: Fri Nov 3 09:45:08 2017 +0100 -- .../services/ClassPropertyAdapterImpl.java | 31 .../internal/services/PropertyAccessImpl.java | 3 +- .../ioc/specs/PropertyAccessImplSpec.groovy | 23 +++ 3 files changed, 44 insertions(+), 13 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/127f62ed/beanmodel/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassPropertyAdapterImpl.java -- diff --git a/beanmodel/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassPropertyAdapterImpl.java b/beanmodel/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassPropertyAdapterImpl.java index 9c5f36c4..8164ec7 100644 --- a/beanmodel/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassPropertyAdapterImpl.java +++ b/beanmodel/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassPropertyAdapterImpl.java @@ -41,19 +41,26 @@ public class ClassPropertyAdapterImpl implements ClassPropertyAdapter // lazy init Map nonBridgeMethods = null; - + for (PropertyDescriptor pd : descriptors) { // Indexed properties will have a null propertyType (and a non-null // indexedPropertyType). We ignore indexed properties. +String name = pd.getName(); + +if (adapters.containsKey(name)) +{ +continue; +} + final Class thisPropertyType = pd.getPropertyType(); if (thisPropertyType == null) continue; Method readMethod = pd.getReadMethod(); Method writeMethod = pd.getWriteMethod(); - + // TAP5-1493 if (readMethod != null && readMethod.isBridge()) { @@ -61,15 +68,15 @@ public class ClassPropertyAdapterImpl implements ClassPropertyAdapter { nonBridgeMethods = groupNonBridgeMethodsByName(beanType); } -readMethod = findMethodWithSameNameAndParamCount(readMethod, nonBridgeMethods); +readMethod = findMethodWithSameNameAndParamCount(readMethod, nonBridgeMethods); } - + // TAP5-1548, TAP5-1885: trying to find a getter which Introspector missed if (readMethod == null) { final String prefix = thisPropertyType != boolean.class ? "get" : "is"; try { -Method method = beanType.getMethod(prefix + capitalize(pd.getName())); +Method method = beanType.getMethod(prefix + capitalize(name)); final Class returnType = method.getReturnType(); if (returnType.equals(thisPropertyType) || returnType.isInstance(thisPropertyType)) { readMethod = method; @@ -83,7 +90,7 @@ public class ClassPropertyAdapterImpl implements ClassPropertyAdapter // getter doesn't exist. } } - + if (writeMethod != null && writeMethod.isBridge()) { if (nonBridgeMethods == null) @@ -92,12 +99,12 @@ public class ClassPropertyAdapterImpl implements ClassPropertyAdapter } writeMethod = findMethodWithSameNameAndParamCount(writeMethod, nonBridgeMethods); } - + // TAP5-1548, TAP5-1885: trying to find a setter which Introspector missed if (writeMethod == null) { try { -Method method = beanType.getMethod("set" + capitalize(pd.getName()), pd.getPropertyType()); +Method method = beanType.getMethod("set" + capitalize(name), pd.getPropertyType()); final Class returnType = method.getReturnType(); if (returnType.equals(void.class)) { writeMethod = method; @@ -115,7 +122,7 @@ public class
tapestry-5 git commit: produce more output so that builds don't stall on Travis
Repository: tapestry-5 Updated Branches: refs/heads/master 2433746b6 -> 3fbcb2602 produce more output so that builds don't stall on Travis Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/3fbcb260 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/3fbcb260 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/3fbcb260 Branch: refs/heads/master Commit: 3fbcb2602cfa3578cd6b2bd6be1e76812223cf8d Parents: 2433746 Author: Jochen KemnadeAuthored: Fri Nov 3 08:57:07 2017 +0100 Committer: Jochen Kemnade Committed: Fri Nov 3 08:57:07 2017 +0100 -- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/3fbcb260/build.gradle -- diff --git a/build.gradle b/build.gradle index 898ab92..c898aa6 100755 --- a/build.gradle +++ b/build.gradle @@ -209,7 +209,7 @@ subprojects { def numberOfTestsExecuted = 0 afterTest { descriptor, result-> numberOfTestsExecuted++ -if (numberOfTestsExecuted % 50 == 0){ +if (numberOfTestsExecuted % 25 == 0){ logger.lifecycle "$numberOfTestsExecuted tests executed" } }
tapestry-5 git commit: and another fix
Repository: tapestry-5 Updated Branches: refs/heads/master 3293db657 -> 2433746b6 and another fix Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/2433746b Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/2433746b Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/2433746b Branch: refs/heads/master Commit: 2433746b6e4bc25aeafdec912772238cdca0afec Parents: 3293db6 Author: Jochen KemnadeAuthored: Fri Nov 3 08:35:40 2017 +0100 Committer: Jochen Kemnade Committed: Fri Nov 3 08:35:40 2017 +0100 -- .../java/org/apache/tapestry5/integration/app1/FormTests.java| 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/2433746b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/FormTests.java -- diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/FormTests.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/FormTests.java index c4044b4..fa792b6 100644 --- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/FormTests.java +++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/FormTests.java @@ -469,7 +469,9 @@ public class FormTests extends App1TestCase assertTextPresent("Selected position: TEMP"); - webDriver.findElements(By.cssSelector("label")).stream().filter(element-> element.getText().contains("Lifer")).findFirst().get().click(); +WebElement lifer = webDriver.findElements(By.cssSelector("label")).stream().filter(element-> element.getText().contains("Lifer")).findFirst().get(); +scrollIntoView(lifer); +lifer.click(); clickAndWait(update);
tapestry-5 git commit: still working on test failures
Repository: tapestry-5 Updated Branches: refs/heads/master 012789962 -> 3293db657 still working on test failures Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/3293db65 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/3293db65 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/3293db65 Branch: refs/heads/master Commit: 3293db657ad8d935a331e4ba64af11ec6183af44 Parents: 0127899 Author: Jochen KemnadeAuthored: Fri Nov 3 08:12:30 2017 +0100 Committer: Jochen Kemnade Committed: Fri Nov 3 08:12:30 2017 +0100 -- .../java/org/apache/tapestry5/integration/app1/FormTests.java| 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/3293db65/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/FormTests.java -- diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/FormTests.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/FormTests.java index 54d96a2..c4044b4 100644 --- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/FormTests.java +++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/FormTests.java @@ -461,7 +461,9 @@ public class FormTests extends App1TestCase assertTextPresent("Selected department: SALES_AND_MARKETING"); // not in a loop ... - webDriver.findElements(By.cssSelector("label")).stream().filter(element-> element.getText().contains("Temp")).findFirst().get().click(); +WebElement temp = webDriver.findElements(By.cssSelector("label")).stream().filter(element-> element.getText().contains("Temp")).findFirst().get(); +scrollIntoView(temp); +temp.click(); clickAndWait(update);
tapestry-5 git commit: extract and re-use
Repository: tapestry-5 Updated Branches: refs/heads/master bd2c277f3 -> 012789962 extract and re-use Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/01278996 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/01278996 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/01278996 Branch: refs/heads/master Commit: 0127899628c823a9d588999595e867d8f2f3fae7 Parents: bd2c277 Author: Jochen KemnadeAuthored: Thu Nov 2 16:33:14 2017 +0100 Committer: Jochen Kemnade Committed: Fri Nov 3 07:58:15 2017 +0100 -- .../tapestry5/integration/app1/AjaxGroovyTests.groovy | 4 +++- .../org/apache/tapestry5/integration/app1/FormTests.java | 5 - .../java/org/apache/tapestry5/test/SeleniumTestCase.java | 10 -- 3 files changed, 15 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/01278996/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/app1/AjaxGroovyTests.groovy -- diff --git a/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/app1/AjaxGroovyTests.groovy b/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/app1/AjaxGroovyTests.groovy index 209281a..1b129ee 100644 --- a/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/app1/AjaxGroovyTests.groovy +++ b/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/app1/AjaxGroovyTests.groovy @@ -12,7 +12,9 @@ class AjaxGroovyTests extends App1TestCase { openLinks "Ajax Radio Demo" webDriver.findElements(By.cssSelector('label')).find{it.text.contains('It')}.click() - webDriver.findElements(By.cssSelector('label')).find{it.text.contains('Temp')}.click() +def labelTemp = webDriver.findElements(By.cssSelector('label')).find{it.text.contains('Temp')} +scrollIntoView(labelTemp) +labelTemp.click() click SUBMIT http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/01278996/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/FormTests.java -- diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/FormTests.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/FormTests.java index b666012..54d96a2 100644 --- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/FormTests.java +++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/FormTests.java @@ -17,6 +17,7 @@ import java.util.Date; import org.apache.tapestry5.corelib.components.Form; import org.openqa.selenium.By; +import org.openqa.selenium.WebElement; import org.openqa.selenium.support.ui.ExpectedCondition; import org.openqa.selenium.support.ui.ExpectedConditions; import org.testng.annotations.Test; @@ -451,7 +452,9 @@ public class FormTests extends App1TestCase assertTextPresent("Selected department: ACCOUNTING"); - webDriver.findElements(By.cssSelector("label")).stream().filter(element-> element.getText().contains("Sales And Marketin")).findFirst().get().click(); +WebElement salesAndMarketing = webDriver.findElements(By.cssSelector("label")).stream().filter(element-> element.getText().contains("Sales And Marketin")).findFirst().get(); +scrollIntoView(salesAndMarketing); +salesAndMarketing.click(); clickAndWait(update); http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/01278996/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java -- diff --git a/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java b/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java index f318733..313e4e5 100644 --- a/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java +++ b/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java @@ -544,7 +544,7 @@ public abstract class SeleniumTestCase extends Assert implements Selenium WebElement element = webDriver.findElement(convertLocator(locator)); if (!element.isSelected()) { -((JavascriptExecutor) webDriver).executeScript("arguments[0].scrollIntoView(true);", element); +scrollIntoView(element); element.click(); } } @@ -565,7 +565,7 @@ public abstract class SeleniumTestCase extends Assert implements Selenium public void click(String locator) { WebElement element = webDriver.findElement(convertLocator(locator)); -((JavascriptExecutor)
tapestry-5 git commit: quit the webdriver instead of closing it
Repository: tapestry-5 Updated Branches: refs/heads/master a147df916 -> b45201db3 quit the webdriver instead of closing it Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/b45201db Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/b45201db Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/b45201db Branch: refs/heads/master Commit: b45201db3eab74651c98582a4b1c462e9749dab1 Parents: a147df9 Author: Jochen KemnadeAuthored: Thu Nov 2 12:31:27 2017 +0100 Committer: Jochen Kemnade Committed: Thu Nov 2 12:31:27 2017 +0100 -- .../src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b45201db/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java -- diff --git a/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java b/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java index 5bca70b..f318733 100644 --- a/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java +++ b/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java @@ -263,7 +263,7 @@ public abstract class SeleniumTestCase extends Assert implements Selenium try { -webDriver.close(); +webDriver.quit(); } catch (RuntimeException e) { LOGGER.error("Webdriver shutdown failure.", e);
tapestry-5 git commit: properly shut down webdriver instance
Repository: tapestry-5 Updated Branches: refs/heads/master 91c4c7c5c -> a147df916 properly shut down webdriver instance Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/a147df91 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/a147df91 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/a147df91 Branch: refs/heads/master Commit: a147df916d7f0bd9c3a274f28b93274c90ba52e2 Parents: 91c4c7c Author: Jochen KemnadeAuthored: Thu Nov 2 12:07:46 2017 +0100 Committer: Jochen Kemnade Committed: Thu Nov 2 12:07:46 2017 +0100 -- .../java/org/apache/tapestry5/test/SeleniumTestCase.java | 10 ++ 1 file changed, 10 insertions(+) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/a147df91/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java -- diff --git a/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java b/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java index 9701d30..5bca70b 100644 --- a/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java +++ b/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java @@ -259,6 +259,16 @@ public abstract class SeleniumTestCase extends Assert implements Selenium LOGGER.error("Selenium client shutdown failure.", e); } +LOGGER.info("Shutting down webdriver ..."); + +try +{ +webDriver.close(); +} catch (RuntimeException e) +{ +LOGGER.error("Webdriver shutdown failure.", e); +} + LOGGER.info("Shutting down selenium server ..."); LOGGER.info("Shutting web server ...");
tapestry-5 git commit: upgrade Gradle wrapper
Repository: tapestry-5 Updated Branches: refs/heads/master 316e2ab56 -> 91c4c7c5c upgrade Gradle wrapper Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/91c4c7c5 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/91c4c7c5 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/91c4c7c5 Branch: refs/heads/master Commit: 91c4c7c5c45cba359427107603eb366358431960 Parents: 316e2ab Author: Jochen KemnadeAuthored: Wed Nov 1 08:38:45 2017 +0100 Committer: Jochen Kemnade Committed: Wed Nov 1 08:38:45 2017 +0100 -- build.gradle| 2 +- gradle/wrapper/gradle-wrapper.jar | Bin 54712 -> 54727 bytes gradle/wrapper/gradle-wrapper.properties| 4 ++-- .../filtered/archetype-resources/build.gradle | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/91c4c7c5/build.gradle -- diff --git a/build.gradle b/build.gradle index 80cc485..898ab92 100755 --- a/build.gradle +++ b/build.gradle @@ -427,7 +427,7 @@ task continuousIntegration { } task wrapper(type: Wrapper) { -gradleVersion = '4.2.1' +gradleVersion = '4.3' description "Regenerates the Gradle Wrapper files" } http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/91c4c7c5/gradle/wrapper/gradle-wrapper.jar -- diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index ed88a04..27768f1 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/91c4c7c5/gradle/wrapper/gradle-wrapper.properties -- diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 731147b..92165ee 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ -distributionUrl=https\://services.gradle.org/distributions/gradle-4.2.1-bin.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-bin.zip http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/91c4c7c5/quickstart/filtered/archetype-resources/build.gradle -- diff --git a/quickstart/filtered/archetype-resources/build.gradle b/quickstart/filtered/archetype-resources/build.gradle index 0ec74df..e9c946e 100644 --- a/quickstart/filtered/archetype-resources/build.gradle +++ b/quickstart/filtered/archetype-resources/build.gradle @@ -87,7 +87,7 @@ test { } task wrapper(type: Wrapper) { -gradleVersion = '4.2.1' +gradleVersion = '4.3' } // TODO: Configure execution mode for jettyRun task
tapestry-5 git commit: try to fix tests
Repository: tapestry-5 Updated Branches: refs/heads/master cc93f5631 -> 316e2ab56 try to fix tests Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/316e2ab5 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/316e2ab5 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/316e2ab5 Branch: refs/heads/master Commit: 316e2ab56afbddf3fba9a5f429abe3a959559918 Parents: cc93f56 Author: Jochen KemnadeAuthored: Mon Oct 30 09:38:18 2017 +0100 Committer: Jochen Kemnade Committed: Mon Oct 30 09:38:18 2017 +0100 -- .../java/org/apache/tapestry5/integration/app1/AjaxTests.java | 2 +- .../main/java/org/apache/tapestry5/test/SeleniumTestCase.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/316e2ab5/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/AjaxTests.java -- diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/AjaxTests.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/AjaxTests.java index 114e0f1..d26df0e 100644 --- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/AjaxTests.java +++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/AjaxTests.java @@ -37,7 +37,7 @@ public class AjaxTests extends App1TestCase { openLinks("Autocomplete Mixin Demo"); -type("required", "foo"); +typeKeys("required", "foo"); clickAndWait(SUBMIT); http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/316e2ab5/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java -- diff --git a/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java b/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java index 57348ba..9701d30 100644 --- a/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java +++ b/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java @@ -1313,14 +1313,14 @@ public abstract class SeleniumTestCase extends Assert implements Selenium public void type(String locator, String value) { WebElement element = webDriver.findElement(convertLocator(locator)); -element.clear(); -element.sendKeys(value); +((JavascriptExecutor) webDriver).executeScript("arguments[0].value = arguments[1];", element, value); } @Override public void typeKeys(String locator, String value) { -selenium.typeKeys(locator, value); +WebElement element = webDriver.findElement(convertLocator(locator)); +element.sendKeys(value); } @Override
tapestry-5 git commit: clear the field before sending the new keys
Repository: tapestry-5 Updated Branches: refs/heads/master 88aad2673 -> cc93f5631 clear the field before sending the new keys Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/cc93f563 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/cc93f563 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/cc93f563 Branch: refs/heads/master Commit: cc93f5631d2bc71a9dc1a07300c3c03bf0c9d36f Parents: 88aad26 Author: Jochen KemnadeAuthored: Mon Oct 16 14:57:53 2017 +0200 Committer: Jochen Kemnade Committed: Mon Oct 30 09:08:33 2017 +0100 -- .../src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/cc93f563/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java -- diff --git a/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java b/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java index 204145a..57348ba 100644 --- a/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java +++ b/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java @@ -1313,6 +1313,7 @@ public abstract class SeleniumTestCase extends Assert implements Selenium public void type(String locator, String value) { WebElement element = webDriver.findElement(convertLocator(locator)); +element.clear(); element.sendKeys(value); }
tapestry-5 git commit: fix test
Repository: tapestry-5 Updated Branches: refs/heads/master 8ac208194 -> 88aad2673 fix test Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/88aad267 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/88aad267 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/88aad267 Branch: refs/heads/master Commit: 88aad2673a7e5c85bb4f3d949ecc74978238950c Parents: 8ac2081 Author: Jochen KemnadeAuthored: Mon Oct 30 08:43:22 2017 +0100 Committer: Jochen Kemnade Committed: Mon Oct 30 08:43:22 2017 +0100 -- .../src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/88aad267/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java -- diff --git a/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java b/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java index 5f4d696..204145a 100644 --- a/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java +++ b/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java @@ -1312,7 +1312,8 @@ public abstract class SeleniumTestCase extends Assert implements Selenium @Override public void type(String locator, String value) { -selenium.type(locator, value); +WebElement element = webDriver.findElement(convertLocator(locator)); +element.sendKeys(value); } @Override
tapestry-5 git commit: fix tests
Repository: tapestry-5 Updated Branches: refs/heads/master 906d263bd -> 8ac208194 fix tests Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/8ac20819 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/8ac20819 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/8ac20819 Branch: refs/heads/master Commit: 8ac208194e7adc3193c14fa909bc56905ce12b37 Parents: 906d263 Author: Jochen KemnadeAuthored: Fri Oct 27 16:34:16 2017 +0200 Committer: Jochen Kemnade Committed: Fri Oct 27 16:34:16 2017 +0200 -- .../main/java/org/apache/tapestry5/test/SeleniumTestCase.java| 4 1 file changed, 4 insertions(+) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/8ac20819/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java -- diff --git a/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java b/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java index 59d6276..5f4d696 100644 --- a/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java +++ b/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java @@ -1806,6 +1806,10 @@ public abstract class SeleniumTestCase extends Assert implements Selenium { return By.xpath(locator.substring(6)); } +else if (locator.startsWith("id=")) +{ +return By.id(locator.substring(3)); +} else if (locator.startsWith("//")) { return By.xpath(locator);
tapestry-5 git commit: try to fix test
Repository: tapestry-5 Updated Branches: refs/heads/master 72759bb35 -> 906d263bd try to fix test Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/906d263b Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/906d263b Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/906d263b Branch: refs/heads/master Commit: 906d263bd2cfd4b2101cd5bc9f3bd24440980508 Parents: 72759bb Author: Jochen KemnadeAuthored: Fri Oct 27 15:54:51 2017 +0200 Committer: Jochen Kemnade Committed: Fri Oct 27 15:54:51 2017 +0200 -- .../main/java/org/apache/tapestry5/test/SeleniumTestCase.java | 7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/906d263b/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java -- diff --git a/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java b/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java index 2af5575..59d6276 100644 --- a/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java +++ b/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java @@ -531,7 +531,12 @@ public abstract class SeleniumTestCase extends Assert implements Selenium @Override public void check(String locator) { -selenium.check(locator); +WebElement element = webDriver.findElement(convertLocator(locator)); +if (!element.isSelected()) +{ +((JavascriptExecutor) webDriver).executeScript("arguments[0].scrollIntoView(true);", element); +element.click(); +} } @Override
tapestry-5 git commit: upgrade Gradle wrapper
Repository: tapestry-5 Updated Branches: refs/heads/master 9a4ce577e -> 72759bb35 upgrade Gradle wrapper Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/72759bb3 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/72759bb3 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/72759bb3 Branch: refs/heads/master Commit: 72759bb357d0a25a46ad016145c9abd6733fd2f7 Parents: 9a4ce57 Author: Jochen KemnadeAuthored: Tue Oct 24 13:53:58 2017 +0200 Committer: Jochen Kemnade Committed: Tue Oct 24 13:53:58 2017 +0200 -- build.gradle| 2 +- gradle/wrapper/gradle-wrapper.jar | Bin 54708 -> 54712 bytes gradle/wrapper/gradle-wrapper.properties| 4 ++-- .../filtered/archetype-resources/build.gradle | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/72759bb3/build.gradle -- diff --git a/build.gradle b/build.gradle index 1fa8fd6..80cc485 100755 --- a/build.gradle +++ b/build.gradle @@ -427,7 +427,7 @@ task continuousIntegration { } task wrapper(type: Wrapper) { -gradleVersion = '4.2' +gradleVersion = '4.2.1' description "Regenerates the Gradle Wrapper files" } http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/72759bb3/gradle/wrapper/gradle-wrapper.jar -- diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 736fb7d..ed88a04 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/72759bb3/gradle/wrapper/gradle-wrapper.properties -- diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 52dd1f0..731147b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ +distributionUrl=https\://services.gradle.org/distributions/gradle-4.2.1-bin.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.2-bin.zip +zipStoreBase=GRADLE_USER_HOME http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/72759bb3/quickstart/filtered/archetype-resources/build.gradle -- diff --git a/quickstart/filtered/archetype-resources/build.gradle b/quickstart/filtered/archetype-resources/build.gradle index eeed246..0ec74df 100644 --- a/quickstart/filtered/archetype-resources/build.gradle +++ b/quickstart/filtered/archetype-resources/build.gradle @@ -87,7 +87,7 @@ test { } task wrapper(type: Wrapper) { -gradleVersion = '4.2' +gradleVersion = '4.2.1' } // TODO: Configure execution mode for jettyRun task
tapestry-5 git commit: Revert "work around build timeouts"
Repository: tapestry-5 Updated Branches: refs/heads/master 5293d82e4 -> 9a4ce577e Revert "work around build timeouts" This reverts commit 6d69eb9a7d77b112d28df1b6ee1e60ae42878e48. Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/9a4ce577 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/9a4ce577 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/9a4ce577 Branch: refs/heads/master Commit: 9a4ce577eb1f48c6c3538bcb2f58ad9b5be993c9 Parents: 5293d82 Author: Jochen KemnadeAuthored: Tue Oct 24 13:44:58 2017 +0200 Committer: Jochen Kemnade Committed: Tue Oct 24 13:44:58 2017 +0200 -- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/9a4ce577/.travis.yml -- diff --git a/.travis.yml b/.travis.yml index eb3b917..aa9100b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ before_install: install: /bin/true -script: travis_wait ./gradlew -Dci=true continuousIntegration +script: ./gradlew -Dci=true continuousIntegration cache: directories:
tapestry-5 git commit: stick with the latest ESR
Repository: tapestry-5 Updated Branches: refs/heads/master 3f24210f1 -> 5293d82e4 stick with the latest ESR Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/5293d82e Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/5293d82e Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/5293d82e Branch: refs/heads/master Commit: 5293d82e400cace0f48585163aaeb14b3403b729 Parents: 3f24210 Author: Jochen KemnadeAuthored: Tue Oct 10 08:58:36 2017 +0200 Committer: Jochen Kemnade Committed: Tue Oct 24 13:36:48 2017 +0200 -- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5293d82e/.travis.yml -- diff --git a/.travis.yml b/.travis.yml index 5512d5c..eb3b917 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,4 +24,4 @@ notifications: - d...@tapestry.apache.org addons: - firefox: "latest" + firefox: "latest-esr"
tapestry-5 git commit: make tests work on Java 9
Repository: tapestry-5 Updated Branches: refs/heads/master 5321b3d31 -> 3f24210f1 make tests work on Java 9 Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/3f24210f Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/3f24210f Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/3f24210f Branch: refs/heads/master Commit: 3f24210f1d6a1893941ca3ed103ba6db3527d95d Parents: 5321b3d Author: Jochen KemnadeAuthored: Tue Oct 24 13:20:12 2017 +0200 Committer: Jochen Kemnade Committed: Tue Oct 24 13:20:12 2017 +0200 -- build.gradle | 5 + 1 file changed, 5 insertions(+) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/3f24210f/build.gradle -- diff --git a/build.gradle b/build.gradle index de23bb7..1fa8fd6 100755 --- a/build.gradle +++ b/build.gradle @@ -116,6 +116,8 @@ dependencies { binaries "org.antlr:antlr-runtime:3.3", { transitive = false } } +def isJava9 = System.properties['java.version'].startsWith('9') + subprojects { def jdkVersion = System.properties['java.version'] @@ -190,6 +192,9 @@ subprojects { systemProperties["java.io.tmpdir"] = temporaryDir.absolutePath jvmArgs("-Dfile.encoding=UTF-8") +if (isJava9){ + jvmArgs += ["--add-modules", "java.xml.ws.annotation"] +} environment.LANG = 'en_US.UTF-8'
tapestry-5 git commit: Revert "stick with the latest ESR"
Repository: tapestry-5 Updated Branches: refs/heads/master a580c7b60 -> 5321b3d31 Revert "stick with the latest ESR" This reverts commit 7d2c4da4070ae94fdc5106c997ef31c4ca020efe. Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/5321b3d3 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/5321b3d3 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/5321b3d3 Branch: refs/heads/master Commit: 5321b3d319243c7fdf7f4b49261ff53dcdb8cad4 Parents: a580c7b Author: Jochen KemnadeAuthored: Tue Oct 24 12:09:44 2017 +0200 Committer: Jochen Kemnade Committed: Tue Oct 24 12:09:44 2017 +0200 -- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5321b3d3/.travis.yml -- diff --git a/.travis.yml b/.travis.yml index eb3b917..5512d5c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,4 +24,4 @@ notifications: - d...@tapestry.apache.org addons: - firefox: "latest-esr" + firefox: "latest"
tapestry-5 git commit: use webdriver in error reporter
Repository: tapestry-5 Updated Branches: refs/heads/master 6d69eb9a7 -> a580c7b60 use webdriver in error reporter Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/a580c7b6 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/a580c7b6 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/a580c7b6 Branch: refs/heads/master Commit: a580c7b607e575c9daee0110af7b0c537b11c55a Parents: 6d69eb9 Author: Jochen KemnadeAuthored: Tue Oct 24 10:44:50 2017 +0200 Committer: Jochen Kemnade Committed: Tue Oct 24 10:45:39 2017 +0200 -- .../apache/tapestry5/test/ErrorReporterImpl.java | 19 ++- .../apache/tapestry5/test/SeleniumTestCase.java | 2 +- 2 files changed, 11 insertions(+), 10 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/a580c7b6/tapestry-test/src/main/java/org/apache/tapestry5/test/ErrorReporterImpl.java -- diff --git a/tapestry-test/src/main/java/org/apache/tapestry5/test/ErrorReporterImpl.java b/tapestry-test/src/main/java/org/apache/tapestry5/test/ErrorReporterImpl.java index ef44a61..d584e79 100644 --- a/tapestry-test/src/main/java/org/apache/tapestry5/test/ErrorReporterImpl.java +++ b/tapestry-test/src/main/java/org/apache/tapestry5/test/ErrorReporterImpl.java @@ -14,13 +14,16 @@ package org.apache.tapestry5.test; -import com.thoughtworks.selenium.CommandProcessor; +import org.openqa.selenium.OutputType; +import org.openqa.selenium.TakesScreenshot; +import org.openqa.selenium.WebDriver; import org.testng.ITestContext; import java.io.File; import java.io.FileWriter; import java.io.IOException; import java.lang.reflect.Method; +import java.nio.file.Files; import java.util.ArrayList; import java.util.HashSet; import java.util.List; @@ -28,7 +31,7 @@ import java.util.Set; public class ErrorReporterImpl implements ErrorReporter { -private final CommandProcessor commandProcessor; +private final WebDriver webdriver; private final ITestContext testContext; @@ -38,9 +41,9 @@ public class ErrorReporterImpl implements ErrorReporter private final List outputPaths = new ArrayList(); -public ErrorReporterImpl(CommandProcessor commandProcessor, ITestContext testContext) +public ErrorReporterImpl(WebDriver webdriver, ITestContext testContext) { -this.commandProcessor = commandProcessor; +this.webdriver = webdriver; this.testContext = testContext; } @@ -69,8 +72,7 @@ public class ErrorReporterImpl implements ErrorReporter @Override public void writeErrorReport(String reportText) { -String htmlSource = commandProcessor.getString("getHtmlSource", new String[] -{}); +String htmlSource = webdriver.getPageSource(); File dir = new File(testContext.getOutputDirectory()); @@ -107,9 +109,8 @@ public class ErrorReporterImpl implements ErrorReporter try { -commandProcessor.doCommand("captureEntirePageScreenshot", new String[] -{capture.getAbsolutePath(), "background=white"}); - +byte[] screenshotBytes = ((TakesScreenshot) webdriver).getScreenshotAs(OutputType.BYTES); +Files.write(capture.toPath(), screenshotBytes); outputPaths.add(capture); } catch (Exception ex) { http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/a580c7b6/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java -- diff --git a/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java b/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java index 5f9419e..2af5575 100644 --- a/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java +++ b/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java @@ -230,7 +230,7 @@ public abstract class SeleniumTestCase extends Assert implements Selenium CommandProcessor webDriverCommandProcessor = new WebDriverCommandProcessor(baseURL, driver); -final ErrorReporterImpl errorReporter = new ErrorReporterImpl(webDriverCommandProcessor, testContext); +final ErrorReporterImpl errorReporter = new ErrorReporterImpl(driver, testContext); ErrorReportingCommandProcessor commandProcessor = new ErrorReportingCommandProcessor(webDriverCommandProcessor, errorReporter);
tapestry-5 git commit: work around build timeouts
Repository: tapestry-5 Updated Branches: refs/heads/master ef290f536 -> 6d69eb9a7 work around build timeouts Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/6d69eb9a Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/6d69eb9a Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/6d69eb9a Branch: refs/heads/master Commit: 6d69eb9a7d77b112d28df1b6ee1e60ae42878e48 Parents: ef290f5 Author: Jochen KemnadeAuthored: Thu Oct 19 08:34:32 2017 +0200 Committer: Jochen Kemnade Committed: Thu Oct 19 08:34:32 2017 +0200 -- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/6d69eb9a/.travis.yml -- diff --git a/.travis.yml b/.travis.yml index aa9100b..eb3b917 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ before_install: install: /bin/true -script: ./gradlew -Dci=true continuousIntegration +script: travis_wait ./gradlew -Dci=true continuousIntegration cache: directories:
[1/2] tapestry-5 git commit: TAP5-2585: Fix whitespace check
Repository: tapestry-5 Updated Branches: refs/heads/master 0fe1446f2 -> ef290f536 TAP5-2585: Fix whitespace check Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/c152c38f Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/c152c38f Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/c152c38f Branch: refs/heads/master Commit: c152c38f74d0439db33a951e87bb8dda25753d45 Parents: 0fe1446 Author: Jochen KemnadeAuthored: Wed Oct 18 11:25:30 2017 +0200 Committer: Jochen Kemnade Committed: Wed Oct 18 11:25:30 2017 +0200 -- .../tapestry5/ioc/internal/services/cron/CronExpression.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/c152c38f/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/cron/CronExpression.java -- diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/cron/CronExpression.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/cron/CronExpression.java index 1a71ca9..82a0bff 100644 --- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/cron/CronExpression.java +++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/cron/CronExpression.java @@ -934,7 +934,7 @@ public class CronExpression implements Serializable protected int findNextWhiteSpace(int i, String s) { -for (; i < s.length() && (s.charAt(i) != ' ' || s.charAt(i) != '\t'); i++) +for (; i < s.length() && (s.charAt(i) != ' ' && s.charAt(i) != '\t'); i++) { ; }
[2/2] tapestry-5 git commit: TAP5-2585: remove useless ternary
TAP5-2585: remove useless ternary Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/ef290f53 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/ef290f53 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/ef290f53 Branch: refs/heads/master Commit: ef290f5360dc89d5544171c1168c93e5f59c0e1e Parents: c152c38 Author: Jochen KemnadeAuthored: Wed Oct 18 11:28:00 2017 +0200 Committer: Jochen Kemnade Committed: Wed Oct 18 11:28:00 2017 +0200 -- .../java/org/apache/tapestry5/ioc/internal/util/GenericsUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/ef290f53/commons/src/main/java/org/apache/tapestry5/ioc/internal/util/GenericsUtils.java -- diff --git a/commons/src/main/java/org/apache/tapestry5/ioc/internal/util/GenericsUtils.java b/commons/src/main/java/org/apache/tapestry5/ioc/internal/util/GenericsUtils.java index bd834a5..9bf4d00 100644 --- a/commons/src/main/java/org/apache/tapestry5/ioc/internal/util/GenericsUtils.java +++ b/commons/src/main/java/org/apache/tapestry5/ioc/internal/util/GenericsUtils.java @@ -574,7 +574,7 @@ public class GenericsUtils final boolean isSuper = wt.getLowerBounds().length > 0; return String.format("? %s %s", isSuper ? "super" : "extends", -isSuper ? toString(wt.getLowerBounds()) : toString(wt.getLowerBounds())); +toString(wt.getLowerBounds())); } static String toString(Type[] types)
[tapestry-5] Git Push Summary
Repository: tapestry-5 Updated Tags: refs/tags/5.5.0-alpha-7 [created] b58621fbf
tapestry-5 git commit: increment version number
Repository: tapestry-5 Updated Branches: refs/heads/master b58621fbf -> 0fe1446f2 increment version number Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/0fe1446f Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/0fe1446f Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/0fe1446f Branch: refs/heads/master Commit: 0fe1446f2d19ebe658b0d59ed88694eb3ad76b7c Parents: b58621f Author: Jochen KemnadeAuthored: Wed Oct 18 09:29:00 2017 +0200 Committer: Jochen Kemnade Committed: Wed Oct 18 09:29:00 2017 +0200 -- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/0fe1446f/build.gradle -- diff --git a/build.gradle b/build.gradle index b6db510..de23bb7 100755 --- a/build.gradle +++ b/build.gradle @@ -33,7 +33,7 @@ project.version = tapestryVersion() def tapestryVersion() { def major = "5.5.0" -def minor = "-alpha-7" +def minor = "-alpha-8" // When building on the CI server, make sure -SNAPSHOT is appended, as it is a nightly build. // When building normally, or for a release, no suffix is desired.
tapestry-5 git commit: reduce lock-contention during page loading #2
Repository: tapestry-5 Updated Branches: refs/heads/master 1c42cceef -> b58621fbf reduce lock-contention during page loading #2 Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/b58621fb Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/b58621fb Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/b58621fb Branch: refs/heads/master Commit: b58621fbf8a01e9f7fea2c19881b83f5d6de651f Parents: 1c42cce Author: Michael MikhulyaAuthored: Tue Jul 19 11:55:30 2016 +0300 Committer: Jochen Kemnade Committed: Wed Oct 18 08:11:34 2017 +0200 -- .../internal/plastic/PlasticClassPool.java | 63 ++-- .../internal/plastic/PlasticInternalUtils.java | 7 +++ 2 files changed, 38 insertions(+), 32 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b58621fb/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassPool.java -- diff --git a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassPool.java b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassPool.java index 3cf1700..dfbb8cf 100644 --- a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassPool.java +++ b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassPool.java @@ -56,7 +56,7 @@ public class PlasticClassPool implements ClassLoaderDelegate, Opcodes, PlasticCl * Maps class names to instantiators for that class name. * Synchronized on the loader. */ -private final Map instantiators = PlasticInternalUtils.newMap(); +private final Map instantiators = PlasticInternalUtils.newConcurrentMap(); private final InheritanceData emptyInheritanceData = new InheritanceData(null); @@ -599,50 +599,49 @@ public class PlasticClassPool implements ClassLoaderDelegate, Opcodes, PlasticCl public ClassInstantiator getClassInstantiator(String className) { -synchronized (loader) +ClassInstantiator result = instantiators.get(className); + +if (result == null) { -if (!instantiators.containsKey(className)) +try { -try -{ -loader.loadClass(className); -} catch (ClassNotFoundException ex) -{ -throw new RuntimeException(ex); -} +loader.loadClass(className); +result = instantiators.get(className); +} catch (ClassNotFoundException ex) +{ +throw new RuntimeException(ex); } +} -ClassInstantiator result = instantiators.get(className); -if (result == null) -{ -// TODO: Verify that the problem is incorrect package, and not any other failure. +if (result != null) +{ +return result; +} -StringBuilder b = new StringBuilder(); -b.append("Class '") -.append(className) -.append("' is not a transformed class. Transformed classes should be in one of the following packages: "); +// TODO: Verify that the problem is incorrect package, and not any other failure. -String sep = ""; +StringBuilder b = new StringBuilder(); +b.append("Class '") +.append(className) +.append("' is not a transformed class. Transformed classes should be in one of the following packages: "); -List names = new ArrayList(controlledPackages); -Collections.sort(names); +String sep = ""; -for (String name : names) -{ -b.append(sep); -b.append(name); +List names = new ArrayList(controlledPackages); +Collections.sort(names); -sep = ", "; -} +for (String name : names) +{ +b.append(sep); +b.append(name); -String message = b.append('.').toString(); +sep = ", "; +} -throw new IllegalArgumentException(message); -} +String message = b.append('.').toString(); -return result; -} +throw new IllegalArgumentException(message); } TypeCategory getTypeCategory(String typeName)
[2/2] tapestry-5 git commit: Revert "use WebDriver directly"
Revert "use WebDriver directly" This reverts commit de7be5737141e6877b7d29c0e11447c83aa25a6a. Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/1c42ccee Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/1c42ccee Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/1c42ccee Branch: refs/heads/master Commit: 1c42cceef442476124fc7a941d6c1bf82a019282 Parents: 8149c79 Author: Jochen KemnadeAuthored: Mon Oct 16 15:42:06 2017 +0200 Committer: Jochen Kemnade Committed: Mon Oct 16 15:42:06 2017 +0200 -- .../src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/1c42ccee/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java -- diff --git a/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java b/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java index 5c42ba1..5f9419e 100644 --- a/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java +++ b/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java @@ -1307,8 +1307,7 @@ public abstract class SeleniumTestCase extends Assert implements Selenium @Override public void type(String locator, String value) { -WebElement element = webDriver.findElement(convertLocator(locator)); -element.sendKeys(value); +selenium.type(locator, value); } @Override
[1/2] tapestry-5 git commit: Revert "clear the field before sending the new keys"
Repository: tapestry-5 Updated Branches: refs/heads/master 0a62ba844 -> 1c42cceef Revert "clear the field before sending the new keys" This reverts commit 3cd7e52c7713b4662f4255840cf52657dacddfda. Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/8149c79e Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/8149c79e Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/8149c79e Branch: refs/heads/master Commit: 8149c79ec8673da0cdcf8c55527ac09751556ed1 Parents: 0a62ba8 Author: Jochen KemnadeAuthored: Mon Oct 16 15:42:04 2017 +0200 Committer: Jochen Kemnade Committed: Mon Oct 16 15:42:04 2017 +0200 -- .../src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java | 1 - 1 file changed, 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/8149c79e/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java -- diff --git a/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java b/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java index 0ce3f78..5c42ba1 100644 --- a/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java +++ b/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java @@ -1308,7 +1308,6 @@ public abstract class SeleniumTestCase extends Assert implements Selenium public void type(String locator, String value) { WebElement element = webDriver.findElement(convertLocator(locator)); -element.clear(); element.sendKeys(value); }
tapestry-5 git commit: we don't need geckodriver since we're disabling marionette
Repository: tapestry-5 Updated Branches: refs/heads/master 3cd7e52c7 -> 0a62ba844 we don't need geckodriver since we're disabling marionette Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/0a62ba84 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/0a62ba84 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/0a62ba84 Branch: refs/heads/master Commit: 0a62ba84420eae3ab00c4024f8a64be37e7e8b10 Parents: 3cd7e52 Author: Jochen KemnadeAuthored: Mon Oct 16 15:19:22 2017 +0200 Committer: Jochen Kemnade Committed: Mon Oct 16 15:19:22 2017 +0200 -- .../src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/0a62ba84/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java -- diff --git a/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java b/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java index ae2ae51..0ce3f78 100644 --- a/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java +++ b/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java @@ -210,7 +210,7 @@ public abstract class SeleniumTestCase extends Assert implements Selenium final Runnable stopWebServer = launchWebServer(container, webAppFolder, contextPath, port, sslPort); -FirefoxDriverManager.getInstance().setup(); +// FirefoxDriverManager.getInstance().setup(); File ffProfileTemplate = new File(TapestryRunnerConstants.MODULE_BASE_DIR, "src/test/conf/ff_profile_template"); DesiredCapabilities desiredCapabilities = DesiredCapabilities.firefox();
tapestry-5 git commit: clear the field before sending the new keys
Repository: tapestry-5 Updated Branches: refs/heads/master de7be5737 -> 3cd7e52c7 clear the field before sending the new keys Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/3cd7e52c Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/3cd7e52c Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/3cd7e52c Branch: refs/heads/master Commit: 3cd7e52c7713b4662f4255840cf52657dacddfda Parents: de7be57 Author: Jochen KemnadeAuthored: Mon Oct 16 14:57:53 2017 +0200 Committer: Jochen Kemnade Committed: Mon Oct 16 14:57:53 2017 +0200 -- .../src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/3cd7e52c/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java -- diff --git a/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java b/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java index dbf5bbf..ae2ae51 100644 --- a/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java +++ b/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java @@ -1308,6 +1308,7 @@ public abstract class SeleniumTestCase extends Assert implements Selenium public void type(String locator, String value) { WebElement element = webDriver.findElement(convertLocator(locator)); +element.clear(); element.sendKeys(value); }
tapestry-5 git commit: use WebDriver directly
Repository: tapestry-5 Updated Branches: refs/heads/master 0b20ab337 -> de7be5737 use WebDriver directly Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/de7be573 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/de7be573 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/de7be573 Branch: refs/heads/master Commit: de7be5737141e6877b7d29c0e11447c83aa25a6a Parents: 0b20ab3 Author: Jochen KemnadeAuthored: Mon Oct 16 14:43:18 2017 +0200 Committer: Jochen Kemnade Committed: Mon Oct 16 14:43:18 2017 +0200 -- .../src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/de7be573/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java -- diff --git a/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java b/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java index 9b57b85..dbf5bbf 100644 --- a/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java +++ b/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java @@ -1307,7 +1307,8 @@ public abstract class SeleniumTestCase extends Assert implements Selenium @Override public void type(String locator, String value) { -selenium.type(locator, value); +WebElement element = webDriver.findElement(convertLocator(locator)); +element.sendKeys(value); } @Override
[2/2] tapestry-5 git commit: increment version number
increment version number Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/0b20ab33 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/0b20ab33 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/0b20ab33 Branch: refs/heads/master Commit: 0b20ab337597900421f848baa282298005a23598 Parents: 6acc372 Author: Jochen KemnadeAuthored: Fri Oct 13 16:31:42 2017 +0200 Committer: Jochen Kemnade Committed: Fri Oct 13 16:31:42 2017 +0200 -- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/0b20ab33/build.gradle -- diff --git a/build.gradle b/build.gradle index f27e36e..b6db510 100755 --- a/build.gradle +++ b/build.gradle @@ -33,7 +33,7 @@ project.version = tapestryVersion() def tapestryVersion() { def major = "5.5.0" -def minor = "-alpha-6" +def minor = "-alpha-7" // When building on the CI server, make sure -SNAPSHOT is appended, as it is a nightly build. // When building normally, or for a release, no suffix is desired.
[tapestry-5] Git Push Summary
Repository: tapestry-5 Updated Tags: refs/tags/5.5.0-alpha-6 [created] 6acc372ca
[1/2] tapestry-5 git commit: increment versionn number
Repository: tapestry-5 Updated Branches: refs/heads/master 68303b1d6 -> 0b20ab337 increment versionn number Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/6acc372c Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/6acc372c Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/6acc372c Branch: refs/heads/master Commit: 6acc372caa514339c1e4a7025f1a7586eb0272c3 Parents: 68303b1 Author: Jochen KemnadeAuthored: Fri Oct 13 16:21:17 2017 +0200 Committer: Jochen Kemnade Committed: Fri Oct 13 16:21:17 2017 +0200 -- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/6acc372c/build.gradle -- diff --git a/build.gradle b/build.gradle index d53b791..f27e36e 100755 --- a/build.gradle +++ b/build.gradle @@ -33,7 +33,7 @@ project.version = tapestryVersion() def tapestryVersion() { def major = "5.5.0" -def minor = "-alpha-5" +def minor = "-alpha-6" // When building on the CI server, make sure -SNAPSHOT is appended, as it is a nightly build. // When building normally, or for a release, no suffix is desired.
[1/2] tapestry-5 git commit: TAP5-2589: extend interface with methods that ease incremental paging
Repository: tapestry-5 Updated Branches: refs/heads/master 61bc522ee -> 68303b1d6 TAP5-2589: extend interface with methods that ease incremental paging Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/4958b713 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/4958b713 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/4958b713 Branch: refs/heads/master Commit: 4958b713fff229c6b0f028a7226a719549cf4d5b Parents: 61bc522 Author: Jochen KemnadeAuthored: Fri Oct 13 09:51:52 2017 +0200 Committer: Jochen Kemnade Committed: Fri Oct 13 09:51:52 2017 +0200 -- .../apache/tapestry5/grid/GridDataSource.java | 29 .../internal/grid/CollectionGridDataSource.java | 6 2 files changed, 35 insertions(+) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/4958b713/tapestry-core/src/main/java/org/apache/tapestry5/grid/GridDataSource.java -- diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/grid/GridDataSource.java b/tapestry-core/src/main/java/org/apache/tapestry5/grid/GridDataSource.java index 9ebe488..8fca800 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/grid/GridDataSource.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/grid/GridDataSource.java @@ -23,6 +23,35 @@ import java.util.List; */ public interface GridDataSource { + +/** + * Return whether the data source is empty, i.e. does not have any rows available. + */ +default public boolean isEmpty() +{ +return getAvailableRows(1) == 0; +} + +/** + * Return the number of rows available in the data source with an upper limit. + * If determining the total number of rows is expensive, this method should be overridden to provide a more + * efficient implementation. + * Please note that the default Grid pager will still determine the total number of rows, so for this to have + * an effect, a custom pager should be used. + * + * @param limit the upper limit + * @return the number of rows or {@code limit}, whichever is lower + */ +default public int getAvailableRows(final int limit) +{ +int availableRows = getAvailableRows(); +if (availableRows >= limit) +{ +return limit; +} +return availableRows; +} + /** * Returns the number of rows available in the data source. */ http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/4958b713/tapestry-core/src/main/java/org/apache/tapestry5/internal/grid/CollectionGridDataSource.java -- diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/grid/CollectionGridDataSource.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/grid/CollectionGridDataSource.java index 414d146..63591b1 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/grid/CollectionGridDataSource.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/grid/CollectionGridDataSource.java @@ -36,6 +36,12 @@ public class CollectionGridDataSource implements GridDataSource list = CollectionFactory.newList(collection); } +@Override +public boolean isEmpty() +{ +return list.isEmpty(); +} + public int getAvailableRows() { return list.size();
[2/2] tapestry-5 git commit: TAP5-2589: improve data source handling if the pager is not shown Counting the number of results in an expensive operation for some data sources (especially databases), so
TAP5-2589: improve data source handling if the pager is not shown Counting the number of results in an expensive operation for some data sources (especially databases), so we count only as far as we need to. Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/68303b1d Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/68303b1d Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/68303b1d Branch: refs/heads/master Commit: 68303b1d61d09c997bade870587d4586625f17a6 Parents: 4958b71 Author: Jochen KemnadeAuthored: Fri Oct 13 11:27:43 2017 +0200 Committer: Jochen Kemnade Committed: Fri Oct 13 11:27:43 2017 +0200 -- .../tapestry5/corelib/components/Grid.java | 87 +--- .../tapestry5/corelib/components/GridRows.java | 14 ++-- .../tapestry5/corelib/components/Grid.tml | 6 +- 3 files changed, 87 insertions(+), 20 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/68303b1d/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Grid.java -- diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Grid.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Grid.java index 814d5e1..a884e52 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Grid.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Grid.java @@ -285,7 +285,7 @@ public class Grid implements GridModel, ClientElement } /** - * A version of GridDataSource that caches the availableRows property. This addresses TAPESTRY-2245. + * A version of GridDataSource that caches the availableRows and empty properties. This addresses TAPESTRY-2245. */ static class CachingDataSource implements GridDataSource { @@ -295,17 +295,70 @@ public class Grid implements GridModel, ClientElement private int availableRows; +private boolean emptyCached; + +private boolean empty; + CachingDataSource(GridDataSource delegate) { this.delegate = delegate; } +@Override +public boolean isEmpty() +{ +if (!emptyCached) +{ +empty = delegate.isEmpty(); +emptyCached = true; +if (empty) +{ +availableRows = 0; +availableRowsCached = true; +} +} + +return empty; +} + +@Override +public int getAvailableRows(int limit) +{ +if (!availableRowsCached) +{ +int result = delegate.getAvailableRows(limit); +if (result == 0) +{ +empty = true; +emptyCached = true; +} else { +empty = false; +emptyCached = true; +} +if (result < limit) { +availableRows = result; +availableRowsCached = true; +} +return result; +} else { + return Math.min(availableRows, limit); +} +} + public int getAvailableRows() { if (!availableRowsCached) { availableRows = delegate.getAvailableRows(); availableRowsCached = true; +if (availableRows == 0) +{ +empty = true; +emptyCached = true; +} else { + empty = false; + emptyCached = true; + } } return availableRows; @@ -461,7 +514,7 @@ public class Grid implements GridModel, ClientElement // If there's no rows, display the empty block placeholder. -return !renderTableIfEmpty && cachingSource.getAvailableRows() == 0 ? empty : null; +return !renderTableIfEmpty && cachingSource.isEmpty() ? empty : null; } void cleanupRender() @@ -492,25 +545,35 @@ public class Grid implements GridModel, ClientElement // cached, and therefore access was very inefficient, and sorting was // very inconsistent during the processing of the form submission. -cachingSource = new CachingDataSource(source); +int effectiveCurrentPage = getCurrentPage(); -int availableRows = cachingSource.getAvailableRows(); +int numberOfRowsRequiredToShowCurrentPage = 1 + (effectiveCurrentPage - 1) * rowsPerPage; +int
[tapestry-5] Git Push Summary
Repository: tapestry-5 Updated Tags: refs/tags/5.5.0-alpha-5 [created] 61bc522ee
tapestry-5 git commit: restore the old constructor
Repository: tapestry-5 Updated Branches: refs/heads/master 9ee0dab91 -> 61bc522ee restore the old constructor Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/61bc522e Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/61bc522e Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/61bc522e Branch: refs/heads/master Commit: 61bc522eed7c1c3959d3bfc65c18b5dcce300396 Parents: 9ee0dab Author: Jochen KemnadeAuthored: Wed Oct 11 09:35:04 2017 +0200 Committer: Jochen Kemnade Committed: Wed Oct 11 09:35:04 2017 +0200 -- .../tapestry5/internal/webresources/CoffeeScriptCompiler.java | 2 +- .../tapestry5/internal/webresources/RhinoExecutorPool.java | 5 + 2 files changed, 6 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/61bc522e/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/CoffeeScriptCompiler.java -- diff --git a/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/CoffeeScriptCompiler.java b/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/CoffeeScriptCompiler.java index 8797f2d..3a8e60c 100644 --- a/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/CoffeeScriptCompiler.java +++ b/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/CoffeeScriptCompiler.java @@ -49,7 +49,7 @@ public class CoffeeScriptCompiler implements ResourceTransformer OperationTracker tracker) { -executorPool = new RhinoExecutorPool(tracker, toList(mainCompiler, shim), Context.VERSION_DEFAULT); +executorPool = new RhinoExecutorPool(tracker, toList(mainCompiler, shim)); } private List toList(Resource... resources) http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/61bc522e/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/RhinoExecutorPool.java -- diff --git a/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/RhinoExecutorPool.java b/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/RhinoExecutorPool.java index e64a2a0..dad8da6 100644 --- a/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/RhinoExecutorPool.java +++ b/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/RhinoExecutorPool.java @@ -48,6 +48,11 @@ public class RhinoExecutorPool private final int languageVersion; +public RhinoExecutorPool(OperationTracker tracker, List scripts) +{ +this(tracker, scripts, Context.VERSION_DEFAULT); +} + public RhinoExecutorPool(OperationTracker tracker, List scripts, int languageVersion) { this.tracker = tracker;
tapestry-5 git commit: increment version number
Repository: tapestry-5 Updated Branches: refs/heads/master 6dd92b5f8 -> 9ee0dab91 increment version number Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/9ee0dab9 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/9ee0dab9 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/9ee0dab9 Branch: refs/heads/master Commit: 9ee0dab918ff5983f99f88e0a7171cf5a7be379c Parents: 6dd92b5 Author: Jochen KemnadeAuthored: Tue Oct 10 18:05:56 2017 +0200 Committer: Jochen Kemnade Committed: Tue Oct 10 18:05:56 2017 +0200 -- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/9ee0dab9/build.gradle -- diff --git a/build.gradle b/build.gradle index 0838e52..d53b791 100755 --- a/build.gradle +++ b/build.gradle @@ -33,7 +33,7 @@ project.version = tapestryVersion() def tapestryVersion() { def major = "5.5.0" -def minor = "-alpha-4" +def minor = "-alpha-5" // When building on the CI server, make sure -SNAPSHOT is appended, as it is a nightly build. // When building normally, or for a release, no suffix is desired.
[tapestry-5] Git Push Summary
Repository: tapestry-5 Updated Tags: refs/tags/5.5.0-alpha-4 [created] 6dd92b5f8
tapestry-5 git commit: upgrade SLF4J
Repository: tapestry-5 Updated Branches: refs/heads/master 56168dabe -> 6dd92b5f8 upgrade SLF4J Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/6dd92b5f Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/6dd92b5f Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/6dd92b5f Branch: refs/heads/master Commit: 6dd92b5f87dd59719f857dcf967377d056f1f5ee Parents: 56168da Author: Jochen KemnadeAuthored: Tue Oct 10 13:17:34 2017 +0200 Committer: Jochen Kemnade Committed: Tue Oct 10 13:17:34 2017 +0200 -- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/6dd92b5f/build.gradle -- diff --git a/build.gradle b/build.gradle index 2ed9d25..0838e52 100755 --- a/build.gradle +++ b/build.gradle @@ -15,7 +15,7 @@ project.ext.versions = [ servletapi: "3.0.1", spock: "1.1-groovy-2.4", hibernate: "5.1.0.Final", -slf4j: "1.7.24", +slf4j: "1.7.25", geb: "1.1.1", selenium: "3.6.0" ]
tapestry-5 git commit: cache downloaded webdriver binaries
Repository: tapestry-5 Updated Branches: refs/heads/master 57028a1a4 -> 56168dabe cache downloaded webdriver binaries Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/56168dab Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/56168dab Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/56168dab Branch: refs/heads/master Commit: 56168dabe66ba4c6df555b76650ef95796840f1c Parents: 57028a1 Author: Jochen KemnadeAuthored: Tue Oct 10 11:38:57 2017 +0200 Committer: Jochen Kemnade Committed: Tue Oct 10 11:38:57 2017 +0200 -- .travis.yml | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/56168dab/.travis.yml -- diff --git a/.travis.yml b/.travis.yml index 699533a..aa9100b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,6 +15,7 @@ script: ./gradlew -Dci=true continuousIntegration cache: directories: - $HOME/.gradle + - $HOME/.m2/repository/webdriver sudo: false
tapestry-5 git commit: upgrade Spock
Repository: tapestry-5 Updated Branches: refs/heads/master d7eb3dd70 -> 57028a1a4 upgrade Spock Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/57028a1a Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/57028a1a Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/57028a1a Branch: refs/heads/master Commit: 57028a1a4b7b758481d13c1b199ba7f474999c85 Parents: d7eb3dd Author: Jochen KemnadeAuthored: Tue Oct 10 09:56:44 2017 +0200 Committer: Jochen Kemnade Committed: Tue Oct 10 09:56:44 2017 +0200 -- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/57028a1a/build.gradle -- diff --git a/build.gradle b/build.gradle index 601b973..2ed9d25 100755 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ project.ext.versions = [ testng: "6.8.21", easymock: "3.3.1", servletapi: "3.0.1", -spock: "1.0-groovy-2.4", +spock: "1.1-groovy-2.4", hibernate: "5.1.0.Final", slf4j: "1.7.24", geb: "1.1.1",
[1/2] tapestry-5 git commit: update source levels
Repository: tapestry-5 Updated Branches: refs/heads/master 7d2c4da40 -> d528181bb update source levels Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/e4d4382c Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/e4d4382c Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/e4d4382c Branch: refs/heads/master Commit: e4d4382c5c9a7cc6f07f7c3b15a91932144539c0 Parents: 7d2c4da Author: Jochen KemnadeAuthored: Tue Oct 10 09:24:01 2017 +0200 Committer: Jochen Kemnade Committed: Tue Oct 10 09:24:01 2017 +0200 -- quickstart/filtered/archetype-resources/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/e4d4382c/quickstart/filtered/archetype-resources/build.gradle -- diff --git a/quickstart/filtered/archetype-resources/build.gradle b/quickstart/filtered/archetype-resources/build.gradle index fd13b62..f3dca79 100644 --- a/quickstart/filtered/archetype-resources/build.gradle +++ b/quickstart/filtered/archetype-resources/build.gradle @@ -4,8 +4,8 @@ apply plugin: "war" apply plugin: "java" apply plugin: "jetty" -sourceCompatibility = "1.6" -targetCompatibility = "1.6" +sourceCompatibility = "1.8" +targetCompatibility = "1.8" group = "${groupId}" version = "${version}"
tapestry-5 git commit: allow to specify the language version to use for the Context
Repository: tapestry-5 Updated Branches: refs/heads/master eec9c9ae8 -> d7eb3dd70 allow to specify the language version to use for the Context Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/d7eb3dd7 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/d7eb3dd7 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/d7eb3dd7 Branch: refs/heads/master Commit: d7eb3dd701192b578c1977e26b6d99ffe221f44c Parents: eec9c9a Author: Jochen KemnadeAuthored: Tue Oct 10 09:41:11 2017 +0200 Committer: Jochen Kemnade Committed: Tue Oct 10 09:41:11 2017 +0200 -- .../tapestry5/internal/webresources/CoffeeScriptCompiler.java | 3 ++- .../tapestry5/internal/webresources/RhinoExecutorPool.java | 6 +- 2 files changed, 7 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/d7eb3dd7/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/CoffeeScriptCompiler.java -- diff --git a/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/CoffeeScriptCompiler.java b/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/CoffeeScriptCompiler.java index cdbf504..8797f2d 100644 --- a/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/CoffeeScriptCompiler.java +++ b/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/CoffeeScriptCompiler.java @@ -22,6 +22,7 @@ import org.apache.tapestry5.ioc.internal.util.CollectionFactory; import org.apache.tapestry5.ioc.internal.util.InternalUtils; import org.apache.tapestry5.services.assets.ResourceDependencies; import org.apache.tapestry5.services.assets.ResourceTransformer; +import org.mozilla.javascript.Context; import org.mozilla.javascript.NativeObject; import java.io.IOException; @@ -48,7 +49,7 @@ public class CoffeeScriptCompiler implements ResourceTransformer OperationTracker tracker) { -executorPool = new RhinoExecutorPool(tracker, toList(mainCompiler, shim)); +executorPool = new RhinoExecutorPool(tracker, toList(mainCompiler, shim), Context.VERSION_DEFAULT); } private List toList(Resource... resources) http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/d7eb3dd7/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/RhinoExecutorPool.java -- diff --git a/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/RhinoExecutorPool.java b/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/RhinoExecutorPool.java index 80efaee..e64a2a0 100644 --- a/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/RhinoExecutorPool.java +++ b/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/RhinoExecutorPool.java @@ -46,10 +46,13 @@ public class RhinoExecutorPool private final ContextFactory contextFactory = new ContextFactory(); -public RhinoExecutorPool(OperationTracker tracker, List scripts) +private final int languageVersion; + +public RhinoExecutorPool(OperationTracker tracker, List scripts, int languageVersion) { this.tracker = tracker; this.scripts = scripts; +this.languageVersion = languageVersion; } /** @@ -91,6 +94,7 @@ public class RhinoExecutorPool try { context.setOptimizationLevel(-1); +context.setLanguageVersion(languageVersion); for (Resource script : scripts) {
[2/2] tapestry-5 git commit: upgrade Gradle wrapper
upgrade Gradle wrapper Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/d528181b Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/d528181b Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/d528181b Branch: refs/heads/master Commit: d528181bb55d0e9322f1a632a12e773306b7ecbe Parents: e4d4382 Author: Jochen KemnadeAuthored: Tue Oct 10 09:24:40 2017 +0200 Committer: Jochen Kemnade Committed: Tue Oct 10 09:24:40 2017 +0200 -- build.gradle| 6 ++ gradle/wrapper/gradle-wrapper.jar | Bin 54708 -> 54708 bytes gradle/wrapper/gradle-wrapper.properties| 4 ++-- quickstart/build.gradle | 4 ++-- .../filtered/archetype-resources/build.gradle | 4 ++-- tapestry-test/build.gradle | 1 + 6 files changed, 9 insertions(+), 10 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/d528181b/build.gradle -- diff --git a/build.gradle b/build.gradle index 603ad17..601b973 100755 --- a/build.gradle +++ b/build.gradle @@ -397,15 +397,13 @@ task combinedJacocoReport(type:JacocoReport){ reports { html { enabled = true -destination = "$buildDir/reports/jacoco" +destination = file("$buildDir/reports/jacoco") } xml { enabled = false -destination = "unused" } csv { enabled = false -destination = "unused" } } onlyIf = { @@ -424,7 +422,7 @@ task continuousIntegration { } task wrapper(type: Wrapper) { -gradleVersion = '3.5.1' +gradleVersion = '4.2' description "Regenerates the Gradle Wrapper files" } http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/d528181b/gradle/wrapper/gradle-wrapper.jar -- diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7a3265e..736fb7d 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/d528181b/gradle/wrapper/gradle-wrapper.properties -- diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 651f764..52dd1f0 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ -distributionUrl=https\://services.gradle.org/distributions/gradle-3.5.1-bin.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.2-bin.zip http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/d528181b/quickstart/build.gradle -- diff --git a/quickstart/build.gradle b/quickstart/build.gradle index 5c215d3..a499357 100644 --- a/quickstart/build.gradle +++ b/quickstart/build.gradle @@ -17,10 +17,10 @@ task processFiltered(type: Copy) { inputs.file srcDir inputs.file file("${rootDir}/build.gradle") -outputs.dir sourceSets.main.output.classesDir +outputs.dir sourceSets.main.java.outputDir from srcDir -into sourceSets.main.output.classesDir +into sourceSets.main.java.outputDir // Use some of the filters provided by Ant filter(FixCrLfFilter) http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/d528181b/quickstart/filtered/archetype-resources/build.gradle -- diff --git a/quickstart/filtered/archetype-resources/build.gradle b/quickstart/filtered/archetype-resources/build.gradle index f3dca79..eeed246 100644 --- a/quickstart/filtered/archetype-resources/build.gradle +++ b/quickstart/filtered/archetype-resources/build.gradle @@ -2,7 +2,7 @@ description = "${artifactId} application" apply plugin: "war" apply plugin: "java" -apply plugin: "jetty" +apply plugin: "gretty" sourceCompatibility = "1.8" targetCompatibility = "1.8" @@ -87,7 +87,7 @@ test { } task wrapper(type: Wrapper) { -gradleVersion = '2.3' +gradleVersion = '4.2' } // TODO: Configure execution mode for jettyRun task http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/d528181b/tapestry-test/build.gradle -- diff --git a/tapestry-test/build.gradle b/tapestry-test/build.gradle index f0dc96d..f46ecc0 100644 --- a/tapestry-test/build.gradle +++
tapestry-5 git commit: upgrade dependencies
Repository: tapestry-5 Updated Branches: refs/heads/master d528181bb -> eec9c9ae8 upgrade dependencies Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/eec9c9ae Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/eec9c9ae Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/eec9c9ae Branch: refs/heads/master Commit: eec9c9ae8a34aacb9d59e74cc486e960465692be Parents: d528181 Author: Jochen KemnadeAuthored: Tue Oct 10 09:36:48 2017 +0200 Committer: Jochen Kemnade Committed: Tue Oct 10 09:36:48 2017 +0200 -- tapestry-webresources/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/eec9c9ae/tapestry-webresources/build.gradle -- diff --git a/tapestry-webresources/build.gradle b/tapestry-webresources/build.gradle index fa24be1..cdc1751 100644 --- a/tapestry-webresources/build.gradle +++ b/tapestry-webresources/build.gradle @@ -3,8 +3,8 @@ description = "Integration with WRO4J to perform runtime CoffeeScript compilatio dependencies { compile project(":tapestry-core") compile "com.github.sommeri:less4j:1.12.0" -compile "com.google.javascript:closure-compiler-unshaded:v20170218" -compile "org.mozilla:rhino:1.7.7.1" +compile "com.google.javascript:closure-compiler-unshaded:v20170910" +compile "org.mozilla:rhino:1.7.7.2" testCompile project(":tapestry-runner") testCompile "org.gebish:geb-spock:${versions.geb}"
tapestry-5 git commit: stick with the latest ESR
Repository: tapestry-5 Updated Branches: refs/heads/master 1b6d21535 -> 7d2c4da40 stick with the latest ESR Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/7d2c4da4 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/7d2c4da4 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/7d2c4da4 Branch: refs/heads/master Commit: 7d2c4da4070ae94fdc5106c997ef31c4ca020efe Parents: 1b6d215 Author: Jochen KemnadeAuthored: Tue Oct 10 08:58:36 2017 +0200 Committer: Jochen Kemnade Committed: Tue Oct 10 08:58:36 2017 +0200 -- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/7d2c4da4/.travis.yml -- diff --git a/.travis.yml b/.travis.yml index f59f06c..699533a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,4 +23,4 @@ notifications: - d...@tapestry.apache.org addons: - firefox: "latest" + firefox: "latest-esr"
tapestry-5 git commit: Upgrade Selenium and Geb
Repository: tapestry-5 Updated Branches: refs/heads/master b993e79eb -> bf258ea96 Upgrade Selenium and Geb Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/bf258ea9 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/bf258ea9 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/bf258ea9 Branch: refs/heads/master Commit: bf258ea96be8645d2563eb5c8af047aac6325313 Parents: b993e79 Author: Jochen KemnadeAuthored: Fri Mar 3 11:03:54 2017 +0100 Committer: Jochen Kemnade Committed: Tue Oct 10 08:30:49 2017 +0200 -- build.gradle| 4 +- .../integration/app1/AjaxGroovyTests.groovy | 6 +- .../integration/app1/AlertsTests.groovy | 6 +- .../integration/appfolder/AppFolderTests.groovy | 8 +- .../integration/app1/CoreBehaviorsTests.java| 13 ++- .../tapestry5/integration/app1/FormTests.java | 43 .../integration/app1/PaletteTests.java | 6 +- .../integration/cluster/ClusterTests.java | 20 ++-- tapestry-test/build.gradle | 11 +- .../apache/tapestry5/test/SeleniumTestCase.java | 101 +-- tapestry-webresources/build.gradle | 2 + .../webresources/tests/WebResourcesSpec.groovy | 6 +- .../src/test/resources/GebConfig.groovy | 3 + 13 files changed, 146 insertions(+), 83 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/bf258ea9/build.gradle -- diff --git a/build.gradle b/build.gradle index e0a8184..603ad17 100755 --- a/build.gradle +++ b/build.gradle @@ -16,8 +16,8 @@ project.ext.versions = [ spock: "1.0-groovy-2.4", hibernate: "5.1.0.Final", slf4j: "1.7.24", -geb: "0.13.1", -selenium: "2.53.1" +geb: "1.1.1", +selenium: "3.6.0" ] ext.continuousIntegrationBuild = Boolean.getBoolean("ci") http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/bf258ea9/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/app1/AjaxGroovyTests.groovy -- diff --git a/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/app1/AjaxGroovyTests.groovy b/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/app1/AjaxGroovyTests.groovy index b4531da..209281a 100644 --- a/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/app1/AjaxGroovyTests.groovy +++ b/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/app1/AjaxGroovyTests.groovy @@ -1,5 +1,6 @@ package org.apache.tapestry5.integration.app1 +import org.openqa.selenium.By import org.testng.annotations.Test @@ -10,9 +11,8 @@ class AjaxGroovyTests extends App1TestCase { void radio_buttons_in_ajax_form() { openLinks "Ajax Radio Demo" - -click "css=label:contains('It')" -click "css=label:contains('Temp')" + webDriver.findElements(By.cssSelector('label')).find{it.text.contains('It')}.click() + webDriver.findElements(By.cssSelector('label')).find{it.text.contains('Temp')}.click() click SUBMIT http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/bf258ea9/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/app1/AlertsTests.groovy -- diff --git a/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/app1/AlertsTests.groovy b/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/app1/AlertsTests.groovy index 081445b..92854f7 100644 --- a/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/app1/AlertsTests.groovy +++ b/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/app1/AlertsTests.groovy @@ -12,6 +12,7 @@ package org.apache.tapestry5.integration.app1 +import org.openqa.selenium.By import org.testng.annotations.Test /** @@ -82,8 +83,9 @@ class AlertsTests extends App1TestCase { assertTextPresent "trad warn transient" // dismiss the first alert that indicates the submission type - -click "css=$CONTAINER :contains('Traditional form submission') button.close" +webDriver.findElements(By.cssSelector(CONTAINER)).find{ + it.text.contains('Traditional form submission') +}.findElement(By.cssSelector('button.close')).click() // wait for the transient alert to be automatically removed sleep 5000 http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/bf258ea9/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/appfolder/AppFolderTests.groovy -- diff --git
tapestry-5 git commit: make sure that a recent Firefox is available for the Travis CI builds
Repository: tapestry-5 Updated Branches: refs/heads/master bf258ea96 -> 1b6d21535 make sure that a recent Firefox is available for the Travis CI builds Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/1b6d2153 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/1b6d2153 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/1b6d2153 Branch: refs/heads/master Commit: 1b6d2153593e71b2fdd4868fb0c529be182e0789 Parents: bf258ea Author: Jochen KemnadeAuthored: Tue Oct 10 08:51:53 2017 +0200 Committer: Jochen Kemnade Committed: Tue Oct 10 08:51:53 2017 +0200 -- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/1b6d2153/.travis.yml -- diff --git a/.travis.yml b/.travis.yml index c9a9a10..f59f06c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,3 +21,6 @@ sudo: false notifications: email: - d...@tapestry.apache.org + +addons: + firefox: "latest"
tapestry-5 git commit: fix test
Repository: tapestry-5 Updated Branches: refs/heads/master 0f000e6ab -> b993e79eb fix test Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/b993e79e Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/b993e79e Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/b993e79e Branch: refs/heads/master Commit: b993e79ebe493a97ecc21301a89e13d738cb9d3c Parents: 0f000e6 Author: Jochen KemnadeAuthored: Tue Oct 10 07:26:52 2017 +0200 Committer: Jochen Kemnade Committed: Tue Oct 10 07:26:52 2017 +0200 -- .../test/java/org/apache/tapestry5/integration/app1/FormTests.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b993e79e/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/FormTests.java -- diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/FormTests.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/FormTests.java index 85a3690..2f6588a 100644 --- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/FormTests.java +++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/FormTests.java @@ -331,7 +331,7 @@ public class FormTests extends App1TestCase assertFieldValue("asteroidImpact", ""); -click(noneButton); +click("css=.x-impact .btn"); waitForCSSSelectedElementToAppear("div.datePicker"); assertFalse(isElementPresent("css=td.selected"));
tapestry-5 git commit: upgrade Gradle wrapper
Repository: tapestry-5 Updated Branches: refs/heads/master 52e2b7b38 -> 0f000e6ab upgrade Gradle wrapper Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/0f000e6a Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/0f000e6a Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/0f000e6a Branch: refs/heads/master Commit: 0f000e6ab32a167cf15b61f3436fda54af60c7e5 Parents: 52e2b7b Author: Jochen KemnadeAuthored: Fri Oct 6 16:51:52 2017 +0200 Committer: Jochen Kemnade Committed: Fri Oct 6 16:51:52 2017 +0200 -- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.jar| Bin 54208 -> 54708 bytes gradle/wrapper/gradle-wrapper.properties | 5 ++--- gradlew | 6 +++--- 4 files changed, 6 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/0f000e6a/build.gradle -- diff --git a/build.gradle b/build.gradle index 56d1b28..e0a8184 100755 --- a/build.gradle +++ b/build.gradle @@ -424,7 +424,7 @@ task continuousIntegration { } task wrapper(type: Wrapper) { -gradleVersion = '3.4' +gradleVersion = '3.5.1' description "Regenerates the Gradle Wrapper files" } http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/0f000e6a/gradle/wrapper/gradle-wrapper.jar -- diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e1508cd..7a3265e 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/0f000e6a/gradle/wrapper/gradle-wrapper.properties -- diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f5f87ea..651f764 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Fri Mar 03 06:51:16 CET 2017 +distributionUrl=https\://services.gradle.org/distributions/gradle-3.5.1-bin.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.4-bin.zip +zipStoreBase=GRADLE_USER_HOME http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/0f000e6a/gradlew -- diff --git a/gradlew b/gradlew index 4453cce..cccdd3d 100755 --- a/gradlew +++ b/gradlew @@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS="" # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" -warn ( ) { +warn () { echo "$*" } -die ( ) { +die () { echo echo "$*" echo @@ -155,7 +155,7 @@ if $cygwin ; then fi # Escape application args -save ( ) { +save () { for i do printf %s\\n "$i" | sed "s/'/'''/g;1s/^/'/;\$s/\$/' /" ; done echo " " }
[9/9] tapestry-5 git commit: TAP-2588: also test with JDK 9
TAP-2588: also test with JDK 9 Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/52e2b7b3 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/52e2b7b3 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/52e2b7b3 Branch: refs/heads/master Commit: 52e2b7b38b3d502c4eb71db62c2b08797f53de36 Parents: 74324b3 Author: Jochen KemnadeAuthored: Fri Oct 6 16:17:08 2017 +0200 Committer: Jochen Kemnade Committed: Fri Oct 6 16:17:08 2017 +0200 -- .travis.yml | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/52e2b7b3/.travis.yml -- diff --git a/.travis.yml b/.travis.yml index d3708bb..c9a9a10 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,7 @@ language: java jdk: + - oraclejdk9 - oraclejdk8 before_install:
[6/9] tapestry-5 git commit: TAP5-2588: upgrade ASM to 6.0
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/74324b31/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/ModuleWriter.java -- diff --git a/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/ModuleWriter.java b/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/ModuleWriter.java new file mode 100644 index 000..5ab0b3c --- /dev/null +++ b/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/ModuleWriter.java @@ -0,0 +1,293 @@ +/*** + * ASM: a very small and fast Java bytecode manipulation framework + * Copyright (c) 2000-2011 INRIA, France Telecom + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + *notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + *notice, this list of conditions and the following disclaimer in the + *documentation and/or other materials provided with the distribution. + * 3. Neither the name of the copyright holders nor the names of its + *contributors may be used to endorse or promote products derived from + *this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF + * THE POSSIBILITY OF SUCH DAMAGE. + */ + +package org.apache.tapestry5.internal.plastic.asm; + +/** + * @author Remi Forax + */ +final class ModuleWriter extends ModuleVisitor { +/** + * The class writer to which this Module attribute must be added. + */ +private final ClassWriter cw; + +/** + * size in byte of the Module attribute. + */ +int size; + +/** + * Number of attributes associated with the current module + * (Version, ConcealPackages, etc) + */ +int attributeCount; + +/** + * Size in bytes of the attributes associated with the current module + */ +int attributesSize; + +/** + * module name index in the constant pool + */ +private final int name; + +/** + * module access flags + */ +private final int access; + +/** + * module version index in the constant pool or 0 + */ +private final int version; + +/** + * module main class index in the constant pool or 0 + */ +private int mainClass; + +/** + * number of packages + */ +private int packageCount; + +/** + * The packages in bytecode form. This byte vector only contains + * the items themselves, the number of items is store in packageCount + */ +private ByteVector packages; + +/** + * number of requires items + */ +private int requireCount; + +/** + * The requires items in bytecode form. This byte vector only contains + * the items themselves, the number of items is store in requireCount + */ +private ByteVector requires; + +/** + * number of exports items + */ +private int exportCount; + +/** + * The exports items in bytecode form. This byte vector only contains + * the items themselves, the number of items is store in exportCount + */ +private ByteVector exports; + +/** + * number of opens items + */ +private int openCount; + +/** + * The opens items in bytecode form. This byte vector only contains + * the items themselves, the number of items is store in openCount + */ +private ByteVector opens; + +/** + * number of uses items + */ +private int useCount; + +/** + * The uses items in bytecode form. This byte vector only contains + * the items themselves, the number of items is store in useCount + */ +private ByteVector uses; + +/** + * number of provides items + */ +private int provideCount; + +/** + * The uses provides in bytecode form. This byte vector only contains + * the items themselves, the number of items is store in provideCount + */ +
[2/9] tapestry-5 git commit: TAP5-2588: upgrade ASM to 6.0
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/74324b31/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/util/Printer.java -- diff --git a/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/util/Printer.java b/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/util/Printer.java index a849298..2dd644a 100644 --- a/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/util/Printer.java +++ b/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/util/Printer.java @@ -53,14 +53,14 @@ public abstract class Printer { /** * The names of the for operand parameter values of the - * {@link org.apache.tapestry5.internal.plastic.asm.MethodVisitor#visitIntInsn} method when + * {@link org.objectweb.asm.MethodVisitor#visitIntInsn} method when * opcode is NEWARRAY. */ public static final String[] TYPES; /** * The names of the tag field values for - * {@link org.apache.tapestry5.internal.plastic.asm.Handle}. + * {@link org.objectweb.asm.Handle}. */ public static final String[] HANDLE_TAG; @@ -117,7 +117,7 @@ public abstract class Printer { /** * The ASM API version implemented by this class. The value of this field - * must be one of {@link Opcodes#ASM4} or {@link Opcodes#ASM5}. + * must be one of {@link Opcodes#ASM4}, {@link Opcodes#ASM5} or {@link Opcodes#ASM6}. */ protected final int api; @@ -142,6 +142,10 @@ public abstract class Printer { /** * Constructs a new {@link Printer}. + * + * @param api + *the ASM API version implemented by this printer. Must be one + *of {@link Opcodes#ASM4}, {@link Opcodes#ASM5} or {@link Opcodes#ASM6}. */ protected Printer(final int api) { this.api = api; @@ -150,34 +154,121 @@ public abstract class Printer { } /** - * Class header. See {@link org.apache.tapestry5.internal.plastic.asm.ClassVisitor#visit}. + * Class header. + * See {@link org.objectweb.asm.ClassVisitor#visit}. + * + * @param version + *the class version. + * @param access + *the class's access flags (see {@link Opcodes}). This parameter + *also indicates if the class is deprecated. + * @param name + *the internal name of the class (see + *{@link org.objectweb.asm.Type#getInternalName() getInternalName}). + * @param signature + *the signature of this class. May be null if the class + *is not a generic one, and does not extend or implement generic + *classes or interfaces. + * @param superName + *the internal of name of the super class (see + *{@link org.objectweb.asm.Type#getInternalName() getInternalName}). + *For interfaces, the super class is {@link Object}. May be + *null, but only for the {@link Object} class. + * @param interfaces + *the internal names of the class's interfaces (see + *{@link org.objectweb.asm.Type#getInternalName() getInternalName}). + *May be null. */ public abstract void visit(final int version, final int access, final String name, final String signature, final String superName, final String[] interfaces); /** - * Class source. See {@link org.apache.tapestry5.internal.plastic.asm.ClassVisitor#visitSource}. + * Class source. + * See {@link org.objectweb.asm.ClassVisitor#visitSource}. + * + * @param source + *the name of the source file from which the class was compiled. + *May be null. + * @param debug + *additional debug information to compute the correspondance + *between source and compiled elements of the class. May be + *null. */ -public abstract void visitSource(final String file, final String debug); +public abstract void visitSource(final String source, final String debug); + /** - * Class outer class. See - * {@link org.apache.tapestry5.internal.plastic.asm.ClassVisitor#visitOuterClass}. + * Module. + * See {@link org.objectweb.asm.ClassVisitor#visitModule(String, int)}. + * + * @param name + *module name. + * @param access + *module flags, among {@code ACC_OPEN}, {@code ACC_SYNTHETIC} + *and {@code ACC_MANDATED}. + * @param version + *module version or null. + * @return + */ +public Printer visitModule(String name, int access, String version) { +throw new RuntimeException("Must be overriden"); +} + +/** + * Class outer class. + * See {@link
[4/9] tapestry-5 git commit: TAP5-2588: upgrade ASM to 6.0
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/74324b31/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/optimizer/NameMapping.java -- diff --git a/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/optimizer/NameMapping.java b/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/optimizer/NameMapping.java deleted file mode 100644 index 70d74f7..000 --- a/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/optimizer/NameMapping.java +++ /dev/null @@ -1,114 +0,0 @@ -/*** - * ASM: a very small and fast Java bytecode manipulation framework - * Copyright (c) 2000-2011 INRIA, France Telecom - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - *notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - *notice, this list of conditions and the following disclaimer in the - *documentation and/or other materials provided with the distribution. - * 3. Neither the name of the copyright holders nor the names of its - *contributors may be used to endorse or promote products derived from - *this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF - * THE POSSIBILITY OF SUCH DAMAGE. - */ -package org.apache.tapestry5.internal.plastic.asm.optimizer; - -import java.io.BufferedInputStream; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.util.HashSet; -import java.util.Properties; -import java.util.Set; - -import org.apache.tapestry5.internal.plastic.asm.Type; - -/** - * A MAPPING from names to names, used to rename classes, fields and methods. - * - * @author Eric Bruneton - */ -public class NameMapping { - -public final Properties mapping; - -public final Set unused; - -public NameMapping(final String file) throws IOException { -mapping = new Properties(); -InputStream is = null; -try { -is = new BufferedInputStream(new FileInputStream(file)); -mapping.load(is); -unused = new HashSet(mapping.keySet()); -} finally { -if (is != null) { -is.close(); -} -} -} - -public String map(final String name) { -String s = (String) mapping.get(name); -if (s == null) { -int p = name.indexOf('.'); -if (p == -1) { -s = name; -} else { -int q = name.indexOf('('); -if (q == -1) { -s = name.substring(p + 1); -} else { -s = name.substring(p + 1, q); -} -} -} else { -unused.remove(name); -} -return s; -} - -public String fix(final String desc) { -if (desc.startsWith("(")) { -Type[] arguments = Type.getArgumentTypes(desc); -Type result = Type.getReturnType(desc); -for (int i = 0; i < arguments.length; ++i) { -arguments[i] = fix(arguments[i]); -} -result = fix(result); -return Type.getMethodDescriptor(result, arguments); -} else { -return fix(Type.getType(desc)).getDescriptor(); -} -} - -private Type fix(final Type t) { -if (t.getSort() == Type.OBJECT) { -return Type.getObjectType(map(t.getInternalName())); -} else if (t.getSort() == Type.ARRAY) { -String s = fix(t.getElementType()).getDescriptor(); -for (int i = 0; i < t.getDimensions(); ++i) { -s = '[' + s; -} -return Type.getType(s); -} else { -return t; -} -} -} http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/74324b31/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/optimizer/Shrinker.java
[3/9] tapestry-5 git commit: TAP5-2588: upgrade ASM to 6.0
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/74324b31/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/tree/LocalVariableAnnotationNode.java -- diff --git a/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/tree/LocalVariableAnnotationNode.java b/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/tree/LocalVariableAnnotationNode.java index 27f6e09..8da8627 100644 --- a/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/tree/LocalVariableAnnotationNode.java +++ b/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/tree/LocalVariableAnnotationNode.java @@ -93,7 +93,7 @@ public class LocalVariableAnnotationNode extends TypeAnnotationNode { */ public LocalVariableAnnotationNode(int typeRef, TypePath typePath, LabelNode[] start, LabelNode[] end, int[] index, String desc) { -this(Opcodes.ASM5, typeRef, typePath, start, end, index, desc); +this(Opcodes.ASM6, typeRef, typePath, start, end, index, desc); } /** @@ -101,7 +101,7 @@ public class LocalVariableAnnotationNode extends TypeAnnotationNode { * * @param api *the ASM API version implemented by this visitor. Must be one - *of {@link Opcodes#ASM4} or {@link Opcodes#ASM5}. + *of {@link Opcodes#ASM4}, {@link Opcodes#ASM5} or {@link Opcodes#ASM6}. * @param typeRef *a reference to the annotated type. See {@link TypeReference}. * @param start @@ -152,6 +152,6 @@ public class LocalVariableAnnotationNode extends TypeAnnotationNode { index[i] = this.index.get(i); } accept(mv.visitLocalVariableAnnotation(typeRef, typePath, start, end, -index, desc, true)); +index, desc, visible)); } } http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/74324b31/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/tree/MethodInsnNode.java -- diff --git a/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/tree/MethodInsnNode.java b/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/tree/MethodInsnNode.java index bc90ddd..8d86df7 100644 --- a/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/tree/MethodInsnNode.java +++ b/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/tree/MethodInsnNode.java @@ -44,7 +44,7 @@ public class MethodInsnNode extends AbstractInsnNode { /** * The internal name of the method's owner class (see - * {@link org.apache.tapestry5.internal.plastic.asm.Type#getInternalName() getInternalName}). + * {@link org.objectweb.asm.Type#getInternalName() getInternalName}). */ public String owner; @@ -54,7 +54,7 @@ public class MethodInsnNode extends AbstractInsnNode { public String name; /** - * The method's descriptor (see {@link org.apache.tapestry5.internal.plastic.asm.Type}). + * The method's descriptor (see {@link org.objectweb.asm.Type}). */ public String desc; @@ -72,12 +72,12 @@ public class MethodInsnNode extends AbstractInsnNode { *INVOKEINTERFACE. * @param owner *the internal name of the method's owner class (see - *{@link org.apache.tapestry5.internal.plastic.asm.Type#getInternalName() + *{@link org.objectweb.asm.Type#getInternalName() *getInternalName}). * @param name *the method's name. * @param desc - *the method's descriptor (see {@link org.apache.tapestry5.internal.plastic.asm.Type}). + *the method's descriptor (see {@link org.objectweb.asm.Type}). */ @Deprecated public MethodInsnNode(final int opcode, final String owner, @@ -94,12 +94,12 @@ public class MethodInsnNode extends AbstractInsnNode { *INVOKEINTERFACE. * @param owner *the internal name of the method's owner class (see - *{@link org.apache.tapestry5.internal.plastic.asm.Type#getInternalName() + *{@link org.objectweb.asm.Type#getInternalName() *getInternalName}). * @param name *the method's name. * @param desc - *the method's descriptor (see {@link org.apache.tapestry5.internal.plastic.asm.Type}). + *the method's descriptor (see {@link org.objectweb.asm.Type}). * @param itf *if the method's owner class is an interface. */ http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/74324b31/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/tree/MethodNode.java --
[7/9] tapestry-5 git commit: TAP5-2588: upgrade ASM to 6.0
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/74324b31/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/FieldWriter.java -- diff --git a/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/FieldWriter.java b/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/FieldWriter.java index 4a5f406..f7bbe98 100644 --- a/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/FieldWriter.java +++ b/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/FieldWriter.java @@ -118,7 +118,7 @@ final class FieldWriter extends FieldVisitor { */ FieldWriter(final ClassWriter cw, final int access, final String name, final String desc, final String signature, final Object value) { -super(Opcodes.ASM5); +super(Opcodes.ASM6); if (cw.firstField == null) { cw.firstField = this; } else { @@ -129,7 +129,7 @@ final class FieldWriter extends FieldVisitor { this.access = access; this.name = cw.newUTF8(name); this.desc = cw.newUTF8(desc); -if (ClassReader.SIGNATURES && signature != null) { +if (signature != null) { this.signature = cw.newUTF8(signature); } if (value != null) { @@ -144,9 +144,6 @@ final class FieldWriter extends FieldVisitor { @Override public AnnotationVisitor visitAnnotation(final String desc, final boolean visible) { -if (!ClassReader.ANNOTATIONS) { -return null; -} ByteVector bv = new ByteVector(); // write type, and reserve space for values count bv.putShort(cw.newUTF8(desc)).putShort(0); @@ -164,9 +161,6 @@ final class FieldWriter extends FieldVisitor { @Override public AnnotationVisitor visitTypeAnnotation(final int typeRef, final TypePath typePath, final String desc, final boolean visible) { -if (!ClassReader.ANNOTATIONS) { -return null; -} ByteVector bv = new ByteVector(); // write target_type and target_info AnnotationWriter.putTarget(typeRef, typePath, bv); @@ -220,23 +214,23 @@ final class FieldWriter extends FieldVisitor { cw.newUTF8("Deprecated"); size += 6; } -if (ClassReader.SIGNATURES && signature != 0) { +if (signature != 0) { cw.newUTF8("Signature"); size += 8; } -if (ClassReader.ANNOTATIONS && anns != null) { +if (anns != null) { cw.newUTF8("RuntimeVisibleAnnotations"); size += 8 + anns.getSize(); } -if (ClassReader.ANNOTATIONS && ianns != null) { +if (ianns != null) { cw.newUTF8("RuntimeInvisibleAnnotations"); size += 8 + ianns.getSize(); } -if (ClassReader.ANNOTATIONS && tanns != null) { +if (tanns != null) { cw.newUTF8("RuntimeVisibleTypeAnnotations"); size += 8 + tanns.getSize(); } -if (ClassReader.ANNOTATIONS && itanns != null) { +if (itanns != null) { cw.newUTF8("RuntimeInvisibleTypeAnnotations"); size += 8 + itanns.getSize(); } @@ -270,19 +264,19 @@ final class FieldWriter extends FieldVisitor { if ((access & Opcodes.ACC_DEPRECATED) != 0) { ++attributeCount; } -if (ClassReader.SIGNATURES && signature != 0) { +if (signature != 0) { ++attributeCount; } -if (ClassReader.ANNOTATIONS && anns != null) { +if (anns != null) { ++attributeCount; } -if (ClassReader.ANNOTATIONS && ianns != null) { +if (ianns != null) { ++attributeCount; } -if (ClassReader.ANNOTATIONS && tanns != null) { +if (tanns != null) { ++attributeCount; } -if (ClassReader.ANNOTATIONS && itanns != null) { +if (itanns != null) { ++attributeCount; } if (attrs != null) { @@ -302,23 +296,23 @@ final class FieldWriter extends FieldVisitor { if ((access & Opcodes.ACC_DEPRECATED) != 0) { out.putShort(cw.newUTF8("Deprecated")).putInt(0); } -if (ClassReader.SIGNATURES && signature != 0) { +if (signature != 0) { out.putShort(cw.newUTF8("Signature")); out.putInt(2).putShort(signature); } -if (ClassReader.ANNOTATIONS && anns != null) { +if (anns != null) { out.putShort(cw.newUTF8("RuntimeVisibleAnnotations")); anns.put(out); } -if (ClassReader.ANNOTATIONS && ianns != null) { +if (ianns != null) { out.putShort(cw.newUTF8("RuntimeInvisibleAnnotations")); ianns.put(out); } -if
[8/9] tapestry-5 git commit: TAP5-2588: upgrade ASM to 6.0
TAP5-2588: upgrade ASM to 6.0 Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/74324b31 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/74324b31 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/74324b31 Branch: refs/heads/master Commit: 74324b3130c9f74c1684a08171b7a2ca56532fe1 Parents: 95a548e Author: Jochen KemnadeAuthored: Fri Oct 6 15:20:03 2017 +0200 Committer: Jochen Kemnade Committed: Fri Oct 6 15:59:01 2017 +0200 -- .../internal/plastic/asm/AnnotationVisitor.java | 10 +- .../internal/plastic/asm/AnnotationWriter.java | 2 +- .../internal/plastic/asm/ClassReader.java | 480 --- .../internal/plastic/asm/ClassVisitor.java | 32 +- .../internal/plastic/asm/ClassWriter.java | 295 --- .../internal/plastic/asm/CurrentFrame.java | 56 ++ .../internal/plastic/asm/FieldVisitor.java | 8 +- .../internal/plastic/asm/FieldWriter.java | 40 +- .../tapestry5/internal/plastic/asm/Frame.java | 118 ++- .../tapestry5/internal/plastic/asm/Handle.java | 62 +- .../tapestry5/internal/plastic/asm/Item.java| 5 + .../tapestry5/internal/plastic/asm/Label.java | 15 +- .../internal/plastic/asm/MethodVisitor.java | 8 +- .../internal/plastic/asm/MethodWriter.java | 830 -- .../internal/plastic/asm/ModuleVisitor.java | 190 + .../internal/plastic/asm/ModuleWriter.java | 293 +++ .../tapestry5/internal/plastic/asm/Opcodes.java | 29 +- .../tapestry5/internal/plastic/asm/Type.java| 25 +- .../plastic/asm/commons/AdviceAdapter.java | 16 +- .../plastic/asm/commons/AnalyzerAdapter.java| 8 +- .../plastic/asm/commons/AnnotationRemapper.java | 79 ++ .../plastic/asm/commons/ClassRemapper.java | 158 .../plastic/asm/commons/CodeSizeEvaluator.java | 2 +- .../plastic/asm/commons/FieldRemapper.java | 71 ++ .../plastic/asm/commons/GeneratorAdapter.java | 6 +- .../plastic/asm/commons/InstructionAdapter.java | 4 +- .../plastic/asm/commons/JSRInlinerAdapter.java | 6 +- .../asm/commons/LocalVariablesSorter.java | 20 +- .../plastic/asm/commons/MethodRemapper.java | 225 + .../asm/commons/ModuleHashesAttribute.java | 126 +++ .../plastic/asm/commons/ModuleRemapper.java | 106 +++ .../asm/commons/ModuleResolutionAttribute.java | 106 +++ .../asm/commons/ModuleTargetAttribute.java | 81 ++ .../internal/plastic/asm/commons/Remapper.java | 45 +- .../asm/commons/RemappingAnnotationAdapter.java | 4 +- .../asm/commons/RemappingClassAdapter.java | 10 +- .../asm/commons/RemappingFieldAdapter.java | 4 +- .../asm/commons/RemappingMethodAdapter.java | 28 +- .../asm/commons/RemappingSignatureAdapter.java | 4 +- .../asm/commons/SerialVersionUIDAdder.java | 11 +- .../plastic/asm/commons/SignatureRemapper.java | 159 .../plastic/asm/commons/StaticInitMerger.java | 2 +- .../asm/commons/TryCatchBlockSorter.java| 2 +- .../optimizer/AnnotationConstantsCollector.java | 147 .../asm/optimizer/ClassConstantsCollector.java | 198 - .../plastic/asm/optimizer/ClassOptimizer.java | 260 -- .../plastic/asm/optimizer/Constant.java | 323 --- .../plastic/asm/optimizer/ConstantPool.java | 251 -- .../asm/optimizer/FieldConstantsCollector.java | 89 -- .../plastic/asm/optimizer/JarOptimizer.java | 235 - .../asm/optimizer/MethodConstantsCollector.java | 224 - .../plastic/asm/optimizer/MethodOptimizer.java | 178 .../plastic/asm/optimizer/NameMapping.java | 114 --- .../plastic/asm/optimizer/Shrinker.java | 282 -- .../plastic/asm/optimizer/jdk1.2.2_017.txt.gz | Bin 113814 -> 0 bytes .../plastic/asm/optimizer/jdk1.3.1_19.txt.gz| Bin 128067 -> 0 bytes .../asm/optimizer/shrink-annotations.properties | 53 -- .../asm/optimizer/shrink-frames.properties | 62 -- .../asm/optimizer/shrink-resize.properties | 37 - .../asm/optimizer/shrink-signatures.properties | 43 - .../asm/optimizer/shrink-writer.properties | 66 -- .../plastic/asm/optimizer/shrink.properties | 381 - .../plastic/asm/signature/SignatureReader.java | 8 +- .../plastic/asm/signature/SignatureVisitor.java | 6 +- .../plastic/asm/signature/SignatureWriter.java | 6 +- .../plastic/asm/tree/AbstractInsnNode.java | 4 +- .../plastic/asm/tree/AnnotationNode.java| 82 +- .../internal/plastic/asm/tree/ClassNode.java| 92 +- .../plastic/asm/tree/FieldInsnNode.java | 8 +- .../internal/plastic/asm/tree/FieldNode.java| 28 +- .../plastic/asm/tree/InnerClassNode.java| 8 +- .../internal/plastic/asm/tree/InsnList.java | 23 +- .../plastic/asm/tree/InvokeDynamicInsnNode.java | 2 +-
[5/9] tapestry-5 git commit: TAP5-2588: upgrade ASM to 6.0
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/74324b31/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/commons/SerialVersionUIDAdder.java -- diff --git a/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/commons/SerialVersionUIDAdder.java b/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/commons/SerialVersionUIDAdder.java index b8030df..1f9b7cb 100644 --- a/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/commons/SerialVersionUIDAdder.java +++ b/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/commons/SerialVersionUIDAdder.java @@ -170,7 +170,7 @@ public class SerialVersionUIDAdder extends ClassVisitor { * If a subclass calls this constructor. */ public SerialVersionUIDAdder(final ClassVisitor cv) { -this(Opcodes.ASM5, cv); +this(Opcodes.ASM6, cv); if (getClass() != SerialVersionUIDAdder.class) { throw new IllegalStateException(); } @@ -181,7 +181,7 @@ public class SerialVersionUIDAdder extends ClassVisitor { * * @param api *the ASM API version implemented by this visitor. Must be one - *of {@link Opcodes#ASM4} or {@link Opcodes#ASM5}. + *of {@link Opcodes#ASM4}, {@link Opcodes#ASM5} or {@link Opcodes#ASM6}. * @param cv *a {@link ClassVisitor} to which this visitor will delegate *calls. @@ -205,7 +205,7 @@ public class SerialVersionUIDAdder extends ClassVisitor { public void visit(final int version, final int access, final String name, final String signature, final String superName, final String[] interfaces) { -computeSVUID = (access & Opcodes.ACC_INTERFACE) == 0; +computeSVUID = (access & Opcodes.ACC_ENUM) == 0; if (computeSVUID) { this.name = name; @@ -367,6 +367,11 @@ public class SerialVersionUIDAdder extends ClassVisitor { /* * 2. The class modifiers written as a 32-bit integer. */ +int access = this.access; +if ((access & Opcodes.ACC_INTERFACE) != 0) { +access = (svuidMethods.size() > 0) ? (access | Opcodes.ACC_ABSTRACT) +: (access & ~Opcodes.ACC_ABSTRACT); +} dos.writeInt(access & (Opcodes.ACC_PUBLIC | Opcodes.ACC_FINAL | Opcodes.ACC_INTERFACE | Opcodes.ACC_ABSTRACT)); http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/74324b31/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/commons/SignatureRemapper.java -- diff --git a/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/commons/SignatureRemapper.java b/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/commons/SignatureRemapper.java new file mode 100644 index 000..b16e028 --- /dev/null +++ b/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/commons/SignatureRemapper.java @@ -0,0 +1,159 @@ +/*** + * ASM: a very small and fast Java bytecode manipulation framework + * Copyright (c) 2000-2011 INRIA, France Telecom + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + *notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + *notice, this list of conditions and the following disclaimer in the + *documentation and/or other materials provided with the distribution. + * 3. Neither the name of the copyright holders nor the names of its + *contributors may be used to endorse or promote products derived from + *this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF + * THE POSSIBILITY OF SUCH DAMAGE. + */ + +package
[1/9] tapestry-5 git commit: TAP5-2588: upgrade ASM to 6.0
Repository: tapestry-5 Updated Branches: refs/heads/master 95a548ec4 -> 52e2b7b38 http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/74324b31/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/xml/SAXAnnotationAdapter.java -- diff --git a/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/xml/SAXAnnotationAdapter.java b/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/xml/SAXAnnotationAdapter.java index 76e5b8e..76ad91e 100644 --- a/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/xml/SAXAnnotationAdapter.java +++ b/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/xml/SAXAnnotationAdapter.java @@ -48,20 +48,20 @@ public final class SAXAnnotationAdapter extends AnnotationVisitor { public SAXAnnotationAdapter(final SAXAdapter sa, final String elementName, final int visible, final String name, final String desc) { -this(Opcodes.ASM5, sa, elementName, visible, desc, name, -1, -1, null, +this(Opcodes.ASM6, sa, elementName, visible, desc, name, -1, -1, null, null, null, null); } public SAXAnnotationAdapter(final SAXAdapter sa, final String elementName, final int visible, final int parameter, final String desc) { -this(Opcodes.ASM5, sa, elementName, visible, desc, null, parameter, -1, +this(Opcodes.ASM6, sa, elementName, visible, desc, null, parameter, -1, null, null, null, null); } public SAXAnnotationAdapter(final SAXAdapter sa, final String elementName, final int visible, final String name, final String desc, final int typeRef, final TypePath typePath) { -this(Opcodes.ASM5, sa, elementName, visible, desc, name, -1, typeRef, +this(Opcodes.ASM6, sa, elementName, visible, desc, name, -1, typeRef, typePath, null, null, null); } @@ -69,7 +69,7 @@ public final class SAXAnnotationAdapter extends AnnotationVisitor { final int visible, final String name, final String desc, int typeRef, TypePath typePath, final String[] start, final String[] end, final int[] index) { -this(Opcodes.ASM5, sa, elementName, visible, desc, name, -1, typeRef, +this(Opcodes.ASM6, sa, elementName, visible, desc, name, -1, typeRef, typePath, start, end, index); } @@ -113,24 +113,24 @@ public final class SAXAnnotationAdapter extends AnnotationVisitor { typePath.toString()); } if (start != null) { -StringBuffer value = new StringBuffer(start[0]); +StringBuilder value = new StringBuilder(start[0]); for (int i = 1; i < start.length; ++i) { -value.append(' ').append(start[i]); +value.append(" ").append(start[i]); } att.addAttribute("", "start", "start", "", value.toString()); } if (end != null) { -StringBuffer value = new StringBuffer(end[0]); +StringBuilder value = new StringBuilder(end[0]); for (int i = 1; i < end.length; ++i) { -value.append(' ').append(end[i]); +value.append(" ").append(end[i]); } att.addAttribute("", "end", "end", "", value.toString()); } if (index != null) { -StringBuffer value = new StringBuffer(); +StringBuilder value = new StringBuilder(); value.append(index[0]); for (int i = 1; i < index.length; ++i) { -value.append(' ').append(index[i]); +value.append(" ").append(index[i]); } att.addAttribute("", "index", "index", "", value.toString()); } http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/74324b31/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/xml/SAXClassAdapter.java -- diff --git a/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/xml/SAXClassAdapter.java b/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/xml/SAXClassAdapter.java index dc4cb66..8e41508 100644 --- a/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/xml/SAXClassAdapter.java +++ b/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/xml/SAXClassAdapter.java @@ -33,19 +33,20 @@ import org.apache.tapestry5.internal.plastic.asm.AnnotationVisitor; import org.apache.tapestry5.internal.plastic.asm.ClassVisitor; import org.apache.tapestry5.internal.plastic.asm.FieldVisitor; import org.apache.tapestry5.internal.plastic.asm.MethodVisitor; +import org.apache.tapestry5.internal.plastic.asm.ModuleVisitor; import org.apache.tapestry5.internal.plastic.asm.Opcodes; import
svn commit: r1011116 - in /websites/production/tapestry/content: archetype-catalog.xml doap.rdf
Author: jkemnade Date: Tue Apr 25 12:08:42 2017 New Revision: 106 Log: Updates for 5.4.3 Modified: websites/production/tapestry/content/archetype-catalog.xml websites/production/tapestry/content/doap.rdf Modified: websites/production/tapestry/content/archetype-catalog.xml == --- websites/production/tapestry/content/archetype-catalog.xml (original) +++ websites/production/tapestry/content/archetype-catalog.xml Tue Apr 25 12:08:42 2017 @@ -6,7 +6,7 @@ org.apache.tapestry quickstart - 5.4.2 + 5.4.3 Tapestry 5 Quickstart Project Modified: websites/production/tapestry/content/doap.rdf == --- websites/production/tapestry/content/doap.rdf (original) +++ websites/production/tapestry/content/doap.rdf Tue Apr 25 12:08:42 2017 @@ -45,8 +45,8 @@ Apache Tapestry -2016-04-13 -5.4.2 +2016-04-24 +5.4.3
svn commit: r1011022 - in /websites/production/tapestry/content/5.4.3: ./ apidocs/ apidocs/com/ apidocs/com/yahoo/ apidocs/com/yahoo/platform/ apidocs/com/yahoo/platform/yui/ apidocs/com/yahoo/platfor
Author: jkemnade Date: Mon Apr 24 12:02:37 2017 New Revision: 1011022 Log: add docs for 5.4.3 [This commit notification would consist of 955 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.]
svn commit: r1011023 - /websites/production/tapestry/content/current
Author: jkemnade Date: Mon Apr 24 12:04:04 2017 New Revision: 1011023 Log: Updated javadocs current symbolic link Modified: websites/production/tapestry/content/current Modified: websites/production/tapestry/content/current == --- websites/production/tapestry/content/current (original) +++ websites/production/tapestry/content/current Mon Apr 24 12:04:04 2017 @@ -1 +1 @@ -link 5.4.2 \ No newline at end of file +link 5.4.3 \ No newline at end of file
svn commit: r19243 - /release/tapestry/
Author: jkemnade Date: Mon Apr 24 11:23:24 2017 New Revision: 19243 Log: 5.4.3 Added: release/tapestry/apache-tapestry-5.4.3-apidocs.zip (with props) release/tapestry/apache-tapestry-5.4.3-apidocs.zip.asc release/tapestry/apache-tapestry-5.4.3-apidocs.zip.md5 release/tapestry/apache-tapestry-5.4.3-bin.zip (with props) release/tapestry/apache-tapestry-5.4.3-bin.zip.asc release/tapestry/apache-tapestry-5.4.3-bin.zip.md5 release/tapestry/apache-tapestry-5.4.3-sources.zip (with props) release/tapestry/apache-tapestry-5.4.3-sources.zip.asc release/tapestry/apache-tapestry-5.4.3-sources.zip.md5 Added: release/tapestry/apache-tapestry-5.4.3-apidocs.zip == Binary file - no diff available. Propchange: release/tapestry/apache-tapestry-5.4.3-apidocs.zip -- svn:mime-type = application/octet-stream Added: release/tapestry/apache-tapestry-5.4.3-apidocs.zip.asc == --- release/tapestry/apache-tapestry-5.4.3-apidocs.zip.asc (added) +++ release/tapestry/apache-tapestry-5.4.3-apidocs.zip.asc Mon Apr 24 11:23:24 2017 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: BCPG v1.51 + +iQIcBAABAgAGBQJY+NVLAAoJEPY4+oVWqKshjtgQAIBCHEEhYdt5Loj7hvc4AfTJ +tXCutDnC+rCiEMLAkSVD4iKkZHIOdzQg5ZqVvNbiLr9omLHdevh5poVvBft3DmoO +x9D470bhIPQgT8AWEwtuSA6SqWRSmQkQxU7c9kwL0LAzv7j8/LAg5mhyHpFVqQ08 +2BD6XjNwbG4uNbB5oBj/RGV8JYRPk4vGd53Rmpeyhm4n4zkJPRF60RT28EzChRrx +UjisDA+Cb31AIEUa3qqzO77yLS8+XwtJsVYOx6t5NU29kiggu4JlmANeMF4+iwis +X7Beui60Z1z1GnXI6gQ8iii73cBWm7KmEbbP1HnHnwnbiqlBiQalqqX3KKOpTHja +qpRjxgJ793rkPmHVlKFljY3wNycEUnZ++e/+mLr6WuPpOnRP2T9t3E3AFgLW+PLw +6aBovTh+nlGZq/TIRdC9Mjl0xDhp0dGURj1WVxZi5BjsQjTrwSCWr6XnCbzpakOg +SQyq3zF7YVkjaJXZ8fgupiD0MSwd75H4ueQx6vVKtEY9eh++CDSM6bhIthgdWwCR +b1tqZLqqP5yz0FAzpyGb1Jfv2kATkVHc7fkSi6BnRmqIJFhMkyTxuvDunmsZBnYQ +wTO57CuvqhtU4yHaoYhZrvqr5T4nrGlXu6trNHB//snIBeaIh8lYV4tikGHU6SeK +4WaBzH1sCXm2gxSgfv5P +=le3l +-END PGP SIGNATURE- Added: release/tapestry/apache-tapestry-5.4.3-apidocs.zip.md5 == --- release/tapestry/apache-tapestry-5.4.3-apidocs.zip.md5 (added) +++ release/tapestry/apache-tapestry-5.4.3-apidocs.zip.md5 Mon Apr 24 11:23:24 2017 @@ -0,0 +1 @@ +8ab4ca3546348e82862c6f6dc47397a5 \ No newline at end of file Added: release/tapestry/apache-tapestry-5.4.3-bin.zip == Binary file - no diff available. Propchange: release/tapestry/apache-tapestry-5.4.3-bin.zip -- svn:mime-type = application/octet-stream Added: release/tapestry/apache-tapestry-5.4.3-bin.zip.asc == --- release/tapestry/apache-tapestry-5.4.3-bin.zip.asc (added) +++ release/tapestry/apache-tapestry-5.4.3-bin.zip.asc Mon Apr 24 11:23:24 2017 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: BCPG v1.51 + +iQIcBAABAgAGBQJY+NVLAAoJEPY4+oVWqKshSJsP/jgTyEOS6WaIb2dtyqbbmQ4I +HGK0gsUk8YNK9rQkSAkE3T8gms7YIRCgnaAQRpwog6dMztr3RuIapmwSJy64KAc3 +cPBmrKlNOmCLvYNZsKQmOMr8etKlDFT49XqQ/ijjFfRTCksjY+7o63kwojjRn7sX +sAoP/Di/JghbngaurIajvXCUw6Ss5IyS/2/X6nSejqOafjtfpxgure7ibzMU7toN +nPsRT0tBSyQchrrM9cYPQX2tiMb8yTaW1MRqrmGM1mygYCzDIcuiD7wJL0RB7LCP +IsyeIwuWfFmGoh9hzCJmiuFo+bUI1emcCdSAF6J1fANzk2mCSHf3K/L87dQ9RaYD +5zMQG9qQ86qvLLbpN9Sbn4qgiYzEki5DExIKDCT1a9HEn8v+ISbEck3StWvksEiM +bqMCRu08qb4oCE2RiwKTcC+P3Ec2eKp25RaJZZqwYIYi8MW5v98xM9NUqnFW8inc +xvwWF894swesxQDtoE/aRSB/Srvjf5Rxb/IHEimvSDX3q4s6HG++G/Yr81VbrS2A +ugLRMdmJHf1Oscr/gOQr331ohUIS+c14/f4bVuhkCMVfHvZEhjYeNFgooBV0Umxk +6bsxpj+eDOvkmLWGSij2KYoGxVcelxm11GVDasO8O8C3DB6GHvm/aB/FIrnvUGzc +XEvRBPRNEiWxFb9Upiee +=gMno +-END PGP SIGNATURE- Added: release/tapestry/apache-tapestry-5.4.3-bin.zip.md5 == --- release/tapestry/apache-tapestry-5.4.3-bin.zip.md5 (added) +++ release/tapestry/apache-tapestry-5.4.3-bin.zip.md5 Mon Apr 24 11:23:24 2017 @@ -0,0 +1 @@ +4015631785f8e4ea8048b11734831831 \ No newline at end of file Added: release/tapestry/apache-tapestry-5.4.3-sources.zip == Binary file - no diff available. Propchange: release/tapestry/apache-tapestry-5.4.3-sources.zip -- svn:mime-type = application/octet-stream Added: release/tapestry/apache-tapestry-5.4.3-sources.zip.asc == --- release/tapestry/apache-tapestry-5.4.3-sources.zip.asc (added) +++ release/tapestry/apache-tapestry-5.4.3-sources.zip.asc Mon Apr
tapestry-5 git commit: increment version number
Repository: tapestry-5 Updated Branches: refs/heads/5.4.x 85cc611fb -> e226f86ac increment version number Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/e226f86a Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/e226f86a Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/e226f86a Branch: refs/heads/5.4.x Commit: e226f86ace71c2ca54764f34b582746e168f93fd Parents: 85cc611 Author: Jochen KemnadeAuthored: Thu Apr 20 17:45:55 2017 +0200 Committer: Jochen Kemnade Committed: Thu Apr 20 17:45:55 2017 +0200 -- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/e226f86a/build.gradle -- diff --git a/build.gradle b/build.gradle index 77963b6..8442a16 100755 --- a/build.gradle +++ b/build.gradle @@ -33,7 +33,7 @@ project.version = tapestryVersion() def tapestryVersion() { -def major = "5.4.3" +def major = "5.4.4" def minor = "" // When building on the CI server, make sure -SNAPSHOT is appended, as it is a nightly build.
svn commit: r19218 - /dev/tapestry/
Author: jkemnade Date: Thu Apr 20 15:44:46 2017 New Revision: 19218 Log: 5.4.3 Added: dev/tapestry/apache-tapestry-5.4.3-apidocs.zip (with props) dev/tapestry/apache-tapestry-5.4.3-apidocs.zip.asc dev/tapestry/apache-tapestry-5.4.3-apidocs.zip.md5 dev/tapestry/apache-tapestry-5.4.3-bin.zip (with props) dev/tapestry/apache-tapestry-5.4.3-bin.zip.asc dev/tapestry/apache-tapestry-5.4.3-bin.zip.md5 dev/tapestry/apache-tapestry-5.4.3-sources.zip (with props) dev/tapestry/apache-tapestry-5.4.3-sources.zip.asc dev/tapestry/apache-tapestry-5.4.3-sources.zip.md5 Added: dev/tapestry/apache-tapestry-5.4.3-apidocs.zip == Binary file - no diff available. Propchange: dev/tapestry/apache-tapestry-5.4.3-apidocs.zip -- svn:mime-type = application/octet-stream Added: dev/tapestry/apache-tapestry-5.4.3-apidocs.zip.asc == --- dev/tapestry/apache-tapestry-5.4.3-apidocs.zip.asc (added) +++ dev/tapestry/apache-tapestry-5.4.3-apidocs.zip.asc Thu Apr 20 15:44:46 2017 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: BCPG v1.51 + +iQIcBAABAgAGBQJY+NVLAAoJEPY4+oVWqKshjtgQAIBCHEEhYdt5Loj7hvc4AfTJ +tXCutDnC+rCiEMLAkSVD4iKkZHIOdzQg5ZqVvNbiLr9omLHdevh5poVvBft3DmoO +x9D470bhIPQgT8AWEwtuSA6SqWRSmQkQxU7c9kwL0LAzv7j8/LAg5mhyHpFVqQ08 +2BD6XjNwbG4uNbB5oBj/RGV8JYRPk4vGd53Rmpeyhm4n4zkJPRF60RT28EzChRrx +UjisDA+Cb31AIEUa3qqzO77yLS8+XwtJsVYOx6t5NU29kiggu4JlmANeMF4+iwis +X7Beui60Z1z1GnXI6gQ8iii73cBWm7KmEbbP1HnHnwnbiqlBiQalqqX3KKOpTHja +qpRjxgJ793rkPmHVlKFljY3wNycEUnZ++e/+mLr6WuPpOnRP2T9t3E3AFgLW+PLw +6aBovTh+nlGZq/TIRdC9Mjl0xDhp0dGURj1WVxZi5BjsQjTrwSCWr6XnCbzpakOg +SQyq3zF7YVkjaJXZ8fgupiD0MSwd75H4ueQx6vVKtEY9eh++CDSM6bhIthgdWwCR +b1tqZLqqP5yz0FAzpyGb1Jfv2kATkVHc7fkSi6BnRmqIJFhMkyTxuvDunmsZBnYQ +wTO57CuvqhtU4yHaoYhZrvqr5T4nrGlXu6trNHB//snIBeaIh8lYV4tikGHU6SeK +4WaBzH1sCXm2gxSgfv5P +=le3l +-END PGP SIGNATURE- Added: dev/tapestry/apache-tapestry-5.4.3-apidocs.zip.md5 == --- dev/tapestry/apache-tapestry-5.4.3-apidocs.zip.md5 (added) +++ dev/tapestry/apache-tapestry-5.4.3-apidocs.zip.md5 Thu Apr 20 15:44:46 2017 @@ -0,0 +1 @@ +8ab4ca3546348e82862c6f6dc47397a5 \ No newline at end of file Added: dev/tapestry/apache-tapestry-5.4.3-bin.zip == Binary file - no diff available. Propchange: dev/tapestry/apache-tapestry-5.4.3-bin.zip -- svn:mime-type = application/octet-stream Added: dev/tapestry/apache-tapestry-5.4.3-bin.zip.asc == --- dev/tapestry/apache-tapestry-5.4.3-bin.zip.asc (added) +++ dev/tapestry/apache-tapestry-5.4.3-bin.zip.asc Thu Apr 20 15:44:46 2017 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: BCPG v1.51 + +iQIcBAABAgAGBQJY+NVLAAoJEPY4+oVWqKshSJsP/jgTyEOS6WaIb2dtyqbbmQ4I +HGK0gsUk8YNK9rQkSAkE3T8gms7YIRCgnaAQRpwog6dMztr3RuIapmwSJy64KAc3 +cPBmrKlNOmCLvYNZsKQmOMr8etKlDFT49XqQ/ijjFfRTCksjY+7o63kwojjRn7sX +sAoP/Di/JghbngaurIajvXCUw6Ss5IyS/2/X6nSejqOafjtfpxgure7ibzMU7toN +nPsRT0tBSyQchrrM9cYPQX2tiMb8yTaW1MRqrmGM1mygYCzDIcuiD7wJL0RB7LCP +IsyeIwuWfFmGoh9hzCJmiuFo+bUI1emcCdSAF6J1fANzk2mCSHf3K/L87dQ9RaYD +5zMQG9qQ86qvLLbpN9Sbn4qgiYzEki5DExIKDCT1a9HEn8v+ISbEck3StWvksEiM +bqMCRu08qb4oCE2RiwKTcC+P3Ec2eKp25RaJZZqwYIYi8MW5v98xM9NUqnFW8inc +xvwWF894swesxQDtoE/aRSB/Srvjf5Rxb/IHEimvSDX3q4s6HG++G/Yr81VbrS2A +ugLRMdmJHf1Oscr/gOQr331ohUIS+c14/f4bVuhkCMVfHvZEhjYeNFgooBV0Umxk +6bsxpj+eDOvkmLWGSij2KYoGxVcelxm11GVDasO8O8C3DB6GHvm/aB/FIrnvUGzc +XEvRBPRNEiWxFb9Upiee +=gMno +-END PGP SIGNATURE- Added: dev/tapestry/apache-tapestry-5.4.3-bin.zip.md5 == --- dev/tapestry/apache-tapestry-5.4.3-bin.zip.md5 (added) +++ dev/tapestry/apache-tapestry-5.4.3-bin.zip.md5 Thu Apr 20 15:44:46 2017 @@ -0,0 +1 @@ +4015631785f8e4ea8048b11734831831 \ No newline at end of file Added: dev/tapestry/apache-tapestry-5.4.3-sources.zip == Binary file - no diff available. Propchange: dev/tapestry/apache-tapestry-5.4.3-sources.zip -- svn:mime-type = application/octet-stream Added: dev/tapestry/apache-tapestry-5.4.3-sources.zip.asc == --- dev/tapestry/apache-tapestry-5.4.3-sources.zip.asc (added) +++ dev/tapestry/apache-tapestry-5.4.3-sources.zip.asc Thu Apr 20 15:44:46 2017 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: BCPG v1.51 + +iQIcBAABAgAGBQJY+NVLAAoJEPY4
[tapestry-5] Git Push Summary
Repository: tapestry-5 Updated Tags: refs/tags/5.4.3 [created] 85cc611fb
tapestry-5 git commit: TAP5-2580: don't override defaults for SymbolConstants.MINIFICATION_ENABLED
Repository: tapestry-5 Updated Branches: refs/heads/5.4.x a3bc8aac7 -> 85cc611fb TAP5-2580: don't override defaults for SymbolConstants.MINIFICATION_ENABLED Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/85cc611f Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/85cc611f Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/85cc611f Branch: refs/heads/5.4.x Commit: 85cc611fbad4a3574664b33ce9adf614b4f0fe07 Parents: a3bc8aa Author: Jochen KemnadeAuthored: Thu Apr 20 16:35:17 2017 +0200 Committer: Jochen Kemnade Committed: Thu Apr 20 16:37:11 2017 +0200 -- .../archetype-resources/src/main/java/services/AppModule.java | 1 - 1 file changed, 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/85cc611f/quickstart/filtered/archetype-resources/src/main/java/services/AppModule.java -- diff --git a/quickstart/filtered/archetype-resources/src/main/java/services/AppModule.java b/quickstart/filtered/archetype-resources/src/main/java/services/AppModule.java index 3c2e1ab..dc19a51 100644 --- a/quickstart/filtered/archetype-resources/src/main/java/services/AppModule.java +++ b/quickstart/filtered/archetype-resources/src/main/java/services/AppModule.java @@ -73,7 +73,6 @@ public class AppModule // option in 5.5. configuration.add(SymbolConstants.JAVASCRIPT_INFRASTRUCTURE_PROVIDER, "jquery"); configuration.add(SymbolConstants.BOOTSTRAP_ROOT, "context:mybootstrap"); - configuration.add(SymbolConstants.MINIFICATION_ENABLED, true); }
tapestry-5 git commit: TAP5-2580: don't override defaults for SymbolConstants.MINIFICATION_ENABLED
Repository: tapestry-5 Updated Branches: refs/heads/master 006390ddf -> 95a548ec4 TAP5-2580: don't override defaults for SymbolConstants.MINIFICATION_ENABLED Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/95a548ec Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/95a548ec Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/95a548ec Branch: refs/heads/master Commit: 95a548ec488a3c09c16117a0e6f9d3ce28db0322 Parents: 006390d Author: Jochen KemnadeAuthored: Thu Apr 20 16:35:17 2017 +0200 Committer: Jochen Kemnade Committed: Thu Apr 20 16:36:44 2017 +0200 -- .../archetype-resources/src/main/java/services/AppModule.java | 1 - 1 file changed, 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/95a548ec/quickstart/filtered/archetype-resources/src/main/java/services/AppModule.java -- diff --git a/quickstart/filtered/archetype-resources/src/main/java/services/AppModule.java b/quickstart/filtered/archetype-resources/src/main/java/services/AppModule.java index 3c2e1ab..dc19a51 100644 --- a/quickstart/filtered/archetype-resources/src/main/java/services/AppModule.java +++ b/quickstart/filtered/archetype-resources/src/main/java/services/AppModule.java @@ -73,7 +73,6 @@ public class AppModule // option in 5.5. configuration.add(SymbolConstants.JAVASCRIPT_INFRASTRUCTURE_PROVIDER, "jquery"); configuration.add(SymbolConstants.BOOTSTRAP_ROOT, "context:mybootstrap"); - configuration.add(SymbolConstants.MINIFICATION_ENABLED, true); }
tapestry-5 git commit: TAP5-2578: restore constructor signature from before the tapestry-json rewrite
Repository: tapestry-5 Updated Branches: refs/heads/5.4.x 245857b51 -> a3bc8aac7 TAP5-2578: restore constructor signature from before the tapestry-json rewrite Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/a3bc8aac Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/a3bc8aac Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/a3bc8aac Branch: refs/heads/5.4.x Commit: a3bc8aac780fbc42d4e9eb1964cec98747f5b583 Parents: 245857b Author: Jochen KemnadeAuthored: Wed Apr 19 09:45:54 2017 +0200 Committer: Jochen Kemnade Committed: Wed Apr 19 09:47:08 2017 +0200 -- .../src/main/java/org/apache/tapestry5/json/JSONObject.java| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/a3bc8aac/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONObject.java -- diff --git a/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONObject.java b/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONObject.java index 0073ad9..f5727fa 100644 --- a/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONObject.java +++ b/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONObject.java @@ -171,7 +171,7 @@ public final class JSONObject extends JSONCollection { * @param namesThe names of the fields to copy. * @throws RuntimeException On internal errors. Shouldn't happen. */ -public JSONObject(JSONObject copyFrom, String[] names) { +public JSONObject(JSONObject copyFrom, String... names) { this(); for (String name : names) { Object value = copyFrom.opt(name);
tapestry-5 git commit: TAP5-2578: restore constructor signature from before the tapestry-json rewrite
Repository: tapestry-5 Updated Branches: refs/heads/master 112014a51 -> 006390ddf TAP5-2578: restore constructor signature from before the tapestry-json rewrite Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/006390dd Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/006390dd Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/006390dd Branch: refs/heads/master Commit: 006390ddf96aa4a7473e23e94105091b3bd60f18 Parents: 112014a Author: Jochen KemnadeAuthored: Wed Apr 19 09:45:54 2017 +0200 Committer: Jochen Kemnade Committed: Wed Apr 19 09:45:54 2017 +0200 -- .../src/main/java/org/apache/tapestry5/json/JSONObject.java| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/006390dd/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONObject.java -- diff --git a/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONObject.java b/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONObject.java index 0073ad9..f5727fa 100644 --- a/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONObject.java +++ b/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONObject.java @@ -171,7 +171,7 @@ public final class JSONObject extends JSONCollection { * @param namesThe names of the fields to copy. * @throws RuntimeException On internal errors. Shouldn't happen. */ -public JSONObject(JSONObject copyFrom, String[] names) { +public JSONObject(JSONObject copyFrom, String... names) { this(); for (String name : names) { Object value = copyFrom.opt(name);
svn commit: r1010700 - in /websites/production/tapestry/content: archetype-catalog.xml doap.rdf
Author: jkemnade Date: Wed Apr 19 06:28:10 2017 New Revision: 1010700 Log: updates for 5.4.2 Modified: websites/production/tapestry/content/archetype-catalog.xml websites/production/tapestry/content/doap.rdf Modified: websites/production/tapestry/content/archetype-catalog.xml == --- websites/production/tapestry/content/archetype-catalog.xml (original) +++ websites/production/tapestry/content/archetype-catalog.xml Wed Apr 19 06:28:10 2017 @@ -6,7 +6,7 @@ org.apache.tapestry quickstart - 5.4.1 + 5.4.2 Tapestry 5 Quickstart Project Modified: websites/production/tapestry/content/doap.rdf == --- websites/production/tapestry/content/doap.rdf (original) +++ websites/production/tapestry/content/doap.rdf Wed Apr 19 06:28:10 2017 @@ -45,8 +45,8 @@ Apache Tapestry -2016-03-20 -5.4.1 +2016-04-13 +5.4.2
svn commit: r1010435 - /websites/production/tapestry/content/5.4.2/index.html
Author: jkemnade Date: Thu Apr 13 17:15:47 2017 New Revision: 1010435 Log: fix another version number Modified: websites/production/tapestry/content/5.4.2/index.html Modified: websites/production/tapestry/content/5.4.2/index.html == --- websites/production/tapestry/content/5.4.2/index.html (original) +++ websites/production/tapestry/content/5.4.2/index.html Thu Apr 13 17:15:47 2017 @@ -18,7 +18,7 @@ http://tapestry.apache.org; class="brand"> -Apache Tapestry 5.4-beta-22 +Apache Tapestry 5.4.2
svn commit: r1010434 - /websites/production/tapestry/content/current
Author: jkemnade Date: Thu Apr 13 17:12:34 2017 New Revision: 1010434 Log: Updated javadocs current symbolic link Modified: websites/production/tapestry/content/current Modified: websites/production/tapestry/content/current == --- websites/production/tapestry/content/current (original) +++ websites/production/tapestry/content/current Thu Apr 13 17:12:34 2017 @@ -1 +1 @@ -link 5.4 \ No newline at end of file +link 5.4.2 \ No newline at end of file
svn commit: r1010433 - /websites/production/tapestry/content/5.4.2/index.html
Author: jkemnade Date: Thu Apr 13 17:12:04 2017 New Revision: 1010433 Log: fix version number Modified: websites/production/tapestry/content/5.4.2/index.html Modified: websites/production/tapestry/content/5.4.2/index.html == --- websites/production/tapestry/content/5.4.2/index.html (original) +++ websites/production/tapestry/content/5.4.2/index.html Thu Apr 13 17:12:04 2017 @@ -1,7 +1,7 @@ -Apache Tapestry 5.4-beta-22 - API Documentation +Apache Tapestry 5.4.2 - API Documentation
svn commit: r19139 - /release/tapestry/
Author: jkemnade Date: Thu Apr 13 16:09:20 2017 New Revision: 19139 Log: 5.4.2 Added: release/tapestry/apache-tapestry-5.4.2-apidocs.zip (with props) release/tapestry/apache-tapestry-5.4.2-apidocs.zip.asc release/tapestry/apache-tapestry-5.4.2-apidocs.zip.md5 release/tapestry/apache-tapestry-5.4.2-bin.zip (with props) release/tapestry/apache-tapestry-5.4.2-bin.zip.asc release/tapestry/apache-tapestry-5.4.2-bin.zip.md5 release/tapestry/apache-tapestry-5.4.2-sources.zip (with props) release/tapestry/apache-tapestry-5.4.2-sources.zip.asc release/tapestry/apache-tapestry-5.4.2-sources.zip.md5 Added: release/tapestry/apache-tapestry-5.4.2-apidocs.zip == Binary file - no diff available. Propchange: release/tapestry/apache-tapestry-5.4.2-apidocs.zip -- svn:mime-type = application/octet-stream Added: release/tapestry/apache-tapestry-5.4.2-apidocs.zip.asc == --- release/tapestry/apache-tapestry-5.4.2-apidocs.zip.asc (added) +++ release/tapestry/apache-tapestry-5.4.2-apidocs.zip.asc Thu Apr 13 16:09:20 2017 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: BCPG v1.51 + +iQIcBAABAgAGBQJY62dIAAoJEPY4+oVWqKshgjgP/148HiiF4M4Gojq7KvHh4EQe +D8v3O19fYzlUdhzqniLBOa/U/Qw41XC8fS4qU5D8rdrvBPwdlyEtdhcitYdJmtgn +kpTYwJNa14jzIAWDwyPscraUkVD6VJi5KxldSsqxbMJU1/ZGVQ+c+zW2Nua2Dj4I +H+cDrMykMts0s7YjQjXiCwD75+h+tQ752v9EhBHF8+UXerE1baAgnDr2Gq8Y3ODx +HtY0CZpYZuVGzLLjwI0cRvgFkKX5FKQot8Gg0FF+GAFY5oQ3GJ4l9TQ7AZm3CRho +EQ6HhYy10zlLcijwgpVGHSpnBXwL3xFqNjoY4Wh68wUMHQOiGV1alT7s1FzKSpsY +ygB9RBZhKWxy8glFj2GqznFKNGSxNCikI9LaJ84+sGR/te0XLYk78vfV8MLMliA3 +WWJXOn3FilzWUtLJGZ7DgAWBsdEe3Nmi4xbdHw/kVfEgrCBOJgQOWS6kgkbZSZSN +t7OYEYueVkNhaiuzQ3Ttv/0NBANxllClG6d4I/zobMrMaUJUuY/S4LuoAg1nLdPC +kuWg8SYwqb9JdGUCV00nXUBmJZmVND+TM866J1ONnerr8ODVlSD4bWQ0Ypk1uhER +0ZtO14tx20bBjrqfgbSoiEWjQ2vs99ki2PXBnJkS3u2qCF+RLQgY7PGW3Mj5tAEb +H52omnAJLwMj44Hvi4GN +=QXSq +-END PGP SIGNATURE- Added: release/tapestry/apache-tapestry-5.4.2-apidocs.zip.md5 == --- release/tapestry/apache-tapestry-5.4.2-apidocs.zip.md5 (added) +++ release/tapestry/apache-tapestry-5.4.2-apidocs.zip.md5 Thu Apr 13 16:09:20 2017 @@ -0,0 +1 @@ +714afd5e5a30e6735af7542ed94e9c81 \ No newline at end of file Added: release/tapestry/apache-tapestry-5.4.2-bin.zip == Binary file - no diff available. Propchange: release/tapestry/apache-tapestry-5.4.2-bin.zip -- svn:mime-type = application/octet-stream Added: release/tapestry/apache-tapestry-5.4.2-bin.zip.asc == --- release/tapestry/apache-tapestry-5.4.2-bin.zip.asc (added) +++ release/tapestry/apache-tapestry-5.4.2-bin.zip.asc Thu Apr 13 16:09:20 2017 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: BCPG v1.51 + +iQIcBAABAgAGBQJY62dIAAoJEPY4+oVWqKsh9pwP/A3gO0b6vNxTrAFkHflxEOS5 +cgABUi6yirkjgJzPRGC2U39dv9iI+0vdcNk3Izc0ZuHtobo1KTL8sRySgxNumLpV +BpxRDRaPqRI1+msdOsaMqzz54A59xNm/V9Qeie8/04n7dbpoZUEwWocw5Cq/tbOP +weJ0ZxQCnnXoshuwogkzse8sNFscL5vMu7bYz/tgHFEOweRa06vF/rdK+tYzhehg +fsJB/xy3lGncf4JKoOwgazaWPnTVAkvtR2O9Nw5SCwHW0PmM6gO9rAFd3VoQl1yp +OXcjYxRru4FwMcTLfI5kdU8GX9yRH8i+Ay6OCzbsXuzobNPUhF44RM2H/SWkudzu +eMhqKYkh6Mdet7+SmR/t328nwEW1ilGUQYTPO3Og2r1pWhq32hDMrQwjn51Ikq7e +KfKFq5tGzHvzTquoIo3u+B+iAz+IsvskIYB/tLBCXr0bA/oUXK5UvXmQkj+7uSyr +TzMx7oqT77nx82s+7mCUo8JJ2NbP/bHR2aaTapqc+JF6nsDDWcfD9ss/T5Alaqmd +nJurpDbNO5XO9dsFJ29wLfVuHL/kC7duRcPmZJ++PPHEEGVUXC8LKUmI48MPmg74 +WSWHsgxILiDQ1Zdfr6jVZDRqeCRFRav4osz4OIoKbHGM3woQy3k98xko1meiZVVB +lczfYcBfF2huvYw6mQ07 +=nm49 +-END PGP SIGNATURE- Added: release/tapestry/apache-tapestry-5.4.2-bin.zip.md5 == --- release/tapestry/apache-tapestry-5.4.2-bin.zip.md5 (added) +++ release/tapestry/apache-tapestry-5.4.2-bin.zip.md5 Thu Apr 13 16:09:20 2017 @@ -0,0 +1 @@ +6d0eb9e0cfc748f0be989ddd6c067eff \ No newline at end of file Added: release/tapestry/apache-tapestry-5.4.2-sources.zip == Binary file - no diff available. Propchange: release/tapestry/apache-tapestry-5.4.2-sources.zip -- svn:mime-type = application/octet-stream Added: release/tapestry/apache-tapestry-5.4.2-sources.zip.asc == --- release/tapestry/apache-tapestry-5.4.2-sources.zip.asc (added) +++ release/tapestry/apache-tapestry-5.4.2-sources.zip.asc Thu Apr
tapestry-5 git commit: increment version number
Repository: tapestry-5 Updated Branches: refs/heads/5.4.x b60235838 -> 245857b51 increment version number Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/245857b5 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/245857b5 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/245857b5 Branch: refs/heads/5.4.x Commit: 245857b519ca6dca9e64a224cd15dff2b3076fba Parents: b602358 Author: Jochen KemnadeAuthored: Tue Mar 21 11:05:09 2017 +0100 Committer: Jochen Kemnade Committed: Mon Apr 10 13:17:34 2017 +0200 -- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/245857b5/build.gradle -- diff --git a/build.gradle b/build.gradle index a21747f..77963b6 100755 --- a/build.gradle +++ b/build.gradle @@ -33,7 +33,7 @@ project.version = tapestryVersion() def tapestryVersion() { -def major = "5.4.2" +def major = "5.4.3" def minor = "" // When building on the CI server, make sure -SNAPSHOT is appended, as it is a nightly build.