Displaying differences for changeset
 
display as  

build.xml

@@ -10,6 +10,22 @@
 <project name="csip-wqm" default="default" basedir=".">
     <description>Builds, tests, and runs the project csip-wqm.</description>
     <import file="nbproject/build-impl.xml"/>
+    
+    
+        
+     <target name="-pre-compile">  
+         <exec executable="hg" outputproperty="out" osfamily="unix">
+           <arg value="log"/>
+           <arg value="-r"/>
+           <arg value="tip"/>
+           <arg value="--template"/>
+           <arg value="{latesttag}.{latesttagdistance} {node|short} {date|shortdate}"/>
+        </exec>
+       <replaceregexp match="(.*)\$version:(.*)\$" replace="\1$version: ${out} $" flags="g">
+        <fileset dir="web" includes="**/csip-conf.json"/>
+      </replaceregexp>
+    </target>
+    
     <!--
 
     There exist several targets which are by default empty and which can be 

nbproject/genfiles.properties

@@ -3,8 +3,8 @@
 build.xml.stylesheet.CRC32=651128d4@1.65.1.1
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=977cc862
-nbproject/build-impl.xml.script.CRC32=5bb67674
+nbproject/build-impl.xml.data.CRC32=2ecdb2c8
+nbproject/build-impl.xml.script.CRC32=b2871c30
 nbproject/build-impl.xml.stylesheet.CRC32=99ea4b56@1.68.1.1
 nbproject/rest-build.xml.data.CRC32=bff4a8fe
 nbproject/rest-build.xml.script.CRC32=4734534b

nbproject/project.properties

@@ -43,8 +43,8 @@
 jar.compress=false
 javac.classpath=\
     ${libs.CSIP-Jersey-2.16.classpath}:\
-    ${reference.csip-core.jar}:\
-    ${libs.PostgreSQLDriver.classpath}
+    ${libs.PostgreSQLDriver.classpath}:\
+    ${reference.csip-core.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.debug=true
@@ -74,7 +74,7 @@
 lib.dir=${web.docbase.dir}/WEB-INF/lib
 persistence.xml.dir=${conf.dir}
 platform.active=JDK_1.7
-project.csip-core=../csip-core
+project.csip-core=../csip
 reference.csip-core.jar=${project.csip-core}/dist/csip-core.jar
 resource.dir=setup
 rest.config.type=ide

nbproject/project.xml

@@ -17,11 +17,11 @@
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
                 <library dirs="200">
-                    <file>${reference.csip-core.jar}</file>
+                    <file>${libs.PostgreSQLDriver.classpath}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
                 <library dirs="200">
-                    <file>${libs.PostgreSQLDriver.classpath}</file>
+                    <file>${reference.csip-core.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
             </web-module-libraries>

src/java/m/wqm/ApplicationConfig.java

@@ -42,9 +42,13 @@
         resources.add(m.wqm.pesticide.attributes.V1_0.class);
         resources.add(m.wqm.pesticidesarp.V1_0.class);
         resources.add(m.wqm.pesticidessrp.V1_0.class);
+        resources.add(m.wqm.pestipmscores.V1_0.class);
         resources.add(m.wqm.pestlosspot.V1_0.class);
+        resources.add(m.wqm.pestpractscores.V1_0.class);
+        resources.add(m.wqm.pesttechnscores.V1_0.class);
         resources.add(m.wqm.scpestslp.V1_0.class);
         resources.add(m.wqm.scsednutsrp.V1_0.class);
+        resources.add(m.wqm.sednutpractscores.V1_0.class);
         resources.add(m.wqm.thresholdscores.V1_0.class);
     }
 }

src/java/m/wqm/nuttechscores/Result1.java

@@ -4,6 +4,7 @@
  *
  * @author Srinivas Reddy Kontham
  */
