nbproject/build-impl.xml
| @@ -1007,15 +1007,15 @@ |
| <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="${libs.CSIP-Jersey-2.16.classpath}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
| + <copyfiles files="${file.reference.velocity-engine-core-2.0.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
| <copyfiles files="${reference.csip-core.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
| - <copyfiles files="${file.reference.velocity-engine-core-2.0.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
| <mkdir dir="${build.web.dir}/META-INF"/> |
| <manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update"/> |
| </target> |
| <target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir"> |
| <copyfiles files="${libs.CSIP-Jersey-2.16.classpath}" todir="${build.web.dir}/WEB-INF/lib"/> |
| + <copyfiles files="${file.reference.velocity-engine-core-2.0.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
| <copyfiles files="${reference.csip-core.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
| - <copyfiles files="${file.reference.velocity-engine-core-2.0.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
| </target> |
| <target depends="init" if="dist.ear.dir" name="-clean-webinf-lib"> |
| <delete dir="${build.web.dir}/WEB-INF/lib"/> |
nbproject/genfiles.properties
| @@ -3,8 +3,8 @@ |
| build.xml.stylesheet.CRC32=651128d4@1.65.1.1 |
| # 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=86ef1d0e |
| -nbproject/build-impl.xml.script.CRC32=4d8b3fa1 |
| +nbproject/build-impl.xml.data.CRC32=b100f6d0 |
| +nbproject/build-impl.xml.script.CRC32=ebbfacb8 |
| nbproject/build-impl.xml.stylesheet.CRC32=99ea4b56@1.77.1.1 |
| nbproject/rest-build.xml.data.CRC32=bff4a8fe |
| nbproject/rest-build.xml.script.CRC32=4734534b |
nbproject/project.properties
| @@ -1,5 +1,5 @@ |
| file.reference.velocity-engine-core-2.0.jar=lib/velocity-engine-core-2.0.jar |
| -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.4.1.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/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-spdy.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 |
| +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-de.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-i18n-ko.jar:${j2ee.server.home}/lib/tomcat-i18n-ru.jar:${j2ee.server.home}/lib/tomcat-i18n-zh-CN.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 |
| #Mon Nov 09 10:36:44 MST 2015 |
| javadoc.splitindex=true |
| lib.dir=${web.docbase.dir}/WEB-INF/lib |
| @@ -10,6 +10,8 @@ |
| dist.war=${dist.dir}/${war.name} |
| javac.target=1.8 |
| build.generated.dir=${build.dir}/generated |
| +project.csip-core=../../csip-core |
| +reference.csip-core.jar=${project.csip-core}/dist/csip-core.jar |
| resource.dir=setup |
| build.web.excludes=${build.classes.excludes} |
| war.ear.name=${war.name} |
| @@ -29,7 +31,6 @@ |
| javadoc.version=false |
| build.classes.dir=${build.web.dir}/WEB-INF/classes |
| dist.dir=dist |
| -project.csip-core=../csip-core |
| rest.config.type=ide |
| javac.source=1.8 |
| javac.debug=true |
| @@ -52,15 +53,14 @@ |
| javadoc.additionalparam= |
| javac.classpath=\ |
| ${libs.CSIP-Jersey-2.16.classpath}:\ |
| - ${reference.csip-core.jar}:\ |
| - ${file.reference.velocity-engine-core-2.0.jar} |
| + ${file.reference.velocity-engine-core-2.0.jar}:\ |
| + ${reference.csip-core.jar} |
| javadoc.noindex=false |
| webinf.dir=web/WEB-INF |
| annotation.processing.enabled.in.editor=true |
| javadoc.private=false |
| javadoc.encoding=${source.encoding} |
| build.test.classes.dir=${build.dir}/test/classes |
| -reference.csip-core.jar=${project.csip-core}/dist/csip-core.jar |
| auxiliary.org-netbeans-modules-css-prep.less_2e_compiler_2e_options= |
| web.docbase.dir=web |
| javac.compilerargs= |
nbproject/project.xml
| @@ -16,11 +16,11 @@ |
| <path-in-war>WEB-INF/lib</path-in-war> |
| </library> |
| <library dirs="200"> |
| - <file>${reference.csip-core.jar}</file> |
| + <file>${file.reference.velocity-engine-core-2.0.jar}</file> |
| <path-in-war>WEB-INF/lib</path-in-war> |
| </library> |
| <library dirs="200"> |
| - <file>${file.reference.velocity-engine-core-2.0.jar}</file> |
| + <file>${reference.csip-core.jar}</file> |
| <path-in-war>WEB-INF/lib</path-in-war> |
| </library> |
| </web-module-libraries> |