diff --git a/pom.xml b/pom.xml
index fa36e0b..b4bf1c6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,287 +1,346 @@
-<project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.geronimo.specs</groupId>
-  <artifactId>specs</artifactId>
-  <packaging>pom</packaging>
-  <name>Geronimo Specifications</name>
-  <version>1.1.1-SNAPSHOT</version>
+<?xml version="1.0" encoding="UTF-8"?>
+<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">
 
-  <!--
-   |
-   | Continuum configuration for GBuild
-   |
-   -->
-  <issueManagement>
-    <system>jira</system>
-    <url>http://issues.apache.org/jira/browse/GERONIMO</url>
-  </issueManagement>
-  <ciManagement>
-    <system>continuum</system>
-    <url>http://ci.gbuild.org/continuum</url>
-    <notifiers>
-      <notifier>
-        <configuration>
-          <address>scm@geronimo.apache.org</address>
-        </configuration>
-      </notifier>
-    </notifiers>
-  </ciManagement> 
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.apache.geronimo.specs</groupId>
+	<artifactId>specs</artifactId>
+	<packaging>pom</packaging>
+	<name>Geronimo Specifications</name>
+	<version>1.1.1-SNAPSHOT</version>
 
-  <properties>
-    <!--
-     |
-     | Geronimo module versions
-     | 
-     | Note: when modules move from SNAPSHOT to an official release, they
-     | should be removed from GBuild (assuming they were added to GBuild).
-     |
-     -->
-    <geronimoSpecsVersion>1.1</geronimoSpecsVersion>
-    
-    <geronimoSpecsActivationVersion>1.1</geronimoSpecsActivationVersion>
-    <geronimoSpecsCommonjVersion>1.0</geronimoSpecsCommonjVersion>
-    <geronimoSpecsCorbaVersion>1.0</geronimoSpecsCorbaVersion>
-    <geronimoSpecsCorba30Version>1.1</geronimoSpecsCorba30Version>
-    <geronimoSpecsCorba23Version>1.1</geronimoSpecsCorba23Version>
-    <geronimoSpecsEjbVersion>1.0.1</geronimoSpecsEjbVersion>
-    <geronimoSpecsJ2eeConnectorVersion>1.0.1</geronimoSpecsJ2eeConnectorVersion>
-    <geronimoSpecsJ2eeDeploymentVersion>1.0.1</geronimoSpecsJ2eeDeploymentVersion>
-    <geronimoSpecsJ2eeJaccVersion>1.0.1</geronimoSpecsJ2eeJaccVersion>
-    <geronimoSpecsJ2eeManagementVersion>1.0.1</geronimoSpecsJ2eeManagementVersion>
-    <geronimoSpecsJavamailVersion>1.1</geronimoSpecsJavamailVersion>
-    <geronimoSpecsJaxrVersion>1.0.1</geronimoSpecsJaxrVersion>
-    <geronimoSpecsJaxrpcVersion>1.0.1</geronimoSpecsJaxrpcVersion>
-    <geronimoSpecsJmsVersion>1.0.1</geronimoSpecsJmsVersion>
-    <geronimoSpecsJspVersion>1.0.1</geronimoSpecsJspVersion>
-    <geronimoSpecsJtaVersion>1.0.1</geronimoSpecsJtaVersion>
-    <geronimoSpecsQnameVersion>1.0.1</geronimoSpecsQnameVersion>
-    <geronimoSpecsSaajVersion>1.0.1</geronimoSpecsSaajVersion>
-    <geronimoSpecsServletVersion>1.0.1</geronimoSpecsServletVersion>
-  </properties>
+	<!--
+		|
+		| Continuum configuration for GBuild
+		|
+	-->
+	<issueManagement>
+		<system>jira</system>
+		<url>http://issues.apache.org/jira/browse/GERONIMO</url>
+	</issueManagement>
+	<ciManagement>
+		<system>continuum</system>
+		<url>http://ci.gbuild.org/continuum</url>
+		<notifiers>
+			<notifier>
+				<configuration>
+					<address>scm@geronimo.apache.org</address>
+				</configuration>
+			</notifier>
+		</notifiers>
+	</ciManagement>
 
