[Smartfrog-checkins] core/components/deployapi demo.xml,NONE,1.1 build.xml,1.17,1.18 libraries.properties,1.10,1.11

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

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

Modified Files:
	build.xml libraries.properties 
Added Files:
	demo.xml 
Log Message:
GGF15 demo

--- NEW FILE: demo.xml ---
<?xml version="1.0"?>
<project name="demo" 
  xmlns:ac="antlib:net.sf.antcontrib"
  xmlns:sf="antlib:org.smartfrog.tools.ant"
  xmlns:m2="antlib:org.apache.maven.artifact.ant"
  xmlns:core="http://smartfrog.org/build/core"
  xmlns:demo="http://smartfrog.org/deployapi/demo"
  >
  <property name="root.dir" location="../.."/>
  <property name="antbuild.dir" location="${root.dir}/antbuild"/>
  <property name="xml.dir" location="${antbuild.dir}/xml"/>
  
  
  <!-- Import common stuff -->
  <import file="${xml.dir}/dist.xml"/>
  
<target name="init-demo" depends="init,declare-classpaths">
  <property name="demo.sf.file" location="test/files/demo.sf" />
  <property name="demo.uri" value="http://smartfrog.org/deployapi/demo" />
  <path id="demo.classpath">
    <path refid="run.classpath"/>
  </path>
  
  <property name="demo.host" value="localhost" />
  <property name="demo.port" value="8081" />
  <property name="demo.protocol" value="http" />
  <property name="demo.url"
    value="${demo.protocol}://${demo.host}:${demo.port}/services/Portal/" />
  <echo level="verbose">Portal URL=${demo.url}</echo>
  

  <presetdef name="java" uri="${demo.uri}" >
   <core:java classpathref="demo.classpath" 
    timeout="60000"/>
  </presetdef>

  <macrodef name="deploy" uri="${demo.uri}" 
    backtrace="false">
    <attribute name="file" />
    <sequential>
      <echo>deploying file @{file}</echo>
      <demo:java
        taskname="deploy"
        classname="org.smartfrog.services.deployapi.client.Deploy">
        <arg value="-url:${demo.url}" />
        <arg file="@{file}" />
      </demo:java>
    </sequential>
  </macrodef>

  <macrodef name="terminate" uri="${demo.uri}" 
    backtrace="false">
    <attribute name="system" />
    <sequential>
      <echo>terminating system @{system}</echo>
      <demo:java
        taskname="deploy"
        classname="org.smartfrog.services.deployapi.client.Terminate">
        <arg value="-url:${system}" />
      </demo:java>
    </sequential>
  </macrodef>

  <macrodef name="status" uri="${demo.uri}" 
    backtrace="false">
    <sequential>
      <demo:java
        taskname="status"
        classname="org.smartfrog.services.deployapi.client.Status">
        <arg value="-url:${demo.url}" />
      </demo:java>
    </sequential>
  </macrodef>  
</target>

<target name="demo-status" depends="init-demo">
  <demo:status />
</target>

<target name="demo-deploy" depends="init-demo">
  <demo:deploy file="${demo.sf.file}"/>
</target>

<target name="demo-terminate" depends="init-demo">
  <fail unless="system">property "system" is not set to a system url</fail>
  <demo:terminate system="${system}"/>
</target>

</project>

Index: build.xml
===================================================================
RCS file: /cvsroot/smartfrog/core/components/deployapi/build.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** build.xml	2 Oct 2005 07:29:30 -0000	1.17
--- build.xml	10 Oct 2005 10:33:46 -0000	1.18
***************
*** 44,53 ****
    
    <!-- Import common stuff -->
!   <import file="${xml.dir}/core.xml"/>
!   <import file="${xml.dir}/sftasks.xml"/>
!   <import file="${xml.dir}/m2.xml"/>
!   <import file="${xml.dir}/dist.xml"/>
!   <import file="${xml.dir}/unittest.xml"/>
! 
    <!-- ========================================================== -->
    <!-- ========================================================== -->
--- 44,53 ----
    
    <!-- Import common stuff -->
!   <import file="${xml.dir}/systemtest.xml"/>
!   <import file="${xml.dir}/gui.xml"/>
!   
!   <!-- demo -->
!   <import file="demo.xml"/>
!   
    <!-- ========================================================== -->
    <!-- ========================================================== -->
***************
*** 479,483 ****
  
        
!     <core:jar destFile="${target.war}" 
        <!--  WAR file, includes WEB-INF stuff-->
        <fileset dir="${war.dir}" includes="**/*" />
--- 479,483 ----
  
        
!     <core:jar destFile="${target.war}" > 
        <!--  WAR file, includes WEB-INF stuff-->
        <fileset dir="${war.dir}" includes="**/*" />

Index: libraries.properties
===================================================================
RCS file: /cvsroot/smartfrog/core/components/deployapi/libraries.properties,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** libraries.properties	27 Sep 2005 13:12:09 -0000	1.10
--- libraries.properties	10 Oct 2005 10:33:46 -0000	1.11
***************
*** 7,11 ****
  
  #axis2 stuff
! axis2.version=0.92
  geronimo-spec-javamail.version=1.3.1-rc5
  geronimo-spec-activation.version=1.0.2-rc4
--- 7,12 ----
  
  #axis2 stuff
! #axis2.version=0.92
! axis2.version=0.91
  geronimo-spec-javamail.version=1.3.1-rc5
  geronimo-spec-activation.version=1.0.2-rc4
***************
*** 20,23 ****
--- 21,25 ----
  groovy-all.version=1.0-jsr-01
  
+ commons-cli.version=1.0
  
  #muse stuff