diff options
Diffstat (limited to 'nbproject')
| -rw-r--r-- | nbproject/build-impl.xml | 18 | ||||
| -rw-r--r-- | nbproject/genfiles.properties | 4 | ||||
| -rw-r--r-- | nbproject/project.properties | 6 | ||||
| -rw-r--r-- | nbproject/project.xml | 24 |
4 files changed, 2 insertions, 50 deletions
diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml index a21325e8..c516e2e9 100644 --- a/nbproject/build-impl.xml +++ b/nbproject/build-impl.xml @@ -529,12 +529,6 @@ exists or setup the property manually. For example like this: COMPILATION SECTION --> <target depends="init" if="no.dist.ear.dir" name="deps-module-jar" unless="no.deps"> - <ant antfile="${project.com_juick}/build.xml" inheritall="false" target="jar"> - <property name="deploy.on.save" value="false"/> - </ant> - <ant antfile="${project.com_juick_json}/build.xml" inheritall="false" target="jar"> - <property name="deploy.on.save" value="false"/> - </ant> <ant antfile="${project.com_juick_server}/build.xml" inheritall="false" target="jar"> <property name="deploy.on.save" value="false"/> </ant> @@ -543,12 +537,6 @@ exists or setup the property manually. For example like this: </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"> - <property name="deploy.on.save" value="false"/> - </ant> - <ant antfile="${project.com_juick_json}/build.xml" inheritall="false" target="jar"> - <property name="deploy.on.save" value="false"/> - </ant> <ant antfile="${project.com_juick_server}/build.xml" inheritall="false" target="jar"> <property name="deploy.on.save" value="false"/> </ant> @@ -699,19 +687,15 @@ exists or setup the property manually. For example like this: </target> <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="${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"/> - <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> <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"/> - <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"> @@ -1077,8 +1061,6 @@ exists or setup the property manually. For example like this: CLEANUP SECTION --> <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_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> diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties index a836f39b..91e63deb 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=b3ae4a4b -nbproject/build-impl.xml.script.CRC32=c272645e +nbproject/build-impl.xml.data.CRC32=a61f7a05 +nbproject/build-impl.xml.script.CRC32=dc268d62 nbproject/build-impl.xml.stylesheet.CRC32=0cbf5bb7@1.33.1.1 diff --git a/nbproject/project.properties b/nbproject/project.properties index 9fe1630a..c7f77170 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -34,10 +34,8 @@ j2ee.platform.classpath=${j2ee.server.home}/lib/catalina-ant.jar:${j2ee.server.h j2ee.server.type=Tomcat jar.compress=false 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,12 +65,8 @@ javadoc.windowtitle= 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 2b60b093..44d3db08 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -7,10 +7,6 @@ <minimum-ant-version>1.6.5</minimum-ant-version> <web-module-libraries> <library dirs="200"> - <file>${reference.com_juick.jar}</file> - <path-in-war>WEB-INF/lib</path-in-war> - </library> - <library dirs="200"> <file>${reference.com_juick_server.jar}</file> <path-in-war>WEB-INF/lib</path-in-war> </library> @@ -19,10 +15,6 @@ <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> @@ -37,22 +29,6 @@ </data> <references xmlns="http://www.netbeans.org/ns/ant-project-references/1"> <reference> - <foreign-project>com_juick</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_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> |