# HG changeset patch
# User František Kučera <franta-hg@frantovo.cz>
# Date 1271196752 -7200
# Node ID 01be78803f73dc3c0418fa3b916fc92b37923c9a
# Parent  fd22f66e812d319326890debc394e8b517816328
Webové služby, zjišťování souřadnic podniků.

diff -r fd22f66e812d -r 01be78803f73 java/nekurak.net-ejb/src/conf/Podnik.hbm.xml
--- a/java/nekurak.net-ejb/src/conf/Podnik.hbm.xml	Mon Apr 12 12:09:45 2010 +0200
+++ b/java/nekurak.net-ejb/src/conf/Podnik.hbm.xml	Wed Apr 14 00:12:32 2010 +0200
@@ -21,6 +21,8 @@
 	    <list-index column="poradi"/>
 	    <one-to-many class="cz.frantovo.nekurak.dto.Fotka"/>
 	</list>
+	<property name="sirka" column="sirka"/>
+	<property name="delka" column="delka"/>
 
     </class>
 </hibernate-mapping>
\ No newline at end of file
diff -r fd22f66e812d -r 01be78803f73 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	Mon Apr 12 12:09:45 2010 +0200
+++ b/java/nekurak.net-ejb/src/java/cz/frantovo/nekurak/dao/PodnikDAO.java	Wed Apr 14 00:12:32 2010 +0200
@@ -25,6 +25,18 @@
 	return dotaz.getResultList();
     }
 
