diff -c -r1.9 build.properties
*** build.properties    5 May 2007 05:26:55 -0000       1.9
--- build.properties    6 Dec 2007 20:52:46 -0000
***************
*** 50,57 ****
  webui-jsf-suntheme.jar=${glassfish.adminguijsf.dir}/WEB-INF/lib/webui-jsf-suntheme.jar
  commons-fileupload.jar=${glassfish.adminguijsf.dir}/WEB-INF/lib/commons-fileupload-1.1.1.jar
  commons-io.jar=${glassfish.adminguijsf.dir}/WEB-INF/lib/commons-io-1.2.jar
! jsftemplating.jar=${glassfish.adminguijsf.dir}/WEB-INF/lib/jsftemplating.jar
! jsftemplating-dynafaces.jar=${glassfish.adminguijsf.dir}/WEB-INF/lib/jsftemplating-dynafaces-0.1.jar.jar
  jsftemplating-dt.jar=lib/jsftemplating-dt.jar
  javaee.jar=${glassfish.home}/lib/javaee.jar
  jsf-impl.jar=${glassfish.home}/lib/jsf-impl.jar
--- 50,57 ----
  webui-jsf-suntheme.jar=${glassfish.adminguijsf.dir}/WEB-INF/lib/webui-jsf-suntheme.jar
  commons-fileupload.jar=${glassfish.adminguijsf.dir}/WEB-INF/lib/commons-fileupload-1.1.1.jar
  commons-io.jar=${glassfish.adminguijsf.dir}/WEB-INF/lib/commons-io-1.2.jar
! jsftemplating.jar=${glassfish.adminguijsf.dir}/WEB-INF/lib/${glassfish.jsftemplating.name}-${glassfish.jsftemplating.version}.jar
! jsftemplating-dynafaces.jar=${glassfish.adminguijsf.dir}/WEB-INF/lib/${glassfish.jsftemplating_dynafaces.name}-${glassfish.jsftemplating_dynafaces.version}.jar
  jsftemplating-dt.jar=lib/jsftemplating-dt.jar
  javaee.jar=${glassfish.home}/lib/javaee.jar
  jsf-impl.jar=${glassfish.home}/lib/jsf-impl.jar

diff -c -r1.100.2.4 glassfish.xml
*** glassfish.xml       27 Sep 2007 08:52:40 -0000      1.100.2.4
--- glassfish.xml       6 Dec 2007 20:54:52 -0000
***************
*** 255,269 ****
          <!-- the jbi-admin-common.jar is unzipped directly into glassfish/lib
          by a do.unzip antcall for jbi-common.jar under the unzip-pe.jars task -->
  
-       <!-- jsftemplating for admin-gui -->
-         <unzip src="${glassfish.home}/jsftemplating.zip"
-                dest="${glassfish.home}"/>
-         <delete file="${glassfish.home}/jsftemplating.zip"/>
- 
        <!-- Woodstock component  for admin-gui -->
          <unzip src="${glassfish.home}/woodstock.zip"
                 dest="${glassfish.home}"/>
          <delete file="${glassfish.home}/woodstock.zip"/>
  
          <!-- Fix the execute mode on executables for nss-util -->
          <chmod perm="ugo+x">
--- 255,267 ----
          <!-- the jbi-admin-common.jar is unzipped directly into glassfish/lib
          by a do.unzip antcall for jbi-common.jar under the unzip-pe.jars task 
-->
  
        <!-- Woodstock component  for admin-gui -->
          <unzip src="${glassfish.home}/woodstock.zip"
                 dest="${glassfish.home}"/>
          <delete file="${glassfish.home}/woodstock.zip"/>
+         <copy file="${jsftemplating.jar}" todir="${glassfish.applications.home}/admingui/adminGUI_war/WEB-INF/lib"/>
+         <copy file="${jsftemplating_dynafaces.jar}" todir="${glassfish.applications.home}/admingui/adminGUI_war/WEB-INF/lib"/>
+ 
  
          <!-- Fix the execute mode on executables for nss-util -->
          <chmod perm="ugo+x">
***************
*** 432,443 ****
          </antcall>
  
          <antcall target="do.unzip">
