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 2012/06/05 19:07:37 UTC
[1/3] git commit: TAP5-1945: tapestry-clojure is not compatible with
tapestry-core - add tapestry-core as a test dependency - add missing @Builtin
annotation to disambiguate which PlasticProxyFactory to inject
Updated Branches:
refs/heads/master 5dc2d7e91 -> 68a68e1e6
TAP5-1945: tapestry-clojure is not compatible with tapestry-core
- add tapestry-core as a test dependency
- add missing @Builtin annotation to disambiguate which PlasticProxyFactory to inject
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/68a68e1e
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/68a68e1e
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/68a68e1e
Branch: refs/heads/master
Commit: 68a68e1e6a870dc1d4daaeb8f1444ba78f1eb440
Parents: 16867f5
Author: Howard M. Lewis Ship <hl...@apache.org>
Authored: Tue Jun 5 10:07:24 2012 -0700
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Tue Jun 5 10:07:24 2012 -0700
----------------------------------------------------------------------
tapestry-clojure/build.gradle | 3 +++
.../internal/clojure/ClojureBuilderImpl.java | 3 ++-
.../clojure/tests/ClojureBuilderSpec.groovy | 5 ++++-
3 files changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/68a68e1e/tapestry-clojure/build.gradle
----------------------------------------------------------------------
diff --git a/tapestry-clojure/build.gradle b/tapestry-clojure/build.gradle
index d8077da..bdb09d2 100644
--- a/tapestry-clojure/build.gradle
+++ b/tapestry-clojure/build.gradle
@@ -4,6 +4,9 @@ dependencies {
compile project(':tapestry-ioc')
provided "org.clojure:clojure:1.4.0"
+ // Added just to prove that it works (TAP5-1945)
+ testCompile project(':tapestry-core')
+ testRuntime "javax.servlet:servlet-api:${versions.servletapi}"
testCompile "org.spockframework:spock-core:${versions.spock}"
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/68a68e1e/tapestry-clojure/src/main/java/org/apache/tapestry5/internal/clojure/ClojureBuilderImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-clojure/src/main/java/org/apache/tapestry5/internal/clojure/ClojureBuilderImpl.java b/tapestry-clojure/src/main/java/org/apache/tapestry5/internal/clojure/ClojureBuilderImpl.java
index c4d8c89..b6c0fbb 100644
--- a/tapestry-clojure/src/main/java/org/apache/tapestry5/internal/clojure/ClojureBuilderImpl.java
+++ b/tapestry-clojure/src/main/java/org/apache/tapestry5/internal/clojure/ClojureBuilderImpl.java
@@ -23,6 +23,7 @@ import org.apache.tapestry5.clojure.MethodToFunctionSymbolMapper;
import org.apache.tapestry5.clojure.Namespace;
import org.apache.tapestry5.ioc.OperationTracker;
import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.ioc.services.Builtin;
import org.apache.tapestry5.ioc.services.PlasticProxyFactory;
import org.apache.tapestry5.plastic.*;
@@ -38,7 +39,7 @@ public class ClojureBuilderImpl implements ClojureBuilder
private final Var REQUIRE = RT.var("clojure.core", "require");
- public ClojureBuilderImpl(PlasticProxyFactory proxyFactory, MethodToFunctionSymbolMapper mapper, OperationTracker tracker)
+ public ClojureBuilderImpl(@Builtin PlasticProxyFactory proxyFactory, MethodToFunctionSymbolMapper mapper, OperationTracker tracker)
{
this.proxyFactory = proxyFactory;
this.mapper = mapper;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/68a68e1e/tapestry-clojure/src/test/groovy/org/apache/tapestry5/clojure/tests/ClojureBuilderSpec.groovy
----------------------------------------------------------------------
diff --git a/tapestry-clojure/src/test/groovy/org/apache/tapestry5/clojure/tests/ClojureBuilderSpec.groovy b/tapestry-clojure/src/test/groovy/org/apache/tapestry5/clojure/tests/ClojureBuilderSpec.groovy
index 6d2651d..1563c4b 100644
--- a/tapestry-clojure/src/test/groovy/org/apache/tapestry5/clojure/tests/ClojureBuilderSpec.groovy
+++ b/tapestry-clojure/src/test/groovy/org/apache/tapestry5/clojure/tests/ClojureBuilderSpec.groovy
@@ -3,6 +3,7 @@ package org.apache.tapestry5.clojure.tests
import org.apache.tapestry5.clojure.ClojureModule
import org.apache.tapestry5.ioc.Registry
import org.apache.tapestry5.ioc.RegistryBuilder
+import org.apache.tapestry5.services.TapestryModule
import spock.lang.AutoCleanup
import spock.lang.Shared
import spock.lang.Specification
@@ -20,7 +21,9 @@ class ClojureBuilderSpec extends Specification {
def setupSpec() {
- RegistryBuilder builder = new RegistryBuilder().add(TestModule, ClojureModule)
+ // ClojureModule needed as contents of MANIFEST are not available at test time
+ // TapestryModule needed as part of TAP5-1945
+ RegistryBuilder builder = new RegistryBuilder().add(TestModule, ClojureModule, TapestryModule)
registry = builder.build();