Last fixes for Tapestry version - rewrite for Spring Boot in progress...

.gitignore

@@ -1,5 +1,6 @@
 # Add any directories, files, or patterns you don't want to be tracked by version control
 .svn
+.idea
 target/*
 build/*
 ksfx.iml

pom.xml

@@ -261,11 +261,11 @@
     		<artifactId>language-detector</artifactId>
     		<version>0.5</version>
 		</dependency>
-		<dependency>
-    		<groupId>net.sourceforge.htmlunit</groupId>
-    		<artifactId>htmlunit</artifactId>
-    		<version>2.23</version>
-		</dependency>
+        <dependency>
+            <groupId>net.sourceforge.htmlunit</groupId>
+            <artifactId>htmlunit</artifactId>
+            <version>2.23</version>
+        </dependency>
         <dependency>
             <groupId>io.ebean</groupId>
             <artifactId>ebean</artifactId>
@@ -384,7 +384,7 @@
                 <version>2.20.1</version>
                 <configuration>
                     <systemPropertyVariables>
-                        <testDatabaseConnectionString>jdbc:mysql://localhost:3306/ksfx_test?autoReconnect=true&amp;useUnicode=true&amp;characterEncoding=UTF-8</testDatabaseConnectionString>
+                        <testDatabaseConnectionString>jdbc:mysql://localhost:3306/ksfx_test?autoReconnect=true&amp;nserverTimezone=UTC&amp;useUnicode=true&amp;characterEncoding=UTF-8&amp;useTimezone=false</testDatabaseConnectionString>
                         <testDatabaseName>ksfx_test</testDatabaseName>
                         <testDatabaseRecreate>true</testDatabaseRecreate>
                         <testDatabaseDefaultUser>root</testDatabaseDefaultUser> <!-- override with -DtestDatabaseUser=user -->
@@ -395,7 +395,7 @@
         </plugins>
     </build>
     <properties>
-        <mysql-connector-release-version>5.1.9</mysql-connector-release-version>
+        <mysql-connector-release-version>8.0.16</mysql-connector-release-version>
         <cobertura-plugin-version>2.1</cobertura-plugin-version>
         <tapestry-release-version>5.4.3</tapestry-release-version>
         <spring-security-version>3.0.2.RELEASE</spring-security-version>

src/main/java/ch/ksfx/web/components/Layout.java

@@ -23,12 +23,21 @@
 import org.apache.tapestry5.annotations.Import;
 import org.apache.tapestry5.annotations.InjectComponent;
 import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.ioc.annotations.Value;
+import org.apache.tapestry5.services.Request;
 import org.apache.tapestry5.services.javascript.JavaScriptSupport;
 
 
 @Import(module = { "bootstrap/modal" }, stylesheet = {"context:styles/main_tb.css"}, library = "context:scripts/layout.js")
 public class Layout
 {
+    @Inject
+    @Value("${spring-security.check.url}")
+    private String checkUrl;
+
+    @Inject
+    private Request request;
+
     @Inject
     private Version version;
 
@@ -56,6 +65,11 @@ public Feedback getFeedback()
         return feedback;
     }
 
+    public String getLoginCheckUrl()
+    {
+        return request.getContextPath() + checkUrl;
+    }
+
     private void setupRender() 
     {
     	js.require("bootstrap/dropdown");

src/main/java/ch/ksfx/web/pages/Login.java

@@ -25,15 +25,8 @@
 import org.apache.tapestry5.services.Request;
 
 
-@Import(stylesheet = {"context:styles/signin_tb.css"})
 public class Login
 {
-    @Inject
-    @Value("${spring-security.check.url}")
-    private String checkUrl;
-    @Inject
-    private Request request;
-
     @Inject
     private GenericDataStoreDAO genericDataStoreDAO;
 
@@ -51,11 +44,6 @@ public boolean isFailed()
         return failed;
     }
 
-    public String getLoginCheckUrl()
-    {
-        return request.getContextPath() + checkUrl;
-    }
-
     void onActivate(String extra)
     {
         if (extra.equals("failed")) {

src/main/resources/ch/ksfx/web/components/Layout.tml

@@ -18,12 +18,35 @@
                 <div class="navbar navbar-default navbar-static-top" role="navigation">
                     <div class="container">
                         <div class="navbar-header">
+                        	<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse">
+                				<span class="sr-only">Toggle navigation</span>
+                				<span class="icon-bar"></span>
+                				<span class="icon-bar"></span>
+                				<span class="icon-bar"></span>
+            				</button>
                             <span class="pull-left"><img src="${context:images/ksfx-header.png}" /></span> <span class="navbar-brand">KSFX Data Analysis</span>
                         </div>
                         <div class="navbar-collapse collapse" id="navbar-collapse">
                             <ul class="nav navbar-nav">
 
                             </ul>
+
+                                                              <form id="signin" class="navbar-form navbar-right" role="form" action="${loginCheckUrl}">
+                                                    <div class="input-group">
+                                                        <span class="input-group-addon"><i class="glyphicon glyphicon-user"></i></span>
+                                                        <input id="email" type="text" class="form-control" name="j_username" value="" placeholder="Username" />
+                                                    </div>
+
+                                                    <div class="input-group">
+                                                        <span class="input-group-addon"><i class="glyphicon glyphicon-lock"></i></span>
+                                                        <input id="password" type="password" class="form-control" name="j_password" value="" placeholder="Password" />
+                                                    </div>
+
+                                                    <button type="submit" class="btn btn-primary">Login</button>
+                                               </form>
+
+
+
                         </div>
                     </div>
                 </div>

src/main/resources/conf.xml

@@ -3,6 +3,7 @@
                 <driver>com.mysql.jdbc.Driver</driver>
                 <databaseURL>
                    jdbc:mysql://localhost:3306/ksfx?autoReconnect=true&amp;useUnicode=true&amp;characterEncoding=UTF-8
+                <!-- useLegacyDatetimeCode=false&serverTimezone=UTC -->
                 </databaseURL>
                 <username></username>
                 <password></password>

src/main/resources/version.config

@@ -1,2 +1,2 @@
 application.name=${pom.name}
-application.version=1.1.1142
+application.version=1.1.1230

src/main/webapp/Login.tml

@@ -1,20 +1,9 @@
-<t:loginlayout xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd">
-
-    <center><h1>KSFX Data Analysis</h1></center>
-
-    <form class="form-signin" role="form"
-          action="${loginCheckUrl}">
-        <t:if test="failed">
-            <p>${message:error_message}</p>
-        </t:if>
-        <h2 class="form-signin-heading">Please sign in</h2>
-        <input type="text" class="form-control" name="j_username" placeholder="${message:username}" required="true" autofocus="true" />
-        <input type="password" class="form-control" name="j_password" placeholder="${message:password}" required="true" />
-
-        <button class="btn btn-lg btn-primary btn-block" type="submit">Sign in</button>
-    </form>
+<t:layout xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd">
+    <t:if test="failed">
+        <p>${message:error_message}</p>
+    </t:if>
 
     <t:if test="loginPageInformation">
         <t:outputraw value="loginPageInformation" />
     </t:if>
-</t:loginlayout>
+</t:layout>