Skip to content

Commit d1dfa87

Browse files
author
David Syer
committed
SPR-6092: add section on EBR/Maven and tidy up references to jar files throughout
1 parent 95fb766 commit d1dfa87

5 files changed

Lines changed: 1087 additions & 407 deletions

File tree

‎spring-framework-reference/src/aop.xml‎

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3115,7 +3115,7 @@ public class Account {
31153115
<emphasis>without making any modifications to the application server's
31163116
launch script</emphasis> that will be needed to add
31173117
<literal>-javaagent:path/to/aspectjweaver.jar</literal> or (as we describe later in this
3118-
section) <literal>-javaagent:path/to/org.springframework.instrument.jar</literal> (previously named
3118+
section) <literal>-javaagent:path/to/spring-instrument.jar</literal> (previously named
31193119
<literal>spring-agent.jar</literal>). Developers simply modify
31203120
one or more files that form the application context to enable load-time
31213121
weaving instead of relying on administrators who typically are in charge
@@ -3258,16 +3258,16 @@ public final class Main {
32583258
(supplied with Spring) to switch on the LTW. This is the command line
32593259
we will use to run the above <classname>Main</classname> class:</para>
32603260

3261-
<programlisting>java -javaagent:C:/projects/foo/lib/global/org.springframework.instrument.jar foo.Main</programlisting>
3261+
<programlisting>java -javaagent:C:/projects/foo/lib/global/spring-instrument.jar foo.Main</programlisting>
32623262

32633263
<para>The '<literal>-javaagent</literal>' is a Java 5+ flag for
32643264
specifying and enabling <ulink
32653265
url="http://java.sun.com/j2se/1.5.0/docs/api/java/lang/instrument/package-summary.html">agents
32663266
to instrument programs running on the JVM</ulink>. The Spring
32673267
Framework ships with such an agent, the
32683268
<classname>InstrumentationSavingAgent</classname>, which is packaged
3269-
in the <filename class="libraryfile">org.springframework.instrument.jar</filename> (previously
3270-
named <filename class="libraryfile">spring-agent.jar</filename>) that
3269+
in the <filename class="libraryfile">spring-instrument.jar</filename>
3270+
that
32713271
was supplied as the value of the <literal>-javaagent</literal>
32723272
argument in the above example.</para>
32733273

@@ -3368,8 +3368,8 @@ public final class Main {
33683368

33693369
<orderedlist>
33703370
<listitem>
3371-
<para><filename class="libraryfile">spring.jar</filename> (version
3372-
2.5 or later)</para>
3371+
<para><filename class="libraryfile">spring-aop.jar</filename> (version
3372+
2.5 or later, plus all mandatory dependencies)</para>
33733373
</listitem>
33743374

33753375
<listitem>
@@ -3390,8 +3390,7 @@ public final class Main {
33903390
<orderedlist>
33913391
<listitem>
33923392
<para><filename
3393-
class="libraryfile">org.springframework.instrument.jar</filename> (previously named
3394-
<filename class="libraryfile">spring-agent.jar</filename>)</para>
3393+
class="libraryfile">spring-instrument.jar</filename></para>
33953394
</listitem>
33963395
</orderedlist>
33973396
</section>
@@ -3509,7 +3508,7 @@ http://www.springframework.org/schema/context
35093508
<entry><para>JVM started with Spring
35103509
<classname>InstrumentationSavingAgent</classname></para>
35113510
<para><emphasis><literal>(java
3512-
-javaagent:path/to/org.springframework.instrument.jar)</literal></emphasis></para></entry>
3511+
-javaagent:path/to/spring-instrument.jar)</literal></emphasis></para></entry>
35133512
<entry><para><classname>InstrumentationLoadTimeWeaver</classname></para></entry>
35143513
</row>
35153514

@@ -3623,8 +3622,7 @@ http://www.springframework.org/schema/context
36233622
(standalone as well as application server based) through the use of
36243623
the Spring-provided instrumentation agent. To do so, start
36253624
the VM by by specifying the
3626-
<literal>-javaagent:path/to/org.springframework.instrument.jar</literal> option
3627-
(the jar was previously named <literal>spring-agent.jar</literal>).
3625+
<literal>-javaagent:path/to/spring-instrument.jar</literal> option.
36283626
Note that this requires modification of the VM launch script
36293627
which may prevent you from using this in application server
36303628
environments (depending on your operation policies).</para>
@@ -3639,8 +3637,7 @@ http://www.springframework.org/schema/context
36393637
looks as follows, to be included either in Tomcat's central
36403638
<literal>server.xml</literal> file or in an application-specific
36413639
<literal>META-INF/context.xml</literal> file within the WAR root.
3642-
Spring's <literal>org.springframework.instrument.tomcat.jar</literal>
3643-
(previously named <literal>spring-tomcat-weaver.jar</literal>) needs to be
3640+
Spring's <literal>spring-instrument-tomcat.jar</literal> needs to be
36443641
included in Tomcat's common lib directory in order to make this
36453642
setup work.</para>
36463643

@@ -3677,7 +3674,7 @@ http://www.springframework.org/schema/context
36773674
You can enable LTW by simply activating <literal>context:load-time-weaver</literal>
36783675
as described earlier. Specifically, you do <emphasis>not</emphasis>
36793676
need to modify the launch script to add
3680-
<literal>-javaagent:path/to/org.springframework.instrument.jar</literal>.</para>
3677+
<literal>-javaagent:path/to/spring-instrument.jar</literal>.</para>
36813678

36823679
<para>GlassFish provides an instrumentation-capable ClassLoader as well,
36833680
but only in its EAR environment. For GlassFish web applications,

0 commit comments

Comments
 (0)