airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lah...@apache.org
Subject svn commit: r1382170 - in /incubator/airavata/trunk/modules/xbaya-gui: ./ src/main/java/org/apache/airavata/xbaya/ src/main/java/org/apache/airavata/xbaya/interpretor/ src/main/java/org/apache/airavata/xbaya/registry/ src/main/java/org/apache/airavata/...
Date Fri, 07 Sep 2012 20:53:10 GMT
Author: lahiru
Date: Fri Sep  7 20:53:09 2012
New Revision: 1382170

URL: http://svn.apache.org/viewvc?rev=1382170&view=rev
Log:
using new AiravataRegistry2.

Modified:
    incubator/airavata/trunk/modules/xbaya-gui/pom.xml
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaEngine.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreterConfiguration.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registry/RegistryAccesser.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/AbstractAiravataTreeNode.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/RegistryNode.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionAdvancedOptionDialog.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionHostAdvancedOptionDialog.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DeploymentDescriptionDialog.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DescriptorEditorDialog.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDeploymentDialog.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDescriptionDialog.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/NewJCRRegistryUserDialog.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/RegistryLoaderWindow.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/views/JCRBrowserPanel.java

Modified: incubator/airavata/trunk/modules/xbaya-gui/pom.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/pom.xml?rev=1382170&r1=1382169&r2=1382170&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/pom.xml (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/pom.xml Fri Sep  7 20:53:09 2012
@@ -407,5 +407,10 @@
             <artifactId>airavata-common-registry-api</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.airavata</groupId>
+            <artifactId>airavata-jpa-registry</artifactId>
+            <version>${project.version}</version>
+        </dependency>
     </dependencies>
 </project>

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaEngine.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaEngine.java?rev=1382170&r1=1382169&r2=1382170&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaEngine.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaEngine.java Fri Sep  7 20:53:09 2012
@@ -26,7 +26,7 @@ import java.net.URISyntaxException;
 import java.util.List;
 
 import org.apache.airavata.common.registry.api.exception.RegistryException;
-import org.apache.airavata.registry.api.AiravataRegistry;
+import org.apache.airavata.registry.api.AiravataRegistry2;
 import org.apache.airavata.workflow.model.component.ComponentRegistryException;
 import org.apache.airavata.workflow.model.component.registry.AmazonComponentRegistry;
 import org.apache.airavata.workflow.model.component.registry.LocalComponentRegistry;
@@ -260,7 +260,7 @@ public class XBayaEngine {
 	public void updateXBayaConfigurationServiceURLs() {
 		try {
 			if (this.getConfiguration().getJcrComponentRegistry()!=null && this.getConfiguration().getJcrComponentRegistry().getRegistry()!=null){
-	        	AiravataRegistry registry=this.getConfiguration().getJcrComponentRegistry().getRegistry();
+	        	AiravataRegistry2 registry=this.getConfiguration().getJcrComponentRegistry().getRegistry();
 	        	List<URI> eventingServiceURLList = registry.getEventingServiceURLList();
 				if (eventingServiceURLList.size()>0) {
 					this.getConfiguration()

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreterConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreterConfiguration.java?rev=1382170&r1=1382169&r2=1382170&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreterConfiguration.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreterConfiguration.java Fri Sep  7 20:53:09 2012
@@ -23,7 +23,7 @@ package org.apache.airavata.xbaya.interp
 
 import java.net.URI;
 
-import org.apache.airavata.registry.api.AiravataRegistry;
+import org.apache.airavata.registry.api.AiravataRegistry2;
 import org.apache.airavata.workflow.model.wf.Workflow;
 import org.apache.airavata.xbaya.XBayaConfiguration;
 import org.apache.airavata.xbaya.jython.lib.NotificationSender;
@@ -38,7 +38,7 @@ public class WorkflowInterpreterConfigur
 //	
 	private URI messageBoxURL;
 	private URI messageBrokerURL;
-	private AiravataRegistry registry;
+	private AiravataRegistry2 registry;
 	private XBayaConfiguration configuration;
 	private XBayaGUI gui;
 	private MyProxyChecker myProxyChecker;
@@ -53,11 +53,11 @@ public class WorkflowInterpreterConfigur
 	private boolean subWorkflow;
 	private boolean testMode=false;
 	
-	public WorkflowInterpreterConfiguration(Workflow workflow, String topic, URI messageBoxURL,URI messageBrokerURL,AiravataRegistry registry,XBayaConfiguration configuration,XBayaGUI gui,MyProxyChecker myProxyChecker,Monitor monitor) {
+	public WorkflowInterpreterConfiguration(Workflow workflow, String topic, URI messageBoxURL,URI messageBrokerURL,AiravataRegistry2 registry,XBayaConfiguration configuration,XBayaGUI gui,MyProxyChecker myProxyChecker,Monitor monitor) {
 		this(workflow, topic, messageBoxURL,messageBrokerURL,registry,configuration,gui,myProxyChecker,monitor, true);
 	}
 	
-	public WorkflowInterpreterConfiguration(Workflow workflow, String topic, URI messageBoxURL,URI messageBrokerURL,AiravataRegistry registry,XBayaConfiguration configuration,XBayaGUI gui,MyProxyChecker myProxyChecker,Monitor monitor, boolean offline) {
+	public WorkflowInterpreterConfiguration(Workflow workflow, String topic, URI messageBoxURL,URI messageBrokerURL,AiravataRegistry2 registry,XBayaConfiguration configuration,XBayaGUI gui,MyProxyChecker myProxyChecker,Monitor monitor, boolean offline) {
 		this.messageBoxURL = messageBoxURL;
 		this.messageBrokerURL = messageBrokerURL;
 		this.registry = registry;
@@ -82,10 +82,10 @@ public class WorkflowInterpreterConfigur
 	public void setMessageBrokerURL(URI messageBrokerURL) {
 		this.messageBrokerURL = messageBrokerURL;
 	}
-	public AiravataRegistry getRegistry() {
+	public AiravataRegistry2 getRegistry() {
 		return registry;
 	}
-	public void setRegistry(AiravataRegistry registry) {
+	public void setRegistry(AiravataRegistry2 registry) {
 		this.registry = registry;
 	}
 	public XBayaConfiguration getConfiguration() {

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registry/RegistryAccesser.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registry/RegistryAccesser.java?rev=1382170&r1=1382169&r2=1382170&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registry/RegistryAccesser.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registry/RegistryAccesser.java Fri Sep  7 20:53:09 2012
@@ -32,7 +32,7 @@ import javax.xml.namespace.QName;
 import org.apache.airavata.common.registry.api.exception.RegistryException;
 import org.apache.airavata.common.utils.StringUtil;
 import org.apache.airavata.common.utils.XMLUtil;
-import org.apache.airavata.registry.api.AiravataRegistry;
+import org.apache.airavata.registry.api.AiravataRegistry2;
 import org.apache.airavata.workflow.model.component.ComponentException;
 import org.apache.airavata.workflow.model.component.registry.JCRComponentRegistry;
 import org.apache.airavata.workflow.model.graph.GraphException;
@@ -66,7 +66,7 @@ public class RegistryAccesser {
         this.engine = engine;
     }
 
-    private AiravataRegistry connectToRegistry() {
+    private AiravataRegistry2 connectToRegistry() {
         JCRComponentRegistry jcrComponentRegistry = this.engine.getConfiguration().getJcrComponentRegistry();
         return jcrComponentRegistry.getRegistry();
     }
@@ -76,9 +76,9 @@ public class RegistryAccesser {
      * @return
      * @throws RepositoryException
      */
-    public Map<QName, Node> getOGCEWorkflowTemplateList() throws RegistryException {
-        AiravataRegistry registry = connectToRegistry();
-        return registry.getWorkflows(this.engine.getConfiguration().getRegistryUserName());
+    public Map<String, String> getOGCEWorkflowTemplateList() throws RegistryException {
+        AiravataRegistry2 registry = connectToRegistry();
+        return registry.getWorkflows();
     }
 
     /**

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/AbstractAiravataTreeNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/AbstractAiravataTreeNode.java?rev=1382170&r1=1382169&r2=1382170&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/AbstractAiravataTreeNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/AbstractAiravataTreeNode.java Fri Sep  7 20:53:09 2012
@@ -36,7 +36,7 @@ import javax.swing.tree.DefaultTreeCellR
 import javax.swing.tree.DefaultTreeModel;
 import javax.swing.tree.TreeNode;
 
-import org.apache.airavata.registry.api.AiravataRegistry;
+import org.apache.airavata.registry.api.AiravataRegistry2;
 import org.apache.airavata.xbaya.XBayaEngine;
 import org.apache.airavata.xbaya.ui.actions.AbstractBrowserActionItem;
 import org.apache.airavata.xbaya.ui.actions.registry.browser.RefreshAction;
@@ -191,7 +191,7 @@ public abstract class AbstractAiravataTr
         return rootNode;
     }
 
-    public AiravataRegistry getRegistry() {
+    public AiravataRegistry2 getRegistry() {
         TreeNode rootNode = getRootNode();
         if (rootNode instanceof RegistryNode) {
             return ((RegistryNode) rootNode).getRegistry();

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/RegistryNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/RegistryNode.java?rev=1382170&r1=1382169&r2=1382170&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/RegistryNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/RegistryNode.java Fri Sep  7 20:53:09 2012
@@ -29,6 +29,7 @@ import javax.swing.Icon;
 import javax.swing.tree.TreeNode;
 
 import org.apache.airavata.registry.api.AiravataRegistry;
+import org.apache.airavata.registry.api.AiravataRegistry2;
 import org.apache.airavata.xbaya.XBayaEngine;
 import org.apache.airavata.xbaya.model.registrybrowser.AiravataConfigurations;
 import org.apache.airavata.xbaya.model.registrybrowser.ApplicationDeploymentDescriptions;
@@ -41,7 +42,7 @@ import org.apache.airavata.xbaya.ui.acti
 import org.apache.airavata.xbaya.ui.actions.registry.browser.RefreshAction;
 
 public class RegistryNode extends AbstractAiravataTreeNode {
-    private AiravataRegistry registry;
+    private AiravataRegistry2 registry;
     private XBayaEngine engine;
 
     public RegistryNode(XBayaEngine engine, TreeNode parent) {
@@ -68,18 +69,17 @@ public class RegistryNode extends Abstra
         return getTreeNodeList(children.toArray(), this);
     }
 
-    public AiravataRegistry getRegistry() {
+    public AiravataRegistry2 getRegistry() {
         return registry;
     }
 
-    public void setRegistry(AiravataRegistry registry) {
+    public void setRegistry(AiravataRegistry2 registry) {
         this.registry = registry;
     }
 
     @Override
     public String getCaption(boolean selected, boolean expanded, boolean leaf, boolean hasFocus) {
-        return getRegistry().getName() + " - " + getRegistry().getUsername() + "@"
-                + getRegistry().getRepositoryURI().toString();
+        return getRegistry().getGateway().getGatewayName() + " - " + getRegistry().getUser().getUserName();
     }
 
     @Override

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionAdvancedOptionDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionAdvancedOptionDialog.java?rev=1382170&r1=1382169&r2=1382170&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionAdvancedOptionDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionAdvancedOptionDialog.java Fri Sep  7 20:53:09 2012
@@ -44,7 +44,7 @@ import javax.swing.table.DefaultTableMod
 
 import org.apache.airavata.common.utils.SwingUtil;
 import org.apache.airavata.commons.gfac.type.ApplicationDeploymentDescription;
-import org.apache.airavata.registry.api.AiravataRegistry;
+import org.apache.airavata.registry.api.AiravataRegistry2;
 import org.apache.airavata.schemas.gfac.ApplicationDeploymentDescriptionType;
 import org.apache.airavata.schemas.gfac.NameValuePairType;
 import org.apache.airavata.xbaya.ui.widgets.GridPanel;
@@ -64,7 +64,7 @@ public class ApplicationDescriptionAdvan
     private boolean tableModelChanging = false;
     private JButton btnDeleteVariable;
     private JButton okButton;
-    private AiravataRegistry registry;
+    private AiravataRegistry2 registry;
 	private XBayaTextField txtWorkingDir;
 
     /**
@@ -84,7 +84,7 @@ public class ApplicationDescriptionAdvan
     /**
      * Create the dialog.
      */
-    public ApplicationDescriptionAdvancedOptionDialog(AiravataRegistry registry, ApplicationDeploymentDescription descriptor) {
+    public ApplicationDescriptionAdvancedOptionDialog(AiravataRegistry2 registry, ApplicationDeploymentDescription descriptor) {
         addWindowListener(new WindowAdapter() {
             @Override
             public void windowOpened(WindowEvent arg0) {
@@ -201,7 +201,6 @@ public class ApplicationDescriptionAdvan
         };
         tblEnv.setModel(defaultTableModel);
         defaultTableModel.addTableModelListener(new TableModelListener() {
-            @Override
             public void tableChanged(TableModelEvent arg0) {
                 if (!tableModelChanging) {
                     addNewRowIfLastIsNotEmpty();
@@ -346,11 +345,11 @@ public class ApplicationDescriptionAdvan
 
 
 
-    public AiravataRegistry getRegistry() {
+    public AiravataRegistry2 getRegistry() {
         return registry;
     }
 
-    public void setRegistry(AiravataRegistry registry) {
+    public void setRegistry(AiravataRegistry2 registry) {
         this.registry = registry;
     }
 

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionHostAdvancedOptionDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionHostAdvancedOptionDialog.java?rev=1382170&r1=1382169&r2=1382170&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionHostAdvancedOptionDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionHostAdvancedOptionDialog.java Fri Sep  7 20:53:09 2012
@@ -23,7 +23,7 @@ package org.apache.airavata.xbaya.ui.dia
 
 import org.apache.airavata.common.utils.SwingUtil;
 import org.apache.airavata.commons.gfac.type.ApplicationDeploymentDescription;
-import org.apache.airavata.registry.api.AiravataRegistry;
+import org.apache.airavata.registry.api.AiravataRegistry2;
 import org.apache.airavata.schemas.gfac.GramApplicationDeploymentType;
 import org.apache.airavata.schemas.gfac.JobTypeType;
 import org.apache.airavata.schemas.gfac.JobTypeType.Enum;
@@ -54,7 +54,7 @@ public class ApplicationDescriptionHostA
     private XBayaTextField txtCpuCount = new XBayaTextField();
     private XBayaTextField txtProcessorsPerNode = new XBayaTextField();
     private JButton okButton;
-    private AiravataRegistry registry;
+    private AiravataRegistry2 registry;
     private ApplicationDeploymentDescription descriptor;
 	private XBayaLabel lblCpuCount;
 	private XBayaLabel lblProcessorPerNode;
@@ -62,7 +62,7 @@ public class ApplicationDescriptionHostA
     /**
      * Create the dialog.
      */
-    public ApplicationDescriptionHostAdvancedOptionDialog(AiravataRegistry registry, ApplicationDeploymentDescription descriptor) {
+    public ApplicationDescriptionHostAdvancedOptionDialog(AiravataRegistry2 registry, ApplicationDeploymentDescription descriptor) {
         addWindowListener(new WindowAdapter() {
             @Override
             public void windowOpened(WindowEvent arg0) {
@@ -309,11 +309,11 @@ public class ApplicationDescriptionHostA
 		txtQueueType.setText(queueName.getQueueName()==null?"":queueName.getQueueName());
     }
 
-    public AiravataRegistry getRegistry() {
+    public AiravataRegistry2 getRegistry() {
         return registry;
     }
 
-    public void setRegistry(AiravataRegistry registry) {
+    public void setRegistry(AiravataRegistry2 registry) {
         this.registry = registry;
     }
 

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DeploymentDescriptionDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DeploymentDescriptionDialog.java?rev=1382170&r1=1382169&r2=1382170&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DeploymentDescriptionDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DeploymentDescriptionDialog.java Fri Sep  7 20:53:09 2012
@@ -68,7 +68,7 @@ import org.apache.airavata.common.utils.
 import org.apache.airavata.commons.gfac.type.ApplicationDeploymentDescription;
 import org.apache.airavata.commons.gfac.type.HostDescription;
 import org.apache.airavata.commons.gfac.type.ServiceDescription;
-import org.apache.airavata.registry.api.AiravataRegistry;
+import org.apache.airavata.registry.api.AiravataRegistry2;
 import org.apache.airavata.schemas.gfac.ApplicationDeploymentDescriptionType;
 import org.apache.airavata.schemas.gfac.DataType;
 import org.apache.airavata.schemas.gfac.HostDescriptionType;
@@ -96,7 +96,7 @@ public class DeploymentDescriptionDialog
     private JButton okButton;
     private JButton btnDeleteParameter;
     private DefaultTableModel defaultTableModel;
-    private AiravataRegistry registry;
+    private AiravataRegistry2 registry;
     private boolean newDescription;
     private boolean ignoreTableChanges=false;
 	private JCheckBox chkForceFileStagingToWorkDir;
@@ -119,14 +119,14 @@ public class DeploymentDescriptionDialog
         }
     }
 
-    public DeploymentDescriptionDialog(AiravataRegistry registry) {
+    public DeploymentDescriptionDialog(AiravataRegistry2 registry) {
     	this(registry,true,null);
     }
     
     /**
      * Create the dialog.
      */
-    public DeploymentDescriptionDialog(AiravataRegistry registry, boolean newDescription, ServiceDescription serviceDescription) {
+    public DeploymentDescriptionDialog(AiravataRegistry2 registry, boolean newDescription, ServiceDescription serviceDescription) {
     	setNewDescription(newDescription);
     	this.setOrginalServiceDescription(serviceDescription);
     	setSuggestedNamePrefix(suggestedNamePrefix);
@@ -198,7 +198,6 @@ public class DeploymentDescriptionDialog
 		chkForceFileStagingToWorkDir=new JCheckBox("Advanced: Force input file staging to working directory");
         chkForceFileStagingToWorkDir.addActionListener(new ActionListener(){
 
-			@Override
 			public void actionPerformed(ActionEvent arg0) {
 				setForceFileStagingToWorkDir(chkForceFileStagingToWorkDir.isSelected());
 			}
@@ -229,7 +228,6 @@ public class DeploymentDescriptionDialog
             {
             	JButton resetButton = new JButton("Reset");
                 resetButton.addActionListener(new ActionListener() {
-                    @Override
                     public void actionPerformed(ActionEvent e) {
                     	loadData();
                     }
@@ -243,7 +241,6 @@ public class DeploymentDescriptionDialog
                 }
                 okButton.setEnabled(false);
                 okButton.addActionListener(new ActionListener() {
-                    @Override
                     public void actionPerformed(ActionEvent e) {
                         try {
 							saveServiceDescription();
@@ -260,7 +257,6 @@ public class DeploymentDescriptionDialog
             {
                 JButton cancelButton = new JButton("Cancel");
                 cancelButton.addActionListener(new ActionListener() {
-                    @Override
                     public void actionPerformed(ActionEvent e) {
                         setServiceCreated(false);
                         close();
@@ -323,7 +319,6 @@ public class DeploymentDescriptionDialog
 
         JButton btnNewDeployment = new JButton("New deployment");
         btnNewDeployment.addActionListener(new ActionListener() {
-			@Override
 			public void actionPerformed(ActionEvent e) {
 				HostDeploymentDialog hostDeploymentDialog = new HostDeploymentDialog(getRegistry(),true,null,null,Arrays.asList(getDeployments().keySet().toArray(new String[]{})));
 				try {
@@ -347,7 +342,6 @@ public class DeploymentDescriptionDialog
         
         final JButton btnEditDeployment = new JButton("Edit deployment");
         btnEditDeployment.addActionListener(new ActionListener() {
-			@Override
 			public void actionPerformed(ActionEvent e) {
 				editSelectedDeployment();
 			}
@@ -355,7 +349,6 @@ public class DeploymentDescriptionDialog
         
         final JButton btnDeleteDeployment = new JButton("Delete deployment");
         btnDeleteDeployment.addActionListener(new ActionListener() {
-			@Override
 			public void actionPerformed(ActionEvent e) {
 				String hostName = tblModelHosts.getValueAt(tblHosts.getSelectedRow(),0).toString();
 				int result = JOptionPane.showConfirmDialog(null, "Are you sure you want to remove the host deployment '"+hostName+"'?", "Remove Host Deployment",
@@ -368,7 +361,6 @@ public class DeploymentDescriptionDialog
 		});
         
         selectionModel.addListSelectionListener(new ListSelectionListener() {
-            @Override
             public void valueChanged(ListSelectionEvent e) {
             	btnEditDeployment.setEnabled(tblHosts.getSelectedRows().length > 0);
             	btnDeleteDeployment.setEnabled(tblHosts.getSelectedRows().length > 0);
@@ -423,7 +415,6 @@ public class DeploymentDescriptionDialog
         tblParameters.setModel(defaultTableModel);
         defaultTableModel.addTableModelListener(new TableModelListener() {
 
-            @Override
             public void tableChanged(TableModelEvent arg0) {
                 if (!ignoreTableChanges) {
 					int selectedRow = tblParameters.getSelectedRow();
@@ -463,7 +454,6 @@ public class DeploymentDescriptionDialog
         selectionModel.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
 
         selectionModel.addListSelectionListener(new ListSelectionListener() {
-            @Override
             public void valueChanged(ListSelectionEvent e) {
                 btnDeleteParameter.setEnabled(tblParameters.getSelectedRows().length > 0);
             }
@@ -472,7 +462,6 @@ public class DeploymentDescriptionDialog
         
         btnDeleteParameter = new JButton("Delete parameter");
         btnDeleteParameter.addActionListener(new ActionListener() {
-            @Override
             public void actionPerformed(ActionEvent arg0) {
                 deleteSelectedRows();
             }
@@ -489,16 +478,13 @@ public class DeploymentDescriptionDialog
 		txtApplicationServiceName.setEditable(isNewDescription());
     	ignoreTableChanges=true;
     	updateIODataTable(descType);
-    	try {
-    		getDeployments().clear();
-			Map<HostDescription, List<ApplicationDeploymentDescription>> descs = getRegistry().searchDeploymentDescription(descType.getName());
-			for (HostDescription hostDesc : descs.keySet()) {
-				getDeployments().put(hostDesc.getType().getHostName(),new HostDeployment(hostDesc, descs.get(hostDesc).get(0)));
-			}
-		} catch (RegistryException e) {
-			e.printStackTrace();
-		}
-    	updateDeploymentTable();
+        getDeployments().clear();
+        Map<HostDescription, List<ApplicationDeploymentDescription>> descs = getRegistry().getApplicationDescriptorswithHosts(descType.getName());
+        for (HostDescription hostDesc : descs.keySet()) {
+            getDeployments().put(hostDesc.getType().getHostName(), new HostDeployment(hostDesc, descs.get(hostDesc).get(0)));
+        }
+
+        updateDeploymentTable();
     	Boolean selected = false;
     	if (descType.getPortType()!=null && descType.getPortType().getMethod()!=null) {
 			XmlCursor cursor = descType.getPortType().getMethod().newCursor();
@@ -617,17 +603,8 @@ public class DeploymentDescriptionDialog
         if (getServiceName() == null || getServiceName().trim().equals("")) {
             throw new Exception("Name of the application cannot be empty!!!");
         }
-
         ServiceDescription serviceDescription2 = null;
-        try {
-            serviceDescription2 = getRegistry().getServiceDescription(getServiceName());
-        } catch (RegistryException e) {
-            if (e.getCause() instanceof PathNotFoundException) {
-                // non-existant name. just want we want
-            } else {
-                throw e;
-            }
-        }
+        serviceDescription2 = getRegistry().getServiceDescriptor(getServiceName());
         if (isNewDescription() && serviceDescription2 != null) {
             throw new Exception("Service descriptor with the given name already exists!!!");
         }
@@ -665,26 +642,20 @@ public class DeploymentDescriptionDialog
         }
         getServiceDescriptionType().setInputParametersArray(inputParameters.toArray(new InputParameterType[] {}));
         getServiceDescriptionType().setOutputParametersArray(outputParameters.toArray(new OutputParameterType[] {}));
-
-        try {
-			getRegistry().saveServiceDescription(getServiceDescription());
-			if (!isNewDescription()){
-				Map<HostDescription, List<ApplicationDeploymentDescription>> descs = getRegistry().searchDeploymentDescription(getServiceName());
-				for (HostDescription hostDesc : descs.keySet()) {
-					for (ApplicationDeploymentDescription app : descs.get(hostDesc)) {
-						getRegistry().deleteDeploymentDescription(getServiceName(), hostDesc.getType().getHostName(), app.getType().getApplicationName().getStringValue());	
-					}
-				}
-			}
-			for (String hostName : getDeployments().keySet()) {
-				getRegistry().saveDeploymentDescription(getServiceName(), hostName, getDeployments().get(hostName).getApplicationDescription());
-			}
-	        setServiceCreated(true);
-	        JOptionPane.showMessageDialog(this,"Application '"+getServiceName()+"' is registered Successfully !");
-		} catch (RegistryException e) {
-			setError(e.getMessage());
-			throw e;
-		}
+        getRegistry().addServiceDescriptor(getServiceDescription());
+        if (!isNewDescription()) {
+            Map<HostDescription, List<ApplicationDeploymentDescription>> descs = getRegistry().getApplicationDescriptorswithHosts(getServiceName());
+            for (HostDescription hostDesc : descs.keySet()) {
+                for (ApplicationDeploymentDescription app : descs.get(hostDesc)) {
+                    getRegistry().removeApplicationDescriptor(getServiceName(), hostDesc.getType().getHostName(), app.getType().getApplicationName().getStringValue());
+                }
+            }
+        }
+        for (String hostName : getDeployments().keySet()) {
+            getRegistry().addApplicationDescriptor(getServiceName(), hostName, getDeployments().get(hostName).getApplicationDescription());
+        }
+        setServiceCreated(true);
+        JOptionPane.showMessageDialog(this, "Application '" + getServiceName() + "' is registered Successfully !");
     }
 
     public void close() {
@@ -726,11 +697,11 @@ public class DeploymentDescriptionDialog
 		}
     }
 
-    public AiravataRegistry getRegistry() {
+    public AiravataRegistry2 getRegistry() {
         return registry;
     }
 
-    public void setRegistry(AiravataRegistry registry) {
+    public void setRegistry(AiravataRegistry2 registry) {
         this.registry = registry;
     }
 

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DescriptorEditorDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DescriptorEditorDialog.java?rev=1382170&r1=1382169&r2=1382170&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DescriptorEditorDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DescriptorEditorDialog.java Fri Sep  7 20:53:09 2012
@@ -48,7 +48,7 @@ import org.apache.airavata.common.utils.
 import org.apache.airavata.commons.gfac.type.ApplicationDeploymentDescription;
 import org.apache.airavata.commons.gfac.type.HostDescription;
 import org.apache.airavata.commons.gfac.type.ServiceDescription;
-import org.apache.airavata.registry.api.AiravataRegistry;
+import org.apache.airavata.registry.api.AiravataRegistry2;
 import org.apache.airavata.xbaya.XBayaEngine;
 import org.apache.airavata.xbaya.registrybrowser.nodes.JCRBrowserIcons;
 import org.apache.airavata.xbaya.ui.dialogs.XBayaDialog;
@@ -62,7 +62,7 @@ public class DescriptorEditorDialog exte
 
     private XBayaDialog dialog;
 
-    private AiravataRegistry registry;
+    private AiravataRegistry2 registry;
 
 	private JList descriptorList;
 
@@ -130,7 +130,6 @@ public class DescriptorEditorDialog exte
             }
         });
         descriptorList.addListSelectionListener(new ListSelectionListener(){
-			@Override
 			public void valueChanged(ListSelectionEvent e) {
 				boolean isSelected=descriptorList.getSelectedIndex()!=-1;
 				editButton.setEnabled(isSelected);
@@ -280,26 +279,22 @@ public class DescriptorEditorDialog exte
     	
         
 		if (askQuestion(title, question)) {
-            try {
             	switch (descriptorType){
 	    	    	case HOST:
 	    	    		HostDescription h = (HostDescription) getSelected();
-	    	        	getRegistry().deleteHostDescription(h.getType().getHostName());
+	    	        	getRegistry().removeHostDescriptor(h.getType().getHostName());
 	    	    		break;
 	    	    	case SERVICE:
 	    	        	ServiceDescription d = (ServiceDescription) getSelected();
-	    	        	getRegistry().deleteServiceDescription(d.getType().getName());
+	    	        	getRegistry().removeServiceDescriptor(d.getType().getName());
 	    	    		break;
 	    	    	case APPLICATION:
 	    	    		ApplicationDeploymentDescription a = (ApplicationDeploymentDescription) getSelected();
 	    	    		String[] s = dlist.get(a).split("\\$");
-	    	        	getRegistry().deleteDeploymentDescription(s[0], s[1], a.getType().getApplicationName().getStringValue());
+	    	        	getRegistry().removeApplicationDescriptor(s[0], s[1], a.getType().getApplicationName().getStringValue());
 	    	    		break;
             	}
 				loadDescriptors();
-			} catch (RegistryException e) {
-				this.engine.getGUI().getErrorWindow().error(e);
-			}
         }
         return true;
     }
@@ -312,26 +307,26 @@ public class DescriptorEditorDialog exte
 			e1.printStackTrace();
 		}
     	((DefaultListModel)descriptorList.getModel()).removeAllElements();
-    	try {
     		List<?> descriptors=null;
 			switch (descriptorType){
 	    	case HOST:
-	    		descriptors = getRegistry().searchHostDescription(".*");
+	    		descriptors = getRegistry().getHostDescriptors();
 	    		break;
 	    	case SERVICE:
-	    		descriptors = getRegistry().searchServiceDescription(".*");
+	    		descriptors = getRegistry().getServiceDescriptors();
 	    		break;
 	    	case APPLICATION:
-	    		dlist=getRegistry().searchDeploymentDescription();
+	    		Map<String,ApplicationDeploymentDescription> temp =getRegistry().getApplicationDescriptors(null);
+                for(String value:temp.keySet()) {
+                    dlist.put(temp.get(value), value);
+
+                }
 	    		descriptors =Arrays.asList(dlist.keySet().toArray(new ApplicationDeploymentDescription[]{})); 
 	    		break;
     		}
     		for (Object d : descriptors) {
 				((DefaultListModel)descriptorList.getModel()).addElement(d);
 			}
-		} catch (RegistryException e) {
-			engine.getGUI().getErrorWindow().error(e);
-		}
 	}
     
     private static class DescriptorListCellRenderer extends DefaultListCellRenderer{
@@ -364,11 +359,11 @@ public class DescriptorEditorDialog exte
 		}
     	
     }
-    public AiravataRegistry getRegistry() {
+    public AiravataRegistry2 getRegistry() {
         return registry;
     }
 
-    public void setRegistry(AiravataRegistry registry) {
+    public void setRegistry(AiravataRegistry2 registry) {
         this.registry = registry;
     }
 }
\ No newline at end of file

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDeploymentDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDeploymentDialog.java?rev=1382170&r1=1382169&r2=1382170&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDeploymentDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDeploymentDialog.java Fri Sep  7 20:53:09 2012
@@ -19,8 +19,8 @@
  *
  */
 
-package org.apache.airavata.xbaya.ui.dialogs.descriptors;
-
+package org.apache.airavata.xbaya.ui.dialogs.descriptors;
+
 import java.awt.Color;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
@@ -49,7 +49,7 @@ import org.apache.airavata.common.regist
 import org.apache.airavata.common.utils.SwingUtil;
 import org.apache.airavata.commons.gfac.type.ApplicationDeploymentDescription;
 import org.apache.airavata.commons.gfac.type.HostDescription;
-import org.apache.airavata.registry.api.AiravataRegistry;
+import org.apache.airavata.registry.api.AiravataRegistry2;
 import org.apache.airavata.schemas.gfac.ApplicationDeploymentDescriptionType;
 import org.apache.airavata.schemas.gfac.GlobusHostType;
 import org.apache.airavata.schemas.gfac.GramApplicationDeploymentType;
@@ -59,25 +59,25 @@ import org.apache.airavata.xbaya.ui.widg
 import org.apache.airavata.xbaya.ui.widgets.XBayaLinkButton;
 import org.apache.airavata.xbaya.ui.widgets.XBayaTextField;
 import org.apache.xmlbeans.XmlException;
-
-public class HostDeploymentDialog extends JDialog implements ActionListener {
-    /**
-	 * 
-	 */
-    private static final long serialVersionUID = -2745085755585610025L;
-    private XBayaTextField txtExecPath;
-    private XBayaTextField txtTempDir;
-
-    private AiravataRegistry registry;
-    private ApplicationDeploymentDescription shellApplicationDescription;
-    private JLabel lblError;
-    private boolean applcationDescCreated = false;
-    private JButton okButton;
-
-    private String hostName;
-    private JComboBox cmbHostName;
-
-	private JButton btnHostAdvanceOptions;
+
+public class HostDeploymentDialog extends JDialog implements ActionListener {
+    /**
+	 * 
+	 */
+    private static final long serialVersionUID = -2745085755585610025L;
+    private XBayaTextField txtExecPath;
+    private XBayaTextField txtTempDir;
+
+    private AiravataRegistry2 registry;
+    private ApplicationDeploymentDescription shellApplicationDescription;
+    private JLabel lblError;
+    private boolean applcationDescCreated = false;
+    private JButton okButton;
+
+    private String hostName;
+    private JComboBox cmbHostName;
+
+	private JButton btnHostAdvanceOptions;
 	private boolean newDescriptor;
 	private ApplicationDeploymentDescription originalDeploymentDescription;
 	private String originalHost; 
@@ -85,40 +85,40 @@ public class HostDeploymentDialog extend
 	private JButton btnExecBrowse;
 	private List<String> existingHostList;
 	
-    /**
-     * Create the dialog.
-     */
-    public HostDeploymentDialog(AiravataRegistry registry, boolean newDescriptor, ApplicationDeploymentDescription originalDeploymentDescription, String originalHost, List<String> existingHostList) {
+    /**
+     * Create the dialog.
+     */
+    public HostDeploymentDialog(AiravataRegistry2 registry, boolean newDescriptor, ApplicationDeploymentDescription originalDeploymentDescription, String originalHost, List<String> existingHostList) {
     	setNewDescriptor(newDescriptor);
     	setOriginalDeploymentDescription(originalDeploymentDescription);
     	setOriginalHost(originalHost);
         setRegistry(registry);
         setExistingHostList(existingHostList);
         iniGUI();
-    }
-
-    public void open() {
-        setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
-        setVisible(true);
-    }
-
-    protected HostDeploymentDialog getDialog() {
-        return this;
-    }
-    
-    private void iniGUI() {
+    }
+
+    public void open() {
+        setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
+        setVisible(true);
+    }
+
+    protected HostDeploymentDialog getDialog() {
+        return this;
+    }
+    
+    private void iniGUI() {
         if (isNewDescriptor()) {
 			setTitle("New Application Deployment");
 		}else{
 			setTitle("Update Application Deployment: "+getOriginalDeploymentDescription().getType().getApplicationName().getStringValue());
 		}
-		setBounds(100, 100, 600, 620);
-        setModal(true);
+		setBounds(100, 100, 600, 620);
+        setModal(true);
         setLocationRelativeTo(null);
-        GridPanel buttonPane = new GridPanel();
-        {
-            lblError = new JLabel("");
-            lblError.setForeground(Color.RED);
+        GridPanel buttonPane = new GridPanel();
+        {
+            lblError = new JLabel("");
+            lblError.setForeground(Color.RED);
             buttonPane.add(lblError);
             if (!isNewDescriptor()){
             	JButton resetButton = new JButton("Reset");
@@ -128,43 +128,43 @@ public class HostDeploymentDialog extend
                     }
                 });
                 buttonPane.add(resetButton);
-            }
-            {
+            }
+            {
                 okButton = new JButton("Add");
                 if (!isNewDescriptor()){
                 	okButton.setText("Update");
-                }
-                okButton.addActionListener(new ActionListener() {
-                    public void actionPerformed(ActionEvent e) {
-                        saveApplicationDescription();
-                        close();
-                    }
-                });
-                okButton.setEnabled(false);
-                okButton.setActionCommand("OK");
-                buttonPane.add(okButton);
-                getRootPane().setDefaultButton(okButton);
-            }
-            {
-                JButton cancelButton = new JButton("Cancel");
-                cancelButton.addActionListener(new ActionListener() {
-                    public void actionPerformed(ActionEvent e) {
-                        setApplicationDescCreated(false);
-                        close();
-                    }
-                });
-                cancelButton.setActionCommand("Cancel");
-                buttonPane.add(cancelButton);
-            }
-        }
-        {
-        	JPanel execPath=new JPanel();
-            txtExecPath = new XBayaTextField();
-            txtExecPath.getTextField().addKeyListener(new KeyAdapter() {
-                @Override
-                public void keyReleased(KeyEvent e) {
-                    setExecutablePath(txtExecPath.getText());
-                }
+                }
+                okButton.addActionListener(new ActionListener() {
+                    public void actionPerformed(ActionEvent e) {
+                        saveApplicationDescription();
+                        close();
+                    }
+                });
+                okButton.setEnabled(false);
+                okButton.setActionCommand("OK");
+                buttonPane.add(okButton);
+                getRootPane().setDefaultButton(okButton);
+            }
+            {
+                JButton cancelButton = new JButton("Cancel");
+                cancelButton.addActionListener(new ActionListener() {
+                    public void actionPerformed(ActionEvent e) {
+                        setApplicationDescCreated(false);
+                        close();
+                    }
+                });
+                cancelButton.setActionCommand("Cancel");
+                buttonPane.add(cancelButton);
+            }
+        }
+        {
+        	JPanel execPath=new JPanel();
+            txtExecPath = new XBayaTextField();
+            txtExecPath.getTextField().addKeyListener(new KeyAdapter() {
+                @Override
+                public void keyReleased(KeyEvent e) {
+                    setExecutablePath(txtExecPath.getText());
+                }
             });
             txtExecPath.getTextField().addFocusListener(new FocusAdapter() {
             	@Override
@@ -172,11 +172,10 @@ public class HostDeploymentDialog extend
             		super.focusLost(e);
             		updateTempDirWithExecPath(txtExecPath.getText());
             	}
-			});
+			});
             txtExecPath.setColumns(10);
             btnExecBrowse=new JButton(MenuIcons.OPEN_ICON);
             btnExecBrowse.addActionListener(new ActionListener(){
-				@Override
 				public void actionPerformed(ActionEvent arg0) {
 					JFileChooser c = new JFileChooser();
 					int rVal = c.showOpenDialog(null);
@@ -191,20 +190,19 @@ public class HostDeploymentDialog extend
             
             setupLayoutForBrowse(execPath,txtExecPath.getSwingComponent());
 
-            JLabel lblExecutablePath = new JLabel("Executable path");
+            JLabel lblExecutablePath = new JLabel("Executable path");
         	JPanel tmpDirPath=new JPanel();
-
-            txtTempDir = new XBayaTextField();
-            txtTempDir.getTextField().addKeyListener(new KeyAdapter() {
-                @Override
-                public void keyReleased(KeyEvent e) {
-                    setTempDir(txtTempDir.getText());
-                }
-            });
+
+            txtTempDir = new XBayaTextField();
+            txtTempDir.getTextField().addKeyListener(new KeyAdapter() {
+                @Override
+                public void keyReleased(KeyEvent e) {
+                    setTempDir(txtTempDir.getText());
+                }
+            });
             txtTempDir.setColumns(10);
             btnTmpDirBrowse=new JButton(MenuIcons.OPEN_DIR_ICON);
             btnTmpDirBrowse.addActionListener(new ActionListener(){
-				@Override
 				public void actionPerformed(ActionEvent arg0) {
 					JFileChooser c = new JFileChooser();
 					c.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
@@ -222,57 +220,56 @@ public class HostDeploymentDialog extend
             setupLayoutForBrowse(tmpDirPath, component);
 
             JLabel lblTemporaryDirectory = new JLabel("Scratch working directory");
-
-            JButton btnAdvance = new JButton("Advanced application configurations...");
-            btnAdvance.addActionListener(new ActionListener() {
-                public void actionPerformed(ActionEvent e) {
-                    try {
-                        ApplicationDescriptionAdvancedOptionDialog serviceDescriptionDialog = new ApplicationDescriptionAdvancedOptionDialog(
-                                getRegistry(), getShellApplicationDescription());
-                        serviceDescriptionDialog.open();
-                    } catch (Exception e1) {
-                        e1.printStackTrace();
-                        JOptionPane.showMessageDialog(null, e1.getLocalizedMessage());
-                    }
-                }
-            });
-
-            cmbHostName = new JComboBox();
-            cmbHostName.addActionListener(this);
-
-            XBayaLabel lblHostName = new XBayaLabel("Application host",cmbHostName);
-            XBayaLinkButton lnkNewHost = new XBayaLinkButton("New button");
-            lnkNewHost.addActionListener(new ActionListener() {
-                public void actionPerformed(ActionEvent e) {
-                    try {
+
+            JButton btnAdvance = new JButton("Advanced application configurations...");
+            btnAdvance.addActionListener(new ActionListener() {
+                public void actionPerformed(ActionEvent e) {
+                    try {
+                        ApplicationDescriptionAdvancedOptionDialog serviceDescriptionDialog = new ApplicationDescriptionAdvancedOptionDialog(
+                                getRegistry(), getShellApplicationDescription());
+                        serviceDescriptionDialog.open();
+                    } catch (Exception e1) {
+                        e1.printStackTrace();
+                        JOptionPane.showMessageDialog(null, e1.getLocalizedMessage());
+                    }
+                }
+            });
+
+            cmbHostName = new JComboBox();
+            cmbHostName.addActionListener(this);
+
+            XBayaLabel lblHostName = new XBayaLabel("Application host",cmbHostName);
+            XBayaLinkButton lnkNewHost = new XBayaLinkButton("New button");
+            lnkNewHost.addActionListener(new ActionListener() {
+                public void actionPerformed(ActionEvent e) {
+                    try {
                         HostDescriptionDialog hostDescriptionDialog = new HostDescriptionDialog(getRegistry());
-                        hostDescriptionDialog.setLocationRelativeTo(getContentPane());
-                        hostDescriptionDialog.open();
-
+                        hostDescriptionDialog.setLocationRelativeTo(getContentPane());
+                        hostDescriptionDialog.open();
+
                         if (hostDescriptionDialog.isHostCreated()) {
                         	ProgressMonitor progressMonitor = new ProgressMonitor(getContentPane(), "Host Descriptions", "Refreshing host list..", 0, 200);
                         	int progress=1;
                         	progressMonitor.setProgress(progress++);
-                        	while(cmbHostName.getSelectedIndex()==-1 || !cmbHostName.getSelectedItem().toString().equals(hostDescriptionDialog.getHostLocation())){
+                        	while(cmbHostName.getSelectedIndex()==-1 || !cmbHostName.getSelectedItem().toString().equals(hostDescriptionDialog.getHostLocation())){
 	                            loadHostDescriptions();
 	                            cmbHostName.setSelectedItem(hostDescriptionDialog.getHostLocation());
 	                            progressMonitor.setProgress(progress++);
 	                            Thread.sleep(50);
                         	}
-                        	progressMonitor.setProgress(200);
-                        }
-                    } catch (Exception e1) {
-                        e1.printStackTrace();
-                        JOptionPane.showMessageDialog(null, e1.getLocalizedMessage());
-                    }
-                }
-            });
-            lnkNewHost.setText("Create new host...");
-            lnkNewHost.setHorizontalAlignment(SwingConstants.TRAILING);
-
+                        	progressMonitor.setProgress(200);
+                        }
+                    } catch (Exception e1) {
+                        e1.printStackTrace();
+                        JOptionPane.showMessageDialog(null, e1.getLocalizedMessage());
+                    }
+                }
+            });
+            lnkNewHost.setText("Create new host...");
+            lnkNewHost.setHorizontalAlignment(SwingConstants.TRAILING);
+
             btnHostAdvanceOptions=new JButton("HPC Configuration...");
             btnHostAdvanceOptions.addActionListener(new ActionListener() {
-				@Override
 				public void actionPerformed(ActionEvent arg0) {
 					try {
 						ApplicationDescriptionHostAdvancedOptionDialog hostAdvancedOptionsDialog = new ApplicationDescriptionHostAdvancedOptionDialog(getRegistry(),getShellApplicationDescription());
@@ -332,11 +329,11 @@ public class HostDeploymentDialog extend
             buttonPane.getSwingComponent().setBorder(BorderFactory.createEtchedBorder());
             infoPanel.getSwingComponent().setBorder(BorderFactory.createEtchedBorder());
 
-            SwingUtil.layoutToGrid(getContentPane(), 2, 1, -1, 0);
-            loadHostDescriptions();
-        }
-        setResizable(true);
-        getRootPane().setDefaultButton(okButton);
+            SwingUtil.layoutToGrid(getContentPane(), 2, 1, -1, 0);
+            loadHostDescriptions();
+        }
+        setResizable(true);
+        getRootPane().setDefaultButton(okButton);
         if (!isNewDescriptor()){
         	loadData();
         }
@@ -355,8 +352,8 @@ public class HostDeploymentDialog extend
 		constraints.weightx = 1;
 		layout.setConstraints(component, constraints);
 		tmpDirPath.setLayout(layout);
-	}
-
+	}
+
     private void loadData(){
     	txtExecPath.setText(getOriginalDeploymentDescription().getType().getExecutableLocation());
     	setExecutablePath(txtExecPath.getText());
@@ -367,25 +364,25 @@ public class HostDeploymentDialog extend
     	setHostName(cmbHostName.getSelectedItem().toString());
     	cmbHostName.setEnabled(isNewDescriptor());
     }
-    
-    private void loadHostDescriptions() {
-        cmbHostName.removeAllItems();
-        setHostName(null);
-        try {
-            List<HostDescription> hostDescriptions = getRegistry().searchHostDescription(".*");
-            for (HostDescription hostDescription : hostDescriptions) {
+    
+    private void loadHostDescriptions() {
+        cmbHostName.removeAllItems();
+        setHostName(null);
+        try {
+            List<HostDescription> hostDescriptions = getRegistry().getHostDescriptors();
+            for (HostDescription hostDescription : hostDescriptions) {
                 if (!isNewDescriptor() || !getExistingHostList().contains(hostDescription.getType().getHostName())) {
 					cmbHostName.addItem(hostDescription.getType().getHostName());
-				}
-            }
-        } catch (Exception e) {
-            setError(e.getLocalizedMessage());
-        }
-        updateHostName();
-    }
-
-    public ApplicationDeploymentDescription getShellApplicationDescription() {
-        if(shellApplicationDescription == null){
+				}
+            }
+        } catch (Exception e) {
+            setError(e.getLocalizedMessage());
+        }
+        updateHostName();
+    }
+
+    public ApplicationDeploymentDescription getShellApplicationDescription() {
+        if(shellApplicationDescription == null){
             if (isNewDescriptor()) {
 				shellApplicationDescription = new ApplicationDeploymentDescription();
 			}else{
@@ -394,23 +391,23 @@ public class HostDeploymentDialog extend
 				} catch (XmlException e) {
 					//shouldn't happen (hopefully)
 				}
-			}
-        }
-        return shellApplicationDescription;
-    }
-
-    public ApplicationDeploymentDescriptionType getApplicationDescriptionType() {
-    	return getShellApplicationDescription().getType();
-    }
-
-    public String getExecutablePath() {
-        return getApplicationDescriptionType().getExecutableLocation();
-    }
-
-    public void setExecutablePath(String executablePath) {
+			}
+        }
+        return shellApplicationDescription;
+    }
+
+    public ApplicationDeploymentDescriptionType getApplicationDescriptionType() {
+    	return getShellApplicationDescription().getType();
+    }
+
+    public String getExecutablePath() {
+        return getApplicationDescriptionType().getExecutableLocation();
+    }
+
+    public void setExecutablePath(String executablePath) {
     	getApplicationDescriptionType().setExecutableLocation(executablePath);
-    	updateTempDirWithExecPath(executablePath);
-        updateDialogStatus();
+    	updateTempDirWithExecPath(executablePath);
+        updateDialogStatus();
     }
 
 	private void updateTempDirWithExecPath(String executablePath) {
@@ -424,126 +421,120 @@ public class HostDeploymentDialog extend
 //    		setTempDir(txtTempDir.getText());
 //    		txtTempDir.getSwingComponent().requestFocus();
 //    	}
-	}
-
-    public String getTempDir() {
-        return getApplicationDescriptionType().getScratchWorkingDirectory();
-    }
-
-    public void setTempDir(String tempDir) {
-    	getApplicationDescriptionType().setScratchWorkingDirectory(tempDir);
-        updateDialogStatus();
-    }
-
-    public void close() {
-        getDialog().setVisible(false);
-    }
-
-    public void saveApplicationDescription() {
+	}
+
+    public String getTempDir() {
+        return getApplicationDescriptionType().getScratchWorkingDirectory();
+    }
+
+    public void setTempDir(String tempDir) {
+    	getApplicationDescriptionType().setScratchWorkingDirectory(tempDir);
+        updateDialogStatus();
+    }
+
+    public void close() {
+        getDialog().setVisible(false);
+    }
+
+    public void saveApplicationDescription() {
 		setApplicationDescCreated(true);
-    }
-
-    public boolean isApplicationDescCreated() {
-        return applcationDescCreated;
-    }
-
-    public void setApplicationDescCreated(boolean applicationDescCreated) {
-        this.applcationDescCreated = applicationDescCreated;
-    }
-
-    private void setError(String errorMessage) {
-        if (errorMessage == null || errorMessage.trim().equals("")) {
-            lblError.setText("");
-        } else {
-            lblError.setText(errorMessage.trim());
-        }
-    }
-
-    private void updateDialogStatus() {
-        String message = null;
-        try {
-            validateDialog();
-        } catch (Exception e) {
-            message = e.getLocalizedMessage();
-        }
-        okButton.setEnabled(message == null);
-        setError(message);
-    }
-	
-    private void validateDialog() throws Exception {
-        if (getExecutablePath() == null || getExecutablePath().trim().equals("")) {
-            throw new Exception("Executable path cannot be empty!!!");
-        }
-
-        if (getTempDir() == null || getTempDir().trim().equals("")) {
-            throw new Exception("Temporary directory location cannot be empty!!!");
-        }
-
-        if (getHostName() == null || getHostName().trim().equals("")) {
-            throw new Exception("Please select/create host to bind to this deployment description");
-        }
-
-    }
-
-    public String getHostName() {
-        return hostName;
-    }
-
-    public void setHostName(String hostName) {
+    }
+
+    public boolean isApplicationDescCreated() {
+        return applcationDescCreated;
+    }
+
+    public void setApplicationDescCreated(boolean applicationDescCreated) {
+        this.applcationDescCreated = applicationDescCreated;
+    }
+
+    private void setError(String errorMessage) {
+        if (errorMessage == null || errorMessage.trim().equals("")) {
+            lblError.setText("");
+        } else {
+            lblError.setText(errorMessage.trim());
+        }
+    }
+
+    private void updateDialogStatus() {
+        String message = null;
+        try {
+            validateDialog();
+        } catch (Exception e) {
+            message = e.getLocalizedMessage();
+        }
+        okButton.setEnabled(message == null);
+        setError(message);
+    }
+	
+    private void validateDialog() throws Exception {
+        if (getExecutablePath() == null || getExecutablePath().trim().equals("")) {
+            throw new Exception("Executable path cannot be empty!!!");
+        }
+
+        if (getTempDir() == null || getTempDir().trim().equals("")) {
+            throw new Exception("Temporary directory location cannot be empty!!!");
+        }
+
+        if (getHostName() == null || getHostName().trim().equals("")) {
+            throw new Exception("Please select/create host to bind to this deployment description");
+        }
+
+    }
+
+    public String getHostName() {
+        return hostName;
+    }
+
+    public void setHostName(String hostName) {
         this.hostName = hostName;
-        if (hostName!=null) {
-			HostDescription hostDescription;
-			try {
-				hostDescription = registry.getHostDescription(hostName);
-				if (hostDescription.getType() instanceof GlobusHostType) {
-					getShellApplicationDescription().getType().changeType(
-							GramApplicationDeploymentType.type);
-				} else {
-					getShellApplicationDescription().getType().changeType(
-							ApplicationDeploymentDescriptionType.type);
-				}
-				btnHostAdvanceOptions.setVisible(hostDescription.getType() instanceof GlobusHostType);
-				String hostAddress = hostDescription.getType().getHostAddress();
-				boolean isLocal = isLocalAddress(hostAddress);
-				btnExecBrowse.setVisible(isLocal);
-				btnTmpDirBrowse.setVisible(isLocal);
-				
-			} catch (RegistryException e) {
-				//not there - ouch
-			}
-		}
-		updateDialogStatus();
+        if (hostName != null) {
+            HostDescription hostDescription;
+            hostDescription = registry.getHostDescriptor(hostName);
+            if (hostDescription.getType() instanceof GlobusHostType) {
+                getShellApplicationDescription().getType().changeType(
+                        GramApplicationDeploymentType.type);
+            } else {
+                getShellApplicationDescription().getType().changeType(
+                        ApplicationDeploymentDescriptionType.type);
+            }
+            btnHostAdvanceOptions.setVisible(hostDescription.getType() instanceof GlobusHostType);
+            String hostAddress = hostDescription.getType().getHostAddress();
+            boolean isLocal = isLocalAddress(hostAddress);
+            btnExecBrowse.setVisible(isLocal);
+            btnTmpDirBrowse.setVisible(isLocal);
+        }
+        updateDialogStatus();
     }
 
 	private boolean isLocalAddress(String hostAddress) {
 		return hostAddress.equalsIgnoreCase("localhost") || hostAddress.equalsIgnoreCase("127.0.0.1");
-	}
-
-    private void updateHostName() {
-        if (cmbHostName.getSelectedItem() != null) {
-            setHostName(cmbHostName.getSelectedItem().toString());
-        }
-    }
-
-    @Override
-    public void actionPerformed(ActionEvent e) {
-        if (e.getSource() == cmbHostName) {
-            updateHostName();
-        }
-        if (e.getSource() == txtExecPath) {
-            setExecutablePath(txtExecPath.getText());
-        }
-        if (e.getSource() == txtTempDir) {
-            setTempDir(txtTempDir.getText());
-        }
-    }
-
-    public AiravataRegistry getRegistry() {
-        return registry;
-    }
-
-    public void setRegistry(AiravataRegistry registry) {
-        this.registry = registry;
+	}
+
+    private void updateHostName() {
+        if (cmbHostName.getSelectedItem() != null) {
+            setHostName(cmbHostName.getSelectedItem().toString());
+        }
+    }
+
+    public void actionPerformed(ActionEvent e) {
+        if (e.getSource() == cmbHostName) {
+            updateHostName();
+        }
+        if (e.getSource() == txtExecPath) {
+            setExecutablePath(txtExecPath.getText());
+        }
+        if (e.getSource() == txtTempDir) {
+            setTempDir(txtTempDir.getText());
+        }
+    }
+
+    public AiravataRegistry2 getRegistry() {
+        return registry;
+    }
+
+    public void setRegistry(AiravataRegistry2 registry) {
+        this.registry = registry;
     }
 
 	public boolean isNewDescriptor() {
@@ -574,7 +565,7 @@ public class HostDeploymentDialog extend
 	public HostDeployment execute() throws RegistryException{
 		open();
 		if (isApplicationDescCreated()){
-			return new HostDeployment(getRegistry().getHostDescription(getHostName()),getShellApplicationDescription());
+			return new HostDeployment(getRegistry().getHostDescriptor(getHostName()),getShellApplicationDescription());
 		}
 		return null;
 	}
@@ -607,4 +598,4 @@ public class HostDeploymentDialog extend
 		}
 	}
 	
-}
+}

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDescriptionDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDescriptionDialog.java?rev=1382170&r1=1382169&r2=1382170&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDescriptionDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDescriptionDialog.java Fri Sep  7 20:53:09 2012
@@ -40,7 +40,7 @@ import javax.swing.SwingConstants;
 import org.apache.airavata.common.registry.api.exception.RegistryException;
 import org.apache.airavata.common.utils.SwingUtil;
 import org.apache.airavata.commons.gfac.type.HostDescription;
-import org.apache.airavata.registry.api.AiravataRegistry;
+import org.apache.airavata.registry.api.AiravataRegistry2;
 import org.apache.airavata.schemas.gfac.GlobusHostType;
 import org.apache.airavata.schemas.gfac.HostDescriptionType;
 import org.apache.airavata.xbaya.ui.widgets.GridPanel;
@@ -63,7 +63,7 @@ public class HostDescriptionDialog exten
 
     private boolean hostCreated = false;
 
-    private AiravataRegistry registry;
+    private AiravataRegistry2 registry;
 
 	private XBayaLabel globusGateKeeperLabel;
 
@@ -92,14 +92,17 @@ public class HostDescriptionDialog exten
 	private static final String REMOTE_PROTOCOL_STR_HADOOP="Hadoop";
 	
     
-    public HostDescriptionDialog(AiravataRegistry registry) {
+    public HostDescriptionDialog(AiravataRegistry2 registry) {
     	this(registry,true,null);
     }
-    
+
     /**
-     * @param engine XBaya workflow engine
+     *
+     * @param registry
+     * @param newHost
+     * @param originalHostDescription
      */
-    public HostDescriptionDialog(AiravataRegistry registry, boolean newHost, HostDescription originalHostDescription) {
+    public HostDescriptionDialog(AiravataRegistry2 registry, boolean newHost, HostDescription originalHostDescription) {
         setNewHost(newHost);
         setOriginalHostDescription(originalHostDescription);
         addWindowListener(new WindowAdapter() {
@@ -198,7 +201,6 @@ public class HostDescriptionDialog exten
         pnlResourceProtocolSelection.add(cmbResourceProtocol);
         pnlResourceProtocolSelection.layout(1, 2, 0, 1);
         cmbResourceProtocol.addActionListener(new ActionListener() {
-            @Override
             public void actionPerformed(ActionEvent arg0) {
                 updateRemoteProtocolTypeAndControls();
             }
@@ -346,12 +348,7 @@ public class HostDescriptionDialog exten
 				throw new Exception("Id of the host cannot be empty!!!");
 			}
 			HostDescription hostDescription2 = null;
-			try {
-				hostDescription2 = getRegistry().getHostDescription(
-						hostName);
-			} catch (RegistryException e) {
-				throw e;
-			}
+		    hostDescription2 = getRegistry().getHostDescriptor(hostName);
 			if (hostDescription2 != null) {
 				throw new Exception(
 						"Host descriptor with the given id already exists!!!");
@@ -400,19 +397,15 @@ public class HostDescriptionDialog exten
 
     public void saveHostDescription() {
         HostDescription desc = getHostDescription();
-		try {
-			getRegistry().saveHostDescription(desc);
-			setHostCreated(true);
-		} catch (RegistryException e) {
-			setError(e.getLocalizedMessage());
-		}
+        getRegistry().addHostDescriptor(desc);
+        setHostCreated(true);
     }
 
-    public AiravataRegistry getRegistry() {
+    public AiravataRegistry2 getRegistry() {
         return registry;
     }
 
-    public void setRegistry(AiravataRegistry registry) {
+    public void setRegistry(AiravataRegistry2 registry) {
         this.registry = registry;
     }
     String previousProtocol=null;

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/NewJCRRegistryUserDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/NewJCRRegistryUserDialog.java?rev=1382170&r1=1382169&r2=1382170&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/NewJCRRegistryUserDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/NewJCRRegistryUserDialog.java Fri Sep  7 20:53:09 2012
@@ -53,6 +53,8 @@ public class NewJCRRegistryUserDialog {
 
     private JPasswordField passwordTextField;
 
+    private String gatewayName = "default";
+
     private String username;
 
     private URL url;
@@ -110,19 +112,7 @@ public class NewJCRRegistryUserDialog {
         String status = updateStatus();
         if (status == null) {
             try {
-                JCRComponentRegistry registry = new JCRComponentRegistry(getUrl().toURI(), "anonymous", "");
-                registry.getUserManager().createUser(getUsername(), getPassword());
-                hide();
-                setUserCreated(true);
-            } catch (URISyntaxException e) {
-                e.printStackTrace();
-                engine.getGUI().getErrorWindow().error(e.getMessage());
-            } catch (AuthorizableExistsException e) {
-                e.printStackTrace();
-                engine.getGUI().getErrorWindow().error(e.getMessage());
-            } catch (RepositoryException e) {
-                e.printStackTrace();
-                engine.getGUI().getErrorWindow().error(e.getMessage());
+                JCRComponentRegistry registry = new JCRComponentRegistry(getUsername(),getPassword());
             } catch (RegistryException e) {
                 e.printStackTrace();
                 engine.getGUI().getErrorWindow().error(e.getMessage());
@@ -287,4 +277,12 @@ public class NewJCRRegistryUserDialog {
     public void setUserCreated(boolean userCreated) {
         this.userCreated = userCreated;
     }
+
+    public String getGatewayName() {
+        return gatewayName;
+    }
+
+    public void setGatewayName(String gatewayName) {
+        this.gatewayName = gatewayName;
+    }
 }

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/RegistryLoaderWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/RegistryLoaderWindow.java?rev=1382170&r1=1382169&r2=1382170&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/RegistryLoaderWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/RegistryLoaderWindow.java Fri Sep  7 20:53:09 2012
@@ -93,8 +93,8 @@ public class RegistryLoaderWindow {
                 try {
                     RegistryAccesser registryAccesser = new RegistryAccesser(RegistryLoaderWindow.this.engine);
 
-                    final Map<QName, Node> resultList = registryAccesser.getOGCEWorkflowTemplateList();
-                    final Set<QName> keys = resultList.keySet();
+                    final Map<String, String> resultList = registryAccesser.getOGCEWorkflowTemplateList();
+                    final Set<String> keys = resultList.keySet();
 
                     SwingUtilities.invokeLater(new Runnable() {
                         public void run() {
@@ -105,8 +105,8 @@ public class RegistryLoaderWindow {
                                  */
                             } else {
                                 Vector<RegistrySearchResult> results = new Vector<RegistrySearchResult>();
-                                Node val = null;
-                                for (QName key : keys) {
+                                String val = null;
+                                for (String key : keys) {
                                     val = resultList.get(key);
                                     results.add(new RegistrySearchResult(val));
                                 }

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/views/JCRBrowserPanel.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/views/JCRBrowserPanel.java?rev=1382170&r1=1382169&r2=1382170&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/views/JCRBrowserPanel.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/views/JCRBrowserPanel.java Fri Sep  7 20:53:09 2012
@@ -42,7 +42,7 @@ import javax.swing.KeyStroke;
 import javax.swing.border.EmptyBorder;
 import javax.swing.tree.DefaultTreeModel;
 
-import org.apache.airavata.registry.api.AiravataRegistry;
+import org.apache.airavata.registry.api.AiravataRegistry2;
 import org.apache.airavata.workflow.model.component.registry.JCRComponentRegistry;
 import org.apache.airavata.xbaya.XBayaEngine;
 import org.apache.airavata.xbaya.registrybrowser.nodes.AbstractAiravataTreeNode;
@@ -192,7 +192,7 @@ public class JCRBrowserPanel extends JPa
         }
     }
 
-    private AiravataRegistry getJCRRegistry() {
+    private AiravataRegistry2 getJCRRegistry() {
         try {
             return getEngine().getConfiguration().getJcrComponentRegistry().getRegistry();
         } catch (Exception e) {
@@ -201,12 +201,11 @@ public class JCRBrowserPanel extends JPa
         }
     }
 
-    @Override
     public void update(Observable observable, Object o) {
         if (getEngine().getConfiguration() == observable) {
             if (o instanceof JCRComponentRegistry) {
                 resetModel();
-            } else if (o instanceof AiravataRegistry) {
+            } else if (o instanceof AiravataRegistry2) {
                 resetModel();
             }
         }



Mime
View raw message