Author: dkulp
Date: Wed Oct 14 21:10:48 2009
New Revision: 825285
URL: http://svn.apache.org/viewvc?rev=825285&view=rev
Log:
Merged revisions 825284 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r825284 | dkulp | 2009-10-14 17:09:59 -0400 (Wed, 14 Oct 2009) | 2 lines
[CXF-2470] Mark the invoke operation as synthetic so it doesn't show in
the services list
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
cxf/branches/2.2.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
svn:mergeinfo = /cxf/trunk:825284
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java?rev=825285&r1=825284&r2=825285&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
(original)
+++
cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
Wed Oct 14 21:10:48 2009
@@ -322,6 +322,8 @@
mpi.setTypeQName(XMLSchemaQNames.XSD_ANY);
BindingOperationInfo bo = new
BindingOperationInfo(bind, op);
+ op.setProperty("operation.is.synthetic",
Boolean.TRUE);
+ bo.setProperty("operation.is.synthetic",
Boolean.TRUE);
bind.addOperation(bo);
}
}
Modified:
cxf/branches/2.2.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java?rev=825285&r1=825284&r2=825285&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java
(original)
+++
cxf/branches/2.2.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java
Wed Oct 14 21:10:48 2009
@@ -246,7 +246,9 @@
+ "</span>");
response.getWriter().write("<ul>");
for (OperationInfo oi :
sd.getEndpointInfo().getInterface().getOperations()) {
- response.getWriter().write("<li>" +
oi.getName().getLocalPart() + "</li>");
+ if (oi.getProperty("operation.is.synthetic") !=
Boolean.TRUE) {
+ response.getWriter().write("<li>" +
oi.getName().getLocalPart() + "</li>");
+ }
}
response.getWriter().write("</ul>");
response.getWriter().write("</td><td>");