From: <st...@us...> - 2006-11-27 20:25:29
|
Revision: 3667 http://svn.sourceforge.net/smartfrog/?rev=3667&view=rev Author: steve_l Date: 2006-11-27 12:25:25 -0800 (Mon, 27 Nov 2006) Log Message: ----------- tweaks to get this deploying against SVN head. jetty needs the servlet API at run time BTW. Modified Paths: -------------- trunk/core/components/deployapi/build.xml trunk/core/components/deployapi/ivy.xml trunk/core/components/deployapi/src/org/smartfrog/services/deployapi/examples/interop/pelvoux.sf trunk/core/components/deployapi/test/files/display.sf trunk/core/components/jetty/ivy.xml Modified: trunk/core/components/deployapi/build.xml =================================================================== --- trunk/core/components/deployapi/build.xml 2006-11-27 20:24:17 UTC (rev 3666) +++ trunk/core/components/deployapi/build.xml 2006-11-27 20:25:25 UTC (rev 3667) @@ -382,14 +382,23 @@ </presetdef> </target> + <target name="ssh-ready-to-upload" + depends="ssh-init,ready-to-install,init-codebase,dist,tests-packaged"/> <target name="ssh-mkdirs" depends="ssh-init"> <ssh-cmd command="mkdir -p ${ssh.dir}/bin"/> <ssh-cmd command="mkdir -p ${ssh.dir}/lib"/> </target> - <target name="ssh-prepare-files" depends="install"> - <fileset id="ssh.fileset" dir="${install.dir}" includes="*.jar"/> + <target name="ssh-prepare-files" depends="ssh-ready-to-upload"> + <property name="ssh.upload.dir" location="${build.dir}/ssh"/> + <mkdir dir="${ssh.upload.dir}" /> + <copy todir="${ssh.upload.dir}"> + <fileset file="${target.jar}"/> + <fileset file="${test.jar}"/> + <fileset dir="${build.codebase.dir}" includes="*.jar"/> + </copy> + <fileset id="ssh.fileset" dir="${ssh.upload.dir}" includes="*.jar"/> </target> <!-- insert trust="true" to turn on trust --> Modified: trunk/core/components/deployapi/ivy.xml =================================================================== --- trunk/core/components/deployapi/ivy.xml 2006-11-27 20:24:17 UTC (rev 3666) +++ trunk/core/components/deployapi/ivy.xml 2006-11-27 20:25:25 UTC (rev 3667) @@ -74,13 +74,17 @@ changing="true" rev="latest.integration" conf="test,runtime->default;redist->redist"/> - + <dependency org="org.smartfrog" + name="sf-xmpp" + changing="true" + rev="latest.integration" + conf="test,redist,runtime->default"/> <!--logging--> <dependency org="org.smartfrog" name="sf-loggingservices" changing="true" rev="latest.integration" - conf="compile,redist->redist"/> + conf="compile,redist->default"/> <dependency org="commons-lang" name="commons-lang" rev="${commons-lang.version}" Modified: trunk/core/components/deployapi/src/org/smartfrog/services/deployapi/examples/interop/pelvoux.sf =================================================================== --- trunk/core/components/deployapi/src/org/smartfrog/services/deployapi/examples/interop/pelvoux.sf 2006-11-27 20:24:17 UTC (rev 3666) +++ trunk/core/components/deployapi/src/org/smartfrog/services/deployapi/examples/interop/pelvoux.sf 2006-11-27 20:25:25 UTC (rev 3667) @@ -21,8 +21,10 @@ #include "/org/smartfrog/services/logging/log4j/logtolog4jimpl.sf" #include "/org/smartfrog/sfcore/logging/components.sf" #include "/org/smartfrog/services/jetty/jetty-complete.sf" + /** * this is the OB510 "pelvoux" laptop that hosts the interop test server of Alpine + * It is a live system hosted on a public network */ Pelvoux extends Compound { @@ -69,7 +71,6 @@ contextPath "/logs"; server LAZY alpine:jettyServer; - } logServlets extends Compound { @@ -78,6 +79,7 @@ pathSpec "/*"; context LAZY PARENT:context; } + } //mime type of html pages htmlPages extends MimeType { Modified: trunk/core/components/deployapi/test/files/display.sf =================================================================== --- trunk/core/components/deployapi/test/files/display.sf 2006-11-27 20:24:17 UTC (rev 3666) +++ trunk/core/components/deployapi/test/files/display.sf 2006-11-27 20:25:25 UTC (rev 3667) @@ -32,7 +32,6 @@ #include "org/smartfrog/services/display/components.sf" #include "org/smartfrog/services/trace/components.sf" -#include "org/smartfrog/services/persistence/components.sf" #include "org/smartfrog/components.sf" // Default sfDaemon Display @@ -68,11 +67,6 @@ //outputMsg LAZY HOST localhost:rootProcess:sfDefault:display; } -DefaultPersistentCompound extends DefaultCompound { - persister extends SFPersist { - directory "/tmp/sfPersist/"; - } -} sfConfig extends DefaultCompound; Modified: trunk/core/components/jetty/ivy.xml =================================================================== --- trunk/core/components/jetty/ivy.xml 2006-11-27 20:24:17 UTC (rev 3666) +++ trunk/core/components/jetty/ivy.xml 2006-11-27 20:25:25 UTC (rev 3667) @@ -50,7 +50,7 @@ <dependency org="javax.servlet" name="servlet-api" rev="${servletapi.version}" - conf="compile->master"/> + conf="compile->master;redist->default"/> <dependency org="org.mortbay.jetty" name="jetty" rev="${jetty.version}" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |