airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From samin...@apache.org
Subject svn commit: r1232437 [3/3] - in /incubator/airavata/trunk: modules/commons/ modules/commons/common-registry-api/ modules/commons/common-registry-api/src/ modules/commons/common-registry-api/src/main/ modules/commons/common-registry-api/src/main/java/ m...
Date Tue, 17 Jan 2012 15:11:13 GMT
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/HostDescriptionDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/HostDescriptionDialog.java?rev=1232437&r1=1232436&r2=1232437&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/HostDescriptionDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/HostDescriptionDialog.java Tue Jan 17 15:11:10 2012
@@ -35,10 +35,10 @@ import javax.swing.JCheckBox;
 import javax.swing.JDialog;
 import javax.swing.JLabel;
 
+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.Registry;
-import org.apache.airavata.registry.api.exception.RegistryException;
+import org.apache.airavata.registry.api.AiravataRegistry;
 import org.apache.airavata.schemas.gfac.GlobusHostType;
 import org.apache.airavata.schemas.gfac.HostDescriptionType;
 import org.apache.airavata.xbaya.XBayaEngine;
@@ -62,7 +62,7 @@ public class HostDescriptionDialog exten
 
     private boolean hostCreated = false;
 
-    private Registry registry;
+    private AiravataRegistry registry;
 
 	private JCheckBox chkGobusHost;
 
@@ -252,6 +252,10 @@ public class HostDescriptionDialog exten
         if (!isNewHost()) {
 			loadData();
 		}
+//        SwingUtil.addPlaceHolder(hostIdTextField.getSwingComponent(), "[unique name for the host]");
+//        SwingUtil.addPlaceHolder(hostAddressTextField.getSwingComponent(), "[a valid host address, eg: myhost.com, 127.0.0.1]");
+//        SwingUtil.addPlaceHolder(GridFTPTextField.getSwingComponent(), "[List of grid ftp endpoints]");
+//        SwingUtil.addPlaceHolder(globusGateKeeperTextField.getSwingComponent(), "[List of globus gate keeper endpoints]");
     }
 
     private String arrayToString(String[] list) {
@@ -363,11 +367,11 @@ public class HostDescriptionDialog exten
         setHostCreated(true);
     }
 
-    public Registry getRegistry() {
+    public AiravataRegistry getRegistry() {
         return registry;
     }
 
-    public void setRegistry(Registry registry) {
+    public void setRegistry(AiravataRegistry registry) {
         this.registry = registry;
     }
 

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/ServiceDescriptionDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/ServiceDescriptionDialog.java?rev=1232437&r1=1232436&r2=1232437&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/ServiceDescriptionDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/ServiceDescriptionDialog.java Tue Jan 17 15:11:10 2012
@@ -55,10 +55,10 @@ import javax.swing.event.TableModelListe
 import javax.swing.table.DefaultTableModel;
 import javax.swing.table.TableColumn;
 
+import org.apache.airavata.common.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.Registry;
-import org.apache.airavata.registry.api.exception.RegistryException;
+import org.apache.airavata.registry.api.AiravataRegistry;
 import org.apache.airavata.schemas.gfac.DataType;
 import org.apache.airavata.schemas.gfac.InputParameterType;
 import org.apache.airavata.schemas.gfac.OutputParameterType;
@@ -82,7 +82,7 @@ public class ServiceDescriptionDialog ex
     private JButton okButton;
     private JButton btnDeleteParameter;
     private DefaultTableModel defaultTableModel;
-    private Registry registry;
+    private AiravataRegistry registry;
     private boolean newDescription;
     private boolean ignoreTableChanges=false;
 
@@ -99,14 +99,14 @@ public class ServiceDescriptionDialog ex
         }
     }
 
