Return-Path: 
 <scm-return-12867-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 63790 invoked from network); 7 Jun 2006 21:57:09 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 7 Jun 2006 21:57:09 -0000
Received: (qmail 66392 invoked by uid 500); 7 Jun 2006 21:57:08 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 66352 invoked by uid 500); 7 Jun 2006 21:57:07 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 66331 invoked by uid 99); 7 Jun 2006 21:57:07 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Jun 2006 14:57:07 -0700
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received-SPF: pass (asf.osuosl.org: local policy)
Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Jun 2006 14:57:05 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id 0BB541A984E; Wed,  7 Jun 2006 14:56:45 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r412575 - in /geronimo/trunk: ./ modules/
 modules/client-builder/ modules/client-builder/src/resources2/
 modules/client-builder/src/resources2/META-INF/ modules/directory/
 modules/directory/src/resources2/ modules/directory/src/resources2/M...
Date: Wed, 07 Jun 2006 21:56:43 -0000
To: scm@geronimo.apache.org
From: djencks@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20060607215645.0BB541A984E@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: djencks
Date: Wed Jun  7 14:56:42 2006
New Revision: 412575

URL: http://svn.apache.org/viewvc?rev=412575&view=rev
Log:
GERONIMO-2071 add src geronimo-dependency.xml files in a location they won't conflict with the m1 build.  Add jetty.

Added:
    geronimo/trunk/modules/client-builder/src/resources2/
    geronimo/trunk/modules/client-builder/src/resources2/META-INF/
    geronimo/trunk/modules/client-builder/src/resources2/META-INF/geronimo-dependency.xml   (with props)
    geronimo/trunk/modules/directory/src/resources2/
    geronimo/trunk/modules/directory/src/resources2/META-INF/
    geronimo/trunk/modules/directory/src/resources2/META-INF/geronimo-dependency.xml   (with props)
    geronimo/trunk/modules/jetty/src/resources2/
    geronimo/trunk/modules/jetty/src/resources2/META-INF/
    geronimo/trunk/modules/jetty/src/resources2/META-INF/geronimo-dependency.xml   (with props)
    geronimo/trunk/modules/webservices/src/resources2/
    geronimo/trunk/modules/webservices/src/resources2/META-INF/
    geronimo/trunk/modules/webservices/src/resources2/META-INF/geronimo-dependency.xml   (with props)
Modified:
    geronimo/trunk/modules/client-builder/pom.xml
    geronimo/trunk/modules/directory/pom.xml
    geronimo/trunk/modules/jetty-builder/pom.xml
    geronimo/trunk/modules/jetty/pom.xml
    geronimo/trunk/modules/pom.xml
    geronimo/trunk/modules/webservices/pom.xml
    geronimo/trunk/pom.xml

Modified: geronimo/trunk/modules/client-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/client-builder/pom.xml?rev=412575&r1=412574&r2=412575&view=diff
==============================================================================
--- geronimo/trunk/modules/client-builder/pom.xml (original)
+++ geronimo/trunk/modules/client-builder/pom.xml Wed Jun  7 14:56:42 2006
@@ -31,6 +31,11 @@
   <description>Geronimo :: Client Builder</description>
 
   <build>
+      <resources>
+          <resource>
+              <directory>src/resources2</directory>
+          </resource>
+      </resources>
     <plugins>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>

Added: geronimo/trunk/modules/client-builder/src/resources2/META-INF/geronimo-dependency.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/client-builder/src/resources2/META-INF/geronimo-dependency.xml?rev=412575&view=auto
==============================================================================
--- geronimo/trunk/modules/client-builder/src/resources2/META-INF/geronimo-dependency.xml (added)
+++ geronimo/trunk/modules/client-builder/src/resources2/META-INF/geronimo-dependency.xml Wed Jun  7 14:56:42 2006
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<dep:service xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+  <dep:dependency>
+    <dep:groupId>org.apache.geronimo.modules</dep:groupId>
+    <dep:artifactId>geronimo-client</dep:artifactId>
+  </dep:dependency>
+</dep:service>
\ No newline at end of file

