Menu
▾
▴
[Jnode-svn-commits] SF.net SVN: jnode:[5752] trunk
|
From: <fd...@us...> - 2010-05-16 16:52:05
|
Revision: 5752
http://jnode.svn.sourceforge.net/jnode/?rev=5752&view=rev
Author: fduminy
Date: 2010-05-16 16:51:58 +0000 (Sun, 16 May 2010)
Log Message:
-----------
removed package/plugin dependency cycle org.jnode.security <-> org.jnode.plugin by moving JNodePermission class to its own package/plugin (org.jnode.permission)
Signed-off-by: Fabien DUMINY <fab...@we...>
Modified Paths:
--------------
trunk/all/conf/system-plugin-list.xml
trunk/builder/src/builder/org/jnode/build/AbstractBootImageBuilder.java
trunk/cli/descriptors/org.jnode.command.dev.ant.xml
trunk/cli/descriptors/org.jnode.command.system.xml
trunk/core/descriptors/com.sun.tools.javac.xml
trunk/core/descriptors/org.apache.tools.ant.xml
trunk/core/descriptors/org.classpath.ext.security.xml
trunk/core/descriptors/org.classpath.ext.xml.ws.tools.xml
trunk/core/descriptors/org.classpath.tools.xml
trunk/core/descriptors/org.jnode.debugger.xml
trunk/core/descriptors/org.jnode.driver.bus.pci.xml
trunk/core/descriptors/org.jnode.driver.system.acpi.xml
trunk/core/descriptors/org.jnode.driver.xml
trunk/core/descriptors/org.jnode.system.repository.xml
trunk/core/descriptors/sun.tools.xml
trunk/core/src/classpath/vm/java/lang/NativeClassLoader.java
trunk/core/src/classpath/vm/java/lang/ThreadHelper.java
trunk/core/src/core/org/jnode/plugin/PluginLoader.java
trunk/core/src/core/org/jnode/plugin/PluginSecurityConstants.java
trunk/core/src/core/org/jnode/plugin/manager/DefaultPluginManager.java
trunk/core/src/core/org/jnode/vm/Unsafe.java
trunk/core/src/core/org/jnode/vm/VmArchitecture.java
trunk/core/src/core/org/jnode/vm/VmSystem.java
trunk/core/src/core/org/jnode/vm/classmgr/VmType.java
trunk/fs/descriptors/org.jnode.fs.command.xml
trunk/fs/descriptors/org.jnode.fs.jifs.command.xml
trunk/fs/descriptors/org.jnode.fs.jifs.def.xml
trunk/fs/descriptors/org.jnode.fs.jifs.xml
trunk/net/descriptors/org.jnode.net.ipv4.xml
trunk/shell/descriptors/js.xml
trunk/shell/descriptors/org.beanshell.xml
trunk/shell/descriptors/org.jnode.shell.bjorne.xml
trunk/shell/descriptors/org.jnode.shell.command.bsh.xml
trunk/shell/descriptors/org.jnode.test.shell.xml
Added Paths:
-----------
trunk/core/descriptors/org.jnode.permission.xml
trunk/core/src/core/org/jnode/permission/
trunk/core/src/core/org/jnode/permission/JNodePermission.java
Removed Paths:
-------------
trunk/core/src/core/org/jnode/security/JNodePermission.java
Modified: trunk/all/conf/system-plugin-list.xml
===================================================================
--- trunk/all/conf/system-plugin-list.xml 2010-05-16 16:50:07 UTC (rev 5751)
+++ trunk/all/conf/system-plugin-list.xml 2010-05-16 16:51:58 UTC (rev 5752)
@@ -11,6 +11,7 @@
<plugin id="rt"/>
<plugin id="rt.vm"/>
+ <plugin id="org.jnode.permission"/>
<plugin id="org.jnode.runtime"/>
<plugin id="org.jnode.runtime.core"/>
<plugin id="org.jnode.runtime.core.bootlog"/>
Modified: trunk/builder/src/builder/org/jnode/build/AbstractBootImageBuilder.java
===================================================================
--- trunk/builder/src/builder/org/jnode/build/AbstractBootImageBuilder.java 2010-05-16 16:50:07 UTC (rev 5751)
+++ trunk/builder/src/builder/org/jnode/build/AbstractBootImageBuilder.java 2010-05-16 16:51:58 UTC (rev 5752)
@@ -1446,6 +1446,7 @@
addCompileHighOptLevel("org.jnode.boot");
addCompileHighOptLevel("org.jnode.bootlog");
addCompileHighOptLevel("org.jnode.naming");
+ addCompileHighOptLevel("org.jnode.permission");
addCompileHighOptLevel("org.jnode.plugin");
addCompileHighOptLevel("org.jnode.plugin.manager");
addCompileHighOptLevel("org.jnode.plugin.model");
Modified: trunk/cli/descriptors/org.jnode.command.dev.ant.xml
===================================================================
--- trunk/cli/descriptors/org.jnode.command.dev.ant.xml 2010-05-16 16:50:07 UTC (rev 5751)
+++ trunk/cli/descriptors/org.jnode.command.dev.ant.xml 2010-05-16 16:51:58 UTC (rev 5752)
@@ -29,7 +29,7 @@
<permission class="java.lang.RuntimePermission" name="createClassLoader" actions="*" />
<permission class="java.lang.RuntimePermission" name="setIO" actions="*" />
<permission class="java.lang.RuntimePermission" name="exitVM" actions="*" />
- <permission class="org.jnode.security.JNodePermission" name="getVmClass" actions="*" />
+ <permission class="org.jnode.permission.JNodePermission" name="getVmClass" actions="*" />
<permission class="java.util.PropertyPermission" name="*" actions="read,write"/>
</extension>
Modified: trunk/cli/descriptors/org.jnode.command.system.xml
===================================================================
--- trunk/cli/descriptors/org.jnode.command.system.xml 2010-05-16 16:50:07 UTC (rev 5751)
+++ trunk/cli/descriptors/org.jnode.command.system.xml 2010-05-16 16:51:58 UTC (rev 5752)
@@ -304,13 +304,13 @@
<permission class="java.lang.RuntimePermission" name="setContextClassLoader"/>
<permission class="java.lang.RuntimePermission" name="modifyThreadGroup"/>
<permission class="java.io.FilePermission" name="<<ALL FILES>>" actions="read,write"/>
- <permission class="org.jnode.security.JNodePermission" name="createPluginLoader"/>
- <permission class="org.jnode.security.JNodePermission" name="loadPlugin"/>
- <permission class="org.jnode.security.JNodePermission" name="unloadPlugin"/>
- <permission class="org.jnode.security.JNodePermission" name="stopPlugin"/>
- <permission class="org.jnode.security.JNodePermission" name="halt"/>
- <permission class="org.jnode.security.JNodePermission" name="getVmThread"/>
- <permission class="org.jnode.security.JNodePermission" name="getVmClass"/>
+ <permission class="org.jnode.permission.JNodePermission" name="createPluginLoader"/>
+ <permission class="org.jnode.permission.JNodePermission" name="loadPlugin"/>
+ <permission class="org.jnode.permission.JNodePermission" name="unloadPlugin"/>
+ <permission class="org.jnode.permission.JNodePermission" name="stopPlugin"/>
+ <permission class="org.jnode.permission.JNodePermission" name="halt"/>
+ <permission class="org.jnode.permission.JNodePermission" name="getVmThread"/>
+ <permission class="org.jnode.permission.JNodePermission" name="getVmClass"/>
<permission class="java.lang.reflect.ReflectPermission" name="suppressAccessChecks"/>
</extension>
Modified: trunk/core/descriptors/com.sun.tools.javac.xml
===================================================================
--- trunk/core/descriptors/com.sun.tools.javac.xml 2010-05-16 16:50:07 UTC (rev 5751)
+++ trunk/core/descriptors/com.sun.tools.javac.xml 2010-05-16 16:51:58 UTC (rev 5752)
@@ -64,8 +64,8 @@
<permission class="java.lang.RuntimePermission" name="createClassLoader"/>
<permission class="java.lang.RuntimePermission" name="setContextClassLoader"/>
<permission class="java.lang.RuntimePermission" name="modifyThreadGroup"/>
- <permission class="org.jnode.security.JNodePermission" name="getVmThread"/>
- <permission class="org.jnode.security.JNodePermission" name="getVmClass"/>
+ <permission class="org.jnode.permission.JNodePermission" name="getVmThread"/>
+ <permission class="org.jnode.permission.JNodePermission" name="getVmClass"/>
<permission class="java.net.SocketPermission" name="*" actions="resolve"/>
<permission class="java.net.SocketPermission" name="*:0-" actions="connect,resolve"/>
<permission class="java.lang.RuntimePermission" name="writeFileDescriptor"/>
Modified: trunk/core/descriptors/org.apache.tools.ant.xml
===================================================================
--- trunk/core/descriptors/org.apache.tools.ant.xml 2010-05-16 16:50:07 UTC (rev 5751)
+++ trunk/core/descriptors/org.apache.tools.ant.xml 2010-05-16 16:51:58 UTC (rev 5752)
@@ -36,7 +36,7 @@
<permission class="java.lang.RuntimePermission" name="setIO" actions="*" />
<permission class="java.lang.RuntimePermission" name="exitVM" actions="*" />
<permission class="java.lang.RuntimePermission" name="createClassLoader" actions="*" />
- <permission class="org.jnode.security.JNodePermission" name="getVmClass" actions="*" />
+ <permission class="org.jnode.permission.JNodePermission" name="getVmClass" actions="*" />
<permission class="java.util.PropertyPermission" name="*" actions="read,write"/>
</extension>
</plugin>
\ No newline at end of file
Modified: trunk/core/descriptors/org.classpath.ext.security.xml
===================================================================
--- trunk/core/descriptors/org.classpath.ext.security.xml 2010-05-16 16:50:07 UTC (rev 5751)
+++ trunk/core/descriptors/org.classpath.ext.security.xml 2010-05-16 16:51:58 UTC (rev 5752)
@@ -62,8 +62,8 @@
<permission class="java.lang.RuntimePermission" name="setContextClassLoader"/>
<permission class="java.lang.RuntimePermission" name="modifyThreadGroup"/>
<permission class="java.io.FilePermission" name="<<ALL FILES>>" actions="read,write"/>
- <permission class="org.jnode.security.JNodePermission" name="getVmThread"/>
- <permission class="org.jnode.security.JNodePermission" name="getVmClass"/>
+ <permission class="org.jnode.permission.JNodePermission" name="getVmThread"/>
+ <permission class="org.jnode.permission.JNodePermission" name="getVmClass"/>
<permission class="java.net.SocketPermission" name="*" actions="resolve"/>
<permission class="java.net.SocketPermission" name="*:0-" actions="connect,resolve"/>
<permission class="java.lang.RuntimePermission" name="writeFileDescriptor"/>
Modified: trunk/core/descriptors/org.classpath.ext.xml.ws.tools.xml
===================================================================
--- trunk/core/descriptors/org.classpath.ext.xml.ws.tools.xml 2010-05-16 16:50:07 UTC (rev 5751)
+++ trunk/core/descriptors/org.classpath.ext.xml.ws.tools.xml 2010-05-16 16:51:58 UTC (rev 5752)
@@ -98,8 +98,8 @@
<permission class="java.lang.RuntimePermission" name="createClassLoader"/>
<permission class="java.lang.RuntimePermission" name="setContextClassLoader"/>
<permission class="java.lang.RuntimePermission" name="modifyThreadGroup"/>
- <permission class="org.jnode.security.JNodePermission" name="getVmThread"/>
- <permission class="org.jnode.security.JNodePermission" name="getVmClass"/>
+ <permission class="org.jnode.permission.JNodePermission" name="getVmThread"/>
+ <permission class="org.jnode.permission.JNodePermission" name="getVmClass"/>
<permission class="java.net.SocketPermission" name="*" actions="resolve"/>
<permission class="java.net.SocketPermission" name="*:0-" actions="connect,resolve"/>
<permission class="java.lang.RuntimePermission" name="writeFileDescriptor"/>
Modified: trunk/core/descriptors/org.classpath.tools.xml
===================================================================
--- trunk/core/descriptors/org.classpath.tools.xml 2010-05-16 16:50:07 UTC (rev 5751)
+++ trunk/core/descriptors/org.classpath.tools.xml 2010-05-16 16:51:58 UTC (rev 5752)
@@ -36,8 +36,8 @@
<permission class="java.lang.RuntimePermission" name="setContextClassLoader"/>
<permission class="java.lang.RuntimePermission" name="modifyThreadGroup"/>
<permission class="java.io.FilePermission" name="<<ALL FILES>>" actions="read,write"/>
- <permission class="org.jnode.security.JNodePermission" name="getVmThread"/>
- <permission class="org.jnode.security.JNodePermission" name="getVmClass"/>
+ <permission class="org.jnode.permission.JNodePermission" name="getVmThread"/>
+ <permission class="org.jnode.permission.JNodePermission" name="getVmClass"/>
<permission class="java.net.SocketPermission" name="*" actions="resolve"/>
<permission class="java.net.SocketPermission" name="*:0-" actions="connect,resolve"/>
<permission class="java.lang.RuntimePermission" name="writeFileDescriptor"/>
Modified: trunk/core/descriptors/org.jnode.debugger.xml
===================================================================
--- trunk/core/descriptors/org.jnode.debugger.xml 2010-05-16 16:50:07 UTC (rev 5751)
+++ trunk/core/descriptors/org.jnode.debugger.xml 2010-05-16 16:51:58 UTC (rev 5752)
@@ -22,7 +22,7 @@
<extension point="org.jnode.security.permissions">
<permission class="java.lang.RuntimePermission" name="modifyThreadGroup"/>
<permission class="org.jnode.driver.DriverPermission" name="setPreferredListener"/>
- <permission class="org.jnode.security.JNodePermission" name="getVmThread"/>
+ <permission class="org.jnode.permission.JNodePermission" name="getVmThread"/>
</extension>
</plugin>
\ No newline at end of file
Modified: trunk/core/descriptors/org.jnode.driver.bus.pci.xml
===================================================================
--- trunk/core/descriptors/org.jnode.driver.bus.pci.xml 2010-05-16 16:50:07 UTC (rev 5751)
+++ trunk/core/descriptors/org.jnode.driver.bus.pci.xml 2010-05-16 16:51:58 UTC (rev 5752)
@@ -24,7 +24,7 @@
<extension point="org.jnode.security.permissions">
<permission class="org.jnode.system.ResourcePermission" name="ioports"/>
- <permission class="org.jnode.security.JNodePermission" name="getVmClass"/>
+ <permission class="org.jnode.permission.JNodePermission" name="getVmClass"/>
</extension>
</plugin>
\ No newline at end of file
Modified: trunk/core/descriptors/org.jnode.driver.system.acpi.xml
===================================================================
--- trunk/core/descriptors/org.jnode.driver.system.acpi.xml 2010-05-16 16:50:07 UTC (rev 5751)
+++ trunk/core/descriptors/org.jnode.driver.system.acpi.xml 2010-05-16 16:51:58 UTC (rev 5752)
@@ -25,7 +25,7 @@
</extension>
<extension point="org.jnode.security.permissions">
- <permission class="org.jnode.security.JNodePermission" name="getMemoryMap"/>
+ <permission class="org.jnode.permission.JNodePermission" name="getMemoryMap"/>
</extension>
</plugin>
\ No newline at end of file
Modified: trunk/core/descriptors/org.jnode.driver.xml
===================================================================
--- trunk/core/descriptors/org.jnode.driver.xml 2010-05-16 16:50:07 UTC (rev 5751)
+++ trunk/core/descriptors/org.jnode.driver.xml 2010-05-16 16:51:58 UTC (rev 5752)
@@ -26,7 +26,7 @@
<extension point="org.jnode.security.permissions">
<permission class="java.lang.RuntimePermission" name="getClassLoader"/>
<permission class="java.util.PropertyPermission" name="jnode.cmdline" actions="read"/>
- <permission class="org.jnode.security.JNodePermission" name="getVmClass"/>
+ <permission class="org.jnode.permission.JNodePermission" name="getVmClass"/>
</extension>
</plugin>
\ No newline at end of file
Added: trunk/core/descriptors/org.jnode.permission.xml
===================================================================
--- trunk/core/descriptors/org.jnode.permission.xml (rev 0)
+++ trunk/core/descriptors/org.jnode.permission.xml 2010-05-16 16:51:58 UTC (rev 5752)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plugin SYSTEM "jnode.dtd">
+
+<plugin id="org.jnode.permission"
+ name="JNode specific permissions"
+ version="@VERSION@"
+ system="true"
+ provider-name="JNode.org"
+ license-name="lgpl">
+
+ <runtime>
+ <library name="jnode-core.jar">
+ <export name="org.jnode.permission.*"/>
+ </library>
+ </runtime>
+</plugin>
\ No newline at end of file
Modified: trunk/core/descriptors/org.jnode.system.repository.xml
===================================================================
--- trunk/core/descriptors/org.jnode.system.repository.xml 2010-05-16 16:50:07 UTC (rev 5751)
+++ trunk/core/descriptors/org.jnode.system.repository.xml 2010-05-16 16:51:58 UTC (rev 5752)
@@ -18,7 +18,7 @@
</runtime>
<extension point="org.jnode.security.permissions">
- <permission class="org.jnode.security.JNodePermission" name="createPluginLoader"/>
+ <permission class="org.jnode.permission.JNodePermission" name="createPluginLoader"/>
</extension>
</plugin>
\ No newline at end of file
Modified: trunk/core/descriptors/sun.tools.xml
===================================================================
--- trunk/core/descriptors/sun.tools.xml 2010-05-16 16:50:07 UTC (rev 5751)
+++ trunk/core/descriptors/sun.tools.xml 2010-05-16 16:51:58 UTC (rev 5752)
@@ -44,8 +44,8 @@
<permission class="java.lang.RuntimePermission" name="setContextClassLoader"/>
<permission class="java.lang.RuntimePermission" name="modifyThreadGroup"/>
<permission class="java.io.FilePermission" name="<<ALL FILES>>" actions="read,write"/>
- <permission class="org.jnode.security.JNodePermission" name="getVmThread"/>
- <permission class="org.jnode.security.JNodePermission" name="getVmClass"/>
+ <permission class="org.jnode.permission.JNodePermission" name="getVmThread"/>
+ <permission class="org.jnode.permission.JNodePermission" name="getVmClass"/>
<permission class="java.net.SocketPermission" name="*" actions="resolve"/>
<permission class="java.net.SocketPermission" name="*:0-" actions="connect,resolve"/>
<permission class="java.lang.RuntimePermission" name="writeFileDescriptor"/>
Modified: trunk/core/src/classpath/vm/java/lang/NativeClassLoader.java
===================================================================
--- trunk/core/src/classpath/vm/java/lang/NativeClassLoader.java 2010-05-16 16:50:07 UTC (rev 5751)
+++ trunk/core/src/classpath/vm/java/lang/NativeClassLoader.java 2010-05-16 16:51:58 UTC (rev 5752)
@@ -24,11 +24,12 @@
import java.security.ProtectionDomain;
import java.io.InputStream;
import java.io.IOException;
+
+import org.jnode.permission.JNodePermission;
import org.jnode.vm.classmgr.VmClassLoader;
import org.jnode.vm.classmgr.VmType;
import org.jnode.vm.VmJavaClassLoader;
import org.jnode.vm.VmSystem;
-import org.jnode.security.JNodePermission;
/**
*
Modified: trunk/core/src/classpath/vm/java/lang/ThreadHelper.java
===================================================================
--- trunk/core/src/classpath/vm/java/lang/ThreadHelper.java 2010-05-16 16:50:07 UTC (rev 5751)
+++ trunk/core/src/classpath/vm/java/lang/ThreadHelper.java 2010-05-16 16:51:58 UTC (rev 5752)
@@ -20,10 +20,10 @@
package java.lang;
+import org.jnode.permission.JNodePermission;
import org.jnode.vm.scheduler.VmThread;
import org.jnode.annotation.KernelSpace;
import org.jnode.annotation.Internal;
-import org.jnode.security.JNodePermission;
/**
*
Copied: trunk/core/src/core/org/jnode/permission/JNodePermission.java (from rev 5751, trunk/core/src/core/org/jnode/security/JNodePermission.java)
===================================================================
--- trunk/core/src/core/org/jnode/permission/JNodePermission.java (rev 0)
+++ trunk/core/src/core/org/jnode/permission/JNodePermission.java 2010-05-16 16:51:58 UTC (rev 5752)
@@ -0,0 +1,52 @@
+/*
+ * $Id$
+ *
+ * Copyright (C) 2003-2010 JNode.org
+ *
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published
+ * by the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; If not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+package org.jnode.permission;
+
+import java.security.BasicPermission;
+
+/**
+ * JNode specific permission.
+ * <p/>
+ * Known permission names:
+ * <ul>
+ * <li>getVmClass
+ * <li>getVmThread
+ * </ul>
+ *
+ * @author Ewout Prangsma (ep...@us...)
+ */
+public class JNodePermission extends BasicPermission {
+
+ /**
+ * @param name
+ */
+ public JNodePermission(String name) {
+ super(name);
+ }
+
+ /**
+ * @param name
+ * @param actions
+ */
+ public JNodePermission(String name, String actions) {
+ super(name, actions);
+ }
+}
Modified: trunk/core/src/core/org/jnode/plugin/PluginLoader.java
===================================================================
--- trunk/core/src/core/org/jnode/plugin/PluginLoader.java 2010-05-16 16:50:07 UTC (rev 5751)
+++ trunk/core/src/core/org/jnode/plugin/PluginLoader.java 2010-05-16 16:51:58 UTC (rev 5752)
@@ -22,7 +22,7 @@
import java.nio.ByteBuffer;
-import org.jnode.security.JNodePermission;
+import org.jnode.permission.JNodePermission;
/**
Modified: trunk/core/src/core/org/jnode/plugin/PluginSecurityConstants.java
===================================================================
--- trunk/core/src/core/org/jnode/plugin/PluginSecurityConstants.java 2010-05-16 16:50:07 UTC (rev 5751)
+++ trunk/core/src/core/org/jnode/plugin/PluginSecurityConstants.java 2010-05-16 16:51:58 UTC (rev 5752)
@@ -20,7 +20,7 @@
package org.jnode.plugin;
-import org.jnode.security.JNodePermission;
+import org.jnode.permission.JNodePermission;
/**
* @author epr
Modified: trunk/core/src/core/org/jnode/plugin/manager/DefaultPluginManager.java
===================================================================
--- trunk/core/src/core/org/jnode/plugin/manager/DefaultPluginManager.java 2010-05-16 16:50:07 UTC (rev 5751)
+++ trunk/core/src/core/org/jnode/plugin/manager/DefaultPluginManager.java 2010-05-16 16:51:58 UTC (rev 5752)
@@ -38,6 +38,7 @@
import org.jnode.bootlog.BootLog;
import org.jnode.bootlog.BootLogInstance;
import org.jnode.naming.InitialNaming;
+import org.jnode.permission.JNodePermission;
import org.jnode.plugin.Plugin;
import org.jnode.plugin.PluginDescriptor;
import org.jnode.plugin.PluginException;
@@ -46,7 +47,6 @@
import org.jnode.plugin.PluginPrerequisite;
import org.jnode.plugin.PluginRegistry;
import org.jnode.plugin.model.PluginRegistryModel;
-import org.jnode.security.JNodePermission;
/**
* @author epr
Deleted: trunk/core/src/core/org/jnode/security/JNodePermission.java
===================================================================
--- trunk/core/src/core/org/jnode/security/JNodePermission.java 2010-05-16 16:50:07 UTC (rev 5751)
+++ trunk/core/src/core/org/jnode/security/JNodePermission.java 2010-05-16 16:51:58 UTC (rev 5752)
@@ -1,52 +0,0 @@
-/*
- * $Id$
- *
- * Copyright (C) 2003-2010 JNode.org
- *
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2.1 of the License, or
- * (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
- * License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; If not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-package org.jnode.security;
-
-import java.security.BasicPermission;
-
-/**
- * JNode specific permission.
- * <p/>
- * Known permission names:
- * <ul>
- * <li>getVmClass
- * <li>getVmThread
- * </ul>
- *
- * @author Ewout Prangsma (ep...@us...)
- */
-public class JNodePermission extends BasicPermission {
-
- /**
- * @param name
- */
- public JNodePermission(String name) {
- super(name);
- }
-
- /**
- * @param name
- * @param actions
- */
- public JNodePermission(String name, String actions) {
- super(name, actions);
- }
-}
Modified: trunk/core/src/core/org/jnode/vm/Unsafe.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/Unsafe.java 2010-05-16 16:50:07 UTC (rev 5751)
+++ trunk/core/src/core/org/jnode/vm/Unsafe.java 2010-05-16 16:51:58 UTC (rev 5752)
@@ -24,11 +24,11 @@
import java.io.StringWriter;
import org.jnode.assembler.ObjectResolver;
-import org.jnode.security.JNodePermission;
import org.jnode.annotation.Inline;
import org.jnode.annotation.Internal;
import org.jnode.annotation.KernelSpace;
import org.jnode.annotation.MagicPermission;
+import org.jnode.permission.JNodePermission;
import org.jnode.vm.classmgr.VmMethod;
import org.jnode.vm.classmgr.VmType;
import org.jnode.vm.scheduler.VmProcessor;
Modified: trunk/core/src/core/org/jnode/vm/VmArchitecture.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/VmArchitecture.java 2010-05-16 16:50:07 UTC (rev 5751)
+++ trunk/core/src/core/org/jnode/vm/VmArchitecture.java 2010-05-16 16:51:58 UTC (rev 5752)
@@ -22,7 +22,7 @@
import java.nio.ByteOrder;
-import org.jnode.security.JNodePermission;
+import org.jnode.permission.JNodePermission;
import org.jnode.system.ResourceManager;
import org.jnode.annotation.Internal;
import org.jnode.annotation.KernelSpace;
Modified: trunk/core/src/core/org/jnode/vm/VmSystem.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/VmSystem.java 2010-05-16 16:50:07 UTC (rev 5751)
+++ trunk/core/src/core/org/jnode/vm/VmSystem.java 2010-05-16 16:51:58 UTC (rev 5752)
@@ -41,8 +41,8 @@
import org.jnode.annotation.Uninterruptible;
import org.jnode.bootlog.BootLogInstance;
import org.jnode.naming.InitialNaming;
+import org.jnode.permission.JNodePermission;
import org.jnode.plugin.PluginManager;
-import org.jnode.security.JNodePermission;
import org.jnode.system.MemoryResource;
import org.jnode.system.ResourceManager;
import org.jnode.system.ResourceNotFreeException;
Modified: trunk/core/src/core/org/jnode/vm/classmgr/VmType.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/classmgr/VmType.java 2010-05-16 16:50:07 UTC (rev 5751)
+++ trunk/core/src/core/org/jnode/vm/classmgr/VmType.java 2010-05-16 16:51:58 UTC (rev 5752)
@@ -31,6 +31,7 @@
import java.util.HashSet;
import org.jnode.assembler.NativeStream;
+import org.jnode.permission.JNodePermission;
import org.jnode.vm.JvmType;
import org.jnode.vm.LoadCompileService;
import org.jnode.vm.Unsafe;
@@ -50,7 +51,6 @@
import org.jnode.vm.compiler.CompiledIMT;
import org.jnode.vm.compiler.NativeCodeCompiler;
import org.jnode.vm.isolate.VmIsolateLocal;
-import org.jnode.security.JNodePermission;
import org.vmmagic.unboxed.Address;
import org.vmmagic.unboxed.ObjectReference;
Modified: trunk/fs/descriptors/org.jnode.fs.command.xml
===================================================================
--- trunk/fs/descriptors/org.jnode.fs.command.xml 2010-05-16 16:50:07 UTC (rev 5751)
+++ trunk/fs/descriptors/org.jnode.fs.command.xml 2010-05-16 16:51:58 UTC (rev 5752)
@@ -47,7 +47,7 @@
<permission class="java.net.NetPermission" name="specifyStreamHandler"/>
<permission class="java.lang.RuntimePermission" name="modifyThreadGroup"/>
<permission class="java.lang.RuntimePermission" name="exitVM"/>
- <permission class="org.jnode.security.JNodePermission" name="getVmClass"/>
+ <permission class="org.jnode.permission.JNodePermission" name="getVmClass"/>
</extension>
</plugin>
Modified: trunk/fs/descriptors/org.jnode.fs.jifs.command.xml
===================================================================
--- trunk/fs/descriptors/org.jnode.fs.jifs.command.xml 2010-05-16 16:50:07 UTC (rev 5751)
+++ trunk/fs/descriptors/org.jnode.fs.jifs.command.xml 2010-05-16 16:51:58 UTC (rev 5752)
@@ -30,8 +30,8 @@
</extension>
<extension point="org.jnode.security.permissions">
- <permission class="org.jnode.security.JNodePermission" name="stopPlugin"/>
- <permission class="org.jnode.security.JNodePermission" name="startPlugin"/>
+ <permission class="org.jnode.permission.JNodePermission" name="stopPlugin"/>
+ <permission class="org.jnode.permission.JNodePermission" name="startPlugin"/>
</extension>
</plugin>
\ No newline at end of file
Modified: trunk/fs/descriptors/org.jnode.fs.jifs.def.xml
===================================================================
--- trunk/fs/descriptors/org.jnode.fs.jifs.def.xml 2010-05-16 16:50:07 UTC (rev 5751)
+++ trunk/fs/descriptors/org.jnode.fs.jifs.def.xml 2010-05-16 16:51:58 UTC (rev 5752)
@@ -24,7 +24,7 @@
<permission class="java.util.PropertyPermission" name="*" actions="read,write"/>
<permission class="java.lang.RuntimePermission" name="getProtectionDomain"/>
<permission class="java.lang.RuntimePermission" name="modifyThreadGroup"/>
- <permission class="org.jnode.security.JNodePermission" name="getVmThread"/>
+ <permission class="org.jnode.permission.JNodePermission" name="getVmThread"/>
</extension>
</plugin>
\ No newline at end of file
Modified: trunk/fs/descriptors/org.jnode.fs.jifs.xml
===================================================================
--- trunk/fs/descriptors/org.jnode.fs.jifs.xml 2010-05-16 16:50:07 UTC (rev 5751)
+++ trunk/fs/descriptors/org.jnode.fs.jifs.xml 2010-05-16 16:51:58 UTC (rev 5752)
@@ -30,7 +30,7 @@
<permission class="java.util.PropertyPermission" name="*" actions="read,write"/>
<permission class="java.lang.RuntimePermission" name="getProtectionDomain"/>
<permission class="java.lang.RuntimePermission" name="modifyThreadGroup"/>
- <permission class="org.jnode.security.JNodePermission" name="getVmThread"/>
+ <permission class="org.jnode.permission.JNodePermission" name="getVmThread"/>
</extension>
</plugin>
\ No newline at end of file
Modified: trunk/net/descriptors/org.jnode.net.ipv4.xml
===================================================================
--- trunk/net/descriptors/org.jnode.net.ipv4.xml 2010-05-16 16:50:07 UTC (rev 5751)
+++ trunk/net/descriptors/org.jnode.net.ipv4.xml 2010-05-16 16:51:58 UTC (rev 5752)
@@ -40,7 +40,7 @@
<permission class="org.jnode.net.NetPermission" name="*"/>
<!-- dhcp -->
- <permission class="org.jnode.security.JNodePermission" name="createPluginLoader"/>
+ <permission class="org.jnode.permission.JNodePermission" name="createPluginLoader"/>
<!-- DNS -->
<permission class="java.lang.RuntimePermission" name="selectorProvider"/>
Modified: trunk/shell/descriptors/js.xml
===================================================================
--- trunk/shell/descriptors/js.xml 2010-05-16 16:50:07 UTC (rev 5751)
+++ trunk/shell/descriptors/js.xml 2010-05-16 16:51:58 UTC (rev 5752)
@@ -24,7 +24,7 @@
<permission class="java.lang.RuntimePermission" name="createClassLoader" actions="*" />
<permission class="java.lang.RuntimePermission" name="setIO" actions="*" />
<permission class="java.lang.RuntimePermission" name="exitVM" actions="*" />
- <permission class="org.jnode.security.JNodePermission" name="getVmClass" actions="*" />
+ <permission class="org.jnode.permission.JNodePermission" name="getVmClass" actions="*" />
<permission class="java.util.PropertyPermission" name="*" actions="read,write"/>
</extension>
</plugin>
\ No newline at end of file
Modified: trunk/shell/descriptors/org.beanshell.xml
===================================================================
--- trunk/shell/descriptors/org.beanshell.xml 2010-05-16 16:50:07 UTC (rev 5751)
+++ trunk/shell/descriptors/org.beanshell.xml 2010-05-16 16:51:58 UTC (rev 5752)
@@ -20,7 +20,7 @@
<permission class="java.lang.RuntimePermission" name="createClassLoader" actions="*" />
<permission class="java.lang.RuntimePermission" name="setIO" actions="*" />
<permission class="java.lang.RuntimePermission" name="exitVM" actions="*" />
- <permission class="org.jnode.security.JNodePermission" name="getVmClass" actions="*" />
+ <permission class="org.jnode.permission.JNodePermission" name="getVmClass" actions="*" />
<permission class="java.util.PropertyPermission" name="*" actions="read,write"/>
</extension>
</plugin>
\ No newline at end of file
Modified: trunk/shell/descriptors/org.jnode.shell.bjorne.xml
===================================================================
--- trunk/shell/descriptors/org.jnode.shell.bjorne.xml 2010-05-16 16:50:07 UTC (rev 5751)
+++ trunk/shell/descriptors/org.jnode.shell.bjorne.xml 2010-05-16 16:51:58 UTC (rev 5752)
@@ -27,7 +27,7 @@
<permission class="java.lang.RuntimePermission" name="modifyThread"/>
<permission class="java.lang.RuntimePermission" name="setIO"/>
<permission class="java.lang.RuntimePermission" name="exitVM" actions="*" />
- <permission class="org.jnode.security.JNodePermission" name="getVmClass" actions="*" />
+ <permission class="org.jnode.permission.JNodePermission" name="getVmClass" actions="*" />
<permission class="java.util.PropertyPermission" name="*" actions="read,write"/>
<permission class="java.lang.reflect.ReflectPermission" name="suppressAccessChecks"/>
</extension>
Modified: trunk/shell/descriptors/org.jnode.shell.command.bsh.xml
===================================================================
--- trunk/shell/descriptors/org.jnode.shell.command.bsh.xml 2010-05-16 16:50:07 UTC (rev 5751)
+++ trunk/shell/descriptors/org.jnode.shell.command.bsh.xml 2010-05-16 16:51:58 UTC (rev 5752)
@@ -38,7 +38,7 @@
<permission class="java.lang.RuntimePermission" name="createClassLoader" actions="*" />
<permission class="java.lang.RuntimePermission" name="setIO" actions="*" />
<permission class="java.lang.RuntimePermission" name="exitVM" actions="*" />
- <permission class="org.jnode.security.JNodePermission" name="getVmClass" actions="*" />
+ <permission class="org.jnode.permission.JNodePermission" name="getVmClass" actions="*" />
<permission class="java.util.PropertyPermission" name="*" actions="read,write"/>
</extension>
Modified: trunk/shell/descriptors/org.jnode.test.shell.xml
===================================================================
--- trunk/shell/descriptors/org.jnode.test.shell.xml 2010-05-16 16:50:07 UTC (rev 5751)
+++ trunk/shell/descriptors/org.jnode.test.shell.xml 2010-05-16 16:51:58 UTC (rev 5752)
@@ -41,7 +41,7 @@
<permission class="java.lang.RuntimePermission" name="setIO"/>
<permission class="java.lang.RuntimePermission" name="exitVM"/>
<permission class="java.util.PropertyPermission" name="*" actions="read,write"/>
- <permission class="org.jnode.security.JNodePermission" name="loadPlugin"/>
+ <permission class="org.jnode.permission.JNodePermission" name="loadPlugin"/>
<permission class="java.io.FilePermission" name="<<ALL FILES>>" actions="read"/>
<permission class="java.io.FilePermission" name="/jnode/tmp/test" actions="read,write,delete"/>
<permission class="java.io.FilePermission" name="/jnode/tmp/test/-" actions="read,write,delete"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
