geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r509814 [2/2] - in /geronimo/server/trunk/modules/geronimo-axis2/src: main/generated/org/apache/axis2/jaxws/javaee/ main/java/org/apache/geronimo/axis2/ test/java/org/apache/geronimo/axis2/ test/java/org/apache/geronimo/axis2/testdata/
Date Tue, 20 Feb 2007 23:40:46 GMT
Modified: geronimo/server/trunk/modules/geronimo-axis2/src/main/generated/org/apache/axis2/jaxws/javaee/ServletLinkType.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-axis2/src/main/generated/org/apache/axis2/jaxws/javaee/ServletLinkType.java?view=diff&rev=509814&r1=509813&r2=509814
==============================================================================
--- geronimo/server/trunk/modules/geronimo-axis2/src/main/generated/org/apache/axis2/jaxws/javaee/ServletLinkType.java (original)
+++ geronimo/server/trunk/modules/geronimo-axis2/src/main/generated/org/apache/axis2/jaxws/javaee/ServletLinkType.java Tue Feb 20 15:40:42 2007
@@ -15,21 +15,21 @@
 
 /**
  * 
- * 	
+ *     
  * 
- * 	  The servlet-link element is used in the service-impl-bean element
- * 	  to specify that a Service Implementation Bean is defined as a
- * 	  JAX-RPC Service Endpoint.
+ *       The servlet-link element is used in the service-impl-bean element
+ *       to specify that a Service Implementation Bean is defined as a
+ *       JAX-RPC Service Endpoint.
  * 
- * 	  The value of the servlet-link element must be the servlet-name of
- * 	  a JAX-RPC Service Endpoint in the same WAR file.
+ *       The value of the servlet-link element must be the servlet-name of
+ *       a JAX-RPC Service Endpoint in the same WAR file.
  * 
- * 	  Used in: service-impl-bean
+ *       Used in: service-impl-bean
  * 
- * 	  Example:
- * 		  <servlet-link>StockQuoteService</servlet-link>
+ *       Example:
+ *           <servlet-link>StockQuoteService</servlet-link>
  * 
- * 	  
+ *       
  *       
  * 
  * <p>Java class for servlet-linkType complex type.

Modified: geronimo/server/trunk/modules/geronimo-axis2/src/main/generated/org/apache/axis2/jaxws/javaee/String.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-axis2/src/main/generated/org/apache/axis2/jaxws/javaee/String.java?view=diff&rev=509814&r1=509813&r2=509814
==============================================================================
--- geronimo/server/trunk/modules/geronimo-axis2/src/main/generated/org/apache/axis2/jaxws/javaee/String.java (original)
+++ geronimo/server/trunk/modules/geronimo-axis2/src/main/generated/org/apache/axis2/jaxws/javaee/String.java Tue Feb 20 15:40:42 2007
@@ -21,11 +21,11 @@
 /**
  * 
  * 
- * 	This is a special string datatype that is defined by Java EE as
- * 	a base type for defining collapsed strings. When schemas
- * 	require trailing/leading space elimination as well as
- * 	collapsing the existing whitespace, this base type may be
- * 	used.
+ *     This is a special string datatype that is defined by Java EE as
+ *     a base type for defining collapsed strings. When schemas
+ *     require trailing/leading space elimination as well as
+ *     collapsing the existing whitespace, this base type may be
+ *     used.
  * 
  *       
  * 

Modified: geronimo/server/trunk/modules/geronimo-axis2/src/main/generated/org/apache/axis2/jaxws/javaee/TrueFalseType.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-axis2/src/main/generated/org/apache/axis2/jaxws/javaee/TrueFalseType.java?view=diff&rev=509814&r1=509813&r2=509814
==============================================================================
--- geronimo/server/trunk/modules/geronimo-axis2/src/main/generated/org/apache/axis2/jaxws/javaee/TrueFalseType.java (original)
+++ geronimo/server/trunk/modules/geronimo-axis2/src/main/generated/org/apache/axis2/jaxws/javaee/TrueFalseType.java Tue Feb 20 15:40:42 2007
@@ -16,11 +16,11 @@
 /**
  * 
  * 
- * 	This simple type designates a boolean with only two
- * 	permissible values
+ *     This simple type designates a boolean with only two
+ *     permissible values
  * 
- * 	- true
- * 	- false
+ *     - true
+ *     - false
  * 
  *       
  * 

Modified: geronimo/server/trunk/modules/geronimo-axis2/src/main/generated/org/apache/axis2/jaxws/javaee/UrlPatternType.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-axis2/src/main/generated/org/apache/axis2/jaxws/javaee/UrlPatternType.java?view=diff&rev=509814&r1=509813&r2=509814
==============================================================================
--- geronimo/server/trunk/modules/geronimo-axis2/src/main/generated/org/apache/axis2/jaxws/javaee/UrlPatternType.java (original)
+++ geronimo/server/trunk/modules/geronimo-axis2/src/main/generated/org/apache/axis2/jaxws/javaee/UrlPatternType.java Tue Feb 20 15:40:42 2007
@@ -17,13 +17,13 @@
 /**
  * 
  * 
- * 	The url-patternType contains the url pattern of the mapping.
- * 	It must follow the rules specified in Section 11.2 of the
- * 	Servlet API Specification. This pattern is assumed to be in
- * 	URL-decoded form and must not contain CR(#xD) or LF(#xA).
- * 	If it contains those characters, the container must inform
- * 	the developer with a descriptive error message.
- * 	The container must preserve all characters including whitespaces.
+ *     The url-patternType contains the url pattern of the mapping.
+ *     It must follow the rules specified in Section 11.2 of the
+ *     Servlet API Specification. This pattern is assumed to be in
+ *     URL-decoded form and must not contain CR(#xD) or LF(#xA).
+ *     If it contains those characters, the container must inform
+ *     the developer with a descriptive error message.
+ *     The container must preserve all characters including whitespaces.
  * 
  *       
  * 

Modified: geronimo/server/trunk/modules/geronimo-axis2/src/main/generated/org/apache/axis2/jaxws/javaee/WebserviceDescriptionType.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-axis2/src/main/generated/org/apache/axis2/jaxws/javaee/WebserviceDescriptionType.java?view=diff&rev=509814&r1=509813&r2=509814
==============================================================================
--- geronimo/server/trunk/modules/geronimo-axis2/src/main/generated/org/apache/axis2/jaxws/javaee/WebserviceDescriptionType.java (original)
+++ geronimo/server/trunk/modules/geronimo-axis2/src/main/generated/org/apache/axis2/jaxws/javaee/WebserviceDescriptionType.java Tue Feb 20 15:40:42 2007
@@ -23,15 +23,15 @@
 /**
  * 
  * 
- * 	The webservice-description element defines a WSDL document file
- * 	and the set of Port components associated with the WSDL ports
- * 	defined in the WSDL document.  There may be multiple
- * 	webservice-descriptions defined within a module.
+ *     The webservice-description element defines a WSDL document file
+ *     and the set of Port components associated with the WSDL ports
+ *     defined in the WSDL document.  There may be multiple
+ *     webservice-descriptions defined within a module.
  * 
- * 	All WSDL file ports must have a corresponding port-component element
- * 	defined.
+ *     All WSDL file ports must have a corresponding port-component element
+ *     defined.
  * 
- * 	Used in: webservices
+ *     Used in: webservices
  * 
  *       
  * 

Modified: geronimo/server/trunk/modules/geronimo-axis2/src/main/generated/org/apache/axis2/jaxws/javaee/XsdAnyURIType.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-axis2/src/main/generated/org/apache/axis2/jaxws/javaee/XsdAnyURIType.java?view=diff&rev=509814&r1=509813&r2=509814
==============================================================================
--- geronimo/server/trunk/modules/geronimo-axis2/src/main/generated/org/apache/axis2/jaxws/javaee/XsdAnyURIType.java (original)
+++ geronimo/server/trunk/modules/geronimo-axis2/src/main/generated/org/apache/axis2/jaxws/javaee/XsdAnyURIType.java Tue Feb 20 15:40:42 2007
@@ -21,7 +21,7 @@
 /**
  * 
  * 
- * 	This type adds an "id" attribute to xsd:anyURI.
+ *     This type adds an "id" attribute to xsd:anyURI.
  * 
  *       
  * 

Modified: geronimo/server/trunk/modules/geronimo-axis2/src/main/generated/org/apache/axis2/jaxws/javaee/XsdBooleanType.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-axis2/src/main/generated/org/apache/axis2/jaxws/javaee/XsdBooleanType.java?view=diff&rev=509814&r1=509813&r2=509814
==============================================================================
--- geronimo/server/trunk/modules/geronimo-axis2/src/main/generated/org/apache/axis2/jaxws/javaee/XsdBooleanType.java (original)
+++ geronimo/server/trunk/modules/geronimo-axis2/src/main/generated/org/apache/axis2/jaxws/javaee/XsdBooleanType.java Tue Feb 20 15:40:42 2007
@@ -21,7 +21,7 @@
 /**
  * 
  * 
- * 	This type adds an "id" attribute to xsd:boolean.
+ *     This type adds an "id" attribute to xsd:boolean.
  * 
  *       
  * 

Modified: geronimo/server/trunk/modules/geronimo-axis2/src/main/generated/org/apache/axis2/jaxws/javaee/XsdIntegerType.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-axis2/src/main/generated/org/apache/axis2/jaxws/javaee/XsdIntegerType.java?view=diff&rev=509814&r1=509813&r2=509814
==============================================================================
--- geronimo/server/trunk/modules/geronimo-axis2/src/main/generated/org/apache/axis2/jaxws/javaee/XsdIntegerType.java (original)
+++ geronimo/server/trunk/modules/geronimo-axis2/src/main/generated/org/apache/axis2/jaxws/javaee/XsdIntegerType.java Tue Feb 20 15:40:42 2007
@@ -22,7 +22,7 @@
 /**
  * 
  * 
- * 	This type adds an "id" attribute to xsd:integer.
+ *     This type adds an "id" attribute to xsd:integer.
  * 
  *       
  * 

Modified: geronimo/server/trunk/modules/geronimo-axis2/src/main/generated/org/apache/axis2/jaxws/javaee/XsdNMTOKENType.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-axis2/src/main/generated/org/apache/axis2/jaxws/javaee/XsdNMTOKENType.java?view=diff&rev=509814&r1=509813&r2=509814
==============================================================================
--- geronimo/server/trunk/modules/geronimo-axis2/src/main/generated/org/apache/axis2/jaxws/javaee/XsdNMTOKENType.java (original)
+++ geronimo/server/trunk/modules/geronimo-axis2/src/main/generated/org/apache/axis2/jaxws/javaee/XsdNMTOKENType.java Tue Feb 20 15:40:42 2007
@@ -21,7 +21,7 @@
 /**
  * 
  * 
- * 	This type adds an "id" attribute to xsd:NMTOKEN.
+ *     This type adds an "id" attribute to xsd:NMTOKEN.
  * 
  *       
  * 

Modified: geronimo/server/trunk/modules/geronimo-axis2/src/main/generated/org/apache/axis2/jaxws/javaee/XsdNonNegativeIntegerType.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-axis2/src/main/generated/org/apache/axis2/jaxws/javaee/XsdNonNegativeIntegerType.java?view=diff&rev=509814&r1=509813&r2=509814
==============================================================================
--- geronimo/server/trunk/modules/geronimo-axis2/src/main/generated/org/apache/axis2/jaxws/javaee/XsdNonNegativeIntegerType.java (original)
+++ geronimo/server/trunk/modules/geronimo-axis2/src/main/generated/org/apache/axis2/jaxws/javaee/XsdNonNegativeIntegerType.java Tue Feb 20 15:40:42 2007
@@ -22,7 +22,7 @@
 /**
  * 
  * 
- * 	This type adds an "id" attribute to xsd:nonNegativeInteger.
+ *     This type adds an "id" attribute to xsd:nonNegativeInteger.
  * 
  *       
  * 

Modified: geronimo/server/trunk/modules/geronimo-axis2/src/main/generated/org/apache/axis2/jaxws/javaee/XsdPositiveIntegerType.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-axis2/src/main/generated/org/apache/axis2/jaxws/javaee/XsdPositiveIntegerType.java?view=diff&rev=509814&r1=509813&r2=509814
==============================================================================
--- geronimo/server/trunk/modules/geronimo-axis2/src/main/generated/org/apache/axis2/jaxws/javaee/XsdPositiveIntegerType.java (original)
+++ geronimo/server/trunk/modules/geronimo-axis2/src/main/generated/org/apache/axis2/jaxws/javaee/XsdPositiveIntegerType.java Tue Feb 20 15:40:42 2007
@@ -22,7 +22,7 @@
 /**
  * 
  * 
- * 	This type adds an "id" attribute to xsd:positiveInteger.
+ *     This type adds an "id" attribute to xsd:positiveInteger.
  * 
  *       
  * 

Modified: geronimo/server/trunk/modules/geronimo-axis2/src/main/generated/org/apache/axis2/jaxws/javaee/XsdQNameType.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-axis2/src/main/generated/org/apache/axis2/jaxws/javaee/XsdQNameType.java?view=diff&rev=509814&r1=509813&r2=509814
==============================================================================
--- geronimo/server/trunk/modules/geronimo-axis2/src/main/generated/org/apache/axis2/jaxws/javaee/XsdQNameType.java (original)
+++ geronimo/server/trunk/modules/geronimo-axis2/src/main/generated/org/apache/axis2/jaxws/javaee/XsdQNameType.java Tue Feb 20 15:40:42 2007
@@ -22,7 +22,7 @@
 /**
  * 
  * 
- * 	This type adds an "id" attribute to xsd:QName.
+ *     This type adds an "id" attribute to xsd:QName.
  * 
  *       
  * 

Modified: geronimo/server/trunk/modules/geronimo-axis2/src/main/generated/org/apache/axis2/jaxws/javaee/XsdStringType.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-axis2/src/main/generated/org/apache/axis2/jaxws/javaee/XsdStringType.java?view=diff&rev=509814&r1=509813&r2=509814
==============================================================================
--- geronimo/server/trunk/modules/geronimo-axis2/src/main/generated/org/apache/axis2/jaxws/javaee/XsdStringType.java (original)
+++ geronimo/server/trunk/modules/geronimo-axis2/src/main/generated/org/apache/axis2/jaxws/javaee/XsdStringType.java Tue Feb 20 15:40:42 2007
@@ -21,7 +21,7 @@
 /**
  * 
  * 
- * 	This type adds an "id" attribute to xsd:string.
+ *     This type adds an "id" attribute to xsd:string.
  * 
  *       
  * 

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=509814&r1=509813&r2=509814
==============================================================================
--- 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 Tue Feb 20 15:40:42 2007
@@ -78,7 +78,7 @@
 
 public class Axis2WebServiceContainer implements WebServiceContainer {
 
-	private static final Log log = LogFactory.getLog(Axis2WebServiceContainer.class);
+    private static final Log log = LogFactory.getLog(Axis2WebServiceContainer.class);
 
     public static final String REQUEST = Axis2WebServiceContainer.class.getName() + "@Request";
     public static final String RESPONSE = Axis2WebServiceContainer.class.getName() + "@Response";
@@ -108,11 +108,11 @@
             configurationContext.setServicePath(portInfo.getLocation());
             
             if(portInfo.getWsdlDefinition() != null){ //WSDL Has been provided
-            	AxisServiceGenerator serviceGen = new AxisServiceGenerator();
-            	service = serviceGen.getServiceFromWSDL(portInfo, endpointClassName, portInfo.getWsdlDefinition(), classLoader);
-            	        	            	
+                AxisServiceGenerator serviceGen = new AxisServiceGenerator();
+                service = serviceGen.getServiceFromWSDL(portInfo, endpointClassName, portInfo.getWsdlDefinition(), classLoader);
+                                            
             }else { //No WSDL, Axis2 will handle it. Is it ?
-            	service = AxisService.createService(endpointClassName, configurationContext.getAxisConfiguration(), JAXWSMessageReceiver.class);
+                service = AxisService.createService(endpointClassName, configurationContext.getAxisConfiguration(), JAXWSMessageReceiver.class);
             }
 
             service.setScope(Constants.SCOPE_APPLICATION);
@@ -139,7 +139,7 @@
         initContextRoot(request);
 
         if (log.isDebugEnabled()) {
-        	log.debug("Target URI: " + request.getURI());
+            log.debug("Target URI: " + request.getURI());
         }
 
         MessageContext msgContext = new MessageContext();
@@ -303,19 +303,19 @@
                 }
             }
             if (uri.getQuery().startsWith("wsdl")) {
-            	if(portInfo.getWsdlDefinition() != null){
-            		WSDLFactory factory = WSDLFactory.newInstance();
-            		WSDLWriter writer = factory.newWSDLWriter();            		
-            		writer.writeWSDL(portInfo.getWsdlDefinition(), response.getOutputStream());
-            		return;
-            	}else {
+                if(portInfo.getWsdlDefinition() != null){
+                    WSDLFactory factory = WSDLFactory.newInstance();
+                    WSDLWriter writer = factory.newWSDLWriter();                    
+                    writer.writeWSDL(portInfo.getWsdlDefinition(), response.getOutputStream());
+                    return;
+                }else {
                     service.printWSDL(response.getOutputStream());
                     return;
-            	}
+                }
             }
             //TODO: Not working properly and do we need to have these requests ?
             if (uri.getQuery().startsWith("xsd=")) {
-            	String schemaName = uri.getQuery().substring(uri.getQuery().lastIndexOf("=") + 1);
+                String schemaName = uri.getQuery().substring(uri.getQuery().lastIndexOf("=") + 1);
 
                 if (service != null) {
                     //run the population logic just to be sure
@@ -336,9 +336,9 @@
             }
             //cater for named xsds - check for the xsd name
             if (uri.getQuery().startsWith("xsd")) {
-            	if (service != null) {
-            		response.setContentType("text/xml");
-            		response.setHeader("Transfer-Encoding", "chunked");
+                if (service != null) {
+                    response.setContentType("text/xml");
+                    response.setHeader("Transfer-Encoding", "chunked");
                     service.printSchema(response.getOutputStream());
                     response.getOutputStream().close();
                     return;
@@ -545,21 +545,21 @@
     
     class WSDLGeneratorImpl implements WsdlGenerator {
 
-    	private Definition def;
-    	
-    	public WSDLGeneratorImpl(Definition def) {
-    		this.def = def;
-    	}
-    	
-    	public WsdlComposite generateWsdl(String implClass, String bindingType) throws WebServiceException {
-    		// Need WSDL generation code
-    		WsdlComposite composite = new WsdlComposite();
-    		composite.setWsdlFileName(implClass);
-    		HashMap<String, Definition> testMap = new HashMap<String, Definition>();
-    		testMap.put(composite.getWsdlFileName(), def);
-    		composite.setWsdlDefinition(testMap);
-    		return composite;
-    	}
+        private Definition def;
+        
+        public WSDLGeneratorImpl(Definition def) {
+            this.def = def;
+        }
+        
+        public WsdlComposite generateWsdl(String implClass, String bindingType) throws WebServiceException {
+            // Need WSDL generation code
+            WsdlComposite composite = new WsdlComposite();
+            composite.setWsdlFileName(implClass);
+            HashMap<String, Definition> testMap = new HashMap<String, Definition>();
+            testMap.put(composite.getWsdlFileName(), def);
+            composite.setWsdlDefinition(testMap);
+            return composite;
+        }
     }
 
     protected void init() {

Modified: geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/Axis2WebServiceContainerFactoryGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/Axis2WebServiceContainerFactoryGBean.java?view=diff&rev=509814&r1=509813&r2=509814
==============================================================================
--- geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/Axis2WebServiceContainerFactoryGBean.java (original)
+++ geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/Axis2WebServiceContainerFactoryGBean.java Tue Feb 20 15:40:42 2007
@@ -37,7 +37,7 @@
 
 public class Axis2WebServiceContainerFactoryGBean implements WebServiceContainerFactory {
 
-	private static final Log log = LogFactory.getLog(Axis2WebServiceContainerFactoryGBean.class);
+    private static final Log log = LogFactory.getLog(Axis2WebServiceContainerFactoryGBean.class);
     private final ClassLoader classLoader;
     private final org.apache.geronimo.axis2.PortInfo portInfo;
     private final String endpointClassName;
@@ -45,14 +45,14 @@
     private Context context;
 
     public Axis2WebServiceContainerFactoryGBean(org.apache.geronimo.axis2.PortInfo portInfo, 
-    		String endpointClassName, 
-    		ClassLoader classLoader, 
-    		Map componentContext,
+            String endpointClassName, 
+            ClassLoader classLoader, 
+            Map componentContext,
             Kernel kernel,
             TransactionManager transactionManager,
             URL configurationBaseUrl) throws InstantiationException, IllegalAccessException, ClassNotFoundException {
-    	
-    	if (componentContext != null) {
+        
+        if (componentContext != null) {
             GeronimoUserTransaction userTransaction = new GeronimoUserTransaction(transactionManager);
             try {
                 this.context = EnterpriseNamingContext.createEnterpriseNamingContext(componentContext,

Modified: geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/AxisServiceGenerator.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/AxisServiceGenerator.java?view=diff&rev=509814&r1=509813&r2=509814
==============================================================================
--- geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/AxisServiceGenerator.java (original)
+++ geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/AxisServiceGenerator.java Tue Feb 20 15:40:42 2007
@@ -74,15 +74,15 @@
 //TODO: Investigate more on JAXB Wrapper class gen default behaviour 
 
 public class AxisServiceGenerator {
-	
-	private static String WSDL_ENCODING = "UTF-8";
-	
-	public AxisServiceGenerator(){
-		super();
-	}
-	
-	public AxisService getServiceFromWSDL(org.apache.geronimo.jaxws.PortInfo portInfo, String endpointClassName, Definition wsdlDefinition, ClassLoader classLoader) throws Exception {
-		WSDLToAxisServiceBuilder wsdlBuilder = null;
+    
+    private static String WSDL_ENCODING = "UTF-8";
+    
+    public AxisServiceGenerator(){
+        super();
+    }
+    
+    public AxisService getServiceFromWSDL(org.apache.geronimo.jaxws.PortInfo portInfo, String endpointClassName, Definition wsdlDefinition, ClassLoader classLoader) throws Exception {
+        WSDLToAxisServiceBuilder wsdlBuilder = null;
         WSDLFactory factory = WSDLFactory.newInstance();
         WSDLWriter writer = factory.newWSDLWriter();
         
@@ -90,248 +90,248 @@
         writer.writeWSDL(wsdlDefinition, out);
         String wsdlContent = out.toString(WSDL_ENCODING); //Will the Axis2 give us this information soon ?
         
-   		OMNamespace documentElementNS = ((OMElement)XMLUtils.toOM(new StringReader(wsdlContent))).getNamespace();
-   		
-   		Map<QName, Service> serviceMap = wsdlDefinition.getServices();
-    	Service wsdlService = serviceMap.values().iterator().next();
-    	
-    	Map<String, Port> portMap = wsdlService.getPorts();
-    	Port port = portMap.values().iterator().next();
-    	String portName = port.getName();
-   		QName serviceQName = wsdlService.getQName();
+           OMNamespace documentElementNS = ((OMElement)XMLUtils.toOM(new StringReader(wsdlContent))).getNamespace();
+           
+           Map<QName, Service> serviceMap = wsdlDefinition.getServices();
+        Service wsdlService = serviceMap.values().iterator().next();
+        
+        Map<String, Port> portMap = wsdlService.getPorts();
+        Port port = portMap.values().iterator().next();
+        String portName = port.getName();
+           QName serviceQName = wsdlService.getQName();
 
-   		//Decide WSDL Version : 
-    	if(WSDLConstants.WSDL20_2006Constants.DEFAULT_NAMESPACE_URI.equals(documentElementNS.getNamespaceURI())){
-    		wsdlBuilder = new WSDL20ToAxisServiceBuilder(new ByteArrayInputStream(wsdlContent.getBytes()), serviceQName, null);
-    	}
-    	else if(Constants.NS_URI_WSDL11.equals(documentElementNS.getNamespaceURI())){
-    		wsdlBuilder = new WSDL11ToAxisServiceBuilder(wsdlDefinition, serviceQName , portName);
-    	}
-    	//populate with axis2 objects
-    	AxisService service = wsdlBuilder.populateService();
-    	service.addParameter(new Parameter(Constants.SERVICE_CLASS, endpointClassName));
+           //Decide WSDL Version : 
+        if(WSDLConstants.WSDL20_2006Constants.DEFAULT_NAMESPACE_URI.equals(documentElementNS.getNamespaceURI())){
+            wsdlBuilder = new WSDL20ToAxisServiceBuilder(new ByteArrayInputStream(wsdlContent.getBytes()), serviceQName, null);
+        }
+        else if(Constants.NS_URI_WSDL11.equals(documentElementNS.getNamespaceURI())){
+            wsdlBuilder = new WSDL11ToAxisServiceBuilder(wsdlDefinition, serviceQName , portName);
+        }
+        //populate with axis2 objects
+        AxisService service = wsdlBuilder.populateService();
+        service.addParameter(new Parameter(Constants.SERVICE_CLASS, endpointClassName));
         service.setWsdlFound(true);
         service.setClassLoader(classLoader);
-    	
-    	//Going to create annotations by hand
-    	DescriptionBuilderComposite dbc = new DescriptionBuilderComposite();
-    	dbc.setClassLoader(classLoader);
-    	HashMap<String, DescriptionBuilderComposite> dbcMap = new HashMap<String, DescriptionBuilderComposite>();
-    	
-    	//Service related annotations
+        
+        //Going to create annotations by hand
+        DescriptionBuilderComposite dbc = new DescriptionBuilderComposite();
+        dbc.setClassLoader(classLoader);
+        HashMap<String, DescriptionBuilderComposite> dbcMap = new HashMap<String, DescriptionBuilderComposite>();
+        
+        //Service related annotations
         WebServiceAnnot serviceAnnot = WebServiceAnnot.createWebServiceAnnotImpl();
         serviceAnnot.setPortName(portName);
         serviceAnnot.setServiceName(service.getName());
         serviceAnnot.setName(service.getName());
         serviceAnnot.setTargetNamespace(service.getTargetNamespace());
-  	
-   	 	Class endPointClass = classLoader.loadClass(endpointClassName);
- 		Method[] classMethods = endPointClass.getMethods();
- 		
-   	 	for(Iterator<AxisOperation> opIterator = service.getOperations() ; opIterator.hasNext() ;){
-   	 		AxisOperation operation = opIterator.next();
-   	 		operation.setMessageReceiver(JAXWSMessageReceiver.class.newInstance());
-   	 		
-   	 		for(Method method : classMethods){
-   	 			String axisOpName = operation.getName().getLocalPart();
-   	 			if(method.getName().equals(axisOpName)){
-   	 				fillOperationInformation(method, operation, dbc);
-   	 			}
-   	 		}
-   	 	}
-    	
-    	dbc.setWebServiceAnnot(serviceAnnot);
-   	 	dbc.setWsdlDefinition(wsdlDefinition);
-   	 	dbc.setClassName(endpointClassName);
-   	 	dbc.setCustomWsdlGenerator(new WSDLGeneratorImpl(wsdlDefinition));
-   	 	dbcMap.put(endpointClassName, dbc);
+      
+            Class endPointClass = classLoader.loadClass(endpointClassName);
+         Method[] classMethods = endPointClass.getMethods();
+         
+            for(Iterator<AxisOperation> opIterator = service.getOperations() ; opIterator.hasNext() ;){
+                AxisOperation operation = opIterator.next();
+                operation.setMessageReceiver(JAXWSMessageReceiver.class.newInstance());
+                
+                for(Method method : classMethods){
+                    String axisOpName = operation.getName().getLocalPart();
+                    if(method.getName().equals(axisOpName)){
+                        fillOperationInformation(method, operation, dbc);
+                    }
+                }
+            }
+        
+        dbc.setWebServiceAnnot(serviceAnnot);
+            dbc.setWsdlDefinition(wsdlDefinition);
+            dbc.setClassName(endpointClassName);
+            dbc.setCustomWsdlGenerator(new WSDLGeneratorImpl(wsdlDefinition));
+            dbcMap.put(endpointClassName, dbc);
         List<ServiceDescription> serviceDescList = DescriptionFactory.createServiceDescriptionFromDBCMap(dbcMap);
         ServiceDescription sd = serviceDescList.get(0);
         Parameter serviceDescription = new Parameter(EndpointDescription.AXIS_SERVICE_PARAMETER, sd.getEndpointDescriptions()[0]);
         service.addParameter(serviceDescription);
         
         return service;
-	}
-	
-	private void fillOperationInformation(Method method, AxisOperation operation, DescriptionBuilderComposite dbc) throws Exception{
-			MethodDescriptionComposite mdc = new MethodDescriptionComposite();
-			WebMethodAnnot webMethodAnnot = WebMethodAnnot.createWebMethodAnnotImpl();
-			webMethodAnnot.setOperationName(method.getName());
-			
-			if(operation.getStyle().equals(AxisOperation.STYLE_DOC)){
-				fillDocOperationInfo(method, operation, dbc, mdc, webMethodAnnot);
-			}else if(operation.getStyle().equals(AxisOperation.STYLE_RPC)){
-				throw new RuntimeException("Not Yet Implemented");
-			}
-	}
-	
-	private void fillDocOperationInfo(Method method, AxisOperation operation, DescriptionBuilderComposite dbc, MethodDescriptionComposite mdc, WebMethodAnnot webMethodAnnot ) throws Exception{
-		mdc.setWebMethodAnnot(webMethodAnnot);
-		mdc.setMethodName(method.getName());
+    }
+    
+    private void fillOperationInformation(Method method, AxisOperation operation, DescriptionBuilderComposite dbc) throws Exception{
+            MethodDescriptionComposite mdc = new MethodDescriptionComposite();
+            WebMethodAnnot webMethodAnnot = WebMethodAnnot.createWebMethodAnnotImpl();
+            webMethodAnnot.setOperationName(method.getName());
+            
+            if(operation.getStyle().equals(AxisOperation.STYLE_DOC)){
+                fillDocOperationInfo(method, operation, dbc, mdc, webMethodAnnot);
+            }else if(operation.getStyle().equals(AxisOperation.STYLE_RPC)){
+                throw new RuntimeException("Not Yet Implemented");
+            }
+    }
+    
+    private void fillDocOperationInfo(Method method, AxisOperation operation, DescriptionBuilderComposite dbc, MethodDescriptionComposite mdc, WebMethodAnnot webMethodAnnot ) throws Exception{
+        mdc.setWebMethodAnnot(webMethodAnnot);
+        mdc.setMethodName(method.getName());
 
- 		String MEP = operation.getMessageExchangePattern();
- 		
- 		if (WSDLUtil.isInputPresentForMEP(MEP)) {
- 			AxisMessage inAxisMessage = operation.getMessage(WSDLConstants.MESSAGE_LABEL_IN_VALUE);
- 			if(inAxisMessage != null){
- 				
- 				XmlSchemaElement element = inAxisMessage.getSchemaElement();
- 				XmlSchemaType schemaType = element.getSchemaType();
- 				
- 				if(schemaType instanceof XmlSchemaComplexType){
+         String MEP = operation.getMessageExchangePattern();
+         
+         if (WSDLUtil.isInputPresentForMEP(MEP)) {
+             AxisMessage inAxisMessage = operation.getMessage(WSDLConstants.MESSAGE_LABEL_IN_VALUE);
+             if(inAxisMessage != null){
+                 
+                 XmlSchemaElement element = inAxisMessage.getSchemaElement();
+                 XmlSchemaType schemaType = element.getSchemaType();
+                 
+                 if(schemaType instanceof XmlSchemaComplexType){
 
- 					XmlSchemaComplexType complexSchemaType = (XmlSchemaComplexType)element.getSchemaType();
- 					XmlSchemaParticle particle = complexSchemaType.getParticle();
- 					
-// 					TODO: What if we have more than one complex type in a sequence ???
- 					if (particle instanceof XmlSchemaSequence) {
- 						XmlSchemaSequence xmlSchemaSequence = (XmlSchemaSequence) particle;
- 						Iterator iterator = xmlSchemaSequence.getItems().getIterator();
- 						
- 						while (iterator.hasNext()) {
- 							XmlSchemaElement innerElement = (XmlSchemaElement) iterator.next();
- 							XmlSchemaType innerElementSchemaType = innerElement.getSchemaType();
- 							
- 							if(!(innerElementSchemaType instanceof XmlSchemaComplexType)){
- 								element = innerElement;
- 								break;
- 							}else { 
- 								XmlSchemaComplexType innerComplexSchemaType = (XmlSchemaComplexType)innerElementSchemaType;
- 			 					XmlSchemaParticle innerParticle = innerComplexSchemaType.getParticle();
- 			 					XmlSchemaSequence innerXmlSchemaSequence = (XmlSchemaSequence) innerParticle;
- 		 						iterator = innerXmlSchemaSequence.getItems().getIterator();
- 							}
- 						}
- 					}
- 				}
- 				
- 				ParameterDescriptionComposite pdc = new ParameterDescriptionComposite();
-				WebParamAnnot webParamAnnot = WebParamAnnot.createWebParamAnnotImpl();
-			
-				webParamAnnot.setName(element.getName());
-				pdc.setWebParamAnnot(webParamAnnot);
-					
-				Class[] paramTypes = method.getParameterTypes();
-					
-				for(Class paramType : paramTypes){
-						String strParamType = paramType.toString();
-						pdc.setParameterType(strParamType.split(" ")[1]);
-				}
-					
-				mdc.addParameterDescriptionComposite(pdc);
- 			}
- 		}
- 		
- 		if (WSDLUtil.isOutputPresentForMEP(MEP)) {
- 			AxisMessage outAxisMessage = operation.getMessage(WSDLConstants.MESSAGE_LABEL_OUT_VALUE);
- 			
- 			if(outAxisMessage != null){
- 				
- 				if(!method.getReturnType().toString().equals("void")){
- 					mdc.setReturnType(method.getReturnType().toString().split(" ")[1]);
- 					
- 					XmlSchemaElement element = outAxisMessage.getSchemaElement();
-	 				XmlSchemaType schemaType = element.getSchemaType();
-	 				
-	 				if(schemaType instanceof XmlSchemaComplexType){
+                     XmlSchemaComplexType complexSchemaType = (XmlSchemaComplexType)element.getSchemaType();
+                     XmlSchemaParticle particle = complexSchemaType.getParticle();
+                     
+//                     TODO: What if we have more than one complex type in a sequence ???
+                     if (particle instanceof XmlSchemaSequence) {
+                         XmlSchemaSequence xmlSchemaSequence = (XmlSchemaSequence) particle;
+                         Iterator iterator = xmlSchemaSequence.getItems().getIterator();
+                         
+                         while (iterator.hasNext()) {
+                             XmlSchemaElement innerElement = (XmlSchemaElement) iterator.next();
+                             XmlSchemaType innerElementSchemaType = innerElement.getSchemaType();
+                             
+                             if(!(innerElementSchemaType instanceof XmlSchemaComplexType)){
+                                 element = innerElement;
+                                 break;
+                             }else { 
+                                 XmlSchemaComplexType innerComplexSchemaType = (XmlSchemaComplexType)innerElementSchemaType;
+                                  XmlSchemaParticle innerParticle = innerComplexSchemaType.getParticle();
+                                  XmlSchemaSequence innerXmlSchemaSequence = (XmlSchemaSequence) innerParticle;
+                                  iterator = innerXmlSchemaSequence.getItems().getIterator();
+                             }
+                         }
+                     }
+                 }
+                 
+                 ParameterDescriptionComposite pdc = new ParameterDescriptionComposite();
+                WebParamAnnot webParamAnnot = WebParamAnnot.createWebParamAnnotImpl();
+            
+                webParamAnnot.setName(element.getName());
+                pdc.setWebParamAnnot(webParamAnnot);
+                    
+                Class[] paramTypes = method.getParameterTypes();
+                    
+                for(Class paramType : paramTypes){
+                        String strParamType = paramType.toString();
+                        pdc.setParameterType(strParamType.split(" ")[1]);
+                }
+                    
+                mdc.addParameterDescriptionComposite(pdc);
+             }
+         }
+         
+         if (WSDLUtil.isOutputPresentForMEP(MEP)) {
+             AxisMessage outAxisMessage = operation.getMessage(WSDLConstants.MESSAGE_LABEL_OUT_VALUE);
+             
+             if(outAxisMessage != null){
+                 
+                 if(!method.getReturnType().toString().equals("void")){
+                     mdc.setReturnType(method.getReturnType().toString().split(" ")[1]);
+                     
+                     XmlSchemaElement element = outAxisMessage.getSchemaElement();
+                     XmlSchemaType schemaType = element.getSchemaType();
+                     
+                     if(schemaType instanceof XmlSchemaComplexType){
 
-	 					XmlSchemaComplexType complexSchemaType = (XmlSchemaComplexType)element.getSchemaType();
-	 					XmlSchemaParticle particle = complexSchemaType.getParticle();
-	 					
-//	 					TODO: What if we have more than one complex type in a sequence ???
-	 					if (particle instanceof XmlSchemaSequence) {
-	 						XmlSchemaSequence xmlSchemaSequence = (XmlSchemaSequence) particle;
-	 						Iterator iterator = xmlSchemaSequence.getItems().getIterator();
-	 						
-	 						while (iterator.hasNext()) {
-	 							XmlSchemaElement innerElement = (XmlSchemaElement) iterator.next();
-	 							XmlSchemaType innerElementSchemaType = innerElement.getSchemaType();
-	 							
-	 							if(!(innerElementSchemaType instanceof XmlSchemaComplexType)){
-	 								element = innerElement;
-	 								break;
-	 							}else { 
-	 								XmlSchemaComplexType innerComplexSchemaType = (XmlSchemaComplexType)innerElementSchemaType;
-	 			 					XmlSchemaParticle innerParticle = innerComplexSchemaType.getParticle();
-	 			 					XmlSchemaSequence innerXmlSchemaSequence = (XmlSchemaSequence) innerParticle;
-	 		 						iterator = innerXmlSchemaSequence.getItems().getIterator();
-	 							}
-	 						}
-	 					}
-	 				}
-	 				
-	 				WebResultAnnot webResult = WebResultAnnot.createWebResultAnnotImpl();
-					webResult.setName(element.getName());
-					mdc.setWebResultAnnot(webResult);
+                         XmlSchemaComplexType complexSchemaType = (XmlSchemaComplexType)element.getSchemaType();
+                         XmlSchemaParticle particle = complexSchemaType.getParticle();
+                         
+//                         TODO: What if we have more than one complex type in a sequence ???
+                         if (particle instanceof XmlSchemaSequence) {
+                             XmlSchemaSequence xmlSchemaSequence = (XmlSchemaSequence) particle;
+                             Iterator iterator = xmlSchemaSequence.getItems().getIterator();
+                             
+                             while (iterator.hasNext()) {
+                                 XmlSchemaElement innerElement = (XmlSchemaElement) iterator.next();
+                                 XmlSchemaType innerElementSchemaType = innerElement.getSchemaType();
+                                 
+                                 if(!(innerElementSchemaType instanceof XmlSchemaComplexType)){
+                                     element = innerElement;
+                                     break;
+                                 }else { 
+                                     XmlSchemaComplexType innerComplexSchemaType = (XmlSchemaComplexType)innerElementSchemaType;
+                                      XmlSchemaParticle innerParticle = innerComplexSchemaType.getParticle();
+                                      XmlSchemaSequence innerXmlSchemaSequence = (XmlSchemaSequence) innerParticle;
+                                      iterator = innerXmlSchemaSequence.getItems().getIterator();
+                                 }
+                             }
+                         }
+                     }
+                     
+                     WebResultAnnot webResult = WebResultAnnot.createWebResultAnnotImpl();
+                    webResult.setName(element.getName());
+                    mdc.setWebResultAnnot(webResult);
 
-					ResponseWrapperAnnot responseWrap = ResponseWrapperAnnot.createResponseWrapperAnnotImpl();
-		 			responseWrap.setClassName(getWrapperClassName(outAxisMessage.getElementQName()));
-		 			mdc.setResponseWrapperAnnot(responseWrap);
- 					}
- 				
-	 			}
- 		}
- 		
- 		List faultMessages = operation.getFaultMessages(); 
- 		if(faultMessages != null){//TODO Implement it 
- 			
- 		}
- 		
- 		mdc.setWebMethodAnnot(webMethodAnnot);
- 		dbc.addMethodDescriptionComposite(mdc);
-	}
-	
-	//TODO: Has to verify how JAXB default class wrapper class generation logic
-	private String getWrapperClassName(QName element) throws Exception {
-		String localPart = element.getLocalPart();
-		String nameSpace = element.getNamespaceURI();
-		
-		URI nameSpaceURI = new URI(nameSpace);
-		
-		String host = nameSpaceURI.getHost();
-		String path = nameSpaceURI.getPath();
-		String[] pathParts = path.split("/");
-		int index = 0;
-		
-		while(index < host.length()){
-			if(host.charAt(index) == '.'){
-				break;
-			}
-			index ++;
-		}
-		
-		String packageName = host.substring(index+1, host.length())+"."+host.substring(0, index); 
-		
-		for(String pathPart : pathParts){
-			if(!pathPart.equals("")){
-				packageName += ("."+pathPart);
-			}
-		}
-		
-		String className = localPart;
-		if(Character.isLowerCase(localPart.charAt(0))){
-			className = (char)Character.toUpperCase(localPart.charAt(0))+className.substring(1, className.length());
-		}
-				
-		return packageName + "." + className;
-	}
-	
+                    ResponseWrapperAnnot responseWrap = ResponseWrapperAnnot.createResponseWrapperAnnotImpl();
+                     responseWrap.setClassName(getWrapperClassName(outAxisMessage.getElementQName()));
+                     mdc.setResponseWrapperAnnot(responseWrap);
+                     }
+                 
+                 }
+         }
+         
+         List faultMessages = operation.getFaultMessages(); 
+         if(faultMessages != null){//TODO Implement it 
+             
+         }
+         
+         mdc.setWebMethodAnnot(webMethodAnnot);
+         dbc.addMethodDescriptionComposite(mdc);
+    }
+    
+    //TODO: Has to verify how JAXB default class wrapper class generation logic
+    private String getWrapperClassName(QName element) throws Exception {
+        String localPart = element.getLocalPart();
+        String nameSpace = element.getNamespaceURI();
+        
+        URI nameSpaceURI = new URI(nameSpace);
+        
+        String host = nameSpaceURI.getHost();
+        String path = nameSpaceURI.getPath();
+        String[] pathParts = path.split("/");
+        int index = 0;
+        
+        while(index < host.length()){
+            if(host.charAt(index) == '.'){
+                break;
+            }
+            index ++;
+        }
+        
+        String packageName = host.substring(index+1, host.length())+"."+host.substring(0, index); 
+        
+        for(String pathPart : pathParts){
+            if(!pathPart.equals("")){
+                packageName += ("."+pathPart);
+            }
+        }
+        
+        String className = localPart;
+        if(Character.isLowerCase(localPart.charAt(0))){
+            className = (char)Character.toUpperCase(localPart.charAt(0))+className.substring(1, className.length());
+        }
+                
+        return packageName + "." + className;
+    }
+    
     private class WSDLGeneratorImpl implements WsdlGenerator {
 
-    	private Definition def;
-    	
-    	public WSDLGeneratorImpl(Definition def) {
-    		this.def = def;
-    	}
-    	
-    	public WsdlComposite generateWsdl(String implClass, String bindingType) throws WebServiceException {
-    		// Need WSDL generation code
-    		WsdlComposite composite = new WsdlComposite();
-    		composite.setWsdlFileName(implClass);
-    		HashMap<String, Definition> testMap = new HashMap<String, Definition>();
-    		testMap.put(composite.getWsdlFileName(), def);
-    		composite.setWsdlDefinition(testMap);
-    		return composite;
-    	}
+        private Definition def;
+        
+        public WSDLGeneratorImpl(Definition def) {
+            this.def = def;
+        }
+        
+        public WsdlComposite generateWsdl(String implClass, String bindingType) throws WebServiceException {
+            // Need WSDL generation code
+            WsdlComposite composite = new WsdlComposite();
+            composite.setWsdlFileName(implClass);
+            HashMap<String, Definition> testMap = new HashMap<String, Definition>();
+            testMap.put(composite.getWsdlFileName(), def);
+            composite.setWsdlDefinition(testMap);
+            return composite;
+        }
     }
 }

Modified: geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/PortInfo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/PortInfo.java?view=diff&rev=509814&r1=509813&r2=509814
==============================================================================
--- geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/PortInfo.java (original)
+++ geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/PortInfo.java Tue Feb 20 15:40:42 2007
@@ -20,18 +20,18 @@
 import javax.wsdl.Definition;
 
 public class PortInfo extends org.apache.geronimo.jaxws.PortInfo {
-	
-	private Definition wsdlDefinition;
-	
+    
+    private Definition wsdlDefinition;
+    
     public Definition getWsdlDefinition() {
-		return wsdlDefinition;
-	}
+        return wsdlDefinition;
+    }
 
-	public void setWsdlDefinition(Definition wsdlDefinition) {
-		this.wsdlDefinition = wsdlDefinition;
-	}
+    public void setWsdlDefinition(Definition wsdlDefinition) {
+        this.wsdlDefinition = wsdlDefinition;
+    }
 
-	public String toString() {
+    public String toString() {
         return "[" + getServiceName() + ":" + getPortName() + ":" + getServiceEndpointInterfaceName() + ":" + getWsdlFile() + ":" + getLocation() + "]";
     }
 }

Modified: geronimo/server/trunk/modules/geronimo-axis2/src/test/java/org/apache/geronimo/axis2/Axis2Request.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-axis2/src/test/java/org/apache/geronimo/axis2/Axis2Request.java?view=diff&rev=509814&r1=509813&r2=509814
==============================================================================
--- geronimo/server/trunk/modules/geronimo-axis2/src/test/java/org/apache/geronimo/axis2/Axis2Request.java (original)
+++ geronimo/server/trunk/modules/geronimo-axis2/src/test/java/org/apache/geronimo/axis2/Axis2Request.java Tue Feb 20 15:40:42 2007
@@ -25,86 +25,86 @@
 import org.apache.geronimo.webservices.WebServiceContainer;
 
 class Axis2Request implements WebServiceContainer.Request {
-	private int contentLength;
+    private int contentLength;
 
-	private String contentType;
+    private String contentType;
 
-	private InputStream in;
+    private InputStream in;
 
-	private int method;
+    private int method;
 
-	private Map parameters;
+    private Map parameters;
 
-	private URI uri;
+    private URI uri;
 
-	private Map headers;
+    private Map headers;
 
-	private Map attributes;
+    private Map attributes;
 
-	private String remoteAddress;
+    private String remoteAddress;
 
-	/**
-	 * 
-	 */
-	public Axis2Request(int contentLength, String contentType, InputStream in,
-			int method, Map parameters, URI uri, Map headers,
-			String remoteAddress) {
-		this.contentType = contentType;
-		this.in = in;
-		this.method = method;
-		this.parameters = parameters;
-		this.uri = uri;
-		this.headers = headers;
-		this.attributes = new HashMap();
-		this.remoteAddress = remoteAddress;
-	}
+    /**
+     * 
+     */
+    public Axis2Request(int contentLength, String contentType, InputStream in,
+            int method, Map parameters, URI uri, Map headers,
+            String remoteAddress) {
+        this.contentType = contentType;
+        this.in = in;
+        this.method = method;
+        this.parameters = parameters;
+        this.uri = uri;
+        this.headers = headers;
+        this.attributes = new HashMap();
+        this.remoteAddress = remoteAddress;
+    }
 