+    /**
+     * @return podniky, které nemají souřadnice (null, null)
+     */
+    public Collection<Podnik> getPodnikyBezSouradnic() {
+	Query dotaz = em.createQuery("FROM " + DAO.t(Podnik.class) + " o WHERE sirka IS NULL AND delka IS NULL");
+	return dotaz.getResultList();
+    }
+
+    public Podnik getPodnik(int id) {
+	return em.find(Podnik.class, id);
+    }
+
     public void zaloz(Podnik p) {
 	if (p.getDatum() == null) {
 	    p.setDatum(new Date());
diff -r fd22f66e812d -r 01be78803f73 java/nekurak.net-ejb/src/java/cz/frantovo/nekurak/ejb/Geo.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/java/nekurak.net-ejb/src/java/cz/frantovo/nekurak/ejb/Geo.java	Wed Apr 14 00:12:32 2010 +0200
@@ -0,0 +1,102 @@
+package cz.frantovo.nekurak.ejb;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+/**
+ * TODO: přesunout jinam a převést na EJB.
+ * @author fiki
+ */
+public class Geo {
+
+    private static final Logger log = Logger.getLogger(Geo.class.getSimpleName());
+
+    /**
+     * Převede poštovní adresu na zeměpisné souřadnice.
+     * @param adresa
+     * @return souřadnice k dané adrese nebo null, v případě chyby.
+     */
+    public Souradnice getSouradnice(String adresa) {
+	try {
+
+	    /**
+	     * TODO: naprosto zprasené → předělat →
+	     * http://code.google.com/intl/cs/apis/maps/documentation/geocoding/#XMLParsing
+	     */
+	    DocumentBuilder db = DocumentBuilderFactory.newInstance().newDocumentBuilder();
+	    Document d = db.parse(sestavURL(adresa));
+	    NodeList mista = d.getElementsByTagName("location");
+	    Node misto = mista.item(0);
+	    NodeList potomci = misto.getChildNodes();
+	    String delka = null;
+	    String sirka = null;
+	    for (int i = 0; i < potomci.getLength(); i++) {
+		Node p = potomci.item(i);
+		System.out.println("XML:" + p.getNodeName() + "|" + p.getTextContent());
+		if ("lat".equals(p.getNodeName())) {
+		    sirka = p.getTextContent();
+		}
+		if ("lng".equals(p.getNodeName())) {
+		    delka = p.getTextContent();
+		}
+	    }
+
+	    if (sirka == null || delka == null) {
+		log.log(Level.WARNING, "Selhalo zjišťování souřadnic – šířka nebo délka jsou null – pro adresu: " + adresa);
+		return null;
+	    } else {
+		return new Souradnice(Double.parseDouble(sirka), Double.parseDouble(delka));
+	    }
+	} catch (Exception e) {
+	    log.log(Level.WARNING, "Selhalo zjišťování souřadnic pro adresu: " + adresa, e);
+	    return null;
+	}
+    }
+
+    private static String sestavURL(String adresa) throws UnsupportedEncodingException {
+	return "http://maps.google.com/maps/api/geocode/xml?sensor=false&address=" + URLEncoder.encode(adresa, "UTF-8");
+    }
+
+    public class Souradnice {
+
+	private double sirka;
+	private double delka;
+
+	@Override
+	public String toString() {
+	    return "šířka = " + sirka + "; délka = " + delka + ";";
+	}
+
+	public Souradnice(double sirka, double delka) {
+	    this.sirka = sirka;
+	    this.delka = delka;
+	}
+
+	public String getLoc() {
+	    return "Loc: " + sirka + ", " + delka;
+	}
+
+	public double getDelka() {
+	    return delka;
+	}
+
+	public double getSirka() {
+	    return sirka;
+	}
+
+	public void setDelka(double delka) {
+	    this.delka = delka;
+	}
+
+	public void setSirka(double sirka) {
+	    this.sirka = sirka;
+	}
+    }
+}
diff -r fd22f66e812d -r 01be78803f73 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	Mon Apr 12 12:09:45 2010 +0200
+++ b/java/nekurak.net-ejb/src/java/cz/frantovo/nekurak/ejb/PodnikEJB.java	Wed Apr 14 00:12:32 2010 +0200
@@ -2,6 +2,7 @@
 
 import cz.frantovo.nekurak.dao.PodnikDAO;
 import cz.frantovo.nekurak.dto.Podnik;
+import cz.frantovo.nekurak.ejb.Geo.Souradnice;
 import java.util.Collection;
 import javax.annotation.Resource;
 import javax.annotation.security.RolesAllowed;
@@ -26,6 +27,10 @@
 	return vysledek;
     }
 
+    public Podnik getPodnik(int id) {
+	return podnikDAO.getPodnik(id);
+    }
+
     @RolesAllowed("opravneny")
     public void zalozPodnik(Podnik p) {
 	p.setSpravce(ctx.getCallerPrincipal().getName());
@@ -36,4 +41,25 @@
     public void upravPodnik(Podnik p) {
 	podnikDAO.uloz(p);
     }
+
+    public int dopocitejSouradnice() {
+	/**
+	 * TODO:    refaktorovat, změnit datové typy, souřadnice…
+	 *	    dopočítávat jen ty, které ještě nemají souřadnice
+	 */
+	Geo g = new Geo();
+	int pocetAktualizovanych = 0;
+
+	for (Podnik p : podnikDAO.getPodniky()) {
+	    Souradnice s = g.getSouradnice(p.getUlice() + " " + p.getCisloPopisne() + ", " + p.getMesto());
+	    if (s != null) {
+		pocetAktualizovanych++;
+		p.setSirka(s.getSirka());
+		p.setDelka(s.getDelka());
+		podnikDAO.uloz(p);
+	    }
+	}
+
+	return pocetAktualizovanych;
+    }
 }
diff -r fd22f66e812d -r 01be78803f73 java/nekurak.net-lib/src/cz/frantovo/nekurak/dto/Podnik.java
--- a/java/nekurak.net-lib/src/cz/frantovo/nekurak/dto/Podnik.java	Mon Apr 12 12:09:45 2010 +0200
+++ b/java/nekurak.net-lib/src/cz/frantovo/nekurak/dto/Podnik.java	Wed Apr 14 00:12:32 2010 +0200
@@ -22,6 +22,8 @@
     private String mesto;
     private String spravce;
     private List<Fotka> fotky = new ArrayList<Fotka>();
+    private Double sirka;
+    private Double delka;
 
     public Podnik() {
     }
@@ -110,4 +112,20 @@
     public void setFotky(List<Fotka> fotky) {
 	this.fotky = fotky;
     }
+
+    public Double getSirka() {
+	return sirka;
+    }
+
+    public void setSirka(Double sirka) {
+	this.sirka = sirka;
+    }
+
+    public Double getDelka() {
+	return delka;
+    }
+
+    public void setDelka(Double delka) {
+	this.delka = delka;
+    }
 }
diff -r fd22f66e812d -r 01be78803f73 java/nekurak.net-lib/src/cz/frantovo/nekurak/ejb/PodnikRemote.java
--- a/java/nekurak.net-lib/src/cz/frantovo/nekurak/ejb/PodnikRemote.java	Mon Apr 12 12:09:45 2010 +0200
+++ b/java/nekurak.net-lib/src/cz/frantovo/nekurak/ejb/PodnikRemote.java	Wed Apr 14 00:12:32 2010 +0200
@@ -17,4 +17,7 @@
 
     public void upravPodnik(Podnik p);
 
