airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chath...@apache.org
Subject svn commit: r1412246 [4/4] - in /airavata/trunk: ./ modules/airavata-client/ modules/airavata-client/src/main/java/org/apache/airavata/client/ modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ modules/distribution/ modules/distribu...
Date Wed, 21 Nov 2012 19:39:59 GMT
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DeploymentDescriptionDialog.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DeploymentDescriptionDialog.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DeploymentDescriptionDialog.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DeploymentDescriptionDialog.java Wed Nov 21 19:39:38 2012
@@ -45,11 +45,13 @@ import javax.swing.table.DefaultTableMod
 import javax.swing.table.TableColumn;
 import javax.xml.namespace.QName;
 
+import org.apache.airavata.client.api.AiravataAPI;
+import org.apache.airavata.client.api.AiravataAPIInvocationException;
 import org.apache.airavata.registry.api.exception.RegistryException;
 import org.apache.airavata.common.utils.SwingUtil;
 import org.apache.airavata.commons.gfac.type.ApplicationDeploymentDescription;
 import org.apache.airavata.commons.gfac.type.ServiceDescription;
-import org.apache.airavata.registry.api.AiravataRegistry2;
+//import org.apache.airavata.registry.api.AiravataRegistry2;
 import org.apache.airavata.registry.api.exception.gateway.DescriptorDoesNotExistsException;
 import org.apache.airavata.registry.api.exception.gateway.MalformedDescriptorException;
 import org.apache.airavata.schemas.gfac.ApplicationDeploymentDescriptionType;
@@ -79,7 +81,7 @@ public class DeploymentDescriptionDialog
     private JButton okButton;
     private JButton btnDeleteParameter;
     private DefaultTableModel defaultTableModel;
-    private AiravataRegistry2 registry;
+    private AiravataAPI registry;
     private boolean newDescription;
     private boolean ignoreTableChanges=false;
 	private JCheckBox chkForceFileStagingToWorkDir;
@@ -102,7 +104,7 @@ public class DeploymentDescriptionDialog
         }
     }
 
-    public DeploymentDescriptionDialog(JFrame parent, AiravataRegistry2 registry) {
+    public DeploymentDescriptionDialog(JFrame parent, AiravataAPI registry) {
     	this(registry, true, null, parent);
     }
 
@@ -113,7 +115,7 @@ public class DeploymentDescriptionDialog
     /**
      * Create the dialog.
      */
-    public DeploymentDescriptionDialog(AiravataRegistry2 registry, boolean newDescription, ServiceDescription serviceDescription, JFrame parent) {
+    public DeploymentDescriptionDialog(AiravataAPI registry, boolean newDescription, ServiceDescription serviceDescription, JFrame parent) {
         super(parent);
         setNewDescription(newDescription);
     	this.setOrginalServiceDescription(serviceDescription);
@@ -242,7 +244,7 @@ public class DeploymentDescriptionDialog
                                 saveServiceDescription(true);
                             }
 							close();
-						} catch (RegistryException e1) {
+						} catch (AiravataAPIInvocationException e1) {
 							e1.printStackTrace();
 						}
                     }
@@ -329,7 +331,7 @@ public class DeploymentDescriptionDialog
 						getDeployments().put(hostType.getHostName(), deployDesc);
 						updateDeploymentTable();
 					}
-				} catch (RegistryException e1) {
+				} catch (AiravataAPIInvocationException e1) {
 					setError(e1.getLocalizedMessage());
 					e1.printStackTrace();
 				}
