prepared for 2.1 release

gaelyk · Mar 23, 2014 · ccfe6ff · ccfe6ff
1 parent bd6dc92
commit ccfe6ff
Show file tree

Hide file tree

Showing 31 changed files with 17,266 additions and 6,265 deletions.
diff --git a/build.gradle b/build.gradle
@@ -40,5 +40,5 @@ task templateProjectZip(type: Zip) {
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '1.6'
+    gradleVersion = '1.10'
 }
diff --git a/common.gradle b/common.gradle
@@ -2,7 +2,7 @@ ext.gaelykGroovyVersion = '2.1.9'
 ext.gaelykSpockVersion = '0.7-groovy-2.0'
 ext.gaelykAppEngineVersion = '1.9.1'
 ext.gaelykLatestVersion = '2.1'
-ext.gaelykSpockLatestVersion = '0.5-SNAPSHOT'
+ext.gaelykSpockLatestVersion = '0.4'
 ext.gaelykGradleVersion = '1.10'
 
 repositories {
@@ -36,3 +36,4 @@ println "App Engine Version: $ext.gaelykAppEngineVersion"
 println "Gaelyk Version: $ext.gaelykLatestVersion"
 println "Gaelyk Spock Version: $ext.gaelykSpockLatestVersion"
 println "Gradle Version: $ext.gaelykGradleVersion"
+println "Java Version: ${System.getProperty("java.vendor")} ${System.getProperty("java.version")}"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Mar 20 17:35:02 CET 2014
+#Sun Mar 23 14:56:43 CET 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.6-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip
diff --git a/graphics/gaelyk-logo-square.png b/graphics/gaelyk-logo-square.png
diff --git a/template-project/build.gradle b/template-project/build.gradle
@@ -1,7 +1,6 @@
+apply plugin: 'war'
 apply plugin: 'gaelyk'
-apply plugin: 'gae-geb'
-apply plugin: 'eclipse'
-apply plugin: 'idea'
+apply plugin: 'appengine-geb'
 
 def compatibilityVersion = 1.7
 sourceCompatibility = compatibilityVersion
@@ -10,108 +9,62 @@ targetCompatibility = compatibilityVersion
 buildscript {
     repositories {
         mavenCentral()
+        jcenter()
     }
 
     dependencies {
-        classpath 'org.gradle.api.plugins:gradle-gaelyk-plugin:0.4.1'
-        classpath 'org.gradle.api.plugins:gradle-gae-plugin:0.8', {
-            exclude module: "gradle-fatjar-plugin"
-        }
-        classpath 'eu.appsatori:gradle-fatjar-plugin:0.2-rc1'
-        classpath 'org.gradle.api.plugins:gradle-gae-geb-plugin:0.3'
+        classpath 'org.gradle.api.plugins:gradle-gaelyk-plugin:0.6'
+        classpath 'org.gradle.api.plugins:gradle-appengine-geb-plugin:0.4'
     }
 }
 
 repositories {
+    maven { url 'http://dl.bintray.com/gaelyk/groovy-patches/'}
     mavenCentral()
-    mavenLocal()
+    jcenter()
 }
 
-/*
-configurations {
-    precompile
-}
-
-gaelykPrecompileGroovlet.runtimeClasspath += project.configurations.precompile
-gaelykPrecompileTemplate.runtimeClasspath += project.configurations.precompile
-*/
-
 dependencies {
     def gaeVersion = '1.9.1'
-    def groovyVersion = '2.1.9'
-    groovy "org.codehaus.groovy:groovy-all:${groovyVersion}" 
-//    precompile "org.codehaus.groovy:groovy-ant:${groovyVersion}"     
-//    precompile "org.ow2.asm:asm:4.0" 
-//    precompile "commons-cli:commons-cli:1.2"  
-    compile "org.codehaus.groovy:groovy-json:${groovyVersion}"
-    compile "org.codehaus.groovy:groovy-servlet:${groovyVersion}"    
+    def groovyVersion = '2.2.2'
+
+    if (System.getProperty('os.name') in ['Linux', 'Mac OS X']) {
+        // appengine local dev server bug
+        logger.warn("Changed groovy version because running on ${System.getProperty('os.name')}")
+        compile "org.codehaus.groovy:groovy-all:2.1.10:indy", { force = true }
+        compile "org.codehaus.groovy:groovy:2.1.10:indy", { force = true }
+    } else {
+        logger.info("Using predefined groovy version $groovyVersion because running on ${System.getProperty('os.name')}")
+        compile "org.codehaus.groovy:groovy-all:${groovyVersion}:indy"
+    }
+
     compile "com.google.appengine:appengine-api-1.0-sdk:$gaeVersion",
             "com.google.appengine:appengine-api-labs:$gaeVersion"
     compile 'org.gaelyk:gaelyk:2.1'
-
-
 
-    /** 
+
+    testCompile 'org.gaelyk:gaelyk-spock:0.4'
+    testCompile "com.google.appengine:appengine-api-stubs:$gaeVersion",
+            "com.google.appengine:appengine-testing:$gaeVersion"
+
+    functionalTestCompile 'org.seleniumhq.selenium:selenium-firefox-driver:2.40.0'
+    functionalTestCompile 'org.gebish:geb-spock:0.9.2'
+
+    appengineSdk "com.google.appengine:appengine-java-sdk:$gaeVersion"
+
+
+    /**
      * To add binary plugin just declare it as a dependency. For example,
      * uncomment following to add GPars support to your Gaelyk project.
      * @see https://github.com/musketyr/gpars-appengine
-     */ 
+     */
     // compile 'org.codehaus.gpars:gpars-appengine:0.1'
-    
+
     /**
      * Gaelyk console serves as playground or key-hole surgery tool for
      * your application
      * @see https://github.com/gaelyk/gaelyk-console
      */
     // compile 'org.gaelyk:gaelyk-console:2.0'
-
-    testCompile 'org.gaelyk:gaelyk-spock:0.4'
-    testCompile "com.google.appengine:appengine-api-stubs:$gaeVersion",
-                "com.google.appengine:appengine-testing:$gaeVersion"
-
-    functionalTestCompile 'org.codehaus.geb:geb-spock:0.7.0',
-                          'org.seleniumhq.selenium:selenium-firefox-driver:2.22.0'
-    gaeSdk "com.google.appengine:appengine-java-sdk:$gaeVersion"
-}
-
-idea {
-    project {
-        jdkName = compatibilityVersion
 
-        ipr.withXml { provider ->
-            def node = provider.asNode()
-
-            // Set Gradle home
-            def gradleSettings = node.appendNode('component', [name: 'GradleSettings'])
-            gradleSettings.appendNode('option', [name: 'SDK_HOME', value: gradle.gradleHomeDir])
-        }
-    }
-}
-
-eclipse {
-    project {
-        name 'gaelyk-project'
-        file {
-            whenMerged { project ->
-                project.natures << 'com.google.appengine.eclipse.core.gaeNature'
-                project.natures << 'com.google.gdt.eclipse.core.webAppNature'
-                project.buildCommands << [name: 'com.google.appengine.eclipse.core.enhancerbuilder']
-                project.buildCommands << [name: 'com.google.appengine.eclipse.core.projectValidator']
-                project.buildCommands << [name: 'com.google.gdt.eclipse.core.webAppProjectValidator']
-            }
-        }
-    }
-    classpath {
-        file {
-            withXml { xml ->
-                xml.asNode().classpathentry.find { it.@kind == 'output' && it.@path == 'bin' }.@path = 'src/main/webapp/WEB-INF/classes'
-                xml.asNode().appendNode('classpathentry', [kind: 'con', path: 'com.google.appengine.eclipse.core.GAE_CONTAINER'])
-                            .appendNode('attributes')
-                            .appendNode('attribute', [name: 'org.eclipse.jst.component.nondependency', value: '/src/main/webapp/WEB-INF/lib'])
-                xml.asNode().appendNode('classpathentry', [exported: 'true', kind: 'con', path: 'GROOVY_SUPPORT'])
-                            .appendNode('attributes')
-                            .appendNode('attribute', [name: 'org.eclipse.jst.component.nondependency', value: '/src/main/webapp/WEB-INF/lib'])
-            }
-        }
-    }
 }
diff --git a/template-project/src/main/webapp/WEB-INF/includes/header.gtpl b/template-project/src/main/webapp/WEB-INF/includes/header.gtpl
@@ -5,37 +5,38 @@
   <link rel="shortcut icon" href="/images/gaelyk-small-favicon.png" type="image/png">
   <link rel="icon" href="/images/gaelyk-small-favicon.png" type="image/png">
   <link rel="stylesheet" type="text/css" href="/css/bootstrap.min.css" />
-  <link rel="stylesheet" type="text/css" href="/css/bootstrap-responsive.min.css" />
-  <script type="text/javascript" src="/js/jquery-1.7.2.min.js">
+  <link rel="stylesheet" type="text/css" href="/css/bootstrap-theme.min.css" />
+  <script type="text/javascript" src="/js/jquery-1.11.0.js">
   </script>
   <script type="text/javascript" src="/js/bootstrap.min.js"></script>
   <style type="text/css">
-      body {
-          padding-top: 60px;
-      }
-
       .center {
         text-align: center;
       }
   </style>
 </head>
 <body>
-   <div class="navbar navbar-fixed-top">
-	<div class="navbar-inner">
-		<div class="container">
-			<a class="btn btn-navbar" data-toggle="collapse"
-				data-target=".nav-collapse"> <span class="icon-bar"></span> <span
-				class="icon-bar"></span> <span class="icon-bar"></span>
-			</a> <a class="brand" href="/"><img src="/images/gaelyk-logo.png"/></a>
-			<div class="nav-collapse">
-				<ul class="nav">
-					<li class="${request.servletPath == '/WEB-INF/pages/index.gtpl' ? 'active' : ''}"><a href="/">Home</a></li>
-					<li class="${request.servletPath == '/WEB-INF/pages/datetime.gtpl' ? 'active' : ''}"><a href="/datetime">Current Time</a></li>
-				</ul>
-			</div>
-			<!--/.nav-collapse -->
-		</div>
-	</div>
-	</div>
+    <nav class="navbar navbar-default" role="navigation">
+        <div class="container">
+            <!-- Brand and toggle get grouped for better mobile display -->
+            <div class="navbar-header">
+                <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
+                    <span class="sr-only">Toggle navigation</span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                </button>
+                <a class="navbar-brand" href="/">Gaelyk</a>
+            </div>
+
+            <!-- Collect the nav links, forms, and other content for toggling -->
+            <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
+                <ul class="nav navbar-nav">
+                    <li class="${request.servletPath == '/WEB-INF/pages/index.gtpl' ? 'active' : ''}"><a href="/">Home</a></li>
+                    <li class="${request.servletPath == '/WEB-INF/pages/datetime.gtpl' ? 'active' : ''}"><a href="/datetime">Current Time</a></li>
+                </ul>
+            </div><!-- /.navbar-collapse -->
+        </div><!-- /.container-fluid -->
+    </nav>
 
     <div class="container">
diff --git a/template-project/src/main/webapp/WEB-INF/pages/datetime.gtpl b/template-project/src/main/webapp/WEB-INF/pages/datetime.gtpl
@@ -1,5 +1,5 @@
 <% include '/WEB-INF/includes/header.gtpl' %>
-<div class="hero-unit">
+<div class="jumbotron">
 <h1>Current Date</h1>
 
 <p>

diff --git a/template-project/src/main/webapp/WEB-INF/pages/index.gtpl b/template-project/src/main/webapp/WEB-INF/pages/index.gtpl
@@ -1,5 +1,5 @@
 <% include '/WEB-INF/includes/header.gtpl' %>
-<div class="hero-unit center">
+<div class="jumbotron center">
     <a href="http://gaelyk.appspot.com"><img alt="Gaelyk Logo" src="/images/gaelyk.png"/></a>
 	<br/>
 	<p>
@@ -12,16 +12,16 @@
 	</p>
 </div>
 <div class="row">
-  <div class="span4">
+  <div class="col-md-4">
     <h2>Start Experimenting</h2>
      <p>This template contains following sample files<ul><li><code>datetime.groovy</code></li><li><code>WEB-INF/pages/datetime.gtpl</code></li></ul>Try to edit them and watch the changes.</p>
   </div>
-  <div class="span4">
+  <div class="col-md-4">
     <h2>Learn More</h2>
      <p>All <a href="http://gaelyk.appspot.com">Gaelyk</a> features are well documented. If you are new to <a href="http://gaelyk.appspot.com">Gaelyk</a> best place to learn more is the <a href="http://gaelyk.appspot.com/tutorial">Tutorial</a>.</p>
     <p><a class="btn" href="http://gaelyk.appspot.com/tutorial">Read Tutorial &raquo;</a></p>
  </div>
-  <div class="span4">
+  <div class="col-md-4">
     <h2>Work Less</h2>
     <p>Take advantage of existing plugins. You can for example unleash the power of <a href="http://developer.google.com/appengine/">Google App Engine</a> using <a href="https://github.com/musketyr/gpars-appengine">GPars App Engine</a> integration library</p>
     <p><a class="btn" href="http://gaelyk.appspot.com/plugins">More about plugins &raquo;</a></p>