Commit d7fca691 authored by Adrien's avatar Adrien
Browse files

Merge branch 'master' of git@github.com:bonitasoft/bonita-studio-sp.git

into dev

Conflicts:
	community/bundles/plugins/org.bonitasoft.studio.actors/messages_es.properties
	community/bundles/plugins/org.bonitasoft.studio.actors/messages_fr.properties
	community/pom.xml
parents 603ceb55 f4950d86
......@@ -178,7 +178,7 @@ importOrganizationSuccessfullTitle=Importaci\u00f3n exitosa
importOrganizationSuccessfullMessage=La organizaci\u00f3n se ha importado correctamente.
errorSelectionGroups=No puede seleccionar un grupo y uno de sus afiliados.
exportActorFilterTitle=Filtro de exportaci\u00f3n de actor
UserDoesntExistError={0} does not exist in the current organization.
UserDoesntExistError={0} no existe en la organizaci\u00f3n actual.
addActor=Agregar...
initiator=Iniciador
newActor=Nuevo actor
......
......@@ -178,7 +178,7 @@ importOrganizationSuccessfullTitle=Import r\u00e9ussie
importOrganizationSuccessfullMessage=Organisation a \u00e9t\u00e9 import\u00e9e avec succ\u00e8s.
errorSelectionGroups=Vous ne pouvez pas s\u00e9lectionner un groupe et un de ses affili\u00e9s.
exportActorFilterTitle=Exporter le filtre d'acteur
UserDoesntExistError={0} does not exist in the current organization.
UserDoesntExistError={0} n\u2019existe pas dans l\u2019organisation actuelle.
addActor=Ajouter...
initiator=Initiateur
newActor=Cr\u00e9ation d'acteur
......
......@@ -262,7 +262,8 @@ public class UIDesignerServerManager implements IBonitaProjectListener {
private static boolean isPortAvailable(int port) {
try {
return org.eclipse.wst.server.core.util.SocketUtil.isPortInUse(InetAddress.getByName("localhost"), port);
return org.eclipse.wst.server.core.util.SocketUtil.isPortInUse(InetAddress.getByName("localhost"), port)
|| org.eclipse.wst.server.core.util.SocketUtil.isPortInUse(port);
} catch (UnknownHostException e) {
return org.eclipse.wst.server.core.util.SocketUtil.isPortInUse(port);
}
......
......@@ -131,7 +131,7 @@ public class PortConfigurator {
protected boolean isPortInUse(final int port) {
try {
return SocketUtil.isPortInUse(InetAddress.getByName("localhost"), port);
return SocketUtil.isPortInUse(InetAddress.getByName("localhost"), port) || SocketUtil.isPortInUse(port);
} catch (UnknownHostException e) {
return SocketUtil.isPortInUse(port);
}
......
......@@ -87,7 +87,8 @@ public class WatchdogManager {
private boolean portIsUsed() {
try {
return SocketUtil.isPortInUse(InetAddress.getByName("localhost"), WATCHDOG_PORT);
return SocketUtil.isPortInUse(InetAddress.getByName("localhost"), WATCHDOG_PORT)
|| SocketUtil.isPortInUse(WATCHDOG_PORT);
} catch (UnknownHostException e) {
return SocketUtil.isPortInUse(WATCHDOG_PORT);
}
......
......@@ -19,6 +19,7 @@
<filters.version>${project.version}</filters.version>
<platform.version>${project.parent.version}</platform.version>
<watchdog.version>7.2.0</watchdog.version>
<image-overlay-plugin.version>1.0.8</image-overlay-plugin.version>
<p2MirrorUrl>http://repositories.rd.lan/p2/4.10.1</p2MirrorUrl>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<sonar.exclusions>
......@@ -53,7 +54,7 @@
<plugin>
<groupId>org.bonitasoft.maven</groupId>
<artifactId>image-overlay-plugin</artifactId>
<version>1.0.8</version>
<version>${image-overlay-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
......
Markdown is supported
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