root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

+ internal improvement of WebLogic LTW 

+ minor improvements to the LTW files (mainly trailing blank lines)
This commit is contained in:
Costin Leau 2009-11-12 01:28:32 +00:00
parent 846c7f6000
commit 190aee17d8
6 changed files with 27 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
org.springframework.context/src/main/java/org/springframework/context/weaving/DefaultContextLoadTimeWeaver.java
View File

@ -27,7 +27,7 @@ import org.springframework.instrument.InstrumentationSavingAgent;
import org.springframework.instrument.classloading.InstrumentationLoadTimeWeaver; import org.springframework.instrument.classloading.InstrumentationLoadTimeWeaver;
import org.springframework.instrument.classloading.LoadTimeWeaver; import org.springframework.instrument.classloading.LoadTimeWeaver;
import org.springframework.instrument.classloading.ReflectiveLoadTimeWeaver; import org.springframework.instrument.classloading.ReflectiveLoadTimeWeaver;
import org.springframework.instrument.classloading.jboss.JBoss5LoadTimeWeaver; import org.springframework.instrument.classloading.jboss.JBossLoadTimeWeaver;
import org.springframework.instrument.classloading.glassfish.GlassFishLoadTimeWeaver; import org.springframework.instrument.classloading.glassfish.GlassFishLoadTimeWeaver;
import org.springframework.instrument.classloading.oc4j.OC4JLoadTimeWeaver; import org.springframework.instrument.classloading.oc4j.OC4JLoadTimeWeaver;
import org.springframework.instrument.classloading.weblogic.WebLogicLoadTimeWeaver; import org.springframework.instrument.classloading.weblogic.WebLogicLoadTimeWeaver;
@ -96,18 +96,19 @@ public class DefaultContextLoadTimeWeaver implements LoadTimeWeaver, BeanClassLo
* versions even though the ClassLoader name is the same. * versions even though the ClassLoader name is the same.
*/ */
protected LoadTimeWeaver createServerSpecificLoadTimeWeaver(ClassLoader classLoader) { protected LoadTimeWeaver createServerSpecificLoadTimeWeaver(ClassLoader classLoader) {
String name = classLoader.getClass().getName();
try { try {
if (classLoader.getClass().getName().startsWith("weblogic")) { if (name.startsWith("weblogic")) {
return new WebLogicLoadTimeWeaver(classLoader); return new WebLogicLoadTimeWeaver(classLoader);
} }
else if (classLoader.getClass().getName().startsWith("oracle")) { else if (name.startsWith("oracle")) {
return new OC4JLoadTimeWeaver(classLoader); return new OC4JLoadTimeWeaver(classLoader);
} }
else if (classLoader.getClass().getName().startsWith("com.sun.enterprise")) { else if (name.startsWith("com.sun.enterprise")) {
return new GlassFishLoadTimeWeaver(classLoader); return new GlassFishLoadTimeWeaver(classLoader);
} }
else if (classLoader.getClass().getName().startsWith("org.jboss")) { else if (name.startsWith("org.jboss")) {
return new JBoss5LoadTimeWeaver(classLoader); return new JBossLoadTimeWeaver(classLoader);
} }
} }
catch (IllegalStateException ex) { catch (IllegalStateException ex) {
@ -136,5 +137,4 @@ public class DefaultContextLoadTimeWeaver implements LoadTimeWeaver, BeanClassLo
public ClassLoader getThrowawayClassLoader() { public ClassLoader getThrowawayClassLoader() {
return this.loadTimeWeaver.getThrowawayClassLoader(); return this.loadTimeWeaver.getThrowawayClassLoader();
} }
}
}

3
org.springframework.context/src/main/java/org/springframework/instrument/classloading/ReflectiveLoadTimeWeaver.java
View File

@ -135,5 +135,4 @@ public class ReflectiveLoadTimeWeaver implements LoadTimeWeaver {
return new SimpleThrowawayClassLoader(this.classLoader); return new SimpleThrowawayClassLoader(this.classLoader);
} }
} }
}
}

3
org.springframework.context/src/main/java/org/springframework/instrument/classloading/oc4j/OC4JLoadTimeWeaver.java
View File

@ -76,5 +76,4 @@ public class OC4JLoadTimeWeaver implements LoadTimeWeaver {
public ClassLoader getThrowawayClassLoader() { public ClassLoader getThrowawayClassLoader() {
return ClassLoaderUtilities.copy(this.classLoader); return ClassLoaderUtilities.copy(this.classLoader);
} }
}
}

25
org.springframework.context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicClassLoader.java → org.springframework.context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicClassLoaderAdapter.java
View File

