From 05f9ce8292fa19cc2b8059f32308511019e69fde Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <apoutsma@vmware.com>
Date: Fri, 25 Sep 2009 12:51:58 +0000
Subject: [PATCH] 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                            | 2 +-
 build-spring-framework/generate-pom.xml                     | 2 +-
 build-spring-framework/pom.xml                              | 2 +-
 build-spring-framework/publish.xml                          | 2 +-
 .../.classpath                                              | 0
 .../.project                                                | 0
 .../.settings/org.eclipse.jdt.core.prefs                    | 0
 .../.settings/org.eclipse.jdt.ui.prefs                      | 0
 .../build.xml                                               | 2 +-
 .../ivy.xml                                                 | 0
 .../pom.xml                                                 | 2 +-
 .../instrument/classloading/WeavingTransformer.java         | 0
 .../tomcat/TomcatInstrumentableClassLoader.java             | 0
 .../instrument/classloading/tomcat/package-info.java        | 0
 .../src/main/java/overview.html                             | 0
 .../src/test/resources/log4j.xml                            | 0
 .../template.mf                                             | 4 ++--
 org.springframework.orm/ivy.xml                             | 1 -
 org.springframework.orm/pom.xml                             | 6 ------
 org.springframework.test/ivy.xml                            | 1 -
 org.springframework.test/pom.xml                            | 6 ------
 spring-framework.psf                                        | 2 +-
 22 files changed, 9 insertions(+), 23 deletions(-)
 rename {org.springframework.instrument.classloading => org.springframework.instrument.tomcat}/.classpath (100%)
 rename {org.springframework.instrument.classloading => org.springframework.instrument.tomcat}/.project (100%)
 rename {org.springframework.instrument.classloading => org.springframework.instrument.tomcat}/.settings/org.eclipse.jdt.core.prefs (100%)
 rename {org.springframework.instrument.classloading => org.springframework.instrument.tomcat}/.settings/org.eclipse.jdt.ui.prefs (100%)
 rename {org.springframework.instrument.classloading => org.springframework.instrument.tomcat}/build.xml (79%)
 rename {org.springframework.instrument.classloading => org.springframework.instrument.tomcat}/ivy.xml (100%)
 rename {org.springframework.instrument.classloading => org.springframework.instrument.tomcat}/pom.xml (93%)
 rename {org.springframework.instrument.classloading => org.springframework.instrument.tomcat}/src/main/java/org/springframework/instrument/classloading/WeavingTransformer.java (100%)
 rename {org.springframework.instrument.classloading => org.springframework.instrument.tomcat}/src/main/java/org/springframework/instrument/classloading/tomcat/TomcatInstrumentableClassLoader.java (100%)
 rename {org.springframework.instrument.classloading => org.springframework.instrument.tomcat}/src/main/java/org/springframework/instrument/classloading/tomcat/package-info.java (100%)
 rename {org.springframework.instrument.classloading => org.springframework.instrument.tomcat}/src/main/java/overview.html (100%)
 rename {org.springframework.instrument.classloading => org.springframework.instrument.tomcat}/src/test/resources/log4j.xml (100%)
 rename {org.springframework.instrument.classloading => org.springframework.instrument.tomcat}/template.mf (52%)

