Return-Path: 
 <commits-return-4039-apmail-gump-commits-archive=www.apache.org@gump.apache.org>
Delivered-To: apmail-gump-commits-archive@www.apache.org
Received: (qmail 40987 invoked from network); 22 Sep 2009 06:46:04 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 22 Sep 2009 06:46:04 -0000
Received: (qmail 89423 invoked by uid 500); 22 Sep 2009 06:46:04 -0000
Mailing-List: contact commits-help@gump.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@gump.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@gump.apache.org>
List-Post: <mailto:commits@gump.apache.org>
List-Id: <commits.gump.apache.org>
Reply-To: general@gump.apache.org
Delivered-To: mailing list commits@gump.apache.org
Received: (qmail 89413 invoked by uid 99); 22 Sep 2009 06:46:04 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 Sep 2009 06:46:04 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 Sep 2009 06:46:01 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 530C023888CD; Tue, 22 Sep 2009 06:45:40 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r817513 - in /gump/metadata/project:
 jakarta-servletapi-5.xml
 tomcat-tc6.xml
Date: Tue, 22 Sep 2009 06:45:40 -0000
To: commits@gump.apache.org
From: bodewig@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20090922064540.530C023888CD@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: bodewig
Date: Tue Sep 22 06:45:39 2009
New Revision: 817513

URL: http://svn.apache.org/viewvc?rev=817513&view=rev
Log:
make Tomcat6 source for javax.servlet projects in mvn builds

Modified:
    gump/metadata/project/jakarta-servletapi-5.xml
    gump/metadata/project/tomcat-tc6.xml

Modified: gump/metadata/project/jakarta-servletapi-5.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/jakarta-servletapi-5.xml?rev=817513&r1=817512&r2=817513&view=diff
==============================================================================
--- gump/metadata/project/jakarta-servletapi-5.xml (original)
+++ gump/metadata/project/jakarta-servletapi-5.xml Tue Sep 22 06:45:39 2009
@@ -81,16 +81,4 @@
     <jar name="jsr152/build/jsp-anttask-@@DATE@@.jar"/>
   </project>
 
-  <project name="javax.servlet.servletapi5" groupId="javax.servlet">
-    <depend project="jakarta-servletapi-5-servlet"/>
-    <depend project="jakarta-servletapi-5-jsp"/>
-    <jar name="jsr154/dist/lib/servlet-api.jar" id="servlet-api"/>
-    <jar name="jsr152/dist/lib/jsp-api.jar" id="jsp-api"/>
-  </project>
-
-  <project name="javax.servlet.jsp.servletapi5" groupId="javax.servlet.jsp">
-    <depend project="jakarta-servletapi-5-jsp"/>
-    <jar name="jsr152/dist/lib/jsp-api.jar" id="jsp-api"/>
-  </project>
-
 </module>

Modified: gump/metadata/project/tomcat-tc6.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/tomcat-tc6.xml?rev=817513&r1=817512&r2=817513&view=diff
==============================================================================
--- gump/metadata/project/tomcat-tc6.xml (original)
+++ gump/metadata/project/tomcat-tc6.xml Tue Sep 22 06:45:39 2009
@@ -77,6 +77,16 @@
     <jar name="lib/jsp-api.jar"  id="jsp-api" />
   </project>
 
+  <!--
+     some version of the JSP API ended up using groupId
+     javax.servlet instead of javax.servlet.jsp in the mvn repo
+    -->
+  <project name="javax.servlet.jsp-in-servlet" groupId="javax.servlet">
+    <depend project="tomcat-tc6"/>
+    <home nested="output/build" />
+    <jar name="lib/jsp-api.jar"  id="jsp-api" />
+  </project>
+
   <project name="javax.el" groupId="javax.el">
     <package name="javax.el"/>
     <home nested="output/build" />