airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sma...@apache.org
Subject svn commit: r1399404 - in /airavata/trunk: modules/airavata-client/src/test/java/org/apache/airavata/client/airavata/ modules/airavata-client/src/test/resources/ modules/commons/ modules/commons/utils/src/main/java/org/apache/airavata/common/utils/ mod...
Date Wed, 17 Oct 2012 19:41:24 GMT
Author: smarru
Date: Wed Oct 17 19:41:21 2012
New Revision: 1399404

URL: http://svn.apache.org/viewvc?rev=1399404&view=rev
Log:
Unified the property files and removed all duplicates as discussed in AIRAVATA-383

Added:
    airavata/trunk/modules/airavata-client/src/test/resources/airavata-client.properties
    airavata/trunk/modules/registry/airavata-jpa-registry/src/test/resources/airavata-server.properties
      - copied, changed from r1398969, airavata/trunk/modules/registry/airavata-jpa-registry/src/test/resources/repository.properties
    airavata/trunk/modules/registry/airavata-registry-test/src/test/resources/airavata-server.properties
      - copied, changed from r1399374, airavata/trunk/modules/registry/airavata-registry-test/src/test/resources/repository.properties
    airavata/trunk/modules/ws-messenger/messagebox/src/test/resources/airavata-server.properties
    airavata/trunk/modules/ws-messenger/messagebroker/src/test/resources/airavata-server.properties
    airavata/trunk/modules/xbaya-gui/src/main/resources/airavata-server.properties
    airavata/trunk/modules/xbaya-gui/src/test/resources/airavata-server.properties
Removed:
    airavata/trunk/modules/airavata-client/src/test/resources/xbaya.properties
    airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/util/ConfigKeys.java
    airavata/trunk/modules/commons/workflow-tracking/src/main/resources/workflow_tracking.properties
    airavata/trunk/modules/distribution/src/main/resources/conf/repository.properties
    airavata/trunk/modules/distribution/src/main/resources/conf/xbaya.properties
    airavata/trunk/modules/registry/airavata-jpa-registry/src/test/resources/repository.properties
    airavata/trunk/modules/registry/airavata-registry-test/src/test/resources/repository.properties
    airavata/trunk/modules/ws-messenger/distribution/src/main/resources/msgBox.properties
    airavata/trunk/modules/ws-messenger/distribution/src/main/resources/msgBroker.properties
    airavata/trunk/modules/ws-messenger/messagebox/src/test/resources/conf/
    airavata/trunk/modules/ws-messenger/messagebroker/src/test/resources/conf/
    airavata/trunk/modules/xbaya-gui/src/test/resources/conf/
    airavata/trunk/modules/xbaya-gui/src/test/resources/xbaya.properties
Modified:
    airavata/trunk/modules/airavata-client/src/test/java/org/apache/airavata/client/airavata/AiravataClientTest.java
    airavata/trunk/modules/commons/pom.xml
    airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/ServiceUtils.java
    airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/samples/listener/Listener.java
    airavata/trunk/modules/distribution/src/main/assembly/bin-assembly.xml
    airavata/trunk/modules/distribution/src/main/resources/conf/airavata-server.properties
    airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/GFacService.java
    airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/reciever/GFacMessageReciever.java
    airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/GfacAPI.java
    airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/services/impl/PropertiesBasedServiceImpl.java
    airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/AiravataRegistryConnectionDataProviderImpl.java
    airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java
    airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/util/Initialize.java
    airavata/trunk/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/RegistryService.java
    airavata/trunk/modules/registry/airavata-registry-test/src/test/java/org/apache/airavata/registry/api/test/util/Initialize.java
    airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataRegistryFactory.java
    airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/RegistryAccessorUndefinedException.java
    airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/registry/JCRComponentRegistry.java
    airavata/trunk/modules/ws-messenger/INSTALL.txt
    airavata/trunk/modules/ws-messenger/commons/src/main/java/org/apache/airavata/wsmg/commons/WsmgCommonConstants.java
    airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/MsgBoxServiceLifeCycle.java
    airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/Storage/dbpool/DatabaseStorageImpl.java
    airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/Storage/memory/InMemoryImpl.java
    airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/util/ConfigKeys.java
    airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/BrokerServiceLifeCycle.java
    airavata/trunk/modules/ws-messenger/messagebroker/src/main/resources/services.xml
    airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/util/TestUtilServer.java
    airavata/trunk/modules/ws-messenger/samples/messagebox/messagebox-create-store-take-delete/src/org/apache/airavata/wsmg/samples/msgBox/SimpleMsgBoxExec.java
    airavata/trunk/modules/ws-messenger/samples/messagebroker/wnt-multiple-producers-consumers-topics/src/org/apache/airavata/wsmg/samples/wse/MultipleProducersConsumersTopics.java
    airavata/trunk/modules/ws-messenger/samples/messagebroker/wse-multiple-producers-consumers-topics/src/org/apache/airavata/wsmg/samples/wse/MultipleProducersConsumersTopics.java
    airavata/trunk/modules/ws-messenger/samples/messagebroker/wse-multiple-producers-consumers-xpath/src/org/apache/airavata/wsmg/samples/wse/MultipleProducersConsumers.java
    airavata/trunk/modules/ws-messenger/samples/messagebroker/wse-multiple-producers-consumers/src/org/apache/airavata/wsmg/samples/wse/MultipleProducersConsumers.java
    airavata/trunk/modules/ws-messenger/samples/messagebroker/wse-round-trip/src/org/apache/airavata/wsmg/samples/wse/WSERoundTrip.java
    airavata/trunk/modules/ws-messenger/samples/messagebroker/wse-topic-subscription/src/org/apache/airavata/wsmg/samples/wse/TopicSubscribe.java
    airavata/trunk/modules/ws-messenger/samples/messagebroker/wse-xpath-subscription/src/org/apache/airavata/wsmg/samples/wse/XpathSubscribe.java
    airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java
    airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/GenericInvoker.java
    airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/monitor/MonitorEventHandler.java
    airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/utils/TestUtilServer.java
    airavata/trunk/samples/workflow-tracking/simple-service-tracking/src/workflowtracking/samples/invoke/SimpleWorkflowTracker.java

