| @@ -1,23 +1,42 @@ |
| <?xml version="1.0" encoding="UTF-8"?> |
| <!-- |
| +DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. |
| |
| - Licensed to the Apache Software Foundation (ASF) under one |
| - or more contributor license agreements. See the NOTICE file |
| - distributed with this work for additional information |
| - regarding copyright ownership. The ASF licenses this file |
| - to you under the Apache License, Version 2.0 (the |
| - "License"); you may not use this file except in compliance |
| - with the License. You may obtain a copy of the License at |
| +Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved. |
| |
| - http://www.apache.org/licenses/LICENSE-2.0 |
| +Oracle and Java are registered trademarks of Oracle and/or its affiliates. |
| +Other names may be trademarks of their respective owners. |
| |
| - Unless required by applicable law or agreed to in writing, |
| - software distributed under the License is distributed on an |
| - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY |
| - KIND, either express or implied. See the License for the |
| - specific language governing permissions and limitations |
| - under the License. |
| +The contents of this file are subject to the terms of either the GNU |
| +General Public License Version 2 only ("GPL") or the Common |
| +Development and Distribution License("CDDL") (collectively, the |
| +"License"). You may not use this file except in compliance with the |
| +License. You can obtain a copy of the License at |
| +http://www.netbeans.org/cddl-gplv2.html |
| +or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the |
| +specific language governing permissions and limitations under the |
| +License. When distributing the software, include this License Header |
| +Notice in each file and include the License file at |
| +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this |
| +particular file as subject to the "Classpath" exception as provided |
| +by Oracle in the GPL Version 2 section of the License file that |
| +accompanied this code. If applicable, add the following below the |
| +License Header, with the fields enclosed by brackets [] replaced by |
| +your own identifying information: |
| +"Portions Copyrighted [year] [name of copyright owner]" |
| |
| +If you wish your version of this file to be governed by only the CDDL |
| +or only the GPL Version 2, indicate your decision by adding |
| +"[Contributor] elects to include this software in this distribution |
| +under the [CDDL or GPL Version 2] license." If you do not indicate a |
| +single choice of license, a recipient has the option to distribute |
| +your version of this file under either the CDDL, the GPL Version 2 or |
| +to extend the choice of license to its licensees as provided above. |
| +However, if you add GPL Version 2 code and therefore, elected the GPL |
| +Version 2 license, then the option applies only if the new code is |
| +made subject to such option by the copyright holder. |
| + |
| +Contributor(s): |
| --> |
| <project default="-deploy-ant" basedir="."> |
| <target name="-init" if="deploy.ant.enabled"> |
| @@ -1009,10 +1009,10 @@ |
| <copyfiles files="${reference.csip-core.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"/> |
| <copyfiles files="${file.reference.Lmod2Rusle2.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
| - <copyfiles files="${file.reference.csip-soilsdb-3.0.18.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
| - <copyfiles files="${file.reference.csip-gis-objects-2.0.17.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
| <copyfiles files="${file.reference.calcmanstir.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
| - <copyfiles files="${file.reference.SDMDriver-1.0.4.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
| + <copyfiles files="${file.reference.SDMDriver-1.0.7.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
| + <copyfiles files="${file.reference.csip-gis-objects-2.0.40.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
| + <copyfiles files="${file.reference.csip-soilsdb-3.5.109.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> |
| @@ -1020,10 +1020,10 @@ |
| <copyfiles files="${reference.csip-core.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
| <copyfiles files="${libs.CSIP-Jersey-2.16.classpath}" todir="${build.web.dir}/WEB-INF/lib"/> |
| <copyfiles files="${file.reference.Lmod2Rusle2.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
| - <copyfiles files="${file.reference.csip-soilsdb-3.0.18.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
| - <copyfiles files="${file.reference.csip-gis-objects-2.0.17.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
| <copyfiles files="${file.reference.calcmanstir.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
| - <copyfiles files="${file.reference.SDMDriver-1.0.4.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
| + <copyfiles files="${file.reference.SDMDriver-1.0.7.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
| + <copyfiles files="${file.reference.csip-gis-objects-2.0.40.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
| + <copyfiles files="${file.reference.csip-soilsdb-3.5.109.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"/> |
| @@ -1,106 +1,106 @@ |
| -file.reference.calcmanstir.jar=lib/calcmanstir.jar |
| -file.reference.commons-codec-1.10.jar=lib/commons-codec-1.10.jar |
| -file.reference.commons-vfs2-2.1.jar=lib/commons-vfs2-2.1.jar |
| -file.reference.csip-gis-objects-2.0.17.jar=lib/csip-gis-objects-2.0.17.jar |
| -file.reference.csip-soilsdb-3.0.18.jar=lib/csip-soilsdb-3.0.18.jar |
| -file.reference.Lmod2Rusle2.jar=lib/Lmod2Rusle2.jar |
| -file.reference.SDMDriver-1.0.4.jar=lib/SDMDriver-1.0.4.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 |
| -#Thu Dec 17 13:44:22 MST 2015 |
| -javadoc.splitindex=true |
| -lib.dir=${web.docbase.dir}/WEB-INF/lib |
| -auxiliary.org-netbeans-modules-css-prep.sass_2e_mappings=/scss\:/css |
| -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 |
| -project.csip-core=../csip-core |
| -reference.csip-core.jar=${project.csip-core}/dist/csip-core.jar |
| -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 |
| -auxiliary.org-netbeans-modules-css-prep.less_2e_mappings=/less\:/css |
| -test.src.dir=test |
| -auxiliary.org-netbeans-modules-css-prep.sass_2e_compiler_2e_options= |
| -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 |
| -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 |
| -auxiliary.org-netbeans-modules-css-prep.less_2e_enabled=false |
| -javadoc.notree=false |
| -source.root=src |
| -runmain.jvmargs= |
| -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=\ |
| - ${reference.csip-core.jar}:\ |
| - ${libs.CSIP-Jersey-2.16.classpath}:\ |
| - ${file.reference.Lmod2Rusle2.jar}:\ |
| - ${file.reference.commons-vfs2-2.1.jar}:\ |
| - ${file.reference.commons-codec-1.10.jar}:\ |
| - ${file.reference.csip-soilsdb-3.0.18.jar}:\ |
| - ${file.reference.csip-gis-objects-2.0.17.jar}:\ |
| - ${file.reference.calcmanstir.jar}:\ |
| - ${file.reference.SDMDriver-1.0.4.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 |
| -auxiliary.org-netbeans-modules-css-prep.less_2e_compiler_2e_options= |
| -web.docbase.dir=web |
| -javac.compilerargs= |
| -auxiliary.org-netbeans-modules-web-clientproject-api.js_2e_libs_2e_folder=js/libs |
| -auxiliary.org-netbeans-modules-css-prep.sass_2e_enabled=false |
| -source.encoding=UTF-8 |
| -dist.ear.war=${dist.dir}/${war.ear.name} |
| -j2ee.server.type=Tomcat |
| -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-r2.war |
| -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.calcmanstir.jar=lib/calcmanstir.jar |
| +file.reference.commons-codec-1.10.jar=lib/commons-codec-1.10.jar |
| +file.reference.commons-vfs2-2.1.jar=lib/commons-vfs2-2.1.jar |
| +file.reference.csip-gis-objects-2.0.40.jar=lib/csip-gis-objects-2.0.40.jar |
| +file.reference.csip-soilsdb-3.5.109.jar=lib/csip-soilsdb-3.5.109.jar |
| +file.reference.Lmod2Rusle2.jar=lib/Lmod2Rusle2.jar |
| +file.reference.SDMDriver-1.0.7.jar=lib/SDMDriver-1.0.7.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.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 |
| +#Thu Dec 17 13:44:22 MST 2015 |
| +javadoc.splitindex=true |
| +lib.dir=${web.docbase.dir}/WEB-INF/lib |
| +auxiliary.org-netbeans-modules-css-prep.sass_2e_mappings=/scss\:/css |
| +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 |
| +project.csip-core=../csip-core |
| +reference.csip-core.jar=${project.csip-core}/dist/csip-core.jar |
| +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 |
| +auxiliary.org-netbeans-modules-css-prep.less_2e_mappings=/less\:/css |
| +test.src.dir=test |
| +auxiliary.org-netbeans-modules-css-prep.sass_2e_compiler_2e_options= |
| +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 |
| +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 |
| +auxiliary.org-netbeans-modules-css-prep.less_2e_enabled=false |
| +javadoc.notree=false |
| +source.root=src |
| +runmain.jvmargs= |
| +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=\ |
| + ${reference.csip-core.jar}:\ |
| + ${libs.CSIP-Jersey-2.16.classpath}:\ |
| + ${file.reference.Lmod2Rusle2.jar}:\ |
| + ${file.reference.commons-vfs2-2.1.jar}:\ |
| + ${file.reference.commons-codec-1.10.jar}:\ |
| + ${file.reference.calcmanstir.jar}:\ |
| + ${file.reference.SDMDriver-1.0.7.jar}:\ |
| + ${file.reference.csip-gis-objects-2.0.40.jar}:\ |
| + ${file.reference.csip-soilsdb-3.5.109.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 |
| +auxiliary.org-netbeans-modules-css-prep.less_2e_compiler_2e_options= |
| +web.docbase.dir=web |
| +javac.compilerargs= |
| +auxiliary.org-netbeans-modules-web-clientproject-api.js_2e_libs_2e_folder=js/libs |
| +auxiliary.org-netbeans-modules-css-prep.sass_2e_enabled=false |
| +source.encoding=UTF-8 |
| +dist.ear.war=${dist.dir}/${war.ear.name} |
| +j2ee.server.type=Tomcat |
| +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-r2.war |
| +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} |