geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r428856 [9/12] - in /geronimo/sandbox/svkmerge/trunk: ./ applications/ applications/console/ applications/console/console-core/ applications/console/console-ear/ applications/console/console-framework/ applications/console/console-framework...
Date Fri, 04 Aug 2006 19:44:34 GMT
Modified: geronimo/sandbox/svkmerge/trunk/modules/activation/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/modules/activation/pom.xml?rev=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/modules/activation/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/modules/activation/pom.xml Fri Aug  4 12:44:18 2006
@@ -17,34 +17,72 @@
 
 <!-- $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-activation</artifactId>
     <name>Geronimo :: Activation</name>
-    <description>Geronimo Activation implements Content Handlers for use in conjuction with the Java Activation Framework.</description>
     
-    <properties>
-        <maven.test.skip>true</maven.test.skip>
-    </properties>
-
+    <description>
+        Geronimo Activation implements Content Handlers for use in
+        conjuction with the Java Activation Framework.
+    </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/sandbox/svkmerge/m2migration/modules/activation</connection>
+        <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/activation</developerConnection>
+        <url>http://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/activation</url>
+    </scm>
+    
     <dependencies>
+        
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-activation_1.0.2_spec</artifactId>
         </dependency>
-
+        
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
         </dependency>
+        
     </dependencies>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>**/Abstract*.java</exclude>
+                        
+                        <!--
+                        FIXME: This test fails on JDK 1.5, works on 1.4:
+                               
+                               https://issues.apache.org/jira/browse/GERONIMO-2209
+                        -->
+                        <exclude>**/MailcapTest.java</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    
 </project>
 

Modified: geronimo/sandbox/svkmerge/trunk/modules/activemq-embedded-rar/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/modules/activemq-embedded-rar/pom.xml?rev=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/modules/activemq-embedded-rar/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/modules/activemq-embedded-rar/pom.xml Fri Aug  4 12:44:18 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>
@@ -32,11 +33,24 @@
     <description>Resource Adapter configuration for using ActiveMQ as a bundled JMS provider.</description>
     <packaging>rar</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/sandbox/svkmerge/m2migration/modules/activemq-embedded-rar</connection>
+        <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/activemq-embedded-rar</developerConnection>
+        <url>http://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/activemq-embedded-rar</url>
+    </scm>
+    
     <build>
         <plugins>
             <plugin>
                 <artifactId>maven-rar-plugin</artifactId>
-                <version>${mavenRarPluginVersion}</version>
                 <configuration>
                     <raXmlFile>${basedir}/src/rar/META-INF/ra.xml</raXmlFile>
                     <includeJar>false</includeJar>

Modified: geronimo/sandbox/svkmerge/trunk/modules/activemq-gbean-management/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/modules/activemq-gbean-management/pom.xml?rev=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/modules/activemq-gbean-management/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/modules/activemq-gbean-management/pom.xml Fri Aug  4 12:44:18 2006
@@ -17,24 +17,38 @@
 
 <!-- $Rev: 411333 $ $Date: 2006-06-02 18:35:57 -0500 (Fri, 02 Jun 2006) $ -->
 
-<project
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns="http://maven.apache.org/POM/4.0.0">
-
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    
     <modelVersion>4.0.0</modelVersion>
-
+    
     <parent>
         <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>modules-parent</artifactId>
+        <artifactId>modules</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-activemq-gbean-management</artifactId>
-    <name>Geronimo :: ActiveMQ :: GBean Interfaces</name>
-    <description>ActiveMQ Management Interfaces used by Geronimo</description>
-
+    <name>Geronimo :: ActiveMQ GBean Management Interfaces</name>
+    
+    <description>
+        ActiveMQ Management Interfaces used by 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/sandbox/svkmerge/m2migration/modules/activemq-gbean-management</connection>
+        <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/activemq-gbean-management</developerConnection>
+        <url>http://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/activemq-gbean-management</url>
+    </scm>
+    
     <dependencies>
 
         <dependency>
