Return-Path: 
 <scm-return-19966-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 4617 invoked from network); 3 Jun 2007 14:52:19 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 3 Jun 2007 14:52:19 -0000
Received: (qmail 86025 invoked by uid 500); 3 Jun 2007 14:52:23 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 86015 invoked by uid 500); 3 Jun 2007 14:52:23 -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 86004 invoked by uid 99); 3 Jun 2007 14:52:23 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 03 Jun 2007 07:52:23 -0700
X-ASF-Spam-Status: No, hits=-99.5 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 03 Jun 2007 07:52:18 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id 7A1481A981A; Sun,  3 Jun 2007 07:51:57 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r543910 - in /geronimo/server/branches/2.0-M6: ./
 applications/console/geronimo-console-framework/
 applications/console/geronimo-console-standard/
 applications/geronimo-ca-helper/
 applications/geronimo-examples/geronimo-jsp-examples/ applic...
Date: Sun, 03 Jun 2007 14:51:57 -0000
To: scm@geronimo.apache.org
From: jdillon@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20070603145157.7A1481A981A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: jdillon
Date: Sun Jun  3 07:51:56 2007
New Revision: 543910

URL: http://svn.apache.org/viewvc?view=rev&rev=543910
Log:
(GERONIMO-3205) Upgrade to the lastest jspc-maven-plugin 2.0-SNAPSHOT, which has better pluggability and allows us to use our custom jasper artifacts,
Dropping the temporary geronimo-jspc-maven-plugin

Removed:
    geronimo/server/branches/2.0-M6/maven-plugins/geronimo-jspc-maven-plugin/
Modified:
    geronimo/server/branches/2.0-M6/applications/console/geronimo-console-framework/pom.xml
    geronimo/server/branches/2.0-M6/applications/console/geronimo-console-standard/pom.xml
    geronimo/server/branches/2.0-M6/applications/geronimo-ca-helper/pom.xml
    geronimo/server/branches/2.0-M6/applications/geronimo-examples/geronimo-jsp-examples/pom.xml
    geronimo/server/branches/2.0-M6/applications/geronimo-ldap-demo/pom.xml
    geronimo/server/branches/2.0-M6/applications/geronimo-remote-deploy/pom.xml
    geronimo/server/branches/2.0-M6/applications/geronimo-uddi-server/pom.xml
    geronimo/server/branches/2.0-M6/applications/geronimo-welcome/pom.xml
    geronimo/server/branches/2.0-M6/maven-plugins/pom.xml
    geronimo/server/branches/2.0-M6/pom.xml

Modified: geronimo/server/branches/2.0-M6/applications/console/geronimo-console-framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0-M6/applications/console/geronimo-console-framework/pom.xml?view=diff&rev=543910&r1=543909&r2=543910
==============================================================================
--- geronimo/server/branches/2.0-M6/applications/console/geronimo-console-framework/pom.xml (original)
+++ geronimo/server/branches/2.0-M6/applications/console/geronimo-console-framework/pom.xml Sun Jun  3 07:51:56 2007
@@ -84,8 +84,8 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.geronimo.plugins</groupId>
-                <artifactId>geronimo-jspc-maven-plugin</artifactId>
+                <groupId>org.codehaus.mojo.jspc</groupId>
+                <artifactId>jspc-maven-plugin</artifactId>
             </plugin>
             
             <plugin>

Modified: geronimo/server/branches/2.0-M6/applications/console/geronimo-console-standard/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0-M6/applications/console/geronimo-console-standard/pom.xml?view=diff&rev=543910&r1=543909&r2=543910
==============================================================================
--- geronimo/server/branches/2.0-M6/applications/console/geronimo-console-standard/pom.xml (original)
+++ geronimo/server/branches/2.0-M6/applications/console/geronimo-console-standard/pom.xml Sun Jun  3 07:51:56 2007
@@ -140,8 +140,8 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.geronimo.plugins</groupId>
-                <artifactId>geronimo-jspc-maven-plugin</artifactId>
+                <groupId>org.codehaus.mojo.jspc</groupId>
+                <artifactId>jspc-maven-plugin</artifactId>
             </plugin>
             
             <plugin>

