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/27 00:30:10 UTC
svn commit: r437240 - in /geronimo/server/trunk/modules: ./ activation/
activemq-embedded-rar/ activemq-gbean-management/ activemq-gbean/
axis-builder/ axis/ client-builder/ client/ common/ connector-builder/
connector/ converter/ core/ deploy-config/ ...
Author: jdillon
Date: Sat Aug 26 15:30:02 2006
New Revision: 437240
URL: http://svn.apache.org/viewvc?rev=437240&view=rev
Log:
(GERONIMO-2162) Use same directory as artifactId for modules/*
Added:
geronimo/server/trunk/modules/ge-activemq-rar/
- copied from r437231, geronimo/server/trunk/modules/activemq-embedded-rar/
geronimo/server/trunk/modules/geronimo-activation/
- copied from r437231, geronimo/server/trunk/modules/activation/
geronimo/server/trunk/modules/geronimo-activemq-gbean/
- copied from r437231, geronimo/server/trunk/modules/activemq-gbean/
geronimo/server/trunk/modules/geronimo-activemq-gbean-management/
- copied from r437231, geronimo/server/trunk/modules/activemq-gbean-management/
geronimo/server/trunk/modules/geronimo-axis/
- copied from r437231, geronimo/server/trunk/modules/axis/
geronimo/server/trunk/modules/geronimo-axis-builder/
- copied from r437231, geronimo/server/trunk/modules/axis-builder/
geronimo/server/trunk/modules/geronimo-client/
- copied from r437231, geronimo/server/trunk/modules/client/
geronimo/server/trunk/modules/geronimo-client-builder/
- copied from r437231, geronimo/server/trunk/modules/client-builder/
geronimo/server/trunk/modules/geronimo-common/
- copied from r437231, geronimo/server/trunk/modules/common/
geronimo/server/trunk/modules/geronimo-connector/
- copied from r437231, geronimo/server/trunk/modules/connector/
geronimo/server/trunk/modules/geronimo-connector-builder/
- copied from r437231, geronimo/server/trunk/modules/connector-builder/
geronimo/server/trunk/modules/geronimo-converter/
- copied from r437231, geronimo/server/trunk/modules/converter/
geronimo/server/trunk/modules/geronimo-core/
- copied from r437231, geronimo/server/trunk/modules/core/
geronimo/server/trunk/modules/geronimo-deploy-config/
- copied from r437231, geronimo/server/trunk/modules/deploy-config/
geronimo/server/trunk/modules/geronimo-deploy-jsr88/
- copied from r437231, geronimo/server/trunk/modules/deploy-jsr88/
geronimo/server/trunk/modules/geronimo-deploy-tool/
- copied from r437231, geronimo/server/trunk/modules/deploy-tool/
geronimo/server/trunk/modules/geronimo-deployment/
- copied from r437231, geronimo/server/trunk/modules/deployment/
geronimo/server/trunk/modules/geronimo-derby/
- copied from r437231, geronimo/server/trunk/modules/derby/
geronimo/server/trunk/modules/geronimo-directory/
- copied from r437231, geronimo/server/trunk/modules/directory/
geronimo/server/trunk/modules/geronimo-hot-deploy/
- copied from r437231, geronimo/server/trunk/modules/hot-deploy/
geronimo/server/trunk/modules/geronimo-interceptor/
- copied from r437231, geronimo/server/trunk/modules/interceptor/
geronimo/server/trunk/modules/geronimo-j2ee/
- copied from r437231, geronimo/server/trunk/modules/j2ee/
geronimo/server/trunk/modules/geronimo-j2ee-builder/
- copied from r437231, geronimo/server/trunk/modules/j2ee-builder/
geronimo/server/trunk/modules/geronimo-j2ee-schema/
- copied from r437231, geronimo/server/trunk/modules/j2ee-schema/
geronimo/server/trunk/modules/geronimo-jetty/
- copied from r437231, geronimo/server/trunk/modules/jetty/
geronimo/server/trunk/modules/geronimo-jetty-builder/
- copied from r437231, geronimo/server/trunk/modules/jetty-builder/
geronimo/server/trunk/modules/geronimo-jmx-remoting/
- copied from r437231, geronimo/server/trunk/modules/jmx-remoting/
geronimo/server/trunk/modules/geronimo-kernel/
- copied from r437231, geronimo/server/trunk/modules/kernel/
geronimo/server/trunk/modules/geronimo-mail/
- copied from r437231, geronimo/server/trunk/modules/mail/
geronimo/server/trunk/modules/geronimo-management/
- copied from r437231, geronimo/server/trunk/modules/management/
geronimo/server/trunk/modules/geronimo-naming/
- copied from r437231, geronimo/server/trunk/modules/naming/
geronimo/server/trunk/modules/geronimo-naming-builder/
- copied from r437231, geronimo/server/trunk/modules/naming-builder/
geronimo/server/trunk/modules/geronimo-security/
- copied from r437231, geronimo/server/trunk/modules/security/
geronimo/server/trunk/modules/geronimo-security-builder/
- copied from r437231, geronimo/server/trunk/modules/security-builder/
geronimo/server/trunk/modules/geronimo-service-builder/
- copied from r437231, geronimo/server/trunk/modules/service-builder/
geronimo/server/trunk/modules/geronimo-system/
- copied from r437231, geronimo/server/trunk/modules/system/
geronimo/server/trunk/modules/geronimo-test-ddbean/
- copied from r437231, geronimo/server/trunk/modules/test-ddbean/
geronimo/server/trunk/modules/geronimo-timer/
- copied from r437231, geronimo/server/trunk/modules/timer/
geronimo/server/trunk/modules/geronimo-tomcat/
- copied from r437231, geronimo/server/trunk/modules/tomcat/
geronimo/server/trunk/modules/geronimo-tomcat-builder/
- copied from r437231, geronimo/server/trunk/modules/tomcat-builder/
geronimo/server/trunk/modules/geronimo-transaction/
- copied from r437231, geronimo/server/trunk/modules/transaction/
geronimo/server/trunk/modules/geronimo-upgrade/
- copied from r437231, geronimo/server/trunk/modules/upgrade/
geronimo/server/trunk/modules/geronimo-util/
- copied from r437231, geronimo/server/trunk/modules/util/
geronimo/server/trunk/modules/geronimo-web-builder/
- copied from r437231, geronimo/server/trunk/modules/web-builder/
geronimo/server/trunk/modules/geronimo-webservices/
- copied from r437231, geronimo/server/trunk/modules/webservices/
Removed:
geronimo/server/trunk/modules/activation/
geronimo/server/trunk/modules/activemq-embedded-rar/
geronimo/server/trunk/modules/activemq-gbean/
geronimo/server/trunk/modules/activemq-gbean-management/
geronimo/server/trunk/modules/axis/
geronimo/server/trunk/modules/axis-builder/
geronimo/server/trunk/modules/client/
geronimo/server/trunk/modules/client-builder/
geronimo/server/trunk/modules/common/
geronimo/server/trunk/modules/connector/
geronimo/server/trunk/modules/connector-builder/
geronimo/server/trunk/modules/converter/
geronimo/server/trunk/modules/core/
geronimo/server/trunk/modules/deploy-config/
geronimo/server/trunk/modules/deploy-jsr88/
geronimo/server/trunk/modules/deploy-tool/
geronimo/server/trunk/modules/deployment/
geronimo/server/trunk/modules/derby/
geronimo/server/trunk/modules/directory/
geronimo/server/trunk/modules/hot-deploy/
geronimo/server/trunk/modules/interceptor/
geronimo/server/trunk/modules/j2ee/
geronimo/server/trunk/modules/j2ee-builder/
geronimo/server/trunk/modules/j2ee-schema/
geronimo/server/trunk/modules/jetty/
geronimo/server/trunk/modules/jetty-builder/
geronimo/server/trunk/modules/jmx-remoting/
geronimo/server/trunk/modules/kernel/
geronimo/server/trunk/modules/mail/
geronimo/server/trunk/modules/management/
geronimo/server/trunk/modules/naming/
geronimo/server/trunk/modules/naming-builder/
geronimo/server/trunk/modules/security/
geronimo/server/trunk/modules/security-builder/
geronimo/server/trunk/modules/service-builder/
geronimo/server/trunk/modules/system/
geronimo/server/trunk/modules/test-ddbean/
geronimo/server/trunk/modules/timer/
geronimo/server/trunk/modules/tomcat/
geronimo/server/trunk/modules/tomcat-builder/
geronimo/server/trunk/modules/transaction/
geronimo/server/trunk/modules/upgrade/
geronimo/server/trunk/modules/util/
geronimo/server/trunk/modules/web-builder/
geronimo/server/trunk/modules/webservices/
Modified:
geronimo/server/trunk/modules/ge-activemq-rar/pom.xml
geronimo/server/trunk/modules/geronimo-activation/pom.xml
geronimo/server/trunk/modules/geronimo-activemq-gbean-management/pom.xml
geronimo/server/trunk/modules/geronimo-activemq-gbean/pom.xml
geronimo/server/trunk/modules/geronimo-axis-builder/pom.xml
geronimo/server/trunk/modules/geronimo-axis/pom.xml
geronimo/server/trunk/modules/geronimo-client-builder/pom.xml
geronimo/server/trunk/modules/geronimo-client/pom.xml
geronimo/server/trunk/modules/geronimo-common/pom.xml
geronimo/server/trunk/modules/geronimo-connector-builder/pom.xml
geronimo/server/trunk/modules/geronimo-connector/pom.xml
geronimo/server/trunk/modules/geronimo-converter/pom.xml
geronimo/server/trunk/modules/geronimo-core/pom.xml
geronimo/server/trunk/modules/geronimo-deploy-config/pom.xml
geronimo/server/trunk/modules/geronimo-deploy-jsr88/pom.xml
geronimo/server/trunk/modules/geronimo-deploy-tool/pom.xml
geronimo/server/trunk/modules/geronimo-deployment/pom.xml
geronimo/server/trunk/modules/geronimo-derby/pom.xml
geronimo/server/trunk/modules/geronimo-directory/pom.xml
geronimo/server/trunk/modules/geronimo-hot-deploy/pom.xml
geronimo/server/trunk/modules/geronimo-interceptor/pom.xml
geronimo/server/trunk/modules/geronimo-j2ee-builder/pom.xml
geronimo/server/trunk/modules/geronimo-j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/SecurityBuilder.java
geronimo/server/trunk/modules/geronimo-j2ee-schema/pom.xml
geronimo/server/trunk/modules/geronimo-j2ee/pom.xml
geronimo/server/trunk/modules/geronimo-jetty-builder/pom.xml
geronimo/server/trunk/modules/geronimo-jetty/pom.xml
geronimo/server/trunk/modules/geronimo-jmx-remoting/pom.xml
geronimo/server/trunk/modules/geronimo-kernel/pom.xml
geronimo/server/trunk/modules/geronimo-mail/pom.xml
geronimo/server/trunk/modules/geronimo-management/pom.xml
geronimo/server/trunk/modules/geronimo-naming-builder/pom.xml
geronimo/server/trunk/modules/geronimo-naming/pom.xml
geronimo/server/trunk/modules/geronimo-security-builder/pom.xml
geronimo/server/trunk/modules/geronimo-security/pom.xml
geronimo/server/trunk/modules/geronimo-service-builder/pom.xml
geronimo/server/trunk/modules/geronimo-system/pom.xml
geronimo/server/trunk/modules/geronimo-test-ddbean/pom.xml
geronimo/server/trunk/modules/geronimo-testsupport/pom.xml
geronimo/server/trunk/modules/geronimo-timer/pom.xml
geronimo/server/trunk/modules/geronimo-tomcat-builder/pom.xml
geronimo/server/trunk/modules/geronimo-tomcat/pom.xml
geronimo/server/trunk/modules/geronimo-transaction/pom.xml
geronimo/server/trunk/modules/geronimo-upgrade/pom.xml
geronimo/server/trunk/modules/geronimo-util/pom.xml
geronimo/server/trunk/modules/geronimo-web-builder/pom.xml
geronimo/server/trunk/modules/geronimo-webservices/pom.xml
geronimo/server/trunk/modules/pom.xml
Modified: geronimo/server/trunk/modules/ge-activemq-rar/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/ge-activemq-rar/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
==============================================================================
--- geronimo/server/trunk/modules/ge-activemq-rar/pom.xml (original)
+++ geronimo/server/trunk/modules/ge-activemq-rar/pom.xml Sat Aug 26 15:30:02 2006
@@ -33,20 +33,6 @@
<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:http://svn.apache.org/repos/asf/geronimo/server/trunk/modules/activemq-embedded-rar</connection>
- <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/server/trunk/modules/activemq-embedded-rar</developerConnection>
- <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/activemq-embedded-rar</url>
- </scm>
-
<dependencies>
<dependency>
Modified: geronimo/server/trunk/modules/geronimo-activation/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-activation/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-activation/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-activation/pom.xml Sat Aug 26 15:30:02 2006
@@ -36,20 +36,6 @@
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:http://svn.apache.org/repos/asf/geronimo/server/trunk/modules/activation</connection>
- <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/server/trunk/modules/activation</developerConnection>
- <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/activation</url>
- </scm>
-
<dependencies>
<dependency>
Modified: geronimo/server/trunk/modules/geronimo-activemq-gbean-management/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-activemq-gbean-management/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-activemq-gbean-management/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-activemq-gbean-management/pom.xml Sat Aug 26 15:30:02 2006
@@ -31,24 +31,6 @@
<artifactId>geronimo-activemq-gbean-management</artifactId>
<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:http://svn.apache.org/repos/asf/geronimo/server/trunk/modules/activemq-gbean-management</connection>
- <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/server/trunk/modules/activemq-gbean-management</developerConnection>
- <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/activemq-gbean-management</url>
- </scm>
-
<dependencies>
<dependency>
Modified: geronimo/server/trunk/modules/geronimo-activemq-gbean/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-activemq-gbean/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-activemq-gbean/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-activemq-gbean/pom.xml Sat Aug 26 15:30:02 2006
@@ -31,24 +31,6 @@
<artifactId>geronimo-activemq-gbean</artifactId>
<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:http://svn.apache.org/repos/asf/geronimo/server/trunk/modules/activemq-gbean</connection>
- <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/server/trunk/modules/activemq-gbean</developerConnection>
- <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/activemq-gbean</url>
- </scm>
-
<dependencies>
<dependency>
Modified: geronimo/server/trunk/modules/geronimo-axis-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-axis-builder/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-axis-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-axis-builder/pom.xml Sat Aug 26 15:30:02 2006
@@ -31,24 +31,8 @@
<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:http://svn.apache.org/repos/asf/geronimo/server/trunk/modules/axis-builder</connection>
- <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/server/trunk/modules/axis-builder</developerConnection>
- <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/axis-builder</url>
- </scm>
-
<dependencies>
- <!-- Module Dependencies -->
-
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>geronimo-axis</artifactId>
@@ -85,8 +69,6 @@
<version>${pom.version}</version>
</dependency>
- <!-- Spec Dependencies -->
-
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
@@ -101,8 +83,6 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-qname_1.1_spec</artifactId>
</dependency>
-
- <!-- Thirdparty Dependencies -->
<dependency>
<groupId>asm</groupId>
Modified: geronimo/server/trunk/modules/geronimo-axis/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-axis/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-axis/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-axis/pom.xml Sat Aug 26 15:30:02 2006
@@ -31,21 +31,6 @@
<artifactId>geronimo-axis</artifactId>
<packaging>jar</packaging>
<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:http://svn.apache.org/repos/asf/geronimo/server/trunk/modules/axis</connection>
- <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/server/trunk/modules/axis</developerConnection>
- <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/axis</url>
- </scm>
<dependencies>
Modified: geronimo/server/trunk/modules/geronimo-client-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-client-builder/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-client-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-client-builder/pom.xml Sat Aug 26 15:30:02 2006
@@ -31,23 +31,7 @@
<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:http://svn.apache.org/repos/asf/geronimo/server/trunk/modules/client-builder</connection>
- <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/server/trunk/modules/client-builder</developerConnection>
- <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/client-builder</url>
- </scm>
-
<dependencies>
-
- <!-- Module Dependencies -->
<dependency>
<groupId>${pom.groupId}</groupId>
Modified: geronimo/server/trunk/modules/geronimo-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-client/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-client/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-client/pom.xml Sat Aug 26 15:30:02 2006
@@ -31,20 +31,6 @@
<artifactId>geronimo-client</artifactId>
<name>Geronimo :: Client</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:http://svn.apache.org/repos/asf/geronimo/server/trunk/modules/client</connection>
- <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/server/trunk/modules/client</developerConnection>
- <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/client</url>
- </scm>
-
<dependencies>
<dependency>
Modified: geronimo/server/trunk/modules/geronimo-common/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-common/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-common/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-common/pom.xml Sat Aug 26 15:30:02 2006
@@ -31,20 +31,6 @@
<artifactId>geronimo-common</artifactId>
<name>Geronimo :: Common</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:http://svn.apache.org/repos/asf/geronimo/server/trunk/modules/common</connection>
- <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/server/trunk/modules/common</developerConnection>
- <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/common</url>
- </scm>
-
<dependencies>
<dependency>
Modified: geronimo/server/trunk/modules/geronimo-connector-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector-builder/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-connector-builder/pom.xml Sat Aug 26 15:30:02 2006
@@ -31,24 +31,8 @@
<artifactId>geronimo-connector-builder</artifactId>
<name>Geronimo :: Connector :: 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:http://svn.apache.org/repos/asf/geronimo/server/trunk/modules/connector-builder</connection>
- <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/server/trunk/modules/connector-builder</developerConnection>
- <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/connector-builder</url>
- </scm>
-
<dependencies>
- <!-- Module Dependencies -->
-
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>geronimo-connector</artifactId>
@@ -72,8 +56,6 @@
<artifactId>geronimo-test-ddbean</artifactId>
<version>${pom.version}</version>
</dependency>
-
- <!-- Thirdparty Dependencies -->
<dependency>
<groupId>tranql</groupId>
Modified: geronimo/server/trunk/modules/geronimo-connector/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-connector/pom.xml Sat Aug 26 15:30:02 2006
@@ -31,20 +31,6 @@
<artifactId>geronimo-connector</artifactId>
<name>Geronimo :: Connector</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:http://svn.apache.org/repos/asf/geronimo/server/trunk/modules/connector</connection>
- <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/server/trunk/modules/connector</developerConnection>
- <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/connector</url>
- </scm>
-
<dependencies>
<dependency>
Modified: geronimo/server/trunk/modules/geronimo-converter/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-converter/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-converter/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-converter/pom.xml Sat Aug 26 15:30:02 2006
@@ -31,20 +31,6 @@
<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:http://svn.apache.org/repos/asf/geronimo/server/trunk/modules/converter</connection>
- <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/server/trunk/modules/converter</developerConnection>
- <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/converter</url>
- </scm>
-
<dependencies>
<dependency>
Modified: geronimo/server/trunk/modules/geronimo-core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-core/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-core/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-core/pom.xml Sat Aug 26 15:30:02 2006
@@ -31,20 +31,6 @@
<artifactId>geronimo-core</artifactId>
<name>Geronimo :: Core</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:http://svn.apache.org/repos/asf/geronimo/server/trunk/modules/core</connection>
- <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/server/trunk/modules/core</developerConnection>
- <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/core</url>
- </scm>
-
<dependencies>
<dependency>
Modified: geronimo/server/trunk/modules/geronimo-deploy-config/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-deploy-config/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-deploy-config/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-deploy-config/pom.xml Sat Aug 26 15:30:02 2006
@@ -30,27 +30,12 @@
<artifactId>geronimo-deploy-config</artifactId>
<name>Geronimo :: Deploy :: Common Config</name>
- <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:http://svn.apache.org/repos/asf/geronimo/server/trunk/modules/deploy-config</connection>
- <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/server/trunk/modules/deploy-config</developerConnection>
- <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/deploy-config</url>
- </scm>
<dependencies>
Modified: geronimo/server/trunk/modules/geronimo-deploy-jsr88/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-deploy-jsr88/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-deploy-jsr88/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-deploy-jsr88/pom.xml Sat Aug 26 15:30:02 2006
@@ -30,26 +30,9 @@
<artifactId>geronimo-deploy-jsr88</artifactId>
<name>Geronimo :: Deploy :: JSR-88</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:http://svn.apache.org/repos/asf/geronimo/server/trunk/modules/deploy-jsr88</connection>
- <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/server/trunk/modules/deploy-jsr88</developerConnection>
- <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/deploy-jsr88</url>
- </scm>
<dependencies>
- <!-- Module Dependencies -->
-
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-system</artifactId>
@@ -80,8 +63,6 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
</dependency>
-
- <!-- Thirdparty Dependencies -->
<dependency>
<groupId>mx4j</groupId>
Modified: geronimo/server/trunk/modules/geronimo-deploy-tool/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-deploy-tool/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-deploy-tool/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-deploy-tool/pom.xml Sat Aug 26 15:30:02 2006
@@ -31,20 +31,6 @@
<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:http://svn.apache.org/repos/asf/geronimo/server/trunk/modules/deploy-tool</connection>
- <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/server/trunk/modules/deploy-tool</developerConnection>
- <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/deploy-tool</url>
- </scm>
-
<dependencies>
<dependency>
@@ -82,8 +68,6 @@
<version>${pom.version}</version>
</dependency>
- <!-- Thirdparty Dependencies -->
-
<dependency>
<groupId>jline</groupId>
<artifactId>jline</artifactId>
Modified: geronimo/server/trunk/modules/geronimo-deployment/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-deployment/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-deployment/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-deployment/pom.xml Sat Aug 26 15:30:02 2006
@@ -31,31 +31,13 @@
<artifactId>geronimo-deployment</artifactId>
<name>Geronimo :: Deployment</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:http://svn.apache.org/repos/asf/geronimo/server/trunk/modules/deployment</connection>
- <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/server/trunk/modules/deployment</developerConnection>
- <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/deployment</url>
- </scm>
-
<dependencies>
- <!-- Module Dependencies -->
-
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-system</artifactId>
<version>${pom.version}</version>
</dependency>
-
- <!-- Thirdparty Dependencies -->
<dependency>
<groupId>xmlbeans</groupId>
Modified: geronimo/server/trunk/modules/geronimo-derby/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-derby/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-derby/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-derby/pom.xml Sat Aug 26 15:30:02 2006
@@ -33,20 +33,6 @@
<description>Wrapper for using Apache Derby as a bundled database.</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:http://svn.apache.org/repos/asf/geronimo/server/trunk/modules/derby</connection>
- <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/server/trunk/modules/derby</developerConnection>
- <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/derby</url>
- </scm>
-
<dependencies>
<dependency>
Modified: geronimo/server/trunk/modules/geronimo-directory/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-directory/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-directory/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-directory/pom.xml Sat Aug 26 15:30:02 2006
@@ -31,31 +31,13 @@
<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:http://svn.apache.org/repos/asf/geronimo/server/trunk/modules/directory</connection>
- <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/server/trunk/modules/directory</developerConnection>
- <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/directory</url>
- </scm>
-
<dependencies>
- <!-- Module Dependencies -->
-
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>geronimo-system</artifactId>
<version>${pom.version}</version>
</dependency>
-
- <!-- Thirdparty Dependencies -->
<dependency>
<groupId>regexp</groupId>
Modified: geronimo/server/trunk/modules/geronimo-hot-deploy/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-hot-deploy/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-hot-deploy/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-hot-deploy/pom.xml Sat Aug 26 15:30:02 2006
@@ -31,21 +31,7 @@
<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:http://svn.apache.org/repos/asf/geronimo/server/trunk/modules/hot-deploy</connection>
- <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/server/trunk/modules/hot-deploy</developerConnection>
- <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/hot-deploy</url>
- </scm>
+ <description>Provides hot deployment for Geronimo.</description>
<dependencies>
Modified: geronimo/server/trunk/modules/geronimo-interceptor/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-interceptor/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-interceptor/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-interceptor/pom.xml Sat Aug 26 15:30:02 2006
@@ -30,20 +30,5 @@
<artifactId>geronimo-interceptor</artifactId>
<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:http://svn.apache.org/repos/asf/geronimo/server/trunk/modules/interceptor</connection>
- <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/server/trunk/modules/interceptor</developerConnection>
- <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/interceptor</url>
- </scm>
</project>
Modified: geronimo/server/trunk/modules/geronimo-j2ee-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-j2ee-builder/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-j2ee-builder/pom.xml Sat Aug 26 15:30:02 2006
@@ -31,23 +31,7 @@
<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:http://svn.apache.org/repos/asf/geronimo/server/trunk/modules/j2ee-builder</connection>
- <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/server/trunk/modules/j2ee-builder</developerConnection>
- <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/j2ee-builder</url>
- </scm>
-
<dependencies>
-
- <!-- Module Dependencies -->
<dependency>
<groupId>${pom.groupId}</groupId>
Modified: geronimo/server/trunk/modules/geronimo-j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/SecurityBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/SecurityBuilder.java?rev=437240&r1=437231&r2=437240&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/SecurityBuilder.java (original)
+++ geronimo/server/trunk/modules/geronimo-j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/SecurityBuilder.java Sat Aug 26 15:30:02 2006
@@ -23,7 +23,7 @@
import org.apache.xmlbeans.XmlObject;
/**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
*/
public interface SecurityBuilder extends NamespaceDrivenBuilder {
Modified: geronimo/server/trunk/modules/geronimo-j2ee-schema/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-j2ee-schema/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee-schema/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-j2ee-schema/pom.xml Sat Aug 26 15:30:02 2006
@@ -31,20 +31,6 @@
<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:http://svn.apache.org/repos/asf/geronimo/server/trunk/modules/j2ee-schema</connection>
- <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/server/trunk/modules/j2ee-schema</developerConnection>
- <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/j2ee-schema</url>
- </scm>
-
<dependencies>
<!-- might not be necessary -->
@@ -80,10 +66,10 @@
https://svn.apache.org/repos/tck/geronimo-tck/schema/j2ee14
-->
<dependency>
- <groupId>org.apache.geronimo.schema</groupId>
- <artifactId>geronimo-schema-j2ee1.4</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
+ <groupId>org.apache.geronimo.schema</groupId>
+ <artifactId>geronimo-schema-j2ee1.4</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
</dependencies>
Modified: geronimo/server/trunk/modules/geronimo-j2ee/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-j2ee/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-j2ee/pom.xml Sat Aug 26 15:30:02 2006
@@ -31,20 +31,6 @@
<artifactId>geronimo-j2ee</artifactId>
<name>Geronimo :: J2EE</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:http://svn.apache.org/repos/asf/geronimo/server/trunk/modules/j2ee</connection>
- <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/server/trunk/modules/j2ee</developerConnection>
- <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/j2ee</url>
- </scm>
-
<dependencies>
<dependency>
Modified: geronimo/server/trunk/modules/geronimo-jetty-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty-builder/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-jetty-builder/pom.xml Sat Aug 26 15:30:02 2006
@@ -31,23 +31,7 @@
<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:http://svn.apache.org/repos/asf/geronimo/server/trunk/modules/jetty-builder</connection>
- <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/server/trunk/modules/jetty-builder</developerConnection>
- <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/jetty-builder</url>
- </scm>
-
<dependencies>
-
- <!-- Module Dependencies -->
<dependency>
<groupId>${pom.groupId}</groupId>
Modified: geronimo/server/trunk/modules/geronimo-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-jetty/pom.xml Sat Aug 26 15:30:02 2006
@@ -31,20 +31,6 @@
<artifactId>geronimo-jetty</artifactId>
<name>Geronimo :: Jetty</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:http://svn.apache.org/repos/asf/geronimo/server/trunk/modules/jetty</connection>
- <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/server/trunk/modules/jetty</developerConnection>
- <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/jetty</url>
- </scm>
-
<dependencies>
<dependency>
Modified: geronimo/server/trunk/modules/geronimo-jmx-remoting/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jmx-remoting/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jmx-remoting/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-jmx-remoting/pom.xml Sat Aug 26 15:30:02 2006
@@ -31,21 +31,9 @@
<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:http://svn.apache.org/repos/asf/geronimo/server/trunk/modules/jmx-remoting</connection>
- <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/server/trunk/modules/jmx-remoting</developerConnection>
- <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/jmx-remoting</url>
- </scm>
+ <description>
+ Provides remote access to a Geronimo server using JSR 160 JMX Remoting.
+ </description>
<dependencies>
Modified: geronimo/server/trunk/modules/geronimo-kernel/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-kernel/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-kernel/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-kernel/pom.xml Sat Aug 26 15:30:02 2006
@@ -31,20 +31,6 @@
<artifactId>geronimo-kernel</artifactId>
<name>Geronimo :: Kernel</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:http://svn.apache.org/repos/asf/geronimo/server/trunk/modules/kernel</connection>
- <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/server/trunk/modules/kernel</developerConnection>
- <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/kernel</url>
- </scm>
-
<dependencies>
<dependency>
@@ -76,8 +62,6 @@
<groupId>xpp3</groupId>
<artifactId>xpp3</artifactId>
</dependency>
-
- <!-- Test Dependencies -->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
Modified: geronimo/server/trunk/modules/geronimo-mail/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-mail/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-mail/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-mail/pom.xml Sat Aug 26 15:30:02 2006
@@ -31,23 +31,7 @@
<artifactId>geronimo-mail</artifactId>
<name>Geronimo :: Mail</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:http://svn.apache.org/repos/asf/geronimo/server/trunk/modules/mail</connection>
- <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/server/trunk/modules/mail</developerConnection>
- <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/mail</url>
- </scm>
-
<dependencies>
-
- <!-- Module Dependencies -->
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
Modified: geronimo/server/trunk/modules/geronimo-management/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-management/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-management/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-management/pom.xml Sat Aug 26 15:30:02 2006
@@ -31,21 +31,9 @@
<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:http://svn.apache.org/repos/asf/geronimo/server/trunk/modules/management</connection>
- <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/server/trunk/modules/management</developerConnection>
- <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/management</url>
- </scm>
+ <description>
+ Contains interfaces that define the management API for Geronimo.
+ </description>
<dependencies>
Modified: geronimo/server/trunk/modules/geronimo-naming-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-naming-builder/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-naming-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-naming-builder/pom.xml Sat Aug 26 15:30:02 2006
@@ -30,24 +30,9 @@
<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:http://svn.apache.org/repos/asf/geronimo/server/trunk/modules/naming-builder</connection>
- <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/server/trunk/modules/naming-builder</developerConnection>
- <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/naming-builder</url>
- </scm>
<dependencies>
- <!-- Module Dependencies -->
-
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>geronimo-common</artifactId>
@@ -95,8 +80,6 @@
<artifactId>geronimo-naming</artifactId>
<version>${pom.version}</version>
</dependency>
-
- <!-- Spec Dependencies -->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
Modified: geronimo/server/trunk/modules/geronimo-naming/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-naming/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-naming/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-naming/pom.xml Sat Aug 26 15:30:02 2006
@@ -31,20 +31,6 @@
<artifactId>geronimo-naming</artifactId>
<name>Geronimo :: Naming</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:http://svn.apache.org/repos/asf/geronimo/server/trunk/modules/naming</connection>
- <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/server/trunk/modules/naming</developerConnection>
- <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/naming</url>
- </scm>
-
<dependencies>
<dependency>
Modified: geronimo/server/trunk/modules/geronimo-security-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-security-builder/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-security-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-security-builder/pom.xml Sat Aug 26 15:30:02 2006
@@ -31,23 +31,7 @@
<artifactId>geronimo-security-builder</artifactId>
<name>Geronimo :: Security :: 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:http://svn.apache.org/repos/asf/geronimo/server/trunk/modules/security-builder</connection>
- <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/server/trunk/modules/security-builder</developerConnection>
- <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/security-builder</url>
- </scm>
-
<dependencies>
-
- <!-- Module Dependencies -->
<dependency>
<groupId>${pom.groupId}</groupId>
Modified: geronimo/server/trunk/modules/geronimo-security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-security/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-security/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-security/pom.xml Sat Aug 26 15:30:02 2006
@@ -31,24 +31,8 @@
<artifactId>geronimo-security</artifactId>
<name>Geronimo :: Security</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:http://svn.apache.org/repos/asf/geronimo/server/trunk/modules/security</connection>
- <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/server/trunk/modules/security</developerConnection>
- <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/security</url>
- </scm>
-
<dependencies>
- <!-- Module Dependencies -->
-
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-core</artifactId>
@@ -84,8 +68,6 @@
<artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
</dependency>
- <!-- Thirdparty Dependencies -->
-
<dependency>
<groupId>activeio</groupId>
<artifactId>activeio</artifactId>
@@ -95,8 +77,6 @@
<groupId>regexp</groupId>
<artifactId>regexp</artifactId>
</dependency>
-
- <!-- Test Dependencies -->
<dependency>
<groupId>hsqldb</groupId>
Modified: geronimo/server/trunk/modules/geronimo-service-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-service-builder/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-service-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-service-builder/pom.xml Sat Aug 26 15:30:02 2006
@@ -29,24 +29,9 @@
<artifactId>geronimo-service-builder</artifactId>
<name>Geronimo :: Service :: 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:http://svn.apache.org/repos/asf/geronimo/server/trunk/modules/service-builder</connection>
- <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/server/trunk/modules/service-builder</developerConnection>
- <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/service-builder</url>
- </scm>
<dependencies>
- <!-- Module Dependencies -->
-
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>geronimo-kernel</artifactId>
@@ -78,8 +63,6 @@
<scope>test</scope>
</dependency>
- <!-- Thirdparty Dependencies -->
-
<dependency>
<groupId>xmlbeans</groupId>
<artifactId>xbean</artifactId>
Modified: geronimo/server/trunk/modules/geronimo-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-system/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-system/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-system/pom.xml Sat Aug 26 15:30:02 2006
@@ -31,24 +31,8 @@
<artifactId>geronimo-system</artifactId>
<name>Geronimo :: System</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:http://svn.apache.org/repos/asf/geronimo/server/trunk/modules/system</connection>
- <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/server/trunk/modules/system</developerConnection>
- <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/system</url>
- </scm>
-
<dependencies>
- <!-- Module Dependencies -->
-
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-common</artifactId>
@@ -67,14 +51,10 @@
<version>${pom.version}</version>
</dependency>
- <!-- Thirdparty Dependencies -->
-
<dependency>
<groupId>concurrent</groupId>
<artifactId>concurrent</artifactId>
</dependency>
-
- <!-- Test Dependencies -->
<!--
NOTE: Need to include Xerces for tests in case Crimson (or another parser)
Modified: geronimo/server/trunk/modules/geronimo-test-ddbean/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-test-ddbean/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-test-ddbean/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-test-ddbean/pom.xml Sat Aug 26 15:30:02 2006
@@ -31,20 +31,6 @@
<artifactId>geronimo-test-ddbean</artifactId>
<name>Geronimo :: Test :: DDBeans</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:http://svn.apache.org/repos/asf/geronimo/server/trunk/modules/test-ddbean</connection>
- <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/server/trunk/modules/test-ddbean</developerConnection>
- <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/test-ddbean</url>
- </scm>
-
<dependencies>
<dependency>
Modified: geronimo/server/trunk/modules/geronimo-testsupport/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-testsupport/pom.xml?rev=437240&r1=437239&r2=437240&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-testsupport/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-testsupport/pom.xml Sat Aug 26 15:30:02 2006
@@ -47,11 +47,4 @@
</dependencies>
- <build>
- <!--
- FIXME: Remove when the default is to use the m2 standard layout
- -->
- <sourceDirectory>${pom.basedir}/src/main/java</sourceDirectory>
- </build>
-
</project>
Modified: geronimo/server/trunk/modules/geronimo-timer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-timer/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-timer/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-timer/pom.xml Sat Aug 26 15:30:02 2006
@@ -31,20 +31,6 @@
<artifactId>geronimo-timer</artifactId>
<name>Geronimo :: Timer</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:http://svn.apache.org/repos/asf/geronimo/server/trunk/modules/timer</connection>
- <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/server/trunk/modules/timer</developerConnection>
- <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/timer</url>
- </scm>
-
<properties>
<!--
FIXME: Disable the timer tests for now since they can fail if the host environment
Modified: geronimo/server/trunk/modules/geronimo-tomcat-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat-builder/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-tomcat-builder/pom.xml Sat Aug 26 15:30:02 2006
@@ -31,24 +31,8 @@
<artifactId>geronimo-tomcat-builder</artifactId>
<name>Geronimo :: Tomcat :: 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:http://svn.apache.org/repos/asf/geronimo/server/trunk/modules/tomcat-builder</connection>
- <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/server/trunk/modules/tomcat-builder</developerConnection>
- <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/tomcat-builder</url>
- </scm>
-
<dependencies>
- <!-- Module Dependencies -->
-
<!--<dependency>-->
<!--<groupId>${pom.groupId}</groupId>-->
<!--<artifactId>geronimo-deployment</artifactId>-->
@@ -103,8 +87,6 @@
<version>${pom.version}</version>
</dependency>
- <!-- Thirdparty Dependencies -->
-
<dependency>
<groupId>xmlbeans</groupId>
<artifactId>xbean</artifactId>
@@ -115,8 +97,6 @@
<artifactId>stax-api</artifactId>
</dependency>
- <!-- Test Dependencies -->
-
<!--<dependency>-->
<!--<groupId>${pom.groupId}</groupId>-->
<!--<artifactId>geronimo-axis</artifactId>-->
@@ -130,7 +110,7 @@
<!--<scope>test</scope>-->
<!--</dependency>-->
- <!--WFT??? why is this needed for tests all of a sudden? -->
+ <!-- WFT??? why is this needed for tests all of a sudden? -->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jsp_2.0_spec</artifactId>
Modified: geronimo/server/trunk/modules/geronimo-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-tomcat/pom.xml Sat Aug 26 15:30:02 2006
@@ -31,20 +31,6 @@
<artifactId>geronimo-tomcat</artifactId>
<name>Geronimo :: Tomcat</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:http://svn.apache.org/repos/asf/geronimo/server/trunk/modules/tomcat</connection>
- <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/server/trunk/modules/tomcat</developerConnection>
- <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/tomcat</url>
- </scm>
-
<properties>
<endorsedDir>${project.build.directory}/endorsed</endorsedDir>
<localRepoDir>${settings.localRepository}</localRepoDir>
Modified: geronimo/server/trunk/modules/geronimo-transaction/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-transaction/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-transaction/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-transaction/pom.xml Sat Aug 26 15:30:02 2006
@@ -31,20 +31,6 @@
<artifactId>geronimo-transaction</artifactId>
<name>Geronimo :: Transaction</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:http://svn.apache.org/repos/asf/geronimo/server/trunk/modules/transaction</connection>
- <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/server/trunk/modules/transaction</developerConnection>
- <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/transaction</url>
- </scm>
-
<dependencies>
<!-- temp, for ServerInfo. Remove when it is moved to Kernel-->
Modified: geronimo/server/trunk/modules/geronimo-upgrade/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-upgrade/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-upgrade/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-upgrade/pom.xml Sat Aug 26 15:30:02 2006
@@ -31,20 +31,6 @@
<artifactId>geronimo-upgrade</artifactId>
<name>Geronimo :: Upgrade</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:http://svn.apache.org/repos/asf/geronimo/server/trunk/modules/upgrade</connection>
- <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/server/trunk/modules/upgrade</developerConnection>
- <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/upgrade</url>
- </scm>
-
<dependencies>
<dependency>
Modified: geronimo/server/trunk/modules/geronimo-util/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-util/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-util/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-util/pom.xml Sat Aug 26 15:30:02 2006
@@ -31,20 +31,6 @@
<artifactId>geronimo-util</artifactId>
<name>Geronimo :: Util</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:http://svn.apache.org/repos/asf/geronimo/server/trunk/modules/util</connection>
- <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/server/trunk/modules/util</developerConnection>
- <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/util</url>
- </scm>
-
<dependencies>
<dependency>
Modified: geronimo/server/trunk/modules/geronimo-web-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-web-builder/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-web-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-web-builder/pom.xml Sat Aug 26 15:30:02 2006
@@ -31,24 +31,8 @@
<artifactId>geronimo-web-builder</artifactId>
<name>Geronimo :: Web :: Builder</name>
- <!--
-
- HACK: Need to explicitly configure SCM for this module since its artifactId
- does not match the directory it lives in.
-
- FIXME: Rename module directory or artifactId.
-
- -->
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/server/trunk/modules/web-builder</connection>
- <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/server/trunk/modules/web-builder</developerConnection>
- <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/web-builder</url>
- </scm>
-
<dependencies>
- <!-- Module Dependencies -->
-
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>geronimo-j2ee-builder</artifactId>
@@ -87,8 +71,6 @@
<version>${pom.version}</version>
</dependency>
- <!-- Spec Dependencies -->
-
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.4_spec</artifactId>
Modified: geronimo/server/trunk/modules/geronimo-webservices/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-webservices/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-webservices/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-webservices/pom.xml Sat Aug 26 15:30:02 2006
@@ -31,20 +31,6 @@
<artifactId>geronimo-webservices</artifactId>
<name>Geronimo :: Web Services</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:http://svn.apache.org/repos/asf/geronimo/server/trunk/modules/webservices</connection>
- <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/server/trunk/modules/webservices</developerConnection>
- <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/webservices</url>
- </scm>
-
<dependencies>
<dependency>
@@ -121,6 +107,7 @@
<groupId>scout</groupId>
<artifactId>scout</artifactId>
</dependency>
+
</dependencies>
</project>
Modified: geronimo/server/trunk/modules/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/pom.xml?rev=437240&r1=437239&r2=437240&view=diff
==============================================================================
--- geronimo/server/trunk/modules/pom.xml (original)
+++ geronimo/server/trunk/modules/pom.xml Sat Aug 26 15:30:02 2006
@@ -35,51 +35,51 @@
<modules>
<module>geronimo-testsupport</module>
- <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>
- <module>client-builder</module>
- <module>common</module>
- <module>connector</module>
- <module>connector-builder</module>
- <module>converter</module>
- <module>core</module>
- <module>deploy-config</module>
- <module>deploy-jsr88</module>
- <module>deploy-tool</module>
- <module>deployment</module>
- <module>derby</module>
- <module>directory</module>
- <module>hot-deploy</module>
- <module>interceptor</module>
- <module>j2ee</module>
- <module>j2ee-builder</module>
- <module>j2ee-schema</module>
- <module>jetty</module>
- <module>jetty-builder</module>
- <module>jmx-remoting</module>
- <module>kernel</module>
- <module>mail</module>
- <module>management</module>
- <module>naming</module>
- <module>naming-builder</module>
- <module>security</module>
- <module>security-builder</module>
- <module>service-builder</module>
- <module>system</module>
- <module>test-ddbean</module>
- <module>timer</module>
- <module>tomcat</module>
- <module>tomcat-builder</module>
- <module>transaction</module>
- <module>upgrade</module>
- <module>util</module>
- <module>web-builder</module>
- <module>webservices</module>
+ <module>geronimo-activation</module>
+ <module>ge-activemq-rar</module>
+ <module>geronimo-activemq-gbean</module>
+ <module>geronimo-activemq-gbean-management</module>
+ <module>geronimo-axis</module>
+ <module>geronimo-axis-builder</module>
+ <module>geronimo-client</module>
+ <module>geronimo-client-builder</module>
+ <module>geronimo-common</module>
+ <module>geronimo-connector</module>
+ <module>geronimo-connector-builder</module>
+ <module>geronimo-converter</module>
+ <module>geronimo-core</module>
+ <module>geronimo-deploy-config</module>
+ <module>geronimo-deploy-jsr88</module>
+ <module>geronimo-deploy-tool</module>
+ <module>geronimo-deployment</module>
+ <module>geronimo-derby</module>
+ <module>geronimo-directory</module>
+ <module>geronimo-hot-deploy</module>
+ <module>geronimo-interceptor</module>
+ <module>geronimo-j2ee</module>
+ <module>geronimo-j2ee-builder</module>
+ <module>geronimo-j2ee-schema</module>
+ <module>geronimo-jetty</module>
+ <module>geronimo-jetty-builder</module>
+ <module>geronimo-jmx-remoting</module>
+ <module>geronimo-kernel</module>
+ <module>geronimo-mail</module>
+ <module>geronimo-management</module>
+ <module>geronimo-naming</module>
+ <module>geronimo-naming-builder</module>
+ <module>geronimo-security</module>
+ <module>geronimo-security-builder</module>
+ <module>geronimo-service-builder</module>
+ <module>geronimo-system</module>
+ <module>geronimo-test-ddbean</module>
+ <module>geronimo-timer</module>
+ <module>geronimo-tomcat</module>
+ <module>geronimo-tomcat-builder</module>
+ <module>geronimo-transaction</module>
+ <module>geronimo-upgrade</module>
+ <module>geronimo-util</module>
+ <module>geronimo-web-builder</module>
+ <module>geronimo-webservices</module>
</modules>
</project>
Re: svn commit: r437240 - in /geronimo/server/trunk/modules: ./ activation/ activemq-embedded-rar/ activemq-gbean-management/ activemq-gbean/ axis-builder/ axis/ client-builder/ client/ common/ connector-builder/ connector/ converter/ core/ deploy-config/ ...
Posted by Jason Dillon <ja...@planet57.com>.
That is probably a good idea. svk can help... though I think I was
told that svk HEAD is where the changes are to handle directory moves...
--jason
On Aug 29, 2006, at 8:26 AM, David Jencks wrote:
> What I've been doing is to make a patch of my changes before the
> merge, merge, update the paths in the patch to the new locations,
> and apply the patch. This is sort of horrendous, but is the best
> I've found so far.
>
> thanks
> david jencks
>
> On Aug 29, 2006, at 8:21 AM, Sachin Patel wrote:
>
>> So I assume after merging the changes have to be re-made manually?
>>
>> On Aug 28, 2006, at 9:18 AM, Sachin Patel wrote:
>>
>>> for example...
>>>
>>> my branch contains j2ee-builder/src/foo.java (which contains
>>> committed changes that are not in trunk)
>>>
>>> and for example, in trunk you happened to rename this too..
>>>
>>> geronimo-j2ee-builder/src/foo.java..
>>>
>>> Doing any svn merge, would remove my copy of it, and replace it
>>> with the foo.java from trunk, thus losing my changes.
>>>
>>> Can svn merge or svk handle this? I've got svk installed, but not
>>> sure how to use it.
>>>
>>> thx
>>>
>>> On Aug 28, 2006, at 8:37 AM, Sachin Patel wrote:
>>>
>>>> Jason, how can I best merge these changes into the sachin branch
>>>> without having my changes wiped out? Using svn merge, since old
>>>> source folders are being renamed and the source removed, my
>>>> files are being deleted :(, what is the best way for my tree to
>>>> be updated to any further new structure changes?
>>>>
>>>> Thanks.
>>>>
>>>> On Aug 26, 2006, at 6:30 PM, jdillon@apache.org wrote:
>>>>
>>>>> Author: jdillon
>>>>> Date: Sat Aug 26 15:30:02 2006
>>>>> New Revision: 437240
>>>>>
>>>>> URL: http://svn.apache.org/viewvc?rev=437240&view=rev
>>>>> Log:
>>>>> (GERONIMO-2162) Use same directory as artifactId for modules/*
>>>>>
>>>>> Added:
>>>>> geronimo/server/trunk/modules/ge-activemq-rar/
>>>>> - copied from r437231, geronimo/server/trunk/modules/
>>>>> activemq-embedded-rar/
>>>>> geronimo/server/trunk/modules/geronimo-activation/
>>>>> - copied from r437231, geronimo/server/trunk/modules/
>>>>> activation/
>>>>> geronimo/server/trunk/modules/geronimo-activemq-gbean/
>>>>> - copied from r437231, geronimo/server/trunk/modules/
>>>>> activemq-gbean/
>>>>> geronimo/server/trunk/modules/geronimo-activemq-gbean-
>>>>> management/
>>>>> - copied from r437231, geronimo/server/trunk/modules/
>>>>> activemq-gbean-management/
>>>>> geronimo/server/trunk/modules/geronimo-axis/
>>>>> - copied from r437231, geronimo/server/trunk/modules/axis/
>>>>> geronimo/server/trunk/modules/geronimo-axis-builder/
>>>>> - copied from r437231, geronimo/server/trunk/modules/axis-
>>>>> builder/
>>>>> geronimo/server/trunk/modules/geronimo-client/
>>>>> - copied from r437231, geronimo/server/trunk/modules/client/
>>>>> geronimo/server/trunk/modules/geronimo-client-builder/
>>>>> - copied from r437231, geronimo/server/trunk/modules/
>>>>> client-builder/
>>>>> geronimo/server/trunk/modules/geronimo-common/
>>>>> - copied from r437231, geronimo/server/trunk/modules/common/
>>>>> geronimo/server/trunk/modules/geronimo-connector/
>>>>> - copied from r437231, geronimo/server/trunk/modules/
>>>>> connector/
>>>>> geronimo/server/trunk/modules/geronimo-connector-builder/
>>>>> - copied from r437231, geronimo/server/trunk/modules/
>>>>> connector-builder/
>>>>> geronimo/server/trunk/modules/geronimo-converter/
>>>>> - copied from r437231, geronimo/server/trunk/modules/
>>>>> converter/
>>>>> geronimo/server/trunk/modules/geronimo-core/
>>>>> - copied from r437231, geronimo/server/trunk/modules/core/
>>>>> geronimo/server/trunk/modules/geronimo-deploy-config/
>>>>> - copied from r437231, geronimo/server/trunk/modules/
>>>>> deploy-config/
>>>>> geronimo/server/trunk/modules/geronimo-deploy-jsr88/
>>>>> - copied from r437231, geronimo/server/trunk/modules/
>>>>> deploy-jsr88/
>>>>> geronimo/server/trunk/modules/geronimo-deploy-tool/
>>>>> - copied from r437231, geronimo/server/trunk/modules/
>>>>> deploy-tool/
>>>>> geronimo/server/trunk/modules/geronimo-deployment/
>>>>> - copied from r437231, geronimo/server/trunk/modules/
>>>>> deployment/
>>>>> geronimo/server/trunk/modules/geronimo-derby/
>>>>> - copied from r437231, geronimo/server/trunk/modules/derby/
>>>>> geronimo/server/trunk/modules/geronimo-directory/
>>>>> - copied from r437231, geronimo/server/trunk/modules/
>>>>> directory/
>>>>> geronimo/server/trunk/modules/geronimo-hot-deploy/
>>>>> - copied from r437231, geronimo/server/trunk/modules/hot-
>>>>> deploy/
>>>>> geronimo/server/trunk/modules/geronimo-interceptor/
>>>>> - copied from r437231, geronimo/server/trunk/modules/
>>>>> interceptor/
>>>>> geronimo/server/trunk/modules/geronimo-j2ee/
>>>>> - copied from r437231, geronimo/server/trunk/modules/j2ee/
>>>>> geronimo/server/trunk/modules/geronimo-j2ee-builder/
>>>>> - copied from r437231, geronimo/server/trunk/modules/j2ee-
>>>>> builder/
>>>>> geronimo/server/trunk/modules/geronimo-j2ee-schema/
>>>>> - copied from r437231, geronimo/server/trunk/modules/j2ee-
>>>>> schema/
>>>>> geronimo/server/trunk/modules/geronimo-jetty/
>>>>> - copied from r437231, geronimo/server/trunk/modules/jetty/
>>>>> geronimo/server/trunk/modules/geronimo-jetty-builder/
>>>>> - copied from r437231, geronimo/server/trunk/modules/
>>>>> jetty-builder/
>>>>> geronimo/server/trunk/modules/geronimo-jmx-remoting/
>>>>> - copied from r437231, geronimo/server/trunk/modules/jmx-
>>>>> remoting/
>>>>> geronimo/server/trunk/modules/geronimo-kernel/
>>>>> - copied from r437231, geronimo/server/trunk/modules/kernel/
>>>>> geronimo/server/trunk/modules/geronimo-mail/
>>>>> - copied from r437231, geronimo/server/trunk/modules/mail/
>>>>> geronimo/server/trunk/modules/geronimo-management/
>>>>> - copied from r437231, geronimo/server/trunk/modules/
>>>>> management/
>>>>> geronimo/server/trunk/modules/geronimo-naming/
>>>>> - copied from r437231, geronimo/server/trunk/modules/naming/
>>>>> geronimo/server/trunk/modules/geronimo-naming-builder/
>>>>> - copied from r437231, geronimo/server/trunk/modules/
>>>>> naming-builder/
>>>>> geronimo/server/trunk/modules/geronimo-security/
>>>>> - copied from r437231, geronimo/server/trunk/modules/
>>>>> security/
>>>>> geronimo/server/trunk/modules/geronimo-security-builder/
>>>>> - copied from r437231, geronimo/server/trunk/modules/
>>>>> security-builder/
>>>>> geronimo/server/trunk/modules/geronimo-service-builder/
>>>>> - copied from r437231, geronimo/server/trunk/modules/
>>>>> service-builder/
>>>>> geronimo/server/trunk/modules/geronimo-system/
>>>>> - copied from r437231, geronimo/server/trunk/modules/system/
>>>>> geronimo/server/trunk/modules/geronimo-test-ddbean/
>>>>> - copied from r437231, geronimo/server/trunk/modules/test-
>>>>> ddbean/
>>>>> geronimo/server/trunk/modules/geronimo-timer/
>>>>> - copied from r437231, geronimo/server/trunk/modules/timer/
>>>>> geronimo/server/trunk/modules/geronimo-tomcat/
>>>>> - copied from r437231, geronimo/server/trunk/modules/tomcat/
>>>>> geronimo/server/trunk/modules/geronimo-tomcat-builder/
>>>>> - copied from r437231, geronimo/server/trunk/modules/
>>>>> tomcat-builder/
>>>>> geronimo/server/trunk/modules/geronimo-transaction/
>>>>> - copied from r437231, geronimo/server/trunk/modules/
>>>>> transaction/
>>>>> geronimo/server/trunk/modules/geronimo-upgrade/
>>>>> - copied from r437231, geronimo/server/trunk/modules/
>>>>> upgrade/
>>>>> geronimo/server/trunk/modules/geronimo-util/
>>>>> - copied from r437231, geronimo/server/trunk/modules/util/
>>>>> geronimo/server/trunk/modules/geronimo-web-builder/
>>>>> - copied from r437231, geronimo/server/trunk/modules/web-
>>>>> builder/
>>>>> geronimo/server/trunk/modules/geronimo-webservices/
>>>>> - copied from r437231, geronimo/server/trunk/modules/
>>>>> webservices/
>>>>> Removed:
>>>>> geronimo/server/trunk/modules/activation/
>>>>> geronimo/server/trunk/modules/activemq-embedded-rar/
>>>>> geronimo/server/trunk/modules/activemq-gbean/
>>>>> geronimo/server/trunk/modules/activemq-gbean-management/
>>>>> geronimo/server/trunk/modules/axis/
>>>>> geronimo/server/trunk/modules/axis-builder/
>>>>> geronimo/server/trunk/modules/client/
>>>>> geronimo/server/trunk/modules/client-builder/
>>>>> geronimo/server/trunk/modules/common/
>>>>> geronimo/server/trunk/modules/connector/
>>>>> geronimo/server/trunk/modules/connector-builder/
>>>>> geronimo/server/trunk/modules/converter/
>>>>> geronimo/server/trunk/modules/core/
>>>>> geronimo/server/trunk/modules/deploy-config/
>>>>> geronimo/server/trunk/modules/deploy-jsr88/
>>>>> geronimo/server/trunk/modules/deploy-tool/
>>>>> geronimo/server/trunk/modules/deployment/
>>>>> geronimo/server/trunk/modules/derby/
>>>>> geronimo/server/trunk/modules/directory/
>>>>> geronimo/server/trunk/modules/hot-deploy/
>>>>> geronimo/server/trunk/modules/interceptor/
>>>>> geronimo/server/trunk/modules/j2ee/
>>>>> geronimo/server/trunk/modules/j2ee-builder/
>>>>> geronimo/server/trunk/modules/j2ee-schema/
>>>>> geronimo/server/trunk/modules/jetty/
>>>>> geronimo/server/trunk/modules/jetty-builder/
>>>>> geronimo/server/trunk/modules/jmx-remoting/
>>>>> geronimo/server/trunk/modules/kernel/
>>>>> geronimo/server/trunk/modules/mail/
>>>>> geronimo/server/trunk/modules/management/
>>>>> geronimo/server/trunk/modules/naming/
>>>>> geronimo/server/trunk/modules/naming-builder/
>>>>> geronimo/server/trunk/modules/security/
>>>>> geronimo/server/trunk/modules/security-builder/
>>>>> geronimo/server/trunk/modules/service-builder/
>>>>> geronimo/server/trunk/modules/system/
>>>>> geronimo/server/trunk/modules/test-ddbean/
>>>>> geronimo/server/trunk/modules/timer/
>>>>> geronimo/server/trunk/modules/tomcat/
>>>>> geronimo/server/trunk/modules/tomcat-builder/
>>>>> geronimo/server/trunk/modules/transaction/
>>>>> geronimo/server/trunk/modules/upgrade/
>>>>> geronimo/server/trunk/modules/util/
>>>>> geronimo/server/trunk/modules/web-builder/
>>>>> geronimo/server/trunk/modules/webservices/
>>>>> Modified:
>>>>> geronimo/server/trunk/modules/ge-activemq-rar/pom.xml
>>>>> geronimo/server/trunk/modules/geronimo-activation/pom.xml
>>>>> geronimo/server/trunk/modules/geronimo-activemq-gbean-
>>>>> management/pom.xml
>>>>> geronimo/server/trunk/modules/geronimo-activemq-gbean/pom.xml
>>>>> geronimo/server/trunk/modules/geronimo-axis-builder/pom.xml
>>>>> geronimo/server/trunk/modules/geronimo-axis/pom.xml
>>>>> geronimo/server/trunk/modules/geronimo-client-builder/pom.xml
>>>>> geronimo/server/trunk/modules/geronimo-client/pom.xml
>>>>> geronimo/server/trunk/modules/geronimo-common/pom.xml
>>>>> geronimo/server/trunk/modules/geronimo-connector-builder/
>>>>> pom.xml
>>>>> geronimo/server/trunk/modules/geronimo-connector/pom.xml
>>>>> geronimo/server/trunk/modules/geronimo-converter/pom.xml
>>>>> geronimo/server/trunk/modules/geronimo-core/pom.xml
>>>>> geronimo/server/trunk/modules/geronimo-deploy-config/pom.xml
>>>>> geronimo/server/trunk/modules/geronimo-deploy-jsr88/pom.xml
>>>>> geronimo/server/trunk/modules/geronimo-deploy-tool/pom.xml
>>>>> geronimo/server/trunk/modules/geronimo-deployment/pom.xml
>>>>> geronimo/server/trunk/modules/geronimo-derby/pom.xml
>>>>> geronimo/server/trunk/modules/geronimo-directory/pom.xml
>>>>> geronimo/server/trunk/modules/geronimo-hot-deploy/pom.xml
>>>>> geronimo/server/trunk/modules/geronimo-interceptor/pom.xml
>>>>> geronimo/server/trunk/modules/geronimo-j2ee-builder/pom.xml
>>>>> geronimo/server/trunk/modules/geronimo-j2ee-builder/src/
>>>>> java/org/apache/geronimo/j2ee/deployment/SecurityBuilder.java
>>>>> geronimo/server/trunk/modules/geronimo-j2ee-schema/pom.xml
>>>>> geronimo/server/trunk/modules/geronimo-j2ee/pom.xml
>>>>> geronimo/server/trunk/modules/geronimo-jetty-builder/pom.xml
>>>>> geronimo/server/trunk/modules/geronimo-jetty/pom.xml
>>>>> geronimo/server/trunk/modules/geronimo-jmx-remoting/pom.xml
>>>>> geronimo/server/trunk/modules/geronimo-kernel/pom.xml
>>>>> geronimo/server/trunk/modules/geronimo-mail/pom.xml
>>>>> geronimo/server/trunk/modules/geronimo-management/pom.xml
>>>>> geronimo/server/trunk/modules/geronimo-naming-builder/pom.xml
>>>>> geronimo/server/trunk/modules/geronimo-naming/pom.xml
>>>>> geronimo/server/trunk/modules/geronimo-security-builder/
>>>>> pom.xml
>>>>> geronimo/server/trunk/modules/geronimo-security/pom.xml
>>>>> geronimo/server/trunk/modules/geronimo-service-builder/pom.xml
>>>>> geronimo/server/trunk/modules/geronimo-system/pom.xml
>>>>> geronimo/server/trunk/modules/geronimo-test-ddbean/pom.xml
>>>>> geronimo/server/trunk/modules/geronimo-testsupport/pom.xml
>>>>> geronimo/server/trunk/modules/geronimo-timer/pom.xml
>>>>> geronimo/server/trunk/modules/geronimo-tomcat-builder/pom.xml
>>>>> geronimo/server/trunk/modules/geronimo-tomcat/pom.xml
>>>>> geronimo/server/trunk/modules/geronimo-transaction/pom.xml
>>>>> geronimo/server/trunk/modules/geronimo-upgrade/pom.xml
>>>>> geronimo/server/trunk/modules/geronimo-util/pom.xml
>>>>> geronimo/server/trunk/modules/geronimo-web-builder/pom.xml
>>>>> geronimo/server/trunk/modules/geronimo-webservices/pom.xml
>>>>> geronimo/server/trunk/modules/pom.xml
>>>>>
>>>>> Modified: geronimo/server/trunk/modules/ge-activemq-rar/pom.xml
>>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>>> ge-activemq-rar/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>>>>> ==================================================================
>>>>> ============
>>>>> --- geronimo/server/trunk/modules/ge-activemq-rar/pom.xml
>>>>> (original)
>>>>> +++ geronimo/server/trunk/modules/ge-activemq-rar/pom.xml Sat
>>>>> Aug 26 15:30:02 2006
>>>>> @@ -33,20 +33,6 @@
>>>>> <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:http://svn.apache.org/repos/asf/
>>>>> geronimo/server/trunk/modules/activemq-embedded-rar</connection>
>>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/
>>>>> activemq-embedded-rar</developerConnection>
>>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>>> modules/activemq-embedded-rar</url>
>>>>> - </scm>
>>>>> -
>>>>> <dependencies>
>>>>>
>>>>> <dependency>
>>>>>
>>>>> Modified: geronimo/server/trunk/modules/geronimo-activation/
>>>>> pom.xml
>>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>>> geronimo-activation/pom.xml?
>>>>> rev=437240&r1=437231&r2=437240&view=diff
>>>>> ==================================================================
>>>>> ============
>>>>> --- geronimo/server/trunk/modules/geronimo-activation/pom.xml
>>>>> (original)
>>>>> +++ geronimo/server/trunk/modules/geronimo-activation/pom.xml
>>>>> Sat Aug 26 15:30:02 2006
>>>>> @@ -36,20 +36,6 @@
>>>>> 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:http://svn.apache.org/repos/asf/
>>>>> geronimo/server/trunk/modules/activation</connection>
>>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/
>>>>> activation</developerConnection>
>>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>>> modules/activation</url>
>>>>> - </scm>
>>>>> -
>>>>> <dependencies>
>>>>>
>>>>> <dependency>
>>>>>
>>>>> Modified: geronimo/server/trunk/modules/geronimo-activemq-gbean-
>>>>> management/pom.xml
>>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>>> geronimo-activemq-gbean-management/pom.xml?
>>>>> rev=437240&r1=437231&r2=437240&view=diff
>>>>> ==================================================================
>>>>> ============
>>>>> --- geronimo/server/trunk/modules/geronimo-activemq-gbean-
>>>>> management/pom.xml (original)
>>>>> +++ geronimo/server/trunk/modules/geronimo-activemq-gbean-
>>>>> management/pom.xml Sat Aug 26 15:30:02 2006
>>>>> @@ -31,24 +31,6 @@
>>>>> <artifactId>geronimo-activemq-gbean-management</artifactId>
>>>>> <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:http://svn.apache.org/repos/asf/
>>>>> geronimo/server/trunk/modules/activemq-gbean-management</
>>>>> connection>
>>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/
>>>>> activemq-gbean-management</developerConnection>
>>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>>> modules/activemq-gbean-management</url>
>>>>> - </scm>
>>>>> -
>>>>> <dependencies>
>>>>>
>>>>> <dependency>
>>>>>
>>>>> Modified: geronimo/server/trunk/modules/geronimo-activemq-gbean/
>>>>> pom.xml
>>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>>> geronimo-activemq-gbean/pom.xml?
>>>>> rev=437240&r1=437231&r2=437240&view=diff
>>>>> ==================================================================
>>>>> ============
>>>>> --- geronimo/server/trunk/modules/geronimo-activemq-gbean/
>>>>> pom.xml (original)
>>>>> +++ geronimo/server/trunk/modules/geronimo-activemq-gbean/
>>>>> pom.xml Sat Aug 26 15:30:02 2006
>>>>> @@ -31,24 +31,6 @@
>>>>> <artifactId>geronimo-activemq-gbean</artifactId>
>>>>> <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:http://svn.apache.org/repos/asf/
>>>>> geronimo/server/trunk/modules/activemq-gbean</connection>
>>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/
>>>>> activemq-gbean</developerConnection>
>>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>>> modules/activemq-gbean</url>
>>>>> - </scm>
>>>>> -
>>>>> <dependencies>
>>>>>
>>>>> <dependency>
>>>>>
>>>>> Modified: geronimo/server/trunk/modules/geronimo-axis-builder/
>>>>> pom.xml
>>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>>> geronimo-axis-builder/pom.xml?
>>>>> rev=437240&r1=437231&r2=437240&view=diff
>>>>> ==================================================================
>>>>> ============
>>>>> --- geronimo/server/trunk/modules/geronimo-axis-builder/pom.xml
>>>>> (original)
>>>>> +++ geronimo/server/trunk/modules/geronimo-axis-builder/pom.xml
>>>>> Sat Aug 26 15:30:02 2006
>>>>> @@ -31,24 +31,8 @@
>>>>> <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:http://svn.apache.org/repos/asf/
>>>>> geronimo/server/trunk/modules/axis-builder</connection>
>>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/axis-
>>>>> builder</developerConnection>
>>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>>> modules/axis-builder</url>
>>>>> - </scm>
>>>>> -
>>>>> <dependencies>
>>>>>
>>>>> - <!-- Module Dependencies -->
>>>>> -
>>>>> <dependency>
>>>>> <groupId>${pom.groupId}</groupId>
>>>>> <artifactId>geronimo-axis</artifactId>
>>>>> @@ -85,8 +69,6 @@
>>>>> <version>${pom.version}</version>
>>>>> </dependency>
>>>>>
>>>>> - <!-- Spec Dependencies -->
>>>>> -
>>>>> <dependency>
>>>>> <groupId>org.apache.geronimo.specs</groupId>
>>>>> <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
>>>>> @@ -101,8 +83,6 @@
>>>>> <groupId>org.apache.geronimo.specs</groupId>
>>>>> <artifactId>geronimo-qname_1.1_spec</artifactId>
>>>>> </dependency>
>>>>> -
>>>>> - <!-- Thirdparty Dependencies -->
>>>>>
>>>>> <dependency>
>>>>> <groupId>asm</groupId>
>>>>>
>>>>> Modified: geronimo/server/trunk/modules/geronimo-axis/pom.xml
>>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>>> geronimo-axis/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>>>>> ==================================================================
>>>>> ============
>>>>> --- geronimo/server/trunk/modules/geronimo-axis/pom.xml (original)
>>>>> +++ geronimo/server/trunk/modules/geronimo-axis/pom.xml Sat Aug
>>>>> 26 15:30:02 2006
>>>>> @@ -31,21 +31,6 @@
>>>>> <artifactId>geronimo-axis</artifactId>
>>>>> <packaging>jar</packaging>
>>>>> <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:http://svn.apache.org/repos/asf/
>>>>> geronimo/server/trunk/modules/axis</connection>
>>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/axis</
>>>>> developerConnection>
>>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>>> modules/axis</url>
>>>>> - </scm>
>>>>>
>>>>> <dependencies>
>>>>>
>>>>>
>>>>> Modified: geronimo/server/trunk/modules/geronimo-client-builder/
>>>>> pom.xml
>>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>>> geronimo-client-builder/pom.xml?
>>>>> rev=437240&r1=437231&r2=437240&view=diff
>>>>> ==================================================================
>>>>> ============
>>>>> --- geronimo/server/trunk/modules/geronimo-client-builder/
>>>>> pom.xml (original)
>>>>> +++ geronimo/server/trunk/modules/geronimo-client-builder/
>>>>> pom.xml Sat Aug 26 15:30:02 2006
>>>>> @@ -31,23 +31,7 @@
>>>>> <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:http://svn.apache.org/repos/asf/
>>>>> geronimo/server/trunk/modules/client-builder</connection>
>>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/client-
>>>>> builder</developerConnection>
>>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>>> modules/client-builder</url>
>>>>> - </scm>
>>>>> -
>>>>> <dependencies>
>>>>> -
>>>>> - <!-- Module Dependencies -->
>>>>>
>>>>> <dependency>
>>>>> <groupId>${pom.groupId}</groupId>
>>>>>
>>>>> Modified: geronimo/server/trunk/modules/geronimo-client/pom.xml
>>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>>> geronimo-client/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>>>>> ==================================================================
>>>>> ============
>>>>> --- geronimo/server/trunk/modules/geronimo-client/pom.xml
>>>>> (original)
>>>>> +++ geronimo/server/trunk/modules/geronimo-client/pom.xml Sat
>>>>> Aug 26 15:30:02 2006
>>>>> @@ -31,20 +31,6 @@
>>>>> <artifactId>geronimo-client</artifactId>
>>>>> <name>Geronimo :: Client</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:http://svn.apache.org/repos/asf/
>>>>> geronimo/server/trunk/modules/client</connection>
>>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/client</
>>>>> developerConnection>
>>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>>> modules/client</url>
>>>>> - </scm>
>>>>> -
>>>>> <dependencies>
>>>>>
>>>>> <dependency>
>>>>>
>>>>> Modified: geronimo/server/trunk/modules/geronimo-common/pom.xml
>>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>>> geronimo-common/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>>>>> ==================================================================
>>>>> ============
>>>>> --- geronimo/server/trunk/modules/geronimo-common/pom.xml
>>>>> (original)
>>>>> +++ geronimo/server/trunk/modules/geronimo-common/pom.xml Sat
>>>>> Aug 26 15:30:02 2006
>>>>> @@ -31,20 +31,6 @@
>>>>> <artifactId>geronimo-common</artifactId>
>>>>> <name>Geronimo :: Common</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:http://svn.apache.org/repos/asf/
>>>>> geronimo/server/trunk/modules/common</connection>
>>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/common</
>>>>> developerConnection>
>>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>>> modules/common</url>
>>>>> - </scm>
>>>>> -
>>>>> <dependencies>
>>>>>
>>>>> <dependency>
>>>>>
>>>>> Modified: geronimo/server/trunk/modules/geronimo-connector-
>>>>> builder/pom.xml
>>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>>> geronimo-connector-builder/pom.xml?
>>>>> rev=437240&r1=437231&r2=437240&view=diff
>>>>> ==================================================================
>>>>> ============
>>>>> --- geronimo/server/trunk/modules/geronimo-connector-builder/
>>>>> pom.xml (original)
>>>>> +++ geronimo/server/trunk/modules/geronimo-connector-builder/
>>>>> pom.xml Sat Aug 26 15:30:02 2006
>>>>> @@ -31,24 +31,8 @@
>>>>> <artifactId>geronimo-connector-builder</artifactId>
>>>>> <name>Geronimo :: Connector :: 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:http://svn.apache.org/repos/asf/
>>>>> geronimo/server/trunk/modules/connector-builder</connection>
>>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/
>>>>> connector-builder</developerConnection>
>>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>>> modules/connector-builder</url>
>>>>> - </scm>
>>>>> -
>>>>> <dependencies>
>>>>>
>>>>> - <!-- Module Dependencies -->
>>>>> -
>>>>> <dependency>
>>>>> <groupId>${pom.groupId}</groupId>
>>>>> <artifactId>geronimo-connector</artifactId>
>>>>> @@ -72,8 +56,6 @@
>>>>> <artifactId>geronimo-test-ddbean</artifactId>
>>>>> <version>${pom.version}</version>
>>>>> </dependency>
>>>>> -
>>>>> - <!-- Thirdparty Dependencies -->
>>>>>
>>>>> <dependency>
>>>>> <groupId>tranql</groupId>
>>>>>
>>>>> Modified: geronimo/server/trunk/modules/geronimo-connector/pom.xml
>>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>>> geronimo-connector/pom.xml?
>>>>> rev=437240&r1=437231&r2=437240&view=diff
>>>>> ==================================================================
>>>>> ============
>>>>> --- geronimo/server/trunk/modules/geronimo-connector/pom.xml
>>>>> (original)
>>>>> +++ geronimo/server/trunk/modules/geronimo-connector/pom.xml
>>>>> Sat Aug 26 15:30:02 2006
>>>>> @@ -31,20 +31,6 @@
>>>>> <artifactId>geronimo-connector</artifactId>
>>>>> <name>Geronimo :: Connector</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:http://svn.apache.org/repos/asf/
>>>>> geronimo/server/trunk/modules/connector</connection>
>>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/
>>>>> connector</developerConnection>
>>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>>> modules/connector</url>
>>>>> - </scm>
>>>>> -
>>>>> <dependencies>
>>>>>
>>>>> <dependency>
>>>>>
>>>>> Modified: geronimo/server/trunk/modules/geronimo-converter/pom.xml
>>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>>> geronimo-converter/pom.xml?
>>>>> rev=437240&r1=437231&r2=437240&view=diff
>>>>> ==================================================================
>>>>> ============
>>>>> --- geronimo/server/trunk/modules/geronimo-converter/pom.xml
>>>>> (original)
>>>>> +++ geronimo/server/trunk/modules/geronimo-converter/pom.xml
>>>>> Sat Aug 26 15:30:02 2006
>>>>> @@ -31,20 +31,6 @@
>>>>> <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:http://svn.apache.org/repos/asf/
>>>>> geronimo/server/trunk/modules/converter</connection>
>>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/
>>>>> converter</developerConnection>
>>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>>> modules/converter</url>
>>>>> - </scm>
>>>>> -
>>>>> <dependencies>
>>>>>
>>>>> <dependency>
>>>>>
>>>>> Modified: geronimo/server/trunk/modules/geronimo-core/pom.xml
>>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>>> geronimo-core/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>>>>> ==================================================================
>>>>> ============
>>>>> --- geronimo/server/trunk/modules/geronimo-core/pom.xml (original)
>>>>> +++ geronimo/server/trunk/modules/geronimo-core/pom.xml Sat Aug
>>>>> 26 15:30:02 2006
>>>>> @@ -31,20 +31,6 @@
>>>>> <artifactId>geronimo-core</artifactId>
>>>>> <name>Geronimo :: Core</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:http://svn.apache.org/repos/asf/
>>>>> geronimo/server/trunk/modules/core</connection>
>>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/core</
>>>>> developerConnection>
>>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>>> modules/core</url>
>>>>> - </scm>
>>>>> -
>>>>> <dependencies>
>>>>>
>>>>> <dependency>
>>>>>
>>>>> Modified: geronimo/server/trunk/modules/geronimo-deploy-config/
>>>>> pom.xml
>>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>>> geronimo-deploy-config/pom.xml?
>>>>> rev=437240&r1=437231&r2=437240&view=diff
>>>>> ==================================================================
>>>>> ============
>>>>> --- geronimo/server/trunk/modules/geronimo-deploy-config/
>>>>> pom.xml (original)
>>>>> +++ geronimo/server/trunk/modules/geronimo-deploy-config/
>>>>> pom.xml Sat Aug 26 15:30:02 2006
>>>>> @@ -30,27 +30,12 @@
>>>>>
>>>>> <artifactId>geronimo-deploy-config</artifactId>
>>>>> <name>Geronimo :: Deploy :: Common Config</name>
>>>>> - <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:http://svn.apache.org/repos/asf/
>>>>> geronimo/server/trunk/modules/deploy-config</connection>
>>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/deploy-
>>>>> config</developerConnection>
>>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>>> modules/deploy-config</url>
>>>>> - </scm>
>>>>>
>>>>> <dependencies>
>>>>>
>>>>>
>>>>> Modified: geronimo/server/trunk/modules/geronimo-deploy-jsr88/
>>>>> pom.xml
>>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>>> geronimo-deploy-jsr88/pom.xml?
>>>>> rev=437240&r1=437231&r2=437240&view=diff
>>>>> ==================================================================
>>>>> ============
>>>>> --- geronimo/server/trunk/modules/geronimo-deploy-jsr88/pom.xml
>>>>> (original)
>>>>> +++ geronimo/server/trunk/modules/geronimo-deploy-jsr88/pom.xml
>>>>> Sat Aug 26 15:30:02 2006
>>>>> @@ -30,26 +30,9 @@
>>>>>
>>>>> <artifactId>geronimo-deploy-jsr88</artifactId>
>>>>> <name>Geronimo :: Deploy :: JSR-88</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:http://svn.apache.org/repos/asf/
>>>>> geronimo/server/trunk/modules/deploy-jsr88</connection>
>>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/deploy-
>>>>> jsr88</developerConnection>
>>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>>> modules/deploy-jsr88</url>
>>>>> - </scm>
>>>>>
>>>>> <dependencies>
>>>>>
>>>>> - <!-- Module Dependencies -->
>>>>> -
>>>>> <dependency>
>>>>> <groupId>org.apache.geronimo.modules</groupId>
>>>>> <artifactId>geronimo-system</artifactId>
>>>>> @@ -80,8 +63,6 @@
>>>>> <groupId>org.apache.geronimo.specs</groupId>
>>>>> <artifactId>geronimo-j2ee-deployment_1.1_spec</
>>>>> artifactId>
>>>>> </dependency>
>>>>> -
>>>>> - <!-- Thirdparty Dependencies -->
>>>>>
>>>>> <dependency>
>>>>> <groupId>mx4j</groupId>
>>>>>
>>>>> Modified: geronimo/server/trunk/modules/geronimo-deploy-tool/
>>>>> pom.xml
>>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>>> geronimo-deploy-tool/pom.xml?
>>>>> rev=437240&r1=437231&r2=437240&view=diff
>>>>> ==================================================================
>>>>> ============
>>>>> --- geronimo/server/trunk/modules/geronimo-deploy-tool/pom.xml
>>>>> (original)
>>>>> +++ geronimo/server/trunk/modules/geronimo-deploy-tool/pom.xml
>>>>> Sat Aug 26 15:30:02 2006
>>>>> @@ -31,20 +31,6 @@
>>>>> <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:http://svn.apache.org/repos/asf/
>>>>> geronimo/server/trunk/modules/deploy-tool</connection>
>>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/deploy-
>>>>> tool</developerConnection>
>>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>>> modules/deploy-tool</url>
>>>>> - </scm>
>>>>> -
>>>>> <dependencies>
>>>>>
>>>>> <dependency>
>>>>> @@ -82,8 +68,6 @@
>>>>> <version>${pom.version}</version>
>>>>> </dependency>
>>>>>
>>>>> - <!-- Thirdparty Dependencies -->
>>>>> -
>>>>> <dependency>
>>>>> <groupId>jline</groupId>
>>>>> <artifactId>jline</artifactId>
>>>>>
>>>>> Modified: geronimo/server/trunk/modules/geronimo-deployment/
>>>>> pom.xml
>>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>>> geronimo-deployment/pom.xml?
>>>>> rev=437240&r1=437231&r2=437240&view=diff
>>>>> ==================================================================
>>>>> ============
>>>>> --- geronimo/server/trunk/modules/geronimo-deployment/pom.xml
>>>>> (original)
>>>>> +++ geronimo/server/trunk/modules/geronimo-deployment/pom.xml
>>>>> Sat Aug 26 15:30:02 2006
>>>>> @@ -31,31 +31,13 @@
>>>>> <artifactId>geronimo-deployment</artifactId>
>>>>> <name>Geronimo :: Deployment</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:http://svn.apache.org/repos/asf/
>>>>> geronimo/server/trunk/modules/deployment</connection>
>>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/
>>>>> deployment</developerConnection>
>>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>>> modules/deployment</url>
>>>>> - </scm>
>>>>> -
>>>>> <dependencies>
>>>>>
>>>>> - <!-- Module Dependencies -->
>>>>> -
>>>>> <dependency>
>>>>> <groupId>org.apache.geronimo.modules</groupId>
>>>>> <artifactId>geronimo-system</artifactId>
>>>>> <version>${pom.version}</version>
>>>>> </dependency>
>>>>> -
>>>>> - <!-- Thirdparty Dependencies -->
>>>>>
>>>>> <dependency>
>>>>> <groupId>xmlbeans</groupId>
>>>>>
>>>>> Modified: geronimo/server/trunk/modules/geronimo-derby/pom.xml
>>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>>> geronimo-derby/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>>>>> ==================================================================
>>>>> ============
>>>>> --- geronimo/server/trunk/modules/geronimo-derby/pom.xml
>>>>> (original)
>>>>> +++ geronimo/server/trunk/modules/geronimo-derby/pom.xml Sat
>>>>> Aug 26 15:30:02 2006
>>>>> @@ -33,20 +33,6 @@
>>>>>
>>>>> <description>Wrapper for using Apache Derby as a bundled
>>>>> database.</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:http://svn.apache.org/repos/asf/
>>>>> geronimo/server/trunk/modules/derby</connection>
>>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/derby</
>>>>> developerConnection>
>>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>>> modules/derby</url>
>>>>> - </scm>
>>>>> -
>>>>> <dependencies>
>>>>>
>>>>> <dependency>
>>>>>
>>>>> Modified: geronimo/server/trunk/modules/geronimo-directory/pom.xml
>>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>>> geronimo-directory/pom.xml?
>>>>> rev=437240&r1=437231&r2=437240&view=diff
>>>>> ==================================================================
>>>>> ============
>>>>> --- geronimo/server/trunk/modules/geronimo-directory/pom.xml
>>>>> (original)
>>>>> +++ geronimo/server/trunk/modules/geronimo-directory/pom.xml
>>>>> Sat Aug 26 15:30:02 2006
>>>>> @@ -31,31 +31,13 @@
>>>>> <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:http://svn.apache.org/repos/asf/
>>>>> geronimo/server/trunk/modules/directory</connection>
>>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/
>>>>> directory</developerConnection>
>>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>>> modules/directory</url>
>>>>> - </scm>
>>>>> -
>>>>> <dependencies>
>>>>>
>>>>> - <!-- Module Dependencies -->
>>>>> -
>>>>> <dependency>
>>>>> <groupId>${pom.groupId}</groupId>
>>>>> <artifactId>geronimo-system</artifactId>
>>>>> <version>${pom.version}</version>
>>>>> </dependency>
>>>>> -
>>>>> - <!-- Thirdparty Dependencies -->
>>>>>
>>>>> <dependency>
>>>>> <groupId>regexp</groupId>
>>>>>
>>>>> Modified: geronimo/server/trunk/modules/geronimo-hot-deploy/
>>>>> pom.xml
>>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>>> geronimo-hot-deploy/pom.xml?
>>>>> rev=437240&r1=437231&r2=437240&view=diff
>>>>> ==================================================================
>>>>> ============
>>>>> --- geronimo/server/trunk/modules/geronimo-hot-deploy/pom.xml
>>>>> (original)
>>>>> +++ geronimo/server/trunk/modules/geronimo-hot-deploy/pom.xml
>>>>> Sat Aug 26 15:30:02 2006
>>>>> @@ -31,21 +31,7 @@
>>>>> <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:http://svn.apache.org/repos/asf/
>>>>> geronimo/server/trunk/modules/hot-deploy</connection>
>>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/hot-
>>>>> deploy</developerConnection>
>>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>>> modules/hot-deploy</url>
>>>>> - </scm>
>>>>> + <description>Provides hot deployment for Geronimo.</
>>>>> description>
>>>>>
>>>>> <dependencies>
>>>>>
>>>>>
>>>>> Modified: geronimo/server/trunk/modules/geronimo-interceptor/
>>>>> pom.xml
>>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>>> geronimo-interceptor/pom.xml?
>>>>> rev=437240&r1=437231&r2=437240&view=diff
>>>>> ==================================================================
>>>>> ============
>>>>> --- geronimo/server/trunk/modules/geronimo-interceptor/pom.xml
>>>>> (original)
>>>>> +++ geronimo/server/trunk/modules/geronimo-interceptor/pom.xml
>>>>> Sat Aug 26 15:30:02 2006
>>>>> @@ -30,20 +30,5 @@
>>>>>
>>>>> <artifactId>geronimo-interceptor</artifactId>
>>>>> <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:http://svn.apache.org/repos/asf/
>>>>> geronimo/server/trunk/modules/interceptor</connection>
>>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/
>>>>> interceptor</developerConnection>
>>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>>> modules/interceptor</url>
>>>>> - </scm>
>>>>>
>>>>> </project>
>>>>>
>>>>> Modified: geronimo/server/trunk/modules/geronimo-j2ee-builder/
>>>>> pom.xml
>>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>>> geronimo-j2ee-builder/pom.xml?
>>>>> rev=437240&r1=437231&r2=437240&view=diff
>>>>> ==================================================================
>>>>> ============
>>>>> --- geronimo/server/trunk/modules/geronimo-j2ee-builder/pom.xml
>>>>> (original)
>>>>> +++ geronimo/server/trunk/modules/geronimo-j2ee-builder/pom.xml
>>>>> Sat Aug 26 15:30:02 2006
>>>>> @@ -31,23 +31,7 @@
>>>>> <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:http://svn.apache.org/repos/asf/
>>>>> geronimo/server/trunk/modules/j2ee-builder</connection>
>>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/j2ee-
>>>>> builder</developerConnection>
>>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>>> modules/j2ee-builder</url>
>>>>> - </scm>
>>>>> -
>>>>> <dependencies>
>>>>> -
>>>>> - <!-- Module Dependencies -->
>>>>>
>>>>> <dependency>
>>>>> <groupId>${pom.groupId}</groupId>
>>>>>
>>>>> Modified: geronimo/server/trunk/modules/geronimo-j2ee-builder/
>>>>> src/java/org/apache/geronimo/j2ee/deployment/SecurityBuilder.java
>>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>>> geronimo-j2ee-builder/src/java/org/apache/geronimo/j2ee/
>>>>> deployment/SecurityBuilder.java?
>>>>> rev=437240&r1=437231&r2=437240&view=diff
>>>>> ==================================================================
>>>>> ============
>>>>> --- geronimo/server/trunk/modules/geronimo-j2ee-builder/src/
>>>>> java/org/apache/geronimo/j2ee/deployment/SecurityBuilder.java
>>>>> (original)
>>>>> +++ geronimo/server/trunk/modules/geronimo-j2ee-builder/src/
>>>>> java/org/apache/geronimo/j2ee/deployment/SecurityBuilder.java
>>>>> Sat Aug 26 15:30:02 2006
>>>>> @@ -23,7 +23,7 @@
>>>>> import org.apache.xmlbeans.XmlObject;
>>>>>
>>>>> /**
>>>>> - * @version $Rev:$ $Date:$
>>>>> + * @version $Rev$ $Date$
>>>>> */
>>>>> public interface SecurityBuilder extends NamespaceDrivenBuilder {
>>>>>
>>>>>
>>>>> Modified: geronimo/server/trunk/modules/geronimo-j2ee-schema/
>>>>> pom.xml
>>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>>> geronimo-j2ee-schema/pom.xml?
>>>>> rev=437240&r1=437231&r2=437240&view=diff
>>>>> ==================================================================
>>>>> ============
>>>>> --- geronimo/server/trunk/modules/geronimo-j2ee-schema/pom.xml
>>>>> (original)
>>>>> +++ geronimo/server/trunk/modules/geronimo-j2ee-schema/pom.xml
>>>>> Sat Aug 26 15:30:02 2006
>>>>> @@ -31,20 +31,6 @@
>>>>> <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:http://svn.apache.org/repos/asf/
>>>>> geronimo/server/trunk/modules/j2ee-schema</connection>
>>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/j2ee-
>>>>> schema</developerConnection>
>>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>>> modules/j2ee-schema</url>
>>>>> - </scm>
>>>>> -
>>>>> <dependencies>
>>>>>
>>>>> <!-- might not be necessary -->
>>>>> @@ -80,10 +66,10 @@
>>>>> https://svn.apache.org/repos/tck/geronimo-tck/
>>>>> schema/j2ee14
>>>>> -->
>>>>> <dependency>
>>>>> - <groupId>org.apache.geronimo.schema</groupId>
>>>>> - <artifactId>geronimo-schema-j2ee1.4</artifactId>
>>>>> - <version>1.0-SNAPSHOT</version>
>>>>> - </dependency>
>>>>> + <groupId>org.apache.geronimo.schema</groupId>
>>>>> + <artifactId>geronimo-schema-j2ee1.4</artifactId>
>>>>> + <version>1.0-SNAPSHOT</version>
>>>>> + </dependency>
>>>>>
>>>>> </dependencies>
>>>>>
>>>>>
>>>>> Modified: geronimo/server/trunk/modules/geronimo-j2ee/pom.xml
>>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>>> geronimo-j2ee/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>>>>> ==================================================================
>>>>> ============
>>>>> --- geronimo/server/trunk/modules/geronimo-j2ee/pom.xml (original)
>>>>> +++ geronimo/server/trunk/modules/geronimo-j2ee/pom.xml Sat Aug
>>>>> 26 15:30:02 2006
>>>>> @@ -31,20 +31,6 @@
>>>>> <artifactId>geronimo-j2ee</artifactId>
>>>>> <name>Geronimo :: J2EE</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:http://svn.apache.org/repos/asf/
>>>>> geronimo/server/trunk/modules/j2ee</connection>
>>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/j2ee</
>>>>> developerConnection>
>>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>>> modules/j2ee</url>
>>>>> - </scm>
>>>>> -
>>>>> <dependencies>
>>>>>
>>>>> <dependency>
>>>>>
>>>>> Modified: geronimo/server/trunk/modules/geronimo-jetty-builder/
>>>>> pom.xml
>>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>>> geronimo-jetty-builder/pom.xml?
>>>>> rev=437240&r1=437231&r2=437240&view=diff
>>>>> ==================================================================
>>>>> ============
>>>>> --- geronimo/server/trunk/modules/geronimo-jetty-builder/
>>>>> pom.xml (original)
>>>>> +++ geronimo/server/trunk/modules/geronimo-jetty-builder/
>>>>> pom.xml Sat Aug 26 15:30:02 2006
>>>>> @@ -31,23 +31,7 @@
>>>>> <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:http://svn.apache.org/repos/asf/
>>>>> geronimo/server/trunk/modules/jetty-builder</connection>
>>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/jetty-
>>>>> builder</developerConnection>
>>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>>> modules/jetty-builder</url>
>>>>> - </scm>
>>>>> -
>>>>> <dependencies>
>>>>> -
>>>>> - <!-- Module Dependencies -->
>>>>>
>>>>> <dependency>
>>>>> <groupId>${pom.groupId}</groupId>
>>>>>
>>>>> Modified: geronimo/server/trunk/modules/geronimo-jetty/pom.xml
>>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>>> geronimo-jetty/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>>>>> ==================================================================
>>>>> ============
>>>>> --- geronimo/server/trunk/modules/geronimo-jetty/pom.xml
>>>>> (original)
>>>>> +++ geronimo/server/trunk/modules/geronimo-jetty/pom.xml Sat
>>>>> Aug 26 15:30:02 2006
>>>>> @@ -31,20 +31,6 @@
>>>>> <artifactId>geronimo-jetty</artifactId>
>>>>> <name>Geronimo :: Jetty</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:http://svn.apache.org/repos/asf/
>>>>> geronimo/server/trunk/modules/jetty</connection>
>>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/jetty</
>>>>> developerConnection>
>>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>>> modules/jetty</url>
>>>>> - </scm>
>>>>> -
>>>>> <dependencies>
>>>>>
>>>>> <dependency>
>>>>>
>>>>> Modified: geronimo/server/trunk/modules/geronimo-jmx-remoting/
>>>>> pom.xml
>>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>>> geronimo-jmx-remoting/pom.xml?
>>>>> rev=437240&r1=437231&r2=437240&view=diff
>>>>> ==================================================================
>>>>> ============
>>>>> --- geronimo/server/trunk/modules/geronimo-jmx-remoting/pom.xml
>>>>> (original)
>>>>> +++ geronimo/server/trunk/modules/geronimo-jmx-remoting/pom.xml
>>>>> Sat Aug 26 15:30:02 2006
>>>>> @@ -31,21 +31,9 @@
>>>>> <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:http://svn.apache.org/repos/asf/
>>>>> geronimo/server/trunk/modules/jmx-remoting</connection>
>>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/jmx-
>>>>> remoting</developerConnection>
>>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>>> modules/jmx-remoting</url>
>>>>> - </scm>
>>>>> + <description>
>>>>> + Provides remote access to a Geronimo server using JSR
>>>>> 160 JMX Remoting.
>>>>> + </description>
>>>>>
>>>>> <dependencies>
>>>>>
>>>>>
>>>>> Modified: geronimo/server/trunk/modules/geronimo-kernel/pom.xml
>>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>>> geronimo-kernel/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>>>>> ==================================================================
>>>>> ============
>>>>> --- geronimo/server/trunk/modules/geronimo-kernel/pom.xml
>>>>> (original)
>>>>> +++ geronimo/server/trunk/modules/geronimo-kernel/pom.xml Sat
>>>>> Aug 26 15:30:02 2006
>>>>> @@ -31,20 +31,6 @@
>>>>> <artifactId>geronimo-kernel</artifactId>
>>>>> <name>Geronimo :: Kernel</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:http://svn.apache.org/repos/asf/
>>>>> geronimo/server/trunk/modules/kernel</connection>
>>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/kernel</
>>>>> developerConnection>
>>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>>> modules/kernel</url>
>>>>> - </scm>
>>>>> -
>>>>> <dependencies>
>>>>>
>>>>> <dependency>
>>>>> @@ -76,8 +62,6 @@
>>>>> <groupId>xpp3</groupId>
>>>>> <artifactId>xpp3</artifactId>
>>>>> </dependency>
>>>>> -
>>>>> - <!-- Test Dependencies -->
>>>>>
>>>>> <dependency>
>>>>> <groupId>org.apache.geronimo.specs</groupId>
>>>>>
>>>>> Modified: geronimo/server/trunk/modules/geronimo-mail/pom.xml
>>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>>> geronimo-mail/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>>>>> ==================================================================
>>>>> ============
>>>>> --- geronimo/server/trunk/modules/geronimo-mail/pom.xml (original)
>>>>> +++ geronimo/server/trunk/modules/geronimo-mail/pom.xml Sat Aug
>>>>> 26 15:30:02 2006
>>>>> @@ -31,23 +31,7 @@
>>>>> <artifactId>geronimo-mail</artifactId>
>>>>> <name>Geronimo :: Mail</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:http://svn.apache.org/repos/asf/
>>>>> geronimo/server/trunk/modules/mail</connection>
>>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/mail</
>>>>> developerConnection>
>>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>>> modules/mail</url>
>>>>> - </scm>
>>>>> -
>>>>> <dependencies>
>>>>> -
>>>>> - <!-- Module Dependencies -->
>>>>>
>>>>> <dependency>
>>>>> <groupId>org.apache.geronimo.modules</groupId>
>>>>>
>>>>> Modified: geronimo/server/trunk/modules/geronimo-management/
>>>>> pom.xml
>>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>>> geronimo-management/pom.xml?
>>>>> rev=437240&r1=437231&r2=437240&view=diff
>>>>> ==================================================================
>>>>> ============
>>>>> --- geronimo/server/trunk/modules/geronimo-management/pom.xml
>>>>> (original)
>>>>> +++ geronimo/server/trunk/modules/geronimo-management/pom.xml
>>>>> Sat Aug 26 15:30:02 2006
>>>>> @@ -31,21 +31,9 @@
>>>>> <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:http://svn.apache.org/repos/asf/
>>>>> geronimo/server/trunk/modules/management</connection>
>>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/
>>>>> management</developerConnection>
>>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>>> modules/management</url>
>>>>> - </scm>
>>>>> + <description>
>>>>> + Contains interfaces that define the management API for
>>>>> Geronimo.
>>>>> + </description>
>>>>>
>>>>> <dependencies>
>>>>>
>>>>>
>>>>> Modified: geronimo/server/trunk/modules/geronimo-naming-builder/
>>>>> pom.xml
>>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>>> geronimo-naming-builder/pom.xml?
>>>>> rev=437240&r1=437231&r2=437240&view=diff
>>>>> ==================================================================
>>>>> ============
>>>>> --- geronimo/server/trunk/modules/geronimo-naming-builder/
>>>>> pom.xml (original)
>>>>> +++ geronimo/server/trunk/modules/geronimo-naming-builder/
>>>>> pom.xml Sat Aug 26 15:30:02 2006
>>>>> @@ -30,24 +30,9 @@
>>>>>
>>>>> <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:http://svn.apache.org/repos/asf/
>>>>> geronimo/server/trunk/modules/naming-builder</connection>
>>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/naming-
>>>>> builder</developerConnection>
>>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>>> modules/naming-builder</url>
>>>>> - </scm>
>>>>>
>>>>> <dependencies>
>>>>>
>>>>> - <!-- Module Dependencies -->
>>>>> -
>>>>> <dependency>
>>>>> <groupId>${pom.groupId}</groupId>
>>>>> <artifactId>geronimo-common</artifactId>
>>>>> @@ -95,8 +80,6 @@
>>>>> <artifactId>geronimo-naming</artifactId>
>>>>> <version>${pom.version}</version>
>>>>> </dependency>
>>>>> -
>>>>> - <!-- Spec Dependencies -->
>>>>>
>>>>> <dependency>
>>>>> <groupId>org.apache.geronimo.specs</groupId>
>>>>>
>>>>> Modified: geronimo/server/trunk/modules/geronimo-naming/pom.xml
>>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>>> geronimo-naming/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>>>>> ==================================================================
>>>>> ============
>>>>> --- geronimo/server/trunk/modules/geronimo-naming/pom.xml
>>>>> (original)
>>>>> +++ geronimo/server/trunk/modules/geronimo-naming/pom.xml Sat
>>>>> Aug 26 15:30:02 2006
>>>>> @@ -31,20 +31,6 @@
>>>>> <artifactId>geronimo-naming</artifactId>
>>>>> <name>Geronimo :: Naming</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:http://svn.apache.org/repos/asf/
>>>>> geronimo/server/trunk/modules/naming</connection>
>>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/naming</
>>>>> developerConnection>
>>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>>> modules/naming</url>
>>>>> - </scm>
>>>>> -
>>>>> <dependencies>
>>>>>
>>>>> <dependency>
>>>>>
>>>>> Modified: geronimo/server/trunk/modules/geronimo-security-
>>>>> builder/pom.xml
>>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>>> geronimo-security-builder/pom.xml?
>>>>> rev=437240&r1=437231&r2=437240&view=diff
>>>>> ==================================================================
>>>>> ============
>>>>> --- geronimo/server/trunk/modules/geronimo-security-builder/
>>>>> pom.xml (original)
>>>>> +++ geronimo/server/trunk/modules/geronimo-security-builder/
>>>>> pom.xml Sat Aug 26 15:30:02 2006
>>>>> @@ -31,23 +31,7 @@
>>>>> <artifactId>geronimo-security-builder</artifactId>
>>>>> <name>Geronimo :: Security :: 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:http://svn.apache.org/repos/asf/
>>>>> geronimo/server/trunk/modules/security-builder</connection>
>>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/
>>>>> security-builder</developerConnection>
>>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>>> modules/security-builder</url>
>>>>> - </scm>
>>>>> -
>>>>> <dependencies>
>>>>> -
>>>>> - <!-- Module Dependencies -->
>>>>>
>>>>> <dependency>
>>>>> <groupId>${pom.groupId}</groupId>
>>>>>
>>>>> Modified: geronimo/server/trunk/modules/geronimo-security/pom.xml
>>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>>> geronimo-security/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>>>>> ==================================================================
>>>>> ============
>>>>> --- geronimo/server/trunk/modules/geronimo-security/pom.xml
>>>>> (original)
>>>>> +++ geronimo/server/trunk/modules/geronimo-security/pom.xml Sat
>>>>> Aug 26 15:30:02 2006
>>>>> @@ -31,24 +31,8 @@
>>>>> <artifactId>geronimo-security</artifactId>
>>>>> <name>Geronimo :: Security</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:http://svn.apache.org/repos/asf/
>>>>> geronimo/server/trunk/modules/security</connection>
>>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/
>>>>> security</developerConnection>
>>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>>> modules/security</url>
>>>>> - </scm>
>>>>> -
>>>>> <dependencies>
>>>>>
>>>>> - <!-- Module Dependencies -->
>>>>> -
>>>>> <dependency>
>>>>> <groupId>org.apache.geronimo.modules</groupId>
>>>>> <artifactId>geronimo-core</artifactId>
>>>>> @@ -84,8 +68,6 @@
>>>>> <artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
>>>>> </dependency>
>>>>>
>>>>> - <!-- Thirdparty Dependencies -->
>>>>> -
>>>>> <dependency>
>>>>> <groupId>activeio</groupId>
>>>>> <artifactId>activeio</artifactId>
>>>>> @@ -95,8 +77,6 @@
>>>>> <groupId>regexp</groupId>
>>>>> <artifactId>regexp</artifactId>
>>>>> </dependency>
>>>>> -
>>>>> - <!-- Test Dependencies -->
>>>>>
>>>>> <dependency>
>>>>> <groupId>hsqldb</groupId>
>>>>>
>>>>> Modified: geronimo/server/trunk/modules/geronimo-service-
>>>>> builder/pom.xml
>>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>>> geronimo-service-builder/pom.xml?
>>>>> rev=437240&r1=437231&r2=437240&view=diff
>>>>> ==================================================================
>>>>> ============
>>>>> --- geronimo/server/trunk/modules/geronimo-service-builder/
>>>>> pom.xml (original)
>>>>> +++ geronimo/server/trunk/modules/geronimo-service-builder/
>>>>> pom.xml Sat Aug 26 15:30:02 2006
>>>>> @@ -29,24 +29,9 @@
>>>>>
>>>>> <artifactId>geronimo-service-builder</artifactId>
>>>>> <name>Geronimo :: Service :: 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:http://svn.apache.org/repos/asf/
>>>>> geronimo/server/trunk/modules/service-builder</connection>
>>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/service-
>>>>> builder</developerConnection>
>>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>>> modules/service-builder</url>
>>>>> - </scm>
>>>>>
>>>>> <dependencies>
>>>>>
>>>>> - <!-- Module Dependencies -->
>>>>> -
>>>>> <dependency>
>>>>> <groupId>${pom.groupId}</groupId>
>>>>> <artifactId>geronimo-kernel</artifactId>
>>>>> @@ -78,8 +63,6 @@
>>>>> <scope>test</scope>
>>>>> </dependency>
>>>>>
>>>>> - <!-- Thirdparty Dependencies -->
>>>>> -
>>>>> <dependency>
>>>>> <groupId>xmlbeans</groupId>
>>>>> <artifactId>xbean</artifactId>
>>>>>
>>>>> Modified: geronimo/server/trunk/modules/geronimo-system/pom.xml
>>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>>> geronimo-system/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>>>>> ==================================================================
>>>>> ============
>>>>> --- geronimo/server/trunk/modules/geronimo-system/pom.xml
>>>>> (original)
>>>>> +++ geronimo/server/trunk/modules/geronimo-system/pom.xml Sat
>>>>> Aug 26 15:30:02 2006
>>>>> @@ -31,24 +31,8 @@
>>>>> <artifactId>geronimo-system</artifactId>
>>>>> <name>Geronimo :: System</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:http://svn.apache.org/repos/asf/
>>>>> geronimo/server/trunk/modules/system</connection>
>>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/system</
>>>>> developerConnection>
>>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>>> modules/system</url>
>>>>> - </scm>
>>>>> -
>>>>> <dependencies>
>>>>>
>>>>> - <!-- Module Dependencies -->
>>>>> -
>>>>> <dependency>
>>>>> <groupId>org.apache.geronimo.modules</groupId>
>>>>> <artifactId>geronimo-common</artifactId>
>>>>> @@ -67,14 +51,10 @@
>>>>> <version>${pom.version}</version>
>>>>> </dependency>
>>>>>
>>>>> - <!-- Thirdparty Dependencies -->
>>>>> -
>>>>> <dependency>
>>>>> <groupId>concurrent</groupId>
>>>>> <artifactId>concurrent</artifactId>
>>>>> </dependency>
>>>>> -
>>>>> - <!-- Test Dependencies -->
>>>>>
>>>>> <!--
>>>>> NOTE: Need to include Xerces for tests in case Crimson
>>>>> (or another parser)
>>>>>
>>>>> Modified: geronimo/server/trunk/modules/geronimo-test-ddbean/
>>>>> pom.xml
>>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>>> geronimo-test-ddbean/pom.xml?
>>>>> rev=437240&r1=437231&r2=437240&view=diff
>>>>> ==================================================================
>>>>> ============
>>>>> --- geronimo/server/trunk/modules/geronimo-test-ddbean/pom.xml
>>>>> (original)
>>>>> +++ geronimo/server/trunk/modules/geronimo-test-ddbean/pom.xml
>>>>> Sat Aug 26 15:30:02 2006
>>>>> @@ -31,20 +31,6 @@
>>>>> <artifactId>geronimo-test-ddbean</artifactId>
>>>>> <name>Geronimo :: Test :: DDBeans</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:http://svn.apache.org/repos/asf/
>>>>> geronimo/server/trunk/modules/test-ddbean</connection>
>>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/test-
>>>>> ddbean</developerConnection>
>>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>>> modules/test-ddbean</url>
>>>>> - </scm>
>>>>> -
>>>>> <dependencies>
>>>>>
>>>>> <dependency>
>>>>>
>>>>> Modified: geronimo/server/trunk/modules/geronimo-testsupport/
>>>>> pom.xml
>>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>>> geronimo-testsupport/pom.xml?
>>>>> rev=437240&r1=437239&r2=437240&view=diff
>>>>> ==================================================================
>>>>> ============
>>>>> --- geronimo/server/trunk/modules/geronimo-testsupport/pom.xml
>>>>> (original)
>>>>> +++ geronimo/server/trunk/modules/geronimo-testsupport/pom.xml
>>>>> Sat Aug 26 15:30:02 2006
>>>>> @@ -47,11 +47,4 @@
>>>>>
>>>>> </dependencies>
>>>>>
>>>>> - <build>
>>>>> - <!--
>>>>> - FIXME: Remove when the default is to use the m2
>>>>> standard layout
>>>>> - -->
>>>>> - <sourceDirectory>${pom.basedir}/src/main/java</
>>>>> sourceDirectory>
>>>>> - </build>
>>>>> -
>>>>> </project>
>>>>>
>>>>> Modified: geronimo/server/trunk/modules/geronimo-timer/pom.xml
>>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>>> geronimo-timer/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>>>>> ==================================================================
>>>>> ============
>>>>> --- geronimo/server/trunk/modules/geronimo-timer/pom.xml
>>>>> (original)
>>>>> +++ geronimo/server/trunk/modules/geronimo-timer/pom.xml Sat
>>>>> Aug 26 15:30:02 2006
>>>>> @@ -31,20 +31,6 @@
>>>>> <artifactId>geronimo-timer</artifactId>
>>>>> <name>Geronimo :: Timer</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:http://svn.apache.org/repos/asf/
>>>>> geronimo/server/trunk/modules/timer</connection>
>>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/timer</
>>>>> developerConnection>
>>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>>> modules/timer</url>
>>>>> - </scm>
>>>>> -
>>>>> <properties>
>>>>> <!--
>>>>> FIXME: Disable the timer tests for now since they can
>>>>> fail if the host environment
>>>>>
>>>>> Modified: geronimo/server/trunk/modules/geronimo-tomcat-builder/
>>>>> pom.xml
>>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>>> geronimo-tomcat-builder/pom.xml?
>>>>> rev=437240&r1=437231&r2=437240&view=diff
>>>>> ==================================================================
>>>>> ============
>>>>> --- geronimo/server/trunk/modules/geronimo-tomcat-builder/
>>>>> pom.xml (original)
>>>>> +++ geronimo/server/trunk/modules/geronimo-tomcat-builder/
>>>>> pom.xml Sat Aug 26 15:30:02 2006
>>>>> @@ -31,24 +31,8 @@
>>>>> <artifactId>geronimo-tomcat-builder</artifactId>
>>>>> <name>Geronimo :: Tomcat :: 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:http://svn.apache.org/repos/asf/
>>>>> geronimo/server/trunk/modules/tomcat-builder</connection>
>>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/tomcat-
>>>>> builder</developerConnection>
>>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>>> modules/tomcat-builder</url>
>>>>> - </scm>
>>>>> -
>>>>> <dependencies>
>>>>>
>>>>> - <!-- Module Dependencies -->
>>>>> -
>>>>> <!--<dependency>-->
>>>>> <!--<groupId>${pom.groupId}</groupId>-->
>>>>> <!--<artifactId>geronimo-deployment</artifactId>-->
>>>>> @@ -103,8 +87,6 @@
>>>>> <version>${pom.version}</version>
>>>>> </dependency>
>>>>>
>>>>> - <!-- Thirdparty Dependencies -->
>>>>> -
>>>>> <dependency>
>>>>> <groupId>xmlbeans</groupId>
>>>>> <artifactId>xbean</artifactId>
>>>>> @@ -115,8 +97,6 @@
>>>>> <artifactId>stax-api</artifactId>
>>>>> </dependency>
>>>>>
>>>>> - <!-- Test Dependencies -->
>>>>> -
>>>>> <!--<dependency>-->
>>>>> <!--<groupId>${pom.groupId}</groupId>-->
>>>>> <!--<artifactId>geronimo-axis</artifactId>-->
>>>>> @@ -130,7 +110,7 @@
>>>>> <!--<scope>test</scope>-->
>>>>> <!--</dependency>-->
>>>>>
>>>>> - <!--WFT??? why is this needed for tests all of a
>>>>> sudden? -->
>>>>> + <!-- WFT??? why is this needed for tests all of a
>>>>> sudden? -->
>>>>> <dependency>
>>>>> <groupId>org.apache.geronimo.specs</groupId>
>>>>> <artifactId>geronimo-jsp_2.0_spec</artifactId>
>>>>>
>>>>> Modified: geronimo/server/trunk/modules/geronimo-tomcat/pom.xml
>>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>>> geronimo-tomcat/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>>>>> ==================================================================
>>>>> ============
>>>>> --- geronimo/server/trunk/modules/geronimo-tomcat/pom.xml
>>>>> (original)
>>>>> +++ geronimo/server/trunk/modules/geronimo-tomcat/pom.xml Sat
>>>>> Aug 26 15:30:02 2006
>>>>> @@ -31,20 +31,6 @@
>>>>> <artifactId>geronimo-tomcat</artifactId>
>>>>> <name>Geronimo :: Tomcat</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:http://svn.apache.org/repos/asf/
>>>>> geronimo/server/trunk/modules/tomcat</connection>
>>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/tomcat</
>>>>> developerConnection>
>>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>>> modules/tomcat</url>
>>>>> - </scm>
>>>>> -
>>>>> <properties>
>>>>> <endorsedDir>${project.build.directory}/endorsed</
>>>>> endorsedDir>
>>>>> <localRepoDir>${settings.localRepository}</localRepoDir>
>>>>>
>>>>> Modified: geronimo/server/trunk/modules/geronimo-transaction/
>>>>> pom.xml
>>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>>> geronimo-transaction/pom.xml?
>>>>> rev=437240&r1=437231&r2=437240&view=diff
>>>>> ==================================================================
>>>>> ============
>>>>> --- geronimo/server/trunk/modules/geronimo-transaction/pom.xml
>>>>> (original)
>>>>> +++ geronimo/server/trunk/modules/geronimo-transaction/pom.xml
>>>>> Sat Aug 26 15:30:02 2006
>>>>> @@ -31,20 +31,6 @@
>>>>> <artifactId>geronimo-transaction</artifactId>
>>>>> <name>Geronimo :: Transaction</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:http://svn.apache.org/repos/asf/
>>>>> geronimo/server/trunk/modules/transaction</connection>
>>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/
>>>>> transaction</developerConnection>
>>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>>> modules/transaction</url>
>>>>> - </scm>
>>>>> -
>>>>> <dependencies>
>>>>>
>>>>> <!-- temp, for ServerInfo. Remove when it is moved to
>>>>> Kernel-->
>>>>>
>>>>> Modified: geronimo/server/trunk/modules/geronimo-upgrade/pom.xml
>>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>>> geronimo-upgrade/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>>>>> ==================================================================
>>>>> ============
>>>>> --- geronimo/server/trunk/modules/geronimo-upgrade/pom.xml
>>>>> (original)
>>>>> +++ geronimo/server/trunk/modules/geronimo-upgrade/pom.xml Sat
>>>>> Aug 26 15:30:02 2006
>>>>> @@ -31,20 +31,6 @@
>>>>> <artifactId>geronimo-upgrade</artifactId>
>>>>> <name>Geronimo :: Upgrade</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:http://svn.apache.org/repos/asf/
>>>>> geronimo/server/trunk/modules/upgrade</connection>
>>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/
>>>>> upgrade</developerConnection>
>>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>>> modules/upgrade</url>
>>>>> - </scm>
>>>>> -
>>>>> <dependencies>
>>>>>
>>>>> <dependency>
>>>>>
>>>>> Modified: geronimo/server/trunk/modules/geronimo-util/pom.xml
>>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>>> geronimo-util/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>>>>> ==================================================================
>>>>> ============
>>>>> --- geronimo/server/trunk/modules/geronimo-util/pom.xml (original)
>>>>> +++ geronimo/server/trunk/modules/geronimo-util/pom.xml Sat Aug
>>>>> 26 15:30:02 2006
>>>>> @@ -31,20 +31,6 @@
>>>>> <artifactId>geronimo-util</artifactId>
>>>>> <name>Geronimo :: Util</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:http://svn.apache.org/repos/asf/
>>>>> geronimo/server/trunk/modules/util</connection>
>>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/util</
>>>>> developerConnection>
>>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>>> modules/util</url>
>>>>> - </scm>
>>>>> -
>>>>> <dependencies>
>>>>>
>>>>> <dependency>
>>>>>
>>>>> Modified: geronimo/server/trunk/modules/geronimo-web-builder/
>>>>> pom.xml
>>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>>> geronimo-web-builder/pom.xml?
>>>>> rev=437240&r1=437231&r2=437240&view=diff
>>>>> ==================================================================
>>>>> ============
>>>>> --- geronimo/server/trunk/modules/geronimo-web-builder/pom.xml
>>>>> (original)
>>>>> +++ geronimo/server/trunk/modules/geronimo-web-builder/pom.xml
>>>>> Sat Aug 26 15:30:02 2006
>>>>> @@ -31,24 +31,8 @@
>>>>> <artifactId>geronimo-web-builder</artifactId>
>>>>> <name>Geronimo :: Web :: Builder</name>
>>>>>
>>>>> - <!--
>>>>> -
>>>>> - HACK: Need to explicitly configure SCM for this module
>>>>> since its artifactId
>>>>> - does not match the directory it lives in.
>>>>> -
>>>>> - FIXME: Rename module directory or artifactId.
>>>>> -
>>>>> - -->
>>>>> - <scm>
>>>>> - <connection>scm:svn:http://svn.apache.org/repos/asf/
>>>>> geronimo/server/trunk/modules/web-builder</connection>
>>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/web-
>>>>> builder</developerConnection>
>>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>>> modules/web-builder</url>
>>>>> - </scm>
>>>>> -
>>>>> <dependencies>
>>>>>
>>>>> - <!-- Module Dependencies -->
>>>>> -
>>>>> <dependency>
>>>>> <groupId>${pom.groupId}</groupId>
>>>>> <artifactId>geronimo-j2ee-builder</artifactId>
>>>>> @@ -87,8 +71,6 @@
>>>>> <version>${pom.version}</version>
>>>>> </dependency>
>>>>>
>>>>> - <!-- Spec Dependencies -->
>>>>> -
>>>>> <dependency>
>>>>> <groupId>org.apache.geronimo.specs</groupId>
>>>>> <artifactId>geronimo-servlet_2.4_spec</artifactId>
>>>>>
>>>>> Modified: geronimo/server/trunk/modules/geronimo-webservices/
>>>>> pom.xml
>>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>>> geronimo-webservices/pom.xml?
>>>>> rev=437240&r1=437231&r2=437240&view=diff
>>>>> ==================================================================
>>>>> ============
>>>>> --- geronimo/server/trunk/modules/geronimo-webservices/pom.xml
>>>>> (original)
>>>>> +++ geronimo/server/trunk/modules/geronimo-webservices/pom.xml
>>>>> Sat Aug 26 15:30:02 2006
>>>>> @@ -31,20 +31,6 @@
>>>>> <artifactId>geronimo-webservices</artifactId>
>>>>> <name>Geronimo :: Web Services</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:http://svn.apache.org/repos/asf/
>>>>> geronimo/server/trunk/modules/webservices</connection>
>>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/
>>>>> webservices</developerConnection>
>>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>>> modules/webservices</url>
>>>>> - </scm>
>>>>> -
>>>>> <dependencies>
>>>>>
>>>>> <dependency>
>>>>> @@ -121,6 +107,7 @@
>>>>> <groupId>scout</groupId>
>>>>> <artifactId>scout</artifactId>
>>>>> </dependency>
>>>>> +
>>>>> </dependencies>
>>>>>
>>>>> </project>
>>>>>
>>>>> Modified: geronimo/server/trunk/modules/pom.xml
>>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>>> pom.xml?rev=437240&r1=437239&r2=437240&view=diff
>>>>> ==================================================================
>>>>> ============
>>>>> --- geronimo/server/trunk/modules/pom.xml (original)
>>>>> +++ geronimo/server/trunk/modules/pom.xml Sat Aug 26 15:30:02 2006
>>>>> @@ -35,51 +35,51 @@
>>>>>
>>>>> <modules>
>>>>> <module>geronimo-testsupport</module>
>>>>> - <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>
>>>>> - <module>client-builder</module>
>>>>> - <module>common</module>
>>>>> - <module>connector</module>
>>>>> - <module>connector-builder</module>
>>>>> - <module>converter</module>
>>>>> - <module>core</module>
>>>>> - <module>deploy-config</module>
>>>>> - <module>deploy-jsr88</module>
>>>>> - <module>deploy-tool</module>
>>>>> - <module>deployment</module>
>>>>> - <module>derby</module>
>>>>> - <module>directory</module>
>>>>> - <module>hot-deploy</module>
>>>>> - <module>interceptor</module>
>>>>> - <module>j2ee</module>
>>>>> - <module>j2ee-builder</module>
>>>>> - <module>j2ee-schema</module>
>>>>> - <module>jetty</module>
>>>>> - <module>jetty-builder</module>
>>>>> - <module>jmx-remoting</module>
>>>>> - <module>kernel</module>
>>>>> - <module>mail</module>
>>>>> - <module>management</module>
>>>>> - <module>naming</module>
>>>>> - <module>naming-builder</module>
>>>>> - <module>security</module>
>>>>> - <module>security-builder</module>
>>>>> - <module>service-builder</module>
>>>>> - <module>system</module>
>>>>> - <module>test-ddbean</module>
>>>>> - <module>timer</module>
>>>>> - <module>tomcat</module>
>>>>> - <module>tomcat-builder</module>
>>>>> - <module>transaction</module>
>>>>> - <module>upgrade</module>
>>>>> - <module>util</module>
>>>>> - <module>web-builder</module>
>>>>> - <module>webservices</module>
>>>>> + <module>geronimo-activation</module>
>>>>> + <module>ge-activemq-rar</module>
>>>>> + <module>geronimo-activemq-gbean</module>
>>>>> + <module>geronimo-activemq-gbean-management</module>
>>>>> + <module>geronimo-axis</module>
>>>>> + <module>geronimo-axis-builder</module>
>>>>> + <module>geronimo-client</module>
>>>>> + <module>geronimo-client-builder</module>
>>>>> + <module>geronimo-common</module>
>>>>> + <module>geronimo-connector</module>
>>>>> + <module>geronimo-connector-builder</module>
>>>>> + <module>geronimo-converter</module>
>>>>> + <module>geronimo-core</module>
>>>>> + <module>geronimo-deploy-config</module>
>>>>> + <module>geronimo-deploy-jsr88</module>
>>>>> + <module>geronimo-deploy-tool</module>
>>>>> + <module>geronimo-deployment</module>
>>>>> + <module>geronimo-derby</module>
>>>>> + <module>geronimo-directory</module>
>>>>> + <module>geronimo-hot-deploy</module>
>>>>> + <module>geronimo-interceptor</module>
>>>>> + <module>geronimo-j2ee</module>
>>>>> + <module>geronimo-j2ee-builder</module>
>>>>> + <module>geronimo-j2ee-schema</module>
>>>>> + <module>geronimo-jetty</module>
>>>>> + <module>geronimo-jetty-builder</module>
>>>>> + <module>geronimo-jmx-remoting</module>
>>>>> + <module>geronimo-kernel</module>
>>>>> + <module>geronimo-mail</module>
>>>>> + <module>geronimo-management</module>
>>>>> + <module>geronimo-naming</module>
>>>>> + <module>geronimo-naming-builder</module>
>>>>> + <module>geronimo-security</module>
>>>>> + <module>geronimo-security-builder</module>
>>>>> + <module>geronimo-service-builder</module>
>>>>> + <module>geronimo-system</module>
>>>>> + <module>geronimo-test-ddbean</module>
>>>>> + <module>geronimo-timer</module>
>>>>> + <module>geronimo-tomcat</module>
>>>>> + <module>geronimo-tomcat-builder</module>
>>>>> + <module>geronimo-transaction</module>
>>>>> + <module>geronimo-upgrade</module>
>>>>> + <module>geronimo-util</module>
>>>>> + <module>geronimo-web-builder</module>
>>>>> + <module>geronimo-webservices</module>
>>>>> </modules>
>>>>>
>>>>> </project>
>>>>>
>>>>>
>>>>
>>>>
>>>> -sachin
>>>>
>>>>
>>>
>>>
>>> -sachin
>>>
>>>
>>
>>
>> -sachin
>>
>>
>
Re: svn commit: r437240 - in /geronimo/server/trunk/modules: ./ activation/ activemq-embedded-rar/ activemq-gbean-management/ activemq-gbean/ axis-builder/ axis/ client-builder/ client/ common/ connector-builder/ connector/ converter/ core/ deploy-config/ ...
Posted by David Jencks <da...@yahoo.com>.
What I've been doing is to make a patch of my changes before the
merge, merge, update the paths in the patch to the new locations, and
apply the patch. This is sort of horrendous, but is the best I've
found so far.
thanks
david jencks
On Aug 29, 2006, at 8:21 AM, Sachin Patel wrote:
> So I assume after merging the changes have to be re-made manually?
>
> On Aug 28, 2006, at 9:18 AM, Sachin Patel wrote:
>
>> for example...
>>
>> my branch contains j2ee-builder/src/foo.java (which contains
>> committed changes that are not in trunk)
>>
>> and for example, in trunk you happened to rename this too..
>>
>> geronimo-j2ee-builder/src/foo.java..
>>
>> Doing any svn merge, would remove my copy of it, and replace it
>> with the foo.java from trunk, thus losing my changes.
>>
>> Can svn merge or svk handle this? I've got svk installed, but not
>> sure how to use it.
>>
>> thx
>>
>> On Aug 28, 2006, at 8:37 AM, Sachin Patel wrote:
>>
>>> Jason, how can I best merge these changes into the sachin branch
>>> without having my changes wiped out? Using svn merge, since old
>>> source folders are being renamed and the source removed, my files
>>> are being deleted :(, what is the best way for my tree to be
>>> updated to any further new structure changes?
>>>
>>> Thanks.
>>>
>>> On Aug 26, 2006, at 6:30 PM, jdillon@apache.org wrote:
>>>
>>>> Author: jdillon
>>>> Date: Sat Aug 26 15:30:02 2006
>>>> New Revision: 437240
>>>>
>>>> URL: http://svn.apache.org/viewvc?rev=437240&view=rev
>>>> Log:
>>>> (GERONIMO-2162) Use same directory as artifactId for modules/*
>>>>
>>>> Added:
>>>> geronimo/server/trunk/modules/ge-activemq-rar/
>>>> - copied from r437231, geronimo/server/trunk/modules/
>>>> activemq-embedded-rar/
>>>> geronimo/server/trunk/modules/geronimo-activation/
>>>> - copied from r437231, geronimo/server/trunk/modules/
>>>> activation/
>>>> geronimo/server/trunk/modules/geronimo-activemq-gbean/
>>>> - copied from r437231, geronimo/server/trunk/modules/
>>>> activemq-gbean/
>>>> geronimo/server/trunk/modules/geronimo-activemq-gbean-
>>>> management/
>>>> - copied from r437231, geronimo/server/trunk/modules/
>>>> activemq-gbean-management/
>>>> geronimo/server/trunk/modules/geronimo-axis/
>>>> - copied from r437231, geronimo/server/trunk/modules/axis/
>>>> geronimo/server/trunk/modules/geronimo-axis-builder/
>>>> - copied from r437231, geronimo/server/trunk/modules/axis-
>>>> builder/
>>>> geronimo/server/trunk/modules/geronimo-client/
>>>> - copied from r437231, geronimo/server/trunk/modules/client/
>>>> geronimo/server/trunk/modules/geronimo-client-builder/
>>>> - copied from r437231, geronimo/server/trunk/modules/
>>>> client-builder/
>>>> geronimo/server/trunk/modules/geronimo-common/
>>>> - copied from r437231, geronimo/server/trunk/modules/common/
>>>> geronimo/server/trunk/modules/geronimo-connector/
>>>> - copied from r437231, geronimo/server/trunk/modules/
>>>> connector/
>>>> geronimo/server/trunk/modules/geronimo-connector-builder/
>>>> - copied from r437231, geronimo/server/trunk/modules/
>>>> connector-builder/
>>>> geronimo/server/trunk/modules/geronimo-converter/
>>>> - copied from r437231, geronimo/server/trunk/modules/
>>>> converter/
>>>> geronimo/server/trunk/modules/geronimo-core/
>>>> - copied from r437231, geronimo/server/trunk/modules/core/
>>>> geronimo/server/trunk/modules/geronimo-deploy-config/
>>>> - copied from r437231, geronimo/server/trunk/modules/
>>>> deploy-config/
>>>> geronimo/server/trunk/modules/geronimo-deploy-jsr88/
>>>> - copied from r437231, geronimo/server/trunk/modules/
>>>> deploy-jsr88/
>>>> geronimo/server/trunk/modules/geronimo-deploy-tool/
>>>> - copied from r437231, geronimo/server/trunk/modules/
>>>> deploy-tool/
>>>> geronimo/server/trunk/modules/geronimo-deployment/
>>>> - copied from r437231, geronimo/server/trunk/modules/
>>>> deployment/
>>>> geronimo/server/trunk/modules/geronimo-derby/
>>>> - copied from r437231, geronimo/server/trunk/modules/derby/
>>>> geronimo/server/trunk/modules/geronimo-directory/
>>>> - copied from r437231, geronimo/server/trunk/modules/
>>>> directory/
>>>> geronimo/server/trunk/modules/geronimo-hot-deploy/
>>>> - copied from r437231, geronimo/server/trunk/modules/hot-
>>>> deploy/
>>>> geronimo/server/trunk/modules/geronimo-interceptor/
>>>> - copied from r437231, geronimo/server/trunk/modules/
>>>> interceptor/
>>>> geronimo/server/trunk/modules/geronimo-j2ee/
>>>> - copied from r437231, geronimo/server/trunk/modules/j2ee/
>>>> geronimo/server/trunk/modules/geronimo-j2ee-builder/
>>>> - copied from r437231, geronimo/server/trunk/modules/j2ee-
>>>> builder/
>>>> geronimo/server/trunk/modules/geronimo-j2ee-schema/
>>>> - copied from r437231, geronimo/server/trunk/modules/j2ee-
>>>> schema/
>>>> geronimo/server/trunk/modules/geronimo-jetty/
>>>> - copied from r437231, geronimo/server/trunk/modules/jetty/
>>>> geronimo/server/trunk/modules/geronimo-jetty-builder/
>>>> - copied from r437231, geronimo/server/trunk/modules/jetty-
>>>> builder/
>>>> geronimo/server/trunk/modules/geronimo-jmx-remoting/
>>>> - copied from r437231, geronimo/server/trunk/modules/jmx-
>>>> remoting/
>>>> geronimo/server/trunk/modules/geronimo-kernel/
>>>> - copied from r437231, geronimo/server/trunk/modules/kernel/
>>>> geronimo/server/trunk/modules/geronimo-mail/
>>>> - copied from r437231, geronimo/server/trunk/modules/mail/
>>>> geronimo/server/trunk/modules/geronimo-management/
>>>> - copied from r437231, geronimo/server/trunk/modules/
>>>> management/
>>>> geronimo/server/trunk/modules/geronimo-naming/
>>>> - copied from r437231, geronimo/server/trunk/modules/naming/
>>>> geronimo/server/trunk/modules/geronimo-naming-builder/
>>>> - copied from r437231, geronimo/server/trunk/modules/
>>>> naming-builder/
>>>> geronimo/server/trunk/modules/geronimo-security/
>>>> - copied from r437231, geronimo/server/trunk/modules/
>>>> security/
>>>> geronimo/server/trunk/modules/geronimo-security-builder/
>>>> - copied from r437231, geronimo/server/trunk/modules/
>>>> security-builder/
>>>> geronimo/server/trunk/modules/geronimo-service-builder/
>>>> - copied from r437231, geronimo/server/trunk/modules/
>>>> service-builder/
>>>> geronimo/server/trunk/modules/geronimo-system/
>>>> - copied from r437231, geronimo/server/trunk/modules/system/
>>>> geronimo/server/trunk/modules/geronimo-test-ddbean/
>>>> - copied from r437231, geronimo/server/trunk/modules/test-
>>>> ddbean/
>>>> geronimo/server/trunk/modules/geronimo-timer/
>>>> - copied from r437231, geronimo/server/trunk/modules/timer/
>>>> geronimo/server/trunk/modules/geronimo-tomcat/
>>>> - copied from r437231, geronimo/server/trunk/modules/tomcat/
>>>> geronimo/server/trunk/modules/geronimo-tomcat-builder/
>>>> - copied from r437231, geronimo/server/trunk/modules/
>>>> tomcat-builder/
>>>> geronimo/server/trunk/modules/geronimo-transaction/
>>>> - copied from r437231, geronimo/server/trunk/modules/
>>>> transaction/
>>>> geronimo/server/trunk/modules/geronimo-upgrade/
>>>> - copied from r437231, geronimo/server/trunk/modules/upgrade/
>>>> geronimo/server/trunk/modules/geronimo-util/
>>>> - copied from r437231, geronimo/server/trunk/modules/util/
>>>> geronimo/server/trunk/modules/geronimo-web-builder/
>>>> - copied from r437231, geronimo/server/trunk/modules/web-
>>>> builder/
>>>> geronimo/server/trunk/modules/geronimo-webservices/
>>>> - copied from r437231, geronimo/server/trunk/modules/
>>>> webservices/
>>>> Removed:
>>>> geronimo/server/trunk/modules/activation/
>>>> geronimo/server/trunk/modules/activemq-embedded-rar/
>>>> geronimo/server/trunk/modules/activemq-gbean/
>>>> geronimo/server/trunk/modules/activemq-gbean-management/
>>>> geronimo/server/trunk/modules/axis/
>>>> geronimo/server/trunk/modules/axis-builder/
>>>> geronimo/server/trunk/modules/client/
>>>> geronimo/server/trunk/modules/client-builder/
>>>> geronimo/server/trunk/modules/common/
>>>> geronimo/server/trunk/modules/connector/
>>>> geronimo/server/trunk/modules/connector-builder/
>>>> geronimo/server/trunk/modules/converter/
>>>> geronimo/server/trunk/modules/core/
>>>> geronimo/server/trunk/modules/deploy-config/
>>>> geronimo/server/trunk/modules/deploy-jsr88/
>>>> geronimo/server/trunk/modules/deploy-tool/
>>>> geronimo/server/trunk/modules/deployment/
>>>> geronimo/server/trunk/modules/derby/
>>>> geronimo/server/trunk/modules/directory/
>>>> geronimo/server/trunk/modules/hot-deploy/
>>>> geronimo/server/trunk/modules/interceptor/
>>>> geronimo/server/trunk/modules/j2ee/
>>>> geronimo/server/trunk/modules/j2ee-builder/
>>>> geronimo/server/trunk/modules/j2ee-schema/
>>>> geronimo/server/trunk/modules/jetty/
>>>> geronimo/server/trunk/modules/jetty-builder/
>>>> geronimo/server/trunk/modules/jmx-remoting/
>>>> geronimo/server/trunk/modules/kernel/
>>>> geronimo/server/trunk/modules/mail/
>>>> geronimo/server/trunk/modules/management/
>>>> geronimo/server/trunk/modules/naming/
>>>> geronimo/server/trunk/modules/naming-builder/
>>>> geronimo/server/trunk/modules/security/
>>>> geronimo/server/trunk/modules/security-builder/
>>>> geronimo/server/trunk/modules/service-builder/
>>>> geronimo/server/trunk/modules/system/
>>>> geronimo/server/trunk/modules/test-ddbean/
>>>> geronimo/server/trunk/modules/timer/
>>>> geronimo/server/trunk/modules/tomcat/
>>>> geronimo/server/trunk/modules/tomcat-builder/
>>>> geronimo/server/trunk/modules/transaction/
>>>> geronimo/server/trunk/modules/upgrade/
>>>> geronimo/server/trunk/modules/util/
>>>> geronimo/server/trunk/modules/web-builder/
>>>> geronimo/server/trunk/modules/webservices/
>>>> Modified:
>>>> geronimo/server/trunk/modules/ge-activemq-rar/pom.xml
>>>> geronimo/server/trunk/modules/geronimo-activation/pom.xml
>>>> geronimo/server/trunk/modules/geronimo-activemq-gbean-
>>>> management/pom.xml
>>>> geronimo/server/trunk/modules/geronimo-activemq-gbean/pom.xml
>>>> geronimo/server/trunk/modules/geronimo-axis-builder/pom.xml
>>>> geronimo/server/trunk/modules/geronimo-axis/pom.xml
>>>> geronimo/server/trunk/modules/geronimo-client-builder/pom.xml
>>>> geronimo/server/trunk/modules/geronimo-client/pom.xml
>>>> geronimo/server/trunk/modules/geronimo-common/pom.xml
>>>> geronimo/server/trunk/modules/geronimo-connector-builder/
>>>> pom.xml
>>>> geronimo/server/trunk/modules/geronimo-connector/pom.xml
>>>> geronimo/server/trunk/modules/geronimo-converter/pom.xml
>>>> geronimo/server/trunk/modules/geronimo-core/pom.xml
>>>> geronimo/server/trunk/modules/geronimo-deploy-config/pom.xml
>>>> geronimo/server/trunk/modules/geronimo-deploy-jsr88/pom.xml
>>>> geronimo/server/trunk/modules/geronimo-deploy-tool/pom.xml
>>>> geronimo/server/trunk/modules/geronimo-deployment/pom.xml
>>>> geronimo/server/trunk/modules/geronimo-derby/pom.xml
>>>> geronimo/server/trunk/modules/geronimo-directory/pom.xml
>>>> geronimo/server/trunk/modules/geronimo-hot-deploy/pom.xml
>>>> geronimo/server/trunk/modules/geronimo-interceptor/pom.xml
>>>> geronimo/server/trunk/modules/geronimo-j2ee-builder/pom.xml
>>>> geronimo/server/trunk/modules/geronimo-j2ee-builder/src/java/
>>>> org/apache/geronimo/j2ee/deployment/SecurityBuilder.java
>>>> geronimo/server/trunk/modules/geronimo-j2ee-schema/pom.xml
>>>> geronimo/server/trunk/modules/geronimo-j2ee/pom.xml
>>>> geronimo/server/trunk/modules/geronimo-jetty-builder/pom.xml
>>>> geronimo/server/trunk/modules/geronimo-jetty/pom.xml
>>>> geronimo/server/trunk/modules/geronimo-jmx-remoting/pom.xml
>>>> geronimo/server/trunk/modules/geronimo-kernel/pom.xml
>>>> geronimo/server/trunk/modules/geronimo-mail/pom.xml
>>>> geronimo/server/trunk/modules/geronimo-management/pom.xml
>>>> geronimo/server/trunk/modules/geronimo-naming-builder/pom.xml
>>>> geronimo/server/trunk/modules/geronimo-naming/pom.xml
>>>> geronimo/server/trunk/modules/geronimo-security-builder/pom.xml
>>>> geronimo/server/trunk/modules/geronimo-security/pom.xml
>>>> geronimo/server/trunk/modules/geronimo-service-builder/pom.xml
>>>> geronimo/server/trunk/modules/geronimo-system/pom.xml
>>>> geronimo/server/trunk/modules/geronimo-test-ddbean/pom.xml
>>>> geronimo/server/trunk/modules/geronimo-testsupport/pom.xml
>>>> geronimo/server/trunk/modules/geronimo-timer/pom.xml
>>>> geronimo/server/trunk/modules/geronimo-tomcat-builder/pom.xml
>>>> geronimo/server/trunk/modules/geronimo-tomcat/pom.xml
>>>> geronimo/server/trunk/modules/geronimo-transaction/pom.xml
>>>> geronimo/server/trunk/modules/geronimo-upgrade/pom.xml
>>>> geronimo/server/trunk/modules/geronimo-util/pom.xml
>>>> geronimo/server/trunk/modules/geronimo-web-builder/pom.xml
>>>> geronimo/server/trunk/modules/geronimo-webservices/pom.xml
>>>> geronimo/server/trunk/modules/pom.xml
>>>>
>>>> Modified: geronimo/server/trunk/modules/ge-activemq-rar/pom.xml
>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>> ge-activemq-rar/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>>>> ===================================================================
>>>> ===========
>>>> --- geronimo/server/trunk/modules/ge-activemq-rar/pom.xml
>>>> (original)
>>>> +++ geronimo/server/trunk/modules/ge-activemq-rar/pom.xml Sat
>>>> Aug 26 15:30:02 2006
>>>> @@ -33,20 +33,6 @@
>>>> <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:http://svn.apache.org/repos/asf/
>>>> geronimo/server/trunk/modules/activemq-embedded-rar</connection>
>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/activemq-
>>>> embedded-rar</developerConnection>
>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>> modules/activemq-embedded-rar</url>
>>>> - </scm>
>>>> -
>>>> <dependencies>
>>>>
>>>> <dependency>
>>>>
>>>> Modified: geronimo/server/trunk/modules/geronimo-activation/pom.xml
>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>> geronimo-activation/pom.xml?
>>>> rev=437240&r1=437231&r2=437240&view=diff
>>>> ===================================================================
>>>> ===========
>>>> --- geronimo/server/trunk/modules/geronimo-activation/pom.xml
>>>> (original)
>>>> +++ geronimo/server/trunk/modules/geronimo-activation/pom.xml
>>>> Sat Aug 26 15:30:02 2006
>>>> @@ -36,20 +36,6 @@
>>>> 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:http://svn.apache.org/repos/asf/
>>>> geronimo/server/trunk/modules/activation</connection>
>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/
>>>> activation</developerConnection>
>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>> modules/activation</url>
>>>> - </scm>
>>>> -
>>>> <dependencies>
>>>>
>>>> <dependency>
>>>>
>>>> Modified: geronimo/server/trunk/modules/geronimo-activemq-gbean-
>>>> management/pom.xml
>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>> geronimo-activemq-gbean-management/pom.xml?
>>>> rev=437240&r1=437231&r2=437240&view=diff
>>>> ===================================================================
>>>> ===========
>>>> --- geronimo/server/trunk/modules/geronimo-activemq-gbean-
>>>> management/pom.xml (original)
>>>> +++ geronimo/server/trunk/modules/geronimo-activemq-gbean-
>>>> management/pom.xml Sat Aug 26 15:30:02 2006
>>>> @@ -31,24 +31,6 @@
>>>> <artifactId>geronimo-activemq-gbean-management</artifactId>
>>>> <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:http://svn.apache.org/repos/asf/
>>>> geronimo/server/trunk/modules/activemq-gbean-management</
>>>> connection>
>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/activemq-
>>>> gbean-management</developerConnection>
>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>> modules/activemq-gbean-management</url>
>>>> - </scm>
>>>> -
>>>> <dependencies>
>>>>
>>>> <dependency>
>>>>
>>>> Modified: geronimo/server/trunk/modules/geronimo-activemq-gbean/
>>>> pom.xml
>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>> geronimo-activemq-gbean/pom.xml?
>>>> rev=437240&r1=437231&r2=437240&view=diff
>>>> ===================================================================
>>>> ===========
>>>> --- geronimo/server/trunk/modules/geronimo-activemq-gbean/
>>>> pom.xml (original)
>>>> +++ geronimo/server/trunk/modules/geronimo-activemq-gbean/
>>>> pom.xml Sat Aug 26 15:30:02 2006
>>>> @@ -31,24 +31,6 @@
>>>> <artifactId>geronimo-activemq-gbean</artifactId>
>>>> <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:http://svn.apache.org/repos/asf/
>>>> geronimo/server/trunk/modules/activemq-gbean</connection>
>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/activemq-
>>>> gbean</developerConnection>
>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>> modules/activemq-gbean</url>
>>>> - </scm>
>>>> -
>>>> <dependencies>
>>>>
>>>> <dependency>
>>>>
>>>> Modified: geronimo/server/trunk/modules/geronimo-axis-builder/
>>>> pom.xml
>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>> geronimo-axis-builder/pom.xml?
>>>> rev=437240&r1=437231&r2=437240&view=diff
>>>> ===================================================================
>>>> ===========
>>>> --- geronimo/server/trunk/modules/geronimo-axis-builder/pom.xml
>>>> (original)
>>>> +++ geronimo/server/trunk/modules/geronimo-axis-builder/pom.xml
>>>> Sat Aug 26 15:30:02 2006
>>>> @@ -31,24 +31,8 @@
>>>> <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:http://svn.apache.org/repos/asf/
>>>> geronimo/server/trunk/modules/axis-builder</connection>
>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/axis-
>>>> builder</developerConnection>
>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>> modules/axis-builder</url>
>>>> - </scm>
>>>> -
>>>> <dependencies>
>>>>
>>>> - <!-- Module Dependencies -->
>>>> -
>>>> <dependency>
>>>> <groupId>${pom.groupId}</groupId>
>>>> <artifactId>geronimo-axis</artifactId>
>>>> @@ -85,8 +69,6 @@
>>>> <version>${pom.version}</version>
>>>> </dependency>
>>>>
>>>> - <!-- Spec Dependencies -->
>>>> -
>>>> <dependency>
>>>> <groupId>org.apache.geronimo.specs</groupId>
>>>> <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
>>>> @@ -101,8 +83,6 @@
>>>> <groupId>org.apache.geronimo.specs</groupId>
>>>> <artifactId>geronimo-qname_1.1_spec</artifactId>
>>>> </dependency>
>>>> -
>>>> - <!-- Thirdparty Dependencies -->
>>>>
>>>> <dependency>
>>>> <groupId>asm</groupId>
>>>>
>>>> Modified: geronimo/server/trunk/modules/geronimo-axis/pom.xml
>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>> geronimo-axis/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>>>> ===================================================================
>>>> ===========
>>>> --- geronimo/server/trunk/modules/geronimo-axis/pom.xml (original)
>>>> +++ geronimo/server/trunk/modules/geronimo-axis/pom.xml Sat Aug
>>>> 26 15:30:02 2006
>>>> @@ -31,21 +31,6 @@
>>>> <artifactId>geronimo-axis</artifactId>
>>>> <packaging>jar</packaging>
>>>> <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:http://svn.apache.org/repos/asf/
>>>> geronimo/server/trunk/modules/axis</connection>
>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/axis</
>>>> developerConnection>
>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>> modules/axis</url>
>>>> - </scm>
>>>>
>>>> <dependencies>
>>>>
>>>>
>>>> Modified: geronimo/server/trunk/modules/geronimo-client-builder/
>>>> pom.xml
>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>> geronimo-client-builder/pom.xml?
>>>> rev=437240&r1=437231&r2=437240&view=diff
>>>> ===================================================================
>>>> ===========
>>>> --- geronimo/server/trunk/modules/geronimo-client-builder/
>>>> pom.xml (original)
>>>> +++ geronimo/server/trunk/modules/geronimo-client-builder/
>>>> pom.xml Sat Aug 26 15:30:02 2006
>>>> @@ -31,23 +31,7 @@
>>>> <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:http://svn.apache.org/repos/asf/
>>>> geronimo/server/trunk/modules/client-builder</connection>
>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/client-
>>>> builder</developerConnection>
>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>> modules/client-builder</url>
>>>> - </scm>
>>>> -
>>>> <dependencies>
>>>> -
>>>> - <!-- Module Dependencies -->
>>>>
>>>> <dependency>
>>>> <groupId>${pom.groupId}</groupId>
>>>>
>>>> Modified: geronimo/server/trunk/modules/geronimo-client/pom.xml
>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>> geronimo-client/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>>>> ===================================================================
>>>> ===========
>>>> --- geronimo/server/trunk/modules/geronimo-client/pom.xml
>>>> (original)
>>>> +++ geronimo/server/trunk/modules/geronimo-client/pom.xml Sat
>>>> Aug 26 15:30:02 2006
>>>> @@ -31,20 +31,6 @@
>>>> <artifactId>geronimo-client</artifactId>
>>>> <name>Geronimo :: Client</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:http://svn.apache.org/repos/asf/
>>>> geronimo/server/trunk/modules/client</connection>
>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/client</
>>>> developerConnection>
>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>> modules/client</url>
>>>> - </scm>
>>>> -
>>>> <dependencies>
>>>>
>>>> <dependency>
>>>>
>>>> Modified: geronimo/server/trunk/modules/geronimo-common/pom.xml
>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>> geronimo-common/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>>>> ===================================================================
>>>> ===========
>>>> --- geronimo/server/trunk/modules/geronimo-common/pom.xml
>>>> (original)
>>>> +++ geronimo/server/trunk/modules/geronimo-common/pom.xml Sat
>>>> Aug 26 15:30:02 2006
>>>> @@ -31,20 +31,6 @@
>>>> <artifactId>geronimo-common</artifactId>
>>>> <name>Geronimo :: Common</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:http://svn.apache.org/repos/asf/
>>>> geronimo/server/trunk/modules/common</connection>
>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/common</
>>>> developerConnection>
>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>> modules/common</url>
>>>> - </scm>
>>>> -
>>>> <dependencies>
>>>>
>>>> <dependency>
>>>>
>>>> Modified: geronimo/server/trunk/modules/geronimo-connector-
>>>> builder/pom.xml
>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>> geronimo-connector-builder/pom.xml?
>>>> rev=437240&r1=437231&r2=437240&view=diff
>>>> ===================================================================
>>>> ===========
>>>> --- geronimo/server/trunk/modules/geronimo-connector-builder/
>>>> pom.xml (original)
>>>> +++ geronimo/server/trunk/modules/geronimo-connector-builder/
>>>> pom.xml Sat Aug 26 15:30:02 2006
>>>> @@ -31,24 +31,8 @@
>>>> <artifactId>geronimo-connector-builder</artifactId>
>>>> <name>Geronimo :: Connector :: 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:http://svn.apache.org/repos/asf/
>>>> geronimo/server/trunk/modules/connector-builder</connection>
>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/
>>>> connector-builder</developerConnection>
>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>> modules/connector-builder</url>
>>>> - </scm>
>>>> -
>>>> <dependencies>
>>>>
>>>> - <!-- Module Dependencies -->
>>>> -
>>>> <dependency>
>>>> <groupId>${pom.groupId}</groupId>
>>>> <artifactId>geronimo-connector</artifactId>
>>>> @@ -72,8 +56,6 @@
>>>> <artifactId>geronimo-test-ddbean</artifactId>
>>>> <version>${pom.version}</version>
>>>> </dependency>
>>>> -
>>>> - <!-- Thirdparty Dependencies -->
>>>>
>>>> <dependency>
>>>> <groupId>tranql</groupId>
>>>>
>>>> Modified: geronimo/server/trunk/modules/geronimo-connector/pom.xml
>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>> geronimo-connector/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>>>> ===================================================================
>>>> ===========
>>>> --- geronimo/server/trunk/modules/geronimo-connector/pom.xml
>>>> (original)
>>>> +++ geronimo/server/trunk/modules/geronimo-connector/pom.xml Sat
>>>> Aug 26 15:30:02 2006
>>>> @@ -31,20 +31,6 @@
>>>> <artifactId>geronimo-connector</artifactId>
>>>> <name>Geronimo :: Connector</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:http://svn.apache.org/repos/asf/
>>>> geronimo/server/trunk/modules/connector</connection>
>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/
>>>> connector</developerConnection>
>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>> modules/connector</url>
>>>> - </scm>
>>>> -
>>>> <dependencies>
>>>>
>>>> <dependency>
>>>>
>>>> Modified: geronimo/server/trunk/modules/geronimo-converter/pom.xml
>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>> geronimo-converter/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>>>> ===================================================================
>>>> ===========
>>>> --- geronimo/server/trunk/modules/geronimo-converter/pom.xml
>>>> (original)
>>>> +++ geronimo/server/trunk/modules/geronimo-converter/pom.xml Sat
>>>> Aug 26 15:30:02 2006
>>>> @@ -31,20 +31,6 @@
>>>> <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:http://svn.apache.org/repos/asf/
>>>> geronimo/server/trunk/modules/converter</connection>
>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/
>>>> converter</developerConnection>
>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>> modules/converter</url>
>>>> - </scm>
>>>> -
>>>> <dependencies>
>>>>
>>>> <dependency>
>>>>
>>>> Modified: geronimo/server/trunk/modules/geronimo-core/pom.xml
>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>> geronimo-core/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>>>> ===================================================================
>>>> ===========
>>>> --- geronimo/server/trunk/modules/geronimo-core/pom.xml (original)
>>>> +++ geronimo/server/trunk/modules/geronimo-core/pom.xml Sat Aug
>>>> 26 15:30:02 2006
>>>> @@ -31,20 +31,6 @@
>>>> <artifactId>geronimo-core</artifactId>
>>>> <name>Geronimo :: Core</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:http://svn.apache.org/repos/asf/
>>>> geronimo/server/trunk/modules/core</connection>
>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/core</
>>>> developerConnection>
>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>> modules/core</url>
>>>> - </scm>
>>>> -
>>>> <dependencies>
>>>>
>>>> <dependency>
>>>>
>>>> Modified: geronimo/server/trunk/modules/geronimo-deploy-config/
>>>> pom.xml
>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>> geronimo-deploy-config/pom.xml?
>>>> rev=437240&r1=437231&r2=437240&view=diff
>>>> ===================================================================
>>>> ===========
>>>> --- geronimo/server/trunk/modules/geronimo-deploy-config/pom.xml
>>>> (original)
>>>> +++ geronimo/server/trunk/modules/geronimo-deploy-config/pom.xml
>>>> Sat Aug 26 15:30:02 2006
>>>> @@ -30,27 +30,12 @@
>>>>
>>>> <artifactId>geronimo-deploy-config</artifactId>
>>>> <name>Geronimo :: Deploy :: Common Config</name>
>>>> - <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:http://svn.apache.org/repos/asf/
>>>> geronimo/server/trunk/modules/deploy-config</connection>
>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/deploy-
>>>> config</developerConnection>
>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>> modules/deploy-config</url>
>>>> - </scm>
>>>>
>>>> <dependencies>
>>>>
>>>>
>>>> Modified: geronimo/server/trunk/modules/geronimo-deploy-jsr88/
>>>> pom.xml
>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>> geronimo-deploy-jsr88/pom.xml?
>>>> rev=437240&r1=437231&r2=437240&view=diff
>>>> ===================================================================
>>>> ===========
>>>> --- geronimo/server/trunk/modules/geronimo-deploy-jsr88/pom.xml
>>>> (original)
>>>> +++ geronimo/server/trunk/modules/geronimo-deploy-jsr88/pom.xml
>>>> Sat Aug 26 15:30:02 2006
>>>> @@ -30,26 +30,9 @@
>>>>
>>>> <artifactId>geronimo-deploy-jsr88</artifactId>
>>>> <name>Geronimo :: Deploy :: JSR-88</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:http://svn.apache.org/repos/asf/
>>>> geronimo/server/trunk/modules/deploy-jsr88</connection>
>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/deploy-
>>>> jsr88</developerConnection>
>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>> modules/deploy-jsr88</url>
>>>> - </scm>
>>>>
>>>> <dependencies>
>>>>
>>>> - <!-- Module Dependencies -->
>>>> -
>>>> <dependency>
>>>> <groupId>org.apache.geronimo.modules</groupId>
>>>> <artifactId>geronimo-system</artifactId>
>>>> @@ -80,8 +63,6 @@
>>>> <groupId>org.apache.geronimo.specs</groupId>
>>>> <artifactId>geronimo-j2ee-deployment_1.1_spec</
>>>> artifactId>
>>>> </dependency>
>>>> -
>>>> - <!-- Thirdparty Dependencies -->
>>>>
>>>> <dependency>
>>>> <groupId>mx4j</groupId>
>>>>
>>>> Modified: geronimo/server/trunk/modules/geronimo-deploy-tool/
>>>> pom.xml
>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>> geronimo-deploy-tool/pom.xml?
>>>> rev=437240&r1=437231&r2=437240&view=diff
>>>> ===================================================================
>>>> ===========
>>>> --- geronimo/server/trunk/modules/geronimo-deploy-tool/pom.xml
>>>> (original)
>>>> +++ geronimo/server/trunk/modules/geronimo-deploy-tool/pom.xml
>>>> Sat Aug 26 15:30:02 2006
>>>> @@ -31,20 +31,6 @@
>>>> <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:http://svn.apache.org/repos/asf/
>>>> geronimo/server/trunk/modules/deploy-tool</connection>
>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/deploy-
>>>> tool</developerConnection>
>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>> modules/deploy-tool</url>
>>>> - </scm>
>>>> -
>>>> <dependencies>
>>>>
>>>> <dependency>
>>>> @@ -82,8 +68,6 @@
>>>> <version>${pom.version}</version>
>>>> </dependency>
>>>>
>>>> - <!-- Thirdparty Dependencies -->
>>>> -
>>>> <dependency>
>>>> <groupId>jline</groupId>
>>>> <artifactId>jline</artifactId>
>>>>
>>>> Modified: geronimo/server/trunk/modules/geronimo-deployment/pom.xml
>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>> geronimo-deployment/pom.xml?
>>>> rev=437240&r1=437231&r2=437240&view=diff
>>>> ===================================================================
>>>> ===========
>>>> --- geronimo/server/trunk/modules/geronimo-deployment/pom.xml
>>>> (original)
>>>> +++ geronimo/server/trunk/modules/geronimo-deployment/pom.xml
>>>> Sat Aug 26 15:30:02 2006
>>>> @@ -31,31 +31,13 @@
>>>> <artifactId>geronimo-deployment</artifactId>
>>>> <name>Geronimo :: Deployment</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:http://svn.apache.org/repos/asf/
>>>> geronimo/server/trunk/modules/deployment</connection>
>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/
>>>> deployment</developerConnection>
>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>> modules/deployment</url>
>>>> - </scm>
>>>> -
>>>> <dependencies>
>>>>
>>>> - <!-- Module Dependencies -->
>>>> -
>>>> <dependency>
>>>> <groupId>org.apache.geronimo.modules</groupId>
>>>> <artifactId>geronimo-system</artifactId>
>>>> <version>${pom.version}</version>
>>>> </dependency>
>>>> -
>>>> - <!-- Thirdparty Dependencies -->
>>>>
>>>> <dependency>
>>>> <groupId>xmlbeans</groupId>
>>>>
>>>> Modified: geronimo/server/trunk/modules/geronimo-derby/pom.xml
>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>> geronimo-derby/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>>>> ===================================================================
>>>> ===========
>>>> --- geronimo/server/trunk/modules/geronimo-derby/pom.xml (original)
>>>> +++ geronimo/server/trunk/modules/geronimo-derby/pom.xml Sat Aug
>>>> 26 15:30:02 2006
>>>> @@ -33,20 +33,6 @@
>>>>
>>>> <description>Wrapper for using Apache Derby as a bundled
>>>> database.</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:http://svn.apache.org/repos/asf/
>>>> geronimo/server/trunk/modules/derby</connection>
>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/derby</
>>>> developerConnection>
>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>> modules/derby</url>
>>>> - </scm>
>>>> -
>>>> <dependencies>
>>>>
>>>> <dependency>
>>>>
>>>> Modified: geronimo/server/trunk/modules/geronimo-directory/pom.xml
>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>> geronimo-directory/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>>>> ===================================================================
>>>> ===========
>>>> --- geronimo/server/trunk/modules/geronimo-directory/pom.xml
>>>> (original)
>>>> +++ geronimo/server/trunk/modules/geronimo-directory/pom.xml Sat
>>>> Aug 26 15:30:02 2006
>>>> @@ -31,31 +31,13 @@
>>>> <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:http://svn.apache.org/repos/asf/
>>>> geronimo/server/trunk/modules/directory</connection>
>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/
>>>> directory</developerConnection>
>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>> modules/directory</url>
>>>> - </scm>
>>>> -
>>>> <dependencies>
>>>>
>>>> - <!-- Module Dependencies -->
>>>> -
>>>> <dependency>
>>>> <groupId>${pom.groupId}</groupId>
>>>> <artifactId>geronimo-system</artifactId>
>>>> <version>${pom.version}</version>
>>>> </dependency>
>>>> -
>>>> - <!-- Thirdparty Dependencies -->
>>>>
>>>> <dependency>
>>>> <groupId>regexp</groupId>
>>>>
>>>> Modified: geronimo/server/trunk/modules/geronimo-hot-deploy/pom.xml
>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>> geronimo-hot-deploy/pom.xml?
>>>> rev=437240&r1=437231&r2=437240&view=diff
>>>> ===================================================================
>>>> ===========
>>>> --- geronimo/server/trunk/modules/geronimo-hot-deploy/pom.xml
>>>> (original)
>>>> +++ geronimo/server/trunk/modules/geronimo-hot-deploy/pom.xml
>>>> Sat Aug 26 15:30:02 2006
>>>> @@ -31,21 +31,7 @@
>>>> <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:http://svn.apache.org/repos/asf/
>>>> geronimo/server/trunk/modules/hot-deploy</connection>
>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/hot-
>>>> deploy</developerConnection>
>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>> modules/hot-deploy</url>
>>>> - </scm>
>>>> + <description>Provides hot deployment for Geronimo.</
>>>> description>
>>>>
>>>> <dependencies>
>>>>
>>>>
>>>> Modified: geronimo/server/trunk/modules/geronimo-interceptor/
>>>> pom.xml
>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>> geronimo-interceptor/pom.xml?
>>>> rev=437240&r1=437231&r2=437240&view=diff
>>>> ===================================================================
>>>> ===========
>>>> --- geronimo/server/trunk/modules/geronimo-interceptor/pom.xml
>>>> (original)
>>>> +++ geronimo/server/trunk/modules/geronimo-interceptor/pom.xml
>>>> Sat Aug 26 15:30:02 2006
>>>> @@ -30,20 +30,5 @@
>>>>
>>>> <artifactId>geronimo-interceptor</artifactId>
>>>> <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:http://svn.apache.org/repos/asf/
>>>> geronimo/server/trunk/modules/interceptor</connection>
>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/
>>>> interceptor</developerConnection>
>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>> modules/interceptor</url>
>>>> - </scm>
>>>>
>>>> </project>
>>>>
>>>> Modified: geronimo/server/trunk/modules/geronimo-j2ee-builder/
>>>> pom.xml
>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>> geronimo-j2ee-builder/pom.xml?
>>>> rev=437240&r1=437231&r2=437240&view=diff
>>>> ===================================================================
>>>> ===========
>>>> --- geronimo/server/trunk/modules/geronimo-j2ee-builder/pom.xml
>>>> (original)
>>>> +++ geronimo/server/trunk/modules/geronimo-j2ee-builder/pom.xml
>>>> Sat Aug 26 15:30:02 2006
>>>> @@ -31,23 +31,7 @@
>>>> <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:http://svn.apache.org/repos/asf/
>>>> geronimo/server/trunk/modules/j2ee-builder</connection>
>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/j2ee-
>>>> builder</developerConnection>
>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>> modules/j2ee-builder</url>
>>>> - </scm>
>>>> -
>>>> <dependencies>
>>>> -
>>>> - <!-- Module Dependencies -->
>>>>
>>>> <dependency>
>>>> <groupId>${pom.groupId}</groupId>
>>>>
>>>> Modified: geronimo/server/trunk/modules/geronimo-j2ee-builder/
>>>> src/java/org/apache/geronimo/j2ee/deployment/SecurityBuilder.java
>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>> geronimo-j2ee-builder/src/java/org/apache/geronimo/j2ee/
>>>> deployment/SecurityBuilder.java?
>>>> rev=437240&r1=437231&r2=437240&view=diff
>>>> ===================================================================
>>>> ===========
>>>> --- geronimo/server/trunk/modules/geronimo-j2ee-builder/src/java/
>>>> org/apache/geronimo/j2ee/deployment/SecurityBuilder.java (original)
>>>> +++ geronimo/server/trunk/modules/geronimo-j2ee-builder/src/java/
>>>> org/apache/geronimo/j2ee/deployment/SecurityBuilder.java Sat Aug
>>>> 26 15:30:02 2006
>>>> @@ -23,7 +23,7 @@
>>>> import org.apache.xmlbeans.XmlObject;
>>>>
>>>> /**
>>>> - * @version $Rev:$ $Date:$
>>>> + * @version $Rev$ $Date$
>>>> */
>>>> public interface SecurityBuilder extends NamespaceDrivenBuilder {
>>>>
>>>>
>>>> Modified: geronimo/server/trunk/modules/geronimo-j2ee-schema/
>>>> pom.xml
>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>> geronimo-j2ee-schema/pom.xml?
>>>> rev=437240&r1=437231&r2=437240&view=diff
>>>> ===================================================================
>>>> ===========
>>>> --- geronimo/server/trunk/modules/geronimo-j2ee-schema/pom.xml
>>>> (original)
>>>> +++ geronimo/server/trunk/modules/geronimo-j2ee-schema/pom.xml
>>>> Sat Aug 26 15:30:02 2006
>>>> @@ -31,20 +31,6 @@
>>>> <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:http://svn.apache.org/repos/asf/
>>>> geronimo/server/trunk/modules/j2ee-schema</connection>
>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/j2ee-
>>>> schema</developerConnection>
>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>> modules/j2ee-schema</url>
>>>> - </scm>
>>>> -
>>>> <dependencies>
>>>>
>>>> <!-- might not be necessary -->
>>>> @@ -80,10 +66,10 @@
>>>> https://svn.apache.org/repos/tck/geronimo-tck/
>>>> schema/j2ee14
>>>> -->
>>>> <dependency>
>>>> - <groupId>org.apache.geronimo.schema</groupId>
>>>> - <artifactId>geronimo-schema-j2ee1.4</artifactId>
>>>> - <version>1.0-SNAPSHOT</version>
>>>> - </dependency>
>>>> + <groupId>org.apache.geronimo.schema</groupId>
>>>> + <artifactId>geronimo-schema-j2ee1.4</artifactId>
>>>> + <version>1.0-SNAPSHOT</version>
>>>> + </dependency>
>>>>
>>>> </dependencies>
>>>>
>>>>
>>>> Modified: geronimo/server/trunk/modules/geronimo-j2ee/pom.xml
>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>> geronimo-j2ee/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>>>> ===================================================================
>>>> ===========
>>>> --- geronimo/server/trunk/modules/geronimo-j2ee/pom.xml (original)
>>>> +++ geronimo/server/trunk/modules/geronimo-j2ee/pom.xml Sat Aug
>>>> 26 15:30:02 2006
>>>> @@ -31,20 +31,6 @@
>>>> <artifactId>geronimo-j2ee</artifactId>
>>>> <name>Geronimo :: J2EE</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:http://svn.apache.org/repos/asf/
>>>> geronimo/server/trunk/modules/j2ee</connection>
>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/j2ee</
>>>> developerConnection>
>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>> modules/j2ee</url>
>>>> - </scm>
>>>> -
>>>> <dependencies>
>>>>
>>>> <dependency>
>>>>
>>>> Modified: geronimo/server/trunk/modules/geronimo-jetty-builder/
>>>> pom.xml
>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>> geronimo-jetty-builder/pom.xml?
>>>> rev=437240&r1=437231&r2=437240&view=diff
>>>> ===================================================================
>>>> ===========
>>>> --- geronimo/server/trunk/modules/geronimo-jetty-builder/pom.xml
>>>> (original)
>>>> +++ geronimo/server/trunk/modules/geronimo-jetty-builder/pom.xml
>>>> Sat Aug 26 15:30:02 2006
>>>> @@ -31,23 +31,7 @@
>>>> <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:http://svn.apache.org/repos/asf/
>>>> geronimo/server/trunk/modules/jetty-builder</connection>
>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/jetty-
>>>> builder</developerConnection>
>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>> modules/jetty-builder</url>
>>>> - </scm>
>>>> -
>>>> <dependencies>
>>>> -
>>>> - <!-- Module Dependencies -->
>>>>
>>>> <dependency>
>>>> <groupId>${pom.groupId}</groupId>
>>>>
>>>> Modified: geronimo/server/trunk/modules/geronimo-jetty/pom.xml
>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>> geronimo-jetty/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>>>> ===================================================================
>>>> ===========
>>>> --- geronimo/server/trunk/modules/geronimo-jetty/pom.xml (original)
>>>> +++ geronimo/server/trunk/modules/geronimo-jetty/pom.xml Sat Aug
>>>> 26 15:30:02 2006
>>>> @@ -31,20 +31,6 @@
>>>> <artifactId>geronimo-jetty</artifactId>
>>>> <name>Geronimo :: Jetty</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:http://svn.apache.org/repos/asf/
>>>> geronimo/server/trunk/modules/jetty</connection>
>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/jetty</
>>>> developerConnection>
>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>> modules/jetty</url>
>>>> - </scm>
>>>> -
>>>> <dependencies>
>>>>
>>>> <dependency>
>>>>
>>>> Modified: geronimo/server/trunk/modules/geronimo-jmx-remoting/
>>>> pom.xml
>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>> geronimo-jmx-remoting/pom.xml?
>>>> rev=437240&r1=437231&r2=437240&view=diff
>>>> ===================================================================
>>>> ===========
>>>> --- geronimo/server/trunk/modules/geronimo-jmx-remoting/pom.xml
>>>> (original)
>>>> +++ geronimo/server/trunk/modules/geronimo-jmx-remoting/pom.xml
>>>> Sat Aug 26 15:30:02 2006
>>>> @@ -31,21 +31,9 @@
>>>> <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:http://svn.apache.org/repos/asf/
>>>> geronimo/server/trunk/modules/jmx-remoting</connection>
>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/jmx-
>>>> remoting</developerConnection>
>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>> modules/jmx-remoting</url>
>>>> - </scm>
>>>> + <description>
>>>> + Provides remote access to a Geronimo server using JSR
>>>> 160 JMX Remoting.
>>>> + </description>
>>>>
>>>> <dependencies>
>>>>
>>>>
>>>> Modified: geronimo/server/trunk/modules/geronimo-kernel/pom.xml
>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>> geronimo-kernel/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>>>> ===================================================================
>>>> ===========
>>>> --- geronimo/server/trunk/modules/geronimo-kernel/pom.xml
>>>> (original)
>>>> +++ geronimo/server/trunk/modules/geronimo-kernel/pom.xml Sat
>>>> Aug 26 15:30:02 2006
>>>> @@ -31,20 +31,6 @@
>>>> <artifactId>geronimo-kernel</artifactId>
>>>> <name>Geronimo :: Kernel</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:http://svn.apache.org/repos/asf/
>>>> geronimo/server/trunk/modules/kernel</connection>
>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/kernel</
>>>> developerConnection>
>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>> modules/kernel</url>
>>>> - </scm>
>>>> -
>>>> <dependencies>
>>>>
>>>> <dependency>
>>>> @@ -76,8 +62,6 @@
>>>> <groupId>xpp3</groupId>
>>>> <artifactId>xpp3</artifactId>
>>>> </dependency>
>>>> -
>>>> - <!-- Test Dependencies -->
>>>>
>>>> <dependency>
>>>> <groupId>org.apache.geronimo.specs</groupId>
>>>>
>>>> Modified: geronimo/server/trunk/modules/geronimo-mail/pom.xml
>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>> geronimo-mail/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>>>> ===================================================================
>>>> ===========
>>>> --- geronimo/server/trunk/modules/geronimo-mail/pom.xml (original)
>>>> +++ geronimo/server/trunk/modules/geronimo-mail/pom.xml Sat Aug
>>>> 26 15:30:02 2006
>>>> @@ -31,23 +31,7 @@
>>>> <artifactId>geronimo-mail</artifactId>
>>>> <name>Geronimo :: Mail</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:http://svn.apache.org/repos/asf/
>>>> geronimo/server/trunk/modules/mail</connection>
>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/mail</
>>>> developerConnection>
>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>> modules/mail</url>
>>>> - </scm>
>>>> -
>>>> <dependencies>
>>>> -
>>>> - <!-- Module Dependencies -->
>>>>
>>>> <dependency>
>>>> <groupId>org.apache.geronimo.modules</groupId>
>>>>
>>>> Modified: geronimo/server/trunk/modules/geronimo-management/pom.xml
>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>> geronimo-management/pom.xml?
>>>> rev=437240&r1=437231&r2=437240&view=diff
>>>> ===================================================================
>>>> ===========
>>>> --- geronimo/server/trunk/modules/geronimo-management/pom.xml
>>>> (original)
>>>> +++ geronimo/server/trunk/modules/geronimo-management/pom.xml
>>>> Sat Aug 26 15:30:02 2006
>>>> @@ -31,21 +31,9 @@
>>>> <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:http://svn.apache.org/repos/asf/
>>>> geronimo/server/trunk/modules/management</connection>
>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/
>>>> management</developerConnection>
>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>> modules/management</url>
>>>> - </scm>
>>>> + <description>
>>>> + Contains interfaces that define the management API for
>>>> Geronimo.
>>>> + </description>
>>>>
>>>> <dependencies>
>>>>
>>>>
>>>> Modified: geronimo/server/trunk/modules/geronimo-naming-builder/
>>>> pom.xml
>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>> geronimo-naming-builder/pom.xml?
>>>> rev=437240&r1=437231&r2=437240&view=diff
>>>> ===================================================================
>>>> ===========
>>>> --- geronimo/server/trunk/modules/geronimo-naming-builder/
>>>> pom.xml (original)
>>>> +++ geronimo/server/trunk/modules/geronimo-naming-builder/
>>>> pom.xml Sat Aug 26 15:30:02 2006
>>>> @@ -30,24 +30,9 @@
>>>>
>>>> <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:http://svn.apache.org/repos/asf/
>>>> geronimo/server/trunk/modules/naming-builder</connection>
>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/naming-
>>>> builder</developerConnection>
>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>> modules/naming-builder</url>
>>>> - </scm>
>>>>
>>>> <dependencies>
>>>>
>>>> - <!-- Module Dependencies -->
>>>> -
>>>> <dependency>
>>>> <groupId>${pom.groupId}</groupId>
>>>> <artifactId>geronimo-common</artifactId>
>>>> @@ -95,8 +80,6 @@
>>>> <artifactId>geronimo-naming</artifactId>
>>>> <version>${pom.version}</version>
>>>> </dependency>
>>>> -
>>>> - <!-- Spec Dependencies -->
>>>>
>>>> <dependency>
>>>> <groupId>org.apache.geronimo.specs</groupId>
>>>>
>>>> Modified: geronimo/server/trunk/modules/geronimo-naming/pom.xml
>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>> geronimo-naming/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>>>> ===================================================================
>>>> ===========
>>>> --- geronimo/server/trunk/modules/geronimo-naming/pom.xml
>>>> (original)
>>>> +++ geronimo/server/trunk/modules/geronimo-naming/pom.xml Sat
>>>> Aug 26 15:30:02 2006
>>>> @@ -31,20 +31,6 @@
>>>> <artifactId>geronimo-naming</artifactId>
>>>> <name>Geronimo :: Naming</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:http://svn.apache.org/repos/asf/
>>>> geronimo/server/trunk/modules/naming</connection>
>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/naming</
>>>> developerConnection>
>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>> modules/naming</url>
>>>> - </scm>
>>>> -
>>>> <dependencies>
>>>>
>>>> <dependency>
>>>>
>>>> Modified: geronimo/server/trunk/modules/geronimo-security-
>>>> builder/pom.xml
>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>> geronimo-security-builder/pom.xml?
>>>> rev=437240&r1=437231&r2=437240&view=diff
>>>> ===================================================================
>>>> ===========
>>>> --- geronimo/server/trunk/modules/geronimo-security-builder/
>>>> pom.xml (original)
>>>> +++ geronimo/server/trunk/modules/geronimo-security-builder/
>>>> pom.xml Sat Aug 26 15:30:02 2006
>>>> @@ -31,23 +31,7 @@
>>>> <artifactId>geronimo-security-builder</artifactId>
>>>> <name>Geronimo :: Security :: 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:http://svn.apache.org/repos/asf/
>>>> geronimo/server/trunk/modules/security-builder</connection>
>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/security-
>>>> builder</developerConnection>
>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>> modules/security-builder</url>
>>>> - </scm>
>>>> -
>>>> <dependencies>
>>>> -
>>>> - <!-- Module Dependencies -->
>>>>
>>>> <dependency>
>>>> <groupId>${pom.groupId}</groupId>
>>>>
>>>> Modified: geronimo/server/trunk/modules/geronimo-security/pom.xml
>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>> geronimo-security/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>>>> ===================================================================
>>>> ===========
>>>> --- geronimo/server/trunk/modules/geronimo-security/pom.xml
>>>> (original)
>>>> +++ geronimo/server/trunk/modules/geronimo-security/pom.xml Sat
>>>> Aug 26 15:30:02 2006
>>>> @@ -31,24 +31,8 @@
>>>> <artifactId>geronimo-security</artifactId>
>>>> <name>Geronimo :: Security</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:http://svn.apache.org/repos/asf/
>>>> geronimo/server/trunk/modules/security</connection>
>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/
>>>> security</developerConnection>
>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>> modules/security</url>
>>>> - </scm>
>>>> -
>>>> <dependencies>
>>>>
>>>> - <!-- Module Dependencies -->
>>>> -
>>>> <dependency>
>>>> <groupId>org.apache.geronimo.modules</groupId>
>>>> <artifactId>geronimo-core</artifactId>
>>>> @@ -84,8 +68,6 @@
>>>> <artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
>>>> </dependency>
>>>>
>>>> - <!-- Thirdparty Dependencies -->
>>>> -
>>>> <dependency>
>>>> <groupId>activeio</groupId>
>>>> <artifactId>activeio</artifactId>
>>>> @@ -95,8 +77,6 @@
>>>> <groupId>regexp</groupId>
>>>> <artifactId>regexp</artifactId>
>>>> </dependency>
>>>> -
>>>> - <!-- Test Dependencies -->
>>>>
>>>> <dependency>
>>>> <groupId>hsqldb</groupId>
>>>>
>>>> Modified: geronimo/server/trunk/modules/geronimo-service-builder/
>>>> pom.xml
>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>> geronimo-service-builder/pom.xml?
>>>> rev=437240&r1=437231&r2=437240&view=diff
>>>> ===================================================================
>>>> ===========
>>>> --- geronimo/server/trunk/modules/geronimo-service-builder/
>>>> pom.xml (original)
>>>> +++ geronimo/server/trunk/modules/geronimo-service-builder/
>>>> pom.xml Sat Aug 26 15:30:02 2006
>>>> @@ -29,24 +29,9 @@
>>>>
>>>> <artifactId>geronimo-service-builder</artifactId>
>>>> <name>Geronimo :: Service :: 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:http://svn.apache.org/repos/asf/
>>>> geronimo/server/trunk/modules/service-builder</connection>
>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/service-
>>>> builder</developerConnection>
>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>> modules/service-builder</url>
>>>> - </scm>
>>>>
>>>> <dependencies>
>>>>
>>>> - <!-- Module Dependencies -->
>>>> -
>>>> <dependency>
>>>> <groupId>${pom.groupId}</groupId>
>>>> <artifactId>geronimo-kernel</artifactId>
>>>> @@ -78,8 +63,6 @@
>>>> <scope>test</scope>
>>>> </dependency>
>>>>
>>>> - <!-- Thirdparty Dependencies -->
>>>> -
>>>> <dependency>
>>>> <groupId>xmlbeans</groupId>
>>>> <artifactId>xbean</artifactId>
>>>>
>>>> Modified: geronimo/server/trunk/modules/geronimo-system/pom.xml
>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>> geronimo-system/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>>>> ===================================================================
>>>> ===========
>>>> --- geronimo/server/trunk/modules/geronimo-system/pom.xml
>>>> (original)
>>>> +++ geronimo/server/trunk/modules/geronimo-system/pom.xml Sat
>>>> Aug 26 15:30:02 2006
>>>> @@ -31,24 +31,8 @@
>>>> <artifactId>geronimo-system</artifactId>
>>>> <name>Geronimo :: System</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:http://svn.apache.org/repos/asf/
>>>> geronimo/server/trunk/modules/system</connection>
>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/system</
>>>> developerConnection>
>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>> modules/system</url>
>>>> - </scm>
>>>> -
>>>> <dependencies>
>>>>
>>>> - <!-- Module Dependencies -->
>>>> -
>>>> <dependency>
>>>> <groupId>org.apache.geronimo.modules</groupId>
>>>> <artifactId>geronimo-common</artifactId>
>>>> @@ -67,14 +51,10 @@
>>>> <version>${pom.version}</version>
>>>> </dependency>
>>>>
>>>> - <!-- Thirdparty Dependencies -->
>>>> -
>>>> <dependency>
>>>> <groupId>concurrent</groupId>
>>>> <artifactId>concurrent</artifactId>
>>>> </dependency>
>>>> -
>>>> - <!-- Test Dependencies -->
>>>>
>>>> <!--
>>>> NOTE: Need to include Xerces for tests in case Crimson
>>>> (or another parser)
>>>>
>>>> Modified: geronimo/server/trunk/modules/geronimo-test-ddbean/
>>>> pom.xml
>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>> geronimo-test-ddbean/pom.xml?
>>>> rev=437240&r1=437231&r2=437240&view=diff
>>>> ===================================================================
>>>> ===========
>>>> --- geronimo/server/trunk/modules/geronimo-test-ddbean/pom.xml
>>>> (original)
>>>> +++ geronimo/server/trunk/modules/geronimo-test-ddbean/pom.xml
>>>> Sat Aug 26 15:30:02 2006
>>>> @@ -31,20 +31,6 @@
>>>> <artifactId>geronimo-test-ddbean</artifactId>
>>>> <name>Geronimo :: Test :: DDBeans</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:http://svn.apache.org/repos/asf/
>>>> geronimo/server/trunk/modules/test-ddbean</connection>
>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/test-
>>>> ddbean</developerConnection>
>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>> modules/test-ddbean</url>
>>>> - </scm>
>>>> -
>>>> <dependencies>
>>>>
>>>> <dependency>
>>>>
>>>> Modified: geronimo/server/trunk/modules/geronimo-testsupport/
>>>> pom.xml
>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>> geronimo-testsupport/pom.xml?
>>>> rev=437240&r1=437239&r2=437240&view=diff
>>>> ===================================================================
>>>> ===========
>>>> --- geronimo/server/trunk/modules/geronimo-testsupport/pom.xml
>>>> (original)
>>>> +++ geronimo/server/trunk/modules/geronimo-testsupport/pom.xml
>>>> Sat Aug 26 15:30:02 2006
>>>> @@ -47,11 +47,4 @@
>>>>
>>>> </dependencies>
>>>>
>>>> - <build>
>>>> - <!--
>>>> - FIXME: Remove when the default is to use the m2
>>>> standard layout
>>>> - -->
>>>> - <sourceDirectory>${pom.basedir}/src/main/java</
>>>> sourceDirectory>
>>>> - </build>
>>>> -
>>>> </project>
>>>>
>>>> Modified: geronimo/server/trunk/modules/geronimo-timer/pom.xml
>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>> geronimo-timer/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>>>> ===================================================================
>>>> ===========
>>>> --- geronimo/server/trunk/modules/geronimo-timer/pom.xml (original)
>>>> +++ geronimo/server/trunk/modules/geronimo-timer/pom.xml Sat Aug
>>>> 26 15:30:02 2006
>>>> @@ -31,20 +31,6 @@
>>>> <artifactId>geronimo-timer</artifactId>
>>>> <name>Geronimo :: Timer</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:http://svn.apache.org/repos/asf/
>>>> geronimo/server/trunk/modules/timer</connection>
>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/timer</
>>>> developerConnection>
>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>> modules/timer</url>
>>>> - </scm>
>>>> -
>>>> <properties>
>>>> <!--
>>>> FIXME: Disable the timer tests for now since they can
>>>> fail if the host environment
>>>>
>>>> Modified: geronimo/server/trunk/modules/geronimo-tomcat-builder/
>>>> pom.xml
>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>> geronimo-tomcat-builder/pom.xml?
>>>> rev=437240&r1=437231&r2=437240&view=diff
>>>> ===================================================================
>>>> ===========
>>>> --- geronimo/server/trunk/modules/geronimo-tomcat-builder/
>>>> pom.xml (original)
>>>> +++ geronimo/server/trunk/modules/geronimo-tomcat-builder/
>>>> pom.xml Sat Aug 26 15:30:02 2006
>>>> @@ -31,24 +31,8 @@
>>>> <artifactId>geronimo-tomcat-builder</artifactId>
>>>> <name>Geronimo :: Tomcat :: 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:http://svn.apache.org/repos/asf/
>>>> geronimo/server/trunk/modules/tomcat-builder</connection>
>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/tomcat-
>>>> builder</developerConnection>
>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>> modules/tomcat-builder</url>
>>>> - </scm>
>>>> -
>>>> <dependencies>
>>>>
>>>> - <!-- Module Dependencies -->
>>>> -
>>>> <!--<dependency>-->
>>>> <!--<groupId>${pom.groupId}</groupId>-->
>>>> <!--<artifactId>geronimo-deployment</artifactId>-->
>>>> @@ -103,8 +87,6 @@
>>>> <version>${pom.version}</version>
>>>> </dependency>
>>>>
>>>> - <!-- Thirdparty Dependencies -->
>>>> -
>>>> <dependency>
>>>> <groupId>xmlbeans</groupId>
>>>> <artifactId>xbean</artifactId>
>>>> @@ -115,8 +97,6 @@
>>>> <artifactId>stax-api</artifactId>
>>>> </dependency>
>>>>
>>>> - <!-- Test Dependencies -->
>>>> -
>>>> <!--<dependency>-->
>>>> <!--<groupId>${pom.groupId}</groupId>-->
>>>> <!--<artifactId>geronimo-axis</artifactId>-->
>>>> @@ -130,7 +110,7 @@
>>>> <!--<scope>test</scope>-->
>>>> <!--</dependency>-->
>>>>
>>>> - <!--WFT??? why is this needed for tests all of a
>>>> sudden? -->
>>>> + <!-- WFT??? why is this needed for tests all of a
>>>> sudden? -->
>>>> <dependency>
>>>> <groupId>org.apache.geronimo.specs</groupId>
>>>> <artifactId>geronimo-jsp_2.0_spec</artifactId>
>>>>
>>>> Modified: geronimo/server/trunk/modules/geronimo-tomcat/pom.xml
>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>> geronimo-tomcat/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>>>> ===================================================================
>>>> ===========
>>>> --- geronimo/server/trunk/modules/geronimo-tomcat/pom.xml
>>>> (original)
>>>> +++ geronimo/server/trunk/modules/geronimo-tomcat/pom.xml Sat
>>>> Aug 26 15:30:02 2006
>>>> @@ -31,20 +31,6 @@
>>>> <artifactId>geronimo-tomcat</artifactId>
>>>> <name>Geronimo :: Tomcat</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:http://svn.apache.org/repos/asf/
>>>> geronimo/server/trunk/modules/tomcat</connection>
>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/tomcat</
>>>> developerConnection>
>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>> modules/tomcat</url>
>>>> - </scm>
>>>> -
>>>> <properties>
>>>> <endorsedDir>${project.build.directory}/endorsed</
>>>> endorsedDir>
>>>> <localRepoDir>${settings.localRepository}</localRepoDir>
>>>>
>>>> Modified: geronimo/server/trunk/modules/geronimo-transaction/
>>>> pom.xml
>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>> geronimo-transaction/pom.xml?
>>>> rev=437240&r1=437231&r2=437240&view=diff
>>>> ===================================================================
>>>> ===========
>>>> --- geronimo/server/trunk/modules/geronimo-transaction/pom.xml
>>>> (original)
>>>> +++ geronimo/server/trunk/modules/geronimo-transaction/pom.xml
>>>> Sat Aug 26 15:30:02 2006
>>>> @@ -31,20 +31,6 @@
>>>> <artifactId>geronimo-transaction</artifactId>
>>>> <name>Geronimo :: Transaction</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:http://svn.apache.org/repos/asf/
>>>> geronimo/server/trunk/modules/transaction</connection>
>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/
>>>> transaction</developerConnection>
>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>> modules/transaction</url>
>>>> - </scm>
>>>> -
>>>> <dependencies>
>>>>
>>>> <!-- temp, for ServerInfo. Remove when it is moved to
>>>> Kernel-->
>>>>
>>>> Modified: geronimo/server/trunk/modules/geronimo-upgrade/pom.xml
>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>> geronimo-upgrade/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>>>> ===================================================================
>>>> ===========
>>>> --- geronimo/server/trunk/modules/geronimo-upgrade/pom.xml
>>>> (original)
>>>> +++ geronimo/server/trunk/modules/geronimo-upgrade/pom.xml Sat
>>>> Aug 26 15:30:02 2006
>>>> @@ -31,20 +31,6 @@
>>>> <artifactId>geronimo-upgrade</artifactId>
>>>> <name>Geronimo :: Upgrade</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:http://svn.apache.org/repos/asf/
>>>> geronimo/server/trunk/modules/upgrade</connection>
>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/upgrade</
>>>> developerConnection>
>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>> modules/upgrade</url>
>>>> - </scm>
>>>> -
>>>> <dependencies>
>>>>
>>>> <dependency>
>>>>
>>>> Modified: geronimo/server/trunk/modules/geronimo-util/pom.xml
>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>> geronimo-util/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>>>> ===================================================================
>>>> ===========
>>>> --- geronimo/server/trunk/modules/geronimo-util/pom.xml (original)
>>>> +++ geronimo/server/trunk/modules/geronimo-util/pom.xml Sat Aug
>>>> 26 15:30:02 2006
>>>> @@ -31,20 +31,6 @@
>>>> <artifactId>geronimo-util</artifactId>
>>>> <name>Geronimo :: Util</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:http://svn.apache.org/repos/asf/
>>>> geronimo/server/trunk/modules/util</connection>
>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/util</
>>>> developerConnection>
>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>> modules/util</url>
>>>> - </scm>
>>>> -
>>>> <dependencies>
>>>>
>>>> <dependency>
>>>>
>>>> Modified: geronimo/server/trunk/modules/geronimo-web-builder/
>>>> pom.xml
>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>> geronimo-web-builder/pom.xml?
>>>> rev=437240&r1=437231&r2=437240&view=diff
>>>> ===================================================================
>>>> ===========
>>>> --- geronimo/server/trunk/modules/geronimo-web-builder/pom.xml
>>>> (original)
>>>> +++ geronimo/server/trunk/modules/geronimo-web-builder/pom.xml
>>>> Sat Aug 26 15:30:02 2006
>>>> @@ -31,24 +31,8 @@
>>>> <artifactId>geronimo-web-builder</artifactId>
>>>> <name>Geronimo :: Web :: Builder</name>
>>>>
>>>> - <!--
>>>> -
>>>> - HACK: Need to explicitly configure SCM for this module
>>>> since its artifactId
>>>> - does not match the directory it lives in.
>>>> -
>>>> - FIXME: Rename module directory or artifactId.
>>>> -
>>>> - -->
>>>> - <scm>
>>>> - <connection>scm:svn:http://svn.apache.org/repos/asf/
>>>> geronimo/server/trunk/modules/web-builder</connection>
>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/web-
>>>> builder</developerConnection>
>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>> modules/web-builder</url>
>>>> - </scm>
>>>> -
>>>> <dependencies>
>>>>
>>>> - <!-- Module Dependencies -->
>>>> -
>>>> <dependency>
>>>> <groupId>${pom.groupId}</groupId>
>>>> <artifactId>geronimo-j2ee-builder</artifactId>
>>>> @@ -87,8 +71,6 @@
>>>> <version>${pom.version}</version>
>>>> </dependency>
>>>>
>>>> - <!-- Spec Dependencies -->
>>>> -
>>>> <dependency>
>>>> <groupId>org.apache.geronimo.specs</groupId>
>>>> <artifactId>geronimo-servlet_2.4_spec</artifactId>
>>>>
>>>> Modified: geronimo/server/trunk/modules/geronimo-webservices/
>>>> pom.xml
>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>> geronimo-webservices/pom.xml?
>>>> rev=437240&r1=437231&r2=437240&view=diff
>>>> ===================================================================
>>>> ===========
>>>> --- geronimo/server/trunk/modules/geronimo-webservices/pom.xml
>>>> (original)
>>>> +++ geronimo/server/trunk/modules/geronimo-webservices/pom.xml
>>>> Sat Aug 26 15:30:02 2006
>>>> @@ -31,20 +31,6 @@
>>>> <artifactId>geronimo-webservices</artifactId>
>>>> <name>Geronimo :: Web Services</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:http://svn.apache.org/repos/asf/
>>>> geronimo/server/trunk/modules/webservices</connection>
>>>> - <developerConnection>scm:svn:https://${maven.username}
>>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/
>>>> webservices</developerConnection>
>>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/
>>>> modules/webservices</url>
>>>> - </scm>
>>>> -
>>>> <dependencies>
>>>>
>>>> <dependency>
>>>> @@ -121,6 +107,7 @@
>>>> <groupId>scout</groupId>
>>>> <artifactId>scout</artifactId>
>>>> </dependency>
>>>> +
>>>> </dependencies>
>>>>
>>>> </project>
>>>>
>>>> Modified: geronimo/server/trunk/modules/pom.xml
>>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>>> pom.xml?rev=437240&r1=437239&r2=437240&view=diff
>>>> ===================================================================
>>>> ===========
>>>> --- geronimo/server/trunk/modules/pom.xml (original)
>>>> +++ geronimo/server/trunk/modules/pom.xml Sat Aug 26 15:30:02 2006
>>>> @@ -35,51 +35,51 @@
>>>>
>>>> <modules>
>>>> <module>geronimo-testsupport</module>
>>>> - <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>
>>>> - <module>client-builder</module>
>>>> - <module>common</module>
>>>> - <module>connector</module>
>>>> - <module>connector-builder</module>
>>>> - <module>converter</module>
>>>> - <module>core</module>
>>>> - <module>deploy-config</module>
>>>> - <module>deploy-jsr88</module>
>>>> - <module>deploy-tool</module>
>>>> - <module>deployment</module>
>>>> - <module>derby</module>
>>>> - <module>directory</module>
>>>> - <module>hot-deploy</module>
>>>> - <module>interceptor</module>
>>>> - <module>j2ee</module>
>>>> - <module>j2ee-builder</module>
>>>> - <module>j2ee-schema</module>
>>>> - <module>jetty</module>
>>>> - <module>jetty-builder</module>
>>>> - <module>jmx-remoting</module>
>>>> - <module>kernel</module>
>>>> - <module>mail</module>
>>>> - <module>management</module>
>>>> - <module>naming</module>
>>>> - <module>naming-builder</module>
>>>> - <module>security</module>
>>>> - <module>security-builder</module>
>>>> - <module>service-builder</module>
>>>> - <module>system</module>
>>>> - <module>test-ddbean</module>
>>>> - <module>timer</module>
>>>> - <module>tomcat</module>
>>>> - <module>tomcat-builder</module>
>>>> - <module>transaction</module>
>>>> - <module>upgrade</module>
>>>> - <module>util</module>
>>>> - <module>web-builder</module>
>>>> - <module>webservices</module>
>>>> + <module>geronimo-activation</module>
>>>> + <module>ge-activemq-rar</module>
>>>> + <module>geronimo-activemq-gbean</module>
>>>> + <module>geronimo-activemq-gbean-management</module>
>>>> + <module>geronimo-axis</module>
>>>> + <module>geronimo-axis-builder</module>
>>>> + <module>geronimo-client</module>
>>>> + <module>geronimo-client-builder</module>
>>>> + <module>geronimo-common</module>
>>>> + <module>geronimo-connector</module>
>>>> + <module>geronimo-connector-builder</module>
>>>> + <module>geronimo-converter</module>
>>>> + <module>geronimo-core</module>
>>>> + <module>geronimo-deploy-config</module>
>>>> + <module>geronimo-deploy-jsr88</module>
>>>> + <module>geronimo-deploy-tool</module>
>>>> + <module>geronimo-deployment</module>
>>>> + <module>geronimo-derby</module>
>>>> + <module>geronimo-directory</module>
>>>> + <module>geronimo-hot-deploy</module>
>>>> + <module>geronimo-interceptor</module>
>>>> + <module>geronimo-j2ee</module>
>>>> + <module>geronimo-j2ee-builder</module>
>>>> + <module>geronimo-j2ee-schema</module>
>>>> + <module>geronimo-jetty</module>
>>>> + <module>geronimo-jetty-builder</module>
>>>> + <module>geronimo-jmx-remoting</module>
>>>> + <module>geronimo-kernel</module>
>>>> + <module>geronimo-mail</module>
>>>> + <module>geronimo-management</module>
>>>> + <module>geronimo-naming</module>
>>>> + <module>geronimo-naming-builder</module>
>>>> + <module>geronimo-security</module>
>>>> + <module>geronimo-security-builder</module>
>>>> + <module>geronimo-service-builder</module>
>>>> + <module>geronimo-system</module>
>>>> + <module>geronimo-test-ddbean</module>
>>>> + <module>geronimo-timer</module>
>>>> + <module>geronimo-tomcat</module>
>>>> + <module>geronimo-tomcat-builder</module>
>>>> + <module>geronimo-transaction</module>
>>>> + <module>geronimo-upgrade</module>
>>>> + <module>geronimo-util</module>
>>>> + <module>geronimo-web-builder</module>
>>>> + <module>geronimo-webservices</module>
>>>> </modules>
>>>>
>>>> </project>
>>>>
>>>>
>>>
>>>
>>> -sachin
>>>
>>>
>>
>>
>> -sachin
>>
>>
>
>
> -sachin
>
>
Re: svn commit: r437240 - in /geronimo/server/trunk/modules: ./ activation/ activemq-embedded-rar/ activemq-gbean-management/ activemq-gbean/ axis-builder/ axis/ client-builder/ client/ common/ connector-builder/ connector/ converter/ core/ deploy-config/ ...
Posted by Sachin Patel <sp...@gmail.com>.
So I assume after merging the changes have to be re-made manually?
On Aug 28, 2006, at 9:18 AM, Sachin Patel wrote:
> for example...
>
> my branch contains j2ee-builder/src/foo.java (which contains
> committed changes that are not in trunk)
>
> and for example, in trunk you happened to rename this too..
>
> geronimo-j2ee-builder/src/foo.java..
>
> Doing any svn merge, would remove my copy of it, and replace it
> with the foo.java from trunk, thus losing my changes.
>
> Can svn merge or svk handle this? I've got svk installed, but not
> sure how to use it.
>
> thx
>
> On Aug 28, 2006, at 8:37 AM, Sachin Patel wrote:
>
>> Jason, how can I best merge these changes into the sachin branch
>> without having my changes wiped out? Using svn merge, since old
>> source folders are being renamed and the source removed, my files
>> are being deleted :(, what is the best way for my tree to be
>> updated to any further new structure changes?
>>
>> Thanks.
>>
>> On Aug 26, 2006, at 6:30 PM, jdillon@apache.org wrote:
>>
>>> Author: jdillon
>>> Date: Sat Aug 26 15:30:02 2006
>>> New Revision: 437240
>>>
>>> URL: http://svn.apache.org/viewvc?rev=437240&view=rev
>>> Log:
>>> (GERONIMO-2162) Use same directory as artifactId for modules/*
>>>
>>> Added:
>>> geronimo/server/trunk/modules/ge-activemq-rar/
>>> - copied from r437231, geronimo/server/trunk/modules/
>>> activemq-embedded-rar/
>>> geronimo/server/trunk/modules/geronimo-activation/
>>> - copied from r437231, geronimo/server/trunk/modules/
>>> activation/
>>> geronimo/server/trunk/modules/geronimo-activemq-gbean/
>>> - copied from r437231, geronimo/server/trunk/modules/
>>> activemq-gbean/
>>> geronimo/server/trunk/modules/geronimo-activemq-gbean-
>>> management/
>>> - copied from r437231, geronimo/server/trunk/modules/
>>> activemq-gbean-management/
>>> geronimo/server/trunk/modules/geronimo-axis/
>>> - copied from r437231, geronimo/server/trunk/modules/axis/
>>> geronimo/server/trunk/modules/geronimo-axis-builder/
>>> - copied from r437231, geronimo/server/trunk/modules/axis-
>>> builder/
>>> geronimo/server/trunk/modules/geronimo-client/
>>> - copied from r437231, geronimo/server/trunk/modules/client/
>>> geronimo/server/trunk/modules/geronimo-client-builder/
>>> - copied from r437231, geronimo/server/trunk/modules/client-
>>> builder/
>>> geronimo/server/trunk/modules/geronimo-common/
>>> - copied from r437231, geronimo/server/trunk/modules/common/
>>> geronimo/server/trunk/modules/geronimo-connector/
>>> - copied from r437231, geronimo/server/trunk/modules/
>>> connector/
>>> geronimo/server/trunk/modules/geronimo-connector-builder/
>>> - copied from r437231, geronimo/server/trunk/modules/
>>> connector-builder/
>>> geronimo/server/trunk/modules/geronimo-converter/
>>> - copied from r437231, geronimo/server/trunk/modules/
>>> converter/
>>> geronimo/server/trunk/modules/geronimo-core/
>>> - copied from r437231, geronimo/server/trunk/modules/core/
>>> geronimo/server/trunk/modules/geronimo-deploy-config/
>>> - copied from r437231, geronimo/server/trunk/modules/deploy-
>>> config/
>>> geronimo/server/trunk/modules/geronimo-deploy-jsr88/
>>> - copied from r437231, geronimo/server/trunk/modules/deploy-
>>> jsr88/
>>> geronimo/server/trunk/modules/geronimo-deploy-tool/
>>> - copied from r437231, geronimo/server/trunk/modules/deploy-
>>> tool/
>>> geronimo/server/trunk/modules/geronimo-deployment/
>>> - copied from r437231, geronimo/server/trunk/modules/
>>> deployment/
>>> geronimo/server/trunk/modules/geronimo-derby/
>>> - copied from r437231, geronimo/server/trunk/modules/derby/
>>> geronimo/server/trunk/modules/geronimo-directory/
>>> - copied from r437231, geronimo/server/trunk/modules/
>>> directory/
>>> geronimo/server/trunk/modules/geronimo-hot-deploy/
>>> - copied from r437231, geronimo/server/trunk/modules/hot-
>>> deploy/
>>> geronimo/server/trunk/modules/geronimo-interceptor/
>>> - copied from r437231, geronimo/server/trunk/modules/
>>> interceptor/
>>> geronimo/server/trunk/modules/geronimo-j2ee/
>>> - copied from r437231, geronimo/server/trunk/modules/j2ee/
>>> geronimo/server/trunk/modules/geronimo-j2ee-builder/
>>> - copied from r437231, geronimo/server/trunk/modules/j2ee-
>>> builder/
>>> geronimo/server/trunk/modules/geronimo-j2ee-schema/
>>> - copied from r437231, geronimo/server/trunk/modules/j2ee-
>>> schema/
>>> geronimo/server/trunk/modules/geronimo-jetty/
>>> - copied from r437231, geronimo/server/trunk/modules/jetty/
>>> geronimo/server/trunk/modules/geronimo-jetty-builder/
>>> - copied from r437231, geronimo/server/trunk/modules/jetty-
>>> builder/
>>> geronimo/server/trunk/modules/geronimo-jmx-remoting/
>>> - copied from r437231, geronimo/server/trunk/modules/jmx-
>>> remoting/
>>> geronimo/server/trunk/modules/geronimo-kernel/
>>> - copied from r437231, geronimo/server/trunk/modules/kernel/
>>> geronimo/server/trunk/modules/geronimo-mail/
>>> - copied from r437231, geronimo/server/trunk/modules/mail/
>>> geronimo/server/trunk/modules/geronimo-management/
>>> - copied from r437231, geronimo/server/trunk/modules/
>>> management/
>>> geronimo/server/trunk/modules/geronimo-naming/
>>> - copied from r437231, geronimo/server/trunk/modules/naming/
>>> geronimo/server/trunk/modules/geronimo-naming-builder/
>>> - copied from r437231, geronimo/server/trunk/modules/naming-
>>> builder/
>>> geronimo/server/trunk/modules/geronimo-security/
>>> - copied from r437231, geronimo/server/trunk/modules/security/
>>> geronimo/server/trunk/modules/geronimo-security-builder/
>>> - copied from r437231, geronimo/server/trunk/modules/
>>> security-builder/
>>> geronimo/server/trunk/modules/geronimo-service-builder/
>>> - copied from r437231, geronimo/server/trunk/modules/
>>> service-builder/
>>> geronimo/server/trunk/modules/geronimo-system/
>>> - copied from r437231, geronimo/server/trunk/modules/system/
>>> geronimo/server/trunk/modules/geronimo-test-ddbean/
>>> - copied from r437231, geronimo/server/trunk/modules/test-
>>> ddbean/
>>> geronimo/server/trunk/modules/geronimo-timer/
>>> - copied from r437231, geronimo/server/trunk/modules/timer/
>>> geronimo/server/trunk/modules/geronimo-tomcat/
>>> - copied from r437231, geronimo/server/trunk/modules/tomcat/
>>> geronimo/server/trunk/modules/geronimo-tomcat-builder/
>>> - copied from r437231, geronimo/server/trunk/modules/tomcat-
>>> builder/
>>> geronimo/server/trunk/modules/geronimo-transaction/
>>> - copied from r437231, geronimo/server/trunk/modules/
>>> transaction/
>>> geronimo/server/trunk/modules/geronimo-upgrade/
>>> - copied from r437231, geronimo/server/trunk/modules/upgrade/
>>> geronimo/server/trunk/modules/geronimo-util/
>>> - copied from r437231, geronimo/server/trunk/modules/util/
>>> geronimo/server/trunk/modules/geronimo-web-builder/
>>> - copied from r437231, geronimo/server/trunk/modules/web-
>>> builder/
>>> geronimo/server/trunk/modules/geronimo-webservices/
>>> - copied from r437231, geronimo/server/trunk/modules/
>>> webservices/
>>> Removed:
>>> geronimo/server/trunk/modules/activation/
>>> geronimo/server/trunk/modules/activemq-embedded-rar/
>>> geronimo/server/trunk/modules/activemq-gbean/
>>> geronimo/server/trunk/modules/activemq-gbean-management/
>>> geronimo/server/trunk/modules/axis/
>>> geronimo/server/trunk/modules/axis-builder/
>>> geronimo/server/trunk/modules/client/
>>> geronimo/server/trunk/modules/client-builder/
>>> geronimo/server/trunk/modules/common/
>>> geronimo/server/trunk/modules/connector/
>>> geronimo/server/trunk/modules/connector-builder/
>>> geronimo/server/trunk/modules/converter/
>>> geronimo/server/trunk/modules/core/
>>> geronimo/server/trunk/modules/deploy-config/
>>> geronimo/server/trunk/modules/deploy-jsr88/
>>> geronimo/server/trunk/modules/deploy-tool/
>>> geronimo/server/trunk/modules/deployment/
>>> geronimo/server/trunk/modules/derby/
>>> geronimo/server/trunk/modules/directory/
>>> geronimo/server/trunk/modules/hot-deploy/
>>> geronimo/server/trunk/modules/interceptor/
>>> geronimo/server/trunk/modules/j2ee/
>>> geronimo/server/trunk/modules/j2ee-builder/
>>> geronimo/server/trunk/modules/j2ee-schema/
>>> geronimo/server/trunk/modules/jetty/
>>> geronimo/server/trunk/modules/jetty-builder/
>>> geronimo/server/trunk/modules/jmx-remoting/
>>> geronimo/server/trunk/modules/kernel/
>>> geronimo/server/trunk/modules/mail/
>>> geronimo/server/trunk/modules/management/
>>> geronimo/server/trunk/modules/naming/
>>> geronimo/server/trunk/modules/naming-builder/
>>> geronimo/server/trunk/modules/security/
>>> geronimo/server/trunk/modules/security-builder/
>>> geronimo/server/trunk/modules/service-builder/
>>> geronimo/server/trunk/modules/system/
>>> geronimo/server/trunk/modules/test-ddbean/
>>> geronimo/server/trunk/modules/timer/
>>> geronimo/server/trunk/modules/tomcat/
>>> geronimo/server/trunk/modules/tomcat-builder/
>>> geronimo/server/trunk/modules/transaction/
>>> geronimo/server/trunk/modules/upgrade/
>>> geronimo/server/trunk/modules/util/
>>> geronimo/server/trunk/modules/web-builder/
>>> geronimo/server/trunk/modules/webservices/
>>> Modified:
>>> geronimo/server/trunk/modules/ge-activemq-rar/pom.xml
>>> geronimo/server/trunk/modules/geronimo-activation/pom.xml
>>> geronimo/server/trunk/modules/geronimo-activemq-gbean-
>>> management/pom.xml
>>> geronimo/server/trunk/modules/geronimo-activemq-gbean/pom.xml
>>> geronimo/server/trunk/modules/geronimo-axis-builder/pom.xml
>>> geronimo/server/trunk/modules/geronimo-axis/pom.xml
>>> geronimo/server/trunk/modules/geronimo-client-builder/pom.xml
>>> geronimo/server/trunk/modules/geronimo-client/pom.xml
>>> geronimo/server/trunk/modules/geronimo-common/pom.xml
>>> geronimo/server/trunk/modules/geronimo-connector-builder/pom.xml
>>> geronimo/server/trunk/modules/geronimo-connector/pom.xml
>>> geronimo/server/trunk/modules/geronimo-converter/pom.xml
>>> geronimo/server/trunk/modules/geronimo-core/pom.xml
>>> geronimo/server/trunk/modules/geronimo-deploy-config/pom.xml
>>> geronimo/server/trunk/modules/geronimo-deploy-jsr88/pom.xml
>>> geronimo/server/trunk/modules/geronimo-deploy-tool/pom.xml
>>> geronimo/server/trunk/modules/geronimo-deployment/pom.xml
>>> geronimo/server/trunk/modules/geronimo-derby/pom.xml
>>> geronimo/server/trunk/modules/geronimo-directory/pom.xml
>>> geronimo/server/trunk/modules/geronimo-hot-deploy/pom.xml
>>> geronimo/server/trunk/modules/geronimo-interceptor/pom.xml
>>> geronimo/server/trunk/modules/geronimo-j2ee-builder/pom.xml
>>> geronimo/server/trunk/modules/geronimo-j2ee-builder/src/java/
>>> org/apache/geronimo/j2ee/deployment/SecurityBuilder.java
>>> geronimo/server/trunk/modules/geronimo-j2ee-schema/pom.xml
>>> geronimo/server/trunk/modules/geronimo-j2ee/pom.xml
>>> geronimo/server/trunk/modules/geronimo-jetty-builder/pom.xml
>>> geronimo/server/trunk/modules/geronimo-jetty/pom.xml
>>> geronimo/server/trunk/modules/geronimo-jmx-remoting/pom.xml
>>> geronimo/server/trunk/modules/geronimo-kernel/pom.xml
>>> geronimo/server/trunk/modules/geronimo-mail/pom.xml
>>> geronimo/server/trunk/modules/geronimo-management/pom.xml
>>> geronimo/server/trunk/modules/geronimo-naming-builder/pom.xml
>>> geronimo/server/trunk/modules/geronimo-naming/pom.xml
>>> geronimo/server/trunk/modules/geronimo-security-builder/pom.xml
>>> geronimo/server/trunk/modules/geronimo-security/pom.xml
>>> geronimo/server/trunk/modules/geronimo-service-builder/pom.xml
>>> geronimo/server/trunk/modules/geronimo-system/pom.xml
>>> geronimo/server/trunk/modules/geronimo-test-ddbean/pom.xml
>>> geronimo/server/trunk/modules/geronimo-testsupport/pom.xml
>>> geronimo/server/trunk/modules/geronimo-timer/pom.xml
>>> geronimo/server/trunk/modules/geronimo-tomcat-builder/pom.xml
>>> geronimo/server/trunk/modules/geronimo-tomcat/pom.xml
>>> geronimo/server/trunk/modules/geronimo-transaction/pom.xml
>>> geronimo/server/trunk/modules/geronimo-upgrade/pom.xml
>>> geronimo/server/trunk/modules/geronimo-util/pom.xml
>>> geronimo/server/trunk/modules/geronimo-web-builder/pom.xml
>>> geronimo/server/trunk/modules/geronimo-webservices/pom.xml
>>> geronimo/server/trunk/modules/pom.xml
>>>
>>> Modified: geronimo/server/trunk/modules/ge-activemq-rar/pom.xml
>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>> ge-activemq-rar/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>>> ====================================================================
>>> ==========
>>> --- geronimo/server/trunk/modules/ge-activemq-rar/pom.xml (original)
>>> +++ geronimo/server/trunk/modules/ge-activemq-rar/pom.xml Sat Aug
>>> 26 15:30:02 2006
>>> @@ -33,20 +33,6 @@
>>> <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:http://svn.apache.org/repos/asf/
>>> geronimo/server/trunk/modules/activemq-embedded-rar</connection>
>>> - <developerConnection>scm:svn:https://${maven.username}
>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/activemq-
>>> embedded-rar</developerConnection>
>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>>> activemq-embedded-rar</url>
>>> - </scm>
>>> -
>>> <dependencies>
>>>
>>> <dependency>
>>>
>>> Modified: geronimo/server/trunk/modules/geronimo-activation/pom.xml
>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>> geronimo-activation/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>>> ====================================================================
>>> ==========
>>> --- geronimo/server/trunk/modules/geronimo-activation/pom.xml
>>> (original)
>>> +++ geronimo/server/trunk/modules/geronimo-activation/pom.xml Sat
>>> Aug 26 15:30:02 2006
>>> @@ -36,20 +36,6 @@
>>> 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:http://svn.apache.org/repos/asf/
>>> geronimo/server/trunk/modules/activation</connection>
>>> - <developerConnection>scm:svn:https://${maven.username}
>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/
>>> activation</developerConnection>
>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>>> activation</url>
>>> - </scm>
>>> -
>>> <dependencies>
>>>
>>> <dependency>
>>>
>>> Modified: geronimo/server/trunk/modules/geronimo-activemq-gbean-
>>> management/pom.xml
>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>> geronimo-activemq-gbean-management/pom.xml?
>>> rev=437240&r1=437231&r2=437240&view=diff
>>> ====================================================================
>>> ==========
>>> --- geronimo/server/trunk/modules/geronimo-activemq-gbean-
>>> management/pom.xml (original)
>>> +++ geronimo/server/trunk/modules/geronimo-activemq-gbean-
>>> management/pom.xml Sat Aug 26 15:30:02 2006
>>> @@ -31,24 +31,6 @@
>>> <artifactId>geronimo-activemq-gbean-management</artifactId>
>>> <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:http://svn.apache.org/repos/asf/
>>> geronimo/server/trunk/modules/activemq-gbean-management</connection>
>>> - <developerConnection>scm:svn:https://${maven.username}
>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/activemq-
>>> gbean-management</developerConnection>
>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>>> activemq-gbean-management</url>
>>> - </scm>
>>> -
>>> <dependencies>
>>>
>>> <dependency>
>>>
>>> Modified: geronimo/server/trunk/modules/geronimo-activemq-gbean/
>>> pom.xml
>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>> geronimo-activemq-gbean/pom.xml?
>>> rev=437240&r1=437231&r2=437240&view=diff
>>> ====================================================================
>>> ==========
>>> --- geronimo/server/trunk/modules/geronimo-activemq-gbean/pom.xml
>>> (original)
>>> +++ geronimo/server/trunk/modules/geronimo-activemq-gbean/pom.xml
>>> Sat Aug 26 15:30:02 2006
>>> @@ -31,24 +31,6 @@
>>> <artifactId>geronimo-activemq-gbean</artifactId>
>>> <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:http://svn.apache.org/repos/asf/
>>> geronimo/server/trunk/modules/activemq-gbean</connection>
>>> - <developerConnection>scm:svn:https://${maven.username}
>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/activemq-
>>> gbean</developerConnection>
>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>>> activemq-gbean</url>
>>> - </scm>
>>> -
>>> <dependencies>
>>>
>>> <dependency>
>>>
>>> Modified: geronimo/server/trunk/modules/geronimo-axis-builder/
>>> pom.xml
>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>> geronimo-axis-builder/pom.xml?
>>> rev=437240&r1=437231&r2=437240&view=diff
>>> ====================================================================
>>> ==========
>>> --- geronimo/server/trunk/modules/geronimo-axis-builder/pom.xml
>>> (original)
>>> +++ geronimo/server/trunk/modules/geronimo-axis-builder/pom.xml
>>> Sat Aug 26 15:30:02 2006
>>> @@ -31,24 +31,8 @@
>>> <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:http://svn.apache.org/repos/asf/
>>> geronimo/server/trunk/modules/axis-builder</connection>
>>> - <developerConnection>scm:svn:https://${maven.username}
>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/axis-
>>> builder</developerConnection>
>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>>> axis-builder</url>
>>> - </scm>
>>> -
>>> <dependencies>
>>>
>>> - <!-- Module Dependencies -->
>>> -
>>> <dependency>
>>> <groupId>${pom.groupId}</groupId>
>>> <artifactId>geronimo-axis</artifactId>
>>> @@ -85,8 +69,6 @@
>>> <version>${pom.version}</version>
>>> </dependency>
>>>
>>> - <!-- Spec Dependencies -->
>>> -
>>> <dependency>
>>> <groupId>org.apache.geronimo.specs</groupId>
>>> <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
>>> @@ -101,8 +83,6 @@
>>> <groupId>org.apache.geronimo.specs</groupId>
>>> <artifactId>geronimo-qname_1.1_spec</artifactId>
>>> </dependency>
>>> -
>>> - <!-- Thirdparty Dependencies -->
>>>
>>> <dependency>
>>> <groupId>asm</groupId>
>>>
>>> Modified: geronimo/server/trunk/modules/geronimo-axis/pom.xml
>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>> geronimo-axis/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>>> ====================================================================
>>> ==========
>>> --- geronimo/server/trunk/modules/geronimo-axis/pom.xml (original)
>>> +++ geronimo/server/trunk/modules/geronimo-axis/pom.xml Sat Aug
>>> 26 15:30:02 2006
>>> @@ -31,21 +31,6 @@
>>> <artifactId>geronimo-axis</artifactId>
>>> <packaging>jar</packaging>
>>> <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:http://svn.apache.org/repos/asf/
>>> geronimo/server/trunk/modules/axis</connection>
>>> - <developerConnection>scm:svn:https://${maven.username}
>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/axis</
>>> developerConnection>
>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>>> axis</url>
>>> - </scm>
>>>
>>> <dependencies>
>>>
>>>
>>> Modified: geronimo/server/trunk/modules/geronimo-client-builder/
>>> pom.xml
>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>> geronimo-client-builder/pom.xml?
>>> rev=437240&r1=437231&r2=437240&view=diff
>>> ====================================================================
>>> ==========
>>> --- geronimo/server/trunk/modules/geronimo-client-builder/pom.xml
>>> (original)
>>> +++ geronimo/server/trunk/modules/geronimo-client-builder/pom.xml
>>> Sat Aug 26 15:30:02 2006
>>> @@ -31,23 +31,7 @@
>>> <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:http://svn.apache.org/repos/asf/
>>> geronimo/server/trunk/modules/client-builder</connection>
>>> - <developerConnection>scm:svn:https://${maven.username}
>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/client-
>>> builder</developerConnection>
>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>>> client-builder</url>
>>> - </scm>
>>> -
>>> <dependencies>
>>> -
>>> - <!-- Module Dependencies -->
>>>
>>> <dependency>
>>> <groupId>${pom.groupId}</groupId>
>>>
>>> Modified: geronimo/server/trunk/modules/geronimo-client/pom.xml
>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>> geronimo-client/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>>> ====================================================================
>>> ==========
>>> --- geronimo/server/trunk/modules/geronimo-client/pom.xml (original)
>>> +++ geronimo/server/trunk/modules/geronimo-client/pom.xml Sat Aug
>>> 26 15:30:02 2006
>>> @@ -31,20 +31,6 @@
>>> <artifactId>geronimo-client</artifactId>
>>> <name>Geronimo :: Client</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:http://svn.apache.org/repos/asf/
>>> geronimo/server/trunk/modules/client</connection>
>>> - <developerConnection>scm:svn:https://${maven.username}
>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/client</
>>> developerConnection>
>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>>> client</url>
>>> - </scm>
>>> -
>>> <dependencies>
>>>
>>> <dependency>
>>>
>>> Modified: geronimo/server/trunk/modules/geronimo-common/pom.xml
>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>> geronimo-common/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>>> ====================================================================
>>> ==========
>>> --- geronimo/server/trunk/modules/geronimo-common/pom.xml (original)
>>> +++ geronimo/server/trunk/modules/geronimo-common/pom.xml Sat Aug
>>> 26 15:30:02 2006
>>> @@ -31,20 +31,6 @@
>>> <artifactId>geronimo-common</artifactId>
>>> <name>Geronimo :: Common</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:http://svn.apache.org/repos/asf/
>>> geronimo/server/trunk/modules/common</connection>
>>> - <developerConnection>scm:svn:https://${maven.username}
>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/common</
>>> developerConnection>
>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>>> common</url>
>>> - </scm>
>>> -
>>> <dependencies>
>>>
>>> <dependency>
>>>
>>> Modified: geronimo/server/trunk/modules/geronimo-connector-
>>> builder/pom.xml
>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>> geronimo-connector-builder/pom.xml?
>>> rev=437240&r1=437231&r2=437240&view=diff
>>> ====================================================================
>>> ==========
>>> --- geronimo/server/trunk/modules/geronimo-connector-builder/
>>> pom.xml (original)
>>> +++ geronimo/server/trunk/modules/geronimo-connector-builder/
>>> pom.xml Sat Aug 26 15:30:02 2006
>>> @@ -31,24 +31,8 @@
>>> <artifactId>geronimo-connector-builder</artifactId>
>>> <name>Geronimo :: Connector :: 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:http://svn.apache.org/repos/asf/
>>> geronimo/server/trunk/modules/connector-builder</connection>
>>> - <developerConnection>scm:svn:https://${maven.username}
>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/connector-
>>> builder</developerConnection>
>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>>> connector-builder</url>
>>> - </scm>
>>> -
>>> <dependencies>
>>>
>>> - <!-- Module Dependencies -->
>>> -
>>> <dependency>
>>> <groupId>${pom.groupId}</groupId>
>>> <artifactId>geronimo-connector</artifactId>
>>> @@ -72,8 +56,6 @@
>>> <artifactId>geronimo-test-ddbean</artifactId>
>>> <version>${pom.version}</version>
>>> </dependency>
>>> -
>>> - <!-- Thirdparty Dependencies -->
>>>
>>> <dependency>
>>> <groupId>tranql</groupId>
>>>
>>> Modified: geronimo/server/trunk/modules/geronimo-connector/pom.xml
>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>> geronimo-connector/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>>> ====================================================================
>>> ==========
>>> --- geronimo/server/trunk/modules/geronimo-connector/pom.xml
>>> (original)
>>> +++ geronimo/server/trunk/modules/geronimo-connector/pom.xml Sat
>>> Aug 26 15:30:02 2006
>>> @@ -31,20 +31,6 @@
>>> <artifactId>geronimo-connector</artifactId>
>>> <name>Geronimo :: Connector</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:http://svn.apache.org/repos/asf/
>>> geronimo/server/trunk/modules/connector</connection>
>>> - <developerConnection>scm:svn:https://${maven.username}
>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/
>>> connector</developerConnection>
>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>>> connector</url>
>>> - </scm>
>>> -
>>> <dependencies>
>>>
>>> <dependency>
>>>
>>> Modified: geronimo/server/trunk/modules/geronimo-converter/pom.xml
>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>> geronimo-converter/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>>> ====================================================================
>>> ==========
>>> --- geronimo/server/trunk/modules/geronimo-converter/pom.xml
>>> (original)
>>> +++ geronimo/server/trunk/modules/geronimo-converter/pom.xml Sat
>>> Aug 26 15:30:02 2006
>>> @@ -31,20 +31,6 @@
>>> <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:http://svn.apache.org/repos/asf/
>>> geronimo/server/trunk/modules/converter</connection>
>>> - <developerConnection>scm:svn:https://${maven.username}
>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/
>>> converter</developerConnection>
>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>>> converter</url>
>>> - </scm>
>>> -
>>> <dependencies>
>>>
>>> <dependency>
>>>
>>> Modified: geronimo/server/trunk/modules/geronimo-core/pom.xml
>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>> geronimo-core/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>>> ====================================================================
>>> ==========
>>> --- geronimo/server/trunk/modules/geronimo-core/pom.xml (original)
>>> +++ geronimo/server/trunk/modules/geronimo-core/pom.xml Sat Aug
>>> 26 15:30:02 2006
>>> @@ -31,20 +31,6 @@
>>> <artifactId>geronimo-core</artifactId>
>>> <name>Geronimo :: Core</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:http://svn.apache.org/repos/asf/
>>> geronimo/server/trunk/modules/core</connection>
>>> - <developerConnection>scm:svn:https://${maven.username}
>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/core</
>>> developerConnection>
>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>>> core</url>
>>> - </scm>
>>> -
>>> <dependencies>
>>>
>>> <dependency>
>>>
>>> Modified: geronimo/server/trunk/modules/geronimo-deploy-config/
>>> pom.xml
>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>> geronimo-deploy-config/pom.xml?
>>> rev=437240&r1=437231&r2=437240&view=diff
>>> ====================================================================
>>> ==========
>>> --- geronimo/server/trunk/modules/geronimo-deploy-config/pom.xml
>>> (original)
>>> +++ geronimo/server/trunk/modules/geronimo-deploy-config/pom.xml
>>> Sat Aug 26 15:30:02 2006
>>> @@ -30,27 +30,12 @@
>>>
>>> <artifactId>geronimo-deploy-config</artifactId>
>>> <name>Geronimo :: Deploy :: Common Config</name>
>>> - <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:http://svn.apache.org/repos/asf/
>>> geronimo/server/trunk/modules/deploy-config</connection>
>>> - <developerConnection>scm:svn:https://${maven.username}
>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/deploy-
>>> config</developerConnection>
>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>>> deploy-config</url>
>>> - </scm>
>>>
>>> <dependencies>
>>>
>>>
>>> Modified: geronimo/server/trunk/modules/geronimo-deploy-jsr88/
>>> pom.xml
>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>> geronimo-deploy-jsr88/pom.xml?
>>> rev=437240&r1=437231&r2=437240&view=diff
>>> ====================================================================
>>> ==========
>>> --- geronimo/server/trunk/modules/geronimo-deploy-jsr88/pom.xml
>>> (original)
>>> +++ geronimo/server/trunk/modules/geronimo-deploy-jsr88/pom.xml
>>> Sat Aug 26 15:30:02 2006
>>> @@ -30,26 +30,9 @@
>>>
>>> <artifactId>geronimo-deploy-jsr88</artifactId>
>>> <name>Geronimo :: Deploy :: JSR-88</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:http://svn.apache.org/repos/asf/
>>> geronimo/server/trunk/modules/deploy-jsr88</connection>
>>> - <developerConnection>scm:svn:https://${maven.username}
>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/deploy-
>>> jsr88</developerConnection>
>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>>> deploy-jsr88</url>
>>> - </scm>
>>>
>>> <dependencies>
>>>
>>> - <!-- Module Dependencies -->
>>> -
>>> <dependency>
>>> <groupId>org.apache.geronimo.modules</groupId>
>>> <artifactId>geronimo-system</artifactId>
>>> @@ -80,8 +63,6 @@
>>> <groupId>org.apache.geronimo.specs</groupId>
>>> <artifactId>geronimo-j2ee-deployment_1.1_spec</
>>> artifactId>
>>> </dependency>
>>> -
>>> - <!-- Thirdparty Dependencies -->
>>>
>>> <dependency>
>>> <groupId>mx4j</groupId>
>>>
>>> Modified: geronimo/server/trunk/modules/geronimo-deploy-tool/pom.xml
>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>> geronimo-deploy-tool/pom.xml?
>>> rev=437240&r1=437231&r2=437240&view=diff
>>> ====================================================================
>>> ==========
>>> --- geronimo/server/trunk/modules/geronimo-deploy-tool/pom.xml
>>> (original)
>>> +++ geronimo/server/trunk/modules/geronimo-deploy-tool/pom.xml
>>> Sat Aug 26 15:30:02 2006
>>> @@ -31,20 +31,6 @@
>>> <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:http://svn.apache.org/repos/asf/
>>> geronimo/server/trunk/modules/deploy-tool</connection>
>>> - <developerConnection>scm:svn:https://${maven.username}
>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/deploy-
>>> tool</developerConnection>
>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>>> deploy-tool</url>
>>> - </scm>
>>> -
>>> <dependencies>
>>>
>>> <dependency>
>>> @@ -82,8 +68,6 @@
>>> <version>${pom.version}</version>
>>> </dependency>
>>>
>>> - <!-- Thirdparty Dependencies -->
>>> -
>>> <dependency>
>>> <groupId>jline</groupId>
>>> <artifactId>jline</artifactId>
>>>
>>> Modified: geronimo/server/trunk/modules/geronimo-deployment/pom.xml
>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>> geronimo-deployment/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>>> ====================================================================
>>> ==========
>>> --- geronimo/server/trunk/modules/geronimo-deployment/pom.xml
>>> (original)
>>> +++ geronimo/server/trunk/modules/geronimo-deployment/pom.xml Sat
>>> Aug 26 15:30:02 2006
>>> @@ -31,31 +31,13 @@
>>> <artifactId>geronimo-deployment</artifactId>
>>> <name>Geronimo :: Deployment</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:http://svn.apache.org/repos/asf/
>>> geronimo/server/trunk/modules/deployment</connection>
>>> - <developerConnection>scm:svn:https://${maven.username}
>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/
>>> deployment</developerConnection>
>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>>> deployment</url>
>>> - </scm>
>>> -
>>> <dependencies>
>>>
>>> - <!-- Module Dependencies -->
>>> -
>>> <dependency>
>>> <groupId>org.apache.geronimo.modules</groupId>
>>> <artifactId>geronimo-system</artifactId>
>>> <version>${pom.version}</version>
>>> </dependency>
>>> -
>>> - <!-- Thirdparty Dependencies -->
>>>
>>> <dependency>
>>> <groupId>xmlbeans</groupId>
>>>
>>> Modified: geronimo/server/trunk/modules/geronimo-derby/pom.xml
>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>> geronimo-derby/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>>> ====================================================================
>>> ==========
>>> --- geronimo/server/trunk/modules/geronimo-derby/pom.xml (original)
>>> +++ geronimo/server/trunk/modules/geronimo-derby/pom.xml Sat Aug
>>> 26 15:30:02 2006
>>> @@ -33,20 +33,6 @@
>>>
>>> <description>Wrapper for using Apache Derby as a bundled
>>> database.</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:http://svn.apache.org/repos/asf/
>>> geronimo/server/trunk/modules/derby</connection>
>>> - <developerConnection>scm:svn:https://${maven.username}
>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/derby</
>>> developerConnection>
>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>>> derby</url>
>>> - </scm>
>>> -
>>> <dependencies>
>>>
>>> <dependency>
>>>
>>> Modified: geronimo/server/trunk/modules/geronimo-directory/pom.xml
>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>> geronimo-directory/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>>> ====================================================================
>>> ==========
>>> --- geronimo/server/trunk/modules/geronimo-directory/pom.xml
>>> (original)
>>> +++ geronimo/server/trunk/modules/geronimo-directory/pom.xml Sat
>>> Aug 26 15:30:02 2006
>>> @@ -31,31 +31,13 @@
>>> <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:http://svn.apache.org/repos/asf/
>>> geronimo/server/trunk/modules/directory</connection>
>>> - <developerConnection>scm:svn:https://${maven.username}
>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/
>>> directory</developerConnection>
>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>>> directory</url>
>>> - </scm>
>>> -
>>> <dependencies>
>>>
>>> - <!-- Module Dependencies -->
>>> -
>>> <dependency>
>>> <groupId>${pom.groupId}</groupId>
>>> <artifactId>geronimo-system</artifactId>
>>> <version>${pom.version}</version>
>>> </dependency>
>>> -
>>> - <!-- Thirdparty Dependencies -->
>>>
>>> <dependency>
>>> <groupId>regexp</groupId>
>>>
>>> Modified: geronimo/server/trunk/modules/geronimo-hot-deploy/pom.xml
>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>> geronimo-hot-deploy/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>>> ====================================================================
>>> ==========
>>> --- geronimo/server/trunk/modules/geronimo-hot-deploy/pom.xml
>>> (original)
>>> +++ geronimo/server/trunk/modules/geronimo-hot-deploy/pom.xml Sat
>>> Aug 26 15:30:02 2006
>>> @@ -31,21 +31,7 @@
>>> <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:http://svn.apache.org/repos/asf/
>>> geronimo/server/trunk/modules/hot-deploy</connection>
>>> - <developerConnection>scm:svn:https://${maven.username}
>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/hot-
>>> deploy</developerConnection>
>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>>> hot-deploy</url>
>>> - </scm>
>>> + <description>Provides hot deployment for Geronimo.</
>>> description>
>>>
>>> <dependencies>
>>>
>>>
>>> Modified: geronimo/server/trunk/modules/geronimo-interceptor/pom.xml
>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>> geronimo-interceptor/pom.xml?
>>> rev=437240&r1=437231&r2=437240&view=diff
>>> ====================================================================
>>> ==========
>>> --- geronimo/server/trunk/modules/geronimo-interceptor/pom.xml
>>> (original)
>>> +++ geronimo/server/trunk/modules/geronimo-interceptor/pom.xml
>>> Sat Aug 26 15:30:02 2006
>>> @@ -30,20 +30,5 @@
>>>
>>> <artifactId>geronimo-interceptor</artifactId>
>>> <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:http://svn.apache.org/repos/asf/
>>> geronimo/server/trunk/modules/interceptor</connection>
>>> - <developerConnection>scm:svn:https://${maven.username}
>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/
>>> interceptor</developerConnection>
>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>>> interceptor</url>
>>> - </scm>
>>>
>>> </project>
>>>
>>> Modified: geronimo/server/trunk/modules/geronimo-j2ee-builder/
>>> pom.xml
>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>> geronimo-j2ee-builder/pom.xml?
>>> rev=437240&r1=437231&r2=437240&view=diff
>>> ====================================================================
>>> ==========
>>> --- geronimo/server/trunk/modules/geronimo-j2ee-builder/pom.xml
>>> (original)
>>> +++ geronimo/server/trunk/modules/geronimo-j2ee-builder/pom.xml
>>> Sat Aug 26 15:30:02 2006
>>> @@ -31,23 +31,7 @@
>>> <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:http://svn.apache.org/repos/asf/
>>> geronimo/server/trunk/modules/j2ee-builder</connection>
>>> - <developerConnection>scm:svn:https://${maven.username}
>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/j2ee-
>>> builder</developerConnection>
>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>>> j2ee-builder</url>
>>> - </scm>
>>> -
>>> <dependencies>
>>> -
>>> - <!-- Module Dependencies -->
>>>
>>> <dependency>
>>> <groupId>${pom.groupId}</groupId>
>>>
>>> Modified: geronimo/server/trunk/modules/geronimo-j2ee-builder/src/
>>> java/org/apache/geronimo/j2ee/deployment/SecurityBuilder.java
>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>> geronimo-j2ee-builder/src/java/org/apache/geronimo/j2ee/
>>> deployment/SecurityBuilder.java?
>>> rev=437240&r1=437231&r2=437240&view=diff
>>> ====================================================================
>>> ==========
>>> --- geronimo/server/trunk/modules/geronimo-j2ee-builder/src/java/
>>> org/apache/geronimo/j2ee/deployment/SecurityBuilder.java (original)
>>> +++ geronimo/server/trunk/modules/geronimo-j2ee-builder/src/java/
>>> org/apache/geronimo/j2ee/deployment/SecurityBuilder.java Sat Aug
>>> 26 15:30:02 2006
>>> @@ -23,7 +23,7 @@
>>> import org.apache.xmlbeans.XmlObject;
>>>
>>> /**
>>> - * @version $Rev:$ $Date:$
>>> + * @version $Rev$ $Date$
>>> */
>>> public interface SecurityBuilder extends NamespaceDrivenBuilder {
>>>
>>>
>>> Modified: geronimo/server/trunk/modules/geronimo-j2ee-schema/pom.xml
>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>> geronimo-j2ee-schema/pom.xml?
>>> rev=437240&r1=437231&r2=437240&view=diff
>>> ====================================================================
>>> ==========
>>> --- geronimo/server/trunk/modules/geronimo-j2ee-schema/pom.xml
>>> (original)
>>> +++ geronimo/server/trunk/modules/geronimo-j2ee-schema/pom.xml
>>> Sat Aug 26 15:30:02 2006
>>> @@ -31,20 +31,6 @@
>>> <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:http://svn.apache.org/repos/asf/
>>> geronimo/server/trunk/modules/j2ee-schema</connection>
>>> - <developerConnection>scm:svn:https://${maven.username}
>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/j2ee-
>>> schema</developerConnection>
>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>>> j2ee-schema</url>
>>> - </scm>
>>> -
>>> <dependencies>
>>>
>>> <!-- might not be necessary -->
>>> @@ -80,10 +66,10 @@
>>> https://svn.apache.org/repos/tck/geronimo-tck/
>>> schema/j2ee14
>>> -->
>>> <dependency>
>>> - <groupId>org.apache.geronimo.schema</groupId>
>>> - <artifactId>geronimo-schema-j2ee1.4</artifactId>
>>> - <version>1.0-SNAPSHOT</version>
>>> - </dependency>
>>> + <groupId>org.apache.geronimo.schema</groupId>
>>> + <artifactId>geronimo-schema-j2ee1.4</artifactId>
>>> + <version>1.0-SNAPSHOT</version>
>>> + </dependency>
>>>
>>> </dependencies>
>>>
>>>
>>> Modified: geronimo/server/trunk/modules/geronimo-j2ee/pom.xml
>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>> geronimo-j2ee/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>>> ====================================================================
>>> ==========
>>> --- geronimo/server/trunk/modules/geronimo-j2ee/pom.xml (original)
>>> +++ geronimo/server/trunk/modules/geronimo-j2ee/pom.xml Sat Aug
>>> 26 15:30:02 2006
>>> @@ -31,20 +31,6 @@
>>> <artifactId>geronimo-j2ee</artifactId>
>>> <name>Geronimo :: J2EE</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:http://svn.apache.org/repos/asf/
>>> geronimo/server/trunk/modules/j2ee</connection>
>>> - <developerConnection>scm:svn:https://${maven.username}
>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/j2ee</
>>> developerConnection>
>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>>> j2ee</url>
>>> - </scm>
>>> -
>>> <dependencies>
>>>
>>> <dependency>
>>>
>>> Modified: geronimo/server/trunk/modules/geronimo-jetty-builder/
>>> pom.xml
>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>> geronimo-jetty-builder/pom.xml?
>>> rev=437240&r1=437231&r2=437240&view=diff
>>> ====================================================================
>>> ==========
>>> --- geronimo/server/trunk/modules/geronimo-jetty-builder/pom.xml
>>> (original)
>>> +++ geronimo/server/trunk/modules/geronimo-jetty-builder/pom.xml
>>> Sat Aug 26 15:30:02 2006
>>> @@ -31,23 +31,7 @@
>>> <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:http://svn.apache.org/repos/asf/
>>> geronimo/server/trunk/modules/jetty-builder</connection>
>>> - <developerConnection>scm:svn:https://${maven.username}
>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/jetty-
>>> builder</developerConnection>
>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>>> jetty-builder</url>
>>> - </scm>
>>> -
>>> <dependencies>
>>> -
>>> - <!-- Module Dependencies -->
>>>
>>> <dependency>
>>> <groupId>${pom.groupId}</groupId>
>>>
>>> Modified: geronimo/server/trunk/modules/geronimo-jetty/pom.xml
>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>> geronimo-jetty/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>>> ====================================================================
>>> ==========
>>> --- geronimo/server/trunk/modules/geronimo-jetty/pom.xml (original)
>>> +++ geronimo/server/trunk/modules/geronimo-jetty/pom.xml Sat Aug
>>> 26 15:30:02 2006
>>> @@ -31,20 +31,6 @@
>>> <artifactId>geronimo-jetty</artifactId>
>>> <name>Geronimo :: Jetty</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:http://svn.apache.org/repos/asf/
>>> geronimo/server/trunk/modules/jetty</connection>
>>> - <developerConnection>scm:svn:https://${maven.username}
>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/jetty</
>>> developerConnection>
>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>>> jetty</url>
>>> - </scm>
>>> -
>>> <dependencies>
>>>
>>> <dependency>
>>>
>>> Modified: geronimo/server/trunk/modules/geronimo-jmx-remoting/
>>> pom.xml
>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>> geronimo-jmx-remoting/pom.xml?
>>> rev=437240&r1=437231&r2=437240&view=diff
>>> ====================================================================
>>> ==========
>>> --- geronimo/server/trunk/modules/geronimo-jmx-remoting/pom.xml
>>> (original)
>>> +++ geronimo/server/trunk/modules/geronimo-jmx-remoting/pom.xml
>>> Sat Aug 26 15:30:02 2006
>>> @@ -31,21 +31,9 @@
>>> <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:http://svn.apache.org/repos/asf/
>>> geronimo/server/trunk/modules/jmx-remoting</connection>
>>> - <developerConnection>scm:svn:https://${maven.username}
>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/jmx-
>>> remoting</developerConnection>
>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>>> jmx-remoting</url>
>>> - </scm>
>>> + <description>
>>> + Provides remote access to a Geronimo server using JSR
>>> 160 JMX Remoting.
>>> + </description>
>>>
>>> <dependencies>
>>>
>>>
>>> Modified: geronimo/server/trunk/modules/geronimo-kernel/pom.xml
>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>> geronimo-kernel/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>>> ====================================================================
>>> ==========
>>> --- geronimo/server/trunk/modules/geronimo-kernel/pom.xml (original)
>>> +++ geronimo/server/trunk/modules/geronimo-kernel/pom.xml Sat Aug
>>> 26 15:30:02 2006
>>> @@ -31,20 +31,6 @@
>>> <artifactId>geronimo-kernel</artifactId>
>>> <name>Geronimo :: Kernel</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:http://svn.apache.org/repos/asf/
>>> geronimo/server/trunk/modules/kernel</connection>
>>> - <developerConnection>scm:svn:https://${maven.username}
>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/kernel</
>>> developerConnection>
>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>>> kernel</url>
>>> - </scm>
>>> -
>>> <dependencies>
>>>
>>> <dependency>
>>> @@ -76,8 +62,6 @@
>>> <groupId>xpp3</groupId>
>>> <artifactId>xpp3</artifactId>
>>> </dependency>
>>> -
>>> - <!-- Test Dependencies -->
>>>
>>> <dependency>
>>> <groupId>org.apache.geronimo.specs</groupId>
>>>
>>> Modified: geronimo/server/trunk/modules/geronimo-mail/pom.xml
>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>> geronimo-mail/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>>> ====================================================================
>>> ==========
>>> --- geronimo/server/trunk/modules/geronimo-mail/pom.xml (original)
>>> +++ geronimo/server/trunk/modules/geronimo-mail/pom.xml Sat Aug
>>> 26 15:30:02 2006
>>> @@ -31,23 +31,7 @@
>>> <artifactId>geronimo-mail</artifactId>
>>> <name>Geronimo :: Mail</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:http://svn.apache.org/repos/asf/
>>> geronimo/server/trunk/modules/mail</connection>
>>> - <developerConnection>scm:svn:https://${maven.username}
>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/mail</
>>> developerConnection>
>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>>> mail</url>
>>> - </scm>
>>> -
>>> <dependencies>
>>> -
>>> - <!-- Module Dependencies -->
>>>
>>> <dependency>
>>> <groupId>org.apache.geronimo.modules</groupId>
>>>
>>> Modified: geronimo/server/trunk/modules/geronimo-management/pom.xml
>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>> geronimo-management/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>>> ====================================================================
>>> ==========
>>> --- geronimo/server/trunk/modules/geronimo-management/pom.xml
>>> (original)
>>> +++ geronimo/server/trunk/modules/geronimo-management/pom.xml Sat
>>> Aug 26 15:30:02 2006
>>> @@ -31,21 +31,9 @@
>>> <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:http://svn.apache.org/repos/asf/
>>> geronimo/server/trunk/modules/management</connection>
>>> - <developerConnection>scm:svn:https://${maven.username}
>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/
>>> management</developerConnection>
>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>>> management</url>
>>> - </scm>
>>> + <description>
>>> + Contains interfaces that define the management API for
>>> Geronimo.
>>> + </description>
>>>
>>> <dependencies>
>>>
>>>
>>> Modified: geronimo/server/trunk/modules/geronimo-naming-builder/
>>> pom.xml
>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>> geronimo-naming-builder/pom.xml?
>>> rev=437240&r1=437231&r2=437240&view=diff
>>> ====================================================================
>>> ==========
>>> --- geronimo/server/trunk/modules/geronimo-naming-builder/pom.xml
>>> (original)
>>> +++ geronimo/server/trunk/modules/geronimo-naming-builder/pom.xml
>>> Sat Aug 26 15:30:02 2006
>>> @@ -30,24 +30,9 @@
>>>
>>> <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:http://svn.apache.org/repos/asf/
>>> geronimo/server/trunk/modules/naming-builder</connection>
>>> - <developerConnection>scm:svn:https://${maven.username}
>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/naming-
>>> builder</developerConnection>
>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>>> naming-builder</url>
>>> - </scm>
>>>
>>> <dependencies>
>>>
>>> - <!-- Module Dependencies -->
>>> -
>>> <dependency>
>>> <groupId>${pom.groupId}</groupId>
>>> <artifactId>geronimo-common</artifactId>
>>> @@ -95,8 +80,6 @@
>>> <artifactId>geronimo-naming</artifactId>
>>> <version>${pom.version}</version>
>>> </dependency>
>>> -
>>> - <!-- Spec Dependencies -->
>>>
>>> <dependency>
>>> <groupId>org.apache.geronimo.specs</groupId>
>>>
>>> Modified: geronimo/server/trunk/modules/geronimo-naming/pom.xml
>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>> geronimo-naming/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>>> ====================================================================
>>> ==========
>>> --- geronimo/server/trunk/modules/geronimo-naming/pom.xml (original)
>>> +++ geronimo/server/trunk/modules/geronimo-naming/pom.xml Sat Aug
>>> 26 15:30:02 2006
>>> @@ -31,20 +31,6 @@
>>> <artifactId>geronimo-naming</artifactId>
>>> <name>Geronimo :: Naming</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:http://svn.apache.org/repos/asf/
>>> geronimo/server/trunk/modules/naming</connection>
>>> - <developerConnection>scm:svn:https://${maven.username}
>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/naming</
>>> developerConnection>
>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>>> naming</url>
>>> - </scm>
>>> -
>>> <dependencies>
>>>
>>> <dependency>
>>>
>>> Modified: geronimo/server/trunk/modules/geronimo-security-builder/
>>> pom.xml
>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>> geronimo-security-builder/pom.xml?
>>> rev=437240&r1=437231&r2=437240&view=diff
>>> ====================================================================
>>> ==========
>>> --- geronimo/server/trunk/modules/geronimo-security-builder/
>>> pom.xml (original)
>>> +++ geronimo/server/trunk/modules/geronimo-security-builder/
>>> pom.xml Sat Aug 26 15:30:02 2006
>>> @@ -31,23 +31,7 @@
>>> <artifactId>geronimo-security-builder</artifactId>
>>> <name>Geronimo :: Security :: 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:http://svn.apache.org/repos/asf/
>>> geronimo/server/trunk/modules/security-builder</connection>
>>> - <developerConnection>scm:svn:https://${maven.username}
>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/security-
>>> builder</developerConnection>
>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>>> security-builder</url>
>>> - </scm>
>>> -
>>> <dependencies>
>>> -
>>> - <!-- Module Dependencies -->
>>>
>>> <dependency>
>>> <groupId>${pom.groupId}</groupId>
>>>
>>> Modified: geronimo/server/trunk/modules/geronimo-security/pom.xml
>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>> geronimo-security/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>>> ====================================================================
>>> ==========
>>> --- geronimo/server/trunk/modules/geronimo-security/pom.xml
>>> (original)
>>> +++ geronimo/server/trunk/modules/geronimo-security/pom.xml Sat
>>> Aug 26 15:30:02 2006
>>> @@ -31,24 +31,8 @@
>>> <artifactId>geronimo-security</artifactId>
>>> <name>Geronimo :: Security</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:http://svn.apache.org/repos/asf/
>>> geronimo/server/trunk/modules/security</connection>
>>> - <developerConnection>scm:svn:https://${maven.username}
>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/security</
>>> developerConnection>
>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>>> security</url>
>>> - </scm>
>>> -
>>> <dependencies>
>>>
>>> - <!-- Module Dependencies -->
>>> -
>>> <dependency>
>>> <groupId>org.apache.geronimo.modules</groupId>
>>> <artifactId>geronimo-core</artifactId>
>>> @@ -84,8 +68,6 @@
>>> <artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
>>> </dependency>
>>>
>>> - <!-- Thirdparty Dependencies -->
>>> -
>>> <dependency>
>>> <groupId>activeio</groupId>
>>> <artifactId>activeio</artifactId>
>>> @@ -95,8 +77,6 @@
>>> <groupId>regexp</groupId>
>>> <artifactId>regexp</artifactId>
>>> </dependency>
>>> -
>>> - <!-- Test Dependencies -->
>>>
>>> <dependency>
>>> <groupId>hsqldb</groupId>
>>>
>>> Modified: geronimo/server/trunk/modules/geronimo-service-builder/
>>> pom.xml
>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>> geronimo-service-builder/pom.xml?
>>> rev=437240&r1=437231&r2=437240&view=diff
>>> ====================================================================
>>> ==========
>>> --- geronimo/server/trunk/modules/geronimo-service-builder/
>>> pom.xml (original)
>>> +++ geronimo/server/trunk/modules/geronimo-service-builder/
>>> pom.xml Sat Aug 26 15:30:02 2006
>>> @@ -29,24 +29,9 @@
>>>
>>> <artifactId>geronimo-service-builder</artifactId>
>>> <name>Geronimo :: Service :: 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:http://svn.apache.org/repos/asf/
>>> geronimo/server/trunk/modules/service-builder</connection>
>>> - <developerConnection>scm:svn:https://${maven.username}
>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/service-
>>> builder</developerConnection>
>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>>> service-builder</url>
>>> - </scm>
>>>
>>> <dependencies>
>>>
>>> - <!-- Module Dependencies -->
>>> -
>>> <dependency>
>>> <groupId>${pom.groupId}</groupId>
>>> <artifactId>geronimo-kernel</artifactId>
>>> @@ -78,8 +63,6 @@
>>> <scope>test</scope>
>>> </dependency>
>>>
>>> - <!-- Thirdparty Dependencies -->
>>> -
>>> <dependency>
>>> <groupId>xmlbeans</groupId>
>>> <artifactId>xbean</artifactId>
>>>
>>> Modified: geronimo/server/trunk/modules/geronimo-system/pom.xml
>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>> geronimo-system/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>>> ====================================================================
>>> ==========
>>> --- geronimo/server/trunk/modules/geronimo-system/pom.xml (original)
>>> +++ geronimo/server/trunk/modules/geronimo-system/pom.xml Sat Aug
>>> 26 15:30:02 2006
>>> @@ -31,24 +31,8 @@
>>> <artifactId>geronimo-system</artifactId>
>>> <name>Geronimo :: System</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:http://svn.apache.org/repos/asf/
>>> geronimo/server/trunk/modules/system</connection>
>>> - <developerConnection>scm:svn:https://${maven.username}
>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/system</
>>> developerConnection>
>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>>> system</url>
>>> - </scm>
>>> -
>>> <dependencies>
>>>
>>> - <!-- Module Dependencies -->
>>> -
>>> <dependency>
>>> <groupId>org.apache.geronimo.modules</groupId>
>>> <artifactId>geronimo-common</artifactId>
>>> @@ -67,14 +51,10 @@
>>> <version>${pom.version}</version>
>>> </dependency>
>>>
>>> - <!-- Thirdparty Dependencies -->
>>> -
>>> <dependency>
>>> <groupId>concurrent</groupId>
>>> <artifactId>concurrent</artifactId>
>>> </dependency>
>>> -
>>> - <!-- Test Dependencies -->
>>>
>>> <!--
>>> NOTE: Need to include Xerces for tests in case Crimson
>>> (or another parser)
>>>
>>> Modified: geronimo/server/trunk/modules/geronimo-test-ddbean/pom.xml
>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>> geronimo-test-ddbean/pom.xml?
>>> rev=437240&r1=437231&r2=437240&view=diff
>>> ====================================================================
>>> ==========
>>> --- geronimo/server/trunk/modules/geronimo-test-ddbean/pom.xml
>>> (original)
>>> +++ geronimo/server/trunk/modules/geronimo-test-ddbean/pom.xml
>>> Sat Aug 26 15:30:02 2006
>>> @@ -31,20 +31,6 @@
>>> <artifactId>geronimo-test-ddbean</artifactId>
>>> <name>Geronimo :: Test :: DDBeans</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:http://svn.apache.org/repos/asf/
>>> geronimo/server/trunk/modules/test-ddbean</connection>
>>> - <developerConnection>scm:svn:https://${maven.username}
>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/test-
>>> ddbean</developerConnection>
>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>>> test-ddbean</url>
>>> - </scm>
>>> -
>>> <dependencies>
>>>
>>> <dependency>
>>>
>>> Modified: geronimo/server/trunk/modules/geronimo-testsupport/pom.xml
>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>> geronimo-testsupport/pom.xml?
>>> rev=437240&r1=437239&r2=437240&view=diff
>>> ====================================================================
>>> ==========
>>> --- geronimo/server/trunk/modules/geronimo-testsupport/pom.xml
>>> (original)
>>> +++ geronimo/server/trunk/modules/geronimo-testsupport/pom.xml
>>> Sat Aug 26 15:30:02 2006
>>> @@ -47,11 +47,4 @@
>>>
>>> </dependencies>
>>>
>>> - <build>
>>> - <!--
>>> - FIXME: Remove when the default is to use the m2 standard
>>> layout
>>> - -->
>>> - <sourceDirectory>${pom.basedir}/src/main/java</
>>> sourceDirectory>
>>> - </build>
>>> -
>>> </project>
>>>
>>> Modified: geronimo/server/trunk/modules/geronimo-timer/pom.xml
>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>> geronimo-timer/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>>> ====================================================================
>>> ==========
>>> --- geronimo/server/trunk/modules/geronimo-timer/pom.xml (original)
>>> +++ geronimo/server/trunk/modules/geronimo-timer/pom.xml Sat Aug
>>> 26 15:30:02 2006
>>> @@ -31,20 +31,6 @@
>>> <artifactId>geronimo-timer</artifactId>
>>> <name>Geronimo :: Timer</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:http://svn.apache.org/repos/asf/
>>> geronimo/server/trunk/modules/timer</connection>
>>> - <developerConnection>scm:svn:https://${maven.username}
>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/timer</
>>> developerConnection>
>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>>> timer</url>
>>> - </scm>
>>> -
>>> <properties>
>>> <!--
>>> FIXME: Disable the timer tests for now since they can
>>> fail if the host environment
>>>
>>> Modified: geronimo/server/trunk/modules/geronimo-tomcat-builder/
>>> pom.xml
>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>> geronimo-tomcat-builder/pom.xml?
>>> rev=437240&r1=437231&r2=437240&view=diff
>>> ====================================================================
>>> ==========
>>> --- geronimo/server/trunk/modules/geronimo-tomcat-builder/pom.xml
>>> (original)
>>> +++ geronimo/server/trunk/modules/geronimo-tomcat-builder/pom.xml
>>> Sat Aug 26 15:30:02 2006
>>> @@ -31,24 +31,8 @@
>>> <artifactId>geronimo-tomcat-builder</artifactId>
>>> <name>Geronimo :: Tomcat :: 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:http://svn.apache.org/repos/asf/
>>> geronimo/server/trunk/modules/tomcat-builder</connection>
>>> - <developerConnection>scm:svn:https://${maven.username}
>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/tomcat-
>>> builder</developerConnection>
>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>>> tomcat-builder</url>
>>> - </scm>
>>> -
>>> <dependencies>
>>>
>>> - <!-- Module Dependencies -->
>>> -
>>> <!--<dependency>-->
>>> <!--<groupId>${pom.groupId}</groupId>-->
>>> <!--<artifactId>geronimo-deployment</artifactId>-->
>>> @@ -103,8 +87,6 @@
>>> <version>${pom.version}</version>
>>> </dependency>
>>>
>>> - <!-- Thirdparty Dependencies -->
>>> -
>>> <dependency>
>>> <groupId>xmlbeans</groupId>
>>> <artifactId>xbean</artifactId>
>>> @@ -115,8 +97,6 @@
>>> <artifactId>stax-api</artifactId>
>>> </dependency>
>>>
>>> - <!-- Test Dependencies -->
>>> -
>>> <!--<dependency>-->
>>> <!--<groupId>${pom.groupId}</groupId>-->
>>> <!--<artifactId>geronimo-axis</artifactId>-->
>>> @@ -130,7 +110,7 @@
>>> <!--<scope>test</scope>-->
>>> <!--</dependency>-->
>>>
>>> - <!--WFT??? why is this needed for tests all of a sudden?
>>> -->
>>> + <!-- WFT??? why is this needed for tests all of a
>>> sudden? -->
>>> <dependency>
>>> <groupId>org.apache.geronimo.specs</groupId>
>>> <artifactId>geronimo-jsp_2.0_spec</artifactId>
>>>
>>> Modified: geronimo/server/trunk/modules/geronimo-tomcat/pom.xml
>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>> geronimo-tomcat/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>>> ====================================================================
>>> ==========
>>> --- geronimo/server/trunk/modules/geronimo-tomcat/pom.xml (original)
>>> +++ geronimo/server/trunk/modules/geronimo-tomcat/pom.xml Sat Aug
>>> 26 15:30:02 2006
>>> @@ -31,20 +31,6 @@
>>> <artifactId>geronimo-tomcat</artifactId>
>>> <name>Geronimo :: Tomcat</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:http://svn.apache.org/repos/asf/
>>> geronimo/server/trunk/modules/tomcat</connection>
>>> - <developerConnection>scm:svn:https://${maven.username}
>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/tomcat</
>>> developerConnection>
>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>>> tomcat</url>
>>> - </scm>
>>> -
>>> <properties>
>>> <endorsedDir>${project.build.directory}/endorsed</
>>> endorsedDir>
>>> <localRepoDir>${settings.localRepository}</localRepoDir>
>>>
>>> Modified: geronimo/server/trunk/modules/geronimo-transaction/pom.xml
>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>> geronimo-transaction/pom.xml?
>>> rev=437240&r1=437231&r2=437240&view=diff
>>> ====================================================================
>>> ==========
>>> --- geronimo/server/trunk/modules/geronimo-transaction/pom.xml
>>> (original)
>>> +++ geronimo/server/trunk/modules/geronimo-transaction/pom.xml
>>> Sat Aug 26 15:30:02 2006
>>> @@ -31,20 +31,6 @@
>>> <artifactId>geronimo-transaction</artifactId>
>>> <name>Geronimo :: Transaction</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:http://svn.apache.org/repos/asf/
>>> geronimo/server/trunk/modules/transaction</connection>
>>> - <developerConnection>scm:svn:https://${maven.username}
>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/
>>> transaction</developerConnection>
>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>>> transaction</url>
>>> - </scm>
>>> -
>>> <dependencies>
>>>
>>> <!-- temp, for ServerInfo. Remove when it is moved to
>>> Kernel-->
>>>
>>> Modified: geronimo/server/trunk/modules/geronimo-upgrade/pom.xml
>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>> geronimo-upgrade/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>>> ====================================================================
>>> ==========
>>> --- geronimo/server/trunk/modules/geronimo-upgrade/pom.xml
>>> (original)
>>> +++ geronimo/server/trunk/modules/geronimo-upgrade/pom.xml Sat
>>> Aug 26 15:30:02 2006
>>> @@ -31,20 +31,6 @@
>>> <artifactId>geronimo-upgrade</artifactId>
>>> <name>Geronimo :: Upgrade</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:http://svn.apache.org/repos/asf/
>>> geronimo/server/trunk/modules/upgrade</connection>
>>> - <developerConnection>scm:svn:https://${maven.username}
>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/upgrade</
>>> developerConnection>
>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>>> upgrade</url>
>>> - </scm>
>>> -
>>> <dependencies>
>>>
>>> <dependency>
>>>
>>> Modified: geronimo/server/trunk/modules/geronimo-util/pom.xml
>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>> geronimo-util/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>>> ====================================================================
>>> ==========
>>> --- geronimo/server/trunk/modules/geronimo-util/pom.xml (original)
>>> +++ geronimo/server/trunk/modules/geronimo-util/pom.xml Sat Aug
>>> 26 15:30:02 2006
>>> @@ -31,20 +31,6 @@
>>> <artifactId>geronimo-util</artifactId>
>>> <name>Geronimo :: Util</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:http://svn.apache.org/repos/asf/
>>> geronimo/server/trunk/modules/util</connection>
>>> - <developerConnection>scm:svn:https://${maven.username}
>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/util</
>>> developerConnection>
>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>>> util</url>
>>> - </scm>
>>> -
>>> <dependencies>
>>>
>>> <dependency>
>>>
>>> Modified: geronimo/server/trunk/modules/geronimo-web-builder/pom.xml
>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>> geronimo-web-builder/pom.xml?
>>> rev=437240&r1=437231&r2=437240&view=diff
>>> ====================================================================
>>> ==========
>>> --- geronimo/server/trunk/modules/geronimo-web-builder/pom.xml
>>> (original)
>>> +++ geronimo/server/trunk/modules/geronimo-web-builder/pom.xml
>>> Sat Aug 26 15:30:02 2006
>>> @@ -31,24 +31,8 @@
>>> <artifactId>geronimo-web-builder</artifactId>
>>> <name>Geronimo :: Web :: Builder</name>
>>>
>>> - <!--
>>> -
>>> - HACK: Need to explicitly configure SCM for this module since
>>> its artifactId
>>> - does not match the directory it lives in.
>>> -
>>> - FIXME: Rename module directory or artifactId.
>>> -
>>> - -->
>>> - <scm>
>>> - <connection>scm:svn:http://svn.apache.org/repos/asf/
>>> geronimo/server/trunk/modules/web-builder</connection>
>>> - <developerConnection>scm:svn:https://${maven.username}
>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/web-
>>> builder</developerConnection>
>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>>> web-builder</url>
>>> - </scm>
>>> -
>>> <dependencies>
>>>
>>> - <!-- Module Dependencies -->
>>> -
>>> <dependency>
>>> <groupId>${pom.groupId}</groupId>
>>> <artifactId>geronimo-j2ee-builder</artifactId>
>>> @@ -87,8 +71,6 @@
>>> <version>${pom.version}</version>
>>> </dependency>
>>>
>>> - <!-- Spec Dependencies -->
>>> -
>>> <dependency>
>>> <groupId>org.apache.geronimo.specs</groupId>
>>> <artifactId>geronimo-servlet_2.4_spec</artifactId>
>>>
>>> Modified: geronimo/server/trunk/modules/geronimo-webservices/pom.xml
>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>> geronimo-webservices/pom.xml?
>>> rev=437240&r1=437231&r2=437240&view=diff
>>> ====================================================================
>>> ==========
>>> --- geronimo/server/trunk/modules/geronimo-webservices/pom.xml
>>> (original)
>>> +++ geronimo/server/trunk/modules/geronimo-webservices/pom.xml
>>> Sat Aug 26 15:30:02 2006
>>> @@ -31,20 +31,6 @@
>>> <artifactId>geronimo-webservices</artifactId>
>>> <name>Geronimo :: Web Services</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:http://svn.apache.org/repos/asf/
>>> geronimo/server/trunk/modules/webservices</connection>
>>> - <developerConnection>scm:svn:https://${maven.username}
>>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/
>>> webservices</developerConnection>
>>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>>> webservices</url>
>>> - </scm>
>>> -
>>> <dependencies>
>>>
>>> <dependency>
>>> @@ -121,6 +107,7 @@
>>> <groupId>scout</groupId>
>>> <artifactId>scout</artifactId>
>>> </dependency>
>>> +
>>> </dependencies>
>>>
>>> </project>
>>>
>>> Modified: geronimo/server/trunk/modules/pom.xml
>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>>> pom.xml?rev=437240&r1=437239&r2=437240&view=diff
>>> ====================================================================
>>> ==========
>>> --- geronimo/server/trunk/modules/pom.xml (original)
>>> +++ geronimo/server/trunk/modules/pom.xml Sat Aug 26 15:30:02 2006
>>> @@ -35,51 +35,51 @@
>>>
>>> <modules>
>>> <module>geronimo-testsupport</module>
>>> - <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>
>>> - <module>client-builder</module>
>>> - <module>common</module>
>>> - <module>connector</module>
>>> - <module>connector-builder</module>
>>> - <module>converter</module>
>>> - <module>core</module>
>>> - <module>deploy-config</module>
>>> - <module>deploy-jsr88</module>
>>> - <module>deploy-tool</module>
>>> - <module>deployment</module>
>>> - <module>derby</module>
>>> - <module>directory</module>
>>> - <module>hot-deploy</module>
>>> - <module>interceptor</module>
>>> - <module>j2ee</module>
>>> - <module>j2ee-builder</module>
>>> - <module>j2ee-schema</module>
>>> - <module>jetty</module>
>>> - <module>jetty-builder</module>
>>> - <module>jmx-remoting</module>
>>> - <module>kernel</module>
>>> - <module>mail</module>
>>> - <module>management</module>
>>> - <module>naming</module>
>>> - <module>naming-builder</module>
>>> - <module>security</module>
>>> - <module>security-builder</module>
>>> - <module>service-builder</module>
>>> - <module>system</module>
>>> - <module>test-ddbean</module>
>>> - <module>timer</module>
>>> - <module>tomcat</module>
>>> - <module>tomcat-builder</module>
>>> - <module>transaction</module>
>>> - <module>upgrade</module>
>>> - <module>util</module>
>>> - <module>web-builder</module>
>>> - <module>webservices</module>
>>> + <module>geronimo-activation</module>
>>> + <module>ge-activemq-rar</module>
>>> + <module>geronimo-activemq-gbean</module>
>>> + <module>geronimo-activemq-gbean-management</module>
>>> + <module>geronimo-axis</module>
>>> + <module>geronimo-axis-builder</module>
>>> + <module>geronimo-client</module>
>>> + <module>geronimo-client-builder</module>
>>> + <module>geronimo-common</module>
>>> + <module>geronimo-connector</module>
>>> + <module>geronimo-connector-builder</module>
>>> + <module>geronimo-converter</module>
>>> + <module>geronimo-core</module>
>>> + <module>geronimo-deploy-config</module>
>>> + <module>geronimo-deploy-jsr88</module>
>>> + <module>geronimo-deploy-tool</module>
>>> + <module>geronimo-deployment</module>
>>> + <module>geronimo-derby</module>
>>> + <module>geronimo-directory</module>
>>> + <module>geronimo-hot-deploy</module>
>>> + <module>geronimo-interceptor</module>
>>> + <module>geronimo-j2ee</module>
>>> + <module>geronimo-j2ee-builder</module>
>>> + <module>geronimo-j2ee-schema</module>
>>> + <module>geronimo-jetty</module>
>>> + <module>geronimo-jetty-builder</module>
>>> + <module>geronimo-jmx-remoting</module>
>>> + <module>geronimo-kernel</module>
>>> + <module>geronimo-mail</module>
>>> + <module>geronimo-management</module>
>>> + <module>geronimo-naming</module>
>>> + <module>geronimo-naming-builder</module>
>>> + <module>geronimo-security</module>
>>> + <module>geronimo-security-builder</module>
>>> + <module>geronimo-service-builder</module>
>>> + <module>geronimo-system</module>
>>> + <module>geronimo-test-ddbean</module>
>>> + <module>geronimo-timer</module>
>>> + <module>geronimo-tomcat</module>
>>> + <module>geronimo-tomcat-builder</module>
>>> + <module>geronimo-transaction</module>
>>> + <module>geronimo-upgrade</module>
>>> + <module>geronimo-util</module>
>>> + <module>geronimo-web-builder</module>
>>> + <module>geronimo-webservices</module>
>>> </modules>
>>>
>>> </project>
>>>
>>>
>>
>>
>> -sachin
>>
>>
>
>
> -sachin
>
>
-sachin
Re: svn commit: r437240 - in /geronimo/server/trunk/modules: ./ activation/ activemq-embedded-rar/ activemq-gbean-management/ activemq-gbean/ axis-builder/ axis/ client-builder/ client/ common/ connector-builder/ connector/ converter/ core/ deploy-config/ ...
Posted by Sachin Patel <sp...@gmail.com>.
for example...
my branch contains j2ee-builder/src/foo.java (which contains
committed changes that are not in trunk)
and for example, in trunk you happened to rename this too..
geronimo-j2ee-builder/src/foo.java..
Doing any svn merge, would remove my copy of it, and replace it with
the foo.java from trunk, thus losing my changes.
Can svn merge or svk handle this? I've got svk installed, but not
sure how to use it.
thx
On Aug 28, 2006, at 8:37 AM, Sachin Patel wrote:
> Jason, how can I best merge these changes into the sachin branch
> without having my changes wiped out? Using svn merge, since old
> source folders are being renamed and the source removed, my files
> are being deleted :(, what is the best way for my tree to be
> updated to any further new structure changes?
>
> Thanks.
>
> On Aug 26, 2006, at 6:30 PM, jdillon@apache.org wrote:
>
>> Author: jdillon
>> Date: Sat Aug 26 15:30:02 2006
>> New Revision: 437240
>>
>> URL: http://svn.apache.org/viewvc?rev=437240&view=rev
>> Log:
>> (GERONIMO-2162) Use same directory as artifactId for modules/*
>>
>> Added:
>> geronimo/server/trunk/modules/ge-activemq-rar/
>> - copied from r437231, geronimo/server/trunk/modules/
>> activemq-embedded-rar/
>> geronimo/server/trunk/modules/geronimo-activation/
>> - copied from r437231, geronimo/server/trunk/modules/
>> activation/
>> geronimo/server/trunk/modules/geronimo-activemq-gbean/
>> - copied from r437231, geronimo/server/trunk/modules/
>> activemq-gbean/
>> geronimo/server/trunk/modules/geronimo-activemq-gbean-management/
>> - copied from r437231, geronimo/server/trunk/modules/
>> activemq-gbean-management/
>> geronimo/server/trunk/modules/geronimo-axis/
>> - copied from r437231, geronimo/server/trunk/modules/axis/
>> geronimo/server/trunk/modules/geronimo-axis-builder/
>> - copied from r437231, geronimo/server/trunk/modules/axis-
>> builder/
>> geronimo/server/trunk/modules/geronimo-client/
>> - copied from r437231, geronimo/server/trunk/modules/client/
>> geronimo/server/trunk/modules/geronimo-client-builder/
>> - copied from r437231, geronimo/server/trunk/modules/client-
>> builder/
>> geronimo/server/trunk/modules/geronimo-common/
>> - copied from r437231, geronimo/server/trunk/modules/common/
>> geronimo/server/trunk/modules/geronimo-connector/
>> - copied from r437231, geronimo/server/trunk/modules/connector/
>> geronimo/server/trunk/modules/geronimo-connector-builder/
>> - copied from r437231, geronimo/server/trunk/modules/
>> connector-builder/
>> geronimo/server/trunk/modules/geronimo-converter/
>> - copied from r437231, geronimo/server/trunk/modules/converter/
>> geronimo/server/trunk/modules/geronimo-core/
>> - copied from r437231, geronimo/server/trunk/modules/core/
>> geronimo/server/trunk/modules/geronimo-deploy-config/
>> - copied from r437231, geronimo/server/trunk/modules/deploy-
>> config/
>> geronimo/server/trunk/modules/geronimo-deploy-jsr88/
>> - copied from r437231, geronimo/server/trunk/modules/deploy-
>> jsr88/
>> geronimo/server/trunk/modules/geronimo-deploy-tool/
>> - copied from r437231, geronimo/server/trunk/modules/deploy-
>> tool/
>> geronimo/server/trunk/modules/geronimo-deployment/
>> - copied from r437231, geronimo/server/trunk/modules/
>> deployment/
>> geronimo/server/trunk/modules/geronimo-derby/
>> - copied from r437231, geronimo/server/trunk/modules/derby/
>> geronimo/server/trunk/modules/geronimo-directory/
>> - copied from r437231, geronimo/server/trunk/modules/directory/
>> geronimo/server/trunk/modules/geronimo-hot-deploy/
>> - copied from r437231, geronimo/server/trunk/modules/hot-
>> deploy/
>> geronimo/server/trunk/modules/geronimo-interceptor/
>> - copied from r437231, geronimo/server/trunk/modules/
>> interceptor/
>> geronimo/server/trunk/modules/geronimo-j2ee/
>> - copied from r437231, geronimo/server/trunk/modules/j2ee/
>> geronimo/server/trunk/modules/geronimo-j2ee-builder/
>> - copied from r437231, geronimo/server/trunk/modules/j2ee-
>> builder/
>> geronimo/server/trunk/modules/geronimo-j2ee-schema/
>> - copied from r437231, geronimo/server/trunk/modules/j2ee-
>> schema/
>> geronimo/server/trunk/modules/geronimo-jetty/
>> - copied from r437231, geronimo/server/trunk/modules/jetty/
>> geronimo/server/trunk/modules/geronimo-jetty-builder/
>> - copied from r437231, geronimo/server/trunk/modules/jetty-
>> builder/
>> geronimo/server/trunk/modules/geronimo-jmx-remoting/
>> - copied from r437231, geronimo/server/trunk/modules/jmx-
>> remoting/
>> geronimo/server/trunk/modules/geronimo-kernel/
>> - copied from r437231, geronimo/server/trunk/modules/kernel/
>> geronimo/server/trunk/modules/geronimo-mail/
>> - copied from r437231, geronimo/server/trunk/modules/mail/
>> geronimo/server/trunk/modules/geronimo-management/
>> - copied from r437231, geronimo/server/trunk/modules/
>> management/
>> geronimo/server/trunk/modules/geronimo-naming/
>> - copied from r437231, geronimo/server/trunk/modules/naming/
>> geronimo/server/trunk/modules/geronimo-naming-builder/
>> - copied from r437231, geronimo/server/trunk/modules/naming-
>> builder/
>> geronimo/server/trunk/modules/geronimo-security/
>> - copied from r437231, geronimo/server/trunk/modules/security/
>> geronimo/server/trunk/modules/geronimo-security-builder/
>> - copied from r437231, geronimo/server/trunk/modules/
>> security-builder/
>> geronimo/server/trunk/modules/geronimo-service-builder/
>> - copied from r437231, geronimo/server/trunk/modules/service-
>> builder/
>> geronimo/server/trunk/modules/geronimo-system/
>> - copied from r437231, geronimo/server/trunk/modules/system/
>> geronimo/server/trunk/modules/geronimo-test-ddbean/
>> - copied from r437231, geronimo/server/trunk/modules/test-
>> ddbean/
>> geronimo/server/trunk/modules/geronimo-timer/
>> - copied from r437231, geronimo/server/trunk/modules/timer/
>> geronimo/server/trunk/modules/geronimo-tomcat/
>> - copied from r437231, geronimo/server/trunk/modules/tomcat/
>> geronimo/server/trunk/modules/geronimo-tomcat-builder/
>> - copied from r437231, geronimo/server/trunk/modules/tomcat-
>> builder/
>> geronimo/server/trunk/modules/geronimo-transaction/
>> - copied from r437231, geronimo/server/trunk/modules/
>> transaction/
>> geronimo/server/trunk/modules/geronimo-upgrade/
>> - copied from r437231, geronimo/server/trunk/modules/upgrade/
>> geronimo/server/trunk/modules/geronimo-util/
>> - copied from r437231, geronimo/server/trunk/modules/util/
>> geronimo/server/trunk/modules/geronimo-web-builder/
>> - copied from r437231, geronimo/server/trunk/modules/web-
>> builder/
>> geronimo/server/trunk/modules/geronimo-webservices/
>> - copied from r437231, geronimo/server/trunk/modules/
>> webservices/
>> Removed:
>> geronimo/server/trunk/modules/activation/
>> geronimo/server/trunk/modules/activemq-embedded-rar/
>> geronimo/server/trunk/modules/activemq-gbean/
>> geronimo/server/trunk/modules/activemq-gbean-management/
>> geronimo/server/trunk/modules/axis/
>> geronimo/server/trunk/modules/axis-builder/
>> geronimo/server/trunk/modules/client/
>> geronimo/server/trunk/modules/client-builder/
>> geronimo/server/trunk/modules/common/
>> geronimo/server/trunk/modules/connector/
>> geronimo/server/trunk/modules/connector-builder/
>> geronimo/server/trunk/modules/converter/
>> geronimo/server/trunk/modules/core/
>> geronimo/server/trunk/modules/deploy-config/
>> geronimo/server/trunk/modules/deploy-jsr88/
>> geronimo/server/trunk/modules/deploy-tool/
>> geronimo/server/trunk/modules/deployment/
>> geronimo/server/trunk/modules/derby/
>> geronimo/server/trunk/modules/directory/
>> geronimo/server/trunk/modules/hot-deploy/
>> geronimo/server/trunk/modules/interceptor/
>> geronimo/server/trunk/modules/j2ee/
>> geronimo/server/trunk/modules/j2ee-builder/
>> geronimo/server/trunk/modules/j2ee-schema/
>> geronimo/server/trunk/modules/jetty/
>> geronimo/server/trunk/modules/jetty-builder/
>> geronimo/server/trunk/modules/jmx-remoting/
>> geronimo/server/trunk/modules/kernel/
>> geronimo/server/trunk/modules/mail/
>> geronimo/server/trunk/modules/management/
>> geronimo/server/trunk/modules/naming/
>> geronimo/server/trunk/modules/naming-builder/
>> geronimo/server/trunk/modules/security/
>> geronimo/server/trunk/modules/security-builder/
>> geronimo/server/trunk/modules/service-builder/
>> geronimo/server/trunk/modules/system/
>> geronimo/server/trunk/modules/test-ddbean/
>> geronimo/server/trunk/modules/timer/
>> geronimo/server/trunk/modules/tomcat/
>> geronimo/server/trunk/modules/tomcat-builder/
>> geronimo/server/trunk/modules/transaction/
>> geronimo/server/trunk/modules/upgrade/
>> geronimo/server/trunk/modules/util/
>> geronimo/server/trunk/modules/web-builder/
>> geronimo/server/trunk/modules/webservices/
>> Modified:
>> geronimo/server/trunk/modules/ge-activemq-rar/pom.xml
>> geronimo/server/trunk/modules/geronimo-activation/pom.xml
>> geronimo/server/trunk/modules/geronimo-activemq-gbean-
>> management/pom.xml
>> geronimo/server/trunk/modules/geronimo-activemq-gbean/pom.xml
>> geronimo/server/trunk/modules/geronimo-axis-builder/pom.xml
>> geronimo/server/trunk/modules/geronimo-axis/pom.xml
>> geronimo/server/trunk/modules/geronimo-client-builder/pom.xml
>> geronimo/server/trunk/modules/geronimo-client/pom.xml
>> geronimo/server/trunk/modules/geronimo-common/pom.xml
>> geronimo/server/trunk/modules/geronimo-connector-builder/pom.xml
>> geronimo/server/trunk/modules/geronimo-connector/pom.xml
>> geronimo/server/trunk/modules/geronimo-converter/pom.xml
>> geronimo/server/trunk/modules/geronimo-core/pom.xml
>> geronimo/server/trunk/modules/geronimo-deploy-config/pom.xml
>> geronimo/server/trunk/modules/geronimo-deploy-jsr88/pom.xml
>> geronimo/server/trunk/modules/geronimo-deploy-tool/pom.xml
>> geronimo/server/trunk/modules/geronimo-deployment/pom.xml
>> geronimo/server/trunk/modules/geronimo-derby/pom.xml
>> geronimo/server/trunk/modules/geronimo-directory/pom.xml
>> geronimo/server/trunk/modules/geronimo-hot-deploy/pom.xml
>> geronimo/server/trunk/modules/geronimo-interceptor/pom.xml
>> geronimo/server/trunk/modules/geronimo-j2ee-builder/pom.xml
>> geronimo/server/trunk/modules/geronimo-j2ee-builder/src/java/
>> org/apache/geronimo/j2ee/deployment/SecurityBuilder.java
>> geronimo/server/trunk/modules/geronimo-j2ee-schema/pom.xml
>> geronimo/server/trunk/modules/geronimo-j2ee/pom.xml
>> geronimo/server/trunk/modules/geronimo-jetty-builder/pom.xml
>> geronimo/server/trunk/modules/geronimo-jetty/pom.xml
>> geronimo/server/trunk/modules/geronimo-jmx-remoting/pom.xml
>> geronimo/server/trunk/modules/geronimo-kernel/pom.xml
>> geronimo/server/trunk/modules/geronimo-mail/pom.xml
>> geronimo/server/trunk/modules/geronimo-management/pom.xml
>> geronimo/server/trunk/modules/geronimo-naming-builder/pom.xml
>> geronimo/server/trunk/modules/geronimo-naming/pom.xml
>> geronimo/server/trunk/modules/geronimo-security-builder/pom.xml
>> geronimo/server/trunk/modules/geronimo-security/pom.xml
>> geronimo/server/trunk/modules/geronimo-service-builder/pom.xml
>> geronimo/server/trunk/modules/geronimo-system/pom.xml
>> geronimo/server/trunk/modules/geronimo-test-ddbean/pom.xml
>> geronimo/server/trunk/modules/geronimo-testsupport/pom.xml
>> geronimo/server/trunk/modules/geronimo-timer/pom.xml
>> geronimo/server/trunk/modules/geronimo-tomcat-builder/pom.xml
>> geronimo/server/trunk/modules/geronimo-tomcat/pom.xml
>> geronimo/server/trunk/modules/geronimo-transaction/pom.xml
>> geronimo/server/trunk/modules/geronimo-upgrade/pom.xml
>> geronimo/server/trunk/modules/geronimo-util/pom.xml
>> geronimo/server/trunk/modules/geronimo-web-builder/pom.xml
>> geronimo/server/trunk/modules/geronimo-webservices/pom.xml
>> geronimo/server/trunk/modules/pom.xml
>>
>> Modified: geronimo/server/trunk/modules/ge-activemq-rar/pom.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/ge-
>> activemq-rar/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/modules/ge-activemq-rar/pom.xml (original)
>> +++ geronimo/server/trunk/modules/ge-activemq-rar/pom.xml Sat Aug
>> 26 15:30:02 2006
>> @@ -33,20 +33,6 @@
>> <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:http://svn.apache.org/repos/asf/
>> geronimo/server/trunk/modules/activemq-embedded-rar</connection>
>> - <developerConnection>scm:svn:https://${maven.username}
>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/activemq-
>> embedded-rar</developerConnection>
>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>> activemq-embedded-rar</url>
>> - </scm>
>> -
>> <dependencies>
>>
>> <dependency>
>>
>> Modified: geronimo/server/trunk/modules/geronimo-activation/pom.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>> geronimo-activation/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/modules/geronimo-activation/pom.xml
>> (original)
>> +++ geronimo/server/trunk/modules/geronimo-activation/pom.xml Sat
>> Aug 26 15:30:02 2006
>> @@ -36,20 +36,6 @@
>> 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:http://svn.apache.org/repos/asf/
>> geronimo/server/trunk/modules/activation</connection>
>> - <developerConnection>scm:svn:https://${maven.username}
>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/
>> activation</developerConnection>
>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>> activation</url>
>> - </scm>
>> -
>> <dependencies>
>>
>> <dependency>
>>
>> Modified: geronimo/server/trunk/modules/geronimo-activemq-gbean-
>> management/pom.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>> geronimo-activemq-gbean-management/pom.xml?
>> rev=437240&r1=437231&r2=437240&view=diff
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/modules/geronimo-activemq-gbean-
>> management/pom.xml (original)
>> +++ geronimo/server/trunk/modules/geronimo-activemq-gbean-
>> management/pom.xml Sat Aug 26 15:30:02 2006
>> @@ -31,24 +31,6 @@
>> <artifactId>geronimo-activemq-gbean-management</artifactId>
>> <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:http://svn.apache.org/repos/asf/
>> geronimo/server/trunk/modules/activemq-gbean-management</connection>
>> - <developerConnection>scm:svn:https://${maven.username}
>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/activemq-
>> gbean-management</developerConnection>
>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>> activemq-gbean-management</url>
>> - </scm>
>> -
>> <dependencies>
>>
>> <dependency>
>>
>> Modified: geronimo/server/trunk/modules/geronimo-activemq-gbean/
>> pom.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>> geronimo-activemq-gbean/pom.xml?
>> rev=437240&r1=437231&r2=437240&view=diff
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/modules/geronimo-activemq-gbean/pom.xml
>> (original)
>> +++ geronimo/server/trunk/modules/geronimo-activemq-gbean/pom.xml
>> Sat Aug 26 15:30:02 2006
>> @@ -31,24 +31,6 @@
>> <artifactId>geronimo-activemq-gbean</artifactId>
>> <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:http://svn.apache.org/repos/asf/
>> geronimo/server/trunk/modules/activemq-gbean</connection>
>> - <developerConnection>scm:svn:https://${maven.username}
>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/activemq-
>> gbean</developerConnection>
>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>> activemq-gbean</url>
>> - </scm>
>> -
>> <dependencies>
>>
>> <dependency>
>>
>> Modified: geronimo/server/trunk/modules/geronimo-axis-builder/pom.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>> geronimo-axis-builder/pom.xml?
>> rev=437240&r1=437231&r2=437240&view=diff
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/modules/geronimo-axis-builder/pom.xml
>> (original)
>> +++ geronimo/server/trunk/modules/geronimo-axis-builder/pom.xml
>> Sat Aug 26 15:30:02 2006
>> @@ -31,24 +31,8 @@
>> <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:http://svn.apache.org/repos/asf/
>> geronimo/server/trunk/modules/axis-builder</connection>
>> - <developerConnection>scm:svn:https://${maven.username}
>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/axis-
>> builder</developerConnection>
>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>> axis-builder</url>
>> - </scm>
>> -
>> <dependencies>
>>
>> - <!-- Module Dependencies -->
>> -
>> <dependency>
>> <groupId>${pom.groupId}</groupId>
>> <artifactId>geronimo-axis</artifactId>
>> @@ -85,8 +69,6 @@
>> <version>${pom.version}</version>
>> </dependency>
>>
>> - <!-- Spec Dependencies -->
>> -
>> <dependency>
>> <groupId>org.apache.geronimo.specs</groupId>
>> <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
>> @@ -101,8 +83,6 @@
>> <groupId>org.apache.geronimo.specs</groupId>
>> <artifactId>geronimo-qname_1.1_spec</artifactId>
>> </dependency>
>> -
>> - <!-- Thirdparty Dependencies -->
>>
>> <dependency>
>> <groupId>asm</groupId>
>>
>> Modified: geronimo/server/trunk/modules/geronimo-axis/pom.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>> geronimo-axis/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/modules/geronimo-axis/pom.xml (original)
>> +++ geronimo/server/trunk/modules/geronimo-axis/pom.xml Sat Aug 26
>> 15:30:02 2006
>> @@ -31,21 +31,6 @@
>> <artifactId>geronimo-axis</artifactId>
>> <packaging>jar</packaging>
>> <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:http://svn.apache.org/repos/asf/
>> geronimo/server/trunk/modules/axis</connection>
>> - <developerConnection>scm:svn:https://${maven.username}
>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/axis</
>> developerConnection>
>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>> axis</url>
>> - </scm>
>>
>> <dependencies>
>>
>>
>> Modified: geronimo/server/trunk/modules/geronimo-client-builder/
>> pom.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>> geronimo-client-builder/pom.xml?
>> rev=437240&r1=437231&r2=437240&view=diff
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/modules/geronimo-client-builder/pom.xml
>> (original)
>> +++ geronimo/server/trunk/modules/geronimo-client-builder/pom.xml
>> Sat Aug 26 15:30:02 2006
>> @@ -31,23 +31,7 @@
>> <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:http://svn.apache.org/repos/asf/
>> geronimo/server/trunk/modules/client-builder</connection>
>> - <developerConnection>scm:svn:https://${maven.username}
>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/client-
>> builder</developerConnection>
>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>> client-builder</url>
>> - </scm>
>> -
>> <dependencies>
>> -
>> - <!-- Module Dependencies -->
>>
>> <dependency>
>> <groupId>${pom.groupId}</groupId>
>>
>> Modified: geronimo/server/trunk/modules/geronimo-client/pom.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>> geronimo-client/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/modules/geronimo-client/pom.xml (original)
>> +++ geronimo/server/trunk/modules/geronimo-client/pom.xml Sat Aug
>> 26 15:30:02 2006
>> @@ -31,20 +31,6 @@
>> <artifactId>geronimo-client</artifactId>
>> <name>Geronimo :: Client</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:http://svn.apache.org/repos/asf/
>> geronimo/server/trunk/modules/client</connection>
>> - <developerConnection>scm:svn:https://${maven.username}
>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/client</
>> developerConnection>
>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>> client</url>
>> - </scm>
>> -
>> <dependencies>
>>
>> <dependency>
>>
>> Modified: geronimo/server/trunk/modules/geronimo-common/pom.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>> geronimo-common/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/modules/geronimo-common/pom.xml (original)
>> +++ geronimo/server/trunk/modules/geronimo-common/pom.xml Sat Aug
>> 26 15:30:02 2006
>> @@ -31,20 +31,6 @@
>> <artifactId>geronimo-common</artifactId>
>> <name>Geronimo :: Common</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:http://svn.apache.org/repos/asf/
>> geronimo/server/trunk/modules/common</connection>
>> - <developerConnection>scm:svn:https://${maven.username}
>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/common</
>> developerConnection>
>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>> common</url>
>> - </scm>
>> -
>> <dependencies>
>>
>> <dependency>
>>
>> Modified: geronimo/server/trunk/modules/geronimo-connector-builder/
>> pom.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>> geronimo-connector-builder/pom.xml?
>> rev=437240&r1=437231&r2=437240&view=diff
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/modules/geronimo-connector-builder/
>> pom.xml (original)
>> +++ geronimo/server/trunk/modules/geronimo-connector-builder/
>> pom.xml Sat Aug 26 15:30:02 2006
>> @@ -31,24 +31,8 @@
>> <artifactId>geronimo-connector-builder</artifactId>
>> <name>Geronimo :: Connector :: 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:http://svn.apache.org/repos/asf/
>> geronimo/server/trunk/modules/connector-builder</connection>
>> - <developerConnection>scm:svn:https://${maven.username}
>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/connector-
>> builder</developerConnection>
>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>> connector-builder</url>
>> - </scm>
>> -
>> <dependencies>
>>
>> - <!-- Module Dependencies -->
>> -
>> <dependency>
>> <groupId>${pom.groupId}</groupId>
>> <artifactId>geronimo-connector</artifactId>
>> @@ -72,8 +56,6 @@
>> <artifactId>geronimo-test-ddbean</artifactId>
>> <version>${pom.version}</version>
>> </dependency>
>> -
>> - <!-- Thirdparty Dependencies -->
>>
>> <dependency>
>> <groupId>tranql</groupId>
>>
>> Modified: geronimo/server/trunk/modules/geronimo-connector/pom.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>> geronimo-connector/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/modules/geronimo-connector/pom.xml
>> (original)
>> +++ geronimo/server/trunk/modules/geronimo-connector/pom.xml Sat
>> Aug 26 15:30:02 2006
>> @@ -31,20 +31,6 @@
>> <artifactId>geronimo-connector</artifactId>
>> <name>Geronimo :: Connector</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:http://svn.apache.org/repos/asf/
>> geronimo/server/trunk/modules/connector</connection>
>> - <developerConnection>scm:svn:https://${maven.username}
>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/connector</
>> developerConnection>
>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>> connector</url>
>> - </scm>
>> -
>> <dependencies>
>>
>> <dependency>
>>
>> Modified: geronimo/server/trunk/modules/geronimo-converter/pom.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>> geronimo-converter/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/modules/geronimo-converter/pom.xml
>> (original)
>> +++ geronimo/server/trunk/modules/geronimo-converter/pom.xml Sat
>> Aug 26 15:30:02 2006
>> @@ -31,20 +31,6 @@
>> <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:http://svn.apache.org/repos/asf/
>> geronimo/server/trunk/modules/converter</connection>
>> - <developerConnection>scm:svn:https://${maven.username}
>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/converter</
>> developerConnection>
>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>> converter</url>
>> - </scm>
>> -
>> <dependencies>
>>
>> <dependency>
>>
>> Modified: geronimo/server/trunk/modules/geronimo-core/pom.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>> geronimo-core/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/modules/geronimo-core/pom.xml (original)
>> +++ geronimo/server/trunk/modules/geronimo-core/pom.xml Sat Aug 26
>> 15:30:02 2006
>> @@ -31,20 +31,6 @@
>> <artifactId>geronimo-core</artifactId>
>> <name>Geronimo :: Core</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:http://svn.apache.org/repos/asf/
>> geronimo/server/trunk/modules/core</connection>
>> - <developerConnection>scm:svn:https://${maven.username}
>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/core</
>> developerConnection>
>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>> core</url>
>> - </scm>
>> -
>> <dependencies>
>>
>> <dependency>
>>
>> Modified: geronimo/server/trunk/modules/geronimo-deploy-config/
>> pom.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>> geronimo-deploy-config/pom.xml?
>> rev=437240&r1=437231&r2=437240&view=diff
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/modules/geronimo-deploy-config/pom.xml
>> (original)
>> +++ geronimo/server/trunk/modules/geronimo-deploy-config/pom.xml
>> Sat Aug 26 15:30:02 2006
>> @@ -30,27 +30,12 @@
>>
>> <artifactId>geronimo-deploy-config</artifactId>
>> <name>Geronimo :: Deploy :: Common Config</name>
>> - <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:http://svn.apache.org/repos/asf/
>> geronimo/server/trunk/modules/deploy-config</connection>
>> - <developerConnection>scm:svn:https://${maven.username}
>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/deploy-
>> config</developerConnection>
>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>> deploy-config</url>
>> - </scm>
>>
>> <dependencies>
>>
>>
>> Modified: geronimo/server/trunk/modules/geronimo-deploy-jsr88/pom.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>> geronimo-deploy-jsr88/pom.xml?
>> rev=437240&r1=437231&r2=437240&view=diff
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/modules/geronimo-deploy-jsr88/pom.xml
>> (original)
>> +++ geronimo/server/trunk/modules/geronimo-deploy-jsr88/pom.xml
>> Sat Aug 26 15:30:02 2006
>> @@ -30,26 +30,9 @@
>>
>> <artifactId>geronimo-deploy-jsr88</artifactId>
>> <name>Geronimo :: Deploy :: JSR-88</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:http://svn.apache.org/repos/asf/
>> geronimo/server/trunk/modules/deploy-jsr88</connection>
>> - <developerConnection>scm:svn:https://${maven.username}
>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/deploy-
>> jsr88</developerConnection>
>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>> deploy-jsr88</url>
>> - </scm>
>>
>> <dependencies>
>>
>> - <!-- Module Dependencies -->
>> -
>> <dependency>
>> <groupId>org.apache.geronimo.modules</groupId>
>> <artifactId>geronimo-system</artifactId>
>> @@ -80,8 +63,6 @@
>> <groupId>org.apache.geronimo.specs</groupId>
>> <artifactId>geronimo-j2ee-deployment_1.1_spec</
>> artifactId>
>> </dependency>
>> -
>> - <!-- Thirdparty Dependencies -->
>>
>> <dependency>
>> <groupId>mx4j</groupId>
>>
>> Modified: geronimo/server/trunk/modules/geronimo-deploy-tool/pom.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>> geronimo-deploy-tool/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/modules/geronimo-deploy-tool/pom.xml
>> (original)
>> +++ geronimo/server/trunk/modules/geronimo-deploy-tool/pom.xml Sat
>> Aug 26 15:30:02 2006
>> @@ -31,20 +31,6 @@
>> <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:http://svn.apache.org/repos/asf/
>> geronimo/server/trunk/modules/deploy-tool</connection>
>> - <developerConnection>scm:svn:https://${maven.username}
>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/deploy-
>> tool</developerConnection>
>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>> deploy-tool</url>
>> - </scm>
>> -
>> <dependencies>
>>
>> <dependency>
>> @@ -82,8 +68,6 @@
>> <version>${pom.version}</version>
>> </dependency>
>>
>> - <!-- Thirdparty Dependencies -->
>> -
>> <dependency>
>> <groupId>jline</groupId>
>> <artifactId>jline</artifactId>
>>
>> Modified: geronimo/server/trunk/modules/geronimo-deployment/pom.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>> geronimo-deployment/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/modules/geronimo-deployment/pom.xml
>> (original)
>> +++ geronimo/server/trunk/modules/geronimo-deployment/pom.xml Sat
>> Aug 26 15:30:02 2006
>> @@ -31,31 +31,13 @@
>> <artifactId>geronimo-deployment</artifactId>
>> <name>Geronimo :: Deployment</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:http://svn.apache.org/repos/asf/
>> geronimo/server/trunk/modules/deployment</connection>
>> - <developerConnection>scm:svn:https://${maven.username}
>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/
>> deployment</developerConnection>
>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>> deployment</url>
>> - </scm>
>> -
>> <dependencies>
>>
>> - <!-- Module Dependencies -->
>> -
>> <dependency>
>> <groupId>org.apache.geronimo.modules</groupId>
>> <artifactId>geronimo-system</artifactId>
>> <version>${pom.version}</version>
>> </dependency>
>> -
>> - <!-- Thirdparty Dependencies -->
>>
>> <dependency>
>> <groupId>xmlbeans</groupId>
>>
>> Modified: geronimo/server/trunk/modules/geronimo-derby/pom.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>> geronimo-derby/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/modules/geronimo-derby/pom.xml (original)
>> +++ geronimo/server/trunk/modules/geronimo-derby/pom.xml Sat Aug
>> 26 15:30:02 2006
>> @@ -33,20 +33,6 @@
>>
>> <description>Wrapper for using Apache Derby as a bundled
>> database.</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:http://svn.apache.org/repos/asf/
>> geronimo/server/trunk/modules/derby</connection>
>> - <developerConnection>scm:svn:https://${maven.username}
>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/derby</
>> developerConnection>
>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>> derby</url>
>> - </scm>
>> -
>> <dependencies>
>>
>> <dependency>
>>
>> Modified: geronimo/server/trunk/modules/geronimo-directory/pom.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>> geronimo-directory/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/modules/geronimo-directory/pom.xml
>> (original)
>> +++ geronimo/server/trunk/modules/geronimo-directory/pom.xml Sat
>> Aug 26 15:30:02 2006
>> @@ -31,31 +31,13 @@
>> <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:http://svn.apache.org/repos/asf/
>> geronimo/server/trunk/modules/directory</connection>
>> - <developerConnection>scm:svn:https://${maven.username}
>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/directory</
>> developerConnection>
>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>> directory</url>
>> - </scm>
>> -
>> <dependencies>
>>
>> - <!-- Module Dependencies -->
>> -
>> <dependency>
>> <groupId>${pom.groupId}</groupId>
>> <artifactId>geronimo-system</artifactId>
>> <version>${pom.version}</version>
>> </dependency>
>> -
>> - <!-- Thirdparty Dependencies -->
>>
>> <dependency>
>> <groupId>regexp</groupId>
>>
>> Modified: geronimo/server/trunk/modules/geronimo-hot-deploy/pom.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>> geronimo-hot-deploy/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/modules/geronimo-hot-deploy/pom.xml
>> (original)
>> +++ geronimo/server/trunk/modules/geronimo-hot-deploy/pom.xml Sat
>> Aug 26 15:30:02 2006
>> @@ -31,21 +31,7 @@
>> <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:http://svn.apache.org/repos/asf/
>> geronimo/server/trunk/modules/hot-deploy</connection>
>> - <developerConnection>scm:svn:https://${maven.username}
>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/hot-
>> deploy</developerConnection>
>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>> hot-deploy</url>
>> - </scm>
>> + <description>Provides hot deployment for Geronimo.</description>
>>
>> <dependencies>
>>
>>
>> Modified: geronimo/server/trunk/modules/geronimo-interceptor/pom.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>> geronimo-interceptor/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/modules/geronimo-interceptor/pom.xml
>> (original)
>> +++ geronimo/server/trunk/modules/geronimo-interceptor/pom.xml Sat
>> Aug 26 15:30:02 2006
>> @@ -30,20 +30,5 @@
>>
>> <artifactId>geronimo-interceptor</artifactId>
>> <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:http://svn.apache.org/repos/asf/
>> geronimo/server/trunk/modules/interceptor</connection>
>> - <developerConnection>scm:svn:https://${maven.username}
>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/
>> interceptor</developerConnection>
>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>> interceptor</url>
>> - </scm>
>>
>> </project>
>>
>> Modified: geronimo/server/trunk/modules/geronimo-j2ee-builder/pom.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>> geronimo-j2ee-builder/pom.xml?
>> rev=437240&r1=437231&r2=437240&view=diff
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/modules/geronimo-j2ee-builder/pom.xml
>> (original)
>> +++ geronimo/server/trunk/modules/geronimo-j2ee-builder/pom.xml
>> Sat Aug 26 15:30:02 2006
>> @@ -31,23 +31,7 @@
>> <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:http://svn.apache.org/repos/asf/
>> geronimo/server/trunk/modules/j2ee-builder</connection>
>> - <developerConnection>scm:svn:https://${maven.username}
>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/j2ee-
>> builder</developerConnection>
>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>> j2ee-builder</url>
>> - </scm>
>> -
>> <dependencies>
>> -
>> - <!-- Module Dependencies -->
>>
>> <dependency>
>> <groupId>${pom.groupId}</groupId>
>>
>> Modified: geronimo/server/trunk/modules/geronimo-j2ee-builder/src/
>> java/org/apache/geronimo/j2ee/deployment/SecurityBuilder.java
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>> geronimo-j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/
>> SecurityBuilder.java?rev=437240&r1=437231&r2=437240&view=diff
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/modules/geronimo-j2ee-builder/src/java/
>> org/apache/geronimo/j2ee/deployment/SecurityBuilder.java (original)
>> +++ geronimo/server/trunk/modules/geronimo-j2ee-builder/src/java/
>> org/apache/geronimo/j2ee/deployment/SecurityBuilder.java Sat Aug
>> 26 15:30:02 2006
>> @@ -23,7 +23,7 @@
>> import org.apache.xmlbeans.XmlObject;
>>
>> /**
>> - * @version $Rev:$ $Date:$
>> + * @version $Rev$ $Date$
>> */
>> public interface SecurityBuilder extends NamespaceDrivenBuilder {
>>
>>
>> Modified: geronimo/server/trunk/modules/geronimo-j2ee-schema/pom.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>> geronimo-j2ee-schema/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/modules/geronimo-j2ee-schema/pom.xml
>> (original)
>> +++ geronimo/server/trunk/modules/geronimo-j2ee-schema/pom.xml Sat
>> Aug 26 15:30:02 2006
>> @@ -31,20 +31,6 @@
>> <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:http://svn.apache.org/repos/asf/
>> geronimo/server/trunk/modules/j2ee-schema</connection>
>> - <developerConnection>scm:svn:https://${maven.username}
>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/j2ee-
>> schema</developerConnection>
>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>> j2ee-schema</url>
>> - </scm>
>> -
>> <dependencies>
>>
>> <!-- might not be necessary -->
>> @@ -80,10 +66,10 @@
>> https://svn.apache.org/repos/tck/geronimo-tck/
>> schema/j2ee14
>> -->
>> <dependency>
>> - <groupId>org.apache.geronimo.schema</groupId>
>> - <artifactId>geronimo-schema-j2ee1.4</artifactId>
>> - <version>1.0-SNAPSHOT</version>
>> - </dependency>
>> + <groupId>org.apache.geronimo.schema</groupId>
>> + <artifactId>geronimo-schema-j2ee1.4</artifactId>
>> + <version>1.0-SNAPSHOT</version>
>> + </dependency>
>>
>> </dependencies>
>>
>>
>> Modified: geronimo/server/trunk/modules/geronimo-j2ee/pom.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>> geronimo-j2ee/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/modules/geronimo-j2ee/pom.xml (original)
>> +++ geronimo/server/trunk/modules/geronimo-j2ee/pom.xml Sat Aug 26
>> 15:30:02 2006
>> @@ -31,20 +31,6 @@
>> <artifactId>geronimo-j2ee</artifactId>
>> <name>Geronimo :: J2EE</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:http://svn.apache.org/repos/asf/
>> geronimo/server/trunk/modules/j2ee</connection>
>> - <developerConnection>scm:svn:https://${maven.username}
>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/j2ee</
>> developerConnection>
>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>> j2ee</url>
>> - </scm>
>> -
>> <dependencies>
>>
>> <dependency>
>>
>> Modified: geronimo/server/trunk/modules/geronimo-jetty-builder/
>> pom.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>> geronimo-jetty-builder/pom.xml?
>> rev=437240&r1=437231&r2=437240&view=diff
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/modules/geronimo-jetty-builder/pom.xml
>> (original)
>> +++ geronimo/server/trunk/modules/geronimo-jetty-builder/pom.xml
>> Sat Aug 26 15:30:02 2006
>> @@ -31,23 +31,7 @@
>> <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:http://svn.apache.org/repos/asf/
>> geronimo/server/trunk/modules/jetty-builder</connection>
>> - <developerConnection>scm:svn:https://${maven.username}
>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/jetty-
>> builder</developerConnection>
>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>> jetty-builder</url>
>> - </scm>
>> -
>> <dependencies>
>> -
>> - <!-- Module Dependencies -->
>>
>> <dependency>
>> <groupId>${pom.groupId}</groupId>
>>
>> Modified: geronimo/server/trunk/modules/geronimo-jetty/pom.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>> geronimo-jetty/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/modules/geronimo-jetty/pom.xml (original)
>> +++ geronimo/server/trunk/modules/geronimo-jetty/pom.xml Sat Aug
>> 26 15:30:02 2006
>> @@ -31,20 +31,6 @@
>> <artifactId>geronimo-jetty</artifactId>
>> <name>Geronimo :: Jetty</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:http://svn.apache.org/repos/asf/
>> geronimo/server/trunk/modules/jetty</connection>
>> - <developerConnection>scm:svn:https://${maven.username}
>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/jetty</
>> developerConnection>
>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>> jetty</url>
>> - </scm>
>> -
>> <dependencies>
>>
>> <dependency>
>>
>> Modified: geronimo/server/trunk/modules/geronimo-jmx-remoting/pom.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>> geronimo-jmx-remoting/pom.xml?
>> rev=437240&r1=437231&r2=437240&view=diff
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/modules/geronimo-jmx-remoting/pom.xml
>> (original)
>> +++ geronimo/server/trunk/modules/geronimo-jmx-remoting/pom.xml
>> Sat Aug 26 15:30:02 2006
>> @@ -31,21 +31,9 @@
>> <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:http://svn.apache.org/repos/asf/
>> geronimo/server/trunk/modules/jmx-remoting</connection>
>> - <developerConnection>scm:svn:https://${maven.username}
>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/jmx-
>> remoting</developerConnection>
>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>> jmx-remoting</url>
>> - </scm>
>> + <description>
>> + Provides remote access to a Geronimo server using JSR 160
>> JMX Remoting.
>> + </description>
>>
>> <dependencies>
>>
>>
>> Modified: geronimo/server/trunk/modules/geronimo-kernel/pom.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>> geronimo-kernel/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/modules/geronimo-kernel/pom.xml (original)
>> +++ geronimo/server/trunk/modules/geronimo-kernel/pom.xml Sat Aug
>> 26 15:30:02 2006
>> @@ -31,20 +31,6 @@
>> <artifactId>geronimo-kernel</artifactId>
>> <name>Geronimo :: Kernel</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:http://svn.apache.org/repos/asf/
>> geronimo/server/trunk/modules/kernel</connection>
>> - <developerConnection>scm:svn:https://${maven.username}
>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/kernel</
>> developerConnection>
>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>> kernel</url>
>> - </scm>
>> -
>> <dependencies>
>>
>> <dependency>
>> @@ -76,8 +62,6 @@
>> <groupId>xpp3</groupId>
>> <artifactId>xpp3</artifactId>
>> </dependency>
>> -
>> - <!-- Test Dependencies -->
>>
>> <dependency>
>> <groupId>org.apache.geronimo.specs</groupId>
>>
>> Modified: geronimo/server/trunk/modules/geronimo-mail/pom.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>> geronimo-mail/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/modules/geronimo-mail/pom.xml (original)
>> +++ geronimo/server/trunk/modules/geronimo-mail/pom.xml Sat Aug 26
>> 15:30:02 2006
>> @@ -31,23 +31,7 @@
>> <artifactId>geronimo-mail</artifactId>
>> <name>Geronimo :: Mail</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:http://svn.apache.org/repos/asf/
>> geronimo/server/trunk/modules/mail</connection>
>> - <developerConnection>scm:svn:https://${maven.username}
>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/mail</
>> developerConnection>
>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>> mail</url>
>> - </scm>
>> -
>> <dependencies>
>> -
>> - <!-- Module Dependencies -->
>>
>> <dependency>
>> <groupId>org.apache.geronimo.modules</groupId>
>>
>> Modified: geronimo/server/trunk/modules/geronimo-management/pom.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>> geronimo-management/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/modules/geronimo-management/pom.xml
>> (original)
>> +++ geronimo/server/trunk/modules/geronimo-management/pom.xml Sat
>> Aug 26 15:30:02 2006
>> @@ -31,21 +31,9 @@
>> <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:http://svn.apache.org/repos/asf/
>> geronimo/server/trunk/modules/management</connection>
>> - <developerConnection>scm:svn:https://${maven.username}
>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/
>> management</developerConnection>
>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>> management</url>
>> - </scm>
>> + <description>
>> + Contains interfaces that define the management API for
>> Geronimo.
>> + </description>
>>
>> <dependencies>
>>
>>
>> Modified: geronimo/server/trunk/modules/geronimo-naming-builder/
>> pom.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>> geronimo-naming-builder/pom.xml?
>> rev=437240&r1=437231&r2=437240&view=diff
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/modules/geronimo-naming-builder/pom.xml
>> (original)
>> +++ geronimo/server/trunk/modules/geronimo-naming-builder/pom.xml
>> Sat Aug 26 15:30:02 2006
>> @@ -30,24 +30,9 @@
>>
>> <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:http://svn.apache.org/repos/asf/
>> geronimo/server/trunk/modules/naming-builder</connection>
>> - <developerConnection>scm:svn:https://${maven.username}
>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/naming-
>> builder</developerConnection>
>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>> naming-builder</url>
>> - </scm>
>>
>> <dependencies>
>>
>> - <!-- Module Dependencies -->
>> -
>> <dependency>
>> <groupId>${pom.groupId}</groupId>
>> <artifactId>geronimo-common</artifactId>
>> @@ -95,8 +80,6 @@
>> <artifactId>geronimo-naming</artifactId>
>> <version>${pom.version}</version>
>> </dependency>
>> -
>> - <!-- Spec Dependencies -->
>>
>> <dependency>
>> <groupId>org.apache.geronimo.specs</groupId>
>>
>> Modified: geronimo/server/trunk/modules/geronimo-naming/pom.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>> geronimo-naming/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/modules/geronimo-naming/pom.xml (original)
>> +++ geronimo/server/trunk/modules/geronimo-naming/pom.xml Sat Aug
>> 26 15:30:02 2006
>> @@ -31,20 +31,6 @@
>> <artifactId>geronimo-naming</artifactId>
>> <name>Geronimo :: Naming</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:http://svn.apache.org/repos/asf/
>> geronimo/server/trunk/modules/naming</connection>
>> - <developerConnection>scm:svn:https://${maven.username}
>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/naming</
>> developerConnection>
>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>> naming</url>
>> - </scm>
>> -
>> <dependencies>
>>
>> <dependency>
>>
>> Modified: geronimo/server/trunk/modules/geronimo-security-builder/
>> pom.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>> geronimo-security-builder/pom.xml?
>> rev=437240&r1=437231&r2=437240&view=diff
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/modules/geronimo-security-builder/
>> pom.xml (original)
>> +++ geronimo/server/trunk/modules/geronimo-security-builder/
>> pom.xml Sat Aug 26 15:30:02 2006
>> @@ -31,23 +31,7 @@
>> <artifactId>geronimo-security-builder</artifactId>
>> <name>Geronimo :: Security :: 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:http://svn.apache.org/repos/asf/
>> geronimo/server/trunk/modules/security-builder</connection>
>> - <developerConnection>scm:svn:https://${maven.username}
>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/security-
>> builder</developerConnection>
>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>> security-builder</url>
>> - </scm>
>> -
>> <dependencies>
>> -
>> - <!-- Module Dependencies -->
>>
>> <dependency>
>> <groupId>${pom.groupId}</groupId>
>>
>> Modified: geronimo/server/trunk/modules/geronimo-security/pom.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>> geronimo-security/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/modules/geronimo-security/pom.xml
>> (original)
>> +++ geronimo/server/trunk/modules/geronimo-security/pom.xml Sat
>> Aug 26 15:30:02 2006
>> @@ -31,24 +31,8 @@
>> <artifactId>geronimo-security</artifactId>
>> <name>Geronimo :: Security</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:http://svn.apache.org/repos/asf/
>> geronimo/server/trunk/modules/security</connection>
>> - <developerConnection>scm:svn:https://${maven.username}
>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/security</
>> developerConnection>
>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>> security</url>
>> - </scm>
>> -
>> <dependencies>
>>
>> - <!-- Module Dependencies -->
>> -
>> <dependency>
>> <groupId>org.apache.geronimo.modules</groupId>
>> <artifactId>geronimo-core</artifactId>
>> @@ -84,8 +68,6 @@
>> <artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
>> </dependency>
>>
>> - <!-- Thirdparty Dependencies -->
>> -
>> <dependency>
>> <groupId>activeio</groupId>
>> <artifactId>activeio</artifactId>
>> @@ -95,8 +77,6 @@
>> <groupId>regexp</groupId>
>> <artifactId>regexp</artifactId>
>> </dependency>
>> -
>> - <!-- Test Dependencies -->
>>
>> <dependency>
>> <groupId>hsqldb</groupId>
>>
>> Modified: geronimo/server/trunk/modules/geronimo-service-builder/
>> pom.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>> geronimo-service-builder/pom.xml?
>> rev=437240&r1=437231&r2=437240&view=diff
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/modules/geronimo-service-builder/pom.xml
>> (original)
>> +++ geronimo/server/trunk/modules/geronimo-service-builder/pom.xml
>> Sat Aug 26 15:30:02 2006
>> @@ -29,24 +29,9 @@
>>
>> <artifactId>geronimo-service-builder</artifactId>
>> <name>Geronimo :: Service :: 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:http://svn.apache.org/repos/asf/
>> geronimo/server/trunk/modules/service-builder</connection>
>> - <developerConnection>scm:svn:https://${maven.username}
>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/service-
>> builder</developerConnection>
>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>> service-builder</url>
>> - </scm>
>>
>> <dependencies>
>>
>> - <!-- Module Dependencies -->
>> -
>> <dependency>
>> <groupId>${pom.groupId}</groupId>
>> <artifactId>geronimo-kernel</artifactId>
>> @@ -78,8 +63,6 @@
>> <scope>test</scope>
>> </dependency>
>>
>> - <!-- Thirdparty Dependencies -->
>> -
>> <dependency>
>> <groupId>xmlbeans</groupId>
>> <artifactId>xbean</artifactId>
>>
>> Modified: geronimo/server/trunk/modules/geronimo-system/pom.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>> geronimo-system/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/modules/geronimo-system/pom.xml (original)
>> +++ geronimo/server/trunk/modules/geronimo-system/pom.xml Sat Aug
>> 26 15:30:02 2006
>> @@ -31,24 +31,8 @@
>> <artifactId>geronimo-system</artifactId>
>> <name>Geronimo :: System</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:http://svn.apache.org/repos/asf/
>> geronimo/server/trunk/modules/system</connection>
>> - <developerConnection>scm:svn:https://${maven.username}
>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/system</
>> developerConnection>
>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>> system</url>
>> - </scm>
>> -
>> <dependencies>
>>
>> - <!-- Module Dependencies -->
>> -
>> <dependency>
>> <groupId>org.apache.geronimo.modules</groupId>
>> <artifactId>geronimo-common</artifactId>
>> @@ -67,14 +51,10 @@
>> <version>${pom.version}</version>
>> </dependency>
>>
>> - <!-- Thirdparty Dependencies -->
>> -
>> <dependency>
>> <groupId>concurrent</groupId>
>> <artifactId>concurrent</artifactId>
>> </dependency>
>> -
>> - <!-- Test Dependencies -->
>>
>> <!--
>> NOTE: Need to include Xerces for tests in case Crimson
>> (or another parser)
>>
>> Modified: geronimo/server/trunk/modules/geronimo-test-ddbean/pom.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>> geronimo-test-ddbean/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/modules/geronimo-test-ddbean/pom.xml
>> (original)
>> +++ geronimo/server/trunk/modules/geronimo-test-ddbean/pom.xml Sat
>> Aug 26 15:30:02 2006
>> @@ -31,20 +31,6 @@
>> <artifactId>geronimo-test-ddbean</artifactId>
>> <name>Geronimo :: Test :: DDBeans</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:http://svn.apache.org/repos/asf/
>> geronimo/server/trunk/modules/test-ddbean</connection>
>> - <developerConnection>scm:svn:https://${maven.username}
>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/test-
>> ddbean</developerConnection>
>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>> test-ddbean</url>
>> - </scm>
>> -
>> <dependencies>
>>
>> <dependency>
>>
>> Modified: geronimo/server/trunk/modules/geronimo-testsupport/pom.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>> geronimo-testsupport/pom.xml?rev=437240&r1=437239&r2=437240&view=diff
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/modules/geronimo-testsupport/pom.xml
>> (original)
>> +++ geronimo/server/trunk/modules/geronimo-testsupport/pom.xml Sat
>> Aug 26 15:30:02 2006
>> @@ -47,11 +47,4 @@
>>
>> </dependencies>
>>
>> - <build>
>> - <!--
>> - FIXME: Remove when the default is to use the m2 standard
>> layout
>> - -->
>> - <sourceDirectory>${pom.basedir}/src/main/java</
>> sourceDirectory>
>> - </build>
>> -
>> </project>
>>
>> Modified: geronimo/server/trunk/modules/geronimo-timer/pom.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>> geronimo-timer/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/modules/geronimo-timer/pom.xml (original)
>> +++ geronimo/server/trunk/modules/geronimo-timer/pom.xml Sat Aug
>> 26 15:30:02 2006
>> @@ -31,20 +31,6 @@
>> <artifactId>geronimo-timer</artifactId>
>> <name>Geronimo :: Timer</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:http://svn.apache.org/repos/asf/
>> geronimo/server/trunk/modules/timer</connection>
>> - <developerConnection>scm:svn:https://${maven.username}
>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/timer</
>> developerConnection>
>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>> timer</url>
>> - </scm>
>> -
>> <properties>
>> <!--
>> FIXME: Disable the timer tests for now since they can
>> fail if the host environment
>>
>> Modified: geronimo/server/trunk/modules/geronimo-tomcat-builder/
>> pom.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>> geronimo-tomcat-builder/pom.xml?
>> rev=437240&r1=437231&r2=437240&view=diff
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/modules/geronimo-tomcat-builder/pom.xml
>> (original)
>> +++ geronimo/server/trunk/modules/geronimo-tomcat-builder/pom.xml
>> Sat Aug 26 15:30:02 2006
>> @@ -31,24 +31,8 @@
>> <artifactId>geronimo-tomcat-builder</artifactId>
>> <name>Geronimo :: Tomcat :: 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:http://svn.apache.org/repos/asf/
>> geronimo/server/trunk/modules/tomcat-builder</connection>
>> - <developerConnection>scm:svn:https://${maven.username}
>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/tomcat-
>> builder</developerConnection>
>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>> tomcat-builder</url>
>> - </scm>
>> -
>> <dependencies>
>>
>> - <!-- Module Dependencies -->
>> -
>> <!--<dependency>-->
>> <!--<groupId>${pom.groupId}</groupId>-->
>> <!--<artifactId>geronimo-deployment</artifactId>-->
>> @@ -103,8 +87,6 @@
>> <version>${pom.version}</version>
>> </dependency>
>>
>> - <!-- Thirdparty Dependencies -->
>> -
>> <dependency>
>> <groupId>xmlbeans</groupId>
>> <artifactId>xbean</artifactId>
>> @@ -115,8 +97,6 @@
>> <artifactId>stax-api</artifactId>
>> </dependency>
>>
>> - <!-- Test Dependencies -->
>> -
>> <!--<dependency>-->
>> <!--<groupId>${pom.groupId}</groupId>-->
>> <!--<artifactId>geronimo-axis</artifactId>-->
>> @@ -130,7 +110,7 @@
>> <!--<scope>test</scope>-->
>> <!--</dependency>-->
>>
>> - <!--WFT??? why is this needed for tests all of a sudden? -->
>> + <!-- WFT??? why is this needed for tests all of a sudden?
>> -->
>> <dependency>
>> <groupId>org.apache.geronimo.specs</groupId>
>> <artifactId>geronimo-jsp_2.0_spec</artifactId>
>>
>> Modified: geronimo/server/trunk/modules/geronimo-tomcat/pom.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>> geronimo-tomcat/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/modules/geronimo-tomcat/pom.xml (original)
>> +++ geronimo/server/trunk/modules/geronimo-tomcat/pom.xml Sat Aug
>> 26 15:30:02 2006
>> @@ -31,20 +31,6 @@
>> <artifactId>geronimo-tomcat</artifactId>
>> <name>Geronimo :: Tomcat</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:http://svn.apache.org/repos/asf/
>> geronimo/server/trunk/modules/tomcat</connection>
>> - <developerConnection>scm:svn:https://${maven.username}
>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/tomcat</
>> developerConnection>
>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>> tomcat</url>
>> - </scm>
>> -
>> <properties>
>> <endorsedDir>${project.build.directory}/endorsed</
>> endorsedDir>
>> <localRepoDir>${settings.localRepository}</localRepoDir>
>>
>> Modified: geronimo/server/trunk/modules/geronimo-transaction/pom.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>> geronimo-transaction/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/modules/geronimo-transaction/pom.xml
>> (original)
>> +++ geronimo/server/trunk/modules/geronimo-transaction/pom.xml Sat
>> Aug 26 15:30:02 2006
>> @@ -31,20 +31,6 @@
>> <artifactId>geronimo-transaction</artifactId>
>> <name>Geronimo :: Transaction</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:http://svn.apache.org/repos/asf/
>> geronimo/server/trunk/modules/transaction</connection>
>> - <developerConnection>scm:svn:https://${maven.username}
>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/
>> transaction</developerConnection>
>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>> transaction</url>
>> - </scm>
>> -
>> <dependencies>
>>
>> <!-- temp, for ServerInfo. Remove when it is moved to
>> Kernel-->
>>
>> Modified: geronimo/server/trunk/modules/geronimo-upgrade/pom.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>> geronimo-upgrade/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/modules/geronimo-upgrade/pom.xml (original)
>> +++ geronimo/server/trunk/modules/geronimo-upgrade/pom.xml Sat Aug
>> 26 15:30:02 2006
>> @@ -31,20 +31,6 @@
>> <artifactId>geronimo-upgrade</artifactId>
>> <name>Geronimo :: Upgrade</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:http://svn.apache.org/repos/asf/
>> geronimo/server/trunk/modules/upgrade</connection>
>> - <developerConnection>scm:svn:https://${maven.username}
>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/upgrade</
>> developerConnection>
>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>> upgrade</url>
>> - </scm>
>> -
>> <dependencies>
>>
>> <dependency>
>>
>> Modified: geronimo/server/trunk/modules/geronimo-util/pom.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>> geronimo-util/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/modules/geronimo-util/pom.xml (original)
>> +++ geronimo/server/trunk/modules/geronimo-util/pom.xml Sat Aug 26
>> 15:30:02 2006
>> @@ -31,20 +31,6 @@
>> <artifactId>geronimo-util</artifactId>
>> <name>Geronimo :: Util</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:http://svn.apache.org/repos/asf/
>> geronimo/server/trunk/modules/util</connection>
>> - <developerConnection>scm:svn:https://${maven.username}
>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/util</
>> developerConnection>
>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>> util</url>
>> - </scm>
>> -
>> <dependencies>
>>
>> <dependency>
>>
>> Modified: geronimo/server/trunk/modules/geronimo-web-builder/pom.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>> geronimo-web-builder/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/modules/geronimo-web-builder/pom.xml
>> (original)
>> +++ geronimo/server/trunk/modules/geronimo-web-builder/pom.xml Sat
>> Aug 26 15:30:02 2006
>> @@ -31,24 +31,8 @@
>> <artifactId>geronimo-web-builder</artifactId>
>> <name>Geronimo :: Web :: Builder</name>
>>
>> - <!--
>> -
>> - HACK: Need to explicitly configure SCM for this module since
>> its artifactId
>> - does not match the directory it lives in.
>> -
>> - FIXME: Rename module directory or artifactId.
>> -
>> - -->
>> - <scm>
>> - <connection>scm:svn:http://svn.apache.org/repos/asf/
>> geronimo/server/trunk/modules/web-builder</connection>
>> - <developerConnection>scm:svn:https://${maven.username}
>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/web-
>> builder</developerConnection>
>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>> web-builder</url>
>> - </scm>
>> -
>> <dependencies>
>>
>> - <!-- Module Dependencies -->
>> -
>> <dependency>
>> <groupId>${pom.groupId}</groupId>
>> <artifactId>geronimo-j2ee-builder</artifactId>
>> @@ -87,8 +71,6 @@
>> <version>${pom.version}</version>
>> </dependency>
>>
>> - <!-- Spec Dependencies -->
>> -
>> <dependency>
>> <groupId>org.apache.geronimo.specs</groupId>
>> <artifactId>geronimo-servlet_2.4_spec</artifactId>
>>
>> Modified: geronimo/server/trunk/modules/geronimo-webservices/pom.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>> geronimo-webservices/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/modules/geronimo-webservices/pom.xml
>> (original)
>> +++ geronimo/server/trunk/modules/geronimo-webservices/pom.xml Sat
>> Aug 26 15:30:02 2006
>> @@ -31,20 +31,6 @@
>> <artifactId>geronimo-webservices</artifactId>
>> <name>Geronimo :: Web Services</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:http://svn.apache.org/repos/asf/
>> geronimo/server/trunk/modules/webservices</connection>
>> - <developerConnection>scm:svn:https://${maven.username}
>> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/
>> webservices</developerConnection>
>> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
>> webservices</url>
>> - </scm>
>> -
>> <dependencies>
>>
>> <dependency>
>> @@ -121,6 +107,7 @@
>> <groupId>scout</groupId>
>> <artifactId>scout</artifactId>
>> </dependency>
>> +
>> </dependencies>
>>
>> </project>
>>
>> Modified: geronimo/server/trunk/modules/pom.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>> pom.xml?rev=437240&r1=437239&r2=437240&view=diff
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/modules/pom.xml (original)
>> +++ geronimo/server/trunk/modules/pom.xml Sat Aug 26 15:30:02 2006
>> @@ -35,51 +35,51 @@
>>
>> <modules>
>> <module>geronimo-testsupport</module>
>> - <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>
>> - <module>client-builder</module>
>> - <module>common</module>
>> - <module>connector</module>
>> - <module>connector-builder</module>
>> - <module>converter</module>
>> - <module>core</module>
>> - <module>deploy-config</module>
>> - <module>deploy-jsr88</module>
>> - <module>deploy-tool</module>
>> - <module>deployment</module>
>> - <module>derby</module>
>> - <module>directory</module>
>> - <module>hot-deploy</module>
>> - <module>interceptor</module>
>> - <module>j2ee</module>
>> - <module>j2ee-builder</module>
>> - <module>j2ee-schema</module>
>> - <module>jetty</module>
>> - <module>jetty-builder</module>
>> - <module>jmx-remoting</module>
>> - <module>kernel</module>
>> - <module>mail</module>
>> - <module>management</module>
>> - <module>naming</module>
>> - <module>naming-builder</module>
>> - <module>security</module>
>> - <module>security-builder</module>
>> - <module>service-builder</module>
>> - <module>system</module>
>> - <module>test-ddbean</module>
>> - <module>timer</module>
>> - <module>tomcat</module>
>> - <module>tomcat-builder</module>
>> - <module>transaction</module>
>> - <module>upgrade</module>
>> - <module>util</module>
>> - <module>web-builder</module>
>> - <module>webservices</module>
>> + <module>geronimo-activation</module>
>> + <module>ge-activemq-rar</module>
>> + <module>geronimo-activemq-gbean</module>
>> + <module>geronimo-activemq-gbean-management</module>
>> + <module>geronimo-axis</module>
>> + <module>geronimo-axis-builder</module>
>> + <module>geronimo-client</module>
>> + <module>geronimo-client-builder</module>
>> + <module>geronimo-common</module>
>> + <module>geronimo-connector</module>
>> + <module>geronimo-connector-builder</module>
>> + <module>geronimo-converter</module>
>> + <module>geronimo-core</module>
>> + <module>geronimo-deploy-config</module>
>> + <module>geronimo-deploy-jsr88</module>
>> + <module>geronimo-deploy-tool</module>
>> + <module>geronimo-deployment</module>
>> + <module>geronimo-derby</module>
>> + <module>geronimo-directory</module>
>> + <module>geronimo-hot-deploy</module>
>> + <module>geronimo-interceptor</module>
>> + <module>geronimo-j2ee</module>
>> + <module>geronimo-j2ee-builder</module>
>> + <module>geronimo-j2ee-schema</module>
>> + <module>geronimo-jetty</module>
>> + <module>geronimo-jetty-builder</module>
>> + <module>geronimo-jmx-remoting</module>
>> + <module>geronimo-kernel</module>
>> + <module>geronimo-mail</module>
>> + <module>geronimo-management</module>
>> + <module>geronimo-naming</module>
>> + <module>geronimo-naming-builder</module>
>> + <module>geronimo-security</module>
>> + <module>geronimo-security-builder</module>
>> + <module>geronimo-service-builder</module>
>> + <module>geronimo-system</module>
>> + <module>geronimo-test-ddbean</module>
>> + <module>geronimo-timer</module>
>> + <module>geronimo-tomcat</module>
>> + <module>geronimo-tomcat-builder</module>
>> + <module>geronimo-transaction</module>
>> + <module>geronimo-upgrade</module>
>> + <module>geronimo-util</module>
>> + <module>geronimo-web-builder</module>
>> + <module>geronimo-webservices</module>
>> </modules>
>>
>> </project>
>>
>>
>
>
> -sachin
>
>
-sachin
Re: svn commit: r437240 - in /geronimo/server/trunk/modules: ./ activation/ activemq-embedded-rar/ activemq-gbean-management/ activemq-gbean/ axis-builder/ axis/ client-builder/ client/ common/ connector-builder/ connector/ converter/ core/ deploy-config/ ...
Posted by Sachin Patel <sp...@gmail.com>.
Jason, how can I best merge these changes into the sachin branch
without having my changes wiped out? Using svn merge, since old
source folders are being renamed and the source removed, my files are
being deleted :(, what is the best way for my tree to be updated to
any further new structure changes?
Thanks.
On Aug 26, 2006, at 6:30 PM, jdillon@apache.org wrote:
> Author: jdillon
> Date: Sat Aug 26 15:30:02 2006
> New Revision: 437240
>
> URL: http://svn.apache.org/viewvc?rev=437240&view=rev
> Log:
> (GERONIMO-2162) Use same directory as artifactId for modules/*
>
> Added:
> geronimo/server/trunk/modules/ge-activemq-rar/
> - copied from r437231, geronimo/server/trunk/modules/activemq-
> embedded-rar/
> geronimo/server/trunk/modules/geronimo-activation/
> - copied from r437231, geronimo/server/trunk/modules/activation/
> geronimo/server/trunk/modules/geronimo-activemq-gbean/
> - copied from r437231, geronimo/server/trunk/modules/activemq-
> gbean/
> geronimo/server/trunk/modules/geronimo-activemq-gbean-management/
> - copied from r437231, geronimo/server/trunk/modules/activemq-
> gbean-management/
> geronimo/server/trunk/modules/geronimo-axis/
> - copied from r437231, geronimo/server/trunk/modules/axis/
> geronimo/server/trunk/modules/geronimo-axis-builder/
> - copied from r437231, geronimo/server/trunk/modules/axis-
> builder/
> geronimo/server/trunk/modules/geronimo-client/
> - copied from r437231, geronimo/server/trunk/modules/client/
> geronimo/server/trunk/modules/geronimo-client-builder/
> - copied from r437231, geronimo/server/trunk/modules/client-
> builder/
> geronimo/server/trunk/modules/geronimo-common/
> - copied from r437231, geronimo/server/trunk/modules/common/
> geronimo/server/trunk/modules/geronimo-connector/
> - copied from r437231, geronimo/server/trunk/modules/connector/
> geronimo/server/trunk/modules/geronimo-connector-builder/
> - copied from r437231, geronimo/server/trunk/modules/
> connector-builder/
> geronimo/server/trunk/modules/geronimo-converter/
> - copied from r437231, geronimo/server/trunk/modules/converter/
> geronimo/server/trunk/modules/geronimo-core/
> - copied from r437231, geronimo/server/trunk/modules/core/
> geronimo/server/trunk/modules/geronimo-deploy-config/
> - copied from r437231, geronimo/server/trunk/modules/deploy-
> config/
> geronimo/server/trunk/modules/geronimo-deploy-jsr88/
> - copied from r437231, geronimo/server/trunk/modules/deploy-
> jsr88/
> geronimo/server/trunk/modules/geronimo-deploy-tool/
> - copied from r437231, geronimo/server/trunk/modules/deploy-
> tool/
> geronimo/server/trunk/modules/geronimo-deployment/
> - copied from r437231, geronimo/server/trunk/modules/deployment/
> geronimo/server/trunk/modules/geronimo-derby/
> - copied from r437231, geronimo/server/trunk/modules/derby/
> geronimo/server/trunk/modules/geronimo-directory/
> - copied from r437231, geronimo/server/trunk/modules/directory/
> geronimo/server/trunk/modules/geronimo-hot-deploy/
> - copied from r437231, geronimo/server/trunk/modules/hot-deploy/
> geronimo/server/trunk/modules/geronimo-interceptor/
> - copied from r437231, geronimo/server/trunk/modules/
> interceptor/
> geronimo/server/trunk/modules/geronimo-j2ee/
> - copied from r437231, geronimo/server/trunk/modules/j2ee/
> geronimo/server/trunk/modules/geronimo-j2ee-builder/
> - copied from r437231, geronimo/server/trunk/modules/j2ee-
> builder/
> geronimo/server/trunk/modules/geronimo-j2ee-schema/
> - copied from r437231, geronimo/server/trunk/modules/j2ee-
> schema/
> geronimo/server/trunk/modules/geronimo-jetty/
> - copied from r437231, geronimo/server/trunk/modules/jetty/
> geronimo/server/trunk/modules/geronimo-jetty-builder/
> - copied from r437231, geronimo/server/trunk/modules/jetty-
> builder/
> geronimo/server/trunk/modules/geronimo-jmx-remoting/
> - copied from r437231, geronimo/server/trunk/modules/jmx-
> remoting/
> geronimo/server/trunk/modules/geronimo-kernel/
> - copied from r437231, geronimo/server/trunk/modules/kernel/
> geronimo/server/trunk/modules/geronimo-mail/
> - copied from r437231, geronimo/server/trunk/modules/mail/
> geronimo/server/trunk/modules/geronimo-management/
> - copied from r437231, geronimo/server/trunk/modules/management/
> geronimo/server/trunk/modules/geronimo-naming/
> - copied from r437231, geronimo/server/trunk/modules/naming/
> geronimo/server/trunk/modules/geronimo-naming-builder/
> - copied from r437231, geronimo/server/trunk/modules/naming-
> builder/
> geronimo/server/trunk/modules/geronimo-security/
> - copied from r437231, geronimo/server/trunk/modules/security/
> geronimo/server/trunk/modules/geronimo-security-builder/
> - copied from r437231, geronimo/server/trunk/modules/security-
> builder/
> geronimo/server/trunk/modules/geronimo-service-builder/
> - copied from r437231, geronimo/server/trunk/modules/service-
> builder/
> geronimo/server/trunk/modules/geronimo-system/
> - copied from r437231, geronimo/server/trunk/modules/system/
> geronimo/server/trunk/modules/geronimo-test-ddbean/
> - copied from r437231, geronimo/server/trunk/modules/test-
> ddbean/
> geronimo/server/trunk/modules/geronimo-timer/
> - copied from r437231, geronimo/server/trunk/modules/timer/
> geronimo/server/trunk/modules/geronimo-tomcat/
> - copied from r437231, geronimo/server/trunk/modules/tomcat/
> geronimo/server/trunk/modules/geronimo-tomcat-builder/
> - copied from r437231, geronimo/server/trunk/modules/tomcat-
> builder/
> geronimo/server/trunk/modules/geronimo-transaction/
> - copied from r437231, geronimo/server/trunk/modules/
> transaction/
> geronimo/server/trunk/modules/geronimo-upgrade/
> - copied from r437231, geronimo/server/trunk/modules/upgrade/
> geronimo/server/trunk/modules/geronimo-util/
> - copied from r437231, geronimo/server/trunk/modules/util/
> geronimo/server/trunk/modules/geronimo-web-builder/
> - copied from r437231, geronimo/server/trunk/modules/web-
> builder/
> geronimo/server/trunk/modules/geronimo-webservices/
> - copied from r437231, geronimo/server/trunk/modules/
> webservices/
> Removed:
> geronimo/server/trunk/modules/activation/
> geronimo/server/trunk/modules/activemq-embedded-rar/
> geronimo/server/trunk/modules/activemq-gbean/
> geronimo/server/trunk/modules/activemq-gbean-management/
> geronimo/server/trunk/modules/axis/
> geronimo/server/trunk/modules/axis-builder/
> geronimo/server/trunk/modules/client/
> geronimo/server/trunk/modules/client-builder/
> geronimo/server/trunk/modules/common/
> geronimo/server/trunk/modules/connector/
> geronimo/server/trunk/modules/connector-builder/
> geronimo/server/trunk/modules/converter/
> geronimo/server/trunk/modules/core/
> geronimo/server/trunk/modules/deploy-config/
> geronimo/server/trunk/modules/deploy-jsr88/
> geronimo/server/trunk/modules/deploy-tool/
> geronimo/server/trunk/modules/deployment/
> geronimo/server/trunk/modules/derby/
> geronimo/server/trunk/modules/directory/
> geronimo/server/trunk/modules/hot-deploy/
> geronimo/server/trunk/modules/interceptor/
> geronimo/server/trunk/modules/j2ee/
> geronimo/server/trunk/modules/j2ee-builder/
> geronimo/server/trunk/modules/j2ee-schema/
> geronimo/server/trunk/modules/jetty/
> geronimo/server/trunk/modules/jetty-builder/
> geronimo/server/trunk/modules/jmx-remoting/
> geronimo/server/trunk/modules/kernel/
> geronimo/server/trunk/modules/mail/
> geronimo/server/trunk/modules/management/
> geronimo/server/trunk/modules/naming/
> geronimo/server/trunk/modules/naming-builder/
> geronimo/server/trunk/modules/security/
> geronimo/server/trunk/modules/security-builder/
> geronimo/server/trunk/modules/service-builder/
> geronimo/server/trunk/modules/system/
> geronimo/server/trunk/modules/test-ddbean/
> geronimo/server/trunk/modules/timer/
> geronimo/server/trunk/modules/tomcat/
> geronimo/server/trunk/modules/tomcat-builder/
> geronimo/server/trunk/modules/transaction/
> geronimo/server/trunk/modules/upgrade/
> geronimo/server/trunk/modules/util/
> geronimo/server/trunk/modules/web-builder/
> geronimo/server/trunk/modules/webservices/
> Modified:
> geronimo/server/trunk/modules/ge-activemq-rar/pom.xml
> geronimo/server/trunk/modules/geronimo-activation/pom.xml
> geronimo/server/trunk/modules/geronimo-activemq-gbean-
> management/pom.xml
> geronimo/server/trunk/modules/geronimo-activemq-gbean/pom.xml
> geronimo/server/trunk/modules/geronimo-axis-builder/pom.xml
> geronimo/server/trunk/modules/geronimo-axis/pom.xml
> geronimo/server/trunk/modules/geronimo-client-builder/pom.xml
> geronimo/server/trunk/modules/geronimo-client/pom.xml
> geronimo/server/trunk/modules/geronimo-common/pom.xml
> geronimo/server/trunk/modules/geronimo-connector-builder/pom.xml
> geronimo/server/trunk/modules/geronimo-connector/pom.xml
> geronimo/server/trunk/modules/geronimo-converter/pom.xml
> geronimo/server/trunk/modules/geronimo-core/pom.xml
> geronimo/server/trunk/modules/geronimo-deploy-config/pom.xml
> geronimo/server/trunk/modules/geronimo-deploy-jsr88/pom.xml
> geronimo/server/trunk/modules/geronimo-deploy-tool/pom.xml
> geronimo/server/trunk/modules/geronimo-deployment/pom.xml
> geronimo/server/trunk/modules/geronimo-derby/pom.xml
> geronimo/server/trunk/modules/geronimo-directory/pom.xml
> geronimo/server/trunk/modules/geronimo-hot-deploy/pom.xml
> geronimo/server/trunk/modules/geronimo-interceptor/pom.xml
> geronimo/server/trunk/modules/geronimo-j2ee-builder/pom.xml
> geronimo/server/trunk/modules/geronimo-j2ee-builder/src/java/
> org/apache/geronimo/j2ee/deployment/SecurityBuilder.java
> geronimo/server/trunk/modules/geronimo-j2ee-schema/pom.xml
> geronimo/server/trunk/modules/geronimo-j2ee/pom.xml
> geronimo/server/trunk/modules/geronimo-jetty-builder/pom.xml
> geronimo/server/trunk/modules/geronimo-jetty/pom.xml
> geronimo/server/trunk/modules/geronimo-jmx-remoting/pom.xml
> geronimo/server/trunk/modules/geronimo-kernel/pom.xml
> geronimo/server/trunk/modules/geronimo-mail/pom.xml
> geronimo/server/trunk/modules/geronimo-management/pom.xml
> geronimo/server/trunk/modules/geronimo-naming-builder/pom.xml
> geronimo/server/trunk/modules/geronimo-naming/pom.xml
> geronimo/server/trunk/modules/geronimo-security-builder/pom.xml
> geronimo/server/trunk/modules/geronimo-security/pom.xml
> geronimo/server/trunk/modules/geronimo-service-builder/pom.xml
> geronimo/server/trunk/modules/geronimo-system/pom.xml
> geronimo/server/trunk/modules/geronimo-test-ddbean/pom.xml
> geronimo/server/trunk/modules/geronimo-testsupport/pom.xml
> geronimo/server/trunk/modules/geronimo-timer/pom.xml
> geronimo/server/trunk/modules/geronimo-tomcat-builder/pom.xml
> geronimo/server/trunk/modules/geronimo-tomcat/pom.xml
> geronimo/server/trunk/modules/geronimo-transaction/pom.xml
> geronimo/server/trunk/modules/geronimo-upgrade/pom.xml
> geronimo/server/trunk/modules/geronimo-util/pom.xml
> geronimo/server/trunk/modules/geronimo-web-builder/pom.xml
> geronimo/server/trunk/modules/geronimo-webservices/pom.xml
> geronimo/server/trunk/modules/pom.xml
>
> Modified: geronimo/server/trunk/modules/ge-activemq-rar/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/ge-
> activemq-rar/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
> ======================================================================
> ========
> --- geronimo/server/trunk/modules/ge-activemq-rar/pom.xml (original)
> +++ geronimo/server/trunk/modules/ge-activemq-rar/pom.xml Sat Aug
> 26 15:30:02 2006
> @@ -33,20 +33,6 @@
> <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:http://svn.apache.org/repos/asf/
> geronimo/server/trunk/modules/activemq-embedded-rar</connection>
> - <developerConnection>scm:svn:https://${maven.username}
> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/activemq-
> embedded-rar</developerConnection>
> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
> activemq-embedded-rar</url>
> - </scm>
> -
> <dependencies>
>
> <dependency>
>
> Modified: geronimo/server/trunk/modules/geronimo-activation/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
> geronimo-activation/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
> ======================================================================
> ========
> --- geronimo/server/trunk/modules/geronimo-activation/pom.xml
> (original)
> +++ geronimo/server/trunk/modules/geronimo-activation/pom.xml Sat
> Aug 26 15:30:02 2006
> @@ -36,20 +36,6 @@
> 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:http://svn.apache.org/repos/asf/
> geronimo/server/trunk/modules/activation</connection>
> - <developerConnection>scm:svn:https://${maven.username}
> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/activation</
> developerConnection>
> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
> activation</url>
> - </scm>
> -
> <dependencies>
>
> <dependency>
>
> Modified: geronimo/server/trunk/modules/geronimo-activemq-gbean-
> management/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
> geronimo-activemq-gbean-management/pom.xml?
> rev=437240&r1=437231&r2=437240&view=diff
> ======================================================================
> ========
> --- geronimo/server/trunk/modules/geronimo-activemq-gbean-
> management/pom.xml (original)
> +++ geronimo/server/trunk/modules/geronimo-activemq-gbean-
> management/pom.xml Sat Aug 26 15:30:02 2006
> @@ -31,24 +31,6 @@
> <artifactId>geronimo-activemq-gbean-management</artifactId>
> <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:http://svn.apache.org/repos/asf/
> geronimo/server/trunk/modules/activemq-gbean-management</connection>
> - <developerConnection>scm:svn:https://${maven.username}
> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/activemq-
> gbean-management</developerConnection>
> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
> activemq-gbean-management</url>
> - </scm>
> -
> <dependencies>
>
> <dependency>
>
> Modified: geronimo/server/trunk/modules/geronimo-activemq-gbean/
> pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
> geronimo-activemq-gbean/pom.xml?
> rev=437240&r1=437231&r2=437240&view=diff
> ======================================================================
> ========
> --- geronimo/server/trunk/modules/geronimo-activemq-gbean/pom.xml
> (original)
> +++ geronimo/server/trunk/modules/geronimo-activemq-gbean/pom.xml
> Sat Aug 26 15:30:02 2006
> @@ -31,24 +31,6 @@
> <artifactId>geronimo-activemq-gbean</artifactId>
> <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:http://svn.apache.org/repos/asf/
> geronimo/server/trunk/modules/activemq-gbean</connection>
> - <developerConnection>scm:svn:https://${maven.username}
> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/activemq-
> gbean</developerConnection>
> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
> activemq-gbean</url>
> - </scm>
> -
> <dependencies>
>
> <dependency>
>
> Modified: geronimo/server/trunk/modules/geronimo-axis-builder/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
> geronimo-axis-builder/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
> ======================================================================
> ========
> --- geronimo/server/trunk/modules/geronimo-axis-builder/pom.xml
> (original)
> +++ geronimo/server/trunk/modules/geronimo-axis-builder/pom.xml Sat
> Aug 26 15:30:02 2006
> @@ -31,24 +31,8 @@
> <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:http://svn.apache.org/repos/asf/
> geronimo/server/trunk/modules/axis-builder</connection>
> - <developerConnection>scm:svn:https://${maven.username}
> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/axis-
> builder</developerConnection>
> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
> axis-builder</url>
> - </scm>
> -
> <dependencies>
>
> - <!-- Module Dependencies -->
> -
> <dependency>
> <groupId>${pom.groupId}</groupId>
> <artifactId>geronimo-axis</artifactId>
> @@ -85,8 +69,6 @@
> <version>${pom.version}</version>
> </dependency>
>
> - <!-- Spec Dependencies -->
> -
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
> @@ -101,8 +83,6 @@
> <groupId>org.apache.geronimo.specs</groupId>
> <artifactId>geronimo-qname_1.1_spec</artifactId>
> </dependency>
> -
> - <!-- Thirdparty Dependencies -->
>
> <dependency>
> <groupId>asm</groupId>
>
> Modified: geronimo/server/trunk/modules/geronimo-axis/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
> geronimo-axis/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
> ======================================================================
> ========
> --- geronimo/server/trunk/modules/geronimo-axis/pom.xml (original)
> +++ geronimo/server/trunk/modules/geronimo-axis/pom.xml Sat Aug 26
> 15:30:02 2006
> @@ -31,21 +31,6 @@
> <artifactId>geronimo-axis</artifactId>
> <packaging>jar</packaging>
> <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:http://svn.apache.org/repos/asf/
> geronimo/server/trunk/modules/axis</connection>
> - <developerConnection>scm:svn:https://${maven.username}
> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/axis</
> developerConnection>
> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
> axis</url>
> - </scm>
>
> <dependencies>
>
>
> Modified: geronimo/server/trunk/modules/geronimo-client-builder/
> pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
> geronimo-client-builder/pom.xml?
> rev=437240&r1=437231&r2=437240&view=diff
> ======================================================================
> ========
> --- geronimo/server/trunk/modules/geronimo-client-builder/pom.xml
> (original)
> +++ geronimo/server/trunk/modules/geronimo-client-builder/pom.xml
> Sat Aug 26 15:30:02 2006
> @@ -31,23 +31,7 @@
> <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:http://svn.apache.org/repos/asf/
> geronimo/server/trunk/modules/client-builder</connection>
> - <developerConnection>scm:svn:https://${maven.username}
> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/client-
> builder</developerConnection>
> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
> client-builder</url>
> - </scm>
> -
> <dependencies>
> -
> - <!-- Module Dependencies -->
>
> <dependency>
> <groupId>${pom.groupId}</groupId>
>
> Modified: geronimo/server/trunk/modules/geronimo-client/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
> geronimo-client/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
> ======================================================================
> ========
> --- geronimo/server/trunk/modules/geronimo-client/pom.xml (original)
> +++ geronimo/server/trunk/modules/geronimo-client/pom.xml Sat Aug
> 26 15:30:02 2006
> @@ -31,20 +31,6 @@
> <artifactId>geronimo-client</artifactId>
> <name>Geronimo :: Client</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:http://svn.apache.org/repos/asf/
> geronimo/server/trunk/modules/client</connection>
> - <developerConnection>scm:svn:https://${maven.username}
> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/client</
> developerConnection>
> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
> client</url>
> - </scm>
> -
> <dependencies>
>
> <dependency>
>
> Modified: geronimo/server/trunk/modules/geronimo-common/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
> geronimo-common/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
> ======================================================================
> ========
> --- geronimo/server/trunk/modules/geronimo-common/pom.xml (original)
> +++ geronimo/server/trunk/modules/geronimo-common/pom.xml Sat Aug
> 26 15:30:02 2006
> @@ -31,20 +31,6 @@
> <artifactId>geronimo-common</artifactId>
> <name>Geronimo :: Common</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:http://svn.apache.org/repos/asf/
> geronimo/server/trunk/modules/common</connection>
> - <developerConnection>scm:svn:https://${maven.username}
> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/common</
> developerConnection>
> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
> common</url>
> - </scm>
> -
> <dependencies>
>
> <dependency>
>
> Modified: geronimo/server/trunk/modules/geronimo-connector-builder/
> pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
> geronimo-connector-builder/pom.xml?
> rev=437240&r1=437231&r2=437240&view=diff
> ======================================================================
> ========
> --- geronimo/server/trunk/modules/geronimo-connector-builder/
> pom.xml (original)
> +++ geronimo/server/trunk/modules/geronimo-connector-builder/
> pom.xml Sat Aug 26 15:30:02 2006
> @@ -31,24 +31,8 @@
> <artifactId>geronimo-connector-builder</artifactId>
> <name>Geronimo :: Connector :: 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:http://svn.apache.org/repos/asf/
> geronimo/server/trunk/modules/connector-builder</connection>
> - <developerConnection>scm:svn:https://${maven.username}
> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/connector-
> builder</developerConnection>
> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
> connector-builder</url>
> - </scm>
> -
> <dependencies>
>
> - <!-- Module Dependencies -->
> -
> <dependency>
> <groupId>${pom.groupId}</groupId>
> <artifactId>geronimo-connector</artifactId>
> @@ -72,8 +56,6 @@
> <artifactId>geronimo-test-ddbean</artifactId>
> <version>${pom.version}</version>
> </dependency>
> -
> - <!-- Thirdparty Dependencies -->
>
> <dependency>
> <groupId>tranql</groupId>
>
> Modified: geronimo/server/trunk/modules/geronimo-connector/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
> geronimo-connector/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
> ======================================================================
> ========
> --- geronimo/server/trunk/modules/geronimo-connector/pom.xml
> (original)
> +++ geronimo/server/trunk/modules/geronimo-connector/pom.xml Sat
> Aug 26 15:30:02 2006
> @@ -31,20 +31,6 @@
> <artifactId>geronimo-connector</artifactId>
> <name>Geronimo :: Connector</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:http://svn.apache.org/repos/asf/
> geronimo/server/trunk/modules/connector</connection>
> - <developerConnection>scm:svn:https://${maven.username}
> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/connector</
> developerConnection>
> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
> connector</url>
> - </scm>
> -
> <dependencies>
>
> <dependency>
>
> Modified: geronimo/server/trunk/modules/geronimo-converter/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
> geronimo-converter/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
> ======================================================================
> ========
> --- geronimo/server/trunk/modules/geronimo-converter/pom.xml
> (original)
> +++ geronimo/server/trunk/modules/geronimo-converter/pom.xml Sat
> Aug 26 15:30:02 2006
> @@ -31,20 +31,6 @@
> <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:http://svn.apache.org/repos/asf/
> geronimo/server/trunk/modules/converter</connection>
> - <developerConnection>scm:svn:https://${maven.username}
> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/converter</
> developerConnection>
> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
> converter</url>
> - </scm>
> -
> <dependencies>
>
> <dependency>
>
> Modified: geronimo/server/trunk/modules/geronimo-core/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
> geronimo-core/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
> ======================================================================
> ========
> --- geronimo/server/trunk/modules/geronimo-core/pom.xml (original)
> +++ geronimo/server/trunk/modules/geronimo-core/pom.xml Sat Aug 26
> 15:30:02 2006
> @@ -31,20 +31,6 @@
> <artifactId>geronimo-core</artifactId>
> <name>Geronimo :: Core</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:http://svn.apache.org/repos/asf/
> geronimo/server/trunk/modules/core</connection>
> - <developerConnection>scm:svn:https://${maven.username}
> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/core</
> developerConnection>
> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
> core</url>
> - </scm>
> -
> <dependencies>
>
> <dependency>
>
> Modified: geronimo/server/trunk/modules/geronimo-deploy-config/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
> geronimo-deploy-config/pom.xml?
> rev=437240&r1=437231&r2=437240&view=diff
> ======================================================================
> ========
> --- geronimo/server/trunk/modules/geronimo-deploy-config/pom.xml
> (original)
> +++ geronimo/server/trunk/modules/geronimo-deploy-config/pom.xml
> Sat Aug 26 15:30:02 2006
> @@ -30,27 +30,12 @@
>
> <artifactId>geronimo-deploy-config</artifactId>
> <name>Geronimo :: Deploy :: Common Config</name>
> - <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:http://svn.apache.org/repos/asf/
> geronimo/server/trunk/modules/deploy-config</connection>
> - <developerConnection>scm:svn:https://${maven.username}
> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/deploy-
> config</developerConnection>
> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
> deploy-config</url>
> - </scm>
>
> <dependencies>
>
>
> Modified: geronimo/server/trunk/modules/geronimo-deploy-jsr88/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
> geronimo-deploy-jsr88/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
> ======================================================================
> ========
> --- geronimo/server/trunk/modules/geronimo-deploy-jsr88/pom.xml
> (original)
> +++ geronimo/server/trunk/modules/geronimo-deploy-jsr88/pom.xml Sat
> Aug 26 15:30:02 2006
> @@ -30,26 +30,9 @@
>
> <artifactId>geronimo-deploy-jsr88</artifactId>
> <name>Geronimo :: Deploy :: JSR-88</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:http://svn.apache.org/repos/asf/
> geronimo/server/trunk/modules/deploy-jsr88</connection>
> - <developerConnection>scm:svn:https://${maven.username}
> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/deploy-
> jsr88</developerConnection>
> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
> deploy-jsr88</url>
> - </scm>
>
> <dependencies>
>
> - <!-- Module Dependencies -->
> -
> <dependency>
> <groupId>org.apache.geronimo.modules</groupId>
> <artifactId>geronimo-system</artifactId>
> @@ -80,8 +63,6 @@
> <groupId>org.apache.geronimo.specs</groupId>
> <artifactId>geronimo-j2ee-deployment_1.1_spec</
> artifactId>
> </dependency>
> -
> - <!-- Thirdparty Dependencies -->
>
> <dependency>
> <groupId>mx4j</groupId>
>
> Modified: geronimo/server/trunk/modules/geronimo-deploy-tool/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
> geronimo-deploy-tool/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
> ======================================================================
> ========
> --- geronimo/server/trunk/modules/geronimo-deploy-tool/pom.xml
> (original)
> +++ geronimo/server/trunk/modules/geronimo-deploy-tool/pom.xml Sat
> Aug 26 15:30:02 2006
> @@ -31,20 +31,6 @@
> <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:http://svn.apache.org/repos/asf/
> geronimo/server/trunk/modules/deploy-tool</connection>
> - <developerConnection>scm:svn:https://${maven.username}
> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/deploy-
> tool</developerConnection>
> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
> deploy-tool</url>
> - </scm>
> -
> <dependencies>
>
> <dependency>
> @@ -82,8 +68,6 @@
> <version>${pom.version}</version>
> </dependency>
>
> - <!-- Thirdparty Dependencies -->
> -
> <dependency>
> <groupId>jline</groupId>
> <artifactId>jline</artifactId>
>
> Modified: geronimo/server/trunk/modules/geronimo-deployment/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
> geronimo-deployment/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
> ======================================================================
> ========
> --- geronimo/server/trunk/modules/geronimo-deployment/pom.xml
> (original)
> +++ geronimo/server/trunk/modules/geronimo-deployment/pom.xml Sat
> Aug 26 15:30:02 2006
> @@ -31,31 +31,13 @@
> <artifactId>geronimo-deployment</artifactId>
> <name>Geronimo :: Deployment</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:http://svn.apache.org/repos/asf/
> geronimo/server/trunk/modules/deployment</connection>
> - <developerConnection>scm:svn:https://${maven.username}
> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/deployment</
> developerConnection>
> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
> deployment</url>
> - </scm>
> -
> <dependencies>
>
> - <!-- Module Dependencies -->
> -
> <dependency>
> <groupId>org.apache.geronimo.modules</groupId>
> <artifactId>geronimo-system</artifactId>
> <version>${pom.version}</version>
> </dependency>
> -
> - <!-- Thirdparty Dependencies -->
>
> <dependency>
> <groupId>xmlbeans</groupId>
>
> Modified: geronimo/server/trunk/modules/geronimo-derby/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
> geronimo-derby/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
> ======================================================================
> ========
> --- geronimo/server/trunk/modules/geronimo-derby/pom.xml (original)
> +++ geronimo/server/trunk/modules/geronimo-derby/pom.xml Sat Aug 26
> 15:30:02 2006
> @@ -33,20 +33,6 @@
>
> <description>Wrapper for using Apache Derby as a bundled
> database.</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:http://svn.apache.org/repos/asf/
> geronimo/server/trunk/modules/derby</connection>
> - <developerConnection>scm:svn:https://${maven.username}
> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/derby</
> developerConnection>
> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
> derby</url>
> - </scm>
> -
> <dependencies>
>
> <dependency>
>
> Modified: geronimo/server/trunk/modules/geronimo-directory/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
> geronimo-directory/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
> ======================================================================
> ========
> --- geronimo/server/trunk/modules/geronimo-directory/pom.xml
> (original)
> +++ geronimo/server/trunk/modules/geronimo-directory/pom.xml Sat
> Aug 26 15:30:02 2006
> @@ -31,31 +31,13 @@
> <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:http://svn.apache.org/repos/asf/
> geronimo/server/trunk/modules/directory</connection>
> - <developerConnection>scm:svn:https://${maven.username}
> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/directory</
> developerConnection>
> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
> directory</url>
> - </scm>
> -
> <dependencies>
>
> - <!-- Module Dependencies -->
> -
> <dependency>
> <groupId>${pom.groupId}</groupId>
> <artifactId>geronimo-system</artifactId>
> <version>${pom.version}</version>
> </dependency>
> -
> - <!-- Thirdparty Dependencies -->
>
> <dependency>
> <groupId>regexp</groupId>
>
> Modified: geronimo/server/trunk/modules/geronimo-hot-deploy/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
> geronimo-hot-deploy/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
> ======================================================================
> ========
> --- geronimo/server/trunk/modules/geronimo-hot-deploy/pom.xml
> (original)
> +++ geronimo/server/trunk/modules/geronimo-hot-deploy/pom.xml Sat
> Aug 26 15:30:02 2006
> @@ -31,21 +31,7 @@
> <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:http://svn.apache.org/repos/asf/
> geronimo/server/trunk/modules/hot-deploy</connection>
> - <developerConnection>scm:svn:https://${maven.username}
> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/hot-deploy</
> developerConnection>
> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
> hot-deploy</url>
> - </scm>
> + <description>Provides hot deployment for Geronimo.</description>
>
> <dependencies>
>
>
> Modified: geronimo/server/trunk/modules/geronimo-interceptor/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
> geronimo-interceptor/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
> ======================================================================
> ========
> --- geronimo/server/trunk/modules/geronimo-interceptor/pom.xml
> (original)
> +++ geronimo/server/trunk/modules/geronimo-interceptor/pom.xml Sat
> Aug 26 15:30:02 2006
> @@ -30,20 +30,5 @@
>
> <artifactId>geronimo-interceptor</artifactId>
> <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:http://svn.apache.org/repos/asf/
> geronimo/server/trunk/modules/interceptor</connection>
> - <developerConnection>scm:svn:https://${maven.username}
> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/
> interceptor</developerConnection>
> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
> interceptor</url>
> - </scm>
>
> </project>
>
> Modified: geronimo/server/trunk/modules/geronimo-j2ee-builder/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
> geronimo-j2ee-builder/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
> ======================================================================
> ========
> --- geronimo/server/trunk/modules/geronimo-j2ee-builder/pom.xml
> (original)
> +++ geronimo/server/trunk/modules/geronimo-j2ee-builder/pom.xml Sat
> Aug 26 15:30:02 2006
> @@ -31,23 +31,7 @@
> <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:http://svn.apache.org/repos/asf/
> geronimo/server/trunk/modules/j2ee-builder</connection>
> - <developerConnection>scm:svn:https://${maven.username}
> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/j2ee-
> builder</developerConnection>
> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
> j2ee-builder</url>
> - </scm>
> -
> <dependencies>
> -
> - <!-- Module Dependencies -->
>
> <dependency>
> <groupId>${pom.groupId}</groupId>
>
> Modified: geronimo/server/trunk/modules/geronimo-j2ee-builder/src/
> java/org/apache/geronimo/j2ee/deployment/SecurityBuilder.java
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
> geronimo-j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/
> SecurityBuilder.java?rev=437240&r1=437231&r2=437240&view=diff
> ======================================================================
> ========
> --- geronimo/server/trunk/modules/geronimo-j2ee-builder/src/java/
> org/apache/geronimo/j2ee/deployment/SecurityBuilder.java (original)
> +++ geronimo/server/trunk/modules/geronimo-j2ee-builder/src/java/
> org/apache/geronimo/j2ee/deployment/SecurityBuilder.java Sat Aug 26
> 15:30:02 2006
> @@ -23,7 +23,7 @@
> import org.apache.xmlbeans.XmlObject;
>
> /**
> - * @version $Rev:$ $Date:$
> + * @version $Rev$ $Date$
> */
> public interface SecurityBuilder extends NamespaceDrivenBuilder {
>
>
> Modified: geronimo/server/trunk/modules/geronimo-j2ee-schema/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
> geronimo-j2ee-schema/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
> ======================================================================
> ========
> --- geronimo/server/trunk/modules/geronimo-j2ee-schema/pom.xml
> (original)
> +++ geronimo/server/trunk/modules/geronimo-j2ee-schema/pom.xml Sat
> Aug 26 15:30:02 2006
> @@ -31,20 +31,6 @@
> <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:http://svn.apache.org/repos/asf/
> geronimo/server/trunk/modules/j2ee-schema</connection>
> - <developerConnection>scm:svn:https://${maven.username}
> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/j2ee-
> schema</developerConnection>
> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
> j2ee-schema</url>
> - </scm>
> -
> <dependencies>
>
> <!-- might not be necessary -->
> @@ -80,10 +66,10 @@
> https://svn.apache.org/repos/tck/geronimo-tck/schema/
> j2ee14
> -->
> <dependency>
> - <groupId>org.apache.geronimo.schema</groupId>
> - <artifactId>geronimo-schema-j2ee1.4</artifactId>
> - <version>1.0-SNAPSHOT</version>
> - </dependency>
> + <groupId>org.apache.geronimo.schema</groupId>
> + <artifactId>geronimo-schema-j2ee1.4</artifactId>
> + <version>1.0-SNAPSHOT</version>
> + </dependency>
>
> </dependencies>
>
>
> Modified: geronimo/server/trunk/modules/geronimo-j2ee/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
> geronimo-j2ee/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
> ======================================================================
> ========
> --- geronimo/server/trunk/modules/geronimo-j2ee/pom.xml (original)
> +++ geronimo/server/trunk/modules/geronimo-j2ee/pom.xml Sat Aug 26
> 15:30:02 2006
> @@ -31,20 +31,6 @@
> <artifactId>geronimo-j2ee</artifactId>
> <name>Geronimo :: J2EE</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:http://svn.apache.org/repos/asf/
> geronimo/server/trunk/modules/j2ee</connection>
> - <developerConnection>scm:svn:https://${maven.username}
> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/j2ee</
> developerConnection>
> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
> j2ee</url>
> - </scm>
> -
> <dependencies>
>
> <dependency>
>
> Modified: geronimo/server/trunk/modules/geronimo-jetty-builder/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
> geronimo-jetty-builder/pom.xml?
> rev=437240&r1=437231&r2=437240&view=diff
> ======================================================================
> ========
> --- geronimo/server/trunk/modules/geronimo-jetty-builder/pom.xml
> (original)
> +++ geronimo/server/trunk/modules/geronimo-jetty-builder/pom.xml
> Sat Aug 26 15:30:02 2006
> @@ -31,23 +31,7 @@
> <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:http://svn.apache.org/repos/asf/
> geronimo/server/trunk/modules/jetty-builder</connection>
> - <developerConnection>scm:svn:https://${maven.username}
> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/jetty-
> builder</developerConnection>
> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
> jetty-builder</url>
> - </scm>
> -
> <dependencies>
> -
> - <!-- Module Dependencies -->
>
> <dependency>
> <groupId>${pom.groupId}</groupId>
>
> Modified: geronimo/server/trunk/modules/geronimo-jetty/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
> geronimo-jetty/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
> ======================================================================
> ========
> --- geronimo/server/trunk/modules/geronimo-jetty/pom.xml (original)
> +++ geronimo/server/trunk/modules/geronimo-jetty/pom.xml Sat Aug 26
> 15:30:02 2006
> @@ -31,20 +31,6 @@
> <artifactId>geronimo-jetty</artifactId>
> <name>Geronimo :: Jetty</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:http://svn.apache.org/repos/asf/
> geronimo/server/trunk/modules/jetty</connection>
> - <developerConnection>scm:svn:https://${maven.username}
> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/jetty</
> developerConnection>
> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
> jetty</url>
> - </scm>
> -
> <dependencies>
>
> <dependency>
>
> Modified: geronimo/server/trunk/modules/geronimo-jmx-remoting/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
> geronimo-jmx-remoting/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
> ======================================================================
> ========
> --- geronimo/server/trunk/modules/geronimo-jmx-remoting/pom.xml
> (original)
> +++ geronimo/server/trunk/modules/geronimo-jmx-remoting/pom.xml Sat
> Aug 26 15:30:02 2006
> @@ -31,21 +31,9 @@
> <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:http://svn.apache.org/repos/asf/
> geronimo/server/trunk/modules/jmx-remoting</connection>
> - <developerConnection>scm:svn:https://${maven.username}
> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/jmx-
> remoting</developerConnection>
> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
> jmx-remoting</url>
> - </scm>
> + <description>
> + Provides remote access to a Geronimo server using JSR 160
> JMX Remoting.
> + </description>
>
> <dependencies>
>
>
> Modified: geronimo/server/trunk/modules/geronimo-kernel/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
> geronimo-kernel/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
> ======================================================================
> ========
> --- geronimo/server/trunk/modules/geronimo-kernel/pom.xml (original)
> +++ geronimo/server/trunk/modules/geronimo-kernel/pom.xml Sat Aug
> 26 15:30:02 2006
> @@ -31,20 +31,6 @@
> <artifactId>geronimo-kernel</artifactId>
> <name>Geronimo :: Kernel</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:http://svn.apache.org/repos/asf/
> geronimo/server/trunk/modules/kernel</connection>
> - <developerConnection>scm:svn:https://${maven.username}
> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/kernel</
> developerConnection>
> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
> kernel</url>
> - </scm>
> -
> <dependencies>
>
> <dependency>
> @@ -76,8 +62,6 @@
> <groupId>xpp3</groupId>
> <artifactId>xpp3</artifactId>
> </dependency>
> -
> - <!-- Test Dependencies -->
>
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
>
> Modified: geronimo/server/trunk/modules/geronimo-mail/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
> geronimo-mail/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
> ======================================================================
> ========
> --- geronimo/server/trunk/modules/geronimo-mail/pom.xml (original)
> +++ geronimo/server/trunk/modules/geronimo-mail/pom.xml Sat Aug 26
> 15:30:02 2006
> @@ -31,23 +31,7 @@
> <artifactId>geronimo-mail</artifactId>
> <name>Geronimo :: Mail</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:http://svn.apache.org/repos/asf/
> geronimo/server/trunk/modules/mail</connection>
> - <developerConnection>scm:svn:https://${maven.username}
> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/mail</
> developerConnection>
> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
> mail</url>
> - </scm>
> -
> <dependencies>
> -
> - <!-- Module Dependencies -->
>
> <dependency>
> <groupId>org.apache.geronimo.modules</groupId>
>
> Modified: geronimo/server/trunk/modules/geronimo-management/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
> geronimo-management/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
> ======================================================================
> ========
> --- geronimo/server/trunk/modules/geronimo-management/pom.xml
> (original)
> +++ geronimo/server/trunk/modules/geronimo-management/pom.xml Sat
> Aug 26 15:30:02 2006
> @@ -31,21 +31,9 @@
> <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:http://svn.apache.org/repos/asf/
> geronimo/server/trunk/modules/management</connection>
> - <developerConnection>scm:svn:https://${maven.username}
> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/management</
> developerConnection>
> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
> management</url>
> - </scm>
> + <description>
> + Contains interfaces that define the management API for
> Geronimo.
> + </description>
>
> <dependencies>
>
>
> Modified: geronimo/server/trunk/modules/geronimo-naming-builder/
> pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
> geronimo-naming-builder/pom.xml?
> rev=437240&r1=437231&r2=437240&view=diff
> ======================================================================
> ========
> --- geronimo/server/trunk/modules/geronimo-naming-builder/pom.xml
> (original)
> +++ geronimo/server/trunk/modules/geronimo-naming-builder/pom.xml
> Sat Aug 26 15:30:02 2006
> @@ -30,24 +30,9 @@
>
> <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:http://svn.apache.org/repos/asf/
> geronimo/server/trunk/modules/naming-builder</connection>
> - <developerConnection>scm:svn:https://${maven.username}
> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/naming-
> builder</developerConnection>
> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
> naming-builder</url>
> - </scm>
>
> <dependencies>
>
> - <!-- Module Dependencies -->
> -
> <dependency>
> <groupId>${pom.groupId}</groupId>
> <artifactId>geronimo-common</artifactId>
> @@ -95,8 +80,6 @@
> <artifactId>geronimo-naming</artifactId>
> <version>${pom.version}</version>
> </dependency>
> -
> - <!-- Spec Dependencies -->
>
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
>
> Modified: geronimo/server/trunk/modules/geronimo-naming/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
> geronimo-naming/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
> ======================================================================
> ========
> --- geronimo/server/trunk/modules/geronimo-naming/pom.xml (original)
> +++ geronimo/server/trunk/modules/geronimo-naming/pom.xml Sat Aug
> 26 15:30:02 2006
> @@ -31,20 +31,6 @@
> <artifactId>geronimo-naming</artifactId>
> <name>Geronimo :: Naming</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:http://svn.apache.org/repos/asf/
> geronimo/server/trunk/modules/naming</connection>
> - <developerConnection>scm:svn:https://${maven.username}
> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/naming</
> developerConnection>
> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
> naming</url>
> - </scm>
> -
> <dependencies>
>
> <dependency>
>
> Modified: geronimo/server/trunk/modules/geronimo-security-builder/
> pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
> geronimo-security-builder/pom.xml?
> rev=437240&r1=437231&r2=437240&view=diff
> ======================================================================
> ========
> --- geronimo/server/trunk/modules/geronimo-security-builder/pom.xml
> (original)
> +++ geronimo/server/trunk/modules/geronimo-security-builder/pom.xml
> Sat Aug 26 15:30:02 2006
> @@ -31,23 +31,7 @@
> <artifactId>geronimo-security-builder</artifactId>
> <name>Geronimo :: Security :: 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:http://svn.apache.org/repos/asf/
> geronimo/server/trunk/modules/security-builder</connection>
> - <developerConnection>scm:svn:https://${maven.username}
> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/security-
> builder</developerConnection>
> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
> security-builder</url>
> - </scm>
> -
> <dependencies>
> -
> - <!-- Module Dependencies -->
>
> <dependency>
> <groupId>${pom.groupId}</groupId>
>
> Modified: geronimo/server/trunk/modules/geronimo-security/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
> geronimo-security/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
> ======================================================================
> ========
> --- geronimo/server/trunk/modules/geronimo-security/pom.xml (original)
> +++ geronimo/server/trunk/modules/geronimo-security/pom.xml Sat Aug
> 26 15:30:02 2006
> @@ -31,24 +31,8 @@
> <artifactId>geronimo-security</artifactId>
> <name>Geronimo :: Security</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:http://svn.apache.org/repos/asf/
> geronimo/server/trunk/modules/security</connection>
> - <developerConnection>scm:svn:https://${maven.username}
> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/security</
> developerConnection>
> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
> security</url>
> - </scm>
> -
> <dependencies>
>
> - <!-- Module Dependencies -->
> -
> <dependency>
> <groupId>org.apache.geronimo.modules</groupId>
> <artifactId>geronimo-core</artifactId>
> @@ -84,8 +68,6 @@
> <artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
> </dependency>
>
> - <!-- Thirdparty Dependencies -->
> -
> <dependency>
> <groupId>activeio</groupId>
> <artifactId>activeio</artifactId>
> @@ -95,8 +77,6 @@
> <groupId>regexp</groupId>
> <artifactId>regexp</artifactId>
> </dependency>
> -
> - <!-- Test Dependencies -->
>
> <dependency>
> <groupId>hsqldb</groupId>
>
> Modified: geronimo/server/trunk/modules/geronimo-service-builder/
> pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
> geronimo-service-builder/pom.xml?
> rev=437240&r1=437231&r2=437240&view=diff
> ======================================================================
> ========
> --- geronimo/server/trunk/modules/geronimo-service-builder/pom.xml
> (original)
> +++ geronimo/server/trunk/modules/geronimo-service-builder/pom.xml
> Sat Aug 26 15:30:02 2006
> @@ -29,24 +29,9 @@
>
> <artifactId>geronimo-service-builder</artifactId>
> <name>Geronimo :: Service :: 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:http://svn.apache.org/repos/asf/
> geronimo/server/trunk/modules/service-builder</connection>
> - <developerConnection>scm:svn:https://${maven.username}
> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/service-
> builder</developerConnection>
> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
> service-builder</url>
> - </scm>
>
> <dependencies>
>
> - <!-- Module Dependencies -->
> -
> <dependency>
> <groupId>${pom.groupId}</groupId>
> <artifactId>geronimo-kernel</artifactId>
> @@ -78,8 +63,6 @@
> <scope>test</scope>
> </dependency>
>
> - <!-- Thirdparty Dependencies -->
> -
> <dependency>
> <groupId>xmlbeans</groupId>
> <artifactId>xbean</artifactId>
>
> Modified: geronimo/server/trunk/modules/geronimo-system/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
> geronimo-system/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
> ======================================================================
> ========
> --- geronimo/server/trunk/modules/geronimo-system/pom.xml (original)
> +++ geronimo/server/trunk/modules/geronimo-system/pom.xml Sat Aug
> 26 15:30:02 2006
> @@ -31,24 +31,8 @@
> <artifactId>geronimo-system</artifactId>
> <name>Geronimo :: System</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:http://svn.apache.org/repos/asf/
> geronimo/server/trunk/modules/system</connection>
> - <developerConnection>scm:svn:https://${maven.username}
> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/system</
> developerConnection>
> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
> system</url>
> - </scm>
> -
> <dependencies>
>
> - <!-- Module Dependencies -->
> -
> <dependency>
> <groupId>org.apache.geronimo.modules</groupId>
> <artifactId>geronimo-common</artifactId>
> @@ -67,14 +51,10 @@
> <version>${pom.version}</version>
> </dependency>
>
> - <!-- Thirdparty Dependencies -->
> -
> <dependency>
> <groupId>concurrent</groupId>
> <artifactId>concurrent</artifactId>
> </dependency>
> -
> - <!-- Test Dependencies -->
>
> <!--
> NOTE: Need to include Xerces for tests in case Crimson (or
> another parser)
>
> Modified: geronimo/server/trunk/modules/geronimo-test-ddbean/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
> geronimo-test-ddbean/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
> ======================================================================
> ========
> --- geronimo/server/trunk/modules/geronimo-test-ddbean/pom.xml
> (original)
> +++ geronimo/server/trunk/modules/geronimo-test-ddbean/pom.xml Sat
> Aug 26 15:30:02 2006
> @@ -31,20 +31,6 @@
> <artifactId>geronimo-test-ddbean</artifactId>
> <name>Geronimo :: Test :: DDBeans</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:http://svn.apache.org/repos/asf/
> geronimo/server/trunk/modules/test-ddbean</connection>
> - <developerConnection>scm:svn:https://${maven.username}
> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/test-
> ddbean</developerConnection>
> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
> test-ddbean</url>
> - </scm>
> -
> <dependencies>
>
> <dependency>
>
> Modified: geronimo/server/trunk/modules/geronimo-testsupport/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
> geronimo-testsupport/pom.xml?rev=437240&r1=437239&r2=437240&view=diff
> ======================================================================
> ========
> --- geronimo/server/trunk/modules/geronimo-testsupport/pom.xml
> (original)
> +++ geronimo/server/trunk/modules/geronimo-testsupport/pom.xml Sat
> Aug 26 15:30:02 2006
> @@ -47,11 +47,4 @@
>
> </dependencies>
>
> - <build>
> - <!--
> - FIXME: Remove when the default is to use the m2 standard
> layout
> - -->
> - <sourceDirectory>${pom.basedir}/src/main/java</
> sourceDirectory>
> - </build>
> -
> </project>
>
> Modified: geronimo/server/trunk/modules/geronimo-timer/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
> geronimo-timer/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
> ======================================================================
> ========
> --- geronimo/server/trunk/modules/geronimo-timer/pom.xml (original)
> +++ geronimo/server/trunk/modules/geronimo-timer/pom.xml Sat Aug 26
> 15:30:02 2006
> @@ -31,20 +31,6 @@
> <artifactId>geronimo-timer</artifactId>
> <name>Geronimo :: Timer</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:http://svn.apache.org/repos/asf/
> geronimo/server/trunk/modules/timer</connection>
> - <developerConnection>scm:svn:https://${maven.username}
> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/timer</
> developerConnection>
> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
> timer</url>
> - </scm>
> -
> <properties>
> <!--
> FIXME: Disable the timer tests for now since they can fail
> if the host environment
>
> Modified: geronimo/server/trunk/modules/geronimo-tomcat-builder/
> pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
> geronimo-tomcat-builder/pom.xml?
> rev=437240&r1=437231&r2=437240&view=diff
> ======================================================================
> ========
> --- geronimo/server/trunk/modules/geronimo-tomcat-builder/pom.xml
> (original)
> +++ geronimo/server/trunk/modules/geronimo-tomcat-builder/pom.xml
> Sat Aug 26 15:30:02 2006
> @@ -31,24 +31,8 @@
> <artifactId>geronimo-tomcat-builder</artifactId>
> <name>Geronimo :: Tomcat :: 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:http://svn.apache.org/repos/asf/
> geronimo/server/trunk/modules/tomcat-builder</connection>
> - <developerConnection>scm:svn:https://${maven.username}
> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/tomcat-
> builder</developerConnection>
> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
> tomcat-builder</url>
> - </scm>
> -
> <dependencies>
>
> - <!-- Module Dependencies -->
> -
> <!--<dependency>-->
> <!--<groupId>${pom.groupId}</groupId>-->
> <!--<artifactId>geronimo-deployment</artifactId>-->
> @@ -103,8 +87,6 @@
> <version>${pom.version}</version>
> </dependency>
>
> - <!-- Thirdparty Dependencies -->
> -
> <dependency>
> <groupId>xmlbeans</groupId>
> <artifactId>xbean</artifactId>
> @@ -115,8 +97,6 @@
> <artifactId>stax-api</artifactId>
> </dependency>
>
> - <!-- Test Dependencies -->
> -
> <!--<dependency>-->
> <!--<groupId>${pom.groupId}</groupId>-->
> <!--<artifactId>geronimo-axis</artifactId>-->
> @@ -130,7 +110,7 @@
> <!--<scope>test</scope>-->
> <!--</dependency>-->
>
> - <!--WFT??? why is this needed for tests all of a sudden? -->
> + <!-- WFT??? why is this needed for tests all of a sudden? -->
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> <artifactId>geronimo-jsp_2.0_spec</artifactId>
>
> Modified: geronimo/server/trunk/modules/geronimo-tomcat/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
> geronimo-tomcat/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
> ======================================================================
> ========
> --- geronimo/server/trunk/modules/geronimo-tomcat/pom.xml (original)
> +++ geronimo/server/trunk/modules/geronimo-tomcat/pom.xml Sat Aug
> 26 15:30:02 2006
> @@ -31,20 +31,6 @@
> <artifactId>geronimo-tomcat</artifactId>
> <name>Geronimo :: Tomcat</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:http://svn.apache.org/repos/asf/
> geronimo/server/trunk/modules/tomcat</connection>
> - <developerConnection>scm:svn:https://${maven.username}
> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/tomcat</
> developerConnection>
> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
> tomcat</url>
> - </scm>
> -
> <properties>
> <endorsedDir>${project.build.directory}/endorsed</
> endorsedDir>
> <localRepoDir>${settings.localRepository}</localRepoDir>
>
> Modified: geronimo/server/trunk/modules/geronimo-transaction/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
> geronimo-transaction/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
> ======================================================================
> ========
> --- geronimo/server/trunk/modules/geronimo-transaction/pom.xml
> (original)
> +++ geronimo/server/trunk/modules/geronimo-transaction/pom.xml Sat
> Aug 26 15:30:02 2006
> @@ -31,20 +31,6 @@
> <artifactId>geronimo-transaction</artifactId>
> <name>Geronimo :: Transaction</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:http://svn.apache.org/repos/asf/
> geronimo/server/trunk/modules/transaction</connection>
> - <developerConnection>scm:svn:https://${maven.username}
> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/
> transaction</developerConnection>
> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
> transaction</url>
> - </scm>
> -
> <dependencies>
>
> <!-- temp, for ServerInfo. Remove when it is moved to
> Kernel-->
>
> Modified: geronimo/server/trunk/modules/geronimo-upgrade/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
> geronimo-upgrade/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
> ======================================================================
> ========
> --- geronimo/server/trunk/modules/geronimo-upgrade/pom.xml (original)
> +++ geronimo/server/trunk/modules/geronimo-upgrade/pom.xml Sat Aug
> 26 15:30:02 2006
> @@ -31,20 +31,6 @@
> <artifactId>geronimo-upgrade</artifactId>
> <name>Geronimo :: Upgrade</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:http://svn.apache.org/repos/asf/
> geronimo/server/trunk/modules/upgrade</connection>
> - <developerConnection>scm:svn:https://${maven.username}
> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/upgrade</
> developerConnection>
> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
> upgrade</url>
> - </scm>
> -
> <dependencies>
>
> <dependency>
>
> Modified: geronimo/server/trunk/modules/geronimo-util/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
> geronimo-util/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
> ======================================================================
> ========
> --- geronimo/server/trunk/modules/geronimo-util/pom.xml (original)
> +++ geronimo/server/trunk/modules/geronimo-util/pom.xml Sat Aug 26
> 15:30:02 2006
> @@ -31,20 +31,6 @@
> <artifactId>geronimo-util</artifactId>
> <name>Geronimo :: Util</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:http://svn.apache.org/repos/asf/
> geronimo/server/trunk/modules/util</connection>
> - <developerConnection>scm:svn:https://${maven.username}
> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/util</
> developerConnection>
> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
> util</url>
> - </scm>
> -
> <dependencies>
>
> <dependency>
>
> Modified: geronimo/server/trunk/modules/geronimo-web-builder/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
> geronimo-web-builder/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
> ======================================================================
> ========
> --- geronimo/server/trunk/modules/geronimo-web-builder/pom.xml
> (original)
> +++ geronimo/server/trunk/modules/geronimo-web-builder/pom.xml Sat
> Aug 26 15:30:02 2006
> @@ -31,24 +31,8 @@
> <artifactId>geronimo-web-builder</artifactId>
> <name>Geronimo :: Web :: Builder</name>
>
> - <!--
> -
> - HACK: Need to explicitly configure SCM for this module since
> its artifactId
> - does not match the directory it lives in.
> -
> - FIXME: Rename module directory or artifactId.
> -
> - -->
> - <scm>
> - <connection>scm:svn:http://svn.apache.org/repos/asf/
> geronimo/server/trunk/modules/web-builder</connection>
> - <developerConnection>scm:svn:https://${maven.username}
> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/web-
> builder</developerConnection>
> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
> web-builder</url>
> - </scm>
> -
> <dependencies>
>
> - <!-- Module Dependencies -->
> -
> <dependency>
> <groupId>${pom.groupId}</groupId>
> <artifactId>geronimo-j2ee-builder</artifactId>
> @@ -87,8 +71,6 @@
> <version>${pom.version}</version>
> </dependency>
>
> - <!-- Spec Dependencies -->
> -
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> <artifactId>geronimo-servlet_2.4_spec</artifactId>
>
> Modified: geronimo/server/trunk/modules/geronimo-webservices/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
> geronimo-webservices/pom.xml?rev=437240&r1=437231&r2=437240&view=diff
> ======================================================================
> ========
> --- geronimo/server/trunk/modules/geronimo-webservices/pom.xml
> (original)
> +++ geronimo/server/trunk/modules/geronimo-webservices/pom.xml Sat
> Aug 26 15:30:02 2006
> @@ -31,20 +31,6 @@
> <artifactId>geronimo-webservices</artifactId>
> <name>Geronimo :: Web Services</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:http://svn.apache.org/repos/asf/
> geronimo/server/trunk/modules/webservices</connection>
> - <developerConnection>scm:svn:https://${maven.username}
> @svn.apache.org/repos/asf/geronimo/server/trunk/modules/
> webservices</developerConnection>
> - <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/
> webservices</url>
> - </scm>
> -
> <dependencies>
>
> <dependency>
> @@ -121,6 +107,7 @@
> <groupId>scout</groupId>
> <artifactId>scout</artifactId>
> </dependency>
> +
> </dependencies>
>
> </project>
>
> Modified: geronimo/server/trunk/modules/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
> pom.xml?rev=437240&r1=437239&r2=437240&view=diff
> ======================================================================
> ========
> --- geronimo/server/trunk/modules/pom.xml (original)
> +++ geronimo/server/trunk/modules/pom.xml Sat Aug 26 15:30:02 2006
> @@ -35,51 +35,51 @@
>
> <modules>
> <module>geronimo-testsupport</module>
> - <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>
> - <module>client-builder</module>
> - <module>common</module>
> - <module>connector</module>
> - <module>connector-builder</module>
> - <module>converter</module>
> - <module>core</module>
> - <module>deploy-config</module>
> - <module>deploy-jsr88</module>
> - <module>deploy-tool</module>
> - <module>deployment</module>
> - <module>derby</module>
> - <module>directory</module>
> - <module>hot-deploy</module>
> - <module>interceptor</module>
> - <module>j2ee</module>
> - <module>j2ee-builder</module>
> - <module>j2ee-schema</module>
> - <module>jetty</module>
> - <module>jetty-builder</module>
> - <module>jmx-remoting</module>
> - <module>kernel</module>
> - <module>mail</module>
> - <module>management</module>
> - <module>naming</module>
> - <module>naming-builder</module>
> - <module>security</module>
> - <module>security-builder</module>
> - <module>service-builder</module>
> - <module>system</module>
> - <module>test-ddbean</module>
> - <module>timer</module>
> - <module>tomcat</module>
> - <module>tomcat-builder</module>
> - <module>transaction</module>
> - <module>upgrade</module>
> - <module>util</module>
> - <module>web-builder</module>
> - <module>webservices</module>
> + <module>geronimo-activation</module>
> + <module>ge-activemq-rar</module>
> + <module>geronimo-activemq-gbean</module>
> + <module>geronimo-activemq-gbean-management</module>
> + <module>geronimo-axis</module>
> + <module>geronimo-axis-builder</module>
> + <module>geronimo-client</module>
> + <module>geronimo-client-builder</module>
> + <module>geronimo-common</module>
> + <module>geronimo-connector</module>
> + <module>geronimo-connector-builder</module>
> + <module>geronimo-converter</module>
> + <module>geronimo-core</module>
> + <module>geronimo-deploy-config</module>
> + <module>geronimo-deploy-jsr88</module>
> + <module>geronimo-deploy-tool</module>
> + <module>geronimo-deployment</module>
> + <module>geronimo-derby</module>
> + <module>geronimo-directory</module>
> + <module>geronimo-hot-deploy</module>
> + <module>geronimo-interceptor</module>
> + <module>geronimo-j2ee</module>
> + <module>geronimo-j2ee-builder</module>
> + <module>geronimo-j2ee-schema</module>
> + <module>geronimo-jetty</module>
> + <module>geronimo-jetty-builder</module>
> + <module>geronimo-jmx-remoting</module>
> + <module>geronimo-kernel</module>
> + <module>geronimo-mail</module>
> + <module>geronimo-management</module>
> + <module>geronimo-naming</module>
> + <module>geronimo-naming-builder</module>
> + <module>geronimo-security</module>
> + <module>geronimo-security-builder</module>
> + <module>geronimo-service-builder</module>
> + <module>geronimo-system</module>
> + <module>geronimo-test-ddbean</module>
> + <module>geronimo-timer</module>
> + <module>geronimo-tomcat</module>
> + <module>geronimo-tomcat-builder</module>
> + <module>geronimo-transaction</module>
> + <module>geronimo-upgrade</module>
> + <module>geronimo-util</module>
> + <module>geronimo-web-builder</module>
> + <module>geronimo-webservices</module>
> </modules>
>
> </project>
>
>
-sachin