geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmcma...@apache.org
Subject svn commit: r578511 - in /geronimo/plugins/console/trunk: console-base-portlets/pom.xml console-base-portlets/src/main/webapp/WEB-INF/view/classloaderview/ pom.xml
Date Sat, 22 Sep 2007 22:06:01 GMT
Author: pmcmahan
Date: Sat Sep 22 15:06:00 2007
New Revision: 578511

URL: http://svn.apache.org/viewvc?rev=578511&view=rev
Log:
GERONIMO-3413 use maven jspc plugin to recompile the jsps

Removed:
    geronimo/plugins/console/trunk/console-base-portlets/src/main/webapp/WEB-INF/view/classloaderview/
Modified:
    geronimo/plugins/console/trunk/console-base-portlets/pom.xml
    geronimo/plugins/console/trunk/pom.xml

Modified: geronimo/plugins/console/trunk/console-base-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/console/trunk/console-base-portlets/pom.xml?rev=578511&r1=578510&r2=578511&view=diff
==============================================================================
--- geronimo/plugins/console/trunk/console-base-portlets/pom.xml (original)
+++ geronimo/plugins/console/trunk/console-base-portlets/pom.xml Sat Sep 22 15:06:00 2007
@@ -35,6 +35,20 @@
 
     <dependencies>
 
+        <!-- for jspc maven plugin -->
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jee-specs</artifactId>
+            <scope>provided</scope>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.pluto</groupId>
+            <artifactId>pluto-taglib</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-upgrade</artifactId>
@@ -99,9 +113,8 @@
         <filtering>true</filtering>
       </resource>
     </resources>
-    <plugins>
-
 
+    <plugins>
 
 <!--
 
@@ -141,6 +154,26 @@
         </executions>
       </plugin>
 -->
+
+      <plugin>
+          <groupId>org.codehaus.mojo.jspc</groupId>
+          <artifactId>jspc-maven-plugin</artifactId>
+          <executions>
+              <execution>
+                  <id>jspc</id>
+                  <goals>
+                      <goal>compile</goal>
+                  </goals>
+              </execution>
+          </executions>
+      </plugin>
+      <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-war-plugin</artifactId>
+          <configuration>
+              <webXml>${basedir}/target/jspweb.xml</webXml>
+          </configuration>
+      </plugin>
     </plugins>
   </build>
     

Modified: geronimo/plugins/console/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/console/trunk/pom.xml?rev=578511&r1=578510&r2=578511&view=diff
==============================================================================
--- geronimo/plugins/console/trunk/pom.xml (original)
+++ geronimo/plugins/console/trunk/pom.xml Sat Sep 22 15:06:00 2007
@@ -331,6 +331,21 @@
                 </exclusions>
             </dependency>
 
+            <!-- for jspc maven plugin -->
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>jee-specs</artifactId>
+                <version>${geronimoVersion}</version>
+                <type>car</type>
+            </dependency>
+
+            <!-- for jspc maven plugin -->
+            <dependency>
+                <groupId>org.apache.pluto</groupId>
+                <artifactId>pluto-taglib</artifactId>
+                <version>${plutoVersion}</version>
+            </dependency>
+
         </dependencies>
     </dependencyManagement>
 
@@ -391,6 +406,44 @@
                     </configuration>
                 </plugin>
 
+
+                <plugin>
+                    <groupId>org.codehaus.mojo.jspc</groupId>
+                    <artifactId>jspc-maven-plugin</artifactId>
+                    <version>2.0-SNAPSHOT</version>
+                    <executions>
+                        <execution>
+                            <goals>
+                                 <goal>compile</goal>
+                            </goals>
+                            <configuration>
+                                <warSourceDirectory>${pom.basedir}/src/main/webapp</warSourceDirectory>
+                            </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>
                     <groupId>org.apache.pluto</groupId>
                     <artifactId>maven-pluto-plugin</artifactId>
@@ -499,12 +552,18 @@
             </activation>
 
             <modules>
+<!--
                 <module>console-core</module>
+-->
                 <module>console-base-portlets</module>
+<!--
                 <module>console-portal-driver</module>
+-->
                 <module>console-ear</module>
+<!--
                 <module>console-tomcat</module>
                 <module>console-jetty</module>
+-->
             </modules>
         </profile>
     </profiles>



Mime
View raw message