Merge "[releng] Remove obsolete p2 configuration after dropping jboss use"
diff --git a/plugins/org.eclipse.papyrus.gamification/.classpath b/plugins/org.eclipse.papyrus.gamification/.classpath
index a44b9eb..16bf709 100644
--- a/plugins/org.eclipse.papyrus.gamification/.classpath
+++ b/plugins/org.eclipse.papyrus.gamification/.classpath
@@ -1,6 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+ <attributes>
+ <attribute name="module" value="true"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="lib" path="lib/adapter-rxjava2-2.9.0.jar"/>
diff --git a/plugins/org.eclipse.papyrus.gamification/META-INF/MANIFEST.MF b/plugins/org.eclipse.papyrus.gamification/META-INF/MANIFEST.MF
index 5199e39..c14ae6f 100644
--- a/plugins/org.eclipse.papyrus.gamification/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.papyrus.gamification/META-INF/MANIFEST.MF
@@ -28,8 +28,8 @@
org.eclipse.papyrus.junit.utils;bundle-version="2.3.0",
com.google.guava;bundle-version="30.1.0",
org.eclipse.jface,
- com.google.gson;bundle-version="2.8.8",
- org.eclipse.papyrus.uml.perspective;bundle-version="2.0.0"
+ org.eclipse.papyrus.uml.perspective;bundle-version="2.0.0",
+ com.google.gson
Bundle-RequiredExecutionEnvironment: JavaSE-11
Automatic-Module-Name: org.eclipse.papyrus.gamification
Import-Package: org.eclipse.papyrus.editor,
diff --git a/plugins/org.eclipse.papyrus.gamification/src/org/eclipse/papyrus/gamification/Preferences.java b/plugins/org.eclipse.papyrus.gamification/src/org/eclipse/papyrus/gamification/Preferences.java
index 081e837..3b37c6a 100644
--- a/plugins/org.eclipse.papyrus.gamification/src/org/eclipse/papyrus/gamification/Preferences.java
+++ b/plugins/org.eclipse.papyrus.gamification/src/org/eclipse/papyrus/gamification/Preferences.java
@@ -3,9 +3,9 @@
public class Preferences {
public static final boolean IS_MOCK = true;
- public static final String BASE_URL = "https://dev.smartcommunitylab.it";
- public static final String AUTH_USERNAME = "papyrus";
- public static final String AUTH_PASSWORD = "papyrus0704!";
+ public static final String BASE_URL = "https://gamification-test.platform.smartcommunitylab.it";
+ public static final String AUTH_USERNAME = "ge-test-admin";
+ public static final String AUTH_PASSWORD = "7Nd31B5MzGWUZmYhUbtQ";
public static final String INTRO_VIDEO_URL = "https://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4";
public static final String INTRO_VIDEO_PLACEHOLDER = "https://geo.img.pmdstatic.net/fit/http.3A.2F.2Fprd2-bone-image.2Es3-website-eu-west-1.2Eamazonaws.2Ecom.2Fgeo.2F2019.2F10.2F11.2Fc2d7f3c4-4905-4665-aae4-8d86ea1cb8c7.2Ejpeg/640x480/cr/wqkgUGl4YWJheSAvIEdFTw%3D%3D/picture.jpg";
diff --git a/plugins/org.eclipse.papyrus.gamification/src/org/eclipse/papyrus/gamification/data/api/GameManagerService.java b/plugins/org.eclipse.papyrus.gamification/src/org/eclipse/papyrus/gamification/data/api/GameManagerService.java
index 2073131..a69aec3 100644
--- a/plugins/org.eclipse.papyrus.gamification/src/org/eclipse/papyrus/gamification/data/api/GameManagerService.java
+++ b/plugins/org.eclipse.papyrus.gamification/src/org/eclipse/papyrus/gamification/data/api/GameManagerService.java
@@ -21,18 +21,18 @@
@GET
Single<List<Series>> getAvailableSeries(@Url String fullUrl);
- @GET("/gamification-v3/data/game/{gameId}/player/{playerId}")
+ @GET("/gamification/data/game/{gameId}/player/{playerId}")
Single<PlayerStatusJson> getPlayerStatus(@Path("gameId") String gameId, @Path("playerId") String playerId);
// POST /exec/game/{gameId}/action/{actionId}
- @POST("/gamification-v3/exec/game/{gameId}/action/{actionId}")
+ @POST("/gamification/exec/game/{gameId}/action/{actionId}")
Completable submitGameResult(@Path("gameId") String gameId,
@Path("actionId") String actionId,
@Body ActionRequestContent content);
/// data/game/{gameId}/player/{playerId}/custom
- @PUT("/gamification-v3/data/game/{gameId}/player/{playerId}/custom")
+ @PUT("/gamification/data/game/{gameId}/player/{playerId}/custom")
Completable setPlayerCustomData(@Path("gameId") String gameId, @Path("playerId") String playerId, @Body CustomDataJson content);
diff --git a/plugins/org.eclipse.papyrus.gamification/src/org/eclipse/papyrus/gamification/data/api/LoginService.java b/plugins/org.eclipse.papyrus.gamification/src/org/eclipse/papyrus/gamification/data/api/LoginService.java
index 3a68503..7602156 100644
--- a/plugins/org.eclipse.papyrus.gamification/src/org/eclipse/papyrus/gamification/data/api/LoginService.java
+++ b/plugins/org.eclipse.papyrus.gamification/src/org/eclipse/papyrus/gamification/data/api/LoginService.java
@@ -18,18 +18,18 @@
public interface LoginService {
- @GET("/gamification-v3/model/game")
+ @GET("/gamification/model/game")
Single<List<GameJson>> getAllGames();
- @GET("/gamification-v3/gengine/state/{gameId}")
+ @GET("/gamification/gengine/state/{gameId}")
Single<PlayerListJson> getPlayersOfGame(@Path("gameId") String gameId, @Query("size") int sizeOfPage);
- @POST("/gamification-v3/data/game/{gameId}/player/{playerId}")
+ @POST("/gamification/data/game/{gameId}/player/{playerId}")
Completable createPlayerForGame(@Path("gameId") String gameId,
@Path("playerId") String playerId,
@Body UserCreationRequest content);
- @POST("/gamification-v3/exec/game/{gameId}/action/{actionId}")
+ @POST("/gamification/exec/game/{gameId}/action/{actionId}")
Completable invitePlayer(@Path("gameId") String gameId,
@Path("actionId") String actionId,
@Body SponsorRequest content);
