@@ -854,17 +854,11 @@ |
COMPILATION SECTION |
--> |
<target depends="init" if="no.dist.ear.dir" name="deps-module-jar" unless="no.deps"> |
- <ant antfile="${project.Man2Weps}/build.xml" inheritall="false" target="jar"> |
- <property name="deploy.on.save" value="false"/> |
- </ant> |
<ant antfile="${project.csip-core}/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.Man2Weps}/build.xml" inheritall="false" target="jar"> |
- <property name="deploy.on.save" value="false"/> |
- </ant> |
<ant antfile="${project.csip-core}/build.xml" inheritall="false" target="jar"> |
<property name="deploy.on.save" value="false"/> |
</ant> |
@@ -1012,10 +1006,11 @@ |
</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.CSIP-Jersey-2.16.classpath}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
+ <copyfiles files="${reference.csip-core.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
<copyfiles files="${file.reference.Lmod2Rusle2.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
- <copyfiles files="${reference.csip-core.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
- <copyfiles files="${reference.Man2Weps.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
<copyfiles files="${file.reference.WepsReportData.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
+ <copyfiles files="${file.reference.Man2Weps.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
<copyfiles files="${file.reference.commons-lang-2.4.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
<copyfiles files="${file.reference.jsf-api.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
<copyfiles files="${file.reference.jsf-impl.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
@@ -1026,15 +1021,15 @@ |
<copyfiles files="${file.reference.commons-collections-3.2.1.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
<copyfiles files="${file.reference.oro-2.0.8.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
<copyfiles files="${file.reference.jdom_1.1.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
- <copyfiles files="${libs.CSIP-Jersey-2.16.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="${libs.CSIP-Jersey-2.16.classpath}" todir="${build.web.dir}/WEB-INF/lib"/> |
+ <copyfiles files="${reference.csip-core.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
<copyfiles files="${file.reference.Lmod2Rusle2.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
- <copyfiles files="${reference.csip-core.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
- <copyfiles files="${reference.Man2Weps.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
<copyfiles files="${file.reference.WepsReportData.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
+ <copyfiles files="${file.reference.Man2Weps.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
<copyfiles files="${file.reference.commons-lang-2.4.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
<copyfiles files="${file.reference.jsf-api.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
<copyfiles files="${file.reference.jsf-impl.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
@@ -1045,7 +1040,6 @@ |
<copyfiles files="${file.reference.commons-collections-3.2.1.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
<copyfiles files="${file.reference.oro-2.0.8.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
<copyfiles files="${file.reference.jdom_1.1.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
- <copyfiles files="${libs.CSIP-Jersey-2.16.classpath}" 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"/> |
@@ -1459,7 +1453,6 @@ |
CLEANUP SECTION |
--> |
<target depends="init" name="deps-clean" unless="no.deps"> |
- <ant antfile="${project.Man2Weps}/build.xml" inheritall="false" target="clean"/> |
<ant antfile="${project.csip-core}/build.xml" inheritall="false" target="clean"/> |
</target> |
<target depends="init" name="do-clean"> |
@@ -41,6 +41,7 @@ |
file.reference.jsf-impl.jar=lib/jsf-impl.jar |
file.reference.Lmod2Rusle2.jar=lib/Lmod2Rusle2.jar |
file.reference.log4_1.2.15.jar=lib/log4_1.2.15.jar |
+file.reference.Man2Weps.jar=lib/Man2Weps.jar |
file.reference.oro-2.0.8.jar=lib/oro-2.0.8.jar |
file.reference.postgresql-9.0-801.jdbc4.jar=lib/postgresql-9.0-801.jdbc4.jar |
file.reference.truezip_6.6.jar=lib/truezip_6.6.jar |
@@ -54,10 +55,11 @@ |
j2ee.server.type=Tomcat |
jar.compress=false |
javac.classpath=\ |
+ ${libs.CSIP-Jersey-2.16.classpath}:\ |
+ ${reference.csip-core.jar}:\ |
${file.reference.Lmod2Rusle2.jar}:\ |
- ${reference.csip-core.jar}:\ |
- ${reference.Man2Weps.jar}:\ |
${file.reference.WepsReportData.jar}:\ |
+ ${file.reference.Man2Weps.jar}:\ |
${file.reference.commons-lang-2.4.jar}:\ |
${file.reference.jsf-api.jar}:\ |
${file.reference.jsf-impl.jar}:\ |
@@ -67,8 +69,7 @@ |
${file.reference.log4_1.2.15.jar}:\ |
${file.reference.commons-collections-3.2.1.jar}:\ |
${file.reference.oro-2.0.8.jar}:\ |
- ${file.reference.jdom_1.1.jar}:\ |
- ${libs.CSIP-Jersey-2.16.classpath} |
+ ${file.reference.jdom_1.1.jar} |
# Space-separated list of extra javac options |
javac.compilerargs= |
javac.debug=true |
@@ -98,9 +99,7 @@ |
persistence.xml.dir=${conf.dir} |
platform.active=default_platform |
project.csip-core=../csip-core |
-project.Man2Weps=../lmod/translators/Man2Weps |
reference.csip-core.jar=${project.csip-core}/dist/csip-core.jar |
-reference.Man2Weps.jar=${project.Man2Weps}/dist/Man2Weps.jar |
resource.dir=setup |
rest.config.type=ide |
run.test.classpath=\ |
@@ -12,7 +12,7 @@ |
<minimum-ant-version>1.6.5</minimum-ant-version> |
<web-module-libraries> |
<library dirs="200"> |
- <file>${file.reference.Lmod2Rusle2.jar}</file> |
+ <file>${libs.CSIP-Jersey-2.16.classpath}</file> |
<path-in-war>WEB-INF/lib</path-in-war> |
</library> |
<library dirs="200"> |
@@ -20,7 +20,7 @@ |
<path-in-war>WEB-INF/lib</path-in-war> |
</library> |
<library dirs="200"> |
- <file>${reference.Man2Weps.jar}</file> |
+ <file>${file.reference.Lmod2Rusle2.jar}</file> |
<path-in-war>WEB-INF/lib</path-in-war> |
</library> |
<library dirs="200"> |
@@ -28,6 +28,10 @@ |
<path-in-war>WEB-INF/lib</path-in-war> |
</library> |
<library dirs="200"> |
+ <file>${file.reference.Man2Weps.jar}</file> |
+ <path-in-war>WEB-INF/lib</path-in-war> |
+ </library> |
+ <library dirs="200"> |
<file>${file.reference.commons-lang-2.4.jar}</file> |
<path-in-war>WEB-INF/lib</path-in-war> |
</library> |
@@ -67,10 +71,6 @@ |
<file>${file.reference.jdom_1.1.jar}</file> |
<path-in-war>WEB-INF/lib</path-in-war> |
</library> |
- <library dirs="200"> |
- <file>${libs.CSIP-Jersey-2.16.classpath}</file> |
- <path-in-war>WEB-INF/lib</path-in-war> |
- </library> |
</web-module-libraries> |
<web-module-additional-libraries/> |
<source-roots> |
@@ -82,14 +82,6 @@ |
</data> |
<references xmlns="http://www.netbeans.org/ns/ant-project-references/1"> |
<reference> |
- <foreign-project>Man2Weps</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>csip-core</foreign-project> |
<artifact-type>jar</artifact-type> |
<script>build.xml</script> |