svn commit: r1083425 - /axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java

[veithen]

Author: veithen
Date: Sun Mar 20 12:45:22 2011
New Revision: 1083425

URL: http://svn.apache.org/viewvc?rev=1083425&view=rev
Log:
Fixed an issue in the service hierarchy stuff in JAXWSDeployer that causes the 
java_first_jaxws sample service to be deployed as "nullHelloWorld" instead of 
"HelloWorld".

Modified:
    
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java

Modified: 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java?rev=1083425&r1=1083424&r2=1083425&view=diff
==============================================================================
--- 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java
 Sun Mar 20 12:45:22 2011
@@ -210,8 +210,11 @@ public class JAXWSDeployer extends Abstr
                                 className,
                                 location);
                 if(axisService != null) {
+                    if (serviceHierarchy != null) {
+                        axisService.setName(serviceHierarchy + 
axisService.getName());
+                    }
                     log.info("Deploying JAXWS annotated class " + className + 
" as a service - "
-                            + serviceHierarchy + axisService.getName());
+                            + axisService.getName());
                     axisServiceList.add(axisService);
                 }
             }
@@ -222,9 +225,10 @@ public class JAXWSDeployer extends Abstr
         }
         //creating service group by considering the hierarchical path also
         AxisServiceGroup serviceGroup = new AxisServiceGroup();
-        serviceGroup.setServiceGroupName(serviceHierarchy + groupName);
+        if (serviceHierarchy != null) {
+            serviceGroup.setServiceGroupName(serviceHierarchy + groupName);
+        }
         for (AxisService axisService : axisServiceList) {
-            axisService.setName(serviceHierarchy + axisService.getName());
             serviceGroup.addService(axisService);
         }
         axisConfig.addServiceGroup(serviceGroup);