csip-erosion Displaying differences for changeset

Displaying differences for changeset

display as Allow wrapping

nbproject/build-impl.xml

@@ -1007,8 +1007,8 @@

+ <copyfiles files="${file.reference.Lmod2Rusle2.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"/>

@@ -1115,8 +1115,8 @@

</target>

+ <copyfiles files="${file.reference.Lmod2Rusle2.jar}" todir="${build.web.dir}/WEB-INF/lib"/>

- <copyfiles files="${file.reference.Lmod2Rusle2.jar}" todir="${build.web.dir}/WEB-INF/lib"/>

nbproject/project.properties

 @@ -1,299 +1,299 @@
--annotation.processing.enabled=true
--annotation.processing.enabled.in.editor=true
--annotation.processing.processors.list=
--annotation.processing.run.all.processors=true
--annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
--auxiliary.org-netbeans-modules-css-prep.less_2e_compiler_2e_options=
--auxiliary.org-netbeans-modules-css-prep.less_2e_enabled=false
--auxiliary.org-netbeans-modules-css-prep.less_2e_mappings=/less:/css
--auxiliary.org-netbeans-modules-css-prep.sass_2e_compiler_2e_options=
--auxiliary.org-netbeans-modules-css-prep.sass_2e_enabled=false
--auxiliary.org-netbeans-modules-css-prep.sass_2e_mappings=/scss:/css
--auxiliary.org-netbeans-modules-web-clientproject-api.js_2e_libs_2e_folder=js/libs
--build.classes.dir=${build.web.dir}/WEB-INF/classes
--build.classes.excludes=**/*.java,**/*.form
--build.dir=build
--build.generated.dir=${build.dir}/generated
--build.generated.sources.dir=${build.dir}/generated-sources
--build.test.classes.dir=${build.dir}/test/classes
--build.test.results.dir=${build.dir}/test/results
--build.web.dir=${build.dir}/web
--build.web.excludes=${build.classes.excludes}
--client.urlPart=
--compile.jsps=false
--conf.dir=${source.root}/conf
--debug.classpath=${build.classes.dir}:${javac.classpath}
--debug.test.classpath=\
--    ${run.test.classpath}
--display.browser=false
--dist.dir=dist
--dist.ear.war=${dist.dir}/${war.ear.name}
--dist.javadoc.dir=${dist.dir}/javadoc
--dist.war=${dist.dir}/${war.name}
--endorsed.classpath=\
--    ${libs.javaee-endorsed-api-6.0.classpath}
--excludes=
--file.reference.common-2.6.0.jar=lib/geotools/common-2.6.0.jar
--file.reference.commons-beanutils-1.7.0.jar=lib/geotools/commons-beanutils-1.7.0.jar
--file.reference.commons-cli-2.0-gt2-pre1.jar=lib/geotools/commons-cli-2.0-gt2-pre1.jar
--file.reference.commons-codec-1.2.jar=lib/geotools/commons-codec-1.2.jar
--file.reference.commons-collections-3.1.jar=lib/geotools/commons-collections-3.1.jar
--file.reference.commons-collections-3.2.1.jar=lib/commons-collections-3.2.1.jar
--file.reference.commons-dbcp-1.4.jar=lib/geotools/commons-dbcp-1.4.jar
--file.reference.commons-digester-1.7.jar=lib/geotools/commons-digester-1.7.jar
--file.reference.commons-io-2.1.jar=lib/geotools/commons-io-2.1.jar
--file.reference.commons-jxpath-1.3.jar=lib/geotools/commons-jxpath-1.3.jar
--file.reference.commons-lang-2.4.jar=lib/commons-lang-2.4.jar
--file.reference.commons-logging-1.1.1.jar=lib/geotools/commons-logging-1.1.1.jar
--file.reference.commons-pool-1.5.4.jar=lib/geotools/commons-pool-1.5.4.jar
--file.reference.core.commands-3.6.0.I20100512-1500.jar=lib/geotools/core.commands-3.6.0.I20100512-1500.jar
--file.reference.core.runtime-3.6.0.v20100505.jar=lib/geotools/core.runtime-3.6.0.v20100505.jar
--file.reference.eastwood-1.1.1-20090908.jar=lib/geotools/eastwood-1.1.1-20090908.jar
--file.reference.ecore-2.6.1.jar=lib/geotools/ecore-2.6.1.jar
--file.reference.ehcache-1.6.2.jar=lib/geotools/ehcache-1.6.2.jar
--file.reference.gdal-1.8.1.jar=lib/geotools/gdal-1.8.1.jar
--file.reference.gt-api-13.5.jar=lib/geotools/gt-api-13.5.jar
--file.reference.gt-app-schema-13.5.jar=lib/geotools/gt-app-schema-13.5.jar
--file.reference.gt-app-schema-resolver-13.5.jar=lib/geotools/gt-app-schema-resolver-13.5.jar
--file.reference.gt-arcgrid-13.5.jar=lib/geotools/gt-arcgrid-13.5.jar
--file.reference.gt-arcsde-13.5.jar=lib/geotools/gt-arcsde-13.5.jar
--file.reference.gt-arcsde-common-13.5.jar=lib/geotools/gt-arcsde-common-13.5.jar
--file.reference.gt-brewer-13.5.jar=lib/geotools/gt-brewer-13.5.jar
--file.reference.gt-charts-13.5.jar=lib/geotools/gt-charts-13.5.jar
--file.reference.gt-complex-13.5-tests.jar=lib/geotools/gt-complex-13.5-tests.jar
--file.reference.gt-complex-13.5.jar=lib/geotools/gt-complex-13.5.jar
--file.reference.gt-coverage-13.5.jar=lib/geotools/gt-coverage-13.5.jar
--file.reference.gt-coverage-api-13.5.jar=lib/geotools/gt-coverage-api-13.5.jar
--file.reference.gt-coveragetools-13.5.jar=lib/geotools/gt-coveragetools-13.5.jar
--file.reference.gt-cql-13.5.jar=lib/geotools/gt-cql-13.5.jar
--file.reference.gt-css-13.5.jar=lib/geotools/gt-css-13.5.jar
--file.reference.gt-csv-13.5.jar=lib/geotools/gt-csv-13.5.jar
--file.reference.gt-data-13.5.jar=lib/geotools/gt-data-13.5.jar
--file.reference.gt-epsg-wkt-13.5.jar=lib/geotools/gt-epsg-wkt-13.5.jar
--file.reference.gt-feature-aggregate-13.5.jar=lib/geotools/gt-feature-aggregate-13.5.jar
--file.reference.gt-feature-pregeneralized-13.5.jar=lib/geotools/gt-feature-pregeneralized-13.5.jar
--file.reference.gt-geojson-13.5.jar=lib/geotools/gt-geojson-13.5.jar
--file.reference.gt-geometry-13.5.jar=lib/geotools/gt-geometry-13.5.jar
--file.reference.gt-geopkg-13.5.jar=lib/geotools/gt-geopkg-13.5.jar
--file.reference.gt-geotiff-13.5.jar=lib/geotools/gt-geotiff-13.5.jar
--file.reference.gt-graph-13.5.jar=lib/geotools/gt-graph-13.5.jar
--file.reference.gt-grassraster-13.5.jar=lib/geotools/gt-grassraster-13.5.jar
--file.reference.gt-grib-13.5.jar=lib/geotools/gt-grib-13.5.jar
--file.reference.gt-grid-13.5.jar=lib/geotools/gt-grid-13.5.jar
--file.reference.gt-gtopo30-13.5.jar=lib/geotools/gt-gtopo30-13.5.jar
--file.reference.gt-image-13.5.jar=lib/geotools/gt-image-13.5.jar
--file.reference.gt-imageio-ext-gdal-13.5.jar=lib/geotools/gt-imageio-ext-gdal-13.5.jar
--file.reference.gt-imagemosaic-13.5.jar=lib/geotools/gt-imagemosaic-13.5.jar
--file.reference.gt-imagemosaic-jdbc-13.5.jar=lib/geotools/gt-imagemosaic-jdbc-13.5.jar
--file.reference.gt-imagepyramid-13.5.jar=lib/geotools/gt-imagepyramid-13.5.jar
--file.reference.gt-jts-wrapper-13.5.jar=lib/geotools/gt-jts-wrapper-13.5.jar
--file.reference.gt-main-13.5.jar=lib/geotools/gt-main-13.5.jar
--file.reference.gt-matfile5-13.5.jar=lib/geotools/gt-matfile5-13.5.jar
--file.reference.gt-mbtiles-13.5.jar=lib/geotools/gt-mbtiles-13.5.jar
--file.reference.gt-metadata-13.5.jar=lib/geotools/gt-metadata-13.5.jar
--file.reference.gt-netcdf-13.5.jar=lib/geotools/gt-netcdf-13.5.jar
--file.reference.gt-ogr-bridj-13.5.jar=lib/geotools/gt-ogr-bridj-13.5.jar
--file.reference.gt-ogr-core-13.5.jar=lib/geotools/gt-ogr-core-13.5.jar
--file.reference.gt-ogr-jni-13.5.jar=lib/geotools/gt-ogr-jni-13.5.jar
--file.reference.gt-opengis-13.5.jar=lib/geotools/gt-opengis-13.5.jar
--file.reference.gt-process-13.5.jar=lib/geotools/gt-process-13.5.jar
--file.reference.gt-process-feature-13.5.jar=lib/geotools/gt-process-feature-13.5.jar
--file.reference.gt-process-geometry-13.5.jar=lib/geotools/gt-process-geometry-13.5.jar
--file.reference.gt-process-raster-13.5.jar=lib/geotools/gt-process-raster-13.5.jar
--file.reference.gt-property-13.5.jar=lib/geotools/gt-property-13.5.jar
--file.reference.gt-property-old-13.5.jar=lib/geotools/gt-property-old-13.5.jar
--file.reference.gt-referencing-13.5.jar=lib/geotools/gt-referencing-13.5.jar
--file.reference.gt-referencing3D-13.5.jar=lib/geotools/gt-referencing3D-13.5.jar
--file.reference.gt-sfs-13.5.jar=lib/geotools/gt-sfs-13.5.jar
--file.reference.gt-shapefile-13.5.jar=lib/geotools/gt-shapefile-13.5.jar
--file.reference.gt-solr-13.5.jar=lib/geotools/gt-solr-13.5.jar
--file.reference.gt-svg-13.5.jar=lib/geotools/gt-svg-13.5.jar
--file.reference.gt-transform-13.5.jar=lib/geotools/gt-transform-13.5.jar
--file.reference.gt-validation-13.5.jar=lib/geotools/gt-validation-13.5.jar
--file.reference.jai_codec-1.1.3.jar=lib/geotools/jai_codec-1.1.3.jar
--file.reference.jai_core-1.1.3.jar=lib/geotools/jai_core-1.1.3.jar
--file.reference.jai_imageio-1.1.jar=lib/geotools/jai_imageio-1.1.jar
--file.reference.javacsv-2.0.jar=lib/geotools/javacsv-2.0.jar
--file.reference.javax.inject.jar=lib/javax.inject.jar
--file.reference.jdom-1.1.3.jar=lib/geotools/jdom-1.1.3.jar
--file.reference.jdom_1.1.jar=lib/jdom_1.1.jar
--file.reference.jface-3.6.1.M20100825-0800.jar=lib/geotools/jface-3.6.1.M20100825-0800.jar
--file.reference.jgridshift-1.0.jar=lib/geotools/jgridshift-1.0.jar
--file.reference.jsf-api.jar=lib/jsf-api.jar
--file.reference.jsf-impl.jar=lib/jsf-impl.jar
--file.reference.json-simple-1.1.jar=lib/geotools/json-simple-1.1.jar
--file.reference.jsqlparser-0.3.14.jar=lib/geotools/jsqlparser-0.3.14.jar
--file.reference.jsr-275-1.0-beta-2.jar=lib/geotools/jsr-275-1.0-beta-2.jar
--file.reference.jts-1.13.jar=lib/geotools/jts-1.13.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.sqljdbc4.jar=lib/sqljdbc4.jar
--file.reference.truezip_6.6.jar=lib/truezip_6.6.jar
--file.reference.vecmath-1.3.2.jar=lib/geotools/vecmath-1.3.2.jar
--file.reference.WepsReportData.jar=lib/WepsReportData.jar
--file.reference.xsd-2.6.0.jar=lib/geotools/xsd-2.6.0.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.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
--j2ee.server.type=Tomcat
--jar.compress=true
--javac.classpath=\
--    ${libs.CSIP-Jersey-2.16.classpath}:\
--    ${reference.csip-core.jar}:\
--    ${file.reference.Lmod2Rusle2.jar}:\
--    ${file.reference.jsf-api.jar}:\
--    ${file.reference.jsf-impl.jar}:\
--    ${file.reference.postgresql-9.0-801.jdbc4.jar}:\
--    ${file.reference.WepsReportData.jar}:\
--    ${file.reference.javax.inject.jar}:\
--    ${file.reference.truezip_6.6.jar}:\
--    ${file.reference.log4_1.2.15.jar}:\
--    ${file.reference.Man2Weps.jar}:\
--    ${file.reference.commons-collections-3.2.1.jar}:\
--    ${file.reference.oro-2.0.8.jar}:\
--    ${file.reference.jdom_1.1.jar}:\
--    ${file.reference.common-2.6.0.jar}:\
--    ${file.reference.commons-beanutils-1.7.0.jar}:\
--    ${file.reference.commons-cli-2.0-gt2-pre1.jar}:\
--    ${file.reference.commons-codec-1.2.jar}:\
--    ${file.reference.commons-collections-3.1.jar}:\
--    ${file.reference.commons-dbcp-1.4.jar}:\
--    ${file.reference.commons-digester-1.7.jar}:\
--    ${file.reference.commons-io-2.1.jar}:\
--    ${file.reference.commons-jxpath-1.3.jar}:\
--    ${file.reference.commons-logging-1.1.1.jar}:\
--    ${file.reference.commons-pool-1.5.4.jar}:\
--    ${file.reference.core.commands-3.6.0.I20100512-1500.jar}:\
--    ${file.reference.core.runtime-3.6.0.v20100505.jar}:\
--    ${file.reference.eastwood-1.1.1-20090908.jar}:\
--    ${file.reference.ecore-2.6.1.jar}:\
--    ${file.reference.ehcache-1.6.2.jar}:\
--    ${file.reference.gdal-1.8.1.jar}:\
--    ${file.reference.gt-api-13.5.jar}:\
--    ${file.reference.gt-app-schema-13.5.jar}:\
--    ${file.reference.gt-app-schema-resolver-13.5.jar}:\
--    ${file.reference.gt-arcgrid-13.5.jar}:\
--    ${file.reference.gt-arcsde-13.5.jar}:\
--    ${file.reference.gt-arcsde-common-13.5.jar}:\
--    ${file.reference.gt-brewer-13.5.jar}:\
--    ${file.reference.gt-charts-13.5.jar}:\
--    ${file.reference.gt-complex-13.5-tests.jar}:\
--    ${file.reference.gt-complex-13.5.jar}:\
--    ${file.reference.gt-coverage-13.5.jar}:\
--    ${file.reference.gt-coverage-api-13.5.jar}:\
--    ${file.reference.gt-coveragetools-13.5.jar}:\
--    ${file.reference.gt-cql-13.5.jar}:\
--    ${file.reference.gt-css-13.5.jar}:\
--    ${file.reference.gt-csv-13.5.jar}:\
--    ${file.reference.gt-data-13.5.jar}:\
--    ${file.reference.gt-epsg-wkt-13.5.jar}:\
--    ${file.reference.gt-feature-aggregate-13.5.jar}:\
--    ${file.reference.gt-feature-pregeneralized-13.5.jar}:\
--    ${file.reference.gt-geojson-13.5.jar}:\
--    ${file.reference.gt-geometry-13.5.jar}:\
--    ${file.reference.gt-geopkg-13.5.jar}:\
--    ${file.reference.gt-geotiff-13.5.jar}:\
--    ${file.reference.gt-graph-13.5.jar}:\
--    ${file.reference.gt-grassraster-13.5.jar}:\
--    ${file.reference.gt-grib-13.5.jar}:\
--    ${file.reference.gt-grid-13.5.jar}:\
--    ${file.reference.gt-gtopo30-13.5.jar}:\
--    ${file.reference.gt-image-13.5.jar}:\
--    ${file.reference.gt-imageio-ext-gdal-13.5.jar}:\
--    ${file.reference.gt-imagemosaic-13.5.jar}:\
--    ${file.reference.gt-imagemosaic-jdbc-13.5.jar}:\
--    ${file.reference.gt-imagepyramid-13.5.jar}:\
--    ${file.reference.gt-jts-wrapper-13.5.jar}:\
--    ${file.reference.gt-main-13.5.jar}:\
--    ${file.reference.gt-matfile5-13.5.jar}:\
--    ${file.reference.gt-mbtiles-13.5.jar}:\
--    ${file.reference.gt-metadata-13.5.jar}:\
--    ${file.reference.gt-netcdf-13.5.jar}:\
--    ${file.reference.gt-ogr-bridj-13.5.jar}:\
--    ${file.reference.gt-ogr-core-13.5.jar}:\
--    ${file.reference.gt-ogr-jni-13.5.jar}:\
--    ${file.reference.gt-opengis-13.5.jar}:\
--    ${file.reference.gt-process-13.5.jar}:\
--    ${file.reference.gt-process-feature-13.5.jar}:\
--    ${file.reference.gt-process-geometry-13.5.jar}:\
--    ${file.reference.gt-process-raster-13.5.jar}:\
--    ${file.reference.gt-property-13.5.jar}:\
--    ${file.reference.gt-property-old-13.5.jar}:\
--    ${file.reference.gt-referencing-13.5.jar}:\
--    ${file.reference.gt-referencing3D-13.5.jar}:\
--    ${file.reference.gt-sfs-13.5.jar}:\
--    ${file.reference.gt-shapefile-13.5.jar}:\
--    ${file.reference.gt-solr-13.5.jar}:\
--    ${file.reference.gt-svg-13.5.jar}:\
--    ${file.reference.gt-transform-13.5.jar}:\
--    ${file.reference.gt-validation-13.5.jar}:\
--    ${file.reference.jai_codec-1.1.3.jar}:\
--    ${file.reference.jai_core-1.1.3.jar}:\
--    ${file.reference.jai_imageio-1.1.jar}:\
--    ${file.reference.javacsv-2.0.jar}:\
--    ${file.reference.jdom-1.1.3.jar}:\
--    ${file.reference.jface-3.6.1.M20100825-0800.jar}:\
--    ${file.reference.jgridshift-1.0.jar}:\
--    ${file.reference.json-simple-1.1.jar}:\
--    ${file.reference.jsqlparser-0.3.14.jar}:\
--    ${file.reference.jsr-275-1.0-beta-2.jar}:\
--    ${file.reference.jts-1.13.jar}:\
--    ${file.reference.vecmath-1.3.2.jar}:\
--    ${file.reference.xsd-2.6.0.jar}:\
--    ${file.reference.commons-lang-2.4.jar}:\
--    ${file.reference.sqljdbc4.jar}
--# Space-separated list of extra javac options
--javac.compilerargs=
--javac.debug=true
--javac.deprecation=false
--javac.processorpath=\
--    ${javac.classpath}
--javac.source=1.8
--javac.target=1.8
--javac.test.classpath=\
--    ${javac.classpath}:\
--    ${build.classes.dir}:\
--    ${libs.hamcrest.classpath}:\
--    ${libs.junit_4.classpath}
--javac.test.processorpath=\
--    ${javac.test.classpath}
--javadoc.additionalparam=
--javadoc.author=false
--javadoc.encoding=${source.encoding}
--javadoc.noindex=false
--javadoc.nonavbar=false
--javadoc.notree=false
--javadoc.preview=true
--javadoc.private=false
--javadoc.splitindex=true
--javadoc.use=true
--javadoc.version=false
--javadoc.windowtitle=
--lib.dir=${web.docbase.dir}/WEB-INF/lib
--persistence.xml.dir=${conf.dir}
--platform.active=default_platform
--project.csip-core=../csip-core
--reference.csip-core.jar=${project.csip-core}/dist/csip-core.jar
--resource.dir=setup
--rest.config.type=ide
--run.test.classpath=\
--    ${javac.test.classpath}:\
--    ${build.test.classes.dir}
--# Space-separated list of JVM arguments used when running a class with a main method or a unit test
--# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value):
--runmain.jvmargs=
--source.encoding=UTF-8
--source.root=src
--src.dir=${source.root}/java
--test.src.dir=test
--war.content.additional=
--war.ear.name=${war.name}
--war.name=csip-erosion.war
--web.docbase.dir=web
--webinf.dir=web/WEB-INF
++annotation.processing.enabled=true
++annotation.processing.enabled.in.editor=true
++annotation.processing.processors.list=
++annotation.processing.run.all.processors=true
++annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
++auxiliary.org-netbeans-modules-css-prep.less_2e_compiler_2e_options=
++auxiliary.org-netbeans-modules-css-prep.less_2e_enabled=false
++auxiliary.org-netbeans-modules-css-prep.less_2e_mappings=/less:/css
++auxiliary.org-netbeans-modules-css-prep.sass_2e_compiler_2e_options=
++auxiliary.org-netbeans-modules-css-prep.sass_2e_enabled=false
++auxiliary.org-netbeans-modules-css-prep.sass_2e_mappings=/scss:/css
++auxiliary.org-netbeans-modules-web-clientproject-api.js_2e_libs_2e_folder=js/libs
++build.classes.dir=${build.web.dir}/WEB-INF/classes
++build.classes.excludes=**/*.java,**/*.form
++build.dir=build
++build.generated.dir=${build.dir}/generated
++build.generated.sources.dir=${build.dir}/generated-sources
++build.test.classes.dir=${build.dir}/test/classes
++build.test.results.dir=${build.dir}/test/results
++build.web.dir=${build.dir}/web
++build.web.excludes=${build.classes.excludes}
++client.urlPart=
++compile.jsps=false
++conf.dir=${source.root}/conf
++debug.classpath=${build.classes.dir}:${javac.classpath}
++debug.test.classpath=\
++    ${run.test.classpath}
++display.browser=false
++dist.dir=dist
++dist.ear.war=${dist.dir}/${war.ear.name}
++dist.javadoc.dir=${dist.dir}/javadoc
++dist.war=${dist.dir}/${war.name}
++endorsed.classpath=\
++    ${libs.javaee-endorsed-api-6.0.classpath}
++excludes=
++file.reference.common-2.6.0.jar=lib/geotools/common-2.6.0.jar
++file.reference.commons-beanutils-1.7.0.jar=lib/geotools/commons-beanutils-1.7.0.jar
++file.reference.commons-cli-2.0-gt2-pre1.jar=lib/geotools/commons-cli-2.0-gt2-pre1.jar
++file.reference.commons-codec-1.2.jar=lib/geotools/commons-codec-1.2.jar
++file.reference.commons-collections-3.1.jar=lib/geotools/commons-collections-3.1.jar
++file.reference.commons-collections-3.2.1.jar=lib/commons-collections-3.2.1.jar
++file.reference.commons-dbcp-1.4.jar=lib/geotools/commons-dbcp-1.4.jar
++file.reference.commons-digester-1.7.jar=lib/geotools/commons-digester-1.7.jar
++file.reference.commons-io-2.1.jar=lib/geotools/commons-io-2.1.jar
++file.reference.commons-jxpath-1.3.jar=lib/geotools/commons-jxpath-1.3.jar
++file.reference.commons-lang-2.4.jar=lib/commons-lang-2.4.jar
++file.reference.commons-logging-1.1.1.jar=lib/geotools/commons-logging-1.1.1.jar
++file.reference.commons-pool-1.5.4.jar=lib/geotools/commons-pool-1.5.4.jar
++file.reference.core.commands-3.6.0.I20100512-1500.jar=lib/geotools/core.commands-3.6.0.I20100512-1500.jar
++file.reference.core.runtime-3.6.0.v20100505.jar=lib/geotools/core.runtime-3.6.0.v20100505.jar
++file.reference.eastwood-1.1.1-20090908.jar=lib/geotools/eastwood-1.1.1-20090908.jar
++file.reference.ecore-2.6.1.jar=lib/geotools/ecore-2.6.1.jar
++file.reference.ehcache-1.6.2.jar=lib/geotools/ehcache-1.6.2.jar
++file.reference.gdal-1.8.1.jar=lib/geotools/gdal-1.8.1.jar
++file.reference.gt-api-13.5.jar=lib/geotools/gt-api-13.5.jar
++file.reference.gt-app-schema-13.5.jar=lib/geotools/gt-app-schema-13.5.jar
++file.reference.gt-app-schema-resolver-13.5.jar=lib/geotools/gt-app-schema-resolver-13.5.jar
++file.reference.gt-arcgrid-13.5.jar=lib/geotools/gt-arcgrid-13.5.jar
++file.reference.gt-arcsde-13.5.jar=lib/geotools/gt-arcsde-13.5.jar
++file.reference.gt-arcsde-common-13.5.jar=lib/geotools/gt-arcsde-common-13.5.jar
++file.reference.gt-brewer-13.5.jar=lib/geotools/gt-brewer-13.5.jar
++file.reference.gt-charts-13.5.jar=lib/geotools/gt-charts-13.5.jar
++file.reference.gt-complex-13.5-tests.jar=lib/geotools/gt-complex-13.5-tests.jar
++file.reference.gt-complex-13.5.jar=lib/geotools/gt-complex-13.5.jar
++file.reference.gt-coverage-13.5.jar=lib/geotools/gt-coverage-13.5.jar
++file.reference.gt-coverage-api-13.5.jar=lib/geotools/gt-coverage-api-13.5.jar
++file.reference.gt-coveragetools-13.5.jar=lib/geotools/gt-coveragetools-13.5.jar
++file.reference.gt-cql-13.5.jar=lib/geotools/gt-cql-13.5.jar
++file.reference.gt-css-13.5.jar=lib/geotools/gt-css-13.5.jar
++file.reference.gt-csv-13.5.jar=lib/geotools/gt-csv-13.5.jar
++file.reference.gt-data-13.5.jar=lib/geotools/gt-data-13.5.jar
++file.reference.gt-epsg-wkt-13.5.jar=lib/geotools/gt-epsg-wkt-13.5.jar
++file.reference.gt-feature-aggregate-13.5.jar=lib/geotools/gt-feature-aggregate-13.5.jar
++file.reference.gt-feature-pregeneralized-13.5.jar=lib/geotools/gt-feature-pregeneralized-13.5.jar
++file.reference.gt-geojson-13.5.jar=lib/geotools/gt-geojson-13.5.jar
++file.reference.gt-geometry-13.5.jar=lib/geotools/gt-geometry-13.5.jar
++file.reference.gt-geopkg-13.5.jar=lib/geotools/gt-geopkg-13.5.jar
++file.reference.gt-geotiff-13.5.jar=lib/geotools/gt-geotiff-13.5.jar
++file.reference.gt-graph-13.5.jar=lib/geotools/gt-graph-13.5.jar
++file.reference.gt-grassraster-13.5.jar=lib/geotools/gt-grassraster-13.5.jar
++file.reference.gt-grib-13.5.jar=lib/geotools/gt-grib-13.5.jar
++file.reference.gt-grid-13.5.jar=lib/geotools/gt-grid-13.5.jar
++file.reference.gt-gtopo30-13.5.jar=lib/geotools/gt-gtopo30-13.5.jar
++file.reference.gt-image-13.5.jar=lib/geotools/gt-image-13.5.jar
++file.reference.gt-imageio-ext-gdal-13.5.jar=lib/geotools/gt-imageio-ext-gdal-13.5.jar
++file.reference.gt-imagemosaic-13.5.jar=lib/geotools/gt-imagemosaic-13.5.jar
++file.reference.gt-imagemosaic-jdbc-13.5.jar=lib/geotools/gt-imagemosaic-jdbc-13.5.jar
++file.reference.gt-imagepyramid-13.5.jar=lib/geotools/gt-imagepyramid-13.5.jar
++file.reference.gt-jts-wrapper-13.5.jar=lib/geotools/gt-jts-wrapper-13.5.jar
++file.reference.gt-main-13.5.jar=lib/geotools/gt-main-13.5.jar
++file.reference.gt-matfile5-13.5.jar=lib/geotools/gt-matfile5-13.5.jar
++file.reference.gt-mbtiles-13.5.jar=lib/geotools/gt-mbtiles-13.5.jar
++file.reference.gt-metadata-13.5.jar=lib/geotools/gt-metadata-13.5.jar
++file.reference.gt-netcdf-13.5.jar=lib/geotools/gt-netcdf-13.5.jar
++file.reference.gt-ogr-bridj-13.5.jar=lib/geotools/gt-ogr-bridj-13.5.jar
++file.reference.gt-ogr-core-13.5.jar=lib/geotools/gt-ogr-core-13.5.jar
++file.reference.gt-ogr-jni-13.5.jar=lib/geotools/gt-ogr-jni-13.5.jar
++file.reference.gt-opengis-13.5.jar=lib/geotools/gt-opengis-13.5.jar
++file.reference.gt-process-13.5.jar=lib/geotools/gt-process-13.5.jar
++file.reference.gt-process-feature-13.5.jar=lib/geotools/gt-process-feature-13.5.jar
++file.reference.gt-process-geometry-13.5.jar=lib/geotools/gt-process-geometry-13.5.jar
++file.reference.gt-process-raster-13.5.jar=lib/geotools/gt-process-raster-13.5.jar
++file.reference.gt-property-13.5.jar=lib/geotools/gt-property-13.5.jar
++file.reference.gt-property-old-13.5.jar=lib/geotools/gt-property-old-13.5.jar
++file.reference.gt-referencing-13.5.jar=lib/geotools/gt-referencing-13.5.jar
++file.reference.gt-referencing3D-13.5.jar=lib/geotools/gt-referencing3D-13.5.jar
++file.reference.gt-sfs-13.5.jar=lib/geotools/gt-sfs-13.5.jar
++file.reference.gt-shapefile-13.5.jar=lib/geotools/gt-shapefile-13.5.jar
++file.reference.gt-solr-13.5.jar=lib/geotools/gt-solr-13.5.jar
++file.reference.gt-svg-13.5.jar=lib/geotools/gt-svg-13.5.jar
++file.reference.gt-transform-13.5.jar=lib/geotools/gt-transform-13.5.jar
++file.reference.gt-validation-13.5.jar=lib/geotools/gt-validation-13.5.jar
++file.reference.jai_codec-1.1.3.jar=lib/geotools/jai_codec-1.1.3.jar
++file.reference.jai_core-1.1.3.jar=lib/geotools/jai_core-1.1.3.jar
++file.reference.jai_imageio-1.1.jar=lib/geotools/jai_imageio-1.1.jar
++file.reference.javacsv-2.0.jar=lib/geotools/javacsv-2.0.jar
++file.reference.javax.inject.jar=lib/javax.inject.jar
++file.reference.jdom-1.1.3.jar=lib/geotools/jdom-1.1.3.jar
++file.reference.jdom_1.1.jar=lib/jdom_1.1.jar
++file.reference.jface-3.6.1.M20100825-0800.jar=lib/geotools/jface-3.6.1.M20100825-0800.jar
++file.reference.jgridshift-1.0.jar=lib/geotools/jgridshift-1.0.jar
++file.reference.jsf-api.jar=lib/jsf-api.jar
++file.reference.jsf-impl.jar=lib/jsf-impl.jar
++file.reference.json-simple-1.1.jar=lib/geotools/json-simple-1.1.jar
++file.reference.jsqlparser-0.3.14.jar=lib/geotools/jsqlparser-0.3.14.jar
++file.reference.jsr-275-1.0-beta-2.jar=lib/geotools/jsr-275-1.0-beta-2.jar
++file.reference.jts-1.13.jar=lib/geotools/jts-1.13.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.sqljdbc4.jar=lib/sqljdbc4.jar
++file.reference.truezip_6.6.jar=lib/truezip_6.6.jar
++file.reference.vecmath-1.3.2.jar=lib/geotools/vecmath-1.3.2.jar
++file.reference.WepsReportData.jar=lib/WepsReportData.jar
++file.reference.xsd-2.6.0.jar=lib/geotools/xsd-2.6.0.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.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
++j2ee.server.type=Tomcat
++jar.compress=true
++javac.classpath=\
++    ${libs.CSIP-Jersey-2.16.classpath}:\
++    ${file.reference.Lmod2Rusle2.jar}:\
++    ${reference.csip-core.jar}:\
++    ${file.reference.jsf-api.jar}:\
++    ${file.reference.jsf-impl.jar}:\
++    ${file.reference.postgresql-9.0-801.jdbc4.jar}:\
++    ${file.reference.WepsReportData.jar}:\
++    ${file.reference.javax.inject.jar}:\
++    ${file.reference.truezip_6.6.jar}:\
++    ${file.reference.log4_1.2.15.jar}:\
++    ${file.reference.Man2Weps.jar}:\
++    ${file.reference.commons-collections-3.2.1.jar}:\
++    ${file.reference.oro-2.0.8.jar}:\
++    ${file.reference.jdom_1.1.jar}:\
++    ${file.reference.common-2.6.0.jar}:\
++    ${file.reference.commons-beanutils-1.7.0.jar}:\
++    ${file.reference.commons-cli-2.0-gt2-pre1.jar}:\
++    ${file.reference.commons-codec-1.2.jar}:\
++    ${file.reference.commons-collections-3.1.jar}:\
++    ${file.reference.commons-dbcp-1.4.jar}:\
++    ${file.reference.commons-digester-1.7.jar}:\
++    ${file.reference.commons-io-2.1.jar}:\
++    ${file.reference.commons-jxpath-1.3.jar}:\
++    ${file.reference.commons-logging-1.1.1.jar}:\
++    ${file.reference.commons-pool-1.5.4.jar}:\
++    ${file.reference.core.commands-3.6.0.I20100512-1500.jar}:\
++    ${file.reference.core.runtime-3.6.0.v20100505.jar}:\
++    ${file.reference.eastwood-1.1.1-20090908.jar}:\
++    ${file.reference.ecore-2.6.1.jar}:\
++    ${file.reference.ehcache-1.6.2.jar}:\
++    ${file.reference.gdal-1.8.1.jar}:\
++    ${file.reference.gt-api-13.5.jar}:\
++    ${file.reference.gt-app-schema-13.5.jar}:\
++    ${file.reference.gt-app-schema-resolver-13.5.jar}:\
++    ${file.reference.gt-arcgrid-13.5.jar}:\
++    ${file.reference.gt-arcsde-13.5.jar}:\
++    ${file.reference.gt-arcsde-common-13.5.jar}:\
++    ${file.reference.gt-brewer-13.5.jar}:\
++    ${file.reference.gt-charts-13.5.jar}:\
++    ${file.reference.gt-complex-13.5-tests.jar}:\
++    ${file.reference.gt-complex-13.5.jar}:\
++    ${file.reference.gt-coverage-13.5.jar}:\
++    ${file.reference.gt-coverage-api-13.5.jar}:\
++    ${file.reference.gt-coveragetools-13.5.jar}:\
++    ${file.reference.gt-cql-13.5.jar}:\
++    ${file.reference.gt-css-13.5.jar}:\
++    ${file.reference.gt-csv-13.5.jar}:\
++    ${file.reference.gt-data-13.5.jar}:\
++    ${file.reference.gt-epsg-wkt-13.5.jar}:\
++    ${file.reference.gt-feature-aggregate-13.5.jar}:\
++    ${file.reference.gt-feature-pregeneralized-13.5.jar}:\
++    ${file.reference.gt-geojson-13.5.jar}:\
++    ${file.reference.gt-geometry-13.5.jar}:\
++    ${file.reference.gt-geopkg-13.5.jar}:\
++    ${file.reference.gt-geotiff-13.5.jar}:\
++    ${file.reference.gt-graph-13.5.jar}:\
++    ${file.reference.gt-grassraster-13.5.jar}:\
++    ${file.reference.gt-grib-13.5.jar}:\
++    ${file.reference.gt-grid-13.5.jar}:\
++    ${file.reference.gt-gtopo30-13.5.jar}:\
++    ${file.reference.gt-image-13.5.jar}:\
++    ${file.reference.gt-imageio-ext-gdal-13.5.jar}:\
++    ${file.reference.gt-imagemosaic-13.5.jar}:\
++    ${file.reference.gt-imagemosaic-jdbc-13.5.jar}:\
++    ${file.reference.gt-imagepyramid-13.5.jar}:\
++    ${file.reference.gt-jts-wrapper-13.5.jar}:\
++    ${file.reference.gt-main-13.5.jar}:\
++    ${file.reference.gt-matfile5-13.5.jar}:\
++    ${file.reference.gt-mbtiles-13.5.jar}:\
++    ${file.reference.gt-metadata-13.5.jar}:\
++    ${file.reference.gt-netcdf-13.5.jar}:\
++    ${file.reference.gt-ogr-bridj-13.5.jar}:\
++    ${file.reference.gt-ogr-core-13.5.jar}:\
++    ${file.reference.gt-ogr-jni-13.5.jar}:\
++    ${file.reference.gt-opengis-13.5.jar}:\
++    ${file.reference.gt-process-13.5.jar}:\
++    ${file.reference.gt-process-feature-13.5.jar}:\
++    ${file.reference.gt-process-geometry-13.5.jar}:\
++    ${file.reference.gt-process-raster-13.5.jar}:\
++    ${file.reference.gt-property-13.5.jar}:\
++    ${file.reference.gt-property-old-13.5.jar}:\
++    ${file.reference.gt-referencing-13.5.jar}:\
++    ${file.reference.gt-referencing3D-13.5.jar}:\
++    ${file.reference.gt-sfs-13.5.jar}:\
++    ${file.reference.gt-shapefile-13.5.jar}:\
++    ${file.reference.gt-solr-13.5.jar}:\
++    ${file.reference.gt-svg-13.5.jar}:\
++    ${file.reference.gt-transform-13.5.jar}:\
++    ${file.reference.gt-validation-13.5.jar}:\
++    ${file.reference.jai_codec-1.1.3.jar}:\
++    ${file.reference.jai_core-1.1.3.jar}:\
++    ${file.reference.jai_imageio-1.1.jar}:\
++    ${file.reference.javacsv-2.0.jar}:\
++    ${file.reference.jdom-1.1.3.jar}:\
++    ${file.reference.jface-3.6.1.M20100825-0800.jar}:\
++    ${file.reference.jgridshift-1.0.jar}:\
++    ${file.reference.json-simple-1.1.jar}:\
++    ${file.reference.jsqlparser-0.3.14.jar}:\
++    ${file.reference.jsr-275-1.0-beta-2.jar}:\
++    ${file.reference.jts-1.13.jar}:\
++    ${file.reference.vecmath-1.3.2.jar}:\
++    ${file.reference.xsd-2.6.0.jar}:\
++    ${file.reference.commons-lang-2.4.jar}:\
++    ${file.reference.sqljdbc4.jar}
++# Space-separated list of extra javac options
++javac.compilerargs=
++javac.debug=true
++javac.deprecation=false
++javac.processorpath=\
++    ${javac.classpath}
++javac.source=1.8
++javac.target=1.8
++javac.test.classpath=\
++    ${javac.classpath}:\
++    ${build.classes.dir}:\
++    ${libs.hamcrest.classpath}:\
++    ${libs.junit_4.classpath}
++javac.test.processorpath=\
++    ${javac.test.classpath}
++javadoc.additionalparam=
++javadoc.author=false
++javadoc.encoding=${source.encoding}
++javadoc.noindex=false
++javadoc.nonavbar=false
++javadoc.notree=false
++javadoc.preview=true
++javadoc.private=false
++javadoc.splitindex=true
++javadoc.use=true
++javadoc.version=false
++javadoc.windowtitle=
++lib.dir=${web.docbase.dir}/WEB-INF/lib
++persistence.xml.dir=${conf.dir}
++platform.active=default_platform
++project.csip-core=../csip-core
++reference.csip-core.jar=${project.csip-core}/dist/csip-core.jar
++resource.dir=setup
++rest.config.type=ide
++run.test.classpath=\
++    ${javac.test.classpath}:\
++    ${build.test.classes.dir}
++# Space-separated list of JVM arguments used when running a class with a main method or a unit test
++# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value):
++runmain.jvmargs=
++source.encoding=UTF-8
++source.root=src
++src.dir=${source.root}/java
++test.src.dir=test
++war.content.additional=
++war.ear.name=${war.name}
++war.name=csip-erosion.war
++web.docbase.dir=web
++webinf.dir=web/WEB-INF

