aboutsummaryrefslogtreecommitdiff
path: root/nbproject
diff options
context:
space:
mode:
Diffstat (limited to 'nbproject')
-rw-r--r--nbproject/build-impl.xml9
-rw-r--r--nbproject/genfiles.properties6
-rw-r--r--nbproject/project.properties5
-rw-r--r--nbproject/project.xml12
4 files changed, 28 insertions, 4 deletions
diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index 267f24af..4d5df024 100644
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -535,6 +535,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">
@@ -543,6 +546,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">
@@ -689,12 +695,14 @@ exists or setup the property manually. For example like this:
<target depends="init" if="dist.ear.dir" name="library-inclusion-in-manifest">
<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_xmpp.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="${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_xmpp.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"/>
@@ -1061,6 +1069,7 @@ exists or setup the property manually. For example like this:
<target depends="init" name="deps-clean" unless="no.deps">
<ant antfile="${project.com_juick}/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 e8e9295a..ba8ca356 100644
--- a/nbproject/genfiles.properties
+++ b/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=9ff506d8
+build.xml.data.CRC32=8d999c58
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=9ff506d8
-nbproject/build-impl.xml.script.CRC32=e315adae
+nbproject/build-impl.xml.data.CRC32=8d999c58
+nbproject/build-impl.xml.script.CRC32=9d8ae4f2
nbproject/build-impl.xml.stylesheet.CRC32=0cbf5bb7@1.33.1.1
diff --git a/nbproject/project.properties b/nbproject/project.properties
index de13c257..873bcd4c 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}:\
- ${libs.MySQLDriver.classpath}
+ ${libs.MySQLDriver.classpath}:\
+ ${reference.com_juick_xmpp.jar}
# Space-separated list of extra javac options
javac.compilerargs=
javac.debug=true
@@ -67,8 +68,10 @@ persistence.xml.dir=${conf.dir}
platform.active=default_platform
project.com_juick=../com.juick
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_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 78c0648d..45861aa2 100644
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -17,6 +17,10 @@
<library dirs="200">
<file>${libs.MySQLDriver.classpath}</file>
</library>
+ <library dirs="200">
+ <file>${reference.com_juick_xmpp.jar}</file>
+ <path-in-war>WEB-INF/lib</path-in-war>
+ </library>
</web-module-libraries>
<web-module-additional-libraries/>
<source-roots>
@@ -43,6 +47,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>