# HG changeset patch
# User František Kučera <franta-hg@frantovo.cz>
# Date 1267082806 -3600
# Node ID 67d332d4856250ada586cca40bea8636910c4b1c
# Parent  ea342cf8c15a61fcc3c59b072116ff0db3082060
Zakládání podniků + HTTP autentizace.

diff -r ea342cf8c15a -r 67d332d48562 java/nekurak.net-ejb/src/conf/Podnik.hbm.xml
--- a/java/nekurak.net-ejb/src/conf/Podnik.hbm.xml	Thu Feb 25 02:41:57 2010 +0100
+++ b/java/nekurak.net-ejb/src/conf/Podnik.hbm.xml	Thu Feb 25 08:26:46 2010 +0100
@@ -3,7 +3,11 @@
 "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 <hibernate-mapping>
     <class name="cz.frantovo.nekurak.dto.Podnik" table="podnik">
-	<id name="id" column="id" type="integer"/>
+	<id name="id" column="id" type="integer">
+	    <generator class="sequence">
+		<param name="sequence">podnik_seq</param>
+	    </generator>
+	</id>
 	<property name="nazev" column="nazev"/>
 	<property name="popis" column="popis"/>
 	<property name="url" column="url"/>
diff -r ea342cf8c15a -r 67d332d48562 java/nekurak.net-ejb/src/java/cz/frantovo/nekurak/dao/PodnikDAO.java
--- a/java/nekurak.net-ejb/src/java/cz/frantovo/nekurak/dao/PodnikDAO.java	Thu Feb 25 02:41:57 2010 +0100
+++ b/java/nekurak.net-ejb/src/java/cz/frantovo/nekurak/dao/PodnikDAO.java	Thu Feb 25 08:26:46 2010 +0100
@@ -26,6 +26,10 @@
 	return dotaz.getResultList();
     }
 
+    public void uloz(Podnik p) {
+	em.persist(p);
+    }
+
     private static String t(Class trida) {
 	return trida.getSimpleName();
     }
diff -r ea342cf8c15a -r 67d332d48562 java/nekurak.net-ejb/src/java/cz/frantovo/nekurak/ejb/PodnikEJB.java
--- a/java/nekurak.net-ejb/src/java/cz/frantovo/nekurak/ejb/PodnikEJB.java	Thu Feb 25 02:41:57 2010 +0100
+++ b/java/nekurak.net-ejb/src/java/cz/frantovo/nekurak/ejb/PodnikEJB.java	Thu Feb 25 08:26:46 2010 +0100
@@ -3,6 +3,7 @@
 import cz.frantovo.nekurak.dao.PodnikDAO;
 import cz.frantovo.nekurak.dto.Podnik;
 import java.util.Collection;
+import javax.annotation.security.RolesAllowed;
 import javax.ejb.EJB;
 import javax.ejb.Stateless;
 
@@ -20,4 +21,14 @@
 	Collection<Podnik> vysledek = podnikDAO.getPodniky();
 	return vysledek;
     }
+
+    @RolesAllowed("opravneny")
+    public void zalozPodnik(Podnik p) {
+	podnikDAO.uloz(p);
+    }
+
+    @RolesAllowed("opravneny")
+    public void upravPodnik(Podnik p) {
+	podnikDAO.uloz(p);
+    }
 }
diff -r ea342cf8c15a -r 67d332d48562 java/nekurak.net-lib/src/cz/frantovo/nekurak/ejb/PodnikRemote.java
--- a/java/nekurak.net-lib/src/cz/frantovo/nekurak/ejb/PodnikRemote.java	Thu Feb 25 02:41:57 2010 +0100
+++ b/java/nekurak.net-lib/src/cz/frantovo/nekurak/ejb/PodnikRemote.java	Thu Feb 25 08:26:46 2010 +0100
@@ -12,5 +12,9 @@
 public interface PodnikRemote {
 
     public Collection<Podnik> getPodniky();
+
+    public void zalozPodnik(cz.frantovo.nekurak.dto.Podnik p);
+
+    public void upravPodnik(cz.frantovo.nekurak.dto.Podnik p);
     
 }
