From 72307dcf589b695babb3a836817fd7b78907fd05 Mon Sep 17 00:00:00 2001 From: Ognjen Cirkovic Date: Wed, 21 Dec 2022 00:40:45 +0100 Subject: Inicijalni commit. --- .classpath | 18 ++++++++++++ .gitignore | 2 ++ .project | 31 +++++++++++++++++++++ .settings/.jsdtscope | 12 ++++++++ .settings/org.eclipse.jdt.core.prefs | 7 +++++ .settings/org.eclipse.wst.common.component | 8 ++++++ .../org.eclipse.wst.common.project.facet.core.xml | 9 ++++++ .../org.eclipse.wst.jsdt.ui.superType.container | 1 + .settings/org.eclipse.wst.jsdt.ui.superType.name | 1 + libs/mysql-connector-java-8.0.15.jar | Bin 0 -> 2134905 bytes src/main/java/pokemon/Database.java | 30 ++++++++++++++++++++ src/main/webapp/META-INF/MANIFEST.MF | 3 ++ src/main/webapp/WEB-INF/web.xml | 12 ++++++++ src/main/webapp/index.jsp | 21 ++++++++++++++ 14 files changed, 155 insertions(+) create mode 100644 .classpath create mode 100644 .gitignore create mode 100644 .project create mode 100644 .settings/.jsdtscope create mode 100644 .settings/org.eclipse.jdt.core.prefs create mode 100644 .settings/org.eclipse.wst.common.component create mode 100644 .settings/org.eclipse.wst.common.project.facet.core.xml create mode 100644 .settings/org.eclipse.wst.jsdt.ui.superType.container create mode 100644 .settings/org.eclipse.wst.jsdt.ui.superType.name create mode 100644 libs/mysql-connector-java-8.0.15.jar create mode 100644 src/main/java/pokemon/Database.java create mode 100644 src/main/webapp/META-INF/MANIFEST.MF create mode 100644 src/main/webapp/WEB-INF/web.xml create mode 100644 src/main/webapp/index.jsp diff --git a/.classpath b/.classpath new file mode 100644 index 0000000..3c82a2b --- /dev/null +++ b/.classpath @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e31d94d --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +/build/ +apache-tomcat-9.0.65/ diff --git a/.project b/.project new file mode 100644 index 0000000..770ab72 --- /dev/null +++ b/.project @@ -0,0 +1,31 @@ + + + ImiPokemon + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.wst.common.project.facet.core.builder + + + + + org.eclipse.wst.validation.validationbuilder + + + + + + org.eclipse.jem.workbench.JavaEMFNature + org.eclipse.wst.common.modulecore.ModuleCoreNature + org.eclipse.wst.common.project.facet.core.nature + org.eclipse.jdt.core.javanature + org.eclipse.wst.jsdt.core.jsNature + + diff --git a/.settings/.jsdtscope b/.settings/.jsdtscope new file mode 100644 index 0000000..76c2d63 --- /dev/null +++ b/.settings/.jsdtscope @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000..c537b63 --- /dev/null +++ b/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component new file mode 100644 index 0000000..17d5dc5 --- /dev/null +++ b/.settings/org.eclipse.wst.common.component @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml new file mode 100644 index 0000000..611d2df --- /dev/null +++ b/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/.settings/org.eclipse.wst.jsdt.ui.superType.container b/.settings/org.eclipse.wst.jsdt.ui.superType.container new file mode 100644 index 0000000..3bd5d0a --- /dev/null +++ b/.settings/org.eclipse.wst.jsdt.ui.superType.container @@ -0,0 +1 @@ +org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file diff --git a/.settings/org.eclipse.wst.jsdt.ui.superType.name b/.settings/org.eclipse.wst.jsdt.ui.superType.name new file mode 100644 index 0000000..05bd71b --- /dev/null +++ b/.settings/org.eclipse.wst.jsdt.ui.superType.name @@ -0,0 +1 @@ +Window \ No newline at end of file diff --git a/libs/mysql-connector-java-8.0.15.jar b/libs/mysql-connector-java-8.0.15.jar new file mode 100644 index 0000000..fa0979f Binary files /dev/null and b/libs/mysql-connector-java-8.0.15.jar differ diff --git a/src/main/java/pokemon/Database.java b/src/main/java/pokemon/Database.java new file mode 100644 index 0000000..3491ab4 --- /dev/null +++ b/src/main/java/pokemon/Database.java @@ -0,0 +1,30 @@ +package pokemon; +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.SQLException; + +public class Database { + private Connection conn; + static Database instance=null; + + private Database() { + String connString="jdbc:mysql://localhost:3306/pokemon?user=root&password="; + try { + Class.forName("com.mysql.cj.jdbc.Driver"); + conn=DriverManager.getConnection(connString); + } catch (Exception e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + + public static Database getInstance() { + if(instance==null) + instance=new Database(); + return instance; + } + public String getUsername() { + return "test123"; + } + +} diff --git a/src/main/webapp/META-INF/MANIFEST.MF b/src/main/webapp/META-INF/MANIFEST.MF new file mode 100644 index 0000000..254272e --- /dev/null +++ b/src/main/webapp/META-INF/MANIFEST.MF @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 0000000..08c58a0 --- /dev/null +++ b/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,12 @@ + + + ImiPokemon + + index.html + index.jsp + index.htm + default.html + default.jsp + default.htm + + \ No newline at end of file diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp new file mode 100644 index 0000000..9e758a4 --- /dev/null +++ b/src/main/webapp/index.jsp @@ -0,0 +1,21 @@ +<%@ page language="java" contentType="text/html; charset=ISO-8859-1" + pageEncoding="ISO-8859-1"%> + <%@page import="pokemon.Database"%> + +<% %> + + + +Insert title here + + +<% + +Database d=Database.getInstance(); + +out.print(d.getUsername()); + +%> + + + \ No newline at end of file -- cgit v1.2.3