Return-Path: 
 <scm-return-10734-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 71906 invoked from network); 5 Mar 2006 00:53:01 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 5 Mar 2006 00:53:01 -0000
Received: (qmail 98268 invoked by uid 500); 5 Mar 2006 00:53:47 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 98242 invoked by uid 500); 5 Mar 2006 00:53:47 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 98231 invoked by uid 99); 5 Mar 2006 00:53:47 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 04 Mar 2006 16:53:47 -0800
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Sat, 04 Mar 2006 16:53:45 -0800
Received: (qmail 71876 invoked by uid 65534); 5 Mar 2006 00:52:38 -0000
Message-ID: <20060305005238.71875.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r383234 - in /geronimo/trunk: ./
 modules/activemq-embedded-rar/
 modules/connector-builder/ modules/connector/ modules/converter/
 modules/deploy-tool/ modules/derby/ modules/directory/
 modules/j2ee-builder/ modules/j2ee-schema/ modules/javam...
Date: Sun, 05 Mar 2006 00:52:33 -0000
To: scm@geronimo.apache.org
From: jlaskowski@apache.org
X-Mailer: svnmailer-1.0.7
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: jlaskowski
Date: Sat Mar  4 16:52:31 2006
New Revision: 383234

URL: http://svn.apache.org/viewcvs?rev=383234&view=rev
Log:
More updates to pom.xml's

'mvn clean install' doesn't finish successfully yet, but it's very close.

Use M2 from http://maven.zones.apache.org/~maven/builds/trunk/m2-20060304.190000.tar.gz

Added:
    geronimo/trunk/modules/activemq-embedded-rar/pom.xml   (with props)
    geronimo/trunk/modules/security/pom.xml   (with props)
Modified:
    geronimo/trunk/modules/connector-builder/pom.xml
    geronimo/trunk/modules/connector/pom.xml
    geronimo/trunk/modules/converter/pom.xml
    geronimo/trunk/modules/deploy-tool/pom.xml
    geronimo/trunk/modules/derby/pom.xml
    geronimo/trunk/modules/directory/pom.xml
    geronimo/trunk/modules/j2ee-builder/pom.xml
    geronimo/trunk/modules/j2ee-schema/pom.xml
    geronimo/trunk/modules/javamail-transport/pom.xml
    geronimo/trunk/modules/jmx-remoting/pom.xml
    geronimo/trunk/modules/kernel/pom.xml
    geronimo/trunk/modules/mail/pom.xml
    geronimo/trunk/modules/management/pom.xml
    geronimo/trunk/modules/naming-builder/pom.xml
    geronimo/trunk/modules/scripts/pom.xml
    geronimo/trunk/modules/security-builder/pom.xml
    geronimo/trunk/modules/service-builder/pom.xml
    geronimo/trunk/modules/session/pom.xml
    geronimo/trunk/modules/spring/pom.xml
    geronimo/trunk/modules/system/pom.xml
    geronimo/trunk/modules/test-ddbean/pom.xml
    geronimo/trunk/modules/timer/pom.xml
    geronimo/trunk/modules/web-builder/pom.xml
    geronimo/trunk/modules/webservices/pom.xml
    geronimo/trunk/pom.xml