-  <build>
-    <defaultGoal>install</defaultGoal>
-    
-    <plugins>
-      <plugin>
-        <artifactId>maven-one-plugin</artifactId>
-        <executions>
-          <execution>
-            <goals>
-              <goal>install-maven-one-repository</goal>
-              <goal>deploy-maven-one-repository</goal>
-            </goals>
-            <configuration>
-              <remoteRepositoryId>apache</remoteRepositoryId>
-              <remoteRepositoryUrl>scpexe://cvs.apache.org/www/cvs.apache.org/repository</remoteRepositoryUrl>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.4</source>
-          <target>1.4</target>
-        </configuration>
-      </plugin>
-    </plugins>
-    <extensions>
-      <extension>
-        <groupId>org.apache.maven.wagon</groupId>
-        <artifactId>wagon-ssh-external</artifactId>
-        <version>1.0-alpha-6</version>
-      </extension>
-    </extensions>
-  </build>
+	<mailingLists>
+		<mailingList>
+			<name>Development Mailing List</name>
+			<post>dev@geronimo.apache.org</post>
+			<subscribe>dev-subscribe@geronimo.apache.org</subscribe>
+			<unsubscribe>dev-unsubscribe@geronimo.apache.org</unsubscribe>
+			<archive>http://mail-archives.apache.org/mod_mbox/geronimo-dev/</archive>
+		</mailingList>
+		<mailingList>
+			<name>User Mailing List</name>
+			<post>user@geronimo.apache.org</post>
+			<subscribe>user-subscribe@geronimo.apache.org</subscribe>
+			<unsubscribe>user-unsubscribe@geronimo.apache.org</unsubscribe>
+			<archive>http://mail-archives.apache.org/mod_mbox/geronimo-user/</archive>
+		</mailingList>
+	</mailingLists>
 
-  <!--
-   |
-   | Modules that are final (1.0 or other) should not be built and deployed
-   | with the SNAPSHOT versioned modules.
-   |
-   -->
-  <modules>
-    <module>geronimo-spec-activation</module>
-    <module>geronimo-spec-commonj</module>
-    <module>geronimo-spec-corba</module>
-    <module>geronimo-spec-corba-3.0</module>
-    <module>geronimo-spec-corba-2.3</module>
-    <module>geronimo-spec-ejb</module>
-    <module>geronimo-spec-j2ee-connector</module>
-    <module>geronimo-spec-j2ee-deployment</module>
-    <module>geronimo-spec-j2ee-jacc</module>
-    <module>geronimo-spec-j2ee-management</module>
-    <module>geronimo-spec-j2ee</module>
-    <module>geronimo-spec-javamail</module>
-    <module>geronimo-spec-jaxr</module>
-    <module>geronimo-spec-jaxrpc</module>
-    <module>geronimo-spec-jms</module>
-    <module>geronimo-spec-jsp</module>
-    <module>geronimo-spec-jta</module>
-    <module>geronimo-spec-qname</module>
-    <module>geronimo-spec-saaj</module>
-    <module>geronimo-spec-servlet</module>
-  </modules>
+	<developers>
+		<developer>
+			<id>acabrera</id>
+			<name>Alan Cabrera</name>
+			<roles>
+				<role>Commiter</role>
+			</roles>
+			<timezone>-8</timezone>
+		</developer>
+		<developer>
+			<id>dain</id>
+			<name>Dain Sundstrom</name>
+			<email>dain@iq80.com</email>
+			<roles>
+				<role>Commiter</role>
+			</roles>
+			<timezone>-8</timezone>
+		</developer>
+		<developer>
+			<id>dblevins</id>
+			<name>David Blevins</name>
+			<email>dblevins@visi.com</email>
+			<roles>
+				<role>Commiter</role>
+			</roles>
+			<timezone>-8</timezone>
+		</developer>
+		<developer>
+			<id>hogstrom</id>
+			<name>Matt Hogstrom</name>
+			<email>matt@hogstrom.org</email>
+			<roles>
+				<role>Commiter</role>
+			</roles>
+			<timezone>-5</timezone>
+		</developer>
+	</developers>
 
