nbproject/private/private.xml
| @@ -35,9 +35,10 @@ |
| <file>file:/od/projects/csip-all/csip-example/test/service_tests/externalexe/simple-res.json</file> |
| </group> |
| <group name="csip-core"> |
| - <file>file:/od/projects/csip-all/csip-example/nbproject/project.properties</file> |
| - <file>file:/od/projects/csip-all/csip-example/nbproject/build-impl.xml</file> |
| <file>file:/od/projects/csip-all/csip-example/src/java/m/example/simpleservice/V2_0.json</file> |
| + <file>file:/od/projects/csip-all/csip-example/src/java/m/example/jdbc/V1_0.java</file> |
| + <file>file:/od/projects/csip-all/csip-example/src/java/m/example/jdbc/PoolClass.java</file> |
| + <file>file:/od/projects/csip-all/csip-example/src/java/m/example/externalexe/V1_0.java</file> |
| </group> |
| <group name="csip-nrcs"/> |
| </open-files> |
src/java/m/example/jdbc/V1_0.java
| @@ -35,7 +35,7 @@ |
| public class V1_0 extends ModelDataService { |
| |
| @Override |
| - protected String process() throws Exception { |
| + protected void doProcess() throws Exception { |
| try (Connection c = getResourceJDBC("db"); Statement st = c.createStatement()) { |
| try (ResultSet rs = st.executeQuery("select * from patches;")) { |
| while (rs.next()) { |
| @@ -44,9 +44,7 @@ |
| } |
| } catch (SQLException | ServiceException ex) { |
| LOG.log(Level.SEVERE, null, ex); |
| - return EXEC_FAILED; |
| } |
| - return EXEC_OK; |
| } |
| |
| |
src/java/m/example/simpleservice/V3.java
| @@ -5,7 +5,6 @@ |
| */ |
| package m.example.simpleservice; |
| |
| -import csip.ServiceException; |
| import csip.annotations.*; |
| import oms3.annotations.*; |
| import javax.ws.rs.Path; |
| @@ -23,9 +22,9 @@ |
| @Unit("F") |
| @Out public double temp_f; |
| |
| + |
| @Execute |
| public void exec() throws Exception { |
| temp_f = temp_c * 9 / 5 + 32; |
| -// throw new ServiceException("app problem."); |
| } |
| } |
test/service_tests/STest.java
| @@ -20,12 +20,12 @@ |
| |
| |
| private void run() throws Exception { |
| - for (int i = 0; i < 5000; i++) { |
| + for (int i = 0; i < 50; i++) { |
| String testFolder = new File(getClass().getCanonicalName().replace('.', '/')).getParent(); |
| JSONArray r = ServiceTest2.run(new Properties(), "test/" + testFolder + "/" + name.getMethodName() + ".json"); |
| Assert.assertTrue(r.getJSONObject(0).getInt("successful") == 1); |
| System.out.println(i); |
| - Thread.sleep(1000); |
| + Thread.sleep(2000); |
| System.out.flush(); |
| } |
| } |
web/META-INF/csip-conf.json
| @@ -1,6 +1,9 @@ |
| { |
| - "csip.session.backend": "mongodb", |
| - "csip.session.ttl": "PT0S", |
| + "csip.session.backend": "sql", |
| + "csip111.session.sql.uri": "jdbc:postgresql://localhost:5432/od?user=od&password=od", |
| + "csip.session.sql.uri": "jdbc:sqlserver://129.82.20.241:1433;databaseName=csip_logging;user=sa;password=csurams#1", |
| + |
| + "csip.session.ttl": "PT40S", |
| "csip.archive.backend": "none", |
| "csip.archive.ttl": "PT20S", |
| "csip.logging.backend": "none", |