-    public ServiceDescriptionDialog(Registry registry) {
+    public ServiceDescriptionDialog(AiravataRegistry registry) {
     	this(registry,true,null);
     }
     
     /**
      * Create the dialog.
      */
-    public ServiceDescriptionDialog(Registry registry, boolean newDescription, ServiceDescription serviceDescription) {
+    public ServiceDescriptionDialog(AiravataRegistry registry, boolean newDescription, ServiceDescription serviceDescription) {
     	setNewDescription(newDescription);
     	this.setOrginalServiceDescription(serviceDescription);
         addWindowListener(new WindowAdapter() {
@@ -493,11 +493,11 @@ public class ServiceDescriptionDialog ex
 		}
     }
 
-    public Registry getRegistry() {
+    public AiravataRegistry getRegistry() {
         return registry;
     }
 
-    public void setRegistry(Registry registry) {
+    public void setRegistry(AiravataRegistry registry) {
         this.registry = registry;
     }
 

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/NewJCRRegistryUserDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/NewJCRRegistryUserDialog.java?rev=1232437&r1=1232436&r2=1232437&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/NewJCRRegistryUserDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/NewJCRRegistryUserDialog.java Tue Jan 17 15:11:10 2012
@@ -32,7 +32,7 @@ import javax.swing.JButton;
 import javax.swing.JPanel;
 import javax.swing.JPasswordField;
 
-import org.apache.airavata.registry.api.user.AuthorizableExistsException;
+import org.apache.airavata.common.registry.api.user.AuthorizableExistsException;
 import org.apache.airavata.xbaya.XBayaEngine;
 import org.apache.airavata.xbaya.component.registry.JCRComponentRegistry;
 import org.apache.airavata.xbaya.gui.GridPanel;

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentRegistry.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentRegistry.java?rev=1232437&r1=1232436&r2=1232437&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentRegistry.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentRegistry.java Tue Jan 17 15:11:10 2012
@@ -21,7 +21,7 @@
 
 package org.apache.airavata.xbaya.component.registry;
 
-import org.apache.airavata.registry.api.Registry;
+import org.apache.airavata.registry.api.AiravataRegistry;
 import org.apache.airavata.xbaya.component.gui.ComponentTreeNode;
 
 public abstract class ComponentRegistry {

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentRegistryLoader.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentRegistryLoader.java?rev=1232437&r1=1232436&r2=1232437&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentRegistryLoader.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentRegistryLoader.java Tue Jan 17 15:11:10 2012
@@ -26,7 +26,7 @@ import java.util.Map;
 import java.util.Observable;
 import java.util.Observer;
 
-import org.apache.airavata.registry.api.Registry;
+import org.apache.airavata.registry.api.AiravataRegistry;
 import org.apache.airavata.xbaya.XBayaConfiguration;
 import org.apache.airavata.xbaya.XBayaEngine;
 import org.apache.airavata.xbaya.component.gui.ComponentTreeNode;
@@ -142,13 +142,13 @@ public class ComponentRegistryLoader imp
 				observableRegistry.deleteObserver(this);
 			}
 			if (componentRegistry instanceof JCRComponentRegistry){
-				Registry registry = ((JCRComponentRegistry)componentRegistry).getRegistry();
+				AiravataRegistry registry = ((JCRComponentRegistry)componentRegistry).getRegistry();
 				if (registry!=null && registry instanceof Observable){
 					(observableRegistry=(Observable)registry).addObserver(this);
 				}
 			}
 			load(componentRegistry);
-		}else if (observable instanceof Registry){
+		}else if (observable instanceof AiravataRegistry){
 			load(getEngine().getConfiguration().getJcrComponentRegistry());
 		}
 	}

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/JCRComponentRegistry.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/JCRComponentRegistry.java?rev=1232437&r1=1232436&r2=1232437&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/JCRComponentRegistry.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/JCRComponentRegistry.java Tue Jan 17 15:11:10 2012
@@ -27,13 +27,12 @@ import java.util.List;
 
 import javax.jcr.RepositoryException;
 
+import org.apache.airavata.common.registry.api.exception.RegistryException;
 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.Registry;
-import org.apache.airavata.registry.api.exception.RegistryException;
-import org.apache.airavata.registry.api.impl.JCRRegistry;
-import org.apache.airavata.registry.api.user.UserManager;
+import org.apache.airavata.registry.api.AiravataRegistry;
+import org.apache.airavata.registry.api.impl.AiravataJCRRegistry;
+import org.apache.airavata.common.registry.api.user.UserManager;
 import org.apache.airavata.xbaya.component.gui.ComponentTreeNode;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -43,13 +42,13 @@ public class JCRComponentRegistry extend
     private static final Logger log = LoggerFactory.getLogger(JCRComponentRegistry.class);
     private static final String NAME = "Application Services";
 
-    private JCRRegistry registry;
+    private AiravataJCRRegistry registry;
 
     public JCRComponentRegistry(URI url, String username, String password) throws RepositoryException {
         HashMap<String, String> map = new HashMap<String, String>();
         map.put("org.apache.jackrabbit.repository.uri", url.toString());
         try {
-            this.registry = new JCRRegistry(url, "org.apache.jackrabbit.rmi.repository.RmiRepositoryFactory", username,
+            this.registry = new AiravataJCRRegistry(url, "org.apache.jackrabbit.rmi.repository.RmiRepositoryFactory", username,
                     password, map);
         } catch (RepositoryException e) {
             throw e;
@@ -115,7 +114,7 @@ public class JCRComponentRegistry extend
         return registry.saveDeploymentDescription(service, host, app);
     }
 
-    public Registry getRegistry() {
+    public AiravataRegistry getRegistry() {
         return registry;
     }
 }
\ No newline at end of file

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/jackrabbit/user/AbstractJackRabbitUMComponent.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/jackrabbit/user/AbstractJackRabbitUMComponent.java?rev=1232437&r1=1232436&r2=1232437&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/jackrabbit/user/AbstractJackRabbitUMComponent.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/jackrabbit/user/AbstractJackRabbitUMComponent.java Tue Jan 17 15:11:10 2012
@@ -30,7 +30,7 @@ import org.apache.jackrabbit.api.securit
 
 public class AbstractJackRabbitUMComponent {
 
-    protected List<Group> getJRGroupList(Iterator<org.apache.airavata.registry.api.user.Group> airavataUMGroupList) {
+    protected List<Group> getJRGroupList(Iterator<org.apache.airavata.common.registry.api.user.Group> airavataUMGroupList) {
         List<Group> groupList = new ArrayList<Group>();
         while (airavataUMGroupList.hasNext()) {
             groupList.add(new JackRabbitGroup(airavataUMGroupList.next()));
@@ -38,8 +38,8 @@ public class AbstractJackRabbitUMCompone
         return groupList;
     }
 
-    protected List<org.apache.airavata.registry.api.user.Group> getGroupList(Iterator<Group> airavataUMGroupList) {
-        List<org.apache.airavata.registry.api.user.Group> groupList = new ArrayList<org.apache.airavata.registry.api.user.Group>();
+    protected List<org.apache.airavata.common.registry.api.user.Group> getGroupList(Iterator<Group> airavataUMGroupList) {
+        List<org.apache.airavata.common.registry.api.user.Group> groupList = new ArrayList<org.apache.airavata.common.registry.api.user.Group>();
         while (airavataUMGroupList.hasNext()) {
             groupList.add(new JackRabbitGroupWrap(airavataUMGroupList.next()));
         }
@@ -47,7 +47,7 @@ public class AbstractJackRabbitUMCompone
     }
 
     protected List<Authorizable> getJRAuthorizableList(
-            Iterator<org.apache.airavata.registry.api.user.Authorizable> jackRabbitAuthorizableList) {
+            Iterator<org.apache.airavata.common.registry.api.user.Authorizable> jackRabbitAuthorizableList) {
         List<Authorizable> authorizableList = new ArrayList<Authorizable>();
         while (jackRabbitAuthorizableList.hasNext()) {
             authorizableList.add(new JackRabbitAuthorizable(jackRabbitAuthorizableList.next()));
@@ -55,9 +55,9 @@ public class AbstractJackRabbitUMCompone
         return authorizableList;
     }
 
-    protected List<org.apache.airavata.registry.api.user.Authorizable> getAuthorizableList(
+    protected List<org.apache.airavata.common.registry.api.user.Authorizable> getAuthorizableList(
             Iterator<Authorizable> jackRabbitAuthorizableList) {
-        List<org.apache.airavata.registry.api.user.Authorizable> authorizableList = new ArrayList<org.apache.airavata.registry.api.user.Authorizable>();
+        List<org.apache.airavata.common.registry.api.user.Authorizable> authorizableList = new ArrayList<org.apache.airavata.common.registry.api.user.Authorizable>();
         while (jackRabbitAuthorizableList.hasNext()) {
             authorizableList.add(new JackRabbitAuthorizableWrap(jackRabbitAuthorizableList.next()));
         }

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/jackrabbit/user/JackRabbitAuthorizable.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/jackrabbit/user/JackRabbitAuthorizable.java?rev=1232437&r1=1232436&r2=1232437&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/jackrabbit/user/JackRabbitAuthorizable.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/jackrabbit/user/JackRabbitAuthorizable.java Tue Jan 17 15:11:10 2012
@@ -21,26 +21,26 @@
 
 package org.apache.airavata.xbaya.component.registry.jackrabbit.user;
 
-import java.security.Principal;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.jcr.RepositoryException;
-import javax.jcr.Value;
-
-import org.apache.jackrabbit.api.security.user.Authorizable;
-import org.apache.jackrabbit.api.security.user.Group;
+import java.security.Principal;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.jcr.RepositoryException;
+import javax.jcr.Value;
+
+import org.apache.jackrabbit.api.security.user.Authorizable;
+import org.apache.jackrabbit.api.security.user.Group;
 
 public class JackRabbitAuthorizable extends AbstractJackRabbitUMComponent implements Authorizable {
-    private org.apache.airavata.registry.api.user.Authorizable authorizable;
+    private org.apache.airavata.common.registry.api.user.Authorizable authorizable;
 
-    public JackRabbitAuthorizable(org.apache.airavata.registry.api.user.Authorizable authorizable) {
+    public JackRabbitAuthorizable(org.apache.airavata.common.registry.api.user.Authorizable authorizable) {
         this.authorizable = authorizable;
     }
 
     @Override
     public Iterator<Group> declaredMemberOf() throws RepositoryException {
-        Iterator<org.apache.airavata.registry.api.user.Group> declaredMemberOfGroupList = authorizable
+        Iterator<org.apache.airavata.common.registry.api.user.Group> declaredMemberOfGroupList = authorizable
                 .declaredMemberOf();
         List<Group> groupList = getJRGroupList(declaredMemberOfGroupList);
         return groupList.iterator();
@@ -83,7 +83,7 @@ public class JackRabbitAuthorizable exte
 
     @Override
     public Iterator<Group> memberOf() throws RepositoryException {
-        Iterator<org.apache.airavata.registry.api.user.Group> declaredMemberOfGroupList = authorizable.memberOf();
+        Iterator<org.apache.airavata.common.registry.api.user.Group> declaredMemberOfGroupList = authorizable.memberOf();
         List<Group> groupList = getJRGroupList(declaredMemberOfGroupList);
         return groupList.iterator();
     }

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/jackrabbit/user/JackRabbitAuthorizableWrap.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/jackrabbit/user/JackRabbitAuthorizableWrap.java?rev=1232437&r1=1232436&r2=1232437&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/jackrabbit/user/JackRabbitAuthorizableWrap.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/jackrabbit/user/JackRabbitAuthorizableWrap.java Tue Jan 17 15:11:10 2012
@@ -27,8 +27,8 @@ import java.util.Iterator;
 import javax.jcr.RepositoryException;
 import javax.jcr.Value;
 
-import org.apache.airavata.registry.api.user.Authorizable;
-import org.apache.airavata.registry.api.user.Group;
+import org.apache.airavata.common.registry.api.user.Authorizable;
+import org.apache.airavata.common.registry.api.user.Group;
 
 public class JackRabbitAuthorizableWrap extends AbstractJackRabbitUMComponent implements Authorizable {
     private org.apache.jackrabbit.api.security.user.Authorizable authorizable;

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/jackrabbit/user/JackRabbitGroup.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/jackrabbit/user/JackRabbitGroup.java?rev=1232437&r1=1232436&r2=1232437&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/jackrabbit/user/JackRabbitGroup.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/jackrabbit/user/JackRabbitGroup.java Tue Jan 17 15:11:10 2012
@@ -31,9 +31,9 @@ import org.apache.jackrabbit.api.securit
 import org.apache.jackrabbit.api.security.user.Group;
 
 public class JackRabbitGroup extends AbstractJackRabbitUMComponent implements Group {
-    private org.apache.airavata.registry.api.user.Group group;
+    private org.apache.airavata.common.registry.api.user.Group group;
 
-    public JackRabbitGroup(org.apache.airavata.registry.api.user.Group group) {
+    public JackRabbitGroup(org.apache.airavata.common.registry.api.user.Group group) {
         this.group = group;
     }
 
@@ -89,7 +89,7 @@ public class JackRabbitGroup extends Abs
 
     @Override
     public Iterator<Authorizable> getDeclaredMembers() throws RepositoryException {
-        Iterator<org.apache.airavata.registry.api.user.Authorizable> declaredMembers = group.getDeclaredMembers();
+        Iterator<org.apache.airavata.common.registry.api.user.Authorizable> declaredMembers = group.getDeclaredMembers();
         return getJRAuthorizableList(declaredMembers).iterator();
     }
 

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/jackrabbit/user/JackRabbitGroupWrap.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/jackrabbit/user/JackRabbitGroupWrap.java?rev=1232437&r1=1232436&r2=1232437&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/jackrabbit/user/JackRabbitGroupWrap.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/jackrabbit/user/JackRabbitGroupWrap.java Tue Jan 17 15:11:10 2012
@@ -27,8 +27,8 @@ import java.util.Iterator;
 import javax.jcr.RepositoryException;
 import javax.jcr.Value;
 
-import org.apache.airavata.registry.api.user.Authorizable;
-import org.apache.airavata.registry.api.user.Group;
+import org.apache.airavata.common.registry.api.user.Authorizable;
+import org.apache.airavata.common.registry.api.user.Group;
 
 public class JackRabbitGroupWrap extends AbstractJackRabbitUMComponent implements Group {
     private org.apache.jackrabbit.api.security.user.Group group;

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/jackrabbit/user/JackRabbitUserManagerWrap.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/jackrabbit/user/JackRabbitUserManagerWrap.java?rev=1232437&r1=1232436&r2=1232437&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/jackrabbit/user/JackRabbitUserManagerWrap.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/jackrabbit/user/JackRabbitUserManagerWrap.java Tue Jan 17 15:11:10 2012
@@ -21,22 +21,22 @@
 
 package org.apache.airavata.xbaya.component.registry.jackrabbit.user;
 
-import java.security.Principal;
-import java.util.Iterator;
-
-import javax.jcr.AccessDeniedException;
-import javax.jcr.RepositoryException;
-import javax.jcr.Session;
-import javax.jcr.UnsupportedRepositoryOperationException;
-
-import org.apache.airavata.registry.api.impl.JCRRegistry;
-import org.apache.airavata.registry.api.user.Authorizable;
-import org.apache.airavata.registry.api.user.AuthorizableExistsException;
-import org.apache.airavata.registry.api.user.Group;
-import org.apache.airavata.registry.api.user.User;
-import org.apache.airavata.registry.api.user.UserManager;
-import org.apache.airavata.registry.api.user.UserManagerFactory;
-import org.apache.jackrabbit.api.JackrabbitSession;
+import java.security.Principal;
+import java.util.Iterator;
+
+import javax.jcr.AccessDeniedException;
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+import javax.jcr.UnsupportedRepositoryOperationException;
+
+import org.apache.airavata.common.registry.api.impl.JCRRegistry;
+import org.apache.airavata.common.registry.api.user.Authorizable;
+import org.apache.airavata.common.registry.api.user.AuthorizableExistsException;
+import org.apache.airavata.common.registry.api.user.Group;
+import org.apache.airavata.common.registry.api.user.User;
+import org.apache.airavata.common.registry.api.user.UserManager;
+import org.apache.airavata.common.registry.api.user.UserManagerFactory;
+import org.apache.jackrabbit.api.JackrabbitSession;
 
 public class JackRabbitUserManagerWrap extends AbstractJackRabbitUMComponent implements UserManager {
     private JCRRegistry repository;

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/jackrabbit/user/JackRabbitUserWrap.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/jackrabbit/user/JackRabbitUserWrap.java?rev=1232437&r1=1232436&r2=1232437&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/jackrabbit/user/JackRabbitUserWrap.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/jackrabbit/user/JackRabbitUserWrap.java Tue Jan 17 15:11:10 2012
@@ -28,8 +28,8 @@ import javax.jcr.Credentials;
 import javax.jcr.RepositoryException;
 import javax.jcr.Value;
 
-import org.apache.airavata.registry.api.user.Group;
-import org.apache.airavata.registry.api.user.User;
+import org.apache.airavata.common.registry.api.user.Group;
+import org.apache.airavata.common.registry.api.user.User;
 
 public class JackRabbitUserWrap extends AbstractJackRabbitUMComponent implements User {
     private org.apache.jackrabbit.api.security.user.User user;

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/WorkflowInterpreterLaunchWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/WorkflowInterpreterLaunchWindow.java?rev=1232437&r1=1232436&r2=1232437&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/WorkflowInterpreterLaunchWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/WorkflowInterpreterLaunchWindow.java Tue Jan 17 15:11:10 2012
@@ -155,7 +155,7 @@ public class WorkflowInterpreterLaunchWi
             this.workflowInterpreterTextField.setText(XBayaConstants.DEFAULT_WORKFLOW_INTERPRETER_URL);
         }
 
-        org.apache.airavata.registry.api.Registry registryURL = config.getJcrComponentRegistry().getRegistry();
+        org.apache.airavata.registry.api.AiravataRegistry registryURL = config.getJcrComponentRegistry().getRegistry();
         if (null != registryURL) {
             this.RegistryTextField.setText(config.getRegistryURL());
         } else {

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/ProvenanceWrite.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/ProvenanceWrite.java?rev=1232437&r1=1232436&r2=1232437&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/ProvenanceWrite.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/ProvenanceWrite.java Tue Jan 17 15:11:10 2012
@@ -25,7 +25,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.airavata.common.utils.XMLUtil;
-import org.apache.airavata.registry.api.Registry;
+import org.apache.airavata.registry.api.AiravataRegistry;
 import org.apache.airavata.registry.api.workflow.WorkflowIOData;
 import org.apache.airavata.xbaya.XBayaException;
 import org.apache.airavata.xbaya.concurrent.PredicatedExecutable;
@@ -57,10 +57,10 @@ public final class ProvenanceWrite imple
 
     private String experimentId;
 
-    private Registry registry;
+    private AiravataRegistry registry;
 
 	public ProvenanceWrite(Node node, String workflowName,
-                           Map<Node, Invoker> invokerMap, String experimentId,Registry registry) {
+                           Map<Node, Invoker> invokerMap, String experimentId,AiravataRegistry registry) {
 		this.node = node;
 		this.workflowName = workflowName;
 		this.invokerMap = invokerMap;

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=1232437&r1=1232436&r2=1232437&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 Tue Jan 17 15:11:10 2012
@@ -31,7 +31,7 @@ import javax.xml.namespace.QName;
 
 import org.apache.airavata.common.utils.StringUtil;
 import org.apache.airavata.common.utils.XMLUtil;
-import org.apache.airavata.registry.api.Registry;
+import org.apache.airavata.registry.api.AiravataRegistry;
 import org.apache.airavata.xbaya.XBayaConfiguration;
 import org.apache.airavata.xbaya.XBayaConstants;
 import org.apache.airavata.xbaya.XBayaEngine;
@@ -67,7 +67,7 @@ public class RegistryAccesser {
         this.engine = engine;
     }
 
-    private Registry connectToRegistry() {
+    private AiravataRegistry connectToRegistry() {
         JCRComponentRegistry jcrComponentRegistry = this.engine.getConfiguration().getJcrComponentRegistry();
         return jcrComponentRegistry.getRegistry();
     }
@@ -78,7 +78,7 @@ public class RegistryAccesser {
      * @throws RepositoryException
      */
     public Map<QName, Node> getOGCEWorkflowTemplateList() throws RepositoryException {
-        Registry registry = connectToRegistry();
+        AiravataRegistry registry = connectToRegistry();
         return registry.getWorkflows(this.engine.getConfiguration().getRegigstryUserName());
     }
 
@@ -93,7 +93,7 @@ public class RegistryAccesser {
      */
     public Workflow getOGCEWorkflow(QName workflowTemplateId) throws RepositoryException, GraphException,
             ComponentException, Exception {
-        Registry registry = connectToRegistry();
+        AiravataRegistry registry = connectToRegistry();
         Node node = registry.getWorkflow(workflowTemplateId, this.engine.getConfiguration().getRegigstryUserName());
         XmlElement xwf = XMLUtil.stringToXmlElement(node.getProperty("workflow").getString());
         Workflow workflow = new Workflow(xwf);
@@ -156,7 +156,7 @@ public class RegistryAccesser {
                 String workflowAsString = XMLUtil.xmlElementToString(workflow.toXML());
                 String owner = this.engine.getConfiguration().getRegigstryUserName();
 
-                Registry registry = this.connectToRegistry();
+                AiravataRegistry registry = this.connectToRegistry();
                 boolean result = registry.saveWorkflow(workflowQName, workflow.getName(), workflow.getDescription(), workflowAsString,
                         owner, registryPublishingWindow.isMakePublic());
                 registryPublishingWindow.hide();
@@ -175,7 +175,7 @@ public class RegistryAccesser {
      */
     public void deleteOGCEWorkflow(QName workflowTemplateId) throws RepositoryException {
         if (XBayaUtil.acquireJCRRegistry(this.engine)) {
-            Registry registry = connectToRegistry();
+            AiravataRegistry registry = connectToRegistry();
             registry.deleteWorkflow(workflowTemplateId, this.engine.getConfiguration().getRegigstryUserName());
         }
     }
@@ -186,7 +186,7 @@ public class RegistryAccesser {
      * @return
      */
     public Workflow getWorkflow(QName qname) {
-        Registry registry = connectToRegistry();
+        AiravataRegistry registry = connectToRegistry();
         Node node = registry.getWorkflow(qname, this.engine.getConfiguration().getRegigstryUserName());
         Workflow workflow = null;
         try {

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/JCRBrowserPanel.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/JCRBrowserPanel.java?rev=1232437&r1=1232436&r2=1232437&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/JCRBrowserPanel.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/JCRBrowserPanel.java Tue Jan 17 15:11:10 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.Registry;
+import org.apache.airavata.registry.api.AiravataRegistry;
 import org.apache.airavata.xbaya.XBayaEngine;
 import org.apache.airavata.xbaya.component.registry.JCRComponentRegistry;
 import org.apache.airavata.xbaya.registrybrowser.menu.AbstractBrowserActionItem;
@@ -175,7 +175,7 @@ public class JCRBrowserPanel extends JPa
         }
     }
 
-    private Registry getJCRRegistry() {
+    private AiravataRegistry getJCRRegistry() {
         try {
             return getEngine().getConfiguration().getJcrComponentRegistry().getRegistry();
         } catch (Exception e) {
@@ -189,7 +189,7 @@ public class JCRBrowserPanel extends JPa
         if (getEngine().getConfiguration() == observable) {
             if (o instanceof JCRComponentRegistry) {
                 resetModel();
-            } else if (o instanceof Registry) {
+            } else if (o instanceof AiravataRegistry) {
                 resetModel();
             }
         }

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/ApplicationDeploymentDescriptionWrap.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/ApplicationDeploymentDescriptionWrap.java?rev=1232437&r1=1232436&r2=1232437&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/ApplicationDeploymentDescriptionWrap.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/ApplicationDeploymentDescriptionWrap.java Tue Jan 17 15:11:10 2012
@@ -21,19 +21,19 @@
 
 package org.apache.airavata.xbaya.registrybrowser.model;
 
+import org.apache.airavata.common.registry.api.exception.RegistryException;
 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.Registry;
-import org.apache.airavata.registry.api.exception.RegistryException;
+import org.apache.airavata.registry.api.AiravataRegistry;
 
 public class ApplicationDeploymentDescriptionWrap {
     private ApplicationDeploymentDescription applicationDeploymentDescription;
     private String service;
     private String host;
-    private Registry registry;
+    private AiravataRegistry registry;
 
-    public ApplicationDeploymentDescriptionWrap(Registry registry,
+    public ApplicationDeploymentDescriptionWrap(AiravataRegistry registry,
             ApplicationDeploymentDescription applicationDeploymentDescription, String service, String host) {
         setApplicationDeploymentDescription(applicationDeploymentDescription);
         setService(service);
@@ -73,11 +73,11 @@ public class ApplicationDeploymentDescri
         this.host = host;
     }
 
-    public Registry getRegistry() {
+    public AiravataRegistry getRegistry() {
         return registry;
     }
 
-    public void setRegistry(Registry registry) {
+    public void setRegistry(AiravataRegistry registry) {
         this.registry = registry;
     }
 }

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/ApplicationDeploymentDescriptions.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/ApplicationDeploymentDescriptions.java?rev=1232437&r1=1232436&r2=1232437&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/ApplicationDeploymentDescriptions.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/ApplicationDeploymentDescriptions.java Tue Jan 17 15:11:10 2012
@@ -25,22 +25,22 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.airavata.common.registry.api.exception.RegistryException;
 import org.apache.airavata.commons.gfac.type.ApplicationDeploymentDescription;
-import org.apache.airavata.registry.api.Registry;
-import org.apache.airavata.registry.api.exception.RegistryException;
+import org.apache.airavata.registry.api.AiravataRegistry;
 
 public class ApplicationDeploymentDescriptions {
-    private Registry registry;
+    private AiravataRegistry registry;
 
-    public ApplicationDeploymentDescriptions(Registry registry) {
+    public ApplicationDeploymentDescriptions(AiravataRegistry registry) {
         setRegistry(registry);
     }
 
-    public Registry getRegistry() {
+    public AiravataRegistry getRegistry() {
         return registry;
     }
 
-    public void setRegistry(Registry registry) {
+    public void setRegistry(AiravataRegistry registry) {
         this.registry = registry;
     }
 

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/GFacURL.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/GFacURL.java?rev=1232437&r1=1232436&r2=1232437&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/GFacURL.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/GFacURL.java Tue Jan 17 15:11:10 2012
@@ -23,22 +23,22 @@ package org.apache.airavata.xbaya.regist
 
 import java.net.URL;
 
-import org.apache.airavata.registry.api.Registry;
+import org.apache.airavata.registry.api.AiravataRegistry;
 
 public class GFacURL {
-    private Registry registry;
+    private AiravataRegistry registry;
     private URL gfacURL;
 
-    public GFacURL(Registry registry, URL gfacURL) {
+    public GFacURL(AiravataRegistry registry, URL gfacURL) {
         setRegistry(registry);
         setGfacURL(gfacURL);
     }
 
-    public Registry getRegistry() {
+    public AiravataRegistry getRegistry() {
         return registry;
     }
 
-    public void setRegistry(Registry registry) {
+    public void setRegistry(AiravataRegistry registry) {
         this.registry = registry;
     }
 

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/GFacURLs.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/GFacURLs.java?rev=1232437&r1=1232436&r2=1232437&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/GFacURLs.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/GFacURLs.java Tue Jan 17 15:11:10 2012
@@ -26,20 +26,20 @@ import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.airavata.registry.api.Registry;
+import org.apache.airavata.registry.api.AiravataRegistry;
 
 public class GFacURLs {
-    private Registry registry;
+    private AiravataRegistry registry;
 
-    public GFacURLs(Registry registry) {
+    public GFacURLs(AiravataRegistry registry) {
         setRegistry(registry);
     }
 
-    public Registry getRegistry() {
+    public AiravataRegistry getRegistry() {
         return registry;
     }
 
-    public void setRegistry(Registry registry) {
+    public void setRegistry(AiravataRegistry registry) {
         this.registry = registry;
     }
 

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/HostDescriptions.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/HostDescriptions.java?rev=1232437&r1=1232436&r2=1232437&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/HostDescriptions.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/HostDescriptions.java Tue Jan 17 15:11:10 2012
@@ -23,22 +23,22 @@ package org.apache.airavata.xbaya.regist
 
 import java.util.List;
 
+import org.apache.airavata.common.registry.api.exception.RegistryException;
 import org.apache.airavata.commons.gfac.type.HostDescription;
-import org.apache.airavata.registry.api.Registry;
-import org.apache.airavata.registry.api.exception.RegistryException;
+import org.apache.airavata.registry.api.AiravataRegistry;
 
 public class HostDescriptions {
-    private Registry registry;
+    private AiravataRegistry registry;
 
-    public HostDescriptions(Registry registry) {
+    public HostDescriptions(AiravataRegistry registry) {
         setRegistry(registry);
     }
 
-    public Registry getRegistry() {
+    public AiravataRegistry getRegistry() {
         return registry;
     }
 
-    public void setRegistry(Registry registry) {
+    public void setRegistry(AiravataRegistry registry) {
         this.registry = registry;
     }
 

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/ServiceDescriptions.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/ServiceDescriptions.java?rev=1232437&r1=1232436&r2=1232437&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/ServiceDescriptions.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/ServiceDescriptions.java Tue Jan 17 15:11:10 2012
@@ -23,22 +23,22 @@ package org.apache.airavata.xbaya.regist
 
 import java.util.List;
 
+import org.apache.airavata.common.registry.api.exception.RegistryException;
 import org.apache.airavata.commons.gfac.type.ServiceDescription;
-import org.apache.airavata.registry.api.Registry;
-import org.apache.airavata.registry.api.exception.RegistryException;
+import org.apache.airavata.registry.api.AiravataRegistry;
 
 public class ServiceDescriptions {
-    private Registry registry;
+    private AiravataRegistry registry;
 
-    public ServiceDescriptions(Registry registry) {
+    public ServiceDescriptions(AiravataRegistry registry) {
         setRegistry(registry);
     }
 
-    public Registry getRegistry() {
+    public AiravataRegistry getRegistry() {
         return registry;
     }
 
-    public void setRegistry(Registry registry) {
+    public void setRegistry(AiravataRegistry registry) {
         this.registry = registry;
     }
 

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/XBayaWorkflowExperiments.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/XBayaWorkflowExperiments.java?rev=1232437&r1=1232436&r2=1232437&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/XBayaWorkflowExperiments.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/XBayaWorkflowExperiments.java Tue Jan 17 15:11:10 2012
@@ -30,7 +30,7 @@ import java.util.Map;
 
 import javax.xml.parsers.ParserConfigurationException;
 
-import org.apache.airavata.registry.api.Registry;
+import org.apache.airavata.registry.api.AiravataRegistry;
 import org.apache.airavata.registry.api.workflow.WorkflowIOData;
 import org.apache.airavata.schemas.gfac.Parameter;
 import org.apache.axis2.util.XMLUtils;
@@ -40,9 +40,9 @@ import org.w3c.dom.NodeList;
 import org.xml.sax.SAXException;
 
 public class XBayaWorkflowExperiments {
-	private Registry registry;
+	private AiravataRegistry registry;
 	
-	public XBayaWorkflowExperiments(Registry registry) {
+	public XBayaWorkflowExperiments(AiravataRegistry registry) {
 		setRegistry(registry);
 	}
 	
@@ -117,10 +117,10 @@ public class XBayaWorkflowExperiments {
 			//TODO setup parameters
 		}
 	}
-	public Registry getRegistry() {
+	public AiravataRegistry getRegistry() {
 		return registry;
 	}
-	public void setRegistry(Registry registry) {
+	public void setRegistry(AiravataRegistry registry) {
 		this.registry = registry;
 	}
 

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/XBayaWorkflowTemplates.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/XBayaWorkflowTemplates.java?rev=1232437&r1=1232436&r2=1232437&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/XBayaWorkflowTemplates.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/XBayaWorkflowTemplates.java Tue Jan 17 15:11:10 2012
@@ -28,20 +28,20 @@ import java.util.Map;
 import javax.jcr.Node;
 import javax.xml.namespace.QName;
 
-import org.apache.airavata.registry.api.Registry;
+import org.apache.airavata.registry.api.AiravataRegistry;
 
 public class XBayaWorkflowTemplates {
-    private Registry registry;
+    private AiravataRegistry registry;
 
-    public XBayaWorkflowTemplates(Registry registry) {
+    public XBayaWorkflowTemplates(AiravataRegistry registry) {
         setRegistry(registry);
     }
 
-    public Registry getRegistry() {
+    public AiravataRegistry getRegistry() {
         return registry;
     }
 
-    public void setRegistry(Registry registry) {
+    public void setRegistry(AiravataRegistry registry) {
         this.registry = registry;
     }
 

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=1232437&r1=1232436&r2=1232437&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 Tue Jan 17 15:11:10 2012
@@ -37,7 +37,7 @@ import javax.swing.tree.DefaultTreeModel
 import javax.swing.tree.TreeNode;
 import javax.swing.tree.TreePath;
 
-import org.apache.airavata.registry.api.Registry;
+import org.apache.airavata.registry.api.AiravataRegistry;
 import org.apache.airavata.xbaya.XBayaEngine;
 import org.apache.airavata.xbaya.registrybrowser.menu.AbstractBrowserActionItem;
 import org.apache.airavata.xbaya.registrybrowser.menu.RefreshAction;
@@ -192,7 +192,7 @@ public abstract class AbstractAiravataTr
         return rootNode;
     }
 
-    public Registry getRegistry() {
+    public AiravataRegistry 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/ApplicationDeploymentDescriptionNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ApplicationDeploymentDescriptionNode.java?rev=1232437&r1=1232436&r2=1232437&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ApplicationDeploymentDescriptionNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ApplicationDeploymentDescriptionNode.java Tue Jan 17 15:11:10 2012
@@ -28,7 +28,7 @@ import javax.swing.Icon;
 import javax.swing.JTree;
 import javax.swing.tree.TreeNode;
 
-import org.apache.airavata.registry.api.exception.RegistryException;
+import org.apache.airavata.common.registry.api.exception.RegistryException;
 import org.apache.airavata.xbaya.appwrapper.ApplicationDescriptionDialog;
 import org.apache.airavata.xbaya.registrybrowser.menu.AbstractBrowserActionItem;
 import org.apache.airavata.xbaya.registrybrowser.menu.DeleteAction;

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ApplicationDeploymentDescriptionsNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ApplicationDeploymentDescriptionsNode.java?rev=1232437&r1=1232436&r2=1232437&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ApplicationDeploymentDescriptionsNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ApplicationDeploymentDescriptionsNode.java Tue Jan 17 15:11:10 2012
@@ -28,8 +28,8 @@ import javax.swing.Icon;
 import javax.swing.JTree;
 import javax.swing.tree.TreeNode;
 
-import org.apache.airavata.registry.api.Registry;
-import org.apache.airavata.registry.api.exception.RegistryException;
+import org.apache.airavata.common.registry.api.exception.RegistryException;
+import org.apache.airavata.registry.api.AiravataRegistry;
 import org.apache.airavata.xbaya.appwrapper.ApplicationDescriptionDialog;
 import org.apache.airavata.xbaya.registrybrowser.menu.AbstractBrowserActionItem;
 import org.apache.airavata.xbaya.registrybrowser.menu.AddAction;
@@ -99,7 +99,7 @@ public class ApplicationDeploymentDescri
     private void deleteApplicationDescription(JTree tree) throws Exception {
         if (askQuestion("Application descriptions",
                 "Are you sure that you want to remove all application descriptions in this registry?")) {
-            Registry registry = getRegistry();
+            AiravataRegistry registry = getRegistry();
             List<ApplicationDeploymentDescriptionWrap> descriptions = getApplicationDeploymentDescriptions()
                     .getDescriptions();
             for (ApplicationDeploymentDescriptionWrap descriptionWrap : descriptions) {

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/HostDescriptionNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/HostDescriptionNode.java?rev=1232437&r1=1232436&r2=1232437&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/HostDescriptionNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/HostDescriptionNode.java Tue Jan 17 15:11:10 2012
@@ -28,8 +28,8 @@ import javax.swing.Icon;
 import javax.swing.JTree;
 import javax.swing.tree.TreeNode;
 
+import org.apache.airavata.common.registry.api.exception.RegistryException;
 import org.apache.airavata.commons.gfac.type.HostDescription;
-import org.apache.airavata.registry.api.exception.RegistryException;
 import org.apache.airavata.xbaya.appwrapper.HostDescriptionDialog;
 import org.apache.airavata.xbaya.registrybrowser.menu.AbstractBrowserActionItem;
 import org.apache.airavata.xbaya.registrybrowser.menu.DeleteAction;

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/HostDescriptionsNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/HostDescriptionsNode.java?rev=1232437&r1=1232436&r2=1232437&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/HostDescriptionsNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/HostDescriptionsNode.java Tue Jan 17 15:11:10 2012
@@ -28,9 +28,9 @@ import javax.swing.Icon;
 import javax.swing.JTree;
 import javax.swing.tree.TreeNode;
 
+import org.apache.airavata.common.registry.api.exception.RegistryException;
 import org.apache.airavata.commons.gfac.type.HostDescription;
-import org.apache.airavata.registry.api.Registry;
-import org.apache.airavata.registry.api.exception.RegistryException;
+import org.apache.airavata.registry.api.AiravataRegistry;
 import org.apache.airavata.xbaya.appwrapper.HostDescriptionDialog;
 import org.apache.airavata.xbaya.registrybrowser.menu.AbstractBrowserActionItem;
 import org.apache.airavata.xbaya.registrybrowser.menu.AddAction;
@@ -98,7 +98,7 @@ public class HostDescriptionsNode extend
     private void deleteHostDescription(JTree tree) throws Exception {
         if (askQuestion("Host descriptions",
                 "Are you sure that you want to remove all host descriptions in this registry?")) {
-            Registry registry = getRegistry();
+            AiravataRegistry registry = getRegistry();
             List<HostDescription> descriptions = getHostDescriptions().getDescriptions();
             for (HostDescription descriptionWrap : descriptions) {
                 registry.deleteHostDescription(descriptionWrap.getType().getHostName());

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=1232437&r1=1232436&r2=1232437&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 Tue Jan 17 15:11:10 2012
@@ -28,7 +28,7 @@ import java.util.List;
 import javax.swing.Icon;
 import javax.swing.tree.TreeNode;
 
-import org.apache.airavata.registry.api.Registry;
+import org.apache.airavata.registry.api.AiravataRegistry;
 import org.apache.airavata.xbaya.XBayaEngine;
 import org.apache.airavata.xbaya.registrybrowser.menu.AbstractBrowserActionItem;
 import org.apache.airavata.xbaya.registrybrowser.menu.RefreshAction;
@@ -40,7 +40,7 @@ import org.apache.airavata.xbaya.registr
 import org.apache.airavata.xbaya.registrybrowser.model.XBayaWorkflowTemplates;
 
 public class RegistryNode extends AbstractAiravataTreeNode {
-    private Registry registry;
+    private AiravataRegistry registry;
     private XBayaEngine engine;
 
     public RegistryNode(XBayaEngine engine, TreeNode parent) {
@@ -67,11 +67,11 @@ public class RegistryNode extends Abstra
         return getTreeNodeList(children.toArray(), this);
     }
 
-    public Registry getRegistry() {
+    public AiravataRegistry getRegistry() {
         return registry;
     }
 
-    public void setRegistry(Registry registry) {
+    public void setRegistry(AiravataRegistry registry) {
         this.registry = registry;
     }
 

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionNode.java?rev=1232437&r1=1232436&r2=1232437&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionNode.java Tue Jan 17 15:11:10 2012
@@ -29,8 +29,8 @@ import javax.swing.Icon;
 import javax.swing.JTree;
 import javax.swing.tree.TreeNode;
 
+import org.apache.airavata.common.registry.api.exception.RegistryException;
 import org.apache.airavata.commons.gfac.type.ServiceDescription;
-import org.apache.airavata.registry.api.exception.RegistryException;
 import org.apache.airavata.xbaya.appwrapper.ServiceDescriptionDialog;
 import org.apache.airavata.xbaya.registrybrowser.menu.AbstractBrowserActionItem;
 import org.apache.airavata.xbaya.registrybrowser.menu.DeleteAction;

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionsNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionsNode.java?rev=1232437&r1=1232436&r2=1232437&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionsNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionsNode.java Tue Jan 17 15:11:10 2012
@@ -28,9 +28,9 @@ import javax.swing.Icon;
 import javax.swing.JTree;
 import javax.swing.tree.TreeNode;
 
+import org.apache.airavata.common.registry.api.exception.RegistryException;
 import org.apache.airavata.commons.gfac.type.ServiceDescription;
-import org.apache.airavata.registry.api.Registry;
-import org.apache.airavata.registry.api.exception.RegistryException;
+import org.apache.airavata.registry.api.AiravataRegistry;
 import org.apache.airavata.xbaya.appwrapper.ServiceDescriptionDialog;
 import org.apache.airavata.xbaya.registrybrowser.menu.AbstractBrowserActionItem;
 import org.apache.airavata.xbaya.registrybrowser.menu.AddAction;
@@ -98,7 +98,7 @@ public class ServiceDescriptionsNode ext
     private void deleteServiceDescription(JTree tree) throws Exception {
         if (askQuestion("Service descriptions",
                 "Are you sure that you want to remove all service descriptions in this registry?")) {
-            Registry registry = getRegistry();
+            AiravataRegistry registry = getRegistry();
             List<ServiceDescription> descriptions = getServiceDescriptions().getDescriptions();
             for (ServiceDescription descriptionWrap : descriptions) {
                 registry.deleteServiceDescription(descriptionWrap.getType().getName());

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/RegistryServiceTest.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/RegistryServiceTest.java?rev=1232437&r1=1232436&r2=1232437&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/RegistryServiceTest.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/RegistryServiceTest.java Tue Jan 17 15:11:10 2012
@@ -21,12 +21,21 @@
 
 package org.apache.airavata.xbaya.interpreter;
 
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.fail;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.jcr.RepositoryException;
+
+import org.apache.airavata.common.registry.api.exception.RegistryException;
 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.exception.RegistryException;
 import org.apache.airavata.registry.api.exception.ServiceDescriptionRetrieveException;
-import org.apache.airavata.registry.api.impl.JCRRegistry;
+import org.apache.airavata.registry.api.impl.AiravataJCRRegistry;
 import org.apache.airavata.schemas.gfac.ApplicationDeploymentDescriptionType;
 import org.apache.airavata.schemas.gfac.InputParameterType;
 import org.apache.airavata.schemas.gfac.OutputParameterType;
@@ -36,23 +45,17 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
-import javax.jcr.RepositoryException;
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.junit.Assert.*;
-
 public class RegistryServiceTest {
     @Rule
     public ExpectedException exception = ExpectedException.none();
 
-    public JCRRegistry jcrRegistry = null;
+    public AiravataJCRRegistry jcrRegistry = null;
 
     @Before
     public void testExecute() throws RegistryException {
 
         try {
-            jcrRegistry = new JCRRegistry(null, "org.apache.jackrabbit.core.RepositoryFactoryImpl", "admin", "admin",
+            jcrRegistry = new AiravataJCRRegistry(null, "org.apache.jackrabbit.core.RepositoryFactoryImpl", "admin", "admin",
                     null);
         } catch (RepositoryException e) {
             fail("Failed creating the JCR Registry");

Propchange: incubator/airavata/trunk/samples/complex-math-service/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Jan 17 15:11:10 2012
@@ -0,0 +1,4 @@
+target
+.classpath
+.project
+.settings

Propchange: incubator/airavata/trunk/samples/levenshtein-distance-service/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Jan 17 15:11:10 2012
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target



Mime
View raw message