Permalink
Browse files

Merge branch '2.2.x'

  • Loading branch information...
2 parents e0892c9 + 8c3d785 commit 01c87103817542d1608fc567aab48b8ecdf733ba @jeffbrown jeffbrown committed Oct 8, 2012
View
@@ -27,7 +27,7 @@ ext {
datastoreVersion = "1.1.0.RELEASE"
gantVersion = "1.9.6"
gdocEngineVersion = "1.0.1"
- groovyVersion = "2.0.4"
+ groovyVersion = "2.0.5"
gradleGroovyVersion = groovyVersion
gradleGroovyVersion = "1.8.2"
ivyVersion = "2.2.0"
View
@@ -88,8 +88,8 @@ The following libraries are included in Grails because they are required either
- Gant 1.9.5 (http://gant.codehaus.org) Apache 2.0 License
- required for the command line tools (Gant)
-* groovy-all-2.0.4.jar
-- Groovy 2.0.4 (http://groovy.codehaus.org) Apache 2.0 License
+* groovy-all-2.0.5.jar
+- Groovy 2.0.5 (http://groovy.codehaus.org) Apache 2.0 License
- required for the command line tools (Gant)
- required for building Grails core
- required for running Grails applications
@@ -163,7 +163,7 @@ public Object doCall() {
// dependencies needed at compile time
ModuleRevisionId[] groovyDependencies = {
- ModuleRevisionId.newInstance("org.codehaus.groovy", "groovy-all", "2.0.4")
+ ModuleRevisionId.newInstance("org.codehaus.groovy", "groovy-all", "2.0.5")
};
registerDependencies(dependencyManager, compileTimeDependenciesMethod, groovyDependencies, "jline");
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package grails.web;
import java.lang.annotation.ElementType;
@@ -19,6 +19,12 @@
import org.apache.commons.lang.StringUtils;
+/**
+ * URL converter that allows for camel case URLs
+ *
+ * @author Jeff Brown
+ * @since 2.0
+ */
public class CamelCaseUrlConverter implements UrlConverter {
public String toUrlElement(String propertyOrClassName) {
@@ -1,8 +1,28 @@
+/*
+ * Copyright 2011 SpringSource.
+ *
+ * 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 grails.web;
import org.apache.commons.lang.StringUtils;
-
+/**
+ * URL converter that allows for hyphenated URLs
+ *
+ * @author Jeff Brown
+ * @since 2.0
+ */
public class HyphenatedUrlConverter implements UrlConverter {
public String toUrlElement(String propertyOrClassName) {
@@ -15,6 +15,12 @@
*/
package grails.web;
+/**
+ * URL converter interface for conversion strategies to implement
+ *
+ * @author Jeff Brown
+ * @since 2.0
+ */
public interface UrlConverter {
String BEAN_NAME = "grailsUrlConverter";

0 comments on commit 01c8710

Please sign in to comment.