@@ -42,16 +56,13 @@
             <artifactId>geronimo-management</artifactId>
             <version>${pom.version}</version>
         </dependency>
-        
-        <dependency>
-            <groupId>backport-util-concurrent</groupId>
-            <artifactId>backport-util-concurrent</artifactId>
-        </dependency>
-        
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-        </dependency>
 
     </dependencies>
+    
+    <build>
+        <!-- FIXME: Remove when the default is to use the m2 standard layout -->
+        <sourceDirectory>${pom.basedir}/src/main/java</sourceDirectory>
+        <testSourceDirectory>${pom.basedir}/src/test/java</testSourceDirectory>
+    </build>
+    
 </project>

Modified: geronimo/sandbox/svkmerge/trunk/modules/activemq-gbean/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/modules/activemq-gbean/pom.xml?rev=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/modules/activemq-gbean/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/modules/activemq-gbean/pom.xml Fri Aug  4 12:44:18 2006
@@ -17,39 +17,41 @@
 
 <!-- $Rev: 411333 $ $Date: 2006-06-02 18:35:57 -0500 (Fri, 02 Jun 2006) $ -->
 
-<project
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns="http://maven.apache.org/POM/4.0.0">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>modules-parent</artifactId>
+        <artifactId>modules</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-activemq-gbean</artifactId>
-    <name>ActiveMQ :: GBeans</name>
-    <description>Geronimo ActiveMQ Integration</description>
-
+    <name>Geronimo :: ActiveMQ GBeans</name>
+    
+    <description>
+        Geronimo ActiveMQ Integration
+    </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/sandbox/svkmerge/m2migration/modules/activemq-gbean</connection>
+        <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/activemq-gbean</developerConnection>
+        <url>http://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/activemq-gbean</url>
+    </scm>
+    
     <dependencies>
 
         <dependency>
-            <groupId>incubator-activemq</groupId>
-            <artifactId>activemq-core</artifactId>
-            <version>4.0-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>incubator-activemq</groupId>
-            <artifactId>activeio-core</artifactId>
-            <version>3.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-activemq-gbean-management</artifactId>
             <version>${pom.version}</version>
@@ -78,17 +80,41 @@
             <artifactId>geronimo-j2ee</artifactId>
             <version>${pom.version}</version>
         </dependency>
-
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-connector</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>incubator-activemq</groupId>
+            <artifactId>activemq-core</artifactId>
+            <version>4.0.1</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>incubator-activemq</groupId>
+            <artifactId>activeio-core</artifactId>
+            <version>3.0-beta3</version>
+        </dependency>
+        
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
         </dependency>
-
+        
         <dependency>
             <groupId>mx4j</groupId>
             <artifactId>mx4j</artifactId>
         </dependency>
-
+        
     </dependencies>
-
+    
+    <build>
+        <!-- FIXME: Remove when the default is to use the m2 standard layout -->
+        <sourceDirectory>${pom.basedir}/src/main/java</sourceDirectory>
+        <testSourceDirectory>${pom.basedir}/src/test/java</testSourceDirectory>
+    </build>
+    
 </project>

Modified: geronimo/sandbox/svkmerge/trunk/modules/axis-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/modules/axis-builder/pom.xml?rev=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/modules/axis-builder/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/modules/axis-builder/pom.xml Fri Aug  4 12:44:18 2006
@@ -14,13 +14,16 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
+
 <!-- $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>
@@ -28,6 +31,20 @@
     <artifactId>geronimo-axis-builder</artifactId>
     <name>Geronimo :: Axis :: 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/sandbox/svkmerge/m2migration/modules/axis-builder</connection>
+        <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/axis-builder</developerConnection>
+        <url>http://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/axis-builder</url>
+    </scm>
+    
     <dependencies>
         
         <!-- Module Dependencies -->
@@ -116,6 +133,15 @@
     
     <build>
         <resources>
