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 2008/04/05 00:24:46 UTC
svn commit: r644962 - in
/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2:
deployment/AxisConfigBuilder.java deployment/util/Utils.java util/Loader.java
Author: dims
Date: Fri Apr 4 15:24:45 2008
New Revision: 644962
URL: http://svn.apache.org/viewvc?rev=644962&view=rev
Log:
Disable JDK1.5 components when running under JDK14
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/util/Utils.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/Loader.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?rev=644962&r1=644961&r2=644962&view=diff
==============================================================================
--- 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 Fri Apr 4 15:24:45 2008
@@ -291,6 +291,8 @@
Class clazz = Loader.loadClass(className);
ThreadContextMigrator migrator = (ThreadContextMigrator) clazz.newInstance();
ThreadContextMigratorUtil.addThreadContextMigrator(axisConfig, listId, migrator);
+ } catch (UnsupportedClassVersionError e){
+ log.info("Disabled - " + className + " - " + e.getMessage());
} catch (Exception e) {
if (log.isTraceEnabled()) {
log.trace(
@@ -372,6 +374,9 @@
try {
Class deployerClass = Loader.loadClass(deployerClassName);
deployer = (Deployer) deployerClass.newInstance();
+ } catch (UnsupportedClassVersionError ex) {
+ log.info("Disabled - " + deployerClassName + " - " + ex.getMessage());
+ continue;
} catch (Exception e) {
log.info("Unable to instantiate deployer " + deployerClassName);
log.debug(e.getMessage(), e);
@@ -504,12 +509,16 @@
HandlerDescription handler = processHandler(omElement, axisConfig, phaseName);
handler.getRules().setPhaseName(phaseName);
- if(Utils.loadHandler(axisConfig.getSystemClassLoader(), handler)){
- try {
- phase.addHandler(handler);
- } catch (PhaseException e) {
- throw new DeploymentException(e);
+ try {
+ if (Utils.loadHandler(axisConfig.getSystemClassLoader(), handler)) {
+ try {
+ phase.addHandler(handler);
+ } catch (PhaseException e) {
+ throw new DeploymentException(e);
+ }
}
+ } catch (UnsupportedClassVersionError e) {
+ log.info("Disabled - " + handler + " - " + e.getMessage());
}
}
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?rev=644962&r1=644961&r2=644962&view=diff
==============================================================================
--- 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 Fri Apr 4 15:24:45 2008
@@ -172,7 +172,9 @@
});
handler.init(desc);
desc.setHandler(handler);
- } catch (ClassNotFoundException e) {
+ } catch (UnsupportedClassVersionError e) {
+ throw e;
+ } catch (ClassNotFoundException e) {
if (handlername.indexOf("jaxws") > 0) {
log.warn("[JAXWS] - unable to load " + handlername);
return false;
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/Loader.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/Loader.java?rev=644962&r1=644961&r2=644962&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/Loader.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/Loader.java Fri Apr 4 15:24:45 2008
@@ -221,7 +221,7 @@
}
}
} catch (UnsupportedClassVersionError e) {
- log.error(e.getMessage(), e);
+ log.debug(e);
throw e;
} catch (Throwable e) {
log.debug(e);
@@ -250,7 +250,7 @@
}
}
} catch (UnsupportedClassVersionError e) {
- log.error(e.getMessage(), e);
+ log.debug(e);
throw e;
} catch (Throwable e) {
log.debug(e);
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org