Repository: airavata Updated Branches: refs/heads/master 382b6c0e6 -> 624dd4149
removing unused workflow execution context - AIRAVATA-1699 Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/624dd414 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/624dd414 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/624dd414 Branch: refs/heads/master Commit: 624dd4149dd0fc8b4369eff4d4750d0cc9f20411 Parents: 382b6c0 Author: Suresh Marru <[email protected]> Authored: Tue May 12 21:34:31 2015 -0400 Committer: Suresh Marru <[email protected]> Committed: Tue May 12 21:34:31 2015 -0400 ---------------------------------------------------------------------- modules/commons/pom.xml | 1 - .../commons/workflow-execution-context/pom.xml | 94 --- .../context/WorkflowContextHeaderBuilder.java | 476 --------------- .../resources/workflow_execution_context.xsd | 592 ------------------- .../workflow_execution_context.xsdconfig | 15 - .../WorkflowContextHeaderBuilderTest.java | 46 -- .../src/test/resources/result.xml | 23 - modules/distribution/server/pom.xml | 5 - modules/gfac/gfac-core/pom.xml | 11 - .../gfac/gfac-monitor/gfac-hpc-monitor/pom.xml | 5 - modules/orchestrator/orchestrator-core/pom.xml | 5 - 11 files changed, 1273 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/624dd414/modules/commons/pom.xml ---------------------------------------------------------------------- diff --git a/modules/commons/pom.xml b/modules/commons/pom.xml index d274b6b..d871983 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -31,7 +31,6 @@ </activation> <modules> <module>utils</module> - <module>workflow-execution-context</module> </modules> </profile> </profiles> http://git-wip-us.apache.org/repos/asf/airavata/blob/624dd414/modules/commons/workflow-execution-context/pom.xml ---------------------------------------------------------------------- diff --git a/modules/commons/workflow-execution-context/pom.xml b/modules/commons/workflow-execution-context/pom.xml deleted file mode 100644 index e7523dd..0000000 --- a/modules/commons/workflow-execution-context/pom.xml +++ /dev/null @@ -1,94 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!--Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file - distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under - the Apache License, Version 2.0 (theà "License"); you may not use this file except in compliance with the License. You may - obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to - in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF - ANY ~ KIND, either express or implied. See the License for the specific language governing permissions and limitations under - the License. --> - -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - - <parent> - <groupId>org.apache.airavata</groupId> - <artifactId>commons</artifactId> - <version>0.15-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <modelVersion>4.0.0</modelVersion> - <artifactId>airavata-workflow-execution-context</artifactId> - <packaging>jar</packaging> - <name>Airavata Workflow Execution Context</name> - <url>http://airavata.apache.org/</url> - - <dependencies> - <dependency> - <groupId>org.apache.xmlbeans</groupId> - <artifactId>xmlbeans</artifactId> - <version>${xmlbeans.version}</version> - </dependency> - <dependency> - <groupId>org.ogce</groupId> - <artifactId>xpp3</artifactId> - <version>${xpp3.version}</version> - </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>airavata-common-utils</artifactId> - <version>${project.version}</version> - </dependency> - - <!-- Testing --> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - - </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>xmlbeans-maven-plugin</artifactId> - <version>2.3.3</version> - <executions> - <execution> - <goals> - <goal>xmlbeans</goal> - </goals> - </execution> - </executions> - <inherited>true</inherited> - <configuration> - <schemaDirectory>src/main/resources</schemaDirectory> - <xmlConfigs> - <xmlConfig implementation="java.io.File">src/main/resources/workflow_execution_context.xsdconfig</xmlConfig> - </xmlConfigs> - <outputJar>target/generated/${project.artifactId}-${project.version}.jar</outputJar> - </configuration> - </plugin> - - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>1.7</version> - <executions> - <execution> - <id>add-source</id> - <phase>generate-sources</phase> - <goals> - <goal>add-source</goal> - </goals> - <configuration> - <sources> - <source>${basedir}/target/generated-sources/xmlbeans</source> - </sources> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> http://git-wip-us.apache.org/repos/asf/airavata/blob/624dd414/modules/commons/workflow-execution-context/src/main/java/org/apache/airavata/common/workflow/execution/context/WorkflowContextHeaderBuilder.java ---------------------------------------------------------------------- diff --git a/modules/commons/workflow-execution-context/src/main/java/org/apache/airavata/common/workflow/execution/context/WorkflowContextHeaderBuilder.java b/modules/commons/workflow-execution-context/src/main/java/org/apache/airavata/common/workflow/execution/context/WorkflowContextHeaderBuilder.java deleted file mode 100644 index 42aecdf..0000000 --- a/modules/commons/workflow-execution-context/src/main/java/org/apache/airavata/common/workflow/execution/context/WorkflowContextHeaderBuilder.java +++ /dev/null @@ -1,476 +0,0 @@ -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ -package org.apache.airavata.common.workflow.execution.context; - -import org.apache.airavata.common.utils.XMLUtil; -import org.apache.airavata.schemas.wec.ApplicationOutputDataHandlingDocument; -import org.apache.airavata.schemas.wec.ApplicationSchedulingContextDocument; -import org.apache.airavata.schemas.wec.ContextHeaderDocument; -import org.apache.airavata.schemas.wec.NameValuePairType; -import org.apache.airavata.schemas.wec.SecurityContextDocument; -import org.apache.airavata.schemas.wec.SoaServiceEprsDocument; -import org.apache.airavata.schemas.wec.WorkflowMonitoringContextDocument; -import org.apache.airavata.schemas.wec.WorkflowOutputDataHandlingDocument; -import org.apache.airavata.schemas.wec.WorkflowSchedulingContextDocument; -import org.apache.xmlbeans.XmlException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.xmlpull.v1.builder.XmlElement; - -public class WorkflowContextHeaderBuilder { - protected static final Logger log = LoggerFactory.getLogger(WorkflowContextHeaderBuilder.class); - - private WorkflowMonitoringContextDocument.WorkflowMonitoringContext workflowMonitoringContext = null; - - private SecurityContextDocument.SecurityContext securityContext = null; - - - private SoaServiceEprsDocument.SoaServiceEprs soaServiceEprs = null; - - private String userIdentifier = null; - private String submissionUser = null; - - private WorkflowOutputDataHandlingDocument.WorkflowOutputDataHandling workflowOutputDataHandling = null; - - private ContextHeaderDocument.ContextHeader contextHeader = null; - - private WorkflowSchedulingContextDocument.WorkflowSchedulingContext workflowSchedulingContext = null; - - public static ThreadLocal<ContextHeaderDocument.ContextHeader> currentContextHeader = new ThreadLocal<ContextHeaderDocument.ContextHeader>(); - - - public WorkflowContextHeaderBuilder(ContextHeaderDocument.ContextHeader document){ - ContextHeaderDocument parse = null; - try { - ContextHeaderDocument doc = ContextHeaderDocument.Factory.newInstance(); - doc.setContextHeader(document); - parse = ContextHeaderDocument.Factory.parse(doc.xmlText()); - } catch (XmlException e) { - log.error(e.getMessage(), e); - } - this.contextHeader = parse.getContextHeader(); - if (contextHeader!=null) { - this.securityContext = contextHeader.getSecurityContext(); - this.workflowSchedulingContext=contextHeader.getWorkflowSchedulingContext(); - this.soaServiceEprs=contextHeader.getSoaServiceEprs(); - this.workflowMonitoringContext=contextHeader.getWorkflowMonitoringContext(); - this.workflowOutputDataHandling=contextHeader.getWorkflowOutputDataHandling(); - this.userIdentifier=contextHeader.getUserIdentifier(); - } - } - - public WorkflowContextHeaderBuilder(String brokerUrl, String gfacUrl, String registryUrl, String experimentId, - String workflowId, String msgBoxUrl) { - this.contextHeader = ContextHeaderDocument.ContextHeader.Factory.newInstance(); - - this.soaServiceEprs = SoaServiceEprsDocument.SoaServiceEprs.Factory.newInstance(); - this.soaServiceEprs.setGfacUrl(gfacUrl); - this.soaServiceEprs.setRegistryUrl(registryUrl); - - addWorkflowMonitoringContext(brokerUrl, experimentId, workflowId, msgBoxUrl); - this.contextHeader.setSoaServiceEprs(this.soaServiceEprs); - - this.contextHeader.setSecurityContext(SecurityContextDocument.SecurityContext.Factory.newInstance()); - this.contextHeader - .setWorkflowSchedulingContext(WorkflowSchedulingContextDocument.WorkflowSchedulingContext.Factory - .newInstance()); - } - - public static void setCurrentContextHeader(ContextHeaderDocument.ContextHeader contextHeader){ - currentContextHeader.set(contextHeader); - } - - public static ContextHeaderDocument.ContextHeader getCurrentContextHeader(){ - if(currentContextHeader.get() == null){ - log.warn("Null WorkflowContext Header, if you are directly using GFacAPI you will be fine !"); - // This is a fix done to fix test failures - ContextHeaderDocument.ContextHeader contextHeader1 = ContextHeaderDocument.ContextHeader.Factory.newInstance(); - WorkflowMonitoringContextDocument.WorkflowMonitoringContext workflowMonitoringContext1 = contextHeader1.addNewWorkflowMonitoringContext(); - workflowMonitoringContext1.setExperimentId(""); - return contextHeader1; - }else{ - return currentContextHeader.get(); - } - } - public void addWorkflowMonitoringContext(String brokerUrl, String experimentId, String workflowId, String msgBoxUrl) { - this.workflowMonitoringContext = WorkflowMonitoringContextDocument.WorkflowMonitoringContext.Factory - .newInstance(); - this.workflowMonitoringContext.setEventPublishEpr(brokerUrl); - this.workflowMonitoringContext.setWorkflowInstanceId(workflowId); - this.workflowMonitoringContext.setExperimentId(experimentId); - this.workflowMonitoringContext.setMsgBoxEpr(msgBoxUrl); - this.contextHeader.setWorkflowMonitoringContext(this.workflowMonitoringContext); - } - - public WorkflowContextHeaderBuilder setWorkflowMonitoringContext( - WorkflowMonitoringContextDocument.WorkflowMonitoringContext workflowMonitoringContext) { - this.workflowMonitoringContext = workflowMonitoringContext; - return this; - } - - public WorkflowContextHeaderBuilder setSecurityContext(SecurityContextDocument.SecurityContext securityContext) { - this.securityContext = securityContext; - return this; - } - - public WorkflowContextHeaderBuilder setWorkflowOutputDataHandling( - WorkflowOutputDataHandlingDocument.WorkflowOutputDataHandling workflowOutputDataHandling) { - this.workflowOutputDataHandling = workflowOutputDataHandling; - return this; - } - - public WorkflowContextHeaderBuilder setUserIdentifier(String userIdentifier) { - this.userIdentifier = userIdentifier; - return this; - } - - public WorkflowContextHeaderBuilder setContextHeader(ContextHeaderDocument.ContextHeader contextHeader) { - this.contextHeader = contextHeader; - return this; - } - - public WorkflowContextHeaderBuilder setWorkflowSchedulingContext( - WorkflowSchedulingContextDocument.WorkflowSchedulingContext workflowSchedulingContext) { - this.workflowSchedulingContext = workflowSchedulingContext; - return this; - } - - public ContextHeaderDocument.ContextHeader getContextHeader() { - return contextHeader; - } - - public WorkflowSchedulingContextDocument.WorkflowSchedulingContext getWorkflowSchedulingContext() { - return workflowSchedulingContext; - } - - public SecurityContextDocument.SecurityContext getSecurityContext() { - return securityContext; - } - - public WorkflowOutputDataHandlingDocument.WorkflowOutputDataHandling getWorkflowOutputDataHandling() { - return workflowOutputDataHandling; - } - - public SoaServiceEprsDocument.SoaServiceEprs getSoaServiceEprs() { - return soaServiceEprs; - } - - public String getUserIdentifier() { - return userIdentifier; - } - - public WorkflowMonitoringContextDocument.WorkflowMonitoringContext getWorkflowMonitoringContext() { - return workflowMonitoringContext; - } - - public XmlElement getXml() { - ContextHeaderDocument document = getDocument(); - return XMLUtil.stringToXmlElement3(document.xmlText()); - } - - private ContextHeaderDocument getDocument() { - ContextHeaderDocument document = ContextHeaderDocument.Factory.newInstance(); - if (this.workflowMonitoringContext != null) { - this.contextHeader.setWorkflowMonitoringContext(this.workflowMonitoringContext); - } - if (this.soaServiceEprs != null) { - this.contextHeader.setSoaServiceEprs(this.soaServiceEprs); - } - if (this.securityContext != null) { - this.contextHeader.setSecurityContext(this.securityContext); - } - if (this.workflowSchedulingContext != null) { - this.contextHeader.setWorkflowSchedulingContext(this.workflowSchedulingContext); - } - if (this.userIdentifier != null) { - this.contextHeader.setUserIdentifier(this.userIdentifier); - } - if (this.workflowOutputDataHandling != null) { - this.contextHeader.setWorkflowOutputDataHandling(this.workflowOutputDataHandling); - } - document.setContextHeader(this.contextHeader); - return document; - } - - public WorkflowContextHeaderBuilder setResourceSchedularUrl(String resourceSchedular) { - this.soaServiceEprs.setResourceSchedulerUrl(resourceSchedular); - return this; - } - - public WorkflowContextHeaderBuilder setWorkflowTemplateId(String template) { - this.workflowMonitoringContext.setWorkflowTemplateId(template); - return this; - } - - public WorkflowContextHeaderBuilder setWorkflowNodeId(String node) { - this.workflowMonitoringContext.setWorkflowNodeId(node); - return this; - } - - public WorkflowContextHeaderBuilder setWorkflowTimeStep(int timestep) { - this.workflowMonitoringContext.setWorkflowTimeStep(timestep); - return this; - } - - public WorkflowContextHeaderBuilder setServiceInstanceId(String node) { - this.workflowMonitoringContext.setServiceInstanceId(node); - return this; - } - - public WorkflowContextHeaderBuilder setServiceReplicaId(String node) { - this.workflowMonitoringContext.setServiceReplicaId(node); - return this; - } - - public WorkflowContextHeaderBuilder setEventPublishEpr(String node) { - this.workflowMonitoringContext.setEventPublishEpr(node); - return this; - } - - public WorkflowContextHeaderBuilder setErrorPublishEpr(String node) { - this.workflowMonitoringContext.setErrorPublishEpr(node); - return this; - } - - public WorkflowContextHeaderBuilder setNotificationTopic(String node) { - this.workflowMonitoringContext.setNotificationTopic(node); - return this; - } - - public WorkflowContextHeaderBuilder setGridProxy(byte[] gridProxy) { - if (this.securityContext == null) { - this.securityContext = SecurityContextDocument.SecurityContext.Factory.newInstance(); - } - this.securityContext.setGridProxy(gridProxy); - return this; - } - - public WorkflowContextHeaderBuilder setGridMyProxyRepository(String myProxyServer, String userName, - String password, int lifeTimeInHours) { - if (this.securityContext == null) { - this.securityContext = SecurityContextDocument.SecurityContext.Factory.newInstance(); - } - SecurityContextDocument.SecurityContext.GridMyproxyRepository gridMyproxyRepository = this.securityContext - .addNewGridMyproxyRepository(); - gridMyproxyRepository.setMyproxyServer(myProxyServer); - gridMyproxyRepository.setUsername(userName); - gridMyproxyRepository.setPassword(password); - gridMyproxyRepository.setLifeTimeInhours(lifeTimeInHours); - return this; - } - - public WorkflowContextHeaderBuilder setSSHAuthentication(String accessKeyId, String secretKeyId) { - if (this.securityContext == null) { - this.securityContext = SecurityContextDocument.SecurityContext.Factory.newInstance(); - } - SecurityContextDocument.SecurityContext.SshAuthentication sshAuthentication = this.securityContext - .addNewSshAuthentication(); - sshAuthentication.setAccessKeyId(accessKeyId); - sshAuthentication.setSecretAccessKey(secretKeyId); - return this; - } - - public WorkflowContextHeaderBuilder setCredentialManagementService(String tokenId, String portalUser, - String gatewayId) { - if (this.securityContext == null) { - this.securityContext = SecurityContextDocument.SecurityContext.Factory.newInstance(); - } - SecurityContextDocument.SecurityContext.CredentialManagementService credentialManagementService = this.securityContext - .addNewCredentialManagementService(); - credentialManagementService.setTokenId(tokenId); - credentialManagementService.setPortalUser(portalUser); - credentialManagementService.setGatewayId(gatewayId); - return this; - } - - public WorkflowContextHeaderBuilder setAmazonWebServices(String accessKeyId, String secretAccesKey) { - if (this.securityContext == null) { - this.securityContext = SecurityContextDocument.SecurityContext.Factory.newInstance(); - } - SecurityContextDocument.SecurityContext.AmazonWebservices amazonWebservices = this.securityContext - .addNewAmazonWebservices(); - amazonWebservices.setAccessKeyId(accessKeyId); - amazonWebservices.setSecretAccessKey(secretAccesKey); - return this; - } - - public WorkflowContextHeaderBuilder addApplicationOutputDataHandling(String nodeId, String outputDir, String outputDataRegistry, - Boolean dataPersistence) { - if (this.workflowOutputDataHandling == null) { - this.workflowOutputDataHandling = WorkflowOutputDataHandlingDocument.WorkflowOutputDataHandling.Factory - .newInstance(); - } - if (nodeId!=null) { - ApplicationOutputDataHandlingDocument.ApplicationOutputDataHandling applicationOutputDataHandling = this.workflowOutputDataHandling - .addNewApplicationOutputDataHandling(); - applicationOutputDataHandling.setNodeId(nodeId); - if (outputDir!=null) { - applicationOutputDataHandling.setOutputDataDirectory(outputDir); - } - if (outputDataRegistry!=null) { - applicationOutputDataHandling - .setDataRegistryUrl(outputDataRegistry); - } - if (dataPersistence!=null) { - applicationOutputDataHandling - .setDataPersistance(dataPersistence); - } - } - return this; - } - - /** - * @deprecated - Use <code>addApplicationOutputDataHandling(String,String,String,boolean)</code> instead - * @param outputDir - * @param outputDataRegistry - * @param dataPersistence - * @return - */ - public WorkflowContextHeaderBuilder addApplicationOutputDataHandling(String outputDir, String outputDataRegistry, - Boolean dataPersistence) { - return addApplicationOutputDataHandling(null, outputDir, outputDataRegistry, dataPersistence); - } - - public WorkflowContextHeaderBuilder addApplicationSchedulingKeyPair(String workflowNodeId, String name, String value, String description){ - - if (this.workflowSchedulingContext == null) { - this.workflowSchedulingContext = WorkflowSchedulingContextDocument.WorkflowSchedulingContext.Factory - .newInstance(); - } - NameValuePairType nameValuePair = workflowSchedulingContext.addNewNameValuePair(); - if(workflowNodeId != null){ - nameValuePair.setWorkflowNodeId(workflowNodeId); - } - if(name != null && value != null){ - nameValuePair.setName(name); - nameValuePair.setValue(value); - } - if(description != null){ - nameValuePair.setDescription(description); - } - return this; - } - - /** - * Add Application scheduling information to workflow context per node - * @param workflowNodeId - * @param serviceId - * @param hostName - * @param wsGramPreffered - * @param gateKeepersEpr - * @param jobManager - * @param cpuCount - * @param nodeCount - * @param qName - * @param maxWalTime - * @return - */ - public WorkflowContextHeaderBuilder addApplicationSchedulingContext(String workflowNodeId, String serviceId, - String hostName, Boolean wsGramPreffered, String gateKeepersEpr, String jobManager, Integer cpuCount, - Integer nodeCount, String qName, Integer maxWalTime) { - if (this.workflowSchedulingContext == null) { - this.workflowSchedulingContext = WorkflowSchedulingContextDocument.WorkflowSchedulingContext.Factory - .newInstance(); - } - if (workflowNodeId!=null) { - ApplicationSchedulingContextDocument.ApplicationSchedulingContext applicationSchedulingContext = this.workflowSchedulingContext - .addNewApplicationSchedulingContext(); - applicationSchedulingContext.setWorkflowNodeId(workflowNodeId); - if (cpuCount!=null) { - applicationSchedulingContext.setCpuCount(cpuCount); - } - if (gateKeepersEpr!=null) { - applicationSchedulingContext.setGatekeeperEpr(gateKeepersEpr); - } - if (hostName!=null) { - applicationSchedulingContext.setHostName(hostName); - } - if (jobManager!=null) { - applicationSchedulingContext.setJobManager(jobManager); - } - if (maxWalTime!=null) { - applicationSchedulingContext.setMaxWallTime(maxWalTime); - } - if (serviceId!=null) { - applicationSchedulingContext.setServiceId(serviceId); - } - if (nodeCount!=null) { - applicationSchedulingContext.setNodeCount(nodeCount); - } - if (qName!=null) { - applicationSchedulingContext.setQueueName(qName); - } - if (wsGramPreffered!=null) { - applicationSchedulingContext - .setWsgramPreferred(wsGramPreffered); - } - } - return this; - } - - public static ContextHeaderDocument.ContextHeader removeOtherSchedulingConfig(String nodeID, ContextHeaderDocument.ContextHeader header) { - WorkflowContextHeaderBuilder.setCurrentContextHeader(header); - header=new WorkflowContextHeaderBuilder(header).getContextHeader(); - try { - ApplicationSchedulingContextDocument.ApplicationSchedulingContext[] applicationSchedulingContextArray = - header.getWorkflowSchedulingContext().getApplicationSchedulingContextArray(); - - int index = 0; - if (applicationSchedulingContextArray != null) { - for (ApplicationSchedulingContextDocument.ApplicationSchedulingContext context : applicationSchedulingContextArray) { - if (context.getWorkflowNodeId().equals(nodeID)) { - index++; - header.getWorkflowSchedulingContext().setApplicationSchedulingContextArray(new ApplicationSchedulingContextDocument.ApplicationSchedulingContext[]{context}); - break; - } else { - header.getWorkflowSchedulingContext().removeApplicationSchedulingContext(index); - } - } - } - - ApplicationOutputDataHandlingDocument.ApplicationOutputDataHandling[] pdh = - header.getWorkflowOutputDataHandling().getApplicationOutputDataHandlingArray(); - index = 0; - if(applicationSchedulingContextArray != null){ - for(ApplicationOutputDataHandlingDocument.ApplicationOutputDataHandling aODH:pdh){ - if(nodeID.equals(aODH.getNodeId())){ - index++; - header.getWorkflowOutputDataHandling().setApplicationOutputDataHandlingArray(new ApplicationOutputDataHandlingDocument.ApplicationOutputDataHandling[]{aODH}); - break; - }else { - header.getWorkflowOutputDataHandling().removeApplicationOutputDataHandling(index); - } - } - } - } catch (NullPointerException e) { - return header; - } - return header; - } - - public String getSubmissionUser() { - return submissionUser; - } - - public void setSubmissionUser(String submissionUser) { - this.submissionUser = submissionUser; - } -} http://git-wip-us.apache.org/repos/asf/airavata/blob/624dd414/modules/commons/workflow-execution-context/src/main/resources/workflow_execution_context.xsd ---------------------------------------------------------------------- diff --git a/modules/commons/workflow-execution-context/src/main/resources/workflow_execution_context.xsd b/modules/commons/workflow-execution-context/src/main/resources/workflow_execution_context.xsd deleted file mode 100755 index 4c5da15..0000000 --- a/modules/commons/workflow-execution-context/src/main/resources/workflow_execution_context.xsd +++ /dev/null @@ -1,592 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!--Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file - distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under - the Apache License, Version 2.0 (theà "License"); you may not use this file except in compliance with the License. You may - obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to - in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF - ANY ~ KIND, either express or implied. See the License for the specific language governing permissions and limitations under - the License. --> - -<schema targetNamespace="http://airavata.apache.org/schemas/wec/2012/05"; xmlns="http://www.w3.org/2001/XMLSchema"; - xmlns:wec="http://airavata.apache.org/schemas/wec/2012/05"; attributeFormDefault="qualified" - elementFormDefault="qualified"> - - <element name='context-header'> - <annotation> - <documentation xml:lang='en'> - Element that contains Airavata - specific context information sent as a SOAP - header in a SOAP message. - </documentation> - </annotation> - <complexType> - <sequence> - <element minOccurs='0' maxOccurs='1' ref='wec:user-identifier' /> - <element minOccurs='1' maxOccurs='1' ref='wec:soa-service-eprs' /> - <element minOccurs='1' maxOccurs='1' ref='wec:workflow-monitoring-context' /> - <element minOccurs='0' maxOccurs='1' ref='wec:workflow-scheduling-context' /> - <element minOccurs='0' maxOccurs='1' ref='wec:workflow-output-data-handling' /> - <element minOccurs='0' maxOccurs='1' ref='wec:security-context' /> - </sequence> - </complexType> - </element> - - <element name="user-identifier" type="string"> - <annotation> - <documentation xml:lang="en"> User that the workflow is - executed on behalf of, - user id is used to catalog data - and for - monitoring purposes - </documentation> - </annotation> - </element> - - <element name="soa-service-eprs"> - <annotation> - <documentation xml:lang="en"> - Element that contains - persistant service end points within the system. - </documentation> - </annotation> - <complexType> - <sequence> - <element name="gfac-url" type="anyURI" minOccurs='1' maxOccurs='1'> - <annotation> - <documentation xml:lang="en"> Location of GFac factory - service to use. (optional) - </documentation> - </annotation> - </element> - <element name="registry-url" type="anyURI" minOccurs='1' maxOccurs='1'> - <annotation> - <documentation xml:lang="en"> Location of Registry - service - to use. (optional) - </documentation> - </annotation> - </element> - - <element name="resource-scheduler-url" type="string" minOccurs='0' maxOccurs='1'> - <annotation> - <documentation xml:lang="en"> Resource Scheduler to use - </documentation> - </annotation> - </element> - - <element name="hostDescriptor" type="string" minOccurs='0' maxOccurs='1'> - <annotation> - <documentation xml:lang="en"> Which Host Descriptor to be picked - </documentation> - </annotation> - </element> - </sequence> - </complexType> - </element> - - <element name="workflow-monitoring-context"> - <annotation> - <documentation xml:lang="en">Workflow context for execution - of a instance used to - relate the specific activity - in the context of - workflow and used for - monitoring - and illustarting the workflow - progress. - </documentation> - </annotation> - <complexType> - <sequence> - <element name="experiment-id" type="string" minOccurs="1" maxOccurs="1"> - <annotation> - <documentation xml:lang="en"> Experiment ID (REQUIRED in - context), Defines - the context of the workflow. - </documentation> - </annotation> - </element> - <element name="workflow-instance-id" type="anyURI" minOccurs="1" maxOccurs="1"> - <annotation> - <documentation xml:lang="en"> URI that identifies - workflow instance that - originated the message. (optional) - </documentation> - </annotation> - </element> - <element name="workflow-template-id" type="anyURI"> - <annotation> - <documentation xml:lang="en"> URI that identifies - workflow template that was - used to create the workflow - instance. - (optional) - </documentation> - </annotation> - </element> - <element name="workflow-node-id" type="string"> - <annotation> - <documentation xml:lang="en"> String that identifies - uniqueley a node in - workflow graph that originated - that message. - (optional) - </documentation> - </annotation> - </element> - <element name="workflow-time-step" type="int"> - <annotation> - <documentation xml:lang="en"> Increasing integer - representing time in the - workflow execution when the - message - originated. (optional) - </documentation> - </annotation> - </element> - - <element name="service-instance-id" type="anyURI"> - <annotation> - <documentation xml:lang="en"> URI that identifies service - instance that - originated that message. (optional) - </documentation> - </annotation> - </element> - - <element name="service-replica-id" type="anyURI"> - <annotation> - <documentation xml:lang="en"> URI that identifies the - replica of service - instance that originated that - message, primarly - used by Fault Tolerance - service to overprovision. (optional) - </documentation> - </annotation> - </element> - - <element name="event-publish-epr" type="anyURI" minOccurs="1" maxOccurs="1"> - <annotation> - <documentation xml:lang="en"> EPR for WS-Eventing sink - where to send event. (optional) - NOTE: currently any - XML is - accepted as there are many versions of - WS-Addressing. - </documentation> - </annotation> - </element> - - <element name="notification-topic" type="string" minOccurs="0" maxOccurs="1"> - <annotation> - <documentation xml:lang="en"> A Unique String to set as - the topic for - events sent on an experiment. The - topic may be - embedded with the - event-publish-epr. An experiment id being unique - may be chosen as - topic. - </documentation> - </annotation> - </element> - - <element name="error-publish-epr" type="anyURI"> - <annotation> - <documentation xml:lang="en"> EPR for WS-Eventing sink - where to send errors (optional) - NOTE: designed good - for debugging - and system level warnings, errors, - etc - </documentation> - </annotation> - </element> - <element name="msg-box-epr" type="anyURI"> - <annotation> - <documentation xml:lang="en"> EPR for WS-Eventing sink - where to send errors (optional) - NOTE: designed good - for debugging - and system level warnings, errors, - etc - </documentation> - </annotation> - </element> - </sequence> - </complexType> - </element> - - <element name="workflow-scheduling-context"> - <annotation> - <documentation xml:lang="en"> - Element that contains service - specific resource scheduling information sent - inside workflow - context. The purpose of this context is to schedule - individual - activities on a different resource. - </documentation> - </annotation> - <complexType> - <sequence> - <element minOccurs="1" maxOccurs="unbounded" ref="wec:application-scheduling-context" /> - <element name="nameValuePair" type="wec:nameValuePairType" minOccurs="0" maxOccurs="unbounded" /> - </sequence> - </complexType> - </element> - - <complexType name="nameValuePairType"> - <simpleContent> - <extension base="string"> - <attribute name="workflow-node-id" type="string" use="optional"/> - <attribute name="name" type="string" use="required" /> - <attribute name="value" type="string" use="required" /> - <attribute name="description" type="string" use="optional"/> - </extension> - </simpleContent> - </complexType> - <element name="application-scheduling-context"> - <complexType> - <simpleContent> - <extension base="string"> - <annotation> - <documentation xml:lang="en"> - Element text contains host - name for the resource. - </documentation> - </annotation> - - <attribute name="workflow-node-id" type="string"> - <annotation> - <documentation xml:lang="en"> - This is workflow node ID - that is mapped to a resource. - </documentation> - </annotation> - </attribute> - - <attribute name="service-id" type="anyURI" use="optional"> - <annotation> - <documentation xml:lang="en"> - This is service ID. - </documentation> - </annotation> - </attribute> - - <attribute name="host-name" type="anyURI" use="optional"> - <annotation> - <documentation xml:lang="en"> - head node of the resource - </documentation> - </annotation> - </attribute> - - <attribute name="wsgram-preferred" type="boolean" use="optional"> - <annotation> - <documentation xml:lang="en"> - If true then wsgram will be - used, false pre-wsgram will be used. - </documentation> - </annotation> - </attribute> - - <attribute name="gatekeeper-epr" type="anyURI" use="optional"> - <annotation> - <documentation xml:lang="en"> - GRAM EPR of the resource - </documentation> - </annotation> - </attribute> - - <attribute name="job-manager" type="string"> - <annotation> - <documentation xml:lang="en"> - LRM job manager on the - resource, ex: PBS, LSF. - </documentation> - </annotation> - </attribute> - - <attribute name="cpu-count" type="int" use="optional"> - <annotation> - <documentation xml:lang="en"> - number of CPU's allocated - on the compute cluster - </documentation> - </annotation> - </attribute> - - <attribute name="node-count" type="int" use="optional"> - <annotation> - <documentation xml:lang="en"> - number of nodes allocated - on the compute cluster - </documentation> - </annotation> - </attribute> - - <attribute name="queue-name" type="string"> - <annotation> - <documentation xml:lang="en"> - Job queue name if any. - </documentation> - </annotation> - </attribute> - - <attribute name="max-wall-time" type="int" use="optional"> - <annotation> - <documentation xml:lang="en"> - number of CPU's allocated - on the compute cluster - </documentation> - </annotation> - </attribute> - </extension> - </simpleContent> - </complexType> - </element> - - <element name="workflow-output-data-handling"> - <annotation> - <documentation xml:lang="en"> - Element that contains - application specific resource scheduling information sent - inside - workflow context. The purpose of this context is to handle - individual - activities with different needs like - intermediate data - need not be persisted. - </documentation> - </annotation> - <complexType> - <sequence> - <element minOccurs="1" maxOccurs="unbounded" ref="wec:application-output-data-handling" /> - </sequence> - </complexType> - </element> - - <element name="application-output-data-handling"> - <complexType> - <sequence> - <element name="node-id" type="string"> - <annotation> - <documentation xml:lang="en">(Optional) If the workflow - outputs are to be staged to a pre-specified - location, then the - output data staging directory should be provided. - </documentation> - </annotation> - </element> - <element name="data-registry-url" type="anyURI"> - <annotation> - <documentation xml:lang="en"> (Optional) If a seperate - Data - Registry is used for catlogging data, the - associated location - of the - Data registry - </documentation> - </annotation> - </element> - - <element name="output-data-directory" type="anyURI"> - <annotation> - <documentation xml:lang="en">(Optional) If the workflow - outputs are to be staged to a pre-specified - location, then the - output data staging directory should be provided. - </documentation> - </annotation> - </element> - - <element name="data-persistance" type="boolean"> - <annotation> - <documentation xml:lang="en">(Optional) If the - intermediate workflow - outputs are to be discarded after - execution, - this flag should be set to - false. By defualt this flag should be - true assuming all data will - be persisted. - </documentation> - </annotation> - </element> - - </sequence> - </complexType> - </element> - - <element name="security-context"> - <annotation> - <documentation xml:lang="en"> Security context for execution - of the workflow - </documentation> - </annotation> - <complexType> - <sequence> - <element name="grid-proxy" type="base64Binary"> - <annotation> - <documentation xml:lang="en"> Security context for Grid - Security - Infrastructure X509 Proxy with trusted - chain. - </documentation> - </annotation> - </element> - <element name="grid-myproxy-repository"> - <annotation> - <documentation xml:lang="en"> Security context for Grid - Security MyProxy - Service - </documentation> - </annotation> - <complexType> - <sequence> - <element name="myproxy-server" type="string"> - <annotation> - <documentation xml:lang="en"> MyProxy Server. - </documentation> - </annotation> - </element> - <element name="username" type="string"> - <annotation> - <documentation xml:lang="en"> MyProxy User Name. - </documentation> - </annotation> - </element> - <element name="password" type="string"> - <annotation> - <documentation xml:lang="en"> MyProxy Password. - </documentation> - </annotation> - </element> - <element name="life-time-inhours" type="int"> - <annotation> - <documentation xml:lang="en"> MyProxy Proxy Life time. - </documentation> - </annotation> - </element> - </sequence> - </complexType> - </element> - <element name="ssh-authentication"> - <annotation> - <documentation xml:lang="en"> Security context for - execution of the workflow - on SSH accessed resources. - </documentation> - </annotation> - <complexType> - <sequence> - <element name="access-key-id" type="string"> - <annotation> - <documentation xml:lang="en"> Amazon Web Services - Public Access - Key ID used to contact the AWS API's. - </documentation> - </annotation> - </element> - <element name="secret-access-key" type="string"> - <annotation> - <documentation xml:lang="en"> Amazon Web Services AWS - Private - Secret Access Key. - </documentation> - </annotation> - </element> - </sequence> - </complexType> - </element> - <element name="credential-management-service"> - <annotation> - <documentation xml:lang="en"> Security context for - execution of the workflow - </documentation> - </annotation> - <complexType> - <sequence> - <element name="token_id" type="string"> - <annotation> - <documentation xml:lang="en"> Token id used in credential-store. Represents the community user. - </documentation> - </annotation> - </element> - <element name="portal-user" type="string"> - <annotation> - <documentation xml:lang="en"> The portal user id who is invoking the workflow. - </documentation> - </annotation> - </element> - <element name="gateway-id" type="string"> - <annotation> - <documentation xml:lang="en"> The Id associated with the science gateway. - </documentation> - </annotation> - </element> - </sequence> - </complexType> - </element> - <element name="amazon-webservices"> - <annotation> - <documentation xml:lang="en"> Security context for - execution of the workflow - </documentation> - </annotation> - <complexType> - <sequence> - <element name="access-key-id" type="string"> - <annotation> - <documentation xml:lang="en"> Amazon Web Services - Public Access - Key ID used to contact the AWS API's. - </documentation> - </annotation> - </element> - <element name="secret-access-key" type="string"> - <annotation> - <documentation xml:lang="en"> Amazon Web Services AWS - Private - Secret Access Key. - </documentation> - </annotation> - </element> - <element name="ami-id" type="string"> - <annotation> - <documentation xml:lang="en"> Amazon Web Services AWS - Amazon Machine Image (AMI) ID - </documentation> - </annotation> - </element> - <element name="instance-id" type="string"> - <annotation> - <documentation xml:lang="en"> Amazon Web Services AWS - Instance ID. - </documentation> - </annotation> - </element> - <element name="instance-type" type="string"> - <annotation> - <documentation xml:lang="en"> Amazon Web Services AWS - Instance Type. - </documentation> - </annotation> - </element> - <element name="username" type="string"> - <annotation> - <documentation xml:lang="en"> Amazon Web Services AWS - Username. - </documentation> - </annotation> - </element> - </sequence> - </complexType> - </element> - </sequence> - </complexType> - </element> - -</schema> http://git-wip-us.apache.org/repos/asf/airavata/blob/624dd414/modules/commons/workflow-execution-context/src/main/resources/workflow_execution_context.xsdconfig ---------------------------------------------------------------------- diff --git a/modules/commons/workflow-execution-context/src/main/resources/workflow_execution_context.xsdconfig b/modules/commons/workflow-execution-context/src/main/resources/workflow_execution_context.xsdconfig deleted file mode 100755 index 147c631..0000000 --- a/modules/commons/workflow-execution-context/src/main/resources/workflow_execution_context.xsdconfig +++ /dev/null @@ -1,15 +0,0 @@ -<!--Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file - distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under - the Apache License, Version 2.0 (theà "License"); you may not use this file except in compliance with the License. You may - obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to - in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF - ANY ~ KIND, either express or implied. See the License for the specific language governing permissions and limitations under - the License. --> - -<xb:config xmlns:xb="http://www.bea.com/2002/09/xbean/config";> - - <xb:namespace uri="http://airavata.apache.org/schemas/wec/2012/05";> - <xb:package>org.apache.airavata.schemas.wec</xb:package> - </xb:namespace> - -</xb:config> http://git-wip-us.apache.org/repos/asf/airavata/blob/624dd414/modules/commons/workflow-execution-context/src/test/java/org/apache/airavata/common/workflow/execution/context/WorkflowContextHeaderBuilderTest.java ---------------------------------------------------------------------- diff --git a/modules/commons/workflow-execution-context/src/test/java/org/apache/airavata/common/workflow/execution/context/WorkflowContextHeaderBuilderTest.java b/modules/commons/workflow-execution-context/src/test/java/org/apache/airavata/common/workflow/execution/context/WorkflowContextHeaderBuilderTest.java deleted file mode 100644 index bae80f1..0000000 --- a/modules/commons/workflow-execution-context/src/test/java/org/apache/airavata/common/workflow/execution/context/WorkflowContextHeaderBuilderTest.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ -package org.apache.airavata.common.workflow.execution.context; - -import org.apache.airavata.common.utils.XMLUtil; -import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.File; - -public class WorkflowContextHeaderBuilderTest { - private static final Logger log = LoggerFactory.getLogger(WorkflowContextHeaderBuilderTest.class); - @Test - public void testExecute() { - WorkflowContextHeaderBuilder builder = new WorkflowContextHeaderBuilder("brokerurl", "gfacurl", "registryurl", - "experimentid", "workflowid", "msgBox"); - - try { - File testFile = new File(this.getClass().getClassLoader().getResource("result.xml").getPath()); - org.junit.Assert.assertTrue(XMLUtil.isEqual(XMLUtil.loadXML(testFile), - XMLUtil.xmlElement3ToXmlElement5(builder.getXml()))); - } catch (Exception e) { - log.error(e.getMessage(), e); - } - } - -} http://git-wip-us.apache.org/repos/asf/airavata/blob/624dd414/modules/commons/workflow-execution-context/src/test/resources/result.xml ---------------------------------------------------------------------- diff --git a/modules/commons/workflow-execution-context/src/test/resources/result.xml b/modules/commons/workflow-execution-context/src/test/resources/result.xml deleted file mode 100644 index c6ca28d..0000000 --- a/modules/commons/workflow-execution-context/src/test/resources/result.xml +++ /dev/null @@ -1,23 +0,0 @@ -<!--Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file - distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under - the Apache License, Version 2.0 (theà "License"); you may not use this file except in compliance with the License. You may - obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to - in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF - ANY ~ KIND, either express or implied. See the License for the specific language governing permissions and limitations under - the License. --> - -<wor:context-header - xmlns:wor="http://airavata.apache.org/schemas/wec/2012/05";> - <wor:soa-service-eprs> - <wor:gfac-url>gfacurl</wor:gfac-url> - <wor:registry-url>registryurl</wor:registry-url> - </wor:soa-service-eprs> - <wor:workflow-monitoring-context> - <wor:experiment-id>experimentid</wor:experiment-id> - <wor:workflow-instance-id>workflowid</wor:workflow-instance-id> - <wor:event-publish-epr>brokerurl</wor:event-publish-epr> - <wor:msg-box-epr>msgBox</wor:msg-box-epr> - </wor:workflow-monitoring-context> - <wor:workflow-scheduling-context /> - <wor:security-context /> -</wor:context-header> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/airavata/blob/624dd414/modules/distribution/server/pom.xml ---------------------------------------------------------------------- diff --git a/modules/distribution/server/pom.xml b/modules/distribution/server/pom.xml index 6277d0c..6e96410 100644 --- a/modules/distribution/server/pom.xml +++ b/modules/distribution/server/pom.xml @@ -279,11 +279,6 @@ </dependency> <dependency> <groupId>org.apache.airavata</groupId> - <artifactId>airavata-workflow-execution-context</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> <artifactId>airavata-registry-cpi</artifactId> <version>${project.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/airavata/blob/624dd414/modules/gfac/gfac-core/pom.xml ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-core/pom.xml b/modules/gfac/gfac-core/pom.xml index 2a42503..465f00e 100644 --- a/modules/gfac/gfac-core/pom.xml +++ b/modules/gfac/gfac-core/pom.xml @@ -32,11 +32,6 @@ <!-- GFAC schemas --> <dependency> <groupId>org.apache.airavata</groupId> - <artifactId>airavata-workflow-execution-context</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> <artifactId>airavata-registry-cpi</artifactId> <version>${project.version}</version> </dependency> @@ -55,12 +50,6 @@ <artifactId>airavata-jpa-registry</artifactId> <version>${project.version}</version> </dependency> - <!-- Workflow Tracking --> - <!--<dependency>--> - <!--<groupId>org.apache.airavata</groupId>--> - <!--<artifactId>airavata-workflow-tracking</artifactId>--> - <!--<version>${project.version}</version>--> - <!--</dependency>--> <!-- Credential Store --> <dependency> <groupId>org.apache.airavata</groupId> http://git-wip-us.apache.org/repos/asf/airavata/blob/624dd414/modules/gfac/gfac-monitor/gfac-hpc-monitor/pom.xml ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-monitor/gfac-hpc-monitor/pom.xml b/modules/gfac/gfac-monitor/gfac-hpc-monitor/pom.xml index a3e15a2..60cb296 100644 --- a/modules/gfac/gfac-monitor/gfac-hpc-monitor/pom.xml +++ b/modules/gfac/gfac-monitor/gfac-hpc-monitor/pom.xml @@ -39,11 +39,6 @@ </dependency> <dependency> <groupId>org.apache.airavata</groupId> - <artifactId>airavata-workflow-execution-context</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> <artifactId>airavata-registry-cpi</artifactId> <version>${project.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/airavata/blob/624dd414/modules/orchestrator/orchestrator-core/pom.xml ---------------------------------------------------------------------- diff --git a/modules/orchestrator/orchestrator-core/pom.xml b/modules/orchestrator/orchestrator-core/pom.xml index b9d26f5..6cfc17f 100644 --- a/modules/orchestrator/orchestrator-core/pom.xml +++ b/modules/orchestrator/orchestrator-core/pom.xml @@ -46,11 +46,6 @@ the License. --> </dependency> <dependency> <groupId>org.apache.airavata</groupId> - <artifactId>airavata-workflow-execution-context</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> <artifactId>airavata-gfac-core</artifactId> <version>${project.version}</version> </dependency>