+
 public class Result1 
 {
             int nleach_techn_score=0;

src/java/m/wqm/pestipmscores/V1_0.java

@@ -60,7 +60,7 @@
             Connection conn = null;
             Statement statement = null;
             Class.forName("org.postgresql.Driver");
-            conn = DriverManager.getConnection("jdbc:postgresql://localhost:5432/WQM", "postgres", "ids12");
+            conn = DriverManager.getConnection("jdbc:postgresql://localhost:5432/WQM Data Mart 20150324", "postgres", "postgresql");
             conn.setAutoCommit(false);
             statement = conn.createStatement();
             

src/java/m/wqm/scsednutsrp/V1_0.java

 

test/service_tests/m/wqm/pestipmscores/v1_0/simple-res.json

@@ -1,13 +1,13 @@
 {
   "metainfo": {
     "status": "Finished",
-    "suid": "dea1e020-fa6c-11e4-95c7-3fd6421d8084",
+    "suid": "f9ec0473-fb2a-11e4-acff-fbe4764d4206",
     "cloud_node": "129.82.196.103",
-    "tstamp": "2015-05-14 13:10:23",
+    "tstamp": "2015-05-15 11:51:12",
     "service_url": "http://localhost:8080/csip-wqm/m/pesticide_ipm_score/1.0",
     "request_ip": "127.0.0.1",
-    "cpu_time": 198,
-    "expiration_date": "2015-05-14 13:15:24"
+    "cpu_time": 59,
+    "expiration_date": "2015-05-15 11:56:12"
   },
   "parameter": [{
     "name": "pestcomponents",

test/service_tests/m/wqm/pestlosspot/v1_0/simple-res.json

@@ -1,13 +1,14 @@
 {
   "metainfo": {
-    "status": "Finished",
-    "suid": "af4a957d-e498-11e4-8463-87b72f9e73d2",
-    "cloud_node": "192.168.0.23",
-    "tstamp": "2015-04-16 18:28:35",
+    "status": "Failed",
+    "suid": "47b0a26c-fa60-11e4-ae31-f9c96e6de410",
+    "cloud_node": "129.82.196.103",
+    "tstamp": "2015-05-14 11:40:18",
     "service_url": "http://localhost:8080/csip-wqm/m/pestlosspot/1.0",
     "request_ip": "127.0.0.1",
-    "cpu_time": 1107,
-    "expiration_date": "2015-04-16 18:33:36"
+    "cpu_time": 840,
+    "expiration_date": "2015-05-14 11:45:19",
+    "error": "java.util.concurrent.ExecutionException: org.postgresql.util.PSQLException: FATAL: password authentication failed for user \"postgres\"\r\n\tat java.util.concurrent.FutureTask.report(FutureTask.java:122)\r\n\tat java.util.concurrent.FutureTask.get(FutureTask.java:188)\r\n\tat csip.ModelDataService$Task.run(ModelDataService.java:2325)\r\n\tat csip.ModelDataService.execute(ModelDataService.java:2170)\r\n\tat csip.ModelDataService.execute(ModelDataService.java:2246)\r\n\tat sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\r\n\tat sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)\r\n\tat sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)\r\n\tat java.lang.reflect.Method.invoke(Method.java:606)\r\n\tat org.glassfish.jersey.server.model.internal.ResourceMethodInvocationHandlerFactory$1.invoke(ResourceMethodInvocationHandlerFactory.java:81)\r\n\tat org.glassfish.jersey.server.model.internal.AbstractJavaResourceMethodDispatcher$1.run(AbstractJavaResourceMethodDispatcher.java:143)\r\n\tat org.glassfish.jersey.server.model.internal.AbstractJavaResourceMethodDispatcher.invoke(AbstractJavaResourceMethodDispatcher.java:160)\r\n\tat org.glassfish.jersey.server.model.internal.JavaResourceMethodDispatcherProvider$TypeOutInvoker.doDispatch(JavaResourceMethodDispatcherProvider.java:203)\r\n\tat org.glassfish.jersey.server.model.internal.AbstractJavaResourceMethodDispatcher.dispatch(AbstractJavaResourceMethodDispatcher.java:97)\r\n\tat org.glassfish.jersey.server.model.ResourceMethodInvoker.invoke(ResourceMethodInvoker.java:389)\r\n\tat org.glassfish.jersey.server.model.ResourceMethodInvoker.apply(ResourceMethodInvoker.java:347)\r\n\tat org.glassfish.jersey.server.model.ResourceMethodInvoker.apply(ResourceMethodInvoker.java:102)\r\n\tat org.glassfish.jersey.server.ServerRuntime$2.run(ServerRuntime.java:303)\r\n\tat org.glassfish.jersey.internal.Errors$1.call(Errors.java:271)\r\n\tat org.glassfish.jersey.internal.Errors$1.call(Errors.java:267)\r\n\tat org.glassfish.jersey.internal.Errors.process(Errors.java:315)\r\n\tat org.glassfish.jersey.internal.Errors.process(Errors.java:297)\r\n\tat org.glassfish.jersey.internal.Errors.process(Errors.java:267)\r\n\tat org.glassfish.jersey.process.internal.RequestScope.runInScope(RequestScope.java:317)\r\n\tat org.glassfish.jersey.server.ServerRuntime.process(ServerRuntime.java:286)\r\n\tat org.glassfish.jersey.server.ApplicationHandler.handle(ApplicationHandler.java:1072)\r\n\tat org.glassfish.jersey.servlet.WebComponent.service(WebComponent.java:399)\r\n\tat org.glassfish.jersey.servlet.ServletContainer.service(ServletContainer.java:381)\r\n\tat org.glassfish.jersey.servlet.ServletContainer.service(ServletContainer.java:344)\r\n\tat org.glassfish.jersey.servlet.ServletContainer.service(ServletContainer.java:221)\r\n\tat org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:291)\r\n\tat org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206)\r\n\tat org.apache.tomcat.websocket.server.WsFilter.doFilter(WsFilter.java:52)\r\n\tat org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:239)\r\n\tat org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206)\r\n\tat org.netbeans.modules.web.monitor.server.MonitorFilter.doFilter(MonitorFilter.java:393)\r\n\tat org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:239)\r\n\tat org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206)\r\n\tat org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:219)\r\n\tat org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:106)\r\n\tat org.apache.catalina.authenticator.AuthenticatorBase.invoke(AuthenticatorBase.java:501)\r\n\tat org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:142)\r\n\tat org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:79)\r\n\tat org.apache.catalina.valves.AbstractAccessLogValve.invoke(AbstractAccessLogValve.java:610)\r\n\tat org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:88)\r\n\tat org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:537)\r\n\tat org.apache.coyote.http11.AbstractHttp11Processor.process(AbstractHttp11Processor.java:1085)\r\n\tat org.apache.coyote.AbstractProtocol$AbstractConnectionHandler.process(AbstractProtocol.java:658)\r\n\tat org.apache.coyote.http11.Http11NioProtocol$Http11ConnectionHandler.process(Http11NioProtocol.java:222)\r\n\tat org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1556)\r\n\tat org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.run(NioEndpoint.java:1513)\r\n\tat java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)\r\n\tat java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)\r\n\tat org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61)\r\n\tat java.lang.Thread.run(Thread.java:745)\r\nCaused by: org.postgresql.util.PSQLException: FATAL: password authentication failed for user \"postgres\"\r\n\tat org.postgresql.core.v3.ConnectionFactoryImpl.doAuthentication(ConnectionFactoryImpl.java:398)\r\n\tat org.postgresql.core.v3.ConnectionFactoryImpl.openConnectionImpl(ConnectionFactoryImpl.java:173)\r\n\tat org.postgresql.core.ConnectionFactory.openConnection(ConnectionFactory.java:64)\r\n\tat org.postgresql.jdbc2.AbstractJdbc2Connection.<init>(AbstractJdbc2Connection.java:136)\r\n\tat org.postgresql.jdbc3.AbstractJdbc3Connection.<init>(AbstractJdbc3Connection.java:29)\r\n\tat org.postgresql.jdbc3g.AbstractJdbc3gConnection.<init>(AbstractJdbc3gConnection.java:21)\r\n\tat org.postgresql.jdbc4.AbstractJdbc4Connection.<init>(AbstractJdbc4Connection.java:31)\r\n\tat org.postgresql.jdbc4.Jdbc4Connection.<init>(Jdbc4Connection.java:24)\r\n\tat org.postgresql.Driver.makeConnection(Driver.java:393)\r\n\tat org.postgresql.Driver.connect(Driver.java:267)\r\n\tat java.sql.DriverManager.getConnection(DriverManager.java:571)\r\n\tat java.sql.DriverManager.getConnection(DriverManager.java:215)\r\n\tat m.wqm.pestlosspot.V1_0.process(V1_0.java:53)\r\n\tat csip.ModelDataService.process0(ModelDataService.java:487)\r\n\tat csip.ModelDataService.access$000(ModelDataService.java:65)\r\n\tat csip.ModelDataService$1.call(ModelDataService.java:464)\r\n\tat csip.ModelDataService$1.call(ModelDataService.java:460)\r\n\tat java.util.concurrent.FutureTask.run(FutureTask.java:262)\r\n\tat java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:471)\r\n\tat java.util.concurrent.FutureTask.run(FutureTask.java:262)\r\n\tat java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)\r\n\tat java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)\r\n\t... 1 more\r\n"
   },
   "parameter": [{
     "name": "pestcomponents",
@@ -77,202 +78,5 @@
         }
       ]
     ]
-  }],
-  "result": [{
-    "name": "operation",
-    "value": [
-      {
-        "name": "pesticide summary",
-        "value": [
-          {
-            "name": "AoAId",
-            "value": 1,
-            "description": "Area of Analysis Identifier"
-          },
-          {
-            "name": "operation_id",
-            "value": 1,
-            "description": "Operation ID"
-          },
-          {
-            "name": "op_pest_id",
-            "value": "101101",
-            "description": "Pesticide Identifier (PC_CODE)"
-          },
-          {
-            "name": "app_rate",
-            "value": "STANDARD",
-            "description": "Pesticide Application Rating"
-          },
-          {
-            "name": "ai_name",
-            "value": "Metribuzin",
-            "description": "Active Ingredient Name (AI_NAME)"
-          },
-          {
-            "name": "ai_ph",
-            "value": 0,
-            "description": "Active ingredient pH of associate properties (PH)"
-          },
-          {
-            "name": "ai_hl",
-            "value": 40,
-            "description": "Active ingredient field half life (HL)"
-          },
-          {
-            "name": "ai_koc",
-            "value": 60,
-            "description": "Active ingredient soil organic carbon sorption coefficient (KOC)"
-          },
-          {
-            "name": "ai_sol",
-            "value": 1220,
-            "description": "Active ingredient solubility in water (SOL)"
-          },
-          {
-            "name": "ai_humtox",
-            "value": 70,
-            "description": "Active ingredient human toxicity value – long term"
-          },
-          {
-            "name": "ai_humtoxtype",
-            "value": "HA",
-            "description": "Active ingredient human toxicity type"
-          },
-          {
-            "name": "ai_fistox",
-            "value": 3000,
-            "description": "Active ingredient maximum acceptable toxicant concentration-fish"
-          },
-          {
-            "name": "ai_fishtoxtype",
-            "value": "MATC",
-            "description": "Active ingredient fish toxicity type"
-          },
-          {
-            "name": "ai_plp",
-            "value": "VERY LOW",
-            "description": "Active ingredient pesticide leaching potential"
-          },
-          {
-            "name": "ai_psrp",
-            "value": "HIGH",
-            "description": "Active ingredient pesticide soil leaching potential"
-          },
-          {
-            "name": "ai_parp",
-            "value": "LOW",
-            "description": "Active ingredient pesticide adsorbed runoff potential"
-          },
-          {
-            "name": "op_app_area",
-            "value": "Broadcast",
-            "description": "Pesticide application operation area"
-          },
-          {
-            "name": "op_app_method",
-            "value": "Surface Applied",
-            "description": "Pesticide application operation method"
-          }
-        ],
-        "description": "Pest"
-      },
-      {
-        "name": "pesticide summary",
-        "value": [
-          {
-            "name": "AoAId",
-            "value": 1,
-            "description": "Area of Analysis Identifier"
-          },
-          {
-            "name": "operation_id",
-            "value": 1,
-            "description": "Operation ID"
-          },
-          {
-            "name": "op_pest_id",
-            "value": "101702",
-            "description": "Pesticide Identifier (PC_CODE)"
-          },
-          {
-            "name": "app_rate",
-            "value": "LOW",
-            "description": "Pesticide Application Rating"
-          },
-          {
-            "name": "ai_name",
-            "value": "Zoxamide",
-            "description": "Active Ingredient Name (AI_NAME)"
-          },
-          {
-            "name": "ai_ph",
-            "value": 0,
-            "description": "Active ingredient pH of associate properties (PH)"
-          },
-          {
-            "name": "ai_hl",
-            "value": 15,
-            "description": "Active ingredient field half life (HL)"
-          },
-          {
-            "name": "ai_koc",
-            "value": 1211,
-            "description": "Active ingredient soil organic carbon sorption coefficient (KOC)"
-          },
-          {
-            "name": "ai_sol",
-            "value": 0.681,
-            "description": "Active ingredient solubility in water (SOL)"
-          },
-          {
-            "name": "ai_humtox",
-            "value": 3360,
-            "description": "Active ingredient human toxicity value – long term"
-          },
-          {
-            "name": "ai_humtoxtype",
-            "value": "HA*",
-            "description": "Active ingredient human toxicity type"
-          },
-          {
-            "name": "ai_fistox",
-            "value": 4.9,
-            "description": "Active ingredient maximum acceptable toxicant concentration-fish"
-          },
-          {
-            "name": "ai_fishtoxtype",
-            "value": "MATC",
-            "description": "Active ingredient fish toxicity type"
-          },
-          {
-            "name": "ai_plp",
-            "value": "VERY LOW",
-            "description": "Active ingredient pesticide leaching potential"
-          },
-          {
-            "name": "ai_psrp",
-            "value": "LOW",
-            "description": "Active ingredient pesticide soil leaching potential"
-          },
-          {
-            "name": "ai_parp",
-            "value": "",
-            "description": "Active ingredient pesticide adsorbed runoff potential"
-          },
-          {
-            "name": "op_app_area",
-            "value": "Broadcast",
-            "description": "Pesticide application operation area"
-          },
-          {
-            "name": "op_app_method",
-            "value": "Surface Applied",
-            "description": "Pesticide application operation method"
-          }
-        ],
-        "description": "Pest"
-      }
-    ]
   }]
 }
\ No newline at end of file

test/service_tests/m/wqm/scpestslp/V1_0/service.properties

@@ -1,7 +1,7 @@
 #ignore=true
 
 # service endpoint, required
-url=http://localhost:8080/csip-wqm/m/pesticide_slp/1.0
+url=http://localhost:8081/csip-wqm/m/pesticide_slp/1.0
 
 # number of concurrent tests, optional, defaults to 1
 concurrency=1

web/META-INF/csip-conf.json

@@ -1,5 +1,5 @@
-
-  "csip.archive.enabled"  : false,
-  "csip.logging.enabled"  : true,
-  "csip.hazelcast.server" : true
-}
+
+  "csip.archive.enabled"  : false,
+  "csip.logging.enabled"  : false,
+  "wqm.version" : "$version: ${out} $"
+}