# HG changeset patch
# User František Kučera <franta-hg@frantovo.cz>
# Date 1276939167 -7200
# Node ID 44ef544460ca012d6a03decf76d8acd8c6677c4f
# Parent  91490d5419d2430e38835c95646ce75ecfc6a2ad
AJAX komentáře

diff -r 91490d5419d2 -r 44ef544460ca java/nekurak.net-ear/nbproject/ant-deploy.xml
--- a/java/nekurak.net-ear/nbproject/ant-deploy.xml	Thu Jun 17 15:12:30 2010 +0200
+++ b/java/nekurak.net-ear/nbproject/ant-deploy.xml	Sat Jun 19 11:19:27 2010 +0200
@@ -24,7 +24,7 @@
         </xmlproperty>    
         <delete file="${temp.sun.web}"/>
         <property name="deploy.ant.client.url" value="${gfv3.url}${sun-web-app.context-root}"/>
-        <property name="deploy.context.root.argument" value="?contextroot=${sun-web-app.context-root}"/>
+        <property name="deploy.context.root.argument" value="&amp;contextroot=${sun-web-app.context-root}"/>
     </target>
     <target name="-no-parse-sun-web" depends="-init-cl-deployment-env" unless="sun.web.present">
         <property name="deploy.context.root.argument" value=""/>
@@ -43,18 +43,43 @@
         <delete dir="${gfv3.resources.dir}"/>
     </target>
     <target name="-deploy-ant" depends="-parse-sun-web,-no-parse-sun-web,-add-resources" if="deploy.ant.enabled">
+        <antcall target="-deploy-without-pw"/>
+        <antcall target="-deploy-with-pw"/>
+    </target>
+
+    <target name="-deploy-without-pw" unless="gfv3.password">
         <echo message="Deploying ${deploy.ant.archive}"/>
         <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
         <property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
-        <get src="${gfv3.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}?force=true?name=${ant.project.name}"
+        <get src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&amp;force=true&amp;name=${ant.project.name}"
             dest="${gfv3.results.file}"/>
         <delete file="${gfv3.results.file}"/>    
     </target>
+    <target name="-deploy-with-pw" if="gfv3.password">
+        <echo message="Deploying ${deploy.ant.archive}"/>
+        <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
+        <property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
+        <get username="${gfv3.username}" password="${gfv3.password}" src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&amp;force=true&amp;name=${ant.project.name}"
+            dest="${gfv3.results.file}"/>
+        <delete file="${gfv3.results.file}"/>
+    </target>
     <target name="-undeploy-ant" depends="-init-cl-deployment-env" if="deploy.ant.enabled">
+        <antcall target="-undeploy-without-pw"/>
+        <antcall target="-undeploy-with-pw"/>
+    </target>
+
+    <target name="-undeploy-without-pw" unless="gfv3.password">
         <echo message="Undeploying ${deploy.ant.archive}"/>
         <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
-        <get src="${gfv3.url}/__asadmin/undeploy?name=${ant.project.name}"
+        <get src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
             dest="${gfv3.results.file}"/>
         <delete file="${gfv3.results.file}"/>    
     </target>
+    <target name="-undeploy-with-pw" if="gfv3.password">
+        <echo message="Undeploying ${deploy.ant.archive}"/>
+        <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
+        <get username="${gfv3.username}" password="${gfv3.password}" src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
+            dest="${gfv3.results.file}"/>
+        <delete file="${gfv3.results.file}"/>
+    </target>
 </project>
diff -r 91490d5419d2 -r 44ef544460ca java/nekurak.net-ear/nbproject/build-impl.xml
--- a/java/nekurak.net-ear/nbproject/build-impl.xml	Thu Jun 17 15:12:30 2010 +0200
+++ b/java/nekurak.net-ear/nbproject/build-impl.xml	Sat Jun 19 11:19:27 2010 +0200
@@ -365,8 +365,15 @@
             <arg line="${browser.args} ${browse.url}"/>
         </exec>
     </target>
-    <target depends="init" if="app.client" name="run-ac">
-        <antcall target="run-${app.client}"/>
+    <target if="app.client" name="run-ac">
+        <antcall target="-run-ac"/>
+    </target>
+    <target depends="init,-as-retrieve-option-workaround,-init-run-macros,-run-appclient-pregfv3,-run-appclient" name="-run-ac"/>
+    <target if="j2ee.appclient.tool.args" name="-run-appclient-pregfv3">
+        <ear2:run-appclient-pregfv3/>
+    </target>
+    <target name="-run-appclient" unless="j2ee.appclient.tool.args">
+        <ear2:run-appclient subprojectname="${app.client}"/>
     </target>
     <target if="j2ee.appclient.mainclass.args" name="-as-retrieve-option-workaround" unless="j2ee.clientName">
         <property name="client.jar" value="${dist.dir}/nekurak.net-earClient.jar"/>
@@ -382,6 +389,47 @@
             <fileset dir="${dist.dir}/gfdeploy/nekurak.net-ear" includes="**/*.jar"/>
         </copy>
     </target>
+    <target depends="init" name="-init-run-macros">
+        <macrodef name="run-appclient" uri="http://www.netbeans.org/ns/j2ee-earproject/2">
+            <attribute name="subprojectname"/>
+            <attribute default="${application.args.param}" name="args"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <java dir="${basedir}" fork="true" jar="${client.jar}">
+                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
+                    <jvmarg line="${j2ee.appclient.tool.jvmoptions}${client.jar},arg=-name,arg=@{subprojectname}"/>
+                    <arg line="@{args}"/>
+                    <syspropertyset>
+                        <propertyref prefix="run-sys-prop."/>
+                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
+                    </syspropertyset>
+                    <customize/>
+                </java>
+            </sequential>
+        </macrodef>
+        <macrodef name="run-appclient-pregfv3" uri="http://www.netbeans.org/ns/j2ee-earproject/2">
+            <element name="customize" optional="true"/>
+            <sequential>
+                <java classname="${j2ee.appclient.tool.mainclass}" fork="true">
+                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
+                    <jvmarg line="${j2ee.appclient.tool.jvmoptions}"/>
+                    <jvmarg line="${j2ee.appclient.jvmoptions.param}"/>
+                    <arg line="${j2ee.appclient.tool.args}"/>
+                    <arg line="-client ${client.jar}"/>
+                    <arg line="${j2ee.appclient.mainclass.tool.param}"/>
+                    <arg line="${application.args.param}"/>
+                    <classpath>
+                        <path path="${j2ee.platform.classpath}:${j2ee.appclient.tool.runtime}"/>
+                    </classpath>
+                    <syspropertyset>
+                        <propertyref prefix="run-sys-prop."/>
+                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
+                    </syspropertyset>
+                    <customize/>
+                </java>
+            </sequential>
+        </macrodef>
+    </target>
     <!--
     DEBUGGING SECTION
     -->
@@ -392,10 +440,10 @@
         <antcall target="debug-display-browser"/>
     </target>
     <target name="connect-debugger" unless="is.debugged">
-        <nbjpdaconnect address="${jpda.address}" host="${jpda.host}" name="${name}" transport="${jpda.transport}">
+        <nbjpdaconnect address="${jpda.address}" host="${jpda.host}" name="${jpda.host}:${jpda.address}" transport="${jpda.transport}">
             <classpath>
                 <path path="${debug.classpath}"/>
-                <fileset dir="${build.dir}/lib" includes="*.jar"/>
+                <fileset dir="${build.dir}" includes="lib/*.jar"/>
             </classpath>
             <sourcepath>
                 <path path="${ear.docbase.dirs}"/>
@@ -405,6 +453,10 @@
     <target if="do.display.browser" name="debug-display-browser">
         <nbbrowse url="${client.url}"/>
     </target>
+    <target if="can.debug.appclient" name="run-debug-appclient">
+        <antcall target="-run-debug-appclient"/>
+    </target>
+    <target depends="init,-init-debug-args,-debug-appclient-deploy,-as-retrieve-option-workaround,-init-debug-macros,-debug-appclient-start-nbjpda,-debug-appclient-pregfv3,-debug-appclient,connect-debugger" name="-run-debug-appclient"/>
     <target name="-init-debug-args">
         <property name="version-output" value="java version &quot;${ant.java.version}"/>
         <condition property="have-jdk-older-than-1.4">
@@ -419,45 +471,63 @@
             <istrue value="${have-jdk-older-than-1.4}"/>
         </condition>
     </target>
-    <target depends="init,-init-debug-args" if="can.debug.appclient" name="run-debug-appclient">
-        <macrodef name="debug-appclient" uri="http://www.netbeans.org/ns/j2ee-earproject/2">
-            <attribute name="mainclass"/>
+    <target depends="init,-init-debug-args,-as-retrieve-option-workaround,-init-run-macros" name="-init-debug-macros">
+        <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem">
+            <os family="windows"/>
+        </condition>
+        <condition else="${debug-transport-by-os}" property="debug-transport-appclient" value="${debug.transport}">
+            <isset property="debug.transport"/>
+        </condition>
+        <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2ee-earproject/2">
+            <attribute default="${main.class}" name="name"/>
             <attribute default="${debug.classpath}" name="classpath"/>
-            <element name="customize" optional="true"/>
-            <attribute default="${application.args.param}" name="args"/>
+            <attribute default="" name="stopclassname"/>
             <sequential>
-                <parallel>
-                    <java classname="@{mainclass}" fork="true">
-                        <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
-                        <jvmarg line="${j2ee.appclient.tool.jvmoptions}"/>
-                        <jvmarg line="${debug-args-line}"/>
-                        <jvmarg value="-Xrunjdwp:transport=${jpda.transport},server=y,address=${jpda.address},suspend=y"/>
-                        <jvmarg line="${j2ee.appclient.jvmoptions.param}"/>
-                        <arg line="@{args}"/>
-                        <classpath>
-                            <path path="${j2ee.platform.classpath}:${j2ee.appclient.tool.runtime}"/>
-                            <path path="@{classpath}"/>
-                        </classpath>
-                        <syspropertyset>
-                            <propertyref prefix="run-sys-prop."/>
-                            <mapper from="run-sys-prop.*" to="*" type="glob"/>
-                        </syspropertyset>
-                        <customize/>
-                    </java>
-                    <nbjpdaconnect address="${jpda.address}" host="${jpda.host}" name="${name}" transport="${jpda.transport}">
-                        <classpath>
-                            <path path="${j2ee.platform.classpath}:${j2ee.appclient.tool.runtime}"/>
-                            <path path="@{classpath}"/>
-                        </classpath>
-                        <sourcepath>
-                            <path path="${src.dir}"/>
-                        </sourcepath>
-                    </nbjpdaconnect>
-                </parallel>
+                <nbjpdastart addressproperty="jpda.address.appclient" name="@{name}" stopclassname="@{stopclassname}" transport="${debug-transport-appclient}">
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                </nbjpdastart>
             </sequential>
         </macrodef>
-        <nbdeploy clientModuleUri="${client.module.uri}" clientUrlPart="${client.urlPart}" debugmode="false"/>
-        <antcall target="debug-${app.client}"/>
+        <macrodef name="debug-appclient" uri="http://www.netbeans.org/ns/j2ee-earproject/2">
+            <attribute name="subprojectname"/>
+            <sequential>
+                <ear2:run-appclient subprojectname="@{subprojectname}">
+                    <customize>
+                        <jvmarg value="-Xrunjdwp:transport=${debug-transport-appclient},address=${jpda.address.appclient}"/>
+                        <jvmarg line="${debug-args-line}"/>
+                    </customize>
+                </ear2:run-appclient>
+            </sequential>
+        </macrodef>
+        <macrodef name="debug-appclient-pregfv3" uri="http://www.netbeans.org/ns/j2ee-earproject/2">
+            <sequential>
+                <ear2:run-appclient-pregfv3>
+                    <customize>
+                        <jvmarg value="-Xrunjdwp:transport=${debug-transport-appclient},address=${jpda.address.appclient}"/>
+                        <jvmarg line="${debug-args-line}"/>
+                    </customize>
+                </ear2:run-appclient-pregfv3>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-debug-appclient-deploy">
+        <nbstartserver debugmode="true"/>
+        <nbdeploy clientModuleUri="${client.module.uri}" clientUrlPart="${client.urlPart}" debugmode="true"/>
+    </target>
+    <target name="-debug-appclient-start-nbjpda">
+        <ear2:nbjpdastart classpath="" name="${app.client}"/>
+    </target>
+    <target if="j2ee.appclient.tool.args" name="-debug-appclient-pregfv3">
+        <ear2:debug-appclient-pregfv3/>
+    </target>
+    <target name="-debug-appclient" unless="j2ee.appclient.tool.args">
+        <mkdir dir="${dist.dir}/nekurak.net-earClient"/>
+        <copy flatten="true" todir="${dist.dir}/nekurak.net-earClient">
+            <fileset dir="${wa.copy.client.jar.from}/nekurak.net-ear" includes="**/*.*ar"/>
+        </copy>
+        <ear2:debug-appclient subprojectname="${app.client}"/>
     </target>
     <!--
     CLEANUP SECTION
diff -r 91490d5419d2 -r 44ef544460ca java/nekurak.net-ear/nbproject/genfiles.properties
--- a/java/nekurak.net-ear/nbproject/genfiles.properties	Thu Jun 17 15:12:30 2010 +0200
+++ b/java/nekurak.net-ear/nbproject/genfiles.properties	Sat Jun 19 11:19:27 2010 +0200
@@ -4,5 +4,5 @@
 # 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=3ed495e4
-nbproject/build-impl.xml.script.CRC32=a4c4fbbd
-nbproject/build-impl.xml.stylesheet.CRC32=624b8ca2@1.17.2
+nbproject/build-impl.xml.script.CRC32=1197b7f6
+nbproject/build-impl.xml.stylesheet.CRC32=56fd2fa2@1.18.1
diff -r 91490d5419d2 -r 44ef544460ca java/nekurak.net-ear/nbproject/project.properties
--- a/java/nekurak.net-ear/nbproject/project.properties	Thu Jun 17 15:12:30 2010 +0200
+++ b/java/nekurak.net-ear/nbproject/project.properties	Sat Jun 19 11:19:27 2010 +0200
@@ -12,6 +12,12 @@
 j2ee.appclient.mainclass.args=${j2ee.appclient.tool.args}
 j2ee.deploy.on.save=false
 j2ee.platform=1.6
+j2ee.platform.classpath=${j2ee.server.home}/modules/javax.servlet.jar:${j2ee.server.home}/modules/jstl-impl.jar:${j2ee.server.home}/modules/javax.ejb.jar:${j2ee.server.home}/modules/javax.enterprise.deploy.jar:${j2ee.server.home}/modules/javax.security.jacc.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.transaction.jar:${j2ee.server.home}/modules/jsr311-api.jar:${j2ee.server.home}/modules/jsf-api.jar:${j2ee.server.home}/modules/javax.security.auth.message.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/endorsed/javax.annotation.jar:${j2ee.server.home}/modules/javax.management.j2ee.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/javax.jms.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.resource.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.home}/modules/jsf-impl.jar:${j2ee.server.home}/modules/mail.jar
+j2ee.platform.embeddableejb.classpath=${j2ee.server.home}/lib/embedded/glassfish-embedded-static-shell.jar
+j2ee.platform.wscompile.classpath=${j2ee.server.home}/modules/webservices-osgi.jar
+j2ee.platform.wsgen.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/javax.ejb.jar
+j2ee.platform.wsimport.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/javax.ejb.jar
+j2ee.platform.wsit.classpath=
 j2ee.server.type=gfv3ee6
 jar.compress=false
 jar.content.additional=\
