Re: svn commit: r506561 - in /geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2: Axis2WebServiceContainer.java AxisServiceGenerator.java

2007-02-20 Thread Davanum Srinivas 

Done. Sorry for the delay.

-- dims

On 2/12/07, Kevan Miller <[EMAIL PROTECTED]> wrote:

Hey Dims,
Looks like we've got more tab chars. Also, no svn props set...

--kevan
On Feb 12, 2007, at 1:16 PM, [EMAIL PROTECTED] wrote:

> Author: dims
> Date: Mon Feb 12 10:16:14 2007
> New Revision: 506561
>
> URL: http://svn.apache.org/viewvc?view=rev&rev=506561
> Log:
> Fix for GERONIMO-2822 - Axis2 Integration - Get invoke() method
> working for WSDL provided scenario
>
> Added:
> geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/
> apache/geronimo/axis2/AxisServiceGenerator.java
> Modified:
> geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/
> apache/geronimo/axis2/Axis2WebServiceContainer.java
>
> Modified: geronimo/server/trunk/modules/geronimo-axis2/src/main/
> java/org/apache/geronimo/axis2/Axis2WebServiceContainer.java
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
> geronimo-axis2/src/main/java/org/apache/geronimo/axis2/
> Axis2WebServiceContainer.java?view=diff&rev=506561&r1=506560&r2=506561
> ==
> 
> --- geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/
> apache/geronimo/axis2/Axis2WebServiceContainer.java (original)
> +++ geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/
> apache/geronimo/axis2/Axis2WebServiceContainer.java Mon Feb 12
> 10:16:14 2007
> @@ -138,142 +138,8 @@
>  configurationContext.setServicePath
> (portInfo.getLocation());
>
>  if(wsdlDefinition != null){ //WSDL Has been provided
> - WSDLToAxisServiceBuilder wsdlBuilder = null;
> -
> - WSDLFactory factory = WSDLFactory.newInstance();
> - WSDLWriter writer = factory.newWSDLWriter();
> -
> - ByteArrayOutputStream out = new ByteArrayOutputStream();
> - writer.writeWSDL(wsdlDefinition, out);
> - String wsdlContent = out.toString("UTF-8"); //TODO Pass
> correct encoding from WSDL
> -
> - OMNamespace documentElementNS = ((OMElement)
> XMLUtils.toOM(new StringReader(wsdlContent))).getNamespace();
> -
> - Map serviceMap =
> wsdlDefinition.getServices();
> - Service wsdlService = serviceMap.values().iterator
> ().next();
> -
> - Map portMap = wsdlService.getPorts();
> - Port port = portMap.values().iterator().next();
> - String portName = port.getName();
> - QName serviceQName = wsdlService.getQName();
> -
> - //Decide on WSDL Version :
> - if
> (WSDLConstants.WSDL20_2006Constants.DEFAULT_NAMESPACE_URI.equals
> (documentElementNS.getNamespaceURI())){
> - wsdlBuilder = new WSDL20ToAxisServiceBuilder(new
> StringBufferInputStream(wsdlContent), serviceQName, null);
> - }
> - else if(Constants.NS_URI_WSDL11.equals
> (documentElementNS.getNamespaceURI())){
> - wsdlBuilder = new WSDL11ToAxisServiceBuilder
> (wsdlDefinition, serviceQName , portName);
> - }
> - //populate with axis2 objects
> - service = wsdlBuilder.populateService();
> - service.addParameter(new Parameter("ServiceClass",
> endpointClassName));
> -service.setWsdlFound(true);
> -service.setClassLoader(classLoader);
> -
> - //Goind to create annotations by hand
> - DescriptionBuilderComposite dbc = new
> DescriptionBuilderComposite();
> - dbc.setClassLoader(classLoader);
> - HashMap dbcMap =
> new HashMap();
> -
> - //Service related annotations
> -WebServiceAnnot serviceAnnot =
> WebServiceAnnot.createWebServiceAnnotImpl();
> -serviceAnnot.setPortName(portName);
> -serviceAnnot.setServiceName(service.getName());
> -serviceAnnot.setName(service.getName());
> -serviceAnnot.setTargetNamespace
> (service.getTargetNamespace());
> -//don't set endpointinterface now otherwise you'll
> get a
> -//Validation error: SEI must not set a value for
> @WebService.endpointInterface.
> -//The default value is "".
> -//serviceAnnot.setEndpointInterface
> (endpointClassName);
> -
> - Class endPointClass = classLoader.loadClass
> (endpointClassName);
> - Method[] classMethods = endPointClass.getMethods();
> -
> - for(Iterator opIterator =
> service.getOperations() ; opIterator.hasNext() ;){
> - AxisOperation operation = opIterator.next();
> -JAXWSMessageReceiver receiver =
> JAXWSMessageReceiver.class.newInstance();
> -operation.setMessageReceiver(receiver);
> -
> -

Re: svn commit: r506561 - in /geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2: Axis2WebServiceContainer.java AxisServiceGenerator.java

2007-02-12 Thread Kevan Miller 

Hey Dims,
Looks like we've got more tab chars. Also, no svn props set...

--kevan
On Feb 12, 2007, at 1:16 PM, [EMAIL PROTECTED] wrote:


Author: dims
Date: Mon Feb 12 10:16:14 2007
New Revision: 506561

URL: http://svn.apache.org/viewvc?view=rev&rev=506561
Log:
Fix for GERONIMO-2822 - Axis2 Integration - Get invoke() method  
working for WSDL provided scenario


Added:
geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/ 
apache/geronimo/axis2/AxisServiceGenerator.java

Modified:
geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/ 
apache/geronimo/axis2/Axis2WebServiceContainer.java


Modified: geronimo/server/trunk/modules/geronimo-axis2/src/main/ 
java/org/apache/geronimo/axis2/Axis2WebServiceContainer.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/ 
geronimo-axis2/src/main/java/org/apache/geronimo/axis2/ 
Axis2WebServiceContainer.java?view=diff&rev=506561&r1=506560&r2=506561
== 

--- geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/ 
apache/geronimo/axis2/Axis2WebServiceContainer.java (original)
+++ geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/ 
apache/geronimo/axis2/Axis2WebServiceContainer.java Mon Feb 12  
10:16:14 2007

@@ -138,142 +138,8 @@
 configurationContext.setServicePath 
(portInfo.getLocation());


 if(wsdlDefinition != null){ //WSDL Has been provided
-   WSDLToAxisServiceBuilder wsdlBuilder = null;
-   
-   WSDLFactory factory = WSDLFactory.newInstance();
-   WSDLWriter writer = factory.newWSDLWriter();
-   
-   ByteArrayOutputStream out = new ByteArrayOutputStream();
-   writer.writeWSDL(wsdlDefinition, out);
-		String wsdlContent = out.toString("UTF-8"); //TODO Pass  
correct encoding from WSDL

-   
-   		OMNamespace documentElementNS = ((OMElement) 
XMLUtils.toOM(new StringReader(wsdlContent))).getNamespace();

-   
-   		Map serviceMap =  
wsdlDefinition.getServices();
-	Service wsdlService = serviceMap.values().iterator 
().next();

-   
-   Map portMap = wsdlService.getPorts();
-   Port port = portMap.values().iterator().next();
-   String portName = port.getName();
-   QName serviceQName = wsdlService.getQName();
-
-   //Decide on WSDL Version :
-	if 
(WSDLConstants.WSDL20_2006Constants.DEFAULT_NAMESPACE_URI.equals 
(documentElementNS.getNamespaceURI())){
-		wsdlBuilder = new WSDL20ToAxisServiceBuilder(new  
StringBufferInputStream(wsdlContent), serviceQName, null);

-   }
-	else if(Constants.NS_URI_WSDL11.equals 
(documentElementNS.getNamespaceURI())){
-		wsdlBuilder = new WSDL11ToAxisServiceBuilder 
(wsdlDefinition, serviceQName , portName);

-   }
-   //populate with axis2 objects
-   service = wsdlBuilder.populateService();
-	service.addParameter(new Parameter("ServiceClass",  
endpointClassName));

-service.setWsdlFound(true);
-service.setClassLoader(classLoader);
-   
-   //Goind to create annotations by hand
-	DescriptionBuilderComposite dbc = new  
DescriptionBuilderComposite();

-   dbc.setClassLoader(classLoader);
-	HashMap dbcMap =  
new HashMap();

-   
-   //Service related annotations
-WebServiceAnnot serviceAnnot =  
WebServiceAnnot.createWebServiceAnnotImpl();

-serviceAnnot.setPortName(portName);
-serviceAnnot.setServiceName(service.getName());
-serviceAnnot.setName(service.getName());
-serviceAnnot.setTargetNamespace 
(service.getTargetNamespace());
-//don't set endpointinterface now otherwise you'll  
get a
-//Validation error: SEI must not set a value for  
@WebService.endpointInterface.

-//The default value is "".
-//serviceAnnot.setEndpointInterface 
(endpointClassName);

-   
-   	 	Class endPointClass = classLoader.loadClass 
(endpointClassName);

-   Method[] classMethods = endPointClass.getMethods();
-   
-   	 	for(Iterator opIterator =  
service.getOperations() ; opIterator.hasNext() ;){

-   AxisOperation operation = opIterator.next();
-JAXWSMessageReceiver receiver =  
JAXWSMessageReceiver.class.newInstance();

-operation.setMessageReceiver(receiver);
-   
-   for(Method method : classMethods){
-