You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@river.apache.org by gt...@apache.org on 2012/05/03 21:50:08 UTC
svn commit: r1333597 - in /river/jtsk/skunk/surrogate:
src/org/apache/river/container/deployer/StarterServiceDeployer.java
testfiles/testroot/profile/default/service-starter.cfg
Author: gtrasuk
Date: Thu May 3 19:50:07 2012
New Revision: 1333597
URL: http://svn.apache.org/viewvc?rev=1333597&view=rev
Log:
Ongoing work on starter service deployer.
Tweaking the security configuration.
Modified:
river/jtsk/skunk/surrogate/src/org/apache/river/container/deployer/StarterServiceDeployer.java
river/jtsk/skunk/surrogate/testfiles/testroot/profile/default/service-starter.cfg
Modified: river/jtsk/skunk/surrogate/src/org/apache/river/container/deployer/StarterServiceDeployer.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/surrogate/src/org/apache/river/container/deployer/StarterServiceDeployer.java?rev=1333597&r1=1333596&r2=1333597&view=diff
==============================================================================
--- river/jtsk/skunk/surrogate/src/org/apache/river/container/deployer/StarterServiceDeployer.java (original)
+++ river/jtsk/skunk/surrogate/src/org/apache/river/container/deployer/StarterServiceDeployer.java Thu May 3 19:50:07 2012
@@ -364,7 +364,7 @@ public class StarterServiceDeployer {
new Certificate[0]);
log.log(Level.INFO, MessageNames.CODESOURCE_IS,
new Object[]{serviceName, serviceCodeSource});
- VirtualFileSystemClassLoader cl = createServiceClassloader(env.getServiceArchive(), serviceCodeSource);
+ VirtualFileSystemClassLoader cl = createServiceClassloader(env.getServiceRoot(), serviceCodeSource);
/*
Create a codebase context.
*/
@@ -403,7 +403,7 @@ public class StarterServiceDeployer {
String className=(String)((ASTsymbol) node.jjtGetChild(0)).getValue();
Object permissionConstructorArgs[]=new String[node.jjtGetNumChildren()-1];
for (int i = 0; i < permissionConstructorArgs.length; i++) {
- permissionConstructorArgs[i]=(String)((ASTsymbol) node.jjtGetChild(i+1)).getValue();
+ permissionConstructorArgs[i]=(String)((ASTliteral) node.jjtGetChild(i+1)).getValue();
}
Permission perm=(Permission) invokeConstructor(cl, className, permissionConstructorArgs);
perms.add(perm);
Modified: river/jtsk/skunk/surrogate/testfiles/testroot/profile/default/service-starter.cfg
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/surrogate/testfiles/testroot/profile/default/service-starter.cfg?rev=1333597&r1=1333596&r2=1333597&view=diff
==============================================================================
--- river/jtsk/skunk/surrogate/testfiles/testroot/profile/default/service-starter.cfg (original)
+++ river/jtsk/skunk/surrogate/testfiles/testroot/profile/default/service-starter.cfg Thu May 3 19:50:07 2012
@@ -20,8 +20,21 @@
// Grants given to all applications.
grant {
- java.io.FilePermission "${serviceArchive}" "read";
+ //java.io.FilePermission "${serviceArchive}" "read";
+ java.io.FilePermission "*" "read";
java.net.SocketPermission "*" "connect";
+
+ // Required for VFSFileManager
+ java.util.PropertyPermission "java.io.tmpdir" "read";
+ java.util.PropertyPermission "os.*" "read";
+ java.util.PropertyPermission "path.*" "read";
+ java.lang.RuntimePermission "getClassLoader";
+ /* net.jini.security.Security requires createSecurityManager, but we
+ don't grant 'setSecurityManager'. */
+ java.lang.RuntimePermission "createSecurityManager";
+ java.lang.RuntimePermission "getProtectionDomain";
+ java.security.SecurityPermission "getDomainCombiner";
+ java.security.SecurityPermission "createAccessControlContext";
}
classloader {