From: <aft...@us...> - 2007-07-05 17:52:13
|
Revision: 4576 http://svn.sourceforge.net/smartfrog/?rev=4576&view=rev Author: aftereight Date: 2007-07-05 10:52:11 -0700 (Thu, 05 Jul 2007) Log Message: ----------- Updated test after change to the language (#codebase -> #from) Modified Paths: -------------- branches/core-branch-osgi/smartfrog/src/org/smartfrog/sfcore/componentdescription/ComponentDescriptionImpl.java branches/core-branch-osgi/testharness/testcases/org/smartfrog/test/system/compiler/tcn95.sf Modified: branches/core-branch-osgi/smartfrog/src/org/smartfrog/sfcore/componentdescription/ComponentDescriptionImpl.java =================================================================== --- branches/core-branch-osgi/smartfrog/src/org/smartfrog/sfcore/componentdescription/ComponentDescriptionImpl.java 2007-07-05 17:02:28 UTC (rev 4575) +++ branches/core-branch-osgi/smartfrog/src/org/smartfrog/sfcore/componentdescription/ComponentDescriptionImpl.java 2007-07-05 17:52:11 UTC (rev 4576) @@ -878,8 +878,9 @@ */ public static ComponentDescription sfComponentDescription(String url, String language, Vector phases, Reference ref, String codebase) - throws SmartFrogException { - Phases descr = null; + throws SmartFrogException + { + Phases descr; try { descr = (new SFParser(language)).sfParseResource(url,codebase); } catch (Exception thr) { @@ -888,7 +889,7 @@ +" ["+ thr.toString()+"]", thr); } try { - if (phases==null) { + if (phases == null) { descr = descr.sfResolvePhases(); } else { descr = descr.sfResolvePhases(phases); @@ -906,7 +907,7 @@ } if (!(obj instanceof ComponentDescription)){ throw new SmartFrogResolutionException(null,null,"Error resolving '" - +ref.toString()+"' in "+ url + + ref + "' in " + url + ". The result is not a ComponentDescription, resolved to: " + obj.toString() +" ("+obj.getClass().getName()+")" ); Modified: branches/core-branch-osgi/testharness/testcases/org/smartfrog/test/system/compiler/tcn95.sf =================================================================== --- branches/core-branch-osgi/testharness/testcases/org/smartfrog/test/system/compiler/tcn95.sf 2007-07-05 17:02:28 UTC (rev 4575) +++ branches/core-branch-osgi/testharness/testcases/org/smartfrog/test/system/compiler/tcn95.sf 2007-07-05 17:52:11 UTC (rev 4576) @@ -21,8 +21,10 @@ #include "org/smartfrog/components.sf" -/* using codebase to load the included sf files */ -#codebase "http://localhost:8080/test.jar" #include "test.sf" +/* using #from to load the included sf files from a pre-deployed ParseTimeResourceFactory + (but this is a failure test so the factory is not actually there) +*/ +#from PROCESS:testResource #include "test.sf" sfConfig extends Test { name "test"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |