Update new-gm-api

bc-generators/artifact-generators/src/main/java/eu/chorevolution/vsb/artifact/generators/WarGenerator.java

@@ -7,26 +7,19 @@ package eu.chorevolution.vsb.artifact.generators;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
-import java.io.FileReader;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
 import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.asset.EmptyAsset;
 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.json.simple.JSONObject;
-import org.json.simple.parser.JSONParser;
-import org.json.simple.parser.ParseException;
 
-import eu.chorevolution.vsb.bc.manager.BcManagerRestService;
 import eu.chorevolution.vsb.bc.manager.VsbOutput;
 import eu.chorevolution.vsb.gmdl.utils.Constants;
-import eu.chorevolution.vsb.gmdl.utils.PathResolver;
-
 public class WarGenerator {
 
 	private WebArchive archive = null;

vsb-manager/src/main/java/eu/chorevolution/vsb/manager/VsbManager.java

@@ -323,7 +323,6 @@ public class VsbManager {
 			};
 			
 			
-			
 			String[] compileOptions = new String[]{"-d", classDir.getAbsolutePath(),"-cp", PathResolver.myClassPath(classes)} ;
 			Iterable<String> compilationOptions = Arrays.asList(compileOptions);
 			CompilationTask compilerTask = compiler.getTask(null, fileManager, null, compilationOptions, null, javaObjects) ;
@@ -503,7 +502,7 @@ public class VsbManager {
 		JClass BcRestSubcomponentClass = jCodeModel.ref(eu.chorevolution.vsb.gm.protocols.rest.BcRestSubcomponent.class);
 		JClass BcSoapSubcomponentClass = jCodeModel.ref(eu.chorevolution.vsb.gm.protocols.soap.BcSoapSubcomponent.class);
 		JClass BcMQTTSubcomponentClass = jCodeModel.ref(eu.chorevolution.vsb.gm.protocols.mqtt.BcMQTTSubcomponent.class);
-		JClass BcCoapSubcomponentClass = jCodeModel.ref(eu.chorevolution.vsb.gm.protocols.coap.BcCoapSubcomponentPushbased.class);
+		JClass BcCoapSubcomponentClass = jCodeModel.ref(eu.chorevolution.vsb.gm.protocols.coap.BcCoapSubcomponent.class);
 		JClass BcDpwsSubcomponentClass = jCodeModel.ref(eu.chorevolution.vsb.gm.protocols.dpws.BcDPWSSubcomponent.class);
 		
 		JClass BcConfigurationClass = jCodeModel.ref(eu.chorevolution.vsb.gmdl.utils.BcConfiguration.class);
@@ -712,7 +711,7 @@ public class VsbManager {
 			e.printStackTrace();
 		}
 
-		if(protocol==ProtocolType.SOAP) {
+		if(protocol==ProtocolType.SOAP){
 			
 			jsonObject.put("target_namespace", Constants.target_namespace);
 			jsonObject.put("service_name", Constants.soap_service_name);

vsb-manager/src/test/java/eu/chorevolution/vsb/manager/VsbManagerTest.java

@@ -36,8 +36,8 @@ public class VsbManagerTest{
 		try {
 			
 			VsbManager vsbm = new VsbManager();
-			vsbm.generateWar(interfaceDescriptionPath, ProtocolType.REST);
-			//vsbm.deleteGeneratedFiles();
+			vsbm.generateWar(interfaceDescriptionPath, ProtocolType.COAP);
+//			vsbm.deleteGeneratedFiles();
 			
 		} catch (Exception e){