diff -r ea342cf8c15a -r 67d332d48562 java/nekurak.net-web/src/java/cz/frantovo/nekurak/web/PridatPodnik.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/java/nekurak.net-web/src/java/cz/frantovo/nekurak/web/PridatPodnik.java	Thu Feb 25 08:26:46 2010 +0100
@@ -0,0 +1,23 @@
+package cz.frantovo.nekurak.web;
+
+import cz.frantovo.nekurak.dto.Podnik;
+
+public class PridatPodnik {
+
+    private HledacSluzby hledac = new HledacSluzby();
+
+    private Podnik podnik = new Podnik();
+
+    public Podnik getPodnik() {
+	return podnik;
+    }
+
+    public void setPodnik(Podnik podnik) {
+	this.podnik = podnik;
+    }
+
+    public boolean getPridano() {
+	hledac.getPodnikEJB().zalozPodnik(podnik);
+	return true;
+    }
+}
diff -r ea342cf8c15a -r 67d332d48562 java/nekurak.net-web/web/WEB-INF/casti/detail.jsp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/java/nekurak.net-web/web/WEB-INF/casti/detail.jsp	Thu Feb 25 08:26:46 2010 +0100
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
+	  xmlns:c="http://java.sun.com/jsp/jstl/core"
+	  xmlns:fmt="http://java.sun.com/jsp/jstl/fmt"
+	  xmlns:fn="http://java.sun.com/jsp/jstl/functions"
+	  version="2.0">
+
+    <jsp:useBean id="uvod" class="cz.frantovo.nekurak.web.Uvod" scope="request"/>
+
+    <p>TODO: Detail podniku (<c:out value="${param.podnik}"/>).</p>
+
+</jsp:root>
diff -r ea342cf8c15a -r 67d332d48562 java/nekurak.net-web/web/WEB-INF/casti/pridatPodnik.jsp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/java/nekurak.net-web/web/WEB-INF/casti/pridatPodnik.jsp	Thu Feb 25 08:26:46 2010 +0100
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
+	  xmlns:c="http://java.sun.com/jsp/jstl/core"
+	  xmlns:fmt="http://java.sun.com/jsp/jstl/fmt"
+	  xmlns:fn="http://java.sun.com/jsp/jstl/functions"
+	  version="2.0">
+
+    <jsp:useBean id="podnik" class="cz.frantovo.nekurak.dto.Podnik" scope="request"/>
+    <jsp:useBean id="pridatPodnik" class="cz.frantovo.nekurak.web.PridatPodnik" scope="request"/>
+
+    <h1>Přidání nového podniku</h1>
+
+    <c:choose>
+	<c:when test="${param.akcePridat == 'pridej'}">
+	    <jsp:setProperty name="podnik" property="*"/>
+	    <jsp:setProperty name="pridatPodnik" property="podnik" value="${podnik}"/>
+	    
+	    <p>Název: ${pridatPodnik.podnik.nazev} / ${param.nazev}</p>
+	    <p>Popis: ${pridatPodnik.podnik.popis}</p>
+	    <p>URL: ${pridatPodnik.podnik.url}</p>
+	    <p>Ulice: ${pridatPodnik.podnik.ulice}</p>
+	    <p>č.p.: ${pridatPodnik.podnik.cisloPopisne}</p>
+	    <p>Město: ${pridatPodnik.podnik.mesto}</p>
+
+
+	    <c:if test="${pridatPodnik.pridano}">
+		<p>Podnik byl přidán.</p>
+	    </c:if>
+	</c:when>
+	<c:otherwise>
+	    <form method="post" action="?akce=pridatPodnik&amp;amp;akcePridat=pridej">
+		<fieldset>
+		    <label>Název: <input type="text" name="nazev" maxlength="255"/></label><br/>
+		    <label>Popis: <input type="text" name="popis" maxlength="255"/></label><br/>
+		    <label>URL: <input type="text" name="url" maxlength="255"/></label><br/>
+		    <label>Ulice: <input type="text" name="ulice" maxlength="64"/></label><br/>
+		    <label>č.p.: <input type="text" name="cisloPopisne" maxlength="5"/></label><br/>
+		    <label>Město: <input type="text" name="mesto" maxlength="64"/></label><br/>
+		    <button value="submit">Přidat podnik</button>
+		</fieldset>
+	    </form>
+	</c:otherwise>
+    </c:choose>
+
+
+
+
+</jsp:root>
diff -r ea342cf8c15a -r 67d332d48562 java/nekurak.net-web/web/WEB-INF/casti/uvod.jsp
--- a/java/nekurak.net-web/web/WEB-INF/casti/uvod.jsp	Thu Feb 25 02:41:57 2010 +0100
+++ b/java/nekurak.net-web/web/WEB-INF/casti/uvod.jsp	Thu Feb 25 08:26:46 2010 +0100
@@ -10,17 +10,19 @@
     <p>Naposledy přidané podniky:</p>
 
     <c:forEach var="p" items="${uvod.podniky}">
-	<h2><c:out value="${p.nazev}"/></h2>
-	<p><c:out value="${p.popis}"/></p>
-	<p>
+	<div class="podnik">
+	    <a href="?akce=detail&amp;amp;podnik=${p.id}"><h2><c:out value="${p.nazev}"/></h2></a>
+	    <p><c:out value="${p.popis}"/></p>
+	    <p>
 	    Adresa:<br/>
