Repository: airavata Updated Branches: refs/heads/master 13c2e79e4 -> 093643ac3
http://git-wip-us.apache.org/repos/asf/airavata/blob/5a648a60/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/WorkerResourceTest.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/WorkerResourceTest.java b/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/WorkerResourceTest.java deleted file mode 100644 index 8a9caee..0000000 --- a/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/WorkerResourceTest.java +++ /dev/null @@ -1,122 +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.experiment.registry.jpa; -// -//import org.apache.airavata.experiment.registry.jpa.resources.*; -// -//import java.sql.Timestamp; -//import java.util.Calendar; -// -//public class WorkerResourceTest extends AbstractResourceTest { -// private GatewayResource gatewayResource; -// private WorkerResource workerResource; -// private ProjectResource testProject; -// private UserWorkflowResource userWorkflowResource; -// private ExperimentMetadataResource experimentResource; -// -// @Override -// public void setUp() throws Exception { -// super.setUp(); -// gatewayResource = super.getGatewayResource(); -// workerResource = super.getWorkerResource(); -// -// testProject = workerResource.createProject("testProject"); -// userWorkflowResource = workerResource.createWorkflowTemplate("workflow1"); -// experimentResource = (ExperimentMetadataResource) workerResource.create(ResourceType.EXPERIMENT_METADATA); -// -// testProject.setGateway(gatewayResource); -// testProject.save(); -// -// userWorkflowResource.setGateway(gatewayResource); -// userWorkflowResource.setContent("testContent"); -// userWorkflowResource.save(); -// -// experimentResource.setGateway(gatewayResource); -// experimentResource.setExpID("testExpID"); -// experimentResource.setExperimentName("testExpID"); -// experimentResource.setProject(testProject); -// experimentResource.setExecutionUser(workerResource.getUser()); -// experimentResource.setSubmittedDate(getCurrentTimestamp()); -// experimentResource.save(); -// -// -// } -// -// public void testCreate() throws Exception { -// assertNotNull("project resource created successfully", testProject); -// assertNotNull("user workflow created successfully", userWorkflowResource); -// } -// -// public void testGet() throws Exception { -// assertNotNull("project resource retrieved successfully", workerResource.get(ResourceType.PROJECT, "testProject")); -// assertNotNull("user workflow retrieved successfully", workerResource.get(ResourceType.USER_WORKFLOW, "workflow1")); -// assertNotNull("experiment retrieved successfully", workerResource.get(ResourceType.EXPERIMENT_METADATA, "testExpID")); -// } -// -// public void testGetList() throws Exception { -// assertNotNull("project resources retrieved successfully", workerResource.get(ResourceType.PROJECT)); -// assertNotNull("user workflows retrieved successfully", workerResource.get(ResourceType.USER_WORKFLOW)); -// assertNotNull("experiments retrieved successfully", workerResource.get(ResourceType.EXPERIMENT_METADATA)); -// -// } -// -// public void testSave() throws Exception { -// workerResource.save(); -// assertTrue("worker resource saved successfully", gatewayResource.isExists(ResourceType.USER, "admin")); -// //remove -//// ResourceUtils.removeGatewayWorker(gatewayResource, userResource); -//// gatewayResource.remove(ResourceType.USER, "testUser"); -// } -// -// public void testRemove() throws Exception { -// workerResource.removeWorkflowTemplate("workflow1"); -//// workerResource.removeExperiment("testExpID"); -//// workerResource.removeProject("testProject"); -// -// assertTrue("user workflow has been removed successfully", !workerResource.isWorkflowTemplateExists("workflow1")); -//// assertTrue("experiment has been removed successfully", !workerResource.isExperimentExists("testExpID")); -// -//// assertTrue("project has been removed successfully", !workerResource.isProjectExists("testProject")); -// -// -//// testProject.setGateway(gatewayResource); -//// testProject.save(); -//// -//// userWorkflowResource.setGateway(gatewayResource); -//// userWorkflowResource.setContent("testContent"); -//// userWorkflowResource.save(); -//// -//// experimentResource.setGateway(gatewayResource); -//// experimentResource.setExpID("testExpID"); -//// experimentResource.setProject(testProject); -//// experimentResource.setSubmittedDate(getCurrentTimestamp()); -//// experimentResource.save(); -// -// } -// -// @Override -// public void tearDown() throws Exception { -// super.tearDown(); -// } -// -// -//} http://git-wip-us.apache.org/repos/asf/airavata/blob/5a648a60/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/WorkflowDataResourceTest.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/WorkflowDataResourceTest.java b/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/WorkflowDataResourceTest.java deleted file mode 100644 index 7aac186..0000000 --- a/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/WorkflowDataResourceTest.java +++ /dev/null @@ -1,106 +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.experiment.registry.jpa; -// -//import org.apache.airavata.experiment.registry.jpa.resources.*; -// -//import java.sql.Timestamp; -//import java.util.Calendar; -// -//public class WorkflowDataResourceTest extends AbstractResourceTest { -// private ExperimentMetadataResource experimentResource; -// private WorkflowDataResource workflowDataResource; -// private NodeDataResource nodeDataResource; -// private GramDataResource gramDataResource; -// -// @Override -// public void setUp() throws Exception { -// super.setUp(); -// GatewayResource gatewayResource = super.getGatewayResource(); -// WorkerResource workerResource = super.getWorkerResource(); -// -// experimentResource = (ExperimentMetadataResource) gatewayResource.create(ResourceType.EXPERIMENT_METADATA); -// experimentResource.setExpID("testExpID"); -// experimentResource.setExperimentName("testExpID"); -// experimentResource.setExecutionUser(workerResource.getUser()); -// experimentResource.setProject(new ProjectResource(workerResource, gatewayResource, "testProject")); -// experimentResource.save(); -// -// workflowDataResource = (WorkflowDataResource) experimentResource.create(ResourceType.WORKFLOW_DATA); -// workflowDataResource.setWorkflowInstanceID("testWFInstance"); -// workflowDataResource.setTemplateName("testTemplate"); -// workflowDataResource.setExperimentID("testExpID"); -// Calendar calender = Calendar.getInstance(); -// java.util.Date d = calender.getTime(); -// Timestamp timestamp = new Timestamp(d.getTime()); -// workflowDataResource.setLastUpdatedTime(timestamp); -// workflowDataResource.save(); -// -// nodeDataResource = workflowDataResource.createNodeData("testNodeID"); -// gramDataResource = workflowDataResource.createGramData("testNodeID"); -// -// nodeDataResource.setWorkflowDataResource(workflowDataResource); -// nodeDataResource.setInputs("testInput"); -// nodeDataResource.setOutputs("testOutput"); -// nodeDataResource.setStatus("testStatus"); -// nodeDataResource.save(); -// -// gramDataResource.setRsl("testRSL"); -// gramDataResource.setWorkflowDataResource(workflowDataResource); -// gramDataResource.save(); -// } -// -// public void testCreate() throws Exception { -// assertNotNull("node data resource created successfully", nodeDataResource); -// assertNotNull("gram data resource created successfully", gramDataResource); -// } -// -// public void testGet() throws Exception { -// assertNotNull("Node data retrieved successfully", workflowDataResource.getNodeData("testNodeID")); -// assertNotNull("Gram data retrieved successfully", workflowDataResource.getGramData("testNodeID")); -// } -// -// public void testGetList() throws Exception { -// assertNotNull("Node data retrieved successfully", workflowDataResource.getNodeData()); -// assertNotNull("Gram data retrieved successfully", workflowDataResource.getGramData()); -// } -// -// public void testRemove() throws Exception { -// workflowDataResource.removeNodeData("testNodeID"); -// workflowDataResource.removeGramData("testNodeID"); -// -// assertTrue("node date removed successfully", !workflowDataResource.isNodeExists("testNodeID")); -// assertTrue("gram date removed successfully", !workflowDataResource.isGramDataExists("testNodeID")); -// -// } -// -// public void testSave() throws Exception { -// assertTrue("workflow data saved successfully", experimentResource.isExists(ResourceType.WORKFLOW_DATA, "testWFInstance")); -// } -// -// @Override -// public void tearDown() throws Exception { -// super.tearDown(); -// } -// -// -//} http://git-wip-us.apache.org/repos/asf/airavata/blob/5a648a60/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/WorkflowNodeDetailExperimentCatResourceTest.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/WorkflowNodeDetailExperimentCatResourceTest.java b/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/WorkflowNodeDetailExperimentCatResourceTest.java index e26e880..887066b 100644 --- a/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/WorkflowNodeDetailExperimentCatResourceTest.java +++ b/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/WorkflowNodeDetailExperimentCatResourceTest.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.airavata.experiment.catalog; +package org.apache.airavata.registry.core.experiment.catalog; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; http://git-wip-us.apache.org/repos/asf/airavata/blob/5a648a60/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/WorkflowNodeDetailResourceTest.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/WorkflowNodeDetailResourceTest.java b/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/WorkflowNodeDetailResourceTest.java deleted file mode 100644 index 37b98cb..0000000 --- a/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/WorkflowNodeDetailResourceTest.java +++ /dev/null @@ -1,85 +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.experiment.catalog; - -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - -import java.sql.Timestamp; -import java.util.Date; - -import org.apache.airavata.experiment.catalog.resources.ExperimentResource; -import org.apache.airavata.experiment.catalog.resources.WorkflowNodeDetailResource; -import org.junit.Before; -import org.junit.Test; - -public class WorkflowNodeDetailResourceTest extends AbstractResourceTest { - - private ExperimentResource experimentResource; - private WorkflowNodeDetailResource nodeDetailResource; - private String experimentID = "testExpID"; - private String applicationID = "testAppID"; - private String nodeID = "testNode"; - - @Before - public void setUp() throws Exception { - super.setUp(); - Timestamp creationTime = new Timestamp(new Date().getTime()); - - experimentResource = (ExperimentResource) getGatewayResource().create(ResourceType.EXPERIMENT); - experimentResource.setExpID(experimentID); - experimentResource.setExecutionUser(getWorkerResource().getUser()); - experimentResource.setProjectId(getProjectResource().getId()); - experimentResource.setCreationTime(creationTime); - experimentResource.setApplicationId(applicationID); - experimentResource.save(); - - nodeDetailResource = (WorkflowNodeDetailResource) experimentResource.create(ResourceType.WORKFLOW_NODE_DETAIL); - nodeDetailResource.setExperimentId(experimentResource.getExpID()); - nodeDetailResource.setNodeInstanceId(nodeID); - nodeDetailResource.setNodeName(nodeID); - nodeDetailResource.setCreationTime(creationTime); - nodeDetailResource.save(); - - } - - @Test - public void testCreate() throws Exception { - assertNotNull("task data resource has being created ", nodeDetailResource); - } - - @Test - public void testSave() throws Exception { - assertTrue("task save successfully", experimentResource.isExists(ResourceType.WORKFLOW_NODE_DETAIL, nodeID)); - } - - @Test - public void testGet() throws Exception { - assertNotNull("task data retrieved successfully", experimentResource.get(ResourceType.WORKFLOW_NODE_DETAIL, nodeID)); - } - - @Test - public void testRemove() throws Exception { - experimentResource.remove(ResourceType.WORKFLOW_NODE_DETAIL, nodeID); - assertFalse("task data removed successfully", experimentResource.isExists(ResourceType.WORKFLOW_NODE_DETAIL, nodeID)); - } - -} http://git-wip-us.apache.org/repos/asf/airavata/blob/5a648a60/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/util/Initialize.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/util/Initialize.java b/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/util/Initialize.java index c148c89..52b30aa 100644 --- a/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/util/Initialize.java +++ b/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/util/Initialize.java @@ -19,7 +19,7 @@ * */ -package org.apache.airavata.experiment.catalog.util; +package org.apache.airavata.registry.core.experiment.catalog.util; import org.apache.airavata.common.exception.ApplicationSettingsException; import org.apache.airavata.common.utils.ServerSettings; http://git-wip-us.apache.org/repos/asf/airavata/blob/5a648a60/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 0c4a4a1..c115239 100644 --- a/modules/workflow-model/workflow-engine/pom.xml +++ b/modules/workflow-model/workflow-engine/pom.xml @@ -252,7 +252,7 @@ <!--</dependency>--> <dependency> <groupId>org.apache.airavata</groupId> - <artifactId>airavata-experiment-catalog</artifactId> + <artifactId.airavata.registry.core.experiment.catalog</artifactId> <version>${project.version}</version> </dependency> <!-- JCR Support --> http://git-wip-us.apache.org/repos/asf/airavata/blob/5a648a60/modules/workflow-model/workflow-engine/src/main/java/org/apache/airavata/workflow/engine/WorkflowEngineImpl.java ---------------------------------------------------------------------- diff --git a/modules/workflow-model/workflow-engine/src/main/java/org/apache/airavata/workflow/engine/WorkflowEngineImpl.java b/modules/workflow-model/workflow-engine/src/main/java/org/apache/airavata/workflow/engine/WorkflowEngineImpl.java index 1957da7..875aec1 100644 --- a/modules/workflow-model/workflow-engine/src/main/java/org/apache/airavata/workflow/engine/WorkflowEngineImpl.java +++ b/modules/workflow-model/workflow-engine/src/main/java/org/apache/airavata/workflow/engine/WorkflowEngineImpl.java @@ -30,7 +30,7 @@ import org.apache.airavata.model.error.AiravataClientConnectException; import org.apache.airavata.model.workspace.experiment.Experiment; import org.apache.airavata.orchestrator.client.OrchestratorClientFactory; import org.apache.airavata.orchestrator.cpi.OrchestratorService; -import org.apache.airavata.experiment.catalog.impl.RegistryFactory; +import org.apache.airavata.registry.core.experiment.catalog.impl.RegistryFactory; import org.apache.airavata.registry.cpi.ExperimentCatalog; import org.apache.airavata.registry.cpi.ExperimentCatalogModelType; import org.apache.airavata.registry.cpi.RegistryException; http://git-wip-us.apache.org/repos/asf/airavata/blob/5a648a60/modules/workflow-model/workflow-engine/src/main/java/org/apache/airavata/workflow/engine/interpretor/WorkflowInterpreter.java ---------------------------------------------------------------------- diff --git a/modules/workflow-model/workflow-engine/src/main/java/org/apache/airavata/workflow/engine/interpretor/WorkflowInterpreter.java b/modules/workflow-model/workflow-engine/src/main/java/org/apache/airavata/workflow/engine/interpretor/WorkflowInterpreter.java index ea75bec..054e195 100644 --- a/modules/workflow-model/workflow-engine/src/main/java/org/apache/airavata/workflow/engine/interpretor/WorkflowInterpreter.java +++ b/modules/workflow-model/workflow-engine/src/main/java/org/apache/airavata/workflow/engine/interpretor/WorkflowInterpreter.java @@ -38,7 +38,7 @@ import org.apache.airavata.model.messaging.event.*; import org.apache.airavata.model.util.ExperimentModelUtil; import org.apache.airavata.model.workspace.experiment.*; import org.apache.airavata.orchestrator.cpi.OrchestratorService; -import org.apache.airavata.experiment.catalog.impl.RegistryFactory; +import org.apache.airavata.registry.core.experiment.catalog.impl.RegistryFactory; import org.apache.airavata.registry.cpi.ExpCatChildDataType; import org.apache.airavata.registry.cpi.ExperimentCatalog; import org.apache.airavata.registry.cpi.ExperimentCatalogModelType; http://git-wip-us.apache.org/repos/asf/airavata/blob/5a648a60/modules/workflow/workflow-core/pom.xml ---------------------------------------------------------------------- diff --git a/modules/workflow/workflow-core/pom.xml b/modules/workflow/workflow-core/pom.xml index 9f6e056..103ce93 100644 --- a/modules/workflow/workflow-core/pom.xml +++ b/modules/workflow/workflow-core/pom.xml @@ -27,7 +27,7 @@ </dependency> <dependency> <groupId>org.apache.airavata</groupId> - <artifactId>airavata-experiment-catalog</artifactId> + <artifactId.airavata.registry.core.experiment.catalog</artifactId> <version>${project.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/airavata/blob/5a648a60/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/SimpleWorkflowInterpreter.java ---------------------------------------------------------------------- diff --git a/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/SimpleWorkflowInterpreter.java b/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/SimpleWorkflowInterpreter.java index 6b9b5b4..a2befd5 100644 --- a/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/SimpleWorkflowInterpreter.java +++ b/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/SimpleWorkflowInterpreter.java @@ -42,7 +42,7 @@ import org.apache.airavata.model.workspace.experiment.TaskState; import org.apache.airavata.model.workspace.experiment.WorkflowNodeDetails; import org.apache.airavata.model.workspace.experiment.WorkflowNodeState; import org.apache.airavata.model.workspace.experiment.WorkflowNodeStatus; -import org.apache.airavata.experiment.catalog.impl.RegistryFactory; +import org.apache.airavata.registry.core.experiment.catalog.impl.RegistryFactory; import org.apache.airavata.registry.cpi.ChildDataType; import org.apache.airavata.registry.cpi.Registry; import org.apache.airavata.registry.cpi.RegistryException; http://git-wip-us.apache.org/repos/asf/airavata/blob/5a648a60/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/parser/AiravataWorkflowParser.java ---------------------------------------------------------------------- diff --git a/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/parser/AiravataWorkflowParser.java b/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/parser/AiravataWorkflowParser.java index 5842211..a41040c 100644 --- a/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/parser/AiravataWorkflowParser.java +++ b/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/parser/AiravataWorkflowParser.java @@ -27,7 +27,7 @@ import org.apache.aiaravata.application.catalog.data.impl.AppCatalogFactory; import org.apache.airavata.model.appcatalog.appinterface.InputDataObjectType; import org.apache.airavata.model.appcatalog.appinterface.OutputDataObjectType; import org.apache.airavata.model.workspace.experiment.Experiment; -import org.apache.airavata.experiment.catalog.impl.RegistryFactory; +import org.apache.airavata.registry.core.experiment.catalog.impl.RegistryFactory; import org.apache.airavata.registry.cpi.Registry; import org.apache.airavata.registry.cpi.RegistryException; import org.apache.airavata.registry.cpi.RegistryModelType; http://git-wip-us.apache.org/repos/asf/airavata/blob/5a648a60/modules/xbaya-gui/pom.xml ---------------------------------------------------------------------- diff --git a/modules/xbaya-gui/pom.xml b/modules/xbaya-gui/pom.xml index f1d1819..a1eeb7e 100644 --- a/modules/xbaya-gui/pom.xml +++ b/modules/xbaya-gui/pom.xml @@ -221,7 +221,7 @@ </dependency> <dependency> <groupId>org.apache.airavata</groupId> - <artifactId>airavata-experiment-catalog</artifactId> + <artifactId.airavata.registry.core.experiment.catalog</artifactId> <version>${project.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/airavata/blob/5a648a60/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/NewRegistryUserDialog.java ---------------------------------------------------------------------- diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/NewRegistryUserDialog.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/NewRegistryUserDialog.java index 3987773..092ba58 100644 --- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/NewRegistryUserDialog.java +++ b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/NewRegistryUserDialog.java @@ -27,11 +27,11 @@ import java.net.URL; import javax.swing.*; -import org.apache.airavata.experiment.catalog.ResourceType; -import org.apache.airavata.experiment.catalog.ResourceUtils; -import org.apache.airavata.experiment.catalog.resources.GatewayResource; -import org.apache.airavata.experiment.catalog.resources.UserResource; -import org.apache.airavata.experiment.catalog.resources.WorkerResource; +import org.apache.airavata.registry.core.experiment.catalog.ResourceType; +import org.apache.airavata.registry.core.experiment.catalog.ResourceUtils; +import org.apache.airavata.registry.core.experiment.catalog.resources.GatewayResource; +import org.apache.airavata.registry.core.experiment.catalog.resources.UserResource; +import org.apache.airavata.registry.core.experiment.catalog.resources.WorkerResource; import org.apache.airavata.xbaya.XBayaEngine; import org.apache.airavata.xbaya.ui.dialogs.XBayaDialog; import org.apache.airavata.xbaya.ui.widgets.GridPanel; http://git-wip-us.apache.org/repos/asf/airavata/blob/5a648a60/samples/java-client/experiment/pom.xml ---------------------------------------------------------------------- diff --git a/samples/java-client/experiment/pom.xml b/samples/java-client/experiment/pom.xml index e0bf817..472b660 100644 --- a/samples/java-client/experiment/pom.xml +++ b/samples/java-client/experiment/pom.xml @@ -18,7 +18,7 @@ </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>airavata-experiment-sample</artifactId> + <artifactId.airavata.registry.core.experiment.sample</artifactId> <name>Samples - Single application experiment</name> <url>http://airavata.apache.org/</url>
