Menu
▾
▴
[Smartfrog-checkins] SF.net SVN: smartfrog: [6806] trunk/core/extras/VAST
|
From: <hel...@us...> - 2008-07-10 17:32:06
|
Revision: 6806
http://smartfrog.svn.sourceforge.net/smartfrog/?rev=6806&view=rev
Author: helgemahrt
Date: 2008-07-10 10:31:59 -0700 (Thu, 10 Jul 2008)
Log Message:
-----------
SFOS-920 Still not working.
Modified Paths:
--------------
trunk/core/extras/VAST/build.xml
trunk/core/extras/VAST/src/org/smartfrog/vast/archive/BaseArchive.java
Added Paths:
-----------
trunk/core/extras/VAST/boot/
trunk/core/extras/VAST/boot/dist/
trunk/core/extras/VAST/boot/dist/bin/
trunk/core/extras/VAST/boot/dist/bin/sfDaemon
trunk/core/extras/VAST/boot/sfinstaller.vm
trunk/core/extras/VAST/setup.xml
Added: trunk/core/extras/VAST/boot/dist/bin/sfDaemon
===================================================================
--- trunk/core/extras/VAST/boot/dist/bin/sfDaemon (rev 0)
+++ trunk/core/extras/VAST/boot/dist/bin/sfDaemon 2008-07-10 17:31:59 UTC (rev 6806)
@@ -0,0 +1,69 @@
+#!/bin/sh
+if [ -z "$SFHOME" -o ! -d "$SFHOME" ] ; then
+ #echo "$0"
+ SFHOME=`dirname "$0"`/..
+ SFHOME=`cd "$SFHOME" && pwd`
+ export SFHOME;
+ echo SFHOME undefined, using $SFHOME as base directory;
+fi
+
+
+. "$SFHOME/bin/setSFProperties"
+
+#if test "$SFDEFAULTSF";
+#then
+# export SFCMDPARAMETERS="$SFCMDPARAMETERS $SFDEFAULTSF"
+#fi
+
+
+#if test "$SFRMIHOSTNAME";
+#then
+# export SFCMDPARAMETERS="$SFCMDPARAMETERS $SFRMIHOSTNAME"
+#fi
+
+
+#java -Dorg.smartfrog.sfcore.processcompound.sfProcessName=rootProcess "$SFCMDPARAMETERS" org.smartfrog.SFSystem "$@"
+
+#JVMARGS are passed as args to the java exec
+#JVMARGS="$SFDEFAULTINI $SFDEFAULTSF"
+JVMARGS="-DAVALANCHE_EVENT_SERVER=$AVALANCHE_EVENT_SERVER"
+
+#CLASSARGS are appended to java cmd line as class args
+CLASSARGS="-f org/smartfrog/vast/testing/start.sfcd"
+
+#sort cmd line args into JVMARGS or CLASSARGS.
+#JVMARGS are declared using -J token
+#e.g. -J "-Djava.library.path=/libs -Xmx400M"
+#e.g. -J -Djava.library.path=/libs -J -Xmx400M
+while [ $# -ge 1 ]; do
+ case $1 in
+ -J | -j) shift
+ JVMARGS="$JVMARGS $1"
+ ;;
+ *) CLASSARGS="$CLASSARGS $1"
+ ;;
+ esac
+ shift
+done
+
+#if test "$SFCODEBASE"; then
+# JVMARGS="$JVMARGS $SFCODEBASE"
+#fi
+#if test "$SFSECURITY"; then
+# JVMARGS="$JVMARGS $SFSECURITY"
+#fi
+#CMDLINE="java $JVMARGS -Dorg.smartfrog.sfcore.processcompound.sfProcessName=rootProcess org.smartfrog.SFSystem $CLASSARGS"
+#echo $CMDLINE
+#$CMDLINE
+
+# For JMX remote agent add: -Dcom.sun.management.jmxremote
+if test "$SFCODEBASE" && ! test "$SFSECURITY"; then
+ CMDLINE="java $JVMARGS $SFDEFAULTINI $SFDEFAULTSF $SFRMIHOSTNAME $SFCODEBASE -Dorg.smartfrog.sfcore.processcompound.sfProcessName=rootProcess org.smartfrog.SFSystem $CLASSARGS"
+elif test "$SFSECURITY" && ! test "$SFCODEBASE"; then
+ CMDLINE="java $JVMARGS $SFDEFAULTINI $SFDEFAULTSF $SFRMIHOSTNAME $SFSECURITY -Dorg.smartfrog.sfcore.processcompound.sfProcessName=rootProcess org.smartfrog.SFSystem $CLASSARGS"
+elif test "$SFCODEBASE" && test "$SFSECURITY"; then
+ CMDLINE="java $JVMARGS $SFDEFAULTINI $SFDEFAULTSF $SFRMIHOSTNAME $SFCODEBASE $SFSECURITY -Dorg.smartfrog.sfcore.processcompound.sfProcessName=rootProcess org.smartfrog.SFSystem $CLASSARGS"
+else
+ CMDLINE="java $JVMARGS $SFDEFAULTINI $SFDEFAULTSF $SFDEFAULTSECURITY $SFRMIHOSTNAME -Dorg.smartfrog.sfcore.processcompound.sfProcessName=rootProcess org.smartfrog.SFSystem $CLASSARGS"
+fi
+$CMDLINE
Added: trunk/core/extras/VAST/boot/sfinstaller.vm
===================================================================
--- trunk/core/extras/VAST/boot/sfinstaller.vm (rev 0)
+++ trunk/core/extras/VAST/boot/sfinstaller.vm 2008-07-10 17:31:59 UTC (rev 6806)
@@ -0,0 +1,269 @@
+\#include "org/smartfrog/components.sf"
+\#include "org/smartfrog/services/net/ftp.sf"
+\#include "org/smartfrog/services/net/telnet.sf"
+\#include "org/smartfrog/services/ssh/scp.sf"
+\#include "org/smartfrog/services/ssh/sshexecute.sf"
+\#include "org/smartfrog/sfcore/workflow/components.sf"
+
+
+sfConfig extends Parallel {
+ asynchCreateChild true;
+ actions extends LAZY {
+#foreach ($daemon in $allDaemons)
+ $daemon.name extends $daemon.type {
+ #if ($daemon.isFtp())
+ a extends FTPClient {
+ FTP:ftpHost "$daemon.host";
+ FTP:username "$daemon.user";
+ FTP:password "$daemon.password";
+ #if ($daemon.isLinux())
+ #if ($securityOn)
+ FTP:localFiles ["${daemon.localfile1}", "${daemon.keyfile}", "${daemon.secproperties}", "${daemon.smartfrogjar}", "${daemon.servicesjar}", "${daemon.examplesjar}"];
+ FTP:remoteFiles ["${daemon.installdir}/release.tar.gz", "${daemon.installdir}/mykeys.st", "${daemon.installdir}/SFSecurity.properties", "${daemon.installdir}/smartfrog.jar", "${daemon.installdir}/sfServices.jar", "${daemon.installdir}/sfExamples.jar"];
+ #else
+ FTP:localFiles ["${daemon.localfile1}"];
+ FTP:remoteFiles ["${daemon.installdir}/release.tar.gz"];
+ #end
+ #elseif ($daemon.isWindows())
+ #if ($securityOn)
+ FTP:localFiles ["${daemon.localfile1}", "${daemon.localfile2}", "${daemon.localfile3}", "${daemon.keyfile}", "${daemon.secproperties}", "${daemon.smartfrogjar}", "${daemon.servicesjar}", "${daemon.examplesjar}"];
+ FTP:remoteFiles ["${daemon.installdir}\\release.zip", "${daemon.installdir}\\JavaService.exe", "${daemon.installdir}\\start_sfdaemon.bat", "${daemon.installdir}\\mykeys.st", "${daemon.installdir}\\SFSecurity.properties", "${daemon.installdir}\\smartfrog.jar", "${daemon.installdir}\\sfServices.jar", "${daemon.installdir}\\sfExamples.jar"];
+ #else
+ FTP:localFiles ["${daemon.localfile1}", "${daemon.localfile2}", "${daemon.localfile3}"];
+ FTP:remoteFiles ["${daemon.installdir}\\release.zip", "${daemon.installdir}\\JavaService.exe", "${daemon.installdir}\\start_sfdaemon.bat"];
+ #end
+ #end
+ FTP:transferType "put";
+ FTP:transferMode "binary";
+ }
+ #elseif ($daemon.isScp())
+ a extends ScpSessionInlinePassword {
+ SCP:host "${daemon.host}";
+ SCP:username "${daemon.user}";
+ password "${daemon.password}";
+ #if ($daemon.isLinux())
+ #if ($securityOn)
+ localFiles ["${daemon.localfile1}", "$daemon.keyfile", "${daemon.secproperties}", "${daemon.smartfrogjar}", "${daemon.servicesjar}", "${daemon.examplesjar}"];
+ remoteFiles ["${daemon.installdir}/release.tar.gz", "${daemon.installdir}/mykeys.st", "${daemon.installdir}/SFSecurity.properties", "${daemon.installdir}/smartfrog.jar", "${daemon.installdir}/sfServices.jar", "${daemon.installdir}/sfExamples.jar"];
+ #else
+ localFiles ["${daemon.localfile1}"];
+ remoteFiles ["${daemon.installdir}/release.tar.gz"];
+ #end
+ #end
+ SCP:transferType "put";
+ }
+ #end
+ #if ($daemon.isTelnet())
+ b extends TelnetSession {
+ Telnet:host "$daemon.host";
+ Telnet:username "$daemon.user";
+ Telnet:password "$daemon.password";
+ Telnet:logFile "${logDir}${daemon.name}.log";
+ Telnet:timeout 70000;
+ #if ($daemon.isLinux())
+ Telnet:ostype "linux";
+ #if ($securityOn)
+ #if ($dynamicLoadingOn)
+ Telnet:commands ["mkdir -p ${daemon.installdir}",
+ "cd ${daemon.installdir}",
+ "gunzip -f release.tar.gz",
+ "tar -xf release.tar",
+ "cd ${daemon.installdir}/${daemon.releasename}",
+ "mkdir -p dist/private/host1",
+ "mv -f ${daemon.installdir}/mykeys.st dist/private/host1/mykeys.st",
+ "mv -f ${daemon.installdir}/SFSecurity.properties dist/private/host1/SFSecurity.properties",
+ "mv -f ${daemon.installdir}/smartfrog.jar dist/signedLib/smartfrog.jar",
+ "mv -f ${daemon.installdir}/sfServices.jar dist/signedLib/sfServices.jar",
+ "mv -f ${daemon.installdir}/sfExamples.jar dist/signedLib/sfExamples.jar",
+ "export SFHOME=${daemon.installdir}/${daemon.releasename}/dist",
+ "export SFSECURITY_ON=ENABLED",
+ "export PATH=$SFHOME/bin:$PATH",
+ "export SFCODEBASE=-Dorg.smartfrog.codebase=#foreach ($jar in $httpJars)http://${httpServer}:8080/$jar #end",
+ "export AVALANCHE_HOST_ADDRESS=$daemon.host",
+ "export SFSERVERHOSTNAME=$daemon.bindip",
+ "cd ${daemon.installdir}/$daemon.releasename",
+ "nohup sfDaemon -headless &"];
+ #else
+ Telnet:commands ["mkdir -p ${daemon.installdir}",
+ "cd ${daemon.installdir}",
+ "gunzip -f release.tar.gz",
+ "tar -xf release.tar",
+ "cd "${daemon.installdir}/${daemon.releasename}",
+ "mkdir -p dist/private/host1",
+ "mv -f ${daemon.installdir}/mykeys.st dist/private/host1/mykeys.st",
+ "mv -f ${daemon.installdir}/SFSecurity.properties dist/private/host1/SFSecurity.properties",
+ "mv -f ${daemon.installdir}/smartfrog.jar dist/signedLib/smartfrog.jar",
+ "mv -f ${daemon.installdir}/sfServices.jar dist/signedLib/sfServices.jar",
+ "mv -f ${daemon.installdir}/sfExamples.jar dist/signedLib/sfExamples.jar",
+ "export SFHOME=${daemon.installdir}/${daemon.releasename}/dist",
+ "export SFSECURITY_ON=ENABLED",
+ "export PATH=$SFHOME/bin:$PATH",
+ "export AVALANCHE_HOST_ADDRESS=$daemon.host",
+ "export SFSERVERHOSTNAME=$daemon.bindip",
+ "cd ${daemon.installdir}/$daemon.releasename",
+ "nohup sfDaemon -headless &"];
+ #end
+ #else
+ #if ($dynamicLoadingOn)
+ Telnet:commands ["mkdir -p ${daemon.installdir}",
+ "cd ${daemon.installdir}",
+ "gunzip -f release.tar.gz",
+ "tar -xf release.tar",
+ "export SFHOME=${daemon.installdir}/${daemon.releasename}/dist",
+ "export PATH=$SFHOME/bin:$PATH",
+ "export SFCODEBASE=-Dorg.smartfrog.codebase=#foreach ($jar in $httpJars)http://${httpServer}:8080/${jar} #end",
+ "export AVALANCHE_HOST_ADDRESS=$daemon.host",
+ "export SFSERVERHOSTNAME=$daemon.bindip",
+ "cd ${daemon.installdir}/${daemon.releasename}",
+ "nohup sfDaemon -headless &"];
+ #else
+ Telnet:commands ["mkdir -p ${daemon.installdir}",
+ "cd ${daemon.installdir}",
+ "gunzip -f release.tar.gz",
+ "tar -xf release.tar",
+ "export SFHOME=${daemon.installdir}/${daemon.releasename}/dist",
+ "export PATH=$SFHOME/bin:$PATH",
+ "export AVALANCHE_HOST_ADDRESS=$daemon.host",
+ "export SFSERVERHOSTNAME=$daemon.bindip",
+ "cd ${daemon.installdir}/$daemon.releasename",
+ "nohup sfDaemon -headless &"];
+ #end
+ #end
+ #elseif ($daemon.isWindows())
+ Telnet:ostype "windows";
+ Telnet:shellPrompt "C:\\>";
+ #if ($securityOn)
+ #if ($dynamicLoadingOn)
+ Telnet:commands ["md ${daemon.installdir}",
+ "cd ${daemon.installdir}",
+ "wzunzip -d release.zip",
+ ("cd ${daemon.installdir}\\" ++ "${daemon.releasename}"),
+ "md dist\\private\\host1",
+ "move "${daemon.installdir}\\mykeys.st dist\\private\\host1\\mykeys.st",
+ "move ${daemon.installdir}\\SFSecurity.properties dist\\private\\host1\\SFSecurity.properties",
+ "move ${daemon.installdir}\\smartfrog.jar dist\\signedLib\\smartfrog.jar",
+ "move ${daemon.installdir}\\sfServices.jar dist\\signedLib\\sfServices.jar",
+ "move ${daemon.installdir}\\sfExamples.jar dist\\signedLib\\sfExamples.jar",
+ "cd ${daemon.installdir}\\",
+ ("start_sfdaemon.bat ${daemon.javahome} ${daemon.installdir}\\" ++ "${daemon.releasename}\\dist server -s -d #foreach ($jar in $httpJars)http://${httpServer}:8080/${jar} #end"),
+ "net start Daemon"];
+ #else
+ Telnet:commands ["md ${daemon.installdir}",
+\ "cd ${daemon.installdir}",
+ "wzunzip -d release.zip",
+ ("cd ${daemon.installdir}\\" ++ "${daemon.releasename}"),
+ "md dist\\private\\host1",
+ "move ${daemon.installdir}\\mykeys.st dist\\private\\host1\\mykeys.st",
+ "move ${daemon.installdir}\\SFSecurity.properties dist\\private\\host1\\SFSecurity.properties",
+ "move ${daemon.installdir}\\smartfrog.jar dist\\signedLib\\smartfrog.jar",
+ "move ${daemon.installdir}\\sfServices.jar dist\\signedLib\\sfServices.jar",
+ "move ${daemon.installdir}\\sfExamples.jar dist\\signedLib\\sfExamples.jar",
+ "cd ${daemon.installdir}\\",
+ ("start_sfdaemon.bat ${daemon.javahome} ${daemon.installdir}\\" ++ "${daemon.releasename}\\dist server -s"),
+ "net start Daemon"];
+ #end
+ #else
+ #if ($dynamicLoadingOn)
+ Telnet:commands ["md ${daemon.installdir}",
+ "cd ${daemon.installdir}",
+ "wzunzip -d release.zip ",
+ ("start_sfdaemon.bat ${daemon.javahome} ${daemon.installdir}\\" ++"${daemon.releasename}\\dist server -d #foreach ($jar in $httpJars)http://${httpServer}:8080/${jar} #end"),
+ "net start Daemon"];
+ #else
+ Telnet:commands ["md ${daemon.installdir}",
+ "cd ${daemon.installdir}",
+ "wzunzip -d release.zip ",
+ ("start_sfdaemon.bat ${daemon.javahome} ${daemon.installdir}\\" ++"${daemon.releasename}\\dist server"),
+ "net start Daemon"];
+ #end
+ #end
+
+ #end
+ }
+ #elseif ($daemon.isSsh())
+ b extends SSHSessionInlinePassword {
+ SSHCmdExec:host "$daemon.host";
+ SSHCmdExec:username "$daemon.user";
+ password "$daemon.password";
+ SSHCmdExec:logFile "${logDir}${daemon.name}.log";
+ SSHCmdExec:timeout 70000;
+ SSHCmdExec:failOnError false;
+ #if ($daemon.isLinux())
+ #if ($securityOn)
+ #if ($dynamicLoadingOn)
+ commands ["mkdir -p ${daemon.installdir}",
+ "cd ${daemon.installdir}",
+ "gunzip -f release.tar.gz",
+ "tar -xf release.tar",
+ "cd ${daemon.installdir}/${daemon.releasename}",
+ "mkdir -p dist/private/host1",
+ "mv -f ${daemon.installdir}/mykeys.st dist/private/host1/mykeys.st",
+ "mv -f ${daemon.installdir}/SFSecurity.properties dist/private/host1/SFSecurity.properties",
+ "mv -f ${daemon.installdir}/smartfrog.jar dist/signedLib/smartfrog.jar",
+ "mv -f ${daemon.installdir}/sfServices.jar dist/signedLib/sfServices.jar",
+ "mv -f ${daemon.installdir}/sfExamples.jar dist/signedLib/sfExamples.jar",
+ "export SFHOME=${daemon.installdir}/${daemon.releasename}/dist",
+ "export AVALANCHE_EVENT_SERVER=${avEventServer}",
+ "export SFSECURITY_ON=ENABLED",
+ "export PATH=$SFHOME/bin:$PATH",
+ "export SFCODEBASE=-Dorg.smartfrog.codebase=#foreach ($jar in $httpJars)http://${httpServer}:8080/${jar} #end",
+ "export AVALANCHE_HOST_ADDRESS=$daemon.host",
+ "export SFSERVERHOSTNAME=$daemon.bindip",
+ "cd ${daemon.installdir}/${daemon.releasename}",
+ "nohup sfDaemon -headless &"];
+ #else
+ commands ["mkdir -p ${daemon.installdir}",
+ "cd ${daemon.installdir}",
+ "gunzip -f release.tar.gz",
+ "tar -xf release.tar",
+ "cd ${daemon.installdir}/${daemon.releasename}",
+ "mkdir -p dist/private/host1",
+ "mv -f ${daemon.installdir}/mykeys.st dist/private/host1/mykeys.st",
+ "mv -f ${daemon.installdir}/SFSecurity.properties dist/private/host1/SFSecurity.properties",
+ "mv -f ${daemon.installdir}/smartfrog.jar dist/signedLib/smartfrog.jar",
+ "mv -f ${daemon.installdir}/sfServices.jar dist/signedLib/sfServices.jar",
+ "mv -f ${daemon.installdir}/sfExamples.jar dist/signedLib/sfExamples.jar",
+ "export SFHOME=${daemon.installdir}/${daemon.releasename}/dist",
+ "export AVALANCHE_EVENT_SERVER=${avEventServer}",
+ "export SFSECURITY_ON=ENABLED",
+ "export PATH=$SFHOME/bin:$PATH",
+ "export AVALANCHE_HOST_ADDRESS=$daemon.host",
+ "export SFSERVERHOSTNAME=$daemon.bindip",
+ "cd ${daemon.installdir}/${daemon.releasename}",
+ "nohup sfDaemon -headless &"];
+ #end
+ #else
+ #if ($dynamicLoadingOn)
+ commands ["mkdir -p ${daemon.installdir}",
+ cd ${daemon.installdir}",
+ "gunzip -f release.tar.gz",
+ "tar -xf release.tar",
+ "export SFHOME=${daemon.installdir}/${daemon.releasename}/dist",
+ "export PATH=$SFHOME/bin:$PATH",
+ "export AVALANCHE_EVENT_SERVER=${avEventServer}",
+ "export SFCODEBASE=-Dorg.smartfrog.codebase=#foreach ($jar in $httpJars)http://${httpServer}:8080/${jar} #end",
+ "export AVALANCHE_HOST_ADDRESS=$daemon.host",
+ "export SFSERVERHOSTNAME=$daemon.bindip",
+ "cd ${daemon.installdir}/${daemon.releasename}",
+ "nohup sfDaemon -headless &"];
+ #else
+ commands ["mkdir -p ${daemon.installdir}",
+ "cd ${daemon.installdir}",
+ "gunzip -f release.tar.gz",
+ "tar -xf release.tar",
+ "export SFHOME=${daemon.installdir}/${daemon.releasename}/dist",
+ "export AVALANCHE_EVENT_SERVER=${avEventServer}",
+ "export PATH=$SFHOME/bin:$PATH",
+ "export AVALANCHE_HOST_ADDRESS=$daemon.host",
+ "export SFSERVERHOSTNAME=$daemon.bindip",
+ "cd ${daemon.installdir}/${daemon.releasename}",
+ "nohup sfDaemon -headless &"];
+ #end
+ #end
+ #end
+ }
+ #end
+ }
+ #end
+ }
+}
Modified: trunk/core/extras/VAST/build.xml
===================================================================
--- trunk/core/extras/VAST/build.xml 2008-07-10 17:30:12 UTC (rev 6805)
+++ trunk/core/extras/VAST/build.xml 2008-07-10 17:31:59 UTC (rev 6806)
@@ -1,74 +1,79 @@
<?xml version="1.0"?>
<project name="vast" default="allJars">
- <!--
- /** (C) Copyright 1998-2004 Hewlett-Packard Development Company, LP
+ <!--
+ /** (C) Copyright 1998-2004 Hewlett-Packard Development Company, LP
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- For more information: www.smartfrog.org
+ For more information: www.smartfrog.org
- */
- -->
+ */
+ -->
- <description>
- Build file for VAST.
- </description>
+ <description>
+ Build file for VAST.
+ </description>
- <!-- override point -->
+ <!-- override point -->
- <!--<property file="build.properties"/>-->
- <property name="root.dir" location="../.."/>
- <property name="ivy.enabled" value="true"/>
+ <!--<property file="build.properties"/>-->
+ <property name="root.dir" location="../.."/>
+ <property name="ivy.enabled" value="true"/>
+ <!-- Import common stuff -->
+ <!--available file="../../common.xml" property="root.dir" value="../.."/-->
+ <import file="${root.dir}/common.xml"/>
- <!-- Import common stuff -->
- <!--available file="../../common.xml" property="root.dir" value="../.."/-->
- <import file="${root.dir}/common.xml"/>
+ <property name="vast.code.dir" location="src/org/smartfrog/vast"/>
- <echo message="==================================================================="/>
- <echo message="= ${ant.project.name}"/>
+ <echo message="==================================================================="/>
+ <echo message="= ${ant.project.name}"/>
- <target name="helperJar" depends="ready-to-jar">
- <mkdir dir="dist/helper" />
+ <target name="helperJar" depends="ready-to-jar">
+ <mkdir dir="dist/helper"/>
<jar jarfile="${dist.dir}/helper/helper.jar" basedir="${build.classes.dir}"
- includes="**/helper/**">
- <manifest>
- <attribute name="Main-Class" value="org.smartfrog.vast.helper.Setup"/>
- </manifest>
- </jar>
- </target>
+ includes="**/helper/**">
+ <manifest>
+ <attribute name="Main-Class" value="org.smartfrog.vast.helper.Setup"/>
+ </manifest>
+ </jar>
+ </target>
- <target name="allJars" depends="helperJar,controllerJar,architectureJar,runnerJar" />
+ <target name="allJars" depends="helperJar,controllerJar,architectureJar,runnerJar"/>
<target name="architectureJar">
<jar jarfile="${dist.dir}/lib/vast-arch.jar" basedir="${build.classes.dir}"
- includes="**/architecture/**,**/archive/**" >
- </jar>
+ includes="**/architecture/**,**/archive/**"/>
</target>
<target name="controllerJar">
+ <copy tofile="${build.classes.dir}/org/smartfrog/vast/testing/start.sf" file="${vast.code.dir}/testing/startController.sf"
+ overwrite="true"/>
<jar jarfile="${dist.dir}/lib/vast-controller.jar" basedir="${build.classes.dir}"
- includes="**/controller/**" >
- </jar>
+ includes="**/controller/**,**/networking/**,**/testing/start.sfcd,**/testing/start.sf" update="yes"/>
+ <delete file="${build.classes.dir}/org/smartfrog/vast/testing/start.sf"/>
</target>
<target name="runnerJar">
+ <copy tofile="${build.classes.dir}/org/smartfrog/vast/testing/start.sf" file="${vast.code.dir}/testing/startRunner.sf"
+ overwrite="true"/>
<jar jarfile="${dist.dir}/lib/vast-runner.jar" basedir="${build.classes.dir}"
- includes="**/runner/**,**/archive/**" >
- </jar>
+ includes="**/runner/**,**/archive/**,**/networking/**,**/testing/start.sfcd,**/testing/start.sf"
+ update="yes"/>
+ <delete file="${build.classes.dir}/org/smartfrog/vast/testing/start.sf"/>
</target>
</project>
Added: trunk/core/extras/VAST/setup.xml
===================================================================
--- trunk/core/extras/VAST/setup.xml (rev 0)
+++ trunk/core/extras/VAST/setup.xml 2008-07-10 17:31:59 UTC (rev 6806)
@@ -0,0 +1,67 @@
+<?xml version="1.0"?>
+
+<project name="vast setup" default="setupVast">
+
+ <description>
+ VAST setup. Requires Avalanche.
+ </description>
+
+ <property name="root.dir" location="../.."/>
+ <property name="smartfrog.home" location="${root.dir}/smartfrog/"/>
+ <property name="avalanche.core.dir" value="../avalanche/AvalancheCore"/>
+ <property name="avalanche.setup.file" value="${avalanche.core.dir}/setup.xml"/>
+ <property name="avalanche.home" value="../avalanche/server"/>
+ <property name="vast.home" value="${avalanche.home}/temp/vast"/>
+ <property name="helper.jar.name" value="helper.jar"/>
+ <property name="vast.ignition.template" value="sfinstaller.vm"/>
+
+ <target name="setupVast">
+ <subant target="allJars" antfile="build.xml" buildpath="."/>
+
+ <subant target="helperJar" antfile="build.xml" buildpath="."/>
+
+ <subant target="allJars" antfile="build.xml" buildpath="${avalanche.core.dir}"/>
+
+ <subant target="setup" antfile="setup.xml" buildpath="${avalanche.core.dir}"/>
+
+ <!-- copy the helper to the distribution package -->
+ <copy todir="${avalanche.home}/temp/smartfrog/dist/vast" file="dist/helper/${helper.jar.name}"/>
+
+ <!-- copy the vast library to the avalancher server sf daemon -->
+ <copy todir="${avalanche.home}/smartfrog/dist/lib" file="dist/lib/vast-arch.jar"/>
+
+ <!-- copy the sf daemon -->
+ <copy todir="${vast.home}/smartfrog/dist">
+ <fileset dir="${smartfrog.home}/dist" excludes="**/docs/**,**/src/**,**/testCA/**,src.zip"/>
+ </copy>
+
+ <!-- overwrite the sfDaemon file -->
+ <copy todir="${vast.home}/smartfrog/dist" overwrite="true">
+ <fileset dir="boot/dist" includes="**/*"/>
+ </copy>
+
+ <!-- copy the ignition template file -->
+ <copy todir="${vast.home}" file="boot/${vast.ignition.template}"/>
+
+ <!-- copy the SUT packages -->
+ <copy todir="${vast.home}/SUT">
+ <fileset dir="SUT" includes="*"/>
+ </copy>
+
+ <!-- make the SUT dir in the distribution package folder -->
+ <mkdir dir="${vast.home}/smartfrog/dist/vast"/>
+
+ <!-- copy the remaining libs to where they can be found by the vast-arch lib -->
+ <copy todir="${vast.home}/lib">
+ <fileset dir="dist/lib" includes="*.jar" excludes="vast-arch.jar"/>
+ </copy>
+
+ <subant target="createbundle" antfile="setup.xml" buildpath="${avalanche.core.dir}"/>
+ </target>
+
+ <target name="clean">
+ <subant target="cleanAll">
+ <fileset dir="${avalanche.core.dir}" includes="setup.xml"/>
+ </subant>
+ </target>
+</project>
\ No newline at end of file
Modified: trunk/core/extras/VAST/src/org/smartfrog/vast/archive/BaseArchive.java
===================================================================
--- trunk/core/extras/VAST/src/org/smartfrog/vast/archive/BaseArchive.java 2008-07-10 17:30:12 UTC (rev 6805)
+++ trunk/core/extras/VAST/src/org/smartfrog/vast/archive/BaseArchive.java 2008-07-10 17:31:59 UTC (rev 6806)
@@ -3,7 +3,7 @@
import java.io.IOException;
import java.io.File;
-abstract class BaseArchive implements Archive {
+public abstract class BaseArchive implements Archive {
/**
* Path to this archive.
*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|