From 8c791b529b5043a5d74a35473fd2e8a363e100bc Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@vmware.com>
Date: Fri, 22 Jan 2010 19:23:11 +0000
Subject: [PATCH] fixed instrumentation jar names (SPR-6753)

---
 spring-framework-reference/src/aop.xml |  2 +-
 spring-framework-reference/src/orm.xml | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/spring-framework-reference/src/aop.xml b/spring-framework-reference/src/aop.xml
index 15d34eee75..259477ea7a 100644
--- a/spring-framework-reference/src/aop.xml
+++ b/spring-framework-reference/src/aop.xml
@@ -3637,7 +3637,7 @@ http://www.springframework.org/schema/context
           looks as follows, to be included either in Tomcat's central
           <literal>server.xml</literal> file or in an application-specific
           <literal>META-INF/context.xml</literal> file within the WAR root.
-          Spring's <literal>spring-instrument-tomcat.jar</literal> needs to be
+          Spring's <literal>org.springframework.instrument.tomcat.jar</literal> needs to be
           included in Tomcat's common lib directory in order to make this
           setup work.</para>
 
diff --git a/spring-framework-reference/src/orm.xml b/spring-framework-reference/src/orm.xml
index 766a9ffa14..c4bc4b7f74 100644
--- a/spring-framework-reference/src/orm.xml
+++ b/spring-framework-reference/src/orm.xml
@@ -1497,8 +1497,8 @@ TR: OK AS IS. The requirement is to provide the classloader for the runtime envi
 
             <orderedlist>
               <listitem>
-                <para>Copy <literal>spring-tomcat-weaver.jar</literal> into
-                <emphasis>$CATALINA_HOME</emphasis>/server/lib,where
+                <para>Copy <literal>org.springframework.instrument.tomcat.jar</literal>
+                into <emphasis>$CATALINA_HOME</emphasis>/server/lib,where
                 <emphasis>$CATALINA_HOME</emphasis> represents the root of the
                 Tomcat installation.</para>
               </listitem>
@@ -1558,8 +1558,8 @@ TR: REVISED, PLS REVIEW. Chnaged the last one to *inside*--> is recommended
 
             <orderedlist>
               <listitem>
-                <para>Copy <literal>spring-tomcat-weaver.jar</literal> into
-                <emphasis>$CATALINA_HOME</emphasis>/lib, where
+                <para>Copy <literal>org.springframework.instrument.tomcat.jar</literal>
+                into <emphasis>$CATALINA_HOME</emphasis>/lib, where
                 <emphasis>$CATALINA_HOME</emphasis> represents the root of the
                 Tomcat installation)</para>
               </listitem>
@@ -1629,10 +1629,10 @@ TR: REVISED, PLS REVIEW. Should be *inside your war*.--></para>
           not supported by the existing <classname>LoadTimeWeaver</classname>
           implementations<!--OK? If you mean environments that are not supported by existing impl, revise as shown. If you mean class instrumentation is not supp--><!--orted, say *For environments that require class instrumentation that is not supported...*-->,
           a JDK agent can be the only solution. For such cases, Spring
-          provides <classname>InstrumentationLoadTimeWeaver,</classname> which
-          requires a Spring-specific (but very general) VM agent, <filename
-          class="libraryfile">org.springframework.instrument-{version}.jar</filename> (previously named <filename
-          class="libraryfile">spring-agent.jar</filename>):</para>
+          provides <classname>InstrumentationLoadTimeWeaver</classname>,
+          which requires a Spring-specific (but very general) VM agent,
+          <filename class="libraryfile">org.springframework.instrument-{version}.jar</filename>
+          (previously named <filename class="libraryfile">spring-agent.jar</filename>):</para>
 
           <programlisting language="xml">&lt;bean id="emf" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean"&gt;
   &lt;property name="loadTimeWeaver"&gt;