-	public int getContentLength() {
-		return contentLength;
-	}
+    public int getContentLength() {
+        return contentLength;
+    }
 
-	public String getContentType() {
-		return contentType;
-	}
+    public String getContentType() {
+        return contentType;
+    }
 
-	public String getHeader(String name) {
-		return (String) headers.get(name);
-	}
+    public String getHeader(String name) {
+        return (String) headers.get(name);
+    }
 
-	public InputStream getInputStream() throws IOException {
-		return in;
-	}
+    public InputStream getInputStream() throws IOException {
+        return in;
+    }
 
-	public int getMethod() {
-		return method;
-	}
+    public int getMethod() {
+        return method;
+    }
 
-	public String getParameter(String name) {
-		return (String) parameters.get(name);
-	}
+    public String getParameter(String name) {
+        return (String) parameters.get(name);
+    }
 
-	public Map getParameters() {
-		return parameters;
-	}
+    public Map getParameters() {
+        return parameters;
+    }
 
-	public URI getURI() {
-		return uri;
-	}
+    public URI getURI() {
+        return uri;
+    }
 
-	public Object getAttribute(String name) {
-		return attributes.get(name);
-	}
+    public Object getAttribute(String name) {
+        return attributes.get(name);
+    }
 
-	public void setAttribute(String name, Object value) {
-		attributes.put(name, value);
-	}
+    public void setAttribute(String name, Object value) {
+        attributes.put(name, value);
+    }
 
