# HG changeset patch
# User František Kučera <franta-hg@frantovo.cz>
# Date 1234387509 -3600
# Node ID 38625daa449bbef46bea42067dc9c27a12c26395
# Parent  62bddd9b51fbf75b6b055cc1a5a342ee2b57bcee
Začali jsme používat SuperDAO
Umíme načítat data z databáze – zobrazujeme seznam cílů.

diff -r 62bddd9b51fb -r 38625daa449b java/HrisniciSpameri/nbproject/build-impl.xml
--- a/java/HrisniciSpameri/nbproject/build-impl.xml	Wed Feb 11 20:08:00 2009 +0100
+++ b/java/HrisniciSpameri/nbproject/build-impl.xml	Wed Feb 11 22:25:09 2009 +0100
@@ -360,8 +360,12 @@
     <!--
                 COMPILATION SECTION
             -->
-    <target depends="init" if="no.dist.ear.dir" name="deps-module-jar" unless="no.deps"/>
-    <target depends="init" if="dist.ear.dir" name="deps-ear-jar" unless="no.deps"/>
+    <target depends="init" if="no.dist.ear.dir" name="deps-module-jar" unless="no.deps">
+        <ant antfile="${project.SuperDAO}/build.xml" inheritall="false" target="jar"/>
+    </target>
+    <target depends="init" if="dist.ear.dir" name="deps-ear-jar" unless="no.deps">
+        <ant antfile="${project.SuperDAO}/build.xml" inheritall="false" target="jar"/>
+    </target>
     <target depends="init, deps-module-jar, deps-ear-jar" name="deps-jar" unless="no.deps"/>
     <target depends="init,deps-jar" name="-pre-pre-compile">
         <mkdir dir="${build.classes.dir}"/>
@@ -498,10 +502,15 @@
     </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="${reference.SuperDAO.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.reference.SuperDAO.jar" todir="${dist.ear.dir}"/>
         <mkdir dir="${build.web.dir}/META-INF"/>
-        <manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update"/>
+        <manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update">
+            <attribute name="Class-Path" value="${manifest.reference.SuperDAO.jar} "/>
+        </manifest>
     </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="${reference.SuperDAO.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+    </target>
     <target depends="init,compile,compile-jsps,-pre-dist,library-inclusion-in-manifest" name="do-ear-dist">
         <dirname file="${dist.ear.war}" property="dist.jar.dir"/>
         <mkdir dir="${dist.jar.dir}"/>
@@ -777,7 +786,9 @@
                 
                 CLEANUP SECTION
             -->
-    <target depends="init" if="no.dist.ear.dir" name="deps-clean" unless="no.deps"/>
+    <target depends="init" if="no.dist.ear.dir" name="deps-clean" unless="no.deps">
+        <ant antfile="${project.SuperDAO}/build.xml" inheritall="false" target="clean"/>
+    </target>
     <target depends="init" name="do-clean">
         <condition property="build.dir.to.clean" value="${build.web.dir}">
             <isset property="dist.ear.dir"/>
diff -r 62bddd9b51fb -r 38625daa449b java/HrisniciSpameri/nbproject/genfiles.properties
--- a/java/HrisniciSpameri/nbproject/genfiles.properties	Wed Feb 11 20:08:00 2009 +0100
+++ b/java/HrisniciSpameri/nbproject/genfiles.properties	Wed Feb 11 22:25:09 2009 +0100
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=0d6b07a9
+build.xml.data.CRC32=c00e70e9
 build.xml.script.CRC32=20d691ac
 build.xml.stylesheet.CRC32=c0ebde35
 # 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=0d6b07a9
-nbproject/build-impl.xml.script.CRC32=cde5e1cb
+nbproject/build-impl.xml.data.CRC32=c00e70e9
+nbproject/build-impl.xml.script.CRC32=81a189fc
 nbproject/build-impl.xml.stylesheet.CRC32=174458fc
diff -r 62bddd9b51fb -r 38625daa449b java/HrisniciSpameri/nbproject/private/private.xml
--- a/java/HrisniciSpameri/nbproject/private/private.xml	Wed Feb 11 20:08:00 2009 +0100
+++ b/java/HrisniciSpameri/nbproject/private/private.xml	Wed Feb 11 22:25:09 2009 +0100
@@ -1,12 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project-private xmlns="http://www.netbeans.org/ns/project-private/1">
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1"/>
-    <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/1">
-        <file>file:/home/fiki/src/HrisniciSpameri/java/HrisniciSpameri/src/java/cz/frantovo/hrisniciSpameri/DenniSouhrn.java</file>
-        <file>file:/home/fiki/src/HrisniciSpameri/java/HrisniciSpameri/src/java/cz/frantovo/hrisniciSpameri/dto/Cil.java</file>
-        <file>file:/home/fiki/src/HrisniciSpameri/java/HrisniciSpameri/src/java/cz/frantovo/hrisniciSpameri/dto/Souhrn.java</file>
-        <file>file:/home/fiki/src/HrisniciSpameri/java/HrisniciSpameri/web/index.jsp</file>
-        <file>file:/home/fiki/src/HrisniciSpameri/java/HrisniciSpameri/web/souhrn.jspx</file>
-        <file>file:/home/fiki/src/HrisniciSpameri/java/HrisniciSpameri/web/styl.css</file>
-    </open-files>
 </project-private>
diff -r 62bddd9b51fb -r 38625daa449b java/HrisniciSpameri/nbproject/project.properties
--- a/java/HrisniciSpameri/nbproject/project.properties	Wed Feb 11 20:08:00 2009 +0100
+++ b/java/HrisniciSpameri/nbproject/project.properties	Wed Feb 11 22:25:09 2009 +0100
@@ -23,7 +23,8 @@
 j2ee.platform=1.5
 j2ee.server.type=J2EE
 jar.compress=false
-javac.classpath=
+javac.classpath=\
+    ${reference.SuperDAO.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.debug=true
@@ -51,6 +52,8 @@
 lib.dir=${web.docbase.dir}/WEB-INF/lib
 persistence.xml.dir=${conf.dir}
 platform.active=default_platform
+project.SuperDAO=../../../SuperDAO/java/SuperDAO
+reference.SuperDAO.jar=${project.SuperDAO}/dist/SuperDAO.jar
 resource.dir=setup
 run.test.classpath=\
     ${javac.test.classpath}:\
diff -r 62bddd9b51fb -r 38625daa449b java/HrisniciSpameri/nbproject/project.xml
--- a/java/HrisniciSpameri/nbproject/project.xml	Wed Feb 11 20:08:00 2009 +0100
+++ b/java/HrisniciSpameri/nbproject/project.xml	Wed Feb 11 22:25:09 2009 +0100
@@ -5,7 +5,12 @@
         <data xmlns="http://www.netbeans.org/ns/web-project/3">
             <name>HrisniciSpameri</name>
             <minimum-ant-version>1.6.5</minimum-ant-version>
-            <web-module-libraries/>
+            <web-module-libraries>
+                <library>
+                    <file>${reference.SuperDAO.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+            </web-module-libraries>
             <web-module-additional-libraries/>
             <source-roots>
                 <root id="src.dir"/>
@@ -14,5 +19,15 @@
                 <root id="test.src.dir"/>
             </test-roots>
         </data>
+        <references xmlns="http://www.netbeans.org/ns/ant-project-references/1">
+            <reference>
+                <foreign-project>SuperDAO</foreign-project>
+                <artifact-type>jar</artifact-type>
+                <script>build.xml</script>
+                <target>jar</target>
+                <clean-target>clean</clean-target>
+                <id>jar</id>
+            </reference>
+        </references>
     </configuration>
 </project>
diff -r 62bddd9b51fb -r 38625daa449b java/HrisniciSpameri/src/java/cz/frantovo/hrisniciSpameri/DenniSouhrn.java
--- a/java/HrisniciSpameri/src/java/cz/frantovo/hrisniciSpameri/DenniSouhrn.java	Wed Feb 11 20:08:00 2009 +0100
+++ b/java/HrisniciSpameri/src/java/cz/frantovo/hrisniciSpameri/DenniSouhrn.java	Wed Feb 11 22:25:09 2009 +0100
@@ -1,11 +1,10 @@
 package cz.frantovo.hrisniciSpameri;
 
+import cz.frantovo.hrisniciSpameri.dao.CilDAO;
 import cz.frantovo.hrisniciSpameri.dto.Cil;
 import cz.frantovo.hrisniciSpameri.dto.SitovaAdresa;
 import cz.frantovo.hrisniciSpameri.dto.Souhrn;
 import java.io.Serializable;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
 import java.sql.Date;
 import java.text.DateFormat;
 import java.text.ParseException;
@@ -79,4 +78,19 @@
 
         return souhrn;
     }
+
+    /**
+     * @return Seznam všech cílů. Ale bez těchto hodnot: databáze a selekt.
+     */
+    public Collection<Cil> getSeznamCilu() {
+        Collection<Cil> cile = new CilDAO().getCile();
+
+        /** ne všechno musíme posílat do JSP vrstvy */
+        for (Cil c : cile) {
+            c.setDatabaze(null);
+            c.setSelekt(null);
+        }
+
+        return cile;
+    }
 }
