Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@geronimo.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r721408 - in /geronimo/gshell/trunk: NOTES.txt
 gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ApplicationManagerImpl.java
Date: Fri, 28 Nov 2008 09:56:57 -0000
To: scm@geronimo.apache.org
From: jdillon@apache.org
Message-Id: <20081128095658.3103C238889E@eris.apache.org>

Author: jdillon
Date: Fri Nov 28 01:56:57 2008
New Revision: 721408

URL: http://svn.apache.org/viewvc?rev=721408&view=rev
Log:
Don't use our custom SM for now, not sure how to use this *ucking API

Modified:
    geronimo/gshell/trunk/NOTES.txt
    geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ApplicationManagerImpl.java

Modified: geronimo/gshell/trunk/NOTES.txt
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/NOTES.txt?rev=721408&r1=721407&r2=721408&view=diff
==============================================================================
--- geronimo/gshell/trunk/NOTES.txt (original)
+++ geronimo/gshell/trunk/NOTES.txt Fri Nov 28 01:56:57 2008
@@ -41,4 +41,6 @@
     mkdir
     mv
     rmdir
-    sync?
\ No newline at end of file
+    sync?
+
+Make gshell-optional go away, its like the command bitbucket, create gshell-textutils and gshell-shellutils
\ No newline at end of file

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=721408&r1=721407&r2=721408&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 Fri Nov 28 01:56:57 2008
@@ -195,8 +195,11 @@
             //
             // FIXME: This SM actually causes some icky problems when trying to shutdown thread pools, which makes for ugly crap when using ssh
             //
-            
-            private final ApplicationSecurityManager sm = new ApplicationSecurityManager();
+
+            //
+            // FIXME: Disable our custom security stuff for now, not sure how to make this work well... yet.
+            //
+            // private final ApplicationSecurityManager sm = new ApplicationSecurityManager();
 
             public Object invoke(final Object proxy, final Method method, final Object[] args) throws Throwable {
                 assert proxy != null;
@@ -210,8 +213,8 @@
                 final ShellContext prevContext = ShellContextHolder.get(true);
                 ShellContextHolder.set(context);
 
-                final SecurityManager prevSM = System.getSecurityManager();
-                System.setSecurityManager(sm);
+                // final SecurityManager prevSM = System.getSecurityManager();
+                // System.setSecurityManager(sm);
 
                 try {
                     return method.invoke(shell, args);
@@ -220,7 +223,7 @@
                     throw e.getTargetException();
                 }
                 finally {
-                    System.setSecurityManager(prevSM);
+                    // System.setSecurityManager(prevSM);
                     ShellContextHolder.set(prevContext);
                 }
             }