+    public Podnik getPodnik(int id);
+
+    public int dopocitejSouradnice();
 }
diff -r fd22f66e812d -r 01be78803f73 java/nekurak.net-web/src/java/cz/frantovo/nekurak/web/Detail.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/java/nekurak.net-web/src/java/cz/frantovo/nekurak/web/Detail.java	Wed Apr 14 00:12:32 2010 +0200
@@ -0,0 +1,51 @@
+package cz.frantovo.nekurak.web;
+
+import cz.frantovo.nekurak.dto.Podnik;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ *
+ * @author fiki
+ */
+public class Detail {
+
+    private HledacSluzby hledac = new HledacSluzby();
+    private int id;
+    private Podnik podnik;
+
+    /**
+     * @return URL mapy – obrázku nebo null při chybě nebo absenci souřadnic
+     */
+    public String getMapa() {
+	Podnik p = getPodnik();
+
+	if (p == null || p.getSirka() == null || p.getDelka() == null) {
+	    return null;
+	} else {
+	    try {
+		String souradnice = URLEncoder.encode(p.getSirka() + ", " + p.getDelka(), "UTF-8");
+		return "http://maps.google.com/maps/api/staticmap?size=400x400&sensor=false&center=" + souradnice;
+	    } catch (UnsupportedEncodingException e) {
+		return null;
+	    }
+	}
+    }
+
+    public int getId() {
+	return id;
+    }
+
+    public void setId(int id) {
+	this.id = id;
+    }
+
+    public Podnik getPodnik() {
+	if (podnik == null) {
+	    podnik = hledac.getPodnikEJB().getPodnik(id);
+	}
+	return podnik;
+    }
+}
diff -r fd22f66e812d -r 01be78803f73 java/nekurak.net-web/web/WEB-INF/casti/detail.jsp
--- a/java/nekurak.net-web/web/WEB-INF/casti/detail.jsp	Mon Apr 12 12:09:45 2010 +0200
+++ b/java/nekurak.net-web/web/WEB-INF/casti/detail.jsp	Wed Apr 14 00:12:32 2010 +0200
@@ -6,8 +6,36 @@
 	  xmlns:nk="urn:jsptagdir:/WEB-INF/tags/nekurak"
 	  version="2.0">
 
-    <nk:stranka titulek="TODO: Detail podniku">
-	<p>TODO: Detail podniku (<c:out value="${param.podnik}"/>).</p>
+    <jsp:useBean id="detail" class="cz.frantovo.nekurak.web.Detail" scope="request"/>
+
+    <jsp:setProperty name="detail" property="id" value="${param.podnik}"/>
+
+    <nk:stranka titulek="${fn:escapeXml(detail.podnik.nazev)}">
+
+	<h1><c:out value="${detail.podnik.nazev}" /></h1>
+
+
+	<c:choose>
+	    <c:when test="${detail.mapa == null}">
+		<p>
+		    Souřadnice tohoto podniku nejsou známé.<br/>
+		    (možná ještě nebyl proveden jejich výpočet)
+		</p>
+	    </c:when>
+	    <c:otherwise>
+		<p>
+		    Zeměpisná šířka: ${detail.podnik.sirka}<br/>
+		    Zeměpisná délka: ${detail.podnik.sirka}<br/>
+		    Loc: ${detail.podnik.sirka}, ${detail.podnik.delka}<br/>
+		</p>
+		<p>
+		    <img alt="mapa" src="${fn:escapeXml(detail.mapa)}"/>
+		</p>
+	    </c:otherwise>
+	</c:choose>
+
+
+
     </nk:stranka>
 
 </jsp:root>
diff -r fd22f66e812d -r 01be78803f73 java/nekurak.net-ws/nbproject/build-impl.xml
--- a/java/nekurak.net-ws/nbproject/build-impl.xml	Mon Apr 12 12:09:45 2010 +0200
+++ b/java/nekurak.net-ws/nbproject/build-impl.xml	Wed Apr 14 00:12:32 2010 +0200
@@ -391,8 +391,16 @@
     <!--
                 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.nekurak_net-lib}/build.xml" inheritall="false" target="jar">
