Changeset 15:8632e6037843

Show
Ignore:
Timestamp:
05/29/09 02:04:27 (16 years ago)
Author:
František Kučera <franta-hg@…>
Branch:
default
Message:

Přidána závislost na projektu SuperDAO.

Location:
java/sql-vyuka
Files:
5 modified

Legend:

Unmodified
Added
Removed

  • java/sql-vyuka/nbproject/build-impl.xml

    r8 r15  
    361361                COMPILATION SECTION 
    362362            --> 
    363     <target depends="init" if="no.dist.ear.dir" name="deps-module-jar" unless="no.deps"/> 
    364     <target depends="init" if="dist.ear.dir" name="deps-ear-jar" unless="no.deps"/> 
     363    <target depends="init" if="no.dist.ear.dir" name="deps-module-jar" unless="no.deps"> 
     364        <ant antfile="${project.SuperDAO}/build.xml" inheritall="false" target="jar"/> 
     365    </target> 
     366    <target depends="init" if="dist.ear.dir" name="deps-ear-jar" unless="no.deps"> 
     367        <ant antfile="${project.SuperDAO}/build.xml" inheritall="false" target="jar"/> 
     368    </target> 
    365369    <target depends="init, deps-module-jar, deps-ear-jar" name="deps-jar" unless="no.deps"/> 
    366370    <target depends="init,deps-jar" name="-pre-pre-compile"> 
    … …  
    499503    <target depends="init,compile,compile-jsps,-pre-dist,-do-dist-with-manifest,-do-dist-without-manifest" name="do-dist"/> 
    500504    <target depends="init" if="dist.ear.dir" name="library-inclusion-in-manifest"> 
     505        <copyfiles files="${reference.SuperDAO.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.reference.SuperDAO.jar" todir="${dist.ear.dir}"/> 
    501506        <mkdir dir="${build.web.dir}/META-INF"/> 
    502         <manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update"/> 
    503     </target> 
    504     <target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir"/> 
     507        <manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update"> 
     508            <attribute name="Class-Path" value="${manifest.reference.SuperDAO.jar} "/> 
     509        </manifest> 
     510    </target> 
     511    <target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir"> 
     512        <copyfiles files="${reference.SuperDAO.jar}" todir="${build.web.dir}/WEB-INF/lib"/> 
     513    </target> 
    505514    <target depends="init,compile,compile-jsps,-pre-dist,library-inclusion-in-manifest" name="do-ear-dist"> 
    506515        <dirname file="${dist.ear.war}" property="dist.jar.dir"/> 
    … …  
    778787                CLEANUP SECTION 
    779788            --> 
    780     <target depends="init" if="no.dist.ear.dir" name="deps-clean" unless="no.deps"/> 
     789    <target depends="init" if="no.dist.ear.dir" name="deps-clean" unless="no.deps"> 
     790        <ant antfile="${project.SuperDAO}/build.xml" inheritall="false" target="clean"/> 
     791    </target> 
    781792    <target depends="init" name="do-clean"> 
    782793        <condition property="build.dir.to.clean" value="${build.web.dir}"> 

  • java/sql-vyuka/nbproject/genfiles.properties

    r10 r15  
    1 build.xml.data.CRC32=781cf957 
     1build.xml.data.CRC32=eb6453d4 
    22build.xml.script.CRC32=0f264e43 
    33build.xml.stylesheet.CRC32=c0ebde35 
    44# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. 
    55# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. 
    6 nbproject/build-impl.xml.data.CRC32=781cf957 
    7 nbproject/build-impl.xml.script.CRC32=b0e42421 
     6nbproject/build-impl.xml.data.CRC32=eb6453d4 
     7nbproject/build-impl.xml.script.CRC32=7bef4ff2 
    88nbproject/build-impl.xml.stylesheet.CRC32=174458fc 

  • java/sql-vyuka/nbproject/project.properties

    r10 r15  
    2424j2ee.server.type=J2EE 
    2525jar.compress=false 
    26 javac.classpath= 
     26javac.classpath=\ 
     27    ${reference.SuperDAO.jar} 
    2728# Space-separated list of extra javac options 
    2829javac.compilerargs= 
    … …  
    5253persistence.xml.dir=${conf.dir} 
    5354platform.active=default_platform 
     55project.SuperDAO=../../../SuperDAO/java/SuperDAO 
     56reference.SuperDAO.jar=${project.SuperDAO}/dist/SuperDAO.jar 
    5457resource.dir=setup 
    5558run.test.classpath=\ 

  • java/sql-vyuka/nbproject/project.xml

    r10 r15  
    66            <name>sql-vyuka</name> 
    77            <minimum-ant-version>1.6.5</minimum-ant-version> 
    8             <web-module-libraries/> 
     8            <web-module-libraries> 
     9                <library> 
     10                    <file>${reference.SuperDAO.jar}</file> 
     11                    <path-in-war>WEB-INF/lib</path-in-war> 
     12                </library> 
     13            </web-module-libraries> 
    914            <web-module-additional-libraries/> 
    1015            <source-roots> 
    … …  
    1520            </test-roots> 
    1621        </data> 
     22        <references xmlns="http://www.netbeans.org/ns/ant-project-references/1"> 
     23            <reference> 
     24                <foreign-project>SuperDAO</foreign-project> 
     25                <artifact-type>jar</artifact-type> 
     26                <script>build.xml</script> 
     27                <target>jar</target> 
     28                <clean-target>clean</clean-target> 
     29                <id>jar</id> 
     30            </reference> 
     31        </references> 
    1732    </configuration> 
    1833</project> 

  • java/sql-vyuka/web/vstupniPole.js

    r14 r15  
    5858    } 
    5959 
    60  
    6160    // Doprava 
    6261    else if (evt.keyCode == 39 && t.value.slice(ss,ss + 4) == tab) {