Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/test/resources/registry.properties URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/test/resources/registry.properties?rev=1430436&r1=1430435&r2=1430436&view=diff ============================================================================== --- airavata/trunk/modules/registry/airavata-jpa-registry/src/test/resources/registry.properties (original) +++ airavata/trunk/modules/registry/airavata-jpa-registry/src/test/resources/registry.properties Tue Jan 8 18:39:51 2013 @@ -53,3 +53,11 @@ default.registry.gateway=default #for rest [RegistryClient] #registry.jdbc.url=http://localhost:9080/airavata-services +#user defined registry accessor classes +#class.provenance.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry +#class.configuration.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry +#class.descriptor.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry +#class.project.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry +#class.user.workflow.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry +#class.published.workflow.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry +
Modified: airavata/trunk/modules/registry/airavata-registry-test/src/test/resources/registry.properties URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-registry-test/src/test/resources/registry.properties?rev=1430436&r1=1430435&r2=1430436&view=diff ============================================================================== --- airavata/trunk/modules/registry/airavata-registry-test/src/test/resources/registry.properties (original) +++ airavata/trunk/modules/registry/airavata-registry-test/src/test/resources/registry.properties Tue Jan 8 18:39:51 2013 @@ -53,3 +53,11 @@ default.registry.gateway=default #for rest [RegistryClient] #registry.jdbc.url=http://localhost:9080/airavata-services +#user defined registry accessor classes +#class.provenance.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry +#class.configuration.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry +#class.descriptor.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry +#class.project.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry +#class.user.workflow.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry +#class.published.workflow.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry + Modified: airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataRegistry2.java URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataRegistry2.java?rev=1430436&r1=1430435&r2=1430436&view=diff ============================================================================== --- airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataRegistry2.java (original) +++ airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataRegistry2.java Tue Jan 8 18:39:51 2013 @@ -21,6 +21,8 @@ package org.apache.airavata.registry.api; +import org.apache.airavata.registry.api.exception.RegistryException; + import java.net.URI; import java.util.Observable; @@ -38,7 +40,7 @@ public abstract class AiravataRegistry2 setCallback(callback); } - protected abstract void initialize(); + protected abstract void initialize() throws RegistryException; public Gateway getGateway() { return gateway; Modified: airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataRegistryFactory.java URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataRegistryFactory.java?rev=1430436&r1=1430435&r2=1430436&view=diff ============================================================================== --- airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataRegistryFactory.java (original) +++ airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataRegistryFactory.java Tue Jan 8 18:39:51 2013 @@ -48,10 +48,10 @@ public class AiravataRegistryFactory { * @throws RegistryAccessorInvalidException */ public static AiravataRegistry2 getRegistry(Gateway gateway, - AiravataUser user) throws RegistryAccessorNotFoundException, - RegistryAccessorUndefinedException, - RegistryAccessorInstantiateException, - AiravataConfigurationException, RegistryAccessorInvalidException { + AiravataUser user) throws RegistryException, + RegistryAccessorUndefinedException, + RegistryAccessorInstantiateException, + AiravataConfigurationException, RegistryAccessorInvalidException { return getRegistry(null, gateway, user, null); } @@ -70,10 +70,10 @@ public class AiravataRegistryFactory { * @throws RegistryAccessorInvalidException */ public static AiravataRegistry2 getRegistry(URI connectionURI, Gateway gateway, - AiravataUser user, PasswordCallback callback) throws RegistryAccessorNotFoundException, - RegistryAccessorUndefinedException, - RegistryAccessorInstantiateException, - AiravataConfigurationException, RegistryAccessorInvalidException { + AiravataUser user, PasswordCallback callback) throws RegistryException, + RegistryAccessorUndefinedException, + RegistryAccessorInstantiateException, + AiravataConfigurationException, RegistryAccessorInvalidException { Object registryObj = getRegistryClass(REGISTRY_ACCESSOR_CLASS); if (registryObj instanceof AiravataRegistry2) { AiravataRegistry2 registry = (AiravataRegistry2) registryObj; @@ -85,7 +85,7 @@ public class AiravataRegistryFactory { } /*** - * Given the key in the <code>REPOSITORY_PROPERTIES</code> file it will + * Given the key in the registry settings file it will * attempt to instantiate a class from the value of the property * * @param registryClassKey @@ -95,31 +95,31 @@ public class AiravataRegistryFactory { * @throws RegistryAccessorInstantiateException * @throws AiravataConfigurationException */ - private static Object getRegistryClass(String registryClassKey) + public static Object getRegistryClass(String registryClassKey) throws RegistryAccessorNotFoundException, RegistryAccessorUndefinedException, RegistryAccessorInstantiateException, AiravataConfigurationException { try { - String provRegAccessorClass = RegistrySettings.getSetting(REGISTRY_ACCESSOR_CLASS); - if (provRegAccessorClass == null) { + String regAccessorClass = RegistrySettings.getSetting(registryClassKey); + if (regAccessorClass == null) { throw new RegistryAccessorUndefinedException(); } else { try { Class<?> classInstance = AiravataRegistryFactory.class .getClassLoader().loadClass( - provRegAccessorClass); + regAccessorClass); return classInstance.newInstance(); } catch (ClassNotFoundException e) { throw new RegistryAccessorNotFoundException( - provRegAccessorClass, e); + regAccessorClass, e); } catch (InstantiationException e) { throw new RegistryAccessorInstantiateException( - provRegAccessorClass, e); + regAccessorClass, e); } catch (IllegalAccessException e) { throw new RegistryAccessorInstantiateException( - provRegAccessorClass, e); + regAccessorClass, e); } } } catch (RegistrySettingsException e) { Modified: airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataSubRegistry.java URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataSubRegistry.java?rev=1430436&r1=1430435&r2=1430436&view=diff ============================================================================== --- airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataSubRegistry.java (original) +++ airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataSubRegistry.java Tue Jan 8 18:39:51 2013 @@ -27,35 +27,71 @@ import org.apache.airavata.common.utils. public interface AiravataSubRegistry { - public abstract void setAiravataRegistry(AiravataRegistry2 registry); - - public abstract void setAiravataUser(AiravataUser user); - - public abstract void setGateway(Gateway gateway); - + /** + * Determines whether this registry is active. If true the registry is ready to do the + * transaction + * @return + */ + public abstract boolean isActive(); + + /** + * Set airavata registry instrance + * @param registry instance of <code>AiravataRegistry2</code> + */ + public abstract void setAiravataRegistry(AiravataRegistry2 registry); + + /** + * Set airavata user + * @param user current airavata registry user + */ + public abstract void setAiravataUser(AiravataUser user); + + /** + * Set gateway of the airavata system + * @param gateway airavata gateway + */ + public abstract void setGateway(Gateway gateway); + + /** + * Set connection url for the registry + * @param connectionURI connection url for the database + */ + public void setConnectionURI(URI connectionURI); + + /** + * Set custom <code>PasswordCallback</code> implementation class + * @param callback instance of PasswordCallback implementation + */ + public void setCallback(PasswordCallback callback); + + /** + * Retrieve the gateway of the airavata system + * @return gateway + */ public abstract Gateway getGateway(); + /** + * Retrieve the current registry user of the system + * @return current registry user + */ public abstract AiravataUser getAiravataUser(); /** - * Determines whether this registry is active. If true the registry is ready to do the - * transaction - * @return - */ - public abstract boolean isActive(); - - /** * Return the version of the Registry API - * @return + * @return version */ public Version getVersion(); - - public void setConnectionURI(URI connectionURI); - - public URI getConnectionURI(); - - public void setCallback(PasswordCallback callback); - - public PasswordCallback getCallback(); + + /** + * Retrieve connection URI for the database + * @return database connection URI + */ + public URI getConnectionURI(); + + /** + * Retrieve PasswordCallback implementation class + * @return PasswordCallback impl + */ + public PasswordCallback getCallback(); } \ No newline at end of file Modified: airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/util/RegistryConstants.java URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/util/RegistryConstants.java?rev=1430436&r1=1430435&r2=1430436&view=diff ============================================================================== --- airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/util/RegistryConstants.java (original) +++ airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/util/RegistryConstants.java Tue Jan 8 18:39:51 2013 @@ -25,5 +25,11 @@ public class RegistryConstants { public static final String KEY_DEFAULT_GATEWAY_ID = "gateway.id"; public static final String KEY_DEFAULT_REGISTRY_USER = "registry.user"; public static final String KEY_DEFAULT_REGISTRY_URL = "registry.jdbc.url"; + public static final String CONFIGURATION_REGISTRY_ACCESSOR_CLASS = "class.configuration.registry.accessor"; + public static final String DESCRIPTOR_REGISTRY_ACCESSOR_CLASS = "class.descriptor.registry.accessor"; + public static final String PROJECT_REGISTRY_ACCESSOR_CLASS = "class.project.registry.accessor"; + public static final String PROVENANCE_REGISTRY_ACCESSOR_CLASS = "class.provenance.registry.accessor"; + public static final String USER_WF_REGISTRY_ACCESSOR_CLASS = "class.user.workflow.registry.accessor"; + public static final String PUBLISHED_WF_REGISTRY_ACCESSOR_CLASS = "class.published.workflow.registry.accessor"; } Modified: airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/util/RegistrySettings.java URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/util/RegistrySettings.java?rev=1430436&r1=1430435&r2=1430436&view=diff ============================================================================== --- airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/util/RegistrySettings.java (original) +++ airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/util/RegistrySettings.java Tue Jan 8 18:39:51 2013 @@ -69,7 +69,8 @@ public class RegistrySettings { if (properties.containsKey(key)){ return properties.getProperty(key); } - throw new UnspecifiedRegistrySettingsException(key); + return null; +// throw new UnspecifiedRegistrySettingsException(key); } public static String getSetting(String key, String defaultValue){ Modified: airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/util/RegistryUtils.java URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/util/RegistryUtils.java?rev=1430436&r1=1430435&r2=1430436&view=diff ============================================================================== --- airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/util/RegistryUtils.java (original) +++ airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/util/RegistryUtils.java Tue Jan 8 18:39:51 2013 @@ -123,7 +123,9 @@ public class RegistryUtils { log.error("Error initializing AiravataRegistry2"); } catch (ServerSettingsException e) { log.error("Error initializing AiravataRegistry2",e); - } + } catch (RegistryException e) { + log.error("Error initializing AiravataRegistry2",e); + } return registry; } } Modified: airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/RegPoolUtils.java URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/RegPoolUtils.java?rev=1430436&r1=1430435&r2=1430436&view=diff ============================================================================== --- airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/RegPoolUtils.java (original) +++ airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/RegPoolUtils.java Tue Jan 8 18:39:51 2013 @@ -27,10 +27,7 @@ import org.apache.airavata.registry.api. import org.apache.airavata.registry.api.AiravataRegistryFactory; import org.apache.airavata.registry.api.AiravataUser; import org.apache.airavata.registry.api.Gateway; -import org.apache.airavata.registry.api.exception.RegistryAccessorInstantiateException; -import org.apache.airavata.registry.api.exception.RegistryAccessorInvalidException; -import org.apache.airavata.registry.api.exception.RegistryAccessorNotFoundException; -import org.apache.airavata.registry.api.exception.RegistryAccessorUndefinedException; +import org.apache.airavata.registry.api.exception.*; import javax.servlet.ServletContext; import java.util.Map; @@ -81,6 +78,8 @@ public class RegPoolUtils { e.printStackTrace(); } catch (AiravataConfigurationException e) { e.printStackTrace(); + } catch (RegistryException e) { + e.printStackTrace(); } return airavataRegistry; } Modified: airavata/trunk/modules/rest/webapp/src/main/resources/airavata-server.properties URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/webapp/src/main/resources/airavata-server.properties?rev=1430436&r1=1430435&r2=1430436&view=diff ============================================================================== --- airavata/trunk/modules/rest/webapp/src/main/resources/airavata-server.properties (original) +++ airavata/trunk/modules/rest/webapp/src/main/resources/airavata-server.properties Tue Jan 8 18:39:51 2013 @@ -216,3 +216,11 @@ start.derby.server.mode=true #for rest [RegistryClient] #registry.jdbc.url=http://localhost:9080/airavata-services +#user defined registry accessor classes +#class.provenance.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry +#class.configuration.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry +#class.descriptor.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry +#class.project.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry +#class.user.workflow.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry +#class.published.workflow.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry + Modified: airavata/trunk/modules/rest/webapp/src/main/resources/registry.properties URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/webapp/src/main/resources/registry.properties?rev=1430436&r1=1430435&r2=1430436&view=diff ============================================================================== --- airavata/trunk/modules/rest/webapp/src/main/resources/registry.properties (original) +++ airavata/trunk/modules/rest/webapp/src/main/resources/registry.properties Tue Jan 8 18:39:51 2013 @@ -48,3 +48,11 @@ start.derby.server.mode=true #for rest [RegistryClient] #registry.jdbc.url=http://localhost:9080/airavata-services + +#user defined registry accessor classes +#class.provenance.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry +#class.configuration.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry +#class.descriptor.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry +#class.project.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry +#class.user.workflow.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry +#class.published.workflow.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry Modified: airavata/trunk/modules/xbaya-gui/src/main/resources/airavata-client.properties URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/resources/airavata-client.properties?rev=1430436&r1=1430435&r2=1430436&view=diff ============================================================================== --- airavata/trunk/modules/xbaya-gui/src/main/resources/airavata-client.properties (original) +++ airavata/trunk/modules/xbaya-gui/src/main/resources/airavata-client.properties Tue Jan 8 18:39:51 2013 @@ -51,3 +51,10 @@ default.registry.gateway=default #for rest [RegistryClient] #registry.jdbc.url=http://localhost:9080/airavata-services +#user defined registry accessor classes +#class.provenance.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry +#class.configuration.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry +#class.descriptor.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry +#class.project.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry +#class.user.workflow.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry +#class.published.workflow.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry Modified: airavata/trunk/modules/xbaya-gui/src/main/resources/registry.properties URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/resources/registry.properties?rev=1430436&r1=1430435&r2=1430436&view=diff ============================================================================== --- airavata/trunk/modules/xbaya-gui/src/main/resources/registry.properties (original) +++ airavata/trunk/modules/xbaya-gui/src/main/resources/registry.properties Tue Jan 8 18:39:51 2013 @@ -53,3 +53,10 @@ default.registry.gateway=default #for rest [RegistryClient] #registry.jdbc.url=http://localhost:9080/airavata-services +#user defined registry accessor classes +#class.provenance.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry +#class.configuration.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry +#class.descriptor.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry +#class.project.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry +#class.user.workflow.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry +#class.published.workflow.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry Modified: airavata/trunk/samples/airavata-client/create-application/src/main/resources/registry.properties URL: http://svn.apache.org/viewvc/airavata/trunk/samples/airavata-client/create-application/src/main/resources/registry.properties?rev=1430436&r1=1430435&r2=1430436&view=diff ============================================================================== --- airavata/trunk/samples/airavata-client/create-application/src/main/resources/registry.properties (original) +++ airavata/trunk/samples/airavata-client/create-application/src/main/resources/registry.properties Tue Jan 8 18:39:51 2013 @@ -53,3 +53,11 @@ default.registry.gateway=default #for rest [RegistryClient] #registry.jdbc.url=http://localhost:9080/airavata-services +#user defined registry accessor classes +#class.provenance.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry +#class.configuration.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry +#class.descriptor.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry +#class.project.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry +#class.user.workflow.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry +#class.published.workflow.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry + Modified: airavata/trunk/samples/airavata-client/workflow-run/src/main/resources/registry.properties URL: http://svn.apache.org/viewvc/airavata/trunk/samples/airavata-client/workflow-run/src/main/resources/registry.properties?rev=1430436&r1=1430435&r2=1430436&view=diff ============================================================================== --- airavata/trunk/samples/airavata-client/workflow-run/src/main/resources/registry.properties (original) +++ airavata/trunk/samples/airavata-client/workflow-run/src/main/resources/registry.properties Tue Jan 8 18:39:51 2013 @@ -53,3 +53,11 @@ default.registry.gateway=default #for rest [RegistryClient] #registry.jdbc.url=http://localhost:9080/airavata-services +#user defined registry accessor classes +#class.provenance.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry +#class.configuration.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry +#class.descriptor.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry +#class.project.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry +#class.user.workflow.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry +#class.published.workflow.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry +
