Gitignore and cleaning

Sqlite instead of mysql for local use
more ignore
2024-02-08 15:11:59 +01:00 · 2024-02-08 14:50:12 +01:00 · 2024-02-08 14:49:47 +01:00 · 2024-02-08 14:38:39 +01:00 · 2024-02-08 14:37:06 +01:00
42 changed files with 14 additions and 175 deletions
--- a/.gitignore
+++ b/.gitignore
@ -2,6 +2,12 @@ target
 tomcat.8080
 tomcat.5000
 # Gradle generated files
 .gradle
 app/build
 app/bin
 .settings
 # IntelliJ Idea project files
 .idea
 *.iml
@ -24,4 +30,4 @@ buildNumber.properties
 # JDT-specific (Eclipse Java Development Tools)
 .classpath
-.DS_Store
+.DS_Store
--- a/.gradle/8.4/checksums/checksums.lock
+++ b/.gradle/8.4/checksums/checksums.lock
--- a/.gradle/8.4/dependencies-accessors/dependencies-accessors.lock
+++ b/.gradle/8.4/dependencies-accessors/dependencies-accessors.lock
--- a/.gradle/8.4/dependencies-accessors/gc.properties
+++ b/.gradle/8.4/dependencies-accessors/gc.properties
--- a/.gradle/8.4/executionHistory/executionHistory.bin
+++ b/.gradle/8.4/executionHistory/executionHistory.bin
--- a/.gradle/8.4/executionHistory/executionHistory.lock
+++ b/.gradle/8.4/executionHistory/executionHistory.lock
--- a/.gradle/8.4/fileChanges/last-build.bin
+++ b/.gradle/8.4/fileChanges/last-build.bin
--- a/.gradle/8.4/fileHashes/fileHashes.bin
+++ b/.gradle/8.4/fileHashes/fileHashes.bin
--- a/.gradle/8.4/fileHashes/fileHashes.lock
+++ b/.gradle/8.4/fileHashes/fileHashes.lock
--- a/.gradle/8.4/fileHashes/resourceHashesCache.bin
+++ b/.gradle/8.4/fileHashes/resourceHashesCache.bin
--- a/.gradle/8.4/gc.properties
+++ b/.gradle/8.4/gc.properties
--- a/.gradle/buildOutputCleanup/buildOutputCleanup.lock
+++ b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
--- a/.gradle/buildOutputCleanup/cache.properties
+++ b/.gradle/buildOutputCleanup/cache.properties
@ -1,2 +0,0 @@
 #Thu Feb 08 14:24:23 CET 2024
 gradle.version=8.4
--- a/.gradle/buildOutputCleanup/outputFiles.bin
+++ b/.gradle/buildOutputCleanup/outputFiles.bin
--- a/.gradle/file-system.probe
+++ b/.gradle/file-system.probe
--- a/.gradle/vcs-1/gc.properties
+++ b/.gradle/vcs-1/gc.properties
--- a/app/.settings/org.eclipse.jdt.core.prefs
+++ b/app/.settings/org.eclipse.jdt.core.prefs
@ -1,13 +0,0 @@
 #
 #Thu Feb 08 14:14:29 CET 2024
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
 org.eclipse.jdt.core.compiler.source=21
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
--- a/app/bin/main/etsf20/App.class
+++ b/app/bin/main/etsf20/App.class
--- a/app/bin/main/launch/Main.class
+++ b/app/bin/main/launch/Main.class
--- a/app/bin/main/model/HelloJspViewModel.class
+++ b/app/bin/main/model/HelloJspViewModel.class
--- a/app/bin/main/servlet/Database.class
+++ b/app/bin/main/servlet/Database.class
--- a/app/bin/main/servlet/FormGenerator.class
+++ b/app/bin/main/servlet/FormGenerator.class
--- a/app/bin/main/servlet/HelloJsp.class
+++ b/app/bin/main/servlet/HelloJsp.class
--- a/app/bin/main/servlet/Survey.class
+++ b/app/bin/main/servlet/Survey.class
--- a/app/bin/main/webapp/jsp/example.jsp
+++ b/app/bin/main/webapp/jsp/example.jsp
@ -1,16 +0,0 @@
 <%@ page import="model.HelloJspViewModel" %>
 <html>
 <body>
 <h2>Hello Jsp, simple data from Servlet: <%=request.getAttribute("simple")%></h2>
    <ol>
    <%
        HelloJspViewModel model = (HelloJspViewModel)request.getAttribute("complex");
        for(int el : model.getData()) { %>
            <li>
                <%=el%>
                <% out.print(":" + el); // or as ordinary java code %>
            </li>
        <% } %>
    </ol>  
 </body>
 </html>
--- a/app/bin/main/webapp/static/css/pure-min.css
+++ b/app/bin/main/webapp/static/css/pure-min.css
--- a/app/bin/main/webapp/static/index.html
+++ b/app/bin/main/webapp/static/index.html
@ -1,27 +0,0 @@
 <!DOCTYPE html>
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <link rel="stylesheet" href="/css/pure-min.css">
 <title>the Book Store</title>
 <style>
    .main {
        padding: 2em;
        color: black;
    }
    </style>
 </head>
 <body>
    <div class="main">
    <h1>the Test Site</h1>
    Welcome to this Fantastic Web Page.  
    <p> The following services are available today:
    <ul>
    <li> <a href = "http://localhost:8080/Survey"> THE SURVEY</a>
    </ul> 
    </div>
 </body>
 </html>
