diff --git a/protocol-pool/gm-soap/pom.xml b/protocol-pool/gm-soap/pom.xml
index e10ac1288b1752ca1b78d592032b9aa1beda2976..c6c0b9039ec1e603ae990ce7a3f2ec61b6b5ee1d 100644
--- a/protocol-pool/gm-soap/pom.xml
+++ b/protocol-pool/gm-soap/pom.xml
@@ -58,11 +58,18 @@
</dependency>
<!-- Jersey, JAX-RS -->
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-client</artifactId>
+ <version>1.12</version>
+ </dependency>
+
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-client</artifactId>
<version>2.21</version>
</dependency>
+
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
diff --git a/vsb-manager-api/src/main/java/eu/chorevolution/vsb/manager/api/VsbManager.java b/vsb-manager-api/src/main/java/eu/chorevolution/vsb/manager/api/VsbManager.java
index 9eff9330473938d171e34909274f28c31b688cd5..b023cba10618b56bf69fd221d73b0e415a508478 100644
--- a/vsb-manager-api/src/main/java/eu/chorevolution/vsb/manager/api/VsbManager.java
+++ b/vsb-manager-api/src/main/java/eu/chorevolution/vsb/manager/api/VsbManager.java
@@ -226,7 +226,7 @@ public class VsbManager {
warGenerator.addPackage(eu.chorevolution.vsb.gmdl.utils.Operation.class.getPackage());
warGenerator.addPackage(eu.chorevolution.vsb.gmdl.utils.enums.OperationType.class.getPackage());
- warGenerator.addPackage(eu.chorevolution.vsb.gm.protocols.coap.BcCoapGenerator.class.getPackage());
+// warGenerator.addPackage(eu.chorevolution.vsb.gm.protocols.coap.BcCoapGenerator.class.getPackage());
warGenerator.addPackage(eu.chorevolution.vsb.gm.protocols.soap.BcSoapGenerator.class.getPackage());
warGenerator.addPackage(eu.chorevolution.vsb.gm.protocols.rest.BcRestGenerator.class.getPackage());
warGenerator.addPackage(eu.chorevolution.vsb.bc.manager.BcManagerRestService.class.getPackage());
@@ -236,9 +236,8 @@ public class VsbManager {
warGenerator.addPackage(eu.chorevolution.vsb.bc.setinvaddrservice.BaseService.class.getPackage());
warGenerator.addPackage(eu.chorevolution.vsb.gm.protocols.Manageable.class.getPackage());
- String vsb_manager_pomxml = new File(".").getAbsolutePath() + File.separator + "pom.xml";
- String gm_soap_pomxml = new File(".").getAbsolutePath() + File.separator + ".." + File.separator
- + "protocol-pool" + File.separator + "gm-soap" + File.separator + "pom-gm-soap.xml";
+ String vsb_manager_pomxml = new File(".").getAbsolutePath() + File.separator + "src"+File.separator+"main"+File.separator+"resources"+File.separator+"pom-vsb-manager.xml";
+ String gm_soap_pomxml = new File(".").getAbsolutePath() + File.separator + "src"+File.separator+"main"+File.separator+"resources"+File.separator+"pom-gm-soap.xml";
// String gm_coap_pomxml = new File(".").getAbsolutePath() + File.separator+".." + File.separator
// + "protocol-pool" + File.separator + "gm-coap" + File.separator + "pom.xml";
// String gm_dpws_pomxml = new File(".").getAbsolutePath() + File.separator+".." + File.separator
@@ -247,10 +246,8 @@ public class VsbManager {
// + "protocol-pool" + File.separator + "gm-websocket" + File.separator + "pom.xml";
// String gm_mqtt_pomxl = new File(".").getAbsolutePath() + File.separator+".." + File.separator
// + "protocol-pool" + File.separator + "gm-mqtt" + File.separator + "pom.xml";
- String gm_rest_pomxl = new File(".").getAbsolutePath() + File.separator+".." + File.separator
- + "protocol-pool" + File.separator + "gm-rest" + File.separator + "pom-gm-rest.xml";
- String artifact_pomxl = new File(".").getAbsolutePath() + File.separator+".." + File.separator
- + "/bc-generators" + File.separator + "artifact-generators" + File.separator + "pom-artifact.xml";
+ String gm_rest_pomxl = new File(".").getAbsolutePath() + File.separator + "src"+File.separator+"main"+File.separator+"resources"+File.separator+"pom-gm-rest.xml";
+ String artifact_pomxl = new File(".").getAbsolutePath() + File.separator + "src"+File.separator+"main"+File.separator+"resources"+File.separator+"pom-artifact.xml";
if (STARTING_FROM_JAR) {
diff --git a/vsb-manager-api/src/main/resources/pom-artifact.xml b/vsb-manager-api/src/main/resources/pom-artifact.xml
index 7deb60b288d056693d9708ec6acc758617998002..95bb15103d0eeb66d1c87b7ae8dcdd15611ae328 100644
--- a/vsb-manager-api/src/main/resources/pom-artifact.xml
+++ b/vsb-manager-api/src/main/resources/pom-artifact.xml
@@ -9,7 +9,7 @@
<artifactId>artifact-generators</artifactId>
<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>
+ <!-- <repositories>
<repository>
<id>repository.jboss.org</id>
<name>JBoss Repository</name>
@@ -20,7 +20,7 @@
<name>Public online Restlet repository</name>
<url>http://maven.restlet.org</url>
</repository>
- </repositories>
+ </repositories> -->
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring.version>3.2.3.RELEASE</spring.version>
@@ -28,20 +28,6 @@
<jax.ws.rs>2.0.1</jax.ws.rs>
<version.shrinkwrap.resolvers>2.2.6</version.shrinkwrap.resolvers>
</properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
- <configuration>
- <source>1.8</source>
- <target>1.8</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
<dependencies>
<!-- Chorevolution -->
<dependency>
diff --git a/vsb-manager-api/src/main/resources/pom-gm-rest.xml b/vsb-manager-api/src/main/resources/pom-gm-rest.xml
index bab255ec433e90bbe94fa20515a23d70b20f82c9..dd86d5257a66689b356edaa03b5f33c87b7a2f1a 100644
--- a/vsb-manager-api/src/main/resources/pom-gm-rest.xml
+++ b/vsb-manager-api/src/main/resources/pom-gm-rest.xml
@@ -9,14 +9,14 @@
</parent>
<artifactId>gm-rest</artifactId>
<name>gm-rest</name>
- <repositories>
- <!-- REST library: Restlet -->
+ <!-- <repositories>
+ REST library: Restlet
<repository>
<id>maven-restlet</id>
<name>Public online Restlet repository</name>
<url>http://maven.restlet.org</url>
</repository>
- </repositories>
+ </repositories> -->
<dependencies>
diff --git a/vsb-manager-api/src/main/resources/pom-gm-soap.xml b/vsb-manager-api/src/main/resources/pom-gm-soap.xml
index 9e967fcd7f7000f2627cc891cd40be90c80f9d19..3b1a8cdc11a4d4d9d41d330f1c2cd83a4ba48fe9 100644
--- a/vsb-manager-api/src/main/resources/pom-gm-soap.xml
+++ b/vsb-manager-api/src/main/resources/pom-gm-soap.xml
@@ -18,10 +18,10 @@
<id>ow2-nexus-snapshots</id>
<url>http://repository.ow2.org/nexus/content/repositories/snapshots/</url>
<releases>
- <enabled>true</enabled>
+ <enabled>false</enabled>
</releases>
<snapshots>
- <enabled>true</enabled>
+ <enabled>false</enabled>
</snapshots>
</repository>
@@ -55,6 +55,12 @@
</dependency>
<!-- Jersey, JAX-RS -->
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-client</artifactId>
+ <version>1.12</version>
+ </dependency>
+
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-client</artifactId>
diff --git a/vsb-manager-api/src/main/resources/pom-vsb-manager.xml b/vsb-manager-api/src/main/resources/pom-vsb-manager.xml
index 9045d6186758d64b4c7a1a7f3339abd5fb45664e..c1498a046dcd45e8f923677fc696ec6a6230ab43 100644
--- a/vsb-manager-api/src/main/resources/pom-vsb-manager.xml
+++ b/vsb-manager-api/src/main/resources/pom-vsb-manager.xml
@@ -9,11 +9,11 @@
<description>vsb-manager expose a REST interface to generate a Binding-Component WAR based on the description (GMDL) of the system (client, server, publisher, consumer etc.) to bind</description>
<repositories>
<!-- REST library: Restlet -->
- <repository>
+ <!-- <repository>
<id>maven-restlet</id>
<name>Public online Restlet repository</name>
<url>http://maven.restlet.org</url>
- </repository>
+ </repository> -->
<!-- VSB library: eu.chorevolution.vsb <repository> <id>ow2-releases</id>
<url>http://repository.ow2.org/nexus/content/repositories/releases/</url>
@@ -25,10 +25,10 @@
<id>ow2-nexus-snapshots</id>
<url>http://repository.ow2.org/nexus/content/repositories/snapshots/</url>
<releases>
- <enabled>true</enabled>
+ <enabled>false</enabled>
</releases>
<snapshots>
- <enabled>true</enabled>
+ <enabled>false</enabled>
</snapshots>
</repository>
diff --git a/vsb-manager-api/src/test/resources/pom-vsb-manager.xml b/vsb-manager-api/src/test/resources/pom-vsb-manager.xml
deleted file mode 100644
index 9045d6186758d64b4c7a1a7f3339abd5fb45664e..0000000000000000000000000000000000000000
--- a/vsb-manager-api/src/test/resources/pom-vsb-manager.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>eu.chorevolution.vsb</groupId>
- <artifactId>vsb-manager-api</artifactId>
- <name>vsb-manager-api</name>
- <packaging>jar</packaging>
- <version>2.0.1-SNAPSHOT</version>
- <description>vsb-manager expose a REST interface to generate a Binding-Component WAR based on the description (GMDL) of the system (client, server, publisher, consumer etc.) to bind</description>
- <repositories>
- <!-- REST library: Restlet -->
- <repository>
- <id>maven-restlet</id>
- <name>Public online Restlet repository</name>
- <url>http://maven.restlet.org</url>
- </repository>
-
- <!-- VSB library: eu.chorevolution.vsb <repository> <id>ow2-releases</id>
- <url>http://repository.ow2.org/nexus/content/repositories/releases/</url>
- <releases> <enabled>true</enabled> </releases> <snapshots> <enabled>true</enabled>
- </snapshots> </repository> -->
-
- <!-- VSB library: eu.chorevolution.vsb -->
- <repository>
- <id>ow2-nexus-snapshots</id>
- <url>http://repository.ow2.org/nexus/content/repositories/snapshots/</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
-
- <!-- Maven Central repository -->
- <!-- <repository>
- <id>central</id>
- <name>Maven Central Repository</name>
- <url>http://repo1.maven.org/maven2</url>
- </repository> -->
-
- </repositories>
-
- <dependencies>
-
- <!-- RestLet -->
- <dependency>
- <groupId>org.restlet.jse</groupId>
- <artifactId>org.restlet</artifactId>
- <version>2.3.1</version>
- </dependency>
- <!-- Chorevolution -->
- <dependency>
- <groupId>eu.chorevolution.vsb</groupId>
- <artifactId>gmdl-utils</artifactId>
- <version>2.0.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>eu.chorevolution.vsb</groupId>
- <artifactId>artifact-generators</artifactId>
- <version>2.0.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>eu.chorevolution.vsb</groupId>
- <artifactId>gm-rest</artifactId>
- <version>2.0.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>eu.chorevolution.vsb</groupId>
- <artifactId>gm-soap</artifactId>
- <version>2.0.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>eu.chorevolution.vsb</groupId>
- <artifactId>service-parser</artifactId>
- <version>2.0.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>eu.chorevolution.vsb</groupId>
- <artifactId>bc-manager</artifactId>
- <version>2.0.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.json</groupId>
- <artifactId>json</artifactId>
- <version>20090211</version>
- </dependency>
- <dependency>
- <groupId>com.googlecode.json-simple</groupId>
- <artifactId>json-simple</artifactId>
- <version>1.1.1</version>
- </dependency>
- </dependencies>
-</project>