-	    <c:out value="${p.ulice}"/>&amp;#160;
-	    <c:out value="${p.cisloPopisne}"/><br/>
-	    <c:out value="${p.mesto}"/>
-	</p>
-	<c:if test="${p.url != null}">
-	    <p><a href="${fn:escapeXml(p.url)}">www stránka</a></p>
-	</c:if>
+		<c:out value="${p.ulice}"/>&amp;#160;
+		<c:out value="${p.cisloPopisne}"/><br/>
+		<c:out value="${p.mesto}"/>
+	    </p>
+	    <c:if test="${p.url != null}">
+		<p><a href="${fn:escapeXml(p.url)}">www stránka</a></p>
+	    </c:if>
+	</div>
     </c:forEach>
 
 </jsp:root>
diff -r ea342cf8c15a -r 67d332d48562 java/nekurak.net-web/web/WEB-INF/sun-web.xml
--- a/java/nekurak.net-web/web/WEB-INF/sun-web.xml	Thu Feb 25 02:41:57 2010 +0100
+++ b/java/nekurak.net-web/web/WEB-INF/sun-web.xml	Thu Feb 25 08:26:46 2010 +0100
@@ -1,12 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sun-web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Application Server 9.0 Servlet 2.5//EN" "http://www.sun.com/software/appserver/dtds/sun-web-app_2_5-0.dtd">
 <sun-web-app error-url="">
-  <context-root>/nekurak.net-web</context-root>
-  <class-loader delegate="true"/>
-  <parameter-encoding default-charset="UTF-8"/>
-  <jsp-config>
-    <property name="keepgenerated" value="true">
-      <description>Keep a copy of the generated servlet class' java code.</description>
-    </property>
-  </jsp-config>
+    <context-root>/nekurak.net-web</context-root>
+    <class-loader delegate="true"/>
+    <parameter-encoding default-charset="UTF-8"/>
+    <jsp-config>
+	<property name="keepgenerated" value="true">
+	    <description>Keep a copy of the generated servlet class' java code.</description>
+	</property>
+    </jsp-config>
+    <security-role-mapping>
+	<role-name>opravneny</role-name>
+	<group-name>spravce</group-name>
+    </security-role-mapping>
 </sun-web-app>
diff -r ea342cf8c15a -r 67d332d48562 java/nekurak.net-web/web/WEB-INF/web.xml
--- a/java/nekurak.net-web/web/WEB-INF/web.xml	Thu Feb 25 02:41:57 2010 +0100
+++ b/java/nekurak.net-web/web/WEB-INF/web.xml	Thu Feb 25 08:26:46 2010 +0100
@@ -1,24 +1,44 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
     <session-config>
-	<session-timeout>30</session-timeout>
+        <session-timeout>
+	    30
+	</session-timeout>
     </session-config>
     <welcome-file-list>
-	<welcome-file>index.jsp</welcome-file>
+        <welcome-file>index.jsp</welcome-file>
     </welcome-file-list>
     <error-page>
-	<!-- Stránka nenalezena -->
-	<error-code>404</error-code>
-	<location>/WEB-INF/chyby/404.jsp</location>
+        <!-- Stránka nenalezena -->
+        <error-code>404</error-code>
+        <location>/WEB-INF/chyby/404.jsp</location>
     </error-page>
     <error-page>
-	<!-- Interní chyba serveru -->
-	<error-code>500</error-code>
-	<location>/WEB-INF/chyby/500.jsp</location>
+        <!-- Interní chyba serveru -->
+        <error-code>500</error-code>
+        <location>/WEB-INF/chyby/500.jsp</location>
     </error-page>
     <context-param>
-	<!-- Pro případ, že chybí hlavička „Accept-language“ v HTTP požadavku -->
-	<param-name>javax.servlet.jsp.jstl.fmt.fallbackLocale</param-name>
-	<param-value>cs</param-value>
+        <!-- Pro případ, že chybí hlavička „Accept-language“ v HTTP požadavku -->
+        <param-name>javax.servlet.jsp.jstl.fmt.fallbackLocale</param-name>
+        <param-value>cs</param-value>
     </context-param>
