# HG changeset patch
# User František Kučera <franta-hg@frantovo.cz>
# Date 1243555467 -7200
# Node ID 8632e60378433bc3b29f1b5eba96836e93225cae
# Parent  d0876993394068a0738e4dca37bb6e3504b99e40
Přidána závislost na projektu SuperDAO.

diff -r d08769933940 -r 8632e6037843 java/sql-vyuka/nbproject/build-impl.xml
--- a/java/sql-vyuka/nbproject/build-impl.xml	Fri May 29 01:31:01 2009 +0200
+++ b/java/sql-vyuka/nbproject/build-impl.xml	Fri May 29 02:04:27 2009 +0200
@@ -360,8 +360,12 @@
     <!--
                 COMPILATION SECTION
             -->
-    <target depends="init" if="no.dist.ear.dir" name="deps-module-jar" unless="no.deps"/>
-    <target depends="init" if="dist.ear.dir" name="deps-ear-jar" unless="no.deps"/>
+    <target depends="init" if="no.dist.ear.dir" name="deps-module-jar" unless="no.deps">
+        <ant antfile="${project.SuperDAO}/build.xml" inheritall="false" target="jar"/>
+    </target>
+    <target depends="init" if="dist.ear.dir" name="deps-ear-jar" unless="no.deps">
+        <ant antfile="${project.SuperDAO}/build.xml" inheritall="false" target="jar"/>
+    </target>
     <target depends="init, deps-module-jar, deps-ear-jar" name="deps-jar" unless="no.deps"/>
     <target depends="init,deps-jar" name="-pre-pre-compile">
         <mkdir dir="${build.classes.dir}"/>
@@ -498,10 +502,15 @@
     </target>
     <target depends="init,compile,compile-jsps,-pre-dist,-do-dist-with-manifest,-do-dist-without-manifest" name="do-dist"/>
     <target depends="init" if="dist.ear.dir" name="library-inclusion-in-manifest">
+        <copyfiles files="${reference.SuperDAO.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.reference.SuperDAO.jar" todir="${dist.ear.dir}"/>
         <mkdir dir="${build.web.dir}/META-INF"/>
-        <manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update"/>
+        <manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update">
+            <attribute name="Class-Path" value="${manifest.reference.SuperDAO.jar} "/>
+        </manifest>
     </target>
-    <target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir"/>
+    <target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir">
+        <copyfiles files="${reference.SuperDAO.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+    </target>
     <target depends="init,compile,compile-jsps,-pre-dist,library-inclusion-in-manifest" name="do-ear-dist">
         <dirname file="${dist.ear.war}" property="dist.jar.dir"/>
         <mkdir dir="${dist.jar.dir}"/>
@@ -777,7 +786,9 @@
                 
                 CLEANUP SECTION
             -->
-    <target depends="init" if="no.dist.ear.dir" name="deps-clean" unless="no.deps"/>
+    <target depends="init" if="no.dist.ear.dir" name="deps-clean" unless="no.deps">
+        <ant antfile="${project.SuperDAO}/build.xml" inheritall="false" target="clean"/>
+    </target>
     <target depends="init" name="do-clean">
         <condition property="build.dir.to.clean" value="${build.web.dir}">
             <isset property="dist.ear.dir"/>
diff -r d08769933940 -r 8632e6037843 java/sql-vyuka/nbproject/genfiles.properties
--- a/java/sql-vyuka/nbproject/genfiles.properties	Fri May 29 01:31:01 2009 +0200
+++ b/java/sql-vyuka/nbproject/genfiles.properties	Fri May 29 02:04:27 2009 +0200
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=781cf957
+build.xml.data.CRC32=eb6453d4
 build.xml.script.CRC32=0f264e43
 build.xml.stylesheet.CRC32=c0ebde35
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=781cf957
-nbproject/build-impl.xml.script.CRC32=b0e42421
+nbproject/build-impl.xml.data.CRC32=eb6453d4
+nbproject/build-impl.xml.script.CRC32=7bef4ff2
 nbproject/build-impl.xml.stylesheet.CRC32=174458fc
diff -r d08769933940 -r 8632e6037843 java/sql-vyuka/nbproject/project.properties
--- a/java/sql-vyuka/nbproject/project.properties	Fri May 29 01:31:01 2009 +0200
+++ b/java/sql-vyuka/nbproject/project.properties	Fri May 29 02:04:27 2009 +0200
@@ -23,7 +23,8 @@
 j2ee.platform=1.5
 j2ee.server.type=J2EE
 jar.compress=false
-javac.classpath=
+javac.classpath=\
+    ${reference.SuperDAO.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.debug=true
@@ -51,6 +52,8 @@
 lib.dir=${web.docbase.dir}/WEB-INF/lib
 persistence.xml.dir=${conf.dir}
 platform.active=default_platform
+project.SuperDAO=../../../SuperDAO/java/SuperDAO
+reference.SuperDAO.jar=${project.SuperDAO}/dist/SuperDAO.jar
 resource.dir=setup
 run.test.classpath=\
     ${javac.test.classpath}:\
diff -r d08769933940 -r 8632e6037843 java/sql-vyuka/nbproject/project.xml
--- a/java/sql-vyuka/nbproject/project.xml	Fri May 29 01:31:01 2009 +0200
+++ b/java/sql-vyuka/nbproject/project.xml	Fri May 29 02:04:27 2009 +0200
@@ -5,7 +5,12 @@
         <data xmlns="http://www.netbeans.org/ns/web-project/3">
             <name>sql-vyuka</name>
             <minimum-ant-version>1.6.5</minimum-ant-version>
-            <web-module-libraries/>
+            <web-module-libraries>
+                <library>
+                    <file>${reference.SuperDAO.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+            </web-module-libraries>
             <web-module-additional-libraries/>
             <source-roots>
                 <root id="src.dir"/>
@@ -14,5 +19,15 @@
                 <root id="test.src.dir"/>
             </test-roots>
         </data>
+        <references xmlns="http://www.netbeans.org/ns/ant-project-references/1">
+            <reference>
+                <foreign-project>SuperDAO</foreign-project>
+                <artifact-type>jar</artifact-type>
+                <script>build.xml</script>
+                <target>jar</target>
+                <clean-target>clean</clean-target>
+                <id>jar</id>
+            </reference>
+        </references>
     </configuration>
 </project>
diff -r d08769933940 -r 8632e6037843 java/sql-vyuka/web/vstupniPole.js
--- a/java/sql-vyuka/web/vstupniPole.js	Fri May 29 01:31:01 2009 +0200
+++ b/java/sql-vyuka/web/vstupniPole.js	Fri May 29 02:04:27 2009 +0200
@@ -57,7 +57,6 @@
         t.selectionStart = t.selectionEnd = ss - 4;
     }
 
-
     // Doprava
     else if (evt.keyCode == 39 && t.value.slice(ss,ss + 4) == tab) {
         alert("pravá");