geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r393987 - in /geronimo/branches/1.1/applications: console-framework/maven.xml console-standard/maven.xml
Date Fri, 14 Apr 2006 00:25:57 GMT
Author: dain
Date: Thu Apr 13 17:25:55 2006
New Revision: 393987

URL: http://svn.apache.org/viewcvs?rev=393987&view=rev
Log:
Disable broken jsp precompilation code

Modified:
    geronimo/branches/1.1/applications/console-framework/maven.xml
    geronimo/branches/1.1/applications/console-standard/maven.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=393987&r1=393986&r2=393987&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-framework/maven.xml (original)
+++ geronimo/branches/1.1/applications/console-framework/maven.xml Thu Apr 13 17:25:55 2006
@@ -6,16 +6,18 @@
     xmlns:velocity="jelly:velocity"
     xmlns:util="jelly:util">
 
+<!--
     <preGoal name="war:war">
         <attainGoal name="preCompile"/>
     </preGoal>
+-->
 
     <!-- Output folder for compiled jsps. -->
-    <j:set var="outDir"  value="${basedir}/target/${pom.artifactId}/WEB-INF/work"/>
    
+    <!--<j:set var="outDir"  value="${basedir}/target/${pom.artifactId}/WEB-INF/work"/>
    -->
    
     <!-- pre compile jsps -->   
     <goal name="default">
-        <ant:mkdir dir="${outDir}"/>         
+        <!--<ant:mkdir dir="${outDir}"/>         -->
         <attainGoal name="war:install"/>
     </goal>
 
@@ -23,6 +25,7 @@
     <!-- ==================================================== -->
     <!-- Pre compile JSPs                                     -->
     <!-- ==================================================== -->
+<!--
     <goal name="preCompile">
         <ant:path id="jspc.classpath">
             <ant:path refid="maven.dependency.classpath"/>
@@ -44,5 +47,6 @@
             optimize="${maven.compile.optimize}"
             classpathref="jspc.classpath"/>
     </goal>  
+-->
 
 </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=393987&r1=393986&r2=393987&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-standard/maven.xml (original)
+++ geronimo/branches/1.1/applications/console-standard/maven.xml Thu Apr 13 17:25:55 2006
@@ -5,31 +5,32 @@
     xmlns:define="jelly:define"
     xmlns:velocity="jelly:velocity"
     xmlns:util="jelly:util">
-
+
     <preGoal name="war:war">
-        <attainGoal name="preCompile"/>
+        <!--<attainGoal name="preCompile"/>-->
         <attainGoal name="substitute"/>
     </preGoal>
-
+
     <!-- Output folder for compiled jsps. -->
-    <j:set var="outDir"  value="${basedir}/target/${pom.artifactId}/WEB-INF/work"/>
+    <!--<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}"/>
+        <!--<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>
-
+    <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">
         <ant:path id="jspc.classpath">
             <ant:path refid="maven.dependency.classpath"/>
@@ -51,5 +52,6 @@
             optimize="${maven.compile.optimize}"
             classpathref="jspc.classpath"/>
     </goal>
+-->
 
 </project>



Mime
View raw message