+    <!--  <zabezpečení> -->
+    <security-role>
+        <role-name>opravneny</role-name>
+    </security-role>
+    <security-constraint>
+        <web-resource-collection>
+            <web-resource-name>Správa Nekuřák.net</web-resource-name>
+            <url-pattern>/sprava/*</url-pattern>
+        </web-resource-collection>
+        <auth-constraint>
+            <role-name>opravneny</role-name>
+        </auth-constraint>
+    </security-constraint>    
+    <login-config>
+        <auth-method>BASIC</auth-method>
+        <realm-name>nekurakNET</realm-name>
+    </login-config>
+    <!--  </zabezpečení> -->
 </web-app>
diff -r ea342cf8c15a -r 67d332d48562 java/nekurak.net-web/web/index.jsp
--- a/java/nekurak.net-web/web/index.jsp	Thu Feb 25 02:41:57 2010 +0100
+++ b/java/nekurak.net-web/web/index.jsp	Thu Feb 25 08:26:46 2010 +0100
@@ -30,19 +30,26 @@
 		</div>
 
 		<ul id="nabidka">
-		    <li><a href="#">Úvod</a></li>
-		    <li><a href="#">Přidat podnik</a></li>
-		    <li><a href="#">Přihlásit se</a></li>
+		    <li><a href="?">Úvod</a></li>
+		    <li><a href="${pageContext.servletContext.contextPath}/sprava">Správa</a></li>
+		    <c:if test="${pageContext.request.userPrincipal.name != null}">
+			<li><a href="?akce=pridatPodnik">Přidat podnik</a></li>
+			<li id="prihlasenyUzivatel">Přihlášený uživatel: ${pageContext.request.userPrincipal.name}</li>
+		    </c:if>
+
 		</ul>
 
 		<div id="obsah">
 
 		    <c:choose>
 			<c:when test="${param.akce == 'detail'}">
-
+			    <jsp:include page="/WEB-INF/casti/detail.jsp" flush="false"/>
+			</c:when>
+			<c:when test="${param.akce == 'pridatPodnik'}">
+			    <jsp:include page="/WEB-INF/casti/pridatPodnik.jsp" flush="false"/>
 			</c:when>
 			<c:otherwise>
-			    <jsp:include page="WEB-INF/casti/uvod.jsp" flush="false"/>
+			    <jsp:include page="/WEB-INF/casti/uvod.jsp" flush="false"/>
 			</c:otherwise>
 		    </c:choose>
 
@@ -51,8 +58,8 @@
 		<div id="paticka">
 		    <p>
 			© 2010 nekurak.net. Licence: Affero GPL.
-			<a href="nekurak.net-src.zip">nekurak.net-src.zip</a>
-			<a href="nekurak.net-src.zip.SHA-512">.</a>
+			<a href="${pageContext.servletContext.contextPath}/nekurak.net-src.zip">nekurak.net-src.zip</a>
+			<a href="${pageContext.servletContext.contextPath}/nekurak.net-src.zip.SHA-512">.</a>
 		    </p>
 		</div>
 
diff -r ea342cf8c15a -r 67d332d48562 java/nekurak.net-web/web/sprava/grafika
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/java/nekurak.net-web/web/sprava/grafika	Thu Feb 25 08:26:46 2010 +0100
@@ -0,0 +1,1 @@
+../grafika/
\ No newline at end of file
diff -r ea342cf8c15a -r 67d332d48562 java/nekurak.net-web/web/sprava/index.jsp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/java/nekurak.net-web/web/sprava/index.jsp	Thu Feb 25 08:26:46 2010 +0100
@@ -0,0 +1,1 @@
+../index.jsp
\ No newline at end of file
diff -r ea342cf8c15a -r 67d332d48562 java/nekurak.net-web/web/sprava/styl.css
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/java/nekurak.net-web/web/sprava/styl.css	Thu Feb 25 08:26:46 2010 +0100
@@ -0,0 +1,1 @@
+../styl.css
\ No newline at end of file
diff -r ea342cf8c15a -r 67d332d48562 java/nekurak.net-web/web/styl.css
--- a/java/nekurak.net-web/web/styl.css	Thu Feb 25 02:41:57 2010 +0100
+++ b/java/nekurak.net-web/web/styl.css	Thu Feb 25 08:26:46 2010 +0100
@@ -5,6 +5,10 @@
     text-align: center;
 }
 
+a {
+    text-decoration: none;
+}
+
 .body {
     width: 1000px;
     text-align: left;
@@ -37,7 +41,7 @@
 #nabidka li {
     display: inline;
     font-size: 14px;
-    margin-left: 8px;
+    margin-left: 12px;
 }
 
 #nabidka li a {
@@ -48,6 +52,10 @@
     color: orange;
 }
 
+#prihlasenyUzivatel {
+    color: gray;
+}
+
 #obsah {
     width: 980px;
     border: 1px solid silver;
@@ -81,3 +89,19 @@
     font-weight: bold;
 }
 
+.podnik a h2 {
+    color: black;
+}
+
+fieldset {
+	border: none;
+}
+
+form {
+	text-align: right;
+	max-width: 400px;
+}
+
+input	{
+	width:200px;
+}