Propchange: geronimo/trunk/modules/client-builder/src/resources2/META-INF/geronimo-dependency.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/modules/client-builder/src/resources2/META-INF/geronimo-dependency.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/trunk/modules/client-builder/src/resources2/META-INF/geronimo-dependency.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/trunk/modules/directory/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/directory/pom.xml?rev=412575&r1=412574&r2=412575&view=diff
==============================================================================
--- geronimo/trunk/modules/directory/pom.xml (original)
+++ geronimo/trunk/modules/directory/pom.xml Wed Jun  7 14:56:42 2006
@@ -30,6 +30,11 @@
     <name>Geronimo :: Directory</name>
 
     <build>
+        <resources>
+            <resource>
+                <directory>src/resources2</directory>
+            </resource>
+        </resources>
         <plugins>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>

Added: geronimo/trunk/modules/directory/src/resources2/META-INF/geronimo-dependency.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/directory/src/resources2/META-INF/geronimo-dependency.xml?rev=412575&view=auto
==============================================================================
--- geronimo/trunk/modules/directory/src/resources2/META-INF/geronimo-dependency.xml (added)
+++ geronimo/trunk/modules/directory/src/resources2/META-INF/geronimo-dependency.xml Wed Jun  7 14:56:42 2006
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<dep:service xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+  <dep:dependency>
+    <dep:groupId>directory</dep:groupId>
+    <dep:artifactId>apacheds-core</dep:artifactId>
+    <dep:version>0.9.2</dep:version>
+  </dep:dependency>
+  <dep:dependency>
+    <dep:groupId>directory</dep:groupId>
+    <dep:artifactId>apacheds-shared</dep:artifactId>
+    <dep:version>0.9.2</dep:version>
+  </dep:dependency>
+  <dep:dependency>
+    <dep:groupId>directory-asn1</dep:groupId>
+    <dep:artifactId>asn1-codec</dep:artifactId>
+    <dep:version>0.3.2</dep:version>
+  </dep:dependency>
+  <dep:dependency>
+    <dep:groupId>directory-shared</dep:groupId>
+    <dep:artifactId>apache-ldapber-provider</dep:artifactId>
+    <dep:version>0.9.2</dep:version>
+  </dep:dependency>
+  <dep:dependency>
+    <dep:groupId>directory-asn1</dep:groupId>
+    <dep:artifactId>asn1-ber</dep:artifactId>
+    <dep:version>0.3.2</dep:version>
+  </dep:dependency>
+  <dep:dependency>
+    <dep:groupId>directory-asn1</dep:groupId>
+    <dep:artifactId>asn1-der</dep:artifactId>
+    <dep:version>0.3.2</dep:version>
+  </dep:dependency>
+  <dep:dependency>
+    <dep:groupId>jdbm</dep:groupId>
+    <dep:artifactId>jdbm</dep:artifactId>
+    <dep:version>0.20-dev</dep:version>
+  </dep:dependency>
+  <dep:dependency>
+    <dep:groupId>regexp</dep:groupId>
+    <dep:artifactId>regexp</dep:artifactId>
+    <dep:version>1.3</dep:version>
+  </dep:dependency>
+  <dep:dependency>
+    <dep:groupId>oro</dep:groupId>
+    <dep:artifactId>oro</dep:artifactId>
+    <dep:version>2.0.8</dep:version>
+  </dep:dependency>
+  <dep:dependency>
+    <dep:groupId>commons-lang</dep:groupId>
+    <dep:artifactId>commons-lang</dep:artifactId>
+    <dep:version>2.0</dep:version>
+  </dep:dependency>
+  <dep:dependency>
+    <dep:groupId>commons-collections</dep:groupId>
+    <dep:artifactId>commons-collections</dep:artifactId>
+    <dep:version>3.1</dep:version>
+  </dep:dependency>
+  <dep:dependency>
+    <dep:groupId>commons-io</dep:groupId>
+    <dep:artifactId>commons-io</dep:artifactId>
+    <dep:version>1.1</dep:version>
+  </dep:dependency>
+  <dep:dependency>
+    <dep:groupId>commons-primitives</dep:groupId>
+    <dep:artifactId>commons-primitives</dep:artifactId>
+    <dep:version>20041207.202534</dep:version>
+  </dep:dependency>
+  <dep:dependency>
+    <dep:groupId>directory-shared</dep:groupId>
+    <dep:artifactId>ldap-common</dep:artifactId>
+    <dep:version>0.9.2</dep:version>
+  </dep:dependency>
+  <dep:dependency>
+    <dep:groupId>directory-shared</dep:groupId>
+    <dep:artifactId>kerberos-common</dep:artifactId>
+    <dep:version>0.5</dep:version>
+  </dep:dependency>
+  <dep:dependency>
+    <dep:groupId>directory-network</dep:groupId>
+    <dep:artifactId>mina</dep:artifactId>
+    <dep:version>0.7.3</dep:version>
+  </dep:dependency>
+  <dep:dependency>
+    <dep:groupId>directory-protocols</dep:groupId>
+    <dep:artifactId>kerberos-protocol</dep:artifactId>
+    <dep:version>0.5</dep:version>
+  </dep:dependency>
+  <dep:dependency>
+    <dep:groupId>directory-protocols</dep:groupId>
+    <dep:artifactId>ldap-protocol</dep:artifactId>
+    <dep:version>0.9.2</dep:version>
+  </dep:dependency>
+  <dep:dependency>
+    <dep:groupId>antlr</dep:groupId>
+    <dep:artifactId>antlr</dep:artifactId>
+    <dep:version>2.7.2</dep:version>
+  </dep:dependency>
+  <dep:dependency>
+    <dep:groupId>org.slf4j</dep:groupId>
+    <dep:artifactId>slf4j-simple</dep:artifactId>
+    <dep:version>1.0-beta7</dep:version>
+  </dep:dependency>
+</dep:service>
\ No newline at end of file

