# HG changeset patch
# User František Kučera <franta-hg@frantovo.cz>
# Date 1265854437 -3600
# Node ID fc3e84d87e01fa62ed34691182ebc1f1a131bb99
# Parent  49dacfa6eae46f7dfc27d61bb3d7dad89156a252
DAO vrstva pomocí Spring JdbcTemplate.

diff -r 49dacfa6eae4 -r fc3e84d87e01 java/nekurak.net-web/build.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/java/nekurak.net-web/build.xml	Thu Feb 11 03:13:57 2010 +0100
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- You may freely edit this file. See commented blocks below for -->
+<!-- some examples of how to customize the build. -->
+<!-- (If you delete it and reopen the project it will be recreated.) -->
+<!-- By default, only the Clean and Build commands use this build script. -->
+<!-- Commands such as Run, Debug, and Test only use this build script if -->
+<!-- the Compile on Save feature is turned off for the project. -->
+<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
+<!-- in the project's Project Properties dialog box.-->
+<project name="nekurak.net-web" default="default" basedir=".">
+    <description>Builds, tests, and runs the project nekurak.net-web.</description>
+    <import file="nbproject/build-impl.xml"/>
+    <!--
+
+    There exist several targets which are by default empty and which can be 
+    used for execution of your tasks. These targets are usually executed 
+    before and after some main targets. They are: 
+
+      -pre-init:                 called before initialization of project properties 
+      -post-init:                called after initialization of project properties 
+      -pre-compile:              called before javac compilation 
+      -post-compile:             called after javac compilation 
+      -pre-compile-single:       called before javac compilation of single file
+      -post-compile-single:      called after javac compilation of single file
+      -pre-compile-test:         called before javac compilation of JUnit tests
+      -post-compile-test:        called after javac compilation of JUnit tests
+      -pre-compile-test-single:  called before javac compilation of single JUnit test
+      -post-compile-test-single: called after javac compilation of single JUunit test
+      -pre-dist:                 called before archive building 
+      -post-dist:                called after archive building 
+      -post-clean:               called after cleaning build products 
+      -pre-run-deploy:           called before deploying
+      -post-run-deploy:          called after deploying
+
+    Example of pluging an obfuscator after the compilation could look like 
+
+        <target name="-post-compile">
+            <obfuscate>
+                <fileset dir="${build.classes.dir}"/>
+            </obfuscate>
+        </target>
+
+    For list of available properties check the imported 
+    nbproject/build-impl.xml file. 
+
+
+    Other way how to customize the build is by overriding existing main targets.
+    The target of interest are: 
+
+      init-macrodef-javac:    defines macro for javac compilation
+      init-macrodef-junit:   defines macro for junit execution
+      init-macrodef-debug:    defines macro for class debugging
+      do-dist:                archive building
+      run:                    execution of project 
+      javadoc-build:          javadoc generation 
+
+    Example of overriding the target for project execution could look like 
+
+        <target name="run" depends="<PROJNAME>-impl.jar">
+            <exec dir="bin" executable="launcher.exe">
+                <arg file="${dist.jar}"/>
+            </exec>
+        </target>
+
+    Notice that overridden target depends on jar target and not only on 
+    compile target as regular run target does. Again, for list of available 
+    properties which you can use check the target you are overriding in 
+    nbproject/build-impl.xml file. 
+
+    -->
+</project>
diff -r 49dacfa6eae4 -r fc3e84d87e01 java/nekurak.net-web/nbproject/build-impl.xml
--- a/java/nekurak.net-web/nbproject/build-impl.xml	Wed Jan 27 05:21:57 2010 +0100
+++ b/java/nekurak.net-web/nbproject/build-impl.xml	Thu Feb 11 03:13:57 2010 +0100
@@ -527,10 +527,13 @@
     </target>
     <target depends="init,compile,compile-jsps,-pre-dist,-do-dist-with-manifest,-do-dist-without-manifest" name="do-dist"/>
     <target depends="init" if="dist.ear.dir" name="library-inclusion-in-manifest">
