1.1 --- a/.hgignore Wed Feb 08 13:15:23 2012 +0100
1.2 +++ b/.hgignore Wed Feb 08 13:16:13 2012 +0100
1.3 @@ -3,3 +3,5 @@
1.4 java/sql-vyuka/web/sql-vyuka-src.zip
1.5 java/sql-vyuka/nbproject/private
1.6 java/sql-vyuka/src/conf/MANIFEST.MF
1.7 +temp/*
1.8 +balíčky/*
2.1 --- a/java/sql-vyuka/nbproject/ant-deploy.xml Wed Feb 08 13:15:23 2012 +0100
2.2 +++ b/java/sql-vyuka/nbproject/ant-deploy.xml Wed Feb 08 13:16:13 2012 +0100
2.3 @@ -3,6 +3,7 @@
2.4 <target name="-init-cl-deployment-env" if="deploy.ant.enabled">
2.5 <property file="${deploy.ant.properties.file}" />
2.6 <available file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" property="sun.web.present"/>
2.7 + <available file="${deploy.ant.docbase.dir}/WEB-INF/glassfish-web.xml" property="glassfish.web.present"/>
2.8 <available file="${deploy.ant.resource.dir}" property="has.setup"/>
2.9 <tempfile prefix="gfv3" property="gfv3.password.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
2.10 <echo message="AS_ADMIN_PASSWORD=${gfv3.password}" file="${gfv3.password.file}"/>
2.11 @@ -23,8 +24,34 @@
2.12 <xmlproperty file="${temp.sun.web}" validate="false">
2.13 </xmlproperty>
2.14 <delete file="${temp.sun.web}"/>
2.15 - <property name="deploy.ant.client.url" value="${gfv3.url}${sun-web-app.context-root}"/>
2.16 - <property name="deploy.context.root.argument" value="?contextroot=${sun-web-app.context-root}"/>
2.17 + <condition property="deploy.ant.client.url" value="${gfv3.url}${sun-web-app.context-root}" else="${gfv3.url}/${ant.project.name}">
2.18 + <isset property="sun-web-app.context-root"/>
2.19 + </condition>
2.20 + <condition property="deploy.context.root.argument" value="&contextroot=${sun-web-app.context-root}" else="/${ant.project.name}">
2.21 + <isset property="sun-web-app.context-root"/>
2.22 + </condition>
2.23 + </target>
2.24 + <target name="-parse-glassfish-web" depends="-init-cl-deployment-env" if="glassfish.web.present">
2.25 + <tempfile prefix="gfv3" property="temp.gf.web" destdir="${java.io.tmpdir}"/>
2.26 + <copy file="${deploy.ant.docbase.dir}/WEB-INF/glassfish-web.xml" tofile="${temp.gf.web}"/>
2.27 + <!-- The doctype triggers resolution which can fail -->
2.28 + <replace file="${temp.gf.web}">
2.29 + <replacetoken><![CDATA[<!DOCTYPE]]></replacetoken>
2.30 + <replacevalue><![CDATA[<!-- <!DOCTYPE]]></replacevalue>
2.31 + </replace>
2.32 + <replace file="${temp.gf.web}">
2.33 + <replacetoken><![CDATA[<glassfish-web-app]]></replacetoken>
2.34 + <replacevalue><![CDATA[--> <glassfish-web-app]]></replacevalue>
2.35 + </replace>
2.36 + <xmlproperty file="${temp.gf.web}" validate="false">
2.37 + </xmlproperty>
2.38 + <delete file="${temp.gf.web}"/>
2.39 + <condition property="deploy.ant.client.url" value="${gfv3.url}${glassfish-web-app.context-root}" else="${gfv3.url}/${ant.project.name}">
2.40 + <isset property="glassfish-web-app.context-root"/>
2.41 + </condition>
2.42 + <condition property="deploy.context.root.argument" value="&contextroot=${glassfish-web-app.context-root}" else="/${ant.project.name}">
2.43 + <isset property="glassfish-web-app.context-root"/>
2.44 + </condition>
2.45 </target>
2.46 <target name="-no-parse-sun-web" depends="-init-cl-deployment-env" unless="sun.web.present">
2.47 <property name="deploy.context.root.argument" value=""/>
2.48 @@ -33,7 +60,6 @@
2.49 <tempfile prefix="gfv3" property="gfv3.resources.dir" destdir="${java.io.tmpdir}"/>
2.50 <mkdir dir="${gfv3.resources.dir}"/>
2.51 <mkdir dir="${gfv3.resources.dir}/META-INF"/>
2.52 - <property name="gfv3.resources.file" value="${gfv3.resources.dir}/META-INF/sun-resources.xml"/>
2.53 <copy todir="${gfv3.resources.dir}/META-INF">
2.54 <fileset dir="${deploy.ant.resource.dir}"/>
2.55 </copy>
2.56 @@ -42,19 +68,44 @@
2.57 </jar>
2.58 <delete dir="${gfv3.resources.dir}"/>
2.59 </target>
2.60 - <target name="-deploy-ant" depends="-parse-sun-web,-no-parse-sun-web,-add-resources" if="deploy.ant.enabled">
2.61 + <target name="-deploy-ant" depends="-parse-glassfish-web, -parse-sun-web, -no-parse-sun-web,-add-resources" if="deploy.ant.enabled">
2.62 + <antcall target="-deploy-without-pw"/>
2.63 + <antcall target="-deploy-with-pw"/>
2.64 + </target>
2.65 +
2.66 + <target name="-deploy-without-pw" unless="gfv3.password">
2.67 <echo message="Deploying ${deploy.ant.archive}"/>
2.68 <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
2.69 <property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
2.70 - <get src="${gfv3.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}?force=true?name=${ant.project.name}"
2.71 + <get src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&force=true&name=${ant.project.name}"
2.72 dest="${gfv3.results.file}"/>
2.73 <delete file="${gfv3.results.file}"/>
2.74 </target>
2.75 + <target name="-deploy-with-pw" if="gfv3.password">
2.76 + <echo message="Deploying ${deploy.ant.archive}"/>
2.77 + <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
2.78 + <property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
2.79 + <get username="${gfv3.username}" password="${gfv3.password}" src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&force=true&name=${ant.project.name}"
2.80 + dest="${gfv3.results.file}"/>
2.81 + <delete file="${gfv3.results.file}"/>
2.82 + </target>
2.83 <target name="-undeploy-ant" depends="-init-cl-deployment-env" if="deploy.ant.enabled">
2.84 + <antcall target="-undeploy-without-pw"/>
2.85 + <antcall target="-undeploy-with-pw"/>
2.86 + </target>
2.87 +
2.88 + <target name="-undeploy-without-pw" unless="gfv3.password">
2.89 <echo message="Undeploying ${deploy.ant.archive}"/>
2.90 <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
2.91 - <get src="${gfv3.url}/__asadmin/undeploy?name=${ant.project.name}"
2.92 + <get src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
2.93 dest="${gfv3.results.file}"/>
2.94 <delete file="${gfv3.results.file}"/>
2.95 </target>
2.96 + <target name="-undeploy-with-pw" if="gfv3.password">
2.97 + <echo message="Undeploying ${deploy.ant.archive}"/>
2.98 + <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
2.99 + <get username="${gfv3.username}" password="${gfv3.password}" src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
2.100 + dest="${gfv3.results.file}"/>
2.101 + <delete file="${gfv3.results.file}"/>
2.102 + </target>
2.103 </project>
3.1 --- a/java/sql-vyuka/nbproject/build-impl.xml Wed Feb 08 13:15:23 2012 +0100
3.2 +++ b/java/sql-vyuka/nbproject/build-impl.xml Wed Feb 08 13:16:13 2012 +0100
3.3 @@ -173,12 +173,27 @@
3.4 <property name="runmain.jvmargs" value=""/>
3.5 <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
3.6 <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
3.7 - <length length="0" string="${endorsed.classpath}" when="greater"/>
3.8 + <and>
3.9 + <isset property="endorsed.classpath"/>
3.10 + <length length="0" string="${endorsed.classpath}" when="greater"/>
3.11 + </and>
3.12 </condition>
3.13 + <condition else="false" property="jdkBug6558476">
3.14 + <and>
3.15 + <matches pattern="1\.[56]" string="${java.specification.version}"/>
3.16 + <not>
3.17 + <os family="unix"/>
3.18 + </not>
3.19 + </and>
3.20 + </condition>
3.21 + <property name="javac.fork" value="${jdkBug6558476}"/>
3.22 </target>
3.23 <target depends="init" name="-init-cos" unless="deploy.on.save">
3.24 <condition property="deploy.on.save" value="true">
3.25 - <istrue value="${j2ee.deploy.on.save}"/>
3.26 + <or>
3.27 + <istrue value="${j2ee.deploy.on.save}"/>
3.28 + <istrue value="${j2ee.compile.on.save}"/>
3.29 + </or>
3.30 </condition>
3.31 </target>
3.32 <target name="-post-init">
3.33 @@ -198,6 +213,20 @@
3.34 <fail unless="build.test.results.dir">Must set build.test.results.dir</fail>
3.35 <fail unless="build.classes.excludes">Must set build.classes.excludes</fail>
3.36 <fail unless="dist.war">Must set dist.war</fail>
3.37 + <condition property="missing.j2ee.server.home">
3.38 + <and>
3.39 + <matches pattern="j2ee.server.home" string="${j2ee.platform.classpath}"/>
3.40 + <not>
3.41 + <isset property="j2ee.server.home"/>
3.42 + </not>
3.43 + </and>
3.44 + </condition>
3.45 + <fail if="missing.j2ee.server.home">
3.46 +The Java EE server classpath is not correctly set up - server home directory is missing.
3.47 +Either open the project in the IDE and assign the server or setup the server classpath manually.
3.48 +For example like this:
3.49 + ant -Dj2ee.server.home=<app_server_installation_directory>
3.50 + </fail>
3.51 <fail unless="j2ee.platform.classpath">
3.52 The Java EE server classpath is not correctly set up. Your active server type is ${j2ee.server.type}.
3.53 Either open the project in the IDE and assign the server or setup the server classpath manually.
3.54 @@ -215,11 +244,51 @@
3.55 </sequential>
3.56 </macrodef>
3.57 </target>
3.58 - <target name="-init-macrodef-javac">
3.59 + <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">
3.60 <macrodef name="javac" uri="http://www.netbeans.org/ns/web-project/2">
3.61 <attribute default="${src.dir}" name="srcdir"/>
3.62 <attribute default="${build.classes.dir}" name="destdir"/>
3.63 <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
3.64 + <attribute default="${javac.processorpath}" name="processorpath"/>
3.65 + <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
3.66 + <attribute default="${includes}" name="includes"/>
3.67 + <attribute default="${excludes}" name="excludes"/>
3.68 + <attribute default="${javac.debug}" name="debug"/>
3.69 + <attribute default="${empty.dir}" name="gensrcdir"/>
3.70 + <element name="customize" optional="true"/>
3.71 + <sequential>
3.72 + <property location="${build.dir}/empty" name="empty.dir"/>
3.73 + <mkdir dir="${empty.dir}"/>
3.74 + <mkdir dir="@{apgeneratedsrcdir}"/>
3.75 + <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}">
3.76 + <src>
3.77 + <dirset dir="@{gensrcdir}" erroronmissingdir="false">
3.78 + <include name="*"/>
3.79 + </dirset>
3.80 + </src>
3.81 + <classpath>
3.82 + <path path="@{classpath}"/>
3.83 + </classpath>
3.84 + <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
3.85 + <compilerarg line="${javac.compilerargs}"/>
3.86 + <compilerarg value="-processorpath"/>
3.87 + <compilerarg path="@{processorpath}:${empty.dir}"/>
3.88 + <compilerarg line="${ap.processors.internal}"/>
3.89 + <compilerarg value="-s"/>
3.90 + <compilerarg path="@{apgeneratedsrcdir}"/>
3.91 + <compilerarg line="${ap.proc.none.internal}"/>
3.92 + <customize/>
3.93 + </javac>
3.94 + </sequential>
3.95 + </macrodef>
3.96 + </target>
3.97 + <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
3.98 + <macrodef name="javac" uri="http://www.netbeans.org/ns/web-project/2">
3.99 + <attribute default="${src.dir}" name="srcdir"/>
3.100 + <attribute default="${build.classes.dir}" name="destdir"/>
3.101 + <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
3.102 + <attribute default="${javac.processorpath}" name="processorpath"/>
3.103 + <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
3.104 <attribute default="${includes}" name="includes"/>
3.105 <attribute default="${excludes}" name="excludes"/>
3.106 <attribute default="${javac.debug}" name="debug"/>
3.107 @@ -244,6 +313,38 @@
3.108 </sequential>
3.109 </macrodef>
3.110 </target>
3.111 + <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
3.112 + <macrodef name="depend" uri="http://www.netbeans.org/ns/web-project/2">
3.113 + <attribute default="${src.dir}" name="srcdir"/>
3.114 + <attribute default="${build.classes.dir}" name="destdir"/>
3.115 + <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
3.116 + <sequential>
3.117 + <depend cache="${build.dir}/depcache" destdir="@{destdir}" excludes="${excludes}" includes="${includes}" srcdir="@{srcdir}">
3.118 + <classpath>
3.119 + <path path="@{classpath}"/>
3.120 + </classpath>
3.121 + </depend>
3.122 + </sequential>
3.123 + </macrodef>
3.124 + <macrodef name="force-recompile" uri="http://www.netbeans.org/ns/web-project/2">
3.125 + <attribute default="${build.classes.dir}" name="destdir"/>
3.126 + <sequential>
3.127 + <fail unless="javac.includes">Must set javac.includes</fail>
3.128 + <pathconvert pathsep="${line.separator}" property="javac.includes.binary">
3.129 + <path>
3.130 + <filelist dir="@{destdir}" files="${javac.includes}"/>
3.131 + </path>
3.132 + <globmapper from="*.java" to="*.class"/>
3.133 + </pathconvert>
3.134 + <tempfile deleteonexit="true" property="javac.includesfile.binary"/>
3.135 + <echo file="${javac.includesfile.binary}" message="${javac.includes.binary}"/>
3.136 + <delete>
3.137 + <files includesfile="${javac.includesfile.binary}"/>
3.138 + </delete>
3.139 + <delete file="${javac.includesfile.binary}"/>
3.140 + </sequential>
3.141 + </macrodef>
3.142 + </target>
3.143 <target name="-init-macrodef-junit">
3.144 <macrodef name="junit" uri="http://www.netbeans.org/ns/web-project/2">
3.145 <attribute default="${includes}" name="includes"/>
3.146 @@ -266,6 +367,7 @@
3.147 <formatter type="brief" usefile="false"/>
3.148 <formatter type="xml"/>
3.149 <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
3.150 + <jvmarg value="-ea"/>
3.151 <jvmarg line="${runmain.jvmargs}"/>
3.152 </junit>
3.153 </sequential>
3.154 @@ -386,7 +488,43 @@
3.155 </fail>
3.156 <taskdef classpath="${libs.CopyLibs.classpath}" resource="org/netbeans/modules/java/j2seproject/copylibstask/antlib.xml"/>
3.157 </target>
3.158 - <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"/>
3.159 + <target name="-init-ap-cmdline-properties">
3.160 + <property name="annotation.processing.enabled" value="true"/>
3.161 + <property name="annotation.processing.processors.list" value=""/>
3.162 + <property name="annotation.processing.run.all.processors" value="true"/>
3.163 + <property name="javac.processorpath" value="${javac.classpath}"/>
3.164 + <property name="javac.test.processorpath" value="${javac.test.classpath}"/>
3.165 + <condition property="ap.supported.internal" value="true">
3.166 + <not>
3.167 + <matches pattern="1\.[0-5](\..*)?" string="${javac.source}"/>
3.168 + </not>
3.169 + </condition>
3.170 + </target>
3.171 + <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-ap-cmdline-supported">
3.172 + <condition else="" property="ap.processors.internal" value="-processor ${annotation.processing.processors.list}">
3.173 + <isfalse value="${annotation.processing.run.all.processors}"/>
3.174 + </condition>
3.175 + <condition else="" property="ap.proc.none.internal" value="-proc:none">
3.176 + <isfalse value="${annotation.processing.enabled}"/>
3.177 + </condition>
3.178 + </target>
3.179 + <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline">
3.180 + <property name="ap.cmd.line.internal" value=""/>
3.181 + </target>
3.182 + <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-check" name="profile-init"/>
3.183 + <target name="-profile-pre-init">
3.184 + <!-- Empty placeholder for easier customization. -->
3.185 + <!-- You can override this target in the ../build.xml file. -->
3.186 + </target>
3.187 + <target name="-profile-post-init">
3.188 + <!-- Empty placeholder for easier customization. -->
3.189 + <!-- You can override this target in the ../build.xml file. -->
3.190 + </target>
3.191 + <target depends="-profile-pre-init, init, -profile-post-init" name="-profile-init-check">
3.192 + <fail unless="profiler.info.jvm">Must set JVM to use for profiling in profiler.info.jvm</fail>
3.193 + <fail unless="profiler.info.jvmargs.agent">Must set profiler agent JVM arguments in profiler.info.jvmargs.agent</fail>
3.194 + </target>
3.195 + <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"/>
3.196 <!--
3.197 COMPILATION SECTION
3.198 -->
3.199 @@ -455,6 +593,8 @@
3.200 <!-- You can override this target in the ../build.xml file. -->
3.201 </target>
3.202 <target depends="init,deps-jar,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
3.203 + <property name="jspc.schemas" value="/resources/schemas/"/>
3.204 + <property name="jspc.dtds" value="/resources/dtds/"/>
3.205 <target depends="compile" description="Test compile JSP pages to expose compilation errors." if="do.compile.jsps" name="compile-jsps">
3.206 <mkdir dir="${build.generated.dir}/src"/>
3.207 <java classname="org.netbeans.modules.web.project.ant.JspC" failonerror="true" fork="true">
3.208 @@ -463,13 +603,16 @@
3.209 <arg value="-d"/>
3.210 <arg file="${basedir}/${build.generated.dir}/src"/>
3.211 <arg value="-die1"/>
3.212 + <arg value="-schemas ${jspc.schemas}"/>
3.213 + <arg value="-dtds ${jspc.dtds}"/>
3.214 <arg value="-compilerSourceVM ${javac.source}"/>
3.215 <arg value="-compilerTargetVM ${javac.target}"/>
3.216 <arg value="-javaEncoding ${source.encoding}"/>
3.217 - <classpath path="${java.home}/../lib/tools.jar:${jspctask.classpath}:${jspcompilation.classpath}"/>
3.218 + <arg value="-sysClasspath ${libs.jsp-compilation-syscp.classpath}"/>
3.219 + <classpath path="${java.home}/../lib/tools.jar:${libs.jsp-compiler.classpath}:${libs.jsp-compilation.classpath}"/>
3.220 </java>
3.221 <mkdir dir="${build.generated.dir}/classes"/>
3.222 - <webproject2:javac classpath="${j2ee.platform.classpath}:${build.classes.dir}:${jspcompilation.classpath}" destdir="${build.generated.dir}/classes" srcdir="${build.generated.dir}/src"/>
3.223 + <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"/>
3.224 </target>
3.225 <target depends="compile" if="jsp.includes" name="-do-compile-single-jsp">
3.226 <fail unless="javac.jsp.includes">Must select some files in the IDE or set javac.jsp.includes</fail>
3.227 @@ -480,15 +623,18 @@
3.228 <arg value="-d"/>
3.229 <arg file="${basedir}/${build.generated.dir}/src"/>
3.230 <arg value="-die1"/>
3.231 + <arg value="-schemas ${jspc.schemas}"/>
3.232 + <arg value="-dtds ${jspc.dtds}"/>
3.233 + <arg value="-sysClasspath ${libs.jsp-compilation-syscp.classpath}"/>
3.234 <arg value="-jspc.files"/>
3.235 <arg path="${jsp.includes}"/>
3.236 <arg value="-compilerSourceVM ${javac.source}"/>
3.237 <arg value="-compilerTargetVM ${javac.target}"/>
3.238 <arg value="-javaEncoding ${source.encoding}"/>
3.239 - <classpath path="${java.home}/../lib/tools.jar:${jspctask.classpath}:${jspcompilation.classpath}"/>
3.240 + <classpath path="${java.home}/../lib/tools.jar:${libs.jsp-compiler.classpath}:${libs.jsp-compilation.classpath}"/>
3.241 </java>
3.242 <mkdir dir="${build.generated.dir}/classes"/>
3.243 - <webproject2:javac classpath="${j2ee.platform.classpath}:${build.classes.dir}:${jspcompilation.classpath}" destdir="${build.generated.dir}/classes" srcdir="${build.generated.dir}/src">
3.244 + <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">
3.245 <customize>
3.246 <patternset includes="${javac.jsp.includes}"/>
3.247 </customize>
3.248 @@ -509,28 +655,28 @@
3.249 <dirname file="${dist.war}" property="dist.jar.dir"/>
3.250 <mkdir dir="${dist.jar.dir}"/>
3.251 <jar compress="${jar.compress}" jarfile="${dist.war}">
3.252 - <fileset dir="${build.web.dir}"/>
3.253 + <fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*"/>
3.254 </jar>
3.255 </target>
3.256 <target depends="init,compile,compile-jsps,-pre-dist" if="do.war.package.with.custom.manifest" name="-do-dist-with-manifest">
3.257 <dirname file="${dist.war}" property="dist.jar.dir"/>
3.258 <mkdir dir="${dist.jar.dir}"/>
3.259 <jar compress="${jar.compress}" jarfile="${dist.war}" manifest="${build.meta.inf.dir}/MANIFEST.MF">
3.260 - <fileset dir="${build.web.dir}"/>
3.261 + <fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*"/>
3.262 </jar>
3.263 </target>
3.264 <target depends="init,compile,compile-jsps,-pre-dist" if="do.tmp.war.package.without.custom.manifest" name="-do-tmp-dist-without-manifest">
3.265 <dirname file="${dist.war}" property="dist.jar.dir"/>
3.266 <mkdir dir="${dist.jar.dir}"/>
3.267 <jar compress="${jar.compress}" jarfile="${dist.war}">
3.268 - <fileset dir="${build.web.dir}"/>
3.269 + <fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*"/>
3.270 </jar>
3.271 </target>
3.272 <target depends="init,compile,compile-jsps,-pre-dist" if="do.tmp.war.package.with.custom.manifest" name="-do-tmp-dist-with-manifest">
3.273 <dirname file="${dist.war}" property="dist.jar.dir"/>
3.274 <mkdir dir="${dist.jar.dir}"/>
3.275 <jar compress="${jar.compress}" jarfile="${dist.war}" manifest="${build.meta.inf.dir}/MANIFEST.MF">
3.276 - <fileset dir="${build.web.dir}"/>
3.277 + <fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*"/>
3.278 </jar>
3.279 </target>
3.280 <target depends="init,compile,compile-jsps,-pre-dist,-do-dist-with-manifest,-do-dist-without-manifest" name="do-dist"/>
3.281 @@ -549,7 +695,7 @@
3.282 <dirname file="${dist.ear.war}" property="dist.jar.dir"/>
3.283 <mkdir dir="${dist.jar.dir}"/>
3.284 <jar compress="${jar.compress}" jarfile="${dist.ear.war}" manifest="${build.web.dir}/META-INF/MANIFEST.MF">
3.285 - <fileset dir="${build.web.dir}"/>
3.286 + <fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*"/>
3.287 </jar>
3.288 </target>
3.289 <target name="-post-dist">
3.290 @@ -581,9 +727,7 @@
3.291 <target name="-run-deploy-am">
3.292 <!-- Task to deploy to the Access Manager runtime. -->
3.293 </target>
3.294 - <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">
3.295 - <nbjpdaappreloaded/>
3.296 - </target>
3.297 + <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"/>
3.298 <target if="netbeans.home" name="-run-deploy-nb">
3.299 <nbdeploy clientUrlPart="${client.urlPart}" debugmode="false" forceRedeploy="${forceRedeploy}"/>
3.300 </target>
3.301 @@ -669,6 +813,9 @@
3.302 <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
3.303 <webproject1:java classname="${run.class}" classpath="${run.test.classpath}"/>
3.304 </target>
3.305 + <target depends="init" if="netbeans.home" name="-do-update-breakpoints">
3.306 + <webproject1:nbjpdaappreloaded/>
3.307 + </target>
3.308 <!--
3.309 DEBUGGING SECTION
3.310 -->
3.311 @@ -721,9 +868,38 @@
3.312 </target>
3.313 <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/>
3.314 <!--
3.315 + =================
3.316 + PROFILING SECTION
3.317 + =================
3.318 + -->
3.319 + <target description="Profile a J2EE project in the IDE." name="profile">
3.320 + <condition else="start-profiled-server" property="profiler.startserver.target" value="start-profiled-server-extraargs">
3.321 + <isset property="profiler.info.jvmargs.extra"/>
3.322 + </condition>
3.323 + <antcall target="${profiler.startserver.target}"/>
3.324 + <antcall target="run"/>
3.325 + <antcall target="start-loadgen"/>
3.326 + </target>
3.327 + <target name="start-profiled-server">
3.328 + <nbstartprofiledserver forceRestart="${profiler.j2ee.serverForceRestart}" javaPlatform="${profiler.info.javaPlatform}" startupTimeout="${profiler.j2ee.serverStartupTimeout}">
3.329 + <jvmarg value="${profiler.info.jvmargs.agent}"/>
3.330 + <jvmarg value="${profiler.j2ee.agentID}"/>
3.331 + </nbstartprofiledserver>
3.332 + </target>
3.333 + <target name="start-profiled-server-extraargs">
3.334 + <nbstartprofiledserver forceRestart="${profiler.j2ee.serverForceRestart}" javaPlatform="${profiler.info.javaPlatform}" startupTimeout="${profiler.j2ee.serverStartupTimeout}">
3.335 + <jvmarg value="${profiler.info.jvmargs.extra}"/>
3.336 + <jvmarg value="${profiler.info.jvmargs.agent}"/>
3.337 + <jvmarg value="${profiler.j2ee.agentID}"/>
3.338 + </nbstartprofiledserver>
3.339 + </target>
3.340 + <target if="profiler.loadgen.path" name="start-loadgen">
3.341 + <loadgenstart path="${profiler.loadgen.path}"/>
3.342 + </target>
3.343 + <!--
3.344 JAVADOC SECTION
3.345 -->
3.346 - <target depends="init" name="javadoc-build">
3.347 + <target depends="init" if="have.sources" name="javadoc-build">
3.348 <mkdir dir="${dist.javadoc.dir}"/>
3.349 <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}">
3.350 <classpath>
3.351 @@ -736,6 +912,14 @@
3.352 <include name="**/*.java"/>
3.353 </fileset>
3.354 </javadoc>
3.355 + <copy todir="${dist.javadoc.dir}">
3.356 + <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
3.357 + <filename name="**/doc-files/**"/>
3.358 + </fileset>
3.359 + <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
3.360 + <include name="**/doc-files/**"/>
3.361 + </fileset>
3.362 + </copy>
3.363 </target>
3.364 <target depends="init,javadoc-build" if="netbeans.home" name="javadoc-browse" unless="no.javadoc.preview">
3.365 <nbbrowse file="${dist.javadoc.dir}/index.html"/>
3.366 @@ -834,10 +1018,39 @@
3.367 </target>
3.368 <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
3.369 <!--
3.370 + =========================
3.371 + TESTS PROFILING SECTION
3.372 + =========================
3.373 + -->
3.374 + <target depends="profile-init,compile-test-single" if="netbeans.home" name="profile-test-single">
3.375 + <nbprofiledirect>
3.376 + <classpath>
3.377 + <path path="${run.test.classpath}"/>
3.378 + <path path="${j2ee.platform.classpath}"/>
3.379 + </classpath>
3.380 + </nbprofiledirect>
3.381 + <junit dir="${profiler.info.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${profiler.info.jvm}" showoutput="true">
3.382 + <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
3.383 + <jvmarg value="${profiler.info.jvmargs.agent}"/>
3.384 + <jvmarg line="${profiler.info.jvmargs}"/>
3.385 + <test name="${profile.class}"/>
3.386 + <classpath>
3.387 + <path path="${run.test.classpath}"/>
3.388 + <path path="${j2ee.platform.classpath}"/>
3.389 + </classpath>
3.390 + <syspropertyset>
3.391 + <propertyref prefix="test-sys-prop."/>
3.392 + <mapper from="test-sys-prop.*" to="*" type="glob"/>
3.393 + </syspropertyset>
3.394 + <formatter type="brief" usefile="false"/>
3.395 + <formatter type="xml"/>
3.396 + </junit>
3.397 + </target>
3.398 + <!--
3.399
3.400 CLEANUP SECTION
3.401 -->
3.402 - <target depends="init" if="no.dist.ear.dir" name="deps-clean" unless="no.deps">
3.403 + <target depends="init" name="deps-clean" unless="no.deps">
3.404 <ant antfile="${project.SuperDAO}/build.xml" inheritall="false" target="clean"/>
3.405 </target>
3.406 <target depends="init" name="do-clean">
4.1 --- a/java/sql-vyuka/nbproject/genfiles.properties Wed Feb 08 13:15:23 2012 +0100
4.2 +++ b/java/sql-vyuka/nbproject/genfiles.properties Wed Feb 08 13:16:13 2012 +0100
4.3 @@ -4,5 +4,5 @@
4.4 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
4.5 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
4.6 nbproject/build-impl.xml.data.CRC32=3f9299bb
4.7 -nbproject/build-impl.xml.script.CRC32=1628db8a
4.8 -nbproject/build-impl.xml.stylesheet.CRC32=b139b33b@1.21.1.1
4.9 +nbproject/build-impl.xml.script.CRC32=6d1d7d3b
4.10 +nbproject/build-impl.xml.stylesheet.CRC32=b7883b1f@1.36.1.1
5.1 --- a/java/sql-vyuka/nbproject/project.properties Wed Feb 08 13:15:23 2012 +0100
5.2 +++ b/java/sql-vyuka/nbproject/project.properties Wed Feb 08 13:16:13 2012 +0100
5.3 @@ -1,3 +1,8 @@
5.4 +annotation.processing.enabled=true
5.5 +annotation.processing.enabled.in.editor=true
5.6 +annotation.processing.processors.list=
5.7 +annotation.processing.run.all.processors=true
5.8 +annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
5.9 build.classes.dir=${build.web.dir}/WEB-INF/classes
5.10 build.classes.excludes=**/*.java,**/*.form
5.11 build.dir=build
5.12 @@ -21,8 +26,15 @@
5.13 endorsed.classpath=
5.14 excludes=
5.15 includes=**
5.16 +j2ee.compile.on.save=false
5.17 j2ee.deploy.on.save=false
5.18 j2ee.platform=1.5
5.19 +j2ee.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
5.20 +j2ee.platform.embeddableejb.classpath=${j2ee.server.home}/lib/embedded/glassfish-embedded-static-shell.jar
5.21 +j2ee.platform.wscompile.classpath=${j2ee.server.home}/modules/webservices-osgi.jar
5.22 +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
5.23 +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
5.24 +j2ee.platform.wsit.classpath=
5.25 j2ee.server.type=gfv3ee6
5.26 jar.compress=false
5.27 javac.classpath=\
5.28 @@ -31,11 +43,14 @@
5.29 javac.compilerargs=
5.30 javac.debug=true
5.31 javac.deprecation=false
5.32 +javac.processorpath=\
5.33 + ${javac.classpath}
5.34 javac.source=1.5
5.35 javac.target=1.5
5.36 javac.test.classpath=\
5.37 ${javac.classpath}:\
5.38 ${build.classes.dir}
5.39 +javac.test.processorpath=${javac.test.classpath}
5.40 javadoc.additionalparam=
5.41 javadoc.author=false
5.42 javadoc.encoding=${source.encoding}
6.1 --- a/java/sql-vyuka/web/WEB-INF/casti/aplikace.jspx Wed Feb 08 13:15:23 2012 +0100
6.2 +++ b/java/sql-vyuka/web/WEB-INF/casti/aplikace.jspx Wed Feb 08 13:16:13 2012 +0100
6.3 @@ -24,36 +24,36 @@
6.4 name="predchozi"
6.5 title="${navigacePredchozi}"
6.6 type="button"
6.7 - onclick="javascript:ajaxPruvodcePredchozi();">&nbsp;</button>
6.8 + onclick="javascript:ajaxPruvodcePredchozi();">&#160;</button>
6.9 <fmt:message key="navigace.zpet" var="navigaceZpet" />
6.10 <button class="zpet"
6.11 name="zpet"
6.12 title="${navigaceZpet}"
6.13 type="button"
6.14 - onclick="javascript:ajaxPruvodceZpet();">&nbsp;</button>
6.15 + onclick="javascript:ajaxPruvodceZpet();">&#160;</button>
6.16 <fmt:message key="navigace.pruvodce" var="navigacePruvodce" />
6.17 <button class="pruvodce"
6.18 name="pruvodce"
6.19 title="${navigacePruvodce}"
6.20 type="button"
6.21 - onclick="javascript:ajaxPruvodceKod('pruvodce');">&nbsp;</button>
6.22 + onclick="javascript:ajaxPruvodceKod('pruvodce');">&#160;</button>
6.23 <fmt:message key="navigace.model" var="navigaceModel" />
6.24 <button class="model"
6.25 name="model"
6.26 title="${navigaceModel}"
6.27 type="button"
6.28 - onclick="javascript:ajaxPruvodceKod('model');">&nbsp;</button>
6.29 + onclick="javascript:ajaxPruvodceKod('model');">&#160;</button>
6.30 <fmt:message key="navigace.vpred" var="navigaceVpred" />
6.31 <button class="vpred"
6.32 name="vpred"
6.33 title="${navigaceVpred}"
6.34 type="button"
6.35 - onclick="javascript:ajaxPruvodceVpred();">&nbsp;</button>
6.36 + onclick="javascript:ajaxPruvodceVpred();">&#160;</button>
6.37 <fmt:message key="navigace.nasledujici" var="navigaceNasledujici" />
6.38 <button class="nasledujici"
6.39 title="${navigaceNasledujici}"
6.40 type="button"
6.41 - onclick="javascript:ajaxPruvodceNasledujici();">&nbsp;</button>
6.42 + onclick="javascript:ajaxPruvodceNasledujici();">&#160;</button>
6.43 </fieldset>
6.44 </form>
6.45 </div>
6.46 @@ -80,13 +80,13 @@
6.47 name="zobrazitHistorii"
6.48 title="${zobrazitHistoriiTip}"
6.49 type="button"
6.50 - onclick="javascript:ajaxZobrazitHistorii();">&nbsp;</button>
6.51 + onclick="javascript:ajaxZobrazitHistorii();">&#160;</button>
6.52 <fmt:message key="tlacitko.vykonat.tip" var="vykonatSQLTip" />
6.53 <button class="vykonatSQL"
6.54 name="vykonatSQL"
6.55 title="${vykonatSQLTip}"
6.56 type="button"
6.57 - onclick="javascript:ajaxVykonatSQL();">&nbsp;</button>
6.58 + onclick="javascript:ajaxVykonatSQL();">&#160;</button>
6.59 </fieldset>
6.60 </form>
6.61 </div>
7.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
7.2 +++ b/java/sql-vyuka/web/WEB-INF/glassfish-web.xml Wed Feb 08 13:16:13 2012 +0100
7.3 @@ -0,0 +1,10 @@
7.4 +<?xml version="1.0" encoding="UTF-8"?>
7.5 +<!DOCTYPE glassfish-web-app PUBLIC "-//GlassFish.org//DTD GlassFish Application Server 3.1 Servlet 3.0//EN" "http://glassfish.org/dtds/glassfish-web-app_3_0-1.dtd">
7.6 +<glassfish-web-app error-url="">
7.7 + <class-loader delegate="true"/>
7.8 + <jsp-config>
7.9 + <property name="keepgenerated" value="true">
7.10 + <description>Keep a copy of the generated servlet class' java code.</description>
7.11 + </property>
7.12 + </jsp-config>
7.13 +</glassfish-web-app>
8.1 --- a/java/sql-vyuka/web/index.jsp Wed Feb 08 13:15:23 2012 +0100
8.2 +++ b/java/sql-vyuka/web/index.jsp Wed Feb 08 13:16:13 2012 +0100
8.3 @@ -7,20 +7,20 @@
8.4
8.5 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="cs" lang="cs">
8.6 <head>
8.7 - <meta http-equiv="content-language" content="cs"/>
8.8 - <meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
8.9 - <link href="styl.css" type="text/css" rel="StyleSheet"/>
8.10 - <link href="strom.css" type="text/css" rel="StyleSheet"/>
8.11 - <link rel="shortcut icon" href="grafika/navigace-model.png" type="image/x-icon" />
8.12 - <script type="text/javaScript" src="hlavni.js"></script>
8.13 - <script type="text/javaScript" src="vstupniPole.js"></script>
8.14 - <script type="text/javaScript" src="klavesoveZkratky.js"></script>
8.15 - <script type="text/javaScript" src="strom.js"></script>
8.16 - <title><fmt:message key="nazev"/></title>
8.17 + <meta http-equiv="content-language" content="cs"/>
8.18 + <meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
8.19 + <link href="styl.css" type="text/css" rel="StyleSheet"/>
8.20 + <link href="strom.css" type="text/css" rel="StyleSheet"/>
8.21 + <link rel="shortcut icon" href="grafika/navigace-model.png" type="image/x-icon" />
8.22 + <script type="text/javaScript" src="hlavni.js"></script>
8.23 + <script type="text/javaScript" src="vstupniPole.js"></script>
8.24 + <script type="text/javaScript" src="klavesoveZkratky.js"></script>
8.25 + <script type="text/javaScript" src="strom.js"></script>
8.26 + <title><fmt:message key="nazev"/></title>
8.27 </head>
8.28 <body>
8.29
8.30 - <jsp:include page="WEB-INF/casti/aplikace.jspx" flush="false"/>
8.31 + <jsp:include page="WEB-INF/casti/aplikace.jspx" flush="false"/>
8.32
8.33 </body>
8.34 </html>