-             <param name="name" value="${glassfish.jsftemplating.name}"/>
-             <param name="version" value="${glassfish.jsftemplating.version}"/>
-             <param name="directory" value="${glassfish.home}"/>
-         </antcall>
- 

RCS file: /cvs/glassfish/bootstrap/project.properties,v
retrieving revision 1.401.2.10
diff -c -r1.401.2.10 project.properties
*** project.properties  31 Oct 2007 20:03:46 -0000      1.401.2.10
--- project.properties  6 Dec 2007 20:56:00 -0000
***************
*** 133,139 ****
  glassfish.ldapbp.name=ldapbp
  glassfish.ldapbp.version=1.1_01_fcs
  glassfish.jsftemplating.name=jsftemplating
! glassfish.jsftemplating.version=1.0-03292007
  glassfish.woodstock.name=woodstock
  glassfish.woodstock.version=4.0-03162007
  glassfish.netbeans.name=netbeans
--- 133,142 ----
  glassfish.ldapbp.name=ldapbp
  glassfish.ldapbp.version=1.1_01_fcs
  glassfish.jsftemplating.name=jsftemplating
! glassfish.jsftemplating.version=1.0
! glassfish.jsftemplating.groupId=com.sun.jsftemplating
! glassfish.jsftemplating_dynafaces.name=jsftemplating-dynafaces
! glassfish.jsftemplating_dynafaces.version=0.1-1.0
  glassfish.woodstock.name=woodstock
  glassfish.woodstock.version=4.0-03162007
  glassfish.netbeans.name=netbeans
***************
*** 200,205 ****
--- 203,210 ----
  # acceptable use of this property is for creating j2ee.jar in post-bootstrap
  # ant task (file glassfish/bootstrap/glassfish.xml).
  j2ee.jar=${glassfish.home}/lib/j2ee.jar
+ jsftemplating.jar=${repo.local}/${glassfish.jsftemplating.groupId}/jars/${glas
sfish.jsftemplating.name}-${glassfish.jsftemplating.version}.jar
+ jsftemplating_dynafaces.jar=${repo.local}/${glassfish.jsftemplating.groupId}/j
ars/${glassfish.jsftemplating_dynafaces.name}-${glassfish.jsftemplating_dynaface
s.version}.jar

Index: project-src.xml
===================================================================
RCS file: /cvs/glassfish/bootstrap/project-src.xml,v
retrieving revision 1.48.6.3
diff -c -r1.48.6.3 project-src.xml
*** project-src.xml     27 Sep 2007 08:53:34 -0000      1.48.6.3
--- project-src.xml     6 Dec 2007 20:56:59 -0000
***************
*** 196,207 ****
           </dependency>
           <dependency>
            <artifactId>jsftemplating</artifactId>
!             <groupId>${glassfish.jsftemplating.name}</groupId>
            <jar>${glassfish.jsftemplating.name}-${glassfish.jsftemplating.versi
on}.jar</jar>
              <version>${glassfish.jsftemplating.version}</version>
              <url/>
           </dependency>
           <dependency>
              <id>${glassfish.updatecenter.name}</id>
              <version>${glassfish.updatecenter.version}</version>
           </dependency>
--- 196,214 ----
           </dependency>
           <dependency>
            <artifactId>jsftemplating</artifactId>
!             <groupId>${glassfish.jsftemplating.groupId}</groupId>
            <jar>${glassfish.jsftemplating.name}-${glassfish.jsftemplating.versi
on}.jar</jar>
              <version>${glassfish.jsftemplating.version}</version>
              <url/>
           </dependency>
           <dependency>
+           <artifactId>jsftemplating-dynafaces</artifactId>
+             <groupId>${glassfish.jsftemplating.groupId}</groupId>
+           <jar>${glassfish.jsftemplating_dynafaces.name}-${glassfish.jsftempla
ting_dynafaces.version}.jar</jar>
+             <version>${glassfish.jsftemplating_dynafaces.version}</version>
+             <url/>
+          </dependency>
+          <dependency>
              <id>${glassfish.updatecenter.name}</id>
              <version>${glassfish.updatecenter.version}</version>