Displaying differences for changeset
 
display as  

nbproject/project.properties

@@ -1,95 +1,95 @@
-file.reference.csip-lib-water-4.1.1.jar=lib/csip-lib-water-4.1.1.jar
-file.reference.Jama-1.0.2.jar=lib/Jama-1.0.2.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-storeconfig.jar:${j2ee.server.home}/lib/catalina-tribes.jar:${j2ee.server.home}/lib/catalina.jar:${j2ee.server.home}/lib/ecj-4.4.1.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-spdy.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
-#Fri May 06 09:05:19 MDT 2016
-javadoc.splitindex=true
-lib.dir=${web.docbase.dir}/WEB-INF/lib
-build.classes.excludes=**/*.java,**/*.form
-javadoc.author=false
-j2ee.platform=1.6-web
-dist.war=${dist.dir}/${war.name}
-javac.target=1.8
-build.generated.dir=${build.dir}/generated
-resource.dir=setup
-build.web.excludes=${build.classes.excludes}
-war.ear.name=${war.name}
-j2ee.compile.on.save=true
-debug.test.classpath=${run.test.classpath}
-build.dir=build
-javac.deprecation=false
-persistence.xml.dir=${conf.dir}
-j2ee.copy.static.files.on.save=true
-test.src.dir=test
-junit.selected.version=4
-includes=**
-jar.compress=false
-annotation.processing.processors.list=
-javadoc.version=false
-build.classes.dir=${build.web.dir}/WEB-INF/classes
-dist.dir=dist
-project.csip-core=../csip-core
-rest.config.type=ide
-javac.source=1.8
-javac.debug=true
-javac.test.processorpath=${javac.test.classpath}
-run.test.classpath=\
-    ${javac.test.classpath}:\
-    ${build.test.classes.dir}
-build.generated.sources.dir=${build.dir}/generated-sources
-javadoc.notree=false
-runmain.jvmargs=
-source.root=src
-platform.active=default_platform
-javadoc.preview=true
-j2ee.deploy.on.save=true
-annotation.processing.enabled=true
-war.content.additional=
-dist.javadoc.dir=${dist.dir}/javadoc
-client.urlPart=
-javadoc.additionalparam=
-javac.classpath=\
-    ${libs.CSIP-Jersey-2.16.classpath}:\
-    ${reference.csip-core.jar}:\
-    ${file.reference.commons-math-2.0.jar}:\
-    ${file.reference.jcommon-1.0.16.jar}:\
-    ${file.reference.jfreechart-1.0.13.jar}:\
-    ${file.reference.Jama-1.0.2.jar}:\
-    ${file.reference.csip-lib-water-4.1.1.jar}
-javadoc.noindex=false
-webinf.dir=web/WEB-INF
-annotation.processing.enabled.in.editor=true
-javadoc.private=false
-javadoc.encoding=${source.encoding}
-build.test.classes.dir=${build.dir}/test/classes
-reference.csip-core.jar=${project.csip-core}/dist/csip-core.jar
-web.docbase.dir=web
-javac.compilerargs=
-file.reference.commons-math-2.0.jar=lib/commons-math-2.0.jar
-source.encoding=UTF-8
-dist.ear.war=${dist.dir}/${war.ear.name}
-j2ee.server.type=Tomcat
-file.reference.jfreechart-1.0.13.jar=lib/jfreechart-1.0.13.jar
-conf.dir=${source.root}/conf
-annotation.processing.run.all.processors=true
-compile.jsps=false
-excludes=
-javac.processorpath=\
-    ${javac.classpath}
-build.test.results.dir=${build.dir}/test/results
-display.browser=false
-endorsed.classpath=\
-    ${libs.javaee-endorsed-api-6.0.classpath}
-javadoc.use=true
-build.web.dir=${build.dir}/web
-javadoc.nonavbar=false
-war.name=csip-cfa.war
-file.reference.jcommon-1.0.16.jar=lib/jcommon-1.0.16.jar
-javadoc.windowtitle=
-javac.test.classpath=\
-    ${javac.classpath}:\
-    ${build.classes.dir}:\
-    ${libs.junit_4.classpath}:\
-    ${libs.hamcrest.classpath}
-src.dir=${source.root}/java
-annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
-debug.classpath=${build.classes.dir}\:${javac.classpath}
+file.reference.csip-lib-water-4.2.1.jar=lib/csip-lib-water-4.2.1.jar
+file.reference.Jama-1.0.2.jar=lib/Jama-1.0.2.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
+#Fri May 06 09:05:19 MDT 2016
+javadoc.splitindex=true
+lib.dir=${web.docbase.dir}/WEB-INF/lib
+build.classes.excludes=**/*.java,**/*.form
+javadoc.author=false
+j2ee.platform=1.6-web
+dist.war=${dist.dir}/${war.name}
+javac.target=1.8
+build.generated.dir=${build.dir}/generated
+resource.dir=setup
+build.web.excludes=${build.classes.excludes}
+war.ear.name=${war.name}
+j2ee.compile.on.save=true
+debug.test.classpath=${run.test.classpath}
+build.dir=build
+javac.deprecation=false
+persistence.xml.dir=${conf.dir}
+j2ee.copy.static.files.on.save=true
+test.src.dir=test
+junit.selected.version=4
+includes=**
+jar.compress=false
+annotation.processing.processors.list=
+javadoc.version=false
+build.classes.dir=${build.web.dir}/WEB-INF/classes
+dist.dir=dist
+project.csip-core=../csip-core
+rest.config.type=ide
+javac.source=1.8
+javac.debug=true
+javac.test.processorpath=${javac.test.classpath}
+run.test.classpath=\
+    ${javac.test.classpath}:\
+    ${build.test.classes.dir}
+build.generated.sources.dir=${build.dir}/generated-sources
+javadoc.notree=false
+runmain.jvmargs=
+source.root=src
+platform.active=default_platform
+javadoc.preview=true
+j2ee.deploy.on.save=true
+annotation.processing.enabled=true
+war.content.additional=
+dist.javadoc.dir=${dist.dir}/javadoc
+client.urlPart=
+javadoc.additionalparam=
+javac.classpath=\
+    ${libs.CSIP-Jersey-2.16.classpath}:\
+    ${reference.csip-core.jar}:\
+    ${file.reference.commons-math-2.0.jar}:\
+    ${file.reference.jcommon-1.0.16.jar}:\
+    ${file.reference.jfreechart-1.0.13.jar}:\
+    ${file.reference.Jama-1.0.2.jar}:\
+    ${file.reference.csip-lib-water-4.2.1.jar}
+javadoc.noindex=false
+webinf.dir=web/WEB-INF
+annotation.processing.enabled.in.editor=true
+javadoc.private=false
+javadoc.encoding=${source.encoding}
+build.test.classes.dir=${build.dir}/test/classes
+reference.csip-core.jar=${project.csip-core}/dist/csip-core.jar
+web.docbase.dir=web
+javac.compilerargs=
+file.reference.commons-math-2.0.jar=lib/commons-math-2.0.jar
+source.encoding=UTF-8
+dist.ear.war=${dist.dir}/${war.ear.name}
+j2ee.server.type=Tomcat
+file.reference.jfreechart-1.0.13.jar=lib/jfreechart-1.0.13.jar
+conf.dir=${source.root}/conf
+annotation.processing.run.all.processors=true
+compile.jsps=false
+excludes=
+javac.processorpath=\
+    ${javac.classpath}
+build.test.results.dir=${build.dir}/test/results
+display.browser=false
+endorsed.classpath=\
+    ${libs.javaee-endorsed-api-6.0.classpath}
+javadoc.use=true
+build.web.dir=${build.dir}/web
+javadoc.nonavbar=false
+war.name=csip-cfa.war
+file.reference.jcommon-1.0.16.jar=lib/jcommon-1.0.16.jar
+javadoc.windowtitle=
+javac.test.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}:\
+    ${libs.junit_4.classpath}:\
+    ${libs.hamcrest.classpath}
+src.dir=${source.root}/java
+annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
+debug.classpath=${build.classes.dir}\:${javac.classpath}

nbproject/project.xml

@@ -36,7 +36,7 @@
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
                 <library dirs="200">
-                    <file>${file.reference.csip-lib-water-4.1.1.jar}</file>
+                    <file>${file.reference.csip-lib-water-4.2.1.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
             </web-module-libraries>