You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sa...@apache.org on 2012/09/05 15:59:21 UTC

svn commit: r1381187 - in /incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api: AiravataRegistry2.java ConfigurationRegistry.java DescriptorRegistry.java ResourceMetadata.java

Author: samindaw
Date: Wed Sep  5 13:59:21 2012
New Revision: 1381187

URL: http://svn.apache.org/viewvc?rev=1381187&view=rev
Log:
adding configuration registry & resourcemetadata

Added:
    incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/ConfigurationRegistry.java   (with props)
    incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/ResourceMetadata.java   (with props)
Modified:
    incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataRegistry2.java
    incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/DescriptorRegistry.java

Modified: incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataRegistry2.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataRegistry2.java?rev=1381187&r1=1381186&r2=1381187&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataRegistry2.java (original)
+++ incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataRegistry2.java Wed Sep  5 13:59:21 2012
@@ -22,11 +22,11 @@
 package org.apache.airavata.registry.api;
 
 
-public abstract class AiravataRegistry2 implements DescriptorRegistry, ProjectsRegistry, PublishedWorkflowRegistry, UserWorkflowRegistry{
+public abstract class AiravataRegistry2 implements DescriptorRegistry, ProjectsRegistry, PublishedWorkflowRegistry, UserWorkflowRegistry, ConfigurationRegistry{
 	private Gateway gateway;
 	private AiravataUser user;
 	
-	public void preInitialize(Gateway gateway, AiravataUser user) {
+	protected void preInitialize(Gateway gateway, AiravataUser user) {
 		setGateway(gateway);
 		setUser(user);
 	}

Added: incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/ConfigurationRegistry.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/ConfigurationRegistry.java?rev=1381187&view=auto
==============================================================================
--- incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/ConfigurationRegistry.java (added)
+++ incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/ConfigurationRegistry.java Wed Sep  5 13:59:21 2012
@@ -0,0 +1,57 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.airavata.registry.api;
+
+import java.net.URI;
+import java.util.Date;
+import java.util.List;
+
+public interface ConfigurationRegistry extends AiravataSubRegistry {
+	public Object getConfiguration(String key);
+	public List<Object> getConfigurationList(String key);
+	public void setConfiguration(String key, String value, Date expire);
+	public void addConfiguration(String key, String value, Date expire);
+	public void removeAllConfiguration(String key);
+	public void removeConfiguration(String key, String value);
+	
+	public List<URI> getGFacURIs();
+	public List<URI> getWorkflowInterpreterURIs();
+	public URI getEventingServiceURI();
+	public URI getMessageBoxURI();
+	
+	public void addGFacURI(URI uri);
+	public void addWorkflowInterpreterURI(URI uri);
+	public void setEventingURI(URI uri);
+	public void setMessageBoxURI(URI uri);
+
+	public void addGFacURI(URI uri, Date expire);
+	public void addWorkflowInterpreterURI(URI uri, Date expire);
+	public void setEventingURI(URI uri, Date expire);
+	public void setMessageBoxURI(URI uri, Date expire);
+	
+	public void removeGFacURI(URI uri);
+	public void removeWorkflowInterpreterURI();
+	public void removeAllGFacURI(URI uri);
+	public void removeAllWorkflowInterpreterURI();
+	public void unsetEventingURI();
+	public void unsetMessageBoxURI();
+}

Propchange: incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/ConfigurationRegistry.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/DescriptorRegistry.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/DescriptorRegistry.java?rev=1381187&r1=1381186&r2=1381187&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/DescriptorRegistry.java (original)
+++ incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/DescriptorRegistry.java Wed Sep  5 13:59:21 2012
@@ -38,12 +38,14 @@ public interface DescriptorRegistry exte
 	public void updateHostDescriptor(HostDescription descriptor);
 	public HostDescription getHostDescriptor(String hostName);
 	public void removeHostDescriptor(String hostName);
+	public ResourceMetadata getHostDescriptorMetadata(String hostName);
 
 	//---------Service Descriptor data------------
 	public void addServiceDescriptor(ServiceDescription descriptor);
 	public void updateServiceDescriptor(ServiceDescription descriptor);
 	public ServiceDescription getServiceDescriptor(String serviceName);
 	public void removeServiceDescriptor(String serviceName);
+	public ResourceMetadata getServiceDescriptorMetadata(String serviceName);
 	
 	//---------Service Descriptor data------------
 	public void addApplicationDescriptor(ServiceDescription serviceDescription, HostDescription hostDescriptor, ApplicationDeploymentDescription descriptor);
@@ -53,6 +55,7 @@ public interface DescriptorRegistry exte
 	public ApplicationDeploymentDescription getApplicationDescriptors(String serviceName, String hostname);
 	public Map<String,ApplicationDeploymentDescription> getApplicationDescriptors(String serviceName);
 	public void removeApplicationDescriptor(String serviceName, String hostName, String applicationName);
+	public ResourceMetadata getApplicationDescriptorMetadata(String serviceName, String hostName, String applicationName);
 
 
 }

Added: incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/ResourceMetadata.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/ResourceMetadata.java?rev=1381187&view=auto
==============================================================================
--- incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/ResourceMetadata.java (added)
+++ incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/ResourceMetadata.java Wed Sep  5 13:59:21 2012
@@ -0,0 +1,70 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.airavata.registry.api;
+
+import java.util.Date;
+
+public class ResourceMetadata {
+	
+	/**
+	 * Note: not all the following properties will be available for
+	 * a resource
+	 */
+	
+	private AiravataUser createdUser;
+	private AiravataUser lastUpdatedUser;
+	
+	private Date createdDate;
+	private Date lastUpdatedDate;
+	private String revision;
+	
+	public AiravataUser getCreatedUser() {
+		return createdUser;
+	}
+	public void setCreatedUser(AiravataUser createdUser) {
+		this.createdUser = createdUser;
+	}
+	public AiravataUser getLastUpdatedUser() {
+		return lastUpdatedUser;
+	}
+	public void setLastUpdatedUser(AiravataUser lastUpdatedUser) {
+		this.lastUpdatedUser = lastUpdatedUser;
+	}
+	public Date getCreatedDate() {
+		return createdDate;
+	}
+	public void setCreatedDate(Date createdDate) {
+		this.createdDate = createdDate;
+	}
+	public Date getLastUpdatedDate() {
+		return lastUpdatedDate;
+	}
+	public void setLastUpdatedDate(Date lastUpdatedDate) {
+		this.lastUpdatedDate = lastUpdatedDate;
+	}
+	public String getRevision() {
+		return revision;
+	}
+	public void setRevision(String revision) {
+		this.revision = revision;
+	}
+}

Propchange: incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/ResourceMetadata.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain