Repository: airavata Updated Branches: refs/heads/master 1860a8ce2 -> 908132809
https://issues.apache.org/jira/browse/AIRAVATA-1051 Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/90813280 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/90813280 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/90813280 Branch: refs/heads/master Commit: 908132809b395a7419c6ff9756c26fa61e7dd01d Parents: 1860a8c Author: Saminda Wijeratne <[email protected]> Authored: Tue Mar 4 23:07:39 2014 -0500 Committer: Saminda Wijeratne <[email protected]> Committed: Tue Mar 4 23:07:39 2014 -0500 ---------------------------------------------------------------------- .../src/main/assembly/bin-assembly.xml | 35 +++++++++++--------- .../resources/conf/airavata-client.properties | 35 ++++++++++++-------- 2 files changed, 41 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/90813280/modules/distribution/airavata-client/src/main/assembly/bin-assembly.xml ---------------------------------------------------------------------- diff --git a/modules/distribution/airavata-client/src/main/assembly/bin-assembly.xml b/modules/distribution/airavata-client/src/main/assembly/bin-assembly.xml index 03664a8..073f140 100644 --- a/modules/distribution/airavata-client/src/main/assembly/bin-assembly.xml +++ b/modules/distribution/airavata-client/src/main/assembly/bin-assembly.xml @@ -96,21 +96,26 @@ <!--<include>com.amazonaws:aws-java-sdk</include> --> <!--<include>amazon:MapReduce.Service.Client</include> --> <include>net.java.dev.jets3t:jets3t</include> - <include>org.apache.airavata:airavata-registry-api</include> - <include>org.apache.airavata:airavata-workflow-execution-context</include> - <!--<include>org.apache.airavata:airavata-workflow-tracking</include> --> - <!--<include>org.apache.airavata:airavata-gfac-core</include> --> - <include>org.apache.airavata:airavata-messenger-client</include> - <include>org.apache.airavata:airavata-messenger-commons</include> - <include>org.apache.airavata:airavata-gfac-schema-utils</include> - <include>org.apache.airavata:airavata-common-utils</include> - <include>org.apache.airavata:airavata-workflow-model-core:jar</include> - <!--<include>org.apache.airavata:airavata-workflow-model-component:jar</include> --> - <include>org.apache.airavata:airavata-message-monitor:jar</include> - <include>org.apache.airavata:airavata-client-api:jar</include> - <include>org.apache.airavata:airavata-jpa-registry:jar</include> - <include>org.apache.airavata:airavata-rest-client:jar</include> - <include>org.apache.airavata:airavata-interpreter-service-client:jar</include> + <include>org.apache.airavata:airavata-orchestrator-core:jar</include> + <include>org.apache.airavata:airavata-registry-api:jar</include> + <include>org.apache.airavata:airavata-gfac-schema-utils:jar</include> + <include>org.apache.airavata:airavata-common-utils:jar</include> + <include>org.apache.airavata:airavata-workflow-execution-context:jar</include> + <include>org.apache.airavata:airavata-registry-cpi:jar</include> + <include>org.apache.airavata:airavata-jpa-registry:jar</include> + <include>org.apache.airavata:airavata-data-models:jar</include> + <include>org.apache.airavata:airavata-credential-store:jar</include> + <include>org.apache.airavata:airavata-gfac-core:jar</include> + <include>org.apache.airavata:airavata-client-api:jar</include> + <include>org.apache.airavata:airavata-message-monitor:jar</include> + <include>org.apache.airavata:airavata-workflow-model-core:jar</include> + <include>org.apache.airavata:airavata-messenger-commons:jar</include> + <include>org.apache.airavata:airavata-messenger-client:jar</include> + <include>org.apache.airavata:airavata-workflow-tracking:jar</include> + <include>org.apache.airavata:gsissh:jar</include> + <include>org.apache.airavata:airavata-model-utils:jar</include> + <include>org.apache.airavata:airavata-job-monitor:jar</include> + <include>org.apache.airavata:airavata-orchestrator-service:jar</include> <include>org.apache.openjpa:openjpa-all:jar</include> <include>xerces:xercesImpl:jar:2.9.1</include> <include>com.sun.jersey:jersey-json</include> http://git-wip-us.apache.org/repos/asf/airavata/blob/90813280/modules/distribution/airavata-client/src/main/resources/conf/airavata-client.properties ---------------------------------------------------------------------- diff --git a/modules/distribution/airavata-client/src/main/resources/conf/airavata-client.properties b/modules/distribution/airavata-client/src/main/resources/conf/airavata-client.properties index efc5893..ff4de88 100644 --- a/modules/distribution/airavata-client/src/main/resources/conf/airavata-client.properties +++ b/modules/distribution/airavata-client/src/main/resources/conf/airavata-client.properties @@ -27,11 +27,12 @@ ###---------------------------REGISTRY API IMPLEMENTATION---------------------------### -#class.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry -class.registry.accessor=org.apache.airavata.rest.client.RegistryClient +class.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry +#class.registry.accessor=org.apache.airavata.rest.client.RegistryClient ###---------------------REGISTRY API IMPLEMENTATION - CUSTOM SETTINGS----------------------### +########################Registry JPA Implementation Settings######################## #for mysql [AiravataJPARegistry] #registry.jdbc.driver=com.mysql.jdbc.Driver #registry.jdbc.url=jdbc:mysql://localhost:3306/persistent_data @@ -42,29 +43,35 @@ registry.jdbc.url=jdbc:derby://localhost:1527/persistent_data;create=true;user=a registry.jdbc.user=airavata registry.jdbc.password=airavata start.derby.server.mode=true + + validationQuery=SELECT 1 from Configuration -default.registry.user=admin +jpa.connection.properties=MaxActive=10,MaxIdle=5,MinIdle=2,MaxWait=60000,testWhileIdle=true,testOnBorrow=true +defauly.registry.user=admin default.registry.password=admin default.registry.password.hash.method=SHA default.registry.gateway=default -#for xbaya -xbaya.registry.user=admin -xbaya.registry.url=http://localhost:8080/airavata/services/registry -xbaya.default.gateway=default - -trust.store=aiaravata.jks -trust.store.password=airavata - #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 -# To make JPA accessor work you need to add OpenJPA jars and uncomment jpa.connection.properties #class.published.workflow.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry -#jpa.connection.properties=MaxActive=10,MaxIdle=5,MinIdle=2,MaxWait=60000 -#registry.service.wsdl=http://localhost:8080/airavata-server/services/RegistryService?wsdl +########################Registry Rest Implementation Settings######################## + +trust.store=aiaravata.jks +trust.store.password=airavata + +##################################################################################### + +#for xbaya +xbaya.registry.user=admin +xbaya.registry.url=http://localhost:8080/airavata/services/registry +xbaya.default.gateway=default + + +
