Skip to content
Snippets Groups Projects
Commit f42d3b5a authored by NTUMBA WA NTUMBA Patient's avatar NTUMBA WA NTUMBA Patient
Browse files

Commit before going on weekend 1st of december 2017

parent 2889ac49
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 43 additions and 30 deletions
bc-generators/artifact-generators/src/main/java/eu/chorevolution/vsb/artifact/war/StartBcManagerServlet.java
+ 1
− 1
View file @ f42d3b5a
...@@ -44,7 +44,6 @@ public class StartBcManagerServlet extends HttpServlet { ...@@ -44,7 +44,6 @@ public class StartBcManagerServlet extends HttpServlet {
this.getServletContext().setAttribute("role", "role--1"); this.getServletContext().setAttribute("role", "role--1");
this.getServletContext().setAttribute("name", "name--1"); this.getServletContext().setAttribute("name", "name--1");
this.getServletContext().setAttribute("endpoints", "endpoints--1"); this.getServletContext().setAttribute("endpoints", "endpoints--1");
System.out.println("Query "+request.getQueryString().toString());
String op = request.getParameter("op"); String op = request.getParameter("op");
if(op.equals("start")){ if(op.equals("start")){
...@@ -60,6 +59,7 @@ public class StartBcManagerServlet extends HttpServlet { ...@@ -60,6 +59,7 @@ public class StartBcManagerServlet extends HttpServlet {
int portBcManagerServlet = Integer.valueOf(getPort()); int portBcManagerServlet = Integer.valueOf(getPort());
server = new BcManagerRestService(portBcManagerServlet); server = new BcManagerRestService(portBcManagerServlet);
System.out.println("portBcManagerServlet "+portBcManagerServlet);
response.getWriter().println("-> BC Manager started!"); response.getWriter().println("-> BC Manager started!");
} }
else if(op.equals("stopbcm")){ else if(op.equals("stopbcm")){
......
bc-manager/src/main/java/eu/chorevolution/vsb/bc/manager/VsbOutput.java
+ 6
− 0
View file @ f42d3b5a
...@@ -4,6 +4,10 @@ import java.io.Serializable; ...@@ -4,6 +4,10 @@ import java.io.Serializable;
public class VsbOutput implements Serializable { public class VsbOutput implements Serializable {
/**
*
*/
private static final long serialVersionUID = 1L;
public byte[] war; public byte[] war;
// public byte[] jar; // public byte[] jar;
public byte[] wsdl; public byte[] wsdl;
...@@ -11,4 +15,6 @@ public class VsbOutput implements Serializable { ...@@ -11,4 +15,6 @@ public class VsbOutput implements Serializable {
public String setinvaddr_service_port; public String setinvaddr_service_port;
public String service_bc_port; public String service_bc_port;
public String bc_manager_servlet_port; public String bc_manager_servlet_port;
public String subcomponent_port;
public String printer_service_port;
} }
gmdl-utils/src/main/java/eu/chorevolution/vsb/gmdl/utils/Constants.java
+ 9
− 0
View file @ f42d3b5a
...@@ -13,6 +13,15 @@ public class Constants { ...@@ -13,6 +13,15 @@ public class Constants {
public static String wsdlName; public static String wsdlName;
public static String service_name; 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 String service_port;
public static int service_port_min_range = 5000; public static int service_port_min_range = 5000;
public static int service_port_max_range = 5999; public static int service_port_max_range = 5999;
......
protocol-pool/gm-rest/src/main/java/eu/chorevolution/vsb/gm/protocols/rest/BcRestSubcomponent.java
+ 1
− 1
View file @ f42d3b5a
...@@ -66,7 +66,7 @@ public class BcRestSubcomponent extends BcGmSubcomponent { ...@@ -66,7 +66,7 @@ public class BcRestSubcomponent extends BcGmSubcomponent {
this.bcRestSubcomponent = this; this.bcRestSubcomponent = this;
setGmServiceRepresentation(serviceRepresentation); setGmServiceRepresentation(serviceRepresentation);
int restservicePort = Integer.valueOf(bcConfiguration.getServicePort()); int restservicePort = Integer.valueOf(bcConfiguration.getServicePort());
System.out.println(" restservicePort "+restservicePort);
switch (this.bcConfiguration.getSubcomponentRole()) { switch (this.bcConfiguration.getSubcomponentRole()) {
case SERVER: case SERVER:
......
protocol-pool/pom.xml
+ 2
− 2
View file @ f42d3b5a
...@@ -12,10 +12,10 @@ ...@@ -12,10 +12,10 @@
<modules> <modules>
<module>gm-rest</module> <module>gm-rest</module>
<module>gm-soap</module> <module>gm-soap</module>
<module>gm-mqtt</module> <!-- <module>gm-mqtt</module>
<module>gm-coap</module> <module>gm-coap</module>
<module>gm-dpws</module> <module>gm-dpws</module>
<module>gm-websocket</module> <module>gm-websocket</module> -->
</modules> </modules>
<dependencies> <dependencies>
<!-- Chorevolution --> <!-- Chorevolution -->
......
vsb-manager-api/pom.xml
+ 0
− 15
View file @ f42d3b5a
...@@ -49,21 +49,6 @@ ...@@ -49,21 +49,6 @@
<artifactId>gm-soap</artifactId> <artifactId>gm-soap</artifactId>
<version>2.0.1-SNAPSHOT</version> <version>2.0.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency>
<groupId>eu.chorevolution.vsb</groupId>
<artifactId>gm-coap</artifactId>
<version>2.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>eu.chorevolution.vsb</groupId>
<artifactId>gm-mqtt</artifactId>
<version>2.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>eu.chorevolution.vsb</groupId>
<artifactId>gm-websocket</artifactId>
<version>2.0.1-SNAPSHOT</version>
</dependency>
<dependency> <dependency>
<groupId>eu.chorevolution.vsb</groupId> <groupId>eu.chorevolution.vsb</groupId>
<artifactId>service-parser</artifactId> <artifactId>service-parser</artifactId>
......
vsb-manager-api/src/main/java/eu/chorevolution/vsb/manager/api/VsbManager.java
+ 17
− 7
View file @ f42d3b5a
...@@ -164,7 +164,16 @@ public class VsbManager { ...@@ -164,7 +164,16 @@ public class VsbManager {
Constants.bc_manager_servlet_port = String.valueOf(rand Constants.bc_manager_servlet_port = String.valueOf(rand
.nextInt(Constants.bc_manager_servlet_port_max_range - Constants.bc_manager_servlet_port_min_range + 1) .nextInt(Constants.bc_manager_servlet_port_max_range - Constants.bc_manager_servlet_port_min_range + 1)
+ Constants.bc_manager_servlet_port_min_range); + Constants.bc_manager_servlet_port_min_range);
Constants.subcomponent_port = String.valueOf(rand
.nextInt(Constants.subcomponent_port_max_range - Constants.subcomponent_port_min_range + 1)
+ Constants.subcomponent_port_min_range);
Constants.printer_service_port = String.valueOf(rand
.nextInt(Constants.printer_service_port_max_range - Constants.printer_service_port_min_range + 1)
+ Constants.printer_service_port_min_range);
Constants.generatedCodePath = PathResolver.createTempDir(); Constants.generatedCodePath = PathResolver.createTempDir();
Class[] classe = { BcManagerRestService.class }; Class[] classe = { BcManagerRestService.class };
...@@ -308,7 +317,8 @@ public class VsbManager { ...@@ -308,7 +317,8 @@ public class VsbManager {
vsbOutput.setinvaddr_service_port = Constants.setinvaddr_service_port; vsbOutput.setinvaddr_service_port = Constants.setinvaddr_service_port;
vsbOutput.service_port = Constants.service_port; vsbOutput.service_port = Constants.service_port;
vsbOutput.bc_manager_servlet_port = Constants.bc_manager_servlet_port; vsbOutput.bc_manager_servlet_port = Constants.bc_manager_servlet_port;
vsbOutput.printer_service_port = Constants.printer_service_port;
vsbOutput.subcomponent_port = Constants.subcomponent_port;
return vsbOutput; return vsbOutput;
} }
...@@ -743,8 +753,8 @@ public class VsbManager { ...@@ -743,8 +753,8 @@ public class VsbManager {
jsonObject.put("target_namespace", Constants.target_namespace); jsonObject.put("target_namespace", Constants.target_namespace);
jsonObject.put("service_name", Constants.soap_service_name); jsonObject.put("service_name", Constants.soap_service_name);
jsonObject.put("subcomponent_port", "1111"); jsonObject.put("subcomponent_port", Constants.subcomponent_port);
jsonObject.put("service_port", "1111"); jsonObject.put("service_port", Constants.subcomponent_port);
jsonObject.put("subcomponent_address", "127.0.0.1"); jsonObject.put("subcomponent_address", "127.0.0.1");
jsonObject.put("invocation_address", "127.0.0.1"); jsonObject.put("invocation_address", "127.0.0.1");
...@@ -803,9 +813,9 @@ public class VsbManager { ...@@ -803,9 +813,9 @@ public class VsbManager {
jsonObject.put("target_namespace", Constants.target_namespace); jsonObject.put("target_namespace", Constants.target_namespace);
jsonObject.put("service_name", Constants.soap_service_name); jsonObject.put("service_name", Constants.soap_service_name);
jsonObject.put("subcomponent_port", "1112"); jsonObject.put("subcomponent_port", Constants.subcomponent_port);
jsonObject.put("service_port", "1113"); jsonObject.put("service_port", Constants.printer_service_port);
jsonObject.put("subcomponent_address", "127.0.0.1:1111"); jsonObject.put("subcomponent_address", "127.0.0.1:"+Constants.subcomponent_port);
jsonObject.put("invocation_address", "http://127.0.0.1:1111/"); jsonObject.put("invocation_address", "http://127.0.0.1:1111/");
break; break;
......
vsb-manager-api/src/main/resources/pom-gm-soap.xml
+ 1
− 1
View file @ f42d3b5a
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<enabled>false</enabled> <enabled>false</enabled>
</releases> </releases>
<snapshots> <snapshots>
<enabled>false</enabled> <enabled>true</enabled>
</snapshots> </snapshots>
</repository> </repository>
......
vsb-manager-api/src/test/java/eu/chorevolution/vsb/manager/VsbManagerTestGidlFiles.java
+ 6
− 3
View file @ f42d3b5a
...@@ -9,7 +9,7 @@ public class VsbManagerTestGidlFiles{ ...@@ -9,7 +9,7 @@ public class VsbManagerTestGidlFiles{
public static void main(String[] args){ public static void main(String[] args){
// String interfaceDescriptionPath = "/home/pntumba/inria_code/repositories/smart-mobility-tourism/bindingcomponents/without_adaptation/bcNews/model/news-service-name.gidl"; String interfaceDescriptionPath = "/home/pntumba/inria_code/repositories/smart-mobility-tourism/bindingcomponents/without_adaptation/bcNews/model/news-service-name.gidl";
// String interfaceDescriptionPath = "/home/pntumba/inria_code/repositories/smart-mobility-tourism/bindingcomponents/without_adaptation/bcPws/model/pws-service-name.gidl"; // String interfaceDescriptionPath = "/home/pntumba/inria_code/repositories/smart-mobility-tourism/bindingcomponents/without_adaptation/bcPws/model/pws-service-name.gidl";
// String interfaceDescriptionPath = "/home/pntumba/inria_code/repositories/smart-mobility-tourism/bindingcomponents/without_adaptation/bcParking/model/parking-service-name.gidl"; // String interfaceDescriptionPath = "/home/pntumba/inria_code/repositories/smart-mobility-tourism/bindingcomponents/without_adaptation/bcParking/model/parking-service-name.gidl";
// 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/bcPoi/model/poi-service-name.gidl";
...@@ -30,14 +30,17 @@ public class VsbManagerTestGidlFiles{ ...@@ -30,14 +30,17 @@ public class VsbManagerTestGidlFiles{
// String interfaceDescriptionPath = "/home/pntumba/inria_code/workspace/gidl/WP4/TrafficverketRoadcondition.gidl"; // String interfaceDescriptionPath = "/home/pntumba/inria_code/workspace/gidl/WP4/TrafficverketRoadcondition.gidl";
// String interfaceDescriptionPath = "/home/pntumba/inria_code/workspace/gidl/WP4/TrafficverketWeather.gidl"; // String interfaceDescriptionPath = "/home/pntumba/inria_code/workspace/gidl/WP4/TrafficverketWeather.gidl";
// String interfaceDescriptionPath = "/home/pntumba/inria_code/workspace/gidl/WP4/VasttrafikGenerateOAuth2Token.gidl"; // String interfaceDescriptionPath = "/home/pntumba/inria_code/workspace/gidl/WP4/VasttrafikGenerateOAuth2Token.gidl";
String interfaceDescriptionPath = "/home/pntumba/inria_code/workspace/gidl/WP4/VasttrafikrequestDepartureBoard.gidl"; // String interfaceDescriptionPath = "/home/pntumba/inria_code/workspace/gidl/WP4/VasttrafikrequestDepartureBoard.gidl";
VsbManager vsbm = new VsbManager(); VsbManager vsbm = new VsbManager();
VsbOutput vsbOutput = vsbm.generateWar(interfaceDescriptionPath,ProtocolType.SOAP, "TrafficverketRoadcondition"); VsbOutput vsbOutput = vsbm.generateWar(interfaceDescriptionPath,ProtocolType.SOAP, "news-service-name");
System.out.println("bc_manager_servlet_port "+vsbOutput.bc_manager_servlet_port); 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_bc_port "+vsbOutput.service_bc_port);
System.out.println("service_port "+vsbOutput.service_port); System.out.println("service_port "+vsbOutput.service_port);
System.out.println("setinvaddr_service_port "+vsbOutput.setinvaddr_service_port); System.out.println("setinvaddr_service_port "+vsbOutput.setinvaddr_service_port);
System.out.println("printer_service_port "+vsbOutput.printer_service_port);
System.out.println("subcomponent_port "+vsbOutput.subcomponent_port);
} }
} }
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment