You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by bw...@apache.org on 2003/02/04 00:58:10 UTC

cvs commit: jakarta-turbine-maven/src/plugins-build/jbuilder/src/plugin-resources library.jsl

bwalding    2003/02/03 15:58:10

  Modified:    src/plugins-build/jbuilder plugin.jelly
  Removed:     src/plugins-build/jbuilder/src/plugin-resources library.jsl
  Log:
  MAVEN-251: Removed jsl file as it isn't really required for a plugin this trivial.  Now follows same pattern as eclipse plugin, merge opportunity?
  
  Revision  Changes    Path
  1.2       +17 -23    jakarta-turbine-maven/src/plugins-build/jbuilder/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/jbuilder/plugin.jelly,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- plugin.jelly	24 Jan 2003 03:45:34 -0000	1.1
  +++ plugin.jelly	3 Feb 2003 23:58:09 -0000	1.2
  @@ -1,8 +1,7 @@
   <?xml version="1.0"?>
   
   <project 
  -  xmlns:j="jelly:core" 
  -  xmlns:doc="doc">
  +  xmlns:j="jelly:core">
   
     <!--==================================================================-->
     <!-- Generate JBuilder [id_project].library files                     -->
  @@ -15,37 +14,32 @@
       description="Generate JBuilder [id_project].library file">
   
       <echo>Creating ${basedir}/${pom.artifactId}.library ...</echo>
  -	  <j:file name="${basedir}/jbuilder_library.xml" prettyPrint="true" xmlns="dummy">
  -      <classpath>
  +	  <j:file name="${basedir}/${pom.artifactId}.library" prettyPrint="true" xmlns="dummy">
  +	  
  +	  <library>
  +      <!--JBuilder Library Definition File-->
  +      <fullname>${pom.artifactId}</fullname>
  +      <class>
           <j:if test="${maven.has.jar.resource.patterns}">
  -          <classpathentry path="${maven.jarResources.basedir}"/>
  +          <path>${maven.jarResources.basedir}"</path>
           </j:if>
           <j:if test="${pom.build.testResources != null}">
             <j:forEach var="res" items="${pom.build.testResources}">
  -            <classpathentry path="${res.directory}"/>
  +            <path>${res.directory}</path>
             </j:forEach>
           </j:if>
           <j:if test="${pom.build.unitTest.resources != null}">
  -          <classpathentry path="${pom.build.unitTestSourceDirectory}"/>
  +          <path>${pom.build.unitTestSourceDirectory}</path>
           </j:if>
  -        <j:forEach var="lib" items="${pom.dependencies}">
  -          <classpathentry path="${maven.repo.local}/${lib.artifactDirectory}/jars/${lib.artifact}"/>
  +        <j:forEach var="lib" items="${pom.artifacts}">
  +          <!-- Had some problems with whitespace, so use j:expr -->
  +          <path><j:expr value="${maven.repo.local}${lib.urlPath}"/></path>
           </j:forEach>
  -      </classpath>
  +      </class>
  +      <required>${pom.artifactId}</required>
  +    </library>
     	</j:file>	
  -
  -     <doc:jsl
  -       input="${basedir}/jbuilder_library.xml"
  -       output="${basedir}/${pom.artifactId}.library"
  -       stylesheet="${plugin.resources}/library.jsl"
  -       encoding="${maven.docs.outputencoding}"
  -       omitXmlDeclaration="true"
  -       outputMode="xml"
  -       prettyPrint="true"
  -     />
  -
  -    <delete file="${basedir}/jbuilder_library.xml"/>
  -    
  +  	
     </goal>
     
     <goal name="jbuilder:generate-project"