Fix broken links in Javadoc

This commit removes several links that were broken due to the removal
of various APIs in 6.0.

See gh-27480

Author: sbrannen

spring-context/src/main/java/org/springframework/cache/concurrent/ConcurrentMapCacheManager.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 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.
@@ -38,8 +38,7 @@
  * <p>Note: This is by no means a sophisticated CacheManager; it comes with no
  * cache configuration options. However, it may be useful for testing or simple
  * caching scenarios. For advanced local caching needs, consider
- * {@link org.springframework.cache.jcache.JCacheCacheManager},
- * {@link org.springframework.cache.ehcache.EhCacheCacheManager},
+ * {@link org.springframework.cache.jcache.JCacheCacheManager} or
  * {@link org.springframework.cache.caffeine.CaffeineCacheManager}.
  *
  * @author Juergen Hoeller

spring-context/src/main/java/org/springframework/scheduling/SchedulingAwareRunnable.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2021 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.
@@ -17,22 +17,17 @@
 package org.springframework.scheduling;
 
 /**
- * Extension of the Runnable interface, adding special callbacks
+ * Extension of the {@link Runnable} interface, adding special callbacks
  * for long-running operations.
  *
- * <p>This interface closely corresponds to the CommonJ Work interface,
- * but is kept separate to avoid a required CommonJ dependency.
- *
  * <p>Scheduling-capable TaskExecutors are encouraged to check a submitted
  * Runnable, detecting whether this interface is implemented and reacting
  * as appropriately as they are able to.
  *
  * @author Juergen Hoeller
  * @since 2.0
- * @see commonj.work.Work
  * @see org.springframework.core.task.TaskExecutor
  * @see SchedulingTaskExecutor
- * @see org.springframework.scheduling.commonj.WorkManagerTaskExecutor
  */
 public interface SchedulingAwareRunnable extends Runnable {
 

spring-context/src/main/java/org/springframework/scheduling/SchedulingTaskExecutor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 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.
@@ -28,7 +28,7 @@
  *
  * <p>Note: {@link SchedulingTaskExecutor} implementations are encouraged to also
  * implement the {@link org.springframework.core.task.AsyncListenableTaskExecutor}
- * interface. This is not required due to the dependency on Spring 4.0's new
+ * interface. This is not required due to the dependency on Spring 4.0's
  * {@link org.springframework.util.concurrent.ListenableFuture} interface,
  * which would make it impossible for third-party executor implementations
  * to remain compatible with both Spring 4.0 and Spring 3.x.
@@ -37,7 +37,6 @@
  * @since 2.0
  * @see SchedulingAwareRunnable
  * @see org.springframework.core.task.TaskExecutor
- * @see org.springframework.scheduling.commonj.WorkManagerTaskExecutor
  */
 public interface SchedulingTaskExecutor extends AsyncTaskExecutor {
 

spring-core/src/main/java/org/springframework/core/ConfigurableObjectInputStream.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2021 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.
@@ -26,12 +26,12 @@
 import org.springframework.util.ClassUtils;
 
 /**
- * Special ObjectInputStream subclass that resolves class names
- * against a specific ClassLoader. Serves as base class for
- * {@link org.springframework.remoting.rmi.CodebaseAwareObjectInputStream}.
+ * Special {@link ObjectInputStream} subclass that resolves class names
+ * against a specific {@link ClassLoader}.
  *
  * @author Juergen Hoeller
  * @since 2.5.5
+ * @see org.springframework.core.serializer.DefaultDeserializer
  */
 public class ConfigurableObjectInputStream extends ObjectInputStream {
 

spring-core/src/main/java/org/springframework/core/io/VfsResource.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 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.
@@ -38,7 +38,6 @@
  * @author Costin Leau
  * @author Sam Brannen
  * @since 3.0
- * @see org.jboss.vfs.VirtualFile
  */
 public class VfsResource extends AbstractResource {
 

spring-core/src/main/java/org/springframework/core/io/VfsUtils.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 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.
@@ -35,8 +35,9 @@
  * (package {@code org.jboss.vfs}) and is in particular compatible with
  * JBoss AS 7 and WildFly 8+.
  *
- * <p>Thanks go to Marius Bogoevici for the initial patch.
- * <b>Note:</b> This is an internal class and should not be used outside the framework.
+ * <p>Thanks go to Marius Bogoevici for the initial implementation.
+ *
+ * <p><b>Note:</b> This is an internal class and should not be used outside the framework.
  *
  * @author Costin Leau
  * @author Juergen Hoeller

spring-core/src/main/java/org/springframework/core/task/SimpleAsyncTaskExecutor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 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.
@@ -45,7 +45,6 @@
  * @see #setConcurrencyLimit
  * @see SyncTaskExecutor
  * @see org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor
- * @see org.springframework.scheduling.commonj.WorkManagerTaskExecutor
  */
 @SuppressWarnings("serial")
 public class SimpleAsyncTaskExecutor extends CustomizableThreadCreator

spring-jms/src/main/java/org/springframework/jms/listener/DefaultMessageListenerContainer.java

@@ -62,11 +62,10 @@
  * abstraction. By default, the specified number of invoker tasks will be created
  * on startup, according to the {@link #setConcurrentConsumers "concurrentConsumers"}
  * setting. Specify an alternative {@code TaskExecutor} to integrate with an existing
- * thread pool facility (such as a Jakarta EE server's), for example using a
- * {@link org.springframework.scheduling.commonj.WorkManagerTaskExecutor CommonJ WorkManager}.
- * With a native JMS setup, each of those listener threads is going to use a
- * cached JMS {@code Session} and {@code MessageConsumer} (only refreshed in case
- * of failure), using the JMS provider's resources as efficiently as possible.
+ * thread pool facility (such as a Jakarta EE server's). With a native JMS setup,
+ * each of those listener threads is going to use a cached JMS {@code Session} and
+ * {@code MessageConsumer} (only refreshed in case of failure), using the JMS provider's
+ * resources as efficiently as possible.
  *
  * <p>Message reception and listener execution can automatically be wrapped
  * in transactions by passing a Spring
@@ -224,7 +223,6 @@ public class DefaultMessageListenerContainer extends AbstractPollingMessageListe
 	 * will occupy a number of threads for its entire lifetime.
 	 * @see #setConcurrentConsumers
 	 * @see org.springframework.core.task.SimpleAsyncTaskExecutor
-	 * @see org.springframework.scheduling.commonj.WorkManagerTaskExecutor
 	 */
 	public void setTaskExecutor(Executor taskExecutor) {
 		this.taskExecutor = taskExecutor;

spring-jms/src/main/java/org/springframework/jms/listener/SimpleMessageListenerContainer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 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.
@@ -177,7 +177,6 @@ public void setConcurrentConsumers(int concurrentConsumers) {
 	 * {@link jakarta.jms.MessageListener} will work fine, in general.
 	 * @see #setConcurrentConsumers
 	 * @see org.springframework.core.task.SimpleAsyncTaskExecutor
-	 * @see org.springframework.scheduling.commonj.WorkManagerTaskExecutor
 	 */
 	public void setTaskExecutor(Executor taskExecutor) {
 		this.taskExecutor = taskExecutor;

spring-jms/src/main/java/org/springframework/jms/support/converter/MessageConverter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 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.
@@ -31,8 +31,6 @@
  * @since 1.1
  * @see org.springframework.jms.core.JmsTemplate#setMessageConverter
  * @see org.springframework.jms.listener.adapter.MessageListenerAdapter#setMessageConverter
- * @see org.springframework.jms.remoting.JmsInvokerClientInterceptor#setMessageConverter
- * @see org.springframework.jms.remoting.JmsInvokerServiceExporter#setMessageConverter
  */
 public interface MessageConverter {
 

spring-tx/src/main/java/org/springframework/jca/endpoint/GenericMessageEndpointManager.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 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.
@@ -39,59 +39,61 @@
  *
  * <pre class="code">
  * &lt;bean class="org.springframework.jca.endpoint.GenericMessageEndpointManager"&gt;
- * 	 &lt;property name="resourceAdapter" ref="resourceAdapter"/&gt;
- * 	 &lt;property name="messageEndpointFactory"&gt;
- *     &lt;bean class="org.springframework.jca.endpoint.GenericMessageEndpointFactory"&gt;
- *       &lt;property name="messageListener" ref="messageListener"/&gt;
- *     &lt;/bean&gt;
- * 	 &lt;/property&gt;
- * 	 &lt;property name="activationSpec"&gt;
- *     &lt;bean class="org.apache.activemq.ra.ActiveMQActivationSpec"&gt;
- *       &lt;property name="destination" value="myQueue"/&gt;
- *       &lt;property name="destinationType" value="jakarta.jms.Queue"/&gt;
- *     &lt;/bean&gt;
- *   &lt;/property&gt;
- * &lt;/bean&gt;</pre>
+ *  &lt;property name="resourceAdapter" ref="resourceAdapter"/&gt;
+ *  &lt;property name="messageEndpointFactory"&gt;
+ *    &lt;bean class="org.springframework.jca.endpoint.GenericMessageEndpointFactory"&gt;
+ *      &lt;property name="messageListener" ref="messageListener"/&gt;
+ *    &lt;/bean&gt;
+ *  &lt;/property&gt;
+ *  &lt;property name="activationSpec"&gt;
+ *    &lt;bean class="org.apache.activemq.ra.ActiveMQActivationSpec"&gt;
+ *      &lt;property name="destination" value="myQueue"/&gt;
+ *      &lt;property name="destinationType" value="jakarta.jms.Queue"/&gt;
+ *    &lt;/bean&gt;
+ *  &lt;/property&gt;
+ * &lt;/bean&gt;
+ * </pre>
  *
- * In this example, Spring's own {@link GenericMessageEndpointFactory} is used
+ * <p>In this example, Spring's own {@link GenericMessageEndpointFactory} is used
  * to point to a standard message listener object that happens to be supported
  * by the specified target ResourceAdapter: in this case, a JMS
  * {@link jakarta.jms.MessageListener} object as supported by the ActiveMQ
  * message broker, defined as a Spring bean:
  *
  * <pre class="code">
  * &lt;bean id="messageListener" class="com.myorg.messaging.myMessageListener"&gt;
- *   ...
- * &lt;/bean&gt;</pre>
+ *   &lt;!-- ... --&gt;
+ * &lt;/bean&gt;
+ * </pre>
  *
- * The target ResourceAdapter may be configured as a local Spring bean as well
+ * <p>The target ResourceAdapter may be configured as a local Spring bean as well
  * (the typical case) or obtained from JNDI (e.g. on WebLogic). For the
  * example above, a local ResourceAdapter bean could be defined as follows
  * (matching the "resourceAdapter" bean reference above):
  *
  * <pre class="code">
  * &lt;bean id="resourceAdapter" class="org.springframework.jca.support.ResourceAdapterFactoryBean"&gt;
- *   &lt;property name="resourceAdapter"&gt;
- *     &lt;bean class="org.apache.activemq.ra.ActiveMQResourceAdapter"&gt;
- *       &lt;property name="serverUrl" value="tcp://localhost:61616"/&gt;
- *     &lt;/bean&gt;
- *   &lt;/property&gt;
- *   &lt;property name="workManager"&gt;
- *     &lt;bean class="org.springframework.jca.work.SimpleTaskWorkManager"/&gt;
- *   &lt;/property&gt;
- * &lt;/bean&gt;</pre>
+ *  &lt;property name="resourceAdapter"&gt;
+ *    &lt;bean class="org.apache.activemq.ra.ActiveMQResourceAdapter"&gt;
+ *      &lt;property name="serverUrl" value="tcp://localhost:61616"/&gt;
+ *    &lt;/bean&gt;
+ *  &lt;/property&gt;
+ *  &lt;property name="workManager"&gt;
+ *    &lt;bean class="..."/&gt;
+ *  &lt;/property&gt;
+ * &lt;/bean&gt;
+ * </pre>
  *
- * For a different target resource, the configuration would simply point to a
+ * <p>For a different target resource, the configuration would simply point to a
  * different ResourceAdapter and a different ActivationSpec object (which are
  * both specific to the resource provider), and possibly a different message
  * listener (e.g. a CCI {@link jakarta.resource.cci.MessageListener} for a
  * resource adapter which is based on the JCA Common Client Interface).
  *
  * <p>The asynchronous execution strategy can be customized through the
- * "workManager" property on the ResourceAdapterFactoryBean (as shown above).
- * Check out {@link org.springframework.jca.work.SimpleTaskWorkManager}'s
- * javadoc for its configuration options; alternatively, any other
- * JCA-compliant WorkManager can be used (e.g. Geronimo's).
+ * "workManager" property on the ResourceAdapterFactoryBean as shown above,
+ * where {@code <bean class="..."/>} should be replaced with configuration for
+ * any JCA-compliant {@code WorkManager}.
  *
  * <p>Transactional execution is a responsibility of the concrete message endpoint,
  * as built by the specified MessageEndpointFactory. {@link GenericMessageEndpointFactory}
@@ -101,43 +103,45 @@
  *
  * <pre class="code">
  * &lt;bean class="org.springframework.jca.endpoint.GenericMessageEndpointManager"&gt;
- * 	 &lt;property name="resourceAdapter" ref="resourceAdapter"/&gt;
- * 	 &lt;property name="messageEndpointFactory"&gt;
- *     &lt;bean class="org.springframework.jca.endpoint.GenericMessageEndpointFactory"&gt;
- *       &lt;property name="messageListener" ref="messageListener"/&gt;
- *       &lt;property name="transactionManager" ref="transactionManager"/&gt;
- *     &lt;/bean&gt;
- * 	 &lt;/property&gt;
- * 	 &lt;property name="activationSpec"&gt;
- *     &lt;bean class="org.apache.activemq.ra.ActiveMQActivationSpec"&gt;
- *       &lt;property name="destination" value="myQueue"/&gt;
- *       &lt;property name="destinationType" value="jakarta.jms.Queue"/&gt;
- *     &lt;/bean&gt;
- *   &lt;/property&gt;
+ *  &lt;property name="resourceAdapter" ref="resourceAdapter"/&gt;
+ *  &lt;property name="messageEndpointFactory"&gt;
+ *    &lt;bean class="org.springframework.jca.endpoint.GenericMessageEndpointFactory"&gt;
+ *      &lt;property name="messageListener" ref="messageListener"/&gt;
+ *      &lt;property name="transactionManager" ref="transactionManager"/&gt;
+ *    &lt;/bean&gt;
+ *  &lt;/property&gt;
+ *  &lt;property name="activationSpec"&gt;
+ *    &lt;bean class="org.apache.activemq.ra.ActiveMQActivationSpec"&gt;
+ *      &lt;property name="destination" value="myQueue"/&gt;
+ *      &lt;property name="destinationType" value="jakarta.jms.Queue"/&gt;
+ *    &lt;/bean&gt;
+ *  &lt;/property&gt;
  * &lt;/bean&gt;
  *
- * &lt;bean id="transactionManager" class="org.springframework.transaction.jta.JtaTransactionManager"/&gt;</pre>
+ * &lt;bean id="transactionManager" class="org.springframework.transaction.jta.JtaTransactionManager"/&gt;
+ * </pre>
  *
- * Alternatively, check out your resource provider's ActivationSpec object,
+ * <p>Alternatively, check out your resource provider's ActivationSpec object,
  * which should support local transactions through a provider-specific config flag,
  * e.g. ActiveMQActivationSpec's "useRAManagedTransaction" bean property.
  *
  * <pre class="code">
  * &lt;bean class="org.springframework.jca.endpoint.GenericMessageEndpointManager"&gt;
- * 	 &lt;property name="resourceAdapter" ref="resourceAdapter"/&gt;
- * 	 &lt;property name="messageEndpointFactory"&gt;
- *     &lt;bean class="org.springframework.jca.endpoint.GenericMessageEndpointFactory"&gt;
- *       &lt;property name="messageListener" ref="messageListener"/&gt;
- *     &lt;/bean&gt;
- * 	 &lt;/property&gt;
- * 	 &lt;property name="activationSpec"&gt;
- *     &lt;bean class="org.apache.activemq.ra.ActiveMQActivationSpec"&gt;
- *       &lt;property name="destination" value="myQueue"/&gt;
- *       &lt;property name="destinationType" value="jakarta.jms.Queue"/&gt;
- *       &lt;property name="useRAManagedTransaction" value="true"/&gt;
- *     &lt;/bean&gt;
- *   &lt;/property&gt;
- * &lt;/bean&gt;</pre>
+ *  &lt;property name="resourceAdapter" ref="resourceAdapter"/&gt;
+ *  &lt;property name="messageEndpointFactory"&gt;
+ *    &lt;bean class="org.springframework.jca.endpoint.GenericMessageEndpointFactory"&gt;
+ *      &lt;property name="messageListener" ref="messageListener"/&gt;
+ *    &lt;/bean&gt;
+ *  &lt;/property&gt;
+ *  &lt;property name="activationSpec"&gt;
+ *    &lt;bean class="org.apache.activemq.ra.ActiveMQActivationSpec"&gt;
+ *      &lt;property name="destination" value="myQueue"/&gt;
+ *      &lt;property name="destinationType" value="jakarta.jms.Queue"/&gt;
+ *      &lt;property name="useRAManagedTransaction" value="true"/&gt;
+ *    &lt;/bean&gt;
+ *  &lt;/property&gt;
+ * &lt;/bean&gt;
+ * </pre>
  *
  * @author Juergen Hoeller
  * @since 2.5