@ -34,14 +34,14 @@ import org.springframework.util.Assert;
* @author Juergen Hoeller * @author Juergen Hoeller
* @since 2.5 * @since 2.5
*/ */
class WebLogicClassLoader { class WebLogicClassLoaderAdapter {
private static final String GENERIC_CLASS_LOADER_NAME = "weblogic.utils.classloaders.GenericClassLoader"; private static final String GENERIC_CLASS_LOADER_NAME = "weblogic.utils.classloaders.GenericClassLoader";
private static final String CLASS_PRE_PROCESSOR_NAME = "weblogic.utils.classloaders.ClassPreProcessor"; private static final String CLASS_PRE_PROCESSOR_NAME = "weblogic.utils.classloaders.ClassPreProcessor";
private final ClassLoader internalClassLoader; private final ClassLoader classLoader;
private final Class wlPreProcessorClass; private final Class wlPreProcessorClass;
@ -54,7 +54,7 @@ class WebLogicClassLoader {
private final Constructor wlGenericClassLoaderConstructor; private final Constructor wlGenericClassLoaderConstructor;
public WebLogicClassLoader(ClassLoader classLoader) { public WebLogicClassLoaderAdapter(ClassLoader classLoader) {
Class wlGenericClassLoaderClass = null; Class wlGenericClassLoaderClass = null;
try { try {
wlGenericClassLoaderClass = classLoader.loadClass(GENERIC_CLASS_LOADER_NAME); wlGenericClassLoaderClass = classLoader.loadClass(GENERIC_CLASS_LOADER_NAME);
@ -68,21 +68,21 @@ class WebLogicClassLoader {
} }
catch (Exception ex) { catch (Exception ex) {
throw new IllegalStateException( throw new IllegalStateException(
"Could not initialize WebLogic ClassLoader because WebLogic 10 API classes are not available", ex); "Could not initialize WebLogic LoadTimeWeaver because WebLogic 10 API classes are not available", ex);
} }
Assert.isInstanceOf(wlGenericClassLoaderClass, classLoader, Assert.isInstanceOf(wlGenericClassLoaderClass, classLoader,
"ClassLoader must be instance of [" + wlGenericClassLoaderClass.getName() + "]"); "ClassLoader must be instance of [" + wlGenericClassLoaderClass.getName() + "]");
this.internalClassLoader = classLoader; this.classLoader = classLoader;
} }
public void addTransformer(ClassFileTransformer transformer) { public void addTransformer(ClassFileTransformer transformer) {
Assert.notNull(transformer, "ClassFileTransformer must not be null"); Assert.notNull(transformer, "ClassFileTransformer must not be null");
try { try {
InvocationHandler adapter = new WebLogicClassPreProcessorAdapter(transformer, this.internalClassLoader); InvocationHandler adapter = new WebLogicClassPreProcessorAdapter(transformer, this.classLoader);
Object adapterInstance = Proxy.newProxyInstance(this.wlPreProcessorClass.getClassLoader(), Object adapterInstance = Proxy.newProxyInstance(this.wlPreProcessorClass.getClassLoader(),
new Class[] {this.wlPreProcessorClass}, adapter); new Class[] {this.wlPreProcessorClass}, adapter);
this.addPreProcessorMethod.invoke(this.internalClassLoader, adapterInstance); this.addPreProcessorMethod.invoke(this.classLoader, adapterInstance);
} }
catch (InvocationTargetException ex) { catch (InvocationTargetException ex) {
throw new IllegalStateException("WebLogic addInstanceClassPreProcessor method threw exception", ex.getCause()); throw new IllegalStateException("WebLogic addInstanceClassPreProcessor method threw exception", ex.getCause());
@ -92,14 +92,14 @@ class WebLogicClassLoader {
} }
} }
public ClassLoader getInternalClassLoader() { public ClassLoader getClassLoader() {
return this.internalClassLoader; return this.classLoader;
} }
public ClassLoader getThrowawayClassLoader() { public ClassLoader getThrowawayClassLoader() {
try { try {
Object classFinder = this.getClassFinderMethod.invoke(this.internalClassLoader); Object classFinder = this.getClassFinderMethod.invoke(this.classLoader);
Object parent = this.getParentMethod.invoke(this.internalClassLoader); Object parent = this.getParentMethod.invoke(this.classLoader);
// arguments for 'clone'-like method // arguments for 'clone'-like method
return (ClassLoader) this.wlGenericClassLoaderConstructor.newInstance(classFinder, parent); return (ClassLoader) this.wlGenericClassLoaderConstructor.newInstance(classFinder, parent);
} }
@ -110,5 +110,4 @@ class WebLogicClassLoader {
throw new IllegalStateException("Could not construct WebLogic GenericClassLoader", ex); throw new IllegalStateException("Could not construct WebLogic GenericClassLoader", ex);
} }
} }
}
}

3
org.springframework.context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicClassPreProcessorAdapter.java
View File

@ -92,5 +92,4 @@ class WebLogicClassPreProcessorAdapter implements InvocationHandler {
builder.append(this.transformer); builder.append(this.transformer);
return builder.toString(); return builder.toString();
} }
}
}

9
org.springframework.context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicLoadTimeWeaver.java
View File

@ -34,7 +34,7 @@ import org.springframework.util.ClassUtils;
*/ */
public class WebLogicLoadTimeWeaver implements LoadTimeWeaver { public class WebLogicLoadTimeWeaver implements LoadTimeWeaver {
private final WebLogicClassLoader classLoader; private final WebLogicClassLoaderAdapter classLoader;
/** /**
@ -54,7 +54,7 @@ public class WebLogicLoadTimeWeaver implements LoadTimeWeaver {
*/ */
public WebLogicLoadTimeWeaver(ClassLoader classLoader) { public WebLogicLoadTimeWeaver(ClassLoader classLoader) {
Assert.notNull(classLoader, "ClassLoader must not be null"); Assert.notNull(classLoader, "ClassLoader must not be null");
this.classLoader = new WebLogicClassLoader(classLoader); this.classLoader = new WebLogicClassLoaderAdapter(classLoader);
} }
@ -63,11 +63,10 @@ public class WebLogicLoadTimeWeaver implements LoadTimeWeaver {
} }
public ClassLoader getInstrumentableClassLoader() { public ClassLoader getInstrumentableClassLoader() {
return this.classLoader.getInternalClassLoader(); return this.classLoader.getClassLoader();
} }
public ClassLoader getThrowawayClassLoader() { public ClassLoader getThrowawayClassLoader() {
return this.classLoader.getThrowawayClassLoader(); return this.classLoader.getThrowawayClassLoader();
} }
}
}