diff -r 91490d5419d2 -r 44ef544460ca java/nekurak.net-ejb/nbproject/ant-deploy.xml
--- a/java/nekurak.net-ejb/nbproject/ant-deploy.xml	Thu Jun 17 15:12:30 2010 +0200
+++ b/java/nekurak.net-ejb/nbproject/ant-deploy.xml	Sat Jun 19 11:19:27 2010 +0200
@@ -24,7 +24,7 @@
         </xmlproperty>    
         <delete file="${temp.sun.web}"/>
         <property name="deploy.ant.client.url" value="${gfv3.url}${sun-web-app.context-root}"/>
-        <property name="deploy.context.root.argument" value="?contextroot=${sun-web-app.context-root}"/>
+        <property name="deploy.context.root.argument" value="&amp;contextroot=${sun-web-app.context-root}"/>
     </target>
     <target name="-no-parse-sun-web" depends="-init-cl-deployment-env" unless="sun.web.present">
         <property name="deploy.context.root.argument" value=""/>
@@ -43,18 +43,43 @@
         <delete dir="${gfv3.resources.dir}"/>
     </target>
     <target name="-deploy-ant" depends="-parse-sun-web,-no-parse-sun-web,-add-resources" if="deploy.ant.enabled">
+        <antcall target="-deploy-without-pw"/>
+        <antcall target="-deploy-with-pw"/>
+    </target>
+
+    <target name="-deploy-without-pw" unless="gfv3.password">
         <echo message="Deploying ${deploy.ant.archive}"/>
         <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
         <property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
-        <get src="${gfv3.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}?force=true?name=${ant.project.name}"
+        <get src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&amp;force=true&amp;name=${ant.project.name}"
             dest="${gfv3.results.file}"/>
         <delete file="${gfv3.results.file}"/>    
     </target>
+    <target name="-deploy-with-pw" if="gfv3.password">
+        <echo message="Deploying ${deploy.ant.archive}"/>
+        <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
+        <property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
+        <get username="${gfv3.username}" password="${gfv3.password}" src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&amp;force=true&amp;name=${ant.project.name}"
+            dest="${gfv3.results.file}"/>
+        <delete file="${gfv3.results.file}"/>
+    </target>
     <target name="-undeploy-ant" depends="-init-cl-deployment-env" if="deploy.ant.enabled">
+        <antcall target="-undeploy-without-pw"/>
+        <antcall target="-undeploy-with-pw"/>
+    </target>
+
+    <target name="-undeploy-without-pw" unless="gfv3.password">
         <echo message="Undeploying ${deploy.ant.archive}"/>
         <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
-        <get src="${gfv3.url}/__asadmin/undeploy?name=${ant.project.name}"
+        <get src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
             dest="${gfv3.results.file}"/>
         <delete file="${gfv3.results.file}"/>    
     </target>
+    <target name="-undeploy-with-pw" if="gfv3.password">
+        <echo message="Undeploying ${deploy.ant.archive}"/>
+        <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
+        <get username="${gfv3.username}" password="${gfv3.password}" src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
+            dest="${gfv3.results.file}"/>
+        <delete file="${gfv3.results.file}"/>
+    </target>
 </project>
diff -r 91490d5419d2 -r 44ef544460ca java/nekurak.net-ejb/nbproject/build-impl.xml
--- a/java/nekurak.net-ejb/nbproject/build-impl.xml	Thu Jun 17 15:12:30 2010 +0200
+++ b/java/nekurak.net-ejb/nbproject/build-impl.xml	Sat Jun 19 11:19:27 2010 +0200
@@ -140,6 +140,20 @@
         <fail unless="dist.javadoc.dir">Must set dist.javadoc.dir</fail>
         <fail unless="build.classes.excludes">Must set build.classes.excludes</fail>
         <fail unless="dist.jar">Must set dist.jar</fail>
+        <condition property="missing.j2ee.server.home">
+            <and>
+                <matches pattern="j2ee.server.home" string="${j2ee.platform.classpath}"/>
+                <not>
+                    <isset property="j2ee.server.home"/>
+                </not>
+            </and>
+        </condition>
+        <fail if="missing.j2ee.server.home">
+The Java EE server classpath is not correctly set up - server home directory is missing.
+Either open the project in the IDE and assign the server or setup the server classpath manually.
+For example like this:
+   ant -Dj2ee.server.home=&lt;app_server_installation_directory&gt;
+                </fail>
         <fail unless="j2ee.platform.classpath">
 The Java EE server classpath is not correctly set up. Your active server type is ${j2ee.server.type}.
 Either open the project in the IDE and assign the server or setup the server classpath manually.
@@ -157,11 +171,52 @@
             </sequential>
         </macrodef>
     </target>
-    <target name="-init-macrodef-javac">
+    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">
         <macrodef name="javac" uri="http://www.netbeans.org/ns/j2ee-ejbjarproject/2">
             <attribute default="${src.dir}" name="srcdir"/>
             <attribute default="${build.classes.dir}" name="destdir"/>
             <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
+            <attribute default="${javac.processorpath}" name="processorpath"/>
+            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="${javac.debug}" name="debug"/>
+            <attribute default="${empty.dir}" name="gensrcdir"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <property name="javac.compilerargs" value=""/>
+                <property location="${build.dir}/empty" name="empty.dir"/>
+                <mkdir dir="${empty.dir}"/>
+                <mkdir dir="@{apgeneratedsrcdir}"/>
+                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" source="${javac.source}" srcdir="@{srcdir}" target="${javac.target}">
+                    <src>
+                        <dirset dir="@{gensrcdir}" erroronmissingdir="false">
+                            <include name="*"/>
+                        </dirset>
+                    </src>
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                    <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
+                    <compilerarg line="${javac.compilerargs}"/>
+                    <compilerarg value="-processorpath"/>
+                    <compilerarg path="@{processorpath}:${empty.dir}"/>
+                    <compilerarg line="${ap.processors.internal}"/>
+                    <compilerarg value="-s"/>
+                    <compilerarg path="@{apgeneratedsrcdir}"/>
+                    <compilerarg line="${ap.proc.none.internal}"/>
+                    <customize/>
+                </javac>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
+        <macrodef name="javac" uri="http://www.netbeans.org/ns/j2ee-ejbjarproject/2">
+            <attribute default="${src.dir}" name="srcdir"/>
+            <attribute default="${build.classes.dir}" name="destdir"/>
+            <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
+            <attribute default="${javac.processorpath}" name="processorpath"/>
+            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
             <attribute default="${includes}" name="includes"/>
             <attribute default="${excludes}" name="excludes"/>
             <attribute default="${javac.debug}" name="debug"/>
@@ -187,6 +242,35 @@
             </sequential>
         </macrodef>
     </target>
+    <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
+        <macrodef name="depend" uri="http://www.netbeans.org/ns/j2ee-ejbjarproject/2">
+            <attribute default="${src.dir}" name="srcdir"/>
+            <attribute default="${build.classes.dir}" name="destdir"/>
+            <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
+            <sequential>
+                <depend cache="${build.dir}/depcache" destdir="@{destdir}" excludes="${excludes}" includes="${includes}" srcdir="@{srcdir}">
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                </depend>
+            </sequential>
+        </macrodef>
+        <macrodef name="force-recompile" uri="http://www.netbeans.org/ns/j2ee-ejbjarproject/2">
+            <attribute default="${build.classes.dir}" name="destdir"/>
+            <sequential>
+                <fail unless="javac.includes">Must set javac.includes</fail>
+                <pathconvert pathsep="," property="javac.includes.binary">
+                    <path>
+                        <filelist dir="@{destdir}" files="${javac.includes}"/>
+                    </path>
+                    <globmapper from="*.java" to="*.class"/>
+                </pathconvert>
+                <delete>
+                    <files includes="${javac.includes.binary}"/>
+                </delete>
+            </sequential>
+        </macrodef>
+    </target>
     <target name="-init-macrodef-junit">
         <macrodef name="junit" uri="http://www.netbeans.org/ns/j2ee-ejbjarproject/2">
             <attribute default="${includes}" name="includes"/>
@@ -294,6 +378,7 @@
                 <java classname="@{classname}" fork="true">
                     <jvmarg line="${debug-args-line}"/>
                     <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
+                    <jvmarg line="${runmain.jvmargs}"/>
                     <classpath>
                         <path path="@{classpath}"/>
                     </classpath>
@@ -316,7 +401,30 @@
                 </fail>
         <taskdef classpath="${libs.CopyLibs.classpath}" resource="org/netbeans/modules/java/j2seproject/copylibstask/antlib.xml"/>
     </target>
-    <target depends="-pre-init,-init-private,-init-userdir,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-java,-init-macrodef-nbjpda,-init-macrodef-debug,-init-taskdefs" name="init"/>
+    <target name="-init-ap-cmdline-properties">
+        <property name="annotation.processing.enabled" value="true"/>
+        <property name="annotation.processing.processors.list" value=""/>
+        <property name="annotation.processing.run.all.processors" value="true"/>
+        <property name="javac.processorpath" value="${javac.classpath}"/>
+        <property name="javac.test.processorpath" value="${javac.test.classpath}"/>
+        <condition property="ap.supported.internal" value="true">
+            <not>
+                <matches pattern="1\.[0-5](\..*)?" string="${javac.source}"/>
+            </not>
+        </condition>
+    </target>
+    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-ap-cmdline-supported">
+        <condition else="" property="ap.processors.internal" value="-processor ${annotation.processing.processors.list}">
+            <isfalse value="${annotation.processing.run.all.processors}"/>
+        </condition>
+        <condition else="" property="ap.proc.none.internal" value="-proc:none">
+            <isfalse value="${annotation.processing.enabled}"/>
+        </condition>
+    </target>
+    <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline">
+        <property name="ap.cmd.line.internal" value=""/>
+    </target>
+    <target depends="-pre-init,-init-private,-init-userdir,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-java,-init-macrodef-nbjpda,-init-macrodef-debug,-init-taskdefs,-init-ap-cmdline" name="init"/>
     <!--
                 COMPILATION SECTION
             -->
@@ -527,7 +635,7 @@
     <!--
                 JAVADOC SECTION
             -->
-    <target depends="init" name="javadoc-build">
+    <target depends="init" if="have.sources" name="javadoc-build">
         <mkdir dir="${dist.javadoc.dir}"/>
         <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
             <classpath>
diff -r 91490d5419d2 -r 44ef544460ca java/nekurak.net-ejb/nbproject/genfiles.properties
--- a/java/nekurak.net-ejb/nbproject/genfiles.properties	Thu Jun 17 15:12:30 2010 +0200
+++ b/java/nekurak.net-ejb/nbproject/genfiles.properties	Sat Jun 19 11:19:27 2010 +0200
@@ -1,8 +1,8 @@
 build.xml.data.CRC32=764630c8
 build.xml.script.CRC32=d7a2a0ed
-build.xml.stylesheet.CRC32=e5f4c432@1.19.2
+build.xml.stylesheet.CRC32=5910fda3@1.22.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=764630c8
-nbproject/build-impl.xml.script.CRC32=45c5a458
-nbproject/build-impl.xml.stylesheet.CRC32=b9c9cfe1@1.19.2
+nbproject/build-impl.xml.script.CRC32=43ab1f1c
+nbproject/build-impl.xml.stylesheet.CRC32=986a5256@1.22.1
diff -r 91490d5419d2 -r 44ef544460ca java/nekurak.net-ejb/nbproject/project.properties
--- a/java/nekurak.net-ejb/nbproject/project.properties	Thu Jun 17 15:12:30 2010 +0200
+++ b/java/nekurak.net-ejb/nbproject/project.properties	Sat Jun 19 11:19:27 2010 +0200
@@ -1,3 +1,8 @@
+annotation.processing.enabled=true
+annotation.processing.enabled.in.editor=true
+annotation.processing.processors.list=
+annotation.processing.run.all.processors=true
+annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
 build.classes.dir=${build.dir}/classes
 build.classes.excludes=**/*.java,**/*.form,**/.nbattrs
 build.dir=build
@@ -19,6 +24,12 @@
 includes=**
 j2ee.deploy.on.save=false
 j2ee.platform=1.6
+j2ee.platform.classpath=${j2ee.server.home}/modules/javax.servlet.jar:${j2ee.server.home}/modules/jstl-impl.jar:${j2ee.server.home}/modules/javax.ejb.jar:${j2ee.server.home}/modules/javax.enterprise.deploy.jar:${j2ee.server.home}/modules/javax.security.jacc.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.transaction.jar:${j2ee.server.home}/modules/jsr311-api.jar:${j2ee.server.home}/modules/jsf-api.jar:${j2ee.server.home}/modules/javax.security.auth.message.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/endorsed/javax.annotation.jar:${j2ee.server.home}/modules/javax.management.j2ee.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/javax.jms.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.resource.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.home}/modules/jsf-impl.jar:${j2ee.server.home}/modules/mail.jar
+j2ee.platform.embeddableejb.classpath=${j2ee.server.home}/lib/embedded/glassfish-embedded-static-shell.jar
+j2ee.platform.wscompile.classpath=${j2ee.server.home}/modules/webservices-osgi.jar
+j2ee.platform.wsgen.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/javax.ejb.jar
+j2ee.platform.wsimport.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/javax.ejb.jar
+j2ee.platform.wsit.classpath=
 j2ee.server.type=gfv3ee6
 jar.compress=false
 jar.name=nekurak.net-ejb.jar
@@ -27,12 +38,14 @@
     ${reference.SuperDAO.jar}
 javac.debug=true
 javac.deprecation=false
+javac.processorpath=${javac.classpath}
 javac.source=1.5
 javac.target=1.5
 javac.test.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}:\
     ${libs.junit_4.classpath}
+javac.test.processorpath=${javac.test.classpath}
 javadoc.additionalparam=
 javadoc.author=false
 javadoc.encoding=${source.encoding}
diff -r 91490d5419d2 -r 44ef544460ca 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 Jun 17 15:12:30 2010 +0200
+++ b/java/nekurak.net-ejb/src/java/cz/frantovo/nekurak/ejb/PodnikEJB.java	Sat Jun 19 11:19:27 2010 +0200
@@ -81,11 +81,14 @@
 	return podnikDAO.getVysledekHlasovani(podnik);
     }
 
-    @RolesAllowed("opravneny")
-    public void komentuj(Komentar k) throws KomentarovaVyjimka, TexyVyjimka {
+    private void kontrolaKomentare(Komentar k) throws TexyVyjimka, KomentarovaVyjimka {
 	k.setUzivatel(ctx.getCallerPrincipal().getName());
 	k.setDatum(null);
 
+	if (k.getKomentar() == null || k.getKomentar().length() < 1) {
+	    throw new KomentarovaVyjimka("Nechceme prázdné komentáře.", null);
+	}
+
 	/** Převedeme na XML */
 	switch (k.getTyp()) {
 	    case PROSTY_TEXT:
@@ -99,13 +102,19 @@
 		k.setKomentar(Komentare.upravXHTML(k.getKomentar()));
 		break;
 	}
+	/** Přidáme kořenový element */
 	k.setKomentar(Komentare.obal(k.getKomentar()));
 
 	/** Zkontrolujeme XML */
-	komentare.zkontroluj(k.getKomentar());
+	Komentare.zkontroluj(k.getKomentar());
+    }
 
-
-	/** TODO: Uložíme do databáze */
-	podnikDAO.zaloz(k);
+    @RolesAllowed("opravneny")
+    public Komentar komentuj(Komentar k, boolean uloz) throws KomentarovaVyjimka, TexyVyjimka {
+	kontrolaKomentare(k);
+	if (uloz) {
+	    podnikDAO.zaloz(k);
+	}
+	return k;
     }
 }
