Author: richard.opalka(a)jboss.com Date: 2011-04-18 11:02:02 -0400 (Mon, 18 Apr 2011) New Revision: 14156 Removed: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/ant/SecurityActions.java Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/ant/wstools.java Log: [JBWS-3273] fixing class collision with new jbossws-tools-common.jar module Deleted: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/ant/SecurityActions.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/ant/SecurityActions.java 2011-04-18 14:27:59 UTC (rev 14155) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/ant/SecurityActions.java 2011-04-18 15:02:02 UTC (rev 14156) @@ -1,112 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This 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 software 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 software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.tools.ant; - -import java.security.AccessController; -import java.security.PrivilegedAction; -import java.security.PrivilegedActionException; -import java.security.PrivilegedExceptionAction; - -/** - * Security actions for this package - * - * @author alessio.soldano(a)jboss.com - * @since 19-Jun-2009 - * - */ -class SecurityActions -{ - /** - * Get context classloader. - * - * @return the current context classloader - */ - static ClassLoader getContextClassLoader() - { - SecurityManager sm = System.getSecurityManager(); - if (sm == null) - { - return Thread.currentThread().getContextClassLoader(); - } - else - { - return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() { - public ClassLoader run() - { - return Thread.currentThread().getContextClassLoader(); - } - }); - } - } - - /** - * Set context classloader. - * - * @param cl the classloader - * @return previous context classloader - * @throws Throwable for any error - */ - static ClassLoader setContextClassLoader(final ClassLoader cl) - { - if (System.getSecurityManager() == null) - { - ClassLoader result = Thread.currentThread().getContextClassLoader(); - if (cl != null) - Thread.currentThread().setContextClassLoader(cl); - return result; - } - else - { - try - { - return AccessController.doPrivileged(new PrivilegedExceptionAction<ClassLoader>() { - public ClassLoader run() throws Exception - { - try - { - ClassLoader result = Thread.currentThread().getContextClassLoader(); - if (cl != null) - Thread.currentThread().setContextClassLoader(cl); - return result; - } - catch (Exception e) - { - throw e; - } - catch (Error e) - { - throw e; - } - catch (Throwable e) - { - throw new RuntimeException("Error setting context classloader", e); - } - } - }); - } - catch (PrivilegedActionException e) - { - throw new RuntimeException("Error running privileged action", e.getCause()); - } - } - } -} \ No newline at end of file Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/ant/wstools.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/ant/wstools.java 2011-04-18 14:27:59 UTC (rev 14155) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/ant/wstools.java 2011-04-18 15:02:02 UTC (rev 14156) @@ -21,6 +21,11 @@ */ package org.jboss.ws.tools.ant; +import java.security.AccessController; +import java.security.PrivilegedAction; +import java.security.PrivilegedActionException; +import java.security.PrivilegedExceptionAction; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.taskdefs.MatchingTask; import org.apache.tools.ant.types.Path; @@ -95,8 +100,8 @@ public void execute() throws BuildException { - ClassLoader prevCL = SecurityActions.getContextClassLoader(); - SecurityActions.setContextClassLoader(this.getClass().getClassLoader()); + ClassLoader prevCL = getContextClassLoader(); + setContextClassLoader(this.getClass().getClassLoader()); try { String[] args = new String[] { "-dest", dest, "-config", config }; @@ -116,7 +121,77 @@ } finally { - SecurityActions.setContextClassLoader(prevCL); + setContextClassLoader(prevCL); } } + + private static ClassLoader getContextClassLoader() + { + SecurityManager sm = System.getSecurityManager(); + if (sm == null) + { + return Thread.currentThread().getContextClassLoader(); + } + else + { + return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() { + public ClassLoader run() + { + return Thread.currentThread().getContextClassLoader(); + } + }); + } + } + + /** + * Set context classloader. + * + * @param cl the classloader + * @return previous context classloader + * @throws Throwable for any error + */ + private static ClassLoader setContextClassLoader(final ClassLoader cl) + { + if (System.getSecurityManager() == null) + { + ClassLoader result = Thread.currentThread().getContextClassLoader(); + if (cl != null) + Thread.currentThread().setContextClassLoader(cl); + return result; + } + else + { + try + { + return AccessController.doPrivileged(new PrivilegedExceptionAction<ClassLoader>() { + public ClassLoader run() throws Exception + { + try + { + ClassLoader result = Thread.currentThread().getContextClassLoader(); + if (cl != null) + Thread.currentThread().setContextClassLoader(cl); + return result; + } + catch (Exception e) + { + throw e; + } + catch (Error e) + { + throw e; + } + catch (Throwable e) + { + throw new RuntimeException("Error setting context classloader", e); + } + } + }); + } + catch (PrivilegedActionException e) + { + throw new RuntimeException("Error running privileged action", e.getCause()); + } + } + } }