| Displaying differences for changeset |
| @@ -1010,7 +1010,7 @@ |
| <copyfiles files="${reference.csip-core.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
| <copyfiles files="${file.reference.commons-math-2.0.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
| <copyfiles files="${file.reference.csip-lib-air-0.1.2.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
| - <copyfiles files="${file.reference.csip-lib-water-3.1.1.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
| + <copyfiles files="${file.reference.csip-lib-water-4.0.2.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> |
| @@ -1019,7 +1019,7 @@ |
| <copyfiles files="${reference.csip-core.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
| <copyfiles files="${file.reference.commons-math-2.0.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
| <copyfiles files="${file.reference.csip-lib-air-0.1.2.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
| - <copyfiles files="${file.reference.csip-lib-water-3.1.1.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
| + <copyfiles files="${file.reference.csip-lib-water-4.0.2.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"/> |
| @@ -35,13 +35,13 @@ |
| excludes= |
| file.reference.commons-math-2.0.jar=lib/commons-math-2.0.jar |
| file.reference.csip-lib-air-0.1.2.jar=lib/csip-lib-air-0.1.2.jar |
| -file.reference.csip-lib-water-3.1.1.jar=lib/csip-lib-water-3.1.1.jar |
| +file.reference.csip-lib-water-4.0.2.jar=lib/csip-lib-water-4.0.2.jar |
| includes=** |
| j2ee.compile.on.save=true |
| j2ee.copy.static.files.on.save=true |
| j2ee.deploy.on.save=true |
| j2ee.platform=1.6-web |
| -j2ee.platform.classpath=${j2ee.server.home}/lib/annotations-api.jar:${j2ee.server.home}/lib/catalina-ant.jar:${j2ee.server.home}/lib/catalina-ha.jar:${j2ee.server.home}/lib/catalina-storeconfig.jar:${j2ee.server.home}/lib/catalina-tribes.jar:${j2ee.server.home}/lib/catalina.jar:${j2ee.server.home}/lib/ecj-4.4.2.jar:${j2ee.server.home}/lib/el-api.jar:${j2ee.server.home}/lib/jasper-el.jar:${j2ee.server.home}/lib/jasper.jar:${j2ee.server.home}/lib/jsp-api.jar:${j2ee.server.home}/lib/servlet-api.jar:${j2ee.server.home}/lib/tomcat-api.jar:${j2ee.server.home}/lib/tomcat-coyote.jar:${j2ee.server.home}/lib/tomcat-dbcp.jar:${j2ee.server.home}/lib/tomcat-i18n-es.jar:${j2ee.server.home}/lib/tomcat-i18n-fr.jar:${j2ee.server.home}/lib/tomcat-i18n-ja.jar:${j2ee.server.home}/lib/tomcat-jdbc.jar:${j2ee.server.home}/lib/tomcat-jni.jar:${j2ee.server.home}/lib/tomcat-util-scan.jar:${j2ee.server.home}/lib/tomcat-util.jar:${j2ee.server.home}/lib/tomcat-websocket.jar:${j2ee.server.home}/lib/websocket-api.jar |
| +j2ee.platform.classpath=${j2ee.server.home}/lib/annotations-api.jar:${j2ee.server.home}/lib/catalina-ant.jar:${j2ee.server.home}/lib/catalina-ha.jar:${j2ee.server.home}/lib/catalina-ssi.jar:${j2ee.server.home}/lib/catalina-storeconfig.jar:${j2ee.server.home}/lib/catalina-tribes.jar:${j2ee.server.home}/lib/catalina.jar:${j2ee.server.home}/lib/ecj-4.20.jar:${j2ee.server.home}/lib/el-api.jar:${j2ee.server.home}/lib/jasper-el.jar:${j2ee.server.home}/lib/jasper.jar:${j2ee.server.home}/lib/jaspic-api.jar:${j2ee.server.home}/lib/jsp-api.jar:${j2ee.server.home}/lib/servlet-api.jar:${j2ee.server.home}/lib/tomcat-api.jar:${j2ee.server.home}/lib/tomcat-coyote.jar:${j2ee.server.home}/lib/tomcat-dbcp.jar:${j2ee.server.home}/lib/tomcat-i18n-cs.jar:${j2ee.server.home}/lib/tomcat-i18n-de.jar:${j2ee.server.home}/lib/tomcat-i18n-es.jar:${j2ee.server.home}/lib/tomcat-i18n-fr.jar:${j2ee.server.home}/lib/tomcat-i18n-ja.jar:${j2ee.server.home}/lib/tomcat-i18n-ko.jar:${j2ee.server.home}/lib/tomcat-i18n-pt-BR.jar:${j2ee.server.home}/lib/tomcat-i18n-ru.jar:${j2ee.server.home}/lib/tomcat-i18n-zh-CN.jar:${j2ee.server.home}/lib/tomcat-jdbc.jar:${j2ee.server.home}/lib/tomcat-jni.jar:${j2ee.server.home}/lib/tomcat-util-scan.jar:${j2ee.server.home}/lib/tomcat-util.jar:${j2ee.server.home}/lib/tomcat-websocket.jar:${j2ee.server.home}/lib/websocket-api.jar |
| j2ee.server.type=Tomcat |
| jar.compress=false |
| javac.classpath=\ |
| @@ -49,7 +49,7 @@ |
| ${reference.csip-core.jar}:\ |
| ${file.reference.commons-math-2.0.jar}:\ |
| ${file.reference.csip-lib-air-0.1.2.jar}:\ |
| - ${file.reference.csip-lib-water-3.1.1.jar} |
| + ${file.reference.csip-lib-water-4.0.2.jar} |
| # Space-separated list of extra javac options |
| javac.compilerargs= |
| javac.debug=true |
| @@ -28,7 +28,7 @@ |
| <path-in-war>WEB-INF/lib</path-in-war> |
| </library> |
| <library dirs="200"> |
| - <file>${file.reference.csip-lib-water-3.1.1.jar}</file> |
| + <file>${file.reference.csip-lib-water-4.0.2.jar}</file> |
| <path-in-war>WEB-INF/lib</path-in-war> |
| </library> |
| </web-module-libraries> |