From f4a0763baf6678ad16226943e9cde1d7d923691b Mon Sep 17 00:00:00 2001 From: Erich Duda Date: Wed, 20 Jul 2016 10:15:31 +0200 Subject: [PATCH] ARTEMIS-643 wrong paths in restricted-security-client.policy user.dir points to current working directory from which the maven command was invoked. If the command is not invoked from project root directory, the generated paths are wrong what causes failures of some tests. --- .../src/test/resources/restricted-security-client.policy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/integration-tests/src/test/resources/restricted-security-client.policy b/tests/integration-tests/src/test/resources/restricted-security-client.policy index 9cc76aa501..119861acb3 100644 --- a/tests/integration-tests/src/test/resources/restricted-security-client.policy +++ b/tests/integration-tests/src/test/resources/restricted-security-client.policy @@ -23,8 +23,8 @@ grant { permission java.net.SocketPermission "*:1024-", "connect"; // Note1: normally, we don't need this permission since the applet allows reading jars loaded by the applet // Note2: Which of the following two java.io.FilePermission is necessary depends on the exact Maven command - permission java.io.FilePermission "${user.dir}/artemis-core-client/target/classes/-", "read"; - permission java.io.FilePermission "${user.dir}/artemis-core-client/target/artemis-core-client-${project.version}.jar", "read"; + permission java.io.FilePermission "${activemq.basedir}/artemis-core-client/target/classes/-", "read"; + permission java.io.FilePermission "${activemq.basedir}/artemis-core-client/target/artemis-core-client-${project.version}.jar", "read"; permission java.util.PropertyPermission "activemq.version.property.filename", "read"; permission java.util.PropertyPermission "activemq.artemis.client.global.thread.pool.max.size", "read"; permission java.util.PropertyPermission "activemq.artemis.client.global.scheduled.thread.pool.core.size", "read";