+            <resource>
+                <directory>${pom.basedir}</directory>
+                <targetPath>META-INF</targetPath>
+                <includes>
+                    <include>LICENSE.txt</include>
+                    <include>NOTICE.txt</include>
+                </includes>
+            </resource>
+            
             <!-- This schema is NOT compiled to xmlobjects.  Do not remove!  Used by SchemaInfoBuilder -->
             <resource>
                 <directory>src/schema</directory>
@@ -128,23 +154,37 @@
 
         <plugins>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <systemProperties>
-                    <!--<geronimo.run.external.webservicetest>true</geronimo.run.external.webservicetest> -->
-                    </systemProperties>
-
-                    <forkMode>once</forkMode>
-                </configuration>
-            </plugin>
-
-            <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>xmlbeans-maven-plugin</artifactId>
                 <configuration>
                     <sourceSchemas>wsdl.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/sandbox/svkmerge/trunk/modules/axis-builder/src/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Fri Aug  4 12:44:18 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/modules/axis-builder/src:423551

Propchange: geronimo/sandbox/svkmerge/trunk/modules/axis-builder/src/java/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Fri Aug  4 12:44:18 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/modules/axis-builder/src/java:423551

Modified: geronimo/sandbox/svkmerge/trunk/modules/axis/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/modules/axis/pom.xml?rev=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/modules/axis/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/modules/axis/pom.xml Fri Aug  4 12:44:18 2006
@@ -17,16 +17,13 @@
 
 <!-- $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.modules</groupId>
-        <artifactId>modules-parent</artifactId>
+        <artifactId>modules</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -36,6 +33,20 @@
     <name>Geronimo :: Axis</name>
     <description>Geronimo Axis Integration</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/sandbox/svkmerge/m2migration/modules/axis</connection>
+        <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/axis</developerConnection>
+        <url>http://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/axis</url>
+    </scm>
+    
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
@@ -115,6 +126,15 @@
     
     <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>

Modified: geronimo/sandbox/svkmerge/trunk/modules/client-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/modules/client-builder/pom.xml?rev=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/modules/client-builder/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/modules/client-builder/pom.xml Fri Aug  4 12:44:18 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-client-builder</artifactId>
     <name>Geronimo :: Client 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/sandbox/svkmerge/m2migration/modules/client-builder</connection>
+        <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/client-builder</developerConnection>
+        <url>http://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/client-builder</url>
+    </scm>
+    
     <dependencies>
         
         <!-- Module Dependencies -->
@@ -59,6 +74,15 @@
     <build>
         <resources>
             <resource>
+                <directory>${pom.basedir}</directory>
+                <targetPath>META-INF</targetPath>
+                <includes>
+                    <include>LICENSE.txt</include>
+                    <include>NOTICE.txt</include>
+                </includes>
+            </resource>
+            
+            <resource>
                 <directory>${pom.basedir}/src/resources2</directory>
             </resource>
         </resources>
@@ -70,6 +94,32 @@
                 <configuration>
                     <sourceSchemas>geronimo-application-client-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/sandbox/svkmerge/trunk/modules/client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/modules/client/pom.xml?rev=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/modules/client/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/modules/client/pom.xml Fri Aug  4 12:44:18 2006
@@ -17,23 +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-client</artifactId>
-    <packaging>jar</packaging>
     <name>Geronimo :: Client</name>
-
-    <!-- ============ -->
-    <!-- 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/sandbox/svkmerge/m2migration/modules/client</connection>
+        <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/client</developerConnection>
+        <url>http://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/client</url>
+    </scm>
     
     <dependencies>
     

Modified: geronimo/sandbox/svkmerge/trunk/modules/common/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/modules/common/pom.xml?rev=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/modules/common/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/modules/common/pom.xml Fri Aug  4 12:44:18 2006
@@ -17,20 +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-common</artifactId>
     <name>Geronimo :: Common</name>
-    <description>Geronimo Common</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/sandbox/svkmerge/m2migration/modules/common</connection>
+        <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/common</developerConnection>
+        <url>http://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/common</url>
+    </scm>
+    
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
@@ -38,5 +52,6 @@
             <version>${pom.version}</version>
         </dependency>
     </dependencies>
