Return-Path: X-Original-To: apmail-airavata-commits-archive@www.apache.org Delivered-To: apmail-airavata-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E8401E802 for ; Wed, 23 Jan 2013 15:05:59 +0000 (UTC) Received: (qmail 25663 invoked by uid 500); 23 Jan 2013 15:05:59 -0000 Delivered-To: apmail-airavata-commits-archive@airavata.apache.org Received: (qmail 24138 invoked by uid 500); 23 Jan 2013 15:05:54 -0000 Mailing-List: contact commits-help@airavata.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@airavata.apache.org Delivered-To: mailing list commits@airavata.apache.org Received: (qmail 24109 invoked by uid 99); 23 Jan 2013 15:05:53 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Jan 2013 15:05:53 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Jan 2013 15:05:50 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 3D1012388A32; Wed, 23 Jan 2013 15:05:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1437443 - /airavata/trunk/modules/rest/webapp/src/main/resources/airavata-server.properties Date: Wed, 23 Jan 2013 15:05:30 -0000 To: commits@airavata.apache.org From: lahiru@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130123150530.3D1012388A32@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: lahiru Date: Wed Jan 23 15:05:29 2013 New Revision: 1437443 URL: http://svn.apache.org/viewvc?rev=1437443&view=rev Log: keeping same airavata-server.properties. Modified: airavata/trunk/modules/rest/webapp/src/main/resources/airavata-server.properties 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=1437443&r1=1437442&r2=1437443&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 Wed Jan 23 15:05:29 2013 @@ -43,34 +43,41 @@ port=8080 ########################################################################### # Airavata Registry Configuration ########################################################################### - -#registry.user=admin -#registry.password=admin -gateway.id=default -#registry.jdbc.user=airavata -#registry.jdbc.password=airavata -#start.derby.server.mode=true - system.gateway=default system.user=admin system.password=admin - -#for mysql - #registry.jdbc.driver=com.mysql.jdbc.Driver +#for derby [AiravataJPARegistry] +registry.jdbc.driver=org.apache.derby.jdbc.ClientDriver +registry.jdbc.url=jdbc:derby://localhost:1527/persistent_data;create=true;user=airavata;password=airavata +# MySql database configuration +#registry.jdbc.driver=com.mysql.jdbc.Driver #registry.jdbc.url=jdbc:mysql://localhost:3306/persistent_data +registry.jdbc.user=airavata +registry.jdbc.password=airavata +start.derby.server.mode=true +default.registry.user=admin +default.registry.password=admin +default.registry.password.hash.method=SHA +default.registry.gateway=default +#for rest [RegistryClient] +#registry.jdbc.url=http://localhost:9080/airavata-services -#for derby -#registry.jdbc.driver=org.apache.derby.jdbc.ClientDriver -#registry.jdbc.url=jdbc:derby://localhost:1527/persistent_data;create=true;user=airavata;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 +#class.published.workflow.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry ########################################################################### # Airavata Workflow Interpreter Configurations ########################################################################### -runInThread=false +runInThread=true provenance=true provenanceWriterThreadPoolSize=20 -gfac.embedded=false +gfac.embedded=true # # Security Configuration used by Airavata Generic Factory Service @@ -125,6 +132,9 @@ msgBox.jdbc.url=jdbc:derby:wsmg;create=t # Advance configuration to change service implementations ########################################################################### +#Update the server context root path if airavata server is deployed under a different context root other than axis2 +#server.context-root=axis2 + # # Class which implemented Scheduler interface. It will be used to determine a Provider # @@ -199,28 +209,6 @@ messagePerservationIntervalMinutes=0 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----------------------### - -#for mysql [AiravataJPARegistry] -#registry.jdbc.driver=com.mysql.jdbc.Driver -#registry.jdbc.url=jdbc:mysql://localhost:3306/persistent_data -#for derby [AiravataJPARegistry] -registry.jdbc.driver=org.apache.derby.jdbc.ClientDriver -registry.jdbc.url=jdbc:derby://localhost:1527/persistent_data;create=true;user=airavata;password=airavata -registry.jdbc.user=airavata -registry.jdbc.password=airavata -default.registry.password.hash.method=SHA -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