Renamed org.springframework.instrument.classloading module to org.springframework.instrument.tomcat

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2016 50f2f4bb-b051-0410-bef5-90022cba6387

build-spring-framework/build.xml

@@ -3,7 +3,7 @@
 
 	<path id="bundles">
 		<pathelement location="../org.springframework.instrument"/>
-		<pathelement location="../org.springframework.instrument.classloading"/>
+		<pathelement location="../org.springframework.instrument.tomcat"/>
 		<pathelement location="../org.springframework.asm"/>
 		<pathelement location="../org.springframework.core"/>
 		<pathelement location="../org.springframework.expression"/>

build-spring-framework/generate-pom.xml

@@ -7,7 +7,7 @@
 
   <path id="modules-to-process">
           <pathelement location="../org.springframework.instrument"/>
-          <pathelement location="../org.springframework.instrument.classloading"/>
+          <pathelement location="../org.springframework.instrument.tomcat"/>
           <pathelement location="../org.springframework.asm"/>
           <pathelement location="../org.springframework.core"/>
           <pathelement location="../org.springframework.expression"/>

build-spring-framework/pom.xml

@@ -56,7 +56,7 @@
   <modules>
     <module>../org.springframework.spring-parent</module>
     <module>../org.springframework.instrument</module>
-    <module>../org.springframework.instrument.classloading</module>
+    <module>../org.springframework.instrument.tomcat</module>
     <module>../org.springframework.asm</module>
     <module>../org.springframework.core</module>
     <module>../org.springframework.expression</module>

build-spring-framework/publish.xml

@@ -6,7 +6,7 @@
 
   <path id="modules-with-code-artifacts">
           <pathelement location="../org.springframework.instrument"/>
-          <pathelement location="../org.springframework.instrument.classloading"/>
+          <pathelement location="../org.springframework.instrument.tomcat"/>
           <pathelement location="../org.springframework.asm"/>
           <pathelement location="../org.springframework.core"/>
           <pathelement location="../org.springframework.expression"/>

org.springframework.instrument.tomcat/build.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="org.springframework.instrument.classloading">
+<project name="org.springframework.instrument.tomcat">
 	<property file="${basedir}/../build.properties"/>
 	<import file="${basedir}/../build-spring-framework/package-bundle.xml"/>
 	<import file="${basedir}/../spring-build/standard/default.xml"/>

org.springframework.instrument.tomcat/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.springframework</groupId>
-  <artifactId>spring-instrument-classloading</artifactId>
+  <artifactId>spring-instrument-tomcat</artifactId>
   <packaging>jar</packaging>
   <version>3.0.0.BUILD-SNAPSHOT</version>
   <parent>

org.springframework.instrument.tomcat/template.mf

@@ -1,5 +1,5 @@
-Bundle-SymbolicName: org.springframework.instrument.classloading
+Bundle-SymbolicName: org.springframework.instrument.tomcat
-Bundle-Name: Spring Instrument Classloading
+Bundle-Name: Spring Instrument Tomcat Weaver
 Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Template: 

org.springframework.orm/ivy.xml

@@ -48,7 +48,6 @@
 		<dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="compile->compile"/>
 		<dependency org="org.springframework" name="org.springframework.context" rev="latest.integration" conf="optional, jndi->compile"/>
 		<dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="compile->compile"/>
-		<dependency org="org.springframework" name="org.springframework.instrument.classloading" rev="latest.integration" conf="optional, jpa->compile"/>
 		<dependency org="org.springframework" name="org.springframework.jdbc" rev="latest.integration" conf="compile->compile"/>
 		<dependency org="org.springframework" name="org.springframework.transaction" rev="latest.integration" conf="compile->compile"/>
 		<dependency org="org.springframework" name="org.springframework.web" rev="latest.integration" conf="optional, web->compile"/>

org.springframework.orm/pom.xml

@@ -145,12 +145,6 @@
       <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-instrument-classloading</artifactId>
-      <version>${project.version}</version>
-      <optional>true</optional>
-    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-jdbc</artifactId>

org.springframework.test/ivy.xml

@@ -37,7 +37,6 @@
 		<dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="optional->compile"/>
 		<dependency org="org.springframework" name="org.springframework.context" rev="latest.integration" conf="optional->compile"/>
 		<dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="optional->compile"/>
-		<dependency org="org.springframework" name="org.springframework.instrument.classloading" rev="latest.integration" conf="optional->compile"/>
 		<dependency org="org.springframework" name="org.springframework.jdbc" rev="latest.integration" conf="optional->compile"/>
 		<dependency org="org.springframework" name="org.springframework.orm" rev="latest.integration" conf="optional->compile"/>
 		<dependency org="org.springframework" name="org.springframework.transaction" rev="latest.integration" conf="optional->compile"/>

org.springframework.test/pom.xml

@@ -119,12 +119,6 @@
       <version>${project.version}</version>
       <optional>true</optional>
     </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-instrument-classloading</artifactId>
-      <version>${project.version}</version>
-      <optional>true</optional>
-    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-jdbc</artifactId>

spring-framework.psf

@@ -8,7 +8,7 @@
 <project reference="0.9.3,https://src.springframework.org/svn/spring-framework/trunk/org.springframework.core,org.springframework.core"/>
 <project reference="0.9.3,https://src.springframework.org/svn/spring-framework/trunk/org.springframework.expression,org.springframework.expression"/>
 <project reference="0.9.3,https://src.springframework.org/svn/spring-framework/trunk/org.springframework.instrument,org.springframework.instrument"/>
-<project reference="0.9.3,https://src.springframework.org/svn/spring-framework/trunk/org.springframework.instrument.classloading,org.springframework.instrument.classloading"/>
+<project reference="0.9.3,https://src.springframework.org/svn/spring-framework/trunk/org.springframework.instrument.tomcat,org.springframework.instrument.tomcat"/>
 <project reference="0.9.3,https://src.springframework.org/svn/spring-framework/trunk/org.springframework.jdbc,org.springframework.jdbc"/>
 <project reference="0.9.3,https://src.springframework.org/svn/spring-framework/trunk/org.springframework.jms,org.springframework.jms"/>
 <project reference="0.9.3,https://src.springframework.org/svn/spring-framework/trunk/org.springframework.orm,org.springframework.orm"/>