Return-Path: Delivered-To: apmail-ws-axis-dev-archive@www.apache.org Received: (qmail 31478 invoked from network); 21 Nov 2006 21:34:38 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 21 Nov 2006 21:34:38 -0000 Received: (qmail 24332 invoked by uid 500); 21 Nov 2006 21:34:47 -0000 Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org Received: (qmail 24239 invoked by uid 500); 21 Nov 2006 21:34:46 -0000 Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list axis-cvs@ws.apache.org Received: (qmail 24228 invoked by uid 500); 21 Nov 2006 21:34:46 -0000 Delivered-To: apmail-ws-axis2-cvs@ws.apache.org Received: (qmail 24222 invoked by uid 99); 21 Nov 2006 21:34:46 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Nov 2006 13:34:46 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Nov 2006 13:34:36 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id C33361A9846; Tue, 21 Nov 2006 13:34:01 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r477903 - in /webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2: deployment/AxisConfigBuilder.java deployment/DescriptionBuilder.java description/AxisService.java engine/AxisConfiguration.java Date: Tue, 21 Nov 2006 21:34:01 -0000 To: axis2-cvs@ws.apache.org From: nagy@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061121213401.C33361A9846@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: nagy Date: Tue Nov 21 13:34:00 2006 New Revision: 477903 URL: http://svn.apache.org/viewvc?view=rev&rev=477903 Log: Ported r469707 (Added usages of AccessController) Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DescriptionBuilder.java webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java?view=diff&rev=477903&r1=477902&r2=477903 ============================================================================== --- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java (original) +++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java Tue Nov 21 13:34:00 2006 @@ -39,6 +39,8 @@ import javax.xml.namespace.QName; import javax.xml.stream.XMLStreamException; import java.io.InputStream; +import java.security.PrivilegedActionException; +import java.security.PrivilegedExceptionAction; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; @@ -205,15 +207,22 @@ OMElement observerelement = (OMElement) oservers.next(); AxisObserver observer; OMAttribute trsClas = observerelement.getAttribute(new QName(TAG_CLASS_NAME)); - String clasName; - if (trsClas != null) { - clasName = trsClas.getAttributeValue(); - } else { + if (trsClas == null) { log.info(Messages.getMessage(DeploymentErrorMsgs.OBSERVER_ERROR)); return; } + final String clasName = trsClas.getAttributeValue(); - Class observerclass = Loader.loadClass(clasName); + Class observerclass; + try { + observerclass = (Class) org.apache.axis2.java.security.AccessController.doPrivileged(new PrivilegedExceptionAction() { + public Object run() throws ClassNotFoundException { + return Loader.loadClass(clasName); + } + }); + } catch (PrivilegedActionException e) { + throw (ClassNotFoundException)e.getException(); + } observer = (AxisObserver) observerclass.newInstance(); // processing Parameters // Processing service level parameters Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DescriptionBuilder.java URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DescriptionBuilder.java?view=diff&rev=477903&r1=477902&r2=477903 ============================================================================== --- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DescriptionBuilder.java (original) +++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DescriptionBuilder.java Tue Nov 21 13:34:00 2006 @@ -41,6 +41,8 @@ import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; import java.io.InputStream; +import java.security.PrivilegedActionException; +import java.security.PrivilegedExceptionAction; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; @@ -131,8 +133,17 @@ TAG_MESSAGE_RECEIVER)); while (msgReceivers.hasNext()) { OMElement msgReceiver = (OMElement) msgReceivers.next(); - MessageReceiver receiver = loadMessageReceiver(Thread - .currentThread().getContextClassLoader(), msgReceiver); + final OMElement tempMsgReceiver = msgReceiver; + MessageReceiver receiver = null; + try { + receiver = (MessageReceiver) org.apache.axis2.java.security.AccessController.doPrivileged(new PrivilegedExceptionAction() { + public Object run() throws org.apache.axis2.deployment.DeploymentException { + return loadMessageReceiver(Thread.currentThread().getContextClassLoader(), tempMsgReceiver); + } + }); + } catch (PrivilegedActionException e) { + throw (DeploymentException)e.getException(); + } OMAttribute mepAtt = msgReceiver.getAttribute(new QName(TAG_MEP)); mr_mep.put(mepAtt.getAttributeValue(), receiver); } Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java?view=diff&rev=477903&r1=477902&r2=477903 ============================================================================== --- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java (original) +++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java Tue Nov 21 13:34:00 2006 @@ -64,6 +64,7 @@ import java.io.OutputStream; import java.net.SocketException; import java.net.URL; +import java.security.PrivilegedAction; import java.util.*; /** @@ -243,7 +244,11 @@ moduleRefs = new ArrayList(); engagedModules = new ArrayList(); schemaList = new ArrayList(); - serviceClassLoader = Thread.currentThread().getContextClassLoader(); + serviceClassLoader = (ClassLoader) org.apache.axis2.java.security.AccessController.doPrivileged(new PrivilegedAction() { + public Object run() { + return Thread.currentThread().getContextClassLoader(); + } + }); objectSupplier = new DefaultObjectSupplier(); } Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java?view=diff&rev=477903&r1=477902&r2=477903 ============================================================================== --- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java (original) +++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java Tue Nov 21 13:34:00 2006 @@ -30,6 +30,7 @@ import javax.xml.namespace.QName; import java.net.URL; +import java.security.PrivilegedAction; import java.util.*; /** @@ -129,9 +130,14 @@ faultyModules = new Hashtable(); observersList = new ArrayList(); inPhasesUptoAndIncludingPostDispatch = new ArrayList(); - systemClassLoader = Thread.currentThread().getContextClassLoader(); - serviceClassLoader = Thread.currentThread().getContextClassLoader(); - moduleClassLoader = Thread.currentThread().getContextClassLoader(); + systemClassLoader = (ClassLoader) org.apache.axis2.java.security.AccessController.doPrivileged(new PrivilegedAction() { + public Object run() { + return Thread.currentThread().getContextClassLoader(); + } + }); + serviceClassLoader = systemClassLoader; + moduleClassLoader = systemClassLoader; + this.phasesinfo = new PhasesInfo(); targetResolvers = new ArrayList(); } --------------------------------------------------------------------- To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org For additional commands, e-mail: axis-cvs-help@ws.apache.org