geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r399898 - in /geronimo/branches/1.1: applications/console-framework/ applications/console-standard/ applications/welcome/ etc/ plugins/geronimo-deployment-plugin/
Date Fri, 05 May 2006 00:35:17 GMT
Author: dain
Date: Thu May  4 17:35:14 2006
New Revision: 399898

URL: http://svn.apache.org/viewcvs?rev=399898&view=rev
Log:
Applied GERONIMO-1904 Precompile JSPs for all apps by default.  Thanks Prasad Kashyap.
Bumped plugin version

Modified:
    geronimo/branches/1.1/applications/console-framework/maven.xml
    geronimo/branches/1.1/applications/console-framework/project.xml
    geronimo/branches/1.1/applications/console-standard/maven.xml
    geronimo/branches/1.1/applications/console-standard/project.xml
    geronimo/branches/1.1/applications/welcome/maven.xml
    geronimo/branches/1.1/applications/welcome/project.xml
    geronimo/branches/1.1/etc/maven.xml
    geronimo/branches/1.1/etc/project.properties
    geronimo/branches/1.1/plugins/geronimo-deployment-plugin/project.xml

Modified: geronimo/branches/1.1/applications/console-framework/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/console-framework/maven.xml?rev=399898&r1=399897&r2=399898&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-framework/maven.xml (original)
+++ geronimo/branches/1.1/applications/console-framework/maven.xml Thu May  4 17:35:14 2006
@@ -1,66 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project default="default"
-    xmlns:j="jelly:core"
-    xmlns:ant="jelly:ant"
-    xmlns:define="jelly:define"
-    xmlns:velocity="jelly:velocity"
-    xmlns:deploy="geronimo:deploy"
-    xmlns:util="jelly:util">
+<project default="default">
 
-      <postGoal name="war:webapp">
-        <attainGoal name="preCompile"/>
-    </postGoal>
-
-    <!-- Output folder for compiled jsps. -->
-    <j:set var="outDir"  value="${basedir}/target/${pom.artifactId}/WEB-INF/work"/>
-   
-    <!-- pre compile jsps -->   
     <goal name="default">
-        <ant:mkdir dir="${outDir}"/>
         <attainGoal name="war:install"/>
     </goal>
 
-    
-    <!-- ==================================================== -->
-    <!-- Pre compile JSPs                                     -->
-    <!-- ==================================================== -->
-<goal name="preCompile">
-    <j:set var="webroot"  value="${basedir}/target/${pom.artifactId}"/>
-    <ant:path id="jspc.classpath">
-      <ant:path refid="maven.dependency.classpath"/>
-      <ant:pathelement path="${maven.build.dest}"/>
-    </ant:path>
-    <ant:echo>Pre-compiling JSPs from ${basedir}/src/webapp to ${outDir}.</ant:echo>
-    <!-- ant:taskdef classname="org.apache.jasper.JspC" name="ant:jasper2" classpathref="jspc.classpath"/>
-   <ant:jasper2 
-     validateXml="false" 
-     uriroot="${webroot}"
-     webapp="${basedir}/src/webapp"
-     webXmlFragment="${webroot}/generated_web.xml"
-     addWebXmlMappings="true"
-     outputDir="${outDir}" /  -->
-
-    <ant:java classname="org.apache.jasper.JspC" fork="true" failonerror="true" classpathref="jspc.classpath">
-      <arg value="-d"/>
-      <arg value="${outDir}"/>
-      <arg value="-webapp"/>
-      <arg value="${basedir}/src/webapp"/>
-      <arg value="-uriroot"/>
-      <arg value="${webroot}"/>
-      <arg value="-webinc"/>
-      <arg value="${webroot}/WEB-INF/generated-web.xml"/>
-    </ant:java>
-
-    <ant:echo>Compiling generated Java files in ${outDir}.</ant:echo>
-    <ant:javac
-            srcdir="${outDir}"
-            destdir="${outDir}"
-            debug="${maven.compile.debug}"
-            deprecation="${maven.compile.deprecation}"
-            optimize="${maven.compile.optimize}"
-            classpathref="jspc.classpath"/>
-
-        <deploy:mergeWebXML uriRoot="${webroot}" />
-  </goal>
+    <postGoal name="war:webapp">
+      <attainGoal name="preCompile"/>
+    </postGoal>
 
 </project>

