geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r429088 [5/7] - in /geronimo/branches/dain/notcm: ./ applications/ applications/console/ applications/console/console-core/ applications/console/console-ear/ applications/console/console-framework/ applications/console/console-framework/src...
Date Sun, 06 Aug 2006 01:47:20 GMT
Modified: geronimo/branches/dain/notcm/modules/j2ee-schema/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/j2ee-schema/pom.xml?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/j2ee-schema/pom.xml (original)
+++ geronimo/branches/dain/notcm/modules/j2ee-schema/pom.xml Sat Aug  5 18:47:06 2006
@@ -17,13 +17,13 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project>
+<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.apache.geronimo.modules</groupId>
-        <artifactId>modules-parent</artifactId>
+        <artifactId>modules</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -31,6 +31,20 @@
     <artifactId>geronimo-j2ee-schema</artifactId>
     <name>Geronimo :: J2EE Schema</name>
     
+    <!--
+    
+    HACK: Need to explicitly configure SCM for this module since its artifactId
+          does not match the directory it lives in.
+    
+    FIXME: Rename module directory or artifactId.
+    
+    -->
+    <scm>
+        <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/trunk/modules/j2ee-schema</connection>
+        <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/trunk/modules/j2ee-schema</developerConnection>
+        <url>http://svn.apache.org/repos/asf/geronimo/trunk/modules/j2ee-schema</url>
+    </scm>
+    
     <dependencies>
         
         <!-- Thirdparty Dependencies -->
@@ -40,12 +54,14 @@
             <artifactId>xbean</artifactId>
         </dependency>
         
-        <!-- Test Dependencies -->
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+        </dependency>
         
         <dependency>
             <groupId>stax</groupId>
             <artifactId>stax-api</artifactId>
-            <scope>test</scope>
         </dependency>
         
     </dependencies>
@@ -62,6 +78,33 @@
                         <xmlConfig implementation="java.io.File">${pom.basedir}/src/conf</xmlConfig>
                     </xmlConfigs>
                 </configuration>
+            </plugin>
+            
+            
+            <!--
+            HACK: Copy the generated XmlBeans bits for clover
+            -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <mkdir dir="${pom.basedir}/target/clover/classes"/>
+                                <copy todir="${pom.basedir}/target/clover/classes">
+                                    <fileset dir="${pom.basedir}/target/classes">
+                                        <include name="schemaorg_apache_xmlbeans/**"/>
+                                    </fileset>
+                                </copy>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
     </build>

Modified: geronimo/branches/dain/notcm/modules/j2ee-schema/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/j2ee-schema/project.xml?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/j2ee-schema/project.xml (original)
+++ geronimo/branches/dain/notcm/modules/j2ee-schema/project.xml Sat Aug  5 18:47:06 2006
@@ -50,6 +50,12 @@
 
         <!-- needed for xmlbeans runtime-->
         <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>${commons_logging_version}</version>
+        </dependency>
+
+        <dependency>
             <groupId>xmlbeans</groupId>
             <artifactId>xbean</artifactId>
             <version>${xmlbeans_version}</version>

Propchange: geronimo/branches/dain/notcm/modules/j2ee-schema/src/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Sat Aug  5 18:47:06 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/modules/j2ee-schema/src:424119

Modified: geronimo/branches/dain/notcm/modules/j2ee-schema/src/test/org/apache/geronimo/schema/SchemaConversionUtilsTest.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/j2ee-schema/src/test/org/apache/geronimo/schema/SchemaConversionUtilsTest.java?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/j2ee-schema/src/test/org/apache/geronimo/schema/SchemaConversionUtilsTest.java (original)
+++ geronimo/branches/dain/notcm/modules/j2ee-schema/src/test/org/apache/geronimo/schema/SchemaConversionUtilsTest.java Sat Aug  5 18:47:06 2006
@@ -29,6 +29,9 @@
 import org.apache.xmlbeans.XmlException;
 import org.apache.geronimo.xbeans.j2ee.EjbJarType;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
 /**
  * ejb 1.1 dtd appears to be a subset of ejb 2.0 dtd so the same xsl should
  * work for both.
@@ -36,6 +39,8 @@
  * @version $Rev$ $Date$
  */
 public class SchemaConversionUtilsTest extends TestCase {
+    private static final Log log = LogFactory.getLog(SchemaConversionUtilsTest.class);
+    
     private ClassLoader classLoader = this.getClass().getClassLoader();
 
 //comment on validity of j2ee 1.4 schemas: validation doesn't work...
@@ -66,8 +71,8 @@
         XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
         SchemaConversionUtils.validateDD(expected);
         xmlObject = SchemaConversionUtils.convertToApplicationClientSchema(xmlObject);
-//        System.out.println(xmlObject.toString());
-//        System.out.println(expected.toString());
+//        log.debug(xmlObject.toString());
+//        log.debug(expected.toString());
         List problems = new ArrayList();
         boolean ok = compareXmlObjects(xmlObject, expected, problems);
         assertTrue("Differences: " + problems, ok);
@@ -95,8 +100,8 @@
         XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
         SchemaConversionUtils.validateDD(expected);
         xmlObject = SchemaConversionUtils.convertToApplicationSchema(xmlObject);
-//        System.out.println(xmlObject.toString());
-//        System.out.println(expected.toString());
+//        log.debug(xmlObject.toString());
+//        log.debug(expected.toString());
         List problems = new ArrayList();
         boolean ok = compareXmlObjects(xmlObject, expected, problems);
         assertTrue("Differences: " + problems, ok);
@@ -124,8 +129,8 @@
         XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
         SchemaConversionUtils.validateDD(expected);
         xmlObject = SchemaConversionUtils.convertToConnectorSchema(xmlObject);
-//        System.out.println(xmlObject.toString());
-//        System.out.println(expected.toString());
+//        log.debug(xmlObject.toString());
+//        log.debug(expected.toString());
         List problems = new ArrayList();
         boolean ok = compareXmlObjects(xmlObject, expected, problems);
         assertTrue("Differences: " + problems, ok);
@@ -153,8 +158,8 @@
         XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
         SchemaConversionUtils.validateDD(expected);
         xmlObject = SchemaConversionUtils.convertToEJBSchema(xmlObject);
-//        System.out.println(xmlObject.toString());
-//        System.out.println(expected.toString());
+//        log.debug(xmlObject.toString());
+//        log.debug(expected.toString());
         List problems = new ArrayList();
         boolean ok = compareXmlObjects(xmlObject, expected, problems);
         assertTrue("Differences: " + problems, ok);
@@ -182,8 +187,8 @@
         XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
         SchemaConversionUtils.validateDD(expected);
         xmlObject = SchemaConversionUtils.convertToEJBSchema(xmlObject);
-//        System.out.println(xmlObject.toString());
-//        System.out.println(expected.toString());
+//        log.debug(xmlObject.toString());
+//        log.debug(expected.toString());
         List problems = new ArrayList();
         boolean ok = compareXmlObjects(xmlObject, expected, problems);
         assertTrue("Differences: " + problems, ok);
@@ -211,8 +216,8 @@
         XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
         SchemaConversionUtils.validateDD(expected);
         xmlObject = SchemaConversionUtils.convertToEJBSchema(xmlObject);
-//        System.out.println(xmlObject.toString());
-//        System.out.println(expected.toString());
+//        log.debug(xmlObject.toString());
+//        log.debug(expected.toString());
         List problems = new ArrayList();
         boolean ok = compareXmlObjects(xmlObject, expected, problems);
         assertTrue("Differences: " + problems, ok);
@@ -240,8 +245,8 @@
         XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
         SchemaConversionUtils.validateDD(expected);
         xmlObject = SchemaConversionUtils.convertToEJBSchema(xmlObject);
-//        System.out.println(xmlObject.toString());
-//        System.out.println(expected.toString());
+//        log.debug(xmlObject.toString());
+//        log.debug(expected.toString());
         List problems = new ArrayList();
         boolean ok = compareXmlObjects(xmlObject, expected, problems);
         assertTrue("Differences: " + problems, ok);
@@ -281,7 +286,7 @@
         } finally {
             srcCursor.dispose();
         }
