[wsas-java-dev] svn commit r4612 - in trunk/wsas/java/modules: admin/src/org/wso2/wsas/admin/service www/extensions/core/xslt

[svn at wso2.org]

Author: sumedha
Date: Sun Jul  1 23:11:33 2007
New Revision: 4612

Modified:
   trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ServiceGroupAdmin.java
   trunk/wsas/java/modules/www/extensions/core/xslt/list_services_info.xsl
Log:
displaying service group along with service name

Modified: trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ServiceGroupAdmin.java
==============================================================================
--- trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ServiceGroupAdmin.java	(original)
+++ trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ServiceGroupAdmin.java	Sun Jul  1 23:11:33 2007
@@ -15,15 +15,21 @@
  */
 package org.wso2.wsas.admin.service;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.List;
+
 import org.apache.axiom.om.OMElement;
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.description.AxisService;
 import org.apache.axis2.description.AxisServiceGroup;
 import org.apache.axis2.description.Parameter;
 import org.apache.axis2.description.PolicyInclude;
-import org.apache.neethi.Policy;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.neethi.Policy;
 import org.wso2.wsas.ServerConstants;
 import org.wso2.wsas.admin.service.util.ServiceArchiveCreator;
 import org.wso2.wsas.admin.service.util.ServiceGroupMetaData;
@@ -35,13 +41,6 @@
 import org.wso2.wsas.util.ParameterUtil;
 import org.wso2.wsas.util.PolicyUtil;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-
 /**
  * Admin service to manage service groups
  */
@@ -64,7 +63,6 @@
 
             String sgName = axisServiceGroup.getServiceGroupName();
             if (AdminFilter.isFilteredOutService(sgName)) {
-
                 // No need to display Admin Service Groups
                 continue;
             }
@@ -80,11 +78,12 @@
                     clientsideService = true;
                 }
                 services.add(axisService.getName());
+                //extract service type
                 serviceTypeParam = axisService.getParameter(ServerConstants.SERVICE_TYPE);
                 if(serviceTypeParam != null){
-                	serviceTypes.add((String)serviceTypeParam.getValue());
+                	serviceTypes.add(axisService.getName()+"#"+(String)serviceTypeParam.getValue());
                 }else{
-                	serviceTypes.add(ServerConstants.SERVICE_TYPE_OTHER);
+                	serviceTypes.add(axisService.getName()+"#"+ServerConstants.SERVICE_TYPE_OTHER);
                 }
             }
 

Modified: trunk/wsas/java/modules/www/extensions/core/xslt/list_services_info.xsl
==============================================================================
--- trunk/wsas/java/modules/www/extensions/core/xslt/list_services_info.xsl	(original)
+++ trunk/wsas/java/modules/www/extensions/core/xslt/list_services_info.xsl	Sun Jul  1 23:11:33 2007
@@ -9,6 +9,7 @@
                             <th>Service Groups</th>
                             <th>Actions</th>
                             <th>Services</th>
+							<th>Service Type</th>
                             <th>View</th>
                         </tr>
                     </thead>
@@ -23,7 +24,7 @@
                                             <xsl:attribute name="href">#</xsl:attribute>
                                             <xsl:attribute name="onclick">javascript:showServiceGroupInfo('<xsl:value-of select="group_name"/>'); return false;</xsl:attribute>
                                             <xsl:attribute name="title">Show Service Group <xsl:value-of select="group_name"/></xsl:attribute>
-                                            <xsl:value-of select="group_name"/> [<xsl:value-of select="group_name"/>.aar]
+                                            <xsl:value-of select="group_name"/>
                                         </a>
                                 </td>
                                 <td>
@@ -51,6 +52,13 @@
                                             <xsl:value-of select="."/>
                                         </a>
                                     </td>
+                                    <td>
+										<xsl:variable name="parentEle" select=".."/>
+										<xsl:variable name="serviceName" select="."/>
+										<xsl:apply-templates select="$parentEle/serviceTypes">
+											<xsl:with-param name="serviceNameParam" select="$serviceName"/>
+										</xsl:apply-templates>
+                                    </td>									
                                     <td style="width: 200px;">
                                         <a>
                                             <xsl:attribute name="href">#</xsl:attribute>
@@ -101,4 +109,16 @@
 
         </xsl:choose>
     </xsl:template>
+	
+    <xsl:template match="serviceTypes">
+		<xsl:param name="serviceNameParam"/>
+	    <xsl:for-each select=".">
+            <xsl:variable name="serviceType" select="."/>
+            <xsl:variable name="seperator">#</xsl:variable>	
+            <xsl:variable name="serviceName" select="substring-before($serviceType,$seperator)" />
+		    <xsl:if test="$serviceNameParam = $serviceName">
+	    	       <xsl:value-of select="substring-after($serviceType,$seperator)"/>
+	    	</xsl:if>
+        </xsl:for-each>
+    </xsl:template>	
 </xsl:stylesheet>
\ No newline at end of file