Resolved merge conflict between master and chovevolution branches

bc-generators/artifact-generators/pom.xml

@@ -10,11 +10,8 @@
 	<name>artifact-generators</name>
 	<description>artifact-generators provides classes to generate a BC WAR and generic interface which each concrete protocol implementation MUST implement to generate its concrete endpoints or clients</description>
 	<repositories>
-		<repository>
-			<id>repository.jboss.org</id>
-			<name>JBoss Repository</name>
-			<url>http://mvnrepository.com/artifact/org.jboss.shrinkwrap</url>
-		</repository>
+		<!-- <repository> <id>repository.jboss.org</id> <name>JBoss Repository</name> 
+			<url>http://mvnrepository.com/artifact/org.jboss.shrinkwrap</url> </repository> -->
 		<repository>
 			<id>maven-restlet</id>
 			<name>Public online Restlet repository</name>
@@ -23,11 +20,13 @@
 	</repositories>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.version>3.2.3.RELEASE</spring.version>
-		<cxf.version>3.1.4</cxf.version>
+		<spring.version>4.3.12.RELEASE</spring.version>
+		<cxf.version>3.1.11</cxf.version>
 		<jax.ws.rs>2.0.1</jax.ws.rs>
 		<version.shrinkwrap>1.2.6</version.shrinkwrap>
 		<version.shrinkwrap.resolvers>3.0.0</version.shrinkwrap.resolvers>
+		<vsb.version>2.1.1-SNAPSHOT</vsb.version>
+
 	</properties>
 
 	<build>
@@ -48,37 +47,37 @@
 		<dependency>
 			<groupId>eu.chorevolution.vsb</groupId>
 			<artifactId>gmdl-utils</artifactId>
-			<version>2.1.1-SNAPSHOT</version>
+			<version>${vsb.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>eu.chorevolution.vsb</groupId>
 			<artifactId>bc-manager</artifactId>
-			<version>2.1.1-SNAPSHOT</version>
+			<version>${vsb.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>eu.chorevolution.vsb</groupId>
 			<artifactId>gm-api</artifactId>
-			<version>2.1.1-SNAPSHOT</version>
+			<version>${vsb.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>eu.chorevolution.vsb</groupId>
 			<artifactId>gm-dpws</artifactId>
-			<version>2.1.1-SNAPSHOT</version>
+			<version>${vsb.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>eu.chorevolution.vsb</groupId>
 			<artifactId>gm-mqtt</artifactId>
-			<version>2.1.1-SNAPSHOT</version>
+			<version>${vsb.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>eu.chorevolution.vsb</groupId>
 			<artifactId>gm-websocket</artifactId>
-			<version>2.1.1-SNAPSHOT</version>
+			<version>${vsb.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>eu.chorevolution.vsb</groupId>
 			<artifactId>compiler</artifactId>
-			<version>2.1.1-SNAPSHOT</version>
+			<version>${vsb.version}</version>
 		</dependency>
 
 		<!-- RestLet -->
@@ -88,7 +87,6 @@
 			<version>2.3.1</version>
 		</dependency>
 
-
 		<!-- CodeModel -->
 		<dependency>
 			<groupId>com.sun.codemodel</groupId>
@@ -108,20 +106,17 @@
 			<artifactId>shrinkwrap-impl-base</artifactId>
 			<version>1.2.6</version>
 		</dependency>
-
 		<dependency>
 			<groupId>org.jboss.shrinkwrap.resolver</groupId>
 			<artifactId>shrinkwrap-resolver-api-maven-embedded</artifactId>
 			<version>${version.shrinkwrap.resolvers}</version>
 		</dependency>
-
 		<dependency>
 			<groupId>org.jboss.shrinkwrap.resolver</groupId>
 			<artifactId>shrinkwrap-resolver-depchain</artifactId>
 			<version>${version.shrinkwrap.resolvers}</version>
 			<type>pom</type>
 		</dependency>
-
 		<dependency>
 			<groupId>org.jboss.shrinkwrap.resolver</groupId>
 			<artifactId>shrinkwrap-resolver-impl-maven</artifactId>
@@ -132,7 +127,12 @@
 			<artifactId>shrinkwrap-resolver-impl-maven-archive</artifactId>
 			<version>${version.shrinkwrap.resolvers}</version>
 		</dependency>
-
+		<dependency>
+			<groupId>org.jboss.shrinkwrap.resolver</groupId>
+			<artifactId>shrinkwrap-resolver-impl-maven-archive</artifactId>
+			<version>${version.shrinkwrap.resolvers}</version>
+		</dependency>
+	
 		<!-- jackson -->
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
@@ -177,22 +177,21 @@
 			<artifactId>javax.ws.rs-api</artifactId>
 			<version>${jax.ws.rs}</version>
 		</dependency>
+
 		<dependency>
 			<groupId>org.springframework</groupId>
-			<artifactId>spring-web</artifactId>
+			<artifactId>spring-context</artifactId>
 			<version>${spring.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
-			<artifactId>spring-webmvc</artifactId>
+			<artifactId>spring-web</artifactId>
 			<version>${spring.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>commons-logging</groupId>
-			<artifactId>commons-logging</artifactId>
-			<version>1.2</version>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-webmvc</artifactId>
+			<version>${spring.version}</version>
 		</dependency>
-		<!-- <dependency> <groupId>org.apache.axis2</groupId> <artifactId>axis2-transport-http</artifactId> 
-			<version>1.7.5</version> </dependency> -->
 	</dependencies>
 </project>

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

@@ -25,14 +25,15 @@ 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);
 
 			Class<?> bc = null;

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

@@ -18,7 +18,6 @@ import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.jboss.shrinkwrap.impl.base.exporter.zip.ZipExporterImpl;
 import org.jboss.shrinkwrap.resolver.api.maven.embedded.BuiltProject;
 import org.jboss.shrinkwrap.resolver.api.maven.embedded.EmbeddedMaven;
-
 import eu.chorevolution.vsb.gmdl.utils.Constants;
 import eu.chorevolution.vsb.gmdl.utils.PathResolver;
 import eu.chorevolution.vsb.gmdl.utils.enums.ProtocolType;

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

@@ -16,11 +16,11 @@ import java.util.List;
 
 import org.jboss.shrinkwrap.api.Archive;
 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.embedded.BuiltProject;
 import org.jboss.shrinkwrap.resolver.api.maven.embedded.EmbeddedMaven;
-
 import eu.chorevolution.vsb.bc.manager.VsbOutput;
 import eu.chorevolution.vsb.gmdl.utils.Constants;
 import eu.chorevolution.vsb.gmdl.utils.PathResolver;
@@ -36,8 +36,8 @@ public class WarGenerator {
 	public WarGenerator() {
 		
 		String warDestination = Constants.warDestination;
-		
 		archive = ShrinkWrap.create(WebArchive.class, warDestination);
+		
 	}
 
 	public void addPackage(Package pack){
@@ -97,6 +97,22 @@ public class WarGenerator {
 			buidAndMergeArchives( hmapPomXml.get("dpws"));
 		}
 		
+	}
+	public void addDependencyFiles(String pathToPom){
+		
+		BuiltProject builtProject = EmbeddedMaven.forProject(new File(pathToPom))
+		   .useMaven3Version("3.3.9")
+		   .setGoals("package")
+		   .build();
+		
+		List<Archive> jars =  builtProject.getArchives();
+		for(Archive jar : jars ){
+			
+			archive = archive.merge(jar);
+		}
+		PathResolver.deleteTempDir(new File(builtProject.getTargetDirectory().getAbsolutePath()));
+		
+
 	}
 	
 	public VsbOutput generate(boolean isBusProtocolSoap){
@@ -147,10 +163,11 @@ public class WarGenerator {
 			archive.addAsWebResource(f, "assets" + "/" + "js" + "/" + f.getName());
 		}
 
+		
 		ByteArrayOutputStream bos = new ByteArrayOutputStream();
 		new ZipExporterImpl(archive).exportTo(bos);
 
-		new ZipExporterImpl(archive).exportTo(new File(archive.getName()), true);
+    	new ZipExporterImpl(archive).exportTo(new File(archive.getName()), true);
 
 		VsbOutput vsbOutput = new VsbOutput();
 		vsbOutput.war = bos.toByteArray();
@@ -167,7 +184,6 @@ public class WarGenerator {
 			}
 		}
 		
-		
 		return vsbOutput;
 	}
 	

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

@@ -3,11 +3,11 @@ package eu.chorevolution.vsb.artifact.generators;
 import java.io.File;
 
 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;
 
+
 /**
  * @author Georgios Bouloukakis (boulouk@gmail.com)
  * 

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

@@ -10,7 +10,8 @@ import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.lang.StringUtils;
+
+import org.apache.commons.lang3.StringUtils;
 import org.json.simple.JSONObject;
 import org.json.simple.parser.JSONParser;
 import org.restlet.Client;
@@ -68,7 +69,6 @@ public class RestServlet extends HttpServlet {
 					String message = result.getText();
 					if (!message.equals("empty")){
 						if(!message.equals(previousMsg)) {
-							System.err.println("message: " + message);
 							out.print(StringUtils.abbreviate(message, 480));
 							previousMsg = message;
 						}
@@ -128,9 +128,9 @@ public class RestServlet extends HttpServlet {
 	
 	private String getRestServicePort(){
 		
-		String bc_rest_service_port = "";
+		String service_port = "";
 		File dir = new File(BcManagerRestService.class.getClassLoader().getResource("example.json").toExternalForm().substring(9)).getParentFile().getParentFile().getParentFile().getParentFile();
-		File configFilePath = new File(dir.getAbsolutePath() + File.separator + "config"+ File.separator + "config_block1_interface_1");
+		File configFilePath = new File(dir.getAbsolutePath() + File.separator + "config"+ File.separator + "config_block2_interface_1");
 		JSONParser parser = new JSONParser();
 	    JSONObject jsonObject = new JSONObject();
 	    try {
@@ -139,9 +139,9 @@ public class RestServlet extends HttpServlet {
 	    } catch (Exception _x) {
 	    }
 	    
-	    if(jsonObject.get("bc_rest_service_port") != null){
-	    	bc_rest_service_port = (String) jsonObject.get("bc_rest_service_port");
+	    if(jsonObject.get("service_port") != null){
+	    	service_port = (String) jsonObject.get("service_port");
 	    }
-		return bc_rest_service_port;
+		return service_port;
 	}
 }

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

@@ -23,6 +23,14 @@ public class StartBcManagerServlet extends HttpServlet {
     
 	BcManagerRestService server = null;
 	
+	public StartBcManagerServlet(){
+		
+		int portBcManagerServlet = Integer.valueOf(getPort());
+		server = new BcManagerRestService(portBcManagerServlet);
+		
+	}
+	
+	
 	/**
 	 * Processes requests for both HTTP <code>GET</code> and <code>POST</code>
 	 * methods.
@@ -44,7 +52,6 @@ public class StartBcManagerServlet extends HttpServlet {
 		this.getServletContext().setAttribute("role", "role--1");
 		this.getServletContext().setAttribute("name", "name--1");
 		this.getServletContext().setAttribute("endpoints", "endpoints--1");
-		System.out.println("Query "+request.getQueryString().toString());
 		String op = request.getParameter("op");
 		if(op.equals("start")){
 			
@@ -58,9 +65,18 @@ public class StartBcManagerServlet extends HttpServlet {
 		} 
 		else if(op.equals("startbcm")){
 			
+			
 			int portBcManagerServlet = Integer.valueOf(getPort());
-			server = new BcManagerRestService(portBcManagerServlet);
-			response.getWriter().println("-> BC Manager started!");
+			if(!server.isBcSarted()){
+				
+				server = new BcManagerRestService(portBcManagerServlet);
+				
+				response.getWriter().println("-> BC Manager started!");
+			}else{
+				
+				response.getWriter().println("-> BC Manager already started!");
+			}
+			
 		}
 		else if(op.equals("stopbcm")){
 			

bc-generators/artifact-generators/src/main/webapp/WEB-INF/web.xml

@@ -38,6 +38,7 @@
 	<servlet>
 		<servlet-name>StartBcManagerServlet</servlet-name>
 		<servlet-class>eu.chorevolution.vsb.artifact.war.StartBcManagerServlet</servlet-class>
+		 <load-on-startup>0</load-on-startup>
 	</servlet>
 	<servlet-mapping>
 		<servlet-name>StartBcManagerServlet</servlet-name>

bc-generators/pom.xml

@@ -10,6 +10,9 @@
 	<name>bc-generators</name>
 	<description>bc-generators provides classes and web interfaces to generate artifacts for binding components</description>
 	<packaging>pom</packaging>
+	<properties>
+		<vsb.version>2.1.1-SNAPSHOT</vsb.version>
+	</properties>
 	<modules>
 		<module>artifact-generators</module>
 	</modules>

bc-manager/pom.xml

@@ -13,6 +13,7 @@
 	<properties>
 		<axis2.version>1.7.5</axis2.version>
 		<axis2.stable.version>1.7.5</axis2.stable.version>
+		<vsb.version>2.1.1-SNAPSHOT</vsb.version>
 	</properties>
 	
 	<dependencies>
@@ -20,27 +21,27 @@
 		<dependency>
 			<groupId>eu.chorevolution.vsb</groupId>
 			<artifactId>gmdl-utils</artifactId>
-			<version>2.1.1-SNAPSHOT</version>
+			<version>${vsb.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>eu.chorevolution.vsb</groupId>
 			<artifactId>service-parser</artifactId>
-			<version>2.1.1-SNAPSHOT</version>
+			<version>${vsb.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>eu.chorevolution.vsb</groupId>
 			<artifactId>gm-rest</artifactId>
-			<version>2.1.1-SNAPSHOT</version>
+			<version>${vsb.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>eu.chorevolution.vsb</groupId>
 			<artifactId>gm-mqtt</artifactId>
-			<version>2.1.1-SNAPSHOT</version>
+			<version>${vsb.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>eu.chorevolution.vsb</groupId>
 			<artifactId>gm-coap</artifactId>
-			<version>2.1.1-SNAPSHOT</version>
+			<version>${vsb.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>eu.chorevolution.vsb</groupId>
@@ -50,7 +51,25 @@
 		<dependency>
 			<groupId>eu.chorevolution.vsb</groupId>
 			<artifactId>gm-dpws</artifactId>
-			<version>2.1.1-SNAPSHOT</version>
+			<version>${vsb.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>eu.chorevolution.vsb</groupId>
+			<artifactId>gm-soap</artifactId>
+			<version>${vsb.version}</version>
+		</dependency>
+		
+		<dependency>
+			<groupId>org.apache.axis2</groupId>
+			<artifactId>axis2-kernel</artifactId>
+			<version>${axis2.version}</version>
+		</dependency>
+
+	
+		<dependency>
+			<groupId>org.apache.axis2</groupId>
+			<artifactId>axis2-ant-plugin</artifactId>
+			<version>${axis2.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.json</groupId>

bc-manager/src/main/java/eu/chorevolution/vsb/bc/manager/BcManagerRest.java

@@ -87,8 +87,6 @@ public class BcManagerRest implements Manageable{
         e.printStackTrace();
       }
       
-      System.out.println("rec: " + receivedText);
-      
       String returnMessage = "";
       returnMessage = "Configuration Complete!";
       return new StringRepresentation(returnMessage);

bc-manager/src/main/java/eu/chorevolution/vsb/bc/manager/VsbOutput.java

@@ -4,6 +4,10 @@ import java.io.Serializable;
 
 public class VsbOutput implements Serializable {
 	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
 	public byte[] war;
     public byte[] jar;
 	public byte[] wsdl;
@@ -15,4 +19,7 @@ public class VsbOutput implements Serializable {
 	public String response_message;
 	public String generatedCodePath;
 	public String service_name;
+	public String printer_service_port;
+	public String subcomponent_port;
+
 }

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

@@ -28,7 +28,6 @@ import java.util.List;
 import javax.annotation.Resource;
 import javax.jws.WebMethod;
 import javax.jws.WebService;
-import javax.mail.MessageContext;
 import javax.servlet.ServletContext;
 import javax.xml.namespace.QName;
 import javax.xml.ws.Service;
@@ -40,10 +39,6 @@ import org.json.simple.parser.ParseException;
 
 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;
-
 
 @WebService(
         name = "ConfigurableService",

gm-api/pom.xml

@@ -8,6 +8,11 @@
   <artifactId>gm-api</artifactId>
   <name>gm-api</name>
   <description>gm-protocols provides generics interfaces which each concrete protocol implemention MUST implement</description>
+    <properties>
+		<vsb.version>2.1.1-SNAPSHOT</vsb.version>
+	</properties>
+	
+	
     <build>
         <plugins>
             <plugin>
@@ -26,7 +31,7 @@
     <dependency>
       <groupId>eu.chorevolution.vsb</groupId>
       <artifactId>gmdl-utils</artifactId>
-      <version>2.1.1-SNAPSHOT</version>
+      <version>${vsb.version}</version>
     </dependency>
     <!-- JSON Parsing & Mapping -->
     <dependency>
@@ -52,7 +57,7 @@
     <dependency>
     	<groupId>eu.chorevolution.vsb</groupId>
 		<artifactId>logger</artifactId>
-		<version>2.1.1-SNAPSHOT</version>
+		<version>${vsb.version}</version>
     </dependency>
   </dependencies>
 </project>

gmdl-utils/pom.xml

@@ -8,6 +8,9 @@
   <artifactId>gmdl-utils</artifactId>
   <name>gmdl-utils</name>
   <description>GMDL Utils provides classes to parse and instantiate a GMDL representation of a system to be binded, based on its description file</description>
+  <properties>
+		<vsb.version>2.1.0</vsb.version>
+	</properties>
   <dependencies>
   <dependency>
     <groupId>com.googlecode.json-simple</groupId>

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

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

@@ -13,6 +13,15 @@ public class Constants {
 	public static String wsdlName;
 	public static String service_name;
 	
+	public static String subcomponent_port;
+	public static int subcomponent_port_min_range = 1200;
+	public static int subcomponent_port_max_range = 1299;
+	
+	
+	public static String printer_service_port;
+	public static int printer_service_port_min_range = 1300;
+	public static int printer_service_port_max_range = 1399;
+	
 	public static String service_port;
 	public static int service_port_min_range = 5000;
 	public static int service_port_max_range = 5999;

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

@@ -288,7 +288,7 @@ public static String myFilePath(Class className, String fileName){
 				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);

playgrounds/client-server/dpws-playground/pom.xml

@@ -37,7 +37,6 @@
 	</repository>
 </repositories>
 	
-	
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>

playgrounds/client-server/rest-playground/pom.xml

@@ -19,7 +19,6 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
 
-
 	<repositories>
 		<!-- REST library: Restlet -->
 		<repository>
@@ -61,6 +60,7 @@
 			<artifactId>experiment</artifactId>
 			<version>2.1.1-SNAPSHOT</version>
 		</dependency> -->
+
 		
 	</dependencies>
 </project>