[Smartfrog-checkins] core/components/jetty build.xml,1.22,1.23

[Steve L. <st...@us...>]

Update of /cvsroot/smartfrog/core/components/jetty
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26129/components/jetty

Modified Files:
	build.xml 
Log Message:
updating examples to new style, plus
 -parsing all examples in the parse target; 
 -making "dist" depend on "parse", and not the other way around. you cannot dist without valid examples now.

Index: build.xml
===================================================================
RCS file: /cvsroot/smartfrog/core/components/jetty/build.xml,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** build.xml	1 Jun 2005 10:26:56 -0000	1.22
--- build.xml	17 Aug 2005 16:21:05 -0000	1.23
***************
*** 49,53 ****
    <property file="build.properties" />
    <property name="root.dir" location="../../"  />
!  <property name="Name.System" value="Jetty"/>
   <!-- Import common stuff -->
    <!--available file="../../common.xml" property="root.dir" value="../.."/--> 
--- 49,53 ----
    <property file="build.properties" />
    <property name="root.dir" location="../../"  />
!   <property name="Name.System" value="Jetty"/>
   <!-- Import common stuff -->
    <!--available file="../../common.xml" property="root.dir" value="../.."/--> 
***************
*** 57,73 ****
    <!-- ========================================================== -->
    <!-- ========================================================== -->
-   <target name="init" depends="init-standard-output-dirs,use-smartfrog-tasks">
-           
-     <!-- <property name="target.jar" location="${dist.lib.dir}/jetty.jar" /> -->
-     <property name="deploy.sf" value="org/smartfrog/services/jetty/example.sf"/>
-     <property name="manifestName" 
-        value="${smartfrog.home}/private/sealManifest.mf"/>
  
  
  	   <tstamp/>
      <property name="Name.Company" value="(C) Copyright 1998-2004 Hewlett-Packard Development Company, LP"/>
      <property name="version" value="smartfrog components"/>
      <!--property name="Version" value="1.00.000_beta"/-->
!     <property name="year" value="2004"/>
  
      <echo message=""/>
--- 57,72 ----
    <!-- ========================================================== -->
    <!-- ========================================================== -->
  
+   <target name="init" depends="init-standard-output-dirs,use-smartfrog-tasks">
  
+     <property name="example.path" value="/org/smartfrog/services/jetty/examples"/>
+     <property name="deploy.sf" value="${example.path}/example1.sf"/>
+     <property name="manifestName"
+        value="${smartfrog.home}/private/sealManifest.mf"/>
  	   <tstamp/>
      <property name="Name.Company" value="(C) Copyright 1998-2004 Hewlett-Packard Development Company, LP"/>
      <property name="version" value="smartfrog components"/>
      <!--property name="Version" value="1.00.000_beta"/-->
!     <property name="year" value="2005"/>
  
      <echo message=""/>
***************
*** 91,100 ****
    <!-- ========================================================== -->
    <target name="verify-prerequisites" depends="pre-verify-prerequisites">
!         <available property="verified.ok"
!             classname="org.mortbay.http.HttpServer"
!             classpathref="compile.classpath"
!             ignoresystemclasses="false"/>
!         <property name="verify.fail.message"
!           value="No Jetty found"/>    
    </target>
    
--- 90,99 ----
    <!-- ========================================================== -->
    <target name="verify-prerequisites" depends="pre-verify-prerequisites">
!     <available property="verified.ok"
!                classname="org.mortbay.http.HttpServer"
!                classpathref="compile.classpath"
!                ignoresystemclasses="false"/>
!     <property name="verify.fail.message"
!               value="No Jetty found"/>
    </target>
    
***************
*** 102,112 ****
      <!-- parse the file -->
      <!-- ========================================================== -->
!     <target name="parse" depends="init,dist"
          description="parse the deployment descriptor">
  
!         <sf-parse quiet="true" file="${src.dir}/${deploy.sf}">
!             <classpath path="${target.jar}"/>
!         </sf-parse>
! 
      </target>
      
--- 101,119 ----
      <!-- parse the file -->
      <!-- ========================================================== -->
!     <target name="parse" depends="init,package"
          description="parse the deployment descriptor">
  
!       <sf-parse quiet="true" file="${src.dir}/${deploy.sf}">
!         <classpath path="${target.jar}"/>
!       </sf-parse>
!       <sf-parse quiet="true" file="${src.dir}/${example.path}/example2.sf">
!         <classpath path="${target.jar}"/>
!       </sf-parse>
!       <sf-parse quiet="true" file="${src.dir}/${example.path}/example3.sf">
!         <classpath path="${target.jar}"/>
!       </sf-parse>
!       <sf-parse quiet="true" file="${src.dir}/${example.path}/dynamicexample.sf">
!         <classpath path="${target.jar}"/>
!       </sf-parse>
      </target>
      
***************
*** 115,132 ****
    <!-- create the jar -->
    <!-- ========================================================== -->
!  	<target name="dist" depends="common.dist,jdocs" description="create the jar files">
! 	 <copy todir = "${dist.lib.dir}">
!         <fileset dir ="${lib.dir}" />
!     </copy>
! 	
! 	<copy todir = "${dist.doc.dir}">
!         <fileset dir ="${doc.dir}" />
!     </copy>   
  
! 		 <copy todir = "${dist.src.dir}">
! 		    <fileset dir ="${src.dir}">
! 		        <include name="**/examples/**"/>
! 		    </fileset>
! 	         </copy>
  	 <copy tofile="${dist.dir}/build.xml" file="releaseBuild.xml"/>	
  	 <copy tofile="${dist.dir}/build.example.properties" file="build.example.properties"/>
--- 122,139 ----
    <!-- create the jar -->
    <!-- ========================================================== -->
!  	<target name="dist" depends="common.dist,jdocs,parse" description="create a full distribution">
!      <copy todir="${dist.lib.dir}">
!        <fileset dir="${lib.dir}"/>
!      </copy>
  
!      <copy todir="${dist.doc.dir}">
!        <fileset dir="${doc.dir}"/>
!      </copy>
! 
!      <copy todir="${dist.src.dir}">
!        <fileset dir="${src.dir}">
!          <include name="**/examples/**"/>
!        </fileset>
!      </copy>
  	 <copy tofile="${dist.dir}/build.xml" file="releaseBuild.xml"/>	
  	 <copy tofile="${dist.dir}/build.example.properties" file="build.example.properties"/>