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/09/20 20:30:20 UTC
svn commit: r1173295 - in
/incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2:
GFacService.java reciever/GFacMessageReciever.java
Author: lahiru
Date: Tue Sep 20 18:30:20 2011
New Revision: 1173295
URL: http://svn.apache.org/viewvc?rev=1173295&view=rev
Log:
fixing https://issues.apache.org/jira/browse/AIRAVATA-115
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=1173295&r1=1173294&r2=1173295&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 Sep 20 18:30:20 2011
@@ -69,6 +69,7 @@ public class GFacService implements Serv
public void startUp(ConfigurationContext configctx, AxisService service){
AxisConfiguration config = null;
+ configctx.getAxisConfiguration().getTransportsIn().get("http").getParameter("port");
List<Phase> phases = null;
config = service.getAxisConfiguration();
phases = config.getInFlowPhases();
@@ -96,14 +97,13 @@ public class GFacService implements Serv
RepositoryFactory repositoryFactory = (RepositoryFactory) c.newInstance();
Repository repository = repositoryFactory.getRepository(map);
Credentials credentials = new SimpleCredentials(map.get(JCR_USER), map.get(JCR_PASS).toCharArray());
- JCRRegistry registry = new JCRRegistry(repository,credentials);
+ JCRRegistry registry = new JCRRegistry(repository, credentials);
String localAddress = Utils.getIpAddress(context.getAxisConfiguration());
- String port = context.getAxisConfiguration().getTransportIn("http").getReceiver().PARAM_PORT;
- localAddress = "http://" + localAddress + ":" + port ;
- if(context.getContextRoot().startsWith("/")){
- localAddress = localAddress +
- context.getServiceContextPath() + "/" + WSConstants.GFAC_SERVICE_NAME;
- }
+ String port = (String) context.getAxisConfiguration().getTransportsIn().get("http").getParameter("port").getValue();
+ localAddress = "http://" + localAddress + ":" + port;
+ localAddress = localAddress + "/" +
+ context.getContextRoot() + "/" + context.getServicePath() + "/" + WSConstants.GFAC_SERVICE_NAME;
+ System.out.println(localAddress);
registry.saveGFacDescriptor(localAddress);
context.setProperty(CONFIGURATION_CONTEXT_REGISTRY, new JCRRegistry(repository, credentials));
} catch (Exception e) {
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=1173295&r1=1173294&r2=1173295&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 Tue Sep 20 18:30:20 2011
@@ -230,7 +230,7 @@ public class GFacMessageReciever impleme
EndpointReference gfacUrl = messageContext.getConfigurationContext().getListenerManager()
.getEPRforService(WSConstants.GFAC_SERVICE_NAME, WSConstants.GFAC_INVOKE_METHOD, WSConstants.GFAC_TRANSPORT);
String serviceName = getOriginalServiceName(messageContext);
- String serviceEpr = gfacUrl.getAddress().split("GFacService")[0] + serviceName;
+ String serviceEpr = gfacUrl.getAddress().split(WSConstants.GFAC_SERVICE_NAME)[0] + serviceName;
ConfigurationContext context = messageContext.getConfigurationContext();
// TODO this logic has to change based on the logic we are storing data
// into repository