You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by da...@apache.org on 2006/08/06 03:47:20 UTC
svn commit: r429088 [4/7] - in /geronimo/branches/dain/notcm: ./
applications/ applications/console/ applications/console/console-core/
applications/console/console-ear/ applications/console/console-framework/
applications/console/console-framework/src...
Modified: geronimo/branches/dain/notcm/maven.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/maven.xml?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/maven.xml (original)
+++ geronimo/branches/dain/notcm/maven.xml Sat Aug 5 18:47:06 2006
@@ -96,13 +96,19 @@
| Same as m:clean m:clean-repo m:default and it includes geronimo spec modules
|
| m:checkout or m:co
- | Checks out ActiveMQ, OpenEJB, and TranQL
+ | Checks out OpenEJB for non-OpenEJB Committers
+ |
+ | m:committer-checkout or m:cco
+ | Checks out OpenEJB for OpenEJB Committers
|
| m:update
- | Updates ActiveMQ, Geronimo, OpenEJB, and TranQL
+ | Updates Geronimo and OpenEJB
|
| m:fresh-checkout
- | BECAREFUL: Deletes checkout of ActiveMQ, OpenEJB, and TranQL and checks them out again
+ | BECAREFUL: Deletes checkout of OpenEJB and checks it out again
+ |
+ | m:cfresh-checkout
+ | BECAREFUL: Deletes checkout of OpenEJB and checks it out again
|
|
| In addition to the above we support a -Dmodules command line option which is a comma
@@ -275,42 +281,46 @@
</define:tag>
</define:taglib>
+ <!-- ======================================= -->
+ <!-- Goals for use by non-OpenEJB committers -->
+ <!-- ======================================= -->
<goal name="m:co" prereqs="m:checkout"/>
<goal name="m:checkout">
- <!--gscm:checkout module="activemq" root="${geronimo.activemq.cvs.access}@cvs.activemq.codehaus.org:/home/projects/activemq/scm"/-->
- <!--gscm:checkout module="howl/logger" root="${geronimo.howl.cvs.access}@cvs.forge.objectweb.org:/cvsroot/howl"/-->
- <!-- http isn't working to svn.codehaus.org. so using https for now... -->
<ant:exec dir="${basedir}" executable="svn">
<ant:arg line="checkout https://svn.codehaus.org/openejb/branches/dain-2.2-merge/notcm openejb"/>
</ant:exec>
-<!-- <gscm:checkout-tag module="openejb" root="${geronimo.openejb.cvs.access}@cvs.openejb.org:/home/projects/openejb/scm" tag="v2_0"/> -->
-<!--
- <mkdir dir="${basedir}/tranql"/>
- <gscm:checkout module="tranql" dest="${basedir}/tranql" root="${geronimo.tranql.cvs.access}@cvs.tranql.codehaus.org:/home/projects/tranql/scm"/>
- <gscm:checkout module="connector" dest="${basedir}/tranql" root="${geronimo.tranql.cvs.access}@cvs.tranql.codehaus.org:/home/projects/tranql/scm"/>-->
+ </goal>
+
+ <!-- =================================== -->
+ <!-- Goals for use by OpenEJB committers -->
+ <!-- =================================== -->
+ <goal name="m:cco" prereqs="m:committer-checkout"/>
+ <goal name="m:committer-checkout">
+ <ant:exec dir="${basedir}" executable="svn">
+ <ant:arg line="checkout https://svn.codehaus.org/openejb/trunk/openejb2 openejb"/>
+ </ant:exec>
</goal>
<goal name="m:update">
<ant:exec dir="${basedir}" executable="svn">
<ant:arg line="update"/>
</ant:exec>
- <!--gscm:update dir="${basedir}/activemq"/-->
- <!--gscm:update dir="${basedir}/howl/logger"/-->
<ant:exec dir="${basedir}/openejb" executable="svn">
<ant:arg line="update"/>
</ant:exec>
-<!--
- <gscm:update dir="${basedir}/tranql/tranql"/>
- <gscm:update dir="${basedir}/tranql/connector"/>
--->
</goal>
<goal name="m:fresh-checkout">
- <!--delete dir="${basedir}/activemq"/-->
- <!--delete dir="${basedir}/howl"/-->
<delete dir="${basedir}/openejb"/>
- <!--<delete dir="${basedir}/tranql"/>-->
<attainGoal name="m:checkout"/>
+ <ant:exec dir="${basedir}" executable="svn">
+ <ant:arg line="update"/>
+ </ant:exec>
+ </goal>
+
+ <goal name="m:cfresh-checkout">
+ <delete dir="${basedir}/openejb"/>
+ <attainGoal name="m:committer-checkout"/>
<ant:exec dir="${basedir}" executable="svn">
<ant:arg line="update"/>
</ant:exec>
Modified: geronimo/branches/dain/notcm/modules/activation/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/activation/pom.xml?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/activation/pom.xml (original)
+++ geronimo/branches/dain/notcm/modules/activation/pom.xml Sat Aug 5 18:47:06 2006
@@ -17,34 +17,72 @@
<!-- $Rev$ $Date$ -->
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>modules-parent</artifactId>
+ <artifactId>modules</artifactId>
<version>1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>geronimo-activation</artifactId>
<name>Geronimo :: Activation</name>
- <description>Geronimo Activation implements Content Handlers for use in conjuction with the Java Activation Framework.</description>
- <properties>
- <maven.test.skip>true</maven.test.skip>
- </properties>
-
+ <description>
+ Geronimo Activation implements Content Handlers for use in
+ conjuction with the Java Activation Framework.
+ </description>
+
+ <!--
+
+ HACK: Need to explicitly configure SCM for this module since its artifactId
+ does not match the directory it lives in.
+
+ FIXME: Rename module directory or artifactId.
+
+ -->
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/trunk/modules/activation</connection>
+ <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/trunk/modules/activation</developerConnection>
+ <url>http://svn.apache.org/repos/asf/geronimo/trunk/modules/activation</url>
+ </scm>
+
<dependencies>
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-activation_1.0.2_spec</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-javamail_1.3.1_spec</artifactId>
</dependency>
+
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/Abstract*.java</exclude>
+
+ <!--
+ FIXME: This test fails on JDK 1.5, works on 1.4:
+
+ https://issues.apache.org/jira/browse/GERONIMO-2209
+ -->
+ <exclude>**/MailcapTest.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: geronimo/branches/dain/notcm/modules/activemq-embedded-rar/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/activemq-embedded-rar/pom.xml?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/activemq-embedded-rar/pom.xml (original)
+++ geronimo/branches/dain/notcm/modules/activemq-embedded-rar/pom.xml Sat Aug 5 18:47:06 2006
@@ -17,12 +17,13 @@
<!-- $Rev$ $Date$ -->
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>modules-parent</artifactId>
+ <artifactId>modules</artifactId>
<version>1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -32,11 +33,24 @@
<description>Resource Adapter configuration for using ActiveMQ as a bundled JMS provider.</description>
<packaging>rar</packaging>
+ <!--
+
+ HACK: Need to explicitly configure SCM for this module since its artifactId
+ does not match the directory it lives in.
+
+ FIXME: Rename module directory or artifactId.
+
+ -->
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/trunk/modules/activemq-embedded-rar</connection>
+ <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/trunk/modules/activemq-embedded-rar</developerConnection>
+ <url>http://svn.apache.org/repos/asf/geronimo/trunk/modules/activemq-embedded-rar</url>
+ </scm>
+
<build>
<plugins>
<plugin>
<artifactId>maven-rar-plugin</artifactId>
- <version>${mavenRarPluginVersion}</version>
<configuration>
<raXmlFile>${basedir}/src/rar/META-INF/ra.xml</raXmlFile>
<includeJar>false</includeJar>
Modified: geronimo/branches/dain/notcm/modules/activemq-gbean-management/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/activemq-gbean-management/pom.xml?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/activemq-gbean-management/pom.xml (original)
+++ geronimo/branches/dain/notcm/modules/activemq-gbean-management/pom.xml Sat Aug 5 18:47:06 2006
@@ -17,24 +17,38 @@
<!-- $Rev: 411333 $ $Date: 2006-06-02 18:35:57 -0500 (Fri, 02 Jun 2006) $ -->
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://maven.apache.org/POM/4.0.0">
-
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
<modelVersion>4.0.0</modelVersion>
-
+
<parent>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>modules-parent</artifactId>
+ <artifactId>modules</artifactId>
<version>1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>geronimo-activemq-gbean-management</artifactId>
- <name>Geronimo :: ActiveMQ :: GBean Interfaces</name>
- <description>ActiveMQ Management Interfaces used by Geronimo</description>
-
+ <name>Geronimo :: ActiveMQ GBean Management Interfaces</name>
+
+ <description>
+ ActiveMQ Management Interfaces used by Geronimo
+ </description>
+
+ <!--
+
+ HACK: Need to explicitly configure SCM for this module since its artifactId
+ does not match the directory it lives in.
+
+ FIXME: Rename module directory or artifactId.
+
+ -->
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/trunk/modules/activemq-gbean-management</connection>
+ <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/trunk/modules/activemq-gbean-management</developerConnection>
+ <url>http://svn.apache.org/repos/asf/geronimo/trunk/modules/activemq-gbean-management</url>
+ </scm>
+
<dependencies>
<dependency>
@@ -42,16 +56,13 @@
<artifactId>geronimo-management</artifactId>
<version>${pom.version}</version>
</dependency>
-
- <dependency>
- <groupId>backport-util-concurrent</groupId>
- <artifactId>backport-util-concurrent</artifactId>
- </dependency>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
</dependencies>
+
+ <build>
+ <!-- FIXME: Remove when the default is to use the m2 standard layout -->
+ <sourceDirectory>${pom.basedir}/src/main/java</sourceDirectory>
+ <testSourceDirectory>${pom.basedir}/src/test/java</testSourceDirectory>
+ </build>
+
</project>
Modified: geronimo/branches/dain/notcm/modules/activemq-gbean/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/activemq-gbean/pom.xml?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/activemq-gbean/pom.xml (original)
+++ geronimo/branches/dain/notcm/modules/activemq-gbean/pom.xml Sat Aug 5 18:47:06 2006
@@ -17,39 +17,41 @@
<!-- $Rev: 411333 $ $Date: 2006-06-02 18:35:57 -0500 (Fri, 02 Jun 2006) $ -->
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://maven.apache.org/POM/4.0.0">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>modules-parent</artifactId>
+ <artifactId>modules</artifactId>
<version>1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>geronimo-activemq-gbean</artifactId>
- <name>ActiveMQ :: GBeans</name>
- <description>Geronimo ActiveMQ Integration</description>
-
+ <name>Geronimo :: ActiveMQ GBeans</name>
+
+ <description>
+ Geronimo ActiveMQ Integration
+ </description>
+
+ <!--
+
+ HACK: Need to explicitly configure SCM for this module since its artifactId
+ does not match the directory it lives in.
+
+ FIXME: Rename module directory or artifactId.
+
+ -->
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/trunk/modules/activemq-gbean</connection>
+ <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/trunk/modules/activemq-gbean</developerConnection>
+ <url>http://svn.apache.org/repos/asf/geronimo/trunk/modules/activemq-gbean</url>
+ </scm>
+
<dependencies>
<dependency>
- <groupId>incubator-activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <version>4.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>incubator-activemq</groupId>
- <artifactId>activeio-core</artifactId>
- <version>3.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-activemq-gbean-management</artifactId>
<version>${pom.version}</version>
@@ -78,17 +80,41 @@
<artifactId>geronimo-j2ee</artifactId>
<version>${pom.version}</version>
</dependency>
-
+
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-connector</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>incubator-activemq</groupId>
+ <artifactId>activemq-core</artifactId>
+ <version>4.0.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>incubator-activemq</groupId>
+ <artifactId>activeio-core</artifactId>
+ <version>3.0-beta3</version>
+ </dependency>
+
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
-
+
<dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j</artifactId>
</dependency>
-
+
</dependencies>
-
+
+ <build>
+ <!-- FIXME: Remove when the default is to use the m2 standard layout -->
+ <sourceDirectory>${pom.basedir}/src/main/java</sourceDirectory>
+ <testSourceDirectory>${pom.basedir}/src/test/java</testSourceDirectory>
+ </build>
+
</project>
Modified: geronimo/branches/dain/notcm/modules/axis-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/axis-builder/pom.xml?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/axis-builder/pom.xml (original)
+++ geronimo/branches/dain/notcm/modules/axis-builder/pom.xml Sat Aug 5 18:47:06 2006
@@ -14,13 +14,16 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+
<!-- $Rev$ $Date$ -->
-<project>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>modules-parent</artifactId>
+ <artifactId>modules</artifactId>
<version>1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -28,6 +31,20 @@
<artifactId>geronimo-axis-builder</artifactId>
<name>Geronimo :: Axis :: Builder</name>
+ <!--
+
+ HACK: Need to explicitly configure SCM for this module since its artifactId
+ does not match the directory it lives in.
+
+ FIXME: Rename module directory or artifactId.
+
+ -->
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/trunk/modules/axis-builder</connection>
+ <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/trunk/modules/axis-builder</developerConnection>
+ <url>http://svn.apache.org/repos/asf/geronimo/trunk/modules/axis-builder</url>
+ </scm>
+
<dependencies>
<!-- Module Dependencies -->
@@ -116,6 +133,15 @@
<build>
<resources>
+ <resource>
+ <directory>${pom.basedir}</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+
<!-- This schema is NOT compiled to xmlobjects. Do not remove! Used by SchemaInfoBuilder -->
<resource>
<directory>src/schema</directory>
@@ -128,23 +154,37 @@
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemProperties>
- <!--<geronimo.run.external.webservicetest>true</geronimo.run.external.webservicetest> -->
- </systemProperties>
-
- <forkMode>once</forkMode>
- </configuration>
- </plugin>
-
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>xmlbeans-maven-plugin</artifactId>
<configuration>
<sourceSchemas>wsdl.xsd</sourceSchemas>
</configuration>
+ </plugin>
+
+ <!--
+ HACK: Copy the generated XmlBeans bits for clover
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <mkdir dir="${pom.basedir}/target/clover/classes"/>
+ <copy todir="${pom.basedir}/target/clover/classes">
+ <fileset dir="${pom.basedir}/target/classes">
+ <include name="schemaorg_apache_xmlbeans/**"/>
+ </fileset>
+ </copy>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
Propchange: geronimo/branches/dain/notcm/modules/axis-builder/src/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Sat Aug 5 18:47:06 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/modules/axis-builder/src:423551
Propchange: geronimo/branches/dain/notcm/modules/axis-builder/src/java/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Sat Aug 5 18:47:06 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/modules/axis-builder/src/java:423551
Modified: geronimo/branches/dain/notcm/modules/axis/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/axis/pom.xml?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/axis/pom.xml (original)
+++ geronimo/branches/dain/notcm/modules/axis/pom.xml Sat Aug 5 18:47:06 2006
@@ -17,16 +17,13 @@
<!-- $Rev$ $Date$ -->
-<project
- xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>modules-parent</artifactId>
+ <artifactId>modules</artifactId>
<version>1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -36,6 +33,20 @@
<name>Geronimo :: Axis</name>
<description>Geronimo Axis Integration</description>
+ <!--
+
+ HACK: Need to explicitly configure SCM for this module since its artifactId
+ does not match the directory it lives in.
+
+ FIXME: Rename module directory or artifactId.
+
+ -->
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/trunk/modules/axis</connection>
+ <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/trunk/modules/axis</developerConnection>
+ <url>http://svn.apache.org/repos/asf/geronimo/trunk/modules/axis</url>
+ </scm>
+
<dependencies>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
@@ -115,6 +126,15 @@
<build>
<resources>
+ <resource>
+ <directory>${pom.basedir}</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+
<resource>
<directory>src/resources2</directory>
</resource>
Modified: geronimo/branches/dain/notcm/modules/client-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/client-builder/pom.xml?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/client-builder/pom.xml (original)
+++ geronimo/branches/dain/notcm/modules/client-builder/pom.xml Sat Aug 5 18:47:06 2006
@@ -17,12 +17,13 @@
<!-- $Rev$ $Date$ -->
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>modules-parent</artifactId>
+ <artifactId>modules</artifactId>
<version>1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -30,6 +31,20 @@
<artifactId>geronimo-client-builder</artifactId>
<name>Geronimo :: Client Builder</name>
+ <!--
+
+ HACK: Need to explicitly configure SCM for this module since its artifactId
+ does not match the directory it lives in.
+
+ FIXME: Rename module directory or artifactId.
+
+ -->
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/trunk/modules/client-builder</connection>
+ <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/trunk/modules/client-builder</developerConnection>
+ <url>http://svn.apache.org/repos/asf/geronimo/trunk/modules/client-builder</url>
+ </scm>
+
<dependencies>
<!-- Module Dependencies -->
@@ -59,6 +74,15 @@
<build>
<resources>
<resource>
+ <directory>${pom.basedir}</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+
+ <resource>
<directory>${pom.basedir}/src/resources2</directory>
</resource>
</resources>
@@ -70,6 +94,32 @@
<configuration>
<sourceSchemas>geronimo-application-client-1.1.xsd</sourceSchemas>
</configuration>
+ </plugin>
+
+ <!--
+ HACK: Copy the generated XmlBeans bits for clover
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <mkdir dir="${pom.basedir}/target/clover/classes"/>
+ <copy todir="${pom.basedir}/target/clover/classes">
+ <fileset dir="${pom.basedir}/target/classes">
+ <include name="schemaorg_apache_xmlbeans/**"/>
+ </fileset>
+ </copy>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
Modified: geronimo/branches/dain/notcm/modules/client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/client/pom.xml?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/client/pom.xml (original)
+++ geronimo/branches/dain/notcm/modules/client/pom.xml Sat Aug 5 18:47:06 2006
@@ -17,23 +17,33 @@
<!-- $Rev$ $Date$ -->
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>modules-parent</artifactId>
+ <artifactId>modules</artifactId>
<version>1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>geronimo-client</artifactId>
- <packaging>jar</packaging>
<name>Geronimo :: Client</name>
-
- <!-- ============ -->
- <!-- Dependencies -->
- <!-- ============ -->
+
+ <!--
+
+ HACK: Need to explicitly configure SCM for this module since its artifactId
+ does not match the directory it lives in.
+
+ FIXME: Rename module directory or artifactId.
+
+ -->
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/trunk/modules/client</connection>
+ <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/trunk/modules/client</developerConnection>
+ <url>http://svn.apache.org/repos/asf/geronimo/trunk/modules/client</url>
+ </scm>
<dependencies>
Modified: geronimo/branches/dain/notcm/modules/common/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/common/pom.xml?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/common/pom.xml (original)
+++ geronimo/branches/dain/notcm/modules/common/pom.xml Sat Aug 5 18:47:06 2006
@@ -17,20 +17,34 @@
<!-- $Rev$ $Date$ -->
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>modules-parent</artifactId>
+ <artifactId>modules</artifactId>
<version>1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>geronimo-common</artifactId>
<name>Geronimo :: Common</name>
- <description>Geronimo Common</description>
-
+
+ <!--
+
+ HACK: Need to explicitly configure SCM for this module since its artifactId
+ does not match the directory it lives in.
+
+ FIXME: Rename module directory or artifactId.
+
+ -->
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/trunk/modules/common</connection>
+ <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/trunk/modules/common</developerConnection>
+ <url>http://svn.apache.org/repos/asf/geronimo/trunk/modules/common</url>
+ </scm>
+
<dependencies>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
@@ -38,5 +52,6 @@
<version>${pom.version}</version>
</dependency>
</dependencies>
+
</project>
Propchange: geronimo/branches/dain/notcm/modules/common/src/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Sat Aug 5 18:47:06 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/modules/common/src:427996
Propchange: geronimo/branches/dain/notcm/modules/connector-builder/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Sat Aug 5 18:47:06 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/modules/connector-builder:421368
Modified: geronimo/branches/dain/notcm/modules/connector-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/connector-builder/pom.xml?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/connector-builder/pom.xml (original)
+++ geronimo/branches/dain/notcm/modules/connector-builder/pom.xml Sat Aug 5 18:47:06 2006
@@ -17,23 +17,33 @@
<!-- $Rev$ $Date$ -->
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>modules-parent</artifactId>
+ <artifactId>modules</artifactId>
<version>1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>geronimo-connector-builder</artifactId>
<name>Geronimo :: Connector :: Builder</name>
-
- <properties>
- <!-- FIXME: Should never need to default to skip!!! -->
- <maven.test.skip>true</maven.test.skip>
- </properties>
+
+ <!--
+
+ HACK: Need to explicitly configure SCM for this module since its artifactId
+ does not match the directory it lives in.
+
+ FIXME: Rename module directory or artifactId.
+
+ -->
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/trunk/modules/connector-builder</connection>
+ <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/trunk/modules/connector-builder</developerConnection>
+ <url>http://svn.apache.org/repos/asf/geronimo/trunk/modules/connector-builder</url>
+ </scm>
<dependencies>
@@ -89,9 +99,17 @@
</dependencies>
<build>
- <!-- move this to parent pom -->
<resources>
<resource>
+ <directory>${pom.basedir}</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+
+ <resource>
<directory>${pom.basedir}/src/schema</directory>
<targetPath>META-INF</targetPath>
<includes>
@@ -102,6 +120,15 @@
<plugins>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>xmlbeans-maven-plugin</artifactId>
+ <configuration>
+ <sourceSchemas>geronimo-connector-1.1.xsd</sourceSchemas>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
@@ -116,25 +143,49 @@
<goal>run</goal>
</goals>
</execution>
+
+ <!--
+ HACK: Copy the generated XmlBeans bits for clover
+ -->
+ <execution>
+ <id>generate-resources</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <mkdir dir="${pom.basedir}/target/clover/classes"/>
+ <copy todir="${pom.basedir}/target/clover/classes">
+ <fileset dir="${pom.basedir}/target/classes">
+ <include name="schemaorg_apache_xmlbeans/**"/>
+ </fileset>
+ </copy>
+ </tasks>
+ </configuration>
+ </execution>
</executions>
</plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>xmlbeans-maven-plugin</artifactId>
- <configuration>
- <sourceSchemas>geronimo-connector-1.1.xsd</sourceSchemas>
- </configuration>
- </plugin>
-
+
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<systemProperties>
- <java.security.auth.login.config>${basedir}/src/test-data/data/login.config</java.security.auth.login.config>
- <user.dir>${basedir}</user.dir>
+ <property>
+ <name>java.security.auth.login.config</name>
+ <value>${basedir}/src/test-data/data/login.config</value>
+ </property>
</systemProperties>
- <forkMode>once</forkMode>
+
+ <excludes>
+ <exclude>**/Abstract*.java</exclude>
+
+ <!--
+ FIXME: This test was disabled because it is failing in non-obvious ways
+ and requires someone with more insight to resolve
+ -->
+ <exclude>**/Connector15DCBTest.java</exclude>
+ </excludes>
</configuration>
</plugin>
</plugins>
Modified: geronimo/branches/dain/notcm/modules/connector/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/connector/pom.xml?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/connector/pom.xml (original)
+++ geronimo/branches/dain/notcm/modules/connector/pom.xml Sat Aug 5 18:47:06 2006
@@ -17,25 +17,36 @@
<!-- $Rev$ $Date$ -->
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>modules-parent</artifactId>
+ <artifactId>modules</artifactId>
<version>1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>geronimo-connector</artifactId>
<name>Geronimo :: Connector</name>
- <description>Geronimo Connector</description>
-
- <properties>
- <maven.test.skip>true</maven.test.skip>
- </properties>
+ <!--
+
+ HACK: Need to explicitly configure SCM for this module since its artifactId
+ does not match the directory it lives in.
+
+ FIXME: Rename module directory or artifactId.
+
+ -->
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/trunk/modules/connector</connection>
+ <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/trunk/modules/connector</developerConnection>
+ <url>http://svn.apache.org/repos/asf/geronimo/trunk/modules/connector</url>
+ </scm>
+
<dependencies>
+
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-naming</artifactId>
@@ -119,6 +130,8 @@
<groupId>regexp</groupId>
<artifactId>regexp</artifactId>
</dependency>
+
</dependencies>
+
</project>
Propchange: geronimo/branches/dain/notcm/modules/connector/src/java/org/apache/geronimo/connector/outbound/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Sat Aug 5 18:47:06 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound:421368
Propchange: geronimo/branches/dain/notcm/modules/console-web/src/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Sat Aug 5 18:47:06 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/modules/console-web/src:424119
Modified: geronimo/branches/dain/notcm/modules/converter/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/converter/pom.xml?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/converter/pom.xml (original)
+++ geronimo/branches/dain/notcm/modules/converter/pom.xml Sat Aug 5 18:47:06 2006
@@ -17,19 +17,34 @@
<!-- $Rev$ $Date$ -->
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>modules-parent</artifactId>
+ <artifactId>modules</artifactId>
<version>1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>geronimo-converter</artifactId>
<name>Geronimo :: Configuration Converter</name>
-
+
+ <!--
+
+ HACK: Need to explicitly configure SCM for this module since its artifactId
+ does not match the directory it lives in.
+
+ FIXME: Rename module directory or artifactId.
+
+ -->
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/trunk/modules/converter</connection>
+ <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/trunk/modules/converter</developerConnection>
+ <url>http://svn.apache.org/repos/asf/geronimo/trunk/modules/converter</url>
+ </scm>
+
<dependencies>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
Modified: geronimo/branches/dain/notcm/modules/converter/src/java/org/apache/geronimo/converter/bea/WebLogic81DatabaseConverter.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/converter/src/java/org/apache/geronimo/converter/bea/WebLogic81DatabaseConverter.java?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/converter/src/java/org/apache/geronimo/converter/bea/WebLogic81DatabaseConverter.java (original)
+++ geronimo/branches/dain/notcm/modules/converter/src/java/org/apache/geronimo/converter/bea/WebLogic81DatabaseConverter.java Sat Aug 5 18:47:06 2006
@@ -33,6 +33,7 @@
import org.apache.geronimo.converter.JDBCPool;
import org.apache.geronimo.converter.XADatabasePool;
import org.apache.geronimo.converter.AbstractDatabasePool;
+import org.apache.geronimo.kernel.util.XmlUtil;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
@@ -58,7 +59,7 @@
List local = new ArrayList();
List xa = new ArrayList();
- DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+ DocumentBuilderFactory factory = XmlUtil.newDocumentBuilderFactory();
factory.setValidating(false);
try {
DocumentBuilder builder = factory.newDocumentBuilder();
Modified: geronimo/branches/dain/notcm/modules/converter/src/java/org/apache/geronimo/converter/jboss/JBoss4DatabaseConverter.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/converter/src/java/org/apache/geronimo/converter/jboss/JBoss4DatabaseConverter.java?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/converter/src/java/org/apache/geronimo/converter/jboss/JBoss4DatabaseConverter.java (original)
+++ geronimo/branches/dain/notcm/modules/converter/src/java/org/apache/geronimo/converter/jboss/JBoss4DatabaseConverter.java Sat Aug 5 18:47:06 2006
@@ -28,6 +28,7 @@
import org.apache.geronimo.converter.XADatabasePool;
import org.apache.geronimo.converter.AbstractDatabasePool;
import org.apache.geronimo.converter.DOMUtils;
+import org.apache.geronimo.kernel.util.XmlUtil;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
@@ -47,7 +48,7 @@
List local = new ArrayList();
List xa = new ArrayList();
- DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+ DocumentBuilderFactory factory = XmlUtil.newDocumentBuilderFactory();
factory.setValidating(false);
try {
DocumentBuilder builder = factory.newDocumentBuilder();
Modified: geronimo/branches/dain/notcm/modules/core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/core/pom.xml?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/core/pom.xml (original)
+++ geronimo/branches/dain/notcm/modules/core/pom.xml Sat Aug 5 18:47:06 2006
@@ -17,21 +17,34 @@
<!-- $Rev$ $Date$ -->
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>modules-parent</artifactId>
+ <artifactId>modules</artifactId>
<version>1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>geronimo-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/trunk/modules/core</connection>
+ <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/trunk/modules/core</developerConnection>
+ <url>http://svn.apache.org/repos/asf/geronimo/trunk/modules/core</url>
+ </scm>
+
<dependencies>
<dependency>
<groupId>commons-logging</groupId>
Modified: geronimo/branches/dain/notcm/modules/deploy-config/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/deploy-config/pom.xml?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/deploy-config/pom.xml (original)
+++ geronimo/branches/dain/notcm/modules/deploy-config/pom.xml Sat Aug 5 18:47:06 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/trunk/modules/deploy-config</connection>
+ <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/trunk/modules/deploy-config</developerConnection>
+ <url>http://svn.apache.org/repos/asf/geronimo/trunk/modules/deploy-config</url>
+ </scm>
<dependencies>
<dependency>
@@ -52,5 +68,6 @@
<artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
</dependency>
</dependencies>
+
</project>
Modified: geronimo/branches/dain/notcm/modules/deploy-jsr88/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/deploy-jsr88/pom.xml?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/deploy-jsr88/pom.xml (original)
+++ geronimo/branches/dain/notcm/modules/deploy-jsr88/pom.xml Sat Aug 5 18:47:06 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/trunk/modules/deploy-jsr88</connection>
+ <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/trunk/modules/deploy-jsr88</developerConnection>
+ <url>http://svn.apache.org/repos/asf/geronimo/trunk/modules/deploy-jsr88</url>
+ </scm>
<dependencies>
<dependency>
@@ -106,5 +117,6 @@
<artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
</dependency>
</dependencies>
+
</project>
Propchange: geronimo/branches/dain/notcm/modules/deploy-jsr88/src/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Sat Aug 5 18:47:06 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/modules/deploy-jsr88/src:428849
Modified: geronimo/branches/dain/notcm/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/ConfigIDExtractor.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/ConfigIDExtractor.java?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/ConfigIDExtractor.java (original)
+++ geronimo/branches/dain/notcm/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/ConfigIDExtractor.java Sat Aug 5 18:47:06 2006
@@ -16,31 +16,30 @@
*/
package org.apache.geronimo.deployment.plugin;
-import java.io.File;
-import java.io.IOException;
-import java.io.Reader;
import java.io.BufferedReader;
+import java.io.File;
import java.io.FileReader;
+import java.io.IOException;
import java.io.InputStreamReader;
-import java.io.DataInputStream;
-import java.io.BufferedInputStream;
-import java.io.FileInputStream;
-import java.util.jar.JarFile;
-import java.util.jar.JarEntry;
-import java.util.Stack;
+import java.io.Reader;
import java.util.Collection;
-import java.util.List;
import java.util.LinkedList;
-import javax.xml.parsers.SAXParserFactory;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.ParserConfigurationException;
+import java.util.List;
+import java.util.Stack;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
import javax.enterprise.deploy.spi.TargetModuleID;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
import org.apache.geronimo.common.DeploymentException;
+import org.apache.geronimo.common.FileUtils;
import org.apache.geronimo.kernel.repository.Artifact;
import org.apache.geronimo.kernel.repository.Version;
+import org.apache.geronimo.kernel.util.XmlUtil;
+import org.xml.sax.Attributes;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
-import org.xml.sax.Attributes;
import org.xml.sax.helpers.DefaultHandler;
/**
@@ -97,7 +96,7 @@
return name;
}
} else {
- if(!isJarFile(module)) {
+ if(!FileUtils.isZipFile(module)) {
throw new DeploymentException(module.getAbsolutePath()+" is neither a JAR file nor a directory!");
}
JarFile input = new JarFile(module);
@@ -209,7 +208,7 @@
}
private static String extractModuleIdFromPlan(Reader plan) throws IOException {
- SAXParserFactory factory = SAXParserFactory.newInstance();
+ SAXParserFactory factory = XmlUtil.newSAXParserFactory();
factory.setNamespaceAware(true);
factory.setValidating(false);
try {
@@ -231,24 +230,14 @@
/**
* Try to determine whether a file is a JAR File (or, at least, a ZIP file).
+ *
+ * @deprecated See org.apache.geronimo.common.FileUtils.isJarFile
*/
public static boolean isJarFile(File file) throws DeploymentException {
- if(file.isDirectory()) {
- return false;
- }
- if(!file.canRead()) {
- throw new DeploymentException("Cannot read file "+file.getAbsolutePath());
- }
- if(file.length() < 4) {
- return false;
- }
try {
- DataInputStream in = new DataInputStream(new BufferedInputStream(new FileInputStream(file)));
- int test = in.readInt();
- in.close();
- return test == 0x504b0304;
- } catch(IOException e) {
- throw new DeploymentException("Cannot read from file "+file.getAbsolutePath(), e);
+ return FileUtils.isZipFile(file);
+ } catch (IOException e) {
+ throw new DeploymentException("Unable to read file "+file.getAbsolutePath());
}
}
@@ -259,8 +248,12 @@
private String inElement = null;
private Stack parent = new Stack();
private boolean formatIs10 = false;
+ private String defaultType;
public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
+ if(defaultType == null && uri != null && !uri.equals("")) {
+ setDefaultType(uri);
+ }
if(inConfigId) {
if(localName.equals("groupId") || localName.equals("artifactId") || localName.equals("version") || localName.equals("type")) {
inElement = localName;
@@ -278,6 +271,22 @@
parent.push(localName);
}
+ private void setDefaultType(String namespace) {
+ if(namespace.indexOf("web") > -1) {
+ defaultType = "war";
+ } else if(namespace.indexOf("openejb") > -1) {
+ defaultType = "jar";
+ } else if(namespace.indexOf("connector") > -1) {
+ defaultType = "rar";
+ } else if(namespace.indexOf("application-client") > -1) {
+ defaultType = "jar";
+ } else if(namespace.indexOf("application") > -1) {
+ defaultType = "ear";
+ } else {
+ defaultType = "car";
+ }
+ }
+
public void characters(char ch[], int start, int length) throws SAXException {
if(inElement != null) {
formatIs10 = false;
@@ -302,6 +311,9 @@
public void endDocument() throws SAXException {
if(!formatIs10) {
+ if(type.equals("") && defaultType != null) {
+ type = defaultType;
+ }
configId = groupId+"/"+artifactId+"/"+version+"/"+type;
}
if(configId.equals("///")) {
Modified: geronimo/branches/dain/notcm/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java (original)
+++ geronimo/branches/dain/notcm/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java Sat Aug 5 18:47:06 2006
@@ -169,6 +169,9 @@
}
private void redeploySameConfiguration(ConfigurationManager configurationManager, Artifact configID, Target target) throws Exception {
+ if(!configID.isResolved()) {
+ throw new IllegalStateException("Cannot redeploy same module when module ID is not fully resolved ("+configID+")");
+ }
try {
configurationManager.stopConfiguration(configID);
updateStatus("Stopped "+configID);
@@ -179,6 +182,8 @@
} else {
throw cause;
}
+ } catch(NoSuchConfigException e) {
+ // The module isn't loaded -- that's OK
}
try {
configurationManager.unloadConfiguration(configID);
Modified: geronimo/branches/dain/notcm/modules/deploy-tool/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/deploy-tool/pom.xml?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/deploy-tool/pom.xml (original)
+++ geronimo/branches/dain/notcm/modules/deploy-tool/pom.xml Sat Aug 5 18:47:06 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/trunk/modules/deploy-tool</connection>
+ <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/trunk/modules/deploy-tool</developerConnection>
+ <url>http://svn.apache.org/repos/asf/geronimo/trunk/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/branches/dain/notcm/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Sat Aug 5 18:47:06 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli:423294
Modified: geronimo/branches/dain/notcm/modules/deployment/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/deployment/pom.xml?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/deployment/pom.xml (original)
+++ geronimo/branches/dain/notcm/modules/deployment/pom.xml Sat Aug 5 18:47:06 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/trunk/modules/deployment</connection>
+ <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/trunk/modules/deployment</developerConnection>
+ <url>http://svn.apache.org/repos/asf/geronimo/trunk/modules/deployment</url>
+ </scm>
<dependencies>
<dependency>
@@ -65,5 +74,6 @@
<artifactId>xml-resolver</artifactId>
</dependency>
</dependencies>
+
</project>
Propchange: geronimo/branches/dain/notcm/modules/deployment/src/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Sat Aug 5 18:47:06 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/modules/deployment/src:427986
Modified: geronimo/branches/dain/notcm/modules/deployment/src/java/org/apache/geronimo/deployment/xml/ParserFactoryImpl.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/deployment/src/java/org/apache/geronimo/deployment/xml/ParserFactoryImpl.java?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/deployment/src/java/org/apache/geronimo/deployment/xml/ParserFactoryImpl.java (original)
+++ geronimo/branches/dain/notcm/modules/deployment/src/java/org/apache/geronimo/deployment/xml/ParserFactoryImpl.java Sat Aug 5 18:47:06 2006
@@ -25,6 +25,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.kernel.util.XmlUtil;
import org.xml.sax.EntityResolver;
import org.xml.sax.ErrorHandler;
import org.xml.sax.SAXParseException;
@@ -44,7 +45,7 @@
public ParserFactoryImpl(EntityResolver entityResolver) {
this.entityResolver = entityResolver;
- factory = DocumentBuilderFactory.newInstance();
+ factory = XmlUtil.newDocumentBuilderFactory();
//sets "http://xml.org/sax/features/namespaces"
factory.setNamespaceAware(true);
//sets "http://xml.org/sax/features/validation"
Modified: geronimo/branches/dain/notcm/modules/deployment/src/test/org/apache/geronimo/deployment/SingleFileHotDeployerTest.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/deployment/src/test/org/apache/geronimo/deployment/SingleFileHotDeployerTest.java?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/deployment/src/test/org/apache/geronimo/deployment/SingleFileHotDeployerTest.java (original)
+++ geronimo/branches/dain/notcm/modules/deployment/src/test/org/apache/geronimo/deployment/SingleFileHotDeployerTest.java Sat Aug 5 18:47:06 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/branches/dain/notcm/modules/derby/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/derby/pom.xml?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/derby/pom.xml (original)
+++ geronimo/branches/dain/notcm/modules/derby/pom.xml Sat Aug 5 18:47:06 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/trunk/modules/derby</connection>
+ <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/trunk/modules/derby</developerConnection>
+ <url>http://svn.apache.org/repos/asf/geronimo/trunk/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/branches/dain/notcm/modules/directory/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/directory/pom.xml?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/directory/pom.xml (original)
+++ geronimo/branches/dain/notcm/modules/directory/pom.xml Sat Aug 5 18:47:06 2006
@@ -17,12 +17,13 @@
<!-- $Rev$ $Date$ -->
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>modules-parent</artifactId>
+ <artifactId>modules</artifactId>
<version>1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -30,6 +31,20 @@
<artifactId>geronimo-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/trunk/modules/directory</connection>
+ <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/trunk/modules/directory</developerConnection>
+ <url>http://svn.apache.org/repos/asf/geronimo/trunk/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/branches/dain/notcm/modules/hot-deploy/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/hot-deploy/pom.xml?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/hot-deploy/pom.xml (original)
+++ geronimo/branches/dain/notcm/modules/hot-deploy/pom.xml Sat Aug 5 18:47:06 2006
@@ -17,20 +17,36 @@
<!-- $Rev$ $Date$ -->
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>modules-parent</artifactId>
+ <artifactId>modules</artifactId>
<version>1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>geronimo-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/trunk/modules/hot-deploy</connection>
+ <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/trunk/modules/hot-deploy</developerConnection>
+ <url>http://svn.apache.org/repos/asf/geronimo/trunk/modules/hot-deploy</url>
+ </scm>
+
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -88,5 +104,6 @@
</dependency>
</dependencies>
+
</project>
Modified: geronimo/branches/dain/notcm/modules/installer-processing/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/installer-processing/pom.xml?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/installer-processing/pom.xml (original)
+++ geronimo/branches/dain/notcm/modules/installer-processing/pom.xml Sat Aug 5 18:47:06 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/trunk/modules/installer-processing</connection>
+ <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/trunk/modules/installer-processing</developerConnection>
+ <url>http://svn.apache.org/repos/asf/geronimo/trunk/modules/installer-processing</url>
+ </scm>
+
<dependencies>
<dependency>
<groupId>xerces</groupId>
@@ -37,5 +52,6 @@
<version>2.4.0</version>
</dependency>
</dependencies>
+
</project>
Modified: geronimo/branches/dain/notcm/modules/installer-support/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/installer-support/pom.xml?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/installer-support/pom.xml (original)
+++ geronimo/branches/dain/notcm/modules/installer-support/pom.xml Sat Aug 5 18:47:06 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/trunk/modules/installer-support</connection>
+ <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/trunk/modules/installer-support</developerConnection>
+ <url>http://svn.apache.org/repos/asf/geronimo/trunk/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/branches/dain/notcm/modules/interceptor/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/interceptor/pom.xml?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/interceptor/pom.xml (original)
+++ geronimo/branches/dain/notcm/modules/interceptor/pom.xml Sat Aug 5 18:47:06 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/trunk/modules/interceptor</connection>
+ <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/trunk/modules/interceptor</developerConnection>
+ <url>http://svn.apache.org/repos/asf/geronimo/trunk/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/branches/dain/notcm/modules/j2ee-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/j2ee-builder/pom.xml?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/j2ee-builder/pom.xml (original)
+++ geronimo/branches/dain/notcm/modules/j2ee-builder/pom.xml Sat Aug 5 18:47:06 2006
@@ -17,12 +17,13 @@
<!-- $Rev$ $Date$ -->
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>modules-parent</artifactId>
+ <artifactId>modules</artifactId>
<version>1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -30,6 +31,20 @@
<artifactId>geronimo-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/trunk/modules/j2ee-builder</connection>
+ <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/trunk/modules/j2ee-builder</developerConnection>
+ <url>http://svn.apache.org/repos/asf/geronimo/trunk/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>