Modified: geronimo/server/branches/2.0-M6/applications/geronimo-ca-helper/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0-M6/applications/geronimo-ca-helper/pom.xml?view=diff&rev=543910&r1=543909&r2=543910
==============================================================================
--- geronimo/server/branches/2.0-M6/applications/geronimo-ca-helper/pom.xml (original)
+++ geronimo/server/branches/2.0-M6/applications/geronimo-ca-helper/pom.xml Sun Jun  3 07:51:56 2007
@@ -71,8 +71,8 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.geronimo.plugins</groupId>
-                <artifactId>geronimo-jspc-maven-plugin</artifactId>
+                <groupId>org.codehaus.mojo.jspc</groupId>
+                <artifactId>jspc-maven-plugin</artifactId>
             </plugin>
 
             <plugin>

Modified: geronimo/server/branches/2.0-M6/applications/geronimo-examples/geronimo-jsp-examples/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0-M6/applications/geronimo-examples/geronimo-jsp-examples/pom.xml?view=diff&rev=543910&r1=543909&r2=543910
==============================================================================
--- geronimo/server/branches/2.0-M6/applications/geronimo-examples/geronimo-jsp-examples/pom.xml (original)
+++ geronimo/server/branches/2.0-M6/applications/geronimo-examples/geronimo-jsp-examples/pom.xml Sun Jun  3 07:51:56 2007
@@ -58,8 +58,8 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.geronimo.plugins</groupId>
-                <artifactId>geronimo-jspc-maven-plugin</artifactId>
+                <groupId>org.codehaus.mojo.jspc</groupId>
+                <artifactId>jspc-maven-plugin</artifactId>
             </plugin>
             
             <plugin>

Modified: geronimo/server/branches/2.0-M6/applications/geronimo-ldap-demo/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0-M6/applications/geronimo-ldap-demo/pom.xml?view=diff&rev=543910&r1=543909&r2=543910
==============================================================================
--- geronimo/server/branches/2.0-M6/applications/geronimo-ldap-demo/pom.xml (original)
+++ geronimo/server/branches/2.0-M6/applications/geronimo-ldap-demo/pom.xml Sun Jun  3 07:51:56 2007
@@ -44,8 +44,8 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.geronimo.plugins</groupId>
-                <artifactId>geronimo-jspc-maven-plugin</artifactId>
+                <groupId>org.codehaus.mojo.jspc</groupId>
+                <artifactId>jspc-maven-plugin</artifactId>
             </plugin>
             
             <plugin>

Modified: geronimo/server/branches/2.0-M6/applications/geronimo-remote-deploy/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0-M6/applications/geronimo-remote-deploy/pom.xml?view=diff&rev=543910&r1=543909&r2=543910
==============================================================================
--- geronimo/server/branches/2.0-M6/applications/geronimo-remote-deploy/pom.xml (original)
+++ geronimo/server/branches/2.0-M6/applications/geronimo-remote-deploy/pom.xml Sun Jun  3 07:51:56 2007
@@ -58,8 +58,8 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.geronimo.plugins</groupId>
-                <artifactId>geronimo-jspc-maven-plugin</artifactId>
+                <groupId>org.codehaus.mojo.jspc</groupId>
+                <artifactId>jspc-maven-plugin</artifactId>
             </plugin>
             
             <plugin>

Modified: geronimo/server/branches/2.0-M6/applications/geronimo-uddi-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0-M6/applications/geronimo-uddi-server/pom.xml?view=diff&rev=543910&r1=543909&r2=543910
==============================================================================
--- geronimo/server/branches/2.0-M6/applications/geronimo-uddi-server/pom.xml (original)
+++ geronimo/server/branches/2.0-M6/applications/geronimo-uddi-server/pom.xml Sun Jun  3 07:51:56 2007
@@ -52,8 +52,8 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.geronimo.plugins</groupId>
-                <artifactId>geronimo-jspc-maven-plugin</artifactId>
+                <groupId>org.codehaus.mojo.jspc</groupId>
+                <artifactId>jspc-maven-plugin</artifactId>
             </plugin>
 
             <plugin>

