svn commit: r357886 - in /myfaces/build/trunk: build-facelets.xml facelets-build.xml tools/build-tools.jar tools/src/java/org/apache/myfaces/tools/FaceletsTaglibTask.java

[to...@apache.org]

Author: tomsp
Date: Mon Dec 19 19:01:11 2005
New Revision: 357886

URL: http://svn.apache.org/viewcvs?rev=357886&view=rev
Log: (empty)

Added:
    myfaces/build/trunk/build-facelets.xml
      - copied, changed from r357804, myfaces/build/trunk/facelets-build.xml
Removed:
    myfaces/build/trunk/facelets-build.xml
    myfaces/build/trunk/tools/build-tools.jar
Modified:
    myfaces/build/trunk/tools/src/java/org/apache/myfaces/tools/FaceletsTaglibTask.java

Copied: myfaces/build/trunk/build-facelets.xml (from r357804, myfaces/build/trunk/facelets-build.xml)
URL: http://svn.apache.org/viewcvs/myfaces/build/trunk/build-facelets.xml?p2=myfaces/build/trunk/build-facelets.xml&p1=myfaces/build/trunk/facelets-build.xml&r1=357804&r2=357886&rev=357886&view=diff
==============================================================================
--- myfaces/build/trunk/facelets-build.xml (original)
+++ myfaces/build/trunk/build-facelets.xml Mon Dec 19 19:01:11 2005
@@ -1,9 +1,16 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<project name="facelets-build"  default="facelets-taglibs">
+<project name="myfaces-facelets"  default="facelets-taglibs">
 
     <property name="build.dir" location="${basedir}"/>
+    <property name="project.dir" location="${basedir}/.."/>
     <property name="lib.dir" location="${build.dir}/../lib"/>
 
+    <property name="javac.debug"          value="on"/>
+    <property name="javac.optimize"       value="off"/>
+
+    <property name="build.tools.src" value="${build.dir}/tools/src/java" />
+    <property name="build.tools.classes" value="${build.dir}/temp/tools/classes" />
+
     <!-- needed libs
         build/dist/myfaces-all.jar
         build/tools/build-tools.jar
@@ -14,11 +21,40 @@
         lib/common-logging.jar
         lib/jsp.jar
     -->
-    <target name="facelets-taglibs" >
-        <taskdef name="faceletstask"
-                 classname="org.apache.myfaces.tools.FaceletsTaglibTask" />
+
+    <path id="build.tools.classpath">
+        <pathelement location="${build.dir}/dist/myfaces-all.jar"/>
+        <pathelement location="${project.dir}/sandbox/build/dist/sandbox.jar"/>
+        <pathelement location="${lib.dir}/commons-beanutils.jar"/>
+        <pathelement location="${lib.dir}/commons-collections.jar"/>
+        <pathelement location="${lib.dir}/commons-digester.jar"/>
+        <pathelement location="${lib.dir}/commons-logging.jar"/>
+        <pathelement location="${lib.dir}/jsp.jar"/>
+        <path path="${build.tools.classes}" />
+    </path>
+
+    <target name="facelets-taglibs" depends="compile" >
+        <taskdef name="faceletstask" classname="org.apache.myfaces.tools.FaceletsTaglibTask"
+                 classpathref="build.tools.classpath"
+            >
+        </taskdef>
 
         <faceletstask sourceTld="${build.dir}/../tomahawk/build/temp/tlds/tomahawk.tld" targetFile="${build.dir}/dist/tomahawk.taglib.xml" />
         <faceletstask sourceTld="${build.dir}/../sandbox/build/temp/tlds/myfaces_sandbox.tld" targetFile="${build.dir}/dist/sandbox.taglib.xml" />
     </target>
+
+    <target name="compile">
+        <mkdir dir="${build.tools.classes}" />
+        <javac srcdir="${build.tools.src}"
+               destdir="${build.tools.classes}"
+               optimize="${javac.optimize}"
+               debug="${javac.debug}"
+               classpathref="build.tools.classpath">
+        </javac>
+    </target>
+
+    <target name="clean">
+        <delete dir="${build.tools.classes}" />
+    </target>
+
 </project>

Modified: myfaces/build/trunk/tools/src/java/org/apache/myfaces/tools/FaceletsTaglibTask.java
URL: http://svn.apache.org/viewcvs/myfaces/build/trunk/tools/src/java/org/apache/myfaces/tools/FaceletsTaglibTask.java?rev=357886&r1=357885&r2=357886&view=diff
==============================================================================
--- myfaces/build/trunk/tools/src/java/org/apache/myfaces/tools/FaceletsTaglibTask.java (original)
+++ myfaces/build/trunk/tools/src/java/org/apache/myfaces/tools/FaceletsTaglibTask.java Mon Dec 19 19:01:11 2005
@@ -88,7 +88,6 @@
 
     public void createFaceletTaglib(File source, File target) throws Exception {
         FacesContextSingleton.setCurrentInstance(new FacesContextMock());
-
         Digester digester = new Digester();
         digester.addObjectCreate("taglib", Taglib.class);
         digester.addCallMethod("taglib/uri", "setUri", 0);