+    
 </project>
 

Propchange: geronimo/sandbox/svkmerge/trunk/modules/common/src/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Fri Aug  4 12:44:18 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/modules/common/src:427996

Propchange: geronimo/sandbox/svkmerge/trunk/modules/connector-builder/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Fri Aug  4 12:44:18 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/modules/connector-builder:421368

Modified: geronimo/sandbox/svkmerge/trunk/modules/connector-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/modules/connector-builder/pom.xml?rev=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/modules/connector-builder/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/modules/connector-builder/pom.xml Fri Aug  4 12:44:18 2006
@@ -17,23 +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-connector-builder</artifactId>
     <name>Geronimo :: Connector :: Builder</name>
-
-    <properties>
-        <!-- FIXME: Should never need to default to skip!!! -->
-        <maven.test.skip>true</maven.test.skip>
-    </properties>
+    
+    <!--
+    
+    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/sandbox/svkmerge/m2migration/modules/connector-builder</connection>
+        <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/connector-builder</developerConnection>
+        <url>http://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/connector-builder</url>
+    </scm>
     
     <dependencies>
         
@@ -89,9 +99,17 @@
     </dependencies>
     
     <build>
-        <!-- move this to parent pom -->
         <resources>
             <resource>
+                <directory>${pom.basedir}</directory>
+                <targetPath>META-INF</targetPath>
+                <includes>
+                    <include>LICENSE.txt</include>
+                    <include>NOTICE.txt</include>
+                </includes>
+            </resource>
+            
+            <resource>
                 <directory>${pom.basedir}/src/schema</directory>
                 <targetPath>META-INF</targetPath>
                 <includes>
@@ -102,6 +120,15 @@
 
         <plugins>
             <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>xmlbeans-maven-plugin</artifactId>
+                <configuration>
+                    <sourceSchemas>geronimo-connector-1.1.xsd</sourceSchemas>
+                </configuration>
+            </plugin>
+            
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>
                 <executions>
                     <execution>
@@ -116,25 +143,49 @@
                             <goal>run</goal>
                         </goals>
                     </execution>
+                    
+                    <!--
+                    HACK: Copy the generated XmlBeans bits for clover
+                    -->
+                    <execution>
+                        <id>generate-resources</id>
+                        <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>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>xmlbeans-maven-plugin</artifactId>
-                <configuration>
-                    <sourceSchemas>geronimo-connector-1.1.xsd</sourceSchemas>
-                </configuration>
-            </plugin>
-
+            
             <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>
-                        <user.dir>${basedir}</user.dir>
+                        <property>
+                            <name>java.security.auth.login.config</name>
+                            <value>${basedir}/src/test-data/data/login.config</value>
+                        </property>
                     </systemProperties>
-                    <forkMode>once</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>**/Connector15DCBTest.java</exclude>
+                    </excludes>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/sandbox/svkmerge/trunk/modules/connector/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/modules/connector/pom.xml?rev=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/modules/connector/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/modules/connector/pom.xml Fri Aug  4 12:44:18 2006
@@ -17,25 +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-connector</artifactId>
     <name>Geronimo :: Connector</name>
-    <description>Geronimo Connector</description>
-
-    <properties>
-        <maven.test.skip>true</maven.test.skip>
-    </properties>
 
+    <!--
+    
+    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/sandbox/svkmerge/m2migration/modules/connector</connection>
+        <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/connector</developerConnection>
+        <url>http://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/connector</url>
+    </scm>
+    
     <dependencies>
+        
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-naming</artifactId>
@@ -119,6 +130,8 @@
             <groupId>regexp</groupId>
             <artifactId>regexp</artifactId>
         </dependency>
+        
     </dependencies>
+    
 </project>
 

Propchange: geronimo/sandbox/svkmerge/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Fri Aug  4 12:44:18 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound:421368

