Mercurial > hg > LightPIT / changeset

     1.1 --- a/nbproject/build-impl.xml	Sun Oct 29 13:35:43 2017 +0100
     1.2 +++ b/nbproject/build-impl.xml	Sun Nov 26 16:20:38 2017 +0100
     1.3 @@ -997,10 +997,13 @@
     1.4      </target>
     1.5      <target depends="init,compile,compile-jsps,-pre-dist,-do-dist-with-manifest,-do-dist-without-manifest" name="do-dist"/>
     1.6      <target depends="init" if="dist.ear.dir" name="library-inclusion-in-manifest">
     1.7 +        <copyfiles files="${libs.jstl.classpath}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
     1.8          <mkdir dir="${build.web.dir}/META-INF"/>
     1.9          <manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update"/>
    1.10      </target>
    1.11 -    <target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir"/>
    1.12 +    <target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir">
    1.13 +        <copyfiles files="${libs.jstl.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
    1.14 +    </target>
    1.15      <target depends="init" if="dist.ear.dir" name="-clean-webinf-lib">
    1.16          <delete dir="${build.web.dir}/WEB-INF/lib"/>
    1.17      </target>

     2.1 --- a/nbproject/genfiles.properties	Sun Oct 29 13:35:43 2017 +0100
     2.2 +++ b/nbproject/genfiles.properties	Sun Nov 26 16:20:38 2017 +0100
     2.3 @@ -1,8 +1,8 @@
     2.4 -build.xml.data.CRC32=526d7b6b
     2.5 +build.xml.data.CRC32=2ce92825
     2.6  build.xml.script.CRC32=1f023e98
     2.7  build.xml.stylesheet.CRC32=651128d4@1.77.1.1
     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=526d7b6b
    2.11 -nbproject/build-impl.xml.script.CRC32=3fd540ea
    2.12 +nbproject/build-impl.xml.data.CRC32=2ce92825
    2.13 +nbproject/build-impl.xml.script.CRC32=db357bfe
    2.14  nbproject/build-impl.xml.stylesheet.CRC32=99ea4b56@1.77.1.1

     3.1 --- a/nbproject/project.properties	Sun Oct 29 13:35:43 2017 +0100
     3.2 +++ b/nbproject/project.properties	Sun Nov 26 16:20:38 2017 +0100
     3.3 @@ -36,7 +36,8 @@
     3.4  j2ee.platform.classpath=${j2ee.server.home}/lib/annotations-api.jar:${j2ee.server.home}/lib/catalina-ant.jar:${j2ee.server.home}/lib/catalina-ha.jar:${j2ee.server.home}/lib/catalina-storeconfig.jar:${j2ee.server.home}/lib/catalina-tribes.jar:${j2ee.server.home}/lib/catalina.jar:${j2ee.server.home}/lib/ecj-4.6.3.jar:${j2ee.server.home}/lib/el-api.jar:${j2ee.server.home}/lib/jasper-el.jar:${j2ee.server.home}/lib/jasper.jar:${j2ee.server.home}/lib/jaspic-api.jar:${j2ee.server.home}/lib/jsp-api.jar:${j2ee.server.home}/lib/servlet-api.jar:${j2ee.server.home}/lib/tomcat-api.jar:${j2ee.server.home}/lib/tomcat-coyote.jar:${j2ee.server.home}/lib/tomcat-dbcp.jar:${j2ee.server.home}/lib/tomcat-i18n-es.jar:${j2ee.server.home}/lib/tomcat-i18n-fr.jar:${j2ee.server.home}/lib/tomcat-i18n-ja.jar:${j2ee.server.home}/lib/tomcat-jdbc.jar:${j2ee.server.home}/lib/tomcat-jni.jar:${j2ee.server.home}/lib/tomcat-util-scan.jar:${j2ee.server.home}/lib/tomcat-util.jar:${j2ee.server.home}/lib/tomcat-websocket.jar:${j2ee.server.home}/lib/websocket-api.jar
     3.5  j2ee.server.type=Tomcat
     3.6  jar.compress=false
     3.7 -javac.classpath=
     3.8 +javac.classpath=\
     3.9 +    ${libs.jstl.classpath}
    3.10  # Space-separated list of extra javac options
    3.11  javac.compilerargs=
    3.12  javac.debug=true

     4.1 --- a/nbproject/project.xml	Sun Oct 29 13:35:43 2017 +0100
     4.2 +++ b/nbproject/project.xml	Sun Nov 26 16:20:38 2017 +0100
     4.3 @@ -5,7 +5,12 @@
     4.4          <data xmlns="http://www.netbeans.org/ns/web-project/3">
     4.5              <name>LightPIT</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 dirs="200">
    4.10 +                    <file>${libs.jstl.classpath}</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"/>