Author: lahiru Date: Fri Sep 9 03:51:46 2011 New Revision: 1166986 URL: http://svn.apache.org/viewvc?rev=1166986&view=rev Log: using classes in common/utils. Modified: incubator/airavata/trunk/modules/xbaya-gui/pom.xml incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/GpelWorkflowClient.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ProxyServiceTester.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaEngine.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/HostDescriptionRegistrationWindow.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/ws/WSComponent.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/ws/WSComponentFactory.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/ws/WSComponentPort.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/WorkflowInterpreterLaunchWindow.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/file/gui/BPELFiler.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/file/gui/WorkflowFiler.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELInvokeWindow.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/script/BPELScript.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/script/WorkflowWSDL.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/GraphSchema.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/BasicTypeMapping.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/CepNode.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/DynamicWorkflowRunnerWindow.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/impl/EdgeImpl.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/impl/GraphImpl.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/impl/NodeImpl.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/impl/PortImpl.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/ParameterNode.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/ConstantConfigurationDialog.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/InputConfigurationDialog.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/OutputConfigurationDialog.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/WSGraph.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/WSGraphFactory.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/gui/WSNodeWindow.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gridchem/gui/GridChemRunnerWindow.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorEventListener.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/GenericInvoker.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/WorkflowInvokerWrapperForGFacInvoker.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/gui/JythonRunnerWindow.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/lib/GFacServiceCreator.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/lib/NotificationSender.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/lib/ServiceNotificationSender.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/LEADWorkflowInvoker.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/NotificationHandler.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/MonitorUtil.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/WsmgClient.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/MonitorWindow.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEClient.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEInvokerWindow.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/gui/ODEDeploymentClient.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/taverna/TavernaRunnerWindow.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/BPELScriptTestCase.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/DSCTestCase.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/GFacServiceCreaterTestCase.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/GPELClientTestCase.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/GPELInvokeSetupForTesting.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/HierarchicalWorkflowTestCase.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/LEADWorkflowInvokerTestCase.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/MetadataTestCase.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/WSDLTestCase.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/WebComponentRegistryClientTestCase.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/WorkflowModificationTestCase.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/WorkflowTestCase.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/AllServices.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/ServiceNotificationSender.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/adder/AdderClient.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/adder/AdderImpl.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/adder/AdderService.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/approver/ApproverClient.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/approver/ApproverImpl.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/approver/ApproverService.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/arrayadder/ArrayAdderClient.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/arrayadder/ArrayAdderImpl.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/arrayadder/ArrayAdderService.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/arraygen/ArrayGeneratorClient.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/arraygen/ArrayGeneratorImpl.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/arraygen/ArrayGeneratorService.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/echo/EchoClient.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/echo/EchoImpl.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/echo/EchoService.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/multiplier/MultiplierImpl.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/multiplier/MultiplierService.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/wf/TridentTransformer.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/wf/Workflow.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/wf/gui/ParameterPropertyPanel.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/wf/gui/ParameterPropertyWindow.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/wf/gui/WorkflowPropertyWindow.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/workflow/proxy/GPELWorkflowClient.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/workflow/proxy/WorkflowProxyClient.java incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/xregistry/XRegistryAccesser.java Modified: incubator/airavata/trunk/modules/xbaya-gui/pom.xml URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/pom.xml?rev=1166986&r1=1166985&r2=1166986&view=diff ============================================================================== --- incubator/airavata/trunk/modules/xbaya-gui/pom.xml (original) +++ incubator/airavata/trunk/modules/xbaya-gui/pom.xml Fri Sep 9 03:51:46 2011 @@ -385,6 +385,11 @@ airavata-messagebroker ${airavata.version} + + airavata + airavata-common-utils + ${airavata.version} + airavata airavata-workflowtracking Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/GpelWorkflowClient.java URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/GpelWorkflowClient.java?rev=1166986&r1=1166985&r2=1166986&view=diff ============================================================================== --- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/GpelWorkflowClient.java (original) +++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/GpelWorkflowClient.java Fri Sep 9 03:51:46 2011 @@ -32,8 +32,8 @@ import java.util.List; import javax.xml.namespace.QName; +import org.apache.airavata.common.utils.XMLUtil; import org.apache.airavata.workflow.tracking.client.Callback; -import org.apache.airavata.workflow.tracking.client.LeadNotificationManager; import org.apache.airavata.workflow.tracking.client.NotificationType; import org.apache.airavata.wsmg.client.WseMsgBrokerClient; import org.apache.airavata.xbaya.component.ComponentException; @@ -47,7 +47,6 @@ import org.apache.airavata.xbaya.lead.LE import org.apache.airavata.xbaya.security.SecurityUtil; import org.apache.airavata.xbaya.security.UserX509Credential; import org.apache.airavata.xbaya.security.XBayaSecurity; -import org.apache.airavata.xbaya.util.XMLUtil; import org.apache.airavata.xbaya.wf.Workflow; import org.apache.airavata.xbaya.workflow.WorkflowEngineException; import org.apache.axis2.addressing.EndpointReference; Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ProxyServiceTester.java URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ProxyServiceTester.java?rev=1166986&r1=1166985&r2=1166986&view=diff ============================================================================== --- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ProxyServiceTester.java (original) +++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ProxyServiceTester.java Fri Sep 9 03:51:46 2011 @@ -27,11 +27,11 @@ import java.io.StringReader; import java.net.URI; import java.net.URISyntaxException; +import org.apache.airavata.common.utils.XMLUtil; import org.apache.airavata.xbaya.component.ComponentException; import org.apache.airavata.xbaya.file.XBayaPathConstants; import org.apache.airavata.xbaya.graph.GraphException; import org.apache.airavata.xbaya.lead.LeadContextHeaderHelper; -import org.apache.airavata.xbaya.util.XMLUtil; import org.apache.airavata.xbaya.wf.Workflow; import org.apache.airavata.xbaya.workflow.WorkflowEngineException; import org.apache.airavata.xbaya.workflow.proxy.WorkflowProxyClient; Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaEngine.java URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaEngine.java?rev=1166986&r1=1166985&r2=1166986&view=diff ============================================================================== --- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaEngine.java (original) +++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaEngine.java Fri Sep 9 03:51:46 2011 @@ -26,8 +26,7 @@ import java.io.IOException; import java.net.URI; import java.util.List; -import javax.xml.namespace.QName; - +import org.apache.airavata.common.utils.XMLUtil; import org.apache.airavata.xbaya.component.ComponentException; import org.apache.airavata.xbaya.component.SubWorkflowComponent; import org.apache.airavata.xbaya.component.gui.ComponentSelector; @@ -49,7 +48,6 @@ import org.apache.airavata.xbaya.myproxy import org.apache.airavata.xbaya.myproxy.gui.MyProxyDialog; import org.apache.airavata.xbaya.security.XBayaSecurity; import org.apache.airavata.xbaya.streaming.StreamTableModel; -import org.apache.airavata.xbaya.util.XMLUtil; import org.apache.airavata.xbaya.wf.Workflow; import org.apache.airavata.xbaya.wf.gui.WorkflowPropertyWindow; import org.apache.airavata.xbaya.workflow.WorkflowClient; Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/HostDescriptionRegistrationWindow.java URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/HostDescriptionRegistrationWindow.java?rev=1166986&r1=1166985&r2=1166986&view=diff ============================================================================== --- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/HostDescriptionRegistrationWindow.java (original) +++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/HostDescriptionRegistrationWindow.java Fri Sep 9 03:51:46 2011 @@ -40,6 +40,7 @@ import javax.xml.xpath.XPathConstants; import javax.xml.xpath.XPathExpressionException; import javax.xml.xpath.XPathFactory; +import org.apache.airavata.common.utils.XMLUtil; import org.apache.airavata.xbaya.XBayaEngine; import org.apache.airavata.xbaya.gui.GridPanel; import org.apache.airavata.xbaya.gui.XBayaComboBox; @@ -47,7 +48,6 @@ import org.apache.airavata.xbaya.gui.XBa import org.apache.airavata.xbaya.gui.XBayaLabel; import org.apache.airavata.xbaya.gui.XBayaTextField; import org.apache.airavata.xbaya.util.StringUtil; -import org.apache.airavata.xbaya.util.XMLUtil; import org.apache.airavata.xbaya.xregistry.XRegistryAccesser; import org.ogce.schemas.gfac.beans.HostBean; import org.w3c.dom.Document; Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/ws/WSComponent.java URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/ws/WSComponent.java?rev=1166986&r1=1166985&r2=1166986&view=diff ============================================================================== --- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/ws/WSComponent.java (original) +++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/ws/WSComponent.java Fri Sep 9 03:51:46 2011 @@ -29,6 +29,7 @@ import javax.xml.namespace.QName; import org.apache.airavata.common.exception.UtilsException; import org.apache.airavata.common.utils.WSDLUtil; +import org.apache.airavata.common.utils.XMLUtil; import org.apache.airavata.xbaya.component.Component; import org.apache.airavata.xbaya.component.ComponentControlPort; import org.apache.airavata.xbaya.component.ComponentException; @@ -37,7 +38,6 @@ import org.apache.airavata.xbaya.graph.G import org.apache.airavata.xbaya.graph.Node; import org.apache.airavata.xbaya.graph.ws.WSNode; import org.apache.airavata.xbaya.util.WSConstants; -import org.apache.airavata.xbaya.util.XMLUtil; import org.xmlpull.infoset.XmlCharacters; import org.xmlpull.infoset.XmlElement; Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/ws/WSComponentFactory.java URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/ws/WSComponentFactory.java?rev=1166986&r1=1166985&r2=1166986&view=diff ============================================================================== --- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/ws/WSComponentFactory.java (original) +++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/ws/WSComponentFactory.java Fri Sep 9 03:51:46 2011 @@ -28,9 +28,9 @@ import javax.xml.namespace.QName; import org.apache.airavata.common.exception.UtilsException; import org.apache.airavata.common.utils.WSDLUtil; +import org.apache.airavata.common.utils.XMLUtil; import org.apache.airavata.xbaya.component.ComponentException; import org.apache.airavata.xbaya.gui.ErrorMessages; -import org.apache.airavata.xbaya.util.XMLUtil; import org.xmlpull.infoset.XmlElement; import xsul5.wsdl.WsdlDefinitions; Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/ws/WSComponentPort.java URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/ws/WSComponentPort.java?rev=1166986&r1=1166985&r2=1166986&view=diff ============================================================================== --- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/ws/WSComponentPort.java (original) +++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/ws/WSComponentPort.java Fri Sep 9 03:51:46 2011 @@ -23,11 +23,11 @@ package org.apache.airavata.xbaya.compon import javax.xml.namespace.QName; +import org.apache.airavata.common.utils.XMLUtil; import org.apache.airavata.xbaya.component.ComponentDataPort; import org.apache.airavata.xbaya.component.ComponentException; import org.apache.airavata.xbaya.graph.ws.WSPort; import org.apache.airavata.xbaya.util.WSConstants; -import org.apache.airavata.xbaya.util.XMLUtil; import org.xmlpull.infoset.XmlElement; import org.xmlpull.infoset.XmlNamespace; Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/WorkflowInterpreterLaunchWindow.java URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/WorkflowInterpreterLaunchWindow.java?rev=1166986&r1=1166985&r2=1166986&view=diff ============================================================================== --- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/WorkflowInterpreterLaunchWindow.java (original) +++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/WorkflowInterpreterLaunchWindow.java Fri Sep 9 03:51:46 2011 @@ -35,6 +35,7 @@ import javax.swing.JLabel; import javax.swing.JPanel; import javax.xml.namespace.QName; +import org.apache.airavata.common.utils.XMLUtil; import org.apache.airavata.xbaya.XBayaConfiguration; import org.apache.airavata.xbaya.XBayaConstants; import org.apache.airavata.xbaya.XBayaEngine; @@ -55,7 +56,6 @@ import org.apache.airavata.xbaya.monitor import org.apache.airavata.xbaya.monitor.MonitorException; import org.apache.airavata.xbaya.ode.ODEClient; import org.apache.airavata.xbaya.util.StringUtil; -import org.apache.airavata.xbaya.util.XMLUtil; import org.apache.airavata.xbaya.wf.Workflow; import org.xmlpull.infoset.XmlElement; import org.xmlpull.v1.builder.XmlInfosetBuilder; Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/file/gui/BPELFiler.java URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/file/gui/BPELFiler.java?rev=1166986&r1=1166985&r2=1166986&view=diff ============================================================================== --- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/file/gui/BPELFiler.java (original) +++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/file/gui/BPELFiler.java Fri Sep 9 03:51:46 2011 @@ -28,6 +28,7 @@ import java.util.ArrayList; import javax.swing.JFileChooser; import javax.swing.filechooser.FileFilter; +import org.apache.airavata.common.utils.XMLUtil; import org.apache.airavata.xbaya.XBayaConstants; import org.apache.airavata.xbaya.XBayaEngine; import org.apache.airavata.xbaya.file.XBayaPathConstants; @@ -36,7 +37,6 @@ import org.apache.airavata.xbaya.gpel.sc import org.apache.airavata.xbaya.gpel.script.WorkflowWSDL; import org.apache.airavata.xbaya.graph.GraphException; import org.apache.airavata.xbaya.gui.ErrorMessages; -import org.apache.airavata.xbaya.util.XMLUtil; import org.apache.airavata.xbaya.wf.Workflow; import org.gpel.model.GpelProcess; Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/file/gui/WorkflowFiler.java URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/file/gui/WorkflowFiler.java?rev=1166986&r1=1166985&r2=1166986&view=diff ============================================================================== --- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/file/gui/WorkflowFiler.java (original) +++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/file/gui/WorkflowFiler.java Fri Sep 9 03:51:46 2011 @@ -27,6 +27,7 @@ import java.io.IOException; import javax.swing.JFileChooser; import javax.swing.filechooser.FileFilter; +import org.apache.airavata.common.utils.XMLUtil; import org.apache.airavata.xbaya.XBayaConstants; import org.apache.airavata.xbaya.XBayaEngine; import org.apache.airavata.xbaya.component.ComponentException; @@ -35,7 +36,6 @@ import org.apache.airavata.xbaya.graph.G import org.apache.airavata.xbaya.graph.ws.WSGraph; import org.apache.airavata.xbaya.graph.ws.WSGraphFactory; import org.apache.airavata.xbaya.gui.ErrorMessages; -import org.apache.airavata.xbaya.util.XMLUtil; import org.apache.airavata.xbaya.wf.Workflow; import org.xmlpull.infoset.XmlElement; Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELInvokeWindow.java URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELInvokeWindow.java?rev=1166986&r1=1166985&r2=1166986&view=diff ============================================================================== --- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELInvokeWindow.java (original) +++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELInvokeWindow.java Fri Sep 9 03:51:46 2011 @@ -34,6 +34,7 @@ import javax.swing.JPanel; import javax.swing.SwingConstants; import javax.xml.namespace.QName; +import org.apache.airavata.common.utils.XMLUtil; import org.apache.airavata.xbaya.XBayaConfiguration; import org.apache.airavata.xbaya.XBayaEngine; import org.apache.airavata.xbaya.component.ComponentException; @@ -54,7 +55,6 @@ import org.apache.airavata.xbaya.myproxy import org.apache.airavata.xbaya.myproxy.gui.MyProxyChecker; import org.apache.airavata.xbaya.security.UserX509Credential; import org.apache.airavata.xbaya.security.XBayaSecurity; -import org.apache.airavata.xbaya.util.XMLUtil; import org.apache.airavata.xbaya.wf.Workflow; import org.apache.airavata.xbaya.workflow.WorkflowClient; import org.apache.airavata.xbaya.workflow.WorkflowEngineException; Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/script/BPELScript.java URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/script/BPELScript.java?rev=1166986&r1=1166985&r2=1166986&view=diff ============================================================================== --- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/script/BPELScript.java (original) +++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/script/BPELScript.java Fri Sep 9 03:51:46 2011 @@ -30,6 +30,7 @@ import java.util.Set; import javax.xml.namespace.QName; +import org.apache.airavata.common.utils.XMLUtil; import org.apache.airavata.xbaya.XBayaConstants; import org.apache.airavata.xbaya.XBayaRuntimeException; import org.apache.airavata.xbaya.XBayaVersion; @@ -61,7 +62,6 @@ import org.apache.airavata.xbaya.graph.u import org.apache.airavata.xbaya.graph.ws.WSNode; import org.apache.airavata.xbaya.util.StringUtil; import org.apache.airavata.xbaya.util.WSConstants; -import org.apache.airavata.xbaya.util.XMLUtil; import org.apache.airavata.xbaya.wf.Workflow; import org.gpel.GpelConstants; import org.gpel.model.GpelAssign; Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/script/WorkflowWSDL.java URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/script/WorkflowWSDL.java?rev=1166986&r1=1166985&r2=1166986&view=diff ============================================================================== --- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/script/WorkflowWSDL.java (original) +++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/script/WorkflowWSDL.java Fri Sep 9 03:51:46 2011 @@ -29,6 +29,7 @@ import javax.xml.namespace.QName; import org.apache.airavata.common.exception.UtilsException; import org.apache.airavata.common.utils.WSDLUtil; +import org.apache.airavata.common.utils.XMLUtil; import org.apache.airavata.xbaya.XBayaConstants; import org.apache.airavata.xbaya.XBayaRuntimeException; import org.apache.airavata.xbaya.XBayaVersion; @@ -44,7 +45,6 @@ import org.apache.airavata.xbaya.graph.s import org.apache.airavata.xbaya.graph.util.GraphUtil; import org.apache.airavata.xbaya.graph.ws.WSGraph; import org.apache.airavata.xbaya.util.WSConstants; -import org.apache.airavata.xbaya.util.XMLUtil; import org.apache.airavata.xbaya.wf.Workflow; import org.xmlpull.infoset.XmlComment; import org.xmlpull.infoset.XmlElement; @@ -330,7 +330,11 @@ public class WorkflowWSDL { // add metadata if (appinfo != null) { XmlElement annotation = element.addElement(WSConstants.ANNOTATION_TAG); - annotation.addElement(XMLUtil.deepClone(appinfo)); + try { + annotation.addElement(XMLUtil.deepClone(appinfo)); + } catch (UtilsException e) { + e.printStackTrace(); + } } XmlElement complex = schema.addElement(WSConstants.COMPLEX_TYPE_TAG); @@ -369,7 +373,11 @@ public class WorkflowWSDL { // appinfo if (appinfo != null) { XmlElement annotation = element.element(null, WSConstants.ANNOTATION_TAG, true); - annotation.addElement(XMLUtil.deepClone(appinfo)); + try { + annotation.addElement(XMLUtil.deepClone(appinfo)); + } catch (UtilsException e) { + e.printStackTrace(); + } } // @@ -383,7 +391,12 @@ public class WorkflowWSDL { } else if (value instanceof XmlElement) { // Add the default value in because there // is no standard way. - XmlElement valueElement = XMLUtil.deepClone((XmlElement) value); + XmlElement valueElement = null; + try { + valueElement = XMLUtil.deepClone((XmlElement) value); + } catch (UtilsException e) { + e.printStackTrace(); + } XmlElement annotation = element.element(null, WSConstants.ANNOTATION_TAG, true); XmlElement defaultElement = annotation.addElement(WSComponentPort.DEFAULT); defaultElement.addElement(valueElement); @@ -423,7 +436,12 @@ public class WorkflowWSDL { setTypeAttribute(element, type); } else { // Copy the embedded type defition. - XmlElement clonedElementElement = XMLUtil.deepClone(elementElement); + XmlElement clonedElementElement = null; + try { + clonedElementElement = XMLUtil.deepClone(elementElement); + } catch (UtilsException e) { + e.printStackTrace(); + } String typeString = clonedElementElement.attributeValue(WSConstants.TYPE_ATTRIBUTE); if (typeString == null) { for (Object child : clonedElementElement.children()) { Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/GraphSchema.java URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/GraphSchema.java?rev=1166986&r1=1166985&r2=1166986&view=diff ============================================================================== --- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/GraphSchema.java (original) +++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/GraphSchema.java Fri Sep 9 03:51:46 2011 @@ -21,8 +21,8 @@ package org.apache.airavata.xbaya.graph; +import org.apache.airavata.common.utils.XMLUtil; import org.apache.airavata.xbaya.XBayaConstants; -import org.apache.airavata.xbaya.util.XMLUtil; import org.xmlpull.infoset.XmlNamespace; public class GraphSchema { Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/BasicTypeMapping.java URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/BasicTypeMapping.java?rev=1166986&r1=1166985&r2=1166986&view=diff ============================================================================== --- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/BasicTypeMapping.java (original) +++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/BasicTypeMapping.java Fri Sep 9 03:51:46 2011 @@ -26,9 +26,9 @@ import java.util.LinkedList; import javax.xml.namespace.QName; +import org.apache.airavata.common.utils.XMLUtil; import org.apache.airavata.xbaya.XBayaException; import org.apache.airavata.xbaya.XBayaRuntimeException; -import org.apache.airavata.xbaya.util.XMLUtil; import org.xmlpull.infoset.XmlAttribute; import org.xmlpull.infoset.XmlElement; import org.xmlpull.infoset.XmlNamespace; Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/CepNode.java URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/CepNode.java?rev=1166986&r1=1166985&r2=1166986&view=diff ============================================================================== --- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/CepNode.java (original) +++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/CepNode.java Fri Sep 9 03:51:46 2011 @@ -24,6 +24,7 @@ package org.apache.airavata.xbaya.graph. import java.util.Collection; import java.util.List; +import org.apache.airavata.common.utils.XMLUtil; import org.apache.airavata.xbaya.component.dynamic.CepComponent; import org.apache.airavata.xbaya.component.dynamic.CepComponentPort; import org.apache.airavata.xbaya.graph.ControlPort; @@ -38,7 +39,6 @@ import org.apache.airavata.xbaya.graph.g import org.apache.airavata.xbaya.graph.impl.NodeImpl; import org.apache.airavata.xbaya.graph.impl.PortImpl; import org.apache.airavata.xbaya.graph.util.GraphUtil; -import org.apache.airavata.xbaya.util.XMLUtil; import org.xmlpull.infoset.XmlElement; public class CepNode extends NodeImpl implements PortAddable { Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/DynamicWorkflowRunnerWindow.java URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/DynamicWorkflowRunnerWindow.java?rev=1166986&r1=1166985&r2=1166986&view=diff ============================================================================== --- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/DynamicWorkflowRunnerWindow.java (original) +++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/DynamicWorkflowRunnerWindow.java Fri Sep 9 03:51:46 2011 @@ -39,6 +39,7 @@ import javax.swing.JLabel; import javax.swing.JPanel; import javax.xml.namespace.QName; +import org.apache.airavata.common.utils.XMLUtil; import org.apache.airavata.xbaya.XBayaConfiguration; import org.apache.airavata.xbaya.XBayaConstants; import org.apache.airavata.xbaya.XBayaEngine; @@ -60,7 +61,6 @@ import org.apache.airavata.xbaya.monitor import org.apache.airavata.xbaya.monitor.MonitorException; import org.apache.airavata.xbaya.ode.ODEClient; import org.apache.airavata.xbaya.util.StringUtil; -import org.apache.airavata.xbaya.util.XMLUtil; import org.apache.airavata.xbaya.wf.Workflow; import org.apache.airavata.xbaya.xregistry.XRegistryAccesser; import org.ogce.schemas.gfac.beans.HostBean; Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/impl/EdgeImpl.java URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/impl/EdgeImpl.java?rev=1166986&r1=1166985&r2=1166986&view=diff ============================================================================== --- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/impl/EdgeImpl.java (original) +++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/impl/EdgeImpl.java Fri Sep 9 03:51:46 2011 @@ -21,11 +21,11 @@ package org.apache.airavata.xbaya.graph.impl; +import org.apache.airavata.common.utils.XMLUtil; import org.apache.airavata.xbaya.graph.Edge; import org.apache.airavata.xbaya.graph.GraphException; import org.apache.airavata.xbaya.graph.GraphSchema; import org.apache.airavata.xbaya.graph.gui.EdgeGUI; -import org.apache.airavata.xbaya.util.XMLUtil; import org.xmlpull.infoset.XmlElement; /** Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/impl/GraphImpl.java URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/impl/GraphImpl.java?rev=1166986&r1=1166985&r2=1166986&view=diff ============================================================================== --- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/impl/GraphImpl.java (original) +++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/impl/GraphImpl.java Fri Sep 9 03:51:46 2011 @@ -30,6 +30,7 @@ import java.util.List; import javax.swing.JOptionPane; +import org.apache.airavata.common.utils.XMLUtil; import org.apache.airavata.xbaya.XBayaEngine; import org.apache.airavata.xbaya.XBayaRuntimeException; import org.apache.airavata.xbaya.XBayaVersion; @@ -52,7 +53,6 @@ import org.apache.airavata.xbaya.graph.s import org.apache.airavata.xbaya.graph.util.GraphUtil; import org.apache.airavata.xbaya.graph.ws.WSPort; import org.apache.airavata.xbaya.streaming.StreamTableModel; -import org.apache.airavata.xbaya.util.XMLUtil; import org.xmlpull.infoset.XmlElement; import xsul5.MLogger; Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/impl/NodeImpl.java URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/impl/NodeImpl.java?rev=1166986&r1=1166985&r2=1166986&view=diff ============================================================================== --- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/impl/NodeImpl.java (original) +++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/impl/NodeImpl.java Fri Sep 9 03:51:46 2011 @@ -27,6 +27,7 @@ import java.util.Collection; import java.util.Iterator; import java.util.List; +import org.apache.airavata.common.utils.XMLUtil; import org.apache.airavata.xbaya.XBayaRuntimeException; import org.apache.airavata.xbaya.component.Component; import org.apache.airavata.xbaya.graph.ControlPort; @@ -40,7 +41,6 @@ import org.apache.airavata.xbaya.graph.P import org.apache.airavata.xbaya.graph.Port.Kind; import org.apache.airavata.xbaya.streaming.StreamTableModel; import org.apache.airavata.xbaya.util.StringUtil; -import org.apache.airavata.xbaya.util.XMLUtil; import org.xmlpull.infoset.XmlElement; import xsul5.MLogger; Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/impl/PortImpl.java URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/impl/PortImpl.java?rev=1166986&r1=1166985&r2=1166986&view=diff ============================================================================== --- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/impl/PortImpl.java (original) +++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/impl/PortImpl.java Fri Sep 9 03:51:46 2011 @@ -25,6 +25,7 @@ import java.util.ArrayList; import java.util.LinkedList; import java.util.List; +import org.apache.airavata.common.utils.XMLUtil; import org.apache.airavata.xbaya.XBayaRuntimeException; import org.apache.airavata.xbaya.component.ComponentPort; import org.apache.airavata.xbaya.graph.Edge; @@ -33,7 +34,6 @@ import org.apache.airavata.xbaya.graph.G import org.apache.airavata.xbaya.graph.Node; import org.apache.airavata.xbaya.graph.Port; import org.apache.airavata.xbaya.graph.gui.PortGUI; -import org.apache.airavata.xbaya.util.XMLUtil; import org.xmlpull.infoset.XmlElement; /** Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/ParameterNode.java URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/ParameterNode.java?rev=1166986&r1=1166985&r2=1166986&view=diff ============================================================================== --- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/ParameterNode.java (original) +++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/ParameterNode.java Fri Sep 9 03:51:46 2011 @@ -26,13 +26,14 @@ import java.util.List; import javax.xml.namespace.QName; +import org.apache.airavata.common.exception.UtilsException; +import org.apache.airavata.common.utils.XMLUtil; import org.apache.airavata.xbaya.graph.DataEdge; import org.apache.airavata.xbaya.graph.DataPort; import org.apache.airavata.xbaya.graph.Graph; import org.apache.airavata.xbaya.graph.GraphException; import org.apache.airavata.xbaya.graph.GraphSchema; import org.apache.airavata.xbaya.graph.Port; -import org.apache.airavata.xbaya.util.XMLUtil; import org.xmlpull.infoset.XmlElement; import org.xmlpull.infoset.XmlNamespace; @@ -155,7 +156,11 @@ abstract public class ParameterNode exte } // clone and detach from the parent - this.metadata = XMLUtil.deepClone(metadata); + try { + this.metadata = XMLUtil.deepClone(metadata); + } catch (UtilsException e) { + e.printStackTrace(); + } // Reformat List emptyTexts = new ArrayList(); @@ -285,7 +290,11 @@ abstract public class ParameterNode exte XmlElement metadataElement = configElement.addElement(GraphSchema.NS, METADATA_TAG); // Clone the metadata to avoid parent problem because this can be // called multiple times. - metadataElement.addChild(XMLUtil.deepClone(this.metadata)); + try { + metadataElement.addChild(XMLUtil.deepClone(this.metadata)); + } catch (UtilsException e) { + e.printStackTrace(); + } } return configElement; Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/ConstantConfigurationDialog.java URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/ConstantConfigurationDialog.java?rev=1166986&r1=1166985&r2=1166986&view=diff ============================================================================== --- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/ConstantConfigurationDialog.java (original) +++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/ConstantConfigurationDialog.java Fri Sep 9 03:51:46 2011 @@ -28,6 +28,7 @@ import javax.swing.JButton; import javax.swing.JPanel; import javax.xml.namespace.QName; +import org.apache.airavata.common.utils.XMLUtil; import org.apache.airavata.xbaya.XBayaEngine; import org.apache.airavata.xbaya.graph.system.ConstantNode; import org.apache.airavata.xbaya.gui.GridPanel; @@ -37,7 +38,6 @@ import org.apache.airavata.xbaya.gui.XBa import org.apache.airavata.xbaya.gui.XBayaTextComponent; import org.apache.airavata.xbaya.gui.XBayaTextField; import org.apache.airavata.xbaya.lead.LEADTypes; -import org.apache.airavata.xbaya.util.XMLUtil; import org.xmlpull.infoset.XmlElement; public class ConstantConfigurationDialog { Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/InputConfigurationDialog.java URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/InputConfigurationDialog.java?rev=1166986&r1=1166985&r2=1166986&view=diff ============================================================================== --- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/InputConfigurationDialog.java (original) +++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/InputConfigurationDialog.java Fri Sep 9 03:51:46 2011 @@ -28,6 +28,7 @@ import javax.swing.JButton; import javax.swing.JPanel; import javax.xml.namespace.QName; +import org.apache.airavata.common.utils.XMLUtil; import org.apache.airavata.xbaya.XBayaEngine; import org.apache.airavata.xbaya.graph.system.InputNode; import org.apache.airavata.xbaya.gui.GridPanel; @@ -38,7 +39,6 @@ import org.apache.airavata.xbaya.gui.XBa import org.apache.airavata.xbaya.gui.XBayaTextField; import org.apache.airavata.xbaya.lead.LEADTypes; import org.apache.airavata.xbaya.util.WSConstants; -import org.apache.airavata.xbaya.util.XMLUtil; import org.xmlpull.infoset.XmlElement; public class InputConfigurationDialog { Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/OutputConfigurationDialog.java URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/OutputConfigurationDialog.java?rev=1166986&r1=1166985&r2=1166986&view=diff ============================================================================== --- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/OutputConfigurationDialog.java (original) +++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/OutputConfigurationDialog.java Fri Sep 9 03:51:46 2011 @@ -27,6 +27,7 @@ import javax.swing.AbstractAction; import javax.swing.JButton; import javax.swing.JPanel; +import org.apache.airavata.common.utils.XMLUtil; import org.apache.airavata.xbaya.XBayaEngine; import org.apache.airavata.xbaya.graph.system.OutputNode; import org.apache.airavata.xbaya.gui.GridPanel; @@ -35,7 +36,6 @@ import org.apache.airavata.xbaya.gui.XBa import org.apache.airavata.xbaya.gui.XBayaTextArea; import org.apache.airavata.xbaya.gui.XBayaTextField; import org.apache.airavata.xbaya.util.WSConstants; -import org.apache.airavata.xbaya.util.XMLUtil; import org.xmlpull.infoset.XmlElement; public class OutputConfigurationDialog { Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/WSGraph.java URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/WSGraph.java?rev=1166986&r1=1166985&r2=1166986&view=diff ============================================================================== --- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/WSGraph.java (original) +++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/WSGraph.java Fri Sep 9 03:51:46 2011 @@ -26,6 +26,8 @@ import java.util.HashSet; import java.util.LinkedList; import java.util.List; +import org.apache.airavata.common.exception.UtilsException; +import org.apache.airavata.common.utils.XMLUtil; import org.apache.airavata.xbaya.XBayaConstants; import org.apache.airavata.xbaya.XBayaException; import org.apache.airavata.xbaya.XBayaRuntimeException; @@ -48,7 +50,6 @@ import org.apache.airavata.xbaya.graph.i import org.apache.airavata.xbaya.graph.system.InputNode; import org.apache.airavata.xbaya.graph.system.gui.StreamSourceNode; import org.apache.airavata.xbaya.graph.util.GraphUtil; -import org.apache.airavata.xbaya.util.XMLUtil; import org.apache.airavata.xbaya.wf.Workflow; import org.xmlpull.infoset.XmlElement; @@ -133,27 +134,31 @@ public class WSGraph extends GraphImpl { protected void toXML(XmlElement graphElement) { super.toXML(graphElement); - graphElement.setAttributeValue(GraphSchema.NS, GraphSchema.GRAPH_TYPE_ATTRIBUTE, GraphSchema.GRAPH_TYPE_WS); + try { + graphElement.setAttributeValue(GraphSchema.NS, GraphSchema.GRAPH_TYPE_ATTRIBUTE, GraphSchema.GRAPH_TYPE_WS); - if (this.metadata != null) { - XmlElement metadataElement = graphElement.addElement(GraphSchema.NS, GraphSchema.GRAPH_METADATA_TAG); - // Clone the metadata to avoid parent problem because this can be - // called multiple times. - metadataElement.addChild(XMLUtil.deepClone(this.metadata)); - } - - if (this.inputMetadata != null) { - XmlElement metadataElement = graphElement.addElement(GraphSchema.NS, GraphSchema.GRAPH_INPUT_METADATA_TAG); - // Clone the metadata to avoid parent problem because this can be - // called multiple times. - metadataElement.addChild(XMLUtil.deepClone(this.inputMetadata)); - } - - if (this.outputMetadata != null) { - XmlElement metadataElement = graphElement.addElement(GraphSchema.NS, GraphSchema.GRAPH_OUTPUT_METADATA_TAG); - // Clone the metadata to avoid parent problem because this can be - // called multiple times. - metadataElement.addChild(XMLUtil.deepClone(this.outputMetadata)); + if (this.metadata != null) { + XmlElement metadataElement = graphElement.addElement(GraphSchema.NS, GraphSchema.GRAPH_METADATA_TAG); + // Clone the metadata to avoid parent problem because this can be + // called multiple times. + metadataElement.addChild(XMLUtil.deepClone(this.metadata)); + } + + if (this.inputMetadata != null) { + XmlElement metadataElement = graphElement.addElement(GraphSchema.NS, GraphSchema.GRAPH_INPUT_METADATA_TAG); + // Clone the metadata to avoid parent problem because this can be + // called multiple times. + metadataElement.addChild(XMLUtil.deepClone(this.inputMetadata)); + } + + if (this.outputMetadata != null) { + XmlElement metadataElement = graphElement.addElement(GraphSchema.NS, GraphSchema.GRAPH_OUTPUT_METADATA_TAG); + // Clone the metadata to avoid parent problem because this can be + // called multiple times. + metadataElement.addChild(XMLUtil.deepClone(this.outputMetadata)); + } + } catch (UtilsException e) { + e.printStackTrace(); } } Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/WSGraphFactory.java URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/WSGraphFactory.java?rev=1166986&r1=1166985&r2=1166986&view=diff ============================================================================== --- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/WSGraphFactory.java (original) +++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/WSGraphFactory.java Fri Sep 9 03:51:46 2011 @@ -24,6 +24,7 @@ package org.apache.airavata.xbaya.graph. import java.io.File; import java.io.IOException; +import org.apache.airavata.common.utils.XMLUtil; import org.apache.airavata.xbaya.XBayaRuntimeException; import org.apache.airavata.xbaya.graph.ControlEdge; import org.apache.airavata.xbaya.graph.ControlPort; @@ -57,7 +58,6 @@ import org.apache.airavata.xbaya.graph.s import org.apache.airavata.xbaya.graph.system.gui.StreamSourceNode; import org.apache.airavata.xbaya.gui.ErrorMessages; import org.apache.airavata.xbaya.util.IOUtil; -import org.apache.airavata.xbaya.util.XMLUtil; import org.xmlpull.infoset.XmlElement; /** Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/gui/WSNodeWindow.java URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/gui/WSNodeWindow.java?rev=1166986&r1=1166985&r2=1166986&view=diff ============================================================================== --- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/gui/WSNodeWindow.java (original) +++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/gui/WSNodeWindow.java Fri Sep 9 03:51:46 2011 @@ -28,6 +28,7 @@ import javax.swing.JButton; import javax.swing.JPanel; import org.apache.airavata.common.utils.WSDLUtil; +import org.apache.airavata.common.utils.XMLUtil; import org.apache.airavata.xbaya.XBayaEngine; import org.apache.airavata.xbaya.graph.ws.WSNode; import org.apache.airavata.xbaya.gui.GridPanel; @@ -35,8 +36,6 @@ import org.apache.airavata.xbaya.gui.XBa import org.apache.airavata.xbaya.gui.XBayaLabel; import org.apache.airavata.xbaya.gui.XBayaTextArea; import org.apache.airavata.xbaya.gui.XBayaTextField; -import org.apache.airavata.xbaya.util.XBayaUtil; -import org.apache.airavata.xbaya.util.XMLUtil; import xsul5.wsdl.WsdlDefinitions; Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gridchem/gui/GridChemRunnerWindow.java URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gridchem/gui/GridChemRunnerWindow.java?rev=1166986&r1=1166985&r2=1166986&view=diff ============================================================================== --- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gridchem/gui/GridChemRunnerWindow.java (original) +++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gridchem/gui/GridChemRunnerWindow.java Fri Sep 9 03:51:46 2011 @@ -37,6 +37,7 @@ import javax.swing.JLabel; import javax.swing.JPanel; import javax.xml.namespace.QName; +import org.apache.airavata.common.utils.XMLUtil; import org.apache.airavata.xbaya.XBayaConfiguration; import org.apache.airavata.xbaya.XBayaConstants; import org.apache.airavata.xbaya.XBayaEngine; @@ -56,7 +57,6 @@ import org.apache.airavata.xbaya.jython. import org.apache.airavata.xbaya.monitor.MonitorConfiguration; import org.apache.airavata.xbaya.monitor.gui.MonitorStarter; import org.apache.airavata.xbaya.util.StringUtil; -import org.apache.airavata.xbaya.util.XMLUtil; import org.apache.airavata.xbaya.wf.Workflow; import org.apache.commons.httpclient.HttpClient; import org.apache.commons.httpclient.HttpStatus; Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorEventListener.java URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorEventListener.java?rev=1166986&r1=1166985&r2=1166986&view=diff ============================================================================== --- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorEventListener.java (original) +++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorEventListener.java Fri Sep 9 03:51:46 2011 @@ -23,17 +23,16 @@ package org.apache.airavata.xbaya.interp import java.io.IOException; import java.net.URI; -import java.net.URL; import java.util.LinkedList; import java.util.List; +import org.apache.airavata.common.utils.XMLUtil; import org.apache.airavata.commons.WorkFlowUtils; import org.apache.airavata.wsmg.client.ConsumerNotificationHandler; import org.apache.airavata.wsmg.client.MsgBrokerClientException; import org.apache.airavata.wsmg.client.NotificationHandler; import org.apache.airavata.wsmg.client.WseMsgBrokerClient; import org.apache.airavata.wsmg.client.msgbox.MessagePuller; -import org.apache.airavata.wsmg.msgbox.client.MsgBoxClient; import org.apache.airavata.xbaya.XBayaConfiguration; import org.apache.airavata.xbaya.graph.EPRPort; import org.apache.airavata.xbaya.graph.Edge; @@ -50,9 +49,7 @@ import org.apache.airavata.xbaya.monitor import org.apache.airavata.xbaya.monitor.MonitorException; import org.apache.airavata.xbaya.monitor.MonitorUtil; import org.apache.airavata.xbaya.monitor.MonitorUtil.EventType; -import org.apache.airavata.xbaya.monitor.WsmgClient; import org.apache.airavata.xbaya.monitor.gui.MonitorEventHandler.NodeState; -import org.apache.airavata.xbaya.util.XMLUtil; import org.apache.airavata.xbaya.wf.Workflow; import org.apache.axiom.soap.SOAPEnvelope; import org.apache.axis2.addressing.EndpointReference; Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/GenericInvoker.java URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/GenericInvoker.java?rev=1166986&r1=1166985&r2=1166986&view=diff ============================================================================== --- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/GenericInvoker.java (original) +++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/GenericInvoker.java Fri Sep 9 03:51:46 2011 @@ -36,6 +36,7 @@ import java.util.concurrent.TimeoutExcep import javax.xml.namespace.QName; +import org.apache.airavata.common.utils.XMLUtil; import org.apache.airavata.xbaya.XBayaException; import org.apache.airavata.xbaya.XBayaRuntimeException; import org.apache.airavata.xbaya.invoker.factory.InvokerFactory; @@ -43,7 +44,6 @@ import org.apache.airavata.xbaya.jython. import org.apache.airavata.xbaya.jython.lib.ServiceNotificationSender; import org.apache.airavata.xbaya.jython.lib.WorkflowNotifiable; import org.apache.airavata.xbaya.lead.LeadContextHeaderHelper; -import org.apache.airavata.xbaya.util.XMLUtil; import org.xmlpull.v1.builder.XmlElement; import xsul.lead.LeadContextHeader; Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/WorkflowInvokerWrapperForGFacInvoker.java URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/WorkflowInvokerWrapperForGFacInvoker.java?rev=1166986&r1=1166985&r2=1166986&view=diff ============================================================================== --- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/WorkflowInvokerWrapperForGFacInvoker.java (original) +++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/WorkflowInvokerWrapperForGFacInvoker.java Fri Sep 9 03:51:46 2011 @@ -31,10 +31,10 @@ import java.util.concurrent.TimeoutExcep import javax.xml.namespace.QName; +import org.apache.airavata.common.utils.XMLUtil; import org.apache.airavata.xbaya.XBayaException; import org.apache.airavata.xbaya.XBayaRuntimeException; import org.apache.airavata.xbaya.jython.lib.ServiceNotifiable; -import org.apache.airavata.xbaya.util.XMLUtil; import org.xmlpull.v1.builder.XmlElement; import xsul.lead.LeadContextHeader; Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/gui/JythonRunnerWindow.java URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/gui/JythonRunnerWindow.java?rev=1166986&r1=1166985&r2=1166986&view=diff ============================================================================== --- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/gui/JythonRunnerWindow.java (original) +++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/gui/JythonRunnerWindow.java Fri Sep 9 03:51:46 2011 @@ -36,6 +36,7 @@ import javax.swing.JLabel; import javax.swing.JPanel; import javax.xml.namespace.QName; +import org.apache.airavata.common.utils.XMLUtil; import org.apache.airavata.xbaya.XBayaConfiguration; import org.apache.airavata.xbaya.XBayaConstants; import org.apache.airavata.xbaya.XBayaEngine; @@ -55,7 +56,6 @@ import org.apache.airavata.xbaya.jython. import org.apache.airavata.xbaya.monitor.MonitorConfiguration; import org.apache.airavata.xbaya.monitor.gui.MonitorStarter; import org.apache.airavata.xbaya.util.StringUtil; -import org.apache.airavata.xbaya.util.XMLUtil; import org.apache.airavata.xbaya.wf.Workflow; import org.xmlpull.infoset.XmlElement; Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/lib/GFacServiceCreator.java URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/lib/GFacServiceCreator.java?rev=1166986&r1=1166985&r2=1166986&view=diff ============================================================================== --- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/lib/GFacServiceCreator.java (original) +++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/lib/GFacServiceCreator.java Fri Sep 9 03:51:46 2011 @@ -26,8 +26,8 @@ import java.net.URISyntaxException; import javax.xml.namespace.QName; +import org.apache.airavata.common.utils.XMLUtil; import org.apache.airavata.xbaya.XBayaException; -import org.apache.airavata.xbaya.util.XMLUtil; import org.xmlpull.v1.builder.XmlElement; import xsul.wsdl.WsdlDefinitions; Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/lib/NotificationSender.java URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/lib/NotificationSender.java?rev=1166986&r1=1166985&r2=1166986&view=diff ============================================================================== --- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/lib/NotificationSender.java (original) +++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/lib/NotificationSender.java Fri Sep 9 03:51:46 2011 @@ -24,17 +24,16 @@ package org.apache.airavata.xbaya.jython import java.net.URI; import java.util.Properties; +import org.apache.airavata.common.utils.XMLUtil; import org.apache.airavata.workflow.tracking.NotifierFactory; import org.apache.airavata.workflow.tracking.WorkflowNotifier; import org.apache.airavata.workflow.tracking.common.*; import org.apache.airavata.xbaya.util.StringUtil; -import org.apache.airavata.xbaya.util.XMLUtil; import org.apache.airavata.xbaya.wf.Workflow; import org.apache.axis2.addressing.EndpointReference; import org.python.core.PyObject; import org.xmlpull.infoset.XmlElement; -import xsul.ws_addressing.WsaEndpointReference; import xsul5.MLogger; public class NotificationSender implements WorkflowNotifiable { Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/lib/ServiceNotificationSender.java URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/lib/ServiceNotificationSender.java?rev=1166986&r1=1166985&r2=1166986&view=diff ============================================================================== --- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/lib/ServiceNotificationSender.java (original) +++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/lib/ServiceNotificationSender.java Fri Sep 9 03:51:46 2011 @@ -24,19 +24,18 @@ package org.apache.airavata.xbaya.jython import java.net.URI; import java.util.Iterator; +import org.apache.airavata.common.utils.XMLUtil; import org.apache.airavata.workflow.tracking.WorkflowNotifier; import org.apache.airavata.workflow.tracking.common.InvocationContext; import org.apache.airavata.workflow.tracking.common.InvocationEntity; import org.apache.airavata.workflow.tracking.common.WorkflowTrackingContext; import org.apache.airavata.workflow.tracking.impl.state.InvocationContextImpl; import org.apache.airavata.xbaya.util.StringUtil; -import org.apache.airavata.xbaya.util.XMLUtil; import org.apache.axis2.addressing.EndpointReference; import org.apache.xmlbeans.XmlException; import org.apache.xmlbeans.XmlObject; import org.xmlpull.infoset.XmlElement; -import xsul.ws_addressing.WsaEndpointReference; import xsul.wsif.WSIFMessage; import xsul5.MLogger; Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/LEADWorkflowInvoker.java URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/LEADWorkflowInvoker.java?rev=1166986&r1=1166985&r2=1166986&view=diff ============================================================================== --- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/LEADWorkflowInvoker.java (original) +++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/LEADWorkflowInvoker.java Fri Sep 9 03:51:46 2011 @@ -28,12 +28,12 @@ import java.util.regex.Pattern; import javax.xml.namespace.QName; import org.apache.airavata.common.utils.WSDLUtil; +import org.apache.airavata.common.utils.XMLUtil; import org.apache.airavata.xbaya.XBayaException; import org.apache.airavata.xbaya.component.ComponentException; import org.apache.airavata.xbaya.component.ws.WSComponent; import org.apache.airavata.xbaya.component.ws.WSComponentFactory; import org.apache.airavata.xbaya.component.ws.WSComponentPort; -import org.apache.airavata.xbaya.util.XMLUtil; import org.xmlpull.v1.builder.XmlElement; import xsul.XmlConstants; Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/NotificationHandler.java URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/NotificationHandler.java?rev=1166986&r1=1166985&r2=1166986&view=diff ============================================================================== --- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/NotificationHandler.java (original) +++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/NotificationHandler.java Fri Sep 9 03:51:46 2011 @@ -25,13 +25,13 @@ import java.net.URI; import java.net.URISyntaxException; import java.util.Properties; +import org.apache.airavata.common.utils.XMLUtil; import org.apache.airavata.workflow.tracking.NotifierFactory; import org.apache.airavata.workflow.tracking.WorkflowNotifier; import org.apache.airavata.workflow.tracking.common.InvocationContext; import org.apache.airavata.workflow.tracking.common.InvocationEntity; import org.apache.airavata.workflow.tracking.common.WorkflowTrackingContext; import org.apache.airavata.xbaya.XBayaConstants; -import org.apache.airavata.xbaya.util.XMLUtil; import org.apache.axis2.addressing.EndpointReference; import org.apache.xmlbeans.XmlObject; import org.xmlpull.v1.builder.XmlElement; Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/MonitorUtil.java URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/MonitorUtil.java?rev=1166986&r1=1166985&r2=1166986&view=diff ============================================================================== --- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/MonitorUtil.java (original) +++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/MonitorUtil.java Fri Sep 9 03:51:46 2011 @@ -25,8 +25,8 @@ import java.net.URI; import java.net.URISyntaxException; import java.util.Date; +import org.apache.airavata.common.utils.XMLUtil; import org.apache.airavata.xbaya.XBayaRuntimeException; -import org.apache.airavata.xbaya.util.XMLUtil; import org.xmlpull.infoset.XmlElement; import org.xmlpull.infoset.XmlNamespace; Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/WsmgClient.java URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/WsmgClient.java?rev=1166986&r1=1166985&r2=1166986&view=diff ============================================================================== --- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/WsmgClient.java (original) +++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/WsmgClient.java Fri Sep 9 03:51:46 2011 @@ -23,24 +23,19 @@ package org.apache.airavata.xbaya.monito import java.io.IOException; import java.net.URI; -import java.net.URL; -import org.apache.airavata.commons.WorkFlowUtils; +import org.apache.airavata.common.utils.XMLUtil; import org.apache.airavata.wsmg.client.ConsumerNotificationHandler; import org.apache.airavata.wsmg.client.MsgBrokerClientException; import org.apache.airavata.wsmg.client.NotificationHandler; import org.apache.airavata.wsmg.client.WseMsgBrokerClient; import org.apache.airavata.wsmg.client.msgbox.MessagePuller; -import org.apache.airavata.wsmg.msgbox.client.MsgBoxClient; -import org.apache.airavata.xbaya.util.XMLUtil; import org.apache.axiom.soap.SOAPEnvelope; import org.apache.axis2.addressing.EndpointReference; import org.xmlpull.infoset.XmlElement; import xsul5.MLogger; -import javax.xml.stream.XMLStreamException; - public class WsmgClient implements ConsumerNotificationHandler, NotificationHandler{ private static final MLogger logger = MLogger.getLogger(); Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/MonitorWindow.java URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/MonitorWindow.java?rev=1166986&r1=1166985&r2=1166986&view=diff ============================================================================== --- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/MonitorWindow.java (original) +++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/MonitorWindow.java Fri Sep 9 03:51:46 2011 @@ -28,6 +28,7 @@ import javax.swing.AbstractAction; import javax.swing.JButton; import javax.swing.JPanel; +import org.apache.airavata.common.utils.XMLUtil; import org.apache.airavata.xbaya.XBayaEngine; import org.apache.airavata.xbaya.gui.GridPanel; import org.apache.airavata.xbaya.gui.XBayaDialog; @@ -36,7 +37,6 @@ import org.apache.airavata.xbaya.gui.XBa import org.apache.airavata.xbaya.gui.XBayaTextField; import org.apache.airavata.xbaya.monitor.MonitorEventData; import org.apache.airavata.xbaya.monitor.MonitorUtil; -import org.apache.airavata.xbaya.util.XMLUtil; import org.xmlpull.infoset.XmlElement; public class MonitorWindow { Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEClient.java URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEClient.java?rev=1166986&r1=1166985&r2=1166986&view=diff ============================================================================== --- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEClient.java (original) +++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEClient.java Fri Sep 9 03:51:46 2011 @@ -28,6 +28,7 @@ import java.util.List; import javax.xml.namespace.QName; +import org.apache.airavata.common.utils.XMLUtil; import org.apache.airavata.xbaya.XBayaConstants; import org.apache.airavata.xbaya.XBayaException; import org.apache.airavata.xbaya.XBayaRuntimeException; @@ -43,13 +44,10 @@ import org.apache.airavata.xbaya.lead.LE import org.apache.airavata.xbaya.lead.LEADWorkflowInvoker; import org.apache.airavata.xbaya.lead.LeadContextHeaderHelper; import org.apache.airavata.xbaya.monitor.MonitorConfiguration; -import org.apache.airavata.xbaya.security.SecurityUtil; import org.apache.airavata.xbaya.security.XBayaSecurity; -import org.apache.airavata.xbaya.util.XMLUtil; import org.apache.airavata.xbaya.wf.Workflow; import org.apache.airavata.xbaya.xregistry.XRegistryAccesser; import org.ietf.jgss.GSSCredential; -import org.ietf.jgss.GSSException; import org.ogce.xregistry.client.XRegistryClient; import org.ogce.xregistry.utils.XRegistryClientException; @@ -58,9 +56,6 @@ import xsul.XmlConstants; import xsul.invoker.gsi.GsiInvoker; import xsul.lead.LeadContextHeader; import xsul.lead.LeadResourceMapping; -import xsul.xhandler_soap_sticky_header.StickySoapHeaderHandler; -import xsul.xwsif_runtime.WSIFClient; -import xsul.xwsif_runtime.XmlBeansWSIFRuntime; import xsul5.wsdl.WsdlDefinitions; public class ODEClient { Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEInvokerWindow.java URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEInvokerWindow.java?rev=1166986&r1=1166985&r2=1166986&view=diff ============================================================================== --- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEInvokerWindow.java (original) +++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEInvokerWindow.java Fri Sep 9 03:51:46 2011 @@ -37,6 +37,7 @@ import javax.swing.JPanel; import javax.swing.SwingConstants; import javax.xml.namespace.QName; +import org.apache.airavata.common.utils.XMLUtil; import org.apache.airavata.xbaya.XBayaConfiguration; import org.apache.airavata.xbaya.XBayaConstants; import org.apache.airavata.xbaya.XBayaEngine; @@ -59,7 +60,6 @@ import org.apache.airavata.xbaya.myproxy import org.apache.airavata.xbaya.security.UserX509Credential; import org.apache.airavata.xbaya.security.XBayaSecurity; import org.apache.airavata.xbaya.util.StringUtil; -import org.apache.airavata.xbaya.util.XMLUtil; import org.apache.airavata.xbaya.wf.Workflow; import org.apache.airavata.xbaya.workflow.WorkflowClient; import org.apache.airavata.xbaya.workflow.WorkflowEngineException; Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/gui/ODEDeploymentClient.java URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/gui/ODEDeploymentClient.java?rev=1166986&r1=1166985&r2=1166986&view=diff ============================================================================== --- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/gui/ODEDeploymentClient.java (original) +++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/gui/ODEDeploymentClient.java Fri Sep 9 03:51:46 2011 @@ -28,7 +28,7 @@ import java.util.Iterator; import java.util.LinkedList; import java.util.List; -import org.apache.airavata.xbaya.XBaya; +import org.apache.airavata.common.utils.XMLUtil; import org.apache.airavata.xbaya.XBayaConstants; import org.apache.airavata.xbaya.XBayaEngine; import org.apache.airavata.xbaya.component.ComponentException; @@ -54,7 +54,6 @@ import org.apache.airavata.xbaya.securit import org.apache.airavata.xbaya.security.XBayaSecurity; import org.apache.airavata.xbaya.streaming.StreamReceiveComponent; import org.apache.airavata.xbaya.streaming.StreamReceiveNode; -import org.apache.airavata.xbaya.util.XMLUtil; import org.apache.airavata.xbaya.wf.Workflow; import org.apache.airavata.xbaya.workflow.proxy.WorkflowProxyClient; import org.ietf.jgss.GSSCredential; Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/taverna/TavernaRunnerWindow.java URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/taverna/TavernaRunnerWindow.java?rev=1166986&r1=1166985&r2=1166986&view=diff ============================================================================== --- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/taverna/TavernaRunnerWindow.java (original) +++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/taverna/TavernaRunnerWindow.java Fri Sep 9 03:51:46 2011 @@ -33,6 +33,7 @@ import javax.swing.JLabel; import javax.swing.JPanel; import javax.xml.namespace.QName; +import org.apache.airavata.common.utils.XMLUtil; import org.apache.airavata.xbaya.XBayaEngine; import org.apache.airavata.xbaya.XBayaException; import org.apache.airavata.xbaya.graph.GraphException; @@ -48,7 +49,6 @@ import org.apache.airavata.xbaya.jython. import org.apache.airavata.xbaya.monitor.MonitorConfiguration; import org.apache.airavata.xbaya.scufl.script.ScuflScript; import org.apache.airavata.xbaya.util.StringUtil; -import org.apache.airavata.xbaya.util.XMLUtil; import org.apache.airavata.xbaya.wf.Workflow; import org.xmlpull.infoset.XmlElement; import org.xmlpull.v1.builder.XmlInfosetBuilder; Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/BPELScriptTestCase.java URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/BPELScriptTestCase.java?rev=1166986&r1=1166985&r2=1166986&view=diff ============================================================================== --- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/BPELScriptTestCase.java (original) +++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/BPELScriptTestCase.java Fri Sep 9 03:51:46 2011 @@ -24,6 +24,7 @@ package org.apache.airavata.xbaya.test; import java.io.File; import java.io.IOException; +import org.apache.airavata.common.utils.XMLUtil; import org.apache.airavata.xbaya.XBayaConstants; import org.apache.airavata.xbaya.component.ComponentException; import org.apache.airavata.xbaya.component.registry.ComponentRegistryException; @@ -33,7 +34,6 @@ import org.apache.airavata.xbaya.gpel.sc import org.apache.airavata.xbaya.graph.GraphException; import org.apache.airavata.xbaya.test.util.WorkflowCreator; import org.apache.airavata.xbaya.util.IOUtil; -import org.apache.airavata.xbaya.util.XMLUtil; import org.apache.airavata.xbaya.wf.Workflow; import org.gpel.model.GpelProcess; import org.xmlpull.infoset.XmlElement; Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/DSCTestCase.java URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/DSCTestCase.java?rev=1166986&r1=1166985&r2=1166986&view=diff ============================================================================== --- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/DSCTestCase.java (original) +++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/DSCTestCase.java Fri Sep 9 03:51:46 2011 @@ -26,10 +26,10 @@ import java.net.URI; import junit.framework.TestSuite; +import org.apache.airavata.common.utils.XMLUtil; import org.apache.airavata.xbaya.file.XBayaPathConstants; import org.apache.airavata.xbaya.gpel.DSCUtil; import org.apache.airavata.xbaya.lead.LeadContextHeaderHelper; -import org.apache.airavata.xbaya.util.XMLUtil; import org.xmlpull.v1.builder.XmlElement; import xsul.lead.LeadContextHeader; Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/GFacServiceCreaterTestCase.java URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/GFacServiceCreaterTestCase.java?rev=1166986&r1=1166985&r2=1166986&view=diff ============================================================================== --- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/GFacServiceCreaterTestCase.java (original) +++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/GFacServiceCreaterTestCase.java Fri Sep 9 03:51:46 2011 @@ -29,6 +29,7 @@ import java.net.URI; import javax.xml.namespace.QName; import org.apache.airavata.common.utils.WSDLUtil; +import org.apache.airavata.common.utils.XMLUtil; import org.apache.airavata.xbaya.XBayaException; import org.apache.airavata.xbaya.component.ComponentException; import org.apache.airavata.xbaya.component.registry.ComponentRegistryException; @@ -41,7 +42,6 @@ import org.apache.airavata.xbaya.jython. import org.apache.airavata.xbaya.jython.script.JythonScript; import org.apache.airavata.xbaya.test.util.WorkflowCreator; import org.apache.airavata.xbaya.util.IOUtil; -import org.apache.airavata.xbaya.util.XMLUtil; import org.apache.airavata.xbaya.wf.Workflow; import xsul5.MLogger; Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/GPELClientTestCase.java URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/GPELClientTestCase.java?rev=1166986&r1=1166985&r2=1166986&view=diff ============================================================================== --- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/GPELClientTestCase.java (original) +++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/GPELClientTestCase.java Fri Sep 9 03:51:46 2011 @@ -31,6 +31,7 @@ import javax.xml.namespace.QName; import junit.framework.TestSuite; +import org.apache.airavata.common.utils.XMLUtil; import org.apache.airavata.xbaya.XBayaConstants; import org.apache.airavata.xbaya.XBayaException; import org.apache.airavata.xbaya.component.ComponentException; @@ -41,7 +42,6 @@ import org.apache.airavata.xbaya.lead.LE import org.apache.airavata.xbaya.lead.LeadContextHeaderHelper; import org.apache.airavata.xbaya.security.UserX509Credential; import org.apache.airavata.xbaya.test.util.WorkflowCreator; -import org.apache.airavata.xbaya.util.XMLUtil; import org.apache.airavata.xbaya.wf.Workflow; import org.apache.airavata.xbaya.workflow.WorkflowClient; import org.apache.airavata.xbaya.workflow.WorkflowClient.WorkflowType; Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/GPELInvokeSetupForTesting.java URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/GPELInvokeSetupForTesting.java?rev=1166986&r1=1166985&r2=1166986&view=diff ============================================================================== --- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/GPELInvokeSetupForTesting.java (original) +++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/GPELInvokeSetupForTesting.java Fri Sep 9 03:51:46 2011 @@ -28,6 +28,7 @@ import javax.swing.JLabel; import javax.swing.SwingConstants; import javax.xml.namespace.QName; +import org.apache.airavata.common.utils.XMLUtil; import org.apache.airavata.xbaya.XBayaConfiguration; import org.apache.airavata.xbaya.XBayaEngine; import org.apache.airavata.xbaya.component.ComponentException; @@ -47,7 +48,6 @@ import org.apache.airavata.xbaya.myproxy import org.apache.airavata.xbaya.myproxy.gui.MyProxyChecker; import org.apache.airavata.xbaya.security.UserX509Credential; import org.apache.airavata.xbaya.security.XBayaSecurity; -import org.apache.airavata.xbaya.util.XMLUtil; import org.apache.airavata.xbaya.workflow.WorkflowClient; import org.apache.airavata.xbaya.workflow.WorkflowEngineException; import org.ietf.jgss.GSSCredential; Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/HierarchicalWorkflowTestCase.java URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/HierarchicalWorkflowTestCase.java?rev=1166986&r1=1166985&r2=1166986&view=diff ============================================================================== --- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/HierarchicalWorkflowTestCase.java (original) +++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/HierarchicalWorkflowTestCase.java Fri Sep 9 03:51:46 2011 @@ -30,6 +30,7 @@ import java.util.List; import javax.xml.namespace.QName; +import org.apache.airavata.common.utils.XMLUtil; import org.apache.airavata.xbaya.XBayaConstants; import org.apache.airavata.xbaya.XBayaException; import org.apache.airavata.xbaya.component.Component; @@ -54,7 +55,6 @@ import org.apache.airavata.xbaya.securit import org.apache.airavata.xbaya.security.XBayaSecurity; import org.apache.airavata.xbaya.test.service.adder.Adder; import org.apache.airavata.xbaya.test.util.WorkflowCreator; -import org.apache.airavata.xbaya.util.XMLUtil; import org.apache.airavata.xbaya.wf.Workflow; import org.apache.airavata.xbaya.workflow.WorkflowClient; import org.apache.airavata.xbaya.workflow.WorkflowEngineManager; Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/LEADWorkflowInvokerTestCase.java URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/LEADWorkflowInvokerTestCase.java?rev=1166986&r1=1166985&r2=1166986&view=diff ============================================================================== --- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/LEADWorkflowInvokerTestCase.java (original) +++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/LEADWorkflowInvokerTestCase.java Fri Sep 9 03:51:46 2011 @@ -31,6 +31,7 @@ import java.util.List; import junit.framework.TestSuite; import org.apache.airavata.common.utils.WSDLUtil; +import org.apache.airavata.common.utils.XMLUtil; import org.apache.airavata.xbaya.XBayaException; import org.apache.airavata.xbaya.component.ComponentException; import org.apache.airavata.xbaya.component.ws.WSComponentPort; @@ -40,7 +41,6 @@ import org.apache.airavata.xbaya.lead.LE import org.apache.airavata.xbaya.lead.LeadContextHeaderHelper; import org.apache.airavata.xbaya.test.service.adder.Adder; import org.apache.airavata.xbaya.test.service.adder.AdderService; -import org.apache.airavata.xbaya.util.XMLUtil; import org.globus.gsi.CertUtil; import org.ietf.jgss.GSSCredential; import org.xmlpull.v1.builder.XmlContainer;