Propchange: geronimo/sandbox/svkmerge/trunk/modules/console-web/src/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Fri Aug  4 12:44:18 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/modules/console-web/src:424119

Modified: geronimo/sandbox/svkmerge/trunk/modules/converter/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/modules/converter/pom.xml?rev=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/modules/converter/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/modules/converter/pom.xml Fri Aug  4 12:44:18 2006
@@ -17,19 +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-converter</artifactId>
     <name>Geronimo :: Configuration Converter</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/sandbox/svkmerge/m2migration/modules/converter</connection>
+        <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/converter</developerConnection>
+        <url>http://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/converter</url>
+    </scm>
+    
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>

Modified: geronimo/sandbox/svkmerge/trunk/modules/core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/modules/core/pom.xml?rev=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/modules/core/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/modules/core/pom.xml Fri Aug  4 12:44:18 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-core</artifactId>
-    <packaging>jar</packaging>
     <name>Geronimo :: Core</name>
-    <description>Geronimo Core J2EE Utilities</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/sandbox/svkmerge/m2migration/modules/core</connection>
+        <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/core</developerConnection>
+        <url>http://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/core</url>
+    </scm>
+    
     <dependencies>
         <dependency>
             <groupId>commons-logging</groupId>

Modified: geronimo/sandbox/svkmerge/trunk/modules/deploy-config/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/modules/deploy-config/pom.xml?rev=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/modules/deploy-config/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/modules/deploy-config/pom.xml Fri Aug  4 12:44:18 2006
@@ -17,24 +17,40 @@
 
 <!-- $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-deploy-config</artifactId>
-    <packaging>jar</packaging>
     <name>Geronimo :: Deploy :: Common Config</name>
-    <description>The deployment module contains basic infrastructure and base classes for module builders / deployers. This module contains infrastructure and base classes for JSR-88 DConfigBeans.</description>
-
-    <!-- ============ -->
-    <!-- Dependencies -->
-    <!-- ============ -->
+    <packaging>jar</packaging>
+    
+    <description>
+        The deployment module contains basic infrastructure and base classes for 
+        module builders / deployers. This module contains infrastructure and base 
+        classes for JSR-88 DConfigBeans.
+    </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/sandbox/svkmerge/m2migration/modules/deploy-config</connection>
+        <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/deploy-config</developerConnection>
+        <url>http://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/deploy-config</url>
+    </scm>
     
     <dependencies>
         <dependency>
@@ -52,5 +68,6 @@
             <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
         </dependency>
     </dependencies>
+    
 </project>
 

Modified: geronimo/sandbox/svkmerge/trunk/modules/deploy-jsr88/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/modules/deploy-jsr88/pom.xml?rev=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/modules/deploy-jsr88/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/modules/deploy-jsr88/pom.xml Fri Aug  4 12:44:18 2006
@@ -17,23 +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-deploy-jsr88</artifactId>
-    <packaging>jar</packaging>
     <name>Geronimo :: Deploy :: JSR-88</name>
-
-    <!-- ============ -->
-    <!-- Dependencies -->
-    <!-- ============ -->
+    <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/sandbox/svkmerge/m2migration/modules/deploy-jsr88</connection>
+        <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/deploy-jsr88</developerConnection>
+        <url>http://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/deploy-jsr88</url>
+    </scm>
     
     <dependencies>
         <dependency>
@@ -106,5 +117,6 @@
             <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
         </dependency>
     </dependencies>
+    
 </project>
 

Propchange: geronimo/sandbox/svkmerge/trunk/modules/deploy-jsr88/src/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Fri Aug  4 12:44:18 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/modules/deploy-jsr88/src:428849

Modified: geronimo/sandbox/svkmerge/trunk/modules/deploy-tool/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/modules/deploy-tool/pom.xml?rev=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/modules/deploy-tool/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/modules/deploy-tool/pom.xml Fri Aug  4 12:44:18 2006
@@ -17,19 +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-deploy-tool</artifactId>
     <name>Geronimo :: Deploy :: CLI Tool</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/sandbox/svkmerge/m2migration/modules/deploy-tool</connection>