nbproject/project.xml

@@ -16,11 +16,11 @@

<path-in-war>WEB-INF/lib</path-in-war>

</library>

- <file>${reference.csip-core.jar}</file>

+ <file>${file.reference.Lmod2Rusle2.jar}</file>

<path-in-war>WEB-INF/lib</path-in-war>

</library>

- <file>${file.reference.Lmod2Rusle2.jar}</file>

+ <file>${reference.csip-core.jar}</file>

<path-in-war>WEB-INF/lib</path-in-war>

</library>

src/java/m/ApplicationConfig.java

 @@ -33,8 +33,11 @@
       private void addRestResourceClasses(Set<Class<?>> resources) {
           resources.add(c.MsSQLGIS.class);
           resources.add(csip.ArchiveService.class);
++        resources.add(csip.CatalogService.class);
++        resources.add(csip.ControlService.class);
           resources.add(csip.QueryService.class);
           resources.add(csip.ReportService.class);
++        resources.add(csip.UIService.class);
           resources.add(d.rusle2.CMZ1_0.class);
           resources.add(d.rusle2.CMZ1_1.class);
           resources.add(d.rusle2.Climate1_0.class);

web/META-INF/csip-conf.json

@@ -1,5 +1,5 @@

{

- "csip-erosion.version": "$version: 2.0.86 b95b2313f6f8 2017-04-11 Jakob23, built at 2017-04-21 13:51 by od$",

+ "csip-erosion.version": "$version: 2.0.88 d33ce9ed6382 2017-05-08 Jakob23, built at 2017-12-19 11:37 by Lucas Yaege$",

"lmod.db": "jdbc:sqlserver:\/\/129.82.20.129:1433;databaseName=lmod_temp;user=lmod-rw;password=managements",

"conservation_resources.db": "jdbc:sqlserver://129.82.20.129:1433;databaseName=conservation_resources;user=sa;password=csurams#1",

"conservation_resources.database": "mssql",

web/WEB-INF/csip-conf.json

@@ -1,5 +1,5 @@

{

- "csip-erosion.version": "$version: 2.0.86 b95b2313f6f8 2017-04-11 Jakob23, built at 2017-04-21 13:51 by od$",

+ "csip-erosion.version": "$version: 2.0.88 d33ce9ed6382 2017-05-08 Jakob23, built at 2017-12-19 11:37 by Lucas Yaege$",

"weps.version" : "1.3.9",

"lmod.db": "jdbc:sqlserver:\/\/129.82.20.242:1433;databaseName=lmod_zedx;user=lmod-rw;password=managements",

"conservation_resources.db": "jdbc:sqlserver://129.82.20.241:1433;databaseName=conservation_resources;user=sa;password=csurams#1",