Modified: geronimo/branches/1.1/applications/console-framework/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/console-framework/project.xml?rev=399898&r1=399897&r2=399898&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-framework/project.xml (original)
+++ geronimo/branches/1.1/applications/console-framework/project.xml Thu May  4 17:35:14 2006
@@ -79,17 +79,11 @@
             <groupId>tomcat</groupId>
             <artifactId>jasper-runtime</artifactId>
             <version>${jasper_version}</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
         </dependency>
         <dependency>
             <groupId>tomcat</groupId>
             <artifactId>jasper-compiler</artifactId>
             <version>${jasper_version}</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
         </dependency>
 
         <dependency>
@@ -106,4 +100,3 @@
 
 
 </project>
-

Modified: geronimo/branches/1.1/applications/console-standard/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/console-standard/maven.xml?rev=399898&r1=399897&r2=399898&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-standard/maven.xml (original)
+++ geronimo/branches/1.1/applications/console-standard/maven.xml Thu May  4 17:35:14 2006
@@ -1,73 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project default="default"
-    xmlns:j="jelly:core"
-    xmlns:ant="jelly:ant"
-    xmlns:define="jelly:define"
-    xmlns:velocity="jelly:velocity"
-    xmlns:deploy="geronimo:deploy"
-    xmlns:util="jelly:util">
+        xmlns:ant="jelly:ant"
+        xmlns:velocity="jelly:velocity">
 
-  <postGoal name="war:webapp">
-    <attainGoal name="preCompile"/>
-    <attainGoal name="substitute"/>
-  </postGoal>
-
-  <!-- Output folder for compiled jsps. -->
-  <j:set var="outDir"  value="${basedir}/target/${pom.artifactId}/WEB-INF/work"/>
-
-  <!-- pre compile jsps -->
-  <goal name="default">
-    <ant:echo>${commons_fileupload_version}</ant:echo>
-    <ant:mkdir dir="${outDir}"/>
-    <attainGoal name="war:install"/>
-  </goal>
-
-  <goal name="substitute">
-    <velocity:merge basedir="${basedir}/src/conf"
-          template="jms-resource-providers.properties"
-          name="${basedir}/target/${pom.artifactId}/WEB-INF/classes/jms-resource-providers.properties"/>
-  </goal>
-
-  <!-- ==================================================== -->
-  <!-- Pre compile JSPs                                     -->
-  <!-- ==================================================== -->
-  <goal name="preCompile">
-    <j:set var="webroot"  value="${basedir}/target/${pom.artifactId}"/>
-    <ant:path id="jspc.classpath">
-      <ant:path refid="maven.dependency.classpath"/>
-      <ant:pathelement path="${maven.build.dest}"/>
-    </ant:path>
-
-    <ant:echo>Pre-compiling JSPs from ${basedir}/src/webapp to ${outDir}.</ant:echo>
-    <!-- ant:taskdef classname="org.apache.jasper.JspC" name="ant:jasper2" classpathref="jspc.classpath"/>
-   <ant:jasper2
-     validateXml="false"
-     uriroot="${webroot}"
-     webapp="${basedir}/src/webapp"
-     webXmlFragment="${webroot}/generated_web.xml"
-     addWebXmlMappings="true"
-     outputDir="${outDir}" /  -->
-
-    <ant:java classname="org.apache.jasper.JspC" fork="true" failonerror="true" classpathref="jspc.classpath">
-      <arg value="-d"/>
-      <arg value="${outDir}"/>
-      <arg value="-webapp"/>
-      <arg value="${basedir}/src/webapp"/>
-      <arg value="-uriroot"/>
-      <arg value="${webroot}"/>
-      <arg value="-webinc"/>
-      <arg value="${webroot}/WEB-INF/generated-web.xml"/>
-    </ant:java>
-
-    <ant:echo>Compiling generated Java files in ${outDir}.</ant:echo>
-    <ant:javac
-            srcdir="${outDir}"
-            destdir="${outDir}"
-            debug="${maven.compile.debug}"
-            deprecation="${maven.compile.deprecation}"
-            optimize="${maven.compile.optimize}"
-            classpathref="jspc.classpath"/>
-
-        <deploy:mergeWebXML uriRoot="${webroot}" />
-  </goal>
+    <postGoal name="war:webapp">
+        <attainGoal name="preCompile"/>
+        <attainGoal name="substitute"/>
+    </postGoal>
+
+    <goal name="default">
+        <ant:echo>${commons_fileupload_version}</ant:echo>
+        <attainGoal name="war:install"/>
+    </goal>
+
+    <goal name="substitute">
+        <velocity:merge basedir="${basedir}/src/conf"
+                template="jms-resource-providers.properties"
+                name="${basedir}/target/${pom.artifactId}/WEB-INF/classes/jms-resource-providers.properties"/>
+    </goal>
 </project>