+            <property name="deploy.on.save" value="false"/>
+        </ant>
+    </target>
+    <target depends="init" if="dist.ear.dir" name="deps-ear-jar" unless="no.deps">
+        <ant antfile="${project.nekurak_net-lib}/build.xml" inheritall="false" target="jar">
+            <property name="deploy.on.save" value="false"/>
+        </ant>
+    </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}"/>
@@ -528,10 +536,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="${reference.nekurak_net-lib.jar}" 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="${reference.nekurak_net-lib.jar}" 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>
@@ -827,7 +838,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.nekurak_net-lib}/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 fd22f66e812d -r 01be78803f73 java/nekurak.net-ws/nbproject/genfiles.properties
--- a/java/nekurak.net-ws/nbproject/genfiles.properties	Mon Apr 12 12:09:45 2010 +0200
+++ b/java/nekurak.net-ws/nbproject/genfiles.properties	Wed Apr 14 00:12:32 2010 +0200
@@ -3,8 +3,8 @@
 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=4cb22909
-nbproject/build-impl.xml.script.CRC32=2e1faad3
+nbproject/build-impl.xml.data.CRC32=e6e63e07
+nbproject/build-impl.xml.script.CRC32=222fc177
 nbproject/build-impl.xml.stylesheet.CRC32=b139b33b@1.21.2.1
 nbproject/wsit-deploy.xml.data.CRC32=4cb22909
 nbproject/wsit-deploy.xml.script.CRC32=deb039de
diff -r fd22f66e812d -r 01be78803f73 java/nekurak.net-ws/nbproject/jax-ws.xml
--- a/java/nekurak.net-ws/nbproject/jax-ws.xml	Mon Apr 12 12:09:45 2010 +0200
+++ b/java/nekurak.net-ws/nbproject/jax-ws.xml	Wed Apr 14 00:12:32 2010 +0200
@@ -4,6 +4,9 @@
     <service name="Pokus">
       <implementation-class>cz.frantovo.nekurak.ws.Pokus</implementation-class>
     </service>
+    <service name="Podnik">
+      <implementation-class>cz.frantovo.nekurak.ws.Podnik</implementation-class>
+    </service>
   </services>
   <clients/>
 </jax-ws>
diff -r fd22f66e812d -r 01be78803f73 java/nekurak.net-ws/nbproject/jaxws-build.xml
--- a/java/nekurak.net-ws/nbproject/jaxws-build.xml	Mon Apr 12 12:09:45 2010 +0200
+++ b/java/nekurak.net-ws/nbproject/jaxws-build.xml	Wed Apr 14 00:12:32 2010 +0200
@@ -24,6 +24,11 @@
             <classpath path="${java.home}/../lib/tools.jar:${build.classes.dir}:${j2ee.platform.wsgen.classpath}:${javac.classpath}"/>
         </wsgen>
     </target>
+    <target name="wsgen-Podnik" depends="wsgen-init">
+        <wsgen sourcedestdir="${build.generated.sources.dir}/jax-ws" resourcedestdir="${build.generated.sources.dir}/jax-ws/resources/" destdir="${build.generated.sources.dir}/jax-ws" verbose="true" xendorsed="true" keep="true" genwsdl="true" sei="cz.frantovo.nekurak.ws.Podnik">
+            <classpath path="${java.home}/../lib/tools.jar:${build.classes.dir}:${j2ee.platform.wsgen.classpath}:${javac.classpath}"/>
+        </wsgen>
+    </target>
     <!--
                 ===================
                 JAX-WS WSIMPORT SECTION
diff -r fd22f66e812d -r 01be78803f73 java/nekurak.net-ws/nbproject/project.properties
--- a/java/nekurak.net-ws/nbproject/project.properties	Mon Apr 12 12:09:45 2010 +0200
+++ b/java/nekurak.net-ws/nbproject/project.properties	Wed Apr 14 00:12:32 2010 +0200
@@ -26,7 +26,8 @@
 j2ee.platform=1.6-web
 j2ee.server.type=gfv3ee6
 jar.compress=false