Propchange: geronimo/trunk/modules/directory/src/resources2/META-INF/geronimo-dependency.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/modules/directory/src/resources2/META-INF/geronimo-dependency.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/trunk/modules/directory/src/resources2/META-INF/geronimo-dependency.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/trunk/modules/jetty-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/jetty-builder/pom.xml?rev=412575&r1=412574&r2=412575&view=diff
==============================================================================
--- geronimo/trunk/modules/jetty-builder/pom.xml (original)
+++ geronimo/trunk/modules/jetty-builder/pom.xml Wed Jun  7 14:56:42 2006
@@ -72,7 +72,6 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-jetty</artifactId>
-            <version>${geronimoVersion}</version>
         </dependency>
     </dependencies>
 </project>

Modified: geronimo/trunk/modules/jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/jetty/pom.xml?rev=412575&r1=412574&r2=412575&view=diff
==============================================================================
--- geronimo/trunk/modules/jetty/pom.xml (original)
+++ geronimo/trunk/modules/jetty/pom.xml Wed Jun  7 14:56:42 2006
@@ -31,6 +31,11 @@
     <description>Geronimo Jetty Integration</description>
 
     <build>
+        <resources>
+            <resource>
+                <directory>src/resources2</directory>
+            </resource>
+        </resources>
         <plugins>
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>

