You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by jk...@apache.org on 2016/09/12 07:31:32 UTC
[1/4] tapestry-5 git commit: upgrade closure compiler
Repository: tapestry-5
Updated Branches:
refs/heads/master e85e02a3d -> cc2813255
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/cc281325
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/cc281325
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/cc281325
Branch: refs/heads/master
Commit: cc28132559c7bc32ef65cfb99e00dd681f8fcc43
Parents: 1a8f086
Author: Jochen Kemnade <jo...@eddyson.de>
Authored: Mon Sep 12 09:30:51 2016 +0200
Committer: Jochen Kemnade <jo...@eddyson.de>
Committed: Mon Sep 12 09:31:23 2016 +0200
----------------------------------------------------------------------
tapestry-webresources/build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/cc281325/tapestry-webresources/build.gradle
----------------------------------------------------------------------
diff --git a/tapestry-webresources/build.gradle b/tapestry-webresources/build.gradle
index ec5727b..f49bede 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:v20160619"
+ compile "com.google.javascript:closure-compiler:v20160822"
compile "org.mozilla:rhino:1.7.7.1"
testCompile project(":tapestry-runner")
[4/4] tapestry-5 git commit: remove unused sonar plugin
Posted by jk...@apache.org.
remove unused sonar plugin
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/a89a969a
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/a89a969a
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/a89a969a
Branch: refs/heads/master
Commit: a89a969a65e12bf36768347bf2210832bd3a6426
Parents: e85e02a
Author: Jochen Kemnade <jo...@eddyson.de>
Authored: Mon Sep 12 09:19:55 2016 +0200
Committer: Jochen Kemnade <jo...@eddyson.de>
Committed: Mon Sep 12 09:31:23 2016 +0200
----------------------------------------------------------------------
build.gradle | 18 ------------------
1 file changed, 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/a89a969a/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 5026ab1..c1db6cc 100755
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,6 @@ description = "Apache Tapestry 5 Project"
import org.apache.tools.ant.filters.ReplaceTokens
apply plugin: "base"
-apply plugin: "sonar"
apply from: "ssh.gradle"
apply from: "md5.gradle"
@@ -44,11 +43,6 @@ def tapestryVersion() {
// Let analysis.apache.org get in touch with our builds
project.ext {
- sonarUrl = System.getProperty("sonarUrl", "https://analysis.apache.org");
- sonarDbUrl = System.getProperty("sonarDbUrl", "");
- sonarDbUsername = System.getProperty("sonarDbUsername", "");
- sonarDbPassword = System.getProperty("sonarDbPassword", "");
- sonarDbDriverClassName = "com.mysql.jdbc.Driver"
stagingUrl = "https://repository.apache.org/service/local/staging/deploy/maven2/"
snapshotUrl = "https://repository.apache.org/content/repositories/snapshots"
@@ -71,18 +65,6 @@ project.ext {
archiveDeployFolder = { getProperty("apacheArchivesFolder") }
}
-sonar {
- server {
- url = sonarUrl
- }
- database {
- url = sonarDbUrl
- driverClassName = sonarDbDriverClassName
- username = sonarDbUsername
- password = sonarDbPassword
- }
-}
-
allprojects {
apply plugin: "eclipse"
[3/4] tapestry-5 git commit: TAP5-2478: short-circuit in getIfExists
if there is no active session
Posted by jk...@apache.org.
TAP5-2478: short-circuit in getIfExists if there is no active session
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/1a8f0864
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/1a8f0864
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/1a8f0864
Branch: refs/heads/master
Commit: 1a8f0864dd3632fdb911f59e3c9fc0a1d487c84e
Parents: 2ed0a7c
Author: Jochen Kemnade <jo...@eddyson.de>
Authored: Wed Jul 20 14:47:53 2016 +0200
Committer: Jochen Kemnade <jo...@eddyson.de>
Committed: Mon Sep 12 09:31:23 2016 +0200
----------------------------------------------------------------------
.../services/ApplicationStateManagerImpl.java | 9 ++++++---
...essionApplicationStatePersistenceStrategy.java | 18 +++++++++++++++++-
.../ApplicationStatePersistenceStrategy.java | 7 +++++++
.../apache/tapestry5/test/TapestryTestCase.java | 6 ++++++
.../services/ApplicationStateManagerImplTest.java | 5 ++---
5 files changed, 38 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/1a8f0864/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ApplicationStateManagerImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ApplicationStateManagerImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ApplicationStateManagerImpl.java
index 660911f..631f5af 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ApplicationStateManagerImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ApplicationStateManagerImpl.java
@@ -59,6 +59,11 @@ public class ApplicationStateManagerImpl implements ApplicationStateManager
{
return strategy.exists(ssoClass);
}
+
+ T getIfExists()
+ {
+ return strategy.getIfExists(ssoClass);
+ }
}
/**
@@ -135,9 +140,7 @@ public class ApplicationStateManagerImpl implements ApplicationStateManager
public <T> T getIfExists(Class<T> ssoClass)
{
- ApplicationStateAdapter<T> adapter = getAdapter(ssoClass);
-
- return adapter.exists() ? adapter.getOrCreate() : null;
+ return getAdapter(ssoClass).getIfExists();
}
public <T> void set(Class<T> ssoClass, T sso)
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/1a8f0864/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/SessionApplicationStatePersistenceStrategy.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/SessionApplicationStatePersistenceStrategy.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/SessionApplicationStatePersistenceStrategy.java
index bd33e35..a459ae0 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/SessionApplicationStatePersistenceStrategy.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/SessionApplicationStatePersistenceStrategy.java
@@ -43,7 +43,7 @@ public class SessionApplicationStatePersistenceStrategy implements ApplicationSt
{
return (T) getOrCreate(ssoClass, creator);
}
-
+
protected <T> Object getOrCreate(Class<T> ssoClass, ApplicationStateCreator<T> creator)
{
Session session = getSession();
@@ -61,6 +61,22 @@ public class SessionApplicationStatePersistenceStrategy implements ApplicationSt
return sso;
}
+ public <T> T getIfExists(Class<T> ssoClass)
+ {
+ Session session = request.getSession(false);
+
+ if (session != null)
+ {
+
+ String key = buildKey(ssoClass);
+
+ Object sso = session.getAttribute(key);
+
+ return sso != null ? (T)sso : null;
+ }
+ return null;
+ }
+
protected <T> String buildKey(Class<T> ssoClass)
{
return PREFIX + ssoClass.getName();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/1a8f0864/tapestry-core/src/main/java/org/apache/tapestry5/services/ApplicationStatePersistenceStrategy.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/ApplicationStatePersistenceStrategy.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/ApplicationStatePersistenceStrategy.java
index d6eefb6..c6f5e87 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/ApplicationStatePersistenceStrategy.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/ApplicationStatePersistenceStrategy.java
@@ -40,4 +40,11 @@ public interface ApplicationStatePersistenceStrategy
* Returns true if the SSO already exists, false if null.
*/
<T> boolean exists(Class<T> ssoClass);
+
+ /**
+ * Returns the SSO if it exists or null.
+ */
+ default <T> T getIfExists(Class<T> ssoClass) {
+ return exists(ssoClass) ? get(ssoClass, () -> null) : null;
+ }
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/1a8f0864/tapestry-core/src/main/java/org/apache/tapestry5/test/TapestryTestCase.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/test/TapestryTestCase.java b/tapestry-core/src/main/java/org/apache/tapestry5/test/TapestryTestCase.java
index b615489..692a826 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/test/TapestryTestCase.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/test/TapestryTestCase.java
@@ -354,6 +354,12 @@ public abstract class TapestryTestCase extends IOCTestCase
expect(binding.get()).andReturn(value);
}
+ protected final <T> void train_getIfExists(ApplicationStatePersistenceStrategy strategy, Class<T> asoClass,
+ T aso)
+ {
+ expect(strategy.getIfExists(asoClass)).andReturn(aso);
+ }
+
protected void train_getAttribute(HttpSession session, String attributeName, Object value)
{
expect(session.getAttribute(attributeName)).andReturn(value);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/1a8f0864/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ApplicationStateManagerImplTest.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ApplicationStateManagerImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ApplicationStateManagerImplTest.java
index df27034..f9c69a2 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ApplicationStateManagerImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ApplicationStateManagerImplTest.java
@@ -196,7 +196,7 @@ public class ApplicationStateManagerImplTest extends InternalBaseTestCase
new ApplicationStateContribution(strategyName, creator));
train_get(source, strategyName, strategy);
- train_exists(strategy, asoClass, false);
+ train_getIfExists(strategy, asoClass, null);
replay();
@@ -222,8 +222,7 @@ public class ApplicationStateManagerImplTest extends InternalBaseTestCase
new ApplicationStateContribution(strategyName, creator));
train_get(source, strategyName, strategy);
- train_exists(strategy, asoClass, true);
- train_get(strategy, asoClass, creator, aso);
+ train_getIfExists(strategy, asoClass, aso);
replay();
[2/4] tapestry-5 git commit: upgrade Gradle wrapper
Posted by jk...@apache.org.
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/2ed0a7ca
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/2ed0a7ca
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/2ed0a7ca
Branch: refs/heads/master
Commit: 2ed0a7ca1301f3944111e0fc8139dff4c28e0f76
Parents: a89a969
Author: Jochen Kemnade <jo...@eddyson.de>
Authored: Mon Sep 12 09:21:47 2016 +0200
Committer: Jochen Kemnade <jo...@eddyson.de>
Committed: Mon Sep 12 09:31:23 2016 +0200
----------------------------------------------------------------------
build.gradle | 2 +-
gradle/wrapper/gradle-wrapper.jar | Bin 53324 -> 52818 bytes
gradle/wrapper/gradle-wrapper.properties | 4 ++--
gradlew | 5 +++++
gradlew.bat | 6 ------
5 files changed, 8 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/2ed0a7ca/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index c1db6cc..5ee217f 100755
--- a/build.gradle
+++ b/build.gradle
@@ -418,7 +418,7 @@ task continuousIntegration {
}
task wrapper(type: Wrapper) {
- gradleVersion = '2.14.1'
+ gradleVersion = '3.0.0'
description "Regenerates the Gradle Wrapper files"
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/2ed0a7ca/gradle/wrapper/gradle-wrapper.jar
----------------------------------------------------------------------
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 3baa851..deedc7f 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/2ed0a7ca/gradle/wrapper/gradle-wrapper.properties
----------------------------------------------------------------------
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 2eff010..949f0cb 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Jul 20 15:08:04 CEST 2016
+#Mon Sep 12 09:21:40 CEST 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.0.0-bin.zip
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/2ed0a7ca/gradlew
----------------------------------------------------------------------
diff --git a/gradlew b/gradlew
index 27309d9..9aa616c 100755
--- a/gradlew
+++ b/gradlew
@@ -161,4 +161,9 @@ function splitJvmOpts() {
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [[ "$(uname)" == "Darwin" ]] && [[ "$HOME" == "$PWD" ]]; then
+ cd "$(dirname "$0")"
+fi
+
exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/2ed0a7ca/gradlew.bat
----------------------------------------------------------------------
diff --git a/gradlew.bat b/gradlew.bat
index f6d5974..e95643d 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -49,7 +49,6 @@ goto fail
@rem Get command-line arguments, handling Windows variants
if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
:win9xME_args
@rem Slurp the command line arguments.
@@ -60,11 +59,6 @@ set _SKIP=2
if "x%~1" == "x" goto execute
set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
:execute
@rem Setup the command line