-	public String getRemoteAddr() {
-		return remoteAddress;
-	}
+    public String getRemoteAddr() {
+        return remoteAddress;
+    }
 
-	public String getContextPath() {
-		return "/axis2";
-	}
+    public String getContextPath() {
+        return "/axis2";
+    }
 
 }

Modified: geronimo/server/trunk/modules/geronimo-axis2/src/test/java/org/apache/geronimo/axis2/Axis2Response.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-axis2/src/test/java/org/apache/geronimo/axis2/Axis2Response.java?view=diff&rev=509814&r1=509813&r2=509814
==============================================================================
--- geronimo/server/trunk/modules/geronimo-axis2/src/test/java/org/apache/geronimo/axis2/Axis2Response.java (original)
+++ geronimo/server/trunk/modules/geronimo-axis2/src/test/java/org/apache/geronimo/axis2/Axis2Response.java Tue Feb 20 15:40:42 2007
@@ -24,173 +24,173 @@
 import org.apache.geronimo.webservices.WebServiceContainer;
 
 class Axis2Response implements WebServiceContainer.Response {
-	private int contentLength;
+    private int contentLength;
 
-	private String contentType;
+    private String contentType;
 
-	private String host;
+    private String host;
 
-	private OutputStream out;
+    private OutputStream out;
 
-	private int method;
-
-	private Map parameters;
-
-	private String path;
-
-	private URL uri;
-
-	private int port;
-
-	private Map headers;
-
-	private int statusCode;
-
-	private String statusMessage;
-
-	/**
-	 * 
-	 */
-	public Axis2Response(String contentType, String host, String path, URL uri,
-			int port, OutputStream out) {
-		this.contentType = contentType;
-		this.host = host;
-		this.parameters = new HashMap();
-		this.path = path;
-		this.uri = uri;
-		this.port = port;
-		this.headers = new HashMap();
-		this.out = out;
-	}
-
-	public int getContentLength() {
-		return contentLength;
-	}
-
-	public String getHeader(String name) {
-		return (String) headers.get(name);
-	}
-
-	public String getHost() {
-		return host;
-	}
-
-	public OutputStream getOutputStream() {
-		return out;
-	}
-
-	public int getMethod() {
-		return method;
-	}
-
-	public String getParameter(String name) {
-		return (String) parameters.get(name);
-	}
-
-	public Map getParameters() {
-		return parameters;
-	}
-
-	public String getPath() {
-		return path;
-	}
-
-	public int getPort() {
-		return port;
-	}
-
-	public URL getURI() {
-		return uri;
-	}
-
-	/**
-	 * @return
-	 */
-	public String getContentType() {
-		return contentType;
-	}
-
-	/**
-	 * @return
-	 */
-	public URL getUri() {
-		return uri;
-	}
-
-	/**
-	 * @param i
-	 */
-	public void setContentLength(int i) {
-		contentLength = i;
-	}
-
-	/**
-	 * @param string
-	 */
-	public void setContentType(String string) {
-		contentType = string;
-	}
-
-	/**
-	 * @param string
-	 */
-	public void setHost(String string) {
-		host = string;
-	}
-
-	/**
-	 * @param i
-	 */
-	public void setMethod(int i) {
-		method = i;
-	}
-
-	/**
-	 * @param map
-	 */
-	public void setParameters(Map map) {
-		parameters = map;
-	}
-
-	/**
-	 * @param string
-	 */
-	public void setPath(String string) {
-		path = string;
-	}
-
-	/**
-	 * @param i
-	 */
-	public void setPort(int i) {
-		port = i;
-	}
-
-	/**
-	 * @param url
-	 */
-	public void setUri(URL url) {
-		uri = url;
-	}
-
-	public int getStatusCode() {
-		return statusCode;
-	}
-
-	public void setStatusCode(int code) {
-		statusCode = code;
-	}
-
-	public void setStatusMessage(String responseString) {
-		statusMessage = responseString;
-	}
-
-	public void flushBuffer() throws java.io.IOException {
-	}
-
-	public void setHeader(String name, String value) {
-		headers.put(name, value);
-	}
+    private int method;
+
+    private Map parameters;
+
+    private String path;
+
+    private URL uri;
+
+    private int port;
+
+    private Map headers;
+
+    private int statusCode;
+
+    private String statusMessage;
+
+    /**
+     * 
+     */
+    public Axis2Response(String contentType, String host, String path, URL uri,
+            int port, OutputStream out) {
+        this.contentType = contentType;
+        this.host = host;
+        this.parameters = new HashMap();
+        this.path = path;
+        this.uri = uri;
+        this.port = port;
+        this.headers = new HashMap();
+        this.out = out;
+    }
+
+    public int getContentLength() {
+        return contentLength;
+    }
+
+    public String getHeader(String name) {
+        return (String) headers.get(name);
+    }
+
+    public String getHost() {
+        return host;
+    }
+
+    public OutputStream getOutputStream() {
+        return out;
+    }
+
+    public int getMethod() {
+        return method;
+    }
+
+    public String getParameter(String name) {
+        return (String) parameters.get(name);
+    }
+
+    public Map getParameters() {
+        return parameters;
+    }
+
+    public String getPath() {
+        return path;
+    }
+
+    public int getPort() {
+        return port;
+    }
+
+    public URL getURI() {
+        return uri;
+    }
+
+    /**
+     * @return
+     */
+    public String getContentType() {
+        return contentType;
+    }
+
+    /**
+     * @return
+     */
+    public URL getUri() {
+        return uri;
+    }
+
+    /**
+     * @param i
+     */
+    public void setContentLength(int i) {
+        contentLength = i;
+    }
+
+    /**
+     * @param string
+     */
+    public void setContentType(String string) {
+        contentType = string;
+    }
+
+    /**
+     * @param string
+     */
+    public void setHost(String string) {
+        host = string;
+    }
+
+    /**
+     * @param i
+     */
+    public void setMethod(int i) {
+        method = i;
+    }
+
+    /**
+     * @param map
+     */
+    public void setParameters(Map map) {
+        parameters = map;
+    }
+
+    /**
+     * @param string
+     */
+    public void setPath(String string) {
+        path = string;
+    }
+
+    /**
+     * @param i
+     */
+    public void setPort(int i) {
+        port = i;
+    }
+
+    /**
+     * @param url
+     */
+    public void setUri(URL url) {
+        uri = url;
+    }
+
+    public int getStatusCode() {
+        return statusCode;
+    }
+
+    public void setStatusCode(int code) {
+        statusCode = code;
+    }
+
+    public void setStatusMessage(String responseString) {
+        statusMessage = responseString;
+    }
+
+    public void flushBuffer() throws java.io.IOException {
+    }
+
+    public void setHeader(String name, String value) {
+        headers.put(name, value);
+    }
 
 }
 

