diff options
| author |  Ugnich Anton | 2013-09-06 15:02:30 +0700 |
|---|---|---|
| committer | Ugnich Anton | 2013-09-06 15:02:30 +0700 |
| commit | 02fa30624211b46c8f2adcd0c459ffeb1c35a743 (patch) | |
| tree | 68fc8e0678395ae3cad98d5e4bcab7d9ea417961 /nbproject | |
| parent | e1d907ac56fcfe5c380ef781530488c799a1f477 (diff) | |
Bugfixes: PNG, tags, htmlencode
Diffstat (limited to 'nbproject')
| -rw-r--r-- | nbproject/genfiles.properties | 4 | ||||
| -rw-r--r-- | nbproject/project.properties | 3 | ||||
| -rw-r--r-- | nbproject/project.xml | 12 |
3 files changed, 17 insertions, 2 deletions
diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties index 9f68753d..a836f39b 100644 --- a/nbproject/genfiles.properties +++ b/nbproject/genfiles.properties @@ -3,6 +3,6 @@ build.xml.script.CRC32=c93fa366 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=ace7f602 -nbproject/build-impl.xml.script.CRC32=e812c1f8 +nbproject/build-impl.xml.data.CRC32=b3ae4a4b +nbproject/build-impl.xml.script.CRC32=c272645e nbproject/build-impl.xml.stylesheet.CRC32=0cbf5bb7@1.33.1.1 diff --git a/nbproject/project.properties b/nbproject/project.properties index 5b8c8172..e4f4ee12 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -37,6 +37,7 @@ javac.classpath=\ ${reference.com_juick.jar}:\ ${reference.com_juick_server.jar}:\ ${reference.com_juick_xmpp.jar}:\ + ${reference.com_juick_json.jar}:\ ${libs.JSON.classpath} # Space-separated list of extra javac options javac.compilerargs= @@ -67,9 +68,11 @@ lib.dir=${web.docbase.dir}/WEB-INF/lib persistence.xml.dir=${conf.dir} platform.active=default_platform project.com_juick=../com.juick +project.com_juick_json=../com.juick.json project.com_juick_server=../com.juick.server project.com_juick_xmpp=../com.juick.xmpp reference.com_juick.jar=${project.com_juick}/dist/com.juick.jar +reference.com_juick_json.jar=${project.com_juick_json}/dist/com.juick.json.jar reference.com_juick_server.jar=${project.com_juick_server}/dist/com.juick.server.jar reference.com_juick_xmpp.jar=${project.com_juick_xmpp}/dist/com.juick.xmpp.jar resource.dir=setup diff --git a/nbproject/project.xml b/nbproject/project.xml index acac92b2..2b60b093 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -19,6 +19,10 @@ <path-in-war>WEB-INF/lib</path-in-war> </library> <library dirs="200"> + <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> @@ -41,6 +45,14 @@ <id>jar</id> </reference> <reference> + <foreign-project>com_juick_json</foreign-project> + <artifact-type>jar</artifact-type> + <script>build.xml</script> + <target>jar</target> + <clean-target>clean</clean-target> + <id>jar</id> + </reference> + <reference> <foreign-project>com_juick_server</foreign-project> <artifact-type>jar</artifact-type> <script>build.xml</script> |