-  <dependencyManagement>
-    <dependencies>
-      <!--
-       |
-       | Geronimo specification versions
-       |
-       -->          
-      <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-activation_1.0.2_spec</artifactId>
-        <version>${geronimoSpecsActivationVersion}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-commonj_1.1_spec</artifactId>
-        <version>${geronimoSpecsCommonjVersion}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-corba_3.0_spec</artifactId>
-        <version>${geronimoSpecsCorba30Version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-corba_2.3_spec</artifactId>
-        <version>${geronimoSpecsCorba23Version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-ejb_2.1_spec</artifactId>
-        <version>${geronimoSpecsEjbVersion}</version>
-      </dependency>                        
-      <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-j2ee_1.4_spec</artifactId>
-        <version>${geronimoSpecsVersion}</version>
-      </dependency>                        
-      <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
-        <version>${geronimoSpecsJ2eeConnectorVersion}</version>
-      </dependency>                        
-      <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
-        <version>${geronimoSpecsJ2eeDeploymentVersion}</version>
-      </dependency>                        
-      <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
-        <version>${geronimoSpecsJ2eeJaccVersion}</version>
-      </dependency>                              
-      <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
-        <version>${geronimoSpecsJ2eeManagementVersion}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
-        <version>${geronimoSpecsJavamailVersion}</version>
-      </dependency>                                                
-      <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-jaxr_1.0_spec</artifactId>
-        <version>${geronimoSpecsJaxrVersion}</version>
-      </dependency>                                                
-      <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
-        <version>${geronimoSpecsJaxrpcVersion}</version>
-      </dependency>                                                
-      <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-jsp_2.0_spec</artifactId>
-        <version>${geronimoSpecsJspVersion}</version>
-      </dependency>                                          
-      <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-jms_1.1_spec</artifactId>
-        <version>${geronimoSpecsJmsVersion}</version>
-      </dependency>                                    
-      <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
-        <version>${geronimoSpecsJtaVersion}</version>
-      </dependency>                                          
-      <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-qname_1.1_spec</artifactId>
-        <version>${geronimoSpecsQnameVersion}</version>
-      </dependency>            
-      <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-saaj_1.1_spec</artifactId>
-        <version>${geronimoSpecsSaajVersion}</version>
-      </dependency>                  
-      <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-servlet_2.4_spec</artifactId>
-        <version>${geronimoSpecsServletVersion}</version>
-      </dependency>            
+	<scm>
+		<connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/specs/branches/1.1</connection>
+		<developerConnection>
+			scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/specs/branches/1.1
+		</developerConnection>
+		<url>http://svn.apache.org/repos/asf/geronimo/specs/branches/1.1</url>
+	</scm>
 
-      <dependency>
-        <groupId>mx4j</groupId>
-        <artifactId>mx4j</artifactId>
-        <version>3.0.1</version>
-      </dependency>                        
-      <dependency>
-        <groupId>mockobjects</groupId>
-        <artifactId>mockobjects-jdk1.4-j2ee1.3</artifactId>
-        <version>0.09</version>
-      </dependency>                              
-      <dependency>
-        <groupId>mockobjects</groupId>
-        <artifactId>mockobjects-core</artifactId>
-        <version>0.09</version>
-      </dependency>                                    
-      <dependency>
-        <groupId>scout</groupId>
-        <artifactId>scout</artifactId>
-        <version>0.5</version>
-      </dependency>                        
-   </dependencies>
-  </dependencyManagement>
+	<properties>
+		<m2.repo>
+			scp://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository
+		</m2.repo>
+		<m2.snapshot>
+			scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository
+		</m2.snapshot>
+		<site.repo>
+			scp://svn.apache.org/repos/asf/geronimo/specs/branches/1.1
+		</site.repo>
+		<!--
+			|
+			| Geronimo module versions
+			| 
+			| Note: when modules move from SNAPSHOT to an official release, they
+			| should be removed from GBuild (assuming they were added to GBuild).
+			|
+		-->
+		<geronimoSpecsVersion>1.1.1-SNAPSHOT</geronimoSpecsVersion>
 
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
+		<geronimoSpecsActivationVersion>1.1</geronimoSpecsActivationVersion>
+		<geronimoSpecsCommonjVersion>1.0</geronimoSpecsCommonjVersion>
+		<geronimoSpecsCorbaVersion>1.0</geronimoSpecsCorbaVersion>
+		<geronimoSpecsCorba30Version>1.1</geronimoSpecsCorba30Version>
+		<geronimoSpecsCorba23Version>1.1</geronimoSpecsCorba23Version>
+		<geronimoSpecsEjbVersion>1.0.1</geronimoSpecsEjbVersion>
+		<geronimoSpecsJ2eeConnectorVersion>1.0.1</geronimoSpecsJ2eeConnectorVersion>
+		<geronimoSpecsJ2eeDeploymentVersion>1.0.1</geronimoSpecsJ2eeDeploymentVersion>
+		<geronimoSpecsJ2eeJaccVersion>1.1.1</geronimoSpecsJ2eeJaccVersion>
+		<geronimoSpecsJ2eeManagementVersion>1.0.1</geronimoSpecsJ2eeManagementVersion>
+		<geronimoSpecsJavamailVersion>1.1</geronimoSpecsJavamailVersion>
+		<geronimoSpecsJaxrVersion>1.0.1</geronimoSpecsJaxrVersion>
+		<geronimoSpecsJaxrpcVersion>1.0.1</geronimoSpecsJaxrpcVersion>
+		<geronimoSpecsJmsVersion>1.0.1</geronimoSpecsJmsVersion>
+		<geronimoSpecsJspVersion>1.0.1</geronimoSpecsJspVersion>
+		<geronimoSpecsJtaVersion>1.0.1</geronimoSpecsJtaVersion>
+		<geronimoSpecsQnameVersion>1.0.1</geronimoSpecsQnameVersion>
+		<geronimoSpecsSaajVersion>1.0.1</geronimoSpecsSaajVersion>
+		<geronimoSpecsServletVersion>1.0.1</geronimoSpecsServletVersion>
+	</properties>
 
-  <pluginRepositories>
-    <pluginRepository>
-      <id>plugin-snapshots</id>
-      <name>Maven Central Plugins Development Repository</name>
-      <url>http://snapshots.maven.codehaus.org/maven2</url>
-    </pluginRepository>
-  </pluginRepositories>
+	<build>
+		<defaultGoal>install</defaultGoal>
+		<plugins>
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>1.4</source>
+					<target>1.4</target>
+				</configuration>
+			</plugin>
+		</plugins>
+		<extensions>
+			<extension>
+				<groupId>org.apache.maven.wagon</groupId>
+				<artifactId>wagon-ssh-external</artifactId>
+				<version>1.0-alpha-6</version>
+			</extension>
+		</extensions>
+	</build>
 
-  <distributionManagement>
-    <repository>
-      <id>apache-repo</id>
-      <name>Apache CVS Repository</name>
-      <url>scpexe://cvs.apache.org/www/www.apache.org/dist/java-repository</url>
-    </repository>
-    <snapshotRepository>
-      <id>apache-snapshots</id>
-      <name>Apache CVS Development Repository</name>
-      <url>scpexe://cvs.apache.org/www/cvs.apache.org/maven-snapshot-repository</url>
-    </snapshotRepository>
-    <site>
-      <id>geronimo-website</id>
-      <url>scpexe://minotaur.apache.org/www/geronimo.apache.org/maven/</url>
-    </site>
-  </distributionManagement>
+	<!--
+		|
+		| Modules that are final (1.0 or other) should not be built and deployed
+		| with the SNAPSHOT versioned modules.
+		|
+	-->
+	<modules>
+		<module>geronimo-spec-activation</module>
+		<module>geronimo-spec-commonj</module>
+		<module>geronimo-spec-corba</module>
+		<module>geronimo-spec-corba-3.0</module>
+		<module>geronimo-spec-corba-2.3</module>
+		<module>geronimo-spec-ejb</module>
+		<module>geronimo-spec-j2ee-connector</module>
+		<module>geronimo-spec-j2ee-deployment</module>
+		<module>geronimo-spec-j2ee-jacc</module>
+		<module>geronimo-spec-j2ee-management</module>
+		<module>geronimo-spec-j2ee</module>
+		<module>geronimo-spec-javamail</module>
+		<module>geronimo-spec-jaxr</module>
+		<module>geronimo-spec-jaxrpc</module>
+		<module>geronimo-spec-jms</module>
+		<module>geronimo-spec-jsp</module>
+		<module>geronimo-spec-jta</module>
+		<module>geronimo-spec-qname</module>
+		<module>geronimo-spec-saaj</module>
+		<module>geronimo-spec-servlet</module>
+	</modules>
 
+	<dependencyManagement>
+		<dependencies>
+			<!--
+				|
+				| Geronimo specification versions
+				|
+			-->
+			<dependency>
+				<groupId>org.apache.geronimo.specs</groupId>
+				<artifactId>geronimo-activation_1.0.2_spec</artifactId>
+				<version>${geronimoSpecsActivationVersion}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.geronimo.specs</groupId>
+				<artifactId>geronimo-commonj_1.1_spec</artifactId>
+				<version>${geronimoSpecsCommonjVersion}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.geronimo.specs</groupId>
+				<artifactId>geronimo-corba_3.0_spec</artifactId>
+				<version>${geronimoSpecsCorba30Version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.geronimo.specs</groupId>
+				<artifactId>geronimo-corba_2.3_spec</artifactId>
+				<version>${geronimoSpecsCorba23Version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.geronimo.specs</groupId>
+				<artifactId>geronimo-ejb_2.1_spec</artifactId>
+				<version>${geronimoSpecsEjbVersion}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.geronimo.specs</groupId>
+				<artifactId>geronimo-j2ee_1.4_spec</artifactId>
+				<version>${geronimoSpecsVersion}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.geronimo.specs</groupId>
+				<artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+				<version>${geronimoSpecsJ2eeConnectorVersion}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.geronimo.specs</groupId>
+				<artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
+				<version>${geronimoSpecsJ2eeDeploymentVersion}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.geronimo.specs</groupId>
+				<artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
+				<version>${geronimoSpecsJ2eeJaccVersion}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.geronimo.specs</groupId>
+				<artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
+				<version>${geronimoSpecsJ2eeManagementVersion}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.geronimo.specs</groupId>
+				<artifactId>geronimo-javamail_1.3.1_spec</artifactId>
+				<version>${geronimoSpecsJavamailVersion}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.geronimo.specs</groupId>
+				<artifactId>geronimo-jaxr_1.0_spec</artifactId>
+				<version>${geronimoSpecsJaxrVersion}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.geronimo.specs</groupId>
+				<artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
+				<version>${geronimoSpecsJaxrpcVersion}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.geronimo.specs</groupId>
+				<artifactId>geronimo-jsp_2.0_spec</artifactId>
+				<version>${geronimoSpecsJspVersion}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.geronimo.specs</groupId>
+				<artifactId>geronimo-jms_1.1_spec</artifactId>
+				<version>${geronimoSpecsJmsVersion}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.geronimo.specs</groupId>
+				<artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+				<version>${geronimoSpecsJtaVersion}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.geronimo.specs</groupId>
+				<artifactId>geronimo-qname_1.1_spec</artifactId>
+				<version>${geronimoSpecsQnameVersion}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.geronimo.specs</groupId>
+				<artifactId>geronimo-saaj_1.1_spec</artifactId>
+				<version>${geronimoSpecsSaajVersion}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.geronimo.specs</groupId>
+				<artifactId>geronimo-servlet_2.4_spec</artifactId>
+				<version>${geronimoSpecsServletVersion}</version>
+			</dependency>
+
+			<dependency>
+				<groupId>mx4j</groupId>
+				<artifactId>mx4j</artifactId>
+				<version>3.0.1</version>
+			</dependency>
+			<dependency>
+				<groupId>mockobjects</groupId>
+				<artifactId>mockobjects-jdk1.4-j2ee1.3</artifactId>
+				<version>0.09</version>
+			</dependency>
+			<dependency>
+				<groupId>mockobjects</groupId>
+				<artifactId>mockobjects-core</artifactId>
+				<version>0.09</version>
+			</dependency>
+			<dependency>
+				<groupId>scout</groupId>
+				<artifactId>scout</artifactId>
+				<version>0.5</version>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+
+	<dependencies>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>3.8.1</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+
+	<pluginRepositories>
+		<pluginRepository>
+			<id>plugin-snapshots</id>
+			<name>Maven Central Plugins Development Repository</name>
+			<url>http://snapshots.maven.codehaus.org/maven2</url>
+		</pluginRepository>
+	</pluginRepositories>
+
+	<distributionManagement>
+		<repository>
+			<id>Specification Releases</id>
+			<name>Apache Release Distribution Repository</name>
+			<url>${m2.repo}</url>
+		</repository>
+        <snapshotRepository>
+            <id>Specification Snapshots</id>
+            <name>Apache Geronimo SNAPSHOT Repository</name>
+            <url>${m2.snapshot}</url>
+        </snapshotRepository>
+		<site>
+			<id>specs</id>
+			<url>${site.repo}</url>
+		</site>
+	</distributionManagement>
 </project>
diff --git a/pom.xml.proposed b/pom.xml.proposed
deleted file mode 100644
index b4bf1c6..0000000
--- a/pom.xml.proposed
+++ /dev/null
@@ -1,346 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.apache.geronimo.specs</groupId>
-	<artifactId>specs</artifactId>
-	<packaging>pom</packaging>
-	<name>Geronimo Specifications</name>
-	<version>1.1.1-SNAPSHOT</version>
-
-	<!--
-		|
-		| Continuum configuration for GBuild
-		|
-	-->
-	<issueManagement>
-		<system>jira</system>
-		<url>http://issues.apache.org/jira/browse/GERONIMO</url>
-	</issueManagement>
-	<ciManagement>
-		<system>continuum</system>
-		<url>http://ci.gbuild.org/continuum</url>
-		<notifiers>
-			<notifier>
-				<configuration>
-					<address>scm@geronimo.apache.org</address>
-				</configuration>
-			</notifier>
-		</notifiers>
-	</ciManagement>
-
-	<mailingLists>
-		<mailingList>
-			<name>Development Mailing List</name>
-			<post>dev@geronimo.apache.org</post>
-			<subscribe>dev-subscribe@geronimo.apache.org</subscribe>
-			<unsubscribe>dev-unsubscribe@geronimo.apache.org</unsubscribe>
-			<archive>http://mail-archives.apache.org/mod_mbox/geronimo-dev/</archive>
-		</mailingList>
-		<mailingList>
-			<name>User Mailing List</name>
-			<post>user@geronimo.apache.org</post>
-			<subscribe>user-subscribe@geronimo.apache.org</subscribe>
-			<unsubscribe>user-unsubscribe@geronimo.apache.org</unsubscribe>
-			<archive>http://mail-archives.apache.org/mod_mbox/geronimo-user/</archive>
-		</mailingList>
-	</mailingLists>
-
-	<developers>
-		<developer>
-			<id>acabrera</id>
-			<name>Alan Cabrera</name>
-			<roles>
-				<role>Commiter</role>
-			</roles>
-			<timezone>-8</timezone>
-		</developer>
-		<developer>
-			<id>dain</id>
-			<name>Dain Sundstrom</name>
-			<email>dain@iq80.com</email>
-			<roles>
-				<role>Commiter</role>
-			</roles>
-			<timezone>-8</timezone>
-		</developer>
-		<developer>
-			<id>dblevins</id>
-			<name>David Blevins</name>
-			<email>dblevins@visi.com</email>
-			<roles>
-				<role>Commiter</role>
-			</roles>
-			<timezone>-8</timezone>
-		</developer>
-		<developer>
-			<id>hogstrom</id>
-			<name>Matt Hogstrom</name>
-			<email>matt@hogstrom.org</email>
-			<roles>
-				<role>Commiter</role>
-			</roles>
-			<timezone>-5</timezone>
-		</developer>
-	</developers>
-
-	<scm>
-		<connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/specs/branches/1.1</connection>
-		<developerConnection>
-			scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/specs/branches/1.1
-		</developerConnection>
-		<url>http://svn.apache.org/repos/asf/geronimo/specs/branches/1.1</url>
-	</scm>
-
-	<properties>
-		<m2.repo>
-			scp://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository
-		</m2.repo>
-		<m2.snapshot>
-			scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository
-		</m2.snapshot>
-		<site.repo>
-			scp://svn.apache.org/repos/asf/geronimo/specs/branches/1.1
-		</site.repo>
-		<!--
-			|
-			| Geronimo module versions
-			| 
-			| Note: when modules move from SNAPSHOT to an official release, they
-			| should be removed from GBuild (assuming they were added to GBuild).
-			|
-		-->
-		<geronimoSpecsVersion>1.1.1-SNAPSHOT</geronimoSpecsVersion>
-
-		<geronimoSpecsActivationVersion>1.1</geronimoSpecsActivationVersion>
-		<geronimoSpecsCommonjVersion>1.0</geronimoSpecsCommonjVersion>
-		<geronimoSpecsCorbaVersion>1.0</geronimoSpecsCorbaVersion>
-		<geronimoSpecsCorba30Version>1.1</geronimoSpecsCorba30Version>
-		<geronimoSpecsCorba23Version>1.1</geronimoSpecsCorba23Version>
-		<geronimoSpecsEjbVersion>1.0.1</geronimoSpecsEjbVersion>
-		<geronimoSpecsJ2eeConnectorVersion>1.0.1</geronimoSpecsJ2eeConnectorVersion>
-		<geronimoSpecsJ2eeDeploymentVersion>1.0.1</geronimoSpecsJ2eeDeploymentVersion>
-		<geronimoSpecsJ2eeJaccVersion>1.1.1</geronimoSpecsJ2eeJaccVersion>
-		<geronimoSpecsJ2eeManagementVersion>1.0.1</geronimoSpecsJ2eeManagementVersion>
-		<geronimoSpecsJavamailVersion>1.1</geronimoSpecsJavamailVersion>
-		<geronimoSpecsJaxrVersion>1.0.1</geronimoSpecsJaxrVersion>
-		<geronimoSpecsJaxrpcVersion>1.0.1</geronimoSpecsJaxrpcVersion>
-		<geronimoSpecsJmsVersion>1.0.1</geronimoSpecsJmsVersion>
-		<geronimoSpecsJspVersion>1.0.1</geronimoSpecsJspVersion>
-		<geronimoSpecsJtaVersion>1.0.1</geronimoSpecsJtaVersion>
-		<geronimoSpecsQnameVersion>1.0.1</geronimoSpecsQnameVersion>
-		<geronimoSpecsSaajVersion>1.0.1</geronimoSpecsSaajVersion>
-		<geronimoSpecsServletVersion>1.0.1</geronimoSpecsServletVersion>
-	</properties>
-
-	<build>
-		<defaultGoal>install</defaultGoal>
-		<plugins>
-			<plugin>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<source>1.4</source>
-					<target>1.4</target>
-				</configuration>
-			</plugin>
-		</plugins>
-		<extensions>
-			<extension>
-				<groupId>org.apache.maven.wagon</groupId>
-				<artifactId>wagon-ssh-external</artifactId>
-				<version>1.0-alpha-6</version>
-			</extension>
-		</extensions>
-	</build>
-
-	<!--
-		|
-		| Modules that are final (1.0 or other) should not be built and deployed
-		| with the SNAPSHOT versioned modules.
-		|
-	-->
-	<modules>
-		<module>geronimo-spec-activation</module>
-		<module>geronimo-spec-commonj</module>
-		<module>geronimo-spec-corba</module>
-		<module>geronimo-spec-corba-3.0</module>
-		<module>geronimo-spec-corba-2.3</module>
-		<module>geronimo-spec-ejb</module>
-		<module>geronimo-spec-j2ee-connector</module>
-		<module>geronimo-spec-j2ee-deployment</module>
-		<module>geronimo-spec-j2ee-jacc</module>
-		<module>geronimo-spec-j2ee-management</module>
-		<module>geronimo-spec-j2ee</module>
-		<module>geronimo-spec-javamail</module>
-		<module>geronimo-spec-jaxr</module>
-		<module>geronimo-spec-jaxrpc</module>
-		<module>geronimo-spec-jms</module>
-		<module>geronimo-spec-jsp</module>
-		<module>geronimo-spec-jta</module>
-		<module>geronimo-spec-qname</module>
-		<module>geronimo-spec-saaj</module>
-		<module>geronimo-spec-servlet</module>
-	</modules>
-
-	<dependencyManagement>
-		<dependencies>
-			<!--
-				|
-				| Geronimo specification versions
-				|
-			-->
-			<dependency>
-				<groupId>org.apache.geronimo.specs</groupId>
-				<artifactId>geronimo-activation_1.0.2_spec</artifactId>
-				<version>${geronimoSpecsActivationVersion}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.geronimo.specs</groupId>
-				<artifactId>geronimo-commonj_1.1_spec</artifactId>
-				<version>${geronimoSpecsCommonjVersion}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.geronimo.specs</groupId>
-				<artifactId>geronimo-corba_3.0_spec</artifactId>
-				<version>${geronimoSpecsCorba30Version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.geronimo.specs</groupId>
-				<artifactId>geronimo-corba_2.3_spec</artifactId>
-				<version>${geronimoSpecsCorba23Version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.geronimo.specs</groupId>
-				<artifactId>geronimo-ejb_2.1_spec</artifactId>
-				<version>${geronimoSpecsEjbVersion}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.geronimo.specs</groupId>
-				<artifactId>geronimo-j2ee_1.4_spec</artifactId>
-				<version>${geronimoSpecsVersion}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.geronimo.specs</groupId>
-				<artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
-				<version>${geronimoSpecsJ2eeConnectorVersion}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.geronimo.specs</groupId>
-				<artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
-				<version>${geronimoSpecsJ2eeDeploymentVersion}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.geronimo.specs</groupId>
-				<artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
-				<version>${geronimoSpecsJ2eeJaccVersion}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.geronimo.specs</groupId>
-				<artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
-				<version>${geronimoSpecsJ2eeManagementVersion}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.geronimo.specs</groupId>
-				<artifactId>geronimo-javamail_1.3.1_spec</artifactId>
-				<version>${geronimoSpecsJavamailVersion}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.geronimo.specs</groupId>
-				<artifactId>geronimo-jaxr_1.0_spec</artifactId>
-				<version>${geronimoSpecsJaxrVersion}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.geronimo.specs</groupId>
-				<artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
-				<version>${geronimoSpecsJaxrpcVersion}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.geronimo.specs</groupId>
-				<artifactId>geronimo-jsp_2.0_spec</artifactId>
-				<version>${geronimoSpecsJspVersion}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.geronimo.specs</groupId>
-				<artifactId>geronimo-jms_1.1_spec</artifactId>
-				<version>${geronimoSpecsJmsVersion}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.geronimo.specs</groupId>
-				<artifactId>geronimo-jta_1.0.1B_spec</artifactId>
-				<version>${geronimoSpecsJtaVersion}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.geronimo.specs</groupId>
-				<artifactId>geronimo-qname_1.1_spec</artifactId>
-				<version>${geronimoSpecsQnameVersion}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.geronimo.specs</groupId>
-				<artifactId>geronimo-saaj_1.1_spec</artifactId>
-				<version>${geronimoSpecsSaajVersion}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.geronimo.specs</groupId>
-				<artifactId>geronimo-servlet_2.4_spec</artifactId>
-				<version>${geronimoSpecsServletVersion}</version>
-			</dependency>
-
-			<dependency>
-				<groupId>mx4j</groupId>
-				<artifactId>mx4j</artifactId>
-				<version>3.0.1</version>
-			</dependency>
-			<dependency>
-				<groupId>mockobjects</groupId>
-				<artifactId>mockobjects-jdk1.4-j2ee1.3</artifactId>
-				<version>0.09</version>
-			</dependency>
-			<dependency>
-				<groupId>mockobjects</groupId>
-				<artifactId>mockobjects-core</artifactId>
-				<version>0.09</version>
-			</dependency>
-			<dependency>
-				<groupId>scout</groupId>
-				<artifactId>scout</artifactId>
-				<version>0.5</version>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
-
-	<dependencies>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>3.8.1</version>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
-
-	<pluginRepositories>
-		<pluginRepository>
-			<id>plugin-snapshots</id>
-			<name>Maven Central Plugins Development Repository</name>
-			<url>http://snapshots.maven.codehaus.org/maven2</url>
-		</pluginRepository>
-	</pluginRepositories>
-
-	<distributionManagement>
-		<repository>
-			<id>Specification Releases</id>
-			<name>Apache Release Distribution Repository</name>
-			<url>${m2.repo}</url>
-		</repository>
-        <snapshotRepository>
-            <id>Specification Snapshots</id>
-            <name>Apache Geronimo SNAPSHOT Repository</name>
-            <url>${m2.snapshot}</url>
-        </snapshotRepository>
-		<site>
-			<id>specs</id>
-			<url>${site.repo}</url>
-		</site>
-	</distributionManagement>
-</project>