You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by ch...@apache.org on 2006/08/23 08:26:10 UTC

svn commit: r433932 - /webservices/axis2/trunk/java/modules/webapp/listServices.jsp

Author: chinthaka
Date: Tue Aug 22 23:26:10 2006
New Revision: 433932

URL: http://svn.apache.org/viewvc?rev=433932&view=rev
Log:
Making sure we show proper endpoints depending on the various switches

Modified:
    webservices/axis2/trunk/java/modules/webapp/listServices.jsp

Modified: webservices/axis2/trunk/java/modules/webapp/listServices.jsp
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/webapp/listServices.jsp?rev=433932&r1=433931&r2=433932&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/webapp/listServices.jsp (original)
+++ webservices/axis2/trunk/java/modules/webapp/listServices.jsp Tue Aug 22 23:26:10 2006
@@ -1,12 +1,11 @@
 <%@ page import="org.apache.axis2.Constants,
-                 org.apache.axis2.description.AxisOperation"%>
-<%@ page import="org.apache.axis2.description.AxisService"%>
-<%@ page import="java.util.Collection"%>
-<%@ page import="java.util.Enumeration"%>
-<%@ page import="java.util.HashMap"%>
-<%@ page import="java.util.Hashtable"%>
-<%@ page import="java.util.Iterator"%>
-<%@ page import="org.apache.axis2.transport.http.AxisServlet"%>
+                 org.apache.axis2.description.AxisOperation" %>
+<%@ page import="org.apache.axis2.description.AxisService" %>
+<%@ page import="org.apache.axis2.description.Parameter" %>
+<%@ page import="org.apache.axis2.engine.AxisConfiguration" %>
+<%@ page import="org.apache.axis2.transport.http.AxisServlet" %>
+<%@ page import="org.apache.axis2.util.JavaUtils" %>
+<%@ page import="java.util.*" %>
 <%--
     /*
  * Copyright 2002,2004 The Apache Software Foundation.
@@ -26,76 +25,130 @@
 --%>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <html>
-  <jsp:include page="include/httpbase.jsp"/>
-  <head><title>List Services</title>
-  <link href="axis2-web/css/axis-style.css" rel="stylesheet" type="text/css" />
-  </head>
-  <body>
-  <jsp:include page="include/header.inc"></jsp:include>
-    <jsp:include page="include/link-footer.jsp"></jsp:include>
-  <h1>Available services</h1>
-  <%    String prifix = request.getAttribute("frontendHostUrl") + AxisServlet.SERVICE_PATH +"/";
-        String restprefix = request.getAttribute("frontendHostUrl") + "rest/";
-    %>
-     <%
-        HashMap serviceMap = (HashMap)request.getSession().getAttribute(Constants.SERVICE_MAP);
-         request.getSession().setAttribute(Constants.SERVICE_MAP,null);
-        Hashtable errornessservice =(Hashtable)request.getSession().getAttribute(Constants.ERROR_SERVICE_MAP);
-         boolean status = false;
-        if (serviceMap!=null && !serviceMap.isEmpty()){
+<jsp:include page="include/httpbase.jsp"/>
+<head><title>List Services</title>
+    <link href="axis2-web/css/axis-style.css" rel="stylesheet" type="text/css"/>
+</head>
+
+<body>
+<jsp:include page="include/header.inc" />
+<jsp:include page="include/link-footer.jsp" />
+<h1>Available services</h1>
+<% String prefix = request.getAttribute("frontendHostUrl") + AxisServlet.SERVICE_PATH + "/";
+    String restPrefix = request.getAttribute("frontendHostUrl") + "rest/";
+%>
+<%
+    HashMap serviceMap = (HashMap) request.getSession().getAttribute(Constants.SERVICE_MAP);
+    request.getSession().setAttribute(Constants.SERVICE_MAP, null);
+    Hashtable errornessservice = (Hashtable) request.getSession().getAttribute(Constants.ERROR_SERVICE_MAP);
+    boolean status = false;
+    if (serviceMap != null && !serviceMap.isEmpty()) {
         Iterator opItr;
         //HashMap operations;
-        String serviceName ;
+        String serviceName;
         Collection servicecol = serviceMap.values();
-       // Collection operationsList;
-       for (Iterator iterator = servicecol.iterator(); iterator.hasNext();) {
+        // Collection operationsList;
+        for (Iterator iterator = servicecol.iterator(); iterator.hasNext();) {
             AxisService axisService = (AxisService) iterator.next();
             opItr = axisService.getOperations();
             //operationsList = operations.values();
             serviceName = axisService.getName();
-            %><h2><font color="blue"><a href="<%=prifix + axisService.getName()%>?wsdl"><%=serviceName%></a></font></h2>
-           <font color="blue">Service EPR : </font><font color="black"><%=prifix + axisService.getName()%></font><br>
-               <font color="blue">Service REST epr : </font><font color="black"><%=restprefix + axisService.getName()%></font>
-           <h4>Service Description : <font color="black"><%=axisService.getServiceDescription()%></h4>
-            <i><font color="blue">Service Status : <%=axisService.isActive()?"Active":"InActive"%></font></i><br>
-               <%
-            if (opItr.hasNext()) {
-                %><i>Available operations</i><%
-            } else {
-                %><i> There are no Operations specified</i><%
-            }
-               opItr = axisService.getOperations();
-           %><ul><%
-            while (opItr.hasNext()) {
-                AxisOperation axisOperation = (AxisOperation) opItr.next();
-                %><li><%=axisOperation.getName().getLocalPart()%></li>
-<%--                <br>Operation EPR : <%=prifix + axisService.getName().getLocalPart() + "/"+ axisOperation.getName().getLocalPart()%>--%>
-                <%
-            }
-           %></ul>
-           <%
-           status = true;
+%><h2><font color="blue"><a href="<%=prefix + axisService.getName()%>?wsdl"><%=serviceName%></a></font></h2>
+<font color="blue">Service EPR : </font><font color="black"><%=prefix + axisService.getName()%></font><br>
+<%
+    // do we need to enable REST in the main servlet so that it handles both REST and SOAP messages
+    boolean enableRESTInAxis2MainServlet = false;
+    boolean disableREST = false;
+    boolean disableSeperateEndpointForREST = false;
+    AxisConfiguration axisConfiguration = axisService.getAxisConfiguration();
+
+    Parameter parameter = axisConfiguration.getParameter(Constants.Configuration.ENABLE_REST_IN_AXIS2_MAIN_SERVLET);
+    if (parameter != null) {
+        enableRESTInAxis2MainServlet = !JavaUtils.isFalseExplicitly(parameter.getValue());
+    }
+
+    // do we need to completely disable REST support
+    parameter = axisConfiguration.getParameter(Constants.Configuration.DISABLE_REST);
+    if (parameter != null) {
+        disableREST = !JavaUtils.isFalseExplicitly(parameter.getValue());
+    }
+
+    // Do we need to have a separate endpoint for REST
+    parameter = axisConfiguration.getParameter(Constants.Configuration.DISABLE_SEPARATE_ENDPOINT_FOR_REST);
+    if (parameter != null) {
+        disableSeperateEndpointForREST = !JavaUtils.isFalseExplicitly(parameter.getValue());
+    }
+
+    if (enableRESTInAxis2MainServlet) {
+%>
+<font color="blue">Service REST epr : </font><font color="black"><%=prefix + axisService.getName()%></font>
+<%
+    }
+    if (!disableREST && !disableSeperateEndpointForREST) {
+        if (!enableRESTInAxis2MainServlet) {
+%>
+<font color="blue">Service REST epr : </font><font color="black"><%=restPrefix + axisService.getName()%></font>
+<%
+} else {
+%>
+<br />
+<font color="blue">                  : </font><font color="black"><%=restPrefix + axisService.getName()%></font>
+<%
+
+    }
+%>
+<%
+    }
+
+
+    String serviceDescription = axisService.getServiceDescription();
+    if (serviceDescription == null || "".equals(serviceDescription)) {
+        serviceDescription = "No description available for this service";
+    }
+%>
+<h4>Service Description : <font color="black"><%=serviceDescription%></h4>
+<i><font color="blue">Service Status : <%=axisService.isActive() ? "Active" : "InActive"%></font></i><br>
+<%
+    if (opItr.hasNext()) {
+%><i>Available operations</i><%
+} else {
+%><i> There are no Operations specified</i><%
+    }
+    opItr = axisService.getOperations();
+%><ul><%
+    while (opItr.hasNext()) {
+        AxisOperation axisOperation = (AxisOperation) opItr.next();
+%><li><%=axisOperation.getName().getLocalPart()%></li>
+    <%--                <br>Operation EPR : <%=prifix + axisService.getName().getLocalPart() + "/"+ axisOperation.getName().getLocalPart()%>--%>
+    <%
         }
+    %></ul>
+<%
+            status = true;
         }
-        if(errornessservice != null){
-            if(errornessservice.size() > 0){
-                request.getSession().setAttribute(Constants.IS_FAULTY,Constants.IS_FAULTY);
-                %>
-                 <hr><h3><font color="blue">Faulty Services</font></h3>
-                <%
-                Enumeration faultyservices = errornessservice.keys();
-                while (faultyservices.hasMoreElements()) {
-                    String faultyserviceName = (String) faultyservices.nextElement();
-                    %><h3><font color="blue"><a href="services/ListFaultyServices?serviceName=<%=faultyserviceName%>">
-                    <%=faultyserviceName%></a></font></h3>
-                    <%
-                }
+    }
+    if (errornessservice != null) {
+        if (errornessservice.size() > 0) {
+            request.getSession().setAttribute(Constants.IS_FAULTY, Constants.IS_FAULTY);
+%>
+<hr>
+
+<h3><font color="blue">Faulty Services</font></h3>
+<%
+    Enumeration faultyservices = errornessservice.keys();
+    while (faultyservices.hasMoreElements()) {
+        String faultyserviceName = (String) faultyservices.nextElement();
+%><h3><font color="blue"><a href="services/ListFaultyServices?serviceName=<%=faultyserviceName%>">
+    <%=faultyserviceName%></a></font></h3>
+<%
             }
-           status = true;
-        }if(!status){
-            %> There seems to be no services listed! Try hitting refresh <%
         }
-       %>
-    <jsp:include page="include/footer.inc"></jsp:include>
-  </body>
+        status = true;
+    }
+    if (!status) {
+%> There seems to be no services listed! Try hitting refresh <%
+    }
+%>
+<jsp:include page="include/footer.inc" />
+</body>
 </html>



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org