AJAX komentáře
authorFrantišek Kučera <franta-hg@frantovo.cz>
Sat, 19 Jun 2010 11:19:27 +0200
changeset 14244ef544460ca
parent 141 91490d5419d2
child 143 91c4282ea15f
AJAX komentáře
java/nekurak.net-ear/nbproject/ant-deploy.xml
java/nekurak.net-ear/nbproject/build-impl.xml
java/nekurak.net-ear/nbproject/genfiles.properties
java/nekurak.net-ear/nbproject/project.properties
java/nekurak.net-ejb/nbproject/ant-deploy.xml
java/nekurak.net-ejb/nbproject/build-impl.xml
java/nekurak.net-ejb/nbproject/genfiles.properties
java/nekurak.net-ejb/nbproject/project.properties
java/nekurak.net-ejb/src/java/cz/frantovo/nekurak/ejb/PodnikEJB.java
java/nekurak.net-lib/nbproject/build-impl.xml
java/nekurak.net-lib/nbproject/genfiles.properties
java/nekurak.net-lib/src/cz/frantovo/nekurak/ejb/PodnikRemote.java
java/nekurak.net-lib/src/cz/frantovo/nekurak/preklady_cs.properties
java/nekurak.net-rest/nbproject/ant-deploy.xml
java/nekurak.net-rest/nbproject/build-impl.xml
java/nekurak.net-rest/nbproject/genfiles.properties
java/nekurak.net-rest/nbproject/project.properties
java/nekurak.net-web/nbproject/ant-deploy.xml
java/nekurak.net-web/nbproject/build-impl.xml
java/nekurak.net-web/nbproject/genfiles.properties
java/nekurak.net-web/nbproject/project.properties
java/nekurak.net-web/src/java/cz/frantovo/nekurak/servlet/Komentare.java
java/nekurak.net-web/src/java/cz/frantovo/nekurak/web/OdeslatKomentar.java
java/nekurak.net-web/web/WEB-INF/casti/ajaxKomentare/chyba.jsp
java/nekurak.net-web/web/WEB-INF/casti/ajaxKomentare/nahled.jsp
java/nekurak.net-web/web/WEB-INF/casti/ajaxKomentare/odeslano.jsp
java/nekurak.net-web/web/WEB-INF/casti/odeslatKomentar.jsp
java/nekurak.net-web/web/WEB-INF/tags/nekurak/komentareVypis.tag
java/nekurak.net-web/web/WEB-INF/web.xml
java/nekurak.net-web/web/js/komentare.js
java/nekurak.net-web/web/styl.css
java/nekurak.net-ws/nbproject/ant-deploy.xml
java/nekurak.net-ws/nbproject/build-impl.xml
java/nekurak.net-ws/nbproject/genfiles.properties
java/nekurak.net-ws/nbproject/jax-ws.xml
java/nekurak.net-ws/nbproject/jaxws-build.xml
java/nekurak.net-ws/nbproject/project.properties
     1.1 --- a/java/nekurak.net-ear/nbproject/ant-deploy.xml	Thu Jun 17 15:12:30 2010 +0200
     1.2 +++ b/java/nekurak.net-ear/nbproject/ant-deploy.xml	Sat Jun 19 11:19:27 2010 +0200
     1.3 @@ -24,7 +24,7 @@
     1.4          </xmlproperty>    
     1.5          <delete file="${temp.sun.web}"/>
     1.6          <property name="deploy.ant.client.url" value="${gfv3.url}${sun-web-app.context-root}"/>
     1.7 -        <property name="deploy.context.root.argument" value="?contextroot=${sun-web-app.context-root}"/>
     1.8 +        <property name="deploy.context.root.argument" value="&amp;contextroot=${sun-web-app.context-root}"/>
     1.9      </target>
    1.10      <target name="-no-parse-sun-web" depends="-init-cl-deployment-env" unless="sun.web.present">
    1.11          <property name="deploy.context.root.argument" value=""/>
    1.12 @@ -43,18 +43,43 @@
    1.13          <delete dir="${gfv3.resources.dir}"/>
    1.14      </target>
    1.15      <target name="-deploy-ant" depends="-parse-sun-web,-no-parse-sun-web,-add-resources" if="deploy.ant.enabled">
    1.16 +        <antcall target="-deploy-without-pw"/>
    1.17 +        <antcall target="-deploy-with-pw"/>
    1.18 +    </target>
    1.19 +
    1.20 +    <target name="-deploy-without-pw" unless="gfv3.password">
    1.21          <echo message="Deploying ${deploy.ant.archive}"/>
    1.22          <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
    1.23          <property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
    1.24 -        <get src="${gfv3.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}?force=true?name=${ant.project.name}"
    1.25 +        <get src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&amp;force=true&amp;name=${ant.project.name}"
    1.26              dest="${gfv3.results.file}"/>
    1.27          <delete file="${gfv3.results.file}"/>    
    1.28      </target>
    1.29 +    <target name="-deploy-with-pw" if="gfv3.password">
    1.30 +        <echo message="Deploying ${deploy.ant.archive}"/>
    1.31 +        <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
    1.32 +        <property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
    1.33 +        <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}"
    1.34 +            dest="${gfv3.results.file}"/>
    1.35 +        <delete file="${gfv3.results.file}"/>
    1.36 +    </target>
    1.37      <target name="-undeploy-ant" depends="-init-cl-deployment-env" if="deploy.ant.enabled">
    1.38 +        <antcall target="-undeploy-without-pw"/>
    1.39 +        <antcall target="-undeploy-with-pw"/>
    1.40 +    </target>
    1.41 +
    1.42 +    <target name="-undeploy-without-pw" unless="gfv3.password">
    1.43          <echo message="Undeploying ${deploy.ant.archive}"/>
    1.44          <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
    1.45 -        <get src="${gfv3.url}/__asadmin/undeploy?name=${ant.project.name}"
    1.46 +        <get src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
    1.47              dest="${gfv3.results.file}"/>
    1.48          <delete file="${gfv3.results.file}"/>    
    1.49      </target>
    1.50 +    <target name="-undeploy-with-pw" if="gfv3.password">
    1.51 +        <echo message="Undeploying ${deploy.ant.archive}"/>
    1.52 +        <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
    1.53 +        <get username="${gfv3.username}" password="${gfv3.password}" src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
    1.54 +            dest="${gfv3.results.file}"/>
    1.55 +        <delete file="${gfv3.results.file}"/>
    1.56 +    </target>
    1.57  </project>
     2.1 --- a/java/nekurak.net-ear/nbproject/build-impl.xml	Thu Jun 17 15:12:30 2010 +0200
     2.2 +++ b/java/nekurak.net-ear/nbproject/build-impl.xml	Sat Jun 19 11:19:27 2010 +0200
     2.3 @@ -365,8 +365,15 @@
     2.4              <arg line="${browser.args} ${browse.url}"/>
     2.5          </exec>
     2.6      </target>
     2.7 -    <target depends="init" if="app.client" name="run-ac">
     2.8 -        <antcall target="run-${app.client}"/>
     2.9 +    <target if="app.client" name="run-ac">
    2.10 +        <antcall target="-run-ac"/>
    2.11 +    </target>
    2.12 +    <target depends="init,-as-retrieve-option-workaround,-init-run-macros,-run-appclient-pregfv3,-run-appclient" name="-run-ac"/>
    2.13 +    <target if="j2ee.appclient.tool.args" name="-run-appclient-pregfv3">
    2.14 +        <ear2:run-appclient-pregfv3/>
    2.15 +    </target>
    2.16 +    <target name="-run-appclient" unless="j2ee.appclient.tool.args">
    2.17 +        <ear2:run-appclient subprojectname="${app.client}"/>
    2.18      </target>
    2.19      <target if="j2ee.appclient.mainclass.args" name="-as-retrieve-option-workaround" unless="j2ee.clientName">
    2.20          <property name="client.jar" value="${dist.dir}/nekurak.net-earClient.jar"/>
    2.21 @@ -382,6 +389,47 @@
    2.22              <fileset dir="${dist.dir}/gfdeploy/nekurak.net-ear" includes="**/*.jar"/>
    2.23          </copy>
    2.24      </target>
    2.25 +    <target depends="init" name="-init-run-macros">
    2.26 +        <macrodef name="run-appclient" uri="http://www.netbeans.org/ns/j2ee-earproject/2">
    2.27 +            <attribute name="subprojectname"/>
    2.28 +            <attribute default="${application.args.param}" name="args"/>
    2.29 +            <element name="customize" optional="true"/>
    2.30 +            <sequential>
    2.31 +                <java dir="${basedir}" fork="true" jar="${client.jar}">
    2.32 +                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
    2.33 +                    <jvmarg line="${j2ee.appclient.tool.jvmoptions}${client.jar},arg=-name,arg=@{subprojectname}"/>
    2.34 +                    <arg line="@{args}"/>
    2.35 +                    <syspropertyset>
    2.36 +                        <propertyref prefix="run-sys-prop."/>
    2.37 +                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
    2.38 +                    </syspropertyset>
    2.39 +                    <customize/>
    2.40 +                </java>
    2.41 +            </sequential>
    2.42 +        </macrodef>
    2.43 +        <macrodef name="run-appclient-pregfv3" uri="http://www.netbeans.org/ns/j2ee-earproject/2">
    2.44 +            <element name="customize" optional="true"/>
    2.45 +            <sequential>
    2.46 +                <java classname="${j2ee.appclient.tool.mainclass}" fork="true">
    2.47 +                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
    2.48 +                    <jvmarg line="${j2ee.appclient.tool.jvmoptions}"/>
    2.49 +                    <jvmarg line="${j2ee.appclient.jvmoptions.param}"/>
    2.50 +                    <arg line="${j2ee.appclient.tool.args}"/>
    2.51 +                    <arg line="-client ${client.jar}"/>
    2.52 +                    <arg line="${j2ee.appclient.mainclass.tool.param}"/>
    2.53 +                    <arg line="${application.args.param}"/>
    2.54 +                    <classpath>
    2.55 +                        <path path="${j2ee.platform.classpath}:${j2ee.appclient.tool.runtime}"/>
    2.56 +                    </classpath>
    2.57 +                    <syspropertyset>
    2.58 +                        <propertyref prefix="run-sys-prop."/>
    2.59 +                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
    2.60 +                    </syspropertyset>
    2.61 +                    <customize/>
    2.62 +                </java>
    2.63 +            </sequential>
    2.64 +        </macrodef>
    2.65 +    </target>
    2.66      <!--
    2.67      DEBUGGING SECTION
    2.68      -->
    2.69 @@ -392,10 +440,10 @@
    2.70          <antcall target="debug-display-browser"/>
    2.71      </target>
    2.72      <target name="connect-debugger" unless="is.debugged">
    2.73 -        <nbjpdaconnect address="${jpda.address}" host="${jpda.host}" name="${name}" transport="${jpda.transport}">
    2.74 +        <nbjpdaconnect address="${jpda.address}" host="${jpda.host}" name="${jpda.host}:${jpda.address}" transport="${jpda.transport}">
    2.75              <classpath>
    2.76                  <path path="${debug.classpath}"/>
    2.77 -                <fileset dir="${build.dir}/lib" includes="*.jar"/>
    2.78 +                <fileset dir="${build.dir}" includes="lib/*.jar"/>
    2.79              </classpath>
    2.80              <sourcepath>
    2.81                  <path path="${ear.docbase.dirs}"/>
    2.82 @@ -405,6 +453,10 @@
    2.83      <target if="do.display.browser" name="debug-display-browser">
    2.84          <nbbrowse url="${client.url}"/>
    2.85      </target>
    2.86 +    <target if="can.debug.appclient" name="run-debug-appclient">
    2.87 +        <antcall target="-run-debug-appclient"/>
    2.88 +    </target>
    2.89 +    <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"/>
    2.90      <target name="-init-debug-args">
    2.91          <property name="version-output" value="java version &quot;${ant.java.version}"/>
    2.92          <condition property="have-jdk-older-than-1.4">
    2.93 @@ -419,45 +471,63 @@
    2.94              <istrue value="${have-jdk-older-than-1.4}"/>
    2.95          </condition>
    2.96      </target>
    2.97 -    <target depends="init,-init-debug-args" if="can.debug.appclient" name="run-debug-appclient">
    2.98 -        <macrodef name="debug-appclient" uri="http://www.netbeans.org/ns/j2ee-earproject/2">
    2.99 -            <attribute name="mainclass"/>
   2.100 +    <target depends="init,-init-debug-args,-as-retrieve-option-workaround,-init-run-macros" name="-init-debug-macros">
   2.101 +        <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem">
   2.102 +            <os family="windows"/>
   2.103 +        </condition>
   2.104 +        <condition else="${debug-transport-by-os}" property="debug-transport-appclient" value="${debug.transport}">
   2.105 +            <isset property="debug.transport"/>
   2.106 +        </condition>
   2.107 +        <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2ee-earproject/2">
   2.108 +            <attribute default="${main.class}" name="name"/>
   2.109              <attribute default="${debug.classpath}" name="classpath"/>
   2.110 -            <element name="customize" optional="true"/>
   2.111 -            <attribute default="${application.args.param}" name="args"/>
   2.112 +            <attribute default="" name="stopclassname"/>
   2.113              <sequential>
   2.114 -                <parallel>
   2.115 -                    <java classname="@{mainclass}" fork="true">
   2.116 -                        <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
   2.117 -                        <jvmarg line="${j2ee.appclient.tool.jvmoptions}"/>
   2.118 -                        <jvmarg line="${debug-args-line}"/>
   2.119 -                        <jvmarg value="-Xrunjdwp:transport=${jpda.transport},server=y,address=${jpda.address},suspend=y"/>
   2.120 -                        <jvmarg line="${j2ee.appclient.jvmoptions.param}"/>
   2.121 -                        <arg line="@{args}"/>
   2.122 -                        <classpath>
   2.123 -                            <path path="${j2ee.platform.classpath}:${j2ee.appclient.tool.runtime}"/>
   2.124 -                            <path path="@{classpath}"/>
   2.125 -                        </classpath>
   2.126 -                        <syspropertyset>
   2.127 -                            <propertyref prefix="run-sys-prop."/>
   2.128 -                            <mapper from="run-sys-prop.*" to="*" type="glob"/>
   2.129 -                        </syspropertyset>
   2.130 -                        <customize/>
   2.131 -                    </java>
   2.132 -                    <nbjpdaconnect address="${jpda.address}" host="${jpda.host}" name="${name}" transport="${jpda.transport}">
   2.133 -                        <classpath>
   2.134 -                            <path path="${j2ee.platform.classpath}:${j2ee.appclient.tool.runtime}"/>
   2.135 -                            <path path="@{classpath}"/>
   2.136 -                        </classpath>
   2.137 -                        <sourcepath>
   2.138 -                            <path path="${src.dir}"/>
   2.139 -                        </sourcepath>
   2.140 -                    </nbjpdaconnect>
   2.141 -                </parallel>
   2.142 +                <nbjpdastart addressproperty="jpda.address.appclient" name="@{name}" stopclassname="@{stopclassname}" transport="${debug-transport-appclient}">
   2.143 +                    <classpath>
   2.144 +                        <path path="@{classpath}"/>
   2.145 +                    </classpath>
   2.146 +                </nbjpdastart>
   2.147              </sequential>
   2.148          </macrodef>
   2.149 -        <nbdeploy clientModuleUri="${client.module.uri}" clientUrlPart="${client.urlPart}" debugmode="false"/>
   2.150 -        <antcall target="debug-${app.client}"/>
   2.151 +        <macrodef name="debug-appclient" uri="http://www.netbeans.org/ns/j2ee-earproject/2">
   2.152 +            <attribute name="subprojectname"/>
   2.153 +            <sequential>
   2.154 +                <ear2:run-appclient subprojectname="@{subprojectname}">
   2.155 +                    <customize>
   2.156 +                        <jvmarg value="-Xrunjdwp:transport=${debug-transport-appclient},address=${jpda.address.appclient}"/>
   2.157 +                        <jvmarg line="${debug-args-line}"/>
   2.158 +                    </customize>
   2.159 +                </ear2:run-appclient>
   2.160 +            </sequential>
   2.161 +        </macrodef>
   2.162 +        <macrodef name="debug-appclient-pregfv3" uri="http://www.netbeans.org/ns/j2ee-earproject/2">
   2.163 +            <sequential>
   2.164 +                <ear2:run-appclient-pregfv3>
   2.165 +                    <customize>
   2.166 +                        <jvmarg value="-Xrunjdwp:transport=${debug-transport-appclient},address=${jpda.address.appclient}"/>
   2.167 +                        <jvmarg line="${debug-args-line}"/>
   2.168 +                    </customize>
   2.169 +                </ear2:run-appclient-pregfv3>
   2.170 +            </sequential>
   2.171 +        </macrodef>
   2.172 +    </target>
   2.173 +    <target name="-debug-appclient-deploy">
   2.174 +        <nbstartserver debugmode="true"/>
   2.175 +        <nbdeploy clientModuleUri="${client.module.uri}" clientUrlPart="${client.urlPart}" debugmode="true"/>
   2.176 +    </target>
   2.177 +    <target name="-debug-appclient-start-nbjpda">
   2.178 +        <ear2:nbjpdastart classpath="" name="${app.client}"/>
   2.179 +    </target>
   2.180 +    <target if="j2ee.appclient.tool.args" name="-debug-appclient-pregfv3">
   2.181 +        <ear2:debug-appclient-pregfv3/>
   2.182 +    </target>
   2.183 +    <target name="-debug-appclient" unless="j2ee.appclient.tool.args">
   2.184 +        <mkdir dir="${dist.dir}/nekurak.net-earClient"/>
   2.185 +        <copy flatten="true" todir="${dist.dir}/nekurak.net-earClient">
   2.186 +            <fileset dir="${wa.copy.client.jar.from}/nekurak.net-ear" includes="**/*.*ar"/>
   2.187 +        </copy>
   2.188 +        <ear2:debug-appclient subprojectname="${app.client}"/>
   2.189      </target>
   2.190      <!--
   2.191      CLEANUP SECTION
     3.1 --- a/java/nekurak.net-ear/nbproject/genfiles.properties	Thu Jun 17 15:12:30 2010 +0200
     3.2 +++ b/java/nekurak.net-ear/nbproject/genfiles.properties	Sat Jun 19 11:19:27 2010 +0200
     3.3 @@ -4,5 +4,5 @@
     3.4  # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
     3.5  # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
     3.6  nbproject/build-impl.xml.data.CRC32=3ed495e4
     3.7 -nbproject/build-impl.xml.script.CRC32=a4c4fbbd
     3.8 -nbproject/build-impl.xml.stylesheet.CRC32=624b8ca2@1.17.2
     3.9 +nbproject/build-impl.xml.script.CRC32=1197b7f6
    3.10 +nbproject/build-impl.xml.stylesheet.CRC32=56fd2fa2@1.18.1
     4.1 --- a/java/nekurak.net-ear/nbproject/project.properties	Thu Jun 17 15:12:30 2010 +0200
     4.2 +++ b/java/nekurak.net-ear/nbproject/project.properties	Sat Jun 19 11:19:27 2010 +0200
     4.3 @@ -12,6 +12,12 @@
     4.4  j2ee.appclient.mainclass.args=${j2ee.appclient.tool.args}
     4.5  j2ee.deploy.on.save=false
     4.6  j2ee.platform=1.6
     4.7 +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
     4.8 +j2ee.platform.embeddableejb.classpath=${j2ee.server.home}/lib/embedded/glassfish-embedded-static-shell.jar
     4.9 +j2ee.platform.wscompile.classpath=${j2ee.server.home}/modules/webservices-osgi.jar
    4.10 +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
    4.11 +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
    4.12 +j2ee.platform.wsit.classpath=
    4.13  j2ee.server.type=gfv3ee6
    4.14  jar.compress=false
    4.15  jar.content.additional=\
     5.1 --- a/java/nekurak.net-ejb/nbproject/ant-deploy.xml	Thu Jun 17 15:12:30 2010 +0200
     5.2 +++ b/java/nekurak.net-ejb/nbproject/ant-deploy.xml	Sat Jun 19 11:19:27 2010 +0200
     5.3 @@ -24,7 +24,7 @@
     5.4          </xmlproperty>    
     5.5          <delete file="${temp.sun.web}"/>
     5.6          <property name="deploy.ant.client.url" value="${gfv3.url}${sun-web-app.context-root}"/>
     5.7 -        <property name="deploy.context.root.argument" value="?contextroot=${sun-web-app.context-root}"/>
     5.8 +        <property name="deploy.context.root.argument" value="&amp;contextroot=${sun-web-app.context-root}"/>
     5.9      </target>
    5.10      <target name="-no-parse-sun-web" depends="-init-cl-deployment-env" unless="sun.web.present">
    5.11          <property name="deploy.context.root.argument" value=""/>
    5.12 @@ -43,18 +43,43 @@
    5.13          <delete dir="${gfv3.resources.dir}"/>
    5.14      </target>
    5.15      <target name="-deploy-ant" depends="-parse-sun-web,-no-parse-sun-web,-add-resources" if="deploy.ant.enabled">
    5.16 +        <antcall target="-deploy-without-pw"/>
    5.17 +        <antcall target="-deploy-with-pw"/>
    5.18 +    </target>
    5.19 +
    5.20 +    <target name="-deploy-without-pw" unless="gfv3.password">
    5.21          <echo message="Deploying ${deploy.ant.archive}"/>
    5.22          <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
    5.23          <property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
    5.24 -        <get src="${gfv3.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}?force=true?name=${ant.project.name}"
    5.25 +        <get src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&amp;force=true&amp;name=${ant.project.name}"
    5.26              dest="${gfv3.results.file}"/>
    5.27          <delete file="${gfv3.results.file}"/>    
    5.28      </target>
    5.29 +    <target name="-deploy-with-pw" if="gfv3.password">
    5.30 +        <echo message="Deploying ${deploy.ant.archive}"/>
    5.31 +        <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
    5.32 +        <property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
    5.33 +        <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}"
    5.34 +            dest="${gfv3.results.file}"/>
    5.35 +        <delete file="${gfv3.results.file}"/>
    5.36 +    </target>
    5.37      <target name="-undeploy-ant" depends="-init-cl-deployment-env" if="deploy.ant.enabled">
    5.38 +        <antcall target="-undeploy-without-pw"/>
    5.39 +        <antcall target="-undeploy-with-pw"/>
    5.40 +    </target>
    5.41 +
    5.42 +    <target name="-undeploy-without-pw" unless="gfv3.password">
    5.43          <echo message="Undeploying ${deploy.ant.archive}"/>
    5.44          <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
    5.45 -        <get src="${gfv3.url}/__asadmin/undeploy?name=${ant.project.name}"
    5.46 +        <get src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
    5.47              dest="${gfv3.results.file}"/>
    5.48          <delete file="${gfv3.results.file}"/>    
    5.49      </target>
    5.50 +    <target name="-undeploy-with-pw" if="gfv3.password">
    5.51 +        <echo message="Undeploying ${deploy.ant.archive}"/>
    5.52 +        <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
    5.53 +        <get username="${gfv3.username}" password="${gfv3.password}" src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
    5.54 +            dest="${gfv3.results.file}"/>
    5.55 +        <delete file="${gfv3.results.file}"/>
    5.56 +    </target>
    5.57  </project>
     6.1 --- a/java/nekurak.net-ejb/nbproject/build-impl.xml	Thu Jun 17 15:12:30 2010 +0200
     6.2 +++ b/java/nekurak.net-ejb/nbproject/build-impl.xml	Sat Jun 19 11:19:27 2010 +0200
     6.3 @@ -140,6 +140,20 @@
     6.4          <fail unless="dist.javadoc.dir">Must set dist.javadoc.dir</fail>
     6.5          <fail unless="build.classes.excludes">Must set build.classes.excludes</fail>
     6.6          <fail unless="dist.jar">Must set dist.jar</fail>
     6.7 +        <condition property="missing.j2ee.server.home">
     6.8 +            <and>
     6.9 +                <matches pattern="j2ee.server.home" string="${j2ee.platform.classpath}"/>
    6.10 +                <not>
    6.11 +                    <isset property="j2ee.server.home"/>
    6.12 +                </not>
    6.13 +            </and>
    6.14 +        </condition>
    6.15 +        <fail if="missing.j2ee.server.home">
    6.16 +The Java EE server classpath is not correctly set up - server home directory is missing.
    6.17 +Either open the project in the IDE and assign the server or setup the server classpath manually.
    6.18 +For example like this:
    6.19 +   ant -Dj2ee.server.home=&lt;app_server_installation_directory&gt;
    6.20 +                </fail>
    6.21          <fail unless="j2ee.platform.classpath">
    6.22  The Java EE server classpath is not correctly set up. Your active server type is ${j2ee.server.type}.
    6.23  Either open the project in the IDE and assign the server or setup the server classpath manually.
    6.24 @@ -157,11 +171,52 @@
    6.25              </sequential>
    6.26          </macrodef>
    6.27      </target>
    6.28 -    <target name="-init-macrodef-javac">
    6.29 +    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">
    6.30          <macrodef name="javac" uri="http://www.netbeans.org/ns/j2ee-ejbjarproject/2">
    6.31              <attribute default="${src.dir}" name="srcdir"/>
    6.32              <attribute default="${build.classes.dir}" name="destdir"/>
    6.33              <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
    6.34 +            <attribute default="${javac.processorpath}" name="processorpath"/>
    6.35 +            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
    6.36 +            <attribute default="${includes}" name="includes"/>
    6.37 +            <attribute default="${excludes}" name="excludes"/>
    6.38 +            <attribute default="${javac.debug}" name="debug"/>
    6.39 +            <attribute default="${empty.dir}" name="gensrcdir"/>
    6.40 +            <element name="customize" optional="true"/>
    6.41 +            <sequential>
    6.42 +                <property name="javac.compilerargs" value=""/>
    6.43 +                <property location="${build.dir}/empty" name="empty.dir"/>
    6.44 +                <mkdir dir="${empty.dir}"/>
    6.45 +                <mkdir dir="@{apgeneratedsrcdir}"/>
    6.46 +                <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}">
    6.47 +                    <src>
    6.48 +                        <dirset dir="@{gensrcdir}" erroronmissingdir="false">
    6.49 +                            <include name="*"/>
    6.50 +                        </dirset>
    6.51 +                    </src>
    6.52 +                    <classpath>
    6.53 +                        <path path="@{classpath}"/>
    6.54 +                    </classpath>
    6.55 +                    <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
    6.56 +                    <compilerarg line="${javac.compilerargs}"/>
    6.57 +                    <compilerarg value="-processorpath"/>
    6.58 +                    <compilerarg path="@{processorpath}:${empty.dir}"/>
    6.59 +                    <compilerarg line="${ap.processors.internal}"/>
    6.60 +                    <compilerarg value="-s"/>
    6.61 +                    <compilerarg path="@{apgeneratedsrcdir}"/>
    6.62 +                    <compilerarg line="${ap.proc.none.internal}"/>
    6.63 +                    <customize/>
    6.64 +                </javac>
    6.65 +            </sequential>
    6.66 +        </macrodef>
    6.67 +    </target>
    6.68 +    <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
    6.69 +        <macrodef name="javac" uri="http://www.netbeans.org/ns/j2ee-ejbjarproject/2">
    6.70 +            <attribute default="${src.dir}" name="srcdir"/>
    6.71 +            <attribute default="${build.classes.dir}" name="destdir"/>
    6.72 +            <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
    6.73 +            <attribute default="${javac.processorpath}" name="processorpath"/>
    6.74 +            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
    6.75              <attribute default="${includes}" name="includes"/>
    6.76              <attribute default="${excludes}" name="excludes"/>
    6.77              <attribute default="${javac.debug}" name="debug"/>
    6.78 @@ -187,6 +242,35 @@
    6.79              </sequential>
    6.80          </macrodef>
    6.81      </target>
    6.82 +    <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
    6.83 +        <macrodef name="depend" uri="http://www.netbeans.org/ns/j2ee-ejbjarproject/2">
    6.84 +            <attribute default="${src.dir}" name="srcdir"/>
    6.85 +            <attribute default="${build.classes.dir}" name="destdir"/>
    6.86 +            <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
    6.87 +            <sequential>
    6.88 +                <depend cache="${build.dir}/depcache" destdir="@{destdir}" excludes="${excludes}" includes="${includes}" srcdir="@{srcdir}">
    6.89 +                    <classpath>
    6.90 +                        <path path="@{classpath}"/>
    6.91 +                    </classpath>
    6.92 +                </depend>
    6.93 +            </sequential>
    6.94 +        </macrodef>
    6.95 +        <macrodef name="force-recompile" uri="http://www.netbeans.org/ns/j2ee-ejbjarproject/2">
    6.96 +            <attribute default="${build.classes.dir}" name="destdir"/>
    6.97 +            <sequential>
    6.98 +                <fail unless="javac.includes">Must set javac.includes</fail>
    6.99 +                <pathconvert pathsep="," property="javac.includes.binary">
   6.100 +                    <path>
   6.101 +                        <filelist dir="@{destdir}" files="${javac.includes}"/>
   6.102 +                    </path>
   6.103 +                    <globmapper from="*.java" to="*.class"/>
   6.104 +                </pathconvert>
   6.105 +                <delete>
   6.106 +                    <files includes="${javac.includes.binary}"/>
   6.107 +                </delete>
   6.108 +            </sequential>
   6.109 +        </macrodef>
   6.110 +    </target>
   6.111      <target name="-init-macrodef-junit">
   6.112          <macrodef name="junit" uri="http://www.netbeans.org/ns/j2ee-ejbjarproject/2">
   6.113              <attribute default="${includes}" name="includes"/>
   6.114 @@ -294,6 +378,7 @@
   6.115                  <java classname="@{classname}" fork="true">
   6.116                      <jvmarg line="${debug-args-line}"/>
   6.117                      <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
   6.118 +                    <jvmarg line="${runmain.jvmargs}"/>
   6.119                      <classpath>
   6.120                          <path path="@{classpath}"/>
   6.121                      </classpath>
   6.122 @@ -316,7 +401,30 @@
   6.123                  </fail>
   6.124          <taskdef classpath="${libs.CopyLibs.classpath}" resource="org/netbeans/modules/java/j2seproject/copylibstask/antlib.xml"/>
   6.125      </target>
   6.126 -    <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"/>
   6.127 +    <target name="-init-ap-cmdline-properties">
   6.128 +        <property name="annotation.processing.enabled" value="true"/>
   6.129 +        <property name="annotation.processing.processors.list" value=""/>
   6.130 +        <property name="annotation.processing.run.all.processors" value="true"/>
   6.131 +        <property name="javac.processorpath" value="${javac.classpath}"/>
   6.132 +        <property name="javac.test.processorpath" value="${javac.test.classpath}"/>
   6.133 +        <condition property="ap.supported.internal" value="true">
   6.134 +            <not>
   6.135 +                <matches pattern="1\.[0-5](\..*)?" string="${javac.source}"/>
   6.136 +            </not>
   6.137 +        </condition>
   6.138 +    </target>
   6.139 +    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-ap-cmdline-supported">
   6.140 +        <condition else="" property="ap.processors.internal" value="-processor ${annotation.processing.processors.list}">
   6.141 +            <isfalse value="${annotation.processing.run.all.processors}"/>
   6.142 +        </condition>
   6.143 +        <condition else="" property="ap.proc.none.internal" value="-proc:none">
   6.144 +            <isfalse value="${annotation.processing.enabled}"/>
   6.145 +        </condition>
   6.146 +    </target>
   6.147 +    <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline">
   6.148 +        <property name="ap.cmd.line.internal" value=""/>
   6.149 +    </target>
   6.150 +    <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"/>
   6.151      <!--
   6.152                  COMPILATION SECTION
   6.153              -->
   6.154 @@ -527,7 +635,7 @@
   6.155      <!--
   6.156                  JAVADOC SECTION
   6.157              -->
   6.158 -    <target depends="init" name="javadoc-build">
   6.159 +    <target depends="init" if="have.sources" name="javadoc-build">
   6.160          <mkdir dir="${dist.javadoc.dir}"/>
   6.161          <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}">
   6.162              <classpath>
     7.1 --- a/java/nekurak.net-ejb/nbproject/genfiles.properties	Thu Jun 17 15:12:30 2010 +0200
     7.2 +++ b/java/nekurak.net-ejb/nbproject/genfiles.properties	Sat Jun 19 11:19:27 2010 +0200
     7.3 @@ -1,8 +1,8 @@
     7.4  build.xml.data.CRC32=764630c8
     7.5  build.xml.script.CRC32=d7a2a0ed
     7.6 -build.xml.stylesheet.CRC32=e5f4c432@1.19.2
     7.7 +build.xml.stylesheet.CRC32=5910fda3@1.22.1
     7.8  # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
     7.9  # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
    7.10  nbproject/build-impl.xml.data.CRC32=764630c8
    7.11 -nbproject/build-impl.xml.script.CRC32=45c5a458
    7.12 -nbproject/build-impl.xml.stylesheet.CRC32=b9c9cfe1@1.19.2
    7.13 +nbproject/build-impl.xml.script.CRC32=43ab1f1c
    7.14 +nbproject/build-impl.xml.stylesheet.CRC32=986a5256@1.22.1
     8.1 --- a/java/nekurak.net-ejb/nbproject/project.properties	Thu Jun 17 15:12:30 2010 +0200
     8.2 +++ b/java/nekurak.net-ejb/nbproject/project.properties	Sat Jun 19 11:19:27 2010 +0200
     8.3 @@ -1,3 +1,8 @@
     8.4 +annotation.processing.enabled=true
     8.5 +annotation.processing.enabled.in.editor=true
     8.6 +annotation.processing.processors.list=
     8.7 +annotation.processing.run.all.processors=true
     8.8 +annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
     8.9  build.classes.dir=${build.dir}/classes
    8.10  build.classes.excludes=**/*.java,**/*.form,**/.nbattrs
    8.11  build.dir=build
    8.12 @@ -19,6 +24,12 @@
    8.13  includes=**
    8.14  j2ee.deploy.on.save=false
    8.15  j2ee.platform=1.6
    8.16 +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
    8.17 +j2ee.platform.embeddableejb.classpath=${j2ee.server.home}/lib/embedded/glassfish-embedded-static-shell.jar
    8.18 +j2ee.platform.wscompile.classpath=${j2ee.server.home}/modules/webservices-osgi.jar
    8.19 +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
    8.20 +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
    8.21 +j2ee.platform.wsit.classpath=
    8.22  j2ee.server.type=gfv3ee6
    8.23  jar.compress=false
    8.24  jar.name=nekurak.net-ejb.jar
    8.25 @@ -27,12 +38,14 @@
    8.26      ${reference.SuperDAO.jar}
    8.27  javac.debug=true
    8.28  javac.deprecation=false
    8.29 +javac.processorpath=${javac.classpath}
    8.30  javac.source=1.5
    8.31  javac.target=1.5
    8.32  javac.test.classpath=\
    8.33      ${javac.classpath}:\
    8.34      ${build.classes.dir}:\
    8.35      ${libs.junit_4.classpath}
    8.36 +javac.test.processorpath=${javac.test.classpath}
    8.37  javadoc.additionalparam=
    8.38  javadoc.author=false
    8.39  javadoc.encoding=${source.encoding}
     9.1 --- a/java/nekurak.net-ejb/src/java/cz/frantovo/nekurak/ejb/PodnikEJB.java	Thu Jun 17 15:12:30 2010 +0200
     9.2 +++ b/java/nekurak.net-ejb/src/java/cz/frantovo/nekurak/ejb/PodnikEJB.java	Sat Jun 19 11:19:27 2010 +0200
     9.3 @@ -81,11 +81,14 @@
     9.4  	return podnikDAO.getVysledekHlasovani(podnik);
     9.5      }
     9.6  
     9.7 -    @RolesAllowed("opravneny")
     9.8 -    public void komentuj(Komentar k) throws KomentarovaVyjimka, TexyVyjimka {
     9.9 +    private void kontrolaKomentare(Komentar k) throws TexyVyjimka, KomentarovaVyjimka {
    9.10  	k.setUzivatel(ctx.getCallerPrincipal().getName());
    9.11  	k.setDatum(null);
    9.12  
    9.13 +	if (k.getKomentar() == null || k.getKomentar().length() < 1) {
    9.14 +	    throw new KomentarovaVyjimka("Nechceme prázdné komentáře.", null);
    9.15 +	}
    9.16 +
    9.17  	/** Převedeme na XML */
    9.18  	switch (k.getTyp()) {
    9.19  	    case PROSTY_TEXT:
    9.20 @@ -99,13 +102,19 @@
    9.21  		k.setKomentar(Komentare.upravXHTML(k.getKomentar()));
    9.22  		break;
    9.23  	}
    9.24 +	/** Přidáme kořenový element */
    9.25  	k.setKomentar(Komentare.obal(k.getKomentar()));
    9.26  
    9.27  	/** Zkontrolujeme XML */
    9.28 -	komentare.zkontroluj(k.getKomentar());
    9.29 +	Komentare.zkontroluj(k.getKomentar());
    9.30 +    }
    9.31  
    9.32 -
    9.33 -	/** TODO: Uložíme do databáze */
    9.34 -	podnikDAO.zaloz(k);
    9.35 +    @RolesAllowed("opravneny")
    9.36 +    public Komentar komentuj(Komentar k, boolean uloz) throws KomentarovaVyjimka, TexyVyjimka {
    9.37 +	kontrolaKomentare(k);
    9.38 +	if (uloz) {
    9.39 +	    podnikDAO.zaloz(k);
    9.40 +	}
    9.41 +	return k;
    9.42      }
    9.43  }
    10.1 --- a/java/nekurak.net-lib/nbproject/build-impl.xml	Thu Jun 17 15:12:30 2010 +0200
    10.2 +++ b/java/nekurak.net-lib/nbproject/build-impl.xml	Sat Jun 19 11:19:27 2010 +0200
    10.3 @@ -55,6 +55,7 @@
    10.4      </target>
    10.5      <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
    10.6          <available file="${manifest.file}" property="manifest.available"/>
    10.7 +        <available file="${application.splash}" property="splashscreen.available"/>
    10.8          <condition property="main.class.available">
    10.9              <and>
   10.10                  <isset property="main.class"/>
   10.11 @@ -83,23 +84,40 @@
   10.12                  <isset property="do.mkdist"/>
   10.13              </and>
   10.14          </condition>
   10.15 -        <condition property="manifest.available+mkdist.available">
   10.16 +        <condition property="manifest.available+main.class+mkdist.available+splashscreen.available">
   10.17              <and>
   10.18 -                <istrue value="${manifest.available}"/>
   10.19 -                <isset property="do.mkdist"/>
   10.20 +                <istrue value="${manifest.available+main.class+mkdist.available}"/>
   10.21 +                <istrue value="${splashscreen.available}"/>
   10.22              </and>
   10.23          </condition>
   10.24 -        <condition property="manifest.available-mkdist.available">
   10.25 -            <or>
   10.26 -                <istrue value="${manifest.available}"/>
   10.27 -                <isset property="do.mkdist"/>
   10.28 -            </or>
   10.29 +        <condition property="do.archive">
   10.30 +            <not>
   10.31 +                <istrue value="${jar.archive.disabled}"/>
   10.32 +            </not>
   10.33          </condition>
   10.34 -        <condition property="manifest.available+main.class-mkdist.available">
   10.35 -            <or>
   10.36 +        <condition property="do.archive+manifest.available">
   10.37 +            <and>
   10.38 +                <isset property="manifest.available"/>
   10.39 +                <istrue value="${do.archive}"/>
   10.40 +            </and>
   10.41 +        </condition>
   10.42 +        <condition property="do.archive+manifest.available+main.class">
   10.43 +            <and>
   10.44                  <istrue value="${manifest.available+main.class}"/>
   10.45 -                <isset property="do.mkdist"/>
   10.46 -            </or>
   10.47 +                <istrue value="${do.archive}"/>
   10.48 +            </and>
   10.49 +        </condition>
   10.50 +        <condition property="do.archive+manifest.available+main.class+mkdist.available">
   10.51 +            <and>
   10.52 +                <istrue value="${manifest.available+main.class+mkdist.available}"/>
   10.53 +                <istrue value="${do.archive}"/>
   10.54 +            </and>
   10.55 +        </condition>
   10.56 +        <condition property="do.archive+manifest.available+main.class+mkdist.available+splashscreen.available">
   10.57 +            <and>
   10.58 +                <istrue value="${manifest.available+main.class+mkdist.available+splashscreen.available}"/>
   10.59 +                <istrue value="${do.archive}"/>
   10.60 +            </and>
   10.61          </condition>
   10.62          <condition property="have.tests">
   10.63              <or>
   10.64 @@ -156,6 +174,8 @@
   10.65              <length length="0" string="${endorsed.classpath}" when="greater"/>
   10.66          </condition>
   10.67          <property name="javac.fork" value="false"/>
   10.68 +        <property name="jar.index" value="false"/>
   10.69 +        <available file="${meta.inf.dir}/persistence.xml" property="has.persistence.xml"/>
   10.70      </target>
   10.71      <target name="-post-init">
   10.72          <!-- Empty placeholder for easier customization. -->
   10.73 @@ -182,11 +202,53 @@
   10.74              </sequential>
   10.75          </macrodef>
   10.76      </target>
   10.77 -    <target name="-init-macrodef-javac">
   10.78 +    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">
   10.79          <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
   10.80              <attribute default="${src.dir}" name="srcdir"/>
   10.81              <attribute default="${build.classes.dir}" name="destdir"/>
   10.82              <attribute default="${javac.classpath}" name="classpath"/>
   10.83 +            <attribute default="${javac.processorpath}" name="processorpath"/>
   10.84 +            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
   10.85 +            <attribute default="${includes}" name="includes"/>
   10.86 +            <attribute default="${excludes}" name="excludes"/>
   10.87 +            <attribute default="${javac.debug}" name="debug"/>
   10.88 +            <attribute default="${empty.dir}" name="sourcepath"/>
   10.89 +            <attribute default="${empty.dir}" name="gensrcdir"/>
   10.90 +            <element name="customize" optional="true"/>
   10.91 +            <sequential>
   10.92 +                <property location="${build.dir}/empty" name="empty.dir"/>
   10.93 +                <mkdir dir="${empty.dir}"/>
   10.94 +                <mkdir dir="@{apgeneratedsrcdir}"/>
   10.95 +                <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}">
   10.96 +                    <src>
   10.97 +                        <dirset dir="@{gensrcdir}" erroronmissingdir="false">
   10.98 +                            <include name="*"/>
   10.99 +                        </dirset>
  10.100 +                    </src>
  10.101 +                    <classpath>
  10.102 +                        <path path="@{classpath}"/>
  10.103 +                    </classpath>
  10.104 +                    <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
  10.105 +                    <compilerarg line="${javac.compilerargs}"/>
  10.106 +                    <compilerarg value="-processorpath"/>
  10.107 +                    <compilerarg path="@{processorpath}:${empty.dir}"/>
  10.108 +                    <compilerarg line="${ap.processors.internal}"/>
  10.109 +                    <compilerarg line="${annotation.processing.processor.options}"/>
  10.110 +                    <compilerarg value="-s"/>
  10.111 +                    <compilerarg path="@{apgeneratedsrcdir}"/>
  10.112 +                    <compilerarg line="${ap.proc.none.internal}"/>
  10.113 +                    <customize/>
  10.114 +                </javac>
  10.115 +            </sequential>
  10.116 +        </macrodef>
  10.117 +    </target>
  10.118 +    <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
  10.119 +        <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
  10.120 +            <attribute default="${src.dir}" name="srcdir"/>
  10.121 +            <attribute default="${build.classes.dir}" name="destdir"/>
  10.122 +            <attribute default="${javac.classpath}" name="classpath"/>
  10.123 +            <attribute default="${javac.processorpath}" name="processorpath"/>
  10.124 +            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
  10.125              <attribute default="${includes}" name="includes"/>
  10.126              <attribute default="${excludes}" name="excludes"/>
  10.127              <attribute default="${javac.debug}" name="debug"/>
  10.128 @@ -211,6 +273,8 @@
  10.129                  </javac>
  10.130              </sequential>
  10.131          </macrodef>
  10.132 +    </target>
  10.133 +    <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
  10.134          <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
  10.135              <attribute default="${src.dir}" name="srcdir"/>
  10.136              <attribute default="${build.classes.dir}" name="destdir"/>
  10.137 @@ -358,14 +422,65 @@
  10.138              </sequential>
  10.139          </macrodef>
  10.140      </target>
  10.141 +    <target name="-init-macrodef-copylibs">
  10.142 +        <macrodef name="copylibs" uri="http://www.netbeans.org/ns/j2se-project/3">
  10.143 +            <element name="customize" optional="true"/>
  10.144 +            <sequential>
  10.145 +                <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
  10.146 +                <pathconvert property="run.classpath.without.build.classes.dir">
  10.147 +                    <path path="${run.classpath}"/>
  10.148 +                    <map from="${build.classes.dir.resolved}" to=""/>
  10.149 +                </pathconvert>
  10.150 +                <pathconvert pathsep=" " property="jar.classpath">
  10.151 +                    <path path="${run.classpath.without.build.classes.dir}"/>
  10.152 +                    <chainedmapper>
  10.153 +                        <flattenmapper/>
  10.154 +                        <globmapper from="*" to="lib/*"/>
  10.155 +                    </chainedmapper>
  10.156 +                </pathconvert>
  10.157 +                <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
  10.158 +                <copylibs compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}" manifest="${manifest.file}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
  10.159 +                    <fileset dir="${build.classes.dir}"/>
  10.160 +                    <manifest>
  10.161 +                        <attribute name="Class-Path" value="${jar.classpath}"/>
  10.162 +                        <customize/>
  10.163 +                    </manifest>
  10.164 +                </copylibs>
  10.165 +            </sequential>
  10.166 +        </macrodef>
  10.167 +    </target>
  10.168      <target name="-init-presetdef-jar">
  10.169          <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
  10.170 -            <jar compress="${jar.compress}" jarfile="${dist.jar}">
  10.171 +            <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}">
  10.172                  <j2seproject1:fileset dir="${build.classes.dir}"/>
  10.173              </jar>
  10.174          </presetdef>
  10.175      </target>
  10.176 -    <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"/>
  10.177 +    <target name="-init-ap-cmdline-properties">
  10.178 +        <property name="annotation.processing.enabled" value="true"/>
  10.179 +        <property name="annotation.processing.processors.list" value=""/>
  10.180 +        <property name="annotation.processing.processor.options" value=""/>
  10.181 +        <property name="annotation.processing.run.all.processors" value="true"/>
  10.182 +        <property name="javac.processorpath" value="${javac.classpath}"/>
  10.183 +        <property name="javac.test.processorpath" value="${javac.test.classpath}"/>
  10.184 +        <condition property="ap.supported.internal" value="true">
  10.185 +            <not>
  10.186 +                <matches pattern="1\.[0-5](\..*)?" string="${javac.source}"/>
  10.187 +            </not>
  10.188 +        </condition>
  10.189 +    </target>
  10.190 +    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-ap-cmdline-supported">
  10.191 +        <condition else="" property="ap.processors.internal" value="-processor ${annotation.processing.processors.list}">
  10.192 +            <isfalse value="${annotation.processing.run.all.processors}"/>
  10.193 +        </condition>
  10.194 +        <condition else="" property="ap.proc.none.internal" value="-proc:none">
  10.195 +            <isfalse value="${annotation.processing.enabled}"/>
  10.196 +        </condition>
  10.197 +    </target>
  10.198 +    <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline">
  10.199 +        <property name="ap.cmd.line.internal" value=""/>
  10.200 +    </target>
  10.201 +    <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"/>
  10.202      <!--
  10.203                  ===================
  10.204                  COMPILATION SECTION
  10.205 @@ -409,12 +524,18 @@
  10.206          </pathconvert>
  10.207          <j2seproject3:depend srcdir="${src.dir}:${build.generated.subdirs}"/>
  10.208      </target>
  10.209 -    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-compile-depend" if="have.sources" name="-do-compile">
  10.210 +    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile, -copy-persistence-xml,-compile-depend" if="have.sources" name="-do-compile">
  10.211          <j2seproject3:javac gensrcdir="${build.generated.sources.dir}"/>
  10.212          <copy todir="${build.classes.dir}">
  10.213              <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
  10.214          </copy>
  10.215      </target>
  10.216 +    <target if="has.persistence.xml" name="-copy-persistence-xml">
  10.217 +        <mkdir dir="${build.classes.dir}/META-INF"/>
  10.218 +        <copy todir="${build.classes.dir}/META-INF">
  10.219 +            <fileset dir="${meta.inf.dir}" includes="persistence.xml"/>
  10.220 +        </copy>
  10.221 +    </target>
  10.222      <target name="-post-compile">
  10.223          <!-- Empty placeholder for easier customization. -->
  10.224          <!-- You can override this target in the ../build.xml file. -->
  10.225 @@ -447,13 +568,13 @@
  10.226          <!-- Empty placeholder for easier customization. -->
  10.227          <!-- You can override this target in the ../build.xml file. -->
  10.228      </target>
  10.229 -    <target depends="init,compile,-pre-pre-jar,-pre-jar" name="-do-jar-without-manifest" unless="manifest.available-mkdist.available">
  10.230 +    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive" name="-do-jar-without-manifest" unless="manifest.available">
  10.231          <j2seproject1:jar/>
  10.232      </target>
  10.233 -    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available" name="-do-jar-with-manifest" unless="manifest.available+main.class-mkdist.available">
  10.234 +    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive+manifest.available" name="-do-jar-with-manifest" unless="manifest.available+main.class">
  10.235          <j2seproject1:jar manifest="${manifest.file}"/>
  10.236      </target>
  10.237 -    <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">
  10.238 +    <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">
  10.239          <j2seproject1:jar manifest="${manifest.file}">
  10.240              <j2seproject1:manifest>
  10.241                  <j2seproject1:attribute name="Main-Class" value="${main.class}"/>
  10.242 @@ -468,78 +589,35 @@
  10.243          </pathconvert>
  10.244          <echo>java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
  10.245      </target>
  10.246 -    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class+mkdist.available" name="-do-jar-with-libraries">
  10.247 -        <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
  10.248 -        <pathconvert property="run.classpath.without.build.classes.dir">
  10.249 -            <path path="${run.classpath}"/>
  10.250 -            <map from="${build.classes.dir.resolved}" to=""/>
  10.251 -        </pathconvert>
  10.252 -        <pathconvert pathsep=" " property="jar.classpath">
  10.253 -            <path path="${run.classpath.without.build.classes.dir}"/>
  10.254 -            <chainedmapper>
  10.255 -                <flattenmapper/>
  10.256 -                <globmapper from="*" to="lib/*"/>
  10.257 -            </chainedmapper>
  10.258 -        </pathconvert>
  10.259 -        <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
  10.260 -        <copylibs compress="${jar.compress}" jarfile="${dist.jar}" manifest="${manifest.file}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
  10.261 -            <fileset dir="${build.classes.dir}"/>
  10.262 -            <manifest>
  10.263 +    <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">
  10.264 +        <basename file="${application.splash}" property="splashscreen.basename"/>
  10.265 +        <mkdir dir="${build.classes.dir}/META-INF"/>
  10.266 +        <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>
  10.267 +        <j2seproject3:copylibs>
  10.268 +            <customize>
  10.269                  <attribute name="Main-Class" value="${main.class}"/>
  10.270 -                <attribute name="Class-Path" value="${jar.classpath}"/>
  10.271 -            </manifest>
  10.272 -        </copylibs>
  10.273 +                <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
  10.274 +            </customize>
  10.275 +        </j2seproject3:copylibs>
  10.276          <echo>To run this application from the command line without Ant, try:</echo>
  10.277          <property location="${dist.jar}" name="dist.jar.resolved"/>
  10.278          <echo>java -jar "${dist.jar.resolved}"</echo>
  10.279      </target>
  10.280 -    <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">
  10.281 -        <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
  10.282 -        <pathconvert property="run.classpath.without.build.classes.dir">
  10.283 -            <path path="${run.classpath}"/>
  10.284 -            <map from="${build.classes.dir.resolved}" to=""/>
  10.285 -        </pathconvert>
  10.286 -        <pathconvert pathsep=" " property="jar.classpath">
  10.287 -            <path path="${run.classpath.without.build.classes.dir}"/>
  10.288 -            <chainedmapper>
  10.289 -                <flattenmapper/>
  10.290 -                <globmapper from="*" to="lib/*"/>
  10.291 -            </chainedmapper>
  10.292 -        </pathconvert>
  10.293 -        <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
  10.294 -        <copylibs compress="${jar.compress}" jarfile="${dist.jar}" manifest="${manifest.file}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
  10.295 -            <fileset dir="${build.classes.dir}"/>
  10.296 -            <manifest>
  10.297 -                <attribute name="Class-Path" value="${jar.classpath}"/>
  10.298 -            </manifest>
  10.299 -        </copylibs>
  10.300 -    </target>
  10.301 -    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.mkdist" name="-do-jar-with-libraries-without-manifest" unless="manifest.available">
  10.302 -        <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
  10.303 -        <pathconvert property="run.classpath.without.build.classes.dir">
  10.304 -            <path path="${run.classpath}"/>
  10.305 -            <map from="${build.classes.dir.resolved}" to=""/>
  10.306 -        </pathconvert>
  10.307 -        <pathconvert pathsep=" " property="jar.classpath">
  10.308 -            <path path="${run.classpath.without.build.classes.dir}"/>
  10.309 -            <chainedmapper>
  10.310 -                <flattenmapper/>
  10.311 -                <globmapper from="*" to="lib/*"/>
  10.312 -            </chainedmapper>
  10.313 -        </pathconvert>
  10.314 -        <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
  10.315 -        <copylibs compress="${jar.compress}" jarfile="${dist.jar}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
  10.316 -            <fileset dir="${build.classes.dir}"/>
  10.317 -            <manifest>
  10.318 -                <attribute name="Class-Path" value="${jar.classpath}"/>
  10.319 -            </manifest>
  10.320 -        </copylibs>
  10.321 +    <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">
  10.322 +        <j2seproject3:copylibs>
  10.323 +            <customize>
  10.324 +                <attribute name="Main-Class" value="${main.class}"/>
  10.325 +            </customize>
  10.326 +        </j2seproject3:copylibs>
  10.327 +        <echo>To run this application from the command line without Ant, try:</echo>
  10.328 +        <property location="${dist.jar}" name="dist.jar.resolved"/>
  10.329 +        <echo>java -jar "${dist.jar.resolved}"</echo>
  10.330      </target>
  10.331      <target name="-post-jar">
  10.332          <!-- Empty placeholder for easier customization. -->
  10.333          <!-- You can override this target in the ../build.xml file. -->
  10.334      </target>
  10.335 -    <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"/>
  10.336 +    <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"/>
  10.337      <!--
  10.338                  =================
  10.339                  EXECUTION SECTION
  10.340 @@ -609,7 +687,7 @@
  10.341                  JAVADOC SECTION
  10.342                  ===============
  10.343              -->
  10.344 -    <target depends="init" name="-javadoc-build">
  10.345 +    <target depends="init" if="have.sources" name="-javadoc-build">
  10.346          <mkdir dir="${dist.javadoc.dir}"/>
  10.347          <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}">
  10.348              <classpath>
  10.349 @@ -643,7 +721,7 @@
  10.350          <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
  10.351      </target>
  10.352      <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
  10.353 -        <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
  10.354 +        <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}"/>
  10.355          <copy todir="${build.test.classes.dir}">
  10.356              <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
  10.357          </copy>
  10.358 @@ -660,7 +738,7 @@
  10.359      <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
  10.360          <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
  10.361          <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>
  10.362 -        <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}"/>
  10.363 +        <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}"/>
  10.364          <copy todir="${build.test.classes.dir}">
  10.365              <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
  10.366          </copy>
    11.1 --- a/java/nekurak.net-lib/nbproject/genfiles.properties	Thu Jun 17 15:12:30 2010 +0200
    11.2 +++ b/java/nekurak.net-lib/nbproject/genfiles.properties	Sat Jun 19 11:19:27 2010 +0200
    11.3 @@ -1,8 +1,8 @@
    11.4  build.xml.data.CRC32=11ce77af
    11.5  build.xml.script.CRC32=f10c3672
    11.6 -build.xml.stylesheet.CRC32=958a1d3e@1.32.1.45
    11.7 +build.xml.stylesheet.CRC32=28e38971@1.38.1.45
    11.8  # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
    11.9  # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
   11.10  nbproject/build-impl.xml.data.CRC32=11ce77af
   11.11 -nbproject/build-impl.xml.script.CRC32=4e6301c4
   11.12 -nbproject/build-impl.xml.stylesheet.CRC32=576378a2@1.32.1.45
   11.13 +nbproject/build-impl.xml.script.CRC32=8db4fbcf
   11.14 +nbproject/build-impl.xml.stylesheet.CRC32=78c6a6ee@1.38.1.45
    12.1 --- a/java/nekurak.net-lib/src/cz/frantovo/nekurak/ejb/PodnikRemote.java	Thu Jun 17 15:12:30 2010 +0200
    12.2 +++ b/java/nekurak.net-lib/src/cz/frantovo/nekurak/ejb/PodnikRemote.java	Sat Jun 19 11:19:27 2010 +0200
    12.3 @@ -41,6 +41,7 @@
    12.4  
    12.5      /**
    12.6       * @param k komentář, který se má přidat k podniku
    12.7 +     * @param uloz true = vloží komentář | false = pouze zkontroluje (naformátuje obsah komentáře)
    12.8       */
    12.9 -    public void komentuj(Komentar k) throws KomentarovaVyjimka, TexyVyjimka;
   12.10 +    public Komentar komentuj(Komentar k, boolean uloz) throws KomentarovaVyjimka, TexyVyjimka;
   12.11  }
    13.1 --- a/java/nekurak.net-lib/src/cz/frantovo/nekurak/preklady_cs.properties	Thu Jun 17 15:12:30 2010 +0200
    13.2 +++ b/java/nekurak.net-lib/src/cz/frantovo/nekurak/preklady_cs.properties	Sat Jun 19 11:19:27 2010 +0200
    13.3 @@ -1,103 +1,108 @@
    13.4 -jazyk=\u010De\u0161tina
    13.5 +jazyk=\u010de\u0161tina
    13.6  
    13.7 -nazev=Neku\u0159\u00E1k.net
    13.8 -popis=Datab\u00E1ze neku\u0159\u00E1ck\u00FDch restaurac\u00ED.
    13.9 -licence=\u00A9 2010 nekurak.net. Licence: Affero GPL.
   13.10 +nazev=Neku\u0159\u00e1k.net
   13.11 +popis=Datab\u00e1ze neku\u0159\u00e1ck\u00fdch restaurac\u00ed.
   13.12 +licence=\u00a9 2010 nekurak.net. Licence: Affero GPL.
   13.13  
   13.14 -meta.popis=Datab\u00E1ze neku\u0159\u00E1ck\u00FDch hospod
   13.15 -meta.klicova-slova=restaurace, hospoda, kou\u0159en\u00ED, cigarety, tab\u00E1k, neku\u0159\u00E1ck\u00E1
   13.16 -meta.autor=Franti\u0161ek Ku\u010Dera \u2013 http://podnik.frantovo.cz/
   13.17 +meta.popis=Datab\u00e1ze neku\u0159\u00e1ck\u00fdch hospod
   13.18 +meta.klicova-slova=restaurace, hospoda, kou\u0159en\u00ed, cigarety, tab\u00e1k, neku\u0159\u00e1ck\u00e1
   13.19 +meta.autor=Franti\u0161ek Ku\u010dera \u2013 http://podnik.frantovo.cz/
   13.20  
   13.21 -uvod=\u00DAvod
   13.22 +uvod=\u00davod
   13.23  registrovatSe=Registrovat se
   13.24 -prihlasitSe=P\u0159ihl\u00E1sit se
   13.25 -odhlasitSe=Odhl\u00E1sit se
   13.26 +prihlasitSe=P\u0159ihl\u00e1sit se
   13.27 +odhlasitSe=Odhl\u00e1sit se
   13.28  pridatPodnik=P\u0159idat podnik
   13.29 -prihlasenyUzivatel=P\u0159ihl\u00E1\u0161en\u00FD u\u017Eivatel
   13.30 +prihlasenyUzivatel=P\u0159ihl\u00e1\u0161en\u00fd u\u017eivatel
   13.31  
   13.32 -prepinaniJazyku.cestina=\u010De\u0161tina
   13.33 -prepinaniJazyku.cestina.tip=str\u00E1nka ji\u017E je v \u010De\u0161tin\u011B
   13.34 +prepinaniJazyku.cestina=\u010de\u0161tina
   13.35 +prepinaniJazyku.cestina.tip=str\u00e1nka ji\u017e je v \u010de\u0161tin\u011b
   13.36  prepinaniJazyku.slovenstina=sloven\u0161tina
   13.37  prepinaniJazyku.slovenstina.tip=p\u0159epnout na sloven\u0161tinu
   13.38 -prepinaniJazyku.anglictina=angli\u010Dtina
   13.39 -prepinaniJazyku.anglictina.tip=p\u0159epnout na angli\u010Dtinu
   13.40 +prepinaniJazyku.anglictina=angli\u010dtina
   13.41 +prepinaniJazyku.anglictina.tip=p\u0159epnout na angli\u010dtinu
   13.42  
   13.43 -chybovaStranka.404.nazev=404 Str\u00E1nka nenalezena
   13.44 -chybovaStranka.404.popis=Takovou str\u00E1nku tu bohu\u017Eel nem\u00E1me.
   13.45 -chybovaStranka.500.nazev=500 Intern\u00ED chyba serveru
   13.46 -chybovaStranka.500.popis=N\u011Bco se bohu\u017Eel nepovedlo.
   13.47 +chybovaStranka.404.nazev=404 Str\u00e1nka nenalezena
   13.48 +chybovaStranka.404.popis=Takovou str\u00e1nku tu bohu\u017eel nem\u00e1me.
   13.49 +chybovaStranka.500.nazev=500 Intern\u00ed chyba serveru
   13.50 +chybovaStranka.500.popis=N\u011bco se bohu\u017eel nepovedlo.
   13.51  
   13.52 -uvod.naposledyPridanePodniky=Naposledy p\u0159idan\u00E9 podniky
   13.53 -uvod.www=www str\u00E1nka
   13.54 +uvod.naposledyPridanePodniky=Naposledy p\u0159idan\u00e9 podniky
   13.55 +uvod.www=www str\u00e1nka
   13.56  uvod.adresa=Adresa
   13.57  
   13.58  
   13.59 -prihlaseni.odhlaseniUspesne=Odhl\u00E1\u0161en\u00ED prob\u011Bhlo \u00FAsp\u011B\u0161n\u011B.
   13.60 -prihlaseni.nadpis=P\u0159ihl\u00E1\u0161en\u00ED
   13.61 -prihlaseni.nadpis.odhlaseni=Odhl\u00E1\u0161en\u00ED
   13.62 -prihlaseni.zadejte=Zadejte jm\u00E9no a heslo.
   13.63 -prihlaseni.chyba=Nespr\u00E1vn\u00E9 jm\u00E9no nebo heslo, zkuste to pros\u00EDm znovu.
   13.64 -prihlaseni.jmeno=Jm\u00E9no
   13.65 +prihlaseni.odhlaseniUspesne=Odhl\u00e1\u0161en\u00ed prob\u011bhlo \u00fasp\u011b\u0161n\u011b.
   13.66 +prihlaseni.nadpis=P\u0159ihl\u00e1\u0161en\u00ed
   13.67 +prihlaseni.nadpis.odhlaseni=Odhl\u00e1\u0161en\u00ed
   13.68 +prihlaseni.zadejte=Zadejte jm\u00e9no a heslo.
   13.69 +prihlaseni.chyba=Nespr\u00e1vn\u00e9 jm\u00e9no nebo heslo, zkuste to pros\u00edm znovu.
   13.70 +prihlaseni.jmeno=Jm\u00e9no
   13.71  prihlaseni.heslo=Heslo
   13.72 -prihlaseni.tlacitko=P\u0159ihl\u00E1sit se
   13.73 +prihlaseni.tlacitko=P\u0159ihl\u00e1sit se
   13.74  
   13.75 -pridatPodnik.nadpis=P\u0159id\u00E1n\u00ED nov\u00E9ho podniku
   13.76 -pridatPodnik.bylPridan=Podnik byl \u00FAsp\u011B\u0161n\u011B p\u0159id\u00E1n.
   13.77 -pridatPodnik.nebylPridan=P\u0159i p\u0159id\u00E1v\u00E1n\u00ED podniku do\u0161lo k chyb\u011B. Zkontrolujte pros\u00EDm zadan\u00E9 \u00FAdaje.
   13.78 +pridatPodnik.nadpis=P\u0159id\u00e1n\u00ed nov\u00e9ho podniku
   13.79 +pridatPodnik.bylPridan=Podnik byl \u00fasp\u011b\u0161n\u011b p\u0159id\u00e1n.
   13.80 +pridatPodnik.nebylPridan=P\u0159i p\u0159id\u00e1v\u00e1n\u00ed podniku do\u0161lo k chyb\u011b. Zkontrolujte pros\u00edm zadan\u00e9 \u00fadaje.
   13.81  pridatPodnik.tlacitko=P\u0159idat podnik
   13.82  
   13.83 -dto.podnik.nazev=N\u00E1zev
   13.84 +dto.podnik.nazev=N\u00e1zev
   13.85  dto.podnik.popis=Popis
   13.86  dto.podnik.url=URL
   13.87 -dto.podnik.url.tip=www str\u00E1nka
   13.88 +dto.podnik.url.tip=www str\u00e1nka
   13.89  dto.podnik.datum=Datum
   13.90  dto.podnik.ulice=Ulice
   13.91 -dto.podnik.cisloPopisne=\u010D.p.
   13.92 -dto.podnik.cisloPopisne.tip=\u010D\u00EDslo popisn\u00E9
   13.93 -dto.podnik.mesto=M\u011Bsto
   13.94 +dto.podnik.cisloPopisne=\u010d.p.
   13.95 +dto.podnik.cisloPopisne.tip=\u010d\u00edslo popisn\u00e9
   13.96 +dto.podnik.mesto=M\u011bsto
   13.97  
   13.98 -registrace.nadpis=Registrace nov\u00E9ho u\u017Eivatele
   13.99 -registrace.kontrola=Zkontrolujte pros\u00EDm zadan\u00E9 \u00FAdaje.
  13.100 -registrace.hotovo=\u00DA\u010Det byl \u00FAsp\u011B\u0161n\u011B zalo\u017Een, m\u016F\u017Eete se
  13.101 -registrace.hotovo.prihlasit=p\u0159ihl\u00E1sit
  13.102 +registrace.nadpis=Registrace nov\u00e9ho u\u017eivatele
  13.103 +registrace.kontrola=Zkontrolujte pros\u00edm zadan\u00e9 \u00fadaje.
  13.104 +registrace.hotovo=\u00da\u010det byl \u00fasp\u011b\u0161n\u011b zalo\u017een, m\u016f\u017eete se
  13.105 +registrace.hotovo.prihlasit=p\u0159ihl\u00e1sit
  13.106  registrace.tlacitko=Registrovat se
  13.107  registrace.potvrdit=Potvrdit registraci
  13.108 -registrace.vyjimka=Nepoda\u0159ilo se zalo\u017Eit u\u017Eivatele. Po\u017Eadovan\u00E1 p\u0159ezd\u00EDvka je pravd\u011Bpodobn\u011B obsazena.
  13.109 -registrace.vyjimka.necekana=Omlouv\u00E1me se, b\u011Bhem registrace do\u0161lo k nezn\u00E1m\u00E9 chyb\u011B.
  13.110 -registrace.vyjimka.token=Relace vypr\u0161ela, registraci nelze dokon\u010Dit. Vypl\u0148te pros\u00EDm formul\u00E1\u0159 znovu.
  13.111 -registrace.vyjimka.heslaSeNeshoduji=Hesla se neshoduj\u00ED. Pro kontrolu je pot\u0159eba vyplnit stejn\u00E9 heslo dvakr\u00E1t.
  13.112 -registrace.email.predmet=V\u00EDtejte na serveru Neku\u0159\u00E1k.net
  13.113 -registrace.email.text=Srde\u010Dn\u011B v\u00EDt\u00E1me nov\u00E9ho u\u017Eivatele: {0} \nVa\u0161e p\u0159ezd\u00EDvka: {1}
  13.114 +registrace.vyjimka=Nepoda\u0159ilo se zalo\u017eit u\u017eivatele. Po\u017eadovan\u00e1 p\u0159ezd\u00edvka je pravd\u011bpodobn\u011b obsazena.
  13.115 +registrace.vyjimka.necekana=Omlouv\u00e1me se, b\u011bhem registrace do\u0161lo k nezn\u00e1m\u00e9 chyb\u011b.
  13.116 +registrace.vyjimka.token=Relace vypr\u0161ela, registraci nelze dokon\u010dit. Vypl\u0148te pros\u00edm formul\u00e1\u0159 znovu.
  13.117 +registrace.vyjimka.heslaSeNeshoduji=Hesla se neshoduj\u00ed. Pro kontrolu je pot\u0159eba vyplnit stejn\u00e9 heslo dvakr\u00e1t.
  13.118 +registrace.email.predmet=V\u00edtejte na serveru Neku\u0159\u00e1k.net
  13.119 +registrace.email.text=Srde\u010dn\u011b v\u00edt\u00e1me nov\u00e9ho u\u017eivatele: {0} \nVa\u0161e p\u0159ezd\u00edvka: {1}
  13.120  
  13.121 -dto.uzivatel.prezdivka=P\u0159ezd\u00EDvka
  13.122 -dto.uzivatel.prezdivka.tip=U\u017Eivatelsk\u00E9 jm\u00E9no
  13.123 +dto.uzivatel.prezdivka=P\u0159ezd\u00edvka
  13.124 +dto.uzivatel.prezdivka.tip=U\u017eivatelsk\u00e9 jm\u00e9no
  13.125  dto.uzivatel.heslo=Heslo
  13.126  dto.uzivatel.heslo.kontrola=Heslo znovu
  13.127 -dto.uzivatel.jmeno=Jm\u00E9no
  13.128 -dto.uzivatel.prijmeni=P\u0159\u00EDjmen\u00ED
  13.129 +dto.uzivatel.jmeno=Jm\u00e9no
  13.130 +dto.uzivatel.prijmeni=P\u0159\u00edjmen\u00ed
  13.131  dto.uzivatel.email=e-mail
  13.132  
  13.133 -hlasovani.graf.nadpis=M\u011Blo by se tu
  13.134 -hlasovani.graf.zadneHlasy=(zat\u00EDm nikdo nehlasoval)
  13.135 -hlasovani.graf.popisSloupce=hlas\u016F: {0}
  13.136 +hlasovani.graf.nadpis=M\u011blo by se tu
  13.137 +hlasovani.graf.zadneHlasy=(zat\u00edm nikdo nehlasoval)
  13.138 +hlasovani.graf.popisSloupce=hlas\u016f: {0}
  13.139  hlasovani.graf.kourit=kou\u0159it
  13.140  hlasovani.graf.nekourit=nekou\u0159it
  13.141  hlasovani.TODO=TODO: lokalizovat Javascript
  13.142  
  13.143 -komentare.vypisNadpis=Koment\u00E1\u0159e k tomuto podniku
  13.144 -komentare.prihlasitSe=Pro vkl\u00E1d\u00E1n\u00ED koment\u00E1\u0159\u016F se pros\u00EDm p\u0159ihla\u0161te.
  13.145 -komentare.zadneKomentare=Zat\u00EDm nikdo nekomentoval.
  13.146 +komentare.vypisNadpis=Koment\u00e1\u0159e k tomuto podniku
  13.147 +komentare.prihlasitSe=Pro vkl\u00e1d\u00e1n\u00ed koment\u00e1\u0159\u016f se pros\u00edm p\u0159ihla\u0161te.
  13.148 +komentare.zadneKomentare=Zat\u00edm nikdo nekomentoval.
  13.149  komentare.komentovat=Komentovat!
  13.150  komentare.nadpis=Nadpis
  13.151 -komentare.tlacitkoOdeslat=Vlo\u017Eit koment\u00E1\u0159
  13.152 +komentare.tlacitkoOdeslat=Vlo\u017eit koment\u00e1\u0159
  13.153 +komentare.tlacitkoNahled=N\u00e1hled
  13.154  komentare.napsal=Napsal
  13.155 -komentar.odeslat.nadpis=Vlo\u017Een\u00ED koment\u00E1\u0159e
  13.156 -komentar.odeslat.ok=Koment\u00E1\u0159 byl \u00FAsp\u011B\u0161n\u011B vlo\u017Een
  13.157 -komentar.odeslat.pokracujte=pokra\u010Dujte na str\u00E1nku podniku
  13.158 -komentar.odeslat.chyba=Koment\u00E1\u0159 obsahuje nepovolen\u00E9 form\u00E1tov\u00E1n\u00ED.
  13.159 -komentar.typ.prostyText=Prost\u00FD text
  13.160 -komentar.typ.xhtml=XHTML form\u00E1tovan\u00FD text
  13.161 -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;.
  13.162 -komentar.typ.texy=Texy form\u00E1tovan\u00FD text
  13.163 -komentar.nejdeZobrazit=Tento koment\u00E1\u0159 bohu\u017Eel nelze z technick\u00FDch d\u016Fvod\u016F zobrazit.
  13.164 +komentare.nahledNadpis=Takhle bude vypadat v\u00e1\u0161 koment\u00e1\u0159
  13.165 +komentare.nahledChybaFormatu=Koment\u00e1\u0159 obsahuje nepovolen\u00e9 form\u00e1tov\u00e1n\u00ed.
  13.166 +komentare.nahledChybaPrihlaseni=Koment\u00e1\u0159e mohou vkl\u00e1dat pouze p\u0159ihl\u00e1\u0161en\u00ed u\u017eivatel\u00e9.
  13.167 +komentare.nahledOdeslano=Koment\u00e1\u0159 byl \u00fasp\u011b\u0161n\u011b ulo\u017een
  13.168 +komentar.odeslat.nadpis=Vlo\u017een\u00ed koment\u00e1\u0159e
  13.169 +komentar.odeslat.ok=Koment\u00e1\u0159 byl \u00fasp\u011b\u0161n\u011b vlo\u017een
  13.170 +komentar.odeslat.pokracujte=pokra\u010dujte na str\u00e1nku podniku
  13.171 +komentar.odeslat.chyba=Koment\u00e1\u0159 obsahuje nepovolen\u00e9 form\u00e1tov\u00e1n\u00ed.
  13.172 +komentar.typ.prostyText=Prost\u00fd text
  13.173 +komentar.typ.xhtml=XHTML form\u00e1tovan\u00fd text
  13.174 +komentar.typ.xhtml.povoleneZnacky=Povolen\u00e9 zna\u010dky jsou: p, strong, em a br.
  13.175 +komentar.typ.texy=Texy form\u00e1tovan\u00fd text
  13.176 +komentar.nejdeZobrazit=Tento koment\u00e1\u0159 bohu\u017eel nelze z technick\u00fdch d\u016fvod\u016f zobrazit.
  13.177  
    14.1 --- a/java/nekurak.net-rest/nbproject/ant-deploy.xml	Thu Jun 17 15:12:30 2010 +0200
    14.2 +++ b/java/nekurak.net-rest/nbproject/ant-deploy.xml	Sat Jun 19 11:19:27 2010 +0200
    14.3 @@ -24,7 +24,7 @@
    14.4          </xmlproperty>    
    14.5          <delete file="${temp.sun.web}"/>
    14.6          <property name="deploy.ant.client.url" value="${gfv3.url}${sun-web-app.context-root}"/>
    14.7 -        <property name="deploy.context.root.argument" value="?contextroot=${sun-web-app.context-root}"/>
    14.8 +        <property name="deploy.context.root.argument" value="&amp;contextroot=${sun-web-app.context-root}"/>
    14.9      </target>
   14.10      <target name="-no-parse-sun-web" depends="-init-cl-deployment-env" unless="sun.web.present">
   14.11          <property name="deploy.context.root.argument" value=""/>
   14.12 @@ -43,18 +43,43 @@
   14.13          <delete dir="${gfv3.resources.dir}"/>
   14.14      </target>
   14.15      <target name="-deploy-ant" depends="-parse-sun-web,-no-parse-sun-web,-add-resources" if="deploy.ant.enabled">
   14.16 +        <antcall target="-deploy-without-pw"/>
   14.17 +        <antcall target="-deploy-with-pw"/>
   14.18 +    </target>
   14.19 +
   14.20 +    <target name="-deploy-without-pw" unless="gfv3.password">
   14.21          <echo message="Deploying ${deploy.ant.archive}"/>
   14.22          <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
   14.23          <property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
   14.24 -        <get src="${gfv3.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}?force=true?name=${ant.project.name}"
   14.25 +        <get src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&amp;force=true&amp;name=${ant.project.name}"
   14.26              dest="${gfv3.results.file}"/>
   14.27          <delete file="${gfv3.results.file}"/>    
   14.28      </target>
   14.29 +    <target name="-deploy-with-pw" if="gfv3.password">
   14.30 +        <echo message="Deploying ${deploy.ant.archive}"/>
   14.31 +        <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
   14.32 +        <property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
   14.33 +        <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}"
   14.34 +            dest="${gfv3.results.file}"/>
   14.35 +        <delete file="${gfv3.results.file}"/>
   14.36 +    </target>
   14.37      <target name="-undeploy-ant" depends="-init-cl-deployment-env" if="deploy.ant.enabled">
   14.38 +        <antcall target="-undeploy-without-pw"/>
   14.39 +        <antcall target="-undeploy-with-pw"/>
   14.40 +    </target>
   14.41 +
   14.42 +    <target name="-undeploy-without-pw" unless="gfv3.password">
   14.43          <echo message="Undeploying ${deploy.ant.archive}"/>
   14.44          <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
   14.45 -        <get src="${gfv3.url}/__asadmin/undeploy?name=${ant.project.name}"
   14.46 +        <get src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
   14.47              dest="${gfv3.results.file}"/>
   14.48          <delete file="${gfv3.results.file}"/>    
   14.49      </target>
   14.50 +    <target name="-undeploy-with-pw" if="gfv3.password">
   14.51 +        <echo message="Undeploying ${deploy.ant.archive}"/>
   14.52 +        <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
   14.53 +        <get username="${gfv3.username}" password="${gfv3.password}" src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
   14.54 +            dest="${gfv3.results.file}"/>
   14.55 +        <delete file="${gfv3.results.file}"/>
   14.56 +    </target>
   14.57  </project>
    15.1 --- a/java/nekurak.net-rest/nbproject/build-impl.xml	Thu Jun 17 15:12:30 2010 +0200
    15.2 +++ b/java/nekurak.net-rest/nbproject/build-impl.xml	Sat Jun 19 11:19:27 2010 +0200
    15.3 @@ -199,6 +199,20 @@
    15.4          <fail unless="build.test.results.dir">Must set build.test.results.dir</fail>
    15.5          <fail unless="build.classes.excludes">Must set build.classes.excludes</fail>
    15.6          <fail unless="dist.war">Must set dist.war</fail>
    15.7 +        <condition property="missing.j2ee.server.home">
    15.8 +            <and>
    15.9 +                <matches pattern="j2ee.server.home" string="${j2ee.platform.classpath}"/>
   15.10 +                <not>
   15.11 +                    <isset property="j2ee.server.home"/>
   15.12 +                </not>
   15.13 +            </and>
   15.14 +        </condition>
   15.15 +        <fail if="missing.j2ee.server.home">
   15.16 +The Java EE server classpath is not correctly set up - server home directory is missing.
   15.17 +Either open the project in the IDE and assign the server or setup the server classpath manually.
   15.18 +For example like this:
   15.19 +   ant -Dj2ee.server.home=&lt;app_server_installation_directory&gt;
   15.20 +                </fail>
   15.21          <fail unless="j2ee.platform.classpath">
   15.22  The Java EE server classpath is not correctly set up. Your active server type is ${j2ee.server.type}.
   15.23  Either open the project in the IDE and assign the server or setup the server classpath manually.
   15.24 @@ -216,11 +230,51 @@
   15.25              </sequential>
   15.26          </macrodef>
   15.27      </target>
   15.28 -    <target name="-init-macrodef-javac">
   15.29 +    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">
   15.30          <macrodef name="javac" uri="http://www.netbeans.org/ns/web-project/2">
   15.31              <attribute default="${src.dir}" name="srcdir"/>
   15.32              <attribute default="${build.classes.dir}" name="destdir"/>
   15.33              <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
   15.34 +            <attribute default="${javac.processorpath}" name="processorpath"/>
   15.35 +            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
   15.36 +            <attribute default="${includes}" name="includes"/>
   15.37 +            <attribute default="${excludes}" name="excludes"/>
   15.38 +            <attribute default="${javac.debug}" name="debug"/>
   15.39 +            <attribute default="${empty.dir}" name="gensrcdir"/>
   15.40 +            <element name="customize" optional="true"/>
   15.41 +            <sequential>
   15.42 +                <property location="${build.dir}/empty" name="empty.dir"/>
   15.43 +                <mkdir dir="${empty.dir}"/>
   15.44 +                <mkdir dir="@{apgeneratedsrcdir}"/>
   15.45 +                <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}">
   15.46 +                    <src>
   15.47 +                        <dirset dir="@{gensrcdir}" erroronmissingdir="false">
   15.48 +                            <include name="*"/>
   15.49 +                        </dirset>
   15.50 +                    </src>
   15.51 +                    <classpath>
   15.52 +                        <path path="@{classpath}"/>
   15.53 +                    </classpath>
   15.54 +                    <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
   15.55 +                    <compilerarg line="${javac.compilerargs}"/>
   15.56 +                    <compilerarg value="-processorpath"/>
   15.57 +                    <compilerarg path="@{processorpath}:${empty.dir}"/>
   15.58 +                    <compilerarg line="${ap.processors.internal}"/>
   15.59 +                    <compilerarg value="-s"/>
   15.60 +                    <compilerarg path="@{apgeneratedsrcdir}"/>
   15.61 +                    <compilerarg line="${ap.proc.none.internal}"/>
   15.62 +                    <customize/>
   15.63 +                </javac>
   15.64 +            </sequential>
   15.65 +        </macrodef>
   15.66 +    </target>
   15.67 +    <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
   15.68 +        <macrodef name="javac" uri="http://www.netbeans.org/ns/web-project/2">
   15.69 +            <attribute default="${src.dir}" name="srcdir"/>
   15.70 +            <attribute default="${build.classes.dir}" name="destdir"/>
   15.71 +            <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
   15.72 +            <attribute default="${javac.processorpath}" name="processorpath"/>
   15.73 +            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
   15.74              <attribute default="${includes}" name="includes"/>
   15.75              <attribute default="${excludes}" name="excludes"/>
   15.76              <attribute default="${javac.debug}" name="debug"/>
   15.77 @@ -245,6 +299,35 @@
   15.78              </sequential>
   15.79          </macrodef>
   15.80      </target>
   15.81 +    <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
   15.82 +        <macrodef name="depend" uri="http://www.netbeans.org/ns/web-project/2">
   15.83 +            <attribute default="${src.dir}" name="srcdir"/>
   15.84 +            <attribute default="${build.classes.dir}" name="destdir"/>
   15.85 +            <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
   15.86 +            <sequential>
   15.87 +                <depend cache="${build.dir}/depcache" destdir="@{destdir}" excludes="${excludes}" includes="${includes}" srcdir="@{srcdir}">
   15.88 +                    <classpath>
   15.89 +                        <path path="@{classpath}"/>
   15.90 +                    </classpath>
   15.91 +                </depend>
   15.92 +            </sequential>
   15.93 +        </macrodef>
   15.94 +        <macrodef name="force-recompile" uri="http://www.netbeans.org/ns/web-project/2">
   15.95 +            <attribute default="${build.classes.dir}" name="destdir"/>
   15.96 +            <sequential>
   15.97 +                <fail unless="javac.includes">Must set javac.includes</fail>
   15.98 +                <pathconvert pathsep="," property="javac.includes.binary">
   15.99 +                    <path>
  15.100 +                        <filelist dir="@{destdir}" files="${javac.includes}"/>
  15.101 +                    </path>
  15.102 +                    <globmapper from="*.java" to="*.class"/>
  15.103 +                </pathconvert>
  15.104 +                <delete>
  15.105 +                    <files includes="${javac.includes.binary}"/>
  15.106 +                </delete>
  15.107 +            </sequential>
  15.108 +        </macrodef>
  15.109 +    </target>
  15.110      <target name="-init-macrodef-junit">
  15.111          <macrodef name="junit" uri="http://www.netbeans.org/ns/web-project/2">
  15.112              <attribute default="${includes}" name="includes"/>
  15.113 @@ -387,7 +470,30 @@
  15.114                  </fail>
  15.115          <taskdef classpath="${libs.CopyLibs.classpath}" resource="org/netbeans/modules/java/j2seproject/copylibstask/antlib.xml"/>
  15.116      </target>
  15.117 -    <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"/>
  15.118 +    <target name="-init-ap-cmdline-properties">
  15.119 +        <property name="annotation.processing.enabled" value="true"/>
  15.120 +        <property name="annotation.processing.processors.list" value=""/>
  15.121 +        <property name="annotation.processing.run.all.processors" value="true"/>
  15.122 +        <property name="javac.processorpath" value="${javac.classpath}"/>
  15.123 +        <property name="javac.test.processorpath" value="${javac.test.classpath}"/>
  15.124 +        <condition property="ap.supported.internal" value="true">
  15.125 +            <not>
  15.126 +                <matches pattern="1\.[0-5](\..*)?" string="${javac.source}"/>
  15.127 +            </not>
  15.128 +        </condition>
  15.129 +    </target>
  15.130 +    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-ap-cmdline-supported">
  15.131 +        <condition else="" property="ap.processors.internal" value="-processor ${annotation.processing.processors.list}">
  15.132 +            <isfalse value="${annotation.processing.run.all.processors}"/>
  15.133 +        </condition>
  15.134 +        <condition else="" property="ap.proc.none.internal" value="-proc:none">
  15.135 +            <isfalse value="${annotation.processing.enabled}"/>
  15.136 +        </condition>
  15.137 +    </target>
  15.138 +    <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline">
  15.139 +        <property name="ap.cmd.line.internal" value=""/>
  15.140 +    </target>
  15.141 +    <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"/>
  15.142      <!--
  15.143                  COMPILATION SECTION
  15.144              -->
  15.145 @@ -467,10 +573,10 @@
  15.146              <arg value="-compilerSourceVM ${javac.source}"/>
  15.147              <arg value="-compilerTargetVM ${javac.target}"/>
  15.148              <arg value="-javaEncoding ${source.encoding}"/>
  15.149 -            <classpath path="${java.home}/../lib/tools.jar:${jspctask.classpath}:${jspcompilation.classpath}"/>
  15.150 +            <classpath path="${java.home}/../lib/tools.jar:${libs.jsp-compiler.classpath}:${libs.jsp-compilation.classpath}"/>
  15.151          </java>
  15.152          <mkdir dir="${build.generated.dir}/classes"/>
  15.153 -        <webproject2:javac classpath="${j2ee.platform.classpath}:${build.classes.dir}:${jspcompilation.classpath}" destdir="${build.generated.dir}/classes" srcdir="${build.generated.dir}/src"/>
  15.154 +        <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"/>
  15.155      </target>
  15.156      <target depends="compile" if="jsp.includes" name="-do-compile-single-jsp">
  15.157          <fail unless="javac.jsp.includes">Must select some files in the IDE or set javac.jsp.includes</fail>
  15.158 @@ -486,10 +592,10 @@
  15.159              <arg value="-compilerSourceVM ${javac.source}"/>
  15.160              <arg value="-compilerTargetVM ${javac.target}"/>
  15.161              <arg value="-javaEncoding ${source.encoding}"/>
  15.162 -            <classpath path="${java.home}/../lib/tools.jar:${jspctask.classpath}:${jspcompilation.classpath}"/>
  15.163 +            <classpath path="${java.home}/../lib/tools.jar:${libs.jsp-compiler.classpath}:${libs.jsp-compilation.classpath}"/>
  15.164          </java>
  15.165          <mkdir dir="${build.generated.dir}/classes"/>
  15.166 -        <webproject2:javac classpath="${j2ee.platform.classpath}:${build.classes.dir}:${jspcompilation.classpath}" destdir="${build.generated.dir}/classes" srcdir="${build.generated.dir}/src">
  15.167 +        <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">
  15.168              <customize>
  15.169                  <patternset includes="${javac.jsp.includes}"/>
  15.170              </customize>
  15.171 @@ -724,7 +830,7 @@
  15.172      <!--
  15.173                  JAVADOC SECTION
  15.174              -->
  15.175 -    <target depends="init" name="javadoc-build">
  15.176 +    <target depends="init" if="have.sources" name="javadoc-build">
  15.177          <mkdir dir="${dist.javadoc.dir}"/>
  15.178          <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}">
  15.179              <classpath>
    16.1 --- a/java/nekurak.net-rest/nbproject/genfiles.properties	Thu Jun 17 15:12:30 2010 +0200
    16.2 +++ b/java/nekurak.net-rest/nbproject/genfiles.properties	Sat Jun 19 11:19:27 2010 +0200
    16.3 @@ -1,11 +1,11 @@
    16.4  build.xml.data.CRC32=35b9fabc
    16.5  build.xml.script.CRC32=fb1b7f84
    16.6 -build.xml.stylesheet.CRC32=c0ebde35@1.21.2.1
    16.7 +build.xml.stylesheet.CRC32=651128d4@1.24.1.1
    16.8  # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
    16.9  # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
   16.10  nbproject/build-impl.xml.data.CRC32=35b9fabc
   16.11 -nbproject/build-impl.xml.script.CRC32=41eb3ef9
   16.12 -nbproject/build-impl.xml.stylesheet.CRC32=b139b33b@1.21.2.1
   16.13 +nbproject/build-impl.xml.script.CRC32=3663fe21
   16.14 +nbproject/build-impl.xml.stylesheet.CRC32=8335d67d@1.24.1.1
   16.15  nbproject/rest-build.xml.data.CRC32=d32e8880
   16.16  nbproject/rest-build.xml.script.CRC32=23da2c77
   16.17  nbproject/rest-build.xml.stylesheet.CRC32=ddd64843@1.4.1
    17.1 --- a/java/nekurak.net-rest/nbproject/project.properties	Thu Jun 17 15:12:30 2010 +0200
    17.2 +++ b/java/nekurak.net-rest/nbproject/project.properties	Sat Jun 19 11:19:27 2010 +0200
    17.3 @@ -1,3 +1,8 @@
    17.4 +annotation.processing.enabled=true
    17.5 +annotation.processing.enabled.in.editor=true
    17.6 +annotation.processing.processors.list=
    17.7 +annotation.processing.run.all.processors=true
    17.8 +annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
    17.9  build.classes.dir=${build.web.dir}/WEB-INF/classes
   17.10  build.classes.excludes=**/*.java,**/*.form
   17.11  build.dir=build
   17.12 @@ -24,6 +29,12 @@
   17.13  includes=**
   17.14  j2ee.deploy.on.save=false
   17.15  j2ee.platform=1.6-web
   17.16 +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
   17.17 +j2ee.platform.embeddableejb.classpath=${j2ee.server.home}/lib/embedded/glassfish-embedded-static-shell.jar
   17.18 +j2ee.platform.wscompile.classpath=${j2ee.server.home}/modules/webservices-osgi.jar
   17.19 +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
   17.20 +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
   17.21 +j2ee.platform.wsit.classpath=
   17.22  j2ee.server.type=gfv3ee6
   17.23  jar.compress=false
   17.24  javac.classpath=\
   17.25 @@ -32,6 +43,7 @@
   17.26  javac.compilerargs=
   17.27  javac.debug=true
   17.28  javac.deprecation=false
   17.29 +javac.processorpath=${javac.classpath}
   17.30  javac.source=1.5
   17.31  javac.target=1.5
   17.32  javac.test.classpath=\
   17.33 @@ -39,6 +51,7 @@
   17.34      ${build.classes.dir}:\
   17.35      ${libs.junit.classpath}:\
   17.36      ${libs.junit_4.classpath}
   17.37 +javac.test.processorpath=${javac.test.classpath}
   17.38  javadoc.additionalparam=
   17.39  javadoc.author=false
   17.40  javadoc.encoding=${source.encoding}
    18.1 --- a/java/nekurak.net-web/nbproject/ant-deploy.xml	Thu Jun 17 15:12:30 2010 +0200
    18.2 +++ b/java/nekurak.net-web/nbproject/ant-deploy.xml	Sat Jun 19 11:19:27 2010 +0200
    18.3 @@ -24,7 +24,7 @@
    18.4          </xmlproperty>    
    18.5          <delete file="${temp.sun.web}"/>
    18.6          <property name="deploy.ant.client.url" value="${gfv3.url}${sun-web-app.context-root}"/>
    18.7 -        <property name="deploy.context.root.argument" value="?contextroot=${sun-web-app.context-root}"/>
    18.8 +        <property name="deploy.context.root.argument" value="&amp;contextroot=${sun-web-app.context-root}"/>
    18.9      </target>
   18.10      <target name="-no-parse-sun-web" depends="-init-cl-deployment-env" unless="sun.web.present">
   18.11          <property name="deploy.context.root.argument" value=""/>
   18.12 @@ -43,18 +43,43 @@
   18.13          <delete dir="${gfv3.resources.dir}"/>
   18.14      </target>
   18.15      <target name="-deploy-ant" depends="-parse-sun-web,-no-parse-sun-web,-add-resources" if="deploy.ant.enabled">
   18.16 +        <antcall target="-deploy-without-pw"/>
   18.17 +        <antcall target="-deploy-with-pw"/>
   18.18 +    </target>
   18.19 +
   18.20 +    <target name="-deploy-without-pw" unless="gfv3.password">
   18.21          <echo message="Deploying ${deploy.ant.archive}"/>
   18.22          <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
   18.23          <property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
   18.24 -        <get src="${gfv3.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}?force=true?name=${ant.project.name}"
   18.25 +        <get src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&amp;force=true&amp;name=${ant.project.name}"
   18.26              dest="${gfv3.results.file}"/>
   18.27          <delete file="${gfv3.results.file}"/>    
   18.28      </target>
   18.29 +    <target name="-deploy-with-pw" if="gfv3.password">
   18.30 +        <echo message="Deploying ${deploy.ant.archive}"/>
   18.31 +        <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
   18.32 +        <property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
   18.33 +        <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}"
   18.34 +            dest="${gfv3.results.file}"/>
   18.35 +        <delete file="${gfv3.results.file}"/>
   18.36 +    </target>
   18.37      <target name="-undeploy-ant" depends="-init-cl-deployment-env" if="deploy.ant.enabled">
   18.38 +        <antcall target="-undeploy-without-pw"/>
   18.39 +        <antcall target="-undeploy-with-pw"/>
   18.40 +    </target>
   18.41 +
   18.42 +    <target name="-undeploy-without-pw" unless="gfv3.password">
   18.43          <echo message="Undeploying ${deploy.ant.archive}"/>
   18.44          <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
   18.45 -        <get src="${gfv3.url}/__asadmin/undeploy?name=${ant.project.name}"
   18.46 +        <get src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
   18.47              dest="${gfv3.results.file}"/>
   18.48          <delete file="${gfv3.results.file}"/>    
   18.49      </target>
   18.50 +    <target name="-undeploy-with-pw" if="gfv3.password">
   18.51 +        <echo message="Undeploying ${deploy.ant.archive}"/>
   18.52 +        <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
   18.53 +        <get username="${gfv3.username}" password="${gfv3.password}" src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
   18.54 +            dest="${gfv3.results.file}"/>
   18.55 +        <delete file="${gfv3.results.file}"/>
   18.56 +    </target>
   18.57  </project>
    19.1 --- a/java/nekurak.net-web/nbproject/build-impl.xml	Thu Jun 17 15:12:30 2010 +0200
    19.2 +++ b/java/nekurak.net-web/nbproject/build-impl.xml	Sat Jun 19 11:19:27 2010 +0200
    19.3 @@ -199,6 +199,20 @@
    19.4          <fail unless="build.test.results.dir">Must set build.test.results.dir</fail>
    19.5          <fail unless="build.classes.excludes">Must set build.classes.excludes</fail>
    19.6          <fail unless="dist.war">Must set dist.war</fail>
    19.7 +        <condition property="missing.j2ee.server.home">
    19.8 +            <and>
    19.9 +                <matches pattern="j2ee.server.home" string="${j2ee.platform.classpath}"/>
   19.10 +                <not>
   19.11 +                    <isset property="j2ee.server.home"/>
   19.12 +                </not>
   19.13 +            </and>
   19.14 +        </condition>
   19.15 +        <fail if="missing.j2ee.server.home">
   19.16 +The Java EE server classpath is not correctly set up - server home directory is missing.
   19.17 +Either open the project in the IDE and assign the server or setup the server classpath manually.
   19.18 +For example like this:
   19.19 +   ant -Dj2ee.server.home=&lt;app_server_installation_directory&gt;
   19.20 +                </fail>
   19.21          <fail unless="j2ee.platform.classpath">
   19.22  The Java EE server classpath is not correctly set up. Your active server type is ${j2ee.server.type}.
   19.23  Either open the project in the IDE and assign the server or setup the server classpath manually.
   19.24 @@ -216,11 +230,51 @@
   19.25              </sequential>
   19.26          </macrodef>
   19.27      </target>
   19.28 -    <target name="-init-macrodef-javac">
   19.29 +    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">
   19.30          <macrodef name="javac" uri="http://www.netbeans.org/ns/web-project/2">
   19.31              <attribute default="${src.dir}" name="srcdir"/>
   19.32              <attribute default="${build.classes.dir}" name="destdir"/>
   19.33              <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
   19.34 +            <attribute default="${javac.processorpath}" name="processorpath"/>
   19.35 +            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
   19.36 +            <attribute default="${includes}" name="includes"/>
   19.37 +            <attribute default="${excludes}" name="excludes"/>
   19.38 +            <attribute default="${javac.debug}" name="debug"/>
   19.39 +            <attribute default="${empty.dir}" name="gensrcdir"/>
   19.40 +            <element name="customize" optional="true"/>
   19.41 +            <sequential>
   19.42 +                <property location="${build.dir}/empty" name="empty.dir"/>
   19.43 +                <mkdir dir="${empty.dir}"/>
   19.44 +                <mkdir dir="@{apgeneratedsrcdir}"/>
   19.45 +                <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}">
   19.46 +                    <src>
   19.47 +                        <dirset dir="@{gensrcdir}" erroronmissingdir="false">
   19.48 +                            <include name="*"/>
   19.49 +                        </dirset>
   19.50 +                    </src>
   19.51 +                    <classpath>
   19.52 +                        <path path="@{classpath}"/>
   19.53 +                    </classpath>
   19.54 +                    <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
   19.55 +                    <compilerarg line="${javac.compilerargs}"/>
   19.56 +                    <compilerarg value="-processorpath"/>
   19.57 +                    <compilerarg path="@{processorpath}:${empty.dir}"/>
   19.58 +                    <compilerarg line="${ap.processors.internal}"/>
   19.59 +                    <compilerarg value="-s"/>
   19.60 +                    <compilerarg path="@{apgeneratedsrcdir}"/>
   19.61 +                    <compilerarg line="${ap.proc.none.internal}"/>
   19.62 +                    <customize/>
   19.63 +                </javac>
   19.64 +            </sequential>
   19.65 +        </macrodef>
   19.66 +    </target>
   19.67 +    <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
   19.68 +        <macrodef name="javac" uri="http://www.netbeans.org/ns/web-project/2">
   19.69 +            <attribute default="${src.dir}" name="srcdir"/>
   19.70 +            <attribute default="${build.classes.dir}" name="destdir"/>
   19.71 +            <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
   19.72 +            <attribute default="${javac.processorpath}" name="processorpath"/>
   19.73 +            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
   19.74              <attribute default="${includes}" name="includes"/>
   19.75              <attribute default="${excludes}" name="excludes"/>
   19.76              <attribute default="${javac.debug}" name="debug"/>
   19.77 @@ -245,6 +299,35 @@
   19.78              </sequential>
   19.79          </macrodef>
   19.80      </target>
   19.81 +    <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
   19.82 +        <macrodef name="depend" uri="http://www.netbeans.org/ns/web-project/2">
   19.83 +            <attribute default="${src.dir}" name="srcdir"/>
   19.84 +            <attribute default="${build.classes.dir}" name="destdir"/>
   19.85 +            <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
   19.86 +            <sequential>
   19.87 +                <depend cache="${build.dir}/depcache" destdir="@{destdir}" excludes="${excludes}" includes="${includes}" srcdir="@{srcdir}">
   19.88 +                    <classpath>
   19.89 +                        <path path="@{classpath}"/>
   19.90 +                    </classpath>
   19.91 +                </depend>
   19.92 +            </sequential>
   19.93 +        </macrodef>
   19.94 +        <macrodef name="force-recompile" uri="http://www.netbeans.org/ns/web-project/2">
   19.95 +            <attribute default="${build.classes.dir}" name="destdir"/>
   19.96 +            <sequential>
   19.97 +                <fail unless="javac.includes">Must set javac.includes</fail>
   19.98 +                <pathconvert pathsep="," property="javac.includes.binary">
   19.99 +                    <path>
  19.100 +                        <filelist dir="@{destdir}" files="${javac.includes}"/>
  19.101 +                    </path>
  19.102 +                    <globmapper from="*.java" to="*.class"/>
  19.103 +                </pathconvert>
  19.104 +                <delete>
  19.105 +                    <files includes="${javac.includes.binary}"/>
  19.106 +                </delete>
  19.107 +            </sequential>
  19.108 +        </macrodef>
  19.109 +    </target>
  19.110      <target name="-init-macrodef-junit">
  19.111          <macrodef name="junit" uri="http://www.netbeans.org/ns/web-project/2">
  19.112              <attribute default="${includes}" name="includes"/>
  19.113 @@ -387,7 +470,30 @@
  19.114                  </fail>
  19.115          <taskdef classpath="${libs.CopyLibs.classpath}" resource="org/netbeans/modules/java/j2seproject/copylibstask/antlib.xml"/>
  19.116      </target>
  19.117 -    <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"/>
  19.118 +    <target name="-init-ap-cmdline-properties">
  19.119 +        <property name="annotation.processing.enabled" value="true"/>
  19.120 +        <property name="annotation.processing.processors.list" value=""/>
  19.121 +        <property name="annotation.processing.run.all.processors" value="true"/>
  19.122 +        <property name="javac.processorpath" value="${javac.classpath}"/>
  19.123 +        <property name="javac.test.processorpath" value="${javac.test.classpath}"/>
  19.124 +        <condition property="ap.supported.internal" value="true">
  19.125 +            <not>
  19.126 +                <matches pattern="1\.[0-5](\..*)?" string="${javac.source}"/>
  19.127 +            </not>
  19.128 +        </condition>
  19.129 +    </target>
  19.130 +    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-ap-cmdline-supported">
  19.131 +        <condition else="" property="ap.processors.internal" value="-processor ${annotation.processing.processors.list}">
  19.132 +            <isfalse value="${annotation.processing.run.all.processors}"/>
  19.133 +        </condition>
  19.134 +        <condition else="" property="ap.proc.none.internal" value="-proc:none">
  19.135 +            <isfalse value="${annotation.processing.enabled}"/>
  19.136 +        </condition>
  19.137 +    </target>
  19.138 +    <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline">
  19.139 +        <property name="ap.cmd.line.internal" value=""/>
  19.140 +    </target>
  19.141 +    <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"/>
  19.142      <!--
  19.143                  COMPILATION SECTION
  19.144              -->
  19.145 @@ -467,10 +573,10 @@
  19.146              <arg value="-compilerSourceVM ${javac.source}"/>
  19.147              <arg value="-compilerTargetVM ${javac.target}"/>
  19.148              <arg value="-javaEncoding ${source.encoding}"/>
  19.149 -            <classpath path="${java.home}/../lib/tools.jar:${jspctask.classpath}:${jspcompilation.classpath}"/>
  19.150 +            <classpath path="${java.home}/../lib/tools.jar:${libs.jsp-compiler.classpath}:${libs.jsp-compilation.classpath}"/>
  19.151          </java>
  19.152          <mkdir dir="${build.generated.dir}/classes"/>
  19.153 -        <webproject2:javac classpath="${j2ee.platform.classpath}:${build.classes.dir}:${jspcompilation.classpath}" destdir="${build.generated.dir}/classes" srcdir="${build.generated.dir}/src"/>
  19.154 +        <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"/>
  19.155      </target>
  19.156      <target depends="compile" if="jsp.includes" name="-do-compile-single-jsp">
  19.157          <fail unless="javac.jsp.includes">Must select some files in the IDE or set javac.jsp.includes</fail>
  19.158 @@ -486,10 +592,10 @@
  19.159              <arg value="-compilerSourceVM ${javac.source}"/>
  19.160              <arg value="-compilerTargetVM ${javac.target}"/>
  19.161              <arg value="-javaEncoding ${source.encoding}"/>
  19.162 -            <classpath path="${java.home}/../lib/tools.jar:${jspctask.classpath}:${jspcompilation.classpath}"/>
  19.163 +            <classpath path="${java.home}/../lib/tools.jar:${libs.jsp-compiler.classpath}:${libs.jsp-compilation.classpath}"/>
  19.164          </java>
  19.165          <mkdir dir="${build.generated.dir}/classes"/>
  19.166 -        <webproject2:javac classpath="${j2ee.platform.classpath}:${build.classes.dir}:${jspcompilation.classpath}" destdir="${build.generated.dir}/classes" srcdir="${build.generated.dir}/src">
  19.167 +        <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">
  19.168              <customize>
  19.169                  <patternset includes="${javac.jsp.includes}"/>
  19.170              </customize>
  19.171 @@ -726,7 +832,7 @@
  19.172      <!--
  19.173                  JAVADOC SECTION
  19.174              -->
  19.175 -    <target depends="init" name="javadoc-build">
  19.176 +    <target depends="init" if="have.sources" name="javadoc-build">
  19.177          <mkdir dir="${dist.javadoc.dir}"/>
  19.178          <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}">
  19.179              <classpath>
    20.1 --- a/java/nekurak.net-web/nbproject/genfiles.properties	Thu Jun 17 15:12:30 2010 +0200
    20.2 +++ b/java/nekurak.net-web/nbproject/genfiles.properties	Sat Jun 19 11:19:27 2010 +0200
    20.3 @@ -4,8 +4,8 @@
    20.4  # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
    20.5  # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
    20.6  nbproject/build-impl.xml.data.CRC32=28fc3c5a
    20.7 -nbproject/build-impl.xml.script.CRC32=cdc87d62
    20.8 -nbproject/build-impl.xml.stylesheet.CRC32=b139b33b@1.21.2.1
    20.9 +nbproject/build-impl.xml.script.CRC32=e58633c2
   20.10 +nbproject/build-impl.xml.stylesheet.CRC32=8335d67d@1.24.1.1
   20.11  nbproject/rest-build.xml.data.CRC32=84da1c7b
   20.12  nbproject/rest-build.xml.script.CRC32=3db088b3
   20.13  nbproject/rest-build.xml.stylesheet.CRC32=ddd64843@1.4.1
    21.1 --- a/java/nekurak.net-web/nbproject/project.properties	Thu Jun 17 15:12:30 2010 +0200
    21.2 +++ b/java/nekurak.net-web/nbproject/project.properties	Sat Jun 19 11:19:27 2010 +0200
    21.3 @@ -1,3 +1,8 @@
    21.4 +annotation.processing.enabled=true
    21.5 +annotation.processing.enabled.in.editor=true
    21.6 +annotation.processing.processors.list=
    21.7 +annotation.processing.run.all.processors=true
    21.8 +annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
    21.9  build.classes.dir=${build.web.dir}/WEB-INF/classes
   21.10  build.classes.excludes=**/*.java,**/*.form
   21.11  build.dir=build
   21.12 @@ -23,6 +28,12 @@
   21.13  includes=**
   21.14  j2ee.deploy.on.save=true
   21.15  j2ee.platform=1.5
   21.16 +j2ee.platform.classpath=
   21.17 +j2ee.platform.embeddableejb.classpath=${j2ee.server.home}/lib/embedded/glassfish-embedded-static-shell.jar
   21.18 +j2ee.platform.wscompile.classpath=${j2ee.server.home}/modules/webservices-osgi.jar
   21.19 +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
   21.20 +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
   21.21 +j2ee.platform.wsit.classpath=
   21.22  j2ee.server.type=gfv3ee6
   21.23  jar.compress=false
   21.24  javac.classpath=\
   21.25 @@ -32,6 +43,7 @@
   21.26  javac.compilerargs=
   21.27  javac.debug=true
   21.28  javac.deprecation=false
   21.29 +javac.processorpath=${javac.classpath}
   21.30  javac.source=1.5
   21.31  javac.target=1.5
   21.32  javac.test.classpath=\
   21.33 @@ -39,6 +51,7 @@
   21.34      ${build.classes.dir}:\
   21.35      ${libs.junit.classpath}:\
   21.36      ${libs.junit_4.classpath}
   21.37 +javac.test.processorpath=${javac.test.classpath}
   21.38  javadoc.additionalparam=
   21.39  javadoc.author=false
   21.40  javadoc.encoding=${source.encoding}
    22.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    22.2 +++ b/java/nekurak.net-web/src/java/cz/frantovo/nekurak/servlet/Komentare.java	Sat Jun 19 11:19:27 2010 +0200
    22.3 @@ -0,0 +1,57 @@
    22.4 +package cz.frantovo.nekurak.servlet;
    22.5 +
    22.6 +import cz.frantovo.nekurak.dto.Komentar;
    22.7 +import cz.frantovo.nekurak.ejb.PodnikRemote;
    22.8 +import cz.frantovo.nekurak.web.HledacSluzby;
    22.9 +import java.io.IOException;
   22.10 +import javax.servlet.RequestDispatcher;
   22.11 +import javax.servlet.ServletException;
   22.12 +import javax.servlet.http.HttpServlet;
   22.13 +import javax.servlet.http.HttpServletRequest;
   22.14 +import javax.servlet.http.HttpServletResponse;
   22.15 +
   22.16 +/**
   22.17 + *
   22.18 + * @author fiki
   22.19 + */
   22.20 +public class Komentare extends HttpServlet {
   22.21 +
   22.22 +    private HledacSluzby hledac = new HledacSluzby();
   22.23 +
   22.24 +    @Override
   22.25 +    protected void doGet(HttpServletRequest pozadavek, HttpServletResponse odpoved) throws ServletException, IOException {
   22.26 +	doPost(pozadavek, odpoved);
   22.27 +    }
   22.28 +
   22.29 +    @Override
   22.30 +    protected void doPost(HttpServletRequest pozadavek, HttpServletResponse odpoved) throws ServletException, IOException {
   22.31 +	PodnikRemote ejb = hledac.getPodnikEJB();
   22.32 +
   22.33 +	Komentar k = new Komentar();
   22.34 +	k.setPodnik(Integer.decode(pozadavek.getParameter("podnik")));
   22.35 +	k.setNadpis(pozadavek.getParameter("nadpis"));
   22.36 +	k.setKomentar(pozadavek.getParameter("komentar"));
   22.37 +	k.setTyp(Komentar.TYP.valueOf(pozadavek.getParameter("typ")));
   22.38 +
   22.39 +	boolean ulozit = Boolean.valueOf(pozadavek.getParameter("odeslat"));
   22.40 +
   22.41 +	String jsp;
   22.42 +
   22.43 +	try {
   22.44 +	    k = ejb.komentuj(k, ulozit);
   22.45 +	    pozadavek.setAttribute("komentar", k);
   22.46 +
   22.47 +	    if (ulozit) {
   22.48 +		jsp = "/WEB-INF/casti/ajaxKomentare/odeslano.jsp";
   22.49 +	    } else {
   22.50 +		jsp = "/WEB-INF/casti/ajaxKomentare/nahled.jsp";
   22.51 +	    }
   22.52 +	} catch (Exception e) {
   22.53 +	    pozadavek.setAttribute("chyba", e);
   22.54 +	    jsp = "/WEB-INF/casti/ajaxKomentare/chyba.jsp";
   22.55 +	}
   22.56 +
   22.57 +	RequestDispatcher rd = getServletContext().getRequestDispatcher(jsp);
   22.58 +	rd.forward(pozadavek, odpoved);
   22.59 +    }
   22.60 +}
    23.1 --- a/java/nekurak.net-web/src/java/cz/frantovo/nekurak/web/OdeslatKomentar.java	Thu Jun 17 15:12:30 2010 +0200
    23.2 +++ b/java/nekurak.net-web/src/java/cz/frantovo/nekurak/web/OdeslatKomentar.java	Sat Jun 19 11:19:27 2010 +0200
    23.3 @@ -18,7 +18,7 @@
    23.4  
    23.5      public void setKomentar(Komentar k) throws TexyVyjimka {
    23.6  	try {
    23.7 -	    hledac.getPodnikEJB().komentuj(k);
    23.8 +	    hledac.getPodnikEJB().komentuj(k, true);
    23.9  	    ok = true;
   23.10  	} catch (KomentarovaVyjimka e) {
   23.11  	    log.log(Level.WARNING, "chyba při vkládání komentáře", e);
    24.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    24.2 +++ b/java/nekurak.net-web/web/WEB-INF/casti/ajaxKomentare/chyba.jsp	Sat Jun 19 11:19:27 2010 +0200
    24.3 @@ -0,0 +1,21 @@
    24.4 +<?xml version="1.0" encoding="UTF-8"?>
    24.5 +<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
    24.6 +	  xmlns:c="http://java.sun.com/jsp/jstl/core"
    24.7 +	  xmlns:fmt="http://java.sun.com/jsp/jstl/fmt"
    24.8 +	  xmlns:fn="http://java.sun.com/jsp/jstl/functions"
    24.9 +	  xmlns:nk="urn:jsptagdir:/WEB-INF/tags/nekurak"
   24.10 +	  version="2.0">
   24.11 +
   24.12 +    <div>
   24.13 +	<c:choose>
   24.14 +	    <c:when test="${chyba.class == 'class javax.ejb.EJBAccessException'}">
   24.15 +		<p class="chybovaHlaska"><fmt:message key="komentare.nahledChybaPrihlaseni"/></p>
   24.16 +	    </c:when>
   24.17 +	    <c:otherwise>
   24.18 +		<p class="chybovaHlaska"><fmt:message key="komentare.nahledChybaFormatu"/></p>
   24.19 +		<p class="informacniHlaska"><fmt:message key="komentar.typ.xhtml.povoleneZnacky"/></p>
   24.20 +	    </c:otherwise>
   24.21 +	</c:choose>
   24.22 +    </div>
   24.23 +
   24.24 +</jsp:root>
   24.25 \ No newline at end of file
    25.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    25.2 +++ b/java/nekurak.net-web/web/WEB-INF/casti/ajaxKomentare/nahled.jsp	Sat Jun 19 11:19:27 2010 +0200
    25.3 @@ -0,0 +1,17 @@
    25.4 +<?xml version="1.0" encoding="UTF-8"?>
    25.5 +<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
    25.6 +	  xmlns:c="http://java.sun.com/jsp/jstl/core"
    25.7 +	  xmlns:fmt="http://java.sun.com/jsp/jstl/fmt"
    25.8 +	  xmlns:fn="http://java.sun.com/jsp/jstl/functions"
    25.9 +	  xmlns:nk="urn:jsptagdir:/WEB-INF/tags/nekurak"
   25.10 +	  version="2.0">
   25.11 +
   25.12 +    
   25.13 +
   25.14 +    <div>
   25.15 +	<p class="informacniHlaska"><fmt:message key="komentare.nahledNadpis"/>:</p>
   25.16 +	<!-- XHTML je už zkontrolované: -->
   25.17 +	${requestScope['komentar'].komentar}
   25.18 +    </div>
   25.19 +
   25.20 +</jsp:root>
   25.21 \ No newline at end of file
    26.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    26.2 +++ b/java/nekurak.net-web/web/WEB-INF/casti/ajaxKomentare/odeslano.jsp	Sat Jun 19 11:19:27 2010 +0200
    26.3 @@ -0,0 +1,20 @@
    26.4 +<?xml version="1.0" encoding="UTF-8"?>
    26.5 +<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
    26.6 +	  xmlns:c="http://java.sun.com/jsp/jstl/core"
    26.7 +	  xmlns:fmt="http://java.sun.com/jsp/jstl/fmt"
    26.8 +	  xmlns:fn="http://java.sun.com/jsp/jstl/functions"
    26.9 +	  xmlns:nk="urn:jsptagdir:/WEB-INF/tags/nekurak"
   26.10 +	  version="2.0">
   26.11 +
   26.12 +
   26.13 +
   26.14 +    <div>
   26.15 +	<p class="informacniHlaska"><fmt:message key="komentare.nahledOdeslano"/>:</p>
   26.16 +	<!-- XHTML je už zkontrolované: -->
   26.17 +	${requestScope['komentar'].komentar}
   26.18 +	<script type="text/javascript">
   26.19 +	    $("#formularKomentuj form").get(0).reset();
   26.20 +	</script>
   26.21 +    </div>
   26.22 +
   26.23 +</jsp:root>
   26.24 \ No newline at end of file
    27.1 --- a/java/nekurak.net-web/web/WEB-INF/casti/odeslatKomentar.jsp	Thu Jun 17 15:12:30 2010 +0200
    27.2 +++ b/java/nekurak.net-web/web/WEB-INF/casti/odeslatKomentar.jsp	Sat Jun 19 11:19:27 2010 +0200
    27.3 @@ -25,7 +25,9 @@
    27.4  	    <c:when test="${odeslatKomentar.ok}">
    27.5  		<p class="informacniHlaska">
    27.6  		    <fmt:message key="komentar.odeslat.ok"/>,
    27.7 -		    <a href="?akce=detail&amp;amp;podnik=${komentar.podnik}"><fmt:message key="komentar.odeslat.pokracujte"/></a>.
    27.8 +		    <a href="?akce=detail&amp;amp;podnik=${komentar.podnik}">
    27.9 +			<fmt:message key="komentar.odeslat.pokracujte"/>
   27.10 +		    </a>.
   27.11  		</p>
   27.12  	    </c:when>
   27.13  	    <c:otherwise>
    28.1 --- a/java/nekurak.net-web/web/WEB-INF/tags/nekurak/komentareVypis.tag	Thu Jun 17 15:12:30 2010 +0200
    28.2 +++ b/java/nekurak.net-web/web/WEB-INF/tags/nekurak/komentareVypis.tag	Sat Jun 19 11:19:27 2010 +0200
    28.3 @@ -24,7 +24,7 @@
    28.4  	    <c:otherwise>
    28.5  		<p><a href="javascript:komentare.zobrazFormular()"><fmt:message key="komentare.komentovat"/></a></p>
    28.6  		<div id="formularKomentuj" style="display: none;">
    28.7 -		    <form method="post" action="?akce=odeslatKomentar">
    28.8 +		    <form method="post" action="?akce=odeslatKomentar" onsubmit="javascript:komentare.odeslat(); return false;">
    28.9  			<fieldset>
   28.10  			    <input type="hidden" name="podnik" maxlength="255" value="${podnik.id}"/>
   28.11  			    <label><fmt:message key="komentare.nadpis"/>: <input type="text" name="nadpis" maxlength="255"/></label>
   28.12 @@ -37,10 +37,12 @@
   28.13  				<option value="TEXY"><fmt:message key="komentar.typ.texy"/></option>
   28.14  			    </select>
   28.15  			    <br/>
   28.16 +			    <button value="ano" name="nahled" onclick="javascript:komentare.nahled(); return false;"><fmt:message key="komentare.tlacitkoNahled"/></button>
   28.17  			    <button value="submit"><fmt:message key="komentare.tlacitkoOdeslat"/></button>
   28.18  			</fieldset>
   28.19  		    </form>
   28.20 -		    <p><fmt:message key="komentar.typ.xhtml.povoleneZnacky"/></p>
   28.21 +		    <div class="vystup"></div>
   28.22 +		    <div class="cistic"/>
   28.23  		</div>
   28.24  	    </c:otherwise>
   28.25  	</c:choose>
    29.1 --- a/java/nekurak.net-web/web/WEB-INF/web.xml	Thu Jun 17 15:12:30 2010 +0200
    29.2 +++ b/java/nekurak.net-web/web/WEB-INF/web.xml	Sat Jun 19 11:19:27 2010 +0200
    29.3 @@ -41,7 +41,7 @@
    29.4  	<load-on-startup>1</load-on-startup>
    29.5      </servlet>
    29.6      <servlet>
    29.7 -	<servlet-name>Kaptcha</servlet-name>
    29.8 +	<servlet-name>kaptcha</servlet-name>
    29.9  	<servlet-class>com.google.code.kaptcha.servlet.KaptchaServlet</servlet-class>
   29.10      </servlet>
   29.11      <servlet>
   29.12 @@ -50,6 +50,11 @@
   29.13  	<servlet-class>com.sun.jersey.spi.container.servlet.ServletContainer</servlet-class>
   29.14  	<load-on-startup>1</load-on-startup>
   29.15      </servlet>
   29.16 +    <servlet>
   29.17 +	<description>Odesílání a náhledy komentářů pomocí AJAXu.</description>
   29.18 +	<servlet-name>komentare</servlet-name>
   29.19 +	<servlet-class>cz.frantovo.nekurak.servlet.Komentare</servlet-class>
   29.20 +    </servlet>
   29.21      <!-- </definiceServletů> -->
   29.22      <!-- <mapováníServletů> -->
   29.23      <servlet-mapping>
   29.24 @@ -61,7 +66,7 @@
   29.25  	<url-pattern>/atom/*</url-pattern>
   29.26      </servlet-mapping>
   29.27      <servlet-mapping>
   29.28 -	<servlet-name>Kaptcha</servlet-name>
   29.29 +	<servlet-name>kaptcha</servlet-name>
   29.30  	<url-pattern>/kaptcha.jpg</url-pattern>
   29.31      </servlet-mapping>
   29.32      <servlet-mapping>
   29.33 @@ -69,6 +74,10 @@
   29.34  	<servlet-name>REST</servlet-name>
   29.35  	<url-pattern>/zdroje/*</url-pattern>
   29.36      </servlet-mapping>
   29.37 +    <servlet-mapping>
   29.38 +	<servlet-name>komentare</servlet-name>
   29.39 +	<url-pattern>/komentare</url-pattern>
   29.40 +    </servlet-mapping>
   29.41      <!-- </mapováníServletů> -->
   29.42      <context-param>
   29.43  	<!-- Pro případ, že chybí hlavička „Accept-language“ v HTTP požadavku -->
    30.1 --- a/java/nekurak.net-web/web/js/komentare.js	Thu Jun 17 15:12:30 2010 +0200
    30.2 +++ b/java/nekurak.net-web/web/js/komentare.js	Sat Jun 19 11:19:27 2010 +0200
    30.3 @@ -3,3 +3,11 @@
    30.4  komentare.zobrazFormular = function () {
    30.5      $("#formularKomentuj").toggle();
    30.6  };
    30.7 +
    30.8 +komentare.nahled = function() {
    30.9 +    $("#formularKomentuj .vystup").load("komentare", $("#formularKomentuj form").serialize());
   30.10 +};
   30.11 +
   30.12 +komentare.odeslat = function() {
   30.13 +    $("#formularKomentuj .vystup").load("komentare?odeslat=true", $("#formularKomentuj form").serialize());
   30.14 +};
    31.1 --- a/java/nekurak.net-web/web/styl.css	Thu Jun 17 15:12:30 2010 +0200
    31.2 +++ b/java/nekurak.net-web/web/styl.css	Sat Jun 19 11:19:27 2010 +0200
    31.3 @@ -133,6 +133,18 @@
    31.4  	margin-left: 2px;
    31.5  }
    31.6  
    31.7 +#formularKomentuj input, #formularKomentuj textarea, #formularKomentuj select {
    31.8 +	width:300px;
    31.9 +}
   31.10 +
   31.11 +#formularKomentuj form {
   31.12 +    float: left;
   31.13 +}
   31.14 +
   31.15 +#formularKomentuj .vystup {
   31.16 +    margin-left: 400px;
   31.17 +}
   31.18 +
   31.19  .chybovaHlaska {
   31.20      background-image: url('grafika/chyba.png');
   31.21      background-repeat: no-repeat;
    32.1 --- a/java/nekurak.net-ws/nbproject/ant-deploy.xml	Thu Jun 17 15:12:30 2010 +0200
    32.2 +++ b/java/nekurak.net-ws/nbproject/ant-deploy.xml	Sat Jun 19 11:19:27 2010 +0200
    32.3 @@ -24,7 +24,7 @@
    32.4          </xmlproperty>    
    32.5          <delete file="${temp.sun.web}"/>
    32.6          <property name="deploy.ant.client.url" value="${gfv3.url}${sun-web-app.context-root}"/>
    32.7 -        <property name="deploy.context.root.argument" value="?contextroot=${sun-web-app.context-root}"/>
    32.8 +        <property name="deploy.context.root.argument" value="&amp;contextroot=${sun-web-app.context-root}"/>
    32.9      </target>
   32.10      <target name="-no-parse-sun-web" depends="-init-cl-deployment-env" unless="sun.web.present">
   32.11          <property name="deploy.context.root.argument" value=""/>
   32.12 @@ -43,18 +43,43 @@
   32.13          <delete dir="${gfv3.resources.dir}"/>
   32.14      </target>
   32.15      <target name="-deploy-ant" depends="-parse-sun-web,-no-parse-sun-web,-add-resources" if="deploy.ant.enabled">
   32.16 +        <antcall target="-deploy-without-pw"/>
   32.17 +        <antcall target="-deploy-with-pw"/>
   32.18 +    </target>
   32.19 +
   32.20 +    <target name="-deploy-without-pw" unless="gfv3.password">
   32.21          <echo message="Deploying ${deploy.ant.archive}"/>
   32.22          <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
   32.23          <property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
   32.24 -        <get src="${gfv3.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}?force=true?name=${ant.project.name}"
   32.25 +        <get src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&amp;force=true&amp;name=${ant.project.name}"
   32.26              dest="${gfv3.results.file}"/>
   32.27          <delete file="${gfv3.results.file}"/>    
   32.28      </target>
   32.29 +    <target name="-deploy-with-pw" if="gfv3.password">
   32.30 +        <echo message="Deploying ${deploy.ant.archive}"/>
   32.31 +        <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
   32.32 +        <property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
   32.33 +        <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}"
   32.34 +            dest="${gfv3.results.file}"/>
   32.35 +        <delete file="${gfv3.results.file}"/>
   32.36 +    </target>
   32.37      <target name="-undeploy-ant" depends="-init-cl-deployment-env" if="deploy.ant.enabled">
   32.38 +        <antcall target="-undeploy-without-pw"/>
   32.39 +        <antcall target="-undeploy-with-pw"/>
   32.40 +    </target>
   32.41 +
   32.42 +    <target name="-undeploy-without-pw" unless="gfv3.password">
   32.43          <echo message="Undeploying ${deploy.ant.archive}"/>
   32.44          <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
   32.45 -        <get src="${gfv3.url}/__asadmin/undeploy?name=${ant.project.name}"
   32.46 +        <get src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
   32.47              dest="${gfv3.results.file}"/>
   32.48          <delete file="${gfv3.results.file}"/>    
   32.49      </target>
   32.50 +    <target name="-undeploy-with-pw" if="gfv3.password">
   32.51 +        <echo message="Undeploying ${deploy.ant.archive}"/>
   32.52 +        <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
   32.53 +        <get username="${gfv3.username}" password="${gfv3.password}" src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
   32.54 +            dest="${gfv3.results.file}"/>
   32.55 +        <delete file="${gfv3.results.file}"/>
   32.56 +    </target>
   32.57  </project>
    33.1 --- a/java/nekurak.net-ws/nbproject/build-impl.xml	Thu Jun 17 15:12:30 2010 +0200
    33.2 +++ b/java/nekurak.net-ws/nbproject/build-impl.xml	Sat Jun 19 11:19:27 2010 +0200
    33.3 @@ -199,6 +199,20 @@
    33.4          <fail unless="build.test.results.dir">Must set build.test.results.dir</fail>
    33.5          <fail unless="build.classes.excludes">Must set build.classes.excludes</fail>
    33.6          <fail unless="dist.war">Must set dist.war</fail>
    33.7 +        <condition property="missing.j2ee.server.home">
    33.8 +            <and>
    33.9 +                <matches pattern="j2ee.server.home" string="${j2ee.platform.classpath}"/>
   33.10 +                <not>
   33.11 +                    <isset property="j2ee.server.home"/>
   33.12 +                </not>
   33.13 +            </and>
   33.14 +        </condition>
   33.15 +        <fail if="missing.j2ee.server.home">
   33.16 +The Java EE server classpath is not correctly set up - server home directory is missing.
   33.17 +Either open the project in the IDE and assign the server or setup the server classpath manually.
   33.18 +For example like this:
   33.19 +   ant -Dj2ee.server.home=&lt;app_server_installation_directory&gt;
   33.20 +                </fail>
   33.21          <fail unless="j2ee.platform.classpath">
   33.22  The Java EE server classpath is not correctly set up. Your active server type is ${j2ee.server.type}.
   33.23  Either open the project in the IDE and assign the server or setup the server classpath manually.
   33.24 @@ -216,11 +230,51 @@
   33.25              </sequential>
   33.26          </macrodef>
   33.27      </target>
   33.28 -    <target name="-init-macrodef-javac">
   33.29 +    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">
   33.30          <macrodef name="javac" uri="http://www.netbeans.org/ns/web-project/2">
   33.31              <attribute default="${src.dir}" name="srcdir"/>
   33.32              <attribute default="${build.classes.dir}" name="destdir"/>
   33.33              <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
   33.34 +            <attribute default="${javac.processorpath}" name="processorpath"/>
   33.35 +            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
   33.36 +            <attribute default="${includes}" name="includes"/>
   33.37 +            <attribute default="${excludes}" name="excludes"/>
   33.38 +            <attribute default="${javac.debug}" name="debug"/>
   33.39 +            <attribute default="${empty.dir}" name="gensrcdir"/>
   33.40 +            <element name="customize" optional="true"/>
   33.41 +            <sequential>
   33.42 +                <property location="${build.dir}/empty" name="empty.dir"/>
   33.43 +                <mkdir dir="${empty.dir}"/>
   33.44 +                <mkdir dir="@{apgeneratedsrcdir}"/>
   33.45 +                <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}">
   33.46 +                    <src>
   33.47 +                        <dirset dir="@{gensrcdir}" erroronmissingdir="false">
   33.48 +                            <include name="*"/>
   33.49 +                        </dirset>
   33.50 +                    </src>
   33.51 +                    <classpath>
   33.52 +                        <path path="@{classpath}"/>
   33.53 +                    </classpath>
   33.54 +                    <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
   33.55 +                    <compilerarg line="${javac.compilerargs}"/>
   33.56 +                    <compilerarg value="-processorpath"/>
   33.57 +                    <compilerarg path="@{processorpath}:${empty.dir}"/>
   33.58 +                    <compilerarg line="${ap.processors.internal}"/>
   33.59 +                    <compilerarg value="-s"/>
   33.60 +                    <compilerarg path="@{apgeneratedsrcdir}"/>
   33.61 +                    <compilerarg line="${ap.proc.none.internal}"/>
   33.62 +                    <customize/>
   33.63 +                </javac>
   33.64 +            </sequential>
   33.65 +        </macrodef>
   33.66 +    </target>
   33.67 +    <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
   33.68 +        <macrodef name="javac" uri="http://www.netbeans.org/ns/web-project/2">
   33.69 +            <attribute default="${src.dir}" name="srcdir"/>
   33.70 +            <attribute default="${build.classes.dir}" name="destdir"/>
   33.71 +            <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
   33.72 +            <attribute default="${javac.processorpath}" name="processorpath"/>
   33.73 +            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
   33.74              <attribute default="${includes}" name="includes"/>
   33.75              <attribute default="${excludes}" name="excludes"/>
   33.76              <attribute default="${javac.debug}" name="debug"/>
   33.77 @@ -245,6 +299,35 @@
   33.78              </sequential>
   33.79          </macrodef>
   33.80      </target>
   33.81 +    <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
   33.82 +        <macrodef name="depend" uri="http://www.netbeans.org/ns/web-project/2">
   33.83 +            <attribute default="${src.dir}" name="srcdir"/>
   33.84 +            <attribute default="${build.classes.dir}" name="destdir"/>
   33.85 +            <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
   33.86 +            <sequential>
   33.87 +                <depend cache="${build.dir}/depcache" destdir="@{destdir}" excludes="${excludes}" includes="${includes}" srcdir="@{srcdir}">
   33.88 +                    <classpath>
   33.89 +                        <path path="@{classpath}"/>
   33.90 +                    </classpath>
   33.91 +                </depend>
   33.92 +            </sequential>
   33.93 +        </macrodef>
   33.94 +        <macrodef name="force-recompile" uri="http://www.netbeans.org/ns/web-project/2">
   33.95 +            <attribute default="${build.classes.dir}" name="destdir"/>
   33.96 +            <sequential>
   33.97 +                <fail unless="javac.includes">Must set javac.includes</fail>
   33.98 +                <pathconvert pathsep="," property="javac.includes.binary">
   33.99 +                    <path>
  33.100 +                        <filelist dir="@{destdir}" files="${javac.includes}"/>
  33.101 +                    </path>
  33.102 +                    <globmapper from="*.java" to="*.class"/>
  33.103 +                </pathconvert>
  33.104 +                <delete>
  33.105 +                    <files includes="${javac.includes.binary}"/>
  33.106 +                </delete>
  33.107 +            </sequential>
  33.108 +        </macrodef>
  33.109 +    </target>
  33.110      <target name="-init-macrodef-junit">
  33.111          <macrodef name="junit" uri="http://www.netbeans.org/ns/web-project/2">
  33.112              <attribute default="${includes}" name="includes"/>
  33.113 @@ -387,7 +470,30 @@
  33.114                  </fail>
  33.115          <taskdef classpath="${libs.CopyLibs.classpath}" resource="org/netbeans/modules/java/j2seproject/copylibstask/antlib.xml"/>
  33.116      </target>
  33.117 -    <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"/>
  33.118 +    <target name="-init-ap-cmdline-properties">
  33.119 +        <property name="annotation.processing.enabled" value="true"/>
  33.120 +        <property name="annotation.processing.processors.list" value=""/>
  33.121 +        <property name="annotation.processing.run.all.processors" value="true"/>
  33.122 +        <property name="javac.processorpath" value="${javac.classpath}"/>
  33.123 +        <property name="javac.test.processorpath" value="${javac.test.classpath}"/>
  33.124 +        <condition property="ap.supported.internal" value="true">
  33.125 +            <not>
  33.126 +                <matches pattern="1\.[0-5](\..*)?" string="${javac.source}"/>
  33.127 +            </not>
  33.128 +        </condition>
  33.129 +    </target>
  33.130 +    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-ap-cmdline-supported">
  33.131 +        <condition else="" property="ap.processors.internal" value="-processor ${annotation.processing.processors.list}">
  33.132 +            <isfalse value="${annotation.processing.run.all.processors}"/>
  33.133 +        </condition>
  33.134 +        <condition else="" property="ap.proc.none.internal" value="-proc:none">
  33.135 +            <isfalse value="${annotation.processing.enabled}"/>
  33.136 +        </condition>
  33.137 +    </target>
  33.138 +    <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline">
  33.139 +        <property name="ap.cmd.line.internal" value=""/>
  33.140 +    </target>
  33.141 +    <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"/>
  33.142      <!--
  33.143                  COMPILATION SECTION
  33.144              -->
  33.145 @@ -467,10 +573,10 @@
  33.146              <arg value="-compilerSourceVM ${javac.source}"/>
  33.147              <arg value="-compilerTargetVM ${javac.target}"/>
  33.148              <arg value="-javaEncoding ${source.encoding}"/>
  33.149 -            <classpath path="${java.home}/../lib/tools.jar:${jspctask.classpath}:${jspcompilation.classpath}"/>
  33.150 +            <classpath path="${java.home}/../lib/tools.jar:${libs.jsp-compiler.classpath}:${libs.jsp-compilation.classpath}"/>
  33.151          </java>
  33.152          <mkdir dir="${build.generated.dir}/classes"/>
  33.153 -        <webproject2:javac classpath="${j2ee.platform.classpath}:${build.classes.dir}:${jspcompilation.classpath}" destdir="${build.generated.dir}/classes" srcdir="${build.generated.dir}/src"/>
  33.154 +        <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"/>
  33.155      </target>
  33.156      <target depends="compile" if="jsp.includes" name="-do-compile-single-jsp">
  33.157          <fail unless="javac.jsp.includes">Must select some files in the IDE or set javac.jsp.includes</fail>
  33.158 @@ -486,10 +592,10 @@
  33.159              <arg value="-compilerSourceVM ${javac.source}"/>
  33.160              <arg value="-compilerTargetVM ${javac.target}"/>
  33.161              <arg value="-javaEncoding ${source.encoding}"/>
  33.162 -            <classpath path="${java.home}/../lib/tools.jar:${jspctask.classpath}:${jspcompilation.classpath}"/>
  33.163 +            <classpath path="${java.home}/../lib/tools.jar:${libs.jsp-compiler.classpath}:${libs.jsp-compilation.classpath}"/>
  33.164          </java>
  33.165          <mkdir dir="${build.generated.dir}/classes"/>
  33.166 -        <webproject2:javac classpath="${j2ee.platform.classpath}:${build.classes.dir}:${jspcompilation.classpath}" destdir="${build.generated.dir}/classes" srcdir="${build.generated.dir}/src">
  33.167 +        <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">
  33.168              <customize>
  33.169                  <patternset includes="${javac.jsp.includes}"/>
  33.170              </customize>
  33.171 @@ -724,7 +830,7 @@
  33.172      <!--
  33.173                  JAVADOC SECTION
  33.174              -->
  33.175 -    <target depends="init" name="javadoc-build">
  33.176 +    <target depends="init" if="have.sources" name="javadoc-build">
  33.177          <mkdir dir="${dist.javadoc.dir}"/>
  33.178          <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}">
  33.179              <classpath>
    34.1 --- a/java/nekurak.net-ws/nbproject/genfiles.properties	Thu Jun 17 15:12:30 2010 +0200
    34.2 +++ b/java/nekurak.net-ws/nbproject/genfiles.properties	Sat Jun 19 11:19:27 2010 +0200
    34.3 @@ -4,9 +4,9 @@
    34.4  # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
    34.5  # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
    34.6  nbproject/build-impl.xml.data.CRC32=e6e63e07
    34.7 -nbproject/build-impl.xml.script.CRC32=222fc177
    34.8 -nbproject/build-impl.xml.stylesheet.CRC32=b139b33b@1.21.2.1
    34.9 +nbproject/build-impl.xml.script.CRC32=0c0ec7a8
   34.10 +nbproject/build-impl.xml.stylesheet.CRC32=8335d67d@1.24.1.1
   34.11  nbproject/wsit-deploy.xml.data.CRC32=4cb22909
   34.12  nbproject/wsit-deploy.xml.script.CRC32=deb039de
   34.13  nbproject/wsit-deploy.xml.stylesheet.CRC32=beb36995@3.9.1
   34.14 -nbproject/jaxws-build.xml.stylesheet.CRC32=83928735
   34.15 +nbproject/jaxws-build.xml.stylesheet.CRC32=b0a0073f
    35.1 --- a/java/nekurak.net-ws/nbproject/jax-ws.xml	Thu Jun 17 15:12:30 2010 +0200
    35.2 +++ b/java/nekurak.net-ws/nbproject/jax-ws.xml	Sat Jun 19 11:19:27 2010 +0200
    35.3 @@ -1,12 +1,12 @@
    35.4  <?xml version="1.0" encoding="UTF-8"?>
    35.5  <jax-ws xmlns="http://www.netbeans.org/ns/jax-ws/1">
    35.6    <services>
    35.7 +    <service name="Podnik">
    35.8 +      <implementation-class>cz.frantovo.nekurak.ws.Podnik</implementation-class>
    35.9 +    </service>
   35.10      <service name="Pokus">
   35.11        <implementation-class>cz.frantovo.nekurak.ws.Pokus</implementation-class>
   35.12      </service>
   35.13 -    <service name="Podnik">
   35.14 -      <implementation-class>cz.frantovo.nekurak.ws.Podnik</implementation-class>
   35.15 -    </service>
   35.16    </services>
   35.17    <clients/>
   35.18  </jax-ws>
    36.1 --- a/java/nekurak.net-ws/nbproject/jaxws-build.xml	Thu Jun 17 15:12:30 2010 +0200
    36.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    36.3 @@ -1,37 +0,0 @@
    36.4 -<?xml version="1.0" encoding="UTF-8"?>
    36.5 -<!--
    36.6 -        *** GENERATED FROM jax-ws.xml - DO NOT EDIT !                             ***
    36.7 -        *** TO MODIFY wsimport options USE Web Service node -> Edit WS Attributes ***
    36.8 -        *** TO CHANGE TARGETS GENERATED TO jaxws-build.xml COPY THOSE             ***
    36.9 -        *** TARGETS TO ../build.xml AND MODIFY THAT FILE INSTEAD                  ***
   36.10 -
   36.11 -        -->
   36.12 -<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">
   36.13 -    <!--
   36.14 -                ===================
   36.15 -                JAX-WS WSGEN SECTION
   36.16 -                ===================
   36.17 -            -->
   36.18 -    <target name="wsgen-init" depends="init, -do-compile">
   36.19 -        <mkdir dir="${build.generated.sources.dir}/jax-ws/resources/"/>
   36.20 -        <mkdir dir="${build.classes.dir}"/>
   36.21 -        <taskdef name="wsgen" classname="com.sun.tools.ws.ant.WsGen">
   36.22 -            <classpath path="${java.home}/../lib/tools.jar:${build.classes.dir}:${j2ee.platform.wsgen.classpath}:${javac.classpath}"/>
   36.23 -        </taskdef>
   36.24 -    </target>
   36.25 -    <target name="wsgen-Pokus" depends="wsgen-init">
   36.26 -        <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">
   36.27 -            <classpath path="${java.home}/../lib/tools.jar:${build.classes.dir}:${j2ee.platform.wsgen.classpath}:${javac.classpath}"/>
   36.28 -        </wsgen>
   36.29 -    </target>
   36.30 -    <target name="wsgen-Podnik" depends="wsgen-init">
   36.31 -        <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">
   36.32 -            <classpath path="${java.home}/../lib/tools.jar:${build.classes.dir}:${j2ee.platform.wsgen.classpath}:${javac.classpath}"/>
   36.33 -        </wsgen>
   36.34 -    </target>
   36.35 -    <!--
   36.36 -                ===================
   36.37 -                JAX-WS WSIMPORT SECTION
   36.38 -                ===================
   36.39 -            -->
   36.40 -</project>
    37.1 --- a/java/nekurak.net-ws/nbproject/project.properties	Thu Jun 17 15:12:30 2010 +0200
    37.2 +++ b/java/nekurak.net-ws/nbproject/project.properties	Sat Jun 19 11:19:27 2010 +0200
    37.3 @@ -1,3 +1,8 @@
    37.4 +annotation.processing.enabled=true
    37.5 +annotation.processing.enabled.in.editor=true
    37.6 +annotation.processing.processors.list=
    37.7 +annotation.processing.run.all.processors=true
    37.8 +annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
    37.9  build.classes.dir=${build.web.dir}/WEB-INF/classes
   37.10  build.classes.excludes=**/*.java,**/*.form
   37.11  build.dir=build
   37.12 @@ -24,6 +29,12 @@
   37.13  includes=**
   37.14  j2ee.deploy.on.save=false
   37.15  j2ee.platform=1.6-web
   37.16 +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
   37.17 +j2ee.platform.embeddableejb.classpath=${j2ee.server.home}/lib/embedded/glassfish-embedded-static-shell.jar
   37.18 +j2ee.platform.wscompile.classpath=${j2ee.server.home}/modules/webservices-osgi.jar
   37.19 +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
   37.20 +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
   37.21 +j2ee.platform.wsit.classpath=
   37.22  j2ee.server.type=gfv3ee6
   37.23  jar.compress=false
   37.24  javac.classpath=\
   37.25 @@ -32,6 +43,7 @@
   37.26  javac.compilerargs=
   37.27  javac.debug=true
   37.28  javac.deprecation=false
   37.29 +javac.processorpath=${javac.classpath}
   37.30  javac.source=1.5
   37.31  javac.target=1.5
   37.32  javac.test.classpath=\
   37.33 @@ -39,6 +51,7 @@
   37.34      ${build.classes.dir}:\
   37.35      ${libs.junit.classpath}:\
   37.36      ${libs.junit_4.classpath}
   37.37 +javac.test.processorpath=${javac.test.classpath}
   37.38  javadoc.additionalparam=
   37.39  javadoc.author=false
   37.40  javadoc.encoding=${source.encoding}