1.1 --- a/java/sql-vyuka/nbproject/build-impl.xml Fri May 29 01:31:01 2009 +0200
1.2 +++ b/java/sql-vyuka/nbproject/build-impl.xml Fri May 29 02:04:27 2009 +0200
1.3 @@ -360,8 +360,12 @@
1.4 <!--
1.5 COMPILATION SECTION
1.6 -->
1.7 - <target depends="init" if="no.dist.ear.dir" name="deps-module-jar" unless="no.deps"/>
1.8 - <target depends="init" if="dist.ear.dir" name="deps-ear-jar" unless="no.deps"/>
1.9 + <target depends="init" if="no.dist.ear.dir" name="deps-module-jar" unless="no.deps">
1.10 + <ant antfile="${project.SuperDAO}/build.xml" inheritall="false" target="jar"/>
1.11 + </target>
1.12 + <target depends="init" if="dist.ear.dir" name="deps-ear-jar" unless="no.deps">
1.13 + <ant antfile="${project.SuperDAO}/build.xml" inheritall="false" target="jar"/>
1.14 + </target>
1.15 <target depends="init, deps-module-jar, deps-ear-jar" name="deps-jar" unless="no.deps"/>
1.16 <target depends="init,deps-jar" name="-pre-pre-compile">
1.17 <mkdir dir="${build.classes.dir}"/>
1.18 @@ -498,10 +502,15 @@
1.19 </target>
1.20 <target depends="init,compile,compile-jsps,-pre-dist,-do-dist-with-manifest,-do-dist-without-manifest" name="do-dist"/>
1.21 <target depends="init" if="dist.ear.dir" name="library-inclusion-in-manifest">
1.22 + <copyfiles files="${reference.SuperDAO.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.reference.SuperDAO.jar" todir="${dist.ear.dir}"/>
1.23 <mkdir dir="${build.web.dir}/META-INF"/>
1.24 - <manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update"/>
1.25 + <manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update">
1.26 + <attribute name="Class-Path" value="${manifest.reference.SuperDAO.jar} "/>
1.27 + </manifest>
1.28 </target>
1.29 - <target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir"/>
1.30 + <target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir">
1.31 + <copyfiles files="${reference.SuperDAO.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
1.32 + </target>
1.33 <target depends="init,compile,compile-jsps,-pre-dist,library-inclusion-in-manifest" name="do-ear-dist">
1.34 <dirname file="${dist.ear.war}" property="dist.jar.dir"/>
1.35 <mkdir dir="${dist.jar.dir}"/>
1.36 @@ -777,7 +786,9 @@
1.37
1.38 CLEANUP SECTION
1.39 -->
1.40 - <target depends="init" if="no.dist.ear.dir" name="deps-clean" unless="no.deps"/>
1.41 + <target depends="init" if="no.dist.ear.dir" name="deps-clean" unless="no.deps">
1.42 + <ant antfile="${project.SuperDAO}/build.xml" inheritall="false" target="clean"/>
1.43 + </target>
1.44 <target depends="init" name="do-clean">
1.45 <condition property="build.dir.to.clean" value="${build.web.dir}">
1.46 <isset property="dist.ear.dir"/>
2.1 --- a/java/sql-vyuka/nbproject/genfiles.properties Fri May 29 01:31:01 2009 +0200
2.2 +++ b/java/sql-vyuka/nbproject/genfiles.properties Fri May 29 02:04:27 2009 +0200
2.3 @@ -1,8 +1,8 @@
2.4 -build.xml.data.CRC32=781cf957
2.5 +build.xml.data.CRC32=eb6453d4
2.6 build.xml.script.CRC32=0f264e43
2.7 build.xml.stylesheet.CRC32=c0ebde35
2.8 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
2.9 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
2.10 -nbproject/build-impl.xml.data.CRC32=781cf957
2.11 -nbproject/build-impl.xml.script.CRC32=b0e42421
2.12 +nbproject/build-impl.xml.data.CRC32=eb6453d4
2.13 +nbproject/build-impl.xml.script.CRC32=7bef4ff2
2.14 nbproject/build-impl.xml.stylesheet.CRC32=174458fc
3.1 --- a/java/sql-vyuka/nbproject/project.properties Fri May 29 01:31:01 2009 +0200
3.2 +++ b/java/sql-vyuka/nbproject/project.properties Fri May 29 02:04:27 2009 +0200
3.3 @@ -23,7 +23,8 @@
3.4 j2ee.platform=1.5
3.5 j2ee.server.type=J2EE
3.6 jar.compress=false
3.7 -javac.classpath=
3.8 +javac.classpath=\
3.9 + ${reference.SuperDAO.jar}
3.10 # Space-separated list of extra javac options
3.11 javac.compilerargs=
3.12 javac.debug=true
3.13 @@ -51,6 +52,8 @@
3.14 lib.dir=${web.docbase.dir}/WEB-INF/lib
3.15 persistence.xml.dir=${conf.dir}
3.16 platform.active=default_platform
3.17 +project.SuperDAO=../../../SuperDAO/java/SuperDAO
3.18 +reference.SuperDAO.jar=${project.SuperDAO}/dist/SuperDAO.jar
3.19 resource.dir=setup
3.20 run.test.classpath=\
3.21 ${javac.test.classpath}:\
4.1 --- a/java/sql-vyuka/nbproject/project.xml Fri May 29 01:31:01 2009 +0200
4.2 +++ b/java/sql-vyuka/nbproject/project.xml Fri May 29 02:04:27 2009 +0200
4.3 @@ -5,7 +5,12 @@
4.4 <data xmlns="http://www.netbeans.org/ns/web-project/3">
4.5 <name>sql-vyuka</name>
4.6 <minimum-ant-version>1.6.5</minimum-ant-version>
4.7 - <web-module-libraries/>
4.8 + <web-module-libraries>
4.9 + <library>
4.10 + <file>${reference.SuperDAO.jar}</file>
4.11 + <path-in-war>WEB-INF/lib</path-in-war>
4.12 + </library>
4.13 + </web-module-libraries>
4.14 <web-module-additional-libraries/>
4.15 <source-roots>
4.16 <root id="src.dir"/>
4.17 @@ -14,5 +19,15 @@
4.18 <root id="test.src.dir"/>
4.19 </test-roots>
4.20 </data>
4.21 + <references xmlns="http://www.netbeans.org/ns/ant-project-references/1">
4.22 + <reference>
4.23 + <foreign-project>SuperDAO</foreign-project>
4.24 + <artifact-type>jar</artifact-type>
4.25 + <script>build.xml</script>
4.26 + <target>jar</target>
4.27 + <clean-target>clean</clean-target>
4.28 + <id>jar</id>
4.29 + </reference>
4.30 + </references>
4.31 </configuration>
4.32 </project>
5.1 --- a/java/sql-vyuka/web/vstupniPole.js Fri May 29 01:31:01 2009 +0200
5.2 +++ b/java/sql-vyuka/web/vstupniPole.js Fri May 29 02:04:27 2009 +0200
5.3 @@ -57,7 +57,6 @@
5.4 t.selectionStart = t.selectionEnd = ss - 4;
5.5 }
5.6
5.7 -
5.8 // Doprava
5.9 else if (evt.keyCode == 39 && t.value.slice(ss,ss + 4) == tab) {
5.10 alert("pravá");