Added: geronimo/trunk/modules/activemq-embedded-rar/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/activemq-embedded-rar/pom.xml?rev=383234&view=auto
==============================================================================
--- geronimo/trunk/modules/activemq-embedded-rar/pom.xml (added)
+++ geronimo/trunk/modules/activemq-embedded-rar/pom.xml Sat Mar  4 16:52:31 2006
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  
+    Copyright 2006 The Apache Software Foundation
+    
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    
+       http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.geronimo</groupId>
+    <artifactId>geronimo</artifactId>
+    <version>1.2-SNAPSHOT</version>
+  </parent>
+  <groupId>org.apache.geronimo</groupId>
+  <artifactId>geronimo-activemq-embedded-rar</artifactId>
+  <version>${geronimoVersion}</version>
+  <packaging>rar</packaging>
+  <name>Geronimo :: ActiveMQ Embedded RAR</name>
+  <description>Resource Adapter configuration for using ActiveMQ as a bundled JMS provider.</description>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-rar-plugin</artifactId>
+        <version>${mavenRarPluginVersion}</version>
+        <configuration>
+          <raXmlFile>${basedir}/src/rar/META-INF/ra.xml</raXmlFile>
+          <includeJar>false</includeJar>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>activemq</groupId>
+      <artifactId>activemq-core</artifactId>
+      <version>${activeMqVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>activemq</groupId>
+      <artifactId>activemq-ra</artifactId>
+      <version>${activeMqVersion}</version>
+      <!--  Can't be found anywhere -->
+      <exclusions>
+        <exclusion>
+          <groupId>incubator-derby</groupId>
+          <artifactId>derby</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+  </dependencies>
+</project>

Propchange: geronimo/trunk/modules/activemq-embedded-rar/pom.xml
------------------------------------------------------------------------------
    svn:executable = *

Propchange: geronimo/trunk/modules/activemq-embedded-rar/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: geronimo/trunk/modules/activemq-embedded-rar/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/trunk/modules/connector-builder/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector-builder/pom.xml?rev=383234&r1=383233&r2=383234&view=diff
==============================================================================
--- geronimo/trunk/modules/connector-builder/pom.xml (original)
+++ geronimo/trunk/modules/connector-builder/pom.xml Sat Mar  4 16:52:31 2006
@@ -28,7 +28,6 @@
   <groupId>org.apache.geronimo</groupId>
   <artifactId>geronimo-connector-builder</artifactId>
   <version>${geronimoVersion}</version>
-  <packaging>jar</packaging>
   <name>Geronimo :: Connector :: Builder</name>
 
   <!--  Tests not migrated to m2 -->
@@ -36,15 +35,11 @@
     <maven.test.skip>true</maven.test.skip>
   </properties>
   <build>
-    <testResources>
-      <testResource>
-        <directory>src/test-resources</directory>
-      </testResource>
-    </testResources>
     <plugins>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>xmlbeans-maven-plugin</artifactId>
+        <version>${xmlbeansMavenPluginVersion}</version>
         <executions>
           <execution>
             <goals>
@@ -67,18 +62,26 @@
   <!-- Dependencies -->
   <!-- ============ -->
   <dependencies>
-    <!-- needed for xmlbeans runtime-->
-    <!-- <dependency>
+    <dependency>
       <groupId>xmlbeans</groupId>
       <artifactId>xbean</artifactId>
-      <version>${xmlbeans_version}</version>
-    </dependency> -->
-
+    </dependency>
+    <dependency>
+      <groupId>stax</groupId>
+      <artifactId>stax-api</artifactId>
+    </dependency>
     <dependency>
       <groupId>stax</groupId>
       <artifactId>stax</artifactId>
+      <version>1.1.1-dev</version>
+      <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>xmlbeans</groupId>
+          <artifactId>xmlbeans-jsr173-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
-
     <!-- real stuff -->
     <dependency>
       <groupId>org.apache.geronimo</groupId>

Modified: geronimo/trunk/modules/connector/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector/pom.xml?rev=383234&r1=383233&r2=383234&view=diff
==============================================================================
--- geronimo/trunk/modules/connector/pom.xml (original)
+++ geronimo/trunk/modules/connector/pom.xml Sat Mar  4 16:52:31 2006
@@ -36,7 +36,6 @@
   <!-- ============ -->
 
   <dependencies>
-
     <dependency>
       <groupId>org.apache.geronimo</groupId>
       <artifactId>geronimo-naming</artifactId>
@@ -113,10 +112,10 @@
       <artifactId>mx4j</artifactId>
     </dependency>
 
-    <!--  test only -->
     <dependency>
       <groupId>tranql</groupId>
       <artifactId>tranql</artifactId>
+      <scope>test</scope>
     </dependency>
 
     <!-- needed for passwordcredential realm-->

Modified: geronimo/trunk/modules/converter/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/converter/pom.xml?rev=383234&r1=383233&r2=383234&view=diff
==============================================================================
--- geronimo/trunk/modules/converter/pom.xml (original)
+++ geronimo/trunk/modules/converter/pom.xml Sat Mar  4 16:52:31 2006
@@ -28,10 +28,6 @@
   <artifactId>geronimo-converter</artifactId>
   <name>Geronimo :: Configuration Converter</name>
   <version>${geronimoVersion}</version>
-  <!-- ============ -->
-  <!-- Dependencies -->
-  <!-- ============ -->
-
   <dependencies>
     <dependency>
       <groupId>org.apache.geronimo</groupId>

Modified: geronimo/trunk/modules/deploy-tool/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/pom.xml?rev=383234&r1=383233&r2=383234&view=diff
==============================================================================
--- geronimo/trunk/modules/deploy-tool/pom.xml (original)
+++ geronimo/trunk/modules/deploy-tool/pom.xml Sat Mar  4 16:52:31 2006
@@ -28,13 +28,7 @@
   <groupId>org.apache.geronimo</groupId>
   <artifactId>geronimo-deploy-tool</artifactId>
   <version>${geronimoVersion}</version>
-  <packaging>jar</packaging>
   <name>Geronimo :: Deploy :: CLI Tool</name>
-
-  <!-- ============ -->
-  <!-- Dependencies -->
-  <!-- ============ -->
-
   <dependencies>
 
     <dependency>

Modified: geronimo/trunk/modules/derby/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/derby/pom.xml?rev=383234&r1=383233&r2=383234&view=diff
==============================================================================
--- geronimo/trunk/modules/derby/pom.xml (original)
+++ geronimo/trunk/modules/derby/pom.xml Sat Mar  4 16:52:31 2006
@@ -28,13 +28,8 @@
   <groupId>org.apache.geronimo</groupId>
   <artifactId>geronimo-derby</artifactId>
   <version>${geronimoVersion}</version>
-  <packaging>jar</packaging>
   <name>Geronimo :: Derby</name>
   <description>Wrapper for using Apache Derby as a bundled database.</description>
-
-  <!-- ============ -->
-  <!-- Dependencies -->
-  <!-- ============ -->
   <dependencies>
     <dependency>
       <groupId>org.apache.geronimo</groupId>

Modified: geronimo/trunk/modules/directory/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/directory/pom.xml?rev=383234&r1=383233&r2=383234&view=diff
==============================================================================
--- geronimo/trunk/modules/directory/pom.xml (original)
+++ geronimo/trunk/modules/directory/pom.xml Sat Mar  4 16:52:31 2006
@@ -29,9 +29,6 @@
   <artifactId>geronimo-directory</artifactId>
   <version>${geronimoVersion}</version>
   <name>Geronimo :: Directory</name>
-  <!-- ============ -->
-  <!--    Build     -->
-  <!-- ============ -->
   <build>
     <plugins>
       <plugin>
@@ -76,9 +73,6 @@
       </plugin>
     </plugins>
   </build>
-  <!-- ============ -->
-  <!-- Dependencies -->
-  <!-- ============ -->
   <dependencies>
     <dependency>
       <groupId>org.apache.geronimo</groupId>
@@ -212,11 +206,6 @@
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
       <version>${slf4jVersion}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.mojo</groupId>
-      <artifactId>xmlbeans-maven-plugin</artifactId>
-      <version>${xmlbeansMavenPluginVersion}</version>
     </dependency>
   </dependencies>
 </project>

Modified: geronimo/trunk/modules/j2ee-builder/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-builder/pom.xml?rev=383234&r1=383233&r2=383234&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee-builder/pom.xml (original)
+++ geronimo/trunk/modules/j2ee-builder/pom.xml Sat Mar  4 16:52:31 2006
@@ -39,6 +39,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>xmlbeans-maven-plugin</artifactId>
+        <version>${xmlbeansMavenPluginVersion}</version>
         <executions>
           <execution>
             <goals>
@@ -56,18 +57,15 @@
       </plugin>
     </plugins>
   </build>
-  <!-- ============ -->
-  <!-- Dependencies -->
-  <!-- ============ -->
   <dependencies>
-    <!-- needed for xmlbeans runtime-->
     <dependency>
       <groupId>xmlbeans</groupId>
       <artifactId>xbean</artifactId>
     </dependency>
-
-    <!--  The following prevents xmlbeans-jsr173-api from being downloaded.
-      This is good, since it does not exist in the repos. Very hackish. -->
+    <dependency>
+      <groupId>stax</groupId>
+      <artifactId>stax-api</artifactId>
+    </dependency>
     <dependency>
       <groupId>stax</groupId>
       <artifactId>stax</artifactId>
@@ -80,7 +78,6 @@
         </exclusion>
       </exclusions>
     </dependency>
-
     <dependency>
       <groupId>org.apache.geronimo</groupId>
       <artifactId>geronimo-common</artifactId>
@@ -132,23 +129,18 @@
       <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
     </dependency>
-
-    <!-- test only -->
     <dependency>
       <groupId>cglib</groupId>
       <artifactId>cglib-nodep</artifactId>
     </dependency>
-
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
     </dependency>
-
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
     </dependency>
-
     <dependency>
       <groupId>mx4j</groupId>
       <artifactId>mx4j</artifactId>

Modified: geronimo/trunk/modules/j2ee-schema/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-schema/pom.xml?rev=383234&r1=383233&r2=383234&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee-schema/pom.xml (original)
+++ geronimo/trunk/modules/j2ee-schema/pom.xml Sat Mar  4 16:52:31 2006
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-
+  
     Copyright 2006 The Apache Software Foundation
-
+    
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
-
+    
        http://www.apache.org/licenses/LICENSE-2.0
-
+    
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -29,12 +29,12 @@
   <name>Geronimo :: J2EE Schema</name>
   <version>${geronimoVersion}</version>
   <description>Geronimo J2EE schema</description>
-
   <build>
     <plugins>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>xmlbeans-maven-plugin</artifactId>
+        <version>${xmlbeansMavenPluginVersion}</version>
         <executions>
           <execution>
             <goals>
@@ -46,20 +46,12 @@
           <download>true</download>
           <schemaDirectory>src/j2ee_1_4schema</schemaDirectory>
           <xmlConfigs>
-            <xmlConfig implementation="java.io.File">
-              src/conf
-            </xmlConfig>
+            <xmlConfig implementation="java.io.File">src/conf</xmlConfig>
           </xmlConfigs>
         </configuration>
       </plugin>
     </plugins>
-    <testResources>
-      <testResource>
-        <directory>src/test-data</directory>
-      </testResource>
-    </testResources>
   </build>
-
   <dependencies>
     <dependency>
       <groupId>xmlbeans</groupId>
@@ -70,8 +62,6 @@
       <artifactId>stax-api</artifactId>
       <scope>test</scope>
     </dependency>
-    <!--  The following prevents xmlbeans-jsr173-api from being downloaded.
-      This is good, since it does not exist in the repos. Very hackish. -->
     <dependency>
       <groupId>stax</groupId>
       <artifactId>stax</artifactId>

Modified: geronimo/trunk/modules/javamail-transport/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/javamail-transport/pom.xml?rev=383234&r1=383233&r2=383234&view=diff
==============================================================================
--- geronimo/trunk/modules/javamail-transport/pom.xml (original)
+++ geronimo/trunk/modules/javamail-transport/pom.xml Sat Mar  4 16:52:31 2006
@@ -28,12 +28,7 @@
   <groupId>org.apache.geronimo</groupId>
   <artifactId>geronimo-javamail-transport</artifactId>
   <version>${geronimoVersion}</version>
-  <packaging>jar</packaging>
   <name>Geronimo :: JavaMail Transport</name>
-
-  <!-- ============ -->
-  <!-- Dependencies -->
-  <!-- ============ -->
   <dependencies>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>

Modified: geronimo/trunk/modules/jmx-remoting/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jmx-remoting/pom.xml?rev=383234&r1=383233&r2=383234&view=diff
==============================================================================
--- geronimo/trunk/modules/jmx-remoting/pom.xml (original)
+++ geronimo/trunk/modules/jmx-remoting/pom.xml Sat Mar  4 16:52:31 2006
@@ -28,13 +28,8 @@
   <groupId>org.apache.geronimo</groupId>
   <artifactId>geronimo-jmxremoting</artifactId>
   <version>${geronimoVersion}</version>
-  <packaging>jar</packaging>
   <name>Geronimo :: JMX Remoting</name>
   <description>Provides remote access to a Geronimo server using JSR 160 JMX Remoting</description>
-
-  <!-- ============ -->
-  <!-- Dependencies -->
-  <!-- ============ -->
   <dependencies>
     <dependency>
       <groupId>org.apache.geronimo</groupId>

Modified: geronimo/trunk/modules/kernel/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/kernel/pom.xml?rev=383234&r1=383233&r2=383234&view=diff
==============================================================================
--- geronimo/trunk/modules/kernel/pom.xml (original)
+++ geronimo/trunk/modules/kernel/pom.xml Sat Mar  4 16:52:31 2006
@@ -28,9 +28,7 @@
   <groupId>org.apache.geronimo</groupId>
   <artifactId>geronimo-kernel</artifactId>
   <version>${geronimoVersion}</version>
-  <packaging>jar</packaging>
   <name>Geronimo :: Kernel</name>
-
   <build>
     <resources>
       <resource>
@@ -43,44 +41,35 @@
     </resources>
   </build>
   <dependencies>
-    <!-- Module Dependencies -->
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
       <version>${geronimoSpecJ2eeManagementVersion}</version>
     </dependency>
-
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
       <version>${geronimoSpecJ2eeDeploymentVersion}</version>
     </dependency>
-
-    <!-- Thirdparty -->
-
     <dependency>
       <groupId>cglib</groupId>
       <artifactId>cglib-nodep</artifactId>
       <version>${cglibVersion}</version>
     </dependency>
-
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
       <version>${commonsLoggingVersion}</version>
     </dependency>
-
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
       <version>${log4jVersion}</version>
     </dependency>
-
     <dependency>
       <groupId>mx4j</groupId>
       <artifactId>mx4j</artifactId>
       <version>${mx4jVersion}</version>
     </dependency>
   </dependencies>
-
 </project>

Modified: geronimo/trunk/modules/mail/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/mail/pom.xml?rev=383234&r1=383233&r2=383234&view=diff
==============================================================================
--- geronimo/trunk/modules/mail/pom.xml (original)
+++ geronimo/trunk/modules/mail/pom.xml Sat Mar  4 16:52:31 2006
@@ -28,18 +28,10 @@
   <groupId>org.apache.geronimo</groupId>
   <artifactId>geronimo-mail</artifactId>
   <version>${geronimoVersion}</version>
-  <packaging>jar</packaging>
-  <name>Geronimo :: Mail</name>
-  
+  <name>Geronimo :: Mail</name>  
   <build>
-    <testResources>
-      <testResource>
-        <directory>src/test-resources</directory>
-      </testResource>
-    </testResources>
     <plugins>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <inherited>true</inherited>
         <configuration>
@@ -51,10 +43,6 @@
       </plugin>
     </plugins>
   </build>
-
-  <!-- ============ -->
-  <!-- Dependencies -->
-  <!-- ============ -->
   <dependencies>
 
     <dependency>

Modified: geronimo/trunk/modules/management/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/management/pom.xml?rev=383234&r1=383233&r2=383234&view=diff
==============================================================================
--- geronimo/trunk/modules/management/pom.xml (original)
+++ geronimo/trunk/modules/management/pom.xml Sat Mar  4 16:52:31 2006
@@ -28,14 +28,8 @@
   <groupId>org.apache.geronimo</groupId>
   <artifactId>geronimo-management</artifactId>
   <version>${geronimoVersion}</version>
-  <packaging>jar</packaging>
   <name>Geronimo :: Management API</name>
-
-  <!-- ============ -->
-  <!-- Dependencies -->
-  <!-- ============ -->
   <dependencies>
-    <!-- Module Dependencies -->
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>

Modified: geronimo/trunk/modules/naming-builder/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/naming-builder/pom.xml?rev=383234&r1=383233&r2=383234&view=diff
==============================================================================
--- geronimo/trunk/modules/naming-builder/pom.xml (original)
+++ geronimo/trunk/modules/naming-builder/pom.xml Sat Mar  4 16:52:31 2006
@@ -28,12 +28,12 @@
   <artifactId>geronimo-naming-builder</artifactId>
   <name>Geronimo :: Naming :: Builder</name>
   <version>${geronimoVersion}</version>
-
   <build>
     <plugins>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>xmlbeans-maven-plugin</artifactId>
+        <version>${xmlbeansMavenPluginVersion}</version>
         <executions>
           <execution>
             <goals>
@@ -51,19 +51,15 @@
       </plugin>
     </plugins>
   </build>
-  
-  <!-- ============ -->
-  <!-- Dependencies -->
-  <!-- ============ -->
   <dependencies>
-    <!-- needed for xmlbeans runtime-->
     <dependency>
       <groupId>xmlbeans</groupId>
       <artifactId>xbean</artifactId>
     </dependency>
-
-    <!--  The following prevents xmlbeans-jsr173-api from being downloaded.
-      This is good, since it does not exist in the repos. Very hackish. -->
+    <dependency>
+      <groupId>stax</groupId>
+      <artifactId>stax-api</artifactId>
+    </dependency>
     <dependency>
       <groupId>stax</groupId>
       <artifactId>stax</artifactId>
@@ -76,8 +72,6 @@
         </exclusion>
       </exclusions>
     </dependency>
-
-
     <!-- Module Dependencies -->
 
     <dependency>

Modified: geronimo/trunk/modules/scripts/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/scripts/pom.xml?rev=383234&r1=383233&r2=383234&view=diff
==============================================================================
--- geronimo/trunk/modules/scripts/pom.xml (original)
+++ geronimo/trunk/modules/scripts/pom.xml Sat Mar  4 16:52:31 2006
@@ -28,14 +28,5 @@
   <groupId>org.apache.geronimo</groupId>
   <artifactId>geronimo-scripts</artifactId>
   <version>${geronimoVersion}</version>
-  <packaging>jar</packaging>
   <name>Geronimo :: Scripts</name>
-
-  <build>
-    <resources>
-      <resource>
-        <directory>src/resources</directory>
-      </resource>
-    </resources>
-  </build>
 </project>

Modified: geronimo/trunk/modules/security-builder/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/security-builder/pom.xml?rev=383234&r1=383233&r2=383234&view=diff
==============================================================================
--- geronimo/trunk/modules/security-builder/pom.xml (original)
+++ geronimo/trunk/modules/security-builder/pom.xml Sat Mar  4 16:52:31 2006
@@ -30,12 +30,12 @@
   <version>${geronimoVersion}</version>
   <packaging>jar</packaging>
   <name>Geronimo :: Security :: Builder</name>
-
   <build>
     <plugins>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>xmlbeans-maven-plugin</artifactId>
+        <version>${xmlbeansMavenPluginVersion}</version>
         <executions>
           <execution>
             <goals>
@@ -53,19 +53,15 @@
       </plugin>
     </plugins>
   </build>
-
-  <!-- ============ -->
-  <!-- Dependencies -->
-  <!-- ============ -->
   <dependencies>
-    <!-- needed for xmlbeans runtime-->
     <dependency>
       <groupId>xmlbeans</groupId>
       <artifactId>xbean</artifactId>
     </dependency>
-
-    <!--  The following prevents xmlbeans-jsr173-api from being downloaded.
-      This is good, since it does not exist in the repos. Very hackish. -->
+    <dependency>
+      <groupId>stax</groupId>
+      <artifactId>stax-api</artifactId>
+    </dependency>
     <dependency>
       <groupId>stax</groupId>
       <artifactId>stax</artifactId>
@@ -78,7 +74,6 @@
         </exclusion>
       </exclusions>
     </dependency>
-
     <dependency>
       <groupId>org.apache.geronimo</groupId>
       <artifactId>geronimo-security</artifactId>

Added: geronimo/trunk/modules/security/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/pom.xml?rev=383234&view=auto
==============================================================================
--- geronimo/trunk/modules/security/pom.xml (added)
+++ geronimo/trunk/modules/security/pom.xml Sat Mar  4 16:52:31 2006
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  
+    Copyright 2006 The Apache Software Foundation
+    
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    
+       http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.geronimo</groupId>
+    <artifactId>geronimo</artifactId>
+    <version>1.2-SNAPSHOT</version>
+  </parent>
+  <groupId>org.apache.geronimo</groupId>
+  <artifactId>geronimo-security</artifactId>
+  <version>${geronimoVersion}</version>
+  <name>Geronimo :: Security</name>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <systemProperties>
+            <java.security.auth.login.config>${basedir}/src/test-data/data/login.config</java.security.auth.login.config>
+            <log4j.configuration>${basedir}/log4j.properties</log4j.configuration>
+          </systemProperties>
+          <forkMode>pertest</forkMode>
+          <workingDirectory>${basedir}</workingDirectory>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.geronimo</groupId>
+      <artifactId>geronimo-common</artifactId>
+      <version>${geronimoVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo</groupId>
+      <artifactId>geronimo-interceptor</artifactId>
+      <version>${geronimoVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo</groupId>
+      <artifactId>geronimo-j2ee</artifactId>
+      <version>${geronimoVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo</groupId>
+      <artifactId>geronimo-management</artifactId>
+      <version>${geronimoVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo</groupId>
+      <artifactId>geronimo-kernel</artifactId>
+      <version>${geronimoVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo</groupId>
+      <artifactId>geronimo-system</artifactId>
+      <version>${geronimoVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
+      <version>${geronimoSpecJ2eeJaccVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>cglib</groupId>
+      <artifactId>cglib-nodep</artifactId>
+      <version>${cglibVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>concurrent</groupId>
+      <artifactId>concurrent</artifactId>
+      <version>${concurrentVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>activeio</groupId>
+      <artifactId>activeio</artifactId>
+      <version>${activeIoVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>${commonsLoggingVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>mx4j</groupId>
+      <artifactId>mx4j</artifactId>
+      <version>${mx4jVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>regexp</groupId>
+      <artifactId>regexp</artifactId>
+      <version>${regexpVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>hsqldb</groupId>
+      <artifactId>hsqldb</artifactId>
+      <version>${hsqldbVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>${log4jVersion}</version>
+    </dependency>
+  </dependencies>
+</project>

Propchange: geronimo/trunk/modules/security/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: geronimo/trunk/modules/security/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/trunk/modules/service-builder/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/service-builder/pom.xml?rev=383234&r1=383233&r2=383234&view=diff
==============================================================================
--- geronimo/trunk/modules/service-builder/pom.xml (original)
+++ geronimo/trunk/modules/service-builder/pom.xml Sat Mar  4 16:52:31 2006
@@ -28,19 +28,13 @@
   <groupId>org.apache.geronimo</groupId>
   <artifactId>geronimo-service-builder</artifactId>
   <version>${geronimoVersion}</version>
-  <packaging>jar</packaging>
   <name>Geronimo :: Service :: Builder</name>
-
   <build>
-    <testResources>
-      <testResource>
-        <directory>src/test-resources</directory>
-      </testResource>
-    </testResources>
     <plugins>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>xmlbeans-maven-plugin</artifactId>
+        <version>${xmlbeansMavenPluginVersion}</version>
         <executions>
           <execution>
             <goals>
@@ -58,27 +52,15 @@
       </plugin>
     </plugins>
   </build>
-  
-  <!-- ============ -->
-  <!-- Dependencies -->
-  <!-- ============ -->
   <dependencies>
-    <!-- <dependency>
-      <groupId>xmlbeans</groupId>
-      <artifactId>xmlbeans-maven-plugin</artifactId>
-      <version>${xmlbeans_maven_plugin_version}</version>
-      <type>plugin</type>
-    </dependency> -->
-
-    <!-- needed for xmlbeans runtime-->
-    <!-- <dependency>
+    <dependency>
       <groupId>xmlbeans</groupId>
       <artifactId>xbean</artifactId>
-      <version>${xmlbeans_version}</version>
-    </dependency> -->
-
-    <!--  The following prevents xmlbeans-jsr173-api from being downloaded.
-      This is good, since it does not exist in the repos. Very hackish. -->
+    </dependency>
+    <dependency>
+      <groupId>stax</groupId>
+      <artifactId>stax-api</artifactId>
+    </dependency>
     <dependency>
       <groupId>stax</groupId>
       <artifactId>stax</artifactId>
@@ -91,7 +73,6 @@
         </exclusion>
       </exclusions>
     </dependency>
-
     <dependency>
       <groupId>org.apache.geronimo</groupId>
       <artifactId>geronimo-kernel</artifactId>

Modified: geronimo/trunk/modules/session/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/session/pom.xml?rev=383234&r1=383233&r2=383234&view=diff
==============================================================================
--- geronimo/trunk/modules/session/pom.xml (original)
+++ geronimo/trunk/modules/session/pom.xml Sat Mar  4 16:52:31 2006
@@ -28,18 +28,12 @@
   <groupId>org.apache.geronimo</groupId>
   <artifactId>geronimo-session</artifactId>
   <version>${geronimoVersion}</version>
-  <packaging>jar</packaging>
   <name>Geronimo :: Session</name>
-
-  <!-- ============ -->
-  <!-- Dependencies -->
-  <!-- ============ -->
   <dependencies>
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
     </dependency>
-
     <dependency>
       <groupId>backport-util-concurrent</groupId>
       <artifactId>backport-util-concurrent</artifactId>

Modified: geronimo/trunk/modules/spring/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/spring/pom.xml?rev=383234&r1=383233&r2=383234&view=diff
==============================================================================
--- geronimo/trunk/modules/spring/pom.xml (original)
+++ geronimo/trunk/modules/spring/pom.xml Sat Mar  4 16:52:31 2006
@@ -28,20 +28,12 @@
   <groupId>org.apache.geronimo</groupId>
   <artifactId>geronimo-spring</artifactId>
   <version>${geronimoVersion}</version>
-  <packaging>jar</packaging>
   <name>Geronimo :: Spring</name>
-
-  <!-- ============ -->
-  <!-- Dependencies -->
-  <!-- ============ -->
-
   <dependencies>
-    <!-- Module Dependencies -->
     <dependency>
       <groupId>org.apache.geronimo</groupId>
       <artifactId>geronimo-transaction</artifactId>
     </dependency>
-
     <dependency>
       <groupId>org.apache.geronimo</groupId>
       <artifactId>geronimo-kernel</artifactId>

Modified: geronimo/trunk/modules/system/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/system/pom.xml?rev=383234&r1=383233&r2=383234&view=diff
==============================================================================
--- geronimo/trunk/modules/system/pom.xml (original)
+++ geronimo/trunk/modules/system/pom.xml Sat Mar  4 16:52:31 2006
@@ -30,13 +30,7 @@
   <version>${geronimoVersion}</version>
   <packaging>jar</packaging>
   <name>Geronimo :: System</name>
-
   <build>
-    <testResources>
-      <testResource>
-        <directory>src/test-data</directory>
-      </testResource>
-    </testResources>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -50,7 +44,7 @@
         <artifactId>maven-antrun-plugin</artifactId>
         <executions>
           <execution>
-            <phase>process-resources</phase>
+            <phase>process-classes</phase>
             <configuration>
               <tasks>
                 <tstamp>

Modified: geronimo/trunk/modules/test-ddbean/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/test-ddbean/pom.xml?rev=383234&r1=383233&r2=383234&view=diff
==============================================================================
--- geronimo/trunk/modules/test-ddbean/pom.xml (original)
+++ geronimo/trunk/modules/test-ddbean/pom.xml Sat Mar  4 16:52:31 2006
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-
+  
     Copyright 2006 The Apache Software Foundation
-
+    
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
-
+    
        http://www.apache.org/licenses/LICENSE-2.0
-
+    
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -28,31 +28,28 @@
   <groupId>org.apache.geronimo</groupId>
   <artifactId>geronimo-test-ddbean</artifactId>
   <version>${geronimoVersion}</version>
-  <packaging>jar</packaging>
   <name>Geronimo :: Test :: DDBeans</name>
-  
-  <build>
-    <testResources>
-      <testResource>
-        <directory>src/test-resources</directory>
-      </testResource>
-    </testResources>
-  </build>
-
-  <!-- ============ -->
-  <!-- Dependencies -->
-  <!-- ============ -->
   <dependencies>
     <dependency>
       <groupId>xmlbeans</groupId>
       <artifactId>xbean</artifactId>
     </dependency>
-
     <dependency>
       <groupId>stax</groupId>
       <artifactId>stax-api</artifactId>
     </dependency>
-
+    <dependency>
+      <groupId>stax</groupId>
+      <artifactId>stax</artifactId>
+      <version>1.1.1-dev</version>
+      <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>xmlbeans</groupId>
+          <artifactId>xmlbeans-jsr173-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>

Modified: geronimo/trunk/modules/timer/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/timer/pom.xml?rev=383234&r1=383233&r2=383234&view=diff
==============================================================================
--- geronimo/trunk/modules/timer/pom.xml (original)
+++ geronimo/trunk/modules/timer/pom.xml Sat Mar  4 16:52:31 2006
@@ -28,13 +28,7 @@
   <groupId>org.apache.geronimo</groupId>
   <artifactId>geronimo-timer</artifactId>
   <version>${geronimoVersion}</version>
-  <packaging>jar</packaging>
   <name>Geronimo :: Timer</name>
-
-  <!-- ============ -->
-  <!-- Dependencies -->
-  <!-- ============ -->
-
   <dependencies>
 
     <dependency>
@@ -96,16 +90,6 @@
       <groupId>org.apache.derby</groupId>
       <artifactId>derby</artifactId>
     </dependency>
-
-    <!--
-      <dependency>
-      <groupId>commons-primitives</groupId>
-      <artifactId>commons-primitives</artifactId>
-      <version>${commons_primitives_version}</version>
-      </dependency>
-    -->
-
-
     <dependency>
       <groupId>concurrent</groupId>
       <artifactId>concurrent</artifactId>
@@ -115,16 +99,5 @@
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
     </dependency>
-
-    <!-- needed for axion tests-->
-    <!--
-      <dependency>
-      <groupId>regexp</groupId>
-      <artifactId>regexp</artifactId>
-      <version>${regexp_version}</version>
-      <url>http://jakarta.apache.org/regexp</url>
-      </dependency>
-    -->
-
   </dependencies>
 </project>

Modified: geronimo/trunk/modules/web-builder/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/web-builder/pom.xml?rev=383234&r1=383233&r2=383234&view=diff
==============================================================================
--- geronimo/trunk/modules/web-builder/pom.xml (original)
+++ geronimo/trunk/modules/web-builder/pom.xml Sat Mar  4 16:52:31 2006
@@ -28,17 +28,12 @@
   <artifactId>geronimo-web-builder</artifactId>
   <name>Geronimo :: Web :: Builder</name>
   <version>${geronimoVersion}</version>
-
   <build>
-    <testResources>
-      <testResource>
-        <directory>src/test-resources</directory>
-      </testResource>
-    </testResources>
     <plugins>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>xmlbeans-maven-plugin</artifactId>
+        <version>${xmlbeansMavenPluginVersion}</version>
         <executions>
           <execution>
             <goals>
@@ -56,22 +51,26 @@
       </plugin>
     </plugins>
   </build>
-  
-  <!-- ============ -->
-  <!-- Dependencies -->
-  <!-- ============ -->
   <dependencies>
-    <!-- needed for xmlbeans runtime-->
     <dependency>
       <groupId>xmlbeans</groupId>
       <artifactId>xbean</artifactId>
     </dependency>
-
-    <!--  The following prevents xmlbeans-jsr173-api from being downloaded.
-      This is good, since it does not exist in the repos. Very hackish. -->
+    <dependency>
+      <groupId>stax</groupId>
+      <artifactId>stax-api</artifactId>
+    </dependency>
     <dependency>
       <groupId>stax</groupId>
       <artifactId>stax</artifactId>
+      <version>1.1.1-dev</version>
+      <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>xmlbeans</groupId>
+          <artifactId>xmlbeans-jsr173-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo</groupId>

Modified: geronimo/trunk/modules/webservices/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/webservices/pom.xml?rev=383234&r1=383233&r2=383234&view=diff
==============================================================================
--- geronimo/trunk/modules/webservices/pom.xml (original)
+++ geronimo/trunk/modules/webservices/pom.xml Sat Mar  4 16:52:31 2006
@@ -28,15 +28,8 @@
   <groupId>org.apache.geronimo</groupId>
   <artifactId>geronimo-webservices</artifactId>
   <version>${geronimoVersion}</version>
-  <packaging>jar</packaging>
   <name>Geronimo :: Web Services</name>
-  <!-- ============ -->
-  <!-- Dependencies -->
-  <!-- ============ -->
-
   <dependencies>
-    <!-- Module Dependencies -->
-
     <dependency>
       <groupId>org.apache.geronimo</groupId>
       <artifactId>geronimo-common</artifactId>
@@ -114,8 +107,6 @@
       <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-jaxr_1.0_spec</artifactId>
     </dependency>
-
-
     <dependency>
       <groupId>scout</groupId>
       <artifactId>scout</artifactId>

Modified: geronimo/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/pom.xml?rev=383234&r1=383233&r2=383234&view=diff
==============================================================================
--- geronimo/trunk/pom.xml (original)
+++ geronimo/trunk/pom.xml Sat Mar  4 16:52:31 2006
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-
+  
     Copyright 2006 The Apache Software Foundation
-
+    
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
-
+    
        http://www.apache.org/licenses/LICENSE-2.0
-
+    
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -30,9 +30,7 @@
 
   <issueManagement>
     <system>jira</system>
-    <url>
-      http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10220
-    </url>
+    <url>http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10220</url>
   </issueManagement>
 
   <ciManagement>
@@ -52,25 +50,19 @@
       <name>Geronimo User List</name>
       <subscribe>users-subscribe@geronimo.apache.org</subscribe>
       <unsubscribe>users-unsubscribe@geronimo.apache.org</unsubscribe>
-      <archive>
-        http://mail-archives.apache.org/mod_mbox/geronimo-user/
-      </archive>
+      <archive>http://mail-archives.apache.org/mod_mbox/geronimo-user/</archive>
     </mailingList>
     <mailingList>
       <name>Geronimo Developer List</name>
       <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>
+      <archive>http://mail-archives.apache.org/mod_mbox/geronimo-dev/</archive>
     </mailingList>
     <mailingList>
       <name>Source Control List</name>
       <subscribe>scm-subscribe@geronimo.apache.org</subscribe>
       <unsubscribe>scm-unsubscribe@geronimo.apache.org</unsubscribe>
-      <archive>
-        http://mail-archives.apache.org/mod_mbox/geronimo-scm/
-      </archive>
+      <archive>http://mail-archives.apache.org/mod_mbox/geronimo-scm/</archive>
     </mailingList>
   </mailingLists>
 
@@ -83,12 +75,8 @@
   </licenses>
 
   <scm>
-    <connection>
-      scm:svn:https://svn.apache.org/repos/asf/geronimo/
-    </connection>
-    <developerConnection>
-      scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/
-    </developerConnection>
+    <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/</connection>
+    <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/</developerConnection>
     <url>https://svn.apache.org/repos/asf/geronimo/</url>
   </scm>
 
@@ -132,7 +120,7 @@
       | Geronimo plugin versions
       |
     -->
-    <geronimoDependencyPluginVersion>1.2.0-1</geronimoDependencyPluginVersion>    
+    <geronimoDependencyPluginVersion>1.2.0-1</geronimoDependencyPluginVersion>
     <!--
       |
       | External dependency versions
@@ -184,6 +172,7 @@
     <ldapProtocolVersion>0.9.2</ldapProtocolVersion>
     <log4jVersion>1.2.8</log4jVersion>
     <mavenVersion>1.0.2</mavenVersion>
+    <mavenRarPluginVersion>2.1</mavenRarPluginVersion>
     <minaVersion>0.7.3</minaVersion>
     <mockobjectsVersion>0.09</mockobjectsVersion>
     <mx4jVersion>3.0.1</mx4jVersion>
@@ -617,31 +606,41 @@
     <repository>
       <id>apache-repo</id>
       <name>Apache CVS Repository</name>
-      <url>
-        scpexe://cvs.apache.org/www/cvs.apache.org/maven-snapshot-repository
-      </url>
+      <url>scpexe://cvs.apache.org/www/cvs.apache.org/maven-snapshot-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>
+      <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>
+      <url>scpexe://minotaur.apache.org/www/geronimo.apache.org/maven/</url>
     </site>
   </distributionManagement>
-
   <build>
     <defaultGoal>install</defaultGoal>
     <sourceDirectory>src/java</sourceDirectory>
     <testSourceDirectory>src/test</testSourceDirectory>
+    <resources>
+      <resource>
+        <directory>src/resources</directory>
+      </resource>
+    </resources>
+    <testResources>
+      <testResource>
+        <directory>src/test-data</directory>
+      </testResource>
+      <testResource>
+        <directory>src/test-resources</directory>
+      </testResource>
+    </testResources>
     <plugins>
       <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>2.1.3-SNAPSHOT</version>
+      </plugin>
+      <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <source>1.4</source>
@@ -654,9 +653,7 @@
         <executions>
           <execution>
             <configuration>
-              <remoteRepositoryUrl>
-                scpexe://cvs.apache.org/www/cvs.apache.org/repository
-              </remoteRepositoryUrl>
+              <remoteRepositoryUrl>scpexe://cvs.apache.org/www/cvs.apache.org/repository</remoteRepositoryUrl>
             </configuration>
             <goals>
               <goal>install-maven-one-repository</goal>
@@ -716,6 +713,7 @@
       </activation>
       <modules>
         <module>modules/activation</module>
+        <module>modules/activemq-embedded-rar</module>
         <module>modules/client</module>
         <module>modules/common</module>
         <module>modules/connector</module>
@@ -727,17 +725,20 @@
         <module>modules/deploy-tool</module>
         <module>modules/deployment</module>
         <module>modules/derby</module>
+        <module>modules/directory</module>
+        <module>modules/interceptor</module>
         <module>modules/j2ee</module>
         <module>modules/j2ee-builder</module>
         <module>modules/j2ee-schema</module>
         <module>modules/javamail-transport</module>
         <module>modules/jmx-remoting</module>
         <module>modules/kernel</module>
-        <module>modules/interceptor</module>
-        <module>modules/mail</module>
         <module>modules/management</module>
+        <module>modules/mail</module>
         <module>modules/naming</module>
+        <module>modules/naming-builder</module>
         <module>modules/scripts</module>
+        <module>modules/security</module>
         <module>modules/security-builder</module>
         <module>modules/service-builder</module>
         <module>modules/session</module>