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 2015/09/18 11:04:39 UTC
[1/2] tapestry-5 git commit: fix typo
Repository: tapestry-5
Updated Branches:
refs/heads/master 66eed71d2 -> 36301cc42
fix typo
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/90273ab1
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/90273ab1
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/90273ab1
Branch: refs/heads/master
Commit: 90273ab162e27392843b438f14bba15d64e1dd54
Parents: 66eed71
Author: Jochen Kemnade <jo...@eddyson.de>
Authored: Fri Sep 18 09:36:42 2015 +0200
Committer: Jochen Kemnade <jo...@eddyson.de>
Committed: Fri Sep 18 10:45:00 2015 +0200
----------------------------------------------------------------------
.../services/javascript/JavaScriptStackPathConstructor.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/90273ab1/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/JavaScriptStackPathConstructor.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/JavaScriptStackPathConstructor.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/JavaScriptStackPathConstructor.java
index 359e100..6a228d7 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/JavaScriptStackPathConstructor.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/JavaScriptStackPathConstructor.java
@@ -34,7 +34,7 @@ import org.apache.tapestry5.services.javascript.JavaScriptSupport;
public interface JavaScriptStackPathConstructor
{
/**
- * Given a stack, by name, return a list of URL paths for the individual libraqries in the stack.
+ * Given a stack, by name, return a list of URL paths for the individual libraries in the stack.
* If scripts are combined, this will be a single (combined) URL.
*
* @param stackName
[2/2] tapestry-5 git commit: tweak JVM memory settings
Posted by jk...@apache.org.
tweak JVM memory settings
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/36301cc4
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/36301cc4
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/36301cc4
Branch: refs/heads/master
Commit: 36301cc4230431a1bceadd829e1a373cdd7315d5
Parents: 90273ab
Author: Jochen Kemnade <jo...@eddyson.de>
Authored: Fri Sep 18 11:03:52 2015 +0200
Committer: Jochen Kemnade <jo...@eddyson.de>
Committed: Fri Sep 18 11:03:52 2015 +0200
----------------------------------------------------------------------
build.gradle | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/36301cc4/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 2c28632..c637b09 100755
--- a/build.gradle
+++ b/build.gradle
@@ -137,6 +137,10 @@ dependencies {
}
subprojects {
+
+ def jdkVersion = System.properties['java.version']
+ def specifyMaxPermSize = jdkVersion ==~ /1\.[67].+/
+
version = parent.version
group = "org.apache.tapestry"
@@ -182,7 +186,10 @@ subprojects {
compileTestGroovy {
configure(groovyOptions.forkOptions) {
memoryMaximumSize = '1g'
- jvmArgs = ['-XX:MaxPermSize=512m', '-Xms512m', '-Xmx1g']
+ jvmArgs = ['-Xms512m', '-Xmx1g']
+ if (specifyMaxPermSize){
+ jvmArgs << '-XX:MaxPermSize=512m'
+ }
}
}
@@ -190,15 +197,19 @@ subprojects {
useTestNG()
options.suites("src/test/conf/testng.xml")
-
- maxHeapSize "600M"
+ if (specifyMaxPermSize){
+ maxHeapSize "400M"
+ jvmArgs("-XX:MaxPermSize=200m")
+ }else{
+ maxHeapSize "600M"
+ }
// Turn off live service reloading
systemProperties["tapestry.service-reloading-enabled"] = "false"
systemProperties["java.io.tmpdir"] = temporaryDir.absolutePath
- jvmArgs("-XX:MaxPermSize=256m", "-Dfile.encoding=UTF-8")
+ jvmArgs("-Dfile.encoding=UTF-8")
environment.LANG = 'en_US.UTF-8'
[2/2] tapestry-5 git commit: tweak JVM memory settings
Posted by jk...@apache.org.
tweak JVM memory settings
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/36301cc4
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/36301cc4
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/36301cc4
Branch: refs/heads/master
Commit: 36301cc4230431a1bceadd829e1a373cdd7315d5
Parents: 90273ab
Author: Jochen Kemnade <jo...@eddyson.de>
Authored: Fri Sep 18 11:03:52 2015 +0200
Committer: Jochen Kemnade <jo...@eddyson.de>
Committed: Fri Sep 18 11:03:52 2015 +0200
----------------------------------------------------------------------
build.gradle | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/36301cc4/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 2c28632..c637b09 100755
--- a/build.gradle
+++ b/build.gradle
@@ -137,6 +137,10 @@ dependencies {
}
subprojects {
+
+ def jdkVersion = System.properties['java.version']
+ def specifyMaxPermSize = jdkVersion ==~ /1\.[67].+/
+
version = parent.version
group = "org.apache.tapestry"
@@ -182,7 +186,10 @@ subprojects {
compileTestGroovy {
configure(groovyOptions.forkOptions) {
memoryMaximumSize = '1g'
- jvmArgs = ['-XX:MaxPermSize=512m', '-Xms512m', '-Xmx1g']
+ jvmArgs = ['-Xms512m', '-Xmx1g']
+ if (specifyMaxPermSize){
+ jvmArgs << '-XX:MaxPermSize=512m'
+ }
}
}
@@ -190,15 +197,19 @@ subprojects {
useTestNG()
options.suites("src/test/conf/testng.xml")
-
- maxHeapSize "600M"
+ if (specifyMaxPermSize){
+ maxHeapSize "400M"
+ jvmArgs("-XX:MaxPermSize=200m")
+ }else{
+ maxHeapSize "600M"
+ }
// Turn off live service reloading
systemProperties["tapestry.service-reloading-enabled"] = "false"
systemProperties["java.io.tmpdir"] = temporaryDir.absolutePath
- jvmArgs("-XX:MaxPermSize=256m", "-Dfile.encoding=UTF-8")
+ jvmArgs("-Dfile.encoding=UTF-8")
environment.LANG = 'en_US.UTF-8'