Skip to content

Commit 14f27bd

Browse files
jhoellerjhoeller
committed
Prefer use of "Java EE" over "J2EE"
1 parent e5a2b34 commit 14f27bd

7 files changed

Lines changed: 29 additions & 28 deletions

File tree

‎spring-jms/src/main/java/org/springframework/jms/connection/TransactionAwareConnectionFactoryProxy.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2012 the original author or authors.
2+
* Copyright 2002-2015 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -39,7 +39,7 @@
3939
/**
4040
* Proxy for a target JMS {@link javax.jms.ConnectionFactory}, adding awareness of
4141
* Spring-managed transactions. Similar to a transactional JNDI ConnectionFactory
42-
* as provided by a J2EE server.
42+
* as provided by a Java EE application server.
4343
*
4444
* <p>Messaging code which should remain unaware of Spring's JMS support can work with
4545
* this proxy to seamlessly participate in Spring-managed transactions. Note that the

‎spring-jms/src/main/java/org/springframework/jms/core/JmsTemplate.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
* domain.
5252
*
5353
* <p>Default settings for JMS Sessions are "not transacted" and "auto-acknowledge".
54-
* As defined by the J2EE specification, the transaction and acknowledgement
54+
* As defined by the Java EE specification, the transaction and acknowledgement
5555
* parameters are ignored when a JMS Session is created inside an active
5656
* transaction, no matter if a JTA transaction or a Spring-managed transaction.
5757
* To configure them for native JMS usage, specify appropriate values for
@@ -71,7 +71,7 @@
7171
* {@link org.springframework.jms.connection.SingleConnectionFactory} as a
7272
* decorator for your target {@code ConnectionFactory}, reusing a single
7373
* JMS Connection in a thread-safe fashion; this is often good enough for the
74-
* purpose of sending messages via this template. In a J2EE environment,
74+
* purpose of sending messages via this template. In a Java EE environment,
7575
* make sure that the {@code ConnectionFactory} is obtained from the
7676
* application's environment naming context via JNDI; application servers
7777
* typically expose pooled, transaction-aware factories there.

‎spring-jms/src/main/java/org/springframework/jms/listener/AbstractPollingMessageListenerContainer.java‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,20 +46,19 @@
4646
* configured through the {@link #setReceiveTimeout "receiveTimeout"} property.
4747
*
4848
* <p>The underlying mechanism is based on standard JMS MessageConsumer handling,
49-
* which is perfectly compatible with both native JMS and JMS in a J2EE environment.
50-
* Neither the JMS {@code MessageConsumer.setMessageListener} facility
51-
* nor the JMS ServerSessionPool facility is required. A further advantage
52-
* of this approach is full control over the listening process, allowing for
53-
* custom scaling and throttling and of concurrent message processing
54-
* (which is up to concrete subclasses).
49+
* which is perfectly compatible with both native JMS and JMS in a Java EE environment.
50+
* Neither the JMS {@code MessageConsumer.setMessageListener} facility nor the JMS
51+
* ServerSessionPool facility is required. A further advantage of this approach is
52+
* full control over the listening process, allowing for custom scaling and throttling
53+
* and of concurrent message processing (which is up to concrete subclasses).
5554
*
5655
* <p>Message reception and listener execution can automatically be wrapped
5756
* in transactions through passing a Spring
5857
* {@link org.springframework.transaction.PlatformTransactionManager} into the
5958
* {@link #setTransactionManager "transactionManager"} property. This will usually
6059
* be a {@link org.springframework.transaction.jta.JtaTransactionManager} in a
61-
* J2EE enviroment, in combination with a JTA-aware JMS ConnectionFactory obtained
62-
* from JNDI (check your J2EE server's documentation).
60+
* Java EE enviroment, in combination with a JTA-aware JMS ConnectionFactory
61+
* obtained from JNDI (check your application server's documentation).
6362
*
6463
* <p>This base class does not assume any specific mechanism for asynchronous
6564
* execution of polling invokers. Check out {@link DefaultMessageListenerContainer}

‎spring-jms/src/main/java/org/springframework/jms/support/JmsAccessor.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2014 the original author or authors.
2+
* Copyright 2002-2015 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -79,7 +79,7 @@ public ConnectionFactory getConnectionFactory() {
7979
* Default is "false".
8080
* <p>Note that within a JTA transaction, the parameters passed to
8181
* {@code create(Queue/Topic)Session(boolean transacted, int acknowledgeMode)}
82-
* method are not taken into account. Depending on the J2EE transaction context,
82+
* method are not taken into account. Depending on the Java EE transaction context,
8383
* the container makes its own decisions on these values. Analogously, these
8484
* parameters are not taken into account within a locally managed transaction
8585
* either, since the accessor operates on an existing JMS Session in this case.

‎spring-tx/src/main/java/org/springframework/transaction/TransactionDefinition.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2012 the original author or authors.
2+
* Copyright 2002-2015 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -86,8 +86,8 @@ public interface TransactionDefinition {
8686
* <p><b>NOTE:</b> Actual transaction suspension will not work out-of-the-box
8787
* on all transaction managers. This in particular applies to
8888
* {@link org.springframework.transaction.jta.JtaTransactionManager},
89-
* which requires the {@code javax.transaction.TransactionManager}
90-
* to be made available it to it (which is server-specific in standard J2EE).
89+
* which requires the {@code javax.transaction.TransactionManager} to be
90+
* made available it to it (which is server-specific in standard Java EE).
9191
* <p>A {@code PROPAGATION_REQUIRES_NEW} scope always defines its own
9292
* transaction synchronizations. Existing synchronizations will be suspended
9393
* and resumed appropriately.
@@ -101,8 +101,8 @@ public interface TransactionDefinition {
101101
* <p><b>NOTE:</b> Actual transaction suspension will not work out-of-the-box
102102
* on all transaction managers. This in particular applies to
103103
* {@link org.springframework.transaction.jta.JtaTransactionManager},
104-
* which requires the {@code javax.transaction.TransactionManager}
105-
* to be made available it to it (which is server-specific in standard J2EE).
104+
* which requires the {@code javax.transaction.TransactionManager} to be
105+
* made available it to it (which is server-specific in standard Java EE).
106106
* <p>Note that transaction synchronization is <i>not</i> available within a
107107
* {@code PROPAGATION_NOT_SUPPORTED} scope. Existing synchronizations
108108
* will be suspended and resumed appropriately.

‎spring-tx/src/main/java/org/springframework/transaction/annotation/Propagation.java‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2012 the original author or authors.
2+
* Copyright 2002-2015 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -58,21 +58,23 @@ public enum Propagation {
5858
/**
5959
* Create a new transaction, and suspend the current transaction if one exists.
6060
* Analogous to the EJB transaction attribute of the same name.
61-
* <p>Note: Actual transaction suspension will not work out-of-the-box on
62-
* all transaction managers. This in particular applies to JtaTransactionManager,
61+
* <p><b>NOTE:</b> Actual transaction suspension will not work out-of-the-box
62+
* on all transaction managers. This in particular applies to
63+
* {@link org.springframework.transaction.jta.JtaTransactionManager},
6364
* which requires the {@code javax.transaction.TransactionManager} to be
64-
* made available it to it (which is server-specific in standard J2EE).
65+
* made available it to it (which is server-specific in standard Java EE).
6566
* @see org.springframework.transaction.jta.JtaTransactionManager#setTransactionManager
6667
*/
6768
REQUIRES_NEW(TransactionDefinition.PROPAGATION_REQUIRES_NEW),
6869

