From ae5b0c6fb5f02a525ec3e394f45e37aab25d47a1 Mon Sep 17 00:00:00 2001 From: Philippe Marschall Date: Fri, 14 Oct 2016 16:24:16 +0200 Subject: [PATCH 1/2] Replace J2EE with Java EE String with version 5 the name of Java Platform, Enterprise Edition changed from J2EE to Java EE. However a lot of the documentation still uses the term J2EE. This commit includes the following changes: * replace J2EE with Java EE where appropriate This is not a blind search and replace. The following occurrences remain unchanged: * references to old J2EE releases, most notably 1.3 and 1.4. * references to "Expert One-On-One J2EE Design and Development" * references to "Core J2EE patterns" * XML namespaces * package names Issue: SPR-14811 See gh-1206 --- .../beans/factory/access/BeanFactoryLocator.java | 4 ++-- .../access/AbstractRemoteSlsbInvokerInterceptor.java | 2 +- .../org/springframework/ejb/config/package-info.java | 2 +- .../org/springframework/jndi/JndiLocatorDelegate.java | 2 +- .../org/springframework/jndi/JndiLocatorSupport.java | 10 +++++----- .../org/springframework/jndi/JndiObjectLocator.java | 4 ++-- .../jndi/support/SimpleJndiBeanFactory.java | 2 +- .../concurrent/DefaultManagedAwareThreadFactory.java | 4 ++-- .../concurrent/DefaultManagedTaskExecutor.java | 4 ++-- .../concurrent/DefaultManagedTaskScheduler.java | 4 ++-- .../org/springframework/stereotype/Repository.java | 4 ++-- .../tests/mock/jndi/SimpleNamingContextBuilder.java | 2 +- .../springframework/tests/mock/jndi/package-info.java | 2 +- .../jdbc/datasource/DataSourceTransactionManager.java | 6 +++--- .../jdbc/datasource/DriverManagerDataSource.java | 8 ++++---- .../jdbc/datasource/LazyConnectionDataSourceProxy.java | 4 ++-- .../jdbc/datasource/SimpleDriverDataSource.java | 6 +++--- .../datasource/TransactionAwareDataSourceProxy.java | 6 +++--- .../jms/connection/JmsTransactionManager.java | 6 +++--- .../org/springframework/jms/config/spring-jms.xsd | 6 +++--- .../PersistenceAnnotationBeanPostProcessor.java | 2 +- .../mock/jndi/SimpleNamingContextBuilder.java | 2 +- .../jca/cci/connection/CciLocalTransactionManager.java | 6 +++--- .../TransactionAwareConnectionFactoryProxy.java | 6 +++--- .../jca/context/SpringContextResourceAdapter.java | 2 +- .../jca/support/LocalConnectionFactoryBean.java | 4 ++-- .../jca/work/WorkManagerTaskExecutor.java | 2 +- .../remoting/jaxws/LocalJaxWsServiceFactoryBean.java | 4 ++-- 28 files changed, 58 insertions(+), 58 deletions(-) diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/access/BeanFactoryLocator.java b/spring-beans/src/main/java/org/springframework/beans/factory/access/BeanFactoryLocator.java index b917de2a174..4629eb40b23 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/access/BeanFactoryLocator.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/access/BeanFactoryLocator.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2016 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. @@ -40,7 +40,7 @@ import org.springframework.beans.BeansException; * {@code BeanFactory} from which it gets the real object, to which it * delegates, then proper Dependency Injection has been achieved. * - *

As another example, in a complex J2EE app with multiple layers, with each + *

As another example, in a complex Java EE app with multiple layers, with each * layer having its own {@code ApplicationContext} definition (in a * hierarchy), a class like {@code SingletonBeanFactoryLocator} may be used * to demand load these contexts. diff --git a/spring-context/src/main/java/org/springframework/ejb/access/AbstractRemoteSlsbInvokerInterceptor.java b/spring-context/src/main/java/org/springframework/ejb/access/AbstractRemoteSlsbInvokerInterceptor.java index a838a9ea8e2..b731b78146b 100644 --- a/spring-context/src/main/java/org/springframework/ejb/access/AbstractRemoteSlsbInvokerInterceptor.java +++ b/spring-context/src/main/java/org/springframework/ejb/access/AbstractRemoteSlsbInvokerInterceptor.java @@ -53,7 +53,7 @@ public abstract class AbstractRemoteSlsbInvokerInterceptor extends AbstractSlsbI * Set a home interface that this invoker will narrow to before performing * the parameterless SLSB {@code create()} call that returns the actual * SLSB proxy. - *

Default is none, which will work on all J2EE servers that are not based + *

