cvs commit: maven-jahiawar-plugin plugin.jelly plugin.properties

[Serge Huber]

shuber      2004/09/16 16:46:51 CEST

  Modified files:
    .                    plugin.jelly plugin.properties 
  Log:
  Still some bugfixing on JSP compilation, and now the exclusion of JSPs is done 
through this plugin instead of doing it through the WAR plugin.
  
  Revision  Changes    Path
  1.3       +12 -5     maven-jahiawar-plugin/plugin.jelly
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/maven-jahiawar-plugin/plugin.jelly.diff?r1=1.2&r2=1.3&f=h
  1.2       +2 -1      maven-jahiawar-plugin/plugin.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/maven-jahiawar-plugin/plugin.properties.diff?r1=1.1&r2=1.2&f=h
  
  
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/repository/maven-jahiawar-plugin/plugin.jelly,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- plugin.jelly      16 Sep 2004 12:48:38 -0000      1.2
  +++ plugin.jelly      16 Sep 2004 14:46:50 -0000      1.3
  @@ -24,9 +24,10 @@
           <ant:replace file="${target}/WEB-INF/web.xml" token="&lt;!-- [INSERT 
FRAGMENT HERE] --&gt;" value="${fragment}"/>
         </util:available>
         <!-- We now need to copy the compiled classes to the WEB-INF/classes 
directory. -->
  +      <!--echo>Copying JSP classes from ${maven.build.dest} to 
${maven.war.webapp.dir}/WEB-INF/classes ...</echo-->
         <copy todir="${maven.war.webapp.dir}/WEB-INF/classes">
           <fileset dir="${maven.build.dest}"/>
  -      </copy>
  +      </copy>      
       </j:if>
   
       <j:set var="useSharedLibs" value="${maven.jahiawar.usesharedlibs}"/>
  @@ -34,11 +35,17 @@
           <delete>
             <fileset dir="${maven.build.dir}/${pom.artifactId}/WEB-INF/lib" 
includes="${maven.jahiawar.usesharedlibs.list}" />
           </delete>
  -     </j:if>
  +    </j:if>
  +     
  +    <delete>
  +        <fileset dir="${maven.build.dir}/${pom.artifactId}" 
includes="${maven.jahiawar.excludes}" />
  +    </delete>
  +     
     </postGoal>
   
     <goal name="jahia:precompile-jsp" description="Precompile all JSPs into java 
classes, and then into classes">
       <j:set var="warSource" 
value="${pom.getPluginContext('maven-war-plugin').getVariable('maven.war.webapp.dir')}"/>
  +    <j:set var="jspSource" 
value="${pom.getPluginContext('maven-war-plugin').getVariable('maven.war.src')}"/>
       <ant:mkdir dir="${maven.build.dir}/jspc"/>
       <!--ant:mkdir dir="${maven.build.dir}/jspc-processed"/-->
       <!--ant:mkdir dir="${maven.build.dir}/jspc-classes"/-->
  @@ -60,16 +67,16 @@
         <ant:path refid="maven.dependency.classpath"/>
         <ant:pathelement path="${maven.build.dest}"/>
       </ant:path>
  -    <echo>Generating Java source from JSPs, using warSource=${warSource}...</echo>
  +    <echo>Generating Java source from JSPs...</echo>
       <jasper:JspC
         webXmlFragment="${maven.build.dir}/web-fragment.xml"
         package="${pom.package}.jsp.${maven.war.final.name}"
         outputDir="${jspOutDir}"
  -      srcdir="${warSource}"
  +      srcdir="${jspSource}"
         uriroot="${warSource}"
         uribase="/${pom.artifactId}"
         verbose="2"/>
  -    <echo>Compiling generated source...</echo>
  +    <echo>Compiling generated JSP Java source...</echo>
       <ant:javac
         srcdir="${jspOutDir}"
         destdir="${jspClassesOutDir}"
  
  
  
  Index: plugin.properties
  ===================================================================
  RCS file: /home/cvs/repository/maven-jahiawar-plugin/plugin.properties,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- plugin.properties 10 Sep 2004 13:07:40 -0000      1.1
  +++ plugin.properties 16 Sep 2004 14:46:50 -0000      1.2
  @@ -6,12 +6,13 @@
   maven.jahiawar.jarclasses.name=${pom.artifactId}-${pom.currentVersion}.jar
   # set to true if you only want the *.class files in the JAR, false will include the 
whole contents of WEB-INF/classes
   maven.jahiawar.jarclasses.justclasses=true
  +maven.jahiawar.excludes=**/*.jsp
   
   # the name of the context under which to deploy the application.
   maven.jahiawar.deploy.context.name=${pom.artifactId}
   maven.war.final.name=${maven.jahiawar.deploy.context.name}.war
   # remove this if you want to include JSPs.
  -maven.war.src.excludes=**/*.jsp
  +#maven.war.src.excludes=**/*.jsp
   
   # Set to true if you want JSP precompilation to happen after war:webapp goal
   maven.jahiawar.precompile.jsp=true