diff options
Diffstat (limited to 'nbproject')
| -rw-r--r-- | nbproject/build-impl.xml | 2 | ||||
| -rw-r--r-- | nbproject/genfiles.properties | 6 | ||||
| -rw-r--r-- | nbproject/project.properties | 4 | ||||
| -rw-r--r-- | nbproject/project.xml | 8 |
4 files changed, 13 insertions, 7 deletions
diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml index c6dd50e7..965b7552 100644 --- a/nbproject/build-impl.xml +++ b/nbproject/build-impl.xml @@ -696,6 +696,7 @@ exists or setup the property manually. For example like this: <copyfiles files="${reference.com_juick.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> <copyfiles files="${reference.com_juick_server.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> <copyfiles files="${reference.com_juick_json.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> + <copyfiles files="${libs.JSON.classpath}" 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> @@ -703,6 +704,7 @@ exists or setup the property manually. For example like this: <copyfiles files="${reference.com_juick.jar}" todir="${build.web.dir}/WEB-INF/lib"/> <copyfiles files="${reference.com_juick_server.jar}" todir="${build.web.dir}/WEB-INF/lib"/> <copyfiles files="${reference.com_juick_json.jar}" todir="${build.web.dir}/WEB-INF/lib"/> + <copyfiles files="${libs.JSON.classpath}" 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"/> diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties index 0b047451..13678348 100644 --- a/nbproject/genfiles.properties +++ b/nbproject/genfiles.properties @@ -1,8 +1,8 @@ -build.xml.data.CRC32=649ef84a +build.xml.data.CRC32=8cb2a940 build.xml.script.CRC32=2226508e build.xml.stylesheet.CRC32=651128d4@1.33.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=649ef84a -nbproject/build-impl.xml.script.CRC32=3499afe6 +nbproject/build-impl.xml.data.CRC32=8cb2a940 +nbproject/build-impl.xml.script.CRC32=9918d740 nbproject/build-impl.xml.stylesheet.CRC32=0cbf5bb7@1.33.1.1 diff --git a/nbproject/project.properties b/nbproject/project.properties index 5d65b1aa..e57401a6 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -36,7 +36,8 @@ jar.compress=false javac.classpath=\ ${reference.com_juick.jar}:\ ${reference.com_juick_server.jar}:\ - ${reference.com_juick_json.jar} + ${reference.com_juick_json.jar}:\ + ${libs.JSON.classpath} # Space-separated list of extra javac options javac.compilerargs= javac.debug=true @@ -63,7 +64,6 @@ javadoc.use=true javadoc.version=false javadoc.windowtitle= lib.dir=${web.docbase.dir}/WEB-INF/lib -no.dependencies=false persistence.xml.dir=${conf.dir} platform.active=default_platform project.com_juick=../com.juick diff --git a/nbproject/project.xml b/nbproject/project.xml index 6d66c021..15c691a1 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -18,13 +18,17 @@ <file>${reference.com_juick_json.jar}</file> <path-in-war>WEB-INF/lib</path-in-war> </library> + <library dirs="200"> + <file>${libs.JSON.classpath}</file> + <path-in-war>WEB-INF/lib</path-in-war> + </library> </web-module-libraries> <web-module-additional-libraries/> <source-roots> - <root id="src.dir" name="Source Packages"/> + <root id="src.dir"/> </source-roots> <test-roots> - <root id="test.src.dir" name="Test Packages"/> + <root id="test.src.dir"/> </test-roots> </data> <references xmlns="http://www.netbeans.org/ns/ant-project-references/1"> |