You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by di...@apache.org on 2006/09/24 01:38:33 UTC
svn commit: r449332 - in /webservices/axis2/trunk/java/modules/kernel:
src/org/apache/axis2/deployment/ src/org/apache/axis2/deployment/util/
src/org/apache/axis2/description/ src/org/apache/axis2/engine/
src/org/apache/axis2/receivers/ src/org/apache/...
Author: dims
Date: Sat Sep 23 16:38:32 2006
New Revision: 449332
URL: http://svn.apache.org/viewvc?view=rev&rev=449332
Log:
standardize the class search/load pattern (use specified class loader, then tccl, then Class.forName)
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/deployment/ModuleBuilder.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/util/Utils.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/DependencyManager.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/receivers/AbstractMessageReceiver.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/XMLUtils.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/BuildERWithDeploymentTest.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=449332&r1=449331&r2=449332
==============================================================================
--- 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 Sat Sep 23 16:38:32 2006
@@ -32,6 +32,7 @@
import org.apache.axis2.transport.TransportListener;
import org.apache.axis2.transport.TransportSender;
import org.apache.axis2.util.TargetResolver;
+import org.apache.axis2.util.Loader;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -145,8 +146,7 @@
OMAttribute classNameAttribute = targetResolver.getAttribute(new QName(TAG_CLASS_NAME));
String className = classNameAttribute.getAttributeValue();
try {
- ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
- Class classInstance = classLoader.loadClass(className);
+ Class classInstance = Loader.loadClass(className);
TargetResolver tr = (TargetResolver) classInstance.newInstance();
axisConfig.addTargetResolver(tr);
} catch (Exception e) {
@@ -213,8 +213,7 @@
return;
}
- Class observerclass = Class.forName(clasName, true,
- Thread.currentThread().getContextClassLoader());
+ Class observerclass = Loader.loadClass(clasName);
observer = (AxisObserver) observerclass.newInstance();
// processing Parameters
// Processing service level parameters
@@ -332,12 +331,7 @@
try {
String clasName = trsClas.getAttributeValue();
Class receiverClass;
- try {
- receiverClass = Class.forName(clasName, true, Thread.currentThread().getContextClassLoader()); // Try the application class loader
- } catch (ClassNotFoundException e) {
- receiverClass = Class.forName(clasName); // Try the axis2 classloader
- }
-
+ receiverClass = Loader.loadClass(clasName);
TransportListener receiver =
(TransportListener) receiverClass.newInstance();
@@ -389,11 +383,7 @@
Class sender;
try {
- try {
- sender = Class.forName(clasName, true, Thread.currentThread().getContextClassLoader()); // Try the application class loader
- } catch (ClassNotFoundException e) {
- sender = Class.forName(clasName); // Try the axis2 classloader
- }
+ sender = Loader.loadClass(clasName);
TransportSender transportSender = (TransportSender) sender.newInstance();
@@ -431,7 +421,7 @@
if (className == null) {
return new Phase();
}
- Class phaseClass = axisConfig.getSystemClassLoader().loadClass(className);
+ Class phaseClass = Loader.loadClass(axisConfig.getSystemClassLoader(), className);
return (Phase) phaseClass.newInstance();
}
}
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=449332&r1=449331&r2=449332
==============================================================================
--- 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 Sat Sep 23 16:38:32 2006
@@ -24,6 +24,7 @@
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
+import org.apache.axis2.util.Loader;
import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.AxisService;
@@ -167,7 +168,7 @@
Class messageReceiver;
if ((className != null) && !"".equals(className)) {
- messageReceiver = Class.forName(className, true, loader);
+ messageReceiver = Loader.loadClass(loader, className);
receiver = (MessageReceiver) messageReceiver.newInstance();
}
} catch (ClassNotFoundException e) {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ModuleBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ModuleBuilder.java?view=diff&rev=449332&r1=449331&r2=449332
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ModuleBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ModuleBuilder.java Sat Sep 23 16:38:32 2006
@@ -28,6 +28,7 @@
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMElement;
import org.apache.axis2.AxisFault;
+import org.apache.axis2.util.Loader;
import org.apache.axis2.deployment.util.PhasesInfo;
import org.apache.axis2.description.AxisModule;
import org.apache.axis2.description.AxisOperation;
@@ -57,7 +58,7 @@
try {
if ((moduleClassName != null) && !"".equals(moduleClassName)) {
- moduleClass = Class.forName(moduleClassName, true, module.getModuleClassLoader());
+ moduleClass = Loader.loadClass(module.getModuleClassLoader(), moduleClassName);
module.setModule((Module) moduleClass.newInstance());
}
} catch (Exception e) {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java?view=diff&rev=449332&r1=449331&r2=449332
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java Sat Sep 23 16:38:32 2006
@@ -19,6 +19,7 @@
import org.apache.axis2.deployment.repository.util.ArchiveFileData;
import org.apache.axis2.deployment.repository.util.WSInfoList;
+import org.apache.axis2.util.Loader;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -129,7 +130,7 @@
*/
private String getLocation() {
try {
- Class clazz = Class.forName("org.apache.axis2.engine.AxisEngine");
+ Class clazz = Loader.loadClass("org.apache.axis2.engine.AxisEngine");
java.net.URL url = clazz.getProtectionDomain().getCodeSource().getLocation();
String location = url.toString();
if (location.startsWith("jar")) {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java?view=diff&rev=449332&r1=449331&r2=449332
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java Sat Sep 23 16:38:32 2006
@@ -5,6 +5,7 @@
import org.apache.axiom.om.OMFactory;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
+import org.apache.axis2.util.Loader;
import org.apache.axis2.deployment.DeploymentConstants;
import org.apache.axis2.deployment.DeploymentException;
import org.apache.axis2.deployment.repository.util.ArchiveFileData;
@@ -77,7 +78,7 @@
Class handlerClass;
try {
- handlerClass = Class.forName(handlername, true, loader1);
+ handlerClass = Loader.loadClass(loader1, handlername);
handler = (Handler) handlerClass.newInstance();
handler.init(desc);
desc.setHandler(handler);
@@ -204,7 +205,7 @@
Class handlerClass;
try {
- handlerClass = Class.forName(className, true, loader1);
+ handlerClass = Loader.loadClass(loader1, className);
} catch (ClassNotFoundException e) {
throw new AxisFault(e.getMessage());
}
@@ -230,8 +231,8 @@
// other looks.
implInfoParam = axisService.getParameter(Constants.SERVICE_OBJECT_SUPPLIER);
if (implInfoParam != null) {
- Class serviceObjectMaker = Class.forName(((String)
- implInfoParam.getValue()).trim(), true, serviceClassLoader);
+ Class serviceObjectMaker = Loader.loadClass(serviceClassLoader, ((String)
+ implInfoParam.getValue()).trim());
// Find static getServiceObject() method, call it if there
Method method = serviceObjectMaker.
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=449332&r1=449331&r2=449332
==============================================================================
--- 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 Sat Sep 23 16:38:32 2006
@@ -34,6 +34,7 @@
import org.apache.axis2.transport.http.server.HttpUtils;
import org.apache.axis2.util.PolicyUtil;
import org.apache.axis2.util.XMLUtils;
+import org.apache.axis2.util.Loader;
import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -1304,7 +1305,7 @@
AxisConfiguration axisConfig) throws AxisFault {
Class clazz;
try {
- clazz = Class.forName("org.apache.axis2.rpc.receivers.RPCMessageReceiver");
+ clazz = Loader.loadClass("org.apache.axis2.rpc.receivers.RPCMessageReceiver");
} catch (ClassNotFoundException e) {
throw new AxisFault("ClassNotFoundException occured during message receiver loading"
+ e.getMessage());
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/DependencyManager.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/DependencyManager.java?view=diff&rev=449332&r1=449331&r2=449332
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/DependencyManager.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/DependencyManager.java Sat Sep 23 16:38:32 2006
@@ -19,6 +19,7 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
+import org.apache.axis2.util.Loader;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.OperationContext;
import org.apache.axis2.context.ServiceContext;
@@ -129,8 +130,9 @@
Parameter implInfoParam = service.getParameter(Constants.SERVICE_CLASS);
if (implInfoParam != null) {
try {
- Class implClass = Class.forName(((String) implInfoParam.getValue()).trim(), true,
- classLoader);
+ Class implClass = Loader.loadClass(
+ classLoader,
+ ((String) implInfoParam.getValue()).trim());
Object serviceImpl = implClass.newInstance();
serviceContext.setProperty(ServiceContext.SERVICE_OBJECT, serviceImpl);
initServiceClass(serviceImpl, serviceContext);
@@ -152,8 +154,9 @@
Parameter implInfoParam = axisService.getParameter(Constants.SERVICE_CLASS);
if (implInfoParam != null) {
try {
- Class implClass = Class.forName(((String) implInfoParam.getValue()).trim(), true,
- classLoader);
+ Class implClass = Loader.loadClass(
+ classLoader,
+ ((String) implInfoParam.getValue()).trim());
Object serviceImpl = implClass.newInstance();
if (serviceImpl instanceof Service) {
org.apache.axis2.engine.Service service = (Service) serviceImpl;
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/receivers/AbstractMessageReceiver.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/receivers/AbstractMessageReceiver.java?view=diff&rev=449332&r1=449331&r2=449332
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/receivers/AbstractMessageReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/receivers/AbstractMessageReceiver.java Sat Sep 23 16:38:32 2006
@@ -25,6 +25,7 @@
import org.apache.axis2.Constants;
import org.apache.axis2.util.MultiParentClassLoader;
import org.apache.axis2.util.JavaUtils;
+import org.apache.axis2.util.Loader;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.context.ServiceContext;
import org.apache.axis2.description.AxisService;
@@ -86,8 +87,8 @@
if (service.getParameter(Constants.SERVICE_OBJECT_SUPPLIER) != null) {
Parameter serviceObjectParam =
service.getParameter(Constants.SERVICE_OBJECT_SUPPLIER);
- Class serviceObjectMaker = Class.forName(((String)
- serviceObjectParam.getValue()).trim(), true, classLoader);
+ Class serviceObjectMaker = Loader.loadClass(classLoader, ((String)
+ serviceObjectParam.getValue()).trim());
// Find static getServiceObject() method, call it if there
Method method = serviceObjectMaker.
@@ -99,8 +100,9 @@
Parameter implInfoParam = service.getParameter(Constants.SERVICE_CLASS);
if (implInfoParam != null) {
- Class implClass = Class.forName(((String) implInfoParam.getValue()).trim(), true,
- classLoader);
+ Class implClass = Loader.loadClass(
+ classLoader,
+ ((String) implInfoParam.getValue()).trim());
return implClass.newInstance();
} else {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/XMLUtils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/XMLUtils.java?view=diff&rev=449332&r1=449331&r2=449332
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/XMLUtils.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/XMLUtils.java Sat Sep 23 16:38:32 2006
@@ -85,7 +85,7 @@
{
if (factoryClassName != null) {
try {
- saxFactory = (SAXParserFactory)Class.forName(factoryClassName).
+ saxFactory = (SAXParserFactory)Loader.loadClass(factoryClassName).
newInstance();
/*
* Set the system property only if it is not already set to
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/BuildERWithDeploymentTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/BuildERWithDeploymentTest.java?view=diff&rev=449332&r1=449331&r2=449332
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/BuildERWithDeploymentTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/BuildERWithDeploymentTest.java Sat Sep 23 16:38:32 2006
@@ -17,6 +17,7 @@
package org.apache.axis2.deployment;
import org.apache.axis2.AbstractTestCase;
+import org.apache.axis2.util.Loader;
import org.apache.axis2.context.ConfigurationContextFactory;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.AxisService;
@@ -47,7 +48,7 @@
assertTrue(provider instanceof RawXMLINOutMessageReceiver);*/
ClassLoader cl = service.getClassLoader();
assertNotNull(cl);
- Class.forName("org.apache.axis2.Echo2", true, cl);
+ Loader.loadClass(cl, "org.apache.axis2.Echo2");
assertNotNull(service.getName());
assertNotNull(service.getParameter("para2"));
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org