diff -r 62bddd9b51fb -r 38625daa449b java/HrisniciSpameri/src/java/cz/frantovo/hrisniciSpameri/GenerovaciServlet.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/java/HrisniciSpameri/src/java/cz/frantovo/hrisniciSpameri/GenerovaciServlet.java	Wed Feb 11 22:25:09 2009 +0100
@@ -0,0 +1,11 @@
+package cz.frantovo.hrisniciSpameri;
+
+/**
+ * Servlet, který vygeneruje denní souhrn.
+ * Pokud pro daný den už souhr vygenerovaný byl, smaže ho.
+ * Vše probíhá v jedné transakci.
+ * @author fiki
+ */
+public class GenerovaciServlet {
+
+}
diff -r 62bddd9b51fb -r 38625daa449b java/HrisniciSpameri/src/java/cz/frantovo/hrisniciSpameri/dao/CilDAO.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/java/HrisniciSpameri/src/java/cz/frantovo/hrisniciSpameri/dao/CilDAO.java	Wed Feb 11 22:25:09 2009 +0100
@@ -0,0 +1,52 @@
+package cz.frantovo.hrisniciSpameri.dao;
+
+import cz.frantovo.hrisniciSpameri.dto.Cil;
+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;
+
+/**
+ *
+ * @author fiki
+ */
+public class CilDAO extends HrisniciSuperDAO {
+
+    private enum SQL {
+
+        VSECHNY_CILE
+    }
+
+    public Collection<Cil> getCile() {
+        Collection<Cil> cile = new ArrayList<Cil>();
+
+        Connection db = getSpojeni(null);
+        if (db == null) {
+            return null;
+        } else {
+            PreparedStatement ps = null;
+            ResultSet rs = null;
+            try {
+                ps = db.prepareStatement(getSQL(SQL.VSECHNY_CILE));
+                rs = ps.executeQuery();
+                while (rs.next()) {
+                    Cil c = new Cil();
+                    c.setId(rs.getInt("id"));
+                    c.setNazev(rs.getString("nazev"));
+                    c.setUrl(rs.getString("url"));
+                    c.setSelekt(rs.getString("selekt"));
+                    c.setDatabaze(rs.getString("databaze"));
+                    cile.add(c);
+                }
+            } catch (Exception e) {
+                log.log(Level.SEVERE, "Chyba při získávání seznamu cílů z databáze", e);
+            } finally {
+                zavri(db, ps, rs);
+            }
+        }
+
+        return cile;
+    }
+}
diff -r 62bddd9b51fb -r 38625daa449b java/HrisniciSpameri/src/java/cz/frantovo/hrisniciSpameri/dao/CilDAO.sql.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/java/HrisniciSpameri/src/java/cz/frantovo/hrisniciSpameri/dao/CilDAO.sql.xml	Wed Feb 11 22:25:09 2009 +0100
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+<properties>
+    <entry key="VSECHNY_CILE">
+        <![CDATA[
+        SELECT *
+        FROM cil
+        ORDER BY nazev
+        ]]>
+    </entry>
+</properties>
\ No newline at end of file
diff -r 62bddd9b51fb -r 38625daa449b java/HrisniciSpameri/src/java/cz/frantovo/hrisniciSpameri/dao/HrisniciSuperDAO.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/java/HrisniciSpameri/src/java/cz/frantovo/hrisniciSpameri/dao/HrisniciSuperDAO.java	Wed Feb 11 22:25:09 2009 +0100
@@ -0,0 +1,60 @@
+package cz.frantovo.hrisniciSpameri.dao;
+
+import cz.frantovo.superDAO.SuperDAO;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.logging.Level;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.sql.DataSource;
+
+/**
+ *
+ * @author fiki
+ */
+public class HrisniciSuperDAO extends SuperDAO {
+
+    protected InitialContext kontext = null;
+
+    protected enum DATABAZE {
+
+        HRISNICI
+    }
+
+    public HrisniciSuperDAO() {
+        try {
+            kontext = new InitialContext();
+        } catch (NamingException ex) {
+            log.log(Level.SEVERE, "InitialContext problem", ex);
+        }
+    }
+
+    /**
+     * <ul>
+     *  <li>Webová část zadává jako parametr null →
+     *  dostane výchozí spojení do PostgreSQL databáze obsahující vygenerované souhrny.</li>
+     *  <li>Generovací servlet zadává JNDI jméno databáze cíle →
+     *  dostane zdrojovou databázi, ze které vygeneruje denní souhrny a výsledek uloží do výchozí databáze.</li>
+     * </ul>
+     * @param jndi JNDI jméno, pokud je null, vrací výchozí spojení.
+     * @return Databázové spojení
+     */
+    protected Connection getSpojeni(String jndi) {
+        if (jndi == null || jndi.length() < 1) {
+            jndi = getVlastnost(DATABAZE.HRISNICI, HrisniciSuperDAO.class);
+        }
+        jndi = orizniJNDI(jndi);
+        DataSource zdroj = null;
+        try {
+            System.out.println("XXXXXX:" + jndi + ":XXXXX");
+            zdroj = (DataSource) kontext.lookup(jndi);
+            return zdroj.getConnection();
+        } 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 62bddd9b51fb -r 38625daa449b java/HrisniciSpameri/src/java/cz/frantovo/hrisniciSpameri/dao/HrisniciSuperDAO.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/java/HrisniciSpameri/src/java/cz/frantovo/hrisniciSpameri/dao/HrisniciSuperDAO.xml	Wed Feb 11 22:25:09 2009 +0100
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+<properties>
+    <entry key="HRISNICI">
+        <![CDATA[
+        jdbc/HrisniciSpameri
+        ]]>
+    </entry>
+</properties>
\ No newline at end of file
diff -r 62bddd9b51fb -r 38625daa449b java/HrisniciSpameri/src/java/cz/frantovo/hrisniciSpameri/dao/SouhrnDAO.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/java/HrisniciSpameri/src/java/cz/frantovo/hrisniciSpameri/dao/SouhrnDAO.java	Wed Feb 11 22:25:09 2009 +0100
@@ -0,0 +1,9 @@
+package cz.frantovo.hrisniciSpameri.dao;
+
+/**
+ *
+ * @author fiki
+ */
+public class SouhrnDAO extends HrisniciSuperDAO {
+    
+}
diff -r 62bddd9b51fb -r 38625daa449b java/HrisniciSpameri/src/java/cz/frantovo/hrisniciSpameri/dao/SouhrnDAO.sql.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/java/HrisniciSpameri/src/java/cz/frantovo/hrisniciSpameri/dao/SouhrnDAO.sql.xml	Wed Feb 11 22:25:09 2009 +0100
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+<properties>
+    <entry key="AHOJ">
+        <![CDATA[
+        Tak co, jak to jde? ;-)
+        ]]>
+    </entry>
+</properties>
\ No newline at end of file
diff -r 62bddd9b51fb -r 38625daa449b java/HrisniciSpameri/web/souhrn.jspx
--- a/java/HrisniciSpameri/web/souhrn.jspx	Wed Feb 11 20:08:00 2009 +0100
+++ b/java/HrisniciSpameri/web/souhrn.jspx	Wed Feb 11 22:25:09 2009 +0100
@@ -14,8 +14,25 @@
 
 
 
+    <h2>Seznam cílů</h2>
+    <ul>
+        <c:forEach var="c" items="${denniSouhrn.seznamCilu}">
+            <li>
+                <c:choose>
+                    <c:when test="${c.url == null}">
+                        <c:out value="${c.nazev}"/>
+                    </c:when>
+                    <c:otherwise>
+                        <a href="${f:escapeXml(c.url)}"><c:out value="${c.nazev}"/></a>
+                    </c:otherwise>
+                </c:choose>                
+            </li>
+        </c:forEach>
+    </ul>
 
 
+    <h2>Denní souhrn</h2>
+
     <table>
         <thead>
             <td title="Jméno a příjmení">IP adresa</td>