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/01 01:46:53 UTC
svn commit: r1195741 - in /incubator/airavata/trunk/modules:
distribution/src/main/assembly/
gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/dispatchers/
gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/reciever/
gfac-a...
Author: lahiru
Date: Tue Nov 1 00:46:53 2011
New Revision: 1195741
URL: http://svn.apache.org/viewvc?rev=1195741&view=rev
Log:
fixing axis2 error during gfac service invocatin.
Modified:
incubator/airavata/trunk/modules/distribution/src/main/assembly/bin-assembly.xml
incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/dispatchers/GFacURIBasedDispatcher.java
incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/reciever/GFacMessageReciever.java
incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/util/GFacServiceOperations.java
Modified: incubator/airavata/trunk/modules/distribution/src/main/assembly/bin-assembly.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/distribution/src/main/assembly/bin-assembly.xml?rev=1195741&r1=1195740&r2=1195741&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/distribution/src/main/assembly/bin-assembly.xml (original)
+++ incubator/airavata/trunk/modules/distribution/src/main/assembly/bin-assembly.xml Tue Nov 1 00:46:53 2011
@@ -381,6 +381,7 @@
<include>commons-collections:commons-collections</include>
<include>commons-configuration:commons-configuration</include>
<include>commons-lang:commons-lang</include>
+ <include>xpp3:xpp3</include>
</includes>
</dependencySet>
Modified: incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/dispatchers/GFacURIBasedDispatcher.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/dispatchers/GFacURIBasedDispatcher.java?rev=1195741&r1=1195740&r2=1195741&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/dispatchers/GFacURIBasedDispatcher.java (original)
+++ incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/dispatchers/GFacURIBasedDispatcher.java Tue Nov 1 00:46:53 2011
@@ -55,6 +55,9 @@ public class GFacURIBasedDispatcher exte
+ toEPR.getAddress());
}
String filePart = toEPR.getAddress();
+// if(!filePart.endsWith("/invoke")){
+// filePart = filePart + "/invoke";
+// }
ConfigurationContext configurationContext = messageContext.getConfigurationContext();
String[] values = Utils.parseRequestURLForServiceAndOperation(filePart, messageContext
.getConfigurationContext().getServiceContextPath());
@@ -66,9 +69,10 @@ public class GFacURIBasedDispatcher exte
service = registry.getService("GFacService");
if (service != null) {
messageContext.setAxisService(service);
- if (GFacServiceOperations.INVOKE.toString().equals(values[1])) {
+ if (GFacServiceOperations.INVOKE_SOAP_ACTION.toString().equals(messageContext.getSoapAction())) {
messageContext.setAxisOperation(service.getOperation(new QName(GFacServiceOperations.INVOKE
.toString())));
+ messageContext.setTo(new EndpointReference(filePart + "/invoke"));
} else if (GFacServiceOperations.GETWSDL.toString().equals(values[1])) {
messageContext.setAxisOperation(service.getOperation(new QName(
GFacServiceOperations.GETWSDL.toString())));
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=1195741&r1=1195740&r2=1195741&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 Nov 1 00:46:53 2011
@@ -23,6 +23,7 @@ package org.apache.airavata.services.gfa
import java.io.StringReader;
import java.net.URI;
+import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -43,9 +44,7 @@ import org.apache.airavata.core.gfac.not
import org.apache.airavata.core.gfac.services.GenericService;
import org.apache.airavata.registry.api.Axis2Registry;
import org.apache.airavata.registry.api.exception.RegistryException;
-import org.apache.airavata.schemas.gfac.OutputParameterType;
-import org.apache.airavata.schemas.gfac.Parameter;
-import org.apache.airavata.schemas.gfac.ServiceDescriptionType;
+import org.apache.airavata.schemas.gfac.*;
import org.apache.airavata.schemas.wec.ContextHeaderDocument;
import org.apache.airavata.services.gfac.axis2.GFacService;
import org.apache.airavata.services.gfac.axis2.util.GFacServiceOperations;
@@ -179,7 +178,7 @@ public class GFacMessageReciever impleme
ParameterContextImpl inputParam = new ParameterContextImpl();
ServiceDescriptionType serviceDescriptionType = serviceDescription.getType();
- List<Parameter> newInputs = null;
+ List<InputParameterType> newInputs = new ArrayList<InputParameterType>();
for (int i = 0; i < serviceDescriptionType.getInputParametersArray().length; i++) {
newInputs.add(serviceDescriptionType.getInputParametersArray(i));
}
@@ -190,8 +189,9 @@ public class GFacMessageReciever impleme
if (element == null) {
throw new Exception("Parameter is not found in the message");
}
-
- inputParam.add(parameter.getParameterName(), ActualParameter.fromXML(element.getText()));
+ GFacParameterDocument gFacParameterDocument = GFacParameterDocument.Factory.newInstance();
+ ParameterType parameterType = gFacParameterDocument.addNewGFacParameter();
+ inputParam.add(parameter.getParameterName(), ActualParameter.fromXML(GFacParameterDocument.Factory.newInstance().element.getText()));
}
/*
@@ -199,7 +199,7 @@ public class GFacMessageReciever impleme
*/
ParameterContextImpl outputParam = new ParameterContextImpl();
- List<OutputParameterType> newOutputs = null;
+ List<OutputParameterType> newOutputs = new ArrayList<OutputParameterType>();
for (int i = 0; i < serviceDescriptionType.getOutputParametersArray().length; i++) {
newOutputs.add(serviceDescriptionType.getOutputParametersArray(i));
}
Modified: incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/util/GFacServiceOperations.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/util/GFacServiceOperations.java?rev=1195741&r1=1195740&r2=1195741&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/util/GFacServiceOperations.java (original)
+++ incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/util/GFacServiceOperations.java Tue Nov 1 00:46:53 2011
@@ -22,7 +22,8 @@ package org.apache.airavata.services.gfa
public enum GFacServiceOperations {
- GETWSDL("getWSDL"), INVOKE("invoke"), GETABSTRACTWSDL("getAbstractWSDL");
+ GETWSDL("getWSDL"), INVOKE("invoke"), GETABSTRACTWSDL("getAbstractWSDL"),
+ INVOKE_SOAP_ACTION("http://schemas.airavata.apache.org/gfac/type/invoke");
private final String name;