6970
/**
7071
* Execute non-transactionally, suspend the current transaction if one exists.
7172
* Analogous to EJB transaction attribute of the same name.
72-
* <p>Note: Actual transaction suspension will not work on out-of-the-box
73-
* on all transaction managers. This in particular applies to JtaTransactionManager,
73+
* <p><b>NOTE:</b> Actual transaction suspension will not work out-of-the-box
74+
* on all transaction managers. This in particular applies to
75+
* {@link org.springframework.transaction.jta.JtaTransactionManager},
7476
* which requires the {@code javax.transaction.TransactionManager} to be
75-
* made available it to it (which is server-specific in standard J2EE).
77+
* made available it to it (which is server-specific in standard Java EE).
7678
* @see org.springframework.transaction.jta.JtaTransactionManager#setTransactionManager
7779
*/
7880
NOT_SUPPORTED(TransactionDefinition.PROPAGATION_NOT_SUPPORTED),

‎spring-tx/src/main/java/org/springframework/transaction/jta/WebSphereUowTransactionManager.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2014 the original author or authors.
2+
* Copyright 2002-2015 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -119,7 +119,7 @@ public WebSphereUowTransactionManager(UOWManager uowManager) {
119119

120120
/**
121121
* Set the WebSphere UOWManager to use as direct reference.
122-
* <p>Typically just used for test setups; in a J2EE environment,
122+
* <p>Typically just used for test setups; in a Java EE environment,
123123
* the UOWManager will always be fetched from JNDI.
124124
* @see #setUserTransactionName
125125
*/

0 commit comments

Comments
 (0)