diff -r 91490d5419d2 -r 44ef544460ca java/nekurak.net-lib/nbproject/build-impl.xml
--- a/java/nekurak.net-lib/nbproject/build-impl.xml	Thu Jun 17 15:12:30 2010 +0200
+++ b/java/nekurak.net-lib/nbproject/build-impl.xml	Sat Jun 19 11:19:27 2010 +0200
@@ -55,6 +55,7 @@
     </target>
     <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
         <available file="${manifest.file}" property="manifest.available"/>
+        <available file="${application.splash}" property="splashscreen.available"/>
         <condition property="main.class.available">
             <and>
                 <isset property="main.class"/>
@@ -83,23 +84,40 @@
                 <isset property="do.mkdist"/>
             </and>
         </condition>
-        <condition property="manifest.available+mkdist.available">
+        <condition property="manifest.available+main.class+mkdist.available+splashscreen.available">
             <and>
-                <istrue value="${manifest.available}"/>
-                <isset property="do.mkdist"/>
+                <istrue value="${manifest.available+main.class+mkdist.available}"/>
+                <istrue value="${splashscreen.available}"/>
             </and>
         </condition>
-        <condition property="manifest.available-mkdist.available">
-            <or>
-                <istrue value="${manifest.available}"/>
-                <isset property="do.mkdist"/>
-            </or>
+        <condition property="do.archive">
+            <not>
+                <istrue value="${jar.archive.disabled}"/>
+            </not>
         </condition>
-        <condition property="manifest.available+main.class-mkdist.available">
-            <or>
+        <condition property="do.archive+manifest.available">
+            <and>
+                <isset property="manifest.available"/>
+                <istrue value="${do.archive}"/>
+            </and>
+        </condition>
+        <condition property="do.archive+manifest.available+main.class">
+            <and>
                 <istrue value="${manifest.available+main.class}"/>
-                <isset property="do.mkdist"/>
-            </or>
+                <istrue value="${do.archive}"/>
+            </and>
+        </condition>
+        <condition property="do.archive+manifest.available+main.class+mkdist.available">
+            <and>
+                <istrue value="${manifest.available+main.class+mkdist.available}"/>
+                <istrue value="${do.archive}"/>
+            </and>
+        </condition>
+        <condition property="do.archive+manifest.available+main.class+mkdist.available+splashscreen.available">
+            <and>
+                <istrue value="${manifest.available+main.class+mkdist.available+splashscreen.available}"/>
+                <istrue value="${do.archive}"/>
+            </and>
         </condition>
         <condition property="have.tests">
             <or>
@@ -156,6 +174,8 @@
             <length length="0" string="${endorsed.classpath}" when="greater"/>
         </condition>
         <property name="javac.fork" value="false"/>
+        <property name="jar.index" value="false"/>
+        <available file="${meta.inf.dir}/persistence.xml" property="has.persistence.xml"/>
     </target>
     <target name="-post-init">
         <!-- Empty placeholder for easier customization. -->
@@ -182,11 +202,53 @@
             </sequential>
         </macrodef>
     </target>
-    <target name="-init-macrodef-javac">
+    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">
         <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
             <attribute default="${src.dir}" name="srcdir"/>
             <attribute default="${build.classes.dir}" name="destdir"/>
             <attribute default="${javac.classpath}" name="classpath"/>
+            <attribute default="${javac.processorpath}" name="processorpath"/>
+            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="${javac.debug}" name="debug"/>
+            <attribute default="${empty.dir}" name="sourcepath"/>
+            <attribute default="${empty.dir}" name="gensrcdir"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <property location="${build.dir}/empty" name="empty.dir"/>
+                <mkdir dir="${empty.dir}"/>
+                <mkdir dir="@{apgeneratedsrcdir}"/>
+                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
+                    <src>
+                        <dirset dir="@{gensrcdir}" erroronmissingdir="false">
+                            <include name="*"/>
+                        </dirset>
+                    </src>
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                    <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
+                    <compilerarg line="${javac.compilerargs}"/>
+                    <compilerarg value="-processorpath"/>
+                    <compilerarg path="@{processorpath}:${empty.dir}"/>
+                    <compilerarg line="${ap.processors.internal}"/>
+                    <compilerarg line="${annotation.processing.processor.options}"/>
+                    <compilerarg value="-s"/>
+                    <compilerarg path="@{apgeneratedsrcdir}"/>
+                    <compilerarg line="${ap.proc.none.internal}"/>
+                    <customize/>
+                </javac>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
+        <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${src.dir}" name="srcdir"/>
+            <attribute default="${build.classes.dir}" name="destdir"/>
+            <attribute default="${javac.classpath}" name="classpath"/>
+            <attribute default="${javac.processorpath}" name="processorpath"/>
+            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
             <attribute default="${includes}" name="includes"/>
             <attribute default="${excludes}" name="excludes"/>
             <attribute default="${javac.debug}" name="debug"/>
@@ -211,6 +273,8 @@
                 </javac>
             </sequential>
         </macrodef>
+    </target>
+    <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
         <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
             <attribute default="${src.dir}" name="srcdir"/>
             <attribute default="${build.classes.dir}" name="destdir"/>
@@ -358,14 +422,65 @@
             </sequential>
         </macrodef>
     </target>
+    <target name="-init-macrodef-copylibs">
+        <macrodef name="copylibs" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <element name="customize" optional="true"/>
+            <sequential>
+                <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
+                <pathconvert property="run.classpath.without.build.classes.dir">
+                    <path path="${run.classpath}"/>
+                    <map from="${build.classes.dir.resolved}" to=""/>
+                </pathconvert>
+                <pathconvert pathsep=" " property="jar.classpath">
+                    <path path="${run.classpath.without.build.classes.dir}"/>
+                    <chainedmapper>
+                        <flattenmapper/>
+                        <globmapper from="*" to="lib/*"/>
+                    </chainedmapper>
+                </pathconvert>
+                <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
+                <copylibs compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}" manifest="${manifest.file}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
+                    <fileset dir="${build.classes.dir}"/>
+                    <manifest>
+                        <attribute name="Class-Path" value="${jar.classpath}"/>
+                        <customize/>
+                    </manifest>
+                </copylibs>
+            </sequential>
+        </macrodef>
+    </target>
     <target name="-init-presetdef-jar">
         <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <jar compress="${jar.compress}" jarfile="${dist.jar}">
+            <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}">
                 <j2seproject1:fileset dir="${build.classes.dir}"/>
             </jar>
         </presetdef>
     </target>
-    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar" name="init"/>
+    <target name="-init-ap-cmdline-properties">
+        <property name="annotation.processing.enabled" value="true"/>
+        <property name="annotation.processing.processors.list" value=""/>
+        <property name="annotation.processing.processor.options" value=""/>
+        <property name="annotation.processing.run.all.processors" value="true"/>
+        <property name="javac.processorpath" value="${javac.classpath}"/>
+        <property name="javac.test.processorpath" value="${javac.test.classpath}"/>
+        <condition property="ap.supported.internal" value="true">
+            <not>
+                <matches pattern="1\.[0-5](\..*)?" string="${javac.source}"/>
+            </not>
+        </condition>
+    </target>
+    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-ap-cmdline-supported">
+        <condition else="" property="ap.processors.internal" value="-processor ${annotation.processing.processors.list}">
+            <isfalse value="${annotation.processing.run.all.processors}"/>
+        </condition>
+        <condition else="" property="ap.proc.none.internal" value="-proc:none">
+            <isfalse value="${annotation.processing.enabled}"/>
+        </condition>
+    </target>
+    <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline">
+        <property name="ap.cmd.line.internal" value=""/>
+    </target>
+    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar,-init-ap-cmdline" name="init"/>
     <!--
                 ===================
                 COMPILATION SECTION
@@ -409,12 +524,18 @@
         </pathconvert>
         <j2seproject3:depend srcdir="${src.dir}:${build.generated.subdirs}"/>
     </target>
-    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-compile-depend" if="have.sources" name="-do-compile">
+    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile, -copy-persistence-xml,-compile-depend" if="have.sources" name="-do-compile">
         <j2seproject3:javac gensrcdir="${build.generated.sources.dir}"/>
         <copy todir="${build.classes.dir}">
             <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
         </copy>
     </target>
+    <target if="has.persistence.xml" name="-copy-persistence-xml">
+        <mkdir dir="${build.classes.dir}/META-INF"/>
+        <copy todir="${build.classes.dir}/META-INF">
+            <fileset dir="${meta.inf.dir}" includes="persistence.xml"/>
+        </copy>
+    </target>
     <target name="-post-compile">
         <!-- Empty placeholder for easier customization. -->
         <!-- You can override this target in the ../build.xml file. -->
@@ -447,13 +568,13 @@
         <!-- Empty placeholder for easier customization. -->
         <!-- You can override this target in the ../build.xml file. -->
     </target>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar" name="-do-jar-without-manifest" unless="manifest.available-mkdist.available">
+    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive" name="-do-jar-without-manifest" unless="manifest.available">
         <j2seproject1:jar/>
     </target>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available" name="-do-jar-with-manifest" unless="manifest.available+main.class-mkdist.available">
+    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive+manifest.available" name="-do-jar-with-manifest" unless="manifest.available+main.class">
         <j2seproject1:jar manifest="${manifest.file}"/>
     </target>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class" name="-do-jar-with-mainclass" unless="manifest.available+main.class+mkdist.available">
+    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive+manifest.available+main.class" name="-do-jar-with-mainclass" unless="manifest.available+main.class+mkdist.available">
         <j2seproject1:jar manifest="${manifest.file}">
             <j2seproject1:manifest>
                 <j2seproject1:attribute name="Main-Class" value="${main.class}"/>
@@ -468,78 +589,35 @@
         </pathconvert>
         <echo>java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
     </target>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class+mkdist.available" name="-do-jar-with-libraries">
-        <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
-        <pathconvert property="run.classpath.without.build.classes.dir">
-            <path path="${run.classpath}"/>
-            <map from="${build.classes.dir.resolved}" to=""/>
-        </pathconvert>
-        <pathconvert pathsep=" " property="jar.classpath">
-            <path path="${run.classpath.without.build.classes.dir}"/>
-            <chainedmapper>
-                <flattenmapper/>
-                <globmapper from="*" to="lib/*"/>
-            </chainedmapper>
-        </pathconvert>
-        <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
-        <copylibs compress="${jar.compress}" jarfile="${dist.jar}" manifest="${manifest.file}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
-            <fileset dir="${build.classes.dir}"/>
-            <manifest>
+    <target depends="init,compile,-pre-pre-jar,-pre-jar,-init-macrodef-copylibs" if="do.archive+manifest.available+main.class+mkdist.available+splashscreen.available" name="-do-jar-with-libraries-and-splashscreen">
+        <basename file="${application.splash}" property="splashscreen.basename"/>
+        <mkdir dir="${build.classes.dir}/META-INF"/>
+        <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>
+        <j2seproject3:copylibs>
+            <customize>
                 <attribute name="Main-Class" value="${main.class}"/>
-                <attribute name="Class-Path" value="${jar.classpath}"/>
-            </manifest>
-        </copylibs>
+                <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
+            </customize>
+        </j2seproject3:copylibs>
         <echo>To run this application from the command line without Ant, try:</echo>
         <property location="${dist.jar}" name="dist.jar.resolved"/>
         <echo>java -jar "${dist.jar.resolved}"</echo>
     </target>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+mkdist.available" name="-do-jar-with-libraries-without-mainclass" unless="main.class.available">
-        <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
-        <pathconvert property="run.classpath.without.build.classes.dir">
-            <path path="${run.classpath}"/>
-            <map from="${build.classes.dir.resolved}" to=""/>
-        </pathconvert>
-        <pathconvert pathsep=" " property="jar.classpath">
-            <path path="${run.classpath.without.build.classes.dir}"/>
-            <chainedmapper>
-                <flattenmapper/>
-                <globmapper from="*" to="lib/*"/>
-            </chainedmapper>
-        </pathconvert>
-        <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
-        <copylibs compress="${jar.compress}" jarfile="${dist.jar}" manifest="${manifest.file}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
-            <fileset dir="${build.classes.dir}"/>
-            <manifest>
-                <attribute name="Class-Path" value="${jar.classpath}"/>
-            </manifest>
-        </copylibs>
-    </target>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.mkdist" name="-do-jar-with-libraries-without-manifest" unless="manifest.available">
-        <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
-        <pathconvert property="run.classpath.without.build.classes.dir">
-            <path path="${run.classpath}"/>
-            <map from="${build.classes.dir.resolved}" to=""/>
-        </pathconvert>
-        <pathconvert pathsep=" " property="jar.classpath">
-            <path path="${run.classpath.without.build.classes.dir}"/>
-            <chainedmapper>
-                <flattenmapper/>
-                <globmapper from="*" to="lib/*"/>
-            </chainedmapper>
-        </pathconvert>
-        <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
-        <copylibs compress="${jar.compress}" jarfile="${dist.jar}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
-            <fileset dir="${build.classes.dir}"/>
-            <manifest>
-                <attribute name="Class-Path" value="${jar.classpath}"/>
-            </manifest>
-        </copylibs>
+    <target depends="init,compile,-pre-pre-jar,-pre-jar,-init-macrodef-copylibs" if="do.archive+manifest.available+main.class+mkdist.available" name="-do-jar-with-libraries" unless="splashscreen.available">
+        <j2seproject3:copylibs>
+            <customize>
+                <attribute name="Main-Class" value="${main.class}"/>
+            </customize>
+        </j2seproject3:copylibs>
+        <echo>To run this application from the command line without Ant, try:</echo>
+        <property location="${dist.jar}" name="dist.jar.resolved"/>
+        <echo>java -jar "${dist.jar.resolved}"</echo>
     </target>
     <target name="-post-jar">
         <!-- Empty placeholder for easier customization. -->
         <!-- You can override this target in the ../build.xml file. -->
     </target>
-    <target depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries,-do-jar-with-libraries-without-mainclass,-do-jar-with-libraries-without-manifest,-post-jar" description="Build JAR." name="jar"/>
+    <target depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries-and-splashscreen,-do-jar-with-libraries,-post-jar" description="Build JAR." name="jar"/>
     <!--
                 =================
                 EXECUTION SECTION
@@ -609,7 +687,7 @@
                 JAVADOC SECTION
                 ===============
             -->
-    <target depends="init" name="-javadoc-build">
+    <target depends="init" if="have.sources" name="-javadoc-build">
         <mkdir dir="${dist.javadoc.dir}"/>
         <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
             <classpath>
@@ -643,7 +721,7 @@
         <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
     </target>
     <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
-        <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
+        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" processorpath="${javac.test.processorpath}" srcdir="${test.src.dir}"/>
         <copy todir="${build.test.classes.dir}">
             <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
         </copy>
@@ -660,7 +738,7 @@
     <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
         <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
         <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>
-        <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" sourcepath="${test.src.dir}" srcdir="${test.src.dir}"/>
+        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" processorpath="${javac.test.processorpath}" sourcepath="${test.src.dir}" srcdir="${test.src.dir}"/>
         <copy todir="${build.test.classes.dir}">
             <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
         </copy>
diff -r 91490d5419d2 -r 44ef544460ca java/nekurak.net-lib/nbproject/genfiles.properties
--- a/java/nekurak.net-lib/nbproject/genfiles.properties	Thu Jun 17 15:12:30 2010 +0200
+++ b/java/nekurak.net-lib/nbproject/genfiles.properties	Sat Jun 19 11:19:27 2010 +0200
@@ -1,8 +1,8 @@
 build.xml.data.CRC32=11ce77af
 build.xml.script.CRC32=f10c3672
-build.xml.stylesheet.CRC32=958a1d3e@1.32.1.45
+build.xml.stylesheet.CRC32=28e38971@1.38.1.45
 # 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=11ce77af
