From: <bsc...@us...> - 2010-02-16 13:33:03
|
Revision: 6375 http://unicore.svn.sourceforge.net/unicore/?rev=6375&view=rev Author: bschuller Date: 2010-02-16 12:38:17 +0000 (Tue, 16 Feb 2010) Log Message: ----------- update to common 2.1.0-SNAPSHOT and thus uas-core 1.3.0 Modified Paths: -------------- workflow/trunk/workflowservice/pom.xml workflow/trunk/workflowservice/src/main/java/eu/unicore/workflow/pe/messaging/SOSender.java workflow/trunk/workflowservice/src/main/java/eu/unicore/workflow/pe/xnjs/NullGrounder.java Modified: workflow/trunk/workflowservice/pom.xml =================================================================== --- workflow/trunk/workflowservice/pom.xml 2010-02-15 14:43:42 UTC (rev 6374) +++ workflow/trunk/workflowservice/pom.xml 2010-02-16 12:38:17 UTC (rev 6375) @@ -11,7 +11,7 @@ <url>http://www.unicore.eu</url> </organization> <url>http://www.unicore.eu</url> - <version>2.0.2-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> <name>Workflow engine</name> <scm> @@ -63,13 +63,8 @@ <dependency> <groupId>eu.unicore.workflow</groupId> <artifactId>common</artifactId> - <version>2.0.2-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> </dependency> - <dependency> - <groupId>de.fzj.unicore</groupId> - <artifactId>xnjs-module-core</artifactId> - <version>1.2.2</version> - </dependency> </dependencies> <repositories> Modified: workflow/trunk/workflowservice/src/main/java/eu/unicore/workflow/pe/messaging/SOSender.java =================================================================== --- workflow/trunk/workflowservice/src/main/java/eu/unicore/workflow/pe/messaging/SOSender.java 2010-02-15 14:43:42 UTC (rev 6374) +++ workflow/trunk/workflowservice/src/main/java/eu/unicore/workflow/pe/messaging/SOSender.java 2010-02-16 12:38:17 UTC (rev 6375) @@ -39,7 +39,13 @@ private static final Logger logger=LogUtil.getLogger(LogUtil.SERVICES,SOSender.class); public SOSender(){ - Kernel.getMessaging().registerProvider(new Provider(),Provider.SO_CHANNEL); + try{ + Kernel.getMessaging().registerProvider(new Provider(),Provider.SO_CHANNEL); + }catch(MessagingException e){ + logger.error("Error initialising the message system!", e); + //can't continue without messaging + throw new IllegalStateException(e); + } } /** Modified: workflow/trunk/workflowservice/src/main/java/eu/unicore/workflow/pe/xnjs/NullGrounder.java =================================================================== --- workflow/trunk/workflowservice/src/main/java/eu/unicore/workflow/pe/xnjs/NullGrounder.java 2010-02-15 14:43:42 UTC (rev 6374) +++ workflow/trunk/workflowservice/src/main/java/eu/unicore/workflow/pe/xnjs/NullGrounder.java 2010-02-16 12:38:17 UTC (rev 6375) @@ -12,10 +12,29 @@ import de.fzj.unicore.xnjs.ems.ExecutionContext; import de.fzj.unicore.xnjs.ems.ExecutionException; import de.fzj.unicore.xnjs.jsdl.IGrounder; +import de.fzj.unicore.xnjs.jsdl.IncarnatedExecutionEnvironment; import eu.unicore.jsdl.extensions.ExecutionEnvironmentDocument.ExecutionEnvironment; +/* + * dummy implementation of IGrounder interface which is not needed in + * the workflow engine, but the XNJS wants to have it + */ public class NullGrounder implements IGrounder { + public String getProperty(String key, String defaultValue) { + return null; + } + + public String getProperty(String key) { + return null; + } + + public IncarnatedExecutionEnvironment incarnateExecutionEnvironment( + ExecutionEnvironment request, Client client) { + // TODO Auto-generated method stub + return null; + } + public ExecutionEnvironment getExecutionEnvironment(String name) { return null; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |