geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r428856 [11/12] - in /geronimo/sandbox/svkmerge/trunk: ./ applications/ applications/console/ applications/console/console-core/ applications/console/console-ear/ applications/console/console-framework/ applications/console/console-framewor...
Date Fri, 04 Aug 2006 19:44:34 GMT
Modified: geronimo/sandbox/svkmerge/trunk/modules/system/src/test/org/apache/geronimo/system/plugin/PluginInstallerTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/modules/system/src/test/org/apache/geronimo/system/plugin/PluginInstallerTest.java?rev=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/modules/system/src/test/org/apache/geronimo/system/plugin/PluginInstallerTest.java (original)
+++ geronimo/sandbox/svkmerge/trunk/modules/system/src/test/org/apache/geronimo/system/plugin/PluginInstallerTest.java Fri Aug  4 12:44:18 2006
@@ -75,6 +75,8 @@
 
     public void testParsing() throws Exception {
         PluginList list = installer.listPlugins(testRepo, null, null);
+        assertNotNull(list);
+        
         assertEquals(1, list.getRepositories().length);
         assertEquals(fakeRepo, list.getRepositories()[0]);
         assertTrue(list.getPlugins().length > 0);

Modified: geronimo/sandbox/svkmerge/trunk/modules/system/src/test/org/apache/geronimo/system/repository/AbstractRepositoryTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/modules/system/src/test/org/apache/geronimo/system/repository/AbstractRepositoryTest.java?rev=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/modules/system/src/test/org/apache/geronimo/system/repository/AbstractRepositoryTest.java (original)
+++ geronimo/sandbox/svkmerge/trunk/modules/system/src/test/org/apache/geronimo/system/repository/AbstractRepositoryTest.java Fri Aug  4 12:44:18 2006
@@ -26,10 +26,15 @@
 import org.apache.geronimo.kernel.repository.ListableRepository;
 import org.apache.geronimo.kernel.repository.Version;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
 /**
  * @version $Rev$ $Date$
  */
 public class AbstractRepositoryTest extends TestCase {
+    private static final Log log = LogFactory.getLog(AbstractRepositoryTest.class);
+    
     protected ListableRepository repository;
     protected File rootRepoDir;
 
@@ -78,7 +83,7 @@
 
     public void testListAll() {
         SortedSet artifacts = repository.list();
-        System.out.println("Matched artifacts: "+artifacts);
+        log.debug("Matched artifacts: "+artifacts);
 
         assertTrue(artifacts.contains(new Artifact("org.foo", "test", "2.0.1", "properties")));
         assertFalse(artifacts.contains(new Artifact("Unknown", "artifact", "2.0.1", "properties")));

Modified: geronimo/sandbox/svkmerge/trunk/modules/system/src/test/org/apache/geronimo/system/repository/Maven1RepositoryTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/modules/system/src/test/org/apache/geronimo/system/repository/Maven1RepositoryTest.java?rev=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/modules/system/src/test/org/apache/geronimo/system/repository/Maven1RepositoryTest.java (original)
+++ geronimo/sandbox/svkmerge/trunk/modules/system/src/test/org/apache/geronimo/system/repository/Maven1RepositoryTest.java Fri Aug  4 12:44:18 2006
@@ -22,8 +22,10 @@
  * @version $Rev$ $Date$
  */
 public class Maven1RepositoryTest extends AbstractRepositoryTest {
+    private File basedir = new File(System.getProperty("basedir"));
+    
     protected void setUp() throws Exception {
-        rootRepoDir = new File("target/m1");
+        rootRepoDir = new File(basedir, "target/m1");
         repository = new Maven1Repository(rootRepoDir);
         super.setUp();
     }

Modified: geronimo/sandbox/svkmerge/trunk/modules/system/src/test/org/apache/geronimo/system/repository/Maven2RepositoryTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/modules/system/src/test/org/apache/geronimo/system/repository/Maven2RepositoryTest.java?rev=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/modules/system/src/test/org/apache/geronimo/system/repository/Maven2RepositoryTest.java (original)
+++ geronimo/sandbox/svkmerge/trunk/modules/system/src/test/org/apache/geronimo/system/repository/Maven2RepositoryTest.java Fri Aug  4 12:44:18 2006
@@ -22,8 +22,10 @@
  * @version $Rev$ $Date$
  */
 public class Maven2RepositoryTest extends AbstractRepositoryTest {
+    private File basedir = new File(System.getProperty("basedir"));
+    
     protected void setUp() throws Exception {
-        rootRepoDir = new File("target/m2");
+        rootRepoDir = new File(basedir, "target/m2");
         repository = new Maven2Repository(rootRepoDir);
         super.setUp();
     }

Modified: geronimo/sandbox/svkmerge/trunk/modules/system/src/test/org/apache/geronimo/system/rmi/RMIClassLoaderSpiImplTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/modules/system/src/test/org/apache/geronimo/system/rmi/RMIClassLoaderSpiImplTest.java?rev=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/modules/system/src/test/org/apache/geronimo/system/rmi/RMIClassLoaderSpiImplTest.java (original)
+++ geronimo/sandbox/svkmerge/trunk/modules/system/src/test/org/apache/geronimo/system/rmi/RMIClassLoaderSpiImplTest.java Fri Aug  4 12:44:18 2006
@@ -27,13 +27,17 @@
 
 import junit.framework.TestCase;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
 /**
  * Unit tests for {@link RMIClassLoaderSpiImpl} class.
  *
  * @version $Rev$ $Date$
  */
-public class RMIClassLoaderSpiImplTest
-        extends TestCase {
+public class RMIClassLoaderSpiImplTest extends TestCase {
+    private static final Log log = LogFactory.getLog(RMIClassLoaderSpiImplTest.class);
+    
     private String baseURL;
     private String normalizedBaseURL;
 
@@ -50,8 +54,8 @@
             normalizedBaseURL = normalizedBaseURL.substring(0, normalizedBaseURL.length() - 1);
         }
 
-        System.out.println("Using base URL: " + baseURL);
-        System.out.println("Using normalized base URL: " + normalizedBaseURL);
+        log.debug("Using base URL: " + baseURL);
+        log.debug("Using normalized base URL: " + normalizedBaseURL);
     }
 
     public void testNormalizeURL() throws MalformedURLException {

Modified: geronimo/sandbox/svkmerge/trunk/modules/test-ddbean/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/modules/test-ddbean/pom.xml?rev=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/modules/test-ddbean/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/modules/test-ddbean/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-test-ddbean</artifactId>
     <name>Geronimo :: Test :: DDBeans</name>
-    <description>Geronimo Test DDBeans</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/test-ddbean</connection>
+        <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/test-ddbean</developerConnection>
+        <url>http://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/test-ddbean</url>
+    </scm>
+    
     <dependencies>
         <dependency>
             <groupId>xmlbeans</groupId>
@@ -59,5 +73,6 @@
             <version>${pom.version}</version>
         </dependency>
     </dependencies>
+    
 </project>
 

Modified: geronimo/sandbox/svkmerge/trunk/modules/timer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/modules/timer/pom.xml?rev=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/modules/timer/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/modules/timer/pom.xml Fri Aug  4 12:44:18 2006
@@ -17,20 +17,44 @@
 
 <!-- $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-timer</artifactId>
     <name>Geronimo :: Timer</name>
-    <description>Geronimo Timer</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/timer</connection>
+        <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/timer</developerConnection>
+        <url>http://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/timer</url>
+    </scm>
+    
+    <properties>
+        <!--
+        FIXME: Disable the timer tests for now since they can fail if the host environment
+               does not have enough free CPU cycles to trigger enough timer invocations.
+               
+               https://issues.apache.org/jira/browse/GERONIMO-2183
+        -->
+        <maven.test.skip>true</maven.test.skip>
+    </properties>
+    
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
@@ -105,5 +129,6 @@
             <artifactId>commons-logging</artifactId>
         </dependency>
     </dependencies>
+    
 </project>
 

Modified: geronimo/sandbox/svkmerge/trunk/modules/tomcat-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/modules/tomcat-builder/pom.xml?rev=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/modules/tomcat-builder/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/modules/tomcat-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,11 +31,19 @@
     <artifactId>geronimo-tomcat-builder</artifactId>
     <name>Geronimo :: Tomcat :: Builder</name>
     
-    <properties>
-        <buildDir>${project.build.directory}</buildDir>
-        <endorsedDir>${buildDir}/endorsed</endorsedDir>
-        <localRepoDir>${settings.localRepository}</localRepoDir>
-    </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/tomcat-builder</connection>
+        <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/tomcat-builder</developerConnection>
+        <url>http://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/tomcat-builder</url>
+    </scm>
     
     <dependencies>
         
@@ -130,9 +139,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>src/schema</directory>
                 <targetPath>META-INF</targetPath>
                 <includes>
@@ -147,11 +164,15 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
                     <systemProperties>
-                        <java.endorsed.dirs>${endorsedDir}</java.endorsed.dirs>
-                        <java.security.auth.login.config>src/test-resources/data/login.config</java.security.auth.login.config>
-                        <user.dir>${basedir}</user.dir>
+                        <property>
+                            <name>java.endorsed.dirs</name>
+                            <value>${project.build.directory}/endorsed</value>
+                        </property>
+                        <property>
+                            <name>java.security.auth.login.config</name>
+                            <value>src/test-resources/data/login.config</value>
+                        </property>
                     </systemProperties>
-                    <forkMode>once</forkMode>
                 </configuration>
             </plugin>
 
@@ -162,30 +183,53 @@
                     <sourceSchemas>geronimo-tomcat-1.1.xsd,geronimo-tomcat-config-1.0.xsd</sourceSchemas>
                 </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-environment</id>
                         <phase>process-test-resources</phase>
                         <goals>
                             <goal>run</goal>
                         </goals>
                         <configuration>
                             <tasks>
-                                <copy todir="${buildDir}/var/catalina/conf" file="src/var/web.xml" />
-                                <copy todir="${buildDir}/var/catalina/webapps">
+                                <copy todir="${project.build.directory}/var/catalina/conf" file="src/var/web.xml"/>
+                                <copy todir="${project.build.directory}/var/catalina/webapps">
                                     <fileset dir="src/test-resources/deployables">
-                                        <include name="war1/**" />
-                                        <include name="war3/**" />
-                                        <include name="war4/**" />
+                                        <include name="war1/**"/>
+                                        <include name="war3/**"/>
+                                        <include name="war4/**"/>
                                     </fileset>
                                 </copy>
-                                <copy todir="${endorsedDir}" flatten="true">
-                                    <fileset dir="${localRepoDir}">
-                                        <include name="xerces/xercesImpl/${xercesVersion}/*.jar" />
-                                        <include name="xml-apis/xml-apis/${xmlApisVersion}/*.jar" />
+                                <copy todir="${project.build.directory}/endorsed" flatten="true">
+                                    <fileset dir="${settings.localRepository}">
+                                        <include name="xerces/xercesImpl/${xercesVersion}/*.jar"/>
+                                        <include name="xml-apis/xml-apis/${xmlApisVersion}/*.jar"/>
                                     </fileset>
                                 </copy>
                             </tasks>

Propchange: geronimo/sandbox/svkmerge/trunk/modules/tomcat-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/tomcat-builder/src:424119

Modified: geronimo/sandbox/svkmerge/trunk/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/PlanParsingTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/PlanParsingTest.java?rev=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/PlanParsingTest.java (original)
+++ geronimo/sandbox/svkmerge/trunk/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/PlanParsingTest.java Fri Aug  4 12:44:18 2006
@@ -58,7 +58,6 @@
         ref.setResourceLink("target");
 
         SchemaConversionUtils.validateDD(tomcatWebAppType);
-//        System.out.println(tomcatWebAppType.toString());
     }
 
 }

Modified: geronimo/sandbox/svkmerge/trunk/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java?rev=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java (original)
+++ geronimo/sandbox/svkmerge/trunk/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java Fri Aug  4 12:44:18 2006
@@ -140,8 +140,7 @@
     }
 
     private WebModuleInfo deployWar(String warName) throws Exception {
-        File outputPath = new File(basedir,
-                "target/test-resources/deployables/" + warName);
+        File outputPath = new File(basedir, "target/test-resources/deployables/" + warName);
         recursiveDelete(outputPath);
         outputPath.mkdirs();
         File path = new File(basedir, "src/test-resources/deployables/" + warName);
@@ -351,7 +350,7 @@
         WebServiceBuilder webServiceBuilder = new UnavailableWebServiceBuilder();
 
         GBeanData containerData = bootstrap.addGBean("TomcatContainer", TomcatContainer.GBEAN_INFO);
-        containerData.setAttribute("catalinaHome", "target/var/catalina");
+        containerData.setAttribute("catalinaHome", new File(basedir, "target/var/catalina").toString());
         containerData.setReferencePattern("EngineGBean", engine.getAbstractName());
         containerData.setReferencePattern("ServerInfo", serverInfo.getAbstractName());
         AbstractName containerName = containerData.getAbstractName();

Modified: geronimo/sandbox/svkmerge/trunk/modules/tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/modules/tomcat/pom.xml?rev=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/modules/tomcat/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/modules/tomcat/pom.xml Fri Aug  4 12:44:18 2006
@@ -17,80 +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-tomcat</artifactId>
     <name>Geronimo :: Tomcat</name>
-    <description>Geronimo Tomcat 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/tomcat</connection>
+        <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/tomcat</developerConnection>
+        <url>http://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/tomcat</url>
+    </scm>
+    
     <properties>
-        <buildDir>${project.build.directory}</buildDir>
-        <endorsedDir>${buildDir}/endorsed</endorsedDir>
+        <endorsedDir>${project.build.directory}/endorsed</endorsedDir>
         <localRepoDir>${settings.localRepository}</localRepoDir>
     </properties>
-
-    <build>
-        <resources>
-            <resource>
-                <directory>src/resources2</directory>
-            </resource>
-        </resources>
-
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <systemProperties>
-                        <property>
-                            <name>java.endorsed.dirs</name>
-                            <value>${endorsedDir}</value>
-                        </property>
-                    </systemProperties>
-                    <forkMode>pertest</forkMode>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>process-test-resources</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <copy todir="target/var/catalina/conf" file="src/resources/META-INF/geronimo-tomcat/var/catalina/conf/web.xml" />
-                                <copy todir="target/var/catalina/webapps">
-                                    <fileset dir="src/test-resources/deployables">
-                                        <include name="war1/**" />
-                                        <include name="war3/**" />
-                                    </fileset>
-                                </copy>
-                                <copy todir="${endorsedDir}" flatten="true">
-                                    <fileset dir="${localRepoDir}">
-                                        <include name="xerces/xercesImpl/${xercesVersion}/*.jar" />
-                                        <include name="xml-apis/xml-apis/${xmlApisVersion}/*.jar" />
-                                    </fileset>
-                                </copy>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
+    
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
@@ -304,6 +263,55 @@
         </dependency>
         
     </dependencies>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <systemProperties>
+                        <property>
+                            <name>java.endorsed.dirs</name>
+                            <value>${endorsedDir}</value>
+                        </property>
+                    </systemProperties>
+                    
+                    <forkMode>pertest</forkMode>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>process-test-resources</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <copy todir="target/var/catalina/conf" file="src/resources/META-INF/geronimo-tomcat/var/catalina/conf/web.xml" />
+                                <copy todir="target/var/catalina/webapps">
+                                    <fileset dir="src/test-resources/deployables">
+                                        <include name="war1/**" />
+                                        <include name="war3/**" />
+                                    </fileset>
+                                </copy>
+                                <copy todir="${endorsedDir}" flatten="true">
+                                    <fileset dir="${localRepoDir}">
+                                        <include name="xerces/xercesImpl/${xercesVersion}/*.jar" />
+                                        <include name="xml-apis/xml-apis/${xmlApisVersion}/*.jar" />
+                                    </fileset>
+                                </copy>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
     
 </project>
 

Propchange: geronimo/sandbox/svkmerge/trunk/modules/tomcat/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/tomcat/src:424119

Modified: geronimo/sandbox/svkmerge/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/AbstractWebModuleTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/AbstractWebModuleTest.java?rev=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/AbstractWebModuleTest.java (original)
+++ geronimo/sandbox/svkmerge/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/AbstractWebModuleTest.java Fri Aug  4 12:44:18 2006
@@ -50,7 +50,8 @@
  * @version $Rev$ $Date$
  */
 public abstract class AbstractWebModuleTest extends TestCase {
-
+    private File basedir = new File(System.getProperty("basedir"));
+    
     protected ClassLoader cl;
     protected final static String securityRealmName = "demo-properties-realm";
     private ConnectorGBean connector;
@@ -99,8 +100,8 @@
         ApplicationPolicyConfigurationManager jacc = new ApplicationPolicyConfigurationManager(contextIDToPermissionsMap, roleDesignates, cl, roleMapper);
         jacc.doStart();
 
-        URL configurationBaseURL = new File("target/var/catalina/webapps/war3/WEB-INF/web.xml").toURL();
-        return setUpInsecureAppContext(new File("target/var/catalina/webapps/war3/").toURI(),
+        URL configurationBaseURL = new File(basedir, "target/var/catalina/webapps/war3/WEB-INF/web.xml").toURL();
+        return setUpInsecureAppContext(new File(basedir, "target/var/catalina/webapps/war3/").toURI(),
                 configurationBaseURL,
                 securityHolder,
                 jacc,
@@ -116,8 +117,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);
@@ -177,7 +178,7 @@
         engine.doStart();
 
         ServerInfo serverInfo = new BasicServerInfo(".");
-        container = new TomcatContainer(cl, "target/var/catalina", engine, serverInfo, null, null);
+        container = new TomcatContainer(cl, new File(basedir, "target/var/catalina").toString(), engine, serverInfo, null, null);
         container.doStart();
 
         connector = new ConnectorGBean("HTTP", null, "localhost", 8181, container);

Modified: geronimo/sandbox/svkmerge/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/ApplicationTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/ApplicationTest.java?rev=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/ApplicationTest.java (original)
+++ geronimo/sandbox/svkmerge/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/ApplicationTest.java Fri Aug  4 12:44:18 2006
@@ -24,20 +24,20 @@
 
 
 /**
- * @version $Rev: 387050 $ $Date$
+ * @version $Rev$ $Date$
  */
 public class ApplicationTest extends AbstractWebModuleTest {
-
+    private File basedir = new File(System.getProperty("basedir"));
+    
     public void testApplication() throws Exception {
-        setUpInsecureAppContext(new File("target/var/catalina/webapps/war1/").toURI(),
-                new File("target/var/catalina/webapps/war1/WEB-INF/web.xml").toURL(),
+        setUpInsecureAppContext(new File(basedir, "target/var/catalina/webapps/war1/").toURI(),
+                new File(basedir, "target/var/catalina/webapps/war1/WEB-INF/web.xml").toURL(),
                 null,
                 null,
                 null,
                 null);
 
-        HttpURLConnection connection = (HttpURLConnection) new URL("http://localhost:8181/test/hello.txt")
-                .openConnection();
+        HttpURLConnection connection = (HttpURLConnection) new URL("http://localhost:8181/test/hello.txt").openConnection();
         BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream()));
         assertEquals(HttpURLConnection.HTTP_OK, connection.getResponseCode());
         assertEquals("Hello World", reader.readLine());

Modified: geronimo/sandbox/svkmerge/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/JACCSecurityTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/JACCSecurityTest.java?rev=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/JACCSecurityTest.java (original)
+++ geronimo/sandbox/svkmerge/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/JACCSecurityTest.java Fri Aug  4 12:44:18 2006
@@ -45,7 +45,7 @@
 /**
  * Tests the JACC security for Tomcat
  *
- * @version $Revision: 387050 $ $Date$
+ * @version $Revision$ $Date$
  */
 public class JACCSecurityTest extends AbstractWebModuleTest {
 
@@ -183,8 +183,6 @@
                 componentPermissions,
                 null,
                 securityHolder);
-
-
     }
 
     protected void stopWebApp() throws Exception {

Modified: geronimo/sandbox/svkmerge/trunk/modules/transaction/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/modules/transaction/pom.xml?rev=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/modules/transaction/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/modules/transaction/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-transaction</artifactId>
-    <packaging>jar</packaging>
     <name>Geronimo :: Transaction</name>
-    <description>Geronimo Transaction</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/transaction</connection>
+        <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/transaction</developerConnection>
+        <url>http://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/transaction</url>
+    </scm>
+    
     <dependencies>
         <!-- temp, for ServerInfo. Remove when it is moved to Kernel-->
         <dependency>

Modified: geronimo/sandbox/svkmerge/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/log/AbstractLogTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/log/AbstractLogTest.java?rev=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/log/AbstractLogTest.java (original)
+++ geronimo/sandbox/svkmerge/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/log/AbstractLogTest.java Fri Aug  4 12:44:18 2006
@@ -139,6 +139,10 @@
                         }
                         localDuration = System.currentTimeMillis() - localStartTime;
                     } catch (Exception e) {
+                        //
+                        // FIXME: Remove System.err usage
+                        //
+                        
                         System.err.println(Thread.currentThread().getName());
                         e.printStackTrace(System.err);
                         exception = true;

Modified: geronimo/sandbox/svkmerge/trunk/modules/upgrade/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/modules/upgrade/pom.xml?rev=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/modules/upgrade/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/modules/upgrade/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-upgrade</artifactId>
     <name>Geronimo :: Upgrade</name>
-    <description>Geronimo Upgrade</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/upgrade</connection>
+        <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/upgrade</developerConnection>
+        <url>http://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/upgrade</url>
+    </scm>
+    
     <dependencies>
         <dependency>
             <groupId>xmlbeans</groupId>

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

Propchange: geronimo/sandbox/svkmerge/trunk/modules/web-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/web-builder:421368

Modified: geronimo/sandbox/svkmerge/trunk/modules/web-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/modules/web-builder/pom.xml?rev=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/modules/web-builder/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/modules/web-builder/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-web-builder</artifactId>
     <name>Geronimo :: Web :: 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/web-builder</connection>
+        <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/web-builder</developerConnection>
+        <url>http://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/web-builder</url>
+    </scm>
+    
     <dependencies>
         
         <!-- Module Dependencies -->
@@ -133,6 +148,32 @@
                 <configuration>
                     <sourceSchemas>geronimo-web-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/sandbox/svkmerge/trunk/modules/web-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/web-builder/src:424119

Modified: geronimo/sandbox/svkmerge/trunk/modules/web-builder/src/test/org/apache/geronimo/web/deployment/GenericToSpecificPlanConverterTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/modules/web-builder/src/test/org/apache/geronimo/web/deployment/GenericToSpecificPlanConverterTest.java?rev=428856&r1=428855&r2=428856&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/modules/web-builder/src/test/org/apache/geronimo/web/deployment/GenericToSpecificPlanConverterTest.java (original)
+++ geronimo/sandbox/svkmerge/trunk/modules/web-builder/src/test/org/apache/geronimo/web/deployment/GenericToSpecificPlanConverterTest.java Fri Aug  4 12:44:18 2006
@@ -27,10 +27,15 @@
 import org.apache.xmlbeans.XmlCursor;
 import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
 /**
  * @version $Rev$ $Date$
  */
 public class GenericToSpecificPlanConverterTest extends TestCase {
+    private static final Log log = LogFactory.getLog(GenericToSpecificPlanConverterTest.class);
+    
     private ClassLoader classLoader = this.getClass().getClassLoader();
 
     public void testConvertPlan1() throws Exception {
@@ -50,13 +55,15 @@
         URL srcXml = classLoader.getResource(prePlanName);
         URL expectedOutputXml = classLoader.getResource(postPlanName);
         XmlObject rawPlan = XmlBeansUtil.parse(srcXml);
-        System.out.println("RAW PLAN " + rawPlan.toString());
+        log.debug("RAW PLAN " + rawPlan.toString());
+        
         XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
         XmlObject webPlan = new GenericToSpecificPlanConverter("http://geronimo.apache.org/xml/ns/web/tomcat/config-1.0",
                 "http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1", "tomcat").convertToSpecificPlan(rawPlan);
 
-        System.out.println("PROCESSED: " + webPlan.toString());
-        System.out.println("EXPECTED: " + expected.toString());
+        log.debug("PROCESSED: " + webPlan.toString());
+        log.debug("EXPECTED: " + expected.toString());
+        
         List problems = new ArrayList();
         boolean ok = compareXmlObjects(webPlan, expected, problems);
         assertTrue("Differences: " + problems, ok);

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



Mime
View raw message