-nbproject/build-impl.xml.script.CRC32=4e6301c4
-nbproject/build-impl.xml.stylesheet.CRC32=576378a2@1.32.1.45
+nbproject/build-impl.xml.script.CRC32=8db4fbcf
+nbproject/build-impl.xml.stylesheet.CRC32=78c6a6ee@1.38.1.45
diff -r 91490d5419d2 -r 44ef544460ca java/nekurak.net-lib/src/cz/frantovo/nekurak/ejb/PodnikRemote.java
--- a/java/nekurak.net-lib/src/cz/frantovo/nekurak/ejb/PodnikRemote.java	Thu Jun 17 15:12:30 2010 +0200
+++ b/java/nekurak.net-lib/src/cz/frantovo/nekurak/ejb/PodnikRemote.java	Sat Jun 19 11:19:27 2010 +0200
@@ -41,6 +41,7 @@
 
     /**
      * @param k komentář, který se má přidat k podniku
+     * @param uloz true = vloží komentář | false = pouze zkontroluje (naformátuje obsah komentáře)
      */
-    public void komentuj(Komentar k) throws KomentarovaVyjimka, TexyVyjimka;
+    public Komentar komentuj(Komentar k, boolean uloz) throws KomentarovaVyjimka, TexyVyjimka;
 }
diff -r 91490d5419d2 -r 44ef544460ca java/nekurak.net-lib/src/cz/frantovo/nekurak/preklady_cs.properties
--- a/java/nekurak.net-lib/src/cz/frantovo/nekurak/preklady_cs.properties	Thu Jun 17 15:12:30 2010 +0200
+++ b/java/nekurak.net-lib/src/cz/frantovo/nekurak/preklady_cs.properties	Sat Jun 19 11:19:27 2010 +0200
@@ -1,103 +1,108 @@
-jazyk=\u010De\u0161tina
+jazyk=\u010de\u0161tina
 
-nazev=Neku\u0159\u00E1k.net
-popis=Datab\u00E1ze neku\u0159\u00E1ck\u00FDch restaurac\u00ED.
-licence=\u00A9 2010 nekurak.net. Licence: Affero GPL.
+nazev=Neku\u0159\u00e1k.net
+popis=Datab\u00e1ze neku\u0159\u00e1ck\u00fdch restaurac\u00ed.
+licence=\u00a9 2010 nekurak.net. Licence: Affero GPL.
 
-meta.popis=Datab\u00E1ze neku\u0159\u00E1ck\u00FDch hospod
-meta.klicova-slova=restaurace, hospoda, kou\u0159en\u00ED, cigarety, tab\u00E1k, neku\u0159\u00E1ck\u00E1
-meta.autor=Franti\u0161ek Ku\u010Dera \u2013 http://podnik.frantovo.cz/
+meta.popis=Datab\u00e1ze neku\u0159\u00e1ck\u00fdch hospod
+meta.klicova-slova=restaurace, hospoda, kou\u0159en\u00ed, cigarety, tab\u00e1k, neku\u0159\u00e1ck\u00e1
+meta.autor=Franti\u0161ek Ku\u010dera \u2013 http://podnik.frantovo.cz/
 
-uvod=\u00DAvod
+uvod=\u00davod
 registrovatSe=Registrovat se
-prihlasitSe=P\u0159ihl\u00E1sit se
-odhlasitSe=Odhl\u00E1sit se
+prihlasitSe=P\u0159ihl\u00e1sit se
+odhlasitSe=Odhl\u00e1sit se
 pridatPodnik=P\u0159idat podnik
-prihlasenyUzivatel=P\u0159ihl\u00E1\u0161en\u00FD u\u017Eivatel
+prihlasenyUzivatel=P\u0159ihl\u00e1\u0161en\u00fd u\u017eivatel
 
-prepinaniJazyku.cestina=\u010De\u0161tina
-prepinaniJazyku.cestina.tip=str\u00E1nka ji\u017E je v \u010De\u0161tin\u011B
+prepinaniJazyku.cestina=\u010de\u0161tina
+prepinaniJazyku.cestina.tip=str\u00e1nka ji\u017e je v \u010de\u0161tin\u011b
 prepinaniJazyku.slovenstina=sloven\u0161tina
 prepinaniJazyku.slovenstina.tip=p\u0159epnout na sloven\u0161tinu
-prepinaniJazyku.anglictina=angli\u010Dtina
-prepinaniJazyku.anglictina.tip=p\u0159epnout na angli\u010Dtinu
+prepinaniJazyku.anglictina=angli\u010dtina
+prepinaniJazyku.anglictina.tip=p\u0159epnout na angli\u010dtinu
 
-chybovaStranka.404.nazev=404 Str\u00E1nka nenalezena
-chybovaStranka.404.popis=Takovou str\u00E1nku tu bohu\u017Eel nem\u00E1me.
-chybovaStranka.500.nazev=500 Intern\u00ED chyba serveru
-chybovaStranka.500.popis=N\u011Bco se bohu\u017Eel nepovedlo.
+chybovaStranka.404.nazev=404 Str\u00e1nka nenalezena
+chybovaStranka.404.popis=Takovou str\u00e1nku tu bohu\u017eel nem\u00e1me.
+chybovaStranka.500.nazev=500 Intern\u00ed chyba serveru
+chybovaStranka.500.popis=N\u011bco se bohu\u017eel nepovedlo.
 
-uvod.naposledyPridanePodniky=Naposledy p\u0159idan\u00E9 podniky
-uvod.www=www str\u00E1nka
+uvod.naposledyPridanePodniky=Naposledy p\u0159idan\u00e9 podniky
+uvod.www=www str\u00e1nka
 uvod.adresa=Adresa
 
 
-prihlaseni.odhlaseniUspesne=Odhl\u00E1\u0161en\u00ED prob\u011Bhlo \u00FAsp\u011B\u0161n\u011B.
-prihlaseni.nadpis=P\u0159ihl\u00E1\u0161en\u00ED
-prihlaseni.nadpis.odhlaseni=Odhl\u00E1\u0161en\u00ED
-prihlaseni.zadejte=Zadejte jm\u00E9no a heslo.
-prihlaseni.chyba=Nespr\u00E1vn\u00E9 jm\u00E9no nebo heslo, zkuste to pros\u00EDm znovu.
-prihlaseni.jmeno=Jm\u00E9no
+prihlaseni.odhlaseniUspesne=Odhl\u00e1\u0161en\u00ed prob\u011bhlo \u00fasp\u011b\u0161n\u011b.
+prihlaseni.nadpis=P\u0159ihl\u00e1\u0161en\u00ed
+prihlaseni.nadpis.odhlaseni=Odhl\u00e1\u0161en\u00ed
+prihlaseni.zadejte=Zadejte jm\u00e9no a heslo.
+prihlaseni.chyba=Nespr\u00e1vn\u00e9 jm\u00e9no nebo heslo, zkuste to pros\u00edm znovu.
+prihlaseni.jmeno=Jm\u00e9no
 prihlaseni.heslo=Heslo
-prihlaseni.tlacitko=P\u0159ihl\u00E1sit se
+prihlaseni.tlacitko=P\u0159ihl\u00e1sit se
 
-pridatPodnik.nadpis=P\u0159id\u00E1n\u00ED nov\u00E9ho podniku
-pridatPodnik.bylPridan=Podnik byl \u00FAsp\u011B\u0161n\u011B p\u0159id\u00E1n.
-pridatPodnik.nebylPridan=P\u0159i p\u0159id\u00E1v\u00E1n\u00ED podniku do\u0161lo k chyb\u011B. Zkontrolujte pros\u00EDm zadan\u00E9 \u00FAdaje.
+pridatPodnik.nadpis=P\u0159id\u00e1n\u00ed nov\u00e9ho podniku
+pridatPodnik.bylPridan=Podnik byl \u00fasp\u011b\u0161n\u011b p\u0159id\u00e1n.
+pridatPodnik.nebylPridan=P\u0159i p\u0159id\u00e1v\u00e1n\u00ed podniku do\u0161lo k chyb\u011b. Zkontrolujte pros\u00edm zadan\u00e9 \u00fadaje.
 pridatPodnik.tlacitko=P\u0159idat podnik
 
-dto.podnik.nazev=N\u00E1zev
+dto.podnik.nazev=N\u00e1zev
 dto.podnik.popis=Popis
 dto.podnik.url=URL
-dto.podnik.url.tip=www str\u00E1nka
+dto.podnik.url.tip=www str\u00e1nka
 dto.podnik.datum=Datum
 dto.podnik.ulice=Ulice
-dto.podnik.cisloPopisne=\u010D.p.
-dto.podnik.cisloPopisne.tip=\u010D\u00EDslo popisn\u00E9
-dto.podnik.mesto=M\u011Bsto
+dto.podnik.cisloPopisne=\u010d.p.
+dto.podnik.cisloPopisne.tip=\u010d\u00edslo popisn\u00e9
+dto.podnik.mesto=M\u011bsto
 
-registrace.nadpis=Registrace nov\u00E9ho u\u017Eivatele
-registrace.kontrola=Zkontrolujte pros\u00EDm zadan\u00E9 \u00FAdaje.
-registrace.hotovo=\u00DA\u010Det byl \u00FAsp\u011B\u0161n\u011B zalo\u017Een, m\u016F\u017Eete se
-registrace.hotovo.prihlasit=p\u0159ihl\u00E1sit
+registrace.nadpis=Registrace nov\u00e9ho u\u017eivatele
+registrace.kontrola=Zkontrolujte pros\u00edm zadan\u00e9 \u00fadaje.
+registrace.hotovo=\u00da\u010det byl \u00fasp\u011b\u0161n\u011b zalo\u017een, m\u016f\u017eete se
+registrace.hotovo.prihlasit=p\u0159ihl\u00e1sit
 registrace.tlacitko=Registrovat se
 registrace.potvrdit=Potvrdit registraci
-registrace.vyjimka=Nepoda\u0159ilo se zalo\u017Eit u\u017Eivatele. Po\u017Eadovan\u00E1 p\u0159ezd\u00EDvka je pravd\u011Bpodobn\u011B obsazena.
-registrace.vyjimka.necekana=Omlouv\u00E1me se, b\u011Bhem registrace do\u0161lo k nezn\u00E1m\u00E9 chyb\u011B.
-registrace.vyjimka.token=Relace vypr\u0161ela, registraci nelze dokon\u010Dit. Vypl\u0148te pros\u00EDm formul\u00E1\u0159 znovu.
-registrace.vyjimka.heslaSeNeshoduji=Hesla se neshoduj\u00ED. Pro kontrolu je pot\u0159eba vyplnit stejn\u00E9 heslo dvakr\u00E1t.
-registrace.email.predmet=V\u00EDtejte na serveru Neku\u0159\u00E1k.net
-registrace.email.text=Srde\u010Dn\u011B v\u00EDt\u00E1me nov\u00E9ho u\u017Eivatele: {0} \nVa\u0161e p\u0159ezd\u00EDvka: {1}
+registrace.vyjimka=Nepoda\u0159ilo se zalo\u017eit u\u017eivatele. Po\u017eadovan\u00e1 p\u0159ezd\u00edvka je pravd\u011bpodobn\u011b obsazena.
+registrace.vyjimka.necekana=Omlouv\u00e1me se, b\u011bhem registrace do\u0161lo k nezn\u00e1m\u00e9 chyb\u011b.
+registrace.vyjimka.token=Relace vypr\u0161ela, registraci nelze dokon\u010dit. Vypl\u0148te pros\u00edm formul\u00e1\u0159 znovu.
+registrace.vyjimka.heslaSeNeshoduji=Hesla se neshoduj\u00ed. Pro kontrolu je pot\u0159eba vyplnit stejn\u00e9 heslo dvakr\u00e1t.
+registrace.email.predmet=V\u00edtejte na serveru Neku\u0159\u00e1k.net
+registrace.email.text=Srde\u010dn\u011b v\u00edt\u00e1me nov\u00e9ho u\u017eivatele: {0} \nVa\u0161e p\u0159ezd\u00edvka: {1}
 
-dto.uzivatel.prezdivka=P\u0159ezd\u00EDvka
-dto.uzivatel.prezdivka.tip=U\u017Eivatelsk\u00E9 jm\u00E9no
+dto.uzivatel.prezdivka=P\u0159ezd\u00edvka
+dto.uzivatel.prezdivka.tip=U\u017eivatelsk\u00e9 jm\u00e9no
 dto.uzivatel.heslo=Heslo
 dto.uzivatel.heslo.kontrola=Heslo znovu
-dto.uzivatel.jmeno=Jm\u00E9no
-dto.uzivatel.prijmeni=P\u0159\u00EDjmen\u00ED
+dto.uzivatel.jmeno=Jm\u00e9no
+dto.uzivatel.prijmeni=P\u0159\u00edjmen\u00ed
 dto.uzivatel.email=e-mail
 
-hlasovani.graf.nadpis=M\u011Blo by se tu
-hlasovani.graf.zadneHlasy=(zat\u00EDm nikdo nehlasoval)
-hlasovani.graf.popisSloupce=hlas\u016F: {0}
+hlasovani.graf.nadpis=M\u011blo by se tu
+hlasovani.graf.zadneHlasy=(zat\u00edm nikdo nehlasoval)
+hlasovani.graf.popisSloupce=hlas\u016f: {0}
 hlasovani.graf.kourit=kou\u0159it
 hlasovani.graf.nekourit=nekou\u0159it
 hlasovani.TODO=TODO: lokalizovat Javascript
 
-komentare.vypisNadpis=Koment\u00E1\u0159e k tomuto podniku
-komentare.prihlasitSe=Pro vkl\u00E1d\u00E1n\u00ED koment\u00E1\u0159\u016F se pros\u00EDm p\u0159ihla\u0161te.
-komentare.zadneKomentare=Zat\u00EDm nikdo nekomentoval.
+komentare.vypisNadpis=Koment\u00e1\u0159e k tomuto podniku
+komentare.prihlasitSe=Pro vkl\u00e1d\u00e1n\u00ed koment\u00e1\u0159\u016f se pros\u00edm p\u0159ihla\u0161te.
+komentare.zadneKomentare=Zat\u00edm nikdo nekomentoval.
 komentare.komentovat=Komentovat!
 komentare.nadpis=Nadpis
-komentare.tlacitkoOdeslat=Vlo\u017Eit koment\u00E1\u0159
+komentare.tlacitkoOdeslat=Vlo\u017eit koment\u00e1\u0159
+komentare.tlacitkoNahled=N\u00e1hled
 komentare.napsal=Napsal
