aboutsummaryrefslogtreecommitdiff
path: root/nbproject
diff options
context:
space:
mode:
authorGravatar Ugnich Anton2013-06-21 00:16:11 +0700
committerGravatar Ugnich Anton2013-06-21 00:16:11 +0700
commitdf529650d03296bf03ade8c0eed4a2fcc404a041 (patch)
tree9a8bde9365b6f26a54aa660acd873c68e496a7e0 /nbproject
parent0dfa3b0cf640f4b95a3cdfdf8c32ae764d3ff5dd (diff)
Bugfix
Diffstat (limited to 'nbproject')
-rw-r--r--nbproject/build-impl.xml2
-rw-r--r--nbproject/genfiles.properties6
-rw-r--r--nbproject/project.properties5
-rw-r--r--nbproject/project.xml4
4 files changed, 5 insertions, 12 deletions
diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index 00a25390..c6dd50e7 100644
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -693,7 +693,6 @@ 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="${libs.MySQLDriver.classpath}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
<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"/>
@@ -701,7 +700,6 @@ exists or setup the property manually. For example like this:
<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="${libs.MySQLDriver.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
<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"/>
diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
index fd5f8a0b..0b047451 100644
--- a/nbproject/genfiles.properties
+++ b/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=0970a525
+build.xml.data.CRC32=649ef84a
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=0970a525
-nbproject/build-impl.xml.script.CRC32=76130e45
+nbproject/build-impl.xml.data.CRC32=649ef84a
+nbproject/build-impl.xml.script.CRC32=3499afe6
nbproject/build-impl.xml.stylesheet.CRC32=0cbf5bb7@1.33.1.1
diff --git a/nbproject/project.properties b/nbproject/project.properties
index f54b89b4..5d65b1aa 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -34,7 +34,6 @@ j2ee.platform.classpath=${j2ee.server.home}/lib/catalina-ant.jar:${j2ee.server.h
j2ee.server.type=Tomcat
jar.compress=false
javac.classpath=\
- ${libs.MySQLDriver.classpath}:\
${reference.com_juick.jar}:\
${reference.com_juick_server.jar}:\
${reference.com_juick_json.jar}
@@ -85,7 +84,7 @@ source.root=src
src.dir=${source.root}/java
test.src.dir=test
war.content.additional=
-war.ear.name=com.juick.http.api.war
-war.name=com.juick.http.api.war
+war.ear.name=com.juick.api.war
+war.name=com.juick.api.war
web.docbase.dir=web
webinf.dir=web/WEB-INF
diff --git a/nbproject/project.xml b/nbproject/project.xml
index 72915234..6d66c021 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>${libs.MySQLDriver.classpath}</file>
- <path-in-war>WEB-INF/lib</path-in-war>
- </library>
- <library dirs="200">
<file>${reference.com_juick.jar}</file>
<path-in-war>WEB-INF/lib</path-in-war>
</library>