Modified: geronimo/server/trunk/modules/geronimo-axis2/src/test/java/org/apache/geronimo/axis2/Axis2WebServiceContainerTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-axis2/src/test/java/org/apache/geronimo/axis2/Axis2WebServiceContainerTest.java?view=diff&rev=509814&r1=509813&r2=509814
==============================================================================
--- geronimo/server/trunk/modules/geronimo-axis2/src/test/java/org/apache/geronimo/axis2/Axis2WebServiceContainerTest.java (original)
+++ geronimo/server/trunk/modules/geronimo-axis2/src/test/java/org/apache/geronimo/axis2/Axis2WebServiceContainerTest.java Tue Feb 20 15:40:42 2007
@@ -35,7 +35,7 @@
     }
 
     public void testInvokeWithWSDLDocLit() throws Exception {
-    	testInvokeWithWSDL("test_service_doc_lit_request.xml", "test_service_doc_lit.wsdl");
+        testInvokeWithWSDL("test_service_doc_lit_request.xml", "test_service_doc_lit.wsdl");
     }
     
     //TODO:
@@ -43,15 +43,15 @@
     }
     
     private void testInvokeWithWSDL(String requestFile, String wsdlFile) throws Exception {
-    	ClassLoader cl = Thread.currentThread().getContextClassLoader();
-    	InputStream in = cl.getResourceAsStream(requestFile);
+        ClassLoader cl = Thread.currentThread().getContextClassLoader();
+        InputStream in = cl.getResourceAsStream(requestFile);
 
-    	PortInfo portInfo = new PortInfo();
-    	portInfo.setLocation("servlet");
-    	File file = new File(getTestFile("src/test/resources/"+wsdlFile));
-    	portInfo.setWsdlDefinition(readWSDL(file.toURL().toString()));
-    	
-    	try {
+        PortInfo portInfo = new PortInfo();
+        portInfo.setLocation("servlet");
+        File file = new File(getTestFile("src/test/resources/"+wsdlFile));
+        portInfo.setWsdlDefinition(readWSDL(file.toURL().toString()));
+        
+        try {
             Axis2Request req = new Axis2Request(504,
                     "text/xml; charset=utf-8",
                     in,
@@ -72,7 +72,7 @@
             out.flush();
      
         } catch(Exception ex){
-        	throw new Exception(ex.toString());
+            throw new Exception(ex.toString());
         }finally {
             if (in != null) {
                 try {
@@ -85,12 +85,12 @@
     }
     
     private Definition readWSDL(String url) throws Exception{
-    	WSDLFactory factory = WSDLFactory.newInstance();
-		WSDLReader reader = factory.newWSDLReader();
-		reader.setFeature("javax.wsdl.importDocuments", true);
-		reader.setFeature("javax.wsdl.verbose", false);
-		Definition wsdlDefinition = reader.readWSDL(url);
-		return wsdlDefinition;
+        WSDLFactory factory = WSDLFactory.newInstance();
+        WSDLReader reader = factory.newWSDLReader();
+        reader.setFeature("javax.wsdl.importDocuments", true);
+        reader.setFeature("javax.wsdl.verbose", false);
+        Definition wsdlDefinition = reader.readWSDL(url);
+        return wsdlDefinition;
     }
 
     protected void setUp() throws Exception {

Modified: geronimo/server/trunk/modules/geronimo-axis2/src/test/java/org/apache/geronimo/axis2/testdata/HelloWorld.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-axis2/src/test/java/org/apache/geronimo/axis2/testdata/HelloWorld.java?view=diff&rev=509814&r1=509813&r2=509814
==============================================================================
--- geronimo/server/trunk/modules/geronimo-axis2/src/test/java/org/apache/geronimo/axis2/testdata/HelloWorld.java (original)
+++ geronimo/server/trunk/modules/geronimo-axis2/src/test/java/org/apache/geronimo/axis2/testdata/HelloWorld.java Tue Feb 20 15:40:42 2007
@@ -22,8 +22,8 @@
 @WebService(name="HelloWorld")
 public class HelloWorld {
 
-	@WebMethod
-	public String sayHello(String me){
-		return "Hello "+me;
-	}
+    @WebMethod
+    public String sayHello(String me){
+        return "Hello "+me;
+    }
 }



Mime
View raw message