diff --git a/bc-generators/artifact-generators/src/main/java/eu/chorevolution/vsb/artifact/generators/Generator.java b/bc-generators/artifact-generators/src/main/java/eu/chorevolution/vsb/artifact/generators/Generator.java
index c953aac6140a12e64c0f553f1557818b3691aed8..a7355fe9833af583f311d4be5ba202c8fa58170c 100644
--- a/bc-generators/artifact-generators/src/main/java/eu/chorevolution/vsb/artifact/generators/Generator.java
+++ b/bc-generators/artifact-generators/src/main/java/eu/chorevolution/vsb/artifact/generators/Generator.java
@@ -18,14 +18,14 @@ public class Generator {
RunTimeCompiler compiler = new RunTimeCompiler(sourceFilesPath,Constants.generatedCodePath,classesOptions);
compiler.compile();
File sourceDir = new File(sourceFilesPath);
- /*for(File f: sourceDir.listFiles()){
+ for(File f: sourceDir.listFiles()){
if(f.getName().endsWith("java")){
f.delete();
}
- }*/
+ }
PathResolver.setClassPath(Constants.generatedCodePath);
}
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 77c23ff7436fd1f6d418c3a10ccb7875483f9518..579a4aec0f9d881c655591fb4aad6d564f1cc57a 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
@@ -18,7 +18,6 @@ import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.jboss.shrinkwrap.impl.base.exporter.zip.ZipExporterImpl;
-import org.jboss.shrinkwrap.resolver.api.maven.Maven;
import org.jboss.shrinkwrap.resolver.api.maven.embedded.BuiltProject;
import org.jboss.shrinkwrap.resolver.api.maven.embedded.EmbeddedMaven;
diff --git a/protocol-pool/gm-soap/src/main/java/eu/chorevolution/vsb/gidl2wsdl/GidlToWSDL.java b/protocol-pool/gm-soap/src/main/java/eu/chorevolution/vsb/gidl2wsdl/GidlToWSDL.java
index f9a4e6fc871c86d6d804cdf3099575c3209d9265..3cd834880c96c0ebe706ddd8f484dab7b6085a58 100644
--- a/protocol-pool/gm-soap/src/main/java/eu/chorevolution/vsb/gidl2wsdl/GidlToWSDL.java
+++ b/protocol-pool/gm-soap/src/main/java/eu/chorevolution/vsb/gidl2wsdl/GidlToWSDL.java
@@ -129,9 +129,7 @@ public class GidlToWSDL {
DOMSource source = new DOMSource(wsdlDocument);
StreamResult result = new StreamResult(new File(Constants.wsdlDestination + File.separator + Constants.wsdlName+".wsdl"));
transformer.transform(source, result);
- // Output to console for testing
- StreamResult consoleResult = new StreamResult(System.out);
- transformer.transform(source, consoleResult);
+
} catch (TransformerException e) {
// TODO Auto-generated catch block
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 97327306df8ee511cda93c73423b6c75199ac7c9..9158a49cf870a65ea355b91d9aa36e2eccb3a7ed 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
@@ -220,7 +220,6 @@ public class BcSoapGenerator extends BcSubcomponentGenerator {
String directClassTmp = codeModel_directClass;
codeModel_directClass = operation.getPostDatas().get(postDataSize-1).getClassName();
- System.out.println(" codeModel_directClass "+codeModel_directClass);
if(codeModel_directClass.equals("List<"+directClassTmp+">")){
JClass importedClass= codeModel.ref(java.util.List.class)
diff --git a/tools/compiler/pom.xml b/tools/compiler/pom.xml
index 8805f059b7f63760a44e9d759e30ca0b94d28c2a..a365c6613f6960a54c00ca64b6573384cc6b156b 100644
--- a/tools/compiler/pom.xml
+++ b/tools/compiler/pom.xml
@@ -27,5 +27,10 @@
<artifactId>gmdl-utils</artifactId>
<version>2.1.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>eu.chorevolution.vsb</groupId>
+ <artifactId>logger</artifactId>
+ <version>2.1.0-SNAPSHOT</version>
+ </dependency>
</dependencies>
</project>
diff --git a/tools/compiler/src/main/java/eu/chorevolution/vsb/compiler/RunTimeCompiler.java b/tools/compiler/src/main/java/eu/chorevolution/vsb/compiler/RunTimeCompiler.java
index a8692e08723e5ae709a270adf22d65d00bd3713c..c85706f52f54b634951c95d823ba8ddee2487427 100644
--- a/tools/compiler/src/main/java/eu/chorevolution/vsb/compiler/RunTimeCompiler.java
+++ b/tools/compiler/src/main/java/eu/chorevolution/vsb/compiler/RunTimeCompiler.java
@@ -16,6 +16,8 @@ import javax.tools.StandardLocation;
import javax.tools.ToolProvider;
import eu.chorevolution.vsb.gmdl.utils.PathResolver;
+import eu.chorevolution.vsb.logger.GLog;
+import eu.chorevolution.vsb.logger.Logger;
import javax.tools.JavaCompiler.CompilationTask;
@@ -24,6 +26,7 @@ public class RunTimeCompiler{
private String sourceFilesPath = null;
private String outputPath = null;
private Class[] classesOptions = null;
+ private Logger logger = GLog.initLogger();
public RunTimeCompiler(String sourceFilesPath , String outputPath, Class[] classesOptions){
@@ -57,15 +60,14 @@ public class RunTimeCompiler{
StandardJavaFileManager fileManager = compiler.getStandardFileManager(null, Locale.getDefault(), null);
-// String strSourceDir = Constants.generatedCodePath + File.separator+ Constants.target_namespace_path;
-
File sourceDir = new File(sourceFilesPath);
List<JavaFileObject> javaObjects = scanRecursivelyForJavaFiles(sourceDir, fileManager);
if (javaObjects.size() == 0) {
-
- System.out.println("There are no source files to compile in " + sourceDir.getAbsolutePath());
+
+ logger.e(this.getClass().getName(), "There are no source files to compile in " + sourceDir.getAbsolutePath());
+
}
@@ -74,21 +76,11 @@ public class RunTimeCompiler{
javaObjects);
if (!compilerTask.call()){
-
- System.out.println("Could not compile project");
- }
-
- try {
- for (JavaFileObject jfo : fileManager.list(StandardLocation.CLASS_OUTPUT, "",
- Collections.singleton(JavaFileObject.Kind.CLASS), true)) {
-
- System.out.println(jfo.getName());
- }
- } catch (IOException e){
- // TODO Auto-generated catch block
- e.printStackTrace();
+ logger.e(this.getClass().getName(), "Could not compile project");
}
+
+
}
private static List<JavaFileObject> scanRecursivelyForJavaFiles(File dir, StandardJavaFileManager fileManager) {
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 00698ee5953bcdc73377ce4f96cdb083b9e70f14..d996038a0490fea56c22a4735f4d57e63cccf62d 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
@@ -255,7 +255,6 @@ public class VsbManager {
war_pomxl = new File(".").getAbsolutePath() + File.separator + "src"+File.separator+"main"+File.separator+"resources"+File.separator+"pom-of-war.xml";
}
- System.out.println(" war_pomxl "+war_pomxl);
warGenerator.addDependencyFiles(war_pomxl);
@@ -538,7 +537,6 @@ public class VsbManager {
break;
}
- System.out.println(" gmServiceRepresentation.getProtocol() "+gmServiceRepresentation.getProtocol());
switch(gmServiceRepresentation.getProtocol()){
case REST:
for(int i=1; i<=gmServiceRepresentation.getInterfaces().size(); i++)