@@ -476,9 +478,9 @@ public class DeploymentDescriptionDialog
     	updateIODataTable(descType);
         getDeployments().clear();
         try {
-			Map<String, ApplicationDeploymentDescription> descs = getRegistry().getApplicationDescriptors(descType.getName());
+			Map<String, ApplicationDeploymentDescription> descs = getRegistry().getApplicationManager().getApplicationDescriptors(descType.getName());
 			for (String hostDescName : descs.keySet()) {
-			    getDeployments().put(hostDescName, new HostDeployment(getRegistry().getHostDescriptor(hostDescName), descs.get(hostDescName)));
+			    getDeployments().put(hostDescName, new HostDeployment(getRegistry().getApplicationManager().getHostDescription(hostDescName), descs.get(hostDescName)));
 			}
 
 			updateDeploymentTable();
@@ -495,13 +497,7 @@ public class DeploymentDescriptionDialog
 			chkForceFileStagingToWorkDir.setSelected(selected);
 			setForceFileStagingToWorkDir(selected);
 			ignoreTableChanges=false;
-		} catch (MalformedDescriptorException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (DescriptorDoesNotExistsException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (RegistryException e) {
+		} catch (AiravataAPIInvocationException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
@@ -611,13 +607,13 @@ public class DeploymentDescriptionDialog
             throw new Exception("Name of the application cannot be empty!!!");
         }
         ServiceDescription serviceDescription2 = null;
-        serviceDescription2 = getRegistry().getServiceDescriptor(getServiceName());
+        serviceDescription2 = getRegistry().getApplicationManager().getServiceDescription(getServiceName());
         if (isNewDescription() && serviceDescription2 != null) {
             throw new Exception("Service descriptor with the given name already exists!!!");
         }
     }
 
-    public void saveServiceDescription(boolean update) throws RegistryException {
+    public void saveServiceDescription(boolean update) throws AiravataAPIInvocationException {
         List<InputParameterType> inputParameters = new ArrayList<InputParameterType>();
         List<OutputParameterType> outputParameters = new ArrayList<OutputParameterType>();
 
@@ -650,24 +646,24 @@ public class DeploymentDescriptionDialog
         getServiceDescriptionType().setInputParametersArray(inputParameters.toArray(new InputParameterType[] {}));
         getServiceDescriptionType().setOutputParametersArray(outputParameters.toArray(new OutputParameterType[] {}));
         if (update) {
-            getRegistry().updateServiceDescriptor(getServiceDescription());
+            getRegistry().getApplicationManager().updateServiceDescriptor(getServiceDescription());
         } else {
-            getRegistry().addServiceDescriptor(getServiceDescription());
+            getRegistry().getApplicationManager().saveServiceDescription(getServiceDescription());
         }
         if (!isNewDescription()) {
-            Map<String, ApplicationDeploymentDescription> descs = getRegistry().getApplicationDescriptors(getServiceName());
+            Map<String, ApplicationDeploymentDescription> descs = getRegistry().getApplicationManager().getApplicationDescriptors(getServiceName());
             for (String hostDescName : descs.keySet()) {
-                getRegistry().removeApplicationDescriptor(getServiceName(), hostDescName, descs.get(hostDescName).getType().getApplicationName().getStringValue());
+                getRegistry().getApplicationManager().deleteDeploymentDescription(getServiceName(), hostDescName, descs.get(hostDescName).getType().getApplicationName().getStringValue());
             }
         }
         for (String hostName : getDeployments().keySet()) {
-            getRegistry().addApplicationDescriptor(getServiceName(), hostName, getDeployments().get(hostName).getApplicationDescription());
+            getRegistry().getApplicationManager().saveDeploymentDescription(getServiceName(), hostName, getDeployments().get(hostName).getApplicationDescription());
         }
         setServiceCreated(true);
         JOptionPane.showMessageDialog(this, "Application '" + getServiceName() + "' is registered Successfully !");
     }
 
-    public void saveServiceDescription() throws RegistryException {
+    public void saveServiceDescription() throws AiravataAPIInvocationException {
         List<InputParameterType> inputParameters = new ArrayList<InputParameterType>();
         List<OutputParameterType> outputParameters = new ArrayList<OutputParameterType>();
 
@@ -699,15 +695,15 @@ public class DeploymentDescriptionDialog
         }
         getServiceDescriptionType().setInputParametersArray(inputParameters.toArray(new InputParameterType[] {}));
         getServiceDescriptionType().setOutputParametersArray(outputParameters.toArray(new OutputParameterType[] {}));
-        getRegistry().addServiceDescriptor(getServiceDescription());
+        getRegistry().getApplicationManager().saveServiceDescription(getServiceDescription());
         if (!isNewDescription()) {
-            Map<String, ApplicationDeploymentDescription> descs = getRegistry().getApplicationDescriptors(getServiceName());
+            Map<String, ApplicationDeploymentDescription> descs = getRegistry().getApplicationManager().getApplicationDescriptors(getServiceName());
             for (String hostDescName : descs.keySet()) {
-                getRegistry().removeApplicationDescriptor(getServiceName(), hostDescName, descs.get(hostDescName).getType().getApplicationName().getStringValue());
+                getRegistry().getApplicationManager().deleteDeploymentDescription(getServiceName(), hostDescName, descs.get(hostDescName).getType().getApplicationName().getStringValue());
             }
         }
         for (String hostName : getDeployments().keySet()) {
-            getRegistry().addApplicationDescriptor(getServiceName(), hostName, getDeployments().get(hostName).getApplicationDescription());
+            getRegistry().getApplicationManager().saveDeploymentDescription(getServiceName(), hostName, getDeployments().get(hostName).getApplicationDescription());
         }
         setServiceCreated(true);
         JOptionPane.showMessageDialog(this, "Application '" + getServiceName() + "' is registered Successfully !");
@@ -751,11 +747,11 @@ public class DeploymentDescriptionDialog
 		}
     }
 
-    public AiravataRegistry2 getRegistry() {
+    public AiravataAPI getRegistry() {
         return registry;
     }
 
-    public void setRegistry(AiravataRegistry2 registry) {
+    public void setRegistry(AiravataAPI registry) {
         this.registry = registry;
     }
 
@@ -807,7 +803,7 @@ public class DeploymentDescriptionDialog
 				getDeployments().put(deployDesc.getHostDescription().getType().getHostName(), deployDesc);
 				updateDeploymentTable();
 			}
-		} catch (RegistryException e1) {
+		} catch (AiravataAPIInvocationException e1) {
 			setError(e1.getLocalizedMessage());
 			e1.printStackTrace();
 		}

Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DescriptorEditorDialog.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DescriptorEditorDialog.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DescriptorEditorDialog.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DescriptorEditorDialog.java Wed Nov 21 19:39:38 2012
@@ -43,12 +43,14 @@ import javax.swing.JScrollPane;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 
+import org.apache.airavata.client.api.AiravataAPI;
+import org.apache.airavata.client.api.AiravataAPIInvocationException;
 import org.apache.airavata.registry.api.exception.RegistryException;
 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.commons.gfac.type.ServiceDescription;
-import org.apache.airavata.registry.api.AiravataRegistry2;
+//import org.apache.airavata.registry.api.AiravataRegistry2;
 import org.apache.airavata.registry.api.exception.gateway.DescriptorDoesNotExistsException;
 import org.apache.airavata.registry.api.exception.gateway.MalformedDescriptorException;
 import org.apache.airavata.xbaya.XBayaEngine;
@@ -64,7 +66,7 @@ public class DescriptorEditorDialog exte
 
     private XBayaDialog dialog;
 
-    private AiravataRegistry2 registry;
+    private AiravataAPI registry;
 
 	private JList descriptorList;
 
@@ -87,7 +89,7 @@ public class DescriptorEditorDialog exte
      */
     public DescriptorEditorDialog(XBayaEngine engine,DescriptorType descriptorType) {
         this.engine = engine;
-        setRegistry(engine.getConfiguration().getJcrComponentRegistry().getRegistry());
+        setRegistry(engine.getConfiguration().getJcrComponentRegistry().getAiravataAPI());
         this.descriptorType=descriptorType;
         initGUI();
         
@@ -118,7 +120,7 @@ public class DescriptorEditorDialog exte
     			if (e.getClickCount()==2){
     				try {
 						editDescriptor();
-    				} catch (RegistryException e1) {
+    				} catch (AiravataAPIInvocationException e1) {
     					engine.getGUI().getErrorWindow().error("Error while editing descriptor", e1);
     					e1.printStackTrace();
     				}
@@ -135,7 +137,7 @@ public class DescriptorEditorDialog exte
             public void actionPerformed(ActionEvent e) {
             	try {
 					newDescriptor();
-        		} catch (RegistryException e1) {
+        		} catch (AiravataAPIInvocationException e1) {
         			engine.getGUI().getErrorWindow().error("Error while creating descriptors", e1);
         			e1.printStackTrace();
         		}
@@ -154,7 +156,7 @@ public class DescriptorEditorDialog exte
             public void actionPerformed(ActionEvent e) {
             	try {
 					editDescriptor();
-        		} catch (RegistryException e1) {
+        		} catch (AiravataAPIInvocationException e1) {
         			engine.getGUI().getErrorWindow().error("Error while editing descriptor", e1);
         			e1.printStackTrace();
         		}
@@ -166,7 +168,7 @@ public class DescriptorEditorDialog exte
             public void actionPerformed(ActionEvent e) {
             	try {
 					deleteDescriptor();
-        		} catch (RegistryException e1) {
+        		} catch (AiravataAPIInvocationException e1) {
         			engine.getGUI().getErrorWindow().error("Error while removing descriptor", e1);
         			e1.printStackTrace();
         		}
@@ -204,17 +206,17 @@ public class DescriptorEditorDialog exte
         removeButton.setEnabled(false);
         try {
 			loadDescriptors();
-		} catch (RegistryException e1) {
+		} catch (AiravataAPIInvocationException e1) {
 			engine.getGUI().getErrorWindow().error("Error while loading descriptors", e1);
 			e1.printStackTrace();
 		}
     }
     
-    private void editDescriptor() throws MalformedDescriptorException, RegistryException {
+    private void editDescriptor() throws AiravataAPIInvocationException {
     	switch (descriptorType){
 	    	case HOST:
 	    		HostDescription h = (HostDescription) getSelected();
-	    		HostDescriptionDialog hostDescriptionDialog = new HostDescriptionDialog(engine.getConfiguration().getJcrComponentRegistry().getRegistry(),false,h, null);
+	    		HostDescriptionDialog hostDescriptionDialog = new HostDescriptionDialog(engine.getConfiguration().getJcrComponentRegistry().getAiravataAPI(),false,h, null);
 	    		hostDescriptionDialog.setLocationRelativeTo(this.engine.getGUI().getFrame());
 	    		hostDescriptionDialog.open();
 	    		if (hostDescriptionDialog.isHostCreated()) {
@@ -244,10 +246,10 @@ public class DescriptorEditorDialog exte
     	}
 	}
 
-    private void newDescriptor() throws MalformedDescriptorException, RegistryException {
+    private void newDescriptor() throws AiravataAPIInvocationException {
     	switch (descriptorType){
 	    	case HOST:
-	    		HostDescriptionDialog hostDescriptionDialog = new HostDescriptionDialog(engine.getConfiguration().getJcrComponentRegistry().getRegistry(), null);
+	    		HostDescriptionDialog hostDescriptionDialog = new HostDescriptionDialog(engine.getConfiguration().getJcrComponentRegistry().getAiravataAPI(), null);
 	    		hostDescriptionDialog.open();
 	    		if (hostDescriptionDialog.isHostCreated()){
 	    			loadDescriptors();
@@ -280,7 +282,7 @@ public class DescriptorEditorDialog exte
 	protected boolean askQuestion(String title, String question) {
         return JOptionPane.showConfirmDialog(null, question, title, JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION;
     }
-    private boolean deleteDescriptor() throws DescriptorDoesNotExistsException, RegistryException{
+    private boolean deleteDescriptor() throws AiravataAPIInvocationException{
     	String title=null;
     	String question=null;
     	switch (descriptorType){
@@ -309,16 +311,16 @@ public class DescriptorEditorDialog exte
             	switch (descriptorType){
 	    	    	case HOST:
 	    	    		HostDescription h = (HostDescription) getSelected();
-	    	        	getRegistry().removeHostDescriptor(h.getType().getHostName());
+	    	        	getRegistry().getApplicationManager().deleteHostDescription(h.getType().getHostName());
 	    	    		break;
 	    	    	case SERVICE:
 	    	        	ServiceDescription d = (ServiceDescription) getSelected();
-	    	        	getRegistry().removeServiceDescriptor(d.getType().getName());
+	    	        	getRegistry().getApplicationManager().deleteServiceDescription(d.getType().getName());
 	    	    		break;
 	    	    	case APPLICATION:
 	    	    		ApplicationDeploymentDescription a = (ApplicationDeploymentDescription) getSelected();
 	    	    		String[] s = dlist.get(a).split("\\$");
-	    	        	getRegistry().removeApplicationDescriptor(s[0], s[1], a.getType().getApplicationName().getStringValue());
+	    	        	getRegistry().getApplicationManager().deleteDeploymentDescription(s[0], s[1], a.getType().getApplicationName().getStringValue());
 	    	    		break;
             	}
 				loadDescriptors();
@@ -326,7 +328,7 @@ public class DescriptorEditorDialog exte
         return true;
     }
     
-    private void loadDescriptors() throws MalformedDescriptorException, RegistryException {
+    private void loadDescriptors() throws AiravataAPIInvocationException {
     	try {
     		//allow the registry cache to update
 			Thread.sleep(500);
@@ -337,13 +339,13 @@ public class DescriptorEditorDialog exte
     		List<?> descriptors=null;
 			switch (descriptorType){
 	    	case HOST:
-	    		descriptors = getRegistry().getHostDescriptors();
+	    		descriptors = getRegistry().getApplicationManager().getAllHostDescriptions();
 	    		break;
 	    	case SERVICE:
-	    		descriptors = getRegistry().getServiceDescriptors();
+	    		descriptors = getRegistry().getApplicationManager().getAllServiceDescriptions();
 	    		break;
 	    	case APPLICATION:
-	    		Map<String,ApplicationDeploymentDescription> temp =getRegistry().getApplicationDescriptors(null);
+	    		Map<String,ApplicationDeploymentDescription> temp =getRegistry().getApplicationManager().getApplicationDescriptors(null);
                 for(String value:temp.keySet()) {
                     dlist.put(temp.get(value), value);
 
@@ -386,11 +388,11 @@ public class DescriptorEditorDialog exte
 		}
     	
     }
-    public AiravataRegistry2 getRegistry() {
+    public AiravataAPI getRegistry() {
         return registry;
     }
 
-    public void setRegistry(AiravataRegistry2 registry) {
+    public void setRegistry(AiravataAPI registry) {
         this.registry = registry;
     }
 }
\ No newline at end of file

Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DescriptorListDialog.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DescriptorListDialog.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DescriptorListDialog.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DescriptorListDialog.java Wed Nov 21 19:39:38 2012
@@ -42,12 +42,14 @@ import javax.swing.JScrollPane;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 
+import org.apache.airavata.client.api.AiravataAPI;
+import org.apache.airavata.client.api.AiravataAPIInvocationException;
 import org.apache.airavata.registry.api.exception.RegistryException;
 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.commons.gfac.type.ServiceDescription;
-import org.apache.airavata.registry.api.AiravataRegistry2;
+//import org.apache.airavata.registry.api.AiravataRegistry2;
 import org.apache.airavata.xbaya.registrybrowser.nodes.JCRBrowserIcons;
 import org.apache.airavata.xbaya.ui.XBayaGUI;
 import org.apache.airavata.xbaya.ui.dialogs.XBayaDialog;
@@ -61,7 +63,7 @@ public class DescriptorListDialog extend
 
     private XBayaDialog dialog;
 
-    private AiravataRegistry2 registry;
+    private AiravataAPI registry;
 
 	private JList descriptorList;
 
@@ -78,11 +80,13 @@ public class DescriptorListDialog extend
 	};
 
 	public DescriptorType descriptorType;
-	
+
     /**
-     * @param engine XBaya workflow engine
+     *
+     * @param registry
+     * @param descriptorType
      */
-    public DescriptorListDialog(AiravataRegistry2 registry, DescriptorType descriptorType) {
+    public DescriptorListDialog(AiravataAPI registry, DescriptorType descriptorType) {
         setRegistry(registry);
         this.descriptorType=descriptorType;
         initGUI();
@@ -192,20 +196,20 @@ public class DescriptorListDialog extend
     		List<?> descriptors=null;
 			switch (descriptorType){
 	    	case HOST:
-	    		descriptors = getRegistry().getHostDescriptors();
+	    		descriptors = getRegistry().getApplicationManager().getAllHostDescriptions();
 	    		break;
 	    	case SERVICE:
-	    		descriptors = getRegistry().getServiceDescriptors();
+	    		descriptors = getRegistry().getApplicationManager().getAllServiceDescriptions();
 	    		break;
 	    	case APPLICATION:
-	    		dlist=getRegistry().getApplicationDescriptors();
+	    		dlist=getRegistry().getApplicationManager().getAllDeploymentDescriptions();
 	    		descriptors =Arrays.asList(dlist.values().toArray(new ApplicationDeploymentDescription[]{})); 
 	    		break;
     		}
     		for (Object d : descriptors) {
 				((DefaultListModel)descriptorList.getModel()).addElement(d);
 			}
-		} catch (RegistryException e) {
+		} catch (AiravataAPIInvocationException e) {
 			xbayaGUI.getErrorWindow().error(e);
 		}
 	}
@@ -240,11 +244,11 @@ public class DescriptorListDialog extend
 		}
     	
     }
-    public AiravataRegistry2 getRegistry() {
+    public AiravataAPI getRegistry() {
         return registry;
     }
 
-    public void setRegistry(AiravataRegistry2 registry) {
+    public void setRegistry(AiravataAPI registry) {
         this.registry = registry;
     }
 

Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDeploymentDialog.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDeploymentDialog.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDeploymentDialog.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDeploymentDialog.java Wed Nov 21 19:39:38 2012
@@ -45,11 +45,13 @@ import javax.swing.JTextField;
 import javax.swing.ProgressMonitor;
 import javax.swing.SwingConstants;
 
+import org.apache.airavata.client.api.AiravataAPI;
+import org.apache.airavata.client.api.AiravataAPIInvocationException;
 import org.apache.airavata.registry.api.exception.RegistryException;
 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.AiravataRegistry2;
+//import org.apache.airavata.registry.api.AiravataRegistry2;
 import org.apache.airavata.registry.api.exception.gateway.DescriptorDoesNotExistsException;
 import org.apache.airavata.registry.api.exception.gateway.MalformedDescriptorException;
 import org.apache.airavata.schemas.gfac.ApplicationDeploymentDescriptionType;
@@ -70,7 +72,7 @@ public class HostDeploymentDialog extend
     private XBayaTextField txtExecPath;
     private XBayaTextField txtTempDir;
 
-    private AiravataRegistry2 registry;
+    private AiravataAPI registry;
     private ApplicationDeploymentDescription shellApplicationDescription;
     private JLabel lblError;
     private boolean applcationDescCreated = false;
@@ -90,7 +92,7 @@ public class HostDeploymentDialog extend
     /**
      * Create the dialog.
      */
-    public HostDeploymentDialog(AiravataRegistry2 registry, boolean newDescriptor, ApplicationDeploymentDescription originalDeploymentDescription, String originalHost, List<String> existingHostList) {
+    public HostDeploymentDialog(AiravataAPI registry, boolean newDescriptor, ApplicationDeploymentDescription originalDeploymentDescription, String originalHost, List<String> existingHostList) {
     	setNewDescriptor(newDescriptor);
     	setOriginalDeploymentDescription(originalDeploymentDescription);
     	setOriginalHost(originalHost);
@@ -371,7 +373,7 @@ public class HostDeploymentDialog extend
         cmbHostName.removeAllItems();
         setHostName(null);
         try {
-            List<HostDescription> hostDescriptions = getRegistry().getHostDescriptors();
+            List<HostDescription> hostDescriptions = getRegistry().getApplicationManager().getAllHostDescriptions();
             for (HostDescription hostDescription : hostDescriptions) {
                 if (!isNewDescriptor() || !getExistingHostList().contains(hostDescription.getType().getHostName())) {
 					cmbHostName.addItem(hostDescription.getType().getHostName());
@@ -493,7 +495,7 @@ public class HostDeploymentDialog extend
         if (hostName != null) {
             HostDescription hostDescription;
             try {
-				hostDescription = registry.getHostDescriptor(hostName);
+				hostDescription = registry.getApplicationManager().getHostDescription(hostName);
 				if (hostDescription.getType() instanceof GlobusHostType) {
 				    getShellApplicationDescription().getType().changeType(
 				            GramApplicationDeploymentType.type);
@@ -506,13 +508,9 @@ public class HostDeploymentDialog extend
 				boolean isLocal = isLocalAddress(hostAddress);
 				btnExecBrowse.setVisible(isLocal);
 				btnTmpDirBrowse.setVisible(isLocal);
-			} catch (DescriptorDoesNotExistsException e) {
-				e.printStackTrace();
-			} catch (MalformedDescriptorException e) {
-				e.printStackTrace();
-			} catch (RegistryException e) {
-				e.printStackTrace();
-			}
+			}  catch (AiravataAPIInvocationException e) {
+                e.printStackTrace();
+            }
         }
         updateDialogStatus();
     }
@@ -539,11 +537,11 @@ public class HostDeploymentDialog extend
         }
     }
 
-    public AiravataRegistry2 getRegistry() {
+    public AiravataAPI getRegistry() {
         return registry;
     }
 
-    public void setRegistry(AiravataRegistry2 registry) {
+    public void setRegistry(AiravataAPI registry) {
         this.registry = registry;
     }
 
@@ -572,10 +570,10 @@ public class HostDeploymentDialog extend
 		this.originalHost = originalHost;
 	}
 	
-	public HostDeployment execute() throws RegistryException{
+	public HostDeployment execute() throws AiravataAPIInvocationException{
 		open();
 		if (isApplicationDescCreated()){
-			return new HostDeployment(getRegistry().getHostDescriptor(getHostName()),getShellApplicationDescription());
+			return new HostDeployment(getRegistry().getApplicationManager().getHostDescription(getHostName()),getShellApplicationDescription());
 		}
 		return null;
 	}

Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDescriptionDialog.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDescriptionDialog.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDescriptionDialog.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDescriptionDialog.java Wed Nov 21 19:39:38 2012
@@ -32,10 +32,12 @@ import java.awt.event.WindowEvent;
 
 import javax.swing.*;
 
+import org.apache.airavata.client.api.AiravataAPI;
+import org.apache.airavata.client.api.AiravataAPIInvocationException;
 import org.apache.airavata.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.AiravataRegistry2;
+//import org.apache.airavata.registry.api.AiravataRegistry2;
 import org.apache.airavata.registry.api.exception.gateway.DescriptorAlreadyExistsException;
 import org.apache.airavata.schemas.gfac.GlobusHostType;
 import org.apache.airavata.schemas.gfac.HostDescriptionType;
@@ -59,7 +61,7 @@ public class HostDescriptionDialog exten
 
     private boolean hostCreated = false;
 
-    private AiravataRegistry2 registry;
+    private AiravataAPI registry;
 
 	private XBayaLabel globusGateKeeperLabel;
 
@@ -88,7 +90,7 @@ public class HostDescriptionDialog exten
 	private static final String REMOTE_PROTOCOL_STR_HADOOP="Hadoop";
 	
     
-    public HostDescriptionDialog(AiravataRegistry2 registry, JFrame parent) {
+    public HostDescriptionDialog(AiravataAPI registry, JFrame parent) {
     	this(registry,true,null, parent);
     }
 
@@ -98,7 +100,7 @@ public class HostDescriptionDialog exten
      * @param newHost
      * @param originalHostDescription
      */
-    public HostDescriptionDialog(AiravataRegistry2 registry, boolean newHost, HostDescription originalHostDescription, JFrame parent) {
+    public HostDescriptionDialog(AiravataAPI registry, boolean newHost, HostDescription originalHostDescription, JFrame parent) {
         super(parent);
         setNewHost(newHost);
         setOriginalHostDescription(originalHostDescription);
@@ -347,7 +349,7 @@ public class HostDescriptionDialog exten
 				throw new Exception("Id of the host cannot be empty!!!");
 			}
 			HostDescription hostDescription2 = null;
-		    hostDescription2 = getRegistry().getHostDescriptor(hostName);
+		    hostDescription2 = getRegistry().getApplicationManager().getHostDescription(hostName);
 			if (hostDescription2 != null) {
 				throw new Exception(
 						"Host descriptor with the given id already exists!!!");
@@ -397,27 +399,24 @@ public class HostDescriptionDialog exten
     public void saveHostDescription() {
         HostDescription desc = getHostDescription();
         try {
-        	if (getRegistry().isHostDescriptorExists(desc.getType().getHostName())){
-        		getRegistry().updateHostDescriptor(desc);	
+        	if (getRegistry().getApplicationManager().isHostDescriptorExists(desc.getType().getHostName())){
+        		getRegistry().getApplicationManager().updateHostDescriptor(desc);
         	}else{
-        		getRegistry().addHostDescriptor(desc);
+        		getRegistry().getApplicationManager().saveHostDescription(desc);
         	}
 			setHostCreated(true);
-		} catch (DescriptorAlreadyExistsException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (RegistryException e) {
+		}  catch (AiravataAPIInvocationException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
 //		setHostCreated(false);
     }
 
-    public AiravataRegistry2 getRegistry() {
+    public AiravataAPI getRegistry() {
         return registry;
     }
 
-    public void setRegistry(AiravataRegistry2 registry) {
+    public void setRegistry(AiravataAPI registry) {
         this.registry = registry;
     }
     String previousProtocol=null;

Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ServiceDescriptionDialog.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ServiceDescriptionDialog.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ServiceDescriptionDialog.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ServiceDescriptionDialog.java Wed Nov 21 19:39:38 2012
@@ -61,10 +61,12 @@ import javax.swing.table.DefaultTableMod
 import javax.swing.table.TableColumn;
 import javax.xml.namespace.QName;
 
+import org.apache.airavata.client.api.AiravataAPI;
+import org.apache.airavata.client.api.AiravataAPIInvocationException;
 import org.apache.airavata.registry.api.exception.RegistryException;
 import org.apache.airavata.common.utils.SwingUtil;
 import org.apache.airavata.commons.gfac.type.ServiceDescription;
-import org.apache.airavata.registry.api.AiravataRegistry2;
+//import org.apache.airavata.registry.api.AiravataRegistry2;
 import org.apache.airavata.schemas.gfac.DataType;
 import org.apache.airavata.schemas.gfac.InputParameterType;
 import org.apache.airavata.schemas.gfac.OutputParameterType;
@@ -90,7 +92,7 @@ public class ServiceDescriptionDialog ex
     private JButton okButton;
     private JButton btnDeleteParameter;
     private DefaultTableModel defaultTableModel;
-    private AiravataRegistry2 registry;
+    private AiravataAPI registry;
     private boolean newDescription;
     private boolean ignoreTableChanges=false;
 	private JCheckBox chkForceFileStagingToWorkDir;
@@ -111,18 +113,18 @@ public class ServiceDescriptionDialog ex
         }
     }
 
-    public ServiceDescriptionDialog(AiravataRegistry2 registry) {
+    public ServiceDescriptionDialog(AiravataAPI registry) {
     	this(registry,true,null);
     }
     
-    public ServiceDescriptionDialog(AiravataRegistry2 registry, boolean newDescription, ServiceDescription serviceDescription) {
+    public ServiceDescriptionDialog(AiravataAPI registry, boolean newDescription, ServiceDescription serviceDescription) {
     	this(registry, newDescription, serviceDescription, true, null);
     }
     
     /**
      * Create the dialog.
      */
-    public ServiceDescriptionDialog(AiravataRegistry2 registry, boolean newDescription, ServiceDescription serviceDescription, boolean serviceDescriptionMode, String suggestedNamePrefix) {
+    public ServiceDescriptionDialog(AiravataAPI registry, boolean newDescription, ServiceDescription serviceDescription, boolean serviceDescriptionMode, String suggestedNamePrefix) {
     	setNewDescription(newDescription);
     	this.setOrginalServiceDescription(serviceDescription);
     	setServiceDescriptionMode(serviceDescriptionMode);
@@ -147,7 +149,7 @@ public class ServiceDescriptionDialog ex
 						defaultName = baseName;
 					}
 					try {
-						while (getRegistry().isServiceDescriptorExists(defaultName)) {
+						while (getRegistry().getApplicationManager().isServiceDescriptorExists(defaultName)) {
 							defaultName = baseName + (++i);
 						}
 					} catch (Exception e) {
@@ -559,8 +561,8 @@ public class ServiceDescriptionDialog ex
 
         ServiceDescription serviceDescription2 = null;
         try {
-            serviceDescription2 = getRegistry().getServiceDescriptor(getServiceName());
-        } catch (RegistryException e) {
+            serviceDescription2 = getRegistry().getApplicationManager().getServiceDescription(getServiceName());
+        } catch (AiravataAPIInvocationException e) {
             if (e.getCause() instanceof PathNotFoundException) {
                 // non-existant name. just want we want
             } else {
@@ -606,13 +608,13 @@ public class ServiceDescriptionDialog ex
         getServiceDescriptionType().setOutputParametersArray(outputParameters.toArray(new OutputParameterType[] {}));
 
         try {
-			if (getRegistry().isServiceDescriptorExists(getServiceDescription().getType().getName())) {
-				getRegistry().updateServiceDescriptor(getServiceDescription());
+			if (getRegistry().getApplicationManager().isServiceDescriptorExists(getServiceDescription().getType().getName())) {
+				getRegistry().getApplicationManager().updateServiceDescriptor(getServiceDescription());
 			}else{
-				getRegistry().addServiceDescriptor(getServiceDescription());
+				getRegistry().getApplicationManager().saveServiceDescription(getServiceDescription());
 			}
 			setServiceCreated(true);
-		} catch (RegistryException e) {
+		} catch (AiravataAPIInvocationException e) {
 			e.printStackTrace();
 			setError(e.getMessage());
 		}
@@ -657,11 +659,11 @@ public class ServiceDescriptionDialog ex
 		}
     }
 
-    public AiravataRegistry2 getRegistry() {
+    public AiravataAPI getRegistry() {
         return registry;
     }
 
-    public void setRegistry(AiravataRegistry2 registry) {
+    public void setRegistry(AiravataAPI registry) {
         this.registry = registry;
     }
 

Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/dynamic/DynamicWorkflowRunnerWindow.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/dynamic/DynamicWorkflowRunnerWindow.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/dynamic/DynamicWorkflowRunnerWindow.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/dynamic/DynamicWorkflowRunnerWindow.java Wed Nov 21 19:39:38 2012
@@ -40,6 +40,7 @@ import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.xml.namespace.QName;
 
+import org.apache.airavata.client.api.AiravataAPIInvocationException;
 import org.apache.airavata.common.utils.StringUtil;
 import org.apache.airavata.common.utils.XMLUtil;
 import org.apache.airavata.workflow.model.exceptions.WorkflowException;
@@ -121,7 +122,11 @@ public class DynamicWorkflowRunnerWindow
     public void show() {
         this.workflow = this.engine.getGUI().getWorkflow();
         List<URI> urlList=null;
-		urlList = this.engine.getConfiguration().getJcrComponentRegistry().getRegistry().getGFacURIs();
+        try {
+            urlList = this.engine.getConfiguration().getJcrComponentRegistry().getAiravataAPI().getAiravataManager().getGFaCURLs();
+        } catch (AiravataAPIInvocationException e) {
+            e.printStackTrace();
+        }
         // When run xbaya continously urls can be repeating, so first remove everything and then add
         this.gfacUrlListField.removeAllItems();
         for (URI gfacUrl : urlList) {
@@ -351,7 +356,7 @@ public class DynamicWorkflowRunnerWindow
             @Override
             public void run() {
                 XBayaConfiguration conf = DynamicWorkflowRunnerWindow.this.engine.getConfiguration();
-                WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(engine.getGUI().getWorkflow(),topicString,conf.getMessageBoxURL(), conf.getBrokerURL(), conf.getJcrComponentRegistry().getRegistry(), conf, DynamicWorkflowRunnerWindow.this.engine.getGUI(), DynamicWorkflowRunnerWindow.this.engine.getMonitor());
+                WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(engine.getGUI().getWorkflow(),topicString,conf.getMessageBoxURL(), conf.getBrokerURL(), conf.getJcrComponentRegistry().getAiravataAPI(), conf, DynamicWorkflowRunnerWindow.this.engine.getGUI(), DynamicWorkflowRunnerWindow.this.engine.getMonitor());
                 workflowInterpreterConfiguration.setRunWithCrossProduct(isRunCrossProduct);
 
                 WorkflowInterpreter workflowInterpreter = new WorkflowInterpreter(

Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/JCRRegistryWindow.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/JCRRegistryWindow.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/JCRRegistryWindow.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/JCRRegistryWindow.java Wed Nov 21 19:39:38 2012
@@ -111,6 +111,7 @@ public class JCRRegistryWindow {
         configuration.setRegigstryUserName(username);
         configuration.setRegistryPassphrase(password);
         configuration.setRegistryURL(url);
+        configuration.setAiravataAPI(registry.getAiravataAPI());
         engine.updateXBayaConfigurationServiceURLs();
         hide();
 

Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/ExperimentMenu.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/ExperimentMenu.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/ExperimentMenu.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/ExperimentMenu.java Wed Nov 21 19:39:38 2012
@@ -28,6 +28,7 @@ import javax.swing.AbstractAction;
 import javax.swing.JMenu;
 import javax.swing.JMenuItem;
 
+import org.apache.airavata.client.api.AiravataAPIInvocationException;
 import org.apache.airavata.registry.api.exception.RegistryException;
 import org.apache.airavata.workflow.model.exceptions.WorkflowRuntimeException;
 import org.apache.airavata.xbaya.XBayaEngine;
@@ -99,7 +100,7 @@ public class ExperimentMenu {
                 try {
                     ExperimentMenu.this.registryAccesser.deleteOGCEWorkflow(ExperimentMenu.this.engine.getGUI().getWorkflow()
                             .getQname());
-                } catch (RegistryException e1) {
+                } catch (AiravataAPIInvocationException e1) {
                     throw new WorkflowRuntimeException(e1);
                 }
             }

Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/RegistryLoaderWindow.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/RegistryLoaderWindow.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/RegistryLoaderWindow.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/RegistryLoaderWindow.java Wed Nov 21 19:39:38 2012
@@ -35,6 +35,7 @@ import javax.swing.SwingUtilities;
 import javax.swing.border.EtchedBorder;
 import javax.swing.border.TitledBorder;
 
+import org.apache.airavata.client.api.AiravataAPIInvocationException;
 import org.apache.airavata.registry.api.exception.RegistryException;
 import org.apache.airavata.workflow.model.component.ComponentException;
 import org.apache.airavata.workflow.model.graph.GraphException;
@@ -126,7 +127,7 @@ public class RegistryLoaderWindow {
                 } catch (Error e) {
                     RegistryLoaderWindow.this.engine.getGUI().getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
                     hide();
-                } catch (RegistryException e) {
+                } catch (AiravataAPIInvocationException e) {
                     RegistryLoaderWindow.this.engine.getGUI().getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
                     hide();
                 }
@@ -165,7 +166,7 @@ public class RegistryLoaderWindow {
         for (RegistrySearchResult i : this.list.getSelectedValues()) {
             try {
                 registryAccesser.deleteOGCEWorkflow(i.getResourceId());
-            } catch (RegistryException e) {
+            }  catch (AiravataAPIInvocationException e) {
                 e.printStackTrace();
             }
         }

Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/WorkflowInterpreterLaunchWindow.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/WorkflowInterpreterLaunchWindow.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/WorkflowInterpreterLaunchWindow.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/WorkflowInterpreterLaunchWindow.java Wed Nov 21 19:39:38 2012
@@ -36,12 +36,13 @@ import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.xml.namespace.QName;
 
+import org.apache.airavata.client.api.AiravataAPI;
 import org.apache.airavata.client.stub.interpretor.NameValue;
 import org.apache.airavata.client.stub.interpretor.WorkflowInterpretorStub;
 import org.apache.airavata.common.utils.StringUtil;
 import org.apache.airavata.common.utils.XMLUtil;
 import org.apache.airavata.common.workflow.execution.context.WorkflowContextHeaderBuilder;
-import org.apache.airavata.registry.api.AiravataRegistry2;
+//import org.apache.airavata.registry.api.AiravataRegistry2;
 import org.apache.airavata.registry.api.exception.RegistryException;
 import org.apache.airavata.workflow.model.graph.system.InputNode;
 import org.apache.airavata.workflow.model.graph.util.GraphUtil;
@@ -163,8 +164,8 @@ public class WorkflowInterpreterLaunchWi
             this.workflowInterpreterTextField.setText(XBayaConstants.DEFAULT_WORKFLOW_INTERPRETER_URL);
         }
 
-        org.apache.airavata.registry.api.AiravataRegistry2 registryURL = config.getJcrComponentRegistry().getRegistry();
-        if (null != registryURL) {
+        AiravataAPI airavataAPI = config.getJcrComponentRegistry().getAiravataAPI();
+        if (null != airavataAPI) {
             this.RegistryTextField.setText(config.getRegistryURL());
         } else {
             this.RegistryTextField.setText(XBayaConstants.REGISTRY_URL.toASCIIString());
@@ -373,9 +374,9 @@ public class WorkflowInterpreterLaunchWi
                             ,null,configuration.getMessageBoxURL().toASCIIString());
                     stub._getServiceClient().addHeader(AXIOMUtil.stringToOM(XMLUtil.xmlElementToString(builder.getXml())));
                     stub.launchWorkflow(workflow.toXMLText(), topicString, inputNameVals);
-                    AiravataRegistry2 registry = engine.getConfiguration().getJcrComponentRegistry().getRegistry();
-                    registry.updateExperimentName(topicString, instanceNameFinal);
-                    registry.updateExperimentExecutionUser(topicString, registry.getUser().getUserName());
+                    AiravataAPI registry = engine.getConfiguration().getJcrComponentRegistry().getAiravataAPI();
+                    registry.getProvenanceManager().setExperimentName(topicString, instanceNameFinal);
+                    registry.getProvenanceManager().setExperimentUser(topicString, registry.getAiravataManager().getUser().getUserName());
                 } catch (Exception e) {
                     WorkflowInterpreterLaunchWindow.this.engine.getGUI().getErrorWindow().error(e);
                 }

Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/XBayaMenuItem.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/XBayaMenuItem.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/XBayaMenuItem.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/XBayaMenuItem.java Wed Nov 21 19:39:38 2012
@@ -312,7 +312,7 @@ public class XBayaMenuItem implements XB
                 if (XBayaUtil.acquireJCRRegistry(engine)) {
                     try {
                         DeploymentDescriptionDialog serviceDescriptionDialog = new DeploymentDescriptionDialog(XBayaMenuItem.this.engine.getGUI().getFrame(), engine.getConfiguration().getJcrComponentRegistry()
-                                        .getRegistry());
+                                        .getAiravataAPI());
                     	serviceDescriptionDialog.open();
 //                        ServiceDescriptionDialog serviceDescriptionDialog = new ServiceDescriptionDialog(
 //                                engine.getConfiguration().getJcrComponentRegistry()
@@ -359,7 +359,7 @@ public class XBayaMenuItem implements XB
                 if (XBayaUtil.acquireJCRRegistry(engine)) {
                     try {
                         HostDescriptionDialog hostDescriptionDialog = new HostDescriptionDialog(
-                        		engine.getConfiguration().getJcrComponentRegistry().getRegistry(),XBayaMenuItem.this.engine.getGUI().getFrame() );
+                        		engine.getConfiguration().getJcrComponentRegistry().getAiravataAPI(),XBayaMenuItem.this.engine.getGUI().getFrame() );
                         hostDescriptionDialog.open();
                     } catch (Exception e1) {
                         engine.getGUI().getErrorWindow().error(e1);

Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/views/JCRBrowserPanel.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/views/JCRBrowserPanel.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/views/JCRBrowserPanel.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/views/JCRBrowserPanel.java Wed Nov 21 19:39:38 2012
@@ -42,7 +42,8 @@ import javax.swing.KeyStroke;
 import javax.swing.border.EmptyBorder;
 import javax.swing.tree.DefaultTreeModel;
 
-import org.apache.airavata.registry.api.AiravataRegistry2;
+//import org.apache.airavata.registry.api.AiravataRegistry2;
+import org.apache.airavata.client.api.AiravataAPI;
 import org.apache.airavata.workflow.model.component.registry.JCRComponentRegistry;
 import org.apache.airavata.xbaya.XBayaEngine;
 import org.apache.airavata.xbaya.registrybrowser.nodes.AbstractAiravataTreeNode;
@@ -192,9 +193,9 @@ public class JCRBrowserPanel extends JPa
         }
     }
 
-    private AiravataRegistry2 getJCRRegistry() {
+    private AiravataAPI getJCRRegistry() {
         try {
-            return getEngine().getConfiguration().getJcrComponentRegistry().getRegistry();
+            return getEngine().getConfiguration().getJcrComponentRegistry().getAiravataAPI();
         } catch (Exception e) {
             // JCR registry not specified yet
             return null;
@@ -205,7 +206,7 @@ public class JCRBrowserPanel extends JPa
         if (getEngine().getConfiguration() == observable) {
             if (o instanceof JCRComponentRegistry) {
                 resetModel();
-            } else if (o instanceof AiravataRegistry2) {
+            } else if (o instanceof AiravataAPI) {
                 resetModel();
             }
         }

Modified: airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ComplexForEachWorkflowTest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ComplexForEachWorkflowTest.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ComplexForEachWorkflowTest.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ComplexForEachWorkflowTest.java Wed Nov 21 19:39:38 2012
@@ -25,7 +25,7 @@ import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.UUID;
 
-import org.apache.airavata.registry.api.AiravataRegistry2;
+//import org.apache.airavata.registry.api.AiravataRegistry2;
 import org.apache.airavata.workflow.model.exceptions.WorkflowException;
 import org.apache.airavata.workflow.model.wf.Workflow;
 import org.apache.airavata.xbaya.XBayaConfiguration;
@@ -59,9 +59,12 @@ public class ComplexForEachWorkflowTest 
         Workflow workflow = new Workflow(WorkflowTestUtils.readWorkflow(systemResource));
 //        ((InputNode) workflow.getGraph().getNode("input")).setDefaultValue("1");
         XBayaConfiguration conf = WorkflowTestUtils.getConfiguration();
-        AiravataRegistry2 registry = conf.getJcrComponentRegistry()==null? null:conf.getJcrComponentRegistry().getRegistry();
-		WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(workflow, UUID.randomUUID().toString(),conf.getMessageBoxURL(), conf.getBrokerURL(), registry, conf,null,null,true);
-		workflowInterpreterConfiguration.setNotifier(new StandaloneNotificationSender(workflowInterpreterConfiguration.getTopic(),workflowInterpreterConfiguration.getWorkflow()));
+//        AiravataRegistry2 registry = conf.getJcrComponentRegistry()==null? null:conf.getJcrComponentRegistry().getRegistry();
+//		WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(workflow, UUID.randomUUID().toString(),conf.getMessageBoxURL(), conf.getBrokerURL(), registry, conf,null,null,true);
+        WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(workflow,
+                UUID.randomUUID().toString(), conf.getMessageBoxURL(), conf.getBrokerURL(), conf.getAiravataAPI(), conf,null,null,true);
+
+        workflowInterpreterConfiguration.setNotifier(new StandaloneNotificationSender(workflowInterpreterConfiguration.getTopic(),workflowInterpreterConfiguration.getWorkflow()));
         SSWorkflowInterpreterInteractorImpl ssWorkflowInterpreterInteractorImpl = new SSWorkflowInterpreterInteractorImpl();
 
         WorkflowInterpreter interpretor = new WorkflowInterpreter(workflowInterpreterConfiguration,ssWorkflowInterpreterInteractorImpl);

Modified: airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ComplexMathWorkflowTest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ComplexMathWorkflowTest.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ComplexMathWorkflowTest.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ComplexMathWorkflowTest.java Wed Nov 21 19:39:38 2012
@@ -26,7 +26,7 @@ import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.UUID;
 
-import org.apache.airavata.registry.api.AiravataRegistry2;
+//import org.apache.airavata.registry.api.AiravataRegistry2;
 import org.apache.airavata.workflow.model.exceptions.WorkflowException;
 import org.apache.airavata.workflow.model.wf.Workflow;
 import org.apache.airavata.xbaya.XBayaConfiguration;
@@ -59,8 +59,10 @@ public class ComplexMathWorkflowTest {
         URL systemResource = this.getClass().getClassLoader().getSystemResource("ComplexMath.xwf");
         Workflow workflow = new Workflow(WorkflowTestUtils.readWorkflow(systemResource));
         XBayaConfiguration conf = WorkflowTestUtils.getConfiguration();
-        AiravataRegistry2 registry = conf.getJcrComponentRegistry()==null? null:conf.getJcrComponentRegistry().getRegistry();
-		WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(workflow, UUID.randomUUID().toString(),conf.getMessageBoxURL(), conf.getBrokerURL(), registry, conf, null,null,true);
+//        AiravataRegistry2 registry = conf.getJcrComponentRegistry()==null? null:conf.getJcrComponentRegistry().getRegistry();
+//		WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(workflow, UUID.randomUUID().toString(),conf.getMessageBoxURL(), conf.getBrokerURL(), registry, conf, null,null,true);
+		WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(workflow,
+                UUID.randomUUID().toString(),conf.getMessageBoxURL(), conf.getBrokerURL(), conf.getAiravataAPI(), conf, null,null,true);
 		workflowInterpreterConfiguration.setNotifier(new StandaloneNotificationSender(workflowInterpreterConfiguration.getTopic(),workflowInterpreterConfiguration.getWorkflow()));
         SSWorkflowInterpreterInteractorImpl ssWorkflowInterpreterInteractorImpl = new SSWorkflowInterpreterInteractorImpl();
         WorkflowInterpreter interpretor = new WorkflowInterpreter(workflowInterpreterConfiguration,ssWorkflowInterpreterInteractorImpl);

Modified: airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/CrossProductWorkflowTest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/CrossProductWorkflowTest.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/CrossProductWorkflowTest.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/CrossProductWorkflowTest.java Wed Nov 21 19:39:38 2012
@@ -26,7 +26,7 @@ import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.UUID;
 
-import org.apache.airavata.registry.api.AiravataRegistry2;
+//import org.apache.airavata.registry.api.AiravataRegistry2;
 import org.apache.airavata.workflow.model.exceptions.WorkflowException;
 import org.apache.airavata.workflow.model.wf.Workflow;
 import org.apache.airavata.xbaya.XBayaConfiguration;
@@ -59,8 +59,10 @@ public class CrossProductWorkflowTest {
         URL systemResource = this.getClass().getClassLoader().getSystemResource("LevenshteinDistance.xwf");
         Workflow workflow = new Workflow(WorkflowTestUtils.readWorkflow(systemResource));
         XBayaConfiguration conf = WorkflowTestUtils.getConfiguration();
-        AiravataRegistry2 registry = conf.getJcrComponentRegistry()==null? null:conf.getJcrComponentRegistry().getRegistry();
-		WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(workflow, UUID.randomUUID().toString(),conf.getMessageBoxURL(), conf.getBrokerURL(), registry, conf, null,null,true);
+//        AiravataRegistry2 registry = conf.getJcrComponentRegistry()==null? null:conf.getJcrComponentRegistry().getRegistry();
+//		WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(workflow, UUID.randomUUID().toString(),conf.getMessageBoxURL(), conf.getBrokerURL(), registry, conf, null,null,true);
+		WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(workflow,
+                UUID.randomUUID().toString(),conf.getMessageBoxURL(), conf.getBrokerURL(), conf.getAiravataAPI(), conf, null,null,true);
 		workflowInterpreterConfiguration.setNotifier(new StandaloneNotificationSender(workflowInterpreterConfiguration.getTopic(),workflowInterpreterConfiguration.getWorkflow()));
 
         WorkflowInterpreter interpretor = new WorkflowInterpreter(workflowInterpreterConfiguration,new SSWorkflowInterpreterInteractorImpl());

Modified: airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ForEachWorkflowTest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ForEachWorkflowTest.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ForEachWorkflowTest.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ForEachWorkflowTest.java Wed Nov 21 19:39:38 2012
@@ -25,7 +25,7 @@ import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.UUID;
 
-import org.apache.airavata.registry.api.AiravataRegistry2;
+//import org.apache.airavata.registry.api.AiravataRegistry2;
 import org.apache.airavata.workflow.model.exceptions.WorkflowException;
 import org.apache.airavata.workflow.model.graph.system.InputNode;
 import org.apache.airavata.workflow.model.wf.Workflow;
@@ -60,8 +60,10 @@ public class ForEachWorkflowTest {
         Workflow workflow = new Workflow(WorkflowTestUtils.readWorkflow(systemResource));
         ((InputNode) workflow.getGraph().getNode("input")).setDefaultValue("1");
         XBayaConfiguration conf = WorkflowTestUtils.getConfiguration();
-        AiravataRegistry2 registry = conf.getJcrComponentRegistry()==null? null:conf.getJcrComponentRegistry().getRegistry();
-		WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(workflow, UUID.randomUUID().toString(),conf.getMessageBoxURL(), conf.getBrokerURL(), registry, conf, null,null,true);
+//        AiravataRegistry2 registry = conf.getJcrComponentRegistry()==null? null:conf.getJcrComponentRegistry().getRegistry();
+//		WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(workflow, UUID.randomUUID().toString(),conf.getMessageBoxURL(), conf.getBrokerURL(), registry, conf, null,null,true);
+		WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(workflow,
+                UUID.randomUUID().toString(),conf.getMessageBoxURL(), conf.getBrokerURL(), conf.getAiravataAPI(), conf, null,null,true);
 		workflowInterpreterConfiguration.setNotifier(new StandaloneNotificationSender(workflowInterpreterConfiguration.getTopic(),workflowInterpreterConfiguration.getWorkflow()));
 		SSWorkflowInterpreterInteractorImpl ssWorkflowInterpreterInteractorImpl = new SSWorkflowInterpreterInteractorImpl();
 

Modified: airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/SimpleForEachWorkflowTest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/SimpleForEachWorkflowTest.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/SimpleForEachWorkflowTest.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/SimpleForEachWorkflowTest.java Wed Nov 21 19:39:38 2012
@@ -25,7 +25,7 @@ import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.UUID;
 
-import org.apache.airavata.registry.api.AiravataRegistry2;
+//import org.apache.airavata.registry.api.AiravataRegistry2;
 import org.apache.airavata.workflow.model.exceptions.WorkflowException;
 import org.apache.airavata.workflow.model.wf.Workflow;
 import org.apache.airavata.xbaya.XBayaConfiguration;
@@ -58,8 +58,10 @@ public class SimpleForEachWorkflowTest {
         URL systemResource = this.getClass().getClassLoader().getSystemResource("SimpleForEach.xwf");
         Workflow workflow = new Workflow(WorkflowTestUtils.readWorkflow(systemResource));
         XBayaConfiguration conf = WorkflowTestUtils.getConfiguration();
-        AiravataRegistry2 registry = conf.getJcrComponentRegistry()==null? null:conf.getJcrComponentRegistry().getRegistry();
-		WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(workflow, UUID.randomUUID().toString(),conf.getMessageBoxURL(), conf.getBrokerURL(), registry, conf, null,null,true);
+//        AiravataRegistry2 registry = conf.getJcrComponentRegistry()==null? null:conf.getJcrComponentRegistry().getRegistry();
+//		WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(workflow, UUID.randomUUID().toString(),conf.getMessageBoxURL(), conf.getBrokerURL(), registry, conf, null,null,true);
+		WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(workflow,
+                UUID.randomUUID().toString(),conf.getMessageBoxURL(), conf.getBrokerURL(), conf.getAiravataAPI(), conf, null,null,true);
 		workflowInterpreterConfiguration.setNotifier(new StandaloneNotificationSender(workflowInterpreterConfiguration.getTopic(),workflowInterpreterConfiguration.getWorkflow()));
 
         SSWorkflowInterpreterInteractorImpl ssWorkflowInterpreterInteractorImpl = new SSWorkflowInterpreterInteractorImpl();

Modified: airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/SimpleMathWorkflowTest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/SimpleMathWorkflowTest.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/SimpleMathWorkflowTest.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/SimpleMathWorkflowTest.java Wed Nov 21 19:39:38 2012
@@ -26,7 +26,7 @@ import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.UUID;
 
-import org.apache.airavata.registry.api.AiravataRegistry2;
+//import org.apache.airavata.registry.api.AiravataRegistry2;
 import org.apache.airavata.workflow.model.exceptions.WorkflowException;
 import org.apache.airavata.workflow.model.wf.Workflow;
 import org.apache.airavata.xbaya.XBayaConfiguration;
@@ -59,8 +59,10 @@ public class SimpleMathWorkflowTest {
         URL systemResource = this.getClass().getClassLoader().getSystemResource("SimpleMath.xwf");
         Workflow workflow = new Workflow(WorkflowTestUtils.readWorkflow(systemResource));
         XBayaConfiguration conf = WorkflowTestUtils.getConfiguration();
-        AiravataRegistry2 registry = conf.getJcrComponentRegistry()==null? null:conf.getJcrComponentRegistry().getRegistry();
-		WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(workflow, UUID.randomUUID().toString(),conf.getMessageBoxURL(), conf.getBrokerURL(), registry, conf, null,null,true);
+//        AiravataRegistry2 registry = conf.getJcrComponentRegistry()==null? null:conf.getJcrComponentRegistry().getRegistry();
+//		WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(workflow, UUID.randomUUID().toString(),conf.getMessageBoxURL(), conf.getBrokerURL(), registry, conf, null,null,true);
+		WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(workflow,
+                UUID.randomUUID().toString(),conf.getMessageBoxURL(), conf.getBrokerURL(), conf.getAiravataAPI(), conf, null,null,true);
 		workflowInterpreterConfiguration.setNotifier(new StandaloneNotificationSender(workflowInterpreterConfiguration.getTopic(),workflowInterpreterConfiguration.getWorkflow()));
         SSWorkflowInterpreterInteractorImpl ssWorkflowInterpreterInteractorImpl = new SSWorkflowInterpreterInteractorImpl();
 

Modified: airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/WorkflowTest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/WorkflowTest.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/WorkflowTest.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/WorkflowTest.java Wed Nov 21 19:39:38 2012
@@ -26,7 +26,7 @@ import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.UUID;
 
-import org.apache.airavata.registry.api.AiravataRegistry2;
+//import org.apache.airavata.registry.api.AiravataRegistry2;
 import org.apache.airavata.workflow.model.exceptions.WorkflowException;
 import org.apache.airavata.workflow.model.graph.system.InputNode;
 import org.apache.airavata.workflow.model.wf.Workflow;
@@ -61,8 +61,10 @@ public class WorkflowTest{
         Workflow workflow = new Workflow(WorkflowTestUtils.readWorkflow(systemResource));
         ((InputNode) workflow.getGraph().getNode("input")).setDefaultValue("1");
         XBayaConfiguration conf = WorkflowTestUtils.getConfiguration();
-        AiravataRegistry2 registry = conf.getJcrComponentRegistry()==null? null:conf.getJcrComponentRegistry().getRegistry();
-		WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(workflow, UUID.randomUUID().toString(),conf.getMessageBoxURL(), conf.getBrokerURL(), registry, conf, null,null,true);
+//        AiravataRegistry2 registry = conf.getJcrComponentRegistry()==null? null:conf.getJcrComponentRegistry().getRegistry();
+//		WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(workflow, UUID.randomUUID().toString(),conf.getMessageBoxURL(), conf.getBrokerURL(), registry, conf, null,null,true);
+		WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(workflow,
+                UUID.randomUUID().toString(),conf.getMessageBoxURL(), conf.getBrokerURL(), conf.getAiravataAPI(), conf, null,null,true);
 		workflowInterpreterConfiguration.setNotifier(new StandaloneNotificationSender(workflowInterpreterConfiguration.getTopic(),workflowInterpreterConfiguration.getWorkflow()));
         SSWorkflowInterpreterInteractorImpl ssWorkflowInterpreterInteractorImpl = new SSWorkflowInterpreterInteractorImpl();
 

Modified: airavata/trunk/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/pom.xml?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/pom.xml (original)
+++ airavata/trunk/pom.xml Wed Nov 21 19:39:38 2012
@@ -78,6 +78,7 @@
         <jcr.version>2.0</jcr.version>
         <xmlbeans.version>2.5.0</xmlbeans.version>
         <xpp3.version>1.1.3_7</xpp3.version>
+        <jersey.version>1.13</jersey.version>
         <skipTests>false</skipTests>
     </properties>
 



Mime
View raw message