csip-wqm Displaying differences for changeset

Displaying differences for changeset

display as Allow wrapping

nbproject/ant-deploy.xml

 @@ -20,18 +20,30 @@
       </target>
       <target name="-deploy-ant" if="deploy.ant.enabled" depends="-init,-check-credentials">
           <echo message="Deploying ${deploy.ant.archive} to ${Context(path)}"/>
--        <taskdef name="deploy" classname="org.apache.catalina.ant.DeployTask"
--                 classpath="${tomcat.home}/server/lib/catalina-ant.jar"/>
--        <deploy url="${tomcat.url}/manager" username="${tomcat.username}"
++        <taskdef name="deploy" classname="org.apache.catalina.ant.DeployTask">
++            <classpath>
++                <pathelement path="${tomcat.home}/lib/catalina-ant.jar"/>
++                <pathelement path="${tomcat.home}/lib/tomcat-coyote.jar"/>
++                <pathelement path="${tomcat.home}/lib/tomcat-util.jar"/>
++                <pathelement path="${tomcat.home}/bin/tomcat-juli.jar"/>
++            </classpath>
++        </taskdef>
++        <deploy url="${tomcat.url}/manager/text" username="${tomcat.username}"
                   password="${tomcat.password}" path="${Context(path)}"
                   war="${deploy.ant.archive}"/>
           <property name="deploy.ant.client.url" value="${tomcat.url}${Context(path)}"/>
       </target>
       <target name="-undeploy-ant" if="deploy.ant.enabled" depends="-init,-check-credentials">
           <echo message="Undeploying ${Context(path)}"/>
--        <taskdef name="undeploy"  classname="org.apache.catalina.ant.UndeployTask"
--                classpath="${tomcat.home}/server/lib/catalina-ant.jar"/>
--        <undeploy url="${tomcat.url}/manager" username="${tomcat.username}"
++        <taskdef name="undeploy"  classname="org.apache.catalina.ant.UndeployTask">
++            <classpath>
++                <pathelement path="${tomcat.home}/lib/catalina-ant.jar"/>
++                <pathelement path="${tomcat.home}/lib/tomcat-coyote.jar"/>
++                <pathelement path="${tomcat.home}/lib/tomcat-util.jar"/>
++                <pathelement path="${tomcat.home}/bin/tomcat-juli.jar"/>
++            </classpath>
++        </taskdef>
++        <undeploy url="${tomcat.url}/manager/text" username="${tomcat.username}"
                     password="${tomcat.password}" path="${Context(path)}"/>
       </target>
   </project>

src/java/m/wqm/ApplicationConfig.java

@@ -34,6 +34,7 @@

resources.add(csip.ArchiveService.class);

resources.add(csip.CatalogService.class);

resources.add(csip.ControlService.class);

+ resources.add(csip.ModelDataService.class);

resources.add(csip.QueryService.class);

resources.add(csip.ReportService.class);

resources.add(m.wqm.NutrientSLP.V1_0.class);

src/java/m/wqm/wqmsoilattributes/V1_0.java

@@ -36,7 +36,7 @@

public class V1_0 extends ModelDataService {

//mapunit/ssurgo polygon intersect URI

- private final String SSURGO_INTERSECT_URI = "http://csip.engr.colostate.edu:8081/csip/d/soils/1.1";

+ private final String SSURGO_INTERSECT_URI = "http://csip.engr.colostate.edu:8086/csip-erosion/d/soils/1.2";

//Request

private String aoaId;

web/META-INF/csip-conf.json

@@ -6,5 +6,5 @@

"wqm.db": "jdbc:postgresql://csip.engr.colostate.edu:5435/wqm",

"ssurgo.db": "jdbc:postgresql://csip.engr.colostate.edu:5435/ssurgo",

"r2gis.db": "jdbc:postgresql://csip.engr.colostate.edu:5435/r2gis",

- "wqm.version" : "$version: ${out} $"

+ "wqm.version" : "$version: 0.1.110 5fef86c018df 2015-09-23 $"

}