Modified: geronimo/branches/1.1/applications/console-standard/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/console-standard/project.xml?rev=399898&r1=399897&r2=399898&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-standard/project.xml (original)
+++ geronimo/branches/1.1/applications/console-standard/project.xml Thu May  4 17:35:14 2006
@@ -273,17 +273,11 @@
             <groupId>tomcat</groupId>
             <artifactId>jasper-runtime</artifactId>
             <version>${jasper_version}</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
         </dependency>        
         <dependency>
             <groupId>tomcat</groupId>
             <artifactId>jasper-compiler</artifactId>
             <version>${jasper_version}</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
         </dependency>
         <dependency>
             <groupId>dwr</groupId>
@@ -311,6 +305,7 @@
             <version>${geronimo_deployment_plugin_version}</version>
             <type>plugin</type>
         </dependency>
+
     </dependencies>
 
     <build>

Modified: geronimo/branches/1.1/applications/welcome/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/welcome/maven.xml?rev=399898&r1=399897&r2=399898&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/welcome/maven.xml (original)
+++ geronimo/branches/1.1/applications/welcome/maven.xml Thu May  4 17:35:14 2006
@@ -18,13 +18,15 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project
-    default="default"
-    >
+<project default="default" >
 
     <goal name="default">
         <attainGoal name="war:install"/>
     </goal>
+
+    <postGoal name="war:webapp">
+      <attainGoal name="preCompile"/>
+    </postGoal>
 <!--
     <postGoal name="war:install">
         <attainGoal name="car:install"/>

Modified: geronimo/branches/1.1/applications/welcome/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/welcome/project.xml?rev=399898&r1=399897&r2=399898&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/welcome/project.xml (original)
+++ geronimo/branches/1.1/applications/welcome/project.xml Thu May  4 17:35:14 2006
@@ -32,6 +32,71 @@
     </description>
 
     <dependencies>
