Author: sagara
Date: Sat Jul 13 06:17:16 2013
New Revision: 1502752
URL: http://svn.apache.org/r1502752
Log:
Applied patch for AXIS2-5520
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/Utils.java
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/HTTPTransportReceiver.java
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/listServices.jsp
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/Utils.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/Utils.java?rev=1502752&r1=1502751&r2=1502752&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/Utils.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/Utils.java
Sat Jul 13 06:17:16 2013
@@ -20,23 +20,6 @@
package org.apache.axis2.util;
-import java.io.File;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.net.InetAddress;
-import java.net.NetworkInterface;
-import java.net.SocketException;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.security.PrivilegedExceptionAction;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFault;
@@ -73,6 +56,22 @@ import org.apache.axis2.wsdl.WSDLConstan
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import javax.xml.namespace.QName;
+import java.io.File;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.net.InetAddress;
+import java.net.NetworkInterface;
+import java.net.SocketException;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.security.PrivilegedExceptionAction;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
public class Utils {
private static final Log log = LogFactory.getLog(Utils.class);
@@ -804,4 +803,21 @@ public class Utils {
return val != null && ((Boolean)val).booleanValue();
}
}
+
+ /**
+ * This method is used to find whether an axis2service is declared as
hidden using the
+ * "hiddenService" param
+ *
+ * @param axisService - the service of interest
+ * @return true if is declared as hidden, false if not
+ */
+ public static boolean isHiddenService(AxisService axisService) {
+ boolean hideService = false;
+ Parameter hiddenServiceParam;
+ hiddenServiceParam =
axisService.getParameter(Constants.HIDDEN_SERVICE_PARAM_NAME);
+ if (hiddenServiceParam != null) {
+ hideService =
!JavaUtils.isFalseExplicitly(hiddenServiceParam.getValue());
+ }
+ return hideService;
+ }
}
Modified:
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/HTTPTransportReceiver.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/HTTPTransportReceiver.java?rev=1502752&r1=1502751&r2=1502752&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/HTTPTransportReceiver.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/HTTPTransportReceiver.java
Sat Jul 13 06:17:16 2013
@@ -20,6 +20,13 @@
package org.apache.axis2.transport.http;
+import org.apache.axis2.AxisFault;
+import org.apache.axis2.context.ConfigurationContext;
+import org.apache.axis2.description.AxisOperation;
+import org.apache.axis2.description.AxisService;
+import org.apache.axis2.engine.AxisConfiguration;
+import org.apache.axis2.util.Utils;
+
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
@@ -29,12 +36,6 @@ import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
-import org.apache.axis2.AxisFault;
-import org.apache.axis2.context.ConfigurationContext;
-import org.apache.axis2.description.AxisOperation;
-import org.apache.axis2.description.AxisService;
-import org.apache.axis2.engine.AxisConfiguration;
-
/**
* Class HTTPTransportReceiver
@@ -113,23 +114,25 @@ public class HTTPTransportReceiver {
AxisService axisService = (AxisService) it.next();
- Iterator iterator = axisService.getOperations();
+ if (!Utils.isHiddenService(axisService)) {
+ Iterator iterator = axisService.getOperations();
- temp += "<h3><a href=\"" + axisService.getName() + "?wsdl\">" +
- axisService.getName() + "</a></h3>";
+ temp += "<h3><a href=\"" + axisService.getName() +
"?wsdl\">" +
+ axisService.getName() + "</a></h3>";
- if (iterator.hasNext()) {
- temp += "Available operations <ul>";
+ if (iterator.hasNext()) {
+ temp += "Available operations <ul>";
- for (; iterator.hasNext();) {
- AxisOperation axisOperation = (AxisOperation)
iterator.next();
+ for (; iterator.hasNext();) {
+ AxisOperation axisOperation = (AxisOperation)
iterator.next();
- temp += "<li>" +
axisOperation.getName().getLocalPart() + "</li>";
- }
+ temp += "<li>" +
axisOperation.getName().getLocalPart() + "</li>";
+ }
- temp += "</ul>";
- } else {
- temp += "No operations specified for this service";
+ temp += "</ul>";
+ } else {
+ temp += "No operations specified for this service";
+ }
}
}
}
Modified:
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/listServices.jsp
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/listServices.jsp?rev=1502752&r1=1502751&r2=1502752&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/listServices.jsp
(original)
+++
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/listServices.jsp
Sat Jul 13 06:17:16 2013
@@ -22,6 +22,7 @@
<%@ 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.util.Utils" %>
<%@ page import="org.apache.axis2.util.JavaUtils" %>
<%@ page import="java.util.Collection" %>
<%@ page import="java.util.Enumeration" %>
@@ -56,6 +57,7 @@
// Collection operationsList;
for (Iterator iterator = servicecol.iterator(); iterator.hasNext();) {
AxisService axisService = (AxisService) iterator.next();
+ if (!Utils.isHiddenService(axisService)) {
opItr = axisService.getOperations();
//operationsList = operations.values();
serviceName = axisService.getName();
@@ -104,6 +106,7 @@
%></ul>
<%
status = true;
+ }
}
}
if (errornessservice != null) {