+        <copyfiles files="${libs.spring-framework.classpath}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <mkdir dir="${build.web.dir}/META-INF"/>
         <manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update"/>
     </target>
-    <target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir"/>
+    <target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir">
+        <copyfiles files="${libs.spring-framework.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
+    </target>
     <target depends="init" if="dist.ear.dir" name="-clean-webinf-lib">
         <delete dir="${build.web.dir}/WEB-INF/lib"/>
     </target>
diff -r 49dacfa6eae4 -r fc3e84d87e01 java/nekurak.net-web/nbproject/genfiles.properties
--- a/java/nekurak.net-web/nbproject/genfiles.properties	Wed Jan 27 05:21:57 2010 +0100
+++ b/java/nekurak.net-web/nbproject/genfiles.properties	Thu Feb 11 03:13:57 2010 +0100
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=7602bd8b
+build.xml.data.CRC32=e61550c0
 build.xml.script.CRC32=d97fcc7d
-build.xml.stylesheet.CRC32=c0ebde35@1.21.1.1
+build.xml.stylesheet.CRC32=c0ebde35@1.21.2.1
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=7602bd8b
-nbproject/build-impl.xml.script.CRC32=dc954e54
-nbproject/build-impl.xml.stylesheet.CRC32=b139b33b@1.21.1.1
+nbproject/build-impl.xml.data.CRC32=e61550c0
+nbproject/build-impl.xml.script.CRC32=78de9ffb
+nbproject/build-impl.xml.stylesheet.CRC32=b139b33b@1.21.2.1
diff -r 49dacfa6eae4 -r fc3e84d87e01 java/nekurak.net-web/nbproject/project.properties
--- a/java/nekurak.net-web/nbproject/project.properties	Wed Jan 27 05:21:57 2010 +0100
+++ b/java/nekurak.net-web/nbproject/project.properties	Thu Feb 11 03:13:57 2010 +0100
@@ -25,7 +25,8 @@
 j2ee.platform=1.5
 j2ee.server.type=gfv3ee6
 jar.compress=false
-javac.classpath=
+javac.classpath=\
+    ${libs.spring-framework.classpath}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.debug=true
diff -r 49dacfa6eae4 -r fc3e84d87e01 java/nekurak.net-web/nbproject/project.xml
--- a/java/nekurak.net-web/nbproject/project.xml	Wed Jan 27 05:21:57 2010 +0100
+++ b/java/nekurak.net-web/nbproject/project.xml	Thu Feb 11 03:13:57 2010 +0100
@@ -5,7 +5,12 @@
         <data xmlns="http://www.netbeans.org/ns/web-project/3">
             <name>nekurak.net-web</name>
             <minimum-ant-version>1.6.5</minimum-ant-version>
-            <web-module-libraries/>
+            <web-module-libraries>
+                <library dirs="200">
+                    <file>${libs.spring-framework.classpath}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+            </web-module-libraries>
             <web-module-additional-libraries/>
             <source-roots>
                 <root id="src.dir"/>
diff -r 49dacfa6eae4 -r fc3e84d87e01 java/nekurak.net-web/src/java/cz/frantovo/nekurak/dao/NekurakSuperDAO.java
--- a/java/nekurak.net-web/src/java/cz/frantovo/nekurak/dao/NekurakSuperDAO.java	Wed Jan 27 05:21:57 2010 +0100
+++ b/java/nekurak.net-web/src/java/cz/frantovo/nekurak/dao/NekurakSuperDAO.java	Thu Feb 11 03:13:57 2010 +0100
@@ -31,20 +31,15 @@
     }
 
     /**
-     * @return Databázové spojení nebo null při chybě.
+     * @return Datový zdroj nebo null při chybě.
      */