+      <dependency>
+            <groupId>ant</groupId>
+            <artifactId>ant</artifactId>
+            <version>${ant_version}</version>
+<!--            <properties>
+                <repository>true</repository>
+            </properties> -->
+        </dependency>
+        <dependency>
+            <groupId>commons-el</groupId>
+            <artifactId>commons-el</artifactId>
+            <version>${commons_el_version}</version>
+            <url>http://jakarta.apache.org/commons/el/</url>
+            <properties>
+                <repository>true</repository>
+            </properties>
+        </dependency>                       
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee_1.4_spec</artifactId>
+            <version>${geronimo_spec_j2ee_version}</version>
+            <properties>
+                <repository>true</repository>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>taglibs</groupId>
+            <artifactId>standard</artifactId>
+            <version>${standard_taglibs_version}</version>
+            <properties>
+                <war.bundle>true</war.bundle>
+            </properties>
+        </dependency>        
+        <dependency>
+            <groupId>jstl</groupId>
+            <artifactId>jstl</artifactId>
+            <version>${jstl_version}</version>
+            <properties>
+                <war.bundle>true</war.bundle>
+            </properties>
+        </dependency>        
+        <dependency>
+            <groupId>tomcat</groupId>
+            <artifactId>jasper-runtime</artifactId>
+            <version>${jasper_version}</version>
+        </dependency>        
+        <dependency>
+            <groupId>tomcat</groupId>
+            <artifactId>jasper-compiler</artifactId>
+            <version>${jasper_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-deployment-plugin</artifactId>
+            <version>${geronimo_deployment_plugin_version}</version>
+            <type>plugin</type>
+        </dependency>
+        <!-- Logging -->
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>${commons_logging_version}</version>
+        </dependency>
+
         <!-- todo these are here purely to force the deployer to be built - work out how
to remove them --> 
 <!--
         <dependency>

Modified: geronimo/branches/1.1/etc/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/etc/maven.xml?rev=399898&r1=399897&r2=399898&view=diff
==============================================================================
--- geronimo/branches/1.1/etc/maven.xml (original)
+++ geronimo/branches/1.1/etc/maven.xml Thu May  4 17:35:14 2006
@@ -25,6 +25,7 @@
     xmlns:ant="jelly:ant"
     xmlns:maven="jelly:maven"
     xmlns:define="jelly:define"
+    xmlns:deploy="geronimo:deploy"
     xmlns:velocity="jelly:velocity"
     >
 
@@ -258,5 +259,53 @@
       </j:if>
     </j:if>
   </postGoal>
+
+  <!-- ==================================================== -->
+    <!-- Pre compile JSPs                                     -->
+    <!-- ==================================================== -->
+<goal name="preCompile">
+  <!-- Output folder for compiled jsps. -->
+  <j:set var="outDir"  value="${basedir}/target/${pom.artifactId}/WEB-INF/work"/>
+  <ant:mkdir dir="${outDir}"/>
+
+    <j:set var="webroot"  value="${basedir}/target/${pom.artifactId}"/>
+    <ant:path id="jspc.classpath">
+      <ant:path refid="maven.dependency.classpath"/>
+      <ant:pathelement path="${maven.build.dest}"/>
+    </ant:path>
+    <ant:echo>Pre-compiling JSPs from ${basedir}/src/webapp to ${outDir}.</ant:echo>
+    <!-- ant:taskdef classname="org.apache.jasper.JspC" name="ant:jasper2" classpathref="jspc.classpath"/>
+   <ant:jasper2 
+     validateXml="false" 
+     uriroot="${webroot}"
+     webapp="${basedir}/src/webapp"
+     webXmlFragment="${webroot}/generated_web.xml"
+     addWebXmlMappings="true"
+     outputDir="${outDir}" /  -->
+
+    <ant:java classname="org.apache.jasper.JspC" fork="true" failonerror="true" classpathref="jspc.classpath">
+      <arg value="-d"/>
+      <arg value="${outDir}"/>
+      <arg value="-webapp"/>
+      <arg value="${basedir}/src/webapp"/>
+      <arg value="-uriroot"/>
+      <arg value="${webroot}"/>
+      <arg value="-webinc"/>
+      <arg value="${webroot}/WEB-INF/generated-web.xml"/>
+    </ant:java>
+
+    <ant:echo>Compiling generated Java files in ${outDir}.</ant:echo>
+    <ant:javac
+            srcdir="${outDir}"
+            destdir="${outDir}"
+            debug="${maven.compile.debug}"
+            deprecation="${maven.compile.deprecation}"
+            optimize="${maven.compile.optimize}"
+            classpathref="jspc.classpath"/>
+
+    <ant:echo>Merging generated-web.xml with our web.xml</ant:echo>
+    <deploy:mergeWebXML uriRoot="${webroot}" />
+  </goal>
+
 
 </project>

Modified: geronimo/branches/1.1/etc/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/etc/project.properties?rev=399898&r1=399897&r2=399898&view=diff
==============================================================================
--- geronimo/branches/1.1/etc/project.properties (original)
+++ geronimo/branches/1.1/etc/project.properties Thu May  4 17:35:14 2006
@@ -97,7 +97,7 @@
 
 geronimo_packaging_plugin_version=1.1.0-8
 geronimo_assembly_plugin_version=1.1.0-11
-geronimo_deployment_plugin_version=1.1.0-2
+geronimo_deployment_plugin_version=1.1.0-3
 geronimo_dependency_plugin_version=1.1.0-3
 
 geronimo_spec_activation_version=1.0

Modified: geronimo/branches/1.1/plugins/geronimo-deployment-plugin/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/plugins/geronimo-deployment-plugin/project.xml?rev=399898&r1=399897&r2=399898&view=diff
==============================================================================
--- geronimo/branches/1.1/plugins/geronimo-deployment-plugin/project.xml (original)
+++ geronimo/branches/1.1/plugins/geronimo-deployment-plugin/project.xml Thu May  4 17:35:14
2006
@@ -32,7 +32,7 @@
     <package>org.apache.geronimo</package>
     <logo></logo>
 
-    <currentVersion>1.1.0-2</currentVersion>
+    <currentVersion>1.1.0-3</currentVersion>
 
     <dependencies>
         <dependency>



Mime
View raw message