Commit 6584025a authored by Bonita CI's avatar Bonita CI
Browse files

Merge branch 'CoreProduct' into 'feat_test_api'

parents 337df76c 0ee77142
......@@ -24,12 +24,14 @@ import org.bonitasoft.studio.common.ProjectUtil;
import org.bonitasoft.studio.common.log.BonitaStudioLog;
import org.bonitasoft.studio.common.platform.tools.PlatformUtil;
import org.bonitasoft.studio.common.repository.CommonRepositoryPlugin;
import org.bonitasoft.studio.common.repository.Repository;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.Path;
public class BonitaHomeHandler {
......@@ -147,7 +149,10 @@ public class BonitaHomeHandler {
+ File.separator + "i18n");
}
public IFile getCustomPermissionMappingFile() {
return project.getFile(BONITA_HOME + "/client/tenants/" + TENANT_ID + "/conf/custom-permissions-mapping.properties");
public IFile getCustomPermissionMappingFile() throws CoreException {
final IFile file = project
.getFile(Path.fromOSString(Paths.get(BONITA_HOME, "client", "tenants", TENANT_ID, "conf", "custom-permissions-mapping.properties").toString()));
file.refreshLocal(IResource.DEPTH_ONE, Repository.NULL_PROGRESS_MONITOR);
return file;
}
}
......@@ -228,10 +228,12 @@
<unit id="org.codehaus.groovy24.feature.feature.group" version="2.9.2.xx-201509250011-e44"/>
<unit id="com.google.guava.sdk.feature.feature.group" version="11.0.1"/>
<unit id="com.google.guava.runtime.feature.feature.group" version="11.0.1"/>
<unit id="org.eclipse.m2e.feature.feature.group" version="1.5.1.20150109-1820"/>
<unit id="org.eclipse.m2e.feature.feature.group" version="1.6.2.20150902-0002"/>
<unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.6.2.20150902-0002"/>
<unit id="com.google.guava" version="15.0.0.v201403281430"/>
<unit id="org.codehaus.groovy.m2eclipse.feature.feature.group" version="2.9.2.xx-201509250011-e44"/>
<unit id="org.eclipse.m2e.jdt" version="1.5.1.20150109-1820"/>
<unit id="org.eclipse.m2e.feature.feature.group" version="1.6.2.20150902-0002"/>
<unit id="org.eclipse.m2e.jdt" version="1.6.2.20150902-0002"/>
<unit id="org.jspresso.contrib.sjsplugin.spock.feature.feature.group" version="2.12.0.201509182051"/>
</location>
</locations>
......
......@@ -151,6 +151,7 @@
<unit id="org.eclipse.sdk.feature.group" version="4.4.0.v20140925-0400"/>
<unit id="org.eclipse.emf.ecore.source.feature.group" version="2.10.1.v20140901-1043"/>
<unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.0.200.v20140512-1802"/>
<unit id="com.google.guava" version="15.0.0.v201403281430"/>
<repository location="http://download.eclipse.org/releases/luna/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
......@@ -265,11 +266,14 @@
<unit id="org.eclipse.babel.nls_datatools_pt.feature.group" version="4.4.0.v20141223043836"/>
<unit id="org.eclipse.babel.nls_technology.recommenders_de.feature.group" version="4.4.0.v20141223043836"/>
<unit id="org.eclipse.babel.nls_technology.packaging_it.feature.group" version="4.4.0.v20141223043836"/>
<unit id="org.eclipse.m2e.feature.feature.group" version="1.5.1.20150109-1820"/>
<unit id="com.google.guava" version="15.0.0.v201403281430"/>
<unit id="org.eclipse.m2e.jdt" version="1.5.1.20150109-1820"/>
<repository location="http://archive.eclipse.org/technology/babel/update-site/R0.12.1/luna"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.m2e.feature.feature.group" version="1.6.2.20150902-0002"/>
<unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.6.2.20150902-0002"/>
<unit id="org.eclipse.m2e.jdt" version="1.6.2.20150902-0002"/>
<repository location="http://download.eclipse.org/technology/m2e/releases"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.jspresso.contrib.sjsplugin.spock.feature.feature.group" version="2.12.0.201509182051"/>
<repository location="http://www.jspresso.org/external/updates-snapshot/e44"/>
......
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