Author: mmerz Date: Thu Dec 2 17:32:48 2004 New Revision: 109616 URL: http://svn.apache.org/viewcvs?view=rev&rev=109616 Log: Removed remaining references to deprecated DropInDeploymentHandler; added use of OUT parameter to Blank.jws.
Modified: incubator/beehive/trunk/samples/AddressBookWS/WEB-INF/server-config.wsdd incubator/beehive/trunk/samples/EmployeeWS/WEB-INF/server-config.wsdd incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/server-config.wsdd incubator/beehive/trunk/samples/wsm-blank/WEB-INF/server-config.wsdd incubator/beehive/trunk/samples/wsm-blank/WEB-INF/src/template/Blank.jws Modified: incubator/beehive/trunk/samples/AddressBookWS/WEB-INF/server-config.wsdd Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/AddressBookWS/WEB-INF/server-config.wsdd?view=diff&rev=109616&p1=incubator/beehive/trunk/samples/AddressBookWS/WEB-INF/server-config.wsdd&r1=109615&p2=incubator/beehive/trunk/samples/AddressBookWS/WEB-INF/server-config.wsdd&r2=109616 ============================================================================== --- incubator/beehive/trunk/samples/AddressBookWS/WEB-INF/server-config.wsdd (original) +++ incubator/beehive/trunk/samples/AddressBookWS/WEB-INF/server-config.wsdd Thu Dec 2 17:32:48 2004 @@ -1,54 +1,46 @@ <?xml version="1.0" encoding="UTF-8"?> -<deployment xmlns="http://xml.apache.org/axis/wsdd/"; xmlns:java="http://xml.apache.org/axis/wsdd/providers/java";> - <globalConfiguration> - <parameter name="adminPassword" value="admin"/> - <parameter name="disablePrettyXML" value="true"/> - <parameter name="attachments.implementation" value="org.apache.axis.attachments.AttachmentsImpl"/> - <parameter name="sendXsiTypes" value="true"/> - <!--<parameter name="sendMultiRefs" value="true"/>--> - <parameter name="sendXMLDeclaration" value="true"/> - <requestFlow> +<deployment xmlns="http://xml.apache.org/axis/wsdd/"; xmlns:java="http://xml.apache.org/axis/wsdd/providers/java";> + <globalConfiguration> + <parameter name="adminPassword" value="admin"/> + <parameter name="disablePrettyXML" value="true"/> + <parameter name="attachments.implementation" value="org.apache.axis.attachments.AttachmentsImpl"/> + <parameter name="sendXsiTypes" value="true"/> + <parameter name="sendXMLDeclaration" value="true"/> + <requestFlow> <handler type="java:org.apache.beehive.wsm.axis.AnnotatedWebServiceDeploymentHandler"> <parameter name="scope" value="session"/> </handler> - <handler type="java:org.apache.beehive.wsm.axis.DropInDeploymentHandler"> - <parameter name="scope" value="session"/> - </handler> - <handler type="java:org.apache.axis.handlers.JWSHandler"> - <parameter name="scope" value="session"/> - </handler> - <!--<handler type="java:org.apache.axis.handlers.JWSHandler"> - <parameter name="scope" value="request"/> - <parameter name="extension" value=".jwr"/> - </handler>--> - </requestFlow> - </globalConfiguration> - <handler name="LocalResponder" type="java:org.apache.axis.transport.local.LocalResponder"/> - <handler name="URLMapper" type="java:org.apache.axis.handlers.http.URLMapper"/> - <handler name="Authenticate" type="java:org.apache.axis.handlers.SimpleAuthenticationHandler"/> - <service name="AdminService" provider="java:MSG"> - <parameter name="allowedMethods" value="AdminService"/> - <parameter name="enableRemoteAdmin" value="false"/> - <parameter name="className" value="org.apache.axis.utils.Admin"/> - <namespace>http://xml.apache.org/axis/wsdd/</namespace> - </service> - <service name="Version" provider="java:RPC"> - <parameter name="allowedMethods" value="getVersion"/> - <parameter name="className" value="org.apache.axis.Version"/> - </service> - <transport name="http"> - <requestFlow> - <handler type="URLMapper"/> - <handler type="java:org.apache.axis.handlers.http.HTTPAuthHandler"/> - </requestFlow> - <parameter name="qs:list" value="org.apache.axis.transport.http.QSListHandler"/> - <parameter name="qs:wsdl" value="org.apache.axis.transport.http.QSWSDLHandler"/> - <parameter name="qs:method" value="org.apache.axis.transport.http.QSMethodHandler"/> - </transport> - <transport name="local"> - <responseFlow> - <handler type="LocalResponder"/> - </responseFlow> - </transport> -</deployment> - + <handler type="java:org.apache.axis.handlers.JWSHandler"> + <parameter name="scope" value="session"/> + </handler> + </requestFlow> + </globalConfiguration> + <handler name="LocalResponder" type="java:org.apache.axis.transport.local.LocalResponder"/> + <handler name="URLMapper" type="java:org.apache.axis.handlers.http.URLMapper"/> + <handler name="Authenticate" type="java:org.apache.axis.handlers.SimpleAuthenticationHandler"/> + <service name="AdminService" provider="java:MSG"> + <parameter name="allowedMethods" value="AdminService"/> + <parameter name="enableRemoteAdmin" value="false"/> + <parameter name="className" value="org.apache.axis.utils.Admin"/> + <namespace>http://xml.apache.org/axis/wsdd/</namespace> + </service> + <service name="Version" provider="java:RPC"> + <parameter name="allowedMethods" value="getVersion"/> + <parameter name="className" value="org.apache.axis.Version"/> + </service> + <transport name="http"> + <requestFlow> + <handler type="URLMapper"/> + <handler type="java:org.apache.axis.handlers.http.HTTPAuthHandler"/> + </requestFlow> + <parameter name="qs:list" value="org.apache.axis.transport.http.QSListHandler"/> + <parameter name="qs:wsdl" value="org.apache.axis.transport.http.QSWSDLHandler"/> + <parameter name="qs:method" value="org.apache.axis.transport.http.QSMethodHandler"/> + </transport> + <transport name="local"> + <responseFlow> + <handler type="LocalResponder"/> + </responseFlow> + </transport> +</deployment> + Modified: incubator/beehive/trunk/samples/EmployeeWS/WEB-INF/server-config.wsdd Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/EmployeeWS/WEB-INF/server-config.wsdd?view=diff&rev=109616&p1=incubator/beehive/trunk/samples/EmployeeWS/WEB-INF/server-config.wsdd&r1=109615&p2=incubator/beehive/trunk/samples/EmployeeWS/WEB-INF/server-config.wsdd&r2=109616 ============================================================================== --- incubator/beehive/trunk/samples/EmployeeWS/WEB-INF/server-config.wsdd (original) +++ incubator/beehive/trunk/samples/EmployeeWS/WEB-INF/server-config.wsdd Thu Dec 2 17:32:48 2004 @@ -1,54 +1,46 @@ <?xml version="1.0" encoding="UTF-8"?> -<deployment xmlns="http://xml.apache.org/axis/wsdd/"; xmlns:java="http://xml.apache.org/axis/wsdd/providers/java";> - <globalConfiguration> - <parameter name="adminPassword" value="admin"/> - <parameter name="disablePrettyXML" value="true"/> - <parameter name="attachments.implementation" value="org.apache.axis.attachments.AttachmentsImpl"/> - <parameter name="sendXsiTypes" value="true"/> - <!--<parameter name="sendMultiRefs" value="true"/>--> - <parameter name="sendXMLDeclaration" value="true"/> - <requestFlow> +<deployment xmlns="http://xml.apache.org/axis/wsdd/"; xmlns:java="http://xml.apache.org/axis/wsdd/providers/java";> + <globalConfiguration> + <parameter name="adminPassword" value="admin"/> + <parameter name="disablePrettyXML" value="true"/> + <parameter name="attachments.implementation" value="org.apache.axis.attachments.AttachmentsImpl"/> + <parameter name="sendXsiTypes" value="true"/> + <parameter name="sendXMLDeclaration" value="true"/> + <requestFlow> <handler type="java:org.apache.beehive.wsm.axis.AnnotatedWebServiceDeploymentHandler"> <parameter name="scope" value="session"/> </handler> - <handler type="java:org.apache.beehive.wsm.axis.DropInDeploymentHandler"> - <parameter name="scope" value="session"/> - </handler> - <handler type="java:org.apache.axis.handlers.JWSHandler"> - <parameter name="scope" value="session"/> - </handler> - <!--<handler type="java:org.apache.axis.handlers.JWSHandler"> - <parameter name="scope" value="request"/> - <parameter name="extension" value=".jwr"/> - </handler>--> - </requestFlow> - </globalConfiguration> - <handler name="LocalResponder" type="java:org.apache.axis.transport.local.LocalResponder"/> - <handler name="URLMapper" type="java:org.apache.axis.handlers.http.URLMapper"/> - <handler name="Authenticate" type="java:org.apache.axis.handlers.SimpleAuthenticationHandler"/> - <service name="AdminService" provider="java:MSG"> - <parameter name="allowedMethods" value="AdminService"/> - <parameter name="enableRemoteAdmin" value="false"/> - <parameter name="className" value="org.apache.axis.utils.Admin"/> - <namespace>http://xml.apache.org/axis/wsdd/</namespace> - </service> - <service name="Version" provider="java:RPC"> - <parameter name="allowedMethods" value="getVersion"/> - <parameter name="className" value="org.apache.axis.Version"/> - </service> - <transport name="http"> - <requestFlow> - <handler type="URLMapper"/> - <handler type="java:org.apache.axis.handlers.http.HTTPAuthHandler"/> - </requestFlow> - <parameter name="qs:list" value="org.apache.axis.transport.http.QSListHandler"/> - <parameter name="qs:wsdl" value="org.apache.axis.transport.http.QSWSDLHandler"/> - <parameter name="qs:method" value="org.apache.axis.transport.http.QSMethodHandler"/> - </transport> - <transport name="local"> - <responseFlow> - <handler type="LocalResponder"/> - </responseFlow> - </transport> -</deployment> - + <handler type="java:org.apache.axis.handlers.JWSHandler"> + <parameter name="scope" value="session"/> + </handler> + </requestFlow> + </globalConfiguration> + <handler name="LocalResponder" type="java:org.apache.axis.transport.local.LocalResponder"/> + <handler name="URLMapper" type="java:org.apache.axis.handlers.http.URLMapper"/> + <handler name="Authenticate" type="java:org.apache.axis.handlers.SimpleAuthenticationHandler"/> + <service name="AdminService" provider="java:MSG"> + <parameter name="allowedMethods" value="AdminService"/> + <parameter name="enableRemoteAdmin" value="false"/> + <parameter name="className" value="org.apache.axis.utils.Admin"/> + <namespace>http://xml.apache.org/axis/wsdd/</namespace> + </service> + <service name="Version" provider="java:RPC"> + <parameter name="allowedMethods" value="getVersion"/> + <parameter name="className" value="org.apache.axis.Version"/> + </service> + <transport name="http"> + <requestFlow> + <handler type="URLMapper"/> + <handler type="java:org.apache.axis.handlers.http.HTTPAuthHandler"/> + </requestFlow> + <parameter name="qs:list" value="org.apache.axis.transport.http.QSListHandler"/> + <parameter name="qs:wsdl" value="org.apache.axis.transport.http.QSWSDLHandler"/> + <parameter name="qs:method" value="org.apache.axis.transport.http.QSMethodHandler"/> + </transport> + <transport name="local"> + <responseFlow> + <handler type="LocalResponder"/> + </responseFlow> + </transport> +</deployment> + Modified: incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/server-config.wsdd Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/server-config.wsdd?view=diff&rev=109616&p1=incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/server-config.wsdd&r1=109615&p2=incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/server-config.wsdd&r2=109616 ============================================================================== --- incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/server-config.wsdd (original) +++ incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/server-config.wsdd Thu Dec 2 17:32:48 2004 @@ -1,54 +1,51 @@ -<?xml version="1.0" encoding="UTF-8"?> -<deployment xmlns="http://xml.apache.org/axis/wsdd/"; xmlns:java="http://xml.apache.org/axis/wsdd/providers/java";> - <globalConfiguration> - <parameter name="adminPassword" value="admin"/> - <parameter name="disablePrettyXML" value="true"/> - <parameter name="attachments.implementation" value="org.apache.axis.attachments.AttachmentsImpl"/> - <parameter name="sendXsiTypes" value="true"/> - <!--<parameter name="sendMultiRefs" value="true"/>--> - <parameter name="sendXMLDeclaration" value="true"/> - <requestFlow> - <handler type="java:org.apache.beehive.wsm.axis.AnnotatedWebServiceDeploymentHandler"> - <parameter name="scope" value="session"/> - </handler> - <handler type="java:org.apache.beehive.wsm.axis.DropInDeploymentHandler"> - <parameter name="scope" value="session"/> - </handler> - <handler type="java:org.apache.axis.handlers.JWSHandler"> - <parameter name="scope" value="session"/> - </handler> - <!--<handler type="java:org.apache.axis.handlers.JWSHandler"> - <parameter name="scope" value="request"/> - <parameter name="extension" value=".jwr"/> - </handler>--> - </requestFlow> - </globalConfiguration> - <handler name="LocalResponder" type="java:org.apache.axis.transport.local.LocalResponder"/> - <handler name="URLMapper" type="java:org.apache.axis.handlers.http.URLMapper"/> - <handler name="Authenticate" type="java:org.apache.axis.handlers.SimpleAuthenticationHandler"/> - <service name="AdminService" provider="java:MSG"> - <parameter name="allowedMethods" value="AdminService"/> - <parameter name="enableRemoteAdmin" value="false"/> - <parameter name="className" value="org.apache.axis.utils.Admin"/> - <namespace>http://xml.apache.org/axis/wsdd/</namespace> - </service> - <service name="Version" provider="java:RPC"> - <parameter name="allowedMethods" value="getVersion"/> - <parameter name="className" value="org.apache.axis.Version"/> - </service> - <transport name="http"> - <requestFlow> - <handler type="URLMapper"/> - <handler type="java:org.apache.axis.handlers.http.HTTPAuthHandler"/> - </requestFlow> - <parameter name="qs:list" value="org.apache.axis.transport.http.QSListHandler"/> - <parameter name="qs:wsdl" value="org.apache.axis.transport.http.QSWSDLHandler"/> - <parameter name="qs:method" value="org.apache.axis.transport.http.QSMethodHandler"/> - </transport> - <transport name="local"> - <responseFlow> - <handler type="LocalResponder"/> - </responseFlow> - </transport> -</deployment> - +<?xml version="1.0" encoding="UTF-8"?> +<deployment xmlns="http://xml.apache.org/axis/wsdd/"; xmlns:java="http://xml.apache.org/axis/wsdd/providers/java";> + <globalConfiguration> + <parameter name="adminPassword" value="admin"/> + <parameter name="disablePrettyXML" value="true"/> + <parameter name="attachments.implementation" value="org.apache.axis.attachments.AttachmentsImpl"/> + <parameter name="sendXsiTypes" value="true"/> + <!--<parameter name="sendMultiRefs" value="true"/>--> + <parameter name="sendXMLDeclaration" value="true"/> + <requestFlow> + <handler type="java:org.apache.beehive.wsm.axis.AnnotatedWebServiceDeploymentHandler"> + <parameter name="scope" value="session"/> + </handler> + <handler type="java:org.apache.axis.handlers.JWSHandler"> + <parameter name="scope" value="session"/> + </handler> + <!--<handler type="java:org.apache.axis.handlers.JWSHandler"> + <parameter name="scope" value="request"/> + <parameter name="extension" value=".jwr"/> + </handler>--> + </requestFlow> + </globalConfiguration> + <handler name="LocalResponder" type="java:org.apache.axis.transport.local.LocalResponder"/> + <handler name="URLMapper" type="java:org.apache.axis.handlers.http.URLMapper"/> + <handler name="Authenticate" type="java:org.apache.axis.handlers.SimpleAuthenticationHandler"/> + <service name="AdminService" provider="java:MSG"> + <parameter name="allowedMethods" value="AdminService"/> + <parameter name="enableRemoteAdmin" value="false"/> + <parameter name="className" value="org.apache.axis.utils.Admin"/> + <namespace>http://xml.apache.org/axis/wsdd/</namespace> + </service> + <service name="Version" provider="java:RPC"> + <parameter name="allowedMethods" value="getVersion"/> + <parameter name="className" value="org.apache.axis.Version"/> + </service> + <transport name="http"> + <requestFlow> + <handler type="URLMapper"/> + <handler type="java:org.apache.axis.handlers.http.HTTPAuthHandler"/> + </requestFlow> + <parameter name="qs:list" value="org.apache.axis.transport.http.QSListHandler"/> + <parameter name="qs:wsdl" value="org.apache.axis.transport.http.QSWSDLHandler"/> + <parameter name="qs:method" value="org.apache.axis.transport.http.QSMethodHandler"/> + </transport> + <transport name="local"> + <responseFlow> + <handler type="LocalResponder"/> + </responseFlow> + </transport> +</deployment> + Modified: incubator/beehive/trunk/samples/wsm-blank/WEB-INF/server-config.wsdd Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-blank/WEB-INF/server-config.wsdd?view=diff&rev=109616&p1=incubator/beehive/trunk/samples/wsm-blank/WEB-INF/server-config.wsdd&r1=109615&p2=incubator/beehive/trunk/samples/wsm-blank/WEB-INF/server-config.wsdd&r2=109616 ============================================================================== --- incubator/beehive/trunk/samples/wsm-blank/WEB-INF/server-config.wsdd (original) +++ incubator/beehive/trunk/samples/wsm-blank/WEB-INF/server-config.wsdd Thu Dec 2 17:32:48 2004 @@ -1,54 +1,46 @@ <?xml version="1.0" encoding="UTF-8"?> -<deployment xmlns="http://xml.apache.org/axis/wsdd/"; xmlns:java="http://xml.apache.org/axis/wsdd/providers/java";> - <globalConfiguration> - <parameter name="adminPassword" value="admin"/> - <parameter name="disablePrettyXML" value="true"/> - <parameter name="attachments.implementation" value="org.apache.axis.attachments.AttachmentsImpl"/> - <parameter name="sendXsiTypes" value="true"/> - <!--<parameter name="sendMultiRefs" value="true"/>--> - <parameter name="sendXMLDeclaration" value="true"/> - <requestFlow> +<deployment xmlns="http://xml.apache.org/axis/wsdd/"; xmlns:java="http://xml.apache.org/axis/wsdd/providers/java";> + <globalConfiguration> + <parameter name="adminPassword" value="admin"/> + <parameter name="disablePrettyXML" value="true"/> + <parameter name="attachments.implementation" value="org.apache.axis.attachments.AttachmentsImpl"/> + <parameter name="sendXsiTypes" value="true"/> + <parameter name="sendXMLDeclaration" value="true"/> + <requestFlow> <handler type="java:org.apache.beehive.wsm.axis.AnnotatedWebServiceDeploymentHandler"> <parameter name="scope" value="session"/> </handler> - <handler type="java:org.apache.beehive.wsm.axis.DropInDeploymentHandler"> - <parameter name="scope" value="session"/> - </handler> - <handler type="java:org.apache.axis.handlers.JWSHandler"> - <parameter name="scope" value="session"/> - </handler> - <!--<handler type="java:org.apache.axis.handlers.JWSHandler"> - <parameter name="scope" value="request"/> - <parameter name="extension" value=".jwr"/> - </handler>--> - </requestFlow> - </globalConfiguration> - <handler name="LocalResponder" type="java:org.apache.axis.transport.local.LocalResponder"/> - <handler name="URLMapper" type="java:org.apache.axis.handlers.http.URLMapper"/> - <handler name="Authenticate" type="java:org.apache.axis.handlers.SimpleAuthenticationHandler"/> - <service name="AdminService" provider="java:MSG"> - <parameter name="allowedMethods" value="AdminService"/> - <parameter name="enableRemoteAdmin" value="false"/> - <parameter name="className" value="org.apache.axis.utils.Admin"/> - <namespace>http://xml.apache.org/axis/wsdd/</namespace> - </service> - <service name="Version" provider="java:RPC"> - <parameter name="allowedMethods" value="getVersion"/> - <parameter name="className" value="org.apache.axis.Version"/> - </service> - <transport name="http"> - <requestFlow> - <handler type="URLMapper"/> - <handler type="java:org.apache.axis.handlers.http.HTTPAuthHandler"/> - </requestFlow> - <parameter name="qs:list" value="org.apache.axis.transport.http.QSListHandler"/> - <parameter name="qs:wsdl" value="org.apache.axis.transport.http.QSWSDLHandler"/> - <parameter name="qs:method" value="org.apache.axis.transport.http.QSMethodHandler"/> - </transport> - <transport name="local"> - <responseFlow> - <handler type="LocalResponder"/> - </responseFlow> - </transport> -</deployment> - + <handler type="java:org.apache.axis.handlers.JWSHandler"> + <parameter name="scope" value="session"/> + </handler> + </requestFlow> + </globalConfiguration> + <handler name="LocalResponder" type="java:org.apache.axis.transport.local.LocalResponder"/> + <handler name="URLMapper" type="java:org.apache.axis.handlers.http.URLMapper"/> + <handler name="Authenticate" type="java:org.apache.axis.handlers.SimpleAuthenticationHandler"/> + <service name="AdminService" provider="java:MSG"> + <parameter name="allowedMethods" value="AdminService"/> + <parameter name="enableRemoteAdmin" value="false"/> + <parameter name="className" value="org.apache.axis.utils.Admin"/> + <namespace>http://xml.apache.org/axis/wsdd/</namespace> + </service> + <service name="Version" provider="java:RPC"> + <parameter name="allowedMethods" value="getVersion"/> + <parameter name="className" value="org.apache.axis.Version"/> + </service> + <transport name="http"> + <requestFlow> + <handler type="URLMapper"/> + <handler type="java:org.apache.axis.handlers.http.HTTPAuthHandler"/> + </requestFlow> + <parameter name="qs:list" value="org.apache.axis.transport.http.QSListHandler"/> + <parameter name="qs:wsdl" value="org.apache.axis.transport.http.QSWSDLHandler"/> + <parameter name="qs:method" value="org.apache.axis.transport.http.QSMethodHandler"/> + </transport> + <transport name="local"> + <responseFlow> + <handler type="LocalResponder"/> + </responseFlow> + </transport> +</deployment> + Modified: incubator/beehive/trunk/samples/wsm-blank/WEB-INF/src/template/Blank.jws Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-blank/WEB-INF/src/template/Blank.jws?view=diff&rev=109616&p1=incubator/beehive/trunk/samples/wsm-blank/WEB-INF/src/template/Blank.jws&r1=109615&p2=incubator/beehive/trunk/samples/wsm-blank/WEB-INF/src/template/Blank.jws&r2=109616 ============================================================================== --- incubator/beehive/trunk/samples/wsm-blank/WEB-INF/src/template/Blank.jws (original) +++ incubator/beehive/trunk/samples/wsm-blank/WEB-INF/src/template/Blank.jws Thu Dec 2 17:32:48 2004 @@ -17,14 +17,18 @@ */ import javax.jws.WebMethod; +import javax.jws.WebParam; import javax.jws.WebService; +import javax.xml.rpc.holders.StringHolder; + @WebService public class Blank { @WebMethod - public String sayHelloWorld() - { + public String sayHelloWorld(@WebParam(name = "i", mode = WebParam.Mode.OUT) StringHolder i) + { + i.value = "Beehive"; return "Hello world!"; } }