+        <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/deploy-tool</developerConnection>
+        <url>http://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/deploy-tool</url>
+    </scm>
+    
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
@@ -66,5 +81,6 @@
             <version>${pom.version}</version>
         </dependency>
     </dependencies>
+    
 </project>
 

Propchange: geronimo/sandbox/svkmerge/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Fri Aug  4 12:44:18 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli:423294

Modified: geronimo/sandbox/svkmerge/trunk/modules/deployment/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/modules/deployment/pom.xml?rev=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/modules/deployment/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/modules/deployment/pom.xml Fri Aug  4 12:44:18 2006
@@ -17,24 +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-deployment</artifactId>
-    <packaging>jar</packaging>
     <name>Geronimo :: Deployment</name>
-    <description>Geronimo Deployment</description>
-
-    <!-- ============ -->
-    <!-- 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/sandbox/svkmerge/m2migration/modules/deployment</connection>
+        <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/deployment</developerConnection>
+        <url>http://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/deployment</url>
+    </scm>
     
     <dependencies>
         <dependency>
@@ -65,5 +74,6 @@
             <artifactId>xml-resolver</artifactId>
         </dependency>
     </dependencies>
+    
 </project>
 

Propchange: geronimo/sandbox/svkmerge/trunk/modules/deployment/src/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Fri Aug  4 12:44:18 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/modules/deployment/src:427986

Modified: geronimo/sandbox/svkmerge/trunk/modules/deployment/src/test/org/apache/geronimo/deployment/SingleFileHotDeployerTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/modules/deployment/src/test/org/apache/geronimo/deployment/SingleFileHotDeployerTest.java?rev=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/modules/deployment/src/test/org/apache/geronimo/deployment/SingleFileHotDeployerTest.java (original)
+++ geronimo/sandbox/svkmerge/trunk/modules/deployment/src/test/org/apache/geronimo/deployment/SingleFileHotDeployerTest.java Fri Aug  4 12:44:18 2006
@@ -63,7 +63,9 @@
     private final Artifact NEW_ID = new Artifact("new", "new", "new", "new");
     private final Artifact OLD_VERSION_ID = new Artifact("new", "new", "old", "new");
     private final Artifact DIFFERENT_ID = new Artifact("different", "different", "different", "different");
-
+    
+    private File basedir = new File(System.getProperty("basedir"));
+    
     private File dir;
     private String[] watchPaths;
     private MockConfigurationBuilder builder;
