svn commit: r707094 - in /geronimo/gshell/trunk: gshell-application/src/main/java/org/apache/geronimo/gshell/application/ gshell-assembly/src/main/underlay/etc/ gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/appli...

[jd...@apache.org]

Author: jdillon
Date: Wed Oct 22 07:56:04 2008
New Revision: 707094

URL: http://svn.apache.org/viewvc?rev=707094&view=rev
Log:
Move the ApplicationSecurityManager impl to wisdom

Added:
    geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ApplicationSecurityManager.java   (contents, props changed)
      - copied, changed from r707066, geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/ApplicationSecurityManager.java
Removed:
    geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/ApplicationSecurityManager.java
Modified:
    geronimo/gshell/trunk/gshell-assembly/src/main/underlay/etc/log4j.xml
    geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ApplicationManagerImpl.java

Modified: geronimo/gshell/trunk/gshell-assembly/src/main/underlay/etc/log4j.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-assembly/src/main/underlay/etc/log4j.xml?rev=707094&r1=707093&r2=707094&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-assembly/src/main/underlay/etc/log4j.xml (original)
+++ geronimo/gshell/trunk/gshell-assembly/src/main/underlay/etc/log4j.xml Wed Oct 22 07:56:04 2008
@@ -45,7 +45,7 @@
         <level value="INFO"/>
     </logger>
 
-    <logger name="org.apache.geronimo.gshell.application.ApplicationSecurityManager">
+    <logger name="org.apache.geronimo.gshell.wisdom.application.ApplicationSecurityManager">
         <level value="DEBUG"/>
     </logger>
 

Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ApplicationManagerImpl.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ApplicationManagerImpl.java?rev=707094&r1=707093&r2=707094&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ApplicationManagerImpl.java (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ApplicationManagerImpl.java Wed Oct 22 07:56:04 2008
@@ -22,7 +22,7 @@
 import org.apache.geronimo.gshell.application.Application;
 import org.apache.geronimo.gshell.application.ApplicationConfiguration;
 import org.apache.geronimo.gshell.application.ApplicationManager;
-import org.apache.geronimo.gshell.application.ApplicationSecurityManager;
+import org.apache.geronimo.gshell.wisdom.application.ApplicationSecurityManager;
 import org.apache.geronimo.gshell.application.ClassPath;
 import org.apache.geronimo.gshell.application.model.ApplicationModel;
 import org.apache.geronimo.gshell.application.model.Artifact;

Copied: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ApplicationSecurityManager.java (from r707066, geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/ApplicationSecurityManager.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ApplicationSecurityManager.java?p2=geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ApplicationSecurityManager.java&p1=geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/ApplicationSecurityManager.java&r1=707066&r2=707094&rev=707094&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/ApplicationSecurityManager.java (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ApplicationSecurityManager.java Wed Oct 22 07:56:04 2008
@@ -18,13 +18,12 @@
  */
 
 
-package org.apache.geronimo.gshell.application;
+package org.apache.geronimo.gshell.wisdom.application;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.security.Permission;
-import java.util.PropertyPermission;
 
 /**
  * Custom security manager to prevent commands from doing bad things.
@@ -57,17 +56,19 @@
         // TODO: See if there is a more efficent and/or recommended way to implement custom permission handling
         //
 
-        //
-        // FIXME: These don't work as desired ATM, so disable and re-implement a little bit later
-        //
-        
-        /*
         if (perm instanceof RuntimePermission) {
             // Prevent System.exit()
             if (perm.implies(new RuntimePermission("exitVM"))) {
                 throw new SecurityException();
             }
+        }
 
+        //
+        // FIXME: These don't work as desired ATM, so disable and re-implement a little bit later
+        //
+
+        /*
+        if (perm instanceof RuntimePermission) {
             // Prevent unhijacking of the system streams
             if (perm.implies(new RuntimePermission("setIO"))) {
                 throw new SecurityException();

Propchange: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ApplicationSecurityManager.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ApplicationSecurityManager.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ApplicationSecurityManager.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain