You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by la...@apache.org on 2011/11/15 19:05:32 UTC
svn commit: r1202343 -
/incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/GFacService.java
Author: lahiru
Date: Tue Nov 15 18:05:32 2011
New Revision: 1202343
URL: http://svn.apache.org/viewvc?rev=1202343&view=rev
Log:
fixing https://issues.apache.org/jira/browse/AIRAVATA-212.
Modified:
incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/GFacService.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=1202343&r1=1202342&r2=1202343&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 Tue Nov 15 18:05:32 2011
@@ -22,6 +22,7 @@
package org.apache.airavata.services.gfac.axis2;
import java.lang.reflect.Constructor;
+import java.net.URI;
import java.net.URL;
import java.util.HashMap;
import java.util.Iterator;
@@ -69,6 +70,7 @@ public class GFacService implements Serv
public static final String JCR_CLASS = "jcr.class";
public static final String JCR_USER = "jcr.user";
public static final String JCR_PASS = "jcr.pass";
+ public static final String ORG_APACHE_JACKRABBIT_REPOSITORY_URI = "org.apache.jackrabbit.repository.uri";
/*
* Heart beat thread
@@ -104,13 +106,7 @@ public class GFacService implements Serv
URL url = this.getClass().getClassLoader().getResource(REPOSITORY_PROPERTIES);
properties.load(url.openStream());
Map<String, String> map = new HashMap<String, String>((Map) properties);
- Class registryRepositoryFactory = Class.forName(map.get(JCR_CLASS));
- Constructor c = registryRepositoryFactory.getConstructor();
- RepositoryFactory repositoryFactory = (RepositoryFactory) c.newInstance();
- Repository repository = repositoryFactory.getRepository(map);
- Credentials credentials = new SimpleCredentials(map.get(JCR_USER), map.get(JCR_PASS).toCharArray());
-
- Registry registry = new JCRRegistry(repository, credentials);
+ Registry registry = new JCRRegistry(new URI(map.get(ORG_APACHE_JACKRABBIT_REPOSITORY_URI)),map.get(JCR_CLASS),map.get(JCR_USER),map.get(JCR_PASS), map);
String localAddress = Utils.getIpAddress(context.getAxisConfiguration());
TransportInDescription transportInDescription = context.getAxisConfiguration().getTransportsIn()
.get("http");