From: <aft...@us...> - 2007-08-08 19:26:51
|
Revision: 4942 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=4942&view=rev Author: aftereight Date: 2007-08-08 12:26:12 -0700 (Wed, 08 Aug 2007) Log Message: ----------- preparing for demo niceties in environments.sf Modified Paths: -------------- branches/core-branch-osgi/extras/osgi/build.xml branches/core-branch-osgi/smartfrog/src/org/smartfrog/environments.sf Added Paths: ----------- branches/core-branch-osgi/extras/osgi/test-bundle/src/env.sf branches/core-branch-osgi/extras/osgi/test-bundle/src/test.sf Removed Paths: ------------- branches/core-branch-osgi/extras/osgi/env.sf branches/core-branch-osgi/extras/osgi/test.sf Modified: branches/core-branch-osgi/extras/osgi/build.xml =================================================================== --- branches/core-branch-osgi/extras/osgi/build.xml 2007-08-08 18:17:02 UTC (rev 4941) +++ branches/core-branch-osgi/extras/osgi/build.xml 2007-08-08 19:26:12 UTC (rev 4942) @@ -46,10 +46,14 @@ <target name="copyJarsAround"> <copy todir="${user.home}/Dev/equinox/plugins" overwrite="true"> <fileset dir="daemon-bundle/dist/lib/" includes="sf-*.jar"/> + <fileset dir="rmiclassloading-extension-bundle/dist/lib/" includes="sf-*.jar"/> + <fileset dir="test-bundle/dist/lib/" includes="sf-*.jar"/> </copy> <copy todir="${user.home}/public_html" overwrite="true"> - <fileset file="daemon-bundle/dist/lib/sf-*.jar"/> + <fileset dir="daemon-bundle/dist/lib/" includes="sf-*.jar"/> + <fileset dir="rmiclassloading-extension-bundle/dist/lib/" includes="sf-*.jar"/> + <fileset dir="test-bundle/dist/lib/" includes="sf-*.jar"/> </copy> </target> Deleted: branches/core-branch-osgi/extras/osgi/env.sf =================================================================== --- branches/core-branch-osgi/extras/osgi/env.sf 2007-08-08 18:17:02 UTC (rev 4941) +++ branches/core-branch-osgi/extras/osgi/env.sf 2007-08-08 19:26:12 UTC (rev 4942) @@ -1,25 +0,0 @@ -#include "org/smartfrog/environments.sf" -#include "org/smartfrog/osgi/components.sf" - -sfConfig extends ApplicationEnvironment { - - parser extends ParserEnvironment { - sfProcessComponentName "envParser"; - - clEnvTest extends URLClassLoadingEnvironment { - codebase "http://dhcp-168-86/~olivier/sf-test-bundle-3.11.006dev.jar"; - } - } - - - target extends TargetEnvironment { - sfProcessComponentName "envTarget"; - sfProcessHost "localhost"; - - clEnvTest extends OSGiBundle { - location "http://dhcp-168-86/~olivier/sf-test-bundle-3.11.006dev.jar"; - } - - deployerTest extends PrimProcessDeployer; - } -} \ No newline at end of file Copied: branches/core-branch-osgi/extras/osgi/test-bundle/src/env.sf (from rev 4941, branches/core-branch-osgi/extras/osgi/env.sf) =================================================================== --- branches/core-branch-osgi/extras/osgi/test-bundle/src/env.sf (rev 0) +++ branches/core-branch-osgi/extras/osgi/test-bundle/src/env.sf 2007-08-08 19:26:12 UTC (rev 4942) @@ -0,0 +1,25 @@ +#include "org/smartfrog/environments.sf" +#include "org/smartfrog/osgi/components.sf" + +sfConfig extends ApplicationEnvironment { + + parser extends ParserEnvironment { + name "envParser"; + + clEnvTest extends URLClassLoadingEnvironment { + codebase "http://localhost/~olivier/sf-test-bundle-3.11.006dev.jar"; + } + } + + + target extends TargetEnvironment { + name "envTarget"; + sfProcessHost "localhost"; + + clEnvTest extends OSGiBundle { + location "http://localhost/~olivier/sf-test-bundle-3.11.006dev.jar"; + } + + deployerTest extends PrimProcessDeployer; + } +} \ No newline at end of file Copied: branches/core-branch-osgi/extras/osgi/test-bundle/src/test.sf (from rev 4941, branches/core-branch-osgi/extras/osgi/test.sf) =================================================================== --- branches/core-branch-osgi/extras/osgi/test-bundle/src/test.sf (rev 0) +++ branches/core-branch-osgi/extras/osgi/test-bundle/src/test.sf 2007-08-08 19:26:12 UTC (rev 4942) @@ -0,0 +1,23 @@ +#include "org/smartfrog/components.sf" +#from envParser:clEnvTest #include "org/smartfrog/osgi/test/components.sf" +#include "org/smartfrog/examples/counter/components.sf" + +sfConfig extends Compound { + sfMeta extends DATA { + sfApplicationEnvironment LAZY envTarget; + sfClassLoadingEnvironment LAZY envTarget:clEnvTest; + sfDeployer LAZY envTarget:deployerTest; + } + + subprocess extends Compound { + sfProcessName "testProcess"; + + testProvider extends MessageProvider; + //testProvider extends Counter { limit 5; } + } + + testPrinter extends MessagePrinter { + //sfProcessHost "pernet-o-2"; + messageSource LAZY subprocess:testProvider; + } +} \ No newline at end of file Deleted: branches/core-branch-osgi/extras/osgi/test.sf =================================================================== --- branches/core-branch-osgi/extras/osgi/test.sf 2007-08-08 18:17:02 UTC (rev 4941) +++ branches/core-branch-osgi/extras/osgi/test.sf 2007-08-08 19:26:12 UTC (rev 4942) @@ -1,23 +0,0 @@ -#include "org/smartfrog/components.sf" -#from envParser:clEnvTest #include "org/smartfrog/osgi/test/components.sf" -#include "org/smartfrog/examples/counter/components.sf" - -sfConfig extends Compound { - sfMeta extends DATA { - sfApplicationEnvironment LAZY envTarget; - sfClassLoadingEnvironment LAZY envTarget:clEnvTest; - sfDeployer LAZY envTarget:deployerTest; - } - - subprocess extends Compound { - sfProcessName "testProcess"; - - testProvider extends MessageProvider; - //testProvider extends Counter { limit 5; } - } - - testPrinter extends MessagePrinter { - //sfProcessHost "pernet-o-2"; - messageSource LAZY subprocess:testProvider; - } -} \ No newline at end of file Modified: branches/core-branch-osgi/smartfrog/src/org/smartfrog/environments.sf =================================================================== --- branches/core-branch-osgi/smartfrog/src/org/smartfrog/environments.sf 2007-08-08 18:17:02 UTC (rev 4941) +++ branches/core-branch-osgi/smartfrog/src/org/smartfrog/environments.sf 2007-08-08 19:26:12 UTC (rev 4942) @@ -11,8 +11,12 @@ TargetEnvironment extends Compound { sfProcessHost ENVPROPERTY SFTARGETHOST; + name TBD; + sfProcessComponentName name; } ParserEnvironment extends Compound { // todo schema check for sfProcessComponentName presence + name TBD; + sfProcessComponentName name; } \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |