commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jstrac...@apache.org
Subject cvs commit: jakarta-commons-sandbox/jelly/src/bin jelly.bat
Date Wed, 10 Jul 2002 16:12:18 GMT
jstrachan    2002/07/10 09:12:18

  Modified:    jelly    maven.xml project.xml
               jelly/src/test/org/apache/commons/jelly/expression
                        TestExpressions.java
               jelly/src/bin jelly.bat
  Log:
  Patched the dist:build target so that now all the dependent jars go into the lib directory
and the binary scripts to the bin directory.
  For some reason the jelly.bat script doesn't quite work yet; it could be a minor issue with
forehead. We're nearly there...
  
  Revision  Changes    Path
  1.6       +33 -4     jakarta-commons-sandbox/jelly/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/jelly/maven.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- maven.xml	7 Jul 2002 19:38:11 -0000	1.5
  +++ maven.xml	10 Jul 2002 16:12:17 -0000	1.6
  @@ -1,5 +1,6 @@
   <project default="java:jar" xmlns:j="jelly:core">
   
  +
     <!-- runs the XML doclet -->	
     <goal name="xml-doclet" prereqs="java:compile">
       <path id="doclet.classpath">
  @@ -59,16 +60,44 @@
   	
     </goal>
   
  +
     <!-- ensure that the tag documentation is generated as part of the site -->	
  -  <goal
  -    name="deploy-site2" prereqs="doc-tags, deploy-site">
  -  </goal>
  -  
     <preGoal
       name="site:generate">
   
   	<attainGoal name="doc-tags"/>
   	
     </preGoal>
  +
  +  <!-- create the lib and bin directories in the binary distro -->	
  +  <preGoal
  +    name="dist:build">
  +
  +	<echo>The POM is ${pom.build}</echo>
  +	<echo>About to create lib and bin directories in ${maven.dist.assembly.dir}</echo>
  +
  +	<mkdir dir="${maven.dist.assembly.dir}/bin"/>
  +	<mkdir dir="${maven.dist.assembly.dir}/lib"/>
  +	
  +    <copy todir="${maven.dist.assembly.dir}/bin">
  +      <fileset dir="src/bin"/>
  +    </copy>
  +
  +    <j:forEach var="dep" items="${pom.dependencies}">
  +      <j:choose>
  +        <j:when test="${dep.id == 'forehead'}">
  +      	  <copy tofile="${maven.dist.assembly.dir}/lib/forehead.jar" 
  +      	    	file="${maven.repo.local}/${dep.id}/jars/${dep.jar}"/>
  +        </j:when>
  +        <j:otherwise>
  +      	  <copy todir="${maven.dist.assembly.dir}/lib" 
  +      	    	file="${maven.repo.local}/${dep.id}/jars/${dep.jar}"/>
  +      	</j:otherwise>
  +      </j:choose>
  +	</j:forEach>
  +		       	    
  +  </preGoal>
  +
  +
             
   </project>
  
  
  
  1.39      +8 -1      jakarta-commons-sandbox/jelly/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/jelly/project.xml,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- project.xml	9 Jul 2002 21:13:07 -0000	1.38
  +++ project.xml	10 Jul 2002 16:12:17 -0000	1.39
  @@ -96,7 +96,7 @@
       
       <dependency>
         <id>xml-apis</id>
  -      <version>2.0.0</version>
  +      <version>2.0.2</version>
       </dependency>
       
       <dependency>
  @@ -158,6 +158,13 @@
       <dependency>
         <id>werkz</id>
         <version>1.0-beta-2</version>
  +    </dependency>
  +
  +	<!-- for the jelly startup scripts -->
  +    <dependency>
  +      <id>forehead</id>
  +      <version>1.0-beta-2</version>
  +      <url>http://forehead.sf.net/</url>
       </dependency>
       
       <!-- 
  
  
  
  1.4       +16 -0     jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/expression/TestExpressions.java
  
  Index: TestExpressions.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/expression/TestExpressions.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- TestExpressions.java	13 Jun 2002 09:40:53 -0000	1.3
  +++ TestExpressions.java	10 Jul 2002 16:12:17 -0000	1.4
  @@ -119,6 +119,22 @@
           assertExpression("cheese ${maven.some.madeup.name}pizza", "cheese pizza");
           assertExpression("ham and ${maven.home.foo} pizza", "ham and cheese pizza");
       }
  +
  +/*    
  +    temporally disablled until jexl gets patched...
  +    
  +    public void testNull() throws Exception {
  +        context.setVariable("something.blank", "");
  +        context.setVariable("something.ok", "cheese");
  +        
  +        assertExpression("${something.blank.length == 0}", Boolean.TRUE);
  +        assertExpression("${something.blank == ''}", Boolean.TRUE);
  +        assertExpression("${something.ok != null}", Boolean.TRUE);
  +        assertExpression("${something.ok != ''}", Boolean.TRUE);
  +        assertExpression("${something.null != ''}", Boolean.FALSE);
  +        assertExpression("${unknown == null}", Boolean.TRUE);
  +    }
  +*/
       
       protected void assertExpression(String expressionText, Object expectedValue) throws
Exception {
           Expression expression = CompositeExpression.parse(expressionText, factory);
  
  
  
  1.2       +1 -1      jakarta-commons-sandbox/jelly/src/bin/jelly.bat
  
  Index: jelly.bat
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/bin/jelly.bat,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- jelly.bat	10 Jul 2002 12:58:25 -0000	1.1
  +++ jelly.bat	10 Jul 2002 16:12:17 -0000	1.2
  @@ -1,4 +1,4 @@
   @echo off
   
  -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;%JELLY_HOME\lib\forehead.jar -Dforehead.conf.file=%JELLY_HOME%\bin\forehead.conf
-Dant.home=%ANT_HOME% -Djelly.home=%JELLY_HOME% -Dtools.jar=%JAVA_HOME\lib\tools.jar com.werken.forehead.Forehead
%@
  +%JAVA_HOME%\bin\java -classpath %JELLY_HOME%\lib\forehead.jar -Dforehead.conf.file=%JELLY_HOME%\bin\forehead.conf
-Dant.home=%ANT_HOME% -Djelly.home=%JELLY_HOME% -Dtools.jar=%JAVA_HOME%\lib\tools.jar com.werken.forehead.Forehead
%*
   
  
  
  

--
To unsubscribe, e-mail:   <mailto:commons-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:commons-dev-help@jakarta.apache.org>


Mime
View raw message