diff options
Diffstat (limited to 'bpmn')
4 files changed, 16 insertions, 10 deletions
diff --git a/bpmn/MSOCockpit/pom.xml b/bpmn/MSOCockpit/pom.xml index ed9d08d060..be3f9dafb5 100644 --- a/bpmn/MSOCockpit/pom.xml +++ b/bpmn/MSOCockpit/pom.xml @@ -41,7 +41,7 @@ <dependency>
<groupId>org.camunda.bpm.webapp</groupId>
- <artifactId>camunda-webapp-jboss-standalone</artifactId>
+ <artifactId>${camunda.bpm.webapp.artifact}</artifactId>
<version>${camunda.version}</version>
<type>war</type>
</dependency>
diff --git a/bpmn/MSOCockpit/src/main/assembly/cockpit-build.xml b/bpmn/MSOCockpit/src/main/assembly/cockpit-build.xml index b84a84df8a..3bc0ace298 100644 --- a/bpmn/MSOCockpit/src/main/assembly/cockpit-build.xml +++ b/bpmn/MSOCockpit/src/main/assembly/cockpit-build.xml @@ -34,7 +34,7 @@ <dependencySet>
<outputDirectory>/</outputDirectory>
<includes>
- <include>org.camunda.bpm.webapp:camunda-webapp-jboss-standalone</include>
+ <include>org.camunda.bpm.webapp:${camunda.bpm.webapp.artifact}</include>
</includes>
<unpack>true</unpack>
<unpackOptions>
diff --git a/bpmn/MSOURN-plugin/src/main/java/org/openecomp/camunda/bpmn/plugin/urnmap/resources/ProcessInstanceResource.java b/bpmn/MSOURN-plugin/src/main/java/org/openecomp/camunda/bpmn/plugin/urnmap/resources/ProcessInstanceResource.java index 7d432067ba..5cf6f6ca05 100644 --- a/bpmn/MSOURN-plugin/src/main/java/org/openecomp/camunda/bpmn/plugin/urnmap/resources/ProcessInstanceResource.java +++ b/bpmn/MSOURN-plugin/src/main/java/org/openecomp/camunda/bpmn/plugin/urnmap/resources/ProcessInstanceResource.java @@ -27,6 +27,9 @@ import javax.ws.rs.GET; import javax.ws.rs.POST;
import javax.ws.rs.PUT;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.camunda.bpm.cockpit.db.QueryParameters;
import org.camunda.bpm.cockpit.plugin.resource.AbstractPluginResource;
import org.camunda.bpm.cockpit.db.CommandExecutor;
@@ -34,6 +37,8 @@ import org.openecomp.camunda.bpmn.plugin.urnmap.db.*; public class ProcessInstanceResource extends AbstractPluginResource {
+ private static final Logger log = LoggerFactory.getLogger(ProcessInstanceResource.class);
+
public ProcessInstanceResource(String engineName) {
super(engineName);
}
@@ -45,11 +50,11 @@ public class ProcessInstanceResource extends AbstractPluginResource { "cockpit.urnMap.retrieveUrnKeyValuePair",
new QueryParameters<URNData>());
- System.out.println("urnmap-plugin project - Results Retrieved: ");
- System.out.println("URNName: " + " " + "URNValue: " );
+ log.info("urnmap-plugin project - Results Retrieved: ");
+ log.info("URNName: " + " " + "URNValue: " );
for(URNData d: list)
{
- System.out.println( d.getURNName() + " " + d.getURNValue());
+ log.info( d.getURNName() + " " + d.getURNValue());
}
return list;
@@ -59,7 +64,7 @@ public class ProcessInstanceResource extends AbstractPluginResource { //public void insertNewRow(String key_, String value_)
public void insertNewRow(String temp)
{
- System.out.println("AddNewRow: XXXXXXXXXXXXXXXXX ---> " + temp);
+ log.info("AddNewRow: XXXXXXXXXXXXXXXXX ---> " + temp);
StringTokenizer st = new StringTokenizer(temp, "|");
String key_ = "";
String value_ = "";
@@ -70,7 +75,7 @@ public class ProcessInstanceResource extends AbstractPluginResource { System.out.println(key_ + "\t" + value_);
}
- System.out.println("AddNewRow: XXXXXXXXXXXXXXXXX ---> key: " + key_ + " , Value: " + value_);
+ log.info("AddNewRow: XXXXXXXXXXXXXXXXX ---> key: " + key_ + " , Value: " + value_);
URNData nRow = new URNData();
nRow.setVer_("1");
nRow.setURNName(key_);
@@ -78,19 +83,19 @@ public class ProcessInstanceResource extends AbstractPluginResource { getQueryService().executeQuery("cockpit.urnMap.insertNewRow", nRow, URNData.class);
- System.out.println("AddNewRow: XXXXXX END XXXXXXXXXXX");
+ log.info("AddNewRow: XXXXXX END XXXXXXXXXXX");
}
@POST
// public void getPersistData(List<URNData > myList) {
public void getPersistData(URNData d) {
- System.out.println("getPersistData: UrnName: " + d.getURNName() + " , URNValue: " + d.getURNValue() );
+ log.info("getPersistData: UrnName: " + d.getURNName() + " , URNValue: " + d.getURNValue() );
getQueryService().executeQuery("cockpit.urnMap.persistURNData", d, URNData.class);
//getQueryService().executeQuery("cockpit.sample.persistURNData", d, ProcessInstanceCountDto.class);
- System.out.println("XXXXXXXXXX - END - XXXXXXXXXXXXXXX");
+ log.info("XXXXXXXXXX - END - XXXXXXXXXXXXXXX");
}
}
diff --git a/bpmn/pom.xml b/bpmn/pom.xml index 9c9e6e01ef..b878467e72 100644 --- a/bpmn/pom.xml +++ b/bpmn/pom.xml @@ -18,6 +18,7 @@ <properties> <camunda.version>7.7.0</camunda.version> <camunda.bpm.assert.version>1.2</camunda.bpm.assert.version> + <camunda.bpm.webapp.artifact>camunda-webapp-jboss-standalone</camunda.bpm.webapp.artifact> <h2.version>1.3.173</h2.version> <groovy.version>2.4.7</groovy.version> <saxon.version>9.5.1-8</saxon.version> |