Changeset 79:aa8c8f51b0cc

Show
Ignore:
Timestamp:
02/08/12 13:16:13 (8 years ago)
Author:
František Kučera <franta-hg@…>
Branch:
default
Message:

drobnosti, netbeans, entity

Files:
1 added
7 modified

Legend:

Unmodified
Added
Removed
  • .hgignore

    r8 r79  
    44java/sql-vyuka/nbproject/private 
    55java/sql-vyuka/src/conf/MANIFEST.MF 
     6temp/* 
     7balíčky/* 
  • java/sql-vyuka/nbproject/ant-deploy.xml

    r74 r79  
    44        <property file="${deploy.ant.properties.file}" /> 
    55        <available file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" property="sun.web.present"/> 
     6        <available file="${deploy.ant.docbase.dir}/WEB-INF/glassfish-web.xml" property="glassfish.web.present"/> 
    67        <available file="${deploy.ant.resource.dir}" property="has.setup"/> 
    78        <tempfile prefix="gfv3" property="gfv3.password.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! --> 
     
    2425        </xmlproperty>     
    2526        <delete file="${temp.sun.web}"/> 
    26         <property name="deploy.ant.client.url" value="${gfv3.url}${sun-web-app.context-root}"/> 
    27         <property name="deploy.context.root.argument" value="?contextroot=${sun-web-app.context-root}"/> 
     27        <condition property="deploy.ant.client.url" value="${gfv3.url}${sun-web-app.context-root}" else="${gfv3.url}/${ant.project.name}"> 
     28            <isset property="sun-web-app.context-root"/> 
     29        </condition> 
     30        <condition property="deploy.context.root.argument" value="&amp;contextroot=${sun-web-app.context-root}" else="/${ant.project.name}"> 
     31            <isset property="sun-web-app.context-root"/> 
     32        </condition> 
     33    </target> 
     34    <target name="-parse-glassfish-web" depends="-init-cl-deployment-env" if="glassfish.web.present"> 
     35        <tempfile prefix="gfv3" property="temp.gf.web" destdir="${java.io.tmpdir}"/> 
     36        <copy file="${deploy.ant.docbase.dir}/WEB-INF/glassfish-web.xml" tofile="${temp.gf.web}"/> 
     37        <!-- The doctype triggers resolution which can fail --> 
     38        <replace file="${temp.gf.web}"> 
     39            <replacetoken><![CDATA[<!DOCTYPE]]></replacetoken> 
     40            <replacevalue><![CDATA[<!-- <!DOCTYPE]]></replacevalue> 
     41        </replace> 
     42        <replace file="${temp.gf.web}"> 
     43            <replacetoken><![CDATA[<glassfish-web-app]]></replacetoken> 
     44            <replacevalue><![CDATA[--> <glassfish-web-app]]></replacevalue> 
     45        </replace> 
     46        <xmlproperty file="${temp.gf.web}" validate="false"> 
     47        </xmlproperty> 
     48        <delete file="${temp.gf.web}"/> 
     49        <condition property="deploy.ant.client.url" value="${gfv3.url}${glassfish-web-app.context-root}" else="${gfv3.url}/${ant.project.name}"> 
     50            <isset property="glassfish-web-app.context-root"/> 
     51        </condition> 
     52        <condition property="deploy.context.root.argument" value="&amp;contextroot=${glassfish-web-app.context-root}" else="/${ant.project.name}"> 
     53            <isset property="glassfish-web-app.context-root"/> 
     54        </condition> 
    2855    </target> 
    2956    <target name="-no-parse-sun-web" depends="-init-cl-deployment-env" unless="sun.web.present"> 
     
    3461        <mkdir dir="${gfv3.resources.dir}"/> 
    3562        <mkdir dir="${gfv3.resources.dir}/META-INF"/> 
    36         <property name="gfv3.resources.file" value="${gfv3.resources.dir}/META-INF/sun-resources.xml"/> 
    3763        <copy todir="${gfv3.resources.dir}/META-INF"> 
    3864            <fileset dir="${deploy.ant.resource.dir}"/> 
     
    4369        <delete dir="${gfv3.resources.dir}"/> 
    4470    </target> 
    45     <target name="-deploy-ant" depends="-parse-sun-web,-no-parse-sun-web,-add-resources" if="deploy.ant.enabled"> 
     71    <target name="-deploy-ant" depends="-parse-glassfish-web, -parse-sun-web, -no-parse-sun-web,-add-resources" if="deploy.ant.enabled"> 
     72        <antcall target="-deploy-without-pw"/> 
     73        <antcall target="-deploy-with-pw"/> 
     74    </target> 
     75 
     76    <target name="-deploy-without-pw" unless="gfv3.password"> 
    4677        <echo message="Deploying ${deploy.ant.archive}"/> 
    4778        <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! --> 
    4879        <property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/> 
    49         <get src="${gfv3.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}?force=true?name=${ant.project.name}" 
     80        <get src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&amp;force=true&amp;name=${ant.project.name}" 
    5081            dest="${gfv3.results.file}"/> 
    5182        <delete file="${gfv3.results.file}"/>     
    5283    </target> 
     84    <target name="-deploy-with-pw" if="gfv3.password"> 
     85        <echo message="Deploying ${deploy.ant.archive}"/> 
     86        <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! --> 
     87        <property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/> 
     88        <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}" 
     89            dest="${gfv3.results.file}"/> 
     90        <delete file="${gfv3.results.file}"/> 
     91    </target> 
    5392    <target name="-undeploy-ant" depends="-init-cl-deployment-env" if="deploy.ant.enabled"> 
     93        <antcall target="-undeploy-without-pw"/> 
     94        <antcall target="-undeploy-with-pw"/> 
     95    </target> 
     96 
     97    <target name="-undeploy-without-pw" unless="gfv3.password"> 
    5498        <echo message="Undeploying ${deploy.ant.archive}"/> 
    5599        <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! --> 
    56         <get src="${gfv3.url}/__asadmin/undeploy?name=${ant.project.name}" 
     100        <get src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}" 
    57101            dest="${gfv3.results.file}"/> 
    58102        <delete file="${gfv3.results.file}"/>     
    59103    </target> 
     104    <target name="-undeploy-with-pw" if="gfv3.password"> 
     105        <echo message="Undeploying ${deploy.ant.archive}"/> 
     106        <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! --> 
     107        <get username="${gfv3.username}" password="${gfv3.password}" src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}" 
     108            dest="${gfv3.results.file}"/> 
     109        <delete file="${gfv3.results.file}"/> 
     110    </target> 
    60111</project> 
  • java/sql-vyuka/nbproject/build-impl.xml

    r74 r79  
    174174        <path id="endorsed.classpath.path" path="${endorsed.classpath}"/> 
    175175        <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'"> 
    176             <length length="0" string="${endorsed.classpath}" when="greater"/> 
    177         </condition> 
     176            <and> 
     177                <isset property="endorsed.classpath"/> 
     178                <length length="0" string="${endorsed.classpath}" when="greater"/> 
     179            </and> 
     180        </condition> 
     181        <condition else="false" property="jdkBug6558476"> 
     182            <and> 
     183                <matches pattern="1\.[56]" string="${java.specification.version}"/> 
     184                <not> 
     185                    <os family="unix"/> 
     186                </not> 
     187            </and> 
     188        </condition> 
     189        <property name="javac.fork" value="${jdkBug6558476}"/> 
    178190    </target> 
    179191    <target depends="init" name="-init-cos" unless="deploy.on.save"> 
    180192        <condition property="deploy.on.save" value="true"> 
    181             <istrue value="${j2ee.deploy.on.save}"/> 
     193            <or> 
     194                <istrue value="${j2ee.deploy.on.save}"/> 
     195                <istrue value="${j2ee.compile.on.save}"/> 
     196            </or> 
    182197        </condition> 
    183198    </target> 
     
    199214        <fail unless="build.classes.excludes">Must set build.classes.excludes</fail> 
    200215        <fail unless="dist.war">Must set dist.war</fail> 
     216        <condition property="missing.j2ee.server.home"> 
     217            <and> 
     218                <matches pattern="j2ee.server.home" string="${j2ee.platform.classpath}"/> 
     219                <not> 
     220                    <isset property="j2ee.server.home"/> 
     221                </not> 
     222            </and> 
     223        </condition> 
     224        <fail if="missing.j2ee.server.home"> 
     225The Java EE server classpath is not correctly set up - server home directory is missing. 
     226Either open the project in the IDE and assign the server or setup the server classpath manually. 
     227For example like this: 
     228   ant -Dj2ee.server.home=&lt;app_server_installation_directory&gt; 
     229                </fail> 
    201230        <fail unless="j2ee.platform.classpath"> 
    202231The Java EE server classpath is not correctly set up. Your active server type is ${j2ee.server.type}. 
     
    216245        </macrodef> 
    217246    </target> 
    218     <target name="-init-macrodef-javac"> 
     247    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors"> 
    219248        <macrodef name="javac" uri="http://www.netbeans.org/ns/web-project/2"> 
    220249            <attribute default="${src.dir}" name="srcdir"/> 
    221250            <attribute default="${build.classes.dir}" name="destdir"/> 
    222251            <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/> 
     252            <attribute default="${javac.processorpath}" name="processorpath"/> 
     253            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/> 
     254            <attribute default="${includes}" name="includes"/> 
     255            <attribute default="${excludes}" name="excludes"/> 
     256            <attribute default="${javac.debug}" name="debug"/> 
     257            <attribute default="${empty.dir}" name="gensrcdir"/> 
     258            <element name="customize" optional="true"/> 
     259            <sequential> 
     260                <property location="${build.dir}/empty" name="empty.dir"/> 
     261                <mkdir dir="${empty.dir}"/> 
     262                <mkdir dir="@{apgeneratedsrcdir}"/> 
     263                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" srcdir="@{srcdir}" target="${javac.target}"> 
     264                    <src> 
     265                        <dirset dir="@{gensrcdir}" erroronmissingdir="false"> 
     266                            <include name="*"/> 
     267                        </dirset> 
     268                    </src> 
     269                    <classpath> 
     270                        <path path="@{classpath}"/> 
     271                    </classpath> 
     272                    <compilerarg line="${endorsed.classpath.cmd.line.arg}"/> 
     273                    <compilerarg line="${javac.compilerargs}"/> 
     274                    <compilerarg value="-processorpath"/> 
     275                    <compilerarg path="@{processorpath}:${empty.dir}"/> 
     276                    <compilerarg line="${ap.processors.internal}"/> 
     277                    <compilerarg value="-s"/> 
     278                    <compilerarg path="@{apgeneratedsrcdir}"/> 
     279                    <compilerarg line="${ap.proc.none.internal}"/> 
     280                    <customize/> 
     281                </javac> 
     282            </sequential> 
     283        </macrodef> 
     284    </target> 
     285    <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal"> 
     286        <macrodef name="javac" uri="http://www.netbeans.org/ns/web-project/2"> 
     287            <attribute default="${src.dir}" name="srcdir"/> 
     288            <attribute default="${build.classes.dir}" name="destdir"/> 
     289            <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/> 
     290            <attribute default="${javac.processorpath}" name="processorpath"/> 
     291            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/> 
    223292            <attribute default="${includes}" name="includes"/> 
    224293            <attribute default="${excludes}" name="excludes"/> 
     
    242311                    <customize/> 
    243312                </javac> 
     313            </sequential> 
     314        </macrodef> 
     315    </target> 
     316    <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac"> 
     317        <macrodef name="depend" uri="http://www.netbeans.org/ns/web-project/2"> 
     318            <attribute default="${src.dir}" name="srcdir"/> 
     319            <attribute default="${build.classes.dir}" name="destdir"/> 
     320            <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/> 
     321            <sequential> 
     322                <depend cache="${build.dir}/depcache" destdir="@{destdir}" excludes="${excludes}" includes="${includes}" srcdir="@{srcdir}"> 
     323                    <classpath> 
     324                        <path path="@{classpath}"/> 
     325                    </classpath> 
     326                </depend> 
     327            </sequential> 
     328        </macrodef> 
     329        <macrodef name="force-recompile" uri="http://www.netbeans.org/ns/web-project/2"> 
     330            <attribute default="${build.classes.dir}" name="destdir"/> 
     331            <sequential> 
     332                <fail unless="javac.includes">Must set javac.includes</fail> 
     333                <pathconvert pathsep="${line.separator}" property="javac.includes.binary"> 
     334                    <path> 
     335                        <filelist dir="@{destdir}" files="${javac.includes}"/> 
     336                    </path> 
     337                    <globmapper from="*.java" to="*.class"/> 
     338                </pathconvert> 
     339                <tempfile deleteonexit="true" property="javac.includesfile.binary"/> 
     340                <echo file="${javac.includesfile.binary}" message="${javac.includes.binary}"/> 
     341                <delete> 
     342                    <files includesfile="${javac.includesfile.binary}"/> 
     343                </delete> 
     344                <delete file="${javac.includesfile.binary}"/> 
    244345            </sequential> 
    245346        </macrodef> 
     
    267368                    <formatter type="xml"/> 
    268369                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/> 
     370                    <jvmarg value="-ea"/> 
    269371                    <jvmarg line="${runmain.jvmargs}"/> 
    270372                </junit> 
     
    387489        <taskdef classpath="${libs.CopyLibs.classpath}" resource="org/netbeans/modules/java/j2seproject/copylibstask/antlib.xml"/> 
    388490    </target> 
    389     <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"/> 
     491    <target name="-init-ap-cmdline-properties"> 
     492        <property name="annotation.processing.enabled" value="true"/> 
     493        <property name="annotation.processing.processors.list" value=""/> 
     494        <property name="annotation.processing.run.all.processors" value="true"/> 
     495        <property name="javac.processorpath" value="${javac.classpath}"/> 
     496        <property name="javac.test.processorpath" value="${javac.test.classpath}"/> 
     497        <condition property="ap.supported.internal" value="true"> 
     498            <not> 
     499                <matches pattern="1\.[0-5](\..*)?" string="${javac.source}"/> 
     500            </not> 
     501        </condition> 
     502    </target> 
     503    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-ap-cmdline-supported"> 
     504        <condition else="" property="ap.processors.internal" value="-processor ${annotation.processing.processors.list}"> 
     505            <isfalse value="${annotation.processing.run.all.processors}"/> 
     506        </condition> 
     507        <condition else="" property="ap.proc.none.internal" value="-proc:none"> 
     508            <isfalse value="${annotation.processing.enabled}"/> 
     509        </condition> 
     510    </target> 
     511    <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline"> 
     512        <property name="ap.cmd.line.internal" value=""/> 
     513    </target> 
     514    <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-check" name="profile-init"/> 
     515    <target name="-profile-pre-init"> 
     516        <!-- Empty placeholder for easier customization. --> 
     517        <!-- You can override this target in the ../build.xml file. --> 
     518    </target> 
     519    <target name="-profile-post-init"> 
     520        <!-- Empty placeholder for easier customization. --> 
     521        <!-- You can override this target in the ../build.xml file. --> 
     522    </target> 
     523    <target depends="-profile-pre-init, init, -profile-post-init" name="-profile-init-check"> 
     524        <fail unless="profiler.info.jvm">Must set JVM to use for profiling in profiler.info.jvm</fail> 
     525        <fail unless="profiler.info.jvmargs.agent">Must set profiler agent JVM arguments in profiler.info.jvmargs.agent</fail> 
     526    </target> 
     527    <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"/> 
    390528    <!-- 
    391529                COMPILATION SECTION 
     
    456594    </target> 
    457595    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/> 
     596    <property name="jspc.schemas" value="/resources/schemas/"/> 
     597    <property name="jspc.dtds" value="/resources/dtds/"/> 
    458598    <target depends="compile" description="Test compile JSP pages to expose compilation errors." if="do.compile.jsps" name="compile-jsps"> 
    459599        <mkdir dir="${build.generated.dir}/src"/> 
     
    464604            <arg file="${basedir}/${build.generated.dir}/src"/> 
    465605            <arg value="-die1"/> 
     606            <arg value="-schemas ${jspc.schemas}"/> 
     607            <arg value="-dtds ${jspc.dtds}"/> 
    466608            <arg value="-compilerSourceVM ${javac.source}"/> 
    467609            <arg value="-compilerTargetVM ${javac.target}"/> 
    468610            <arg value="-javaEncoding ${source.encoding}"/> 
    469             <classpath path="${java.home}/../lib/tools.jar:${jspctask.classpath}:${jspcompilation.classpath}"/> 
     611            <arg value="-sysClasspath ${libs.jsp-compilation-syscp.classpath}"/> 
     612            <classpath path="${java.home}/../lib/tools.jar:${libs.jsp-compiler.classpath}:${libs.jsp-compilation.classpath}"/> 
    470613        </java> 
    471614        <mkdir dir="${build.generated.dir}/classes"/> 
    472         <webproject2:javac classpath="${j2ee.platform.classpath}:${build.classes.dir}:${jspcompilation.classpath}" destdir="${build.generated.dir}/classes" srcdir="${build.generated.dir}/src"/> 
     615        <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"/> 
    473616    </target> 
    474617    <target depends="compile" if="jsp.includes" name="-do-compile-single-jsp"> 
     
    481624            <arg file="${basedir}/${build.generated.dir}/src"/> 
    482625            <arg value="-die1"/> 
     626            <arg value="-schemas ${jspc.schemas}"/> 
     627            <arg value="-dtds ${jspc.dtds}"/> 
     628            <arg value="-sysClasspath ${libs.jsp-compilation-syscp.classpath}"/> 
    483629            <arg value="-jspc.files"/> 
    484630            <arg path="${jsp.includes}"/> 
     
    486632            <arg value="-compilerTargetVM ${javac.target}"/> 
    487633            <arg value="-javaEncoding ${source.encoding}"/> 
    488             <classpath path="${java.home}/../lib/tools.jar:${jspctask.classpath}:${jspcompilation.classpath}"/> 
     634            <classpath path="${java.home}/../lib/tools.jar:${libs.jsp-compiler.classpath}:${libs.jsp-compilation.classpath}"/> 
    489635        </java> 
    490636        <mkdir dir="${build.generated.dir}/classes"/> 
    491         <webproject2:javac classpath="${j2ee.platform.classpath}:${build.classes.dir}:${jspcompilation.classpath}" destdir="${build.generated.dir}/classes" srcdir="${build.generated.dir}/src"> 
     637        <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"> 
    492638            <customize> 
    493639                <patternset includes="${javac.jsp.includes}"/> 
     
    510656        <mkdir dir="${dist.jar.dir}"/> 
    511657        <jar compress="${jar.compress}" jarfile="${dist.war}"> 
    512             <fileset dir="${build.web.dir}"/> 
     658            <fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*"/> 
    513659        </jar> 
    514660    </target> 
     
    517663        <mkdir dir="${dist.jar.dir}"/> 
    518664        <jar compress="${jar.compress}" jarfile="${dist.war}" manifest="${build.meta.inf.dir}/MANIFEST.MF"> 
    519             <fileset dir="${build.web.dir}"/> 
     665            <fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*"/> 
    520666        </jar> 
    521667    </target> 
     
    524670        <mkdir dir="${dist.jar.dir}"/> 
    525671        <jar compress="${jar.compress}" jarfile="${dist.war}"> 
    526             <fileset dir="${build.web.dir}"/> 
     672            <fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*"/> 
    527673        </jar> 
    528674    </target> 
     
    531677        <mkdir dir="${dist.jar.dir}"/> 
    532678        <jar compress="${jar.compress}" jarfile="${dist.war}" manifest="${build.meta.inf.dir}/MANIFEST.MF"> 
    533             <fileset dir="${build.web.dir}"/> 
     679            <fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*"/> 
    534680        </jar> 
    535681    </target> 
     
    550696        <mkdir dir="${dist.jar.dir}"/> 
    551697        <jar compress="${jar.compress}" jarfile="${dist.ear.war}" manifest="${build.web.dir}/META-INF/MANIFEST.MF"> 
    552             <fileset dir="${build.web.dir}"/> 
     698            <fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*"/> 
    553699        </jar> 
    554700    </target> 
     
    582728        <!-- Task to deploy to the Access Manager runtime. --> 
    583729    </target> 
    584     <target depends="init,-init-cos,compile,compile-jsps,-do-compile-single-jsp,-pre-dist,-do-tmp-dist-with-manifest,-do-tmp-dist-without-manifest,-pre-run-deploy,-pre-nbmodule-run-deploy,-run-deploy-nb,-init-deploy-ant,-deploy-ant,-run-deploy-am,-post-nbmodule-run-deploy,-post-run-deploy" name="run-deploy"> 
    585         <nbjpdaappreloaded/> 
    586     </target> 
     730    <target depends="init,-init-cos,compile,compile-jsps,-do-compile-single-jsp,-pre-dist,-do-tmp-dist-with-manifest,-do-tmp-dist-without-manifest,-pre-run-deploy,-pre-nbmodule-run-deploy,-run-deploy-nb,-init-deploy-ant,-deploy-ant,-run-deploy-am,-post-nbmodule-run-deploy,-post-run-deploy,-do-update-breakpoints" name="run-deploy"/> 
    587731    <target if="netbeans.home" name="-run-deploy-nb"> 
    588732        <nbdeploy clientUrlPart="${client.urlPart}" debugmode="false" forceRedeploy="${forceRedeploy}"/> 
     
    670814        <webproject1:java classname="${run.class}" classpath="${run.test.classpath}"/> 
    671815    </target> 
     816    <target depends="init" if="netbeans.home" name="-do-update-breakpoints"> 
     817        <webproject1:nbjpdaappreloaded/> 
     818    </target> 
    672819    <!-- 
    673820                DEBUGGING SECTION 
     
    722869    <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/> 
    723870    <!-- 
     871            ================= 
     872            PROFILING SECTION 
     873            ================= 
     874            --> 
     875    <target description="Profile a J2EE project in the IDE." name="profile"> 
     876        <condition else="start-profiled-server" property="profiler.startserver.target" value="start-profiled-server-extraargs"> 
     877            <isset property="profiler.info.jvmargs.extra"/> 
     878        </condition> 
     879        <antcall target="${profiler.startserver.target}"/> 
     880        <antcall target="run"/> 
     881        <antcall target="start-loadgen"/> 
     882    </target> 
     883    <target name="start-profiled-server"> 
     884        <nbstartprofiledserver forceRestart="${profiler.j2ee.serverForceRestart}" javaPlatform="${profiler.info.javaPlatform}" startupTimeout="${profiler.j2ee.serverStartupTimeout}"> 
     885            <jvmarg value="${profiler.info.jvmargs.agent}"/> 
     886            <jvmarg value="${profiler.j2ee.agentID}"/> 
     887        </nbstartprofiledserver> 
     888    </target> 
     889    <target name="start-profiled-server-extraargs"> 
     890        <nbstartprofiledserver forceRestart="${profiler.j2ee.serverForceRestart}" javaPlatform="${profiler.info.javaPlatform}" startupTimeout="${profiler.j2ee.serverStartupTimeout}"> 
     891            <jvmarg value="${profiler.info.jvmargs.extra}"/> 
     892            <jvmarg value="${profiler.info.jvmargs.agent}"/> 
     893            <jvmarg value="${profiler.j2ee.agentID}"/> 
     894        </nbstartprofiledserver> 
     895    </target> 
     896    <target if="profiler.loadgen.path" name="start-loadgen"> 
     897        <loadgenstart path="${profiler.loadgen.path}"/> 
     898    </target> 
     899    <!-- 
    724900                JAVADOC SECTION 
    725901            --> 
    726     <target depends="init" name="javadoc-build"> 
     902    <target depends="init" if="have.sources" name="javadoc-build"> 
    727903        <mkdir dir="${dist.javadoc.dir}"/> 
    728904        <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}"> 
     
    737913            </fileset> 
    738914        </javadoc> 
     915        <copy todir="${dist.javadoc.dir}"> 
     916            <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}"> 
     917                <filename name="**/doc-files/**"/> 
     918            </fileset> 
     919            <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false"> 
     920                <include name="**/doc-files/**"/> 
     921            </fileset> 
     922        </copy> 
    739923    </target> 
    740924    <target depends="init,javadoc-build" if="netbeans.home" name="javadoc-browse" unless="no.javadoc.preview"> 
     
    8351019    <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/> 
    8361020    <!-- 
     1021        ========================= 
     1022        TESTS PROFILING  SECTION 
     1023        ========================= 
     1024        --> 
     1025    <target depends="profile-init,compile-test-single" if="netbeans.home" name="profile-test-single"> 
     1026        <nbprofiledirect> 
     1027            <classpath> 
     1028                <path path="${run.test.classpath}"/> 
     1029                <path path="${j2ee.platform.classpath}"/> 
     1030            </classpath> 
     1031        </nbprofiledirect> 
     1032        <junit dir="${profiler.info.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${profiler.info.jvm}" showoutput="true"> 
     1033            <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/> 
     1034            <jvmarg value="${profiler.info.jvmargs.agent}"/> 
     1035            <jvmarg line="${profiler.info.jvmargs}"/> 
     1036            <test name="${profile.class}"/> 
     1037            <classpath> 
     1038                <path path="${run.test.classpath}"/> 
     1039                <path path="${j2ee.platform.classpath}"/> 
     1040            </classpath> 
     1041            <syspropertyset> 
     1042                <propertyref prefix="test-sys-prop."/> 
     1043                <mapper from="test-sys-prop.*" to="*" type="glob"/> 
     1044            </syspropertyset> 
     1045            <formatter type="brief" usefile="false"/> 
     1046            <formatter type="xml"/> 
     1047        </junit> 
     1048    </target> 
     1049    <!-- 
    8371050                 
    8381051                CLEANUP SECTION 
    8391052            --> 
    840     <target depends="init" if="no.dist.ear.dir" name="deps-clean" unless="no.deps"> 
     1053    <target depends="init" name="deps-clean" unless="no.deps"> 
    8411054        <ant antfile="${project.SuperDAO}/build.xml" inheritall="false" target="clean"/> 
    8421055    </target> 
  • java/sql-vyuka/nbproject/genfiles.properties

    r74 r79  
    55# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. 
    66nbproject/build-impl.xml.data.CRC32=3f9299bb 
    7 nbproject/build-impl.xml.script.CRC32=1628db8a 
    8 nbproject/build-impl.xml.stylesheet.CRC32=b139b33b@1.21.1.1 
     7nbproject/build-impl.xml.script.CRC32=6d1d7d3b 
     8nbproject/build-impl.xml.stylesheet.CRC32=b7883b1f@1.36.1.1 
  • java/sql-vyuka/nbproject/project.properties

    r74 r79  
     1annotation.processing.enabled=true 
     2annotation.processing.enabled.in.editor=true 
     3annotation.processing.processors.list= 
     4annotation.processing.run.all.processors=true 
     5annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output 
    16build.classes.dir=${build.web.dir}/WEB-INF/classes 
    27build.classes.excludes=**/*.java,**/*.form 
     
    2227excludes= 
    2328includes=** 
     29j2ee.compile.on.save=false 
    2430j2ee.deploy.on.save=false 
    2531j2ee.platform=1.5 
     32j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/javax.annotation.jar:${j2ee.server.home}/modules/jsf-api.jar:${j2ee.server.home}/modules/jsf-impl.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar:${j2ee.server.home}/modules/javax.enterprise.deploy.jar:${j2ee.server.home}/modules/javax.resource.jar:${j2ee.server.home}/modules/javax.security.auth.message.jar:${j2ee.server.home}/modules/jersey-core.jar:${j2ee.server.home}/modules/javax.servlet.jar:${j2ee.server.home}/modules/javax.ejb.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.management.j2ee.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.jms.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/javax.security.jacc.jar:${j2ee.server.home}/modules/javax.transaction.jar:${j2ee.server.home}/modules/jstl-impl.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/javax.persistence.jar 
     33j2ee.platform.embeddableejb.classpath=${j2ee.server.home}/lib/embedded/glassfish-embedded-static-shell.jar 
     34j2ee.platform.wscompile.classpath=${j2ee.server.home}/modules/webservices-osgi.jar 
     35j2ee.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 
     36j2ee.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 
     37j2ee.platform.wsit.classpath= 
    2638j2ee.server.type=gfv3ee6 
    2739jar.compress=false 
     
    3244javac.debug=true 
    3345javac.deprecation=false 
     46javac.processorpath=\ 
     47    ${javac.classpath} 
    3448javac.source=1.5 
    3549javac.target=1.5 
     
    3751    ${javac.classpath}:\ 
    3852    ${build.classes.dir} 
     53javac.test.processorpath=${javac.test.classpath} 
    3954javadoc.additionalparam= 
    4055javadoc.author=false 
  • java/sql-vyuka/web/WEB-INF/casti/aplikace.jspx

    r64 r79  
    2525                                title="${navigacePredchozi}" 
    2626                                type="button" 
    27                                 onclick="javascript:ajaxPruvodcePredchozi();">&amp;nbsp;</button> 
     27                                onclick="javascript:ajaxPruvodcePredchozi();">&amp;#160;</button> 
    2828                        <fmt:message key="navigace.zpet" var="navigaceZpet" /> 
    2929                        <button class="zpet" 
     
    3131                                title="${navigaceZpet}" 
    3232                                type="button" 
    33                                 onclick="javascript:ajaxPruvodceZpet();">&amp;nbsp;</button> 
     33                                onclick="javascript:ajaxPruvodceZpet();">&amp;#160;</button> 
    3434                        <fmt:message key="navigace.pruvodce" var="navigacePruvodce" /> 
    3535                        <button class="pruvodce" 
     
    3737                                title="${navigacePruvodce}" 
    3838                                type="button" 
    39                                 onclick="javascript:ajaxPruvodceKod('pruvodce');">&amp;nbsp;</button> 
     39                                onclick="javascript:ajaxPruvodceKod('pruvodce');">&amp;#160;</button> 
    4040                        <fmt:message key="navigace.model" var="navigaceModel" /> 
    4141                        <button class="model" 
     
    4343                                title="${navigaceModel}" 
    4444                                type="button" 
    45                                 onclick="javascript:ajaxPruvodceKod('model');">&amp;nbsp;</button> 
     45                                onclick="javascript:ajaxPruvodceKod('model');">&amp;#160;</button> 
    4646                        <fmt:message key="navigace.vpred" var="navigaceVpred" /> 
    4747                        <button class="vpred" 
     
    4949                                title="${navigaceVpred}" 
    5050                                type="button" 
    51                                 onclick="javascript:ajaxPruvodceVpred();">&amp;nbsp;</button> 
     51                                onclick="javascript:ajaxPruvodceVpred();">&amp;#160;</button> 
    5252                        <fmt:message key="navigace.nasledujici" var="navigaceNasledujici" /> 
    5353                        <button class="nasledujici" 
    5454                                title="${navigaceNasledujici}" 
    5555                                type="button" 
    56                                 onclick="javascript:ajaxPruvodceNasledujici();">&amp;nbsp;</button> 
     56                                onclick="javascript:ajaxPruvodceNasledujici();">&amp;#160;</button> 
    5757                    </fieldset> 
    5858                </form> 
     
    8181                                    title="${zobrazitHistoriiTip}" 
    8282                                    type="button" 
    83                                     onclick="javascript:ajaxZobrazitHistorii();">&amp;nbsp;</button> 
     83                                    onclick="javascript:ajaxZobrazitHistorii();">&amp;#160;</button> 
    8484                            <fmt:message key="tlacitko.vykonat.tip" var="vykonatSQLTip" /> 
    8585                            <button class="vykonatSQL" 
     
    8787                                    title="${vykonatSQLTip}" 
    8888                                    type="button" 
    89                                     onclick="javascript:ajaxVykonatSQL();">&amp;nbsp;</button> 
     89                                    onclick="javascript:ajaxVykonatSQL();">&amp;#160;</button> 
    9090                        </fieldset> 
    9191                    </form> 
  • java/sql-vyuka/web/index.jsp

    r57 r79  
    88<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="cs" lang="cs"> 
    99    <head> 
    10         <meta http-equiv="content-language" content="cs"/> 
    11         <meta http-equiv="content-type" content="text/html; charset=UTF-8"/> 
    12         <link href="styl.css" type="text/css" rel="StyleSheet"/> 
    13         <link href="strom.css" type="text/css" rel="StyleSheet"/> 
    14         <link rel="shortcut icon" href="grafika/navigace-model.png" type="image/x-icon" /> 
    15         <script type="text/javaScript" src="hlavni.js"></script> 
    16         <script type="text/javaScript" src="vstupniPole.js"></script> 
    17         <script type="text/javaScript" src="klavesoveZkratky.js"></script> 
    18         <script type="text/javaScript" src="strom.js"></script> 
    19         <title><fmt:message key="nazev"/></title> 
     10        <meta http-equiv="content-language" content="cs"/> 
     11        <meta http-equiv="content-type" content="text/html; charset=UTF-8"/> 
     12        <link href="styl.css" type="text/css" rel="StyleSheet"/> 
     13        <link href="strom.css" type="text/css" rel="StyleSheet"/> 
     14        <link rel="shortcut icon" href="grafika/navigace-model.png" type="image/x-icon" /> 
     15        <script type="text/javaScript" src="hlavni.js"></script> 
     16        <script type="text/javaScript" src="vstupniPole.js"></script> 
     17        <script type="text/javaScript" src="klavesoveZkratky.js"></script> 
     18        <script type="text/javaScript" src="strom.js"></script> 
     19        <title><fmt:message key="nazev"/></title> 
    2020    </head> 
    2121    <body> 
    2222 
    23         <jsp:include page="WEB-INF/casti/aplikace.jspx" flush="false"/> 
     23        <jsp:include page="WEB-INF/casti/aplikace.jspx" flush="false"/> 
    2424 
    2525    </body>