svn commit: r1083510 - in /axis/axis2/java/core/branches/1_6: ./ modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java

[veithen]

Author: veithen
Date: Sun Mar 20 17:15:44 2011
New Revision: 1083510

URL: http://svn.apache.org/viewvc?rev=1083510&view=rev
Log:
Merged r1083425 to the 1.6 branch.

Modified:
    axis/axis2/java/core/branches/1_6/   (props changed)
    
axis/axis2/java/core/branches/1_6/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java

Propchange: axis/axis2/java/core/branches/1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Mar 20 17:15:44 2011
@@ -1 +1 @@
-/axis/axis2/java/core/trunk:1070439,1072077,1072271,1072499,1072510,1078242,1081563,1081587,1081590,1082316,1082322,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083433,1083446
+/axis/axis2/java/core/trunk:1070439,1072077,1072271,1072499,1072510,1078242,1081563,1081587,1081590,1082316,1082322,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446

Modified: 
axis/axis2/java/core/branches/1_6/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java?rev=1083510&r1=1083509&r2=1083510&view=diff
==============================================================================
--- 
axis/axis2/java/core/branches/1_6/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java
 (original)
+++ 
axis/axis2/java/core/branches/1_6/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java
 Sun Mar 20 17:15:44 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);