You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by hl...@apache.org on 2014/12/24 00:45:33 UTC
[1/4] tapestry-5 git commit: Increase the amount of heap space
Repository: tapestry-5
Updated Branches:
refs/heads/master 32e7ecc02 -> fe8ef8545
Increase the amount of heap space
Was getting "Java heap space" errors from Gradle
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/04496097
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/04496097
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/04496097
Branch: refs/heads/master
Commit: 044960977dfc1dd9158877434619979ccba7a286
Parents: 32e7ecc
Author: Howard M. Lewis Ship <hl...@apache.org>
Authored: Tue Dec 23 15:15:56 2014 -0800
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Tue Dec 23 15:15:56 2014 -0800
----------------------------------------------------------------------
build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/04496097/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 1d17c04..68146a7 100755
--- a/build.gradle
+++ b/build.gradle
@@ -182,7 +182,7 @@ subprojects {
options.suites("src/test/conf/testng.xml")
- maxHeapSize "400M"
+ maxHeapSize "800M"
// Turn off live service reloading
[3/4] tapestry-5 git commit: Force up larger heap for compiling
Groovy tests
Posted by hl...@apache.org.
Force up larger heap for compiling Groovy 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/15a33171
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/15a33171
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/15a33171
Branch: refs/heads/master
Commit: 15a331713734720f984d53c8275f3210f86d71fa
Parents: 7e8fc83
Author: Howard M. Lewis Ship <hl...@apache.org>
Authored: Tue Dec 23 15:33:43 2014 -0800
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Tue Dec 23 15:33:43 2014 -0800
----------------------------------------------------------------------
tapestry-ioc/build.gradle | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/15a33171/tapestry-ioc/build.gradle
----------------------------------------------------------------------
diff --git a/tapestry-ioc/build.gradle b/tapestry-ioc/build.gradle
index 5a5321f..dc4fbe8 100644
--- a/tapestry-ioc/build.gradle
+++ b/tapestry-ioc/build.gradle
@@ -26,3 +26,10 @@ test {
// Override the master build.gradle
systemProperties.remove("tapestry.service-reloading-enabled")
}
+
+compileTestGroovy {
+ configure(groovyOptions.forkOptions) {
+ memoryMaximumSize = '1g'
+ jvmArgs = ['-XX:MaxPermSize=512m', '-Xms512m', '-Xmx1g']
+ }
+}
\ No newline at end of file
[4/4] tapestry-5 git commit: Choose a different set of classes for
the test
Posted by hl...@apache.org.
Choose a different set of classes for the 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/fe8ef854
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/fe8ef854
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/fe8ef854
Branch: refs/heads/master
Commit: fe8ef85454b93d5863e6c6ccd16d1c677e62ea4e
Parents: 15a3317
Author: Howard M. Lewis Ship <hl...@apache.org>
Authored: Tue Dec 23 15:45:22 2014 -0800
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Tue Dec 23 15:45:22 2014 -0800
----------------------------------------------------------------------
.../groovy/ioc/specs/ClasspathScannerImplSpec.groovy | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/fe8ef854/tapestry-ioc/src/test/groovy/ioc/specs/ClasspathScannerImplSpec.groovy
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/groovy/ioc/specs/ClasspathScannerImplSpec.groovy b/tapestry-ioc/src/test/groovy/ioc/specs/ClasspathScannerImplSpec.groovy
index 4ddd6df..a0aa7f7 100644
--- a/tapestry-ioc/src/test/groovy/ioc/specs/ClasspathScannerImplSpec.groovy
+++ b/tapestry-ioc/src/test/groovy/ioc/specs/ClasspathScannerImplSpec.groovy
@@ -1,10 +1,10 @@
package ioc.specs
-import org.apache.tapestry5.ioc.Locatable
-import org.apache.tapestry5.ioc.internal.BasicTypeCoercions
+import org.apache.tapestry5.ioc.Registry
import org.apache.tapestry5.ioc.internal.services.ClasspathScannerImpl
import org.apache.tapestry5.ioc.internal.services.ClasspathURLConverterImpl
import org.apache.tapestry5.ioc.services.ClasspathMatcher
+import org.apache.tapestry5.ioc.util.IdAllocator
import spock.lang.Specification
class ClasspathScannerImplSpec extends Specification {
@@ -18,7 +18,7 @@ class ClasspathScannerImplSpec extends Specification {
def scannerJob = new ClasspathScannerImpl.Job(matchAll, Thread.currentThread().getContextClassLoader(), new ClasspathURLConverterImpl())
when:
- URL url = Locatable.class.getResource('Locatable.class');
+ URL url = Registry.class.getResource('Registry.class');
scannerJob.scanDir("org/apache/tapestry5/ioc/", new File(url.getPath()).parentFile)
while (!scannerJob.queue.isEmpty()) {
def queued = scannerJob.queue.pop();
@@ -29,7 +29,10 @@ class ClasspathScannerImplSpec extends Specification {
def classes = scannerJob.matches
then:
- classes.contains(BasicTypeCoercions.name.replaceAll(/\./, "/") + '.class')
+
+ // classes will contain many names, this choice is arbitrary. The point is, it is located on the file system
+ // (not in a JAR) and it is in a package somewhere beneath the scanDir.
+ classes.contains(IdAllocator.name.replaceAll(/\./, "/") + '.class')
}
[2/4] tapestry-5 git commit: Update for code split out of tapestry-ioc
Posted by hl...@apache.org.
Update for code split out of tapestry-ioc
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/7e8fc835
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/7e8fc835
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/7e8fc835
Branch: refs/heads/master
Commit: 7e8fc8352d204456266eb670e53dfc29245462ab
Parents: 0449609
Author: Howard M. Lewis Ship <hl...@apache.org>
Authored: Tue Dec 23 15:16:35 2014 -0800
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Tue Dec 23 15:16:35 2014 -0800
----------------------------------------------------------------------
.../ioc/specs/ClasspathScannerImplSpec.groovy | 38 ++++++++------------
1 file changed, 15 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/7e8fc835/tapestry-ioc/src/test/groovy/ioc/specs/ClasspathScannerImplSpec.groovy
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/groovy/ioc/specs/ClasspathScannerImplSpec.groovy b/tapestry-ioc/src/test/groovy/ioc/specs/ClasspathScannerImplSpec.groovy
index 72e6eaf..4ddd6df 100644
--- a/tapestry-ioc/src/test/groovy/ioc/specs/ClasspathScannerImplSpec.groovy
+++ b/tapestry-ioc/src/test/groovy/ioc/specs/ClasspathScannerImplSpec.groovy
@@ -1,44 +1,36 @@
package ioc.specs
-import java.io.File;
-import java.net.URL;
-
-import org.apache.tapestry5.ioc.Locatable;
-import org.apache.tapestry5.ioc.internal.services.ClasspathScannerImpl;
+import org.apache.tapestry5.ioc.Locatable
+import org.apache.tapestry5.ioc.internal.BasicTypeCoercions
+import org.apache.tapestry5.ioc.internal.services.ClasspathScannerImpl
import org.apache.tapestry5.ioc.internal.services.ClasspathURLConverterImpl
-import org.apache.tapestry5.ioc.internal.util.InternalUtils;
-import org.apache.tapestry5.ioc.services.ClasspathMatcher;
-import org.apache.tapestry5.ioc.services.ClasspathURLConverter;
-
-import spock.lang.Specification;
+import org.apache.tapestry5.ioc.services.ClasspathMatcher
+import spock.lang.Specification
class ClasspathScannerImplSpec extends Specification {
-
+
// TAP5-2096
def "can locate classes inside a subpackage, inside an extracted JAR file"() {
setup:
- ClasspathMatcher matchAll = new ClasspathMatcher(){
- boolean matches(String arg0, String arg1) {
- true
- };
- }
+ ClasspathMatcher matchAll = { packagePage, fileName -> true } as ClasspathMatcher
+
def scannerJob = new ClasspathScannerImpl.Job(matchAll, Thread.currentThread().getContextClassLoader(), new ClasspathURLConverterImpl())
-
+
when:
URL url = Locatable.class.getResource('Locatable.class');
scannerJob.scanDir("org/apache/tapestry5/ioc/", new File(url.getPath()).parentFile)
- while (!scannerJob.queue.isEmpty())
- {
+ while (!scannerJob.queue.isEmpty()) {
def queued = scannerJob.queue.pop();
queued.run();
}
+
def classes = scannerJob.matches
-
+
then:
- classes.contains(InternalUtils.class.getName().replaceAll(/\./, "/")+'.class')
+ classes.contains(BasicTypeCoercions.name.replaceAll(/\./, "/") + '.class')
}
-
-
+
+
}
[2/4] tapestry-5 git commit: Update for code split out of tapestry-ioc
Posted by hl...@apache.org.
Update for code split out of tapestry-ioc
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/7e8fc835
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/7e8fc835
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/7e8fc835
Branch: refs/heads/master
Commit: 7e8fc8352d204456266eb670e53dfc29245462ab
Parents: 0449609
Author: Howard M. Lewis Ship <hl...@apache.org>
Authored: Tue Dec 23 15:16:35 2014 -0800
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Tue Dec 23 15:16:35 2014 -0800
----------------------------------------------------------------------
.../ioc/specs/ClasspathScannerImplSpec.groovy | 38 ++++++++------------
1 file changed, 15 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/7e8fc835/tapestry-ioc/src/test/groovy/ioc/specs/ClasspathScannerImplSpec.groovy
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/groovy/ioc/specs/ClasspathScannerImplSpec.groovy b/tapestry-ioc/src/test/groovy/ioc/specs/ClasspathScannerImplSpec.groovy
index 72e6eaf..4ddd6df 100644
--- a/tapestry-ioc/src/test/groovy/ioc/specs/ClasspathScannerImplSpec.groovy
+++ b/tapestry-ioc/src/test/groovy/ioc/specs/ClasspathScannerImplSpec.groovy
@@ -1,44 +1,36 @@
package ioc.specs
-import java.io.File;
-import java.net.URL;
-
-import org.apache.tapestry5.ioc.Locatable;
-import org.apache.tapestry5.ioc.internal.services.ClasspathScannerImpl;
+import org.apache.tapestry5.ioc.Locatable
+import org.apache.tapestry5.ioc.internal.BasicTypeCoercions
+import org.apache.tapestry5.ioc.internal.services.ClasspathScannerImpl
import org.apache.tapestry5.ioc.internal.services.ClasspathURLConverterImpl
-import org.apache.tapestry5.ioc.internal.util.InternalUtils;
-import org.apache.tapestry5.ioc.services.ClasspathMatcher;
-import org.apache.tapestry5.ioc.services.ClasspathURLConverter;
-
-import spock.lang.Specification;
+import org.apache.tapestry5.ioc.services.ClasspathMatcher
+import spock.lang.Specification
class ClasspathScannerImplSpec extends Specification {
-
+
// TAP5-2096
def "can locate classes inside a subpackage, inside an extracted JAR file"() {
setup:
- ClasspathMatcher matchAll = new ClasspathMatcher(){
- boolean matches(String arg0, String arg1) {
- true
- };
- }
+ ClasspathMatcher matchAll = { packagePage, fileName -> true } as ClasspathMatcher
+
def scannerJob = new ClasspathScannerImpl.Job(matchAll, Thread.currentThread().getContextClassLoader(), new ClasspathURLConverterImpl())
-
+
when:
URL url = Locatable.class.getResource('Locatable.class');
scannerJob.scanDir("org/apache/tapestry5/ioc/", new File(url.getPath()).parentFile)
- while (!scannerJob.queue.isEmpty())
- {
+ while (!scannerJob.queue.isEmpty()) {
def queued = scannerJob.queue.pop();
queued.run();
}
+
def classes = scannerJob.matches
-
+
then:
- classes.contains(InternalUtils.class.getName().replaceAll(/\./, "/")+'.class')
+ classes.contains(BasicTypeCoercions.name.replaceAll(/\./, "/") + '.class')
}
-
-
+
+
}
[4/4] tapestry-5 git commit: Choose a different set of classes for
the test
Posted by hl...@apache.org.
Choose a different set of classes for the 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/fe8ef854
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/fe8ef854
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/fe8ef854
Branch: refs/heads/master
Commit: fe8ef85454b93d5863e6c6ccd16d1c677e62ea4e
Parents: 15a3317
Author: Howard M. Lewis Ship <hl...@apache.org>
Authored: Tue Dec 23 15:45:22 2014 -0800
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Tue Dec 23 15:45:22 2014 -0800
----------------------------------------------------------------------
.../groovy/ioc/specs/ClasspathScannerImplSpec.groovy | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/fe8ef854/tapestry-ioc/src/test/groovy/ioc/specs/ClasspathScannerImplSpec.groovy
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/groovy/ioc/specs/ClasspathScannerImplSpec.groovy b/tapestry-ioc/src/test/groovy/ioc/specs/ClasspathScannerImplSpec.groovy
index 4ddd6df..a0aa7f7 100644
--- a/tapestry-ioc/src/test/groovy/ioc/specs/ClasspathScannerImplSpec.groovy
+++ b/tapestry-ioc/src/test/groovy/ioc/specs/ClasspathScannerImplSpec.groovy
@@ -1,10 +1,10 @@
package ioc.specs
-import org.apache.tapestry5.ioc.Locatable
-import org.apache.tapestry5.ioc.internal.BasicTypeCoercions
+import org.apache.tapestry5.ioc.Registry
import org.apache.tapestry5.ioc.internal.services.ClasspathScannerImpl
import org.apache.tapestry5.ioc.internal.services.ClasspathURLConverterImpl
import org.apache.tapestry5.ioc.services.ClasspathMatcher
+import org.apache.tapestry5.ioc.util.IdAllocator
import spock.lang.Specification
class ClasspathScannerImplSpec extends Specification {
@@ -18,7 +18,7 @@ class ClasspathScannerImplSpec extends Specification {
def scannerJob = new ClasspathScannerImpl.Job(matchAll, Thread.currentThread().getContextClassLoader(), new ClasspathURLConverterImpl())
when:
- URL url = Locatable.class.getResource('Locatable.class');
+ URL url = Registry.class.getResource('Registry.class');
scannerJob.scanDir("org/apache/tapestry5/ioc/", new File(url.getPath()).parentFile)
while (!scannerJob.queue.isEmpty()) {
def queued = scannerJob.queue.pop();
@@ -29,7 +29,10 @@ class ClasspathScannerImplSpec extends Specification {
def classes = scannerJob.matches
then:
- classes.contains(BasicTypeCoercions.name.replaceAll(/\./, "/") + '.class')
+
+ // classes will contain many names, this choice is arbitrary. The point is, it is located on the file system
+ // (not in a JAR) and it is in a package somewhere beneath the scanDir.
+ classes.contains(IdAllocator.name.replaceAll(/\./, "/") + '.class')
}
[3/4] tapestry-5 git commit: Force up larger heap for compiling
Groovy tests
Posted by hl...@apache.org.
Force up larger heap for compiling Groovy 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/15a33171
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/15a33171
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/15a33171
Branch: refs/heads/master
Commit: 15a331713734720f984d53c8275f3210f86d71fa
Parents: 7e8fc83
Author: Howard M. Lewis Ship <hl...@apache.org>
Authored: Tue Dec 23 15:33:43 2014 -0800
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Tue Dec 23 15:33:43 2014 -0800
----------------------------------------------------------------------
tapestry-ioc/build.gradle | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/15a33171/tapestry-ioc/build.gradle
----------------------------------------------------------------------
diff --git a/tapestry-ioc/build.gradle b/tapestry-ioc/build.gradle
index 5a5321f..dc4fbe8 100644
--- a/tapestry-ioc/build.gradle
+++ b/tapestry-ioc/build.gradle
@@ -26,3 +26,10 @@ test {
// Override the master build.gradle
systemProperties.remove("tapestry.service-reloading-enabled")
}
+
+compileTestGroovy {
+ configure(groovyOptions.forkOptions) {
+ memoryMaximumSize = '1g'
+ jvmArgs = ['-XX:MaxPermSize=512m', '-Xms512m', '-Xmx1g']
+ }
+}
\ No newline at end of file