Cleaning code and enable multi-bc in tomcat

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

@@ -111,17 +111,7 @@ public class WarGenerator {
 		vsbOutput.war = bos.toByteArray();
 		if(isBusProtocolSoap){
 			
-			//String path1 = new File(BcManagerRestService.class.getClassLoader().getResource("example.json").toExternalForm()).getParentFile().getParentFile().getParentFile().getParentFile().toString().substring(5);
-			
-			/* Class[] classe = {BcManagerRestService.class};
-			String path1 = new File(PathResolver.myClassPath(classe)).getParentFile().getParentFile().getParentFile().getAbsoluteFile().toString();
-			path1 += (File.separator + "bc-generators" + File.separator + "webapp-bc-generator" 
-					+ File.separator + "src" + File.separator + "main" + File.separator + "webapp" + File.separator + "service.wsdl");
-			*/
-			
 			String path1  = Constants.wsdlDestination +File.separator+Constants.wsdlName+".wsdl";
-			//String osAppropriatePath = System.getProperty( "os.name" ).contains( "indow" ) ? path_new.substring(1) : path_new;
-			
 			Path path = Paths.get(path1);
 			
 			System.out.println(path.toAbsolutePath());

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

@@ -2,6 +2,8 @@ package eu.chorevolution.vsb.artifact.war;
 
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.util.Random;
+
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
@@ -15,6 +17,8 @@ import org.restlet.data.Method;
 import org.restlet.data.Protocol;
 import org.restlet.representation.Representation;
 
+import eu.chorevolution.vsb.gmdl.utils.Constants;
+
 /**
  * @author Georgios Bouloukakis (boulouk@gmail.com)
  * 

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

@@ -3,6 +3,7 @@ package eu.chorevolution.vsb.artifact.war;
 
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.util.Random;
 
 import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
@@ -11,9 +12,12 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import eu.chorevolution.vsb.bc.manager.BcManagerRestService;
+import eu.chorevolution.vsb.gmdl.utils.Constants;
 
 public class StartBcManagerServlet extends HttpServlet {
-
+    
+	Random rand = new Random();
+	final int  portBcManagerServlet = (rand.nextInt(2299 - 2200 + 1)+ 2200);
 	BcManagerRestService server = null;
 	
 	/**
@@ -51,7 +55,7 @@ public class StartBcManagerServlet extends HttpServlet {
 			response.getWriter().println("BC stopped!");
 		} 
 		else if(op.equals("startbcm")) {
-			server = new BcManagerRestService(2235);
+			server = new BcManagerRestService(portBcManagerServlet);
 			response.getWriter().println("-> BC Manager started!");
 		}
 		else if(op.equals("stopbcm")) {

bc-generators/webapp-bc-generator/src/main/webapp/WEB-INF/setinvaddr-context.xml

@@ -10,9 +10,8 @@
 			http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
 
 	<jaxws:endpoint name="BaseService"
-		implementor="eu.chorevolution.vsb.artifact.setinvaddrservice.Base"
-		address="http://localhost:8891/BaseService/setinvaddr">
-
+		implementor="eu.chorevolution.vsb.bc.setinvaddrservice.Base"
+		address="http://localhost:8892/BaseService/setinvaddr">
 	</jaxws:endpoint>
 
 

bc-manager/pom.xml

@@ -47,11 +47,6 @@
 			<artifactId>gm-coap</artifactId>
 			<version>0.0.1-SNAPSHOT</version>
 		</dependency>
-		<!-- <dependency>
-      <groupId>eu.chorevolution.vsb</groupId>
-      <artifactId>gm-dpws</artifactId>
-      <version>0.0.1-SNAPSHOT</version>
-    </dependency> -->
 		<dependency>
 			<groupId>org.json</groupId>
 			<artifactId>json</artifactId>

bc-generators/artifact-generators/src/main/java/eu/chorevolution/vsb/artifact/setinvaddrservice/Base.java → bc-manager/src/main/java/eu/chorevolution/vsb/bc/setinvaddrservice/Base.java

@@ -14,7 +14,7 @@
  *   You should have received a copy of the GNU General Public License
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package eu.chorevolution.vsb.artifact.setinvaddrservice;
+package eu.chorevolution.vsb.bc.setinvaddrservice;
 
 
 import java.io.File;
@@ -38,8 +38,8 @@ import org.json.simple.JSONObject;
 import org.json.simple.parser.JSONParser;
 import org.json.simple.parser.ParseException;
 
-import eu.chorevolution.vsb.artifact.setinvaddrservice.BaseService;
 import eu.chorevolution.vsb.bc.manager.BcManagerRestService;
+import eu.chorevolution.vsb.bc.setinvaddrservice.BaseService;
 import eu.chorevolution.vsb.gmdl.utils.BcConfiguration;
 import eu.chorevolution.vsb.gmdl.utils.Constants;
 import eu.chorevolution.vsb.gmdl.utils.PathResolver;
@@ -82,11 +82,6 @@ public class Base implements BaseService {
 		
 		ServletContext servletContext = (ServletContext) context.getMessageContext().get(javax.xml.ws.handler.MessageContext.SERVLET_CONTEXT);    
 
-		System.out.println(servletContext.getAttribute("role"));
-		System.out.println(servletContext.getAttribute("name"));
-		System.out.println(servletContext.getAttribute("endpoints"));
-		
-		
 		
 		//System.out.println("setting inv. addrr to "+ endpoints); 
 		System.out.println("role "+ role); 
@@ -122,9 +117,6 @@ public class Base implements BaseService {
 			
 		}
 		
-		
-		
-
 	}
 
 	/**

bc-generators/artifact-generators/src/main/java/eu/chorevolution/vsb/artifact/setinvaddrservice/BaseService.java → bc-manager/src/main/java/eu/chorevolution/vsb/bc/setinvaddrservice/BaseService.java

@@ -14,7 +14,7 @@
  *   You should have received a copy of the GNU General Public License
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package eu.chorevolution.vsb.artifact.setinvaddrservice;
+package eu.chorevolution.vsb.bc.setinvaddrservice;
 
 import java.util.List;
 

examples-for-test/set-inv-addr-client/src/main/java/eu/chorevolution/vsb/examplesfortest/setinvaddrclient/BaseServiceClient.java

@@ -11,14 +11,14 @@ public class BaseServiceClient {
 
 	public static void main(String[] args) {
 
-		String bd_wsdl = "http://localhost:8891/BaseService/setinvaddr?wsdl";
-		String bc = "http://localhost:8891/BaseService/setinvaddr";
+		String bd_wsdl = "http://localhost:8873/BaseService/setinvaddr?wsdl";
+		String bc = "http://localhost:8873/BaseService/setinvaddr";
 		List<String> urls = new ArrayList<String>();
 		BaseService service;
 		try{
 			
 			service = (BaseService) (Base.getPort("BaseService", bd_wsdl, bc, BaseService.class));
-			urls.add("http://jinx.viktoria.chalmers.se:3004/");
+			urls.add("http://jinx.viktoria.chalmers.se:3003/");
 			service.setInvocationAddress("dest_role_test", "dest_name_test", urls);
 			
 		}catch (IOException e){

gmdl-utils/pom.xml

@@ -14,10 +14,5 @@
     <artifactId>json-simple</artifactId>
     <version>1.1.1</version>
   </dependency>
- <!--   <dependency>
-  <groupId>eu.chorevolution.vsb</groupId>
-  <artifactId>gmdl-parser</artifactId>
-  <version>0.0.1-SNAPSHOT</version>
-  </dependency> -->
   </dependencies>
 </project>
\ No newline at end of file

gmdl-utils/src/main/java/eu/chorevolution/vsb/gmdl/utils/Constants.java

@@ -11,6 +11,8 @@ public class Constants {
 	public static String wsdlName;
 	public static String service_name;
 	public static String service_port;
+	public static String setinvaddr_service_port;
+	public static String service_getmessage_port;
 	public static String soap_service_name;
 	public static String dpws_service_name;
 	public static String webapp_src_bc;

gmdl-utils/src/main/java/eu/chorevolution/vsb/gmdl/utils/PathResolver.java

@@ -8,20 +8,31 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.JarURLConnection;
 import java.net.MalformedURLException;
-import java.net.URISyntaxException;
 import java.net.URL;
 import java.net.URLClassLoader;
-import java.nio.file.FileSystem;
 import java.nio.file.FileSystems;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
-import java.util.Collections;
 import java.util.Enumeration;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
-import com.sun.org.apache.xerces.internal.util.URI;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.SAXException;
 
 public class PathResolver {
 
@@ -353,4 +364,72 @@ public class PathResolver {
 		  
 	  }
 	  
+	  public static void updatePortServiceSetInvAddr(String port){
+		  
+		 String contextFilePath =  Constants.generatedCodePath+File.separator+"bc-generators"+File.separator+"webapp-bc-generator"+File.separator+"src"+
+		                             File.separator+"main"+File.separator+"webapp"+File.separator+"WEB-INF"+File.separator+"setinvaddr-context.xml";
+		 
+		DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();
+		DocumentBuilder docBuilder = null;
+		Document doc = null;
+		
+		try {
+			
+			docBuilder = docFactory.newDocumentBuilder();
+			
+		} catch (ParserConfigurationException e) {e.printStackTrace();}
+		
+		
+		try {
+			
+			doc = docBuilder.parse(contextFilePath);
+			
+		} catch (SAXException | IOException e){e.printStackTrace();}
+		
+		
+		Node beansNode = doc.getFirstChild();
+		Node jaxwsEndpointNode = null;
+		
+		for(int i=0; i<beansNode.getChildNodes().getLength(); i++){
+			
+			String nodeName = beansNode.getChildNodes().item(i).getNodeName();
+			
+			if(nodeName.equals("jaxws:endpoint"))
+				jaxwsEndpointNode =  beansNode.getChildNodes().item(i);
+			
+		}
+		
+		NamedNodeMap attr = jaxwsEndpointNode.getAttributes();
+		Node nodeAttr = attr.getNamedItem("address");
+		String address = nodeAttr.getTextContent();
+		nodeAttr.setTextContent("http://localhost:"+port+"/BaseService/setinvaddr");
+		
+		TransformerFactory transformerFactory = TransformerFactory.newInstance();
+		Transformer transformer = null;
+		DOMSource contextFileDocUpdated = new DOMSource(doc);
+		StreamResult contextFile = new StreamResult(new File(contextFilePath));
+		
+		try {
+			transformer = transformerFactory.newTransformer();
+			
+		} catch (TransformerConfigurationException e) {e.printStackTrace();}
+		
+		
+		try {
+			transformer.transform(contextFileDocUpdated, contextFile);
+			
+		} catch (TransformerException e) {e.printStackTrace();}
+		
+		System.out.println(address+" update to  http://localhost:"+port+"/BaseService/setinvaddr");
+		
+		  
+	  }
+	  
+	  public static void ouputInfo(){
+		  
+		  
+		  System.out.println(" BC port : "+Constants.service_port);
+	      System.out.println(" Setinvaddr port : "+Constants.setinvaddr_service_port);
+	  }
+	  
 }

protocol-pool/gm-rest/src/main/java/eu/chorevolution/vsb/gm/protocols/rest/BcRestSubcomponent.java

@@ -260,15 +260,15 @@ public class BcRestSubcomponent extends BcGmSubcomponent {
 				//            GLog.log.e(TAG, "Class cast exeption: " + nfe);
 			}
 
-			//        Message_CS msg = new Message_CS("", 0, source, port, "GET", remainingPart, "", connectionTimeout, "", 0);
-			//
-			//        fr.inria.arles.lsb.commons.Response lsbResponse = null;
-			//
-			//        if (callback == null) {
-			//            lsbResponse = connectorRef.invokeSync(msg);
-			//        } else {
-			//            lsbResponse = connectorRef.invokeAsync(msg);
-			//        }
+//			        Message_CS msg = new Message_CS("", 0, source, port, "GET", remainingPart, "", connectionTimeout, "", 0);
+//			
+//			        fr.inria.arles.lsb.commons.Response lsbResponse = null;
+//			
+//			        if (callback == null) {
+//			            lsbResponse = connectorRef.invokeSync(msg);
+//			        } else {
+//			            lsbResponse = connectorRef.invokeAsync(msg);
+//			        }
 
 			org.restlet.Response restletResponse = null;
 			//        restletResponse = getResponse();getResponse();

protocol-pool/gm-rest/src/main/java/eu/chorevolution/vsb/gm/protocols/rest/RestRequestBuilder.java

@@ -37,22 +37,16 @@ public class RestRequestBuilder implements RequestBuilder {
     buildRequestForm(request, datas);
     buildRequestBody(request, datas);
     
-    
     String params = request.getResourceRef().toString();
- 
     
-    try {
+    try{
 //        request.setResourceRef(java.net.URLDecoder.decode(builder.toString(), "UTF-8"));
     	request.setResourceRef(java.net.URLDecoder.decode(destination+scope+params, "UTF-8"));
-      } catch (UnsupportedEncodingException e) {
+      } catch (UnsupportedEncodingException e){
         // TODO Auto-generated catch block
         e.printStackTrace();
       }
     
-    
-
-    
-
     request.setMethod(method);
 
     return request;
@@ -75,7 +69,7 @@ public class RestRequestBuilder implements RequestBuilder {
 
   private static void buildRequestForm(final Request request, final List<Data<?>> datas) {
     for (Data<?> data : datas) {
-      if(data.getContext() == Context.FORM) {
+      if(data.getContext() == Context.FORM){
         // TODO
       }
     }
@@ -96,7 +90,6 @@ public class RestRequestBuilder implements RequestBuilder {
       System.out.println(data.getName() + " " + data.getObject().toString());
       if(data.getContext() == Context.QUERY) {
         System.out.println(data.getName() + " " + data.getObject().toString());
-        if(request.getResourceRef().isRelative()){System.out.println(" OK ");}else{System.out.println(" KO ");}
         request.getResourceRef().addQueryParameter(data.getName(), data.getObject().toString());
       }
     }

protocol-pool/gm-soap/src/main/java/eu/chorevolution/vsb/gm/protocols/soap/BcSoapGenerator.java

@@ -74,13 +74,7 @@ public class BcSoapGenerator extends BcSubcomponentGenerator {
 
 			JFieldVar attrField = null;
 			if (attr.getClassName().indexOf("<") != -1) {
-				// JClass ListClass =
-				// codeModel.ref(attr.getClassName().substring(0,
-				// attr.getClassName().indexOf("<")));
-				// JClass argClass =
-				// codeModel.ref(attr.getClassName().substring(attr.getClassName().indexOf("<")+1,
-				// attr.getClassName().length()-1));
-				// ListClass = ListClass.narrow(argClass);
+				
 				JClass ListClass = null;
 				JClass argClass = codeModel.ref(attr.getClassName().substring(attr.getClassName().indexOf("<") + 1,
 						attr.getClassName().length() - 1));

protocol-pool/gm-soap/src/main/java/eu/chorevolution/vsb/java2wsdl/Java2WSDL.java

@@ -21,13 +21,9 @@ package eu.chorevolution.vsb.java2wsdl;
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
 import java.util.Map;
 
 import org.apache.axis2.description.java2wsdl.Java2WSDLConstants;
-import org.apache.axis2.util.CommandLineOptionConstants;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.ws.java2wsdl.Java2WSDLCodegenEngine;
@@ -38,14 +34,14 @@ import org.apache.ws.java2wsdl.utils.Java2WSDLOptionsValidator;
 import org.json.simple.JSONObject;
 import org.json.simple.parser.JSONParser;
 import org.json.simple.parser.ParseException;
-
 import eu.chorevolution.vsb.gmdl.utils.Constants;
-import eu.chorevolution.vsb.gmdl.utils.PathResolver;
+
 
 public class Java2WSDL {
 	private static Log log = LogFactory.getLog(Java2WSDL.class);
 
-	public static void main(String[] args) throws Exception {
+	public static void main(String[] args) throws Exception{
+		
 		String[] arguments = {"-o", Constants.wsdlDestination, 
 				"-of", "test", 
 				"-sn", "BindingComponent", 
@@ -194,6 +190,7 @@ public class Java2WSDL {
 		Java2WSDLCommandLineOption option = (Java2WSDLCommandLineOption) allOptions
 				.get(Java2WSDLConstants.JAX_WS_SERVICE_OPTION);
 		if( option == null){
+			
 			return false;
 		}
 		return true;

vsb-manager/pom.xml

@@ -19,7 +19,6 @@
 			<url>http://maven.restlet.org</url>
 		</repository>
 	</repositories>
-
 	<dependencies>
 		<!-- RestLet -->
 		<dependency>
@@ -63,8 +62,6 @@
 			<artifactId>gm-mqtt</artifactId>
 			<version>0.0.1-SNAPSHOT</version>
 		</dependency>
-		<!--<dependency> <groupId>eu.chorevolution.vsb</groupId> <artifactId>gm-dpws</artifactId> 
-			<version>0.0.1-SNAPSHOT</version> </dependency> -->
 		<dependency>
 			<groupId>eu.chorevolution.vsb</groupId>
 			<artifactId>service-parser</artifactId>
@@ -87,7 +84,6 @@
 		</dependency>
 	</dependencies>
 	<build>
-
 		<resources>
 			<resource>
 				<directory>../bc-generators</directory>
@@ -112,16 +108,6 @@
 		</resources>
 
 		<plugins>
-			<!-- <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>exec-maven-plugin</artifactId> 
-				<version>1.5.0</version> <executions> <execution> <id>my-execution</id> <phase>package</phase> 
-				<goals> <goal>java</goal> </goals> </execution> </executions> <configuration> 
-				<mainClass>eu.chorevolution.vsb.manager.VsbManager</mainClass> <outputFile>${project.build.directory}/log/exec.log</outputFile> 
-				</configuration> </plugin> -->
-			<!-- <plugin> Build an executable JAR <groupId>org.apache.maven.plugins</groupId> 
-				<artifactId>maven-jar-plugin</artifactId> <version>2.4</version> <configuration> 
-				<archive> <manifest> <addClasspath>true</addClasspath> <classpathPrefix>lib/</classpathPrefix> 
-				<mainClass>eu.chorevolution.vsb.manager.VsbManager</mainClass> </manifest> 
-				</archive> </configuration> </plugin> -->
 			<plugin>
 				<artifactId>maven-assembly-plugin</artifactId>
 				<executions>
@@ -138,14 +124,6 @@
 					</descriptorRefs>
 				</configuration>
 			</plugin>
-			<!-- Plugin to install vsb-manager-with-dependencies jar in local repository -->
-			<!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-install-plugin</artifactId> 
-				<version>2.2</version> <executions> <execution> <id>install-liberty-to-repo</id> 
-				<phase>process-resources</phase> <goals> <goal>install-file</goal> </goals> 
-				</execution> </executions> <configuration> <file>target/vsb-manager-0.0.1-SNAPSHOT-jar-with-dependencies.jar</file> 
-				<groupId>eu.chorevolution.vsb</groupId> <artifactId>vsb-manager-with-dependencies</artifactId> 
-				<version>0.0.1-SNAPSHOT</version> <packaging>jar</packaging> </configuration> 
-				</plugin> -->
 		</plugins>
 	</build>
 </project>

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

@@ -7,17 +7,8 @@ import java.io.FileOutputStream;
 import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
-import java.io.OutputStream;
 import java.io.PrintWriter;
-import java.io.Reader;
-import java.net.MalformedURLException;
-import java.net.URISyntaxException;
 import java.net.URL;
-import java.net.URLClassLoader;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Iterator;
@@ -34,42 +25,27 @@ import javax.tools.StandardJavaFileManager;
 import javax.tools.StandardLocation;
 import javax.tools.ToolProvider;
 
-import org.apache.camel.language.Constant;
 import org.json.simple.JSONObject;
 import org.json.simple.parser.JSONParser;
 import org.json.simple.parser.ParseException;
-import org.omg.CORBA.portable.InputStream;
-
-import com.sun.codemodel.ClassType;
 import com.sun.codemodel.JBlock;
-import com.sun.codemodel.JCatchBlock;
 import com.sun.codemodel.JClass;
 import com.sun.codemodel.JClassAlreadyExistsException;
 import com.sun.codemodel.JCodeModel;
 import com.sun.codemodel.JConditional;
 import com.sun.codemodel.JDefinedClass;
-import com.sun.codemodel.JEnumConstant;
 import com.sun.codemodel.JExpr;
-import com.sun.codemodel.JExpression;
 import com.sun.codemodel.JFieldRef;
 import com.sun.codemodel.JFieldVar;
 import com.sun.codemodel.JForLoop;
-import com.sun.codemodel.JFormatter;
 import com.sun.codemodel.JInvocation;
 import com.sun.codemodel.JMethod;
 import com.sun.codemodel.JMod;
 import com.sun.codemodel.JPackage;
-import com.sun.codemodel.JTryBlock;
 import com.sun.codemodel.JVar;
-import com.sun.xml.bind.v2.runtime.unmarshaller.XsiNilLoader.Array;
-
 import eu.chorevolution.vsb.artifact.generators.WarGenerator;
 import eu.chorevolution.vsb.bc.manager.BcManagerRestService;
 import eu.chorevolution.vsb.bc.manager.VsbOutput;
-import eu.chorevolution.vsb.bindingcomponent.copy.generated.BindingComponent;
-//import eu.chorevolution.vsb.gm.protocols.dpws.BcDPWSGenerator;
-import eu.chorevolution.vsb.gm.protocols.generators.BcSubcomponentGenerator;
-import eu.chorevolution.vsb.gm.protocols.mqtt.BcMQTTSubcomponent;
 import eu.chorevolution.vsb.gm.protocols.primitives.BcGmSubcomponent;
 import eu.chorevolution.vsb.gm.protocols.rest.BcRestSubcomponent;
 import eu.chorevolution.vsb.gm.protocols.soap.BcSoapGenerator;
@@ -77,15 +53,9 @@ import eu.chorevolution.vsb.gm.protocols.soap.BcSoapSubcomponent;
 import eu.chorevolution.vsb.gmdl.tools.serviceparser.ServiceDescriptionParser;
 import eu.chorevolution.vsb.gmdl.utils.BcConfiguration;
 import eu.chorevolution.vsb.gmdl.utils.Constants;
-import eu.chorevolution.vsb.gmdl.utils.Data;
 import eu.chorevolution.vsb.gmdl.utils.PathResolver;
 import eu.chorevolution.vsb.gmdl.utils.GmServiceRepresentation;
-import eu.chorevolution.vsb.gmdl.utils.Interface;
-import eu.chorevolution.vsb.gmdl.utils.Operation;
-import eu.chorevolution.vsb.gmdl.utils.enums.RoleType;
 import eu.chorevolution.vsb.gmdl.utils.enums.ProtocolType;
-import eu.chorevolution.vsb.java2wsdl.Java2WSDL;
-import eu.chorevolution.vsb.webappbcgenerator.StartBcManagerServlet;
 
 public class VsbManager {
 	
@@ -116,7 +86,9 @@ public class VsbManager {
 	
 	public VsbOutput generateWar(String interfaceDescriptionPath, ProtocolType busProtocol){
 		
-		return generate(interfaceDescriptionPath, busProtocol);
+		VsbOutput  vsbOutput = generate(interfaceDescriptionPath, busProtocol);
+		PathResolver.ouputInfo();
+		return vsbOutput;
 	}
 	
 		
@@ -140,6 +112,7 @@ public class VsbManager {
 			
 			interfaceDescriptionFile.delete();
 		}
+		PathResolver.ouputInfo();
 		return vsbOutput;
 	}
 	
@@ -178,6 +151,7 @@ public class VsbManager {
 		
 		Random rand = new Random();
 		Constants.service_port = String.valueOf(rand.nextInt(5999 - 5000 + 1) + 5000);
+		Constants.setinvaddr_service_port = String.valueOf(rand.nextInt(8899 - 8800 + 1)+ 8800);
 		
 		String[] interfaceDescFileNameComponents = interfaceDescriptionPath.split("\\.");
 		String[] interfaceDescFileNameTab = interfaceDescFileNameComponents[0].split("\\"+File.separator);
@@ -204,6 +178,8 @@ public class VsbManager {
 			
 			PathResolver.copyFolder(new File(".." + File.separator + "bc-generators").getAbsolutePath(), bc_generators_copy);
 		}
+		
+		PathResolver.updatePortServiceSetInvAddr(Constants.setinvaddr_service_port);
 			
 		Constants.webapp_src_bc = new File(bc_generators_copy+ File.separator + "webapp-bc-generator" 
 				+ File.separator + "src" + File.separator + "main" + File.separator 
@@ -249,7 +225,7 @@ public class VsbManager {
 		warGenerator.addPackage(eu.chorevolution.vsb.webappbcgenerator.StartBcManagerServlet.class.getPackage());
 		warGenerator.addPackage(eu.chorevolution.vsb.artifact.war.RestServlet.class.getPackage());
 		warGenerator.addPackage(eu.chorevolution.vsb.artifact.generators.WarGenerator.class.getPackage());
-		warGenerator.addPackage(eu.chorevolution.vsb.artifact.setinvaddrservice.BaseService.class.getPackage());
+		warGenerator.addPackage(eu.chorevolution.vsb.bc.setinvaddrservice.BaseService.class.getPackage());
 		warGenerator.addPackage(eu.chorevolution.vsb.gm.protocols.Manageable.class.getPackage());
 		
 		
@@ -342,8 +318,8 @@ public class VsbManager {
 			// Array of imported classes
 			Class[] classes = new Class[]{
 					
-					           BcManagerRestService.class, BcGmSubcomponent.class,BcGmSubcomponent.class, 
-					           BcRestSubcomponent.class, BcSoapSubcomponent.class,ServiceDescriptionParser.class,BcConfiguration.class
+				BcManagerRestService.class, BcGmSubcomponent.class,BcGmSubcomponent.class, 
+				BcRestSubcomponent.class, BcSoapSubcomponent.class,ServiceDescriptionParser.class,BcConfiguration.class
 			};
 			
 			
@@ -549,7 +525,7 @@ public class VsbManager {
 
 		JVar bcConfig1Var = forBlock.decl(BcConfigurationClass, "bcConfiguration1", JExpr._new(BcConfigurationClass));
 		JVar bcConfig2Var = forBlock.decl(BcConfigurationClass, "bcConfiguration2", JExpr._new(BcConfigurationClass));
-
+		
 		JInvocation setRole1 = bcConfig1Var.invoke("setSubcomponentRole").arg(InterfaceVar.invoke("getRole"));
 		forBlock.add(setRole1);
 
@@ -603,7 +579,6 @@ public class VsbManager {
 		default:
 			break;
 		}
-
 		switch(gmServiceRepresentation.getProtocol()){
 		case REST:
 			for(int i=1; i<=gmServiceRepresentation.getInterfaces().size(); i++)  
@@ -732,30 +707,6 @@ public class VsbManager {
 	}
 
 
-
-	private void copyBCClass(GmServiceRepresentation gmServiceRepresentation, ProtocolType busProtocol) {
-		String namespace = Constants.target_namespace;
-		namespace = namespace.replace(".", File.separator);
-		try{
-			
-			File input = new File(new File(BcManagerRestService.class.getClassLoader().getResource("example.json").toString()).getParent().substring(5) + File.separator + "BindingComponent.java");
-			File output = new File(Constants.generatedCodePath + File.separator + namespace + File.separator + "BindingComponent.java");
-			
-			Scanner sc = new Scanner(input);
-			PrintWriter printer = new PrintWriter(output);
-			while(sc.hasNextLine()) {
-				String s = sc.nextLine();
-				printer.write(s+"\n");
-			}
-			sc.close();
-			printer.close();
-		}
-		catch(FileNotFoundException e) {
-			
-			System.err.println("File not found. Please scan in new file.");
-		}
-	}
-	
 	private static boolean isInterfaceDescriptionFile(String interfaceDescriptionPath){
 		
 		

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

@@ -4,6 +4,8 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import eu.chorevolution.vsb.gmdl.utils.enums.ProtocolType;
+import org.junit.Test;
+import static org.junit.Assert.*;
 
 //import eu.chorevolution.vsb.bindingcomponent.generated.GeneratedFactory;
 
@@ -15,7 +17,6 @@ public class VsbManagerTest{
 		
 		
 		String interfaceDescriptionPath = "/home/pntumba/inria_code/doc/accidents.gidl";
-		
 		generateWarFile(interfaceDescriptionPath);
 //		generateWarBytes(interfaceDescriptionPath);