activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From martyntay...@apache.org
Subject [2/2] activemq-artemis git commit: ARTEMIS-643 wrong paths in restricted-security-client.policy
Date Wed, 20 Jul 2016 13:16:29 GMT
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.


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/f4a0763b
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/f4a0763b
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/f4a0763b

Branch: refs/heads/master
Commit: f4a0763baf6678ad16226943e9cde1d7d923691b
Parents: d1cfcdf
Author: Erich Duda <eduda@redhat.com>
Authored: Wed Jul 20 10:15:31 2016 +0200
Committer: Martyn Taylor <mtaylor@redhat.com>
Committed: Wed Jul 20 14:15:14 2016 +0100

----------------------------------------------------------------------
 .../src/test/resources/restricted-security-client.policy         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f4a0763b/tests/integration-tests/src/test/resources/restricted-security-client.policy
----------------------------------------------------------------------
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 9cc76aa..119861a 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";


Mime
View raw message