Removed OC4J support (including documentation references)

spring-context/src/main/java/org/springframework/context/annotation/EnableLoadTimeWeaving.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -55,13 +55,7 @@
  * Spring's JPA bootstrap support.
  *
  * <h2>Customizing the {@code LoadTimeWeaver}</h2>
- * The default weaver is determined automatically. As of Spring 3.1: detecting
- * Sun's GlassFish, Oracle's OC4J, Spring's VM agent and any ClassLoader supported by
- * Spring's {@link
- * org.springframework.instrument.classloading.ReflectiveLoadTimeWeaver
- * ReflectiveLoadTimeWeaver} (for example, the {@link
- * org.springframework.instrument.classloading.tomcat.TomcatInstrumentableClassLoader
- * TomcatInstrumentableClassLoader}).
+ * The default weaver is determined automatically: see {@link DefaultContextLoadTimeWeaver}.
  *
  * <p>To customize the weaver used, the {@code @Configuration} class annotated with
  * {@code @EnableLoadTimeWeaving} may also implement the {@link LoadTimeWeavingConfigurer}

spring-context/src/main/java/org/springframework/context/weaving/AspectJWeavingEnabler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,6 +22,7 @@
 import java.security.ProtectionDomain;
 
 import org.aspectj.weaver.loadtime.ClassPreProcessorAgentAdapter;
+
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanClassLoaderAware;
 import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
@@ -82,9 +83,7 @@ public static void enableAspectJWeaving(LoadTimeWeaver weaverToUse, ClassLoader
 
 	/**
 	 * ClassFileTransformer decorator that suppresses processing of AspectJ
-	 * classes in order to avoid potential LinkageErrors. Required especially for OC4J and
-	 * Tomcat (in Glassfish).
-	 *
+	 * classes in order to avoid potential LinkageErrors.
 	 * @see org.springframework.context.annotation.LoadTimeWeavingConfiguration
 	 */
 	private static class AspectJClassBypassingClassFileTransformer implements ClassFileTransformer {

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,7 +29,6 @@
 import org.springframework.instrument.classloading.ReflectiveLoadTimeWeaver;
 import org.springframework.instrument.classloading.glassfish.GlassFishLoadTimeWeaver;
 import org.springframework.instrument.classloading.jboss.JBossLoadTimeWeaver;
-import org.springframework.instrument.classloading.oc4j.OC4JLoadTimeWeaver;
 import org.springframework.instrument.classloading.weblogic.WebLogicLoadTimeWeaver;
 import org.springframework.instrument.classloading.websphere.WebSphereLoadTimeWeaver;
 
@@ -43,12 +42,11 @@
  *
  * <p>This class implements a runtime environment check for obtaining
  * the appropriate weaver implementation: As of Spring 3.1, it detects
- * Oracle WebLogic 10, Oracle OC4J 10, GlassFish 3, JBoss AS 5, 6 and 7,
- * IBM WebSphere 7 and 8, {@link InstrumentationSavingAgent Spring's VM agent}
- * and any {@link ClassLoader} supported by Spring's {@link ReflectiveLoadTimeWeaver}
- * (for example the
+ * Oracle WebLogic 10, GlassFish 3, JBoss AS 5, 6 and 7, IBM WebSphere 7 and 8,
+ * {@link InstrumentationSavingAgent Spring's VM agent}, and any {@link ClassLoader}
+ * supported by Spring's {@link ReflectiveLoadTimeWeaver} (for example the
  * {@link org.springframework.instrument.classloading.tomcat.TomcatInstrumentableClassLoader}
- * for Tomcat 5, 6 and 7).
+ * for Tomcat 6 and 7).
  *
  * @author Juergen Hoeller
  * @author Ramnivas Laddad
@@ -112,9 +110,6 @@ protected LoadTimeWeaver createServerSpecificLoadTimeWeaver(ClassLoader classLoa
 			if (name.startsWith("weblogic")) {
 				return new WebLogicLoadTimeWeaver(classLoader);
 			}
-			else if (name.startsWith("oracle")) {
-				return new OC4JLoadTimeWeaver(classLoader);
-			}
 			else if (name.startsWith("com.sun.enterprise") || name.startsWith("org.glassfish")) {
 				return new GlassFishLoadTimeWeaver(classLoader);
 			}

spring-context/src/main/java/org/springframework/remoting/rmi/RmiClientInterceptorUtils.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -51,8 +51,6 @@
  */
 public abstract class RmiClientInterceptorUtils {
 
-	private static final String ORACLE_CONNECTION_EXCEPTION = "com.evermind.server.rmi.RMIConnectionException";
-
 	private static final Log logger = LogFactory.getLog(RmiClientInterceptorUtils.class);
 
 
@@ -198,9 +196,7 @@ public static Exception convertRmiAccessException(
 	/**
 	 * Determine whether the given RMI exception indicates a connect failure.
 	 * <p>Treats RMI's ConnectException, ConnectIOException, UnknownHostException,
-	 * NoSuchObjectException and StubNotFoundException as connect failure,
-	 * as well as Oracle's OC4J {@code com.evermind.server.rmi.RMIConnectionException}
-	 * (which doesn't derive from from any well-known RMI connect exception).
+	 * NoSuchObjectException and StubNotFoundException as connect failure.
 	 * @param ex the RMI exception to check
 	 * @return whether the exception should be treated as connect failure
 	 * @see java.rmi.ConnectException
@@ -213,7 +209,7 @@ public static boolean isConnectFailure(RemoteException ex) {
 		return (ex instanceof ConnectException || ex instanceof ConnectIOException ||
 				ex instanceof UnknownHostException || ex instanceof NoSuchObjectException ||
 				ex instanceof StubNotFoundException || ex.getCause() instanceof SocketException ||
-				isCorbaConnectFailure(ex.getCause()) || ORACLE_CONNECTION_EXCEPTION.equals(ex.getClass().getName()));
+				isCorbaConnectFailure(ex.getCause()));
 	}
 
 	/**