svn commit: r1157260 - in /incubator/airavata/trunk/modules/gfac-axis2-artifacts/src/main/java/org/apache/airavata/axis2/artifacts/dispatchers: GFacURIBasedDispatcher.java utils/ utils/GFacAxis2ArtifactsConstants.java

[la...@apache.org]

Author: lahiru
Date: Fri Aug 12 21:35:21 2011
New Revision: 1157260

URL: http://svn.apache.org/viewvc?rev=1157260&view=rev
Log:
minor modification to gfac-dispatcher code

Added:
    incubator/airavata/trunk/modules/gfac-axis2-artifacts/src/main/java/org/apache/airavata/axis2/artifacts/dispatchers/utils/
    incubator/airavata/trunk/modules/gfac-axis2-artifacts/src/main/java/org/apache/airavata/axis2/artifacts/dispatchers/utils/GFacAxis2ArtifactsConstants.java
Modified:
    incubator/airavata/trunk/modules/gfac-axis2-artifacts/src/main/java/org/apache/airavata/axis2/artifacts/dispatchers/GFacURIBasedDispatcher.java

Modified: incubator/airavata/trunk/modules/gfac-axis2-artifacts/src/main/java/org/apache/airavata/axis2/artifacts/dispatchers/GFacURIBasedDispatcher.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-axis2-artifacts/src/main/java/org/apache/airavata/axis2/artifacts/dispatchers/GFacURIBasedDispatcher.java?rev=1157260&r1=1157259&r2=1157260&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-axis2-artifacts/src/main/java/org/apache/airavata/axis2/artifacts/dispatchers/GFacURIBasedDispatcher.java (original)
+++ incubator/airavata/trunk/modules/gfac-axis2-artifacts/src/main/java/org/apache/airavata/axis2/artifacts/dispatchers/GFacURIBasedDispatcher.java Fri Aug 12 21:35:21 2011
@@ -21,6 +21,7 @@ package org.apache.airavata.axis2.artifa
  */
 
 import com.sun.corba.se.spi.activation.Server;
+import org.apache.airavata.axis2.artifacts.dispatchers.utils.GFacAxis2ArtifactsConstants;
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.context.ConfigurationContext;
@@ -67,27 +68,29 @@ public class GFacURIBasedDispatcher exte
                 AxisService service = registry.getService(values[0]);
                 if (service == null) {
                     service = registry.getService("GFacService");
-                    if(service != null){
-                    if ("getWSDL".equals(values[1]) || "invoke".equals(values[1])) {
-                        if (service != null) {
+                    if (service != null) {
+                        messageContext.setAxisService(service);
+                        if (GFacAxis2ArtifactsConstants.OPERATIONINVOKE.equals(values[1])) {
+                            messageContext.setAxisOperation(
+                                    service.getOperation(new QName(GFacAxis2ArtifactsConstants.OPERATIONINVOKE)));
+                        } else if (GFacAxis2ArtifactsConstants.OPERATIONGETWSDL.equals(values[1])) {
                             //todo get the wsdl from registry and add the endpoints to messagecontext
-                            messageContext.setAxisService(service);
                             messageContext.setAxisOperation(
-                                    service.getOperation(new QName("getWSDL")));
+                                    service.getOperation(new QName(GFacAxis2ArtifactsConstants.OPERATIONGETWSDL)));
                         } else {
-                            log.error("GFacService is not deployed, Please deploy the GFac service or double check the service name");
+                            log.error("Wrong Service Name :" + values[0]);
                         }
-                        return service;
-                    }}else{
-                        log.error("GfacService is not deployed");
+                    } else {
+                        log.error("GFacService is not deployed");
                     }
                 }
+                return service;
             }
         }
         return null;
     }
 
-     public void initDispatcher() {
+    public void initDispatcher() {
         init(new HandlerDescription(NAME));
     }
 }

Added: incubator/airavata/trunk/modules/gfac-axis2-artifacts/src/main/java/org/apache/airavata/axis2/artifacts/dispatchers/utils/GFacAxis2ArtifactsConstants.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-axis2-artifacts/src/main/java/org/apache/airavata/axis2/artifacts/dispatchers/utils/GFacAxis2ArtifactsConstants.java?rev=1157260&view=auto
==============================================================================
--- incubator/airavata/trunk/modules/gfac-axis2-artifacts/src/main/java/org/apache/airavata/axis2/artifacts/dispatchers/utils/GFacAxis2ArtifactsConstants.java (added)
+++ incubator/airavata/trunk/modules/gfac-axis2-artifacts/src/main/java/org/apache/airavata/axis2/artifacts/dispatchers/utils/GFacAxis2ArtifactsConstants.java Fri Aug 12 21:35:21 2011
@@ -0,0 +1,26 @@
+/*
+ *
+ * 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.
+ *
+*/
+package org.apache.airavata.axis2.artifacts.dispatchers.utils;
+
+public class GFacAxis2ArtifactsConstants {
+    public static final String OPERATIONINVOKE="invoke";
+    public static final String OPERATIONGETWSDL="getWSDL";
+}