You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2006/08/04 23:22:06 UTC
svn commit: r428888 [9/11] - in /geronimo/trunk: ./ applications/
applications/console/ applications/console/console-core/
applications/console/console-ear/ applications/console/console-framework/
applications/console/console-framework/src/ application...
Modified: geronimo/trunk/modules/core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/core/pom.xml?rev=428888&r1=428887&r2=428888&view=diff
==============================================================================
--- geronimo/trunk/modules/core/pom.xml (original)
+++ geronimo/trunk/modules/core/pom.xml Fri Aug 4 14:21:54 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/trunk/modules/deploy-config/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/deploy-config/pom.xml?rev=428888&r1=428887&r2=428888&view=diff
==============================================================================
--- geronimo/trunk/modules/deploy-config/pom.xml (original)
+++ geronimo/trunk/modules/deploy-config/pom.xml Fri Aug 4 14:21:54 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/trunk/modules/deploy-jsr88/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/deploy-jsr88/pom.xml?rev=428888&r1=428887&r2=428888&view=diff
==============================================================================
--- geronimo/trunk/modules/deploy-jsr88/pom.xml (original)
+++ geronimo/trunk/modules/deploy-jsr88/pom.xml Fri Aug 4 14:21:54 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/trunk/modules/deploy-jsr88/src/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Fri Aug 4 14:21:54 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/modules/deploy-jsr88/src:428849
Modified: geronimo/trunk/modules/deploy-tool/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/deploy-tool/pom.xml?rev=428888&r1=428887&r2=428888&view=diff
==============================================================================
--- geronimo/trunk/modules/deploy-tool/pom.xml (original)
+++ geronimo/trunk/modules/deploy-tool/pom.xml Fri Aug 4 14:21:54 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/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Fri Aug 4 14:21:54 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/trunk/modules/deployment/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/deployment/pom.xml?rev=428888&r1=428887&r2=428888&view=diff
==============================================================================
--- geronimo/trunk/modules/deployment/pom.xml (original)
+++ geronimo/trunk/modules/deployment/pom.xml Fri Aug 4 14:21:54 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/trunk/modules/deployment/src/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Fri Aug 4 14:21:54 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/modules/deployment/src:427986
Modified: geronimo/trunk/modules/deployment/src/test/org/apache/geronimo/deployment/SingleFileHotDeployerTest.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/deployment/src/test/org/apache/geronimo/deployment/SingleFileHotDeployerTest.java?rev=428888&r1=428887&r2=428888&view=diff
==============================================================================
--- geronimo/trunk/modules/deployment/src/test/org/apache/geronimo/deployment/SingleFileHotDeployerTest.java (original)
+++ geronimo/trunk/modules/deployment/src/test/org/apache/geronimo/deployment/SingleFileHotDeployerTest.java Fri Aug 4 14:21:54 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/trunk/modules/derby/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/derby/pom.xml?rev=428888&r1=428887&r2=428888&view=diff
==============================================================================
--- geronimo/trunk/modules/derby/pom.xml (original)
+++ geronimo/trunk/modules/derby/pom.xml Fri Aug 4 14:21:54 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/trunk/modules/directory/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/directory/pom.xml?rev=428888&r1=428887&r2=428888&view=diff
==============================================================================
--- geronimo/trunk/modules/directory/pom.xml (original)
+++ geronimo/trunk/modules/directory/pom.xml Fri Aug 4 14:21:54 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/trunk/modules/hot-deploy/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/hot-deploy/pom.xml?rev=428888&r1=428887&r2=428888&view=diff
==============================================================================
--- geronimo/trunk/modules/hot-deploy/pom.xml (original)
+++ geronimo/trunk/modules/hot-deploy/pom.xml Fri Aug 4 14:21:54 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/trunk/modules/installer-processing/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/installer-processing/pom.xml?rev=428888&r1=428887&r2=428888&view=diff
==============================================================================
--- geronimo/trunk/modules/installer-processing/pom.xml (original)
+++ geronimo/trunk/modules/installer-processing/pom.xml Fri Aug 4 14:21:54 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/trunk/modules/installer-support/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/installer-support/pom.xml?rev=428888&r1=428887&r2=428888&view=diff
==============================================================================
--- geronimo/trunk/modules/installer-support/pom.xml (original)
+++ geronimo/trunk/modules/installer-support/pom.xml Fri Aug 4 14:21:54 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/trunk/modules/interceptor/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/interceptor/pom.xml?rev=428888&r1=428887&r2=428888&view=diff
==============================================================================
--- geronimo/trunk/modules/interceptor/pom.xml (original)
+++ geronimo/trunk/modules/interceptor/pom.xml Fri Aug 4 14:21:54 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/trunk/modules/j2ee-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/j2ee-builder/pom.xml?rev=428888&r1=428887&r2=428888&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee-builder/pom.xml (original)
+++ geronimo/trunk/modules/j2ee-builder/pom.xml Fri Aug 4 14:21:54 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/trunk/modules/j2ee-schema/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/j2ee-schema/pom.xml?rev=428888&r1=428887&r2=428888&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee-schema/pom.xml (original)
+++ geronimo/trunk/modules/j2ee-schema/pom.xml Fri Aug 4 14:21:54 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/trunk/modules/j2ee-schema/src/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Fri Aug 4 14:21:54 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/modules/j2ee-schema/src:424119
Modified: geronimo/trunk/modules/j2ee-schema/src/test/org/apache/geronimo/schema/SchemaConversionUtilsTest.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/j2ee-schema/src/test/org/apache/geronimo/schema/SchemaConversionUtilsTest.java?rev=428888&r1=428887&r2=428888&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee-schema/src/test/org/apache/geronimo/schema/SchemaConversionUtilsTest.java (original)
+++ geronimo/trunk/modules/j2ee-schema/src/test/org/apache/geronimo/schema/SchemaConversionUtilsTest.java Fri Aug 4 14:21:54 2006
@@ -29,6 +29,9 @@
import org.apache.xmlbeans.XmlException;
import org.apache.geronimo.xbeans.j2ee.EjbJarType;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
/**
* ejb 1.1 dtd appears to be a subset of ejb 2.0 dtd so the same xsl should
* work for both.
@@ -36,6 +39,8 @@
* @version $Rev$ $Date$
*/
public class SchemaConversionUtilsTest extends TestCase {
+ private static final Log log = LogFactory.getLog(SchemaConversionUtilsTest.class);
+
private ClassLoader classLoader = this.getClass().getClassLoader();
//comment on validity of j2ee 1.4 schemas: validation doesn't work...
@@ -66,8 +71,8 @@
XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
SchemaConversionUtils.validateDD(expected);
xmlObject = SchemaConversionUtils.convertToApplicationClientSchema(xmlObject);
-// System.out.println(xmlObject.toString());
-// System.out.println(expected.toString());
+// log.debug(xmlObject.toString());
+// log.debug(expected.toString());
List problems = new ArrayList();
boolean ok = compareXmlObjects(xmlObject, expected, problems);
assertTrue("Differences: " + problems, ok);
@@ -95,8 +100,8 @@
XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
SchemaConversionUtils.validateDD(expected);
xmlObject = SchemaConversionUtils.convertToApplicationSchema(xmlObject);
-// System.out.println(xmlObject.toString());
-// System.out.println(expected.toString());
+// log.debug(xmlObject.toString());
+// log.debug(expected.toString());
List problems = new ArrayList();
boolean ok = compareXmlObjects(xmlObject, expected, problems);
assertTrue("Differences: " + problems, ok);
@@ -124,8 +129,8 @@
XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
SchemaConversionUtils.validateDD(expected);
xmlObject = SchemaConversionUtils.convertToConnectorSchema(xmlObject);
-// System.out.println(xmlObject.toString());
-// System.out.println(expected.toString());
+// log.debug(xmlObject.toString());
+// log.debug(expected.toString());
List problems = new ArrayList();
boolean ok = compareXmlObjects(xmlObject, expected, problems);
assertTrue("Differences: " + problems, ok);
@@ -153,8 +158,8 @@
XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
SchemaConversionUtils.validateDD(expected);
xmlObject = SchemaConversionUtils.convertToEJBSchema(xmlObject);
-// System.out.println(xmlObject.toString());
-// System.out.println(expected.toString());
+// log.debug(xmlObject.toString());
+// log.debug(expected.toString());
List problems = new ArrayList();
boolean ok = compareXmlObjects(xmlObject, expected, problems);
assertTrue("Differences: " + problems, ok);
@@ -182,8 +187,8 @@
XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
SchemaConversionUtils.validateDD(expected);
xmlObject = SchemaConversionUtils.convertToEJBSchema(xmlObject);
-// System.out.println(xmlObject.toString());
-// System.out.println(expected.toString());
+// log.debug(xmlObject.toString());
+// log.debug(expected.toString());
List problems = new ArrayList();
boolean ok = compareXmlObjects(xmlObject, expected, problems);
assertTrue("Differences: " + problems, ok);
@@ -211,8 +216,8 @@
XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
SchemaConversionUtils.validateDD(expected);
xmlObject = SchemaConversionUtils.convertToEJBSchema(xmlObject);
-// System.out.println(xmlObject.toString());
-// System.out.println(expected.toString());
+// log.debug(xmlObject.toString());
+// log.debug(expected.toString());
List problems = new ArrayList();
boolean ok = compareXmlObjects(xmlObject, expected, problems);
assertTrue("Differences: " + problems, ok);
@@ -240,8 +245,8 @@
XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
SchemaConversionUtils.validateDD(expected);
xmlObject = SchemaConversionUtils.convertToEJBSchema(xmlObject);
-// System.out.println(xmlObject.toString());
-// System.out.println(expected.toString());
+// log.debug(xmlObject.toString());
+// log.debug(expected.toString());
List problems = new ArrayList();
boolean ok = compareXmlObjects(xmlObject, expected, problems);
assertTrue("Differences: " + problems, ok);
@@ -281,7 +286,7 @@
} finally {
srcCursor.dispose();
}
-// System.out.println(srcObject.toString());
+// log.debug(srcObject.toString());
XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
List problems = new ArrayList();
boolean ok = compareXmlObjects(srcObject, expected, problems);
@@ -310,7 +315,7 @@
} finally {
srcCursor.dispose();
}
-// System.out.println(srcObject.toString());
+// log.debug(srcObject.toString());
XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
List problems = new ArrayList();
boolean ok = compareXmlObjects(srcObject, expected, problems);
@@ -323,8 +328,8 @@
XmlObject xmlObject = XmlObject.Factory.parse(srcXml);
xmlObject = SchemaConversionUtils.convertToServletSchema(xmlObject);
XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
-// System.out.println(xmlObject.toString());
-// System.out.println(expected.toString());
+// log.debug(xmlObject.toString());
+// log.debug(expected.toString());
List problems = new ArrayList();
boolean ok = compareXmlObjects(xmlObject, expected, problems);
assertTrue("Differences: " + problems, ok);
@@ -338,7 +343,7 @@
URL expectedOutputXml = classLoader.getResource("j2ee_1_3dtd/web-1-24.xml");
XmlObject xmlObject = XmlObject.Factory.parse(srcXml);
xmlObject = SchemaConversionUtils.convertToServletSchema(xmlObject);
-// System.out.println(xmlObject.toString());
+// log.debug(xmlObject.toString());
XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
List problems = new ArrayList();
boolean ok = compareXmlObjects(xmlObject, expected, problems);
@@ -354,8 +359,8 @@
XmlObject xmlObject = XmlObject.Factory.parse(srcXml);
xmlObject = SchemaConversionUtils.convertToServletSchema(xmlObject);
XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
-// System.out.println(xmlObject.toString());
-// System.out.println(expected.toString());
+// log.debug(xmlObject.toString());
+// log.debug(expected.toString());
List problems = new ArrayList();
boolean ok = compareXmlObjects(xmlObject, expected, problems);
assertTrue("Differences: " + problems, ok);
@@ -399,9 +404,11 @@
XmlCursor cursor = xmlObject.newCursor();
try {
SchemaConversionUtils.convertToGeronimoSubSchemas(cursor);
- System.out.println(xmlObject.toString());
+ log.debug(xmlObject.toString());
+
XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
- System.out.println(expected.toString());
+ log.debug(expected.toString());
+
List problems = new ArrayList();
boolean ok = compareXmlObjects(xmlObject, expected, problems);
assertTrue("Differences: " + problems, ok);
@@ -419,7 +426,7 @@
XmlObject xmlObject = XmlObject.Factory.parse(srcXml);
//this is not a usable type, we'll see what happens though
xmlObject = SchemaConversionUtils.getNestedObjectAsType(xmlObject, new QName("http://www.openejb.org/xml/ns/openejb-jar-2.1", "openejb-jar"), EjbJarType.type);
-// System.out.println(xmlObject.toString());
+// log.debug(xmlObject.toString());
}
public void testSecurityElementConverter() throws Exception {
@@ -431,7 +438,7 @@
XmlCursor end = cursor.newCursor();
try {
elementConverter.convertElement(cursor, end);
- // System.out.println(xmlObject.toString());
+ // log.debug(xmlObject.toString());
XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
List problems = new ArrayList();
boolean ok = compareXmlObjects(xmlObject, expected, problems);
@@ -455,7 +462,7 @@
XmlCursor end = cursor.newCursor();
try {
elementConverter.convertElement(cursor, end);
- // System.out.println(xmlObject.toString());
+ // log.debug(xmlObject.toString());
XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
List problems = new ArrayList();
boolean ok = compareXmlObjects(xmlObject, expected, problems);
@@ -479,7 +486,7 @@
XmlCursor end = cursor.newCursor();
try {
elementConverter.convertElement(cursor, end);
- // System.out.println(xmlObject.toString());
+ // log.debug(xmlObject.toString());
XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
List problems = new ArrayList();
boolean ok = compareXmlObjects(xmlObject, expected, problems);
@@ -502,7 +509,7 @@
XmlCursor end = cursor.newCursor();
try {
elementConverter.convertElement(cursor, end);
- // System.out.println(xmlObject.toString());
+ // log.debug(xmlObject.toString());
XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
List problems = new ArrayList();
boolean ok = compareXmlObjects(xmlObject, expected, problems);
@@ -523,9 +530,11 @@
XmlCursor cursor = xmlObject.newCursor();
try {
SchemaConversionUtils.convertToGeronimoSubSchemas(cursor);
- System.out.println(xmlObject.toString());
+ log.debug(xmlObject.toString());
+
XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
- System.out.println(expected.toString());
+ log.debug(expected.toString());
+
List problems = new ArrayList();
boolean ok = compareXmlObjects(xmlObject, expected, problems);
assertTrue("Differences: " + problems, ok);
Modified: geronimo/trunk/modules/j2ee/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/j2ee/pom.xml?rev=428888&r1=428887&r2=428888&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee/pom.xml (original)
+++ geronimo/trunk/modules/j2ee/pom.xml Fri Aug 4 14:21:54 2006
@@ -17,33 +17,33 @@
<!-- $Rev$ $Date$ -->
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>modules-parent</artifactId>
+ <artifactId>modules</artifactId>
<version>1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>geronimo-j2ee</artifactId>
<name>Geronimo :: J2EE</name>
- <description>Geronimo J2EE Services</description>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <inherited>true</inherited>
- </plugin>
- </plugins>
- </build>
-
- <!-- ============ -->
- <!-- Dependencies -->
- <!-- ============ -->
+
+ <!--
+
+ HACK: Need to explicitly configure SCM for this module since its artifactId
+ does not match the directory it lives in.
+
+ FIXME: Rename module directory or artifactId.
+
+ -->
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/j2ee</connection>
+ <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/j2ee</developerConnection>
+ <url>http://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/j2ee</url>
+ </scm>
<dependencies>
Modified: geronimo/trunk/modules/jetty-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/jetty-builder/pom.xml?rev=428888&r1=428887&r2=428888&view=diff
==============================================================================
--- geronimo/trunk/modules/jetty-builder/pom.xml (original)
+++ geronimo/trunk/modules/jetty-builder/pom.xml Fri Aug 4 14:21:54 2006
@@ -17,12 +17,13 @@
<!-- $Rev$ $Date$ -->
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>modules-parent</artifactId>
+ <artifactId>modules</artifactId>
<version>1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -30,6 +31,20 @@
<artifactId>geronimo-jetty-builder</artifactId>
<name>Geronimo :: Jetty :: Builder</name>
+ <!--
+
+ HACK: Need to explicitly configure SCM for this module since its artifactId
+ does not match the directory it lives in.
+
+ FIXME: Rename module directory or artifactId.
+
+ -->
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/jetty-builder</connection>
+ <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/jetty-builder</developerConnection>
+ <url>http://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/jetty-builder</url>
+ </scm>
+
<dependencies>
<!-- Module Dependencies -->
@@ -68,6 +83,32 @@
<configuration>
<sourceSchemas>geronimo-jetty-1.1.xsd,geronimo-jetty-config-1.0.xsd</sourceSchemas>
</configuration>
+ </plugin>
+
+ <!--
+ HACK: Copy the generated XmlBeans bits for clover
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <mkdir dir="${pom.basedir}/target/clover/classes"/>
+ <copy todir="${pom.basedir}/target/clover/classes">
+ <fileset dir="${pom.basedir}/target/classes">
+ <include name="schemaorg_apache_xmlbeans/**"/>
+ </fileset>
+ </copy>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
Modified: geronimo/trunk/modules/jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/jetty/pom.xml?rev=428888&r1=428887&r2=428888&view=diff
==============================================================================
--- geronimo/trunk/modules/jetty/pom.xml (original)
+++ geronimo/trunk/modules/jetty/pom.xml Fri Aug 4 14:21:54 2006
@@ -17,42 +17,34 @@
<!-- $Rev$ $Date$ -->
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>modules-parent</artifactId>
+ <artifactId>modules</artifactId>
<version>1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>geronimo-jetty</artifactId>
<name>Geronimo :: Jetty</name>
- <description>Geronimo Jetty Integration</description>
-
- <build>
- <resources>
- <resource>
- <directory>src/resources2</directory>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemProperties>
- <property>
- <name>java.security.auth.login.config</name>
- <value>${basedir}/src/test-resources/data/login.config</value>
- </property>
- </systemProperties>
- <forkMode>once</forkMode>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
+
+ <!--
+
+ HACK: Need to explicitly configure SCM for this module since its artifactId
+ does not match the directory it lives in.
+
+ FIXME: Rename module directory or artifactId.
+
+ -->
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/jetty</connection>
+ <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/jetty</developerConnection>
+ <url>http://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/jetty</url>
+ </scm>
+
<dependencies>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
@@ -77,7 +69,7 @@
<artifactId>geronimo-webservices</artifactId>
<version>${pom.version}</version>
</dependency>
-
+
<dependency>
<groupId>jetty</groupId>
<artifactId>org.mortbay.jetty</artifactId>
@@ -101,12 +93,12 @@
<artifactId>jasper-runtime</artifactId>
<version>${tomcatVersion}</version>
</dependency>
-
+
<dependency>
<groupId>commons-el</groupId>
<artifactId>commons-el</artifactId>
</dependency>
-
+
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
@@ -116,7 +108,39 @@
<groupId>commons-primitives</groupId>
<artifactId>commons-primitives</artifactId>
</dependency>
+
</dependencies>
-
+
+ <build>
+ <resources>
+ <resource>
+ <directory>${pom.basedir}</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+
+ <resource>
+ <directory>src/resources2</directory>
+ </resource>
+ </resources>
+
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemProperties>
+ <property>
+ <name>java.security.auth.login.config</name>
+ <value>${basedir}/src/test-resources/data/login.config</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Propchange: geronimo/trunk/modules/jetty/src/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Fri Aug 4 14:21:54 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/modules/jetty/src:424119
Modified: geronimo/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/AbstractWebModuleTest.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/AbstractWebModuleTest.java?rev=428888&r1=428887&r2=428888&view=diff
==============================================================================
--- geronimo/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/AbstractWebModuleTest.java (original)
+++ geronimo/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/AbstractWebModuleTest.java Fri Aug 4 14:21:54 2006
@@ -17,6 +17,7 @@
package org.apache.geronimo.jetty;
import junit.framework.TestCase;
+
import org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinator;
import org.apache.geronimo.jetty.connector.HTTPConnector;
import org.apache.geronimo.security.SecurityServiceImpl;
@@ -40,6 +41,7 @@
import org.mortbay.http.Authenticator;
import org.mortbay.jetty.servlet.FormAuthenticator;
+import java.io.File;
import java.net.URL;
import java.security.PermissionCollection;
import java.util.Collections;
@@ -53,6 +55,8 @@
* @version $Rev$ $Date$
*/
public class AbstractWebModuleTest extends TestCase {
+ private File basedir = new File(System.getProperty("basedir"));
+
protected ClassLoader cl;
protected final static String securityRealmName = "demo-properties-realm";
private HTTPConnector connector;
@@ -156,8 +160,8 @@
new SecurityServiceImpl(cl, serverInfo, "org.apache.geronimo.security.jacc.GeronimoPolicyConfigurationFactory", "org.apache.geronimo.security.jacc.GeronimoPolicy", null, null, null, null);
Properties options = new Properties();
- options.setProperty("usersURI", "src/test-resources/data/users.properties");
- options.setProperty("groupsURI", "src/test-resources/data/groups.properties");
+ options.setProperty("usersURI", new File(basedir, "src/test-resources/data/users.properties").toURI().toString());
+ options.setProperty("groupsURI", new File(basedir, "src/test-resources/data/groups.properties").toURI().toString());
LoginModuleGBean loginModule = new LoginModuleGBean("org.apache.geronimo.security.realm.providers.PropertiesFileLoginModule", null, true, true, cl);
loginModule.setLoginDomainName(domainName);
Modified: geronimo/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/ClassLoaderTest.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/ClassLoaderTest.java?rev=428888&r1=428887&r2=428888&view=diff
==============================================================================
--- geronimo/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/ClassLoaderTest.java (original)
+++ geronimo/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/ClassLoaderTest.java Fri Aug 4 14:21:54 2006
@@ -33,6 +33,8 @@
* @version $Rev$ $Date$
*/
public class ClassLoaderTest extends TestCase {
+ private File basedir = new File(System.getProperty("basedir"));
+
Artifact configId = new Artifact("foo", "bar", "1", "car");
ClassLoader cl;
URL[] urls;
@@ -41,9 +43,7 @@
public void setUp() throws Exception {
super.setUp();
- URL url = new File("src/test-resources/deployables/cltest/").toURL();
-// URL url = getClass().getClassLoader().getResource("deployables/cltest/");
- System.err.println("URL: " + url);
+ URL url = new File(basedir, "src/test-resources/deployables/cltest/").toURL();
urls = new URL[]{url};
}
Modified: geronimo/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/SecurityTest.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/SecurityTest.java?rev=428888&r1=428887&r2=428888&view=diff
==============================================================================
--- geronimo/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/SecurityTest.java (original)
+++ geronimo/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/SecurityTest.java Fri Aug 4 14:21:54 2006
@@ -46,7 +46,6 @@
* @version $Rev$ $Date$
*/
public class SecurityTest extends AbstractWebModuleTest {
-
/**
* Test the explicit map feature. Only Alan should be able to log in.
*
Modified: geronimo/trunk/modules/jmx-remoting/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/jmx-remoting/pom.xml?rev=428888&r1=428887&r2=428888&view=diff
==============================================================================
--- geronimo/trunk/modules/jmx-remoting/pom.xml (original)
+++ geronimo/trunk/modules/jmx-remoting/pom.xml Fri Aug 4 14:21:54 2006
@@ -17,20 +17,36 @@
<!-- $Rev$ $Date$ -->
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>modules-parent</artifactId>
+ <artifactId>modules</artifactId>
<version>1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>geronimo-jmx-remoting</artifactId>
<name>Geronimo :: JMX Remoting</name>
+
<description>Provides remote access to a Geronimo server using JSR 160 JMX Remoting</description>
+ <!--
+
+ HACK: Need to explicitly configure SCM for this module since its artifactId
+ does not match the directory it lives in.
+
+ FIXME: Rename module directory or artifactId.
+
+ -->
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/jmx-remoting</connection>
+ <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/jmx-remoting</developerConnection>
+ <url>http://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/jmx-remoting</url>
+ </scm>
+
<dependencies>
<dependency>
@@ -45,5 +61,6 @@
<artifactId>mx4j-remote</artifactId>
</dependency>
</dependencies>
+
</project>
Modified: geronimo/trunk/modules/kernel/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/kernel/pom.xml?rev=428888&r1=428887&r2=428888&view=diff
==============================================================================
--- geronimo/trunk/modules/kernel/pom.xml (original)
+++ geronimo/trunk/modules/kernel/pom.xml Fri Aug 4 14:21:54 2006
@@ -17,39 +17,36 @@
<!-- $Rev$ $Date$ -->
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>modules-parent</artifactId>
+ <artifactId>modules</artifactId>
<version>1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>geronimo-kernel</artifactId>
<name>Geronimo :: Kernel</name>
-
- <build>
- <!-- move this to parent pom -->
- <resources>
- <resource>
- <directory>src/META-INF</directory>
- </resource>
- </resources>
-
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkMode>once</forkMode>
- <workingDirectory>${basedir}</workingDirectory>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
+
+ <!--
+
+ HACK: Need to explicitly configure SCM for this module since its artifactId
+ does not match the directory it lives in.
+
+ FIXME: Rename module directory or artifactId.
+
+ -->
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/kernel</connection>
+ <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/kernel</developerConnection>
+ <url>http://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/kernel</url>
+ </scm>
+
<dependencies>
+
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
@@ -79,12 +76,33 @@
<groupId>xpp3</groupId>
<artifactId>xpp3</artifactId>
</dependency>
-
+
+ <!-- Test Dependencies -->
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-qname_1.1_spec</artifactId>
<scope>test</scope>
</dependency>
+
</dependencies>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>${pom.basedir}</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+
+ <resource>
+ <directory>src/META-INF</directory>
+ </resource>
+ </resources>
+ </build>
+
</project>
Propchange: geronimo/trunk/modules/kernel/src/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Fri Aug 4 14:21:54 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/modules/kernel/src:428809
Modified: geronimo/trunk/modules/kernel/src/test/org/apache/geronimo/kernel/basic/BasicProxyMapTest.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/kernel/src/test/org/apache/geronimo/kernel/basic/BasicProxyMapTest.java?rev=428888&r1=428887&r2=428888&view=diff
==============================================================================
--- geronimo/trunk/modules/kernel/src/test/org/apache/geronimo/kernel/basic/BasicProxyMapTest.java (original)
+++ geronimo/trunk/modules/kernel/src/test/org/apache/geronimo/kernel/basic/BasicProxyMapTest.java Fri Aug 4 14:21:54 2006
@@ -98,7 +98,7 @@
Object value1 = new Object();
Object value2 = new Object();
- class IdentityTest {
+ class IdentityTest1 {
public int hashCode() { return 1; }
public boolean equals(Object o) { return true; }
}
@@ -107,8 +107,8 @@
public boolean equals(Object o) { return false; }
}
- Object key1 = new IdentityTest();
- Object key2 = new IdentityTest();
+ Object key1 = new IdentityTest1();
+ Object key2 = new IdentityTest1();
assertNull(map.put(key1, value1));
assertNull(map.get(key2));
Modified: geronimo/trunk/modules/kernel/src/test/org/apache/geronimo/kernel/classloader/UrlResourceFinderTest.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/kernel/src/test/org/apache/geronimo/kernel/classloader/UrlResourceFinderTest.java?rev=428888&r1=428887&r2=428888&view=diff
==============================================================================
--- geronimo/trunk/modules/kernel/src/test/org/apache/geronimo/kernel/classloader/UrlResourceFinderTest.java (original)
+++ geronimo/trunk/modules/kernel/src/test/org/apache/geronimo/kernel/classloader/UrlResourceFinderTest.java Fri Aug 4 14:21:54 2006
@@ -31,9 +31,10 @@
import junit.framework.TestCase;
/**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
*/
public class UrlResourceFinderTest extends TestCase {
+ private File basedir = new File(System.getProperty("basedir"));
private File jarFile;
private Manifest manifest;
private Attributes resourceAttributes;
@@ -45,8 +46,8 @@
* @throws Exception
*/
public void testResourceEnumeration() throws Exception {
- URL jar1 = new File("src/test-data/resourceFinderTest/jar1/").toURL();
- URL jar2 = new File("src/test-data/resourceFinderTest/jar2/").toURL();
+ URL jar1 = new File(basedir, "src/test-data/resourceFinderTest/jar1/").toURL();
+ URL jar2 = new File(basedir, "src/test-data/resourceFinderTest/jar2/").toURL();
UrlResourceFinder resourceFinder = new UrlResourceFinder(new URL[] {jar1, jar2});
Enumeration enumeration = resourceFinder.findResources("resource");
@@ -68,7 +69,7 @@
}
public void testDirectoryResource() throws Exception {
- URL jar = new File("src/test-data/resourceFinderTest/jar1/").toURL();
+ URL jar = new File(basedir, "src/test-data/resourceFinderTest/jar1/").toURL();
UrlResourceFinder resourceFinder = new UrlResourceFinder(new URL[] {jar});
ResourceHandle resource = resourceFinder.getResource("resource");
@@ -146,7 +147,7 @@
}
public void testAddURL() throws Exception {
- URL jar1 = new File("src/test-data/resourceFinderTest/jar1/").toURL();
+ URL jar1 = new File(basedir, "src/test-data/resourceFinderTest/jar1/").toURL();
UrlResourceFinder resourceFinder = new UrlResourceFinder(new URL[] {jar1});
Enumeration enumeration = resourceFinder.findResources("resource");
@@ -160,7 +161,7 @@
assertFalse(enumeration.hasMoreElements());
// addUrl
- URL jar2 = new File("src/test-data/resourceFinderTest/jar2/").toURL();
+ URL jar2 = new File(basedir, "src/test-data/resourceFinderTest/jar2/").toURL();
resourceFinder.addUrl(jar2);
// getResource should find the first jar only
@@ -193,8 +194,8 @@
}
public void testConcurrentAddURL() throws Exception {
- URL jar1 = new File("src/test-data/resourceFinderTest/jar1/").toURL();
- URL jar2 = new File("src/test-data/resourceFinderTest/jar2/").toURL();
+ URL jar1 = new File(basedir, "src/test-data/resourceFinderTest/jar1/").toURL();
+ URL jar2 = new File(basedir, "src/test-data/resourceFinderTest/jar2/").toURL();
UrlResourceFinder resourceFinder = new UrlResourceFinder(new URL[] {jar1, jar2});
Enumeration enumeration = resourceFinder.findResources("resource");
@@ -237,7 +238,7 @@
}
public void testDirectoryDestroy() throws Exception {
- URL jar = new File("src/test-data/resourceFinderTest/jar1/").toURL();
+ URL jar = new File(basedir, "src/test-data/resourceFinderTest/jar1/").toURL();
UrlResourceFinder resourceFinder = new UrlResourceFinder(new URL[] {jar});
assertDestroyed(resourceFinder, "resource1", null);
}
@@ -326,7 +327,10 @@
protected void setUp() throws Exception {
super.setUp();
-
+
+ //
+ // Build a simple Jar file to test with
+ //
manifest = new Manifest();
Attributes mainAttributes = manifest.getMainAttributes();
mainAttributes.put(Attributes.Name.MANIFEST_VERSION, "1.0");
@@ -334,9 +338,9 @@
resourceAttributes = new Attributes();
resourceAttributes.putValue("drink", "margarita");
manifest.getEntries().put("resource", resourceAttributes);
-
- jarFile = new File("target/resourceFinderTest.jar");
- System.out.println(jarFile.getAbsolutePath());
+
+ File targetDir = new File(basedir, "target");
+ jarFile = new File(targetDir, "resourceFinderTest.jar");
JarOutputStream jarOutputStream = new JarOutputStream(new FileOutputStream(jarFile), manifest);
jarOutputStream.putNextEntry(new ZipEntry("resource"));
jarOutputStream.write("resource3".getBytes());
Modified: geronimo/trunk/modules/mail/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/mail/pom.xml?rev=428888&r1=428887&r2=428888&view=diff
==============================================================================
--- geronimo/trunk/modules/mail/pom.xml (original)
+++ geronimo/trunk/modules/mail/pom.xml Fri Aug 4 14:21:54 2006
@@ -17,59 +17,61 @@
<!-- $Rev$ $Date$ -->
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>modules-parent</artifactId>
+ <artifactId>modules</artifactId>
<version>1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>geronimo-mail</artifactId>
<name>Geronimo :: Mail</name>
- <description>Geronimo Mail</description>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <inherited>true</inherited>
- <configuration>
- <excludes>
- <exclude>**/TestStore.class</exclude>
- <exclude>**/TestTransport.class</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <!--
+
+ HACK: Need to explicitly configure SCM for this module since its artifactId
+ does not match the directory it lives in.
+
+ FIXME: Rename module directory or artifactId.
+
+ -->
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/mail</connection>
+ <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/mail</developerConnection>
+ <url>http://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/mail</url>
+ </scm>
+
<dependencies>
+
+ <!-- Module Dependencies -->
+
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-j2ee</artifactId>
<version>${pom.version}</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-kernel</artifactId>
<version>${pom.version}</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-management</artifactId>
<version>${pom.version}</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-javamail_1.3.1_spec</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.apache.geronimo.javamail</groupId>
<artifactId>geronimo-javamail_1.3.1_provider</artifactId>
@@ -79,21 +81,25 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-activation_1.0.2_spec</artifactId>
</dependency>
-
+
+ <!-- Thirdparty Dependencies -->
+
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
</dependency>
-
+
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
-
+
<dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j</artifactId>
</dependency>
+
</dependencies>
+
</project>
Modified: geronimo/trunk/modules/management/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/management/pom.xml?rev=428888&r1=428887&r2=428888&view=diff
==============================================================================
--- geronimo/trunk/modules/management/pom.xml (original)
+++ geronimo/trunk/modules/management/pom.xml Fri Aug 4 14:21:54 2006
@@ -17,20 +17,36 @@
<!-- $Rev$ $Date$ -->
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>modules-parent</artifactId>
+ <artifactId>modules</artifactId>
<version>1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>geronimo-management</artifactId>
<name>Geronimo :: Management API</name>
+
<description>Contains interfaces that define the management API for Geronimo</description>
-
+
+ <!--
+
+ HACK: Need to explicitly configure SCM for this module since its artifactId
+ does not match the directory it lives in.
+
+ FIXME: Rename module directory or artifactId.
+
+ -->
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/management</connection>
+ <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/management</developerConnection>
+ <url>http://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/management</url>
+ </scm>
+
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -49,5 +65,6 @@
<version>${pom.version}</version>
</dependency>
</dependencies>
+
</project>
Propchange: geronimo/trunk/modules/management/src/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Fri Aug 4 14:21:54 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/modules/management/src:427990
Modified: geronimo/trunk/modules/naming-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/naming-builder/pom.xml?rev=428888&r1=428887&r2=428888&view=diff
==============================================================================
--- geronimo/trunk/modules/naming-builder/pom.xml (original)
+++ geronimo/trunk/modules/naming-builder/pom.xml Fri Aug 4 14:21:54 2006
@@ -17,12 +17,13 @@
<!-- $Rev$ $Date$ -->
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>modules-parent</artifactId>
+ <artifactId>modules</artifactId>
<version>1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -30,6 +31,20 @@
<artifactId>geronimo-naming-builder</artifactId>
<name>Geronimo :: Naming :: Builder</name>
+ <!--
+
+ HACK: Need to explicitly configure SCM for this module since its artifactId
+ does not match the directory it lives in.
+
+ FIXME: Rename module directory or artifactId.
+
+ -->
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/naming-builder</connection>
+ <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/naming-builder</developerConnection>
+ <url>http://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/naming-builder</url>
+ </scm>
+
<dependencies>
<!-- Module Dependencies -->
@@ -126,6 +141,32 @@
<configuration>
<sourceSchemas>geronimo-naming-1.1.xsd</sourceSchemas>
</configuration>
+ </plugin>
+
+ <!--
+ HACK: Copy the generated XmlBeans bits for clover
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <mkdir dir="${pom.basedir}/target/clover/classes"/>
+ <copy todir="${pom.basedir}/target/clover/classes">
+ <fileset dir="${pom.basedir}/target/classes">
+ <include name="schemaorg_apache_xmlbeans/**"/>
+ </fileset>
+ </copy>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
Propchange: geronimo/trunk/modules/naming-builder/src/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Fri Aug 4 14:21:54 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/modules/naming-builder/src:427999
Modified: geronimo/trunk/modules/naming/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/naming/pom.xml?rev=428888&r1=428887&r2=428888&view=diff
==============================================================================
--- geronimo/trunk/modules/naming/pom.xml (original)
+++ geronimo/trunk/modules/naming/pom.xml Fri Aug 4 14:21:54 2006
@@ -17,21 +17,34 @@
<!-- $Rev$ $Date$ -->
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>modules-parent</artifactId>
+ <artifactId>modules</artifactId>
<version>1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>geronimo-naming</artifactId>
- <packaging>jar</packaging>
<name>Geronimo :: Naming</name>
- <description>Geronimo Naming</description>
-
+
+ <!--
+
+ HACK: Need to explicitly configure SCM for this module since its artifactId
+ does not match the directory it lives in.
+
+ FIXME: Rename module directory or artifactId.
+
+ -->
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/naming</connection>
+ <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/naming</developerConnection>
+ <url>http://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/naming</url>
+ </scm>
+
<dependencies>
<dependency>
@@ -55,6 +68,8 @@
<groupId>mx4j</groupId>
<artifactId>mx4j</artifactId>
</dependency>
+
</dependencies>
+
</project>
Modified: geronimo/trunk/modules/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/pom.xml?rev=428888&r1=428887&r2=428888&view=diff
==============================================================================
--- geronimo/trunk/modules/pom.xml (original)
+++ geronimo/trunk/modules/pom.xml Fri Aug 4 14:21:54 2006
@@ -17,28 +17,27 @@
<!-- $Rev$ $Date$ -->
-<project
- xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.geronimo</groupId>
- <artifactId>geronimo-parent</artifactId>
+ <artifactId>geronimo</artifactId>
<version>1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>modules-parent</artifactId>
+ <artifactId>modules</artifactId>
<name>Geronimo :: Modules</name>
<packaging>pom</packaging>
<modules>
<module>activation</module>
<module>activemq-embedded-rar</module>
+ <module>activemq-gbean</module>
+ <module>activemq-gbean-management</module>
<module>axis</module>
<module>axis-builder</module>
<module>client</module>
@@ -46,6 +45,9 @@
<module>common</module>
<module>connector</module>
<module>connector-builder</module>
+ <!--
+ <module>console-web</module>
+ -->
<module>converter</module>
<module>core</module>
<module>deploy-config</module>
@@ -56,7 +58,9 @@
<module>directory</module>
<module>hot-deploy</module>
<module>installer-processing</module>
- <!-- <module>installer-support</module> -->
+ <!--
+ <module>installer-support</module>
+ -->
<module>interceptor</module>
<module>j2ee</module>
<module>j2ee-builder</module>
@@ -65,16 +69,14 @@
<module>jetty-builder</module>
<module>jmx-remoting</module>
<module>kernel</module>
- <module>management</module>
<module>mail</module>
+ <module>management</module>
<module>naming</module>
<module>naming-builder</module>
<module>scripts</module>
<module>security</module>
<module>security-builder</module>
<module>service-builder</module>
- <!-- <module>session</module> -->
- <!-- <module>spring</module> -->
<module>system</module>
<module>test-ddbean</module>
<module>timer</module>