Modified: geronimo/server/branches/2.0-M6/applications/geronimo-welcome/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0-M6/applications/geronimo-welcome/pom.xml?view=diff&rev=543910&r1=543909&r2=543910
==============================================================================
--- geronimo/server/branches/2.0-M6/applications/geronimo-welcome/pom.xml (original)
+++ geronimo/server/branches/2.0-M6/applications/geronimo-welcome/pom.xml Sun Jun  3 07:51:56 2007
@@ -64,8 +64,8 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.geronimo.plugins</groupId>
-                <artifactId>geronimo-jspc-maven-plugin</artifactId>
+                <groupId>org.codehaus.mojo.jspc</groupId>
+                <artifactId>jspc-maven-plugin</artifactId>
             </plugin>
 
             <plugin>

Modified: geronimo/server/branches/2.0-M6/maven-plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0-M6/maven-plugins/pom.xml?view=diff&rev=543910&r1=543909&r2=543910
==============================================================================
--- geronimo/server/branches/2.0-M6/maven-plugins/pom.xml (original)
+++ geronimo/server/branches/2.0-M6/maven-plugins/pom.xml Sun Jun  3 07:51:56 2007
@@ -65,7 +65,6 @@
     
     <modules>
         <module>car-maven-plugin</module>
-        <module>geronimo-jspc-maven-plugin</module>
         <module>geronimo-maven-plugin</module>
         <module>testsuite-maven-plugin</module>
         <module>testsuite-archetype-plugin</module>

Modified: geronimo/server/branches/2.0-M6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0-M6/pom.xml?view=diff&rev=543910&r1=543909&r2=543910
==============================================================================
--- geronimo/server/branches/2.0-M6/pom.xml (original)
+++ geronimo/server/branches/2.0-M6/pom.xml Sun Jun  3 07:51:56 2007
@@ -1569,26 +1569,41 @@
                     </configuration>
                 </plugin>
 
-                <!-- 
-                     The jspc 1.4.7 plugin uses a version of jasper which is incompatible with our version of jasper. 
-                     We've incorporated a geronimo-specific version until this is resolved...
-                -->
                 <plugin>
-                    <groupId>org.apache.geronimo.plugins</groupId>
-                    <artifactId>geronimo-jspc-maven-plugin</artifactId>
-                    <version>2.0-M6-SNAPSHOT</version>
+                    <groupId>org.codehaus.mojo.jspc</groupId>
+                    <artifactId>jspc-maven-plugin</artifactId>
+                    <version>2.0-SNAPSHOT</version>
                     <executions>
                         <execution>
-                            <id>jspc</id>
                             <goals>
-                                 <goal>compile</goal> 
+                                 <goal>compile</goal>
                             </goals>
                             <configuration>
                                 <warSourceDirectory>${pom.basedir}/src/main/webapp</warSourceDirectory>
-<!--                                 <inputWebXml>${pom.basedir}/src/main/webapp/WEB-INF/web.xml</inputWebXml> -->
                             </configuration>
                         </execution>
                     </executions>
+                    
+                    <!-- Use the Tomcat 6 JSP compiler, but with our custom Jasper version -->
+                    <dependencies>
+                        <dependency>
+                            <groupId>org.codehaus.mojo.jspc</groupId>
+                            <artifactId>jspc-compiler-tomcat6</artifactId>
+                            <version>2.0-SNAPSHOT</version>
+                            <exclusions>
+                                <exclusion>
+                                    <groupId>org.apache.tomcat</groupId>
+                                    <artifactId>jasper</artifactId>
+                                </exclusion>
+                            </exclusions>
+                        </dependency>
+                        
+                        <dependency>
+                            <groupId>org.apache.tomcat</groupId>
+                            <artifactId>jasper</artifactId>
+                            <version>6.0.13-G543818</version>
+                        </dependency>
+                    </dependencies>
                 </plugin>
 
                 <plugin>