svn commit: r1159419 - in /incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2: GFacService.java reciever/GFacMessageReciever.java

[la...@apache.org]

Author: lahiru
Date: Thu Aug 18 21:19:22 2011
New Revision: 1159419

URL: http://svn.apache.org/viewvc?rev=1159419&view=rev
Log:
fixing compilation error and reading file from classpath rather reading from exact location.

Modified:
    incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/GFacService.java
    incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/reciever/GFacMessageReciever.java

Modified: incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/GFacService.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/GFacService.java?rev=1159419&r1=1159418&r2=1159419&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/GFacService.java (original)
+++ incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/GFacService.java Thu Aug 18 21:19:22 2011
@@ -24,6 +24,7 @@ package org.apache.airavata.services.gfa
 import java.io.File;
 import java.io.FileInputStream;
 import java.lang.reflect.Constructor;
+import java.net.URL;
 import java.util.*;
 
 import org.apache.airavata.core.gfac.services.GenericService;
@@ -39,7 +40,7 @@ import javax.jcr.*;
 public class GFacService implements org.apache.axis2.engine.ServiceLifeCycle {
 
 	public static final String SECURITY_CONTEXT = "security_context";
-
+    public static final String REPOSITORY_PROPERTIES = "repository.properties";
 	public static GenericService service;
 
 	public void startUp(ConfigurationContext configctx, AxisService service) {
@@ -62,8 +63,8 @@ public class GFacService implements org.
     private void initializeRepository(ConfigurationContext context) {
       Properties properties = new Properties();
         try {
-            String axis2Home = System.getenv("AXIS2_HOME");
-            properties.load(new FileInputStream(axis2Home + File.separator + "conf/repository.properties"));
+            URL url = ClassLoader.getSystemResource(REPOSITORY_PROPERTIES);
+            properties.load(url.openStream());
             Map<String, String> map = new HashMap<String, String>((Map) properties);
             Class registryRepositoryFactory = Class.forName(map.get("repository.factory"));
             Constructor c = registryRepositoryFactory.getConstructor();

Modified: incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/reciever/GFacMessageReciever.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/reciever/GFacMessageReciever.java?rev=1159419&r1=1159418&r2=1159419&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/reciever/GFacMessageReciever.java (original)
+++ incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/reciever/GFacMessageReciever.java Thu Aug 18 21:19:22 2011
@@ -21,15 +21,11 @@ package org.apache.airavata.services.gfa
  *
 */
 
-import com.sun.tools.doclets.internal.toolkit.Configuration;
 import org.apache.airavata.core.gfac.api.impl.JCRRegistry;
 import org.apache.airavata.core.gfac.context.InvocationContext;
-import org.apache.airavata.core.gfac.context.SecurityContext;
 import org.apache.airavata.core.gfac.context.impl.ExecutionContextImpl;
 import org.apache.airavata.core.gfac.context.impl.ParameterContextImpl;
 import org.apache.airavata.core.gfac.factory.PropertyServiceFactory;
-import org.apache.airavata.core.gfac.notification.DummyNotification;
-import org.apache.airavata.core.gfac.registry.RegistryService;
 import org.apache.airavata.core.gfac.services.GenericService;
 import org.apache.airavata.core.gfac.type.parameter.StringParameter;
 import org.apache.airavata.services.gfac.axis2.utils.GFacServiceOperations;
@@ -56,7 +52,6 @@ import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamReader;
 import java.io.StringReader;
 import java.util.Iterator;
-import java.util.Map;
 
 public class GFacMessageReciever implements MessageReceiver {