1.1 --- a/java/sql-vyuka/nbproject/build-impl.xml	Sat Jun 13 01:32:13 2009 +0200
     1.2 +++ b/java/sql-vyuka/nbproject/build-impl.xml	Wed Jul 01 20:58:36 2009 +0200
     1.3 @@ -19,6 +19,13 @@
     1.4          -->
     1.5  <project xmlns:webproject1="http://www.netbeans.org/ns/web-project/1" xmlns:webproject2="http://www.netbeans.org/ns/web-project/2" xmlns:webproject3="http://www.netbeans.org/ns/web-project/3" basedir=".." default="default" name="sql-vyuka-impl">
     1.6      <import file="ant-deploy.xml"/>
     1.7 +    <fail message="Please build using Ant 1.7.1 or higher.">
     1.8 +        <condition>
     1.9 +            <not>
    1.10 +                <antversion atleast="1.7.1"/>
    1.11 +            </not>
    1.12 +        </condition>
    1.13 +    </fail>
    1.14      <target depends="dist,javadoc" description="Build whole project." name="default"/>
    1.15      <!--
    1.16                  INITIALIZATION SECTION
    1.17 @@ -130,6 +137,9 @@
    1.18                  <isfalse value="${directory.deployment.supported}"/>
    1.19              </and>
    1.20          </condition>
    1.21 +        <condition property="do.tmp.war.package">
    1.22 +            <isfalse value="${directory.deployment.supported}"/>
    1.23 +        </condition>
    1.24          <property name="build.meta.inf.dir" value="${build.web.dir}/META-INF"/>
    1.25          <condition else="" property="application.args.param" value="${application.args}">
    1.26              <and>
    1.27 @@ -206,9 +216,17 @@
    1.28              <attribute default="${includes}" name="includes"/>
    1.29              <attribute default="${excludes}" name="excludes"/>
    1.30              <attribute default="${javac.debug}" name="debug"/>
    1.31 +            <attribute default="${empty.dir}" name="gensrcdir"/>
    1.32              <element name="customize" optional="true"/>
    1.33              <sequential>
    1.34 +                <property location="${build.dir}/empty" name="empty.dir"/>
    1.35 +                <mkdir dir="${empty.dir}"/>
    1.36                  <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}">
    1.37 +                    <src>
    1.38 +                        <dirset dir="@{gensrcdir}" erroronmissingdir="false">
    1.39 +                            <include name="*"/>
    1.40 +                        </dirset>
    1.41 +                    </src>
    1.42                      <classpath>
    1.43                          <path path="@{classpath}"/>
    1.44                      </classpath>
    1.45 @@ -247,12 +265,13 @@
    1.46      <target name="-init-macrodef-java">
    1.47          <macrodef name="java" uri="http://www.netbeans.org/ns/web-project/1">
    1.48              <attribute default="${main.class}" name="classname"/>
    1.49 +            <attribute default="${debug.classpath}" name="classpath"/>
    1.50              <element name="customize" optional="true"/>
    1.51              <sequential>
    1.52                  <java classname="@{classname}" fork="true">
    1.53                      <jvmarg line="${runmain.jvmargs}"/>
    1.54                      <classpath>
    1.55 -                        <path path="${debug.classpath}:${j2ee.platform.classpath}"/>
    1.56 +                        <path path="@{classpath}:${j2ee.platform.classpath}"/>
    1.57                      </classpath>
    1.58                      <syspropertyset>
    1.59                          <propertyref prefix="run-sys-prop."/>
    1.60 @@ -361,10 +380,14 @@
    1.61                  COMPILATION SECTION
    1.62              -->
    1.63      <target depends="init" if="no.dist.ear.dir" name="deps-module-jar" unless="no.deps">
    1.64 -        <ant antfile="${project.SuperDAO}/build.xml" inheritall="false" target="jar"/>
    1.65 +        <ant antfile="${project.SuperDAO}/build.xml" inheritall="false" target="jar">
    1.66 +            <property name="deploy.on.save" value="false"/>
    1.67 +        </ant>
    1.68      </target>
    1.69      <target depends="init" if="dist.ear.dir" name="deps-ear-jar" unless="no.deps">
    1.70 -        <ant antfile="${project.SuperDAO}/build.xml" inheritall="false" target="jar"/>
    1.71 +        <ant antfile="${project.SuperDAO}/build.xml" inheritall="false" target="jar">
    1.72 +            <property name="deploy.on.save" value="false"/>
    1.73 +        </ant>
    1.74      </target>
    1.75      <target depends="init, deps-module-jar, deps-ear-jar" name="deps-jar" unless="no.deps"/>
    1.76      <target depends="init,deps-jar" name="-pre-pre-compile">
    1.77 @@ -382,9 +405,8 @@
    1.78              <fileset dir="${webinf.dir}" excludes="${build.web.excludes}"/>
    1.79          </copy>
    1.80      </target>
    1.81 -    <target name="-do-ws-compile"/>
    1.82 -    <target depends="init, deps-jar, -pre-pre-compile, -pre-compile, -copy-manifest, -copy-persistence-xml, -copy-webdir, library-inclusion-in-archive,library-inclusion-in-manifest,-do-ws-compile" if="have.sources" name="-do-compile">
    1.83 -        <webproject2:javac destdir="${build.classes.dir}"/>
    1.84 +    <target depends="init, deps-jar, -pre-pre-compile, -pre-compile, -copy-manifest, -copy-persistence-xml, -copy-webdir, library-inclusion-in-archive,library-inclusion-in-manifest" if="have.sources" name="-do-compile">
    1.85 +        <webproject2:javac destdir="${build.classes.dir}" gensrcdir="${build.generated.sources.dir}"/>
    1.86          <copy todir="${build.classes.dir}">
    1.87              <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
    1.88          </copy>
    1.89 @@ -412,7 +434,7 @@
    1.90      </target>
    1.91      <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
    1.92          <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
    1.93 -        <webproject2:javac excludes="" includes="${javac.includes}"/>
    1.94 +        <webproject2:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}"/>
    1.95          <copy todir="${build.classes.dir}">
    1.96              <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
    1.97          </copy>
    1.98 @@ -511,7 +533,7 @@
    1.99      <target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir">
   1.100          <copyfiles files="${reference.SuperDAO.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
   1.101      </target>
   1.102 -    <target depends="init,compile,compile-jsps,-pre-dist,library-inclusion-in-manifest" name="do-ear-dist">
   1.103 +    <target depends="init,compile,compile-jsps,-pre-dist,library-inclusion-in-manifest" if="do.tmp.war.package" name="do-ear-dist">
   1.104          <dirname file="${dist.ear.war}" property="dist.jar.dir"/>
   1.105          <mkdir dir="${dist.jar.dir}"/>
   1.106          <jar compress="${jar.compress}" jarfile="${dist.ear.war}" manifest="${build.web.dir}/META-INF/MANIFEST.MF">
   1.107 @@ -631,12 +653,17 @@
   1.108          <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
   1.109          <webproject1:java classname="${run.class}"/>
   1.110      </target>
   1.111 +    <target depends="init,compile-test-single,-pre-test-run-single" name="run-test-with-main">
   1.112 +        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
   1.113 +        <webproject1:java classname="${run.class}" classpath="${run.test.classpath}"/>
   1.114 +    </target>
   1.115      <!--
   1.116                  DEBUGGING SECTION
   1.117              -->
   1.118      <target depends="init,compile,compile-jsps,-do-compile-single-jsp,-pre-dist,-do-tmp-dist-with-manifest,-do-tmp-dist-without-manifest" description="Debug project in IDE." if="netbeans.home" name="debug">
   1.119 -        <nbdeploy clientUrlPart="${client.urlPart}" debugmode="true"/>
   1.120 +        <nbstartserver debugmode="true"/>
   1.121          <antcall target="connect-debugger"/>
   1.122 +        <nbdeploy clientUrlPart="${client.urlPart}" debugmode="true" forceRedeploy="true"/>
   1.123          <antcall target="debug-display-browser"/>
   1.124          <antcall target="connect-client-debugger"/>
   1.125      </target>
   1.126 @@ -656,7 +683,15 @@
   1.127      <target if="do.debug.client" name="connect-client-debugger">
   1.128          <webproject1:nbjsdebugstart webUrl="${client.url}"/>
   1.129      </target>
   1.130 +    <target depends="init,compile-test-single" if="netbeans.home" name="-debug-start-debuggee-main-test">
   1.131 +        <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
   1.132 +        <webproject1:debug classname="${debug.class}" classpath="${debug.test.classpath}"/>
   1.133 +    </target>
   1.134 +    <target depends="init,compile-test-single,-debug-start-debugger-main-test,-debug-start-debuggee-main-test" if="netbeans.home" name="debug-test-with-main"/>
   1.135      <target depends="init,compile,compile-jsps,-do-compile-single-jsp,debug" if="netbeans.home" name="debug-single"/>
   1.136 +    <target depends="init" if="netbeans.home" name="-debug-start-debugger-main-test">
   1.137 +        <webproject1:nbjpdastart classpath="${debug.test.classpath}" name="${debug.class}"/>
   1.138 +    </target>
   1.139      <target depends="init" if="netbeans.home" name="-debug-start-debugger">
   1.140          <webproject1:nbjpdastart name="${debug.class}"/>
   1.141      </target>
   1.142 @@ -685,6 +720,9 @@
   1.143              <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
   1.144                  <filename name="**/*.java"/>
   1.145              </fileset>
   1.146 +            <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
   1.147 +                <include name="**/*.java"/>
   1.148 +            </fileset>
   1.149          </javadoc>
   1.150      </target>
   1.151      <target depends="init,javadoc-build" if="netbeans.home" name="javadoc-browse" unless="no.javadoc.preview">
   1.152 @@ -740,7 +778,7 @@
   1.153          <webproject2:junit testincludes="**/*Test.java"/>
   1.154      </target>
   1.155      <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
   1.156 -        <fail if="tests.failed">Some tests failed; see details above.</fail>
   1.157 +        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
   1.158      </target>
   1.159      <target depends="init" if="have.tests" name="test-report"/>
   1.160      <target depends="init" if="netbeans.home+have.tests" name="-test-browse"/>
   1.161 @@ -753,7 +791,7 @@
   1.162          <webproject2:junit excludes="" includes="${test.includes}"/>
   1.163      </target>
   1.164      <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
   1.165 -        <fail if="tests.failed">Some tests failed; see details above.</fail>
   1.166 +        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
   1.167      </target>
   1.168      <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
   1.169      <!--

     2.1 --- a/java/sql-vyuka/nbproject/genfiles.properties	Sat Jun 13 01:32:13 2009 +0200
     2.2 +++ b/java/sql-vyuka/nbproject/genfiles.properties	Wed Jul 01 20:58:36 2009 +0200
     2.3 @@ -4,5 +4,5 @@
     2.4  # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
     2.5  # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
     2.6  nbproject/build-impl.xml.data.CRC32=eb6453d4
     2.7 -nbproject/build-impl.xml.script.CRC32=7bef4ff2
     2.8 -nbproject/build-impl.xml.stylesheet.CRC32=174458fc
     2.9 +nbproject/build-impl.xml.script.CRC32=857df3c0
    2.10 +nbproject/build-impl.xml.stylesheet.CRC32=8ab4467e@1.15.1.1

     3.1 --- a/java/sql-vyuka/nbproject/project.properties	Sat Jun 13 01:32:13 2009 +0200
     3.2 +++ b/java/sql-vyuka/nbproject/project.properties	Wed Jul 01 20:58:36 2009 +0200
     3.3 @@ -2,6 +2,7 @@
     3.4  build.classes.excludes=**/*.java,**/*.form
     3.5  build.dir=build
     3.6  build.generated.dir=${build.dir}/generated
     3.7 +build.generated.sources.dir=${build.dir}/generated-sources
     3.8  build.test.classes.dir=${build.dir}/test/classes
     3.9  build.test.results.dir=${build.dir}/test/results
    3.10  build.web.dir=${build.dir}/web

     4.1 --- a/java/sql-vyuka/web/styl.css	Sat Jun 13 01:32:13 2009 +0200
     4.2 +++ b/java/sql-vyuka/web/styl.css	Wed Jul 01 20:58:36 2009 +0200
     4.3 @@ -15,6 +15,16 @@
     4.4      font-size: 12px;
     4.5  }
     4.6  
     4.7 +/** České uvozovky: „ */
     4.8 +q:before {
     4.9 +    content: "\201E";
    4.10 +}
    4.11 +
    4.12 +/** České uvozovky: “ */
    4.13 +q:after {
    4.14 +    content: "\201C";
    4.15 +}
    4.16 +
    4.17  /** Prostor pro logo a název programu */
    4.18  #zahlavi {
    4.19      height: 48px;