-    protected Connection getSpojeni() {
+    protected DataSource getSpojeni() {
 	String jndi = orizni(getVlastnost(DATABAZE.VYCHOZI, NekurakSuperDAO.class));
-	DataSource zdroj = null;
 	try {
-	    zdroj = (DataSource) kontext.lookup(jndi);
-	    return zdroj.getConnection();
+	    return (DataSource) kontext.lookup(jndi);
 	} catch (NamingException ex) {
 	    log.log(Level.SEVERE, "getSpojeni: lookup", ex);
 	    return null;
-	} catch (SQLException ex) {
-	    log.log(Level.SEVERE, "getSpojeni: sql", ex);
-	    return null;
 	}
     }
 }
diff -r 49dacfa6eae4 -r fc3e84d87e01 java/nekurak.net-web/src/java/cz/frantovo/nekurak/dao/PodnikDAO.java
--- a/java/nekurak.net-web/src/java/cz/frantovo/nekurak/dao/PodnikDAO.java	Wed Jan 27 05:21:57 2010 +0100
+++ b/java/nekurak.net-web/src/java/cz/frantovo/nekurak/dao/PodnikDAO.java	Thu Feb 11 03:13:57 2010 +0100
@@ -1,12 +1,8 @@
 package cz.frantovo.nekurak.dao;
 
 import cz.frantovo.nekurak.dto.Podnik;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.util.ArrayList;
 import java.util.Collection;
-import java.util.logging.Level;
+import org.springframework.jdbc.core.JdbcTemplate;
 
 /**
  * Stará se o načítání a ukládání podniků (hospod) z a do databáze.
@@ -21,27 +17,11 @@
 	UPDATE,
 	NEXTVAL
     }
+    private PodnikRowMapper podnikRowMapper = new PodnikRowMapper();
+    private JdbcTemplate jdbcTemplate = new JdbcTemplate(getSpojeni());
 
     public Collection<Podnik> getPodniky() {
-	Connection db = getSpojeni();
-	PreparedStatement ps = null;
-	ResultSet rs = null;
-	try {
-	    ps = db.prepareStatement(getSQL(SQL.SELECT_VSECHNY));
-	    rs = ps.executeQuery();
-	    Collection<Podnik> vysledek = new ArrayList<Podnik>();
-
-	    while (rs.next()) {
-		vysledek.add(new Podnik(rs.getInt("id"), rs.getString("nazev")));
-	    }
-
-	    return vysledek;
-	} catch (Exception e) {
-	    log.log(Level.SEVERE, "Chyba při získávání podniků.", e);
-	    return null;
-	} finally {
-	    zavri(db, ps, rs);
-	}
+	return jdbcTemplate.query(getSQL(SQL.SELECT_VSECHNY), podnikRowMapper);
     }
 
     /**
@@ -50,36 +30,12 @@
      * @return id vloženého nebo uloženého podniku.
      */
     public int ulozPodnik(Podnik p) {
-	Connection db = getSpojeni();
-	PreparedStatement psUpdate = null;
-	PreparedStatement psId = null;
-	ResultSet rsId = null;
-	try {
-	    if (p.getId() == 0) {
-		psId = db.prepareStatement(getSQL(SQL.NEXTVAL));
-		rsId = psId.executeQuery();
-		rsId.next();
-		p.setId(rsId.getInt(1));
-
-		psUpdate = db.prepareStatement(getSQL(SQL.INSERT));
-	    } else {
-		psUpdate = db.prepareStatement(getSQL(SQL.UPDATE));
-	    }
-
-	    psUpdate.setString(1, p.getNazev());
-	    psUpdate.setInt(2, p.getId());
-
-	    psUpdate.executeUpdate();
-
-	    db.commit();
-	    return p.getId();
-	} catch (Exception e) {
-	    rollback(db);
-	    log.log(Level.SEVERE, "Chyba při ukládání podniku.", e);
-	    return -1;
-	} finally {
-	    zavri(null, psId, rsId);
-	    zavri(db, psUpdate, null);
+	if (p.getId() == 0) {
+	    p.setId(jdbcTemplate.queryForInt(getSQL(SQL.NEXTVAL)));
+	    jdbcTemplate.update(getSQL(SQL.INSERT), new Object[]{p.getNazev(), p.getId()});
+	} else {
+	    jdbcTemplate.update(getSQL(SQL.UPDATE), new Object[]{p.getNazev(), p.getId()});
 	}
+	return p.getId();
     }
 }