Default is none, which will work on all Java EE servers that are not based * on CORBA. A plain {@code javax.ejb.EJBHome} interface is known to be * sufficient to make a WebSphere 5.0 Remote SLSB work. On other servers, * the specific home interface for the target SLSB might be necessary. diff --git a/spring-context/src/main/java/org/springframework/ejb/config/package-info.java b/spring-context/src/main/java/org/springframework/ejb/config/package-info.java index de75e5fded7..ccb26f87bb0 100644 --- a/spring-context/src/main/java/org/springframework/ejb/config/package-info.java +++ b/spring-context/src/main/java/org/springframework/ejb/config/package-info.java @@ -1,5 +1,5 @@ /** - * Support package for EJB/J2EE-related configuration, + * Support package for EJB/Java EE-related configuration, * with XML schema being the primary configuration format. */ package org.springframework.ejb.config; diff --git a/spring-context/src/main/java/org/springframework/jndi/JndiLocatorDelegate.java b/spring-context/src/main/java/org/springframework/jndi/JndiLocatorDelegate.java index 53aaebb76ce..beba496092d 100644 --- a/spring-context/src/main/java/org/springframework/jndi/JndiLocatorDelegate.java +++ b/spring-context/src/main/java/org/springframework/jndi/JndiLocatorDelegate.java @@ -76,7 +76,7 @@ public class JndiLocatorDelegate extends JndiLocatorSupport { } /** - * Check whether a default JNDI environment, as in a J2EE environment, + * Check whether a default JNDI environment, as in a Java EE environment, * is available on this JVM. * @return {@code true} if a default InitialContext can be used, * {@code false} if not diff --git a/spring-context/src/main/java/org/springframework/jndi/JndiLocatorSupport.java b/spring-context/src/main/java/org/springframework/jndi/JndiLocatorSupport.java index f24e8467f5f..a05ea898d1c 100644 --- a/spring-context/src/main/java/org/springframework/jndi/JndiLocatorSupport.java +++ b/spring-context/src/main/java/org/springframework/jndi/JndiLocatorSupport.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2016 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,7 +26,7 @@ import org.springframework.util.Assert; * bean properties. * *

JNDI names may or may not include the "java:comp/env/" prefix expected - * by J2EE applications when accessing a locally mapped (ENC - Environmental + * by Java EE applications when accessing a locally mapped (ENC - Environmental * Naming Context) resource. If it doesn't, the "java:comp/env/" prefix will * be prepended if the "resourceRef" property is true (the default is * false) and no other scheme (e.g. "java:") is given. @@ -39,7 +39,7 @@ import org.springframework.util.Assert; */ public abstract class JndiLocatorSupport extends JndiAccessor { - /** JNDI prefix used in a J2EE container */ + /** JNDI prefix used in a Java EE container */ public static final String CONTAINER_PREFIX = "java:comp/env/"; @@ -47,7 +47,7 @@ public abstract class JndiLocatorSupport extends JndiAccessor { /** - * Set whether the lookup occurs in a J2EE container, i.e. if the prefix + * Set whether the lookup occurs in a Java EE container, i.e. if the prefix * "java:comp/env/" needs to be added if the JNDI name doesn't already * contain it. Default is "false". *

Note: Will only get applied if no other scheme (e.g. "java:") is given. @@ -57,7 +57,7 @@ public abstract class JndiLocatorSupport extends JndiAccessor { } /** - * Return whether the lookup occurs in a J2EE container. + * Return whether the lookup occurs in a Java EE container. */ public boolean isResourceRef() { return this.resourceRef; diff --git a/spring-context/src/main/java/org/springframework/jndi/JndiObjectLocator.java b/spring-context/src/main/java/org/springframework/jndi/JndiObjectLocator.java index 123dcee53c4..bcf442ac0f6 100644 --- a/spring-context/src/main/java/org/springframework/jndi/JndiObjectLocator.java +++ b/spring-context/src/main/java/org/springframework/jndi/JndiObjectLocator.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2016 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,7 +26,7 @@ import org.springframework.util.StringUtils; * providing configurable lookup of a specific JNDI resource. * *

Exposes a {@link #setJndiName "jndiName"} property. This may or may not - * include the "java:comp/env/" prefix expected by J2EE applications when + * include the "java:comp/env/" prefix expected by Java EE applications when * accessing a locally mapped (Environmental Naming Context) resource. If it * doesn't, the "java:comp/env/" prefix will be prepended if the "resourceRef" * property is true (the default is false) and no other scheme diff --git a/spring-context/src/main/java/org/springframework/jndi/support/SimpleJndiBeanFactory.java b/spring-context/src/main/java/org/springframework/jndi/support/SimpleJndiBeanFactory.java index 6bfbec411d7..76d9f3cffc6 100644 --- a/spring-context/src/main/java/org/springframework/jndi/support/SimpleJndiBeanFactory.java +++ b/spring-context/src/main/java/org/springframework/jndi/support/SimpleJndiBeanFactory.java @@ -40,7 +40,7 @@ import org.springframework.jndi.TypeMismatchNamingException; * the {@link org.springframework.beans.factory.ListableBeanFactory} interface. * *

This factory resolves given bean names as JNDI names within the - * J2EE application's "java:comp/env/" namespace. It caches the resolved + * Java EE application's "java:comp/env/" namespace. It caches the resolved * types for all obtained objects, and optionally also caches shareable * objects (if they are explicitly marked as * {@link #addShareableResource shareable resource}. diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/DefaultManagedAwareThreadFactory.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/DefaultManagedAwareThreadFactory.java index f3380266390..9f67ab1b7da 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/DefaultManagedAwareThreadFactory.java +++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/DefaultManagedAwareThreadFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2015 the original author or authors. + * Copyright 2002-2016 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. @@ -73,7 +73,7 @@ public class DefaultManagedAwareThreadFactory extends CustomizableThreadFactory } /** - * Set whether the lookup occurs in a J2EE container, i.e. if the prefix + * Set whether the lookup occurs in a Java EE container, i.e. if the prefix * "java:comp/env/" needs to be added if the JNDI name doesn't already * contain it. PersistenceAnnotationBeanPostProcessor's default is "true". * @see org.springframework.jndi.JndiLocatorSupport#setResourceRef diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/DefaultManagedTaskExecutor.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/DefaultManagedTaskExecutor.java index 1aad3a46a03..803491d1049 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/DefaultManagedTaskExecutor.java +++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/DefaultManagedTaskExecutor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2013 the original author or authors. + * Copyright 2002-2016 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. @@ -60,7 +60,7 @@ public class DefaultManagedTaskExecutor extends ConcurrentTaskExecutor implement } /** - * Set whether the lookup occurs in a J2EE container, i.e. if the prefix + * Set whether the lookup occurs in a Java EE container, i.e. if the prefix * "java:comp/env/" needs to be added if the JNDI name doesn't already * contain it. PersistenceAnnotationBeanPostProcessor's default is "true". * @see org.springframework.jndi.JndiLocatorSupport#setResourceRef diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/DefaultManagedTaskScheduler.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/DefaultManagedTaskScheduler.java index 039a6a78000..989c4370f76 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/DefaultManagedTaskScheduler.java +++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/DefaultManagedTaskScheduler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2013 the original author or authors. + * Copyright 2002-2016 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. @@ -60,7 +60,7 @@ public class DefaultManagedTaskScheduler extends ConcurrentTaskScheduler impleme } /** - * Set whether the lookup occurs in a J2EE container, i.e. if the prefix + * Set whether the lookup occurs in a Java EE container, i.e. if the prefix * "java:comp/env/" needs to be added if the JNDI name doesn't already * contain it. PersistenceAnnotationBeanPostProcessor's default is "true". * @see org.springframework.jndi.JndiLocatorSupport#setResourceRef diff --git a/spring-context/src/main/java/org/springframework/stereotype/Repository.java b/spring-context/src/main/java/org/springframework/stereotype/Repository.java index 0709b72bfe1..e69d94466c1 100644 --- a/spring-context/src/main/java/org/springframework/stereotype/Repository.java +++ b/spring-context/src/main/java/org/springframework/stereotype/Repository.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2016 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. @@ -27,7 +27,7 @@ import java.lang.annotation.Target; * Domain-Driven Design (Evans, 2003) as "a mechanism for encapsulating storage, * retrieval, and search behavior which emulates a collection of objects". * - *

Teams implementing traditional J2EE patterns such as "Data Access Object" + *

Teams implementing traditional Java EE patterns such as "Data Access Object" * may also apply this stereotype to DAO classes, though care should be taken to * understand the distinction between Data Access Object and DDD-style repositories * before doing so. This annotation is a general-purpose stereotype and individual teams diff --git a/spring-context/src/test/java/org/springframework/tests/mock/jndi/SimpleNamingContextBuilder.java b/spring-context/src/test/java/org/springframework/tests/mock/jndi/SimpleNamingContextBuilder.java index 34b63b18c6a..c3405d38a3b 100644 --- a/spring-context/src/test/java/org/springframework/tests/mock/jndi/SimpleNamingContextBuilder.java +++ b/spring-context/src/test/java/org/springframework/tests/mock/jndi/SimpleNamingContextBuilder.java @@ -35,7 +35,7 @@ import org.springframework.util.ClassUtils; * configure JNDI appropriately, so that {@code new InitialContext()} * will expose the required objects. Also usable for standalone applications, * e.g. for binding a JDBC DataSource to a well-known JNDI location, to be - * able to use traditional J2EE data access code outside of a J2EE container. + * able to use traditional Java EE data access code outside of a Java EE container. * *

There are various choices for DataSource implementations: *