airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From samin...@apache.org
Subject svn commit: r1431129 - in /airavata/trunk/modules: commons/utils/src/main/java/org/apache/airavata/common/utils/ distribution/airavata-server/src/main/resources/conf/ integration-tests/src/test/resources/ registry/airavata-jpa-registry/src/test/resourc...
Date Wed, 09 Jan 2013 22:54:56 GMT
Author: samindaw
Date: Wed Jan  9 22:54:56 2013
New Revision: 1431129

URL: http://svn.apache.org/viewvc?rev=1431129&view=rev
Log:
removing unwanted reg properties files https://issues.apache.org/jira/browse/AIRAVATA-715

Added:
    airavata/trunk/modules/registry/airavata-jpa-registry/src/test/resources/airavata-client.properties
Removed:
    airavata/trunk/modules/distribution/airavata-server/src/main/resources/conf/registry.properties
    airavata/trunk/modules/integration-tests/src/test/resources/registry.properties
    airavata/trunk/modules/registry/airavata-jpa-registry/src/test/resources/registry.properties
    airavata/trunk/modules/xbaya-gui/src/main/resources/registry.properties
Modified:
    airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/AiravataUtils.java
    airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/ExecutionMode.java
    airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/util/RegistrySettings.java
    airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/MsgBoxServiceSkeleton.java

Modified: airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/AiravataUtils.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/AiravataUtils.java?rev=1431129&r1=1431128&r2=1431129&view=diff
==============================================================================
--- airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/AiravataUtils.java
(original)
+++ airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/AiravataUtils.java
Wed Jan  9 22:54:56 2013
@@ -40,7 +40,7 @@ public class AiravataUtils {
 	}
 	
 	public static boolean isClient(){
-		return getExecutionMode()!=ExecutionMode.SERVER;
+		return getExecutionMode()==ExecutionMode.CLIENT;
 	}
 	
 	public static void setExecutionAsServer(){

Modified: airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/ExecutionMode.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/ExecutionMode.java?rev=1431129&r1=1431128&r2=1431129&view=diff
==============================================================================
--- airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/ExecutionMode.java
(original)
+++ airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/ExecutionMode.java
Wed Jan  9 22:54:56 2013
@@ -23,5 +23,6 @@ package org.apache.airavata.common.utils
 
 public enum ExecutionMode {
 	CLIENT,
-	SERVER
+	SERVER,
+	UNKNOWN
 }

Added: airavata/trunk/modules/registry/airavata-jpa-registry/src/test/resources/airavata-client.properties
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/test/resources/airavata-client.properties?rev=1431129&view=auto
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/test/resources/airavata-client.properties
(added)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/test/resources/airavata-client.properties
Wed Jan  9 22:54:56 2013
@@ -0,0 +1,60 @@
+#
+#
+# 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.
+#
+
+###########################################################################
+#
+#  This properties file provides configuration for Airavata Clients: 
+#  XBaya and Airavata API
+#
+###########################################################################
+
+###---------------------------REGISTRY API IMPLEMENTATION---------------------------###
+
+#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
+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
+
+#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/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=1431129&r1=1431128&r2=1431129&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
Wed Jan  9 22:54:56 2013
@@ -41,8 +41,14 @@ public class RegistrySettings {
 		if (url == null) {
     		if (AiravataUtils.isServer()){
     			 url=RegistrySettings.class.getClassLoader().getResource(ApplicationSettings.SERVER_PROPERTIES);
+    		}else if (AiravataUtils.isClient()){
+        		url=RegistrySettings.class.getClassLoader().getResource(ApplicationSettings.CLIENT_PROPERTIES);
         	}else{
+        		//unknown execution mode... If so, first assume its client, if not server...
         		url=RegistrySettings.class.getClassLoader().getResource(ApplicationSettings.CLIENT_PROPERTIES);
+        		if (url==null){
+        			url=RegistrySettings.class.getClassLoader().getResource(ApplicationSettings.SERVER_PROPERTIES);
+        		}
         	}
 		}
         try {

Modified: airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/MsgBoxServiceSkeleton.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/MsgBoxServiceSkeleton.java?rev=1431129&r1=1431128&r2=1431129&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/MsgBoxServiceSkeleton.java
(original)
+++ airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/MsgBoxServiceSkeleton.java
Wed Jan  9 22:54:56 2013
@@ -57,7 +57,7 @@ public class MsgBoxServiceSkeleton imple
     public void init(ServiceContext context) throws AxisFault {
         this.storage = (MsgBoxStorage) context.getConfigurationContext().getProperty(
                 MsgBoxCommonConstants.MSGBOX_STORAGE);
-        logger.info("Starting cleanup thread for Message Box...");
+        logger.debug("Starting cleanup thread for Message Box...");
         deletingThread = new Thread(new DeleteOldMessageRunnable(context.getConfigurationContext().getProperty(ConfigKeys.MSG_PRESV_INTERVAL)));
         deletingThread.start();
     }



Mime
View raw message