tapestry-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hls...@apache.org
Subject [29/31] git commit: Move ClojureModule into a modules package
Date Tue, 23 Apr 2013 00:39:03 GMT
Move ClojureModule  into a modules package


Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/1b854a95
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/1b854a95
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/1b854a95

Branch: refs/heads/master
Commit: 1b854a95d3944337021664388e757bbaf054cb84
Parents: fcbb5cb
Author: Howard M. Lewis Ship <hlship@apache.org>
Authored: Mon Apr 22 17:16:16 2013 -0700
Committer: Howard M. Lewis Ship <hlship@apache.org>
Committed: Mon Apr 22 17:16:16 2013 -0700

----------------------------------------------------------------------
 tapestry-clojure/build.gradle                      |    2 +-
 .../apache/tapestry5/clojure/ClojureModule.java    |   53 --------------
 .../tapestry5/clojure/modules/ClojureModule.java   |   55 +++++++++++++++
 .../clojure/tests/ClojureBuilderSpec.groovy        |    2 +-
 4 files changed, 57 insertions(+), 55 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/1b854a95/tapestry-clojure/build.gradle
----------------------------------------------------------------------
diff --git a/tapestry-clojure/build.gradle b/tapestry-clojure/build.gradle
index d1afd51..843c1f2 100644
--- a/tapestry-clojure/build.gradle
+++ b/tapestry-clojure/build.gradle
@@ -16,6 +16,6 @@ test {
 
 jar {
   manifest {
-    attributes 'Tapestry-Module-Classes': 'org.apache.tapestry5.clojure.ClojureModule'
+    attributes 'Tapestry-Module-Classes': 'org.apache.tapestry5.clojure.modules.ClojureModule'
   }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/1b854a95/tapestry-clojure/src/main/java/org/apache/tapestry5/clojure/ClojureModule.java
----------------------------------------------------------------------
diff --git a/tapestry-clojure/src/main/java/org/apache/tapestry5/clojure/ClojureModule.java
b/tapestry-clojure/src/main/java/org/apache/tapestry5/clojure/ClojureModule.java
deleted file mode 100644
index 35697a7..0000000
--- a/tapestry-clojure/src/main/java/org/apache/tapestry5/clojure/ClojureModule.java
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2012 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.clojure;
-
-import clojure.lang.RT;
-import clojure.lang.Var;
-import org.apache.tapestry5.internal.clojure.AnnotationMapper;
-import org.apache.tapestry5.internal.clojure.ClojureBuilderImpl;
-import org.apache.tapestry5.internal.clojure.DefaultMapper;
-import org.apache.tapestry5.ioc.OrderedConfiguration;
-import org.apache.tapestry5.ioc.ServiceBinder;
-import org.apache.tapestry5.ioc.annotations.Contribute;
-import org.apache.tapestry5.ioc.annotations.Startup;
-import org.apache.tapestry5.ioc.services.ChainBuilder;
-
-import java.util.List;
-
-public class ClojureModule
-{
-    public static void bind(ServiceBinder binder)
-    {
-        binder.bind(ClojureBuilder.class, ClojureBuilderImpl.class);
-    }
-
-    public static MethodToFunctionSymbolMapper buildMethodToFunctionMapper(List<MethodToFunctionSymbolMapper>
configuration, ChainBuilder builder)
-    {
-        return builder.build(MethodToFunctionSymbolMapper.class, configuration);
-    }
-
-    @Contribute(MethodToFunctionSymbolMapper.class)
-    public static void defaultMappers(OrderedConfiguration<MethodToFunctionSymbolMapper>
configuration)
-    {
-        configuration.add("Annotation", new AnnotationMapper());
-        configuration.add("Default", new DefaultMapper(), "after:*");
-    }
-
-    @Startup
-    public static void launchClojure() {
-        Var require = RT.var("clojure.core", "require");
-    }
-}

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/1b854a95/tapestry-clojure/src/main/java/org/apache/tapestry5/clojure/modules/ClojureModule.java
----------------------------------------------------------------------
diff --git a/tapestry-clojure/src/main/java/org/apache/tapestry5/clojure/modules/ClojureModule.java
b/tapestry-clojure/src/main/java/org/apache/tapestry5/clojure/modules/ClojureModule.java
new file mode 100644
index 0000000..275fe9a
--- /dev/null
+++ b/tapestry-clojure/src/main/java/org/apache/tapestry5/clojure/modules/ClojureModule.java
@@ -0,0 +1,55 @@
+// Copyright 2012-2013 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.clojure.modules;
+
+import clojure.lang.RT;
+import clojure.lang.Var;
+import org.apache.tapestry5.clojure.ClojureBuilder;
+import org.apache.tapestry5.clojure.MethodToFunctionSymbolMapper;
+import org.apache.tapestry5.internal.clojure.AnnotationMapper;
+import org.apache.tapestry5.internal.clojure.ClojureBuilderImpl;
+import org.apache.tapestry5.internal.clojure.DefaultMapper;
+import org.apache.tapestry5.ioc.OrderedConfiguration;
+import org.apache.tapestry5.ioc.ServiceBinder;
+import org.apache.tapestry5.ioc.annotations.Contribute;
+import org.apache.tapestry5.ioc.annotations.Startup;
+import org.apache.tapestry5.ioc.services.ChainBuilder;
+
+import java.util.List;
+
+public class ClojureModule
+{
+    public static void bind(ServiceBinder binder)
+    {
+        binder.bind(ClojureBuilder.class, ClojureBuilderImpl.class);
+    }
+
+    public static MethodToFunctionSymbolMapper buildMethodToFunctionMapper(List<MethodToFunctionSymbolMapper>
configuration, ChainBuilder builder)
+    {
+        return builder.build(MethodToFunctionSymbolMapper.class, configuration);
+    }
+
+    @Contribute(MethodToFunctionSymbolMapper.class)
+    public static void defaultMappers(OrderedConfiguration<MethodToFunctionSymbolMapper>
configuration)
+    {
+        configuration.add("Annotation", new AnnotationMapper());
+        configuration.add("Default", new DefaultMapper(), "after:*");
+    }
+
+    @Startup
+    public static void launchClojure() {
+        Var require = RT.var("clojure.core", "require");
+    }
+}

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/1b854a95/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 efee763..29dde21 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
@@ -1,6 +1,6 @@
 package org.apache.tapestry5.clojure.tests
 
-import org.apache.tapestry5.clojure.ClojureModule
+import org.apache.tapestry5.clojure.modules.ClojureModule
 import org.apache.tapestry5.ioc.Registry
 import org.apache.tapestry5.ioc.RegistryBuilder
 import org.apache.tapestry5.modules.TapestryModule


Mime
View raw message