Add after removing big size file histories

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

@@ -74,6 +74,7 @@ public class Data<T> {
 		// default
 	public Data(String name, String className, boolean isPrimitiveType,
 			T object, String context){
+		
 		this(name, className, isPrimitiveType, object,
 				MediaType.JSON,Context.valueOf(context) , true);
 	}
@@ -113,11 +114,13 @@ public class Data<T> {
 		return this.isPrimitiveType;
 	}
 
-	public T getObject() {
+	public T getObject(){
+		
 		return this.object;
 	}
 
-	public Class<?> getInnerClass() {
+	public Class<?> getInnerClass(){
+		
 		return this.object.getClass();
 	}
 
@@ -125,7 +128,8 @@ public class Data<T> {
 		return this.context;
 	}
 
-	public void addAttribute(Data<?> attribute) {
+	public void addAttribute(Data<?> attribute){
+		
 		this.attributes.add(attribute);
 	}
 
@@ -159,7 +163,8 @@ public class Data<T> {
 		this.mediaType = mediaType;
 	}
 
-	public boolean isRequired() {
+	public boolean isRequired(){
+		
 		return this.isRequired;
 	}
 

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

@@ -102,7 +102,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
 			}
 		}
@@ -112,7 +112,7 @@ public class RestRequestBuilder implements RequestBuilder {
 		
 		for (Data<?> data : datas) {
 
-			if (data.getContext() == Context.QUERY) {
+			if (data.getContext() == Context.QUERY){
 
 				request.getResourceRef().addQueryParameter(data.getName(), data.getObject().toString());
 

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

@@ -11,13 +11,8 @@ import java.io.PrintWriter;
 import java.net.URL;
 import java.util.EmptyStackException;
 import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
 import java.util.Random;
 import java.util.Scanner;
-import javax.tools.JavaFileObject;
-import javax.tools.StandardJavaFileManager;
 import org.json.simple.JSONObject;
 import org.json.simple.parser.JSONParser;
 import org.json.simple.parser.ParseException;
@@ -43,7 +38,6 @@ import com.sun.codemodel.JPackage;
 import com.sun.codemodel.JVar;
 
 import eu.chorevolution.vsb.artifact.generators.Generator;
-import eu.chorevolution.vsb.artifact.generators.JarGenerator;
 import eu.chorevolution.vsb.artifact.generators.WarGenerator;
 import eu.chorevolution.vsb.bc.manager.BcManagerRestService;
 import eu.chorevolution.vsb.bc.manager.VsbOutput;
@@ -59,16 +53,11 @@ import eu.chorevolution.vsb.gmdl.utils.GmServiceRepresentation;
 import eu.chorevolution.vsb.gmdl.utils.enums.ProtocolType;
 import eu.chorevolution.vsb.logger.GLog;
 import eu.chorevolution.vsb.logger.Logger;
-import eu.chorevolution.vsb.websocket.BcWebsocketSubcomponent;
 
 public class VsbManager {
 
 	private boolean STARTING_FROM_JAR = false;
-	private ProtocolType serviceProtocol = null;
-	private ProtocolType busProtocol = null;
 	private Logger logger = GLog.initLogger();
-    
-
 	public VsbManager(){
 
 		// Test if class is running from jar file or from classes files.
@@ -98,7 +87,6 @@ public class VsbManager {
 
 	public VsbOutput generateWar(String interfaceDescriptionPath, ProtocolType busProtocol, String service_name) {
 
-		this.busProtocol = busProtocol;
 		service_name = deleteSpecialChar(service_name);
 		Constants.service_name = service_name;
 		VsbOutput vsbOutput = generate(interfaceDescriptionPath, busProtocol);
@@ -121,7 +109,6 @@ public class VsbManager {
 
 	public VsbOutput generateWar(byte[] interfaceDescriptionByteArray, ProtocolType busProtocol, String service_name) {
 
-		this.busProtocol = busProtocol;
 		service_name = deleteSpecialChar(service_name);
 		Constants.service_name = service_name;
 		String interfaceDescriptionPath = interfaceDescriptionBytesToFile(interfaceDescriptionByteArray);
@@ -329,7 +316,7 @@ public class VsbManager {
 			break;
 		}
 
-		serviceProtocol = gmServiceRepresentation.getProtocol();
+		gmServiceRepresentation.getProtocol();
 		if (busProtocol == ProtocolType.SOAP){
 
 			bcConfiguration.setTargetNamespace(Constants.target_namespace);

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

@@ -15,7 +15,7 @@ public class VsbManagerTest{
 //		String interfaceDescriptionPath = "/home/pntumba/inria_code/repositories/smart-mobility-tourism/bindingcomponents/without_adaptation/bcPoi/model/poi-service-name.gidl";
 //		String interfaceDescriptionPath = "/home/pntumba/inria_code/repositories/smart-mobility-tourism/bindingcomponents/without_adaptation/bcJourneyPlanner/model/journeyplanner-service-name.gidl";
 //		String interfaceDescriptionPath = "/home/pntumba/inria_code/repositories/smart-mobility-tourism/bindingcomponents/without_adaptation/bcTraffic/model/traffic-service-name.gidl";
-//		String interfaceDescriptionPath = "/home/pntumba/inria_code/repositories/smart-mobility-tourism/bindingcomponents/without_adaptation/bcPublicTransportation/model/publictransportation-service-name.gidl";
+		String interfaceDescriptionPath = "/home/pntumba/inria_code/repositories/smart-mobility-tourism/bindingcomponents/without_adaptation/bcPublicTransportation/model/publictransportation-service-name.gidl";
 		
 		
 //		String interfaceDescriptionPath = "/home/pntumba/inria_code/repositories/urban-traffic-coordination/bindingcomponents/bcDTS-ACCIDENTS/model/dts-accidents.gidl";
@@ -29,10 +29,10 @@ public class VsbManagerTest{
 //		String interfaceDescriptionPath = "/home/pntumba/inria_code/workspace/gidl/WP4/TOMTOM.gidl";
 //      String interfaceDescriptionPath = "/home/pntumba/inria_code/workspace/gidl/WP4/TrafficverketRoadcondition.gidl";
 //		String interfaceDescriptionPath = "/home/pntumba/inria_code/workspace/gidl/test/api.gidl";
-		String interfaceDescriptionPath = "/home/pntumba/inria_code/workspace/gidl/WP4/VasttrafikGenerateOAuth2Token.gidl";
+//		String interfaceDescriptionPath = "/home/pntumba/inria_code/workspace/gidl/WP4/VasttrafikGenerateOAuth2Token.gidl";
 		
 		VsbManager vsbm = new VsbManager();
-		VsbOutput  vsbOutput = vsbm.generateWar(interfaceDescriptionPath,ProtocolType.SOAP, "VasttrafikGenerateOAuth2Token");
+		VsbOutput  vsbOutput = vsbm.generateWar(interfaceDescriptionPath,ProtocolType.SOAP, "publicTransportation");
 		System.out.println(" bc_manager_servlet_port "+vsbOutput.bc_manager_servlet_port);
 		System.out.println(" service_bc_port "+vsbOutput.service_bc_port);
 		System.out.println(" service_port "+vsbOutput.service_port);

vsb-manager-api/src/test/resources/pom-vsb-manager.xml

@@ -33,11 +33,11 @@
 		</repository>
 
 		<!-- Maven Central repository -->
-		<repository>
+		<!-- <repository>
 			<id>central</id>
 			<name>Maven Central Repository</name>
 			<url>http://repo1.maven.org/maven2</url>
-		</repository>
+		</repository> -->
 
 	</repositories>