--- a/app/bin/test/etsf20/AppTest.class
+++ b/app/bin/test/etsf20/AppTest.class
--- a/app/build/classes/java/main/etsf20/App.class
+++ b/app/build/classes/java/main/etsf20/App.class
--- a/app/build/classes/java/main/launch/Main.class
+++ b/app/build/classes/java/main/launch/Main.class
--- a/app/build/classes/java/main/model/HelloJspViewModel.class
+++ b/app/build/classes/java/main/model/HelloJspViewModel.class
--- a/app/build/classes/java/main/servlet/Database.class
+++ b/app/build/classes/java/main/servlet/Database.class
--- a/app/build/classes/java/main/servlet/FormGenerator.class
+++ b/app/build/classes/java/main/servlet/FormGenerator.class
--- a/app/build/classes/java/main/servlet/HelloJsp.class
+++ b/app/build/classes/java/main/servlet/HelloJsp.class
--- a/app/build/classes/java/main/servlet/Survey.class
+++ b/app/build/classes/java/main/servlet/Survey.class
--- a/app/build/resources/main/webapp/jsp/example.jsp
+++ b/app/build/resources/main/webapp/jsp/example.jsp
@ -1,16 +0,0 @@
 <%@ page import="model.HelloJspViewModel" %>
 <html>
 <body>
 <h2>Hello Jsp, simple data from Servlet: <%=request.getAttribute("simple")%></h2>
    <ol>
    <%
        HelloJspViewModel model = (HelloJspViewModel)request.getAttribute("complex");
        for(int el : model.getData()) { %>
            <li>
                <%=el%>
                <% out.print(":" + el); // or as ordinary java code %>
            </li>
        <% } %>
    </ol>  
 </body>
 </html>
--- a/app/build/resources/main/webapp/static/css/pure-min.css
+++ b/app/build/resources/main/webapp/static/css/pure-min.css
--- a/app/build/resources/main/webapp/static/index.html
+++ b/app/build/resources/main/webapp/static/index.html
@ -1,27 +0,0 @@
 <!DOCTYPE html>
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <link rel="stylesheet" href="/css/pure-min.css">
 <title>the Book Store</title>
 <style>
    .main {
        padding: 2em;
        color: black;
    }
    </style>
 </head>
 <body>
    <div class="main">
    <h1>the Test Site</h1>
    Welcome to this Fantastic Web Page.  
    <p> The following services are available today:
    <ul>
    <li> <a href = "http://localhost:8080/Survey"> THE SURVEY</a>
    </ul> 
    </div>
 </body>
 </html>
--- a/app/build/tmp/compileJava/previous-compilation-data.bin
+++ b/app/build/tmp/compileJava/previous-compilation-data.bin
--- a/app/src/main/java/etsf20/App.java
+++ b/app/src/main/java/etsf20/App.java
@ -1,14 +0,0 @@
 /*
 * This Java source file was generated by the Gradle 'init' task.
 */
 package etsf20;
 public class App {
    public String getGreeting() {
        return "Hello World!";
    }
    public static void main(String[] args) {
        System.out.println(new App().getGreeting());
    }
 }
--- a/app/src/main/java/servlet/Database.java
+++ b/app/src/main/java/servlet/Database.java
@ -6,29 +6,16 @@ import java.sql.*;
 */
 public class Database implements AutoCloseable {
-	// If you have the mysql server on your own computer use "localhost" as server address.
+	// The connection to the database
 	private static String databaseServerAddress = "vm26.cs.lth.se";
 	private static String databaseUser = "<your databse user on vm26>";             // database login user
 	private static String databasePassword = "<your password>";          // database login password
 	private static String database = "<your database, normally the same as database user>";             // the database to use, i.e. default schema
 	private Connection conn = null;
 	public Database() {
-		try{
+		// Connect to sqlite
-			conn = DriverManager.getConnection("jdbc:mysql://" + databaseServerAddress + "/" + 
+		try {
-                    database, databaseUser, databasePassword);
+			Class.forName("org.sqlite.JDBC");
-			
+			conn = DriverManager.getConnection("jdbc:sqlite:database.db");
-			// Display the contents of the database in the console. 
+			System.out.println("Opened database successfully");
-			// This should be removed in the final version
+		} catch (Exception e) {
 			try(Statement stmt = conn.createStatement()) {
 				ResultSet rs = stmt.executeQuery("select * from Respondents"); 
 				while (rs.next()) {
 					String name = rs.getString("name"); 
 					System.out.println(name);
 				}
 			}
 		} catch (SQLException e) {
 			throw new RuntimeException(e);
 		}
 	}
--- a/app/src/test/java/etsf20/AppTest.java
+++ b/app/src/test/java/etsf20/AppTest.java
@ -1,17 +0,0 @@
 /*
 * This Java source file was generated by the Gradle 'init' task.
 */
 package etsf20;
 import org.junit.jupiter.api.Test;
 import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Disabled;
 class AppTest {
    @Disabled
    @Test void appHasAGreeting() {
        App classUnderTest = new App();
        assertNotNull(classUnderTest.getGreeting(), "app should have a greeting");
    }
 }
Author	SHA1	Message	Date
Imbus	4e47bdf32e	Gitignore and cleaning	2024-02-08 15:11:59 +01:00
Imbus	37a41331c1	Sqlite instead of mysql for local use	2024-02-08 14:50:12 +01:00
Imbus	7a3ff989fb	more ignore	2024-02-08 14:49:47 +01:00
Imbus	da20ce1a80	More unused	2024-02-08 14:38:39 +01:00
Imbus	6c8744d5aa	Pruned unused stuff	2024-02-08 14:37:06 +01:00
		`@ -1,2 +0,0 @@`
			`#Thu Feb 08 14:24:23 CET 2024`
			`gradle.version=8.4`