From e3fb23776e7dc68208efc857ff9932d4d6eefdb7 Mon Sep 17 00:00:00 2001
From: Patient NTUMBA <pntumba@inria.fr>
Date: Thu, 14 Dec 2017 17:46:59 +0100
Subject: [PATCH] Remove System println
---
.../chorevolution/vsb/artifact/generators/WarGenerator.java | 2 +-
.../java/eu/chorevolution/vsb/gmdl/utils/BcConfiguration.java | 4 +---
.../java/eu/chorevolution/vsb/gmdl/utils/PathResolver.java | 2 +-
.../chorevolution/vsb/gm/protocols/soap/BcSoapGenerator.java | 2 ++
.../src/main/java/eu/chorevolution/vsb/logger/GLog.java | 2 --
.../java/eu/chorevolution/vsb/manager/api/VsbManager.java | 3 ---
vsb-manager-api/src/main/resources/pom-of-war.xml | 2 +-
vsb-manager-api/src/test/resources/gidl/gidl.gidl | 4 +++-
8 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/bc-generators/artifact-generators/src/main/java/eu/chorevolution/vsb/artifact/generators/WarGenerator.java b/bc-generators/artifact-generators/src/main/java/eu/chorevolution/vsb/artifact/generators/WarGenerator.java
index 579a4aec..eb668b19 100644
--- a/bc-generators/artifact-generators/src/main/java/eu/chorevolution/vsb/artifact/generators/WarGenerator.java
+++ b/bc-generators/artifact-generators/src/main/java/eu/chorevolution/vsb/artifact/generators/WarGenerator.java
@@ -58,7 +58,6 @@ public class WarGenerator {
}
PathResolver.deleteTempDir(new File(builtProject.getTargetDirectory().getAbsolutePath()));
-
}
public VsbOutput generate(boolean isBusProtocolSoap) {
@@ -109,6 +108,7 @@ public class WarGenerator {
archive.addAsWebResource(f, "assets" + "/" + "js" + "/" + f.getName());
}
+
ByteArrayOutputStream bos = new ByteArrayOutputStream();
new ZipExporterImpl(archive).exportTo(bos);
diff --git a/gmdl-utils/src/main/java/eu/chorevolution/vsb/gmdl/utils/BcConfiguration.java b/gmdl-utils/src/main/java/eu/chorevolution/vsb/gmdl/utils/BcConfiguration.java
index c5de3e07..63d15d58 100644
--- a/gmdl-utils/src/main/java/eu/chorevolution/vsb/gmdl/utils/BcConfiguration.java
+++ b/gmdl-utils/src/main/java/eu/chorevolution/vsb/gmdl/utils/BcConfiguration.java
@@ -104,7 +104,6 @@ public class BcConfiguration {
} catch (Exception _x) {
}
- System.out.println(jsonObject.toString());
if(jsonObject.get("target_namespace") != null)
setTargetNamespace((String) jsonObject.get("target_namespace"));
@@ -126,8 +125,7 @@ public class BcConfiguration {
setSubcomponentPort(subcomponentPortInt);
-
- System.out.println("Done parsing config file");
+
}
}
\ No newline at end of file
diff --git a/gmdl-utils/src/main/java/eu/chorevolution/vsb/gmdl/utils/PathResolver.java b/gmdl-utils/src/main/java/eu/chorevolution/vsb/gmdl/utils/PathResolver.java
index 2736d7a2..2d80dbf4 100644
--- a/gmdl-utils/src/main/java/eu/chorevolution/vsb/gmdl/utils/PathResolver.java
+++ b/gmdl-utils/src/main/java/eu/chorevolution/vsb/gmdl/utils/PathResolver.java
@@ -286,7 +286,7 @@ public class PathResolver {
if (entry.isDirectory()) {
// if its a directory, create it
final boolean bMade = f.mkdir();
- System.out.println((bMade ? " creating " : " unable to create ") + name);
+// System.out.println((bMade ? " creating " : " unable to create ") + name);
} else {
final InputStream is = jar.getInputStream(entry);
diff --git a/protocol-pool/gm-soap/src/main/java/eu/chorevolution/vsb/gm/protocols/soap/BcSoapGenerator.java b/protocol-pool/gm-soap/src/main/java/eu/chorevolution/vsb/gm/protocols/soap/BcSoapGenerator.java
index dd794b7d..9fcec62c 100644
--- a/protocol-pool/gm-soap/src/main/java/eu/chorevolution/vsb/gm/protocols/soap/BcSoapGenerator.java
+++ b/protocol-pool/gm-soap/src/main/java/eu/chorevolution/vsb/gm/protocols/soap/BcSoapGenerator.java
@@ -198,7 +198,9 @@ public class BcSoapGenerator extends BcSubcomponentGenerator {
}
try {
+
codeModel.build(new File(this.bcConfiguration.getGeneratedCodePath()));
+
} catch (IOException e) {
e.printStackTrace();
}
diff --git a/tools/logger/src/main/java/eu/chorevolution/vsb/logger/GLog.java b/tools/logger/src/main/java/eu/chorevolution/vsb/logger/GLog.java
index aa7c39b6..f67700e3 100644
--- a/tools/logger/src/main/java/eu/chorevolution/vsb/logger/GLog.java
+++ b/tools/logger/src/main/java/eu/chorevolution/vsb/logger/GLog.java
@@ -10,8 +10,6 @@ public class GLog {
public static Logger initLogger() {
if (log == null) {
String space = "%-10s %-30s %-50s\n";
- System.out.printf(space, "Type", "Tag", "Message");
- System.out.printf(space, "--------", "--------", "--------");
log = new JavaLogger();
log.setLogLevel(5);
}
diff --git a/vsb-manager-api/src/main/java/eu/chorevolution/vsb/manager/api/VsbManager.java b/vsb-manager-api/src/main/java/eu/chorevolution/vsb/manager/api/VsbManager.java
index afe7e630..9cb77fa3 100644
--- a/vsb-manager-api/src/main/java/eu/chorevolution/vsb/manager/api/VsbManager.java
+++ b/vsb-manager-api/src/main/java/eu/chorevolution/vsb/manager/api/VsbManager.java
@@ -8,10 +8,8 @@ import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException;
import java.io.PrintWriter;
-import java.lang.reflect.Array;
import java.net.URL;
import java.util.EmptyStackException;
-import java.util.HashMap;
import java.util.Random;
import java.util.Scanner;
import org.json.simple.JSONObject;
@@ -311,7 +309,6 @@ public class VsbManager {
bcConfiguration).setDebug(false);
soapGenerator.generatePOJOAndEndpoint();
-
soapGenerator.generateWSDL();
}
diff --git a/vsb-manager-api/src/main/resources/pom-of-war.xml b/vsb-manager-api/src/main/resources/pom-of-war.xml
index 4ecf2e91..07f76c1f 100644
--- a/vsb-manager-api/src/main/resources/pom-of-war.xml
+++ b/vsb-manager-api/src/main/resources/pom-of-war.xml
@@ -48,7 +48,7 @@
<enabled>false</enabled>
</releases>
<snapshots>
- <enabled>true</enabled>
+ <enabled>false</enabled>
</snapshots>
</repository>
</repositories>
diff --git a/vsb-manager-api/src/test/resources/gidl/gidl.gidl b/vsb-manager-api/src/test/resources/gidl/gidl.gidl
index 6da948dd..e8376575 100644
--- a/vsb-manager-api/src/test/resources/gidl/gidl.gidl
+++ b/vsb-manager-api/src/test/resources/gidl/gidl.gidl
@@ -4,11 +4,13 @@
<hasOperations name="publicTransportation" type="two_way_sync" qos="reliable">
<hasScope name="publicTransportation" verb="GET" uri="services/Rest/newsService.svc/latest"/>
<inputData name="request" context="query" media="json">
+ <hasDataType xsi:type="gidl:ComplexType" name="inputDataType" minOccurs="one" maxOccurs="one">
<hasDataType xsi:type="gidl:SimpleType" name="lat" minOccurs="one" maxOccurs="one" type="double"/>
<hasDataType xsi:type="gidl:SimpleType" name="lon" minOccurs="one" maxOccurs="one" type="double"/>
+ </hasDataType>
</inputData>
<outputData name="response" context="body" media="json">
- <hasDataType xsi:type="gidl:ComplexType" name="root" minOccurs="one" maxOccurs="unbounded">
+ <hasDataType xsi:type="gidl:ComplexType" name="OutputDataType" minOccurs="one" maxOccurs="unbounded">
<hasDataType xsi:type="gidl:SimpleType" name="c" minOccurs="one" maxOccurs="one" type="string"/>
<hasDataType xsi:type="gidl:SimpleType" name="did" minOccurs="one" maxOccurs="one" type="integer"/>
<hasDataType xsi:type="gidl:SimpleType" name="id" minOccurs="one" maxOccurs="one" type="integer"/>
--
GitLab