@@ -86,7 +88,7 @@
     protected void setUp() throws Exception {
         super.setUp();
 
-        dir = new File("target/deployTest");
+        dir = new File(basedir, "target/deployTest");
         dir.mkdirs();
 
         File someFile = new File(dir, "someFile");

Modified: geronimo/sandbox/svkmerge/trunk/modules/derby/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/modules/derby/pom.xml?rev=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/modules/derby/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/modules/derby/pom.xml Fri Aug  4 12:44:18 2006
@@ -17,25 +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-derby</artifactId>
     <name>Geronimo :: Derby</name>
+    
     <description>Wrapper for using Apache Derby as a bundled database.</description>
     
-    <properties>
-        <maven.test.skip>true</maven.test.skip>
-    </properties>
-
+    <!--
+    
+    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/sandbox/svkmerge/m2migration/modules/derby</connection>
+        <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/derby</developerConnection>
+        <url>http://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/derby</url>
+    </scm>
+    
     <dependencies>
+        
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-system</artifactId>
@@ -57,6 +70,8 @@
             <groupId>org.apache.derby</groupId>
             <artifactId>derbynet</artifactId>
         </dependency>
+        
     </dependencies>
+
 </project>
 

Modified: geronimo/sandbox/svkmerge/trunk/modules/directory/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/modules/directory/pom.xml?rev=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/modules/directory/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/modules/directory/pom.xml Fri Aug  4 12:44:18 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-directory</artifactId>
     <name>Geronimo :: Directory</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/sandbox/svkmerge/m2migration/modules/directory</connection>
+        <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/directory</developerConnection>
+        <url>http://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/directory</url>
+    </scm>
+    
     <dependencies>
         
         <!-- Module Dependencies -->
@@ -169,6 +184,15 @@
     <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>
@@ -183,12 +207,34 @@
                     <defaultXmlConfigDir>${pom.basedir}/src/schema/xmlconfig.xml</defaultXmlConfigDir>
                 </configuration>
             </plugin>
-
+            
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>
                 <executions>
+                    <!--
+                    HACK: Copy the generated XmlBeans bits for clover
+                    -->
+                    <execution>
+                        <id>copy-xmlbeans-for-clover</id>
+                        <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>
+                    
                     <execution>
+                        <id>setup-test-var-directory</id>
                         <phase>process-test-resources</phase>
                         <goals>
                             <goal>run</goal>

Modified: geronimo/sandbox/svkmerge/trunk/modules/hot-deploy/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/modules/hot-deploy/pom.xml?rev=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/modules/hot-deploy/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/modules/hot-deploy/pom.xml Fri Aug  4 12:44:18 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-hot-deploy</artifactId>
     <name>Geronimo :: Deploy :: Hot Deployer</name>
+    
     <description>A GBean that implements a Hot Deploy directory</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/sandbox/svkmerge/m2migration/modules/hot-deploy</connection>
+        <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/hot-deploy</developerConnection>
+        <url>http://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/hot-deploy</url>
+    </scm>
+    
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
@@ -88,5 +104,6 @@
         </dependency>
 
     </dependencies>
+    
 </project>
 

Modified: geronimo/sandbox/svkmerge/trunk/modules/installer-processing/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/modules/installer-processing/pom.xml?rev=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/modules/installer-processing/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/modules/installer-processing/pom.xml Fri Aug  4 12:44:18 2006
@@ -17,19 +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-installer-processing</artifactId>
     <name>Geronimo :: Installer :: Processing</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/sandbox/svkmerge/m2migration/modules/installer-processing</connection>
+        <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/installer-processing</developerConnection>
+        <url>http://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/installer-processing</url>
+    </scm>
+    
     <dependencies>
         <dependency>
             <groupId>xerces</groupId>
@@ -37,5 +52,6 @@
             <version>2.4.0</version>
         </dependency>
     </dependencies>
+    
 </project>
 

Modified: geronimo/sandbox/svkmerge/trunk/modules/installer-support/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/modules/installer-support/pom.xml?rev=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/modules/installer-support/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/modules/installer-support/pom.xml Fri Aug  4 12:44:18 2006
@@ -17,19 +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-installer-support</artifactId>
     <name>Geronimo :: Installer :: Support</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/sandbox/svkmerge/m2migration/modules/installer-support</connection>
+        <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/installer-support</developerConnection>
+        <url>http://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/installer-support</url>
+    </scm>
+    
     <properties>
         <izpack_version>3.8.0</izpack_version>
     </properties>
@@ -58,10 +73,10 @@
                         <configuration>
                             <tasks>
                                 <ant antfile="setup.xml">
-                                    <property name="izpack_version" value="${izpack_version}" />
-                                    <property name="maven.src.dir" value="${basedir}/src" />
-                                    <property name="maven.build.dir" value="${project.build.directory}" />
-                                    <property name="maven.repo.local" value="${settings.localRepository}" />
+                                    <property name="izpack_version" value="${izpack_version}"/>
+                                    <property name="maven.src.dir" value="${basedir}/src"/>
+                                    <property name="maven.build.dir" value="${project.build.directory}"/>
+                                    <property name="maven.repo.local" value="${settings.localRepository}"/>
                                 </ant>
                             </tasks>
                         </configuration>

Modified: geronimo/sandbox/svkmerge/trunk/modules/interceptor/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/modules/interceptor/pom.xml?rev=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/modules/interceptor/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/modules/interceptor/pom.xml Fri Aug  4 12:44:18 2006
@@ -17,12 +17,13 @@
 
 <!-- $Rev: 411333 $ $Date: 2006-06-02 16:35:57 -0700 (Fri, 02 Jun 2006) $ -->
 
-<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,7 +32,22 @@
     <name>Geronimo :: Interceptor</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/sandbox/svkmerge/m2migration/modules/interceptor</connection>
+        <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/interceptor</developerConnection>
+        <url>http://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/interceptor</url>
+    </scm>
+    
     <build>
+        <!-- FIXME: Remove when the default is to use the m2 standard layout -->
         <sourceDirectory>${pom.basedir}/src/main/java</sourceDirectory>
         <testSourceDirectory>${pom.basedir}/src/test/java</testSourceDirectory>
     </build>

Modified: geronimo/sandbox/svkmerge/trunk/modules/j2ee-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/modules/j2ee-builder/pom.xml?rev=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/modules/j2ee-builder/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/modules/j2ee-builder/pom.xml Fri Aug  4 12:44:18 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-j2ee-builder</artifactId>
     <name>Geronimo :: J2EE :: 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/sandbox/svkmerge/m2migration/modules/j2ee-builder</connection>
+        <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/j2ee-builder</developerConnection>
+        <url>http://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/j2ee-builder</url>
+    </scm>
+    
     <dependencies>
         
         <!-- Module Dependencies -->
@@ -59,26 +74,51 @@
             <plugin>
                 <artifactId>maven-antrun-plugin</artifactId>
                 <executions>
+                    <!--
+                    HACK: Copy the generated XmlBeans bits for clover
+                    -->
+                    <execution>
+                        <id>generate-resources</id>
+                        <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>
+                    
+                    <!--
+                    FIXME: WTF is this for?  Document or remove
+                    -->
                     <execution>
                         <id>process-test-resources</id>
                         <phase>process-test-resources</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
                         <configuration>
                             <tasks>
-                                <echo message="classpath=${project.compileClasspathElements}" file="classpath.properties" />
+                                <echo message="classpath=${project.compileClasspathElements}"
+                                      file="classpath.properties"/>
                                 <ant antfile="${basedir}/src/test/test-setup.xml">
-                                    <property name="maven.compile.source" value="1.4" />
-                                    <property name="maven.compile.target" value="1.4" />
+                                    <property name="maven.compile.source" value="1.4"/>
+                                    <property name="maven.compile.target" value="1.4"/>
                                 </ant>
-                                <delete file="classpath.properties" failonerror="false" />
+                                <delete file="classpath.properties" failonerror="false"/>
                             </tasks>
                         </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
                     </execution>
                 </executions>
             </plugin>
-
+            
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>xmlbeans-maven-plugin</artifactId>

Modified: geronimo/sandbox/svkmerge/trunk/modules/j2ee-schema/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/modules/j2ee-schema/pom.xml?rev=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/modules/j2ee-schema/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/modules/j2ee-schema/pom.xml Fri Aug  4 12:44:18 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/sandbox/svkmerge/m2migration/modules/j2ee-schema</connection>
+        <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/j2ee-schema</developerConnection>
+        <url>http://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/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>

Propchange: geronimo/sandbox/svkmerge/trunk/modules/j2ee-schema/src/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Fri Aug  4 12:44:18 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/modules/j2ee-schema/src:424119

Modified: geronimo/sandbox/svkmerge/trunk/modules/j2ee-schema/src/test/org/apache/geronimo/schema/SchemaConversionUtilsTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/modules/j2ee-schema/src/test/org/apache/geronimo/schema/SchemaConversionUtilsTest.java?rev=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/modules/j2ee-schema/src/test/org/apache/geronimo/schema/SchemaConversionUtilsTest.java (original)
+++ geronimo/sandbox/svkmerge/trunk/modules/j2ee-schema/src/test/org/apache/geronimo/schema/SchemaConversionUtilsTest.java Fri Aug  4 12:44:18 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);



Mime
View raw message