Moved agent to instrument

org.springframework.agent/pom.xml

@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.springframework</groupId>
-	<artifactId>org.springframework.agent</artifactId>
-	<packaging>jar</packaging>
-	<name>Spring Agent</name>
-	<version>3.0.0.M1</version>
-	<repositories>
-		<repository>
-			<id>com.springsource.repository.bundles.external</id>
-			<name>SpringSource Enterprise Bundle Repository - External Bundle Releases</name>
-			<url>http://repository.springsource.com/maven/bundles/external</url>
-		</repository>		
-	</repositories>
-	<build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
-                </configuration>
-            </plugin>
-		</plugins>
-	</build>
-</project>

org.springframework.instrument/build.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="org.springframework.agent">
+<project name="org.springframework.instrument">
 	<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/pom.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+    <parent>
+	    <groupId>org.springframework</groupId>
+	    <artifactId>org.springframework.parent</artifactId>
+	    <version>3.0-M1-SNAPSHOT</version>
+    </parent>
+	<artifactId>org.springframework.agent</artifactId>
+	<packaging>jar</packaging>
+	<name>Spring Framework: Agent</name>
+</project>

org.springframework.instrument/template.mf

@@ -1,5 +1,5 @@
-Bundle-SymbolicName: org.springframework.agent
+Bundle-SymbolicName: org.springframework.instrument
-Bundle-Name: Spring Core
+Bundle-Name: Spring Instrument
 Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Premain-Class: org.springframework.instrument.InstrumentationSavingAgent