-//        System.out.println(srcObject.toString());
+//        log.debug(srcObject.toString());
         XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
         List problems = new ArrayList();
         boolean ok = compareXmlObjects(srcObject, expected, problems);
@@ -310,7 +315,7 @@
         } finally {
             srcCursor.dispose();
         }
-//        System.out.println(srcObject.toString());
+//        log.debug(srcObject.toString());
         XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
         List problems = new ArrayList();
         boolean ok = compareXmlObjects(srcObject, expected, problems);
@@ -323,8 +328,8 @@
         XmlObject xmlObject = XmlObject.Factory.parse(srcXml);
         xmlObject = SchemaConversionUtils.convertToServletSchema(xmlObject);
         XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
-//        System.out.println(xmlObject.toString());
-//        System.out.println(expected.toString());
+//        log.debug(xmlObject.toString());
+//        log.debug(expected.toString());
         List problems = new ArrayList();
         boolean ok = compareXmlObjects(xmlObject, expected, problems);
         assertTrue("Differences: " + problems, ok);
@@ -338,7 +343,7 @@
         URL expectedOutputXml = classLoader.getResource("j2ee_1_3dtd/web-1-24.xml");
         XmlObject xmlObject = XmlObject.Factory.parse(srcXml);
         xmlObject = SchemaConversionUtils.convertToServletSchema(xmlObject);
-//        System.out.println(xmlObject.toString());
+//        log.debug(xmlObject.toString());
         XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
         List problems = new ArrayList();
         boolean ok = compareXmlObjects(xmlObject, expected, problems);
@@ -354,8 +359,8 @@
         XmlObject xmlObject = XmlObject.Factory.parse(srcXml);
         xmlObject = SchemaConversionUtils.convertToServletSchema(xmlObject);
         XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
-//        System.out.println(xmlObject.toString());
-//        System.out.println(expected.toString());
+//        log.debug(xmlObject.toString());
+//        log.debug(expected.toString());
         List problems = new ArrayList();
         boolean ok = compareXmlObjects(xmlObject, expected, problems);
         assertTrue("Differences: " + problems, ok);