Added: geronimo/trunk/modules/jetty/src/resources2/META-INF/geronimo-dependency.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/jetty/src/resources2/META-INF/geronimo-dependency.xml?rev=412575&view=auto
==============================================================================
--- geronimo/trunk/modules/jetty/src/resources2/META-INF/geronimo-dependency.xml (added)
+++ geronimo/trunk/modules/jetty/src/resources2/META-INF/geronimo-dependency.xml Wed Jun  7 14:56:42 2006
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<dep:service xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+  <dep:dependency>
+    <dep:groupId>jetty</dep:groupId>
+    <dep:artifactId>org.mortbay.jetty</dep:artifactId>
+  </dep:dependency>
+  <dep:dependency>
+    <dep:groupId>tomcat</dep:groupId>
+    <dep:artifactId>jasper-compiler</dep:artifactId>
+  </dep:dependency>
+  <dep:dependency>
+    <dep:groupId>tomcat</dep:groupId>
+    <dep:artifactId>jasper-compiler-jdt</dep:artifactId>
+  </dep:dependency>
+  <dep:dependency>
+    <dep:groupId>tomcat</dep:groupId>
+    <dep:artifactId>jasper-runtime</dep:artifactId>
+  </dep:dependency>
+  <dep:dependency>
+    <dep:groupId>commons-el</dep:groupId>
+    <dep:artifactId>commons-el</dep:artifactId>
+  </dep:dependency>
+</dep:service>
\ No newline at end of file

Propchange: geronimo/trunk/modules/jetty/src/resources2/META-INF/geronimo-dependency.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/modules/jetty/src/resources2/META-INF/geronimo-dependency.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/trunk/modules/jetty/src/resources2/META-INF/geronimo-dependency.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/trunk/modules/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/pom.xml?rev=412575&r1=412574&r2=412575&view=diff
==============================================================================
--- geronimo/trunk/modules/pom.xml (original)
+++ geronimo/trunk/modules/pom.xml Wed Jun  7 14:56:42 2006
@@ -62,9 +62,9 @@
                 <module>j2ee</module>
                 <module>j2ee-builder</module>
                 <module>j2ee-schema</module>
-<!--                <module>jetty</module>
+                <module>jetty</module>
                 <module>jetty-builder</module>
-                <module>javamail-transport</module>  -->
+<!--                <module>javamail-transport</module>  -->
                 <module>jmx-remoting</module>
                 <module>kernel</module>
                 <module>management</module>

Modified: geronimo/trunk/modules/webservices/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/webservices/pom.xml?rev=412575&r1=412574&r2=412575&view=diff
==============================================================================
--- geronimo/trunk/modules/webservices/pom.xml (original)
+++ geronimo/trunk/modules/webservices/pom.xml Wed Jun  7 14:56:42 2006
@@ -30,6 +30,14 @@
     <name>Geronimo :: Web Services</name>
     <description>Geronimo Web Services</description>
 
+    <build>
+        <resources>
+            <resource>
+                <directory>src/resources2</directory>
+            </resource>
+        </resources>
+    </build>
+    
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>

Added: geronimo/trunk/modules/webservices/src/resources2/META-INF/geronimo-dependency.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/webservices/src/resources2/META-INF/geronimo-dependency.xml?rev=412575&view=auto
==============================================================================
--- geronimo/trunk/modules/webservices/src/resources2/META-INF/geronimo-dependency.xml (added)
+++ geronimo/trunk/modules/webservices/src/resources2/META-INF/geronimo-dependency.xml Wed Jun  7 14:56:42 2006
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<dep:service xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+  <dep:dependency>
+    <dep:groupId>org.apache.geronimo.specs</dep:groupId>
+    <dep:artifactId>geronimo-jaxr_1.0_spec</dep:artifactId>
+  </dep:dependency>
+</dep:service>
\ No newline at end of file

Propchange: geronimo/trunk/modules/webservices/src/resources2/META-INF/geronimo-dependency.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/modules/webservices/src/resources2/META-INF/geronimo-dependency.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/trunk/modules/webservices/src/resources2/META-INF/geronimo-dependency.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/pom.xml?rev=412575&r1=412574&r2=412575&view=diff
==============================================================================
--- geronimo/trunk/pom.xml (original)
+++ geronimo/trunk/pom.xml Wed Jun  7 14:56:42 2006
@@ -629,6 +629,12 @@
 
             <dependency>
                 <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-jetty</artifactId>
+                <version>${geronimoVersion}</version>
+            </dependency>
+                                                                                                                                                                                                                   
+            <dependency>
+                <groupId>org.apache.geronimo.modules</groupId>
                 <artifactId>geronimo-jmx-remoting</artifactId>
                 <version>${geronimoVersion}</version>
             </dependency>