[Smartfrog-checkins] core/components/cddlm build.xml,1.7,1.8

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

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

Modified Files:
	build.xml 
Log Message:
Lots more CDDLM stuff

Index: build.xml
===================================================================
RCS file: /cvsroot/smartfrog/core/components/cddlm/build.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** build.xml	28 Apr 2004 13:19:50 -0000	1.7
--- build.xml	28 Apr 2004 16:45:07 -0000	1.8
***************
*** 58,62 ****
  
          <property name="target.jar" location="${dist.lib.dir}/cddlm.jar"/>
!         <property name="deploy.sf" value="org/smartfrog/services/cddlm/cddlm.sf"/>
  
          <property name="default.ini" location="test/files/default.ini"/>
--- 58,62 ----
  
          <property name="target.jar" location="${dist.lib.dir}/cddlm.jar"/>
!         <property name="deploy.sf" value="org/smartfrog/services/cddlm/system.sf"/>
  
          <property name="default.ini" location="test/files/default.ini"/>
***************
*** 142,152 ****
          </sf-parse>
  
-         <sf-parse quiet="true">
-             <classpath path="${target.jar}"/>
-             <source dir="${build.classes.dir}"
-                 includes="org/cddlm/components/*.sf">
-             </source>
-         </sf-parse>
- 
      </target>
  
--- 142,145 ----
***************
*** 170,175 ****
      <!-- run the service inline -->
      <!-- ========================================================== -->
      <target name="start-daemon" depends="parse,dist"
!         description="parse the cddlm descriptor">
          <sf-startdaemon classpathref="run.classpath"
              logStackTraces="true" spawn="true">
--- 163,183 ----
      <!-- run the service inline -->
      <!-- ========================================================== -->
+     <target name="run" depends="parse,dist"
+         description="run the service inline r">
+         <sf-run classpathref="run.classpath" includeantruntime="false"
+             logStackTraces="true">
+             <assertions enableSystemAssertions="true">
+                 <enable/>
+             </assertions>
+             <application name="cddlm" descriptor="/${deploy.sf}"/>
+             <codebase file="${target.jar}"/>
+         </sf-run>
+     </target>
+     
+     <!-- ========================================================== -->
+     <!-- start the daemon -->
+     <!-- ========================================================== -->
      <target name="start-daemon" depends="parse,dist"
!         description="start the daemon">
          <sf-startdaemon classpathref="run.classpath"
              logStackTraces="true" spawn="true">
***************
*** 187,196 ****
          description="parse the cddlm descriptor">
          <property name="deploy.host" value="localhost"/>
          <sf-deploy classpathref="run.classpath"
              logStackTraces="true"
              host="${deploy.host}"
              >
!             <application name="cddlm" descriptor="/${deploy.sf}"/>
!             <codebase file="target.jar"/>
          </sf-deploy>
      </target>
--- 195,211 ----
          description="parse the cddlm descriptor">
          <property name="deploy.host" value="localhost"/>
+         <sf-tourl property="target.jar.url" file="${target.jar}"/>
          <sf-deploy classpathref="run.classpath"
              logStackTraces="true"
              host="${deploy.host}"
              >
!             <codebase url="${target.jar.url}"/>
!             <application name="cddlm">
! #include "org/smartfrog/services/cddlm/cddlm.sf"
!   sfCodeBase "${target.jar.url}";
! 
! sfConfig extends CddlmSystem {
! }            
!             </application>
          </sf-deploy>
      </target>