From bf4b9f5ffbe5cf06a94b5621e966daae5ccaa6e2 Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Sat, 7 Aug 2010 14:47:17 +0000 Subject: [PATCH] Replace 'Java EE' with 'enterprise Java' as appropriate Also change 'JEE' -> 'Java EE' --- spring-framework-reference/src/aop.xml | 12 ++++----- spring-framework-reference/src/beans.xml | 4 +-- .../src/transaction.xml | 4 +-- .../src/web-integration.xml | 26 +++++++++---------- .../src/xsd-configuration.xml | 2 +- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/spring-framework-reference/src/aop.xml b/spring-framework-reference/src/aop.xml index 566dddfc00a..906cd94b4bd 100644 --- a/spring-framework-reference/src/aop.xml +++ b/spring-framework-reference/src/aop.xml @@ -74,9 +74,9 @@ Aspect: a modularization of a concern that cuts across multiple classes. Transaction management is a good - example of a crosscutting concern in Java EE applications. In Spring - AOP, aspects are implemented using regular classes (the schema-based approach) or regular + example of a crosscutting concern in enterprise Java applications. + In Spring AOP, aspects are implemented using regular classes (the + schema-based approach) or regular classes annotated with the @Aspect annotation (the @AspectJ @@ -211,7 +211,7 @@ Spring AOP is implemented in pure Java. There is no need for a special compilation process. Spring AOP does not need to control the - class loader hierarchy, and is thus suitable for use in a Java EE web + class loader hierarchy, and is thus suitable for use in a Servlet container or application server. Spring AOP currently supports only method execution join points @@ -235,8 +235,8 @@ efficiently with Spring AOP, such as advise very fine-grained objects (such as domain objects typically): AspectJ is the best choice in such cases. However, our experience is that Spring AOP provides an excellent - solution to most problems in Java EE applications that are amenable to - AOP. + solution to most problems in enterprise Java applications that are + amenable to AOP. Spring AOP will never strive to compete with AspectJ to provide a comprehensive AOP solution. We believe that both proxy-based frameworks diff --git a/spring-framework-reference/src/beans.xml b/spring-framework-reference/src/beans.xml index fb4c78ccd2d..9211a8a88ea 100644 --- a/spring-framework-reference/src/beans.xml +++ b/spring-framework-reference/src/beans.xml @@ -5206,8 +5206,8 @@ public @interface MovieQualifier { Spring also supports injection using the JSR-250 @Resource annotation on fields or bean - property setter methods. This is a common pattern in Java EE 5 and Java - 6, for example, in JSF 1.2 managed beans or JAX-WS 2.0 endpoints. Spring + property setter methods. This is a common pattern in Java EE 5 and 6, + for example in JSF 1.2 managed beans or JAX-WS 2.0 endpoints. Spring supports this pattern for Spring-managed objects as well. @Resource takes a name attribute, diff --git a/spring-framework-reference/src/transaction.xml b/spring-framework-reference/src/transaction.xml index e47994145fd..0e12b490f73 100644 --- a/spring-framework-reference/src/transaction.xml +++ b/spring-framework-reference/src/transaction.xml @@ -169,8 +169,8 @@ TR: OK AS IS - I think it's fine as is - the concepts apply to both programmatic management? The Spring Framework's transaction management support changes - traditional rules as to when a Java EE application requires an - application server. + traditional rules as to when a enterprise Java application requires + an application server. In particular, you do not need an application server simply for declarative transactions through EJBs. In fact, even if your diff --git a/spring-framework-reference/src/web-integration.xml b/spring-framework-reference/src/web-integration.xml index 4338d8573d4..e141362af61 100644 --- a/spring-framework-reference/src/web-integration.xml +++ b/spring-framework-reference/src/web-integration.xml @@ -607,19 +607,19 @@ While Spring has its own powerful web - layer, there are a number of unique advantages to building a Java EE - application using a combination of Tapestry for the web user interface and - the Spring container for the lower layers. This section of the web - integration chapter attempts to detail a few best practices for combining - these two frameworks. + layer, there are a number of unique advantages to building an + enterprise Java application using a combination of Tapestry for the web + user interface and the Spring container for the lower layers. This section + of the web integration chapter attempts to detail a few best practices for + combining these two frameworks. - A typical layered Java EE application built with - Tapestry and Spring will consist of a top user interface (UI) layer built - with Tapestry, and a number of lower layers, all wired together by one or - more Spring containers. Tapestry's own reference documentation contains - the following snippet of best practice advice. (Text that the author of - this Spring section has added is contained within [] - brackets.) + A typical layered enterprise Java application + built with Tapestry and Spring will consist of a top user interface (UI) + layer built with Tapestry, and a number of lower layers, all wired together + by one or more Spring containers. Tapestry's own reference documentation + contains the following snippet of best practice advice. (Text that the + author of this Spring section has added is contained within + [] brackets.) @@ -1092,7 +1092,7 @@ public abstract class Login extends BasePage implements ErrorProperty, PageRende are coming from, and in fact it is easy to slip in another implementation, for example, during testing. This inversion of control is one of the prime goals and benefits of the Spring Framework, and we have managed to extend - it all the way up the Java EE stack in this Tapestry application. + it throughout the stack in this Tapestry application. diff --git a/spring-framework-reference/src/xsd-configuration.xml b/spring-framework-reference/src/xsd-configuration.xml index 0ae3d79f854..d53d9f4dfd1 100644 --- a/spring-framework-reference/src/xsd-configuration.xml +++ b/spring-framework-reference/src/xsd-configuration.xml @@ -466,7 +466,7 @@ public class Client {
The <literal>jee</literal> schema - The jee tags deal with JEE (Java Enterprise Edition)-related + The jee tags deal with Java EE (Java Enterprise Edition)-related configuration issues, such as looking up a JNDI object and defining EJB references. To use the tags in the jee schema, you need to have the following preamble at the top of your Spring XML configuration file;