@@ -399,9 +404,11 @@
         XmlCursor cursor = xmlObject.newCursor();
         try {
             SchemaConversionUtils.convertToGeronimoSubSchemas(cursor);
-                    System.out.println(xmlObject.toString());
+            log.debug(xmlObject.toString());
+            
             XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
-            System.out.println(expected.toString());
+            log.debug(expected.toString());
+            
             List problems = new ArrayList();
             boolean ok = compareXmlObjects(xmlObject, expected, problems);
             assertTrue("Differences: " + problems, ok);
@@ -419,7 +426,7 @@
         XmlObject xmlObject = XmlObject.Factory.parse(srcXml);
         //this is not a usable type, we'll see what happens though
         xmlObject = SchemaConversionUtils.getNestedObjectAsType(xmlObject, new QName("http://www.openejb.org/xml/ns/openejb-jar-2.1", "openejb-jar"), EjbJarType.type);
-//	        System.out.println(xmlObject.toString());
+//	        log.debug(xmlObject.toString());
     }
 
     public void testSecurityElementConverter() throws Exception {
@@ -431,7 +438,7 @@
         XmlCursor end = cursor.newCursor();
         try {
             elementConverter.convertElement(cursor, end);
-            //        System.out.println(xmlObject.toString());
+            //        log.debug(xmlObject.toString());
             XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
             List problems = new ArrayList();
             boolean ok = compareXmlObjects(xmlObject, expected, problems);
@@ -455,7 +462,7 @@
         XmlCursor end = cursor.newCursor();
         try {
             elementConverter.convertElement(cursor, end);
-            //        System.out.println(xmlObject.toString());
+            //        log.debug(xmlObject.toString());
             XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
             List problems = new ArrayList();
             boolean ok = compareXmlObjects(xmlObject, expected, problems);
@@ -479,7 +486,7 @@
         XmlCursor end = cursor.newCursor();
         try {
             elementConverter.convertElement(cursor, end);
-            //        System.out.println(xmlObject.toString());
+            //        log.debug(xmlObject.toString());
             XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
             List problems = new ArrayList();
             boolean ok = compareXmlObjects(xmlObject, expected, problems);
@@ -502,7 +509,7 @@
         XmlCursor end = cursor.newCursor();
         try {
             elementConverter.convertElement(cursor, end);
-            //        System.out.println(xmlObject.toString());
+            //        log.debug(xmlObject.toString());
             XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
             List problems = new ArrayList();
             boolean ok = compareXmlObjects(xmlObject, expected, problems);
@@ -523,9 +530,11 @@
         XmlCursor cursor = xmlObject.newCursor();
         try {
             SchemaConversionUtils.convertToGeronimoSubSchemas(cursor);
-                    System.out.println(xmlObject.toString());
+            log.debug(xmlObject.toString());
+            
             XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
-            System.out.println(expected.toString());
+            log.debug(expected.toString());
+            
             List problems = new ArrayList();
             boolean ok = compareXmlObjects(xmlObject, expected, problems);
             assertTrue("Differences: " + problems, ok);

Modified: geronimo/branches/dain/notcm/modules/j2ee/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/j2ee/pom.xml?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/j2ee/pom.xml (original)
+++ geronimo/branches/dain/notcm/modules/j2ee/pom.xml Sat Aug  5 18:47:06 2006
@@ -17,33 +17,33 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project>
+<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.apache.geronimo.modules</groupId>
-        <artifactId>modules-parent</artifactId>
+        <artifactId>modules</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-j2ee</artifactId>
     <name>Geronimo :: J2EE</name>
-    <description>Geronimo J2EE Services</description>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <inherited>true</inherited>
-            </plugin>
-        </plugins>
-    </build>
-
-    <!-- ============ -->
-    <!-- Dependencies -->
-    <!-- ============ -->
+    
+    <!--
+    
+    HACK: Need to explicitly configure SCM for this module since its artifactId
+          does not match the directory it lives in.
+    
+    FIXME: Rename module directory or artifactId.
+    
+    -->
+    <scm>
+        <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/trunk/modules/j2ee</connection>
+        <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/trunk/modules/j2ee</developerConnection>
+        <url>http://svn.apache.org/repos/asf/geronimo/trunk/modules/j2ee</url>
+    </scm>
     
     <dependencies>
         

Modified: geronimo/branches/dain/notcm/modules/jetty-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/jetty-builder/pom.xml?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/jetty-builder/pom.xml (original)
+++ geronimo/branches/dain/notcm/modules/jetty-builder/pom.xml Sat Aug  5 18:47:06 2006
@@ -17,12 +17,13 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project>
+<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.apache.geronimo.modules</groupId>
-        <artifactId>modules-parent</artifactId>
+        <artifactId>modules</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -30,6 +31,20 @@
     <artifactId>geronimo-jetty-builder</artifactId>
     <name>Geronimo :: Jetty :: Builder</name>
     
+    <!--
+    
+    HACK: Need to explicitly configure SCM for this module since its artifactId
+          does not match the directory it lives in.
+    
+    FIXME: Rename module directory or artifactId.
+    
+    -->
+    <scm>
+        <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/trunk/modules/jetty-builder</connection>
+        <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/trunk/modules/jetty-builder</developerConnection>
+        <url>http://svn.apache.org/repos/asf/geronimo/trunk/modules/jetty-builder</url>
+    </scm>
+    
     <dependencies>
         
         <!-- Module Dependencies -->
@@ -68,6 +83,32 @@
                 <configuration>
                     <sourceSchemas>geronimo-jetty-1.1.xsd,geronimo-jetty-config-1.0.xsd</sourceSchemas>
                 </configuration>
+            </plugin>
+            
+            <!--
+            HACK: Copy the generated XmlBeans bits for clover
+            -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <mkdir dir="${pom.basedir}/target/clover/classes"/>
+                                <copy todir="${pom.basedir}/target/clover/classes">
+                                    <fileset dir="${pom.basedir}/target/classes">
+                                        <include name="schemaorg_apache_xmlbeans/**"/>
+                                    </fileset>
+                                </copy>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
     </build>

Modified: geronimo/branches/dain/notcm/modules/jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/jetty/pom.xml?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/jetty/pom.xml (original)
+++ geronimo/branches/dain/notcm/modules/jetty/pom.xml Sat Aug  5 18:47:06 2006
@@ -17,42 +17,34 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project>
+<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.apache.geronimo.modules</groupId>
-        <artifactId>modules-parent</artifactId>
+        <artifactId>modules</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-jetty</artifactId>
     <name>Geronimo :: Jetty</name>
-    <description>Geronimo Jetty Integration</description>
-
-    <build>
-        <resources>
-            <resource>
-                <directory>src/resources2</directory>
-            </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <systemProperties>
-                        <property>
-                            <name>java.security.auth.login.config</name>
-                            <value>${basedir}/src/test-resources/data/login.config</value>
-                        </property>
-                    </systemProperties>
-                    <forkMode>once</forkMode>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
+    
+    <!--
+    
+    HACK: Need to explicitly configure SCM for this module since its artifactId
+          does not match the directory it lives in.
+    
+    FIXME: Rename module directory or artifactId.
+    
+    -->
+    <scm>
+        <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/trunk/modules/jetty</connection>
+        <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/trunk/modules/jetty</developerConnection>
+        <url>http://svn.apache.org/repos/asf/geronimo/trunk/modules/jetty</url>
+    </scm>
+    
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
@@ -77,7 +69,7 @@
             <artifactId>geronimo-webservices</artifactId>
             <version>${pom.version}</version>
         </dependency>
-
+        
         <dependency>
             <groupId>jetty</groupId>
             <artifactId>org.mortbay.jetty</artifactId>
@@ -101,12 +93,12 @@
             <artifactId>jasper-runtime</artifactId>
             <version>${tomcatVersion}</version>
         </dependency>
-
+        
         <dependency>
             <groupId>commons-el</groupId>
             <artifactId>commons-el</artifactId>
         </dependency>
-
+        
         <dependency>
             <groupId>commons-collections</groupId>
             <artifactId>commons-collections</artifactId>
@@ -116,7 +108,39 @@
             <groupId>commons-primitives</groupId>
             <artifactId>commons-primitives</artifactId>
         </dependency>
+        
     </dependencies>
-
+    
+    <build>
+        <resources>
+            <resource>
+                <directory>${pom.basedir}</directory>
+                <targetPath>META-INF</targetPath>
+                <includes>
+                    <include>LICENSE.txt</include>
+                    <include>NOTICE.txt</include>
+                </includes>
+            </resource>
+            
+            <resource>
+                <directory>src/resources2</directory>
+            </resource>
+        </resources>
+        
+        <plugins>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <systemProperties>
+                        <property>
+                            <name>java.security.auth.login.config</name>
+                            <value>${basedir}/src/test-resources/data/login.config</value>
+                        </property>
+                    </systemProperties>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    
 </project>
 

Propchange: geronimo/branches/dain/notcm/modules/jetty/src/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Sat Aug  5 18:47:06 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/modules/jetty/src:424119

Modified: geronimo/branches/dain/notcm/modules/jetty/src/test/org/apache/geronimo/jetty/AbstractWebModuleTest.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/jetty/src/test/org/apache/geronimo/jetty/AbstractWebModuleTest.java?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/jetty/src/test/org/apache/geronimo/jetty/AbstractWebModuleTest.java (original)
+++ geronimo/branches/dain/notcm/modules/jetty/src/test/org/apache/geronimo/jetty/AbstractWebModuleTest.java Sat Aug  5 18:47:06 2006
@@ -17,6 +17,7 @@
 package org.apache.geronimo.jetty;
 
 import junit.framework.TestCase;
+
 import org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinator;
 import org.apache.geronimo.connector.outbound.connectiontracking.GeronimoTransactionListener;
 import org.apache.geronimo.jetty.connector.HTTPConnector;
@@ -39,6 +40,7 @@
 import org.mortbay.http.Authenticator;
 import org.mortbay.jetty.servlet.FormAuthenticator;
 
+import java.io.File;
 import java.net.URL;
 import java.security.PermissionCollection;
 import java.util.Collections;
@@ -53,6 +55,8 @@
  * @version $Rev$ $Date$
  */
 public class AbstractWebModuleTest extends TestCase {
+    private File basedir = new File(System.getProperty("basedir"));
+    
     protected ClassLoader cl;
     protected final static String securityRealmName = "demo-properties-realm";
     private HTTPConnector connector;
@@ -155,8 +159,8 @@
         new SecurityServiceImpl(cl, serverInfo, "org.apache.geronimo.security.jacc.GeronimoPolicyConfigurationFactory", "org.apache.geronimo.security.jacc.GeronimoPolicy", null, null, null, null);
 
         Properties options = new Properties();
-        options.setProperty("usersURI", "src/test-resources/data/users.properties");
-        options.setProperty("groupsURI", "src/test-resources/data/groups.properties");
+        options.setProperty("usersURI", new File(basedir, "src/test-resources/data/users.properties").toURI().toString());
+        options.setProperty("groupsURI", new File(basedir, "src/test-resources/data/groups.properties").toURI().toString());
 
         LoginModuleGBean loginModule = new LoginModuleGBean("org.apache.geronimo.security.realm.providers.PropertiesFileLoginModule", null, true, true, cl);
         loginModule.setLoginDomainName(domainName);

Modified: geronimo/branches/dain/notcm/modules/jetty/src/test/org/apache/geronimo/jetty/ClassLoaderTest.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/jetty/src/test/org/apache/geronimo/jetty/ClassLoaderTest.java?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/jetty/src/test/org/apache/geronimo/jetty/ClassLoaderTest.java (original)
+++ geronimo/branches/dain/notcm/modules/jetty/src/test/org/apache/geronimo/jetty/ClassLoaderTest.java Sat Aug  5 18:47:06 2006
@@ -33,6 +33,8 @@
  * @version $Rev$ $Date$
  */
 public class ClassLoaderTest extends TestCase {
+    private File basedir = new File(System.getProperty("basedir"));
+    
     Artifact configId = new Artifact("foo", "bar", "1", "car");
     ClassLoader cl;
     URL[] urls;
@@ -41,9 +43,7 @@
 
     public void setUp() throws Exception {
         super.setUp();
-        URL url = new File("src/test-resources/deployables/cltest/").toURL();
-//        URL url = getClass().getClassLoader().getResource("deployables/cltest/");
-        System.err.println("URL: " + url);
+        URL url = new File(basedir, "src/test-resources/deployables/cltest/").toURL();
         urls = new URL[]{url};
     }
 

Modified: geronimo/branches/dain/notcm/modules/jetty/src/test/org/apache/geronimo/jetty/SecurityTest.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/jetty/src/test/org/apache/geronimo/jetty/SecurityTest.java?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/jetty/src/test/org/apache/geronimo/jetty/SecurityTest.java (original)
+++ geronimo/branches/dain/notcm/modules/jetty/src/test/org/apache/geronimo/jetty/SecurityTest.java Sat Aug  5 18:47:06 2006
@@ -46,7 +46,6 @@
  * @version $Rev$ $Date$
  */
 public class SecurityTest extends AbstractWebModuleTest {
-
     /**
      * Test the explicit map feature.  Only Alan should be able to log in.
      *

Modified: geronimo/branches/dain/notcm/modules/jmx-remoting/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/jmx-remoting/pom.xml?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/jmx-remoting/pom.xml (original)
+++ geronimo/branches/dain/notcm/modules/jmx-remoting/pom.xml Sat Aug  5 18:47:06 2006
@@ -17,20 +17,36 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project>
+<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.apache.geronimo.modules</groupId>
-        <artifactId>modules-parent</artifactId>
+        <artifactId>modules</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-jmx-remoting</artifactId>
     <name>Geronimo :: JMX Remoting</name>
+    
     <description>Provides remote access to a Geronimo server using JSR 160 JMX Remoting</description>
 
+    <!--
+    
+    HACK: Need to explicitly configure SCM for this module since its artifactId
+          does not match the directory it lives in.
+    
+    FIXME: Rename module directory or artifactId.
+    
+    -->
+    <scm>
+        <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/trunk/modules/jmx-remoting</connection>
+        <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/trunk/modules/jmx-remoting</developerConnection>
+        <url>http://svn.apache.org/repos/asf/geronimo/trunk/modules/jmx-remoting</url>
+    </scm>
+    
     <dependencies>
         
         <dependency>
@@ -45,5 +61,6 @@
             <artifactId>mx4j-remote</artifactId>
         </dependency>
     </dependencies>
+    
 </project>
 

Modified: geronimo/branches/dain/notcm/modules/kernel/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/kernel/pom.xml?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/kernel/pom.xml (original)
+++ geronimo/branches/dain/notcm/modules/kernel/pom.xml Sat Aug  5 18:47:06 2006
@@ -17,39 +17,36 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project>
+<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.apache.geronimo.modules</groupId>
-        <artifactId>modules-parent</artifactId>
+        <artifactId>modules</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-kernel</artifactId>
     <name>Geronimo :: Kernel</name>
-
-    <build>
-        <!-- move this to parent pom -->
-        <resources>
-            <resource>
-                <directory>src/META-INF</directory>
-            </resource>
-        </resources>
-
-        <plugins>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <forkMode>once</forkMode>
-                    <workingDirectory>${basedir}</workingDirectory>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
+    
+    <!--
+    
+    HACK: Need to explicitly configure SCM for this module since its artifactId
+          does not match the directory it lives in.
+    
+    FIXME: Rename module directory or artifactId.
+    
+    -->
+    <scm>
+        <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/trunk/modules/kernel</connection>
+        <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/trunk/modules/kernel</developerConnection>
+        <url>http://svn.apache.org/repos/asf/geronimo/trunk/modules/kernel</url>
+    </scm>
+    
     <dependencies>
+        
         <dependency>
             <groupId>cglib</groupId>
             <artifactId>cglib-nodep</artifactId>
@@ -79,12 +76,33 @@
             <groupId>xpp3</groupId>
             <artifactId>xpp3</artifactId>
         </dependency>
-
+        
+        <!-- Test Dependencies -->
+        
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-qname_1.1_spec</artifactId>
             <scope>test</scope>
         </dependency>
+        
     </dependencies>
+    
+    <build>
+        <resources>
+            <resource>
+                <directory>${pom.basedir}</directory>
+                <targetPath>META-INF</targetPath>
+                <includes>
+                    <include>LICENSE.txt</include>
+                    <include>NOTICE.txt</include>
+                </includes>
+            </resource>
+            
+            <resource>
+                <directory>src/META-INF</directory>
+            </resource>
+        </resources>
+    </build>
+    
 </project>
 

Propchange: geronimo/branches/dain/notcm/modules/kernel/src/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Sat Aug  5 18:47:06 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/modules/kernel/src:428809

Modified: geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/kernel/config/ConfigurationClassLoader.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/kernel/config/ConfigurationClassLoader.java?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/kernel/config/ConfigurationClassLoader.java (original)
+++ geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/kernel/config/ConfigurationClassLoader.java Sat Aug  5 18:47:06 2006
@@ -68,7 +68,7 @@
             synchronized (lock) {
                 if (!clearSoftCacheFailed) {
                     clearSoftCacheFailed = true;
-                    LogFactory.getLog(ConfigurationClassLoader.class).error("Unable to clear SoftCache field " + fieldName + " in class " + clazz);
+                    LogFactory.getLog(ConfigurationClassLoader.class).debug("Unable to clear SoftCache field " + fieldName + " in class " + clazz);
                 }
             }
         }

Modified: geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/kernel/config/MultiParentClassLoader.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/kernel/config/MultiParentClassLoader.java?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/kernel/config/MultiParentClassLoader.java (original)
+++ geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/kernel/config/MultiParentClassLoader.java Sat Aug  5 18:47:06 2006
@@ -408,7 +408,7 @@
             synchronized (lock) {
                 if (!clearSoftCacheFailed) {
                     clearSoftCacheFailed = true;
-                    LogFactory.getLog(ConfigurationClassLoader.class).error("Unable to clear SoftCache field " + fieldName + " in class " + clazz);
+                    LogFactory.getLog(MultiParentClassLoader.class).debug("Unable to clear SoftCache field " + fieldName + " in class " + clazz);
                 }
             }
         }

Modified: geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/kernel/config/SimpleConfigurationManager.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/kernel/config/SimpleConfigurationManager.java?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/kernel/config/SimpleConfigurationManager.java (original)
+++ geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/kernel/config/SimpleConfigurationManager.java Sat Aug  5 18:47:06 2006
@@ -53,6 +53,15 @@
     protected final Collection repositories;
     protected final Collection watchers;
 
+    /**
+     * When this is not null, it points to the "new" configuration that is
+     * part of an in-process reload operation.  This configuration will
+     * definitely be loaded, but might not be started yet.  It shold never be
+     * populated outside the scope of a reload operation.
+     */
+    private Configuration reloadingConfiguration;
+
+
     public SimpleConfigurationManager(Collection stores, ArtifactResolver artifactResolver, Collection repositories) {
         this(stores, artifactResolver, repositories, Collections.EMPTY_SET);
     }
@@ -86,6 +95,9 @@
         if(!configId.isResolved()) {
             throw new IllegalArgumentException("Artifact "+configId+" is not fully resolved");
         }
+        if(reloadingConfiguration != null && reloadingConfiguration.getId().equals(configId)) {
+            return true;
+        }
         return configurationModel.isLoaded(configId);
     }
 
@@ -228,6 +240,9 @@
         if(!configurationId.isResolved()) {
             throw new IllegalArgumentException("Artifact "+configurationId+" is not fully resolved");
         }
+        if(reloadingConfiguration != null && reloadingConfiguration.getId().equals(configurationId)) {
+            return reloadingConfiguration;
+        }
         return (Configuration) configurations.get(configurationId);
     }
 
@@ -769,11 +784,11 @@
         }
     }
 
-    public LifecycleResults reloadConfiguration(ConfigurationData configurationData) throws LifecycleException, NoSuchConfigException {
+    public synchronized LifecycleResults reloadConfiguration(ConfigurationData configurationData) throws LifecycleException, NoSuchConfigException {
         return reloadConfiguration(configurationData, NullLifecycleMonitor.INSTANCE);
     }
 
-    public LifecycleResults reloadConfiguration(ConfigurationData configurationData, LifecycleMonitor monitor) throws LifecycleException, NoSuchConfigException {
+    public synchronized LifecycleResults reloadConfiguration(ConfigurationData configurationData, LifecycleMonitor monitor) throws LifecycleException, NoSuchConfigException {
         Configuration configuration = getConfiguration(configurationData.getId());
         if (configuration == null) {
             throw new NoSuchConfigException(configurationData.getId());
@@ -942,6 +957,7 @@
 
                     if (configurationId.equals(newConfigurationId)) {
                         newConfiguration = configuration;
+                        reloadingConfiguration = configuration;
                     } else {
                         loadedParents.put(configurationId, configuration);
                     }
@@ -1049,7 +1065,7 @@
                     configuration = load(existingUnloadedConfiguration.getConfigurationData(),
                             existingUnloadedConfiguration.getResolvedParentIds(),
                             Collections.EMPTY_MAP);
-
+                    reloadingConfiguration = configuration;
                     // if the configuration was started before restart it
                     if (started.contains(existingConfigurationId)) {
                         start(configuration);
@@ -1081,6 +1097,8 @@
 
                     throw new LifecycleException("reload", newConfigurationId, results);
                 }
+            } finally {
+                reloadingConfiguration = null;
             }
         }
 
@@ -1113,6 +1131,7 @@
                 if (resolvedParentIds != null) {
                     monitor.loading(configurationId);
                     configuration = load(unloadedConfiguration.getConfigurationData(), resolvedParentIds, Collections.EMPTY_MAP);
+                    reloadingConfiguration = configuration;
                     monitor.succeeded(configurationId);
 
 
@@ -1163,6 +1182,8 @@
 
                     skip.add(failedId);
                 }
+            } finally {
+                reloadingConfiguration = null;
             }
         }
 

Modified: geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/kernel/config/xstream/DomConverter.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/kernel/config/xstream/DomConverter.java?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/kernel/config/xstream/DomConverter.java (original)
+++ geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/kernel/config/xstream/DomConverter.java Sat Aug  5 18:47:06 2006
@@ -30,6 +30,7 @@
 import com.thoughtworks.xstream.io.xml.DomWriter;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
+import org.apache.geronimo.kernel.util.XmlUtil;
 
 /**
  * @version $Rev$ $Date$
@@ -53,7 +54,7 @@
     }
 
     public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext unmarshallingContext) {
-        DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
+        DocumentBuilderFactory documentBuilderFactory = XmlUtil.newDocumentBuilderFactory();
         DocumentBuilder documentBuilder = null;
         try {
             documentBuilder = documentBuilderFactory.newDocumentBuilder();

Modified: geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/kernel/config/xstream/XStreamGBeanState.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/kernel/config/xstream/XStreamGBeanState.java?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/kernel/config/xstream/XStreamGBeanState.java (original)
+++ geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/kernel/config/xstream/XStreamGBeanState.java Sat Aug  5 18:47:06 2006
@@ -33,6 +33,7 @@
 import org.apache.geronimo.gbean.GBeanData;
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.kernel.Naming;
+import org.apache.geronimo.kernel.util.XmlUtil;
 import org.apache.geronimo.kernel.config.InvalidConfigException;
 import org.apache.geronimo.kernel.config.GBeanState;
 import org.apache.geronimo.kernel.repository.Environment;
@@ -125,7 +126,7 @@
     private static Element storeGBeans(List gbeans) throws IOException {
         GBeanData[] gbeanDatas = (GBeanData[]) gbeans.toArray(new GBeanData[gbeans.size()]);
 
-        DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
+        DocumentBuilderFactory documentBuilderFactory = XmlUtil.newDocumentBuilderFactory();
         DocumentBuilder documentBuilder = null;
         try {
             documentBuilder = documentBuilderFactory.newDocumentBuilder();

Modified: geronimo/branches/dain/notcm/modules/kernel/src/test/org/apache/geronimo/kernel/basic/BasicProxyMapTest.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/kernel/src/test/org/apache/geronimo/kernel/basic/BasicProxyMapTest.java?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/kernel/src/test/org/apache/geronimo/kernel/basic/BasicProxyMapTest.java (original)
+++ geronimo/branches/dain/notcm/modules/kernel/src/test/org/apache/geronimo/kernel/basic/BasicProxyMapTest.java Sat Aug  5 18:47:06 2006
@@ -98,7 +98,7 @@
         Object value1 = new Object();
         Object value2 = new Object();
 
-        class IdentityTest {
+        class IdentityTest1 {
             public int hashCode() { return 1; }
             public boolean equals(Object o) { return true; }
         }
@@ -107,8 +107,8 @@
             public boolean equals(Object o) { return false; }
         }
         
-        Object key1 = new IdentityTest();
-        Object key2 = new IdentityTest();
+        Object key1 = new IdentityTest1();
+        Object key2 = new IdentityTest1();
         
         assertNull(map.put(key1, value1));
         assertNull(map.get(key2));

Modified: geronimo/branches/dain/notcm/modules/kernel/src/test/org/apache/geronimo/kernel/classloader/UrlResourceFinderTest.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/kernel/src/test/org/apache/geronimo/kernel/classloader/UrlResourceFinderTest.java?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/kernel/src/test/org/apache/geronimo/kernel/classloader/UrlResourceFinderTest.java (original)
+++ geronimo/branches/dain/notcm/modules/kernel/src/test/org/apache/geronimo/kernel/classloader/UrlResourceFinderTest.java Sat Aug  5 18:47:06 2006
@@ -34,6 +34,7 @@
  * @version $Rev$ $Date$
  */
 public class UrlResourceFinderTest extends TestCase {
+    private File basedir = new File(System.getProperty("basedir"));
     private File jarFile;
     private Manifest manifest;
     private Attributes resourceAttributes;
@@ -45,8 +46,8 @@
      * @throws Exception
      */
     public void testResourceEnumeration() throws Exception {
-        URL jar1 = new File("src/test-data/resourceFinderTest/jar1/").toURL();
-        URL jar2 = new File("src/test-data/resourceFinderTest/jar2/").toURL();
+        URL jar1 = new File(basedir, "src/test-data/resourceFinderTest/jar1/").toURL();
+        URL jar2 = new File(basedir, "src/test-data/resourceFinderTest/jar2/").toURL();
         UrlResourceFinder resourceFinder = new UrlResourceFinder(new URL[] {jar1, jar2});
 
         Enumeration enumeration = resourceFinder.findResources("resource");
@@ -68,7 +69,7 @@
     }
 
     public void testDirectoryResource() throws Exception {
-        URL jar = new File("src/test-data/resourceFinderTest/jar1/").toURL();
+        URL jar = new File(basedir, "src/test-data/resourceFinderTest/jar1/").toURL();
         UrlResourceFinder resourceFinder = new UrlResourceFinder(new URL[] {jar});
 
         ResourceHandle resource = resourceFinder.getResource("resource");
@@ -146,7 +147,7 @@
     }
 
     public void testAddURL() throws Exception {
-        URL jar1 = new File("src/test-data/resourceFinderTest/jar1/").toURL();
+        URL jar1 = new File(basedir, "src/test-data/resourceFinderTest/jar1/").toURL();
         UrlResourceFinder resourceFinder = new UrlResourceFinder(new URL[] {jar1});
 
         Enumeration enumeration = resourceFinder.findResources("resource");
@@ -160,7 +161,7 @@
         assertFalse(enumeration.hasMoreElements());
 
         // addUrl
-        URL jar2 = new File("src/test-data/resourceFinderTest/jar2/").toURL();
+        URL jar2 = new File(basedir, "src/test-data/resourceFinderTest/jar2/").toURL();
         resourceFinder.addUrl(jar2);
 
         // getResource should find the first jar only
@@ -193,8 +194,8 @@
     }
 
     public void testConcurrentAddURL() throws Exception {
-        URL jar1 = new File("src/test-data/resourceFinderTest/jar1/").toURL();
-        URL jar2 = new File("src/test-data/resourceFinderTest/jar2/").toURL();
+        URL jar1 = new File(basedir, "src/test-data/resourceFinderTest/jar1/").toURL();
+        URL jar2 = new File(basedir, "src/test-data/resourceFinderTest/jar2/").toURL();
         UrlResourceFinder resourceFinder = new UrlResourceFinder(new URL[] {jar1, jar2});
 
         Enumeration enumeration = resourceFinder.findResources("resource");
@@ -237,7 +238,7 @@
     }
 
     public void testDirectoryDestroy() throws Exception {
-        URL jar = new File("src/test-data/resourceFinderTest/jar1/").toURL();
+        URL jar = new File(basedir, "src/test-data/resourceFinderTest/jar1/").toURL();
         UrlResourceFinder resourceFinder = new UrlResourceFinder(new URL[] {jar});
         assertDestroyed(resourceFinder, "resource1", null);
     }
@@ -326,7 +327,10 @@
 
     protected void setUp() throws Exception {
         super.setUp();
-
+        
+        //
+        // Build a simple Jar file to test with
+        //
         manifest = new Manifest();
         Attributes mainAttributes = manifest.getMainAttributes();
         mainAttributes.put(Attributes.Name.MANIFEST_VERSION, "1.0");
@@ -334,9 +338,9 @@
         resourceAttributes = new Attributes();
         resourceAttributes.putValue("drink", "margarita");
         manifest.getEntries().put("resource", resourceAttributes);
-
-        jarFile = new File("target/resourceFinderTest.jar");
-        System.out.println(jarFile.getAbsolutePath());
+        
+        File targetDir = new File(basedir, "target");
+        jarFile = new File(targetDir, "resourceFinderTest.jar");
         JarOutputStream jarOutputStream = new JarOutputStream(new FileOutputStream(jarFile), manifest);
         jarOutputStream.putNextEntry(new ZipEntry("resource"));
         jarOutputStream.write("resource3".getBytes());

Modified: geronimo/branches/dain/notcm/modules/mail/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/mail/pom.xml?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/mail/pom.xml (original)
+++ geronimo/branches/dain/notcm/modules/mail/pom.xml Sat Aug  5 18:47:06 2006
@@ -17,59 +17,61 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project>
+<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.apache.geronimo.modules</groupId>
-        <artifactId>modules-parent</artifactId>
+        <artifactId>modules</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-mail</artifactId>
     <name>Geronimo :: Mail</name>
-    <description>Geronimo Mail</description>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <inherited>true</inherited>
-                <configuration>
-                    <excludes>
-                        <exclude>**/TestStore.class</exclude>
-                        <exclude>**/TestTransport.class</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 
+    <!--
+    
+    HACK: Need to explicitly configure SCM for this module since its artifactId
+          does not match the directory it lives in.
+    
+    FIXME: Rename module directory or artifactId.
+    
+    -->
+    <scm>
+        <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/trunk/modules/mail</connection>
+        <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/trunk/modules/mail</developerConnection>
+        <url>http://svn.apache.org/repos/asf/geronimo/trunk/modules/mail</url>
+    </scm>
+    
     <dependencies>
+        
+        <!-- Module Dependencies -->
+        
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-j2ee</artifactId>
             <version>${pom.version}</version>
         </dependency>
-
+        
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-kernel</artifactId>
             <version>${pom.version}</version>
         </dependency>
-
+        
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-management</artifactId>
             <version>${pom.version}</version>
         </dependency>
-
+        
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
         </dependency>
-
+        
         <dependency>
             <groupId>org.apache.geronimo.javamail</groupId>
             <artifactId>geronimo-javamail_1.3.1_provider</artifactId>
@@ -79,21 +81,25 @@
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-activation_1.0.2_spec</artifactId>
         </dependency>
-
+        
+        <!-- Thirdparty Dependencies -->
+        
         <dependency>
             <groupId>cglib</groupId>
             <artifactId>cglib-nodep</artifactId>
         </dependency>
-
+        
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
         </dependency>
-
+        
         <dependency>
             <groupId>mx4j</groupId>
             <artifactId>mx4j</artifactId>
         </dependency>
+        
     </dependencies>
+    
 </project>
 

Modified: geronimo/branches/dain/notcm/modules/management/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/management/pom.xml?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/management/pom.xml (original)
+++ geronimo/branches/dain/notcm/modules/management/pom.xml Sat Aug  5 18:47:06 2006
@@ -17,20 +17,36 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project>
+<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.apache.geronimo.modules</groupId>
-        <artifactId>modules-parent</artifactId>
+        <artifactId>modules</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-management</artifactId>
     <name>Geronimo :: Management API</name>
+    
     <description>Contains interfaces that define the management API for Geronimo</description>
-
+    
+    <!--
+    
+    HACK: Need to explicitly configure SCM for this module since its artifactId
+          does not match the directory it lives in.
+    
+    FIXME: Rename module directory or artifactId.
+    
+    -->
+    <scm>
+        <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/trunk/modules/management</connection>
+        <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/trunk/modules/management</developerConnection>
+        <url>http://svn.apache.org/repos/asf/geronimo/trunk/modules/management</url>
+    </scm>
+    
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
@@ -49,5 +65,6 @@
             <version>${pom.version}</version>
         </dependency>
     </dependencies>
+    
 </project>
 

Propchange: geronimo/branches/dain/notcm/modules/management/src/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Sat Aug  5 18:47:06 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/modules/management/src:427990

Modified: geronimo/branches/dain/notcm/modules/management/src/java/org/apache/geronimo/management/geronimo/KeystoreInstance.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/management/src/java/org/apache/geronimo/management/geronimo/KeystoreInstance.java?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/management/src/java/org/apache/geronimo/management/geronimo/KeystoreInstance.java (original)
+++ geronimo/branches/dain/notcm/modules/management/src/java/org/apache/geronimo/management/geronimo/KeystoreInstance.java Sat Aug  5 18:47:06 2006
@@ -166,4 +166,15 @@
      * @param algorithm The SSL algorithm to use for this trust manager
      */
     public TrustManager[] getTrustManager(String algorithm) throws KeyStoreException, NoSuchAlgorithmException, KeystoreIsLocked;
+    
+    public String generateCSR(String alias);
+    
+    public void importPKCS7Certificate(String alias, String certbuf)
+    throws java.security.cert.CertificateException,
+    java.security.NoSuchProviderException,
+    java.security.KeyStoreException,
+    java.security.NoSuchAlgorithmException,
+    java.security.UnrecoverableKeyException, java.io.IOException;
+    
+    public void deleteEntry(String alias);
 }

Modified: geronimo/branches/dain/notcm/modules/naming-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/naming-builder/pom.xml?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/naming-builder/pom.xml (original)
+++ geronimo/branches/dain/notcm/modules/naming-builder/pom.xml Sat Aug  5 18:47:06 2006
@@ -17,12 +17,13 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project>
+<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.apache.geronimo.modules</groupId>
-        <artifactId>modules-parent</artifactId>
+        <artifactId>modules</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -30,6 +31,20 @@
     <artifactId>geronimo-naming-builder</artifactId>
     <name>Geronimo :: Naming :: Builder</name>
     
+    <!--
+    
+    HACK: Need to explicitly configure SCM for this module since its artifactId
+          does not match the directory it lives in.
+    
+    FIXME: Rename module directory or artifactId.
+    
+    -->
+    <scm>
+        <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/trunk/modules/naming-builder</connection>
+        <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/trunk/modules/naming-builder</developerConnection>
+        <url>http://svn.apache.org/repos/asf/geronimo/trunk/modules/naming-builder</url>
+    </scm>
+    
     <dependencies>
         
         <!-- Module Dependencies -->
@@ -126,6 +141,32 @@
                 <configuration>
                     <sourceSchemas>geronimo-naming-1.1.xsd</sourceSchemas>
                 </configuration>
+            </plugin>
+            
+            <!--
+            HACK: Copy the generated XmlBeans bits for clover
+            -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <mkdir dir="${pom.basedir}/target/clover/classes"/>
+                                <copy todir="${pom.basedir}/target/clover/classes">
+                                    <fileset dir="${pom.basedir}/target/classes">
+                                        <include name="schemaorg_apache_xmlbeans/**"/>
+                                    </fileset>
+                                </copy>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
     </build>

Propchange: geronimo/branches/dain/notcm/modules/naming-builder/src/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Sat Aug  5 18:47:06 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/modules/naming-builder/src:427999

Modified: geronimo/branches/dain/notcm/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java (original)
+++ geronimo/branches/dain/notcm/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java Sat Aug  5 18:47:06 2006
@@ -22,6 +22,7 @@
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -29,18 +30,14 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.Arrays;
-
 import javax.naming.NamingException;
 import javax.naming.Reference;
 import javax.transaction.UserTransaction;
 import javax.xml.namespace.QName;
-
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.common.UnresolvedReferenceException;
 import org.apache.geronimo.gbean.AbstractNameQuery;
 import org.apache.geronimo.gbean.GBeanData;
-import org.apache.geronimo.gbean.ReferencePatterns;
 import org.apache.geronimo.j2ee.deployment.EARContext;
 import org.apache.geronimo.j2ee.deployment.Module;
 import org.apache.geronimo.j2ee.deployment.RefContext;
@@ -855,7 +852,6 @@
         return refMap;
     }
 
-    //TODO consider including target interface
     public static AbstractNameQuery buildAbstractNameQuery(GerPatternType pattern, String type, String moduleType, Set interfaceTypes) {
         String groupId = pattern.isSetGroupId() ? pattern.getGroupId().trim() : null;
         String artifactid = pattern.isSetArtifactId() ? pattern.getArtifactId().trim() : null;
@@ -871,6 +867,14 @@
         }
         if (module != null && moduleType != null) {
             nameMap.put(moduleType, module);
+        }
+        if(interfaceTypes != null) {
+            Set trimmed = new HashSet();
+            for (Iterator it = interfaceTypes.iterator(); it.hasNext();) {
+                String intf = (String) it.next();
+                trimmed.add(intf == null ? null : intf.trim());
+            }
+            interfaceTypes = trimmed;
         }
         return new AbstractNameQuery(artifact, nameMap, interfaceTypes);
     }

Modified: geronimo/branches/dain/notcm/modules/naming/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/naming/pom.xml?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/naming/pom.xml (original)
+++ geronimo/branches/dain/notcm/modules/naming/pom.xml Sat Aug  5 18:47:06 2006
@@ -17,21 +17,34 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project>
+<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.apache.geronimo.modules</groupId>
-        <artifactId>modules-parent</artifactId>
+        <artifactId>modules</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-naming</artifactId>
-    <packaging>jar</packaging>
     <name>Geronimo :: Naming</name>
-    <description>Geronimo Naming</description>
-
+    
+    <!--
+    
+    HACK: Need to explicitly configure SCM for this module since its artifactId
+          does not match the directory it lives in.
+    
+    FIXME: Rename module directory or artifactId.
+    
+    -->
+    <scm>
+        <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/trunk/modules/naming</connection>
+        <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/trunk/modules/naming</developerConnection>
+        <url>http://svn.apache.org/repos/asf/geronimo/trunk/modules/naming</url>
+    </scm>
+    
     <dependencies>
         
         <dependency>
@@ -55,6 +68,8 @@
             <groupId>mx4j</groupId>
             <artifactId>mx4j</artifactId>
         </dependency>
+        
     </dependencies>
+    
 </project>
 

Modified: geronimo/branches/dain/notcm/modules/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/pom.xml?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/pom.xml (original)
+++ geronimo/branches/dain/notcm/modules/pom.xml Sat Aug  5 18:47:06 2006
@@ -17,28 +17,27 @@
 
 <!-- $Rev$ $Date$ -->
 
-<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">
+<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.apache.geronimo</groupId>
-        <artifactId>geronimo-parent</artifactId>
+        <artifactId>geronimo</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.geronimo.modules</groupId>
-    <artifactId>modules-parent</artifactId>
+    <artifactId>modules</artifactId>
     <name>Geronimo :: Modules</name>
     <packaging>pom</packaging>
     
     <modules>
         <module>activation</module>
         <module>activemq-embedded-rar</module>
+        <module>activemq-gbean</module>
+        <module>activemq-gbean-management</module>
         <module>axis</module>
         <module>axis-builder</module>
         <module>client</module>
@@ -46,6 +45,9 @@
         <module>common</module>
         <module>connector</module>
         <module>connector-builder</module>
+        <!--
+        <module>console-web</module>
+        -->
         <module>converter</module>
         <module>core</module>
         <module>deploy-config</module>
@@ -56,7 +58,9 @@
         <module>directory</module>
         <module>hot-deploy</module>
         <module>installer-processing</module>
-        <!-- <module>installer-support</module> -->
+        <!--
+        <module>installer-support</module>
+        -->
         <module>interceptor</module>
         <module>j2ee</module>
         <module>j2ee-builder</module>
@@ -65,16 +69,14 @@
         <module>jetty-builder</module>
         <module>jmx-remoting</module>
         <module>kernel</module>
-        <module>management</module>
         <module>mail</module>
+        <module>management</module>
         <module>naming</module>
         <module>naming-builder</module>
         <module>scripts</module>
         <module>security</module>
         <module>security-builder</module>
         <module>service-builder</module>
-        <!-- <module>session</module> -->
-        <!-- <module>spring</module> -->
         <module>system</module>
         <module>test-ddbean</module>
         <module>timer</module>

Modified: geronimo/branches/dain/notcm/modules/scripts/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/scripts/pom.xml?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/scripts/pom.xml (original)
+++ geronimo/branches/dain/notcm/modules/scripts/pom.xml Sat Aug  5 18:47:06 2006
@@ -17,18 +17,39 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project>
+<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.apache.geronimo.modules</groupId>
-        <artifactId>modules-parent</artifactId>
+        <artifactId>modules</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-scripts</artifactId>
     <name>Geronimo :: Scripts</name>
-    <description>Scripts</description>
+    
+    <!--
+    
+    FIXME: This really belongs in an assembly module... not here
+    
+    -->
+    
+    <!--
+    
+    HACK: Need to explicitly configure SCM for this module since its artifactId
+          does not match the directory it lives in.
+    
+    FIXME: Rename module directory or artifactId.
+    
+    -->
+    <scm>
+        <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/trunk/modules/scripts</connection>
+        <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/trunk/modules/scripts</developerConnection>
+        <url>http://svn.apache.org/repos/asf/geronimo/trunk/modules/scripts</url>
+    </scm>
+    
 </project>
 

Modified: geronimo/branches/dain/notcm/modules/security-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/security-builder/pom.xml?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/security-builder/pom.xml (original)
+++ geronimo/branches/dain/notcm/modules/security-builder/pom.xml Sat Aug  5 18:47:06 2006
@@ -17,19 +17,33 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project>
+<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.apache.geronimo.modules</groupId>
-        <artifactId>modules-parent</artifactId>
+        <artifactId>modules</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-security-builder</artifactId>
     <name>Geronimo :: Security :: Builder</name>
-    <packaging>jar</packaging>
+    
+    <!--
+    
+    HACK: Need to explicitly configure SCM for this module since its artifactId
+          does not match the directory it lives in.
+    
+    FIXME: Rename module directory or artifactId.
+    
+    -->
+    <scm>
+        <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/trunk/modules/security-builder</connection>
+        <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/trunk/modules/security-builder</developerConnection>
+        <url>http://svn.apache.org/repos/asf/geronimo/trunk/modules/security-builder</url>
+    </scm>
     
     <dependencies>
         
@@ -53,7 +67,7 @@
             <version>${pom.version}</version>
         </dependency>
 
-        <!--needed only because security schema references j2ee 1.4 schema for description element -->
+        <!-- needed only because security schema references j2ee 1.4 schema for description element -->
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>geronimo-j2ee-schema</artifactId>
@@ -107,6 +121,32 @@
                 <configuration>
                     <sourceSchemas>geronimo-security-1.1.xsd,geronimo-login-config-1.1.xsd</sourceSchemas>
                 </configuration>
+            </plugin>
+            
+            <!--
+            HACK: Copy the generated XmlBeans bits for clover
+            -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <mkdir dir="${pom.basedir}/target/clover/classes"/>
+                                <copy todir="${pom.basedir}/target/clover/classes">
+                                    <fileset dir="${pom.basedir}/target/classes">
+                                        <include name="schemaorg_apache_xmlbeans/**"/>
+                                    </fileset>
+                                </copy>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
     </build>

Modified: geronimo/branches/dain/notcm/modules/security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/security/pom.xml?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/security/pom.xml (original)
+++ geronimo/branches/dain/notcm/modules/security/pom.xml Sat Aug  5 18:47:06 2006
@@ -17,43 +17,38 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project>
+<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.apache.geronimo.modules</groupId>
-        <artifactId>modules-parent</artifactId>
+        <artifactId>modules</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-security</artifactId>
     <name>Geronimo :: Security</name>
-    <description>Geronimo Security</description>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <systemProperties>
-                        <property>
-                            <name>log4j.configuration</name>
-                            <value>${basedir}/log4j.properties</value>
-                        </property>
-                        <property>
-                            <name>java.security.auth.login.config</name>
-                            <value>${basedir}/src/test-data/data/login.config</value>
-                        </property>
-                    </systemProperties>
-                    <forkMode>once</forkMode>
-                    <workingDirectory>${basedir}</workingDirectory>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
+    
+    <!--
+    
+    HACK: Need to explicitly configure SCM for this module since its artifactId
+          does not match the directory it lives in.
+    
+    FIXME: Rename module directory or artifactId.
+    
+    -->
+    <scm>
+        <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/trunk/modules/security</connection>
+        <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/trunk/modules/security</developerConnection>
+        <url>http://svn.apache.org/repos/asf/geronimo/trunk/modules/security</url>
+    </scm>
+    
     <dependencies>
+        
+        <!-- Module Dependencies -->
+        
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-core</artifactId>
@@ -71,7 +66,7 @@
             <artifactId>geronimo-j2ee</artifactId>
             <version>${pom.version}</version>
         </dependency>
-
+        
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-management</artifactId>
@@ -83,31 +78,64 @@
             <artifactId>geronimo-system</artifactId>
             <version>${pom.version}</version>
         </dependency>
-
+        
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
         </dependency>
-
+        
+        <!-- Thirdparty Dependencies -->
+        
         <dependency>
             <groupId>concurrent</groupId>
             <artifactId>concurrent</artifactId>
         </dependency>
-
+        
         <dependency>
             <groupId>activeio</groupId>
             <artifactId>activeio</artifactId>
         </dependency>
-
+        
         <dependency>
             <groupId>regexp</groupId>
             <artifactId>regexp</artifactId>
         </dependency>
-
+        
         <dependency>
             <groupId>hsqldb</groupId>
             <artifactId>hsqldb</artifactId>
         </dependency>
+    
     </dependencies>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <systemProperties>
+                        <property>
+                            <name>java.security.auth.login.config</name>
+                            <value>${pom.basedir}/src/test-data/data/login.config</value>
+                        </property>
+                    </systemProperties>
+                    
+                    <!-- FIXME: Some tests fail with fork=once -->
+                    <forkMode>pertest</forkMode>
+                    
+                    <excludes>
+                        <exclude>**/Abstract*.java</exclude>
+                        
+                        <!--
+                           | FIXME: This test was disabled because it is failing in non-obvious ways
+                           |        and requires someone with more insight to resolve
+                         -->
+                        <exclude>**/ConfigurationEntryTest.java</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    
 </project>
 

Propchange: geronimo/branches/dain/notcm/modules/security/src/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Sat Aug  5 18:47:06 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/modules/security/src:427990



Mime
View raw message