Return-Path: X-Original-To: apmail-airavata-commits-archive@www.apache.org Delivered-To: apmail-airavata-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 60823D812 for ; Wed, 19 Dec 2012 15:58:52 +0000 (UTC) Received: (qmail 93631 invoked by uid 500); 19 Dec 2012 15:58:52 -0000 Delivered-To: apmail-airavata-commits-archive@airavata.apache.org Received: (qmail 93593 invoked by uid 500); 19 Dec 2012 15:58:52 -0000 Mailing-List: contact commits-help@airavata.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@airavata.apache.org Delivered-To: mailing list commits@airavata.apache.org Received: (qmail 93586 invoked by uid 99); 19 Dec 2012 15:58:52 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Dec 2012 15:58:52 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Dec 2012 15:58:51 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 3979F23889B3; Wed, 19 Dec 2012 15:58:31 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1423909 - /airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java Date: Wed, 19 Dec 2012 15:58:31 -0000 To: commits@airavata.apache.org From: lahiru@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121219155831.3979F23889B3@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: lahiru Date: Wed Dec 19 15:58:30 2012 New Revision: 1423909 URL: http://svn.apache.org/viewvc?rev=1423909&view=rev Log: Fixing AIRAVATA-678. Fixing integration test failure Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java?rev=1423909&r1=1423908&r2=1423909&view=diff ============================================================================== --- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java (original) +++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java Wed Dec 19 15:58:30 2012 @@ -451,11 +451,15 @@ public class WorkflowInterpretorSkeleton ArrayList hostDescriptions = new ArrayList(); XMLStreamReader reader = null; try { - File fXmlFile = new File(url.getPath()); - reader = XMLInputFactory.newInstance().createXMLStreamReader(new FileReader(fXmlFile)); + if (url != null) { + reader = XMLInputFactory.newInstance().createXMLStreamReader(url.openStream()); + } else { + throw new RuntimeException("Error retrieving host.xml file. Should reside in " + + "$SERVER_HOME/webapps/axis2/WEB-INF/classes/host.xml"); + } } catch (XMLStreamException e) { e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates. - } catch (FileNotFoundException e) { + } catch (IOException e) { e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates. } StAXOMBuilder builder = new StAXOMBuilder(reader);