diff options
author | Ugnich Anton | 2013-08-30 13:10:14 +0700 |
---|---|---|
committer | Ugnich Anton | 2013-08-30 13:10:14 +0700 |
commit | 91bf74631157d8e559686ca25e4980f155d88438 (patch) | |
tree | d04790f407eba507aa3e9a6e17d9bc109b7fd982 /nbproject | |
parent | 4b1ef499dbd28c1639b9723ee2e9c5ff80002dde (diff) |
PM
Diffstat (limited to 'nbproject')
-rw-r--r-- | nbproject/build-impl.xml | 11 | ||||
-rw-r--r-- | nbproject/genfiles.properties | 6 | ||||
-rw-r--r-- | nbproject/project.properties | 8 | ||||
-rw-r--r-- | nbproject/project.xml | 16 |
4 files changed, 36 insertions, 5 deletions
diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml index 965b7552..7fcc9e67 100644 --- a/nbproject/build-impl.xml +++ b/nbproject/build-impl.xml @@ -538,6 +538,9 @@ exists or setup the property manually. For example like this: <ant antfile="${project.com_juick_server}/build.xml" inheritall="false" target="jar"> <property name="deploy.on.save" value="false"/> </ant> + <ant antfile="${project.com_juick_xmpp}/build.xml" inheritall="false" target="jar"> + <property name="deploy.on.save" value="false"/> + </ant> </target> <target depends="init" if="dist.ear.dir" name="deps-ear-jar" unless="no.deps"> <ant antfile="${project.com_juick}/build.xml" inheritall="false" target="jar"> @@ -549,6 +552,9 @@ exists or setup the property manually. For example like this: <ant antfile="${project.com_juick_server}/build.xml" inheritall="false" target="jar"> <property name="deploy.on.save" value="false"/> </ant> + <ant antfile="${project.com_juick_xmpp}/build.xml" inheritall="false" target="jar"> + <property name="deploy.on.save" value="false"/> + </ant> </target> <target depends="init, deps-module-jar, deps-ear-jar" name="deps-jar" unless="no.deps"/> <target depends="init,deps-jar" name="-pre-pre-compile"> @@ -696,7 +702,9 @@ 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="${reference.com_juick_xmpp.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"/> + <copyfiles files="${file.reference.xpp3_min-1.1.4.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> @@ -704,7 +712,9 @@ 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="${reference.com_juick_xmpp.jar}" todir="${build.web.dir}/WEB-INF/lib"/> <copyfiles files="${libs.JSON.classpath}" todir="${build.web.dir}/WEB-INF/lib"/> + <copyfiles files="${file.reference.xpp3_min-1.1.4.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"/> @@ -1072,6 +1082,7 @@ exists or setup the property manually. For example like this: <ant antfile="${project.com_juick}/build.xml" inheritall="false" target="clean"/> <ant antfile="${project.com_juick_json}/build.xml" inheritall="false" target="clean"/> <ant antfile="${project.com_juick_server}/build.xml" inheritall="false" target="clean"/> + <ant antfile="${project.com_juick_xmpp}/build.xml" inheritall="false" target="clean"/> </target> <target depends="init" name="do-clean"> <condition property="build.dir.to.clean" value="${build.web.dir}"> diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties index 13678348..9fa27ff1 100644 --- a/nbproject/genfiles.properties +++ b/nbproject/genfiles.properties @@ -1,8 +1,8 @@ -build.xml.data.CRC32=8cb2a940 +build.xml.data.CRC32=0e286cb1 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=8cb2a940 -nbproject/build-impl.xml.script.CRC32=9918d740 +nbproject/build-impl.xml.data.CRC32=0e286cb1 +nbproject/build-impl.xml.script.CRC32=4228b93d nbproject/build-impl.xml.stylesheet.CRC32=0cbf5bb7@1.33.1.1 diff --git a/nbproject/project.properties b/nbproject/project.properties index e57401a6..92f560c4 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -1,6 +1,5 @@ annotation.processing.enabled=true annotation.processing.enabled.in.editor=true -annotation.processing.processors.list= annotation.processing.run.all.processors=true annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output build.classes.dir=${build.web.dir}/WEB-INF/classes @@ -26,6 +25,7 @@ dist.war=${dist.dir}/${war.name} endorsed.classpath=\ ${libs.javaee-endorsed-api-6.0.classpath} excludes= +file.reference.xpp3_min-1.1.4.jar=lib/xpp3_min-1.1.4.jar includes=** j2ee.compile.on.save=true j2ee.deploy.on.save=true @@ -37,7 +37,9 @@ javac.classpath=\ ${reference.com_juick.jar}:\ ${reference.com_juick_server.jar}:\ ${reference.com_juick_json.jar}:\ - ${libs.JSON.classpath} + ${reference.com_juick_xmpp.jar}:\ + ${libs.JSON.classpath}:\ + ${file.reference.xpp3_min-1.1.4.jar} # Space-separated list of extra javac options javac.compilerargs= javac.debug=true @@ -69,9 +71,11 @@ 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 run.test.classpath=\ ${javac.test.classpath}:\ diff --git a/nbproject/project.xml b/nbproject/project.xml index 15c691a1..01e2f8c9 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -19,9 +19,17 @@ <path-in-war>WEB-INF/lib</path-in-war> </library> <library dirs="200"> + <file>${reference.com_juick_xmpp.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> + <library dirs="200"> + <file>${file.reference.xpp3_min-1.1.4.jar}</file> + <path-in-war>WEB-INF/lib</path-in-war> + </library> </web-module-libraries> <web-module-additional-libraries/> <source-roots> @@ -56,6 +64,14 @@ <clean-target>clean</clean-target> <id>jar</id> </reference> + <reference> + <foreign-project>com_juick_xmpp</foreign-project> + <artifact-type>jar</artifact-type> + <script>build.xml</script> + <target>jar</target> + <clean-target>clean</clean-target> + <id>jar</id> + </reference> </references> </configuration> </project> |