Modified: airavata/trunk/modules/airavata-client/src/test/java/org/apache/airavata/client/airavata/AiravataClientTest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/test/java/org/apache/airavata/client/airavata/AiravataClientTest.java?rev=1399404&r1=1399403&r2=1399404&view=diff
==============================================================================
--- airavata/trunk/modules/airavata-client/src/test/java/org/apache/airavata/client/airavata/AiravataClientTest.java (original)
+++ airavata/trunk/modules/airavata-client/src/test/java/org/apache/airavata/client/airavata/AiravataClientTest.java Wed Oct 17 19:41:21 2012
@@ -27,7 +27,7 @@ public class AiravataClientTest {
     @Test
 	public void testInvokeWorkflowString() {
 //        try {
-//            AiravataClient airavataClient = new AiravataClient("xbaya.properties");
+//            AiravataClient airavataClient = new AiravataClient("airavata-client.properties");
 //            List<String> workflowTemplateIds = airavataClient.getWorkflowTemplateIds();
 //            for(String eachId:workflowTemplateIds){
 //                List<WorkflowInput> workflowInputs = airavataClient.getWorkflowInputs(eachId);

Added: airavata/trunk/modules/airavata-client/src/test/resources/airavata-client.properties
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/test/resources/airavata-client.properties?rev=1399404&view=auto
==============================================================================
--- airavata/trunk/modules/airavata-client/src/test/resources/airavata-client.properties (added)
+++ airavata/trunk/modules/airavata-client/src/test/resources/airavata-client.properties Wed Oct 17 19:41:21 2012
@@ -0,0 +1,45 @@
+#
+#
+# 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
+#
+###########################################################################
+
+#
+# Accessing Airavata Registry Configuration
+# For 0.5 release the data case information is required. For 0.6 and beyond
+# the clients should only need Registry Service End Points.
+#
+registry.user=admin
+registry.password=admin
+gateway.id=default
+registry.jdbc.user=airavata
+registry.jdbc.password=airavata
+
+#for mysql
+#registry.jdbc.driver=com.mysql.jdbc.Driver
+#registry.jdbc.url=jdbc:mysql://localhost:3306/persistent_data
+
+#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

Modified: airavata/trunk/modules/commons/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/commons/pom.xml?rev=1399404&r1=1399403&r2=1399404&view=diff
==============================================================================
--- airavata/trunk/modules/commons/pom.xml (original)
+++ airavata/trunk/modules/commons/pom.xml Wed Oct 17 19:41:21 2012
@@ -34,7 +34,7 @@
                 <module>gfac-schema</module>
                 <module>utils</module>
                 <module>workflow-execution-context</module>
-		<module>provenance-registry</module>
+				<module>provenance-registry</module>
             </modules>
         </profile>
     </profiles>

Modified: airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/ServiceUtils.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/ServiceUtils.java?rev=1399404&r1=1399403&r2=1399404&view=diff
==============================================================================
--- airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/ServiceUtils.java (original)
+++ airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/ServiceUtils.java Wed Oct 17 19:41:21 2012
@@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory;
 
 public class ServiceUtils {
     private static final Logger log = LoggerFactory.getLogger(ServiceUtils.class);
-    private static final String REPOSITORY_PROPERTIES = "repository.properties";
+    private static final String REPOSITORY_PROPERTIES = "airavata-server.properties";
     public static final String IP = "ip";
     public static final String PORT = "port";
 

Modified: airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/samples/listener/Listener.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/samples/listener/Listener.java?rev=1399404&r1=1399403&r2=1399404&view=diff
==============================================================================
--- airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/samples/listener/Listener.java (original)
+++ airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/samples/listener/Listener.java Wed Oct 17 19:41:21 2012
@@ -21,15 +21,11 @@
 
 package org.apache.airavata.workflow.tracking.samples.listener;
 
-import java.io.IOException;
 import java.io.StringReader;
-import java.net.URL;
-import java.util.Properties;
 
 import org.apache.airavata.commons.WorkFlowUtils;
 import org.apache.airavata.workflow.tracking.client.LeadNotificationManager;
 import org.apache.airavata.workflow.tracking.client.Subscription;
-import org.apache.airavata.workflow.tracking.util.ConfigKeys;
 import org.apache.airavata.wsmg.client.WseMsgBrokerClient;
 import org.apache.axiom.om.OMAbstractFactory;
 import org.apache.axiom.om.OMElement;
@@ -73,13 +69,6 @@ public class Listener {
         // Inthis sample we emulate it by manually publishing notifications
 
         // created a publisher
-        URL configURL = ClassLoader.getSystemResource(ConfigKeys.CONFIG_FILE_NAME);
-        Properties configs = new Properties();
-        try {
-            configs.load(configURL.openStream());
-        } catch (IOException e1) {
-            e1.printStackTrace();
-        }
 
         WseMsgBrokerClient publisher = new WseMsgBrokerClient();
         EndpointReference endpointRef = publisher.createEndpointReference(brokerLocation, topic);

Modified: airavata/trunk/modules/distribution/src/main/assembly/bin-assembly.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/src/main/assembly/bin-assembly.xml?rev=1399404&r1=1399403&r2=1399404&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/src/main/assembly/bin-assembly.xml (original)
+++ airavata/trunk/modules/distribution/src/main/assembly/bin-assembly.xml Wed Oct 17 19:41:21 2012
@@ -153,14 +153,7 @@
             <directory>../distribution/src/main/resources/conf</directory>
             <outputDirectory>standalone-server/conf</outputDirectory>
             <includes>
-                <include>xbaya.properties</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>../distribution/src/main/resources/conf</directory>
-            <outputDirectory>standalone-server/conf</outputDirectory>
-            <includes>
-                <include>jcr.properties</include>
+                <include>airavata-server.properties</include>
             </includes>
         </fileSet>
         <fileSet>

Modified: airavata/trunk/modules/distribution/src/main/resources/conf/airavata-server.properties
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/src/main/resources/conf/airavata-server.properties?rev=1399404&r1=1399403&r2=1399404&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/src/main/resources/conf/airavata-server.properties (original)
+++ airavata/trunk/modules/distribution/src/main/resources/conf/airavata-server.properties Wed Oct 17 19:41:21 2012
@@ -25,21 +25,25 @@
 #
 ###########################################################################
 
-#
-#Airavata Axis2-Tomcat Server Configuration
-#
-#By default, tomcat runs on port 80. If the port is changed, it will be have 
-# to be specified with port properties. This will be picked up by the registry
-# service to register the service end-points.
+###########################################################################
+# Airavata Axis2-Tomcat Server Configuration
+###########################################################################
+# By default, tomcat runs on port 80. If the port is changed, it will be  
+#  have to be specified with port properties. This will be picked up by 
+#  the registry service to register the service end-points.
+
 port=8080
-# Axis2 server automatically picks up IP address from axisconfiguration, but some
-#  DHCP do not report correct ip addresses, in which case, the IP address can be 
-#  manually specified. 
+
+# Axis2 server automatically picks up IP address from axis configuration, 
+#  but some DHCP enables machines do not report correct ip addresses,  
+#  in which case, the IP address can be manually specified. 
+
 #ip=192.2.33.12 
 
-#
-#Airavata Registry Configuration
-#
+###########################################################################
+# Airavata Registry Configuration
+###########################################################################
+
 registry.user=admin
 registry.password=admin
 gateway.id=default
@@ -54,9 +58,10 @@ registry.jdbc.password=airavata
 registry.jdbc.driver=org.apache.derby.jdbc.ClientDriver
 registry.jdbc.url=jdbc:derby://localhost:1527/persistent_data;create=true;user=airavata;password=airavata
 
-#
+###########################################################################
 # Airavata Workflow Interpreter Configurations
-#
+###########################################################################
+
 runInThread=false
 provenance=true
 provenanceWriterThreadPoolSize=20
@@ -67,7 +72,10 @@ gfac.embedded=false
 #  to interact with Computational Resources.
 #
 
-# MyProxy GSI credentials to access Grid Resources.
+###########################################################################
+# Airavata GFac MyProxy GSI credentials to access Grid Resources.
+###########################################################################
+
 myproxy.server=myproxy.teragrid.org
 myproxy.user=username
 myproxy.pass=password
@@ -80,10 +88,10 @@ trusted.cert.location=/path/to/trusted/c
 #ssh.keypass=
 #ssh.username=usernameAtHost
 
-#
-# Message Broker Basic Configurations, Please see Advanced section for more 
-#  detailed custom configuration properies.
-#
+###########################################################################
+# Airavata Message Broker Basic Configurations.
+#  the Advanced section provides detailed custom configuration properties.
+###########################################################################
 
 # Default derby database configuration
 broker.jdbc.driver=org.apache.derby.jdbc.EmbeddedDriver
@@ -95,10 +103,10 @@ broker.jdbc.url=jdbc:derby:wsmg;create=t
 #broker.jdbc.driver=com.mysql.jdbc.Driver
 #broker.jdbc.url=jdbc:mysql://localhost:3306/wsmg?user=airavata&password=airavata
 
-#
-# Message Box Basic Configurations, Please see Advanced section for more 
-#  detailed custom configuration properies.
-#
+###########################################################################
+# Airavata Message Box Basic Configurations, 
+#  the Advanced section provides detailed custom configuration properties.
+###########################################################################  
 
 # Default derby database
 msgBox.jdbc.driver=org.apache.derby.jdbc.EmbeddedDriver
@@ -109,7 +117,7 @@ msgBox.jdbc.url=jdbc:derby:wsmg;create=t
 #msgBox.jdbc.url=jdbc:mysql://localhost:3306/wsmg?user=airavata&password=airavata
 
 ###########################################################################
-# Advance configuration to change the implementations
+# Advance configuration to change service implementations
 ###########################################################################
 
 # By default all provenance data is also cataloged in Airavata Registry. 

Modified: airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/GFacService.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/GFacService.java?rev=1399404&r1=1399403&r2=1399404&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/GFacService.java (original)
+++ airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/GFacService.java Wed Oct 17 19:41:21 2012
@@ -60,7 +60,7 @@ public class GFacService implements Serv
 
     public static final String SECURITY_CONTEXT = "security_context";
 
-    public static final String REPOSITORY_PROPERTIES = "repository.properties";
+    public static final String REPOSITORY_PROPERTIES = "airavata-server.properties";
 
     public static final int GFAC_URL_UPDATE_INTERVAL = 1000 * 60 * 60 * 3;
 

Modified: airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/reciever/GFacMessageReciever.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/reciever/GFacMessageReciever.java?rev=1399404&r1=1399403&r2=1399404&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/reciever/GFacMessageReciever.java (original)
+++ airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/reciever/GFacMessageReciever.java Wed Oct 17 19:41:21 2012
@@ -80,7 +80,7 @@ public class GFacMessageReciever impleme
     public static final String MYPROXY_PASS = "myproxy.pass";
     public static final String MYPROXY_LIFE = "myproxy.life";
     public static final String GFAC_URL = "GFacURL";
-    public static final String REPOSITORY_PROPERTIES = "repository.properties";
+    public static final String REPOSITORY_PROPERTIES = "airavata-server.properties";
     private GFacConfiguration gfacContext;
     private GenericService service;
     private AiravataRegistry2 registry;

Modified: airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/GfacAPI.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/GfacAPI.java?rev=1399404&r1=1399403&r2=1399404&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/GfacAPI.java (original)
+++ airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/GfacAPI.java Wed Oct 17 19:41:21 2012
@@ -44,7 +44,7 @@ import java.net.URI;
 public class GfacAPI {
     private static final Logger log = LoggerFactory.getLogger(GfacAPI.class +
             "." + WorkflowContextHeaderBuilder.getCurrentContextHeader().getWorkflowMonitoringContext().getExperimentId());
-    public static final String REPOSITORY_PROPERTIES = "repository.properties";
+    public static final String REPOSITORY_PROPERTIES = "airavata-server.properties";
 
     public DefaultInvocationContext gridJobSubmit(JobContext jobContext,GFacConfiguration gfacConfig) throws Exception {
         String workflowNodeId = WorkflowContextHeaderBuilder.getCurrentContextHeader().getWorkflowMonitoringContext().getWorkflowNodeId();

Modified: airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/services/impl/PropertiesBasedServiceImpl.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/services/impl/PropertiesBasedServiceImpl.java?rev=1399404&r1=1399403&r2=1399404&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/services/impl/PropertiesBasedServiceImpl.java (original)
+++ airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/services/impl/PropertiesBasedServiceImpl.java Wed Oct 17 19:41:21 2012
@@ -55,7 +55,7 @@ import org.slf4j.LoggerFactory;
  */
 public class PropertiesBasedServiceImpl extends AbstractSimpleService {
 
-    public static final String REPOSITORY_PROPERTIES = "repository.properties";
+    public static final String REPOSITORY_PROPERTIES = "airavata-server.properties";
 
     private static Logger log = LoggerFactory.getLogger(PropertiesBasedServiceImpl.class+
             "." + WorkflowContextHeaderBuilder.getCurrentContextHeader().getWorkflowMonitoringContext().getExperimentId());

Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/AiravataRegistryConnectionDataProviderImpl.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/AiravataRegistryConnectionDataProviderImpl.java?rev=1399404&r1=1399403&r2=1399404&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/AiravataRegistryConnectionDataProviderImpl.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/AiravataRegistryConnectionDataProviderImpl.java Wed Oct 17 19:41:21 2012
@@ -16,13 +16,13 @@ public class AiravataRegistryConnectionD
 
     private final static Logger logger = LoggerFactory.getLogger(AiravataRegistryConnectionDataProviderImpl.class);
     public static Properties loadProperties(){
-        URL resource = Utils.class.getClassLoader().getResource("repository.properties");
+        URL resource = Utils.class.getClassLoader().getResource("airavata-server.properties");
         Properties properties = new Properties();
         try {
             properties.load(resource.openStream());
         } catch (IOException e) {
             e.printStackTrace();
-            logger.error("Unable to read repository properties " + e);
+            logger.error("Unable to read airavata-server.properties " + e);
 
         }
         return properties;

Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java?rev=1399404&r1=1399403&r2=1399404&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java Wed Oct 17 19:41:21 2012
@@ -55,12 +55,12 @@ public class Utils {
     private final static Logger logger = LoggerFactory.getLogger(Utils.class);
 
     public static Properties loadProperties(){
-        URL resource = Utils.class.getClassLoader().getResource("repository.properties");
+        URL resource = Utils.class.getClassLoader().getResource("airavata-server.properties");
         Properties properties = new Properties();
         try {
             properties.load(resource.openStream());
         } catch (IOException e) {
-            logger.error("Unable to read repository properties..", e);
+            logger.error("Unable to read airavata-server.properties ..", e);
         }
         return properties;
     }

Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/util/Initialize.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/util/Initialize.java?rev=1399404&r1=1399403&r2=1399404&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/util/Initialize.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/util/Initialize.java Wed Oct 17 19:41:21 2012
@@ -77,12 +77,12 @@ public class Initialize {
     public void initializeDB() {
         String jdbcUrl = null;
         String jdbcDriver = null;
-        URL resource = this.getClass().getClassLoader().getResource("repository.properties");
+        URL resource = this.getClass().getClassLoader().getResource("airavata-server.properties");
         Properties properties = new Properties();
         try {
             properties.load(resource.openStream());
         } catch (IOException e) {
-            System.out.println("Unable to read repository properties");
+            System.out.println("Unable to read airavata-server.properties");
         }
         jdbcDriver = properties.getProperty("registry.jdbc.driver");
         jdbcUrl = properties.getProperty("registry.jdbc.url");

Copied: airavata/trunk/modules/registry/airavata-jpa-registry/src/test/resources/airavata-server.properties (from r1398969, airavata/trunk/modules/registry/airavata-jpa-registry/src/test/resources/repository.properties)
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/test/resources/airavata-server.properties?p2=airavata/trunk/modules/registry/airavata-jpa-registry/src/test/resources/airavata-server.properties&p1=airavata/trunk/modules/registry/airavata-jpa-registry/src/test/resources/repository.properties&r1=1398969&r2=1399404&rev=1399404&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/test/resources/repository.properties (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/test/resources/airavata-server.properties Wed Oct 17 19:41:21 2012
@@ -19,63 +19,18 @@
 #
 #
 
-#
-# Properties for JCR Registry interface. By default, Apache Jackrabbit is used.
-#
-#jcr.class=org.apache.jackrabbit.core.RepositoryFactoryImpl
-jcr.class=org.apache.jackrabbit.rmi.repository.RmiRepositoryFactory
-org.apache.jackrabbit.repository.uri=http://localhost:8081/rmi
-jcr.user=admin
-jcr.pass=admin
-
-
-#
-# Class which implemented Scheduler interface. It will be used to determine a Provider
-#
-scheduler.class= org.apache.airavata.core.gfac.scheduler.impl.SchedulerImpl
-
-#
-# Data Service Plugins classes
-#
-datachain.classes= org.apache.airavata.core.gfac.extension.data.RegistryDataService
 
+###########################################################################
 #
-# Pre execution Plugins classes. For example, GridFTP Input Staging
+#  This properties file provides test configuration for JPA Registry 
+#   Please do not use this for any other configuration but test cases.
 #
-prechain.classes= org.apache.airavata.core.gfac.extension.pre.GridFtpInputStaging
-prechain.classes= org.apache.airavata.core.gfac.extension.pre.HttpInputStaging
+###########################################################################
 
-#
-# Post execution Plugins classes. For example, GridFTP Output Staging
-#
-postchain.classes= org.apache.airavata.core.gfac.extension.post.GridFtpOutputStaging
-postchain.classes= org.apache.airavata.core.gfac.extension.post.OutputRegister
-trusted.cert.location=/Users/lahirugunathilake/Downloads/certificates
-
-#Configuring your implementation for Provenance Registry, if you have a implementation for AiravataProvenanceRegstry put the
-#full qualified path name to property name class.provenance.registry.accessor,
-#We have a mysql JPA provenanceRegistry implementation built in but you can write your own
-#class.provenance.registry.accessor=org.apache.airavata.provenance.impl.jpa.AiravataJPAProvenanceRegistry
-
-#
-# SSH private key location. It will be used by SSHProvider
-#
-# ssh.key=/home/user/.ssh/id_rsa
-# ssh.keypass=
-# ssh.username=usernameAtHost
-
-#
-# MyProxy credential. It will be used by GridFTP Plugins and GramProvider.
-#
-myproxy.server=myproxy.teragrid.org
-myproxy.user=username
-myproxy.pass=password
-myproxy.life=3600
-#Port details will be used by gfac-axis2 when deployed on tomcat
-port=8080
-#ip=192.2.33.12 if you configure the ip we will pick this ip address rather picking it from axisconfiguration
+###########################################################################
+# Airavata Registry Configuration
+###########################################################################
 
-#Registry Configuration
 class.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
 registry.user=testUser
 registry.password=testUser

Modified: airavata/trunk/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/RegistryService.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/RegistryService.java?rev=1399404&r1=1399403&r2=1399404&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/RegistryService.java (original)
+++ airavata/trunk/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/RegistryService.java Wed Oct 17 19:41:21 2012
@@ -87,7 +87,7 @@ public class RegistryService implements 
     private void initializeDB() {
         String jdbcUrl = null;
         String jdbcDriver = null;
-        URL resource = this.getClass().getClassLoader().getResource("repository.properties");
+        URL resource = this.getClass().getClassLoader().getResource("airavata-server.properties");
         Properties properties = new Properties();
         try {
             properties.load(resource.openStream());

Modified: airavata/trunk/modules/registry/airavata-registry-test/src/test/java/org/apache/airavata/registry/api/test/util/Initialize.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-registry-test/src/test/java/org/apache/airavata/registry/api/test/util/Initialize.java?rev=1399404&r1=1399403&r2=1399404&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-registry-test/src/test/java/org/apache/airavata/registry/api/test/util/Initialize.java (original)
+++ airavata/trunk/modules/registry/airavata-registry-test/src/test/java/org/apache/airavata/registry/api/test/util/Initialize.java Wed Oct 17 19:41:21 2012
@@ -76,7 +76,7 @@ public class Initialize {
     public void initializeDB() {
         String jdbcUrl = null;
         String jdbcDriver = null;
-        URL resource = this.getClass().getClassLoader().getResource("repository.properties");
+        URL resource = this.getClass().getClassLoader().getResource("airavata-server.properties");
         Properties properties = new Properties();
         try {
             properties.load(resource.openStream());

Copied: airavata/trunk/modules/registry/airavata-registry-test/src/test/resources/airavata-server.properties (from r1399374, airavata/trunk/modules/registry/airavata-registry-test/src/test/resources/repository.properties)
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-registry-test/src/test/resources/airavata-server.properties?p2=airavata/trunk/modules/registry/airavata-registry-test/src/test/resources/airavata-server.properties&p1=airavata/trunk/modules/registry/airavata-registry-test/src/test/resources/repository.properties&r1=1399374&r2=1399404&rev=1399404&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-registry-test/src/test/resources/repository.properties (original)
+++ airavata/trunk/modules/registry/airavata-registry-test/src/test/resources/airavata-server.properties Wed Oct 17 19:41:21 2012
@@ -19,63 +19,10 @@
 #
 #
 
-#
-# Properties for JCR Registry interface. By default, Apache Jackrabbit is used.
-#
-#jcr.class=org.apache.jackrabbit.core.RepositoryFactoryImpl
-jcr.class=org.apache.jackrabbit.rmi.repository.RmiRepositoryFactory
-org.apache.jackrabbit.repository.uri=http://localhost:8081/rmi
-jcr.user=admin
-jcr.pass=admin
-
-
-#
-# Class which implemented Scheduler interface. It will be used to determine a Provider
-#
-scheduler.class= org.apache.airavata.core.gfac.scheduler.impl.SchedulerImpl
-
-#
-# Data Service Plugins classes
-#
-datachain.classes= org.apache.airavata.core.gfac.extension.data.RegistryDataService
-
-#
-# Pre execution Plugins classes. For example, GridFTP Input Staging
-#
-prechain.classes= org.apache.airavata.core.gfac.extension.pre.GridFtpInputStaging
-prechain.classes= org.apache.airavata.core.gfac.extension.pre.HttpInputStaging
-
-#
-# Post execution Plugins classes. For example, GridFTP Output Staging
-#
-postchain.classes= org.apache.airavata.core.gfac.extension.post.GridFtpOutputStaging
-postchain.classes= org.apache.airavata.core.gfac.extension.post.OutputRegister
-trusted.cert.location=/Users/lahirugunathilake/Downloads/certificates
-
-#Configuring your implementation for Provenance Registry, if you have a implementation for AiravataProvenanceRegstry put the
-#full qualified path name to property name class.provenance.registry.accessor,
-#We have a mysql JPA provenanceRegistry implementation built in but you can write your own
-#class.provenance.registry.accessor=org.apache.airavata.provenance.impl.jpa.AiravataJPAProvenanceRegistry
-
-#
-# SSH private key location. It will be used by SSHProvider
-#
-# ssh.key=/home/user/.ssh/id_rsa
-# ssh.keypass=
-# ssh.username=usernameAtHost
-
-#
-# MyProxy credential. It will be used by GridFTP Plugins and GramProvider.
-#
-myproxy.server=myproxy.teragrid.org
-myproxy.user=username
-myproxy.pass=password
-myproxy.life=3600
-#Port details will be used by gfac-axis2 when deployed on tomcat
-port=8080
-#ip=192.2.33.12 if you configure the ip we will pick this ip address rather picking it from axisconfiguration
+###########################################################################
+# Airavata Registry Configuration
+###########################################################################
 
-#Registry Configuration
 class.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
 registry.user=admin
 registry.password=admin
@@ -88,8 +35,8 @@ registry.jdbc.password=airavata
 #registry.jdbc.url=jdbc:mysql://localhost:3306/persistent_data
 
 #for derby
-#registry.jdbc.driver=org.apache.derby.jdbc.EmbeddedDriver
-registry.jdbc.driver=org.apache.derby.jdbc.ClientDriver
+registry.jdbc.driver=org.apache.derby.jdbc.EmbeddedDriver
+#registry.jdbc.driver=org.apache.derby.jdbc.ClientDriver
 #registry.jdbc.url=jdbc:derby://localhost:20000/memory:persistent_data;create=true;user=airavata;password=airavata
 registry.jdbc.url=jdbc:derby:memory:unit-testing;create=true;user=airavata;password=airavata
 

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=1399404&r1=1399403&r2=1399404&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 Wed Oct 17 19:41:21 2012
@@ -33,7 +33,7 @@ import org.apache.airavata.registry.api.
 
 public class AiravataRegistryFactory {
 
-	private static final String REPOSITORY_PROPERTIES = "repository.properties";
+	private static final String REPOSITORY_PROPERTIES = "airavata-server.properties";
 	private static final String REGISTRY_ACCESSOR_CLASS = "class.registry.accessor";
 	private static AiravataRegistryConnectionDataProvider dataProvider;
 

Modified: airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/RegistryAccessorUndefinedException.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/RegistryAccessorUndefinedException.java?rev=1399404&r1=1399403&r2=1399404&view=diff
==============================================================================
--- airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/RegistryAccessorUndefinedException.java (original)
+++ airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/RegistryAccessorUndefinedException.java Wed Oct 17 19:41:21 2012
@@ -26,7 +26,7 @@ public class RegistryAccessorUndefinedEx
 	private static final long serialVersionUID = -2679914107485739140L;
 
 	public RegistryAccessorUndefinedException() {
-		this("A registry accessor was not defined in the repository.properties");
+		this("A registry accessor was not defined in the airavata-server.properties");
 	}
 	
 	public RegistryAccessorUndefinedException(String message) {

Modified: airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/registry/JCRComponentRegistry.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/registry/JCRComponentRegistry.java?rev=1399404&r1=1399403&r2=1399404&view=diff
==============================================================================
--- airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/registry/JCRComponentRegistry.java (original)
+++ airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/registry/JCRComponentRegistry.java Wed Oct 17 19:41:21 2012
@@ -46,7 +46,7 @@ public class JCRComponentRegistry extend
 
     private static final Logger log = LoggerFactory.getLogger(JCRComponentRegistry.class);
     private static final String NAME = "Application Services";
-    public static final String REPOSITORY_PROPERTIES = "repository.properties";
+    public static final String REPOSITORY_PROPERTIES = "airavata-server.properties";
 
     private AiravataRegistry2 registry;
 

Modified: airavata/trunk/modules/ws-messenger/INSTALL.txt
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/INSTALL.txt?rev=1399404&r1=1399403&r2=1399404&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/INSTALL.txt (original)
+++ airavata/trunk/modules/ws-messenger/INSTALL.txt Wed Oct 17 19:41:21 2012
@@ -25,7 +25,7 @@ Maven (tested on v 3.0.2)
 Configure WS-Messenger messageBroker service.
 ----------------------------------------------
 Given below are the configurations for message broker service. configuration file should be named as
-"msgBroker.properties". This should be included in the class path (e.g. <BROKER_DISTRIBUTION_DIR>/standalone-server/conf) when broker starts.
+"airavata-server.properties". This should be included in the class path (e.g. <BROKER_DISTRIBUTION_DIR>/standalone-server/conf) when broker starts.
 
 Configuration	                Description
 =============================   ====================================
@@ -69,8 +69,7 @@ Run standalone version supplied with bin
 2. Change default configurations if needed.
 
 - configuration files is located at:
- <extracted location>/standalone-server/conf/msgBroker.properties
- <extracted location>/standalone-server/conf/msgBox.properties
+ <extracted location>/standalone-server/conf/airavata-server.properties
 
         Run axis2 server by running the command:
             Linux -
@@ -83,14 +82,13 @@ Run Ws-messenger using axis2 servlet
 (Tested on tomcat v 6.0.20 & axis2 v1.5.1)
 1. Copy broker aar file to axis2 distribution accordingly.
 2. Create database tables (Scripts can be found <extracted location>/bin/database_scripts)
-3. Set configurations appropriately and copy configuration file ( named msgBroker.properties) to
+3. Set configurations appropriately and copy configuration file ( named airavata-server.properties) to
 
     <Axis-servlet>/webapps/axis2/WEB-INF/classes
 
 Note: a sample configuration file is located at:
 
-<extracted location>/standalone-server/conf/msgBroker.properties
-<extracted location>/standalone-server/conf/msgBox.properties
+<extracted location>/standalone-server/conf/airavata-server.properties
 
 4. Start tomcat server.
 
@@ -103,9 +101,9 @@ Run Ws-messenger using a external axis2 
 1. Copy broker aar file to following location:
       <AXIS2_DIST_HOME>/repository/services
 
-2. Copy msgBroker.properties and msgBroker.properties file to <AXIS2_DIST_HOME>/conf
+2. Copy airavata-server.properties file to <AXIS2_DIST_HOME>/conf
 
-    Configure msgBroker.properties with broker.start.delivery=false
+    Configure the properties file with broker.start.delivery=false
 
 3. Start axis2 server.
 
@@ -117,8 +115,7 @@ Note: messenger servlet can be found at 
 
 6. Set configurations appropriately.
 
-             <TOMECAT_HOME>/webapps/messenger/WEB-INF/classes/msgBroker.properties
-             <TOMECAT_HOME>/webapps/messenger/WEB-INF/classes/msgBox.properties
+             <TOMECAT_HOME>/webapps/messenger/WEB-INF/classes/airavata-server.properties
 
 Note: Point to the correct database you want to pick the messages and do the message delivery, and check the
 property axis2.repository to the correct location.

Modified: airavata/trunk/modules/ws-messenger/commons/src/main/java/org/apache/airavata/wsmg/commons/WsmgCommonConstants.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/commons/src/main/java/org/apache/airavata/wsmg/commons/WsmgCommonConstants.java?rev=1399404&r1=1399403&r2=1399404&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/commons/src/main/java/org/apache/airavata/wsmg/commons/WsmgCommonConstants.java (original)
+++ airavata/trunk/modules/ws-messenger/commons/src/main/java/org/apache/airavata/wsmg/commons/WsmgCommonConstants.java Wed Oct 17 19:41:21 2012
@@ -86,7 +86,7 @@ public class WsmgCommonConstants {
     public static final String CONFIG_SENDING_BATCH_SIZE = "sending.batch.size";
     public static final String CONFIG_SENDING_THREAD_POOL_SIZE = "sending.thread.pool.size";
 
-    public static final String BROKER_CONFIGURATION_FILE_NAME = "msgBroker.properties";
+    public static final String BROKER_CONFIGURATION_FILE_NAME = "airavata-server.properties";
 
     public static final String DELIVERY_PROTOCOL = "broker.delivery.protocol";
 

Modified: airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/MsgBoxServiceLifeCycle.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/MsgBoxServiceLifeCycle.java?rev=1399404&r1=1399403&r2=1399404&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/MsgBoxServiceLifeCycle.java (original)
+++ airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/MsgBoxServiceLifeCycle.java Wed Oct 17 19:41:21 2012
@@ -51,9 +51,9 @@ import org.slf4j.LoggerFactory;
 public class MsgBoxServiceLifeCycle implements ServiceLifeCycle {
 
     private static final Logger logger = LoggerFactory.getLogger(MsgBoxServiceLifeCycle.class);
-    private static final String CONFIGURATION_FILE_NAME = "msgBox.properties";
+    private static final String CONFIGURATION_FILE_NAME = "airavata-server.properties";
     private static final String TRUE = Boolean.toString(true);
-    public static final String REPOSITORY_PROPERTIES = "repository.properties";
+    public static final String REPOSITORY_PROPERTIES = "airavata-server.properties";
     public static final int GFAC_URL_UPDATE_INTERVAL = 1000 * 60 * 60 * 3;
 
     public static final int JCR_AVAIALABILITY_WAIT_INTERVAL = 1000 * 10;
@@ -88,7 +88,7 @@ public class MsgBoxServiceLifeCycle impl
         Axis2Utils.overrideAddressingPhaseHander(configurationcontext, new StoreMessageHandler());
 
         // Load the configuration file from the classpath
-        ConfigurationManager confmanager = new ConfigurationManager("conf" + File.separator + CONFIGURATION_FILE_NAME);
+        ConfigurationManager confmanager = new ConfigurationManager(CONFIGURATION_FILE_NAME);
         initDatabase(configurationcontext, confmanager);
         configurationcontext.setProperty(ConfigKeys.MSG_PRESV_INTERVAL,getIntervaltoExecuteDelete(confmanager));
         final ConfigurationContext context=configurationcontext;

Modified: airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/Storage/dbpool/DatabaseStorageImpl.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/Storage/dbpool/DatabaseStorageImpl.java?rev=1399404&r1=1399403&r2=1399404&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/Storage/dbpool/DatabaseStorageImpl.java (original)
+++ airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/Storage/dbpool/DatabaseStorageImpl.java Wed Oct 17 19:41:21 2012
@@ -37,7 +37,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * Database message Storage Implementation, if msgBox.properties configured to use database this will set as the storage
+ * Database message Storage Implementation, if airavata-server.properties configured to use database this will set as the storage
  * for MsgBoxSerivceSkeleton
  */
 public class DatabaseStorageImpl implements MsgBoxStorage {

Modified: airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/Storage/memory/InMemoryImpl.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/Storage/memory/InMemoryImpl.java?rev=1399404&r1=1399403&r2=1399404&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/Storage/memory/InMemoryImpl.java (original)
+++ airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/Storage/memory/InMemoryImpl.java Wed Oct 17 19:41:21 2012
@@ -33,7 +33,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * This is the in memory storage implementation for MsgBoxService, this will be initialized if msgBox.properties is
+ * This is the in memory storage implementation for MsgBoxService, this will be initialized if airavata-server.properties is
  * configured not to use database implementation.
  */
 public class InMemoryImpl implements MsgBoxStorage {

Modified: airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/util/ConfigKeys.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/util/ConfigKeys.java?rev=1399404&r1=1399403&r2=1399404&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/util/ConfigKeys.java (original)
+++ airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/util/ConfigKeys.java Wed Oct 17 19:41:21 2012
@@ -22,7 +22,7 @@
 package org.apache.airavata.wsmg.msgbox.util;
 
 public class ConfigKeys {
-    public static final String CONFIG_FILE_NAME = "msgBox.properties";
+    public static final String CONFIG_FILE_NAME = "airavata-server.properties";
     public static final String MSG_PRESV_DAYS = "messagePreservationDays";
     public static final String MSG_PRESV_HRS = "messagePreservationHours";
     public static final String MSG_PRESV_MINS = "messagePreservationMinutes";

Added: airavata/trunk/modules/ws-messenger/messagebox/src/test/resources/airavata-server.properties
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/messagebox/src/test/resources/airavata-server.properties?rev=1399404&view=auto
==============================================================================
--- airavata/trunk/modules/ws-messenger/messagebox/src/test/resources/airavata-server.properties (added)
+++ airavata/trunk/modules/ws-messenger/messagebox/src/test/resources/airavata-server.properties Wed Oct 17 19:41:21 2012
@@ -0,0 +1,51 @@
+#
+#
+# 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 test configuration for Message Box: 
+#  Please do not use this for any other configuration but 
+#   message box test cases.
+#
+###########################################################################
+
+#
+# Message Box Basic Test Configurations
+#
+
+# Default derby database
+msgBox.jdbc.driver=org.apache.derby.jdbc.EmbeddedDriver
+msgBox.jdbc.url=jdbc:derby:wsmg;create=true;user=airavata;password=airavata
+
+# MySql database configuration
+#msgBox.jdbc.driver=com.mysql.jdbc.Driver
+#msgBox.jdbc.url=jdbc:mysql://localhost:3306/wsmg?user=airavata&password=airavata
+
+#
+# Advanced Message Box Configurations
+# 
+msgBox.usedatabase=false
+messagePreservationDays=0
+messagePreservationHours=0
+messagePreservationMinutes=5
+messagePerservationIntervalDays=0
+messagePerservationIntervalHours=1
+messagePerservationIntervalMinutes=0
+

Modified: airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/BrokerServiceLifeCycle.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/BrokerServiceLifeCycle.java?rev=1399404&r1=1399403&r2=1399404&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/BrokerServiceLifeCycle.java (original)
+++ airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/BrokerServiceLifeCycle.java Wed Oct 17 19:41:21 2012
@@ -61,7 +61,7 @@ import org.slf4j.LoggerFactory;
 public class BrokerServiceLifeCycle implements ServiceLifeCycle {
 
     private static final Logger log = LoggerFactory.getLogger(BrokerServiceLifeCycle.class);
-    public static final String REPOSITORY_PROPERTIES = "repository.properties";
+    public static final String REPOSITORY_PROPERTIES = "airavata-server.properties";
     public static final int GFAC_URL_UPDATE_INTERVAL = 1000 * 60 * 60 * 3;
 
     public static final int JCR_AVAIALABILITY_WAIT_INTERVAL = 1000 * 10;
@@ -175,8 +175,8 @@ public class BrokerServiceLifeCycle impl
         WsmgConfigurationContext wsmgConfig = new WsmgConfigurationContext();
         configContext.setProperty(WsmgCommonConstants.BROKER_WSMGCONFIG, wsmgConfig);
 
-        ConfigurationManager configMan = new ConfigurationManager("conf" + File.separator
-                + WsmgCommonConstants.BROKER_CONFIGURATION_FILE_NAME);
+        ConfigurationManager configMan = new ConfigurationManager(
+                    WsmgCommonConstants.BROKER_CONFIGURATION_FILE_NAME);
 
         wsmgConfig.setConfigurationManager(configMan);
 

Modified: airavata/trunk/modules/ws-messenger/messagebroker/src/main/resources/services.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/messagebroker/src/main/resources/services.xml?rev=1399404&r1=1399403&r2=1399404&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/messagebroker/src/main/resources/services.xml (original)
+++ airavata/trunk/modules/ws-messenger/messagebroker/src/main/resources/services.xml Wed Oct 17 19:41:21 2012
@@ -120,6 +120,6 @@
 
     </service>
 
-    <parameter name="configuration.file.name" locked="false">msgBroker.properties</parameter>
+    <parameter name="configuration.file.name" locked="false">airavata-server.properties</parameter>
 
 </serviceGroup>

Modified: airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/util/TestUtilServer.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/util/TestUtilServer.java?rev=1399404&r1=1399403&r2=1399404&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/util/TestUtilServer.java (original)
+++ airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/util/TestUtilServer.java Wed Oct 17 19:41:21 2012
@@ -88,7 +88,7 @@ public class TestUtilServer {
         ServiceLifeCycle brokerLifeCycle = new BrokerServiceLifeCycle();
 
         final String configFileParam = "configuration.file.name";
-        final String configFileValue = "msgBroker.properties";
+        final String configFileValue = "airavata-server.properties";
 
         AxisService notificationService = getNotificationService();
         notificationService.addParameter(configFileParam, configFileValue);

Added: airavata/trunk/modules/ws-messenger/messagebroker/src/test/resources/airavata-server.properties
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/messagebroker/src/test/resources/airavata-server.properties?rev=1399404&view=auto
==============================================================================
--- airavata/trunk/modules/ws-messenger/messagebroker/src/test/resources/airavata-server.properties (added)
+++ airavata/trunk/modules/ws-messenger/messagebroker/src/test/resources/airavata-server.properties Wed Oct 17 19:41:21 2012
@@ -0,0 +1,72 @@
+#
+#
+# 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 test configuration for Message Broker: 
+#  Please do not use this for any other configuration but 
+#   message broker test cases.
+#
+###########################################################################
+
+#
+# Message broker Basic Test Configurations
+#
+
+#database realted settings (only applicable if 'broker.storage.type=persistent')
+#For mysql database configuration
+#broker.jdbc.driver=com.mysql.jdbc.Driver
+#broker.jdbc.url=jdbc:mysql://localhost:3306/wsmg?user=airavata&password=airavata
+
+#Default derby database configuration
+broker.jdbc.driver=org.apache.derby.jdbc.EmbeddedDriver
+broker.jdbc.url=jdbc:derby:wsmg;create=true;user=airavata;password=airavata
+
+#socket time out in milliseconds for sending messages. (defaults is 20000)
+broker.socket.timeout=60000
+
+#broker.storage.type=persistent
+broker.storage.type=memory
+
+#specifies wether delivery component should be started or not.
+broker.start.delivery.thread=true
+
+#fixed thread pool based delivery
+#broker.delivery.method=pcrew
+
+#dynamic thread pool based delivery
+#broker.delivery.method=parallel
+
+#single thread delivery
+broker.delivery.method=serial
+
+#number of message delivery failures before a url become black listed (default is 2)
+#broker.msg.delivery.retries=2
+
+#time period (in seconds) a url will be kept blacklisted (default is 5 seconds) 
+#consumer.expiration.time.gap=5 
+
+#maximum number of messages to be send to a one consumer/url at time. 
+#applicable if 'broker.delivery.method' is 'pcrew' . (default is 10)
+
+#sending.batch.size=10
+
+#size of the thread pool. only applicable if 'broker.delivery.method' is 'pcrew'. (default is 4)
+#sending.thread.pool.size=4
\ No newline at end of file

Modified: airavata/trunk/modules/ws-messenger/samples/messagebox/messagebox-create-store-take-delete/src/org/apache/airavata/wsmg/samples/msgBox/SimpleMsgBoxExec.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/samples/messagebox/messagebox-create-store-take-delete/src/org/apache/airavata/wsmg/samples/msgBox/SimpleMsgBoxExec.java?rev=1399404&r1=1399403&r2=1399404&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/samples/messagebox/messagebox-create-store-take-delete/src/org/apache/airavata/wsmg/samples/msgBox/SimpleMsgBoxExec.java (original)
+++ airavata/trunk/modules/ws-messenger/samples/messagebox/messagebox-create-store-take-delete/src/org/apache/airavata/wsmg/samples/msgBox/SimpleMsgBoxExec.java Wed Oct 17 19:41:21 2012
@@ -48,7 +48,7 @@ public class SimpleMsgBoxExec {
 
 		Properties configurations = new Properties(getDefaults());
 		try {
-			InputStream ioStream = new FileInputStream("conf" + File.separator + ConfigKeys.CONFIG_FILE_NAME);
+			InputStream ioStream = new FileInputStream(ConfigKeys.CONFIG_FILE_NAME);
 			configurations.load(ioStream);
 		} catch (IOException ioe) {
 

Modified: airavata/trunk/modules/ws-messenger/samples/messagebroker/wnt-multiple-producers-consumers-topics/src/org/apache/airavata/wsmg/samples/wse/MultipleProducersConsumersTopics.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/samples/messagebroker/wnt-multiple-producers-consumers-topics/src/org/apache/airavata/wsmg/samples/wse/MultipleProducersConsumersTopics.java?rev=1399404&r1=1399403&r2=1399404&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/samples/messagebroker/wnt-multiple-producers-consumers-topics/src/org/apache/airavata/wsmg/samples/wse/MultipleProducersConsumersTopics.java (original)
+++ airavata/trunk/modules/ws-messenger/samples/messagebroker/wnt-multiple-producers-consumers-topics/src/org/apache/airavata/wsmg/samples/wse/MultipleProducersConsumersTopics.java Wed Oct 17 19:41:21 2012
@@ -60,7 +60,7 @@ public class MultipleProducersConsumersT
 
 		Properties configurations = new Properties(getDefaults());
 		try {
-			InputStream ioStream = new FileInputStream("conf" + File.separator + ConfigKeys.CONFIG_FILE_NAME);
+			InputStream ioStream = new FileInputStream(ConfigKeys.CONFIG_FILE_NAME);
 			configurations.load(ioStream);
 		} catch (IOException ioe) {
 

Modified: airavata/trunk/modules/ws-messenger/samples/messagebroker/wse-multiple-producers-consumers-topics/src/org/apache/airavata/wsmg/samples/wse/MultipleProducersConsumersTopics.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/samples/messagebroker/wse-multiple-producers-consumers-topics/src/org/apache/airavata/wsmg/samples/wse/MultipleProducersConsumersTopics.java?rev=1399404&r1=1399403&r2=1399404&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/samples/messagebroker/wse-multiple-producers-consumers-topics/src/org/apache/airavata/wsmg/samples/wse/MultipleProducersConsumersTopics.java (original)
+++ airavata/trunk/modules/ws-messenger/samples/messagebroker/wse-multiple-producers-consumers-topics/src/org/apache/airavata/wsmg/samples/wse/MultipleProducersConsumersTopics.java Wed Oct 17 19:41:21 2012
@@ -60,7 +60,7 @@ public class MultipleProducersConsumersT
 
 		Properties configurations = new Properties(getDefaults());
 		try {
-			InputStream ioStream = new FileInputStream("conf" + File.separator + ConfigKeys.CONFIG_FILE_NAME);
+			InputStream ioStream = new FileInputStream(ConfigKeys.CONFIG_FILE_NAME);
 			configurations.load(ioStream);
 		} catch (IOException ioe) {
 

Modified: airavata/trunk/modules/ws-messenger/samples/messagebroker/wse-multiple-producers-consumers-xpath/src/org/apache/airavata/wsmg/samples/wse/MultipleProducersConsumers.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/samples/messagebroker/wse-multiple-producers-consumers-xpath/src/org/apache/airavata/wsmg/samples/wse/MultipleProducersConsumers.java?rev=1399404&r1=1399403&r2=1399404&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/samples/messagebroker/wse-multiple-producers-consumers-xpath/src/org/apache/airavata/wsmg/samples/wse/MultipleProducersConsumers.java (original)
+++ airavata/trunk/modules/ws-messenger/samples/messagebroker/wse-multiple-producers-consumers-xpath/src/org/apache/airavata/wsmg/samples/wse/MultipleProducersConsumers.java Wed Oct 17 19:41:21 2012
@@ -49,7 +49,7 @@ public class MultipleProducersConsumers 
 
 		Properties configurations = new Properties(getDefaults());
 		try {
-            InputStream ioStream = new FileInputStream("conf" + File.separator + ConfigKeys.CONFIG_FILE_NAME);
+            InputStream ioStream = new FileInputStream(ConfigKeys.CONFIG_FILE_NAME);
             configurations.load(ioStream);
         } catch (IOException ioe) {
 

Modified: airavata/trunk/modules/ws-messenger/samples/messagebroker/wse-multiple-producers-consumers/src/org/apache/airavata/wsmg/samples/wse/MultipleProducersConsumers.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/samples/messagebroker/wse-multiple-producers-consumers/src/org/apache/airavata/wsmg/samples/wse/MultipleProducersConsumers.java?rev=1399404&r1=1399403&r2=1399404&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/samples/messagebroker/wse-multiple-producers-consumers/src/org/apache/airavata/wsmg/samples/wse/MultipleProducersConsumers.java (original)
+++ airavata/trunk/modules/ws-messenger/samples/messagebroker/wse-multiple-producers-consumers/src/org/apache/airavata/wsmg/samples/wse/MultipleProducersConsumers.java Wed Oct 17 19:41:21 2012
@@ -53,7 +53,7 @@ public class MultipleProducersConsumers 
 		Properties configurations = new Properties(getDefaults());
 		try {
 
-			InputStream ioStream = new FileInputStream("conf" + File.separator + ConfigKeys.CONFIG_FILE_NAME);
+			InputStream ioStream = new FileInputStream(ConfigKeys.CONFIG_FILE_NAME);
 			configurations.load(ioStream);
 		} catch (IOException ioe) {
 			

Modified: airavata/trunk/modules/ws-messenger/samples/messagebroker/wse-round-trip/src/org/apache/airavata/wsmg/samples/wse/WSERoundTrip.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/samples/messagebroker/wse-round-trip/src/org/apache/airavata/wsmg/samples/wse/WSERoundTrip.java?rev=1399404&r1=1399403&r2=1399404&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/samples/messagebroker/wse-round-trip/src/org/apache/airavata/wsmg/samples/wse/WSERoundTrip.java (original)
+++ airavata/trunk/modules/ws-messenger/samples/messagebroker/wse-round-trip/src/org/apache/airavata/wsmg/samples/wse/WSERoundTrip.java Wed Oct 17 19:41:21 2012
@@ -44,7 +44,7 @@ public class WSERoundTrip {
 
 		Properties configurations = new Properties(getDefaults());
 		try {
-            InputStream ioStream = new FileInputStream("conf" + File.separator + ConfigKeys.CONFIG_FILE_NAME);
+            InputStream ioStream = new FileInputStream(ConfigKeys.CONFIG_FILE_NAME);
             configurations.load(ioStream);
 
 		} catch (IOException ioe) {

Modified: airavata/trunk/modules/ws-messenger/samples/messagebroker/wse-topic-subscription/src/org/apache/airavata/wsmg/samples/wse/TopicSubscribe.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/samples/messagebroker/wse-topic-subscription/src/org/apache/airavata/wsmg/samples/wse/TopicSubscribe.java?rev=1399404&r1=1399403&r2=1399404&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/samples/messagebroker/wse-topic-subscription/src/org/apache/airavata/wsmg/samples/wse/TopicSubscribe.java (original)
+++ airavata/trunk/modules/ws-messenger/samples/messagebroker/wse-topic-subscription/src/org/apache/airavata/wsmg/samples/wse/TopicSubscribe.java Wed Oct 17 19:41:21 2012
@@ -38,7 +38,7 @@ public class TopicSubscribe {
 		Properties configurations = new Properties();
 
 		try {
-            InputStream ioStream = new FileInputStream("conf" + File.separator + ConfigKeys.CONFIG_FILE_NAME);
+            InputStream ioStream = new FileInputStream(ConfigKeys.CONFIG_FILE_NAME);
             configurations.load(ioStream);
 		} catch (IOException ioe) {
 

Modified: airavata/trunk/modules/ws-messenger/samples/messagebroker/wse-xpath-subscription/src/org/apache/airavata/wsmg/samples/wse/XpathSubscribe.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/samples/messagebroker/wse-xpath-subscription/src/org/apache/airavata/wsmg/samples/wse/XpathSubscribe.java?rev=1399404&r1=1399403&r2=1399404&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/samples/messagebroker/wse-xpath-subscription/src/org/apache/airavata/wsmg/samples/wse/XpathSubscribe.java (original)
+++ airavata/trunk/modules/ws-messenger/samples/messagebroker/wse-xpath-subscription/src/org/apache/airavata/wsmg/samples/wse/XpathSubscribe.java Wed Oct 17 19:41:21 2012
@@ -36,7 +36,7 @@ public class XpathSubscribe {
 		Properties configurations = new Properties();
 
 		try {
-            InputStream ioStream = new FileInputStream("conf" + File.separator + ConfigKeys.CONFIG_FILE_NAME);
+            InputStream ioStream = new FileInputStream(ConfigKeys.CONFIG_FILE_NAME);
             configurations.load(ioStream);
 		} catch (IOException ioe) {
 

Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java?rev=1399404&r1=1399403&r2=1399404&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java Wed Oct 17 19:41:21 2012
@@ -133,7 +133,7 @@ public class WorkflowInterpretorSkeleton
     }
 
 	private URL getXBayaPropertiesURL() {
-		return this.getClass().getClassLoader().getResource("xbaya.properties");
+		return this.getClass().getClassLoader().getResource("airavata-server.properties");
 	}
 
     public void startUp(final ConfigurationContext configctx, AxisService service) {

Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/GenericInvoker.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/GenericInvoker.java?rev=1399404&r1=1399403&r2=1399404&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/GenericInvoker.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/GenericInvoker.java Wed Oct 17 19:41:21 2012
@@ -249,7 +249,7 @@ public class GenericInvoker implements I
         builder.getWorkflowMonitoringContext().setWorkflowTimeStep(1);
         builder.setUserIdentifier("xbaya-user");
         //todo write a UI component to collect this information and pass it through Header
-//        builder.setGridMyProxyRepository("myproxy.nersc.gov","fangliu","Jdas7wph",14000);
+//        builder.setGridMyProxyRepository("myproxy.nersc.gov","$user","$passwd",14000);
         StickySoapHeaderHandler handler = new StickySoapHeaderHandler("use-workflowcontext-header", builder.getXml());
         // Create Invoker
         this.invoker = InvokerFactory.createInvoker(this.portTypeQName, definitions, this.gfacURL, this.messageBoxURL,

Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/monitor/MonitorEventHandler.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/monitor/MonitorEventHandler.java?rev=1399404&r1=1399403&r2=1399404&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/monitor/MonitorEventHandler.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/monitor/MonitorEventHandler.java Wed Oct 17 19:41:21 2012
@@ -123,11 +123,11 @@ public class MonitorEventHandler impleme
         this.triedWorkflowIDs = Collections.synchronizedSet(new HashSet<URI>());
         this.resourcePaintableMap = new HashMap<Node, LinkedList<ResourcePaintable>>();
 //        try {
-//            if (this.getClass().getClassLoader().getResource("xbaya.properties") != null) {
+//            if (this.getClass().getClassLoader().getResource("airavata-server.properties") != null) {
 //                this.workflowNodeStatusUpdater =
-//                        new WorkflowNodeStatusUpdater(XBayaUtil.getRegistry(this.getClass().getClassLoader().getResource("xbaya.properties")));
+//                        new WorkflowNodeStatusUpdater(XBayaUtil.getRegistry(this.getClass().getClassLoader().getResource("airavata-server.properties")));
 //                this.workflowStatusUpdater =
-//                        new WorkflowStatusUpdater(XBayaUtil.getRegistry(this.getClass().getClassLoader().getResource("xbaya.properties")));
+//                        new WorkflowStatusUpdater(XBayaUtil.getRegistry(this.getClass().getClassLoader().getResource("airavata-server.properties")));
 //            }
 //        } catch (IOException e) {
 //            e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.

Added: airavata/trunk/modules/xbaya-gui/src/main/resources/airavata-server.properties
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/resources/airavata-server.properties?rev=1399404&view=auto
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/resources/airavata-server.properties (added)
+++ airavata/trunk/modules/xbaya-gui/src/main/resources/airavata-server.properties Wed Oct 17 19:41:21 2012
@@ -0,0 +1,54 @@
+#
+#
+# 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 XBaya to connect to
+#   Registry. Please do not use this for any server configurations.
+#
+###########################################################################
+
+###########################################################################
+# Airavata Registry Configuration
+###########################################################################
+
+registry.jdbc.url=jdbc:mysql://gf7.ucs.indiana.edu:4407/paramchem_prod_registry
+registry.jdbc.user=pc_gw_admin
+registry.jdbc.password=pc_gw_pwd
+gateway.id=paramchem
+registry.user=admin
+
+class.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
+#registry.user=admin
+#registry.password=admin
+#gateway.id=default
+#registry.jdbc.user=airavata
+#registry.jdbc.password=airavata
+
+#for mysql
+registry.jdbc.driver=com.mysql.jdbc.Driver
+#registry.jdbc.url=jdbc:mysql://localhost:3306/persistent_data
+
+#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
+

Modified: airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/utils/TestUtilServer.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/utils/TestUtilServer.java?rev=1399404&r1=1399403&r2=1399404&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/utils/TestUtilServer.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/utils/TestUtilServer.java Wed Oct 17 19:41:21 2012
@@ -106,7 +106,7 @@ public class TestUtilServer {
         ServiceLifeCycle brokerLifeCycle = new BrokerServiceLifeCycle();
 
         final String configFileParam = "configuration.file.name";
-        final String configFileValue = "conf/msgBroker.properties";
+        final String configFileValue = "airavata-server.properties";
 
         AxisService notificationService = getNotificationService();
         notificationService.addParameter(configFileParam, configFileValue);

Added: airavata/trunk/modules/xbaya-gui/src/test/resources/airavata-server.properties
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/test/resources/airavata-server.properties?rev=1399404&view=auto
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/test/resources/airavata-server.properties (added)
+++ airavata/trunk/modules/xbaya-gui/src/test/resources/airavata-server.properties Wed Oct 17 19:41:21 2012
@@ -0,0 +1,85 @@
+#
+#
+# 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 test configuration for Message Broker 
+#   and Workflow Interpreter. Please do not use this for any other 
+#   configuration but these test cases.
+#
+###########################################################################
+
+#
+# Message broker Basic Test Configurations
+#
+
+#database realted settings (only applicable if 'broker.storage.type=persistent')
+#For mysql database configuration
+#broker.jdbc.driver=com.mysql.jdbc.Driver
+#broker.jdbc.url=jdbc:mysql://localhost:3306/wsmg?user=airavata&password=airavata
+
+#Default derby database configuration
+broker.jdbc.driver=org.apache.derby.jdbc.EmbeddedDriver
+broker.jdbc.url=jdbc:derby:wsmg;create=true;user=airavata;password=airavata
+
+#socket time out in milliseconds for sending messages. (defaults is 20000)
+broker.socket.timeout=60000
+
+#broker.storage.type=persistent
+broker.storage.type=memory
+
+#specifies wether delivery component should be started or not.
+broker.start.delivery.thread=true
+
+#fixed thread pool based delivery
+#broker.delivery.method=pcrew
+
+#dynamic thread pool based delivery
+#broker.delivery.method=parallel
+
+#single thread delivery
+broker.delivery.method=serial
+
+#number of message delivery failures before a url become black listed (default is 2)
+#broker.msg.delivery.retries=2
+
+#time period (in seconds) a url will be kept blacklisted (default is 5 seconds) 
+#consumer.expiration.time.gap=5 
+
+#maximum number of messages to be send to a one consumer/url at time. 
+#applicable if 'broker.delivery.method' is 'pcrew' . (default is 10)
+
+#sending.batch.size=10
+
+#size of the thread pool. only applicable if 'broker.delivery.method' is 'pcrew'. (default is 4)
+#sending.thread.pool.size=4
+
+gfac.url=http://156.56.179.104:8080/axis2/services/GFacService
+myproxy.url=myproxy.teragrid.org
+messagebox.url=http://156.56.179.104:8080/axis2/services/MsgBoxService
+messagebroker.url=http://156.56.179.104:8080/axis2/services/EventingService
+myproxy.username=ogce
+myproxy.password=j;k
+xbaya.service.url=http://156.56.179.104:8080/axis2/services/WorkflowInterpretor?wsdl
+jcr.url=http://156.56.179.104:8081/jackrabbit-webapp-2.3.7/rmi
+jcr.username=admin
+jcr.password=admin
+with.Listener=false
+Input=Hi1,Hi2,Hi3
\ No newline at end of file

Modified: airavata/trunk/samples/workflow-tracking/simple-service-tracking/src/workflowtracking/samples/invoke/SimpleWorkflowTracker.java
URL: http://svn.apache.org/viewvc/airavata/trunk/samples/workflow-tracking/simple-service-tracking/src/workflowtracking/samples/invoke/SimpleWorkflowTracker.java?rev=1399404&r1=1399403&r2=1399404&view=diff
==============================================================================
--- airavata/trunk/samples/workflow-tracking/simple-service-tracking/src/workflowtracking/samples/invoke/SimpleWorkflowTracker.java (original)
+++ airavata/trunk/samples/workflow-tracking/simple-service-tracking/src/workflowtracking/samples/invoke/SimpleWorkflowTracker.java Wed Oct 17 19:41:21 2012
@@ -50,7 +50,7 @@ public class SimpleWorkflowTracker {
 
         Properties configurations = new Properties(getDefaults());
         try {
-            InputStream ioStream = new FileInputStream("conf" + File.separator + ConfigKeys.CONFIG_FILE_NAME);
+            InputStream ioStream = new FileInputStream(ConfigKeys.CONFIG_FILE_NAME);
             configurations.load(ioStream);
         } catch (IOException ioe) {
 



Mime
View raw message