Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LoadTimeWeaver detection differentiates between WebSphere and Liberty

Browse Source 
Issue SPR-16248
This commit is contained in:
Juergen Hoeller
2018-01-07 23:29:16 +01:00
parent 6a1fe0b1d0
commit d187cbce73
3 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
spring-context/src/main/java/org/springframework/context/weaving/DefaultContextLoadTimeWeaver.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2017 the original author or authors. * Copyright 2002-2018 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -47,7 +47,7 @@ import org.springframework.util.Assert;
* appropriate weaver implementation: As of Spring Framework 5.0, it detects * appropriate weaver implementation: As of Spring Framework 5.0, it detects
* Oracle WebLogic 10+, GlassFish 4+, Tomcat 8+, WildFly 8+, IBM WebSphere 8.5+, * Oracle WebLogic 10+, GlassFish 4+, Tomcat 8+, WildFly 8+, IBM WebSphere 8.5+,
* {@link InstrumentationSavingAgent Spring's VM agent}, and any {@link ClassLoader} * {@link InstrumentationSavingAgent Spring's VM agent}, and any {@link ClassLoader}
* supported by Spring's {@link ReflectiveLoadTimeWeaver}. * supported by Spring's {@link ReflectiveLoadTimeWeaver} (such as Liberty's).
* *
* @author Juergen Hoeller * @author Juergen Hoeller
* @author Ramnivas Laddad * @author Ramnivas Laddad
@@ -104,32 +104,29 @@ public class DefaultContextLoadTimeWeaver implements LoadTimeWeaver, BeanClassLo
* This method never fails, allowing to try other possible ways to use an * This method never fails, allowing to try other possible ways to use an
* server-agnostic weaver. This non-failure logic is required since * server-agnostic weaver. This non-failure logic is required since
* determining a load-time weaver based on the ClassLoader name alone may * determining a load-time weaver based on the ClassLoader name alone may
* legitimately fail due to other mismatches. Specific case in point: the * legitimately fail due to other mismatches.
* use of WebLogicLoadTimeWeaver works for WLS 10 but fails due to the lack
* of a specific method (addInstanceClassPreProcessor) for any earlier
* versions even though the ClassLoader name is the same.
*/ */
@Nullable @Nullable
protected LoadTimeWeaver createServerSpecificLoadTimeWeaver(ClassLoader classLoader) { protected LoadTimeWeaver createServerSpecificLoadTimeWeaver(ClassLoader classLoader) {
String name = classLoader.getClass().getName(); String name = classLoader.getClass().getName();
try { try {
if (name.startsWith("weblogic")) { if (name.startsWith("org.apache.catalina")) {
return new WebLogicLoadTimeWeaver(classLoader); return new TomcatLoadTimeWeaver(classLoader);
} }
else if (name.startsWith("org.glassfish")) { else if (name.startsWith("org.glassfish")) {
return new GlassFishLoadTimeWeaver(classLoader); return new GlassFishLoadTimeWeaver(classLoader);
} }
else if (name.startsWith("org.apache.catalina")) { else if (name.startsWith("org.jboss.modules")) {
return new TomcatLoadTimeWeaver(classLoader);
}
else if (name.startsWith("org.jboss")) {
return new JBossLoadTimeWeaver(classLoader); return new JBossLoadTimeWeaver(classLoader);
} }
else if (name.startsWith("com.ibm")) { else if (name.startsWith("com.ibm.ws.classloader")) {
return new WebSphereLoadTimeWeaver(classLoader); return new WebSphereLoadTimeWeaver(classLoader);
} }
else if (name.startsWith("weblogic")) {
return new WebLogicLoadTimeWeaver(classLoader);
}
} }
catch (IllegalStateException ex) { catch (Exception ex) {
if (logger.isInfoEnabled()) { if (logger.isInfoEnabled()) {
logger.info("Could not obtain server-specific LoadTimeWeaver: " + ex.getMessage()); logger.info("Could not obtain server-specific LoadTimeWeaver: " + ex.getMessage());
} }

3
spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicClassLoaderAdapter.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2017 the original author or authors. * Copyright 2002-2018 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -70,6 +70,7 @@ class WebLogicClassLoaderAdapter {
throw new IllegalStateException( throw new IllegalStateException(
"Could not initialize WebLogic LoadTimeWeaver because WebLogic 10 API classes are not available", ex); "Could not initialize WebLogic LoadTimeWeaver because WebLogic 10 API classes are not available", ex);
} }
if (!wlGenericClassLoaderClass.isInstance(classLoader)) { if (!wlGenericClassLoaderClass.isInstance(classLoader)) {
throw new IllegalArgumentException( throw new IllegalArgumentException(
"ClassLoader must be an instance of [" + wlGenericClassLoaderClass.getName() + "]: " + classLoader); "ClassLoader must be an instance of [" + wlGenericClassLoaderClass.getName() + "]: " + classLoader);

5
spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereClassLoaderAdapter.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2017 the original author or authors. * Copyright 2002-2018 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -74,7 +74,8 @@ class WebSphereClassLoaderAdapter {
} }
if (!wsCompoundClassLoaderClass.isInstance(classLoader)) { if (!wsCompoundClassLoaderClass.isInstance(classLoader)) {
throw new IllegalArgumentException("ClassLoader must be instance of " + COMPOUND_CLASS_LOADER_NAME); throw new IllegalArgumentException(
"ClassLoader must be an instance of [" + COMPOUND_CLASS_LOADER_NAME + "]: " + classLoader);
} }
this.classLoader = classLoader; this.classLoader = classLoader;
} }