diff --git a/build-spring-framework/build.xml b/build-spring-framework/build.xml
index 1e080d067c7..6115f25d3bf 100644
--- a/build-spring-framework/build.xml
+++ b/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"/>
diff --git a/build-spring-framework/generate-pom.xml b/build-spring-framework/generate-pom.xml
index d1bd4cccbed..83e7ab95e9e 100644
--- a/build-spring-framework/generate-pom.xml
+++ b/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"/>
diff --git a/build-spring-framework/pom.xml b/build-spring-framework/pom.xml
index a304529a605..53d58c05c0f 100644
--- a/build-spring-framework/pom.xml
+++ b/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>
diff --git a/build-spring-framework/publish.xml b/build-spring-framework/publish.xml
index 8373bbf87d7..711f4047930 100644
--- a/build-spring-framework/publish.xml
+++ b/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"/>
diff --git a/org.springframework.instrument.classloading/.classpath b/org.springframework.instrument.tomcat/.classpath
similarity index 100%
rename from org.springframework.instrument.classloading/.classpath
rename to org.springframework.instrument.tomcat/.classpath
diff --git a/org.springframework.instrument.classloading/.project b/org.springframework.instrument.tomcat/.project
similarity index 100%
rename from org.springframework.instrument.classloading/.project
rename to org.springframework.instrument.tomcat/.project
diff --git a/org.springframework.instrument.classloading/.settings/org.eclipse.jdt.core.prefs b/org.springframework.instrument.tomcat/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.springframework.instrument.classloading/.settings/org.eclipse.jdt.core.prefs
rename to org.springframework.instrument.tomcat/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.springframework.instrument.classloading/.settings/org.eclipse.jdt.ui.prefs b/org.springframework.instrument.tomcat/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from org.springframework.instrument.classloading/.settings/org.eclipse.jdt.ui.prefs
rename to org.springframework.instrument.tomcat/.settings/org.eclipse.jdt.ui.prefs
diff --git a/org.springframework.instrument.classloading/build.xml b/org.springframework.instrument.tomcat/build.xml
similarity index 79%
rename from org.springframework.instrument.classloading/build.xml
rename to org.springframework.instrument.tomcat/build.xml
index 1b09555968b..09528c68623 100644
--- a/org.springframework.instrument.classloading/build.xml
+++ b/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"/>
diff --git a/org.springframework.instrument.classloading/ivy.xml b/org.springframework.instrument.tomcat/ivy.xml
similarity index 100%
rename from org.springframework.instrument.classloading/ivy.xml
rename to org.springframework.instrument.tomcat/ivy.xml
diff --git a/org.springframework.instrument.classloading/pom.xml b/org.springframework.instrument.tomcat/pom.xml
similarity index 93%
rename from org.springframework.instrument.classloading/pom.xml
rename to org.springframework.instrument.tomcat/pom.xml
index 40c6da46a67..a0495944cc0 100644
--- a/org.springframework.instrument.classloading/pom.xml
+++ b/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>
diff --git a/org.springframework.instrument.classloading/src/main/java/org/springframework/instrument/classloading/WeavingTransformer.java b/org.springframework.instrument.tomcat/src/main/java/org/springframework/instrument/classloading/WeavingTransformer.java
similarity index 100%
rename from org.springframework.instrument.classloading/src/main/java/org/springframework/instrument/classloading/WeavingTransformer.java
rename to org.springframework.instrument.tomcat/src/main/java/org/springframework/instrument/classloading/WeavingTransformer.java
diff --git a/org.springframework.instrument.classloading/src/main/java/org/springframework/instrument/classloading/tomcat/TomcatInstrumentableClassLoader.java b/org.springframework.instrument.tomcat/src/main/java/org/springframework/instrument/classloading/tomcat/TomcatInstrumentableClassLoader.java
similarity index 100%
rename from org.springframework.instrument.classloading/src/main/java/org/springframework/instrument/classloading/tomcat/TomcatInstrumentableClassLoader.java
rename to org.springframework.instrument.tomcat/src/main/java/org/springframework/instrument/classloading/tomcat/TomcatInstrumentableClassLoader.java
diff --git a/org.springframework.instrument.classloading/src/main/java/org/springframework/instrument/classloading/tomcat/package-info.java b/org.springframework.instrument.tomcat/src/main/java/org/springframework/instrument/classloading/tomcat/package-info.java
similarity index 100%
rename from org.springframework.instrument.classloading/src/main/java/org/springframework/instrument/classloading/tomcat/package-info.java
rename to org.springframework.instrument.tomcat/src/main/java/org/springframework/instrument/classloading/tomcat/package-info.java
diff --git a/org.springframework.instrument.classloading/src/main/java/overview.html b/org.springframework.instrument.tomcat/src/main/java/overview.html
similarity index 100%
rename from org.springframework.instrument.classloading/src/main/java/overview.html
rename to org.springframework.instrument.tomcat/src/main/java/overview.html
diff --git a/org.springframework.instrument.classloading/src/test/resources/log4j.xml b/org.springframework.instrument.tomcat/src/test/resources/log4j.xml
similarity index 100%
rename from org.springframework.instrument.classloading/src/test/resources/log4j.xml
rename to org.springframework.instrument.tomcat/src/test/resources/log4j.xml
diff --git a/org.springframework.instrument.classloading/template.mf b/org.springframework.instrument.tomcat/template.mf
similarity index 52%
rename from org.springframework.instrument.classloading/template.mf
rename to org.springframework.instrument.tomcat/template.mf
index cfb085d25cf..42c9fc79f40 100644
--- a/org.springframework.instrument.classloading/template.mf
+++ b/org.springframework.instrument.tomcat/template.mf
@@ -1,5 +1,5 @@
-Bundle-SymbolicName: org.springframework.instrument.classloading
-Bundle-Name: Spring Instrument Classloading
+Bundle-SymbolicName: org.springframework.instrument.tomcat
+Bundle-Name: Spring Instrument Tomcat Weaver
 Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Template: 
diff --git a/org.springframework.orm/ivy.xml b/org.springframework.orm/ivy.xml
index 46a1df89dba..7061a360160 100644
--- a/org.springframework.orm/ivy.xml
+++ b/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"/>
diff --git a/org.springframework.orm/pom.xml b/org.springframework.orm/pom.xml
index 2efd9c87d3e..b5639873433 100644
--- a/org.springframework.orm/pom.xml
+++ b/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>
diff --git a/org.springframework.test/ivy.xml b/org.springframework.test/ivy.xml
index 35f5ec94ea6..e64c205bb57 100644
--- a/org.springframework.test/ivy.xml
+++ b/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"/>
diff --git a/org.springframework.test/pom.xml b/org.springframework.test/pom.xml
index 21e364a1b64..3518579246f 100644
--- a/org.springframework.test/pom.xml
+++ b/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>
diff --git a/spring-framework.psf b/spring-framework.psf
index 60fc3f10386..9977782e6a6 100644
--- a/spring-framework.psf
+++ b/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"/>