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

cvs commit: jakarta-turbine-maven/src/plugins-build/eclipse plugin.jelly

dion        2003/01/03 21:37:02

  Modified:    src/plugins-build/eclipse plugin.jelly
  Log:
  remove jj: so caching bug is worked around
  
  Revision  Changes    Path
  1.15      +21 -21    jakarta-turbine-maven/src/plugins-build/eclipse/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/eclipse/plugin.jelly,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- plugin.jelly	19 Sep 2002 00:30:53 -0000	1.14
  +++ plugin.jelly	4 Jan 2003 05:37:02 -0000	1.15
  @@ -1,20 +1,20 @@
   <?xml version="1.0"?>
   
  -<jj:project xmlns:j="jelly:core" xmlns:jj="jelly:jeez">
  +<project xmlns:j="jelly:core">
   
     <!--==================================================================-->
     <!-- Generate Eclipse .project and .classpath files                   -->
     <!--==================================================================-->    
  -  <jj:goal name="eclipse"
  +  <goal name="eclipse"
       description="Generate Eclipse project files"
       prereqs="eclipse:generate-project"/>
   
  -  <jj:goal name="eclipse:generate-project"
  +  <goal name="eclipse:generate-project"
       description="Generate Eclipse .project and .classpath project files">
   
  -    <jj:echo>Creating ${basedir}/.project ...</jj:echo>
  +    <echo>Creating ${basedir}/.project ...</echo>
   
  -	<j:file name="${basedir}/.project" prettyPrint="true">
  +	<j:file name="${basedir}/.project" prettyPrint="true" xmlns="dummy">
           <projectDescription>
   	    <name>${pom.id}</name>
   	    <comment></comment>
  @@ -33,9 +33,9 @@
         </projectDescription>
   	</j:file>
   
  -    <jj:echo>Creating ${basedir}/.classpath ...</jj:echo>
  +    <echo>Creating ${basedir}/.classpath ...</echo>
   
  -	<j:file name="${basedir}/.classpath" prettyPrint="true">
  +	<j:file name="${basedir}/.classpath" prettyPrint="true" xmlns="dummy">
         <classpath>
   
           <j:if test="${sourcesPresent}">
  @@ -54,21 +54,21 @@
         </classpath>
   	</j:file>	
   
  -  </jj:goal>
  +  </goal>
   
     <!--==================================================================-->
     <!-- Generate Eclipse mappings for Maven goals                        -->
     <!--==================================================================-->
  -  <jj:goal name="eclipse:external-tools"
  +  <goal name="eclipse:external-tools"
              description="Generate an Eclipse external tool for each goal">
  -    <jj:mkdir dir="${maven.build.dir}/eclipse/"/>
  +    <mkdir dir="${maven.build.dir}/eclipse/"/>
       <j:set var="toolFile" value="${maven.build.dir}/eclipse/externaltools.xml" />
   
  -    <jj:echo>Creating ${toolFile}</jj:echo>
  +    <echo>Creating ${toolFile}</echo>
   
       <j:set var="os" value="${os.name}" />
       <j:set var="windows" value="${os.toLowerCase().indexOf('windows') != '-1'}"/>
  -    <jj:echo>Adapting the generated file for a ${os} box.</jj:echo>
  +    <echo>Adapting the generated file for a ${os} box.</echo>
       
       <!-- Strangely, j:file inserts a space between ${maven.home} and /bin/maven ... --> 
       <j:set var="tool.loc" value="${maven.home}${file.separator}bin${file.separator}maven"/>
  @@ -76,7 +76,7 @@
         <j:set var="tool.loc" value="${tool.loc}.bat"/>
       </j:if>
       
  -    <j:file name="${toolFile}" prettyPrint="true">
  +    <j:file name="${toolFile}" prettyPrint="true" xmlns="dummy">
         <externaltools>
           <j:set var="project" value="${org.apache.commons.jelly.werkz.Project}"/>
   
  @@ -115,28 +115,28 @@
       <j:set var="ws" value="${maven.eclipse.workspace}X" />
       <j:if test='${ws != "X"}'>
       	<j:set var="toDir" value="${maven.eclipse.workspace}/.metadata/.plugins/org.eclipse.ui.externaltools/" />
  -    	<jj:copy file="${toolFile}" todir="${toDir}"/>
  +    	<copy file="${toolFile}" todir="${toDir}"/>
       </j:if>
   
  -  </jj:goal>
  +  </goal>
   
     <!--==================================================================-->
     <!-- Add MAVEN_REPO to classpath variables                            -->
     <!--==================================================================-->
  -  <jj:goal name="eclipse:add-maven-repo"
  +  <goal name="eclipse:add-maven-repo"
       description="Ensure that the classpath variable MAVEN_REPO is available">
   
       <j:set var="ws" value="${maven.eclipse.workspace}X" />
       <j:choose>
         <j:when test='${ws != "X"}'>
           <j:set var="variableFile" value="${maven.eclipse.workspace}/.metadata/.plugins/org.eclipse.jdt.core/pref_store.ini" />
  -        <jj:propertyfile file="${variableFile}">
  -          <jj:entry key="org.eclipse.jdt.core.classpathVariable.MAVEN_REPO"
  +        <propertyfile file="${variableFile}">
  +          <entry key="org.eclipse.jdt.core.classpathVariable.MAVEN_REPO"
               default="${maven.repo.local}" />
  -        </jj:propertyfile>
  +        </propertyfile>
         </j:when>
         <j:otherwise>The property $${maven.eclipse.workspace} was not set. MAVEN_REPO may not be set.</j:otherwise>
       </j:choose>
  -  </jj:goal>
  +  </goal>
   
  -</jj:project>
  +</project>
  
  
  

Re: cvs commit: jakarta-turbine-maven/src/plugins-build/eclipse plugin.jelly

Posted by Jason van Zyl <ja...@zenplex.com>.
On Sat, 2003-01-04 at 00:37, dion@apache.org wrote:
> dion        2003/01/03 21:37:02
> 
>   Modified:    src/plugins-build/eclipse plugin.jelly
>   Log:
>   remove jj: so caching bug is worked around

It's happening with the idea plugin too btw.
  

-- 
jvz.

Jason van Zyl
jason@zenplex.com
http://tambora.zenplex.org

In short, man creates for himself a new religion of a rational
and technical order to justify his work and to be justified in it.
  
  -- Jacques Ellul, The Technological Society