Repository: airavata Updated Branches: refs/heads/master a5cb91f0f -> 8d16d0ec5
http://git-wip-us.apache.org/repos/asf/airavata/blob/8d16d0ec/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/RequestData.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/RequestData.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/RequestData.java index 0bf56d2..73538b0 100644 --- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/RequestData.java +++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/RequestData.java @@ -29,7 +29,6 @@ package org.apache.airavata.gfac.core; import org.apache.airavata.common.exception.ApplicationSettingsException; import org.apache.airavata.common.utils.ServerSettings; -import org.apache.airavata.gfac.core.Constants; /** * Encapsulates GFac specific data that are coming in the request. http://git-wip-us.apache.org/repos/asf/airavata/blob/8d16d0ec/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/OutputUtils.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/OutputUtils.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/OutputUtils.java index 81bcf66..904839c 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/OutputUtils.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/OutputUtils.java @@ -21,7 +21,6 @@ package org.apache.airavata.gfac.impl; import org.apache.airavata.common.utils.StringUtil; -import org.apache.airavata.gfac.core.handler.GFacHandlerException; import org.apache.airavata.model.appcatalog.appinterface.DataType; import org.apache.airavata.model.appcatalog.appinterface.OutputDataObjectType; http://git-wip-us.apache.org/repos/asf/airavata/blob/8d16d0ec/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/email/EmailMonitorFactory.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/email/EmailMonitorFactory.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/email/EmailMonitorFactory.java index 3a75331..870cfa4 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/email/EmailMonitorFactory.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/email/EmailMonitorFactory.java @@ -25,8 +25,6 @@ import org.apache.airavata.model.appcatalog.computeresource.ResourceJobManagerTy import java.util.Calendar; import java.util.Date; -import java.util.HashMap; -import java.util.Map; public class EmailMonitorFactory { http://git-wip-us.apache.org/repos/asf/airavata/blob/8d16d0ec/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/ssh/provider/impl/SSHProvider.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/ssh/provider/impl/SSHProvider.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/ssh/provider/impl/SSHProvider.java index d00c698..38de3ba 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/ssh/provider/impl/SSHProvider.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/ssh/provider/impl/SSHProvider.java @@ -58,7 +58,6 @@ import org.apache.airavata.model.appcatalog.computeresource.ResourceJobManagerTy import org.apache.airavata.model.appcatalog.computeresource.SSHJobSubmission; import org.apache.airavata.model.workspace.experiment.CorrectiveAction; import org.apache.airavata.model.workspace.experiment.ErrorCategory; -import org.apache.airavata.model.workspace.experiment.ExperimentState; import org.apache.airavata.model.workspace.experiment.JobDetails; import org.apache.airavata.model.workspace.experiment.JobState; import org.apache.xmlbeans.XmlException; http://git-wip-us.apache.org/repos/asf/airavata/blob/8d16d0ec/modules/gfac/gfac-service/pom.xml ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-service/pom.xml b/modules/gfac/gfac-service/pom.xml index f1d4d6c..47595b8 100644 --- a/modules/gfac/gfac-service/pom.xml +++ b/modules/gfac/gfac-service/pom.xml @@ -42,7 +42,7 @@ <!--</dependency>--> <dependency> <groupId>org.apache.airavata</groupId> - <artifactId>airavata-common-utils</artifactId> + <artifactId>airavata-commons</artifactId> <version>${project.version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/airavata/blob/8d16d0ec/modules/gfac/gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java b/modules/gfac/gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java index 770eb98..9e89788 100644 --- a/modules/gfac/gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java +++ b/modules/gfac/gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java @@ -102,6 +102,7 @@ public class GfacServerHandler implements GfacService.Iface { public GfacServerHandler() throws Exception { try { + // start curator client String zkhostPort = AiravataZKUtils.getZKhostPort(); RetryPolicy retryPolicy = new ExponentialBackoffRetry(1000, 5); http://git-wip-us.apache.org/repos/asf/airavata/blob/8d16d0ec/modules/messaging/core/pom.xml ---------------------------------------------------------------------- diff --git a/modules/messaging/core/pom.xml b/modules/messaging/core/pom.xml index 1c42bf7..4e2915a 100644 --- a/modules/messaging/core/pom.xml +++ b/modules/messaging/core/pom.xml @@ -30,7 +30,7 @@ </dependency> <dependency> <groupId>org.apache.airavata</groupId> - <artifactId>airavata-common-utils</artifactId> + <artifactId>airavata-commons</artifactId> <version>${project.version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/airavata/blob/8d16d0ec/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/Publisher.java ---------------------------------------------------------------------- diff --git a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/Publisher.java b/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/Publisher.java index 4878254..dea8b00 100644 --- a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/Publisher.java +++ b/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/Publisher.java @@ -22,7 +22,6 @@ package org.apache.airavata.messaging.core; import org.apache.airavata.common.exception.AiravataException; -import org.apache.airavata.model.messaging.event.*; /** * This is the basic publisher interface. http://git-wip-us.apache.org/repos/asf/airavata/blob/8d16d0ec/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/RabbitMQTaskLaunchPublisher.java ---------------------------------------------------------------------- diff --git a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/RabbitMQTaskLaunchPublisher.java b/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/RabbitMQTaskLaunchPublisher.java index 34e2545..53bf373 100644 --- a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/RabbitMQTaskLaunchPublisher.java +++ b/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/RabbitMQTaskLaunchPublisher.java @@ -28,7 +28,6 @@ import org.apache.airavata.messaging.core.MessageContext; import org.apache.airavata.messaging.core.MessagingConstants; import org.apache.airavata.messaging.core.Publisher; import org.apache.airavata.model.messaging.event.*; -import org.apache.catalina.Server; import org.apache.thrift.TException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/airavata/blob/8d16d0ec/modules/orchestrator/orchestrator-core/pom.xml ---------------------------------------------------------------------- diff --git a/modules/orchestrator/orchestrator-core/pom.xml b/modules/orchestrator/orchestrator-core/pom.xml index f0bbafb..6bf5171 100644 --- a/modules/orchestrator/orchestrator-core/pom.xml +++ b/modules/orchestrator/orchestrator-core/pom.xml @@ -41,7 +41,7 @@ the License. --> </dependency> <dependency> <groupId>org.apache.airavata</groupId> - <artifactId>airavata-common-utils</artifactId> + <artifactId>airavata-commons</artifactId> <version>${project.version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/airavata/blob/8d16d0ec/modules/registry/registry-core/pom.xml ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/pom.xml b/modules/registry/registry-core/pom.xml index fb80c1f..25eb17d 100644 --- a/modules/registry/registry-core/pom.xml +++ b/modules/registry/registry-core/pom.xml @@ -30,7 +30,7 @@ </dependency> <dependency> <groupId>org.apache.airavata</groupId> - <artifactId>airavata-common-utils</artifactId> + <artifactId>airavata-commons</artifactId> <version>${project.version}</version> </dependency> <!-- Test --> http://git-wip-us.apache.org/repos/asf/airavata/blob/8d16d0ec/modules/registry/registry-cpi/pom.xml ---------------------------------------------------------------------- diff --git a/modules/registry/registry-cpi/pom.xml b/modules/registry/registry-cpi/pom.xml index 8b5f84f..f5a54cc 100644 --- a/modules/registry/registry-cpi/pom.xml +++ b/modules/registry/registry-cpi/pom.xml @@ -30,7 +30,7 @@ </dependency> <dependency> <groupId>org.apache.airavata</groupId> - <artifactId>airavata-common-utils</artifactId> + <artifactId>airavata-commons</artifactId> <version>${project.version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/airavata/blob/8d16d0ec/modules/security/pom.xml ---------------------------------------------------------------------- diff --git a/modules/security/pom.xml b/modules/security/pom.xml index c968e91..ffba9b8 100644 --- a/modules/security/pom.xml +++ b/modules/security/pom.xml @@ -24,7 +24,7 @@ <dependencies> <dependency> <groupId>org.apache.airavata</groupId> - <artifactId>airavata-common-utils</artifactId> + <artifactId>airavata-commons</artifactId> <version>${project.version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/airavata/blob/8d16d0ec/modules/security/src/test/java/org/apache/airavata/security/userstore/SessionDBUserStoreTest.java ---------------------------------------------------------------------- diff --git a/modules/security/src/test/java/org/apache/airavata/security/userstore/SessionDBUserStoreTest.java b/modules/security/src/test/java/org/apache/airavata/security/userstore/SessionDBUserStoreTest.java index 9059c9a..0a8b7ab 100644 --- a/modules/security/src/test/java/org/apache/airavata/security/userstore/SessionDBUserStoreTest.java +++ b/modules/security/src/test/java/org/apache/airavata/security/userstore/SessionDBUserStoreTest.java @@ -23,7 +23,6 @@ package org.apache.airavata.security.userstore; -import junit.framework.TestCase; import org.apache.airavata.common.utils.DatabaseTestCases; import org.apache.airavata.common.utils.DerbyUtil; import org.junit.*; @@ -32,7 +31,6 @@ import org.w3c.dom.NodeList; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; -import java.io.File; import java.io.InputStream; /** http://git-wip-us.apache.org/repos/asf/airavata/blob/8d16d0ec/modules/server/pom.xml ---------------------------------------------------------------------- diff --git a/modules/server/pom.xml b/modules/server/pom.xml index 37ba141..d8f4419 100644 --- a/modules/server/pom.xml +++ b/modules/server/pom.xml @@ -37,7 +37,7 @@ </dependency> <dependency> <groupId>org.apache.airavata</groupId> - <artifactId>airavata-common-utils</artifactId> + <artifactId>airavata-commons</artifactId> <version>${project.version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/airavata/blob/8d16d0ec/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java ---------------------------------------------------------------------- diff --git a/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java b/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java index d90c21b..0117f7a 100644 --- a/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java +++ b/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java @@ -24,10 +24,8 @@ import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; import java.io.RandomAccessFile; -import java.net.URL; import java.util.ArrayList; import java.util.List; -import java.util.Properties; import org.apache.airavata.common.exception.ApplicationSettingsException; import org.apache.airavata.common.utils.*; @@ -36,8 +34,6 @@ import org.apache.airavata.common.utils.IServer.ServerStatus; import org.apache.airavata.common.utils.StringUtil.CommandLineParameters; import org.apache.commons.cli.ParseException; import org.apache.zookeeper.server.ServerCnxnFactory; -import org.apache.zookeeper.server.ServerConfig; -import org.apache.zookeeper.server.quorum.QuorumPeerConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/airavata/blob/8d16d0ec/modules/test-suite/multi-tenanted-airavata/pom.xml ---------------------------------------------------------------------- diff --git a/modules/test-suite/multi-tenanted-airavata/pom.xml b/modules/test-suite/multi-tenanted-airavata/pom.xml index 6c3f41f..58a3b53 100644 --- a/modules/test-suite/multi-tenanted-airavata/pom.xml +++ b/modules/test-suite/multi-tenanted-airavata/pom.xml @@ -65,7 +65,7 @@ </dependency> <dependency> <groupId>org.apache.airavata</groupId> - <artifactId>airavata-common-utils</artifactId> + <artifactId>airavata-commons</artifactId> <version>${project.version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/airavata/blob/8d16d0ec/modules/workflow-model/workflow-engine/pom.xml ---------------------------------------------------------------------- diff --git a/modules/workflow-model/workflow-engine/pom.xml b/modules/workflow-model/workflow-engine/pom.xml index 1361781..6f9bf15 100644 --- a/modules/workflow-model/workflow-engine/pom.xml +++ b/modules/workflow-model/workflow-engine/pom.xml @@ -242,7 +242,7 @@ </dependency> <dependency> <groupId>org.apache.airavata</groupId> - <artifactId>airavata-common-utils</artifactId> + <artifactId>airavata-commons</artifactId> <version>${project.version}</version> </dependency> <!--<dependency>--> http://git-wip-us.apache.org/repos/asf/airavata/blob/8d16d0ec/modules/workflow-model/workflow-engine/src/main/java/org/apache/airavata/workflow/engine/invoker/SimpleInvoker.java ---------------------------------------------------------------------- diff --git a/modules/workflow-model/workflow-engine/src/main/java/org/apache/airavata/workflow/engine/invoker/SimpleInvoker.java b/modules/workflow-model/workflow-engine/src/main/java/org/apache/airavata/workflow/engine/invoker/SimpleInvoker.java index e205459..eef2f8e 100644 --- a/modules/workflow-model/workflow-engine/src/main/java/org/apache/airavata/workflow/engine/invoker/SimpleInvoker.java +++ b/modules/workflow-model/workflow-engine/src/main/java/org/apache/airavata/workflow/engine/invoker/SimpleInvoker.java @@ -21,13 +21,10 @@ package org.apache.airavata.workflow.engine.invoker; -import java.util.Iterator; - import org.apache.airavata.common.utils.XMLUtil; import org.apache.airavata.workflow.model.exceptions.WorkflowException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.xmlpull.v1.builder.XmlElement; //import xsul.wsdl.WsdlDefinitions; //import xsul.wsif.WSIFMessage; http://git-wip-us.apache.org/repos/asf/airavata/blob/8d16d0ec/modules/workflow-model/workflow-engine/src/main/java/org/apache/airavata/workflow/engine/util/InterpreterUtil.java ---------------------------------------------------------------------- diff --git a/modules/workflow-model/workflow-engine/src/main/java/org/apache/airavata/workflow/engine/util/InterpreterUtil.java b/modules/workflow-model/workflow-engine/src/main/java/org/apache/airavata/workflow/engine/util/InterpreterUtil.java index c88f6ab..5beda25 100644 --- a/modules/workflow-model/workflow-engine/src/main/java/org/apache/airavata/workflow/engine/util/InterpreterUtil.java +++ b/modules/workflow-model/workflow-engine/src/main/java/org/apache/airavata/workflow/engine/util/InterpreterUtil.java @@ -23,7 +23,6 @@ package org.apache.airavata.workflow.engine.util; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; -import java.util.Iterator; import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -36,20 +35,11 @@ import org.apache.airavata.workflow.model.exceptions.WorkflowRuntimeException; import org.apache.airavata.workflow.model.graph.DataPort; import org.apache.airavata.workflow.model.graph.Node; import org.apache.airavata.workflow.model.graph.Node.NodeExecutionState; -import org.apache.airavata.workflow.model.graph.amazon.InstanceNode; import org.apache.airavata.workflow.model.graph.impl.NodeImpl; -import org.apache.airavata.workflow.model.graph.system.ConstantNode; -import org.apache.airavata.workflow.model.graph.system.DifferedInputNode; -import org.apache.airavata.workflow.model.graph.system.DoWhileNode; -import org.apache.airavata.workflow.model.graph.system.EndDoWhileNode; import org.apache.airavata.workflow.model.graph.system.EndForEachNode; -import org.apache.airavata.workflow.model.graph.system.EndifNode; import org.apache.airavata.workflow.model.graph.system.ForEachNode; import org.apache.airavata.workflow.model.graph.system.InputNode; -import org.apache.airavata.workflow.model.graph.system.SystemDataPort; import org.apache.airavata.workflow.model.graph.ws.WSGraph; -import org.apache.airavata.workflow.model.graph.ws.WSPort; -import org.xmlpull.infoset.XmlElement; //import xsul5.XmlConstants; //import org.apache.airavata.xbaya.ui.monitor.MonitorEventHandler; http://git-wip-us.apache.org/repos/asf/airavata/blob/8d16d0ec/modules/workflow-model/workflow-engine/src/main/java/org/apache/airavata/workflow/engine/util/XBayaUtil.java ---------------------------------------------------------------------- diff --git a/modules/workflow-model/workflow-engine/src/main/java/org/apache/airavata/workflow/engine/util/XBayaUtil.java b/modules/workflow-model/workflow-engine/src/main/java/org/apache/airavata/workflow/engine/util/XBayaUtil.java index 7aaac5d..f56aeca 100644 --- a/modules/workflow-model/workflow-engine/src/main/java/org/apache/airavata/workflow/engine/util/XBayaUtil.java +++ b/modules/workflow-model/workflow-engine/src/main/java/org/apache/airavata/workflow/engine/util/XBayaUtil.java @@ -28,15 +28,11 @@ import org.apache.airavata.workflow.model.exceptions.WorkflowException; import org.apache.airavata.workflow.model.exceptions.WorkflowRuntimeException; import org.apache.airavata.workflow.model.graph.DataPort; import org.apache.airavata.workflow.model.graph.Node; -import org.apache.airavata.workflow.model.graph.amazon.InstanceNode; -import org.apache.airavata.workflow.model.graph.system.ConstantNode; import org.apache.airavata.workflow.model.graph.system.EndForEachNode; -import org.apache.airavata.workflow.model.graph.system.EndifNode; import org.apache.airavata.workflow.model.graph.system.ForEachNode; import org.apache.airavata.workflow.model.graph.system.InputNode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.xmlpull.infoset.XmlElement; //import xsul5.XmlConstants; import java.net.HttpURLConnection; @@ -44,7 +40,6 @@ import java.net.SocketTimeoutException; import java.net.URL; import java.util.Arrays; import java.util.Collection; -import java.util.Iterator; import java.util.LinkedList; import java.util.List; import java.util.Map; http://git-wip-us.apache.org/repos/asf/airavata/blob/8d16d0ec/modules/workflow-model/workflow-model-component/pom.xml ---------------------------------------------------------------------- diff --git a/modules/workflow-model/workflow-model-component/pom.xml b/modules/workflow-model/workflow-model-component/pom.xml index c45de00..aa99ab0 100644 --- a/modules/workflow-model/workflow-model-component/pom.xml +++ b/modules/workflow-model/workflow-model-component/pom.xml @@ -66,7 +66,7 @@ </dependency> <dependency> <groupId>org.apache.airavata</groupId> - <artifactId>airavata-common-utils</artifactId> + <artifactId>airavata-commons</artifactId> <version>${project.version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/airavata/blob/8d16d0ec/modules/workflow-model/workflow-model-core/pom.xml ---------------------------------------------------------------------- diff --git a/modules/workflow-model/workflow-model-core/pom.xml b/modules/workflow-model/workflow-model-core/pom.xml index 3b31fb7..2e78243 100644 --- a/modules/workflow-model/workflow-model-core/pom.xml +++ b/modules/workflow-model/workflow-model-core/pom.xml @@ -67,7 +67,7 @@ <dependency> <groupId>org.apache.airavata</groupId> - <artifactId>airavata-common-utils</artifactId> + <artifactId>airavata-commons</artifactId> <version>${project.version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/airavata/blob/8d16d0ec/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/amazon/InstanceComponentDataPort.java ---------------------------------------------------------------------- diff --git a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/amazon/InstanceComponentDataPort.java b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/amazon/InstanceComponentDataPort.java index 85e7e4a..9702658 100644 --- a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/amazon/InstanceComponentDataPort.java +++ b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/amazon/InstanceComponentDataPort.java @@ -21,8 +21,6 @@ package org.apache.airavata.workflow.model.component.amazon; -import javax.xml.namespace.QName; - import org.apache.airavata.common.utils.WSConstants; import org.apache.airavata.model.appcatalog.appinterface.DataType; import org.apache.airavata.workflow.model.component.ComponentDataPort; http://git-wip-us.apache.org/repos/asf/airavata/blob/8d16d0ec/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/dynamic/DynamicComponentPort.java ---------------------------------------------------------------------- diff --git a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/dynamic/DynamicComponentPort.java b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/dynamic/DynamicComponentPort.java index 0adc686..f5fa500 100644 --- a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/dynamic/DynamicComponentPort.java +++ b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/dynamic/DynamicComponentPort.java @@ -21,8 +21,6 @@ package org.apache.airavata.workflow.model.component.dynamic; -import javax.xml.namespace.QName; - import org.apache.airavata.model.appcatalog.appinterface.DataType; import org.apache.airavata.workflow.model.component.ComponentDataPort; import org.apache.airavata.workflow.model.graph.DataPort; http://git-wip-us.apache.org/repos/asf/airavata/blob/8d16d0ec/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/url/URLComponentRegistry.java ---------------------------------------------------------------------- diff --git a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/url/URLComponentRegistry.java b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/url/URLComponentRegistry.java index df56cc4..b5bd3b5 100644 --- a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/url/URLComponentRegistry.java +++ b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/url/URLComponentRegistry.java @@ -31,7 +31,6 @@ import org.apache.airavata.workflow.model.component.ComponentReference; import org.apache.airavata.workflow.model.component.ComponentRegistry; import org.apache.airavata.workflow.model.component.ComponentRegistryException; import org.apache.airavata.workflow.model.component.ws.WSComponent; -import org.apache.airavata.workflow.model.component.ws.WSComponentFactory; //import xsul.wsdl.WsdlDefinitions; //import xsul.wsdl.WsdlResolver; http://git-wip-us.apache.org/repos/asf/airavata/blob/8d16d0ec/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/web/WebComponentRegistry.java ---------------------------------------------------------------------- diff --git a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/web/WebComponentRegistry.java b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/web/WebComponentRegistry.java index 3f66877..052868a 100644 --- a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/web/WebComponentRegistry.java +++ b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/web/WebComponentRegistry.java @@ -39,7 +39,6 @@ import javax.swing.text.html.HTMLEditorKit; import javax.swing.text.html.parser.ParserDelegator; import org.apache.airavata.common.utils.IOUtil; -import org.apache.airavata.workflow.model.component.ComponentException; import org.apache.airavata.workflow.model.component.ComponentReference; import org.apache.airavata.workflow.model.component.ComponentRegistry; import org.apache.airavata.workflow.model.component.ComponentRegistryException; http://git-wip-us.apache.org/repos/asf/airavata/blob/8d16d0ec/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/ws/WSComponentApplication.java ---------------------------------------------------------------------- diff --git a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/ws/WSComponentApplication.java b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/ws/WSComponentApplication.java index 1ebc006..c51f39f 100644 --- a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/ws/WSComponentApplication.java +++ b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/ws/WSComponentApplication.java @@ -34,7 +34,6 @@ import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; -import javax.xml.namespace.QName; import com.google.gson.JsonArray; import com.google.gson.JsonElement; @@ -48,7 +47,6 @@ import org.apache.airavata.model.appcatalog.appinterface.OutputDataObjectType; import org.apache.airavata.workflow.model.utils.WorkflowConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.xmlpull.infoset.XmlNamespace; //import xsul5.XmlConstants; http://git-wip-us.apache.org/repos/asf/airavata/blob/8d16d0ec/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/ws/WSComponentPort.java ---------------------------------------------------------------------- diff --git a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/ws/WSComponentPort.java b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/ws/WSComponentPort.java index b216b3d..ac4780a 100644 --- a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/ws/WSComponentPort.java +++ b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/ws/WSComponentPort.java @@ -21,8 +21,6 @@ package org.apache.airavata.workflow.model.component.ws; -import javax.xml.namespace.QName; - import org.apache.airavata.common.utils.WSConstants; import org.apache.airavata.common.utils.XMLUtil; import org.apache.airavata.model.appcatalog.appinterface.DataType; http://git-wip-us.apache.org/repos/asf/airavata/blob/8d16d0ec/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/ws/WSComponentRegistry.java ---------------------------------------------------------------------- diff --git a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/ws/WSComponentRegistry.java b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/ws/WSComponentRegistry.java index 083aa89..bacb90c 100644 --- a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/ws/WSComponentRegistry.java +++ b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/ws/WSComponentRegistry.java @@ -24,7 +24,6 @@ package org.apache.airavata.workflow.model.component.ws; import java.net.URI; import java.net.URISyntaxException; import java.util.ArrayList; -import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -34,7 +33,6 @@ import org.apache.airavata.workflow.model.component.ComponentReference; import org.apache.airavata.workflow.model.component.ComponentRegistry; import org.apache.airavata.workflow.model.component.ComponentRegistryException; import org.apache.airavata.workflow.model.component.system.SubWorkflowComponent; -import org.apache.airavata.workflow.model.component.url.URLComponentReference; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/airavata/blob/8d16d0ec/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/gpel/DSCUtil.java ---------------------------------------------------------------------- diff --git a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/gpel/DSCUtil.java b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/gpel/DSCUtil.java index 7a67672..a7a64e7 100644 --- a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/gpel/DSCUtil.java +++ b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/gpel/DSCUtil.java @@ -23,23 +23,13 @@ package org.apache.airavata.workflow.model.gpel; import java.io.UnsupportedEncodingException; import java.net.URI; -import java.net.URISyntaxException; import java.net.URLEncoder; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; import javax.xml.namespace.QName; import org.apache.airavata.common.exception.UtilsException; import org.apache.airavata.common.utils.WSDLUtil; import org.apache.airavata.workflow.model.exceptions.WorkflowRuntimeException; -import org.apache.airavata.workflow.model.gpel.script.BPELScript; -import org.apache.airavata.workflow.model.graph.Graph; -import org.apache.airavata.workflow.model.graph.util.GraphUtil; -import org.apache.airavata.workflow.model.graph.ws.WSNode; -import org.apache.airavata.workflow.model.wf.Workflow; //import xsul5.wsdl.WsdlDefinitions; //import xsul5.wsdl.WsdlPortType; http://git-wip-us.apache.org/repos/asf/airavata/blob/8d16d0ec/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/gpel/script/BPELScript.java ---------------------------------------------------------------------- diff --git a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/gpel/script/BPELScript.java b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/gpel/script/BPELScript.java index 182c0e8..9063207 100644 --- a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/gpel/script/BPELScript.java +++ b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/gpel/script/BPELScript.java @@ -28,40 +28,29 @@ import java.util.LinkedList; import java.util.List; import java.util.Set; -import javax.xml.namespace.QName; - import org.apache.airavata.common.utils.StringUtil; import org.apache.airavata.common.utils.WSConstants; import org.apache.airavata.common.utils.XMLUtil; import org.apache.airavata.workflow.model.component.ComponentPort; import org.apache.airavata.workflow.model.component.ws.WSComponent; import org.apache.airavata.workflow.model.component.ws.WSComponentPort; -import org.apache.airavata.workflow.model.exceptions.WorkflowRuntimeException; -import org.apache.airavata.workflow.model.graph.DataPort; import org.apache.airavata.workflow.model.graph.EPRPort; import org.apache.airavata.workflow.model.graph.Graph; import org.apache.airavata.workflow.model.graph.GraphException; import org.apache.airavata.workflow.model.graph.Node; import org.apache.airavata.workflow.model.graph.Port; -import org.apache.airavata.workflow.model.graph.amazon.InstanceNode; -import org.apache.airavata.workflow.model.graph.amazon.ResourceNode; import org.apache.airavata.workflow.model.graph.system.BlockNode; import org.apache.airavata.workflow.model.graph.system.ConstantNode; import org.apache.airavata.workflow.model.graph.system.EndBlockNode; import org.apache.airavata.workflow.model.graph.system.EndForEachNode; import org.apache.airavata.workflow.model.graph.system.EndifNode; -import org.apache.airavata.workflow.model.graph.system.ExitNode; import org.apache.airavata.workflow.model.graph.system.ForEachNode; import org.apache.airavata.workflow.model.graph.system.IfNode; import org.apache.airavata.workflow.model.graph.system.InputNode; import org.apache.airavata.workflow.model.graph.system.MemoNode; import org.apache.airavata.workflow.model.graph.system.OutputNode; -import org.apache.airavata.workflow.model.graph.system.ReceiveNode; -import org.apache.airavata.workflow.model.graph.system.StreamSourceNode; import org.apache.airavata.workflow.model.graph.util.GraphUtil; import org.apache.airavata.workflow.model.graph.ws.WSNode; -import org.apache.airavata.workflow.model.utils.WorkflowConstants; -import org.apache.airavata.workflow.model.utils.ApplicationVersion; import org.apache.airavata.workflow.model.wf.Workflow; //import org.gpel.GpelConstants; //import org.gpel.model.GpelAssign; @@ -82,9 +71,7 @@ import org.apache.airavata.workflow.model.wf.Workflow; //import org.gpel.model.GpelVariable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.xmlpull.infoset.XmlComment; import org.xmlpull.infoset.XmlElement; -import org.xmlpull.infoset.XmlInfosetBuilder; import org.xmlpull.infoset.XmlNamespace; //import xsul5.wsdl.WsdlPortType; http://git-wip-us.apache.org/repos/asf/airavata/blob/8d16d0ec/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/gpel/script/WorkflowWSDL.java ---------------------------------------------------------------------- diff --git a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/gpel/script/WorkflowWSDL.java b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/gpel/script/WorkflowWSDL.java index 5017d24..ee8f40b 100644 --- a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/gpel/script/WorkflowWSDL.java +++ b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/gpel/script/WorkflowWSDL.java @@ -21,9 +21,7 @@ package org.apache.airavata.workflow.model.gpel.script; -import java.util.HashMap; import java.util.List; -import java.util.Map; import javax.xml.namespace.QName; @@ -32,22 +30,16 @@ import org.apache.airavata.common.utils.WSConstants; import org.apache.airavata.common.utils.WSDLUtil; import org.apache.airavata.common.utils.XMLUtil; import org.apache.airavata.workflow.model.component.ws.WSComponentPort; -import org.apache.airavata.workflow.model.exceptions.WorkflowRuntimeException; -import org.apache.airavata.workflow.model.graph.DataPort; import org.apache.airavata.workflow.model.graph.GraphException; import org.apache.airavata.workflow.model.graph.Node; import org.apache.airavata.workflow.model.graph.system.InputNode; import org.apache.airavata.workflow.model.graph.system.ParameterNode; -import org.apache.airavata.workflow.model.graph.system.ReceiveNode; import org.apache.airavata.workflow.model.graph.system.SystemDataPort; -import org.apache.airavata.workflow.model.graph.util.GraphUtil; import org.apache.airavata.workflow.model.graph.ws.WSGraph; import org.apache.airavata.workflow.model.utils.WorkflowConstants; -import org.apache.airavata.workflow.model.utils.ApplicationVersion; import org.apache.airavata.workflow.model.wf.Workflow; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.xmlpull.infoset.XmlComment; import org.xmlpull.infoset.XmlElement; import org.xmlpull.infoset.XmlNamespace; http://git-wip-us.apache.org/repos/asf/airavata/blob/8d16d0ec/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/impl/EdgeImpl.java ---------------------------------------------------------------------- diff --git a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/impl/EdgeImpl.java b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/impl/EdgeImpl.java index 03b867d..bb2519f 100644 --- a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/impl/EdgeImpl.java +++ b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/impl/EdgeImpl.java @@ -21,7 +21,6 @@ package org.apache.airavata.workflow.model.graph.impl; -import com.google.gson.JsonElement; import com.google.gson.JsonObject; import org.apache.airavata.common.utils.XMLUtil; import org.apache.airavata.workflow.model.graph.Edge; http://git-wip-us.apache.org/repos/asf/airavata/blob/8d16d0ec/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/impl/PortImpl.java ---------------------------------------------------------------------- diff --git a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/impl/PortImpl.java b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/impl/PortImpl.java index 5231a01..6504d2b 100644 --- a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/impl/PortImpl.java +++ b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/impl/PortImpl.java @@ -25,7 +25,6 @@ import java.util.ArrayList; import java.util.LinkedList; import java.util.List; -import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonPrimitive; import org.apache.airavata.common.utils.XMLUtil; http://git-wip-us.apache.org/repos/asf/airavata/blob/8d16d0ec/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/ConstantNode.java ---------------------------------------------------------------------- diff --git a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/ConstantNode.java b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/ConstantNode.java index b69fcae..405dc3b 100644 --- a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/ConstantNode.java +++ b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/ConstantNode.java @@ -23,8 +23,6 @@ package org.apache.airavata.workflow.model.graph.system; import java.util.List; -import javax.xml.namespace.QName; - import org.apache.airavata.common.utils.WSConstants; import org.apache.airavata.model.appcatalog.appinterface.DataType; import org.apache.airavata.workflow.model.component.Component; http://git-wip-us.apache.org/repos/asf/airavata/blob/8d16d0ec/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/DifferedInputNode.java ---------------------------------------------------------------------- diff --git a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/DifferedInputNode.java b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/DifferedInputNode.java index 5ef7b1c..2902128 100644 --- a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/DifferedInputNode.java +++ b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/DifferedInputNode.java @@ -22,8 +22,6 @@ package org.apache.airavata.workflow.model.graph.system; import java.util.List; -import javax.xml.namespace.QName; - import org.apache.airavata.common.utils.WSConstants; import org.apache.airavata.model.appcatalog.appinterface.DataType; import org.apache.airavata.workflow.model.component.Component; http://git-wip-us.apache.org/repos/asf/airavata/blob/8d16d0ec/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/EndBlockNode.java ---------------------------------------------------------------------- diff --git a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/EndBlockNode.java b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/EndBlockNode.java index c515f63..f57294c 100644 --- a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/EndBlockNode.java +++ b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/EndBlockNode.java @@ -23,8 +23,6 @@ package org.apache.airavata.workflow.model.graph.system; import java.util.List; -import javax.xml.namespace.QName; - import org.apache.airavata.common.utils.WSConstants; import org.apache.airavata.model.appcatalog.appinterface.DataType; import org.apache.airavata.workflow.model.component.ComponentDataPort; http://git-wip-us.apache.org/repos/asf/airavata/blob/8d16d0ec/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/EndDoWhileNode.java ---------------------------------------------------------------------- diff --git a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/EndDoWhileNode.java b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/EndDoWhileNode.java index 6c763aa..7b92714 100644 --- a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/EndDoWhileNode.java +++ b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/EndDoWhileNode.java @@ -23,8 +23,6 @@ package org.apache.airavata.workflow.model.graph.system; import java.util.List; -import javax.xml.namespace.QName; - import org.apache.airavata.common.utils.WSConstants; import org.apache.airavata.model.appcatalog.appinterface.DataType; import org.apache.airavata.workflow.model.component.ComponentDataPort; http://git-wip-us.apache.org/repos/asf/airavata/blob/8d16d0ec/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/EndForEachNode.java ---------------------------------------------------------------------- diff --git a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/EndForEachNode.java b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/EndForEachNode.java index feb07c0..c565ed2 100644 --- a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/EndForEachNode.java +++ b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/EndForEachNode.java @@ -23,8 +23,6 @@ package org.apache.airavata.workflow.model.graph.system; import java.util.List; -import javax.xml.namespace.QName; - import org.apache.airavata.common.utils.WSConstants; import org.apache.airavata.model.appcatalog.appinterface.DataType; import org.apache.airavata.workflow.model.component.ComponentDataPort; http://git-wip-us.apache.org/repos/asf/airavata/blob/8d16d0ec/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/EndifNode.java ---------------------------------------------------------------------- diff --git a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/EndifNode.java b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/EndifNode.java index 63c26d6..dbc8382 100644 --- a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/EndifNode.java +++ b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/EndifNode.java @@ -23,8 +23,6 @@ package org.apache.airavata.workflow.model.graph.system; import java.util.List; -import javax.xml.namespace.QName; - import org.apache.airavata.common.utils.WSConstants; import org.apache.airavata.model.appcatalog.appinterface.DataType; import org.apache.airavata.workflow.model.component.ComponentDataPort; http://git-wip-us.apache.org/repos/asf/airavata/blob/8d16d0ec/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/ForEachNode.java ---------------------------------------------------------------------- diff --git a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/ForEachNode.java b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/ForEachNode.java index 86dcdef..8962cd8 100644 --- a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/ForEachNode.java +++ b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/ForEachNode.java @@ -23,8 +23,6 @@ package org.apache.airavata.workflow.model.graph.system; import java.util.List; -import javax.xml.namespace.QName; - import org.apache.airavata.common.utils.WSConstants; import org.apache.airavata.model.appcatalog.appinterface.DataType; import org.apache.airavata.workflow.model.component.ComponentDataPort; http://git-wip-us.apache.org/repos/asf/airavata/blob/8d16d0ec/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/InputNode.java ---------------------------------------------------------------------- diff --git a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/InputNode.java b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/InputNode.java index ffe017f..5a4c236 100644 --- a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/InputNode.java +++ b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/InputNode.java @@ -23,8 +23,6 @@ package org.apache.airavata.workflow.model.graph.system; import java.util.List; -import javax.xml.namespace.QName; - import com.google.gson.JsonElement; import com.google.gson.JsonObject; import org.apache.airavata.common.utils.WSConstants; http://git-wip-us.apache.org/repos/asf/airavata/blob/8d16d0ec/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/ParameterNode.java ---------------------------------------------------------------------- diff --git a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/ParameterNode.java b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/ParameterNode.java index b819e4f..739b231 100644 --- a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/ParameterNode.java +++ b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/ParameterNode.java @@ -24,8 +24,6 @@ package org.apache.airavata.workflow.model.graph.system; import java.util.ArrayList; import java.util.List; -import javax.xml.namespace.QName; - import com.google.gson.JsonElement; import com.google.gson.JsonObject; import org.apache.airavata.common.exception.UtilsException; http://git-wip-us.apache.org/repos/asf/airavata/blob/8d16d0ec/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/S3InputNode.java ---------------------------------------------------------------------- diff --git a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/S3InputNode.java b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/S3InputNode.java index a51849c..320135f 100644 --- a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/S3InputNode.java +++ b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/S3InputNode.java @@ -23,8 +23,6 @@ package org.apache.airavata.workflow.model.graph.system; import java.util.List; -import javax.xml.namespace.QName; - import org.apache.airavata.common.utils.WSConstants; import org.apache.airavata.model.appcatalog.appinterface.DataType; import org.apache.airavata.workflow.model.component.Component; http://git-wip-us.apache.org/repos/asf/airavata/blob/8d16d0ec/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/SystemDataPort.java ---------------------------------------------------------------------- diff --git a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/SystemDataPort.java b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/SystemDataPort.java index 2967f5c..dc821ce 100644 --- a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/SystemDataPort.java +++ b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/SystemDataPort.java @@ -21,8 +21,6 @@ package org.apache.airavata.workflow.model.graph.system; -import javax.xml.namespace.QName; - import com.google.gson.JsonObject; import org.apache.airavata.common.utils.WSConstants; import org.apache.airavata.model.appcatalog.appinterface.DataType; http://git-wip-us.apache.org/repos/asf/airavata/blob/8d16d0ec/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/SystemNode.java ---------------------------------------------------------------------- diff --git a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/SystemNode.java b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/SystemNode.java index eb83b6b..1962290 100644 --- a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/SystemNode.java +++ b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/SystemNode.java @@ -23,8 +23,6 @@ package org.apache.airavata.workflow.model.graph.system; import java.util.List; -import javax.xml.namespace.QName; - import com.google.gson.JsonObject; import org.apache.airavata.model.appcatalog.appinterface.DataType; import org.apache.airavata.workflow.model.exceptions.WorkflowRuntimeException; http://git-wip-us.apache.org/repos/asf/airavata/blob/8d16d0ec/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/ws/WSGraphFactory.java ---------------------------------------------------------------------- diff --git a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/ws/WSGraphFactory.java b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/ws/WSGraphFactory.java index 9fc9567..cca707d 100644 --- a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/ws/WSGraphFactory.java +++ b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/ws/WSGraphFactory.java @@ -24,7 +24,6 @@ package org.apache.airavata.workflow.model.graph.ws; import java.io.File; import java.io.IOException; -import com.google.gson.JsonElement; import com.google.gson.JsonObject; import org.apache.airavata.common.utils.IOUtil; import org.apache.airavata.common.utils.JSONUtil; http://git-wip-us.apache.org/repos/asf/airavata/blob/8d16d0ec/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/ws/WSPort.java ---------------------------------------------------------------------- diff --git a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/ws/WSPort.java b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/ws/WSPort.java index 0140993..3db6ae6 100644 --- a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/ws/WSPort.java +++ b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/ws/WSPort.java @@ -21,8 +21,6 @@ package org.apache.airavata.workflow.model.graph.ws; -import javax.xml.namespace.QName; - import com.google.gson.JsonObject; import org.apache.airavata.common.utils.WSConstants; import org.apache.airavata.model.appcatalog.appinterface.DataType; http://git-wip-us.apache.org/repos/asf/airavata/blob/8d16d0ec/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/wf/TridentTransformer.java ---------------------------------------------------------------------- diff --git a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/wf/TridentTransformer.java b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/wf/TridentTransformer.java index 51e1f11..d4fbc38 100644 --- a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/wf/TridentTransformer.java +++ b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/wf/TridentTransformer.java @@ -21,13 +21,7 @@ package org.apache.airavata.workflow.model.wf; -import java.util.LinkedList; - import org.apache.airavata.common.utils.XMLUtil; -import org.apache.airavata.workflow.model.xsd.GFacSimpleTypesXSD; -import org.apache.airavata.workflow.model.xsd.LeadContextHeaderXSD; -import org.apache.airavata.workflow.model.xsd.LeadCrosscutXSD; -import org.xmlpull.infoset.XmlElement; //import xsul5.wsdl.WsdlDefinitions; http://git-wip-us.apache.org/repos/asf/airavata/blob/8d16d0ec/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/wf/Workflow.java ---------------------------------------------------------------------- diff --git a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/wf/Workflow.java b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/wf/Workflow.java index eb6ebf7..705b4ae 100644 --- a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/wf/Workflow.java +++ b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/wf/Workflow.java @@ -28,16 +28,13 @@ import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; import java.util.ArrayList; -import java.util.Collection; import java.util.HashMap; -import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import javax.imageio.ImageIO; import javax.xml.namespace.QName; -import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonPrimitive; import org.apache.airavata.common.exception.UtilsException; @@ -52,8 +49,6 @@ import org.apache.airavata.workflow.model.component.ws.WSComponentPort; import org.apache.airavata.workflow.model.exceptions.WorkflowException; import org.apache.airavata.workflow.model.exceptions.WorkflowRuntimeException; import org.apache.airavata.workflow.model.gpel.script.BPELScript; -import org.apache.airavata.workflow.model.gpel.script.BPELScriptType; -import org.apache.airavata.workflow.model.graph.Graph; import org.apache.airavata.workflow.model.graph.GraphException; import org.apache.airavata.workflow.model.graph.GraphSchema; import org.apache.airavata.workflow.model.graph.Node; http://git-wip-us.apache.org/repos/asf/airavata/blob/8d16d0ec/modules/xbaya-gui/pom.xml ---------------------------------------------------------------------- diff --git a/modules/xbaya-gui/pom.xml b/modules/xbaya-gui/pom.xml index fa25025..d15c231 100644 --- a/modules/xbaya-gui/pom.xml +++ b/modules/xbaya-gui/pom.xml @@ -201,7 +201,7 @@ </dependency> <dependency> <groupId>org.apache.airavata</groupId> - <artifactId>airavata-common-utils</artifactId> + <artifactId>airavata-commons</artifactId> <version>${project.version}</version> </dependency> <!--<dependency>--> http://git-wip-us.apache.org/repos/asf/airavata/blob/8d16d0ec/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/core/generators/BPELFiler.java ---------------------------------------------------------------------- diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/core/generators/BPELFiler.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/core/generators/BPELFiler.java index cd3954a..eeb6f3c 100644 --- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/core/generators/BPELFiler.java +++ b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/core/generators/BPELFiler.java @@ -22,7 +22,6 @@ package org.apache.airavata.xbaya.core.generators; import java.io.File; -import java.io.IOException; import java.util.ArrayList; import javax.swing.JFileChooser; @@ -30,15 +29,10 @@ import javax.swing.filechooser.FileFilter; import org.apache.airavata.common.utils.XMLUtil; import org.apache.airavata.workflow.model.gpel.script.BPELScript; -import org.apache.airavata.workflow.model.gpel.script.BPELScriptType; -import org.apache.airavata.workflow.model.gpel.script.WorkflowWSDL; -import org.apache.airavata.workflow.model.graph.GraphException; import org.apache.airavata.workflow.model.wf.Workflow; import org.apache.airavata.xbaya.XBayaConstants; import org.apache.airavata.xbaya.XBayaEngine; import org.apache.airavata.xbaya.file.XBayaPathConstants; -import org.apache.airavata.xbaya.ui.utils.ErrorMessages; -import org.gpel.model.GpelProcess; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/airavata/blob/8d16d0ec/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/core/generators/ODEScriptFiler.java ---------------------------------------------------------------------- diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/core/generators/ODEScriptFiler.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/core/generators/ODEScriptFiler.java index 7649754..dbf0044 100644 --- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/core/generators/ODEScriptFiler.java +++ b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/core/generators/ODEScriptFiler.java @@ -22,20 +22,13 @@ package org.apache.airavata.xbaya.core.generators; import java.io.File; -import java.io.FileWriter; -import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; -import java.util.Map; -import java.util.Set; import javax.swing.JFileChooser; import javax.swing.filechooser.FileFilter; -import javax.xml.namespace.QName; import org.apache.airavata.common.utils.WSDLUtil; -import org.apache.airavata.workflow.model.component.ComponentException; -import org.apache.airavata.workflow.model.graph.GraphException; import org.apache.airavata.workflow.model.wf.Workflow; import org.apache.airavata.xbaya.XBayaConstants; import org.apache.airavata.xbaya.XBayaEngine; @@ -44,10 +37,6 @@ import org.apache.airavata.xbaya.ui.utils.ErrorMessages; import org.gpel.model.GpelProcess; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.xmlpull.infoset.XmlElement; - -import xsul5.XmlConstants; -import xsul5.wsdl.WsdlDefinitions; public class ODEScriptFiler { http://git-wip-us.apache.org/repos/asf/airavata/blob/8d16d0ec/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/StandaloneNotificationSender.java ---------------------------------------------------------------------- diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/StandaloneNotificationSender.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/StandaloneNotificationSender.java index 432bc56..cd06c60 100644 --- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/StandaloneNotificationSender.java +++ b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/StandaloneNotificationSender.java @@ -31,11 +31,9 @@ import org.apache.airavata.workflow.model.graph.system.OutputNode; import org.apache.airavata.workflow.model.graph.util.GraphUtil; import org.apache.airavata.workflow.model.wf.Workflow; import org.apache.airavata.xbaya.XBayaConstants; -import org.apache.airavata.xbaya.graph.controller.NodeController; import org.apache.airavata.xbaya.jython.lib.ServiceNotifiable; import org.apache.airavata.xbaya.jython.lib.StandaloneServiceNotificationSender; import org.apache.airavata.xbaya.jython.lib.WorkflowNotifiable; -import org.apache.airavata.xbaya.ui.monitor.MonitorEventHandler.NodeState; import org.apache.axis2.addressing.EndpointReference; import org.python.core.PyObject; http://git-wip-us.apache.org/repos/asf/airavata/blob/8d16d0ec/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/messaging/EventData.java ---------------------------------------------------------------------- diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/messaging/EventData.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/messaging/EventData.java index ab02662..ba70109 100644 --- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/messaging/EventData.java +++ b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/messaging/EventData.java @@ -27,14 +27,11 @@ import org.apache.airavata.messaging.core.MessageContext; import org.apache.airavata.model.messaging.event.ExperimentStatusChangeEvent; import org.apache.airavata.model.messaging.event.JobIdentifier; import org.apache.airavata.model.messaging.event.JobStatusChangeEvent; -import org.apache.airavata.model.messaging.event.Message; -import org.apache.airavata.model.messaging.event.MessageLevel; import org.apache.airavata.model.messaging.event.MessageType; import org.apache.airavata.model.messaging.event.TaskIdentifier; import org.apache.airavata.model.messaging.event.TaskStatusChangeEvent; import org.apache.airavata.model.messaging.event.WorkflowIdentifier; import org.apache.airavata.model.messaging.event.WorkflowNodeStatusChangeEvent; -import org.apache.thrift.TException; import java.util.Date; http://git-wip-us.apache.org/repos/asf/airavata/blob/8d16d0ec/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/modifier/WorkflowModifier.java ---------------------------------------------------------------------- diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/modifier/WorkflowModifier.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/modifier/WorkflowModifier.java index f8a495a..3b38b1f 100644 --- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/modifier/WorkflowModifier.java +++ b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/modifier/WorkflowModifier.java @@ -51,10 +51,6 @@ import org.apache.airavata.xbaya.messaging.MonitorException; import org.apache.airavata.xbaya.ui.monitor.MonitorEventHandler.NodeState; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.xmlpull.infoset.XmlElement; - -import xsul.XmlConstants; -import xsul5.wsdl.WsdlPortTypeOperation; public class WorkflowModifier { http://git-wip-us.apache.org/repos/asf/airavata/blob/8d16d0ec/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/XBayaGUI.java ---------------------------------------------------------------------- diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/XBayaGUI.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/XBayaGUI.java index fb1a0b0..3c7a1d4 100644 --- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/XBayaGUI.java +++ b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/XBayaGUI.java @@ -52,7 +52,6 @@ import org.apache.airavata.common.utils.SwingUtil; import org.apache.airavata.workflow.model.component.Component; import org.apache.airavata.workflow.model.exceptions.WorkflowException; import org.apache.airavata.workflow.model.exceptions.WorkflowRuntimeException; -import org.apache.airavata.workflow.model.graph.Graph; import org.apache.airavata.workflow.model.graph.Node; import org.apache.airavata.workflow.model.graph.Port; import org.apache.airavata.workflow.model.wf.Workflow; http://git-wip-us.apache.org/repos/asf/airavata/blob/8d16d0ec/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/ConstantConfigurationDialog.java ---------------------------------------------------------------------- diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/ConstantConfigurationDialog.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/ConstantConfigurationDialog.java index 63b7850..9a99baf 100644 --- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/ConstantConfigurationDialog.java +++ b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/ConstantConfigurationDialog.java @@ -26,7 +26,6 @@ import java.awt.event.ActionEvent; import javax.swing.AbstractAction; import javax.swing.JButton; import javax.swing.JPanel; -import javax.xml.namespace.QName; import org.apache.airavata.common.utils.XMLUtil; import org.apache.airavata.model.appcatalog.appinterface.DataType; http://git-wip-us.apache.org/repos/asf/airavata/blob/8d16d0ec/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/DifferedInputConfigurationDialog.java ---------------------------------------------------------------------- diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/DifferedInputConfigurationDialog.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/DifferedInputConfigurationDialog.java index e81a033..1fc19c7 100644 --- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/DifferedInputConfigurationDialog.java +++ b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/DifferedInputConfigurationDialog.java @@ -26,7 +26,6 @@ import java.awt.event.ActionEvent; import javax.swing.AbstractAction; import javax.swing.JButton; import javax.swing.JPanel; -import javax.xml.namespace.QName; import org.apache.airavata.common.utils.WSConstants; import org.apache.airavata.common.utils.XMLUtil; http://git-wip-us.apache.org/repos/asf/airavata/blob/8d16d0ec/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/InputConfigurationDialog.java ---------------------------------------------------------------------- diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/InputConfigurationDialog.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/InputConfigurationDialog.java index b0c5f57..fa88ff1 100644 --- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/InputConfigurationDialog.java +++ b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/InputConfigurationDialog.java @@ -26,10 +26,8 @@ import java.awt.event.ActionEvent; import javax.swing.AbstractAction; import javax.swing.JButton; import javax.swing.JPanel; -import javax.xml.namespace.QName; import org.apache.airavata.common.utils.XMLUtil; -import org.apache.airavata.model.appcatalog.appinterface.DataType; import org.apache.airavata.workflow.model.graph.system.InputNode; import org.apache.airavata.xbaya.ui.XBayaGUI; import org.apache.airavata.xbaya.ui.dialogs.XBayaDialog; http://git-wip-us.apache.org/repos/asf/airavata/blob/8d16d0ec/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/OutputConfigurationDialog.java ---------------------------------------------------------------------- diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/OutputConfigurationDialog.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/OutputConfigurationDialog.java index 7862959..428b0db 100644 --- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/OutputConfigurationDialog.java +++ b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/OutputConfigurationDialog.java @@ -36,7 +36,6 @@ import org.apache.airavata.xbaya.ui.widgets.GridPanel; import org.apache.airavata.xbaya.ui.widgets.XBayaLabel; import org.apache.airavata.xbaya.ui.widgets.XBayaTextArea; import org.apache.airavata.xbaya.ui.widgets.XBayaTextField; -import org.xmlpull.infoset.XmlElement; public class OutputConfigurationDialog { http://git-wip-us.apache.org/repos/asf/airavata/blob/8d16d0ec/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/ws/WSNodeWindow.java ---------------------------------------------------------------------- diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/ws/WSNodeWindow.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/ws/WSNodeWindow.java index f5ce749..b23c84b 100644 --- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/ws/WSNodeWindow.java +++ b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/ws/WSNodeWindow.java @@ -37,8 +37,6 @@ import org.apache.airavata.xbaya.ui.widgets.XBayaLabel; import org.apache.airavata.xbaya.ui.widgets.XBayaTextArea; import org.apache.airavata.xbaya.ui.widgets.XBayaTextField; -import xsul5.wsdl.WsdlDefinitions; - public class WSNodeWindow { private XBayaEngine engine; http://git-wip-us.apache.org/repos/asf/airavata/blob/8d16d0ec/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/workflow/WorkflowImportWindow.java ---------------------------------------------------------------------- diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/workflow/WorkflowImportWindow.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/workflow/WorkflowImportWindow.java index 07d2f46..7feb932 100644 --- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/workflow/WorkflowImportWindow.java +++ b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/workflow/WorkflowImportWindow.java @@ -41,8 +41,6 @@ import org.apache.airavata.common.utils.XMLUtil; import org.apache.airavata.model.error.AiravataClientException; import org.apache.airavata.model.error.AiravataSystemException; import org.apache.airavata.model.error.InvalidRequestException; -import org.apache.airavata.workflow.model.graph.ws.WSGraph; -import org.apache.airavata.workflow.model.graph.ws.WSGraphFactory; import org.apache.airavata.workflow.model.wf.Workflow; import org.apache.airavata.xbaya.ThriftClientData; import org.apache.airavata.xbaya.ThriftServiceType; http://git-wip-us.apache.org/repos/asf/airavata/blob/8d16d0ec/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/workflow/WorkflowPropertyWindow.java ---------------------------------------------------------------------- diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/workflow/WorkflowPropertyWindow.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/workflow/WorkflowPropertyWindow.java index d4bd884..d94054b 100644 --- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/workflow/WorkflowPropertyWindow.java +++ b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/workflow/WorkflowPropertyWindow.java @@ -22,7 +22,6 @@ package org.apache.airavata.xbaya.ui.dialogs.workflow; import java.awt.event.ActionEvent; -import java.net.URI; import java.util.ArrayList; import java.util.List; @@ -31,9 +30,6 @@ import javax.swing.JButton; import javax.swing.JOptionPane; import javax.swing.JPanel; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import com.google.gson.JsonObject; import org.apache.airavata.common.utils.JSONUtil; import org.apache.airavata.common.utils.StringUtil; import org.apache.airavata.common.utils.WSConstants; @@ -46,7 +42,6 @@ import org.apache.airavata.xbaya.ui.widgets.GridPanel; import org.apache.airavata.xbaya.ui.widgets.XBayaLabel; import org.apache.airavata.xbaya.ui.widgets.XBayaTextArea; import org.apache.airavata.xbaya.ui.widgets.XBayaTextField; -import org.xmlpull.infoset.XmlElement; public class WorkflowPropertyWindow { http://git-wip-us.apache.org/repos/asf/airavata/blob/8d16d0ec/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/RegistryWorkflowPublisherWindow.java ---------------------------------------------------------------------- diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/RegistryWorkflowPublisherWindow.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/RegistryWorkflowPublisherWindow.java index 1b4c383..0e9c765 100644 --- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/RegistryWorkflowPublisherWindow.java +++ b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/RegistryWorkflowPublisherWindow.java @@ -21,7 +21,6 @@ package org.apache.airavata.xbaya.ui.experiment; -import java.awt.HeadlessException; import java.awt.event.ActionEvent; import javax.swing.AbstractAction; @@ -35,11 +34,6 @@ import javax.swing.border.TitledBorder; import org.apache.airavata.api.Airavata.Client; import org.apache.airavata.api.client.AiravataClientFactory; import org.apache.airavata.common.utils.XMLUtil; -import org.apache.airavata.model.error.AiravataClientConnectException; -import org.apache.airavata.model.error.AiravataClientException; -import org.apache.airavata.model.error.AiravataSystemException; -import org.apache.airavata.model.error.InvalidRequestException; -import org.apache.airavata.workflow.catalog.WorkflowCatalogFactory; import org.apache.airavata.workflow.model.wf.Workflow; import org.apache.airavata.xbaya.ThriftClientData; import org.apache.airavata.xbaya.ThriftServiceType; @@ -50,7 +44,6 @@ import org.apache.airavata.xbaya.ui.widgets.GridPanel; import org.apache.airavata.xbaya.ui.widgets.XBayaLabel; import org.apache.airavata.xbaya.ui.widgets.XBayaTextArea; import org.apache.airavata.xbaya.ui.widgets.XBayaTextField; -import org.apache.thrift.TException; public class RegistryWorkflowPublisherWindow { http://git-wip-us.apache.org/repos/asf/airavata/blob/8d16d0ec/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/WorkflowInterpreterLaunchWindow.java ---------------------------------------------------------------------- diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/WorkflowInterpreterLaunchWindow.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/WorkflowInterpreterLaunchWindow.java index 5ae0c94..ed73d31 100644 --- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/WorkflowInterpreterLaunchWindow.java +++ b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/WorkflowInterpreterLaunchWindow.java @@ -67,7 +67,6 @@ import javax.swing.JLabel; import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.border.EtchedBorder; -import javax.xml.namespace.QName; import java.awt.event.ActionEvent; import java.util.ArrayList; import java.util.Collection; http://git-wip-us.apache.org/repos/asf/airavata/blob/8d16d0ec/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/GraphCanvas.java ---------------------------------------------------------------------- diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/GraphCanvas.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/GraphCanvas.java index 6e89cbe..24f03ed 100644 --- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/GraphCanvas.java +++ b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/GraphCanvas.java @@ -56,7 +56,6 @@ import javax.swing.JPanel; import javax.swing.JPopupMenu; import javax.swing.JScrollPane; -import com.google.gson.JsonElement; import com.google.gson.JsonObject; import org.apache.airavata.common.utils.JSONUtil; import org.apache.airavata.common.utils.SwingUtil; @@ -92,7 +91,6 @@ import org.apache.airavata.xbaya.ui.utils.ErrorMessages; import org.apache.airavata.xbaya.ui.widgets.component.ComponentSourceTransferable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.xmlpull.infoset.XmlElement; /** http://git-wip-us.apache.org/repos/asf/airavata/blob/8d16d0ec/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/widgets/XBayaToolBar.java ---------------------------------------------------------------------- diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/widgets/XBayaToolBar.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/widgets/XBayaToolBar.java index 9f18440..ac7f034 100644 --- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/widgets/XBayaToolBar.java +++ b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/widgets/XBayaToolBar.java @@ -25,11 +25,9 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Set; import javax.swing.AbstractAction; import javax.swing.BorderFactory; @@ -47,8 +45,6 @@ import org.apache.airavata.workflow.model.wf.WorkflowExecutionState; import org.apache.airavata.xbaya.XBayaEngine; import org.apache.airavata.xbaya.ui.utils.ErrorMessages; -import com.amazonaws.transform.MapEntry; - public class XBayaToolBar implements XBayaComponent { private XBayaEngine engine; http://git-wip-us.apache.org/repos/asf/airavata/blob/8d16d0ec/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/XBayaUtil.java ---------------------------------------------------------------------- diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/XBayaUtil.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/XBayaUtil.java index c67a4c3..d004f18 100644 --- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/XBayaUtil.java +++ b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/XBayaUtil.java @@ -23,41 +23,26 @@ package org.apache.airavata.xbaya.util; import java.net.HttpURLConnection; import java.net.SocketTimeoutException; -import java.net.URISyntaxException; import java.net.URL; import java.util.Collection; -import java.util.Iterator; import java.util.List; -import java.util.Map; import org.apache.airavata.api.Airavata; import org.apache.airavata.api.Airavata.Client; import org.apache.airavata.api.client.AiravataClientFactory; import org.apache.airavata.common.utils.StringUtil; import org.apache.airavata.model.error.AiravataClientConnectException; -import org.apache.airavata.workflow.model.exceptions.WorkflowException; import org.apache.airavata.workflow.model.exceptions.WorkflowRuntimeException; import org.apache.airavata.workflow.model.graph.DataPort; import org.apache.airavata.workflow.model.graph.Node; -import org.apache.airavata.workflow.model.graph.amazon.InstanceNode; -import org.apache.airavata.workflow.model.graph.system.ConstantNode; import org.apache.airavata.workflow.model.graph.system.EndForEachNode; -import org.apache.airavata.workflow.model.graph.system.EndifNode; import org.apache.airavata.workflow.model.graph.system.ForEachNode; -import org.apache.airavata.workflow.model.graph.system.InputNode; -import org.apache.airavata.workflow.model.wf.Workflow; import org.apache.airavata.xbaya.ThriftClientData; import org.apache.airavata.xbaya.ThriftServiceType; -import org.apache.airavata.xbaya.XBayaConfiguration; import org.apache.airavata.xbaya.XBayaEngine; import org.apache.airavata.xbaya.ui.dialogs.registry.RegistryWindow; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.xmlpull.infoset.XmlElement; - -import xsul.lead.LeadContextHeader; -import xsul.lead.LeadResourceMapping; -import xsul5.XmlConstants; public class XBayaUtil {