-komentar.odeslat.nadpis=Vlo\u017Een\u00ED koment\u00E1\u0159e
-komentar.odeslat.ok=Koment\u00E1\u0159 byl \u00FAsp\u011B\u0161n\u011B vlo\u017Een
-komentar.odeslat.pokracujte=pokra\u010Dujte na str\u00E1nku podniku
-komentar.odeslat.chyba=Koment\u00E1\u0159 obsahuje nepovolen\u00E9 form\u00E1tov\u00E1n\u00ED.
-komentar.typ.prostyText=Prost\u00FD text
-komentar.typ.xhtml=XHTML form\u00E1tovan\u00FD text
-komentar.typ.xhtml.povoleneZnacky=Povolen\u00E9 zna\u010Dky jsou: &lt;p&gt;odstavec&lt;/p&gt;, &lt;strong&gt;tu\u010Dn\u011B&lt;/strong&gt;, &lt;em&gt;kurz\u00EDva&lt;/em&gt; a &lt;br/&gt;.
-komentar.typ.texy=Texy form\u00E1tovan\u00FD text
-komentar.nejdeZobrazit=Tento koment\u00E1\u0159 bohu\u017Eel nelze z technick\u00FDch d\u016Fvod\u016F zobrazit.
+komentare.nahledNadpis=Takhle bude vypadat v\u00e1\u0161 koment\u00e1\u0159
+komentare.nahledChybaFormatu=Koment\u00e1\u0159 obsahuje nepovolen\u00e9 form\u00e1tov\u00e1n\u00ed.
+komentare.nahledChybaPrihlaseni=Koment\u00e1\u0159e mohou vkl\u00e1dat pouze p\u0159ihl\u00e1\u0161en\u00ed u\u017eivatel\u00e9.
+komentare.nahledOdeslano=Koment\u00e1\u0159 byl \u00fasp\u011b\u0161n\u011b ulo\u017een
+komentar.odeslat.nadpis=Vlo\u017een\u00ed koment\u00e1\u0159e
+komentar.odeslat.ok=Koment\u00e1\u0159 byl \u00fasp\u011b\u0161n\u011b vlo\u017een
+komentar.odeslat.pokracujte=pokra\u010dujte na str\u00e1nku podniku
+komentar.odeslat.chyba=Koment\u00e1\u0159 obsahuje nepovolen\u00e9 form\u00e1tov\u00e1n\u00ed.
+komentar.typ.prostyText=Prost\u00fd text
+komentar.typ.xhtml=XHTML form\u00e1tovan\u00fd text
+komentar.typ.xhtml.povoleneZnacky=Povolen\u00e9 zna\u010dky jsou: p, strong, em a br.
+komentar.typ.texy=Texy form\u00e1tovan\u00fd text
+komentar.nejdeZobrazit=Tento koment\u00e1\u0159 bohu\u017eel nelze z technick\u00fdch d\u016fvod\u016f zobrazit.
 
diff -r 91490d5419d2 -r 44ef544460ca java/nekurak.net-rest/nbproject/ant-deploy.xml
--- a/java/nekurak.net-rest/nbproject/ant-deploy.xml	Thu Jun 17 15:12:30 2010 +0200
+++ b/java/nekurak.net-rest/nbproject/ant-deploy.xml	Sat Jun 19 11:19:27 2010 +0200
@@ -24,7 +24,7 @@
         </xmlproperty>    
         <delete file="${temp.sun.web}"/>
         <property name="deploy.ant.client.url" value="${gfv3.url}${sun-web-app.context-root}"/>
-        <property name="deploy.context.root.argument" value="?contextroot=${sun-web-app.context-root}"/>
+        <property name="deploy.context.root.argument" value="&amp;contextroot=${sun-web-app.context-root}"/>
     </target>
     <target name="-no-parse-sun-web" depends="-init-cl-deployment-env" unless="sun.web.present">
         <property name="deploy.context.root.argument" value=""/>
@@ -43,18 +43,43 @@
         <delete dir="${gfv3.resources.dir}"/>
     </target>
     <target name="-deploy-ant" depends="-parse-sun-web,-no-parse-sun-web,-add-resources" if="deploy.ant.enabled">
+        <antcall target="-deploy-without-pw"/>
+        <antcall target="-deploy-with-pw"/>
+    </target>
+
+    <target name="-deploy-without-pw" unless="gfv3.password">
         <echo message="Deploying ${deploy.ant.archive}"/>
         <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
         <property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
-        <get src="${gfv3.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}?force=true?name=${ant.project.name}"
+        <get src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&amp;force=true&amp;name=${ant.project.name}"
             dest="${gfv3.results.file}"/>
         <delete file="${gfv3.results.file}"/>    
     </target>
+    <target name="-deploy-with-pw" if="gfv3.password">
+        <echo message="Deploying ${deploy.ant.archive}"/>
+        <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
+        <property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
+        <get username="${gfv3.username}" password="${gfv3.password}" src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&amp;force=true&amp;name=${ant.project.name}"
+            dest="${gfv3.results.file}"/>
+        <delete file="${gfv3.results.file}"/>
+    </target>
     <target name="-undeploy-ant" depends="-init-cl-deployment-env" if="deploy.ant.enabled">
+        <antcall target="-undeploy-without-pw"/>
+        <antcall target="-undeploy-with-pw"/>
+    </target>
+
+    <target name="-undeploy-without-pw" unless="gfv3.password">
         <echo message="Undeploying ${deploy.ant.archive}"/>
         <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
-        <get src="${gfv3.url}/__asadmin/undeploy?name=${ant.project.name}"
+        <get src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
             dest="${gfv3.results.file}"/>
         <delete file="${gfv3.results.file}"/>    
     </target>
+    <target name="-undeploy-with-pw" if="gfv3.password">
+        <echo message="Undeploying ${deploy.ant.archive}"/>
+        <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
+        <get username="${gfv3.username}" password="${gfv3.password}" src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
+            dest="${gfv3.results.file}"/>
+        <delete file="${gfv3.results.file}"/>
+    </target>
 </project>
diff -r 91490d5419d2 -r 44ef544460ca java/nekurak.net-rest/nbproject/build-impl.xml
--- a/java/nekurak.net-rest/nbproject/build-impl.xml	Thu Jun 17 15:12:30 2010 +0200
+++ b/java/nekurak.net-rest/nbproject/build-impl.xml	Sat Jun 19 11:19:27 2010 +0200
@@ -199,6 +199,20 @@
         <fail unless="build.test.results.dir">Must set build.test.results.dir</fail>
         <fail unless="build.classes.excludes">Must set build.classes.excludes</fail>
         <fail unless="dist.war">Must set dist.war</fail>
+        <condition property="missing.j2ee.server.home">
+            <and>
+                <matches pattern="j2ee.server.home" string="${j2ee.platform.classpath}"/>
+                <not>
+                    <isset property="j2ee.server.home"/>
+                </not>
+            </and>
+        </condition>
+        <fail if="missing.j2ee.server.home">
+The Java EE server classpath is not correctly set up - server home directory is missing.
+Either open the project in the IDE and assign the server or setup the server classpath manually.
+For example like this:
+   ant -Dj2ee.server.home=&lt;app_server_installation_directory&gt;
+                </fail>
         <fail unless="j2ee.platform.classpath">
 The Java EE server classpath is not correctly set up. Your active server type is ${j2ee.server.type}.
 Either open the project in the IDE and assign the server or setup the server classpath manually.
@@ -216,11 +230,51 @@
             </sequential>
         </macrodef>
     </target>
-    <target name="-init-macrodef-javac">
+    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">
         <macrodef name="javac" uri="http://www.netbeans.org/ns/web-project/2">
             <attribute default="${src.dir}" name="srcdir"/>
             <attribute default="${build.classes.dir}" name="destdir"/>
             <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
+            <attribute default="${javac.processorpath}" name="processorpath"/>
+            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="${javac.debug}" name="debug"/>
+            <attribute default="${empty.dir}" name="gensrcdir"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <property location="${build.dir}/empty" name="empty.dir"/>
+                <mkdir dir="${empty.dir}"/>
+                <mkdir dir="@{apgeneratedsrcdir}"/>
+                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" source="${javac.source}" srcdir="@{srcdir}" target="${javac.target}">
+                    <src>
+                        <dirset dir="@{gensrcdir}" erroronmissingdir="false">
+                            <include name="*"/>
+                        </dirset>
+                    </src>
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                    <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
+                    <compilerarg line="${javac.compilerargs}"/>
+                    <compilerarg value="-processorpath"/>
+                    <compilerarg path="@{processorpath}:${empty.dir}"/>
+                    <compilerarg line="${ap.processors.internal}"/>
+                    <compilerarg value="-s"/>
+                    <compilerarg path="@{apgeneratedsrcdir}"/>
+                    <compilerarg line="${ap.proc.none.internal}"/>
+                    <customize/>
+                </javac>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
+        <macrodef name="javac" uri="http://www.netbeans.org/ns/web-project/2">
+            <attribute default="${src.dir}" name="srcdir"/>
+            <attribute default="${build.classes.dir}" name="destdir"/>
+            <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
+            <attribute default="${javac.processorpath}" name="processorpath"/>
+            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
             <attribute default="${includes}" name="includes"/>
             <attribute default="${excludes}" name="excludes"/>
             <attribute default="${javac.debug}" name="debug"/>
@@ -245,6 +299,35 @@
             </sequential>
         </macrodef>
     </target>
+    <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
+        <macrodef name="depend" uri="http://www.netbeans.org/ns/web-project/2">
+            <attribute default="${src.dir}" name="srcdir"/>
+            <attribute default="${build.classes.dir}" name="destdir"/>
+            <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
+            <sequential>
+                <depend cache="${build.dir}/depcache" destdir="@{destdir}" excludes="${excludes}" includes="${includes}" srcdir="@{srcdir}">
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                </depend>
+            </sequential>
+        </macrodef>
+        <macrodef name="force-recompile" uri="http://www.netbeans.org/ns/web-project/2">
+            <attribute default="${build.classes.dir}" name="destdir"/>
+            <sequential>
+                <fail unless="javac.includes">Must set javac.includes</fail>
+                <pathconvert pathsep="," property="javac.includes.binary">
+                    <path>
+                        <filelist dir="@{destdir}" files="${javac.includes}"/>
+                    </path>
+                    <globmapper from="*.java" to="*.class"/>
+                </pathconvert>
+                <delete>
+                    <files includes="${javac.includes.binary}"/>
+                </delete>
+            </sequential>
+        </macrodef>
+    </target>
     <target name="-init-macrodef-junit">
         <macrodef name="junit" uri="http://www.netbeans.org/ns/web-project/2">
             <attribute default="${includes}" name="includes"/>
@@ -387,7 +470,30 @@
                 </fail>
         <taskdef classpath="${libs.CopyLibs.classpath}" resource="org/netbeans/modules/java/j2seproject/copylibstask/antlib.xml"/>
     </target>
-    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-java,-init-macrodef-nbjpda,-init-macrodef-nbjsdebug,-init-macrodef-debug,-init-taskdefs" name="init"/>
+    <target name="-init-ap-cmdline-properties">
+        <property name="annotation.processing.enabled" value="true"/>
+        <property name="annotation.processing.processors.list" value=""/>
+        <property name="annotation.processing.run.all.processors" value="true"/>
+        <property name="javac.processorpath" value="${javac.classpath}"/>
+        <property name="javac.test.processorpath" value="${javac.test.classpath}"/>
+        <condition property="ap.supported.internal" value="true">
+            <not>
+                <matches pattern="1\.[0-5](\..*)?" string="${javac.source}"/>
+            </not>
+        </condition>
+    </target>
+    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-ap-cmdline-supported">
+        <condition else="" property="ap.processors.internal" value="-processor ${annotation.processing.processors.list}">
+            <isfalse value="${annotation.processing.run.all.processors}"/>
+        </condition>
+        <condition else="" property="ap.proc.none.internal" value="-proc:none">
+            <isfalse value="${annotation.processing.enabled}"/>
+        </condition>
+    </target>
+    <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline">
+        <property name="ap.cmd.line.internal" value=""/>
+    </target>
+    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-java,-init-macrodef-nbjpda,-init-macrodef-nbjsdebug,-init-macrodef-debug,-init-taskdefs,-init-ap-cmdline" name="init"/>
     <!--
                 COMPILATION SECTION
             -->
@@ -467,10 +573,10 @@
             <arg value="-compilerSourceVM ${javac.source}"/>
             <arg value="-compilerTargetVM ${javac.target}"/>
             <arg value="-javaEncoding ${source.encoding}"/>
-            <classpath path="${java.home}/../lib/tools.jar:${jspctask.classpath}:${jspcompilation.classpath}"/>
+            <classpath path="${java.home}/../lib/tools.jar:${libs.jsp-compiler.classpath}:${libs.jsp-compilation.classpath}"/>
         </java>
         <mkdir dir="${build.generated.dir}/classes"/>
-        <webproject2:javac classpath="${j2ee.platform.classpath}:${build.classes.dir}:${jspcompilation.classpath}" destdir="${build.generated.dir}/classes" srcdir="${build.generated.dir}/src"/>
+        <webproject2:javac classpath="${build.classes.dir}:${libs.jsp-compilation.classpath}:${javac.classpath}:${j2ee.platform.classpath}" destdir="${build.generated.dir}/classes" srcdir="${build.generated.dir}/src"/>
     </target>
     <target depends="compile" if="jsp.includes" name="-do-compile-single-jsp">
         <fail unless="javac.jsp.includes">Must select some files in the IDE or set javac.jsp.includes</fail>
@@ -486,10 +592,10 @@
             <arg value="-compilerSourceVM ${javac.source}"/>
             <arg value="-compilerTargetVM ${javac.target}"/>
             <arg value="-javaEncoding ${source.encoding}"/>
-            <classpath path="${java.home}/../lib/tools.jar:${jspctask.classpath}:${jspcompilation.classpath}"/>
+            <classpath path="${java.home}/../lib/tools.jar:${libs.jsp-compiler.classpath}:${libs.jsp-compilation.classpath}"/>
         </java>
         <mkdir dir="${build.generated.dir}/classes"/>
-        <webproject2:javac classpath="${j2ee.platform.classpath}:${build.classes.dir}:${jspcompilation.classpath}" destdir="${build.generated.dir}/classes" srcdir="${build.generated.dir}/src">
+        <webproject2:javac classpath="${build.classes.dir}:${libs.jsp-compilation.classpath}:${javac.classpath}:${j2ee.platform.classpath}" destdir="${build.generated.dir}/classes" srcdir="${build.generated.dir}/src">
             <customize>
                 <patternset includes="${javac.jsp.includes}"/>
             </customize>
@@ -724,7 +830,7 @@
     <!--
                 JAVADOC SECTION
             -->
-    <target depends="init" name="javadoc-build">
+    <target depends="init" if="have.sources" name="javadoc-build">
         <mkdir dir="${dist.javadoc.dir}"/>
         <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
             <classpath>
diff -r 91490d5419d2 -r 44ef544460ca java/nekurak.net-rest/nbproject/genfiles.properties
--- a/java/nekurak.net-rest/nbproject/genfiles.properties	Thu Jun 17 15:12:30 2010 +0200
+++ b/java/nekurak.net-rest/nbproject/genfiles.properties	Sat Jun 19 11:19:27 2010 +0200
@@ -1,11 +1,11 @@
 build.xml.data.CRC32=35b9fabc
 build.xml.script.CRC32=fb1b7f84
-build.xml.stylesheet.CRC32=c0ebde35@1.21.2.1
+build.xml.stylesheet.CRC32=651128d4@1.24.1.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=35b9fabc
-nbproject/build-impl.xml.script.CRC32=41eb3ef9
-nbproject/build-impl.xml.stylesheet.CRC32=b139b33b@1.21.2.1
+nbproject/build-impl.xml.script.CRC32=3663fe21
+nbproject/build-impl.xml.stylesheet.CRC32=8335d67d@1.24.1.1
 nbproject/rest-build.xml.data.CRC32=d32e8880
 nbproject/rest-build.xml.script.CRC32=23da2c77
 nbproject/rest-build.xml.stylesheet.CRC32=ddd64843@1.4.1
diff -r 91490d5419d2 -r 44ef544460ca java/nekurak.net-rest/nbproject/project.properties
--- a/java/nekurak.net-rest/nbproject/project.properties	Thu Jun 17 15:12:30 2010 +0200
+++ b/java/nekurak.net-rest/nbproject/project.properties	Sat Jun 19 11:19:27 2010 +0200
@@ -1,3 +1,8 @@
+annotation.processing.enabled=true
+annotation.processing.enabled.in.editor=true
+annotation.processing.processors.list=
+annotation.processing.run.all.processors=true
+annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
 build.classes.dir=${build.web.dir}/WEB-INF/classes
 build.classes.excludes=**/*.java,**/*.form
 build.dir=build
@@ -24,6 +29,12 @@
 includes=**
 j2ee.deploy.on.save=false
 j2ee.platform=1.6-web
+j2ee.platform.classpath=${j2ee.server.home}/modules/javax.servlet.jar:${j2ee.server.home}/modules/jstl-impl.jar:${j2ee.server.home}/modules/javax.ejb.jar:${j2ee.server.home}/modules/javax.enterprise.deploy.jar:${j2ee.server.home}/modules/javax.security.jacc.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.transaction.jar:${j2ee.server.home}/modules/jsr311-api.jar:${j2ee.server.home}/modules/jsf-api.jar:${j2ee.server.home}/modules/javax.security.auth.message.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/endorsed/javax.annotation.jar:${j2ee.server.home}/modules/javax.management.j2ee.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/javax.jms.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.resource.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.home}/modules/jsf-impl.jar:${j2ee.server.home}/modules/mail.jar
+j2ee.platform.embeddableejb.classpath=${j2ee.server.home}/lib/embedded/glassfish-embedded-static-shell.jar
+j2ee.platform.wscompile.classpath=${j2ee.server.home}/modules/webservices-osgi.jar
+j2ee.platform.wsgen.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/javax.ejb.jar
+j2ee.platform.wsimport.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/javax.ejb.jar
+j2ee.platform.wsit.classpath=
 j2ee.server.type=gfv3ee6
 jar.compress=false
 javac.classpath=\
@@ -32,6 +43,7 @@
 javac.compilerargs=
 javac.debug=true
 javac.deprecation=false
+javac.processorpath=${javac.classpath}
 javac.source=1.5
 javac.target=1.5
 javac.test.classpath=\
@@ -39,6 +51,7 @@
     ${build.classes.dir}:\
     ${libs.junit.classpath}:\
     ${libs.junit_4.classpath}
+javac.test.processorpath=${javac.test.classpath}
 javadoc.additionalparam=
 javadoc.author=false
 javadoc.encoding=${source.encoding}
diff -r 91490d5419d2 -r 44ef544460ca java/nekurak.net-web/nbproject/ant-deploy.xml
--- a/java/nekurak.net-web/nbproject/ant-deploy.xml	Thu Jun 17 15:12:30 2010 +0200
+++ b/java/nekurak.net-web/nbproject/ant-deploy.xml	Sat Jun 19 11:19:27 2010 +0200
@@ -24,7 +24,7 @@
         </xmlproperty>    
         <delete file="${temp.sun.web}"/>
         <property name="deploy.ant.client.url" value="${gfv3.url}${sun-web-app.context-root}"/>
-        <property name="deploy.context.root.argument" value="?contextroot=${sun-web-app.context-root}"/>
+        <property name="deploy.context.root.argument" value="&amp;contextroot=${sun-web-app.context-root}"/>
     </target>
     <target name="-no-parse-sun-web" depends="-init-cl-deployment-env" unless="sun.web.present">
         <property name="deploy.context.root.argument" value=""/>
@@ -43,18 +43,43 @@
         <delete dir="${gfv3.resources.dir}"/>
     </target>
     <target name="-deploy-ant" depends="-parse-sun-web,-no-parse-sun-web,-add-resources" if="deploy.ant.enabled">
+        <antcall target="-deploy-without-pw"/>
+        <antcall target="-deploy-with-pw"/>
+    </target>
+
+    <target name="-deploy-without-pw" unless="gfv3.password">
         <echo message="Deploying ${deploy.ant.archive}"/>
         <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
         <property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
-        <get src="${gfv3.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}?force=true?name=${ant.project.name}"
+        <get src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&amp;force=true&amp;name=${ant.project.name}"
             dest="${gfv3.results.file}"/>
         <delete file="${gfv3.results.file}"/>    
     </target>
+    <target name="-deploy-with-pw" if="gfv3.password">
+        <echo message="Deploying ${deploy.ant.archive}"/>
+        <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
+        <property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
+        <get username="${gfv3.username}" password="${gfv3.password}" src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&amp;force=true&amp;name=${ant.project.name}"
+            dest="${gfv3.results.file}"/>
+        <delete file="${gfv3.results.file}"/>
+    </target>
     <target name="-undeploy-ant" depends="-init-cl-deployment-env" if="deploy.ant.enabled">
+        <antcall target="-undeploy-without-pw"/>
+        <antcall target="-undeploy-with-pw"/>
+    </target>
+
+    <target name="-undeploy-without-pw" unless="gfv3.password">
         <echo message="Undeploying ${deploy.ant.archive}"/>
         <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
-        <get src="${gfv3.url}/__asadmin/undeploy?name=${ant.project.name}"
+        <get src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
             dest="${gfv3.results.file}"/>
         <delete file="${gfv3.results.file}"/>    
     </target>
+    <target name="-undeploy-with-pw" if="gfv3.password">
+        <echo message="Undeploying ${deploy.ant.archive}"/>
+        <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
+        <get username="${gfv3.username}" password="${gfv3.password}" src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
+            dest="${gfv3.results.file}"/>
+        <delete file="${gfv3.results.file}"/>
+    </target>
 </project>
diff -r 91490d5419d2 -r 44ef544460ca java/nekurak.net-web/nbproject/build-impl.xml
--- a/java/nekurak.net-web/nbproject/build-impl.xml	Thu Jun 17 15:12:30 2010 +0200
+++ b/java/nekurak.net-web/nbproject/build-impl.xml	Sat Jun 19 11:19:27 2010 +0200
@@ -199,6 +199,20 @@
         <fail unless="build.test.results.dir">Must set build.test.results.dir</fail>
         <fail unless="build.classes.excludes">Must set build.classes.excludes</fail>
         <fail unless="dist.war">Must set dist.war</fail>
+        <condition property="missing.j2ee.server.home">
+            <and>
+                <matches pattern="j2ee.server.home" string="${j2ee.platform.classpath}"/>
+                <not>
+                    <isset property="j2ee.server.home"/>
+                </not>
+            </and>
+        </condition>
+        <fail if="missing.j2ee.server.home">
+The Java EE server classpath is not correctly set up - server home directory is missing.
+Either open the project in the IDE and assign the server or setup the server classpath manually.
+For example like this:
+   ant -Dj2ee.server.home=&lt;app_server_installation_directory&gt;
+                </fail>
         <fail unless="j2ee.platform.classpath">
 The Java EE server classpath is not correctly set up. Your active server type is ${j2ee.server.type}.
 Either open the project in the IDE and assign the server or setup the server classpath manually.
@@ -216,11 +230,51 @@
             </sequential>
         </macrodef>
     </target>
-    <target name="-init-macrodef-javac">
+    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">
         <macrodef name="javac" uri="http://www.netbeans.org/ns/web-project/2">
             <attribute default="${src.dir}" name="srcdir"/>
             <attribute default="${build.classes.dir}" name="destdir"/>
             <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
+            <attribute default="${javac.processorpath}" name="processorpath"/>
+            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="${javac.debug}" name="debug"/>
+            <attribute default="${empty.dir}" name="gensrcdir"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <property location="${build.dir}/empty" name="empty.dir"/>
+                <mkdir dir="${empty.dir}"/>
+                <mkdir dir="@{apgeneratedsrcdir}"/>
+                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" source="${javac.source}" srcdir="@{srcdir}" target="${javac.target}">
+                    <src>
+                        <dirset dir="@{gensrcdir}" erroronmissingdir="false">
+                            <include name="*"/>
+                        </dirset>
+                    </src>
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                    <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
+                    <compilerarg line="${javac.compilerargs}"/>
+                    <compilerarg value="-processorpath"/>
+                    <compilerarg path="@{processorpath}:${empty.dir}"/>
+                    <compilerarg line="${ap.processors.internal}"/>
+                    <compilerarg value="-s"/>
+                    <compilerarg path="@{apgeneratedsrcdir}"/>
+                    <compilerarg line="${ap.proc.none.internal}"/>
+                    <customize/>
+                </javac>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
+        <macrodef name="javac" uri="http://www.netbeans.org/ns/web-project/2">
+            <attribute default="${src.dir}" name="srcdir"/>
+            <attribute default="${build.classes.dir}" name="destdir"/>
+            <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
+            <attribute default="${javac.processorpath}" name="processorpath"/>
+            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
             <attribute default="${includes}" name="includes"/>
             <attribute default="${excludes}" name="excludes"/>
             <attribute default="${javac.debug}" name="debug"/>
@@ -245,6 +299,35 @@
             </sequential>
         </macrodef>
     </target>
+    <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
+        <macrodef name="depend" uri="http://www.netbeans.org/ns/web-project/2">
+            <attribute default="${src.dir}" name="srcdir"/>
+            <attribute default="${build.classes.dir}" name="destdir"/>
+            <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
+            <sequential>
+                <depend cache="${build.dir}/depcache" destdir="@{destdir}" excludes="${excludes}" includes="${includes}" srcdir="@{srcdir}">
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                </depend>
+            </sequential>
+        </macrodef>
+        <macrodef name="force-recompile" uri="http://www.netbeans.org/ns/web-project/2">
+            <attribute default="${build.classes.dir}" name="destdir"/>
+            <sequential>
+                <fail unless="javac.includes">Must set javac.includes</fail>
+                <pathconvert pathsep="," property="javac.includes.binary">
+                    <path>
+                        <filelist dir="@{destdir}" files="${javac.includes}"/>
+                    </path>
+                    <globmapper from="*.java" to="*.class"/>
+                </pathconvert>
+                <delete>
+                    <files includes="${javac.includes.binary}"/>
+                </delete>
+            </sequential>
+        </macrodef>
+    </target>
     <target name="-init-macrodef-junit">
         <macrodef name="junit" uri="http://www.netbeans.org/ns/web-project/2">
             <attribute default="${includes}" name="includes"/>
@@ -387,7 +470,30 @@
                 </fail>
         <taskdef classpath="${libs.CopyLibs.classpath}" resource="org/netbeans/modules/java/j2seproject/copylibstask/antlib.xml"/>
     </target>
-    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-java,-init-macrodef-nbjpda,-init-macrodef-nbjsdebug,-init-macrodef-debug,-init-taskdefs" name="init"/>
+    <target name="-init-ap-cmdline-properties">
+        <property name="annotation.processing.enabled" value="true"/>
+        <property name="annotation.processing.processors.list" value=""/>
+        <property name="annotation.processing.run.all.processors" value="true"/>
+        <property name="javac.processorpath" value="${javac.classpath}"/>
+        <property name="javac.test.processorpath" value="${javac.test.classpath}"/>
+        <condition property="ap.supported.internal" value="true">
+            <not>
+                <matches pattern="1\.[0-5](\..*)?" string="${javac.source}"/>
+            </not>
+        </condition>
+    </target>
+    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-ap-cmdline-supported">
+        <condition else="" property="ap.processors.internal" value="-processor ${annotation.processing.processors.list}">
+            <isfalse value="${annotation.processing.run.all.processors}"/>
+        </condition>
+        <condition else="" property="ap.proc.none.internal" value="-proc:none">
+            <isfalse value="${annotation.processing.enabled}"/>
+        </condition>
+    </target>
+    <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline">
+        <property name="ap.cmd.line.internal" value=""/>
+    </target>
+    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-java,-init-macrodef-nbjpda,-init-macrodef-nbjsdebug,-init-macrodef-debug,-init-taskdefs,-init-ap-cmdline" name="init"/>
     <!--
                 COMPILATION SECTION
             -->
@@ -467,10 +573,10 @@
             <arg value="-compilerSourceVM ${javac.source}"/>
             <arg value="-compilerTargetVM ${javac.target}"/>
             <arg value="-javaEncoding ${source.encoding}"/>
-            <classpath path="${java.home}/../lib/tools.jar:${jspctask.classpath}:${jspcompilation.classpath}"/>
+            <classpath path="${java.home}/../lib/tools.jar:${libs.jsp-compiler.classpath}:${libs.jsp-compilation.classpath}"/>
         </java>
         <mkdir dir="${build.generated.dir}/classes"/>
-        <webproject2:javac classpath="${j2ee.platform.classpath}:${build.classes.dir}:${jspcompilation.classpath}" destdir="${build.generated.dir}/classes" srcdir="${build.generated.dir}/src"/>
+        <webproject2:javac classpath="${build.classes.dir}:${libs.jsp-compilation.classpath}:${javac.classpath}:${j2ee.platform.classpath}" destdir="${build.generated.dir}/classes" srcdir="${build.generated.dir}/src"/>
     </target>
     <target depends="compile" if="jsp.includes" name="-do-compile-single-jsp">
         <fail unless="javac.jsp.includes">Must select some files in the IDE or set javac.jsp.includes</fail>
@@ -486,10 +592,10 @@
             <arg value="-compilerSourceVM ${javac.source}"/>
             <arg value="-compilerTargetVM ${javac.target}"/>
             <arg value="-javaEncoding ${source.encoding}"/>
-            <classpath path="${java.home}/../lib/tools.jar:${jspctask.classpath}:${jspcompilation.classpath}"/>
+            <classpath path="${java.home}/../lib/tools.jar:${libs.jsp-compiler.classpath}:${libs.jsp-compilation.classpath}"/>
         </java>
         <mkdir dir="${build.generated.dir}/classes"/>
-        <webproject2:javac classpath="${j2ee.platform.classpath}:${build.classes.dir}:${jspcompilation.classpath}" destdir="${build.generated.dir}/classes" srcdir="${build.generated.dir}/src">
+        <webproject2:javac classpath="${build.classes.dir}:${libs.jsp-compilation.classpath}:${javac.classpath}:${j2ee.platform.classpath}" destdir="${build.generated.dir}/classes" srcdir="${build.generated.dir}/src">
             <customize>
                 <patternset includes="${javac.jsp.includes}"/>
             </customize>
@@ -726,7 +832,7 @@
     <!--
                 JAVADOC SECTION
             -->
-    <target depends="init" name="javadoc-build">
+    <target depends="init" if="have.sources" name="javadoc-build">
         <mkdir dir="${dist.javadoc.dir}"/>
         <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
             <classpath>
diff -r 91490d5419d2 -r 44ef544460ca java/nekurak.net-web/nbproject/genfiles.properties
--- a/java/nekurak.net-web/nbproject/genfiles.properties	Thu Jun 17 15:12:30 2010 +0200
+++ b/java/nekurak.net-web/nbproject/genfiles.properties	Sat Jun 19 11:19:27 2010 +0200
@@ -4,8 +4,8 @@
 # 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=28fc3c5a
-nbproject/build-impl.xml.script.CRC32=cdc87d62
-nbproject/build-impl.xml.stylesheet.CRC32=b139b33b@1.21.2.1
+nbproject/build-impl.xml.script.CRC32=e58633c2
+nbproject/build-impl.xml.stylesheet.CRC32=8335d67d@1.24.1.1
 nbproject/rest-build.xml.data.CRC32=84da1c7b
 nbproject/rest-build.xml.script.CRC32=3db088b3
 nbproject/rest-build.xml.stylesheet.CRC32=ddd64843@1.4.1
diff -r 91490d5419d2 -r 44ef544460ca java/nekurak.net-web/nbproject/project.properties
--- a/java/nekurak.net-web/nbproject/project.properties	Thu Jun 17 15:12:30 2010 +0200
+++ b/java/nekurak.net-web/nbproject/project.properties	Sat Jun 19 11:19:27 2010 +0200
@@ -1,3 +1,8 @@
+annotation.processing.enabled=true
+annotation.processing.enabled.in.editor=true
+annotation.processing.processors.list=
+annotation.processing.run.all.processors=true
+annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
 build.classes.dir=${build.web.dir}/WEB-INF/classes
 build.classes.excludes=**/*.java,**/*.form
 build.dir=build
@@ -23,6 +28,12 @@
 includes=**
 j2ee.deploy.on.save=true
 j2ee.platform=1.5