-javac.classpath=
+javac.classpath=\
+    ${reference.nekurak_net-lib.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.debug=true
@@ -55,6 +56,8 @@
 no.dependencies=false
 persistence.xml.dir=${conf.dir}
 platform.active=default_platform
+project.nekurak_net-lib=../nekurak.net-lib
+reference.nekurak_net-lib.jar=${project.nekurak_net-lib}/dist/nekurak.net-lib.jar
 resource.dir=setup
 run.test.classpath=\
     ${javac.test.classpath}:\
diff -r fd22f66e812d -r 01be78803f73 java/nekurak.net-ws/nbproject/project.xml
--- a/java/nekurak.net-ws/nbproject/project.xml	Mon Apr 12 12:09:45 2010 +0200
+++ b/java/nekurak.net-ws/nbproject/project.xml	Wed Apr 14 00:12:32 2010 +0200
@@ -8,7 +8,12 @@
         <data xmlns="http://www.netbeans.org/ns/web-project/3">
             <name>nekurak.net-ws</name>
             <minimum-ant-version>1.6.5</minimum-ant-version>
-            <web-module-libraries/>
+            <web-module-libraries>
+                <library dirs="200">
+                    <file>${reference.nekurak_net-lib.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" name="Source Packages"/>
@@ -17,5 +22,15 @@
                 <root id="test.src.dir" name="Test Packages"/>
             </test-roots>
         </data>
+        <references xmlns="http://www.netbeans.org/ns/ant-project-references/1">
+            <reference>
+                <foreign-project>nekurak_net-lib</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 fd22f66e812d -r 01be78803f73 java/nekurak.net-ws/src/java/cz/frantovo/nekurak/ws/Podnik.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/java/nekurak.net-ws/src/java/cz/frantovo/nekurak/ws/Podnik.java	Wed Apr 14 00:12:32 2010 +0200
@@ -0,0 +1,28 @@
+package cz.frantovo.nekurak.ws;
+
+import cz.frantovo.nekurak.ejb.PodnikRemote;
+import javax.ejb.EJB;
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+
+/**
+ *
+ * @author fiki
+ */
+@WebService(serviceName = "podnikSluzba", targetNamespace = "podnikNS", portName = "podnikPort")
+public class Podnik {
+
+    @EJB
+    PodnikRemote ejb;
+
+    /**
+     * Projde podniky, které nemají vyplněné souřadnice,
+     * a pokusí se je doplnit na základě poštovní adresy podniku.
+     * @return počet podniků, u nichž jsme doplnili souřadnice
+     */
+    @WebMethod(operationName = "dopocitejSouradnicePodleAdres")
+    public int dopocitejSouradnice() {
+	return ejb.dopocitejSouradnice();
+    }
+
+}
diff -r fd22f66e812d -r 01be78803f73 java/nekurak.net-ws/src/java/cz/frantovo/nekurak/ws/Pokus.java
--- a/java/nekurak.net-ws/src/java/cz/frantovo/nekurak/ws/Pokus.java	Mon Apr 12 12:09:45 2010 +0200
+++ b/java/nekurak.net-ws/src/java/cz/frantovo/nekurak/ws/Pokus.java	Wed Apr 14 00:12:32 2010 +0200
@@ -7,10 +7,14 @@
 
 /**
  *
+ * Jedinou povinnou anotací je zde @WebService – ostatní nejsou nutné 
+ * a slouží k například k upřesnění názvu WS operace (pokud se má jmenovat jinak než metoda v Javě)
+ * nebo k definování názvů parametrů.
+ *
  * @author fiki
  */
-@WebService(serviceName = "pokusnaSluzba", targetNamespace = "pokusNS")
-@SOAPBinding(style=SOAPBinding.Style.RPC, use=SOAPBinding.Use.ENCODED)
+@WebService(serviceName = "pokusnaSluzba", targetNamespace = "pokusNS", portName = "pokusnyPort")
+@SOAPBinding(style = SOAPBinding.Style.RPC, use = SOAPBinding.Use.ENCODED)
 public class Pokus {
 
     /**
@@ -20,7 +24,6 @@
      */
     @WebMethod(operationName = "pozdravOsobu")
     public String pozdrav(@WebParam(name = "jmenoOsoby") String koho) {
-	System.out.println("Čeština? : koho=" + koho);
 	return "Ahoj, " + koho + "!";
     }
 }
diff -r fd22f66e812d -r 01be78803f73 java/nekurak.net-ws/web/WEB-INF/wsit-cz.frantovo.nekurak.ws.Pokus.xml
--- a/java/nekurak.net-ws/web/WEB-INF/wsit-cz.frantovo.nekurak.ws.Pokus.xml	Mon Apr 12 12:09:45 2010 +0200
+++ b/java/nekurak.net-ws/web/WEB-INF/wsit-cz.frantovo.nekurak.ws.Pokus.xml	Wed Apr 14 00:12:32 2010 +0200
@@ -5,19 +5,19 @@
     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
     xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" name="PokusService" targetNamespace="http://ws.nekurak.frantovo.cz/" xmlns:tns="http://ws.nekurak.frantovo.cz/" xmlns:wsp="http://www.w3.org/ns/ws-policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:wsoma="http://schemas.xmlsoap.org/ws/2004/09/policy/optimizedmimeserialization" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:wsrm="http://docs.oasis-open.org/ws-rx/wsrmp/200702" xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702" xmlns:sc="http://schemas.sun.com/2006/03/wss/server" xmlns:wspp="http://java.sun.com/xml/ns/wsit/policy"
     >
-    <message name="pozdravOsobu"/>
-    <message name="pozdravOsobuResponse"/>
-    <portType name="Pokus">
-	<operation name="pozdravOsobu">
-	    <input message="tns:pozdravOsobu"/>
-	    <output message="tns:pozdravOsobuResponse"/>
-	</operation>
-    </portType>
+ <message name="pozdravOsobu"/>
+ <message name="pozdravOsobuResponse"/>
+ <portType name="Pokus">
+  <operation name="pozdravOsobu">
+   <input message="tns:pozdravOsobu"/>
+   <output message="tns:pozdravOsobuResponse"/>
+  </operation>
+ </portType>
     <binding name="PokusPortBinding" type="tns:Pokus">
-	<operation name="pozdravOsobu">
-	    <input/>
-	    <output/>
-	</operation>
+     <operation name="pozdravOsobu">
+      <input/>
+      <output/>
+     </operation>
     </binding>
     <service name="PokusService">
 	<port name="PokusPort" binding="tns:PokusPortBinding"/>
@@ -27,9 +27,11 @@
 	    <wsp:All>
 		<sp:EncryptedParts>
 		    <sp:Body/>
+		 <sp:Body/>
 		</sp:EncryptedParts>
 		<sp:SignedParts>
 		    <sp:Body/>
+		 <sp:Body/>
 		</sp:SignedParts>
 	    </wsp:All>
 	</wsp:ExactlyOne>
@@ -39,13 +41,41 @@
 	    <wsp:All>
 		<sp:EncryptedParts>
 		    <sp:Body/>
+		 <sp:Body/>
 		</sp:EncryptedParts>
 		<sp:SignedParts>
 		    <sp:Body/>
+		 <sp:Body/>
 		</sp:SignedParts>
 	    </wsp:All>
 	</wsp:ExactlyOne>
     </wsp:Policy>
+ <wsp:Policy wsu:Id="PokusPortBinding_pozdravOsobu_Input_Policy">
+  <wsp:ExactlyOne>
+   <wsp:All>
+    <sp:EncryptedParts>
+     <sp:Body/>
+    </sp:EncryptedParts>
+    <sp:SignedParts>
+     <sp:Body/>
+    </sp:SignedParts>
+   </wsp:All>
+  </wsp:ExactlyOne>
+ </wsp:Policy>
+ <wsp:Policy wsu:Id="PokusPortBinding_pozdravOsobu_Output_Policy">
+  <wsp:ExactlyOne>
+   <wsp:All>
+    <sp:EncryptedParts>
+     <sp:Body/>
+    </sp:EncryptedParts>
+    <sp:SignedParts>
+     <sp:Body/>
+    </sp:SignedParts>
+   </wsp:All>
+  </wsp:ExactlyOne>
+ </wsp:Policy>
 </definitions>
 
 
+
+
diff -r fd22f66e812d -r 01be78803f73 java/nekurak.net-ws/web/index.jsp
--- a/java/nekurak.net-ws/web/index.jsp	Mon Apr 12 12:09:45 2010 +0200
+++ b/java/nekurak.net-ws/web/index.jsp	Wed Apr 14 00:12:32 2010 +0200
@@ -19,12 +19,20 @@
 	    <h1>WS SOAP</h1>
 	    <p>API postavené na webových službách</p>
 
+	    <!-- TODO: generovat dynamicky  -->
+
 	    <h2>Pokusná služba</h2>
 	    <ul>
 		<li><a href="pokusnaSluzba?WSDL">WSDL – popis služby</a></li>
 		<li><a href="pokusnaSluzba?Tester">Webové rozhraní pro vyzkoušení</a></li>
 	    </ul>
 
+	    <h2>Podnik – služba</h2>
+	    <ul>
+		<li><a href="podnikSluzba?WSDL">WSDL – popis služby</a></li>
+		<li><a href="podnikSluzba?Tester">Webové rozhraní pro vyzkoušení</a></li>
+	    </ul>
+
 	</body>
     </html>