@@ -1,4 +1,43 @@ |
<?xml version="1.0" encoding="UTF-8"?> |
+<!-- |
+DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. |
+ |
+Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved. |
+ |
+Oracle and Java are registered trademarks of Oracle and/or its affiliates. |
+Other names may be trademarks of their respective owners. |
+ |
+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"> |
<property file="${deploy.ant.properties.file}"/> |
@@ -16,7 +55,7 @@ |
<isset property="tomcat.password"/> |
</not> |
</condition> |
- </fail> |
+ </fail> |
</target> |
<target name="-deploy-ant" if="deploy.ant.enabled" depends="-init,-check-credentials"> |
<echo message="Deploying ${deploy.ant.archive} to ${Context(path)}"/> |
@@ -1009,7 +1009,6 @@ |
<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="${file.reference.Man2Weps.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"/> |
<copyfiles files="${file.reference.postgresql-9.0-801.jdbc4.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
@@ -1017,6 +1016,7 @@ |
<copyfiles files="${file.reference.javax.inject.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
<copyfiles files="${file.reference.truezip_6.6.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
<copyfiles files="${file.reference.log4_1.2.15.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-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"/> |
@@ -1117,7 +1117,6 @@ |
<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="${file.reference.Man2Weps.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"/> |
<copyfiles files="${file.reference.postgresql-9.0-801.jdbc4.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
@@ -1125,6 +1124,7 @@ |
<copyfiles files="${file.reference.javax.inject.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
<copyfiles files="${file.reference.truezip_6.6.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
<copyfiles files="${file.reference.log4_1.2.15.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-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"/> |
@@ -1,6 +1,6 @@ |
{ |
- "csip-erosion.version": "$version: 2.0.79 ca3a4b6a78ab 2017-03-14 Jakob23, built at 2017-04-05 14:56 by brad$", |
- "lmod.db": "jdbc:sqlserver:\/\/129.82.20.242:1433;databaseName=lmod_zedx;user=lmod-rw;password=managements", |
+ "csip-erosion.version": "$version: 2.0.83 88385be665f0 2017-04-05 Jakob23, built at 2017-04-11 13:32 by Brad$", |
+ "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", |
"r2.db": "http://csip.engr.colostate.edu/r2", |