+j2ee.platform.classpath=
+j2ee.platform.embeddableejb.classpath=${j2ee.server.home}/lib/embedded/glassfish-embedded-static-shell.jar
+j2ee.platform.wscompile.classpath=${j2ee.server.home}/modules/webservices-osgi.jar
+j2ee.platform.wsgen.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/javax.ejb.jar
+j2ee.platform.wsimport.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/javax.ejb.jar
+j2ee.platform.wsit.classpath=
 j2ee.server.type=gfv3ee6
 jar.compress=false
 javac.classpath=\
@@ -32,6 +43,7 @@
 javac.compilerargs=
 javac.debug=true
 javac.deprecation=false
+javac.processorpath=${javac.classpath}
 javac.source=1.5
 javac.target=1.5
 javac.test.classpath=\
@@ -39,6 +51,7 @@
     ${build.classes.dir}:\
     ${libs.junit.classpath}:\
     ${libs.junit_4.classpath}
+javac.test.processorpath=${javac.test.classpath}
 javadoc.additionalparam=
 javadoc.author=false
 javadoc.encoding=${source.encoding}
diff -r 91490d5419d2 -r 44ef544460ca java/nekurak.net-web/src/java/cz/frantovo/nekurak/servlet/Komentare.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/java/nekurak.net-web/src/java/cz/frantovo/nekurak/servlet/Komentare.java	Sat Jun 19 11:19:27 2010 +0200
@@ -0,0 +1,57 @@
+package cz.frantovo.nekurak.servlet;
+
+import cz.frantovo.nekurak.dto.Komentar;
+import cz.frantovo.nekurak.ejb.PodnikRemote;
+import cz.frantovo.nekurak.web.HledacSluzby;
+import java.io.IOException;
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ *
+ * @author fiki
+ */
+public class Komentare extends HttpServlet {
+
+    private HledacSluzby hledac = new HledacSluzby();
+
+    @Override
+    protected void doGet(HttpServletRequest pozadavek, HttpServletResponse odpoved) throws ServletException, IOException {
+	doPost(pozadavek, odpoved);
+    }
+
+    @Override
+    protected void doPost(HttpServletRequest pozadavek, HttpServletResponse odpoved) throws ServletException, IOException {
+	PodnikRemote ejb = hledac.getPodnikEJB();
+
+	Komentar k = new Komentar();
+	k.setPodnik(Integer.decode(pozadavek.getParameter("podnik")));
+	k.setNadpis(pozadavek.getParameter("nadpis"));
+	k.setKomentar(pozadavek.getParameter("komentar"));
+	k.setTyp(Komentar.TYP.valueOf(pozadavek.getParameter("typ")));
+
+	boolean ulozit = Boolean.valueOf(pozadavek.getParameter("odeslat"));
+
+	String jsp;
+
+	try {
+	    k = ejb.komentuj(k, ulozit);
+	    pozadavek.setAttribute("komentar", k);
+
+	    if (ulozit) {
+		jsp = "/WEB-INF/casti/ajaxKomentare/odeslano.jsp";
+	    } else {
+		jsp = "/WEB-INF/casti/ajaxKomentare/nahled.jsp";
+	    }
+	} catch (Exception e) {
+	    pozadavek.setAttribute("chyba", e);
+	    jsp = "/WEB-INF/casti/ajaxKomentare/chyba.jsp";
+	}
+
+	RequestDispatcher rd = getServletContext().getRequestDispatcher(jsp);
+	rd.forward(pozadavek, odpoved);
+    }
+}
diff -r 91490d5419d2 -r 44ef544460ca java/nekurak.net-web/src/java/cz/frantovo/nekurak/web/OdeslatKomentar.java
--- a/java/nekurak.net-web/src/java/cz/frantovo/nekurak/web/OdeslatKomentar.java	Thu Jun 17 15:12:30 2010 +0200
+++ b/java/nekurak.net-web/src/java/cz/frantovo/nekurak/web/OdeslatKomentar.java	Sat Jun 19 11:19:27 2010 +0200
@@ -18,7 +18,7 @@
 
     public void setKomentar(Komentar k) throws TexyVyjimka {
 	try {
-	    hledac.getPodnikEJB().komentuj(k);
+	    hledac.getPodnikEJB().komentuj(k, true);
 	    ok = true;
 	} catch (KomentarovaVyjimka e) {
 	    log.log(Level.WARNING, "chyba při vkládání komentáře", e);
diff -r 91490d5419d2 -r 44ef544460ca java/nekurak.net-web/web/WEB-INF/casti/ajaxKomentare/chyba.jsp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/java/nekurak.net-web/web/WEB-INF/casti/ajaxKomentare/chyba.jsp	Sat Jun 19 11:19:27 2010 +0200
@@ -0,0 +1,21 @@
+<?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"
+	  xmlns:nk="urn:jsptagdir:/WEB-INF/tags/nekurak"
+	  version="2.0">
+
+    <div>
+	<c:choose>
+	    <c:when test="${chyba.class == 'class javax.ejb.EJBAccessException'}">
+		<p class="chybovaHlaska"><fmt:message key="komentare.nahledChybaPrihlaseni"/></p>
+	    </c:when>
+	    <c:otherwise>
+		<p class="chybovaHlaska"><fmt:message key="komentare.nahledChybaFormatu"/></p>
+		<p class="informacniHlaska"><fmt:message key="komentar.typ.xhtml.povoleneZnacky"/></p>
+	    </c:otherwise>
+	</c:choose>
+    </div>
+
+</jsp:root>
\ No newline at end of file
diff -r 91490d5419d2 -r 44ef544460ca java/nekurak.net-web/web/WEB-INF/casti/ajaxKomentare/nahled.jsp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/java/nekurak.net-web/web/WEB-INF/casti/ajaxKomentare/nahled.jsp	Sat Jun 19 11:19:27 2010 +0200
@@ -0,0 +1,17 @@
+<?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"
+	  xmlns:nk="urn:jsptagdir:/WEB-INF/tags/nekurak"
+	  version="2.0">
+
+    
+
+    <div>
+	<p class="informacniHlaska"><fmt:message key="komentare.nahledNadpis"/>:</p>
+	<!-- XHTML je už zkontrolované: -->
+	${requestScope['komentar'].komentar}
+    </div>
+
+</jsp:root>
\ No newline at end of file
diff -r 91490d5419d2 -r 44ef544460ca java/nekurak.net-web/web/WEB-INF/casti/ajaxKomentare/odeslano.jsp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/java/nekurak.net-web/web/WEB-INF/casti/ajaxKomentare/odeslano.jsp	Sat Jun 19 11:19:27 2010 +0200
@@ -0,0 +1,20 @@
+<?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"
+	  xmlns:nk="urn:jsptagdir:/WEB-INF/tags/nekurak"
+	  version="2.0">
+
+
+
+    <div>
+	<p class="informacniHlaska"><fmt:message key="komentare.nahledOdeslano"/>:</p>
+	<!-- XHTML je už zkontrolované: -->
+	${requestScope['komentar'].komentar}
+	<script type="text/javascript">
+	    $("#formularKomentuj form").get(0).reset();
+	</script>
+    </div>
+
+</jsp:root>
\ No newline at end of file
diff -r 91490d5419d2 -r 44ef544460ca java/nekurak.net-web/web/WEB-INF/casti/odeslatKomentar.jsp
--- a/java/nekurak.net-web/web/WEB-INF/casti/odeslatKomentar.jsp	Thu Jun 17 15:12:30 2010 +0200
+++ b/java/nekurak.net-web/web/WEB-INF/casti/odeslatKomentar.jsp	Sat Jun 19 11:19:27 2010 +0200
@@ -25,7 +25,9 @@
 	    <c:when test="${odeslatKomentar.ok}">
 		<p class="informacniHlaska">
 		    <fmt:message key="komentar.odeslat.ok"/>,
-		    <a href="?akce=detail&amp;amp;podnik=${komentar.podnik}"><fmt:message key="komentar.odeslat.pokracujte"/></a>.
+		    <a href="?akce=detail&amp;amp;podnik=${komentar.podnik}">
+			<fmt:message key="komentar.odeslat.pokracujte"/>
+		    </a>.
 		</p>
 	    </c:when>
 	    <c:otherwise>
diff -r 91490d5419d2 -r 44ef544460ca java/nekurak.net-web/web/WEB-INF/tags/nekurak/komentareVypis.tag
--- a/java/nekurak.net-web/web/WEB-INF/tags/nekurak/komentareVypis.tag	Thu Jun 17 15:12:30 2010 +0200
+++ b/java/nekurak.net-web/web/WEB-INF/tags/nekurak/komentareVypis.tag	Sat Jun 19 11:19:27 2010 +0200
@@ -24,7 +24,7 @@
 	    <c:otherwise>
 		<p><a href="javascript:komentare.zobrazFormular()"><fmt:message key="komentare.komentovat"/></a></p>
 		<div id="formularKomentuj" style="display: none;">
-		    <form method="post" action="?akce=odeslatKomentar">
+		    <form method="post" action="?akce=odeslatKomentar" onsubmit="javascript:komentare.odeslat(); return false;">
 			<fieldset>
 			    <input type="hidden" name="podnik" maxlength="255" value="${podnik.id}"/>
 			    <label><fmt:message key="komentare.nadpis"/>: <input type="text" name="nadpis" maxlength="255"/></label>
@@ -37,10 +37,12 @@
 				<option value="TEXY"><fmt:message key="komentar.typ.texy"/></option>
 			    </select>
 			    <br/>
+			    <button value="ano" name="nahled" onclick="javascript:komentare.nahled(); return false;"><fmt:message key="komentare.tlacitkoNahled"/></button>
 			    <button value="submit"><fmt:message key="komentare.tlacitkoOdeslat"/></button>
 			</fieldset>
 		    </form>
-		    <p><fmt:message key="komentar.typ.xhtml.povoleneZnacky"/></p>
+		    <div class="vystup"></div>
+		    <div class="cistic"/>
 		</div>
 	    </c:otherwise>
 	</c:choose>
diff -r 91490d5419d2 -r 44ef544460ca java/nekurak.net-web/web/WEB-INF/web.xml
--- a/java/nekurak.net-web/web/WEB-INF/web.xml	Thu Jun 17 15:12:30 2010 +0200
+++ b/java/nekurak.net-web/web/WEB-INF/web.xml	Sat Jun 19 11:19:27 2010 +0200
@@ -41,7 +41,7 @@
 	<load-on-startup>1</load-on-startup>
     </servlet>
     <servlet>
-	<servlet-name>Kaptcha</servlet-name>
+	<servlet-name>kaptcha</servlet-name>
 	<servlet-class>com.google.code.kaptcha.servlet.KaptchaServlet</servlet-class>
     </servlet>
     <servlet>
@@ -50,6 +50,11 @@
 	<servlet-class>com.sun.jersey.spi.container.servlet.ServletContainer</servlet-class>
 	<load-on-startup>1</load-on-startup>
     </servlet>
+    <servlet>
+	<description>Odesílání a náhledy komentářů pomocí AJAXu.</description>
+	<servlet-name>komentare</servlet-name>
+	<servlet-class>cz.frantovo.nekurak.servlet.Komentare</servlet-class>
+    </servlet>
     <!-- </definiceServletů> -->
     <!-- <mapováníServletů> -->
     <servlet-mapping>
@@ -61,7 +66,7 @@
 	<url-pattern>/atom/*</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
-	<servlet-name>Kaptcha</servlet-name>
+	<servlet-name>kaptcha</servlet-name>
 	<url-pattern>/kaptcha.jpg</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
@@ -69,6 +74,10 @@
 	<servlet-name>REST</servlet-name>
 	<url-pattern>/zdroje/*</url-pattern>
     </servlet-mapping>
+    <servlet-mapping>
+	<servlet-name>komentare</servlet-name>
+	<url-pattern>/komentare</url-pattern>
+    </servlet-mapping>
     <!-- </mapováníServletů> -->
     <context-param>
 	<!-- Pro případ, že chybí hlavička „Accept-language“ v HTTP požadavku -->
diff -r 91490d5419d2 -r 44ef544460ca java/nekurak.net-web/web/js/komentare.js
--- a/java/nekurak.net-web/web/js/komentare.js	Thu Jun 17 15:12:30 2010 +0200
+++ b/java/nekurak.net-web/web/js/komentare.js	Sat Jun 19 11:19:27 2010 +0200
@@ -3,3 +3,11 @@
 komentare.zobrazFormular = function () {
     $("#formularKomentuj").toggle();
 };
+
+komentare.nahled = function() {
+    $("#formularKomentuj .vystup").load("komentare", $("#formularKomentuj form").serialize());
+};
+
+komentare.odeslat = function() {
+    $("#formularKomentuj .vystup").load("komentare?odeslat=true", $("#formularKomentuj form").serialize());
+};
diff -r 91490d5419d2 -r 44ef544460ca java/nekurak.net-web/web/styl.css
--- a/java/nekurak.net-web/web/styl.css	Thu Jun 17 15:12:30 2010 +0200
+++ b/java/nekurak.net-web/web/styl.css	Sat Jun 19 11:19:27 2010 +0200
@@ -133,6 +133,18 @@
 	margin-left: 2px;
 }
 
+#formularKomentuj input, #formularKomentuj textarea, #formularKomentuj select {
+	width:300px;
+}
+
+#formularKomentuj form {
+    float: left;
+}
+
+#formularKomentuj .vystup {
+    margin-left: 400px;
+}
+
 .chybovaHlaska {
     background-image: url('grafika/chyba.png');
     background-repeat: no-repeat;
diff -r 91490d5419d2 -r 44ef544460ca java/nekurak.net-ws/nbproject/ant-deploy.xml
--- a/java/nekurak.net-ws/nbproject/ant-deploy.xml	Thu Jun 17 15:12:30 2010 +0200
+++ b/java/nekurak.net-ws/nbproject/ant-deploy.xml	Sat Jun 19 11:19:27 2010 +0200
@@ -24,7 +24,7 @@
         </xmlproperty>    
         <delete file="${temp.sun.web}"/>
         <property name="deploy.ant.client.url" value="${gfv3.url}${sun-web-app.context-root}"/>
-        <property name="deploy.context.root.argument" value="?contextroot=${sun-web-app.context-root}"/>
+        <property name="deploy.context.root.argument" value="&amp;contextroot=${sun-web-app.context-root}"/>
     </target>
     <target name="-no-parse-sun-web" depends="-init-cl-deployment-env" unless="sun.web.present">
         <property name="deploy.context.root.argument" value=""/>
@@ -43,18 +43,43 @@
         <delete dir="${gfv3.resources.dir}"/>
     </target>
     <target name="-deploy-ant" depends="-parse-sun-web,-no-parse-sun-web,-add-resources" if="deploy.ant.enabled">
+        <antcall target="-deploy-without-pw"/>
+        <antcall target="-deploy-with-pw"/>
+    </target>
+
+    <target name="-deploy-without-pw" unless="gfv3.password">
         <echo message="Deploying ${deploy.ant.archive}"/>
         <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
         <property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
-        <get src="${gfv3.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}?force=true?name=${ant.project.name}"
+        <get src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&amp;force=true&amp;name=${ant.project.name}"
             dest="${gfv3.results.file}"/>
         <delete file="${gfv3.results.file}"/>    
     </target>
+    <target name="-deploy-with-pw" if="gfv3.password">
+        <echo message="Deploying ${deploy.ant.archive}"/>
+        <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
+        <property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
+        <get username="${gfv3.username}" password="${gfv3.password}" src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&amp;force=true&amp;name=${ant.project.name}"
+            dest="${gfv3.results.file}"/>
+        <delete file="${gfv3.results.file}"/>
+    </target>
     <target name="-undeploy-ant" depends="-init-cl-deployment-env" if="deploy.ant.enabled">
+        <antcall target="-undeploy-without-pw"/>
+        <antcall target="-undeploy-with-pw"/>
+    </target>
+
+    <target name="-undeploy-without-pw" unless="gfv3.password">
         <echo message="Undeploying ${deploy.ant.archive}"/>
         <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
-        <get src="${gfv3.url}/__asadmin/undeploy?name=${ant.project.name}"
+        <get src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
             dest="${gfv3.results.file}"/>
         <delete file="${gfv3.results.file}"/>    
     </target>
+    <target name="-undeploy-with-pw" if="gfv3.password">
+        <echo message="Undeploying ${deploy.ant.archive}"/>
+        <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
+        <get username="${gfv3.username}" password="${gfv3.password}" src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
+            dest="${gfv3.results.file}"/>
+        <delete file="${gfv3.results.file}"/>
+    </target>
 </project>
diff -r 91490d5419d2 -r 44ef544460ca java/nekurak.net-ws/nbproject/build-impl.xml
--- a/java/nekurak.net-ws/nbproject/build-impl.xml	Thu Jun 17 15:12:30 2010 +0200
+++ b/java/nekurak.net-ws/nbproject/build-impl.xml	Sat Jun 19 11:19:27 2010 +0200
@@ -199,6 +199,20 @@
         <fail unless="build.test.results.dir">Must set build.test.results.dir</fail>
         <fail unless="build.classes.excludes">Must set build.classes.excludes</fail>
         <fail unless="dist.war">Must set dist.war</fail>
+        <condition property="missing.j2ee.server.home">
+            <and>
+                <matches pattern="j2ee.server.home" string="${j2ee.platform.classpath}"/>
+                <not>
+                    <isset property="j2ee.server.home"/>
+                </not>
+            </and>
+        </condition>
+        <fail if="missing.j2ee.server.home">
+The Java EE server classpath is not correctly set up - server home directory is missing.
+Either open the project in the IDE and assign the server or setup the server classpath manually.
+For example like this:
+   ant -Dj2ee.server.home=&lt;app_server_installation_directory&gt;
+                </fail>
         <fail unless="j2ee.platform.classpath">
 The Java EE server classpath is not correctly set up. Your active server type is ${j2ee.server.type}.
 Either open the project in the IDE and assign the server or setup the server classpath manually.
@@ -216,11 +230,51 @@
             </sequential>
         </macrodef>
     </target>
-    <target name="-init-macrodef-javac">
+    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">
         <macrodef name="javac" uri="http://www.netbeans.org/ns/web-project/2">
             <attribute default="${src.dir}" name="srcdir"/>
             <attribute default="${build.classes.dir}" name="destdir"/>
             <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
+            <attribute default="${javac.processorpath}" name="processorpath"/>
+            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="${javac.debug}" name="debug"/>
+            <attribute default="${empty.dir}" name="gensrcdir"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <property location="${build.dir}/empty" name="empty.dir"/>
+                <mkdir dir="${empty.dir}"/>
+                <mkdir dir="@{apgeneratedsrcdir}"/>
+                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" source="${javac.source}" srcdir="@{srcdir}" target="${javac.target}">
+                    <src>
+                        <dirset dir="@{gensrcdir}" erroronmissingdir="false">
+                            <include name="*"/>
+                        </dirset>
+                    </src>
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                    <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
+                    <compilerarg line="${javac.compilerargs}"/>
+                    <compilerarg value="-processorpath"/>
+                    <compilerarg path="@{processorpath}:${empty.dir}"/>
+                    <compilerarg line="${ap.processors.internal}"/>
+                    <compilerarg value="-s"/>
+                    <compilerarg path="@{apgeneratedsrcdir}"/>
+                    <compilerarg line="${ap.proc.none.internal}"/>
+                    <customize/>
+                </javac>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
+        <macrodef name="javac" uri="http://www.netbeans.org/ns/web-project/2">
+            <attribute default="${src.dir}" name="srcdir"/>
+            <attribute default="${build.classes.dir}" name="destdir"/>
+            <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
+            <attribute default="${javac.processorpath}" name="processorpath"/>
+            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
             <attribute default="${includes}" name="includes"/>
             <attribute default="${excludes}" name="excludes"/>
             <attribute default="${javac.debug}" name="debug"/>
@@ -245,6 +299,35 @@
             </sequential>
         </macrodef>
     </target>
+    <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
+        <macrodef name="depend" uri="http://www.netbeans.org/ns/web-project/2">
+            <attribute default="${src.dir}" name="srcdir"/>
+            <attribute default="${build.classes.dir}" name="destdir"/>
+            <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
+            <sequential>
+                <depend cache="${build.dir}/depcache" destdir="@{destdir}" excludes="${excludes}" includes="${includes}" srcdir="@{srcdir}">
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                </depend>
+            </sequential>
+        </macrodef>
+        <macrodef name="force-recompile" uri="http://www.netbeans.org/ns/web-project/2">
+            <attribute default="${build.classes.dir}" name="destdir"/>
+            <sequential>
+                <fail unless="javac.includes">Must set javac.includes</fail>
+                <pathconvert pathsep="," property="javac.includes.binary">
+                    <path>
+                        <filelist dir="@{destdir}" files="${javac.includes}"/>
+                    </path>
+                    <globmapper from="*.java" to="*.class"/>
+                </pathconvert>
+                <delete>
+                    <files includes="${javac.includes.binary}"/>
+                </delete>
+            </sequential>
+        </macrodef>
+    </target>
     <target name="-init-macrodef-junit">
         <macrodef name="junit" uri="http://www.netbeans.org/ns/web-project/2">
             <attribute default="${includes}" name="includes"/>
@@ -387,7 +470,30 @@
                 </fail>
         <taskdef classpath="${libs.CopyLibs.classpath}" resource="org/netbeans/modules/java/j2seproject/copylibstask/antlib.xml"/>
     </target>
-    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-java,-init-macrodef-nbjpda,-init-macrodef-nbjsdebug,-init-macrodef-debug,-init-taskdefs" name="init"/>
+    <target name="-init-ap-cmdline-properties">
+        <property name="annotation.processing.enabled" value="true"/>
+        <property name="annotation.processing.processors.list" value=""/>
+        <property name="annotation.processing.run.all.processors" value="true"/>
+        <property name="javac.processorpath" value="${javac.classpath}"/>
+        <property name="javac.test.processorpath" value="${javac.test.classpath}"/>
+        <condition property="ap.supported.internal" value="true">
+            <not>
+                <matches pattern="1\.[0-5](\..*)?" string="${javac.source}"/>
+            </not>
+        </condition>
+    </target>
+    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-ap-cmdline-supported">
+        <condition else="" property="ap.processors.internal" value="-processor ${annotation.processing.processors.list}">
+            <isfalse value="${annotation.processing.run.all.processors}"/>
+        </condition>
+        <condition else="" property="ap.proc.none.internal" value="-proc:none">
+            <isfalse value="${annotation.processing.enabled}"/>
+        </condition>
+    </target>
+    <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline">
+        <property name="ap.cmd.line.internal" value=""/>
+    </target>
+    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-java,-init-macrodef-nbjpda,-init-macrodef-nbjsdebug,-init-macrodef-debug,-init-taskdefs,-init-ap-cmdline" name="init"/>
     <!--
                 COMPILATION SECTION
             -->
@@ -467,10 +573,10 @@
             <arg value="-compilerSourceVM ${javac.source}"/>
             <arg value="-compilerTargetVM ${javac.target}"/>
             <arg value="-javaEncoding ${source.encoding}"/>
-            <classpath path="${java.home}/../lib/tools.jar:${jspctask.classpath}:${jspcompilation.classpath}"/>
+            <classpath path="${java.home}/../lib/tools.jar:${libs.jsp-compiler.classpath}:${libs.jsp-compilation.classpath}"/>
         </java>
         <mkdir dir="${build.generated.dir}/classes"/>
-        <webproject2:javac classpath="${j2ee.platform.classpath}:${build.classes.dir}:${jspcompilation.classpath}" destdir="${build.generated.dir}/classes" srcdir="${build.generated.dir}/src"/>
+        <webproject2:javac classpath="${build.classes.dir}:${libs.jsp-compilation.classpath}:${javac.classpath}:${j2ee.platform.classpath}" destdir="${build.generated.dir}/classes" srcdir="${build.generated.dir}/src"/>
     </target>
     <target depends="compile" if="jsp.includes" name="-do-compile-single-jsp">
         <fail unless="javac.jsp.includes">Must select some files in the IDE or set javac.jsp.includes</fail>
@@ -486,10 +592,10 @@
             <arg value="-compilerSourceVM ${javac.source}"/>
             <arg value="-compilerTargetVM ${javac.target}"/>
             <arg value="-javaEncoding ${source.encoding}"/>
-            <classpath path="${java.home}/../lib/tools.jar:${jspctask.classpath}:${jspcompilation.classpath}"/>
+            <classpath path="${java.home}/../lib/tools.jar:${libs.jsp-compiler.classpath}:${libs.jsp-compilation.classpath}"/>
         </java>
         <mkdir dir="${build.generated.dir}/classes"/>
-        <webproject2:javac classpath="${j2ee.platform.classpath}:${build.classes.dir}:${jspcompilation.classpath}" destdir="${build.generated.dir}/classes" srcdir="${build.generated.dir}/src">
+        <webproject2:javac classpath="${build.classes.dir}:${libs.jsp-compilation.classpath}:${javac.classpath}:${j2ee.platform.classpath}" destdir="${build.generated.dir}/classes" srcdir="${build.generated.dir}/src">
             <customize>
                 <patternset includes="${javac.jsp.includes}"/>
             </customize>
@@ -724,7 +830,7 @@
     <!--
                 JAVADOC SECTION
             -->
-    <target depends="init" name="javadoc-build">
+    <target depends="init" if="have.sources" name="javadoc-build">
         <mkdir dir="${dist.javadoc.dir}"/>
         <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
             <classpath>
diff -r 91490d5419d2 -r 44ef544460ca java/nekurak.net-ws/nbproject/genfiles.properties
--- a/java/nekurak.net-ws/nbproject/genfiles.properties	Thu Jun 17 15:12:30 2010 +0200
+++ b/java/nekurak.net-ws/nbproject/genfiles.properties	Sat Jun 19 11:19:27 2010 +0200
@@ -4,9 +4,9 @@
 # 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=e6e63e07
-nbproject/build-impl.xml.script.CRC32=222fc177
-nbproject/build-impl.xml.stylesheet.CRC32=b139b33b@1.21.2.1
+nbproject/build-impl.xml.script.CRC32=0c0ec7a8
+nbproject/build-impl.xml.stylesheet.CRC32=8335d67d@1.24.1.1
 nbproject/wsit-deploy.xml.data.CRC32=4cb22909
 nbproject/wsit-deploy.xml.script.CRC32=deb039de
 nbproject/wsit-deploy.xml.stylesheet.CRC32=beb36995@3.9.1
-nbproject/jaxws-build.xml.stylesheet.CRC32=83928735
+nbproject/jaxws-build.xml.stylesheet.CRC32=b0a0073f
diff -r 91490d5419d2 -r 44ef544460ca java/nekurak.net-ws/nbproject/jax-ws.xml
--- a/java/nekurak.net-ws/nbproject/jax-ws.xml	Thu Jun 17 15:12:30 2010 +0200
+++ b/java/nekurak.net-ws/nbproject/jax-ws.xml	Sat Jun 19 11:19:27 2010 +0200
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jax-ws xmlns="http://www.netbeans.org/ns/jax-ws/1">
   <services>
+    <service name="Podnik">
+      <implementation-class>cz.frantovo.nekurak.ws.Podnik</implementation-class>
+    </service>
     <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 91490d5419d2 -r 44ef544460ca java/nekurak.net-ws/nbproject/jaxws-build.xml
--- a/java/nekurak.net-ws/nbproject/jaxws-build.xml	Thu Jun 17 15:12:30 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-        *** GENERATED FROM jax-ws.xml - DO NOT EDIT !                             ***
-        *** TO MODIFY wsimport options USE Web Service node -> Edit WS Attributes ***
-        *** TO CHANGE TARGETS GENERATED TO jaxws-build.xml COPY THOSE             ***
-        *** TARGETS TO ../build.xml AND MODIFY THAT FILE INSTEAD                  ***
-
-        -->
-<project xmlns:xalan="http://xml.apache.org/xslt" xmlns:webproject2="http://www.netbeans.org/ns/web-project/2" xmlns:jaxws="http://www.netbeans.org/ns/jax-ws/1">
-    <!--
-                ===================
-                JAX-WS WSGEN SECTION
-                ===================
-            -->
-    <target name="wsgen-init" depends="init, -do-compile">
-        <mkdir dir="${build.generated.sources.dir}/jax-ws/resources/"/>
-        <mkdir dir="${build.classes.dir}"/>
-        <taskdef name="wsgen" classname="com.sun.tools.ws.ant.WsGen">
-            <classpath path="${java.home}/../lib/tools.jar:${build.classes.dir}:${j2ee.platform.wsgen.classpath}:${javac.classpath}"/>
-        </taskdef>
-    </target>
-    <target name="wsgen-Pokus" 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.Pokus">
-            <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
-                ===================
-            -->
-</project>
diff -r 91490d5419d2 -r 44ef544460ca java/nekurak.net-ws/nbproject/project.properties
--- a/java/nekurak.net-ws/nbproject/project.properties	Thu Jun 17 15:12:30 2010 +0200
+++ b/java/nekurak.net-ws/nbproject/project.properties	Sat Jun 19 11:19:27 2010 +0200
@@ -1,3 +1,8 @@
+annotation.processing.enabled=true
+annotation.processing.enabled.in.editor=true
+annotation.processing.processors.list=
+annotation.processing.run.all.processors=true
+annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
 build.classes.dir=${build.web.dir}/WEB-INF/classes
 build.classes.excludes=**/*.java,**/*.form
 build.dir=build
@@ -24,6 +29,12 @@
 includes=**
 j2ee.deploy.on.save=false
 j2ee.platform=1.6-web
+j2ee.platform.classpath=${j2ee.server.home}/modules/javax.servlet.jar:${j2ee.server.home}/modules/jstl-impl.jar:${j2ee.server.home}/modules/javax.ejb.jar:${j2ee.server.home}/modules/javax.enterprise.deploy.jar:${j2ee.server.home}/modules/javax.security.jacc.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.transaction.jar:${j2ee.server.home}/modules/jsr311-api.jar:${j2ee.server.home}/modules/jsf-api.jar:${j2ee.server.home}/modules/javax.security.auth.message.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/endorsed/javax.annotation.jar:${j2ee.server.home}/modules/javax.management.j2ee.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/javax.jms.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.resource.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.home}/modules/jsf-impl.jar:${j2ee.server.home}/modules/mail.jar
+j2ee.platform.embeddableejb.classpath=${j2ee.server.home}/lib/embedded/glassfish-embedded-static-shell.jar
+j2ee.platform.wscompile.classpath=${j2ee.server.home}/modules/webservices-osgi.jar
+j2ee.platform.wsgen.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/javax.ejb.jar
+j2ee.platform.wsimport.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/javax.ejb.jar
+j2ee.platform.wsit.classpath=
 j2ee.server.type=gfv3ee6
 jar.compress=false
 javac.classpath=\
@@ -32,6 +43,7 @@
 javac.compilerargs=
 javac.debug=true
 javac.deprecation=false
+javac.processorpath=${javac.classpath}
 javac.source=1.5
 javac.target=1.5
 javac.test.classpath=\
@@ -39,6 +51,7 @@
     ${build.classes.dir}:\
     ${libs.junit.classpath}:\
     ${libs.junit_4.classpath}
+javac.test.processorpath=${javac.test.classpath}
 javadoc.additionalparam=
 javadoc.author=false
 javadoc.encoding=${source.encoding}