diff -r 49dacfa6eae4 -r fc3e84d87e01 java/nekurak.net-web/src/java/cz/frantovo/nekurak/dao/PodnikRowMapper.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/java/nekurak.net-web/src/java/cz/frantovo/nekurak/dao/PodnikRowMapper.java	Thu Feb 11 03:13:57 2010 +0100
@@ -0,0 +1,21 @@
+package cz.frantovo.nekurak.dao;
+
+import cz.frantovo.nekurak.dto.Podnik;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import org.springframework.jdbc.core.simple.ParameterizedRowMapper;
+
+/**
+ *
+ * @author fiki
+ */
+public class PodnikRowMapper implements ParameterizedRowMapper<Podnik> {
+
+    public Podnik mapRow(ResultSet rs, int i) throws SQLException {
+	Podnik p = new Podnik();
+	p.setId(rs.getInt("id"));
+	p.setNazev(rs.getString("nazev"));
+	return p;
+    }
+
+}
diff -r 49dacfa6eae4 -r fc3e84d87e01 java/nekurak.net-web/web/index.jsp
--- a/java/nekurak.net-web/web/index.jsp	Wed Jan 27 05:21:57 2010 +0100
+++ b/java/nekurak.net-web/web/index.jsp	Thu Feb 11 03:13:57 2010 +0100
@@ -10,6 +10,7 @@
     <html xmlns="http://www.w3.org/1999/xhtml">
 	<head>
 	    <title>Nekuřák.net</title>
+	    <link href="styl.css" type="text/css" rel="StyleSheet"/>
 	</head>
 	<body>
 	    <h1>Nekuřák.net</h1>
@@ -25,15 +26,25 @@
 	    <c:choose>
 		<!-- if -->
 		<c:when test="${param.akce == 'seznam'}">
-		    <p>Vypíšeme seznam hospod.</p>
+		    <p>Vypíšeme seznam podniků:</p>
 		    <!-- Vytvoříme si instanci JavaBeany -->
 		    <jsp:useBean id="podnikyWeb" class="cz.frantovo.nekurak.web.PodnikyWeb" scope="request"/>
-		    <ul>
-			<c:forEach var="p" items="${podnikyWeb.podniky}">
-			    <!-- vypíšeme název podniku (měli bychom escapovat) -->
-			    <li>${p.nazev}</li>
-			</c:forEach>
-		    </ul>
+		    <table>
+			<thead>
+			    <tr>
+				<td>Číslo</td>
+				<td>Název</td>
+			    </tr>
+			</thead>
+			<tbody>
+			    <c:forEach var="p" items="${podnikyWeb.podniky}">
+				<tr>
+				    <td><c:out value="${p.id}"/></td>
+				    <td><c:out value="${p.nazev}"/></td>
+				</tr>
+			    </c:forEach>
+			</tbody>
+		    </table>
 		</c:when>
 		<!-- else if -->
 		<c:when test="${param.akce == 'podrobnosti'}">
diff -r 49dacfa6eae4 -r fc3e84d87e01 java/nekurak.net-web/web/styl.css
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/java/nekurak.net-web/web/styl.css	Thu Feb 11 03:13:57 2010 +0100
@@ -0,0 +1,15 @@
+table {
+    border: 1px solid gray;
+    border-collapse: collapse;
+}
+
+td {
+    border: 1px solid gray;
+    padding: 2px 4px;